From 20dc759683e798aa207878378a658bedfef78c39 Mon Sep 17 00:00:00 2001 From: Google Cloud Datastore <> Date: Tue, 14 May 2013 12:08:02 -0700 Subject: [PATCH 0001/1784] Initial commit --- .../services/datastore/client/Datastore.java | 124 ++++++ .../datastore/client/DatastoreException.java | 31 ++ .../datastore/client/DatastoreFactory.java | 128 ++++++ .../datastore/client/DatastoreHelper.java | 413 ++++++++++++++++++ .../datastore/client/DatastoreOptions.java | 111 +++++ .../client/LocalDevelopmentDatastore.java | 253 +++++++++++ .../LocalDevelopmentDatastoreException.java | 30 ++ .../LocalDevelopmentDatastoreFactory.java | 41 ++ .../services/datastore/client/RemoteRpc.java | 109 +++++ 9 files changed, 1240 insertions(+) create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreException.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java new file mode 100644 index 000000000000..f3b0a31078fb --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java @@ -0,0 +1,124 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.client.http.HttpStatusCodes; +import com.google.api.services.datastore.DatastoreV1.AllocateIdsRequest; +import com.google.api.services.datastore.DatastoreV1.AllocateIdsResponse; +import com.google.api.services.datastore.DatastoreV1.BeginTransactionRequest; +import com.google.api.services.datastore.DatastoreV1.BeginTransactionResponse; +import com.google.api.services.datastore.DatastoreV1.BlindWriteRequest; +import com.google.api.services.datastore.DatastoreV1.BlindWriteResponse; +import com.google.api.services.datastore.DatastoreV1.CommitRequest; +import com.google.api.services.datastore.DatastoreV1.CommitResponse; +import com.google.api.services.datastore.DatastoreV1.LookupRequest; +import com.google.api.services.datastore.DatastoreV1.LookupResponse; +import com.google.api.services.datastore.DatastoreV1.RollbackRequest; +import com.google.api.services.datastore.DatastoreV1.RollbackResponse; +import com.google.api.services.datastore.DatastoreV1.RunQueryRequest; +import com.google.api.services.datastore.DatastoreV1.RunQueryResponse; + +import java.io.IOException; + +/** + * Provides access to the Datastore. + * + */ +public class Datastore { + + final RemoteRpc remoteRpc; + + Datastore(RemoteRpc remoteRpc) { + this.remoteRpc = remoteRpc; + } + + /** + * Reset the RPC count. + */ + public void resetRpcCount() { + remoteRpc.resetRpcCount(); + } + + /** + * Returns the number of RPC calls made since the client was created + * or {@link #resetRpcCount} was called. + */ + public int getRpcCount() { + return remoteRpc.getRpcCount(); + } + + private DatastoreException invalidResponseException(String method, IOException exception) { + return RemoteRpc.makeException(remoteRpc.getUrl(), method, + HttpStatusCodes.STATUS_CODE_SERVICE_UNAVAILABLE, "Invalid response", exception); + } + + public AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws DatastoreException { + try { + return AllocateIdsResponse.parseFrom(remoteRpc.call("allocateIds", request)); + } catch (IOException exception) { + throw invalidResponseException("allocateIds", exception); + } + } + + public BeginTransactionResponse beginTransaction(BeginTransactionRequest request) + throws DatastoreException { + try { + return BeginTransactionResponse.parseFrom(remoteRpc.call("beginTransaction", request)); + } catch (IOException exception) { + throw invalidResponseException("beginTransaction", exception); + } + } + + public CommitResponse commit(CommitRequest request) throws DatastoreException { + try { + return CommitResponse.parseFrom(remoteRpc.call("commit", request)); + } catch (IOException exception) { + throw invalidResponseException("commit", exception); + } + } + + public LookupResponse lookup(LookupRequest request) throws DatastoreException { + try { + return LookupResponse.parseFrom(remoteRpc.call("lookup", request)); + } catch (IOException exception) { + throw invalidResponseException("lookup", exception); + } + } + + public RollbackResponse rollback(RollbackRequest request) throws DatastoreException { + try { + return RollbackResponse.parseFrom(remoteRpc.call("rollback", request)); + } catch (IOException exception) { + throw invalidResponseException("rollback", exception); + } + } + + public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreException { + try { + return RunQueryResponse.parseFrom(remoteRpc.call("runQuery", request)); + } catch (IOException exception) { + throw invalidResponseException("runQuery", exception); + } + } + + public BlindWriteResponse blindWrite(BlindWriteRequest request) throws DatastoreException { + try { + return BlindWriteResponse.parseFrom(remoteRpc.call("blindWrite", request)); + } catch (IOException exception) { + throw invalidResponseException("blindWrite", exception); + } + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java new file mode 100644 index 000000000000..54f144474b9f --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java @@ -0,0 +1,31 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +/** + * Indicates an error in a {@link Datastore} call. + * + */ +public class DatastoreException extends Exception { + public final String methodName; + public final int code; + + public DatastoreException(String methodName, int code, String message, Throwable cause) { + super(message, cause); + this.methodName = methodName; + this.code = code; + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java new file mode 100644 index 000000000000..acd72c80d360 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java @@ -0,0 +1,128 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.javanet.NetHttpTransport; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.logging.ConsoleHandler; +import java.util.logging.Formatter; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; +import java.util.logging.StreamHandler; + +/** + * Client factory for {@link Datastore}. + * + */ +public class DatastoreFactory { + private static final Logger logger = Logger.getLogger(DatastoreFactory.class.getName()); + + /** Singleton factory instance. */ + private static final DatastoreFactory INSTANCE = new DatastoreFactory(); + private static final String VERSION = "v1beta1"; + + // Lazy load this because we might be running inside App Engine and this + // class isn't on the whitelist. + private static ConsoleHandler methodHandler; + + public static DatastoreFactory get() { + return INSTANCE; + } + + // TODO(user): Support something other than console handler for when we're + // running in App Engine + private static synchronized StreamHandler getStreamHandler() { + if (methodHandler == null) { + methodHandler = new ConsoleHandler(); + methodHandler.setFormatter(new Formatter() { + @Override + public String format(LogRecord record) { + return record.getMessage() + "\n"; + } + }); + methodHandler.setLevel(Level.FINE); + } + return methodHandler; + } + + DatastoreFactory() { } + + RemoteRpc newRemoteRpc(DatastoreOptions options) { + if (options == null) { + throw new IllegalArgumentException("options not set"); + } + HttpRequestFactory client = makeClient(options); + return new RemoteRpc(client, buildUrl(options)); + } + + /** + * Provides access to a datastore using the provided options. Logs + * into the application using the credentials available via these + * options. + * + * @throws IllegalArgumentException if the server or credentials weren't provided. + */ + public Datastore create(DatastoreOptions options) throws IllegalArgumentException { + return new Datastore(newRemoteRpc(options)); + } + + /** + * Constructs a Google APIs HTTP client with the associated credentials. + */ + public HttpRequestFactory makeClient(DatastoreOptions options) { + Credential credential = options.getCredential(); + if (credential == null) { + logger.warning("Not using any credentials"); + return new NetHttpTransport().createRequestFactory(); + } + HttpTransport transport = credential.getTransport(); + return transport.createRequestFactory(credential); + } + + /** + * Build a valid datastore URL. + */ + private String buildUrl(DatastoreOptions options) { + try { + if (options.getDataset() == null) { + throw new IllegalArgumentException("datastore dataset not set in options"); + } + URI validUri = new URI(String.format("%s/datastore/%s/datasets/%s", + options.getHost(), VERSION, options.getDataset())); + return validUri.toString(); + } catch (URISyntaxException e) { + throw new IllegalArgumentException(e); + } + } + + /** + * Starts logging datastore method calls to the console. (Useful within tests.) + */ + public static void logMethodCalls() { + Logger logger = Logger.getLogger(Datastore.class.getName()); + logger.setLevel(Level.FINE); + if (!Arrays.asList(logger.getHandlers()).contains(getStreamHandler())) { + logger.addHandler(getStreamHandler()); + } + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java new file mode 100644 index 000000000000..ab576bdbf9a5 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java @@ -0,0 +1,413 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; +import com.google.api.client.googleapis.compute.ComputeCredential; +import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; +import com.google.api.client.http.javanet.NetHttpTransport; +import com.google.api.client.json.jackson.JacksonFactory; +import com.google.api.services.datastore.DatastoreV1.CompositeFilter; +import com.google.api.services.datastore.DatastoreV1.Entity; +import com.google.api.services.datastore.DatastoreV1.EntityOrBuilder; +import com.google.api.services.datastore.DatastoreV1.Filter; +import com.google.api.services.datastore.DatastoreV1.Key; +import com.google.api.services.datastore.DatastoreV1.Key.PathElement; +import com.google.api.services.datastore.DatastoreV1.Property; +import com.google.api.services.datastore.DatastoreV1.PropertyFilter; +import com.google.api.services.datastore.DatastoreV1.PropertyOrBuilder; +import com.google.api.services.datastore.DatastoreV1.PropertyOrder; +import com.google.api.services.datastore.DatastoreV1.PropertyReference; +import com.google.api.services.datastore.DatastoreV1.Value; +import com.google.api.services.datastore.DatastoreV1.ValueOrBuilder; +import com.google.protobuf.ByteString; + +import java.io.File; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +/** + * Helper methods for {@link Datastore}. + * + */ +public class DatastoreHelper { + private static final Logger logger = Logger.getLogger(DatastoreHelper.class.getName()); + + private DatastoreHelper() {} + + /** + * Attempts to get credentials from Google Compute Engine. + * + * @return valid credentials or {@code null} + */ + public static Credential getComputeEngineCredential() + throws GeneralSecurityException, IOException { + NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport(); + try { + // Try to connect using Google Compute Engine service account credentials. + ComputeCredential credential = new ComputeCredential(transport, new JacksonFactory()); + // Force token refresh to detect if we are running on Google Compute Engine. + credential.refreshToken(); + return credential; + } catch (IOException e) { + return null; + } + } + + /** + * Constructs credentials for the given account and key. + * + * @param account the account to use. + * @param privateKeyFile the file name from which to get the private key. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential(String account, String privateKeyFile) + throws GeneralSecurityException, IOException { + NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport(); + JacksonFactory jsonFactory = new JacksonFactory(); + return new GoogleCredential.Builder() + .setTransport(transport) + .setJsonFactory(jsonFactory) + .setServiceAccountId(account) + .setServiceAccountScopes(DatastoreOptions.SCOPE) + .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile)) + .build(); + } + + /** + * Uses the following enviorment variables to construct a {@link Datastore}: + * DATASTORE_DATASET - the datastore dataset id + * DATASTORE_HOST - the host to use to access the datastore + * e.g: https://www.googleapis.com/datastore/v1/datasets/{dataset} + * DATASTORE_SERVICE_ACCOUNT - (optional) service account name + * DATASTORE_PRIVATE_KEY_FILE - (optional) service account private key file + * + * Preference of credentials is: + * - ComputeEngine + * - Service Account (specified by DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE) + * - no-credentials (for local development environment) + */ + public static DatastoreOptions.Builder getOptionsfromEnv() + throws GeneralSecurityException, IOException { + DatastoreOptions.Builder options = new DatastoreOptions.Builder(); + options.dataset(System.getenv("DATASTORE_DATASET")); + options.host(System.getenv("DATASTORE_HOST")); + Credential credential = getComputeEngineCredential(); + if (credential != null) { + logger.info("Using Compute Engine credential."); + } else if (System.getenv("DATASTORE_SERVICE_ACCOUNT") != null && + System.getenv("DATASTORE_PRIVATE_KEY_FILE") != null) { + credential = getServiceAccountCredential(System.getenv("DATASTORE_SERVICE_ACCOUNT"), + System.getenv("DATASTORE_PRIVATE_KEY_FILE")); + logger.info("Using JWT Service Account credential."); + } + options.credential(credential); + return options; + } + + /** + * @see #getOptionsfromEnv() + */ + public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException { + return DatastoreFactory.get().create(getOptionsfromEnv().build()); + } + + /** + * Make a sort order for use in a query. + */ + public static PropertyOrder.Builder makeOrder(String property, + PropertyOrder.Direction direction) { + return PropertyOrder.newBuilder() + .setProperty(makePropertyReference(property)) + .setDirection(direction); + } + + /** + * Make a filter on a property for use in a query. + */ + public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator, + Value value) { + return Filter.newBuilder() + .setPropertyFilter(PropertyFilter.newBuilder() + .setProperty(makePropertyReference(property)) + .setOperator(operator) + .setValue(value)); + } + + /** + * Make a filter on a property for use in a query. + */ + public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator, + Value.Builder value) { + return makeFilter(property, operator, value.build()); + } + + /** + * Make a composite filter from the given sub-filters. + * + * Uses AND to combine filters. + */ + public static Filter.Builder makeFilter(Filter ...subfilters) { + return makeCompositeFilter(Arrays.asList(subfilters)); + } + + /** + * Make a composite filter from the given sub-filters. + * + * Uses AND to combine filters. + */ + public static Filter.Builder makeCompositeFilter(Iterable subfilters) { + return Filter.newBuilder() + .setCompositeFilter(CompositeFilter.newBuilder() + .addAllFilter(subfilters) + .setOperator(CompositeFilter.Operator.AND)); + } + + /** + * Make an entity property with the specified value. + */ + public static Property.Builder makeProperty(String name, Value value) { + return Property.newBuilder().setName(name).addValue(value); + } + + /** + * Make an entity property with the specified value. + */ + public static Property.Builder makeProperty(String name, Value.Builder value) { + return makeProperty(name, value.build()); + } + + /** + * Make an entity property with the specified values. + */ + public static Property.Builder makeProperty(String name, Iterable values) { + return Property.newBuilder().setName(name).setMulti(true).addAllValue(values); + } + + /** + * Make an entity property with the specified values. + */ + public static Property.Builder makeProperty(String name, Value ...values) { + return makeProperty(name, Arrays.asList(values)); + } + + /** + * Make an entity property with the specified values. + */ + public static Property.Builder makeProperty(String name, Value.Builder ...builders) { + Property.Builder prop = makeProperty(name, Collections.emptyList()); + for (Value.Builder builder : builders) { + prop.addValue(builder); + } + return prop; + } + + /** + * Make a property reference for use in a query. + */ + public static PropertyReference.Builder makePropertyReference(String propertyName) { + return PropertyReference.newBuilder().setName(propertyName); + } + + /** + * Make a key value. + */ + public static Value.Builder makeValue(Key key) { + return Value.newBuilder().setKeyValue(key); + } + + /** + * Make a key value. + */ + public static Value.Builder makeValue(Key.Builder key) { + return makeValue(key.build()); + } + + /** + * Make an integer value. + */ + public static Value.Builder makeValue(long key) { + return Value.newBuilder().setIntegerValue(key); + } + + /** + * Make a floating point value. + */ + public static Value.Builder makeValue(double value) { + return Value.newBuilder().setDoubleValue(value); + } + + /** + * Make a floating point value. + */ + public static Value.Builder makeValue(boolean value) { + return Value.newBuilder().setBooleanValue(value); + } + + /** + * Make a string value. + */ + public static Value.Builder makeValue(String value) { + return Value.newBuilder().setStringValue(value); + } + + /** + * Make a key value. + */ + public static Value.Builder makeValue(Entity entity) { + return Value.newBuilder().setEntityValue(entity); + } + + /** + * Make a entity value. + */ + public static Value.Builder makeValue(Entity.Builder entity) { + return makeValue(entity.build()); + } + + /** + * Make a entity value. + */ + public static Value.Builder makeValue(ByteString blob) { + return Value.newBuilder().setBlobValue(blob); + } + + /** + * Make a date value given a time in milliseconds. + */ + public static Value.Builder makeValue(Date date) { + return Value.newBuilder().setTimestampMicrosecondsValue(date.getTime() * 1000L); + } + + /** + * Make a key from the specified path of kind/id-or-name pairs. + * + * The id-or-name values must be either Key, String, Long, Integer or Short. + * + * The last id-or-name value may be omitted, in which case an entity without + * an id is created (for use with automatic id allocation). + */ + public static Key.Builder makeKey(Object... elements) { + Key.Builder key = Key.newBuilder(); + for (int pathIndex = 0; pathIndex < elements.length; pathIndex += 2) { + PathElement.Builder pathElement = PathElement.newBuilder(); + Object element = elements[pathIndex]; + if (element instanceof Key) { + key.addAllPathElement(((Key) element).getPathElementList()); + // We increment by 2, but since we got a Key argument we're only consuming 1 element in this + // iteration of the loop. Decrement the index so that when we jump by 2 we end up in the + // right spot. + pathIndex--; + } else { + String kind; + try { + kind = (String) element; + } catch (ClassCastException e) { + throw new IllegalArgumentException("Expected string or Key, got: " + element.getClass()); + } + pathElement.setKind(kind); + if (pathIndex + 1 < elements.length) { + Object value = elements[pathIndex + 1]; + if (value instanceof String) { + pathElement.setName((String) value); + } else if (value instanceof Long) { + pathElement.setId((Long) value); + } else if (value instanceof Integer) { + pathElement.setId((Integer) value); + } else if (value instanceof Short) { + pathElement.setId((Short) value); + } else { + throw new IllegalArgumentException( + "Expected string or integer, got: " + value.getClass()); + } + } + key.addPathElement(pathElement); + } + } + return key; + } + + /** + * Return a map of property name to java object. + * + * Looses microseconds on timestamp values, meaning and indexing information. + * + * @param entity the entity to search for the property. + * @return The property value, or null if it's not found. + */ + public static Map getPropertyMap(EntityOrBuilder entity) { + Map result = new HashMap(); + for (PropertyOrBuilder property : entity.getPropertyList()) { + Object value; + if (property.getMulti()) { + List values = new ArrayList(property.getValueCount()); + for (ValueOrBuilder subValue : property.getValueList()) { + values.add(getValue(subValue)); + } + value = values; + } else { + value = getValue(property.getValue(0)); + } + result.put(property.getName(), value); + } + return Collections.unmodifiableMap(result); + } + + /** + * Convert a Value to a Java Object. Ignores meaning. + * + * Looses microseconds on timestamp values, meaning and indexing information. + */ + public static Object getValue(ValueOrBuilder value) { + if (value.hasBooleanValue()) { + return value.getBooleanValue(); + } + if (value.hasIntegerValue()) { + return value.getIntegerValue(); + } + if (value.hasDoubleValue()) { + return value.getDoubleValue(); + } + if (value.hasTimestampMicrosecondsValue()) { + return new Date(value.getTimestampMicrosecondsValue() / 1000L); + } + if (value.hasKeyValue()) { + return value.getKeyValue(); + } + if (value.hasBlobKeyValue()) { + return value; // Returning value directly to avoid loosing type info. + } + if (value.hasStringValue()) { + return value.getStringValue(); + } + if (value.hasBlobValue()) { + return value.getBlobValue(); + } + if (value.hasEntityValue()) { + return value.getEntityValue(); + } + return null; + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java new file mode 100644 index 000000000000..44278959ef15 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java @@ -0,0 +1,111 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.client.auth.oauth2.Credential; + +/** + * A mutable object containing settings for the datastore. + * + *

Example for connecting to a datastore:

+ * + * 
+ * DatastoreOptions options = new DatastoreOptions()
+ *     .dataset("my-dataset-id"),
+ *     .credential(DatastoreHelper.getGceCredential());
+ * DatastoreFactory.get().create(options);
+ *
+ * + *

+ * The options should be passed to {@link DatastoreFactory#create}. + *

+ * + */ +public class DatastoreOptions { + private final String dataset; + private final String host; + private static final String DEFAULT_HOST = "https://www.googleapis.com"; + + private final Credential credential; + public static final String SCOPE = "https://www.googleapis.com/auth/datastore" + + " https://www.googleapis.com/auth/userinfo.email"; + + DatastoreOptions(String dataset, String host, Credential credential) { + this.dataset = dataset; + this.host = host != null ? host : DEFAULT_HOST; + this.credential = credential; + } + + /** + * Builder for {@link DatastoreOptions}. + */ + public static class Builder { + private String dataset; + private String host; + private Credential credential; + + public Builder() { } + + public Builder(DatastoreOptions options) { + this.dataset = options.dataset; + this.host = options.host; + this.credential = options.credential; + } + + public DatastoreOptions build() { + return new DatastoreOptions(dataset, host, credential); + } + + /** + * Sets the dataset used to access the datastore. + */ + public Builder dataset(String newDataset) { + dataset = newDataset; + return this; + } + + /** + * Sets the host used to access the datastore. + */ + public Builder host(String newHost) { + host = newHost; + return this; + } + + /** + * Sets the Google APIs credentials used to access the API. + */ + public Builder credential(Credential newCredential) { + credential = newCredential; + return this; + } + } + + // === getters === + + public String getDataset() { + return dataset; + } + + public String getHost() { + return host; + } + + public Credential getCredential() { + return credential; + } + +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java new file mode 100644 index 000000000000..5b92cfc176a7 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java @@ -0,0 +1,253 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.client.http.GenericUrl; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.HttpResponse; +import com.google.api.client.http.UrlEncodedContent; +import com.google.api.client.util.Preconditions; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +/** + * An extension to {@link Datastore} that provides lifecycle management for a development datastore + * server. + * + * In order to use a development datastore for a JUnit 4 test you might do something like this: + * + * 
+ * public class MyTest {
+ *
+ *   static LocalDevelopmentDatastore datastore;
+ *
+ *   {@literal @}BeforeClass
+ *   public static void startLocalDatastore() throws LocalDevelopmentDatastoreException {
+ *     DatastoreOptions opts = new DatastoreOptions.Builder()
+ *         .host("http://localhost:8080")
+ *         .dataset("myapp")
+ *         .build();
+ *     datastore = LocalDevelopmentDatastoreFactory.get().create(opts);
+ *     datastore.start("/usr/local/gcdsdk", "myapp");
+ *   }
+ *
+ *   {@literal @}Before
+ *   public void setUp() throws LocalDevelopmentDatastoreException {
+ *     datastore.clearDatastore();
+ *   }
+ *
+ *   {@literal @}AfterClass
+ *   public static void stopLocalDatastore() throws LocalDevelopmentDatastoreException {
+ *     datastore.stopDatastore();
+ *   }
+ *
+ *   {@literal @}Test
+ *   public void testFoo1() { }
+
+ *   {@literal @}Test
+ *   public void testFoo2() { }
+ *
+ * }
+ *
+ * + */ +public class LocalDevelopmentDatastore extends Datastore { + private static final int STARTUP_TIMEOUT_SECS = 5; + + private final String host; + + /** Internal state lifecycle management. */ + enum State {NEW, STARTED, STOPPED} + + private State state = State.NEW; + + LocalDevelopmentDatastore(RemoteRpc rpc, String host) { + super(rpc); + this.host = host; + } + + /** + * Clears all data in the Datastore. + * + * @throws LocalDevelopmentDatastoreException + */ + public void clear() throws LocalDevelopmentDatastoreException { + HttpRequestFactory client = remoteRpc.getHttpRequestFactory(); + try { + Map params = new HashMap(); + params.put("action", "Clear Datastore"); + UrlEncodedContent content = new UrlEncodedContent(params); + GenericUrl url = new GenericUrl(host + "/_ah/admin/datastore"); + HttpResponse httpResponse = client.buildPostRequest(url, content).execute(); + if (!httpResponse.isSuccessStatusCode()) { + throw new LocalDevelopmentDatastoreException( + "Clear Datastore returned http status " + httpResponse.getStatusCode()); + } + } catch (IOException e) { + throw new LocalDevelopmentDatastoreException( + "Exception trying to clear the dev datastore", e); + } + } + + /** + * Starts the local datastore. It is the caller's responsibility to call {@link #stop}. Note that + * receiving an exception does not indicate that the server did not start. We recommend calling + * {@link #stop} to ensure the server is not running regardless of the result of this method. + * + * @param sdkPath The path to the GCD SDK, eg /usr/local/dev/gcd + * @param dataset The name of the GCD dataset + * @param cmdLineOptions Command line options to pass to the script that launches the dev server + * @throws LocalDevelopmentDatastoreException If {@link #start} has already been called or the + * server does not start successfully. + */ + public synchronized void start(String sdkPath, String dataset, String... cmdLineOptions) + throws LocalDevelopmentDatastoreException { + Preconditions.checkNotNull(sdkPath, "sdkPath cannot be null"); + Preconditions.checkNotNull(dataset, "dataset cannot be null"); + Preconditions.checkState(state == State.NEW, "Cannot call start() more than once."); + try { + startDatastoreInternal(sdkPath, dataset, cmdLineOptions); + state = State.STARTED; + } finally { + if (state != State.STARTED) { + // If we're not able to start the server we don't want people trying again. Just move it + // straight to the STOPPED state. + state = State.STOPPED; + } + } + } + + void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOptions) + throws LocalDevelopmentDatastoreException { + List cmd = Arrays.asList("./gcd.sh", "start", dataset, "--allow_remote_shutdown", + "--property=datastore.no_storage"); + cmd.addAll(Arrays.asList(cmdLineOptions)); + ProcessBuilder builder = new ProcessBuilder(cmd); + builder.directory(new File(sdkPath)); + builder.redirectErrorStream(true); + Process devDatastoreServerProcess; + try { + devDatastoreServerProcess = builder.start(); + } catch (IOException e) { + throw new LocalDevelopmentDatastoreException("Could not start dev server", e); + } + StartupMonitor monitor = new StartupMonitor(devDatastoreServerProcess.getInputStream()); + try { + monitor.start(); + if (!monitor.startupCompleteLatch.await(STARTUP_TIMEOUT_SECS, TimeUnit.SECONDS)) { + throw new LocalDevelopmentDatastoreException("Dev server did not start within 5 seconds"); + } + if (!monitor.success) { + throw new LocalDevelopmentDatastoreException("Server did not start normally"); + } + } catch (InterruptedException e) { + // not sure why this would happen + throw new LocalDevelopmentDatastoreException("Received an interrupt", e); + } + } + + /** + * Stops the local datastore. Multiple calls are allowed. + * + * @throws LocalDevelopmentDatastoreException + */ + public synchronized void stop() throws LocalDevelopmentDatastoreException { + // We intentionally don't check the internal state. If people want to try and stop the server + // multiple times that's fine. + stopDatastoreInternal(); + state = State.STOPPED; + } + + void stopDatastoreInternal() throws LocalDevelopmentDatastoreException { + // No need to kill the process we started, this function will take care of it. + HttpRequestFactory client = remoteRpc.getHttpRequestFactory(); + Map params = new HashMap(); + UrlEncodedContent content = new UrlEncodedContent(params); + GenericUrl url = new GenericUrl(host + "/_ah/admin/quit"); + try { + HttpResponse httpResponse = client.buildPostRequest(url, content).execute(); + if (!httpResponse.isSuccessStatusCode()) { + throw new LocalDevelopmentDatastoreException( + "Request to shutdown local datastore returned http error code " + + httpResponse.getStatusCode()); + } + } catch (IOException e) { + throw new LocalDevelopmentDatastoreException( + "Exception trying to stop the dev datastore", e); + } + } + + /** + * Monitors the provided input stream for evidence that the dev server has started successfully + * and redirects the output of the dev server process to sysout for this process. + */ + static class StartupMonitor extends Thread { + + private final InputStream inputStream; + private volatile boolean success = false; + /** This latch will reach 0 once server startup has completed. */ + private final CountDownLatch startupCompleteLatch = new CountDownLatch(1); + + StartupMonitor(InputStream inputStream) { + this.inputStream = inputStream; + setDaemon(true); + } + + @Override + public void run() { + try { + BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); + String line; + while ((line = br.readLine()) != null) { + // redirect to sysout for our process + System.out.println(line); + if (!success && line.contains("Dev App Server is now running")) { + success = true; + startupCompleteLatch.countDown(); + } + } + } catch (IOException ioe) { + if (!success) { + System.err.println("Received an IOException before the dev server startup completed. " + + "Dev server is in an unknown state."); + } else { + // We got an exception after the server started successfully. We'll lose the ability + // to log the output of the dev server but there's no need to shut anything down. + System.err.println("Received an exception handling output from the dev server. " + + "Logging will stop but the dev server is probably ok."); + } + ioe.printStackTrace(); + } finally { + if (!success) { + // Either the stream is closed (indicates server shut down) or we received an Exception + // while processing the stream contents. Either way we can tell the calling thread to stop + // waiting. + startupCompleteLatch.countDown(); + } + } + } + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreException.java new file mode 100644 index 000000000000..deaec195703a --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreException.java @@ -0,0 +1,30 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +/** + * An exception related to the local development {@link Datastore}. + * + */ +public class LocalDevelopmentDatastoreException extends Exception { + public LocalDevelopmentDatastoreException(String message) { + super(message); + } + + public LocalDevelopmentDatastoreException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java new file mode 100644 index 000000000000..c0c90c7f0ed6 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java @@ -0,0 +1,41 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + + +/** + * Factory for {@link LocalDevelopmentDatastore}. + * + */ +public class LocalDevelopmentDatastoreFactory extends DatastoreFactory { + + /** Singleton factory instance. */ + private static final LocalDevelopmentDatastoreFactory INSTANCE = + new LocalDevelopmentDatastoreFactory(); + + public static LocalDevelopmentDatastoreFactory get() { + return INSTANCE; + } + + LocalDevelopmentDatastoreFactory() { } + + @Override + public LocalDevelopmentDatastore create(DatastoreOptions options) + throws IllegalArgumentException { + RemoteRpc rpc = newRemoteRpc(options); + return new LocalDevelopmentDatastore(rpc, options.getHost()); + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java new file mode 100644 index 000000000000..60f30395faa2 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java @@ -0,0 +1,109 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.client.http.GenericUrl; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.HttpResponse; +import com.google.api.client.http.HttpResponseException; +import com.google.api.client.http.HttpStatusCodes; +import com.google.api.client.http.protobuf.ProtoHttpContent; + +import com.google.protobuf.MessageLite; + +import java.io.IOException; +import java.io.InputStream; +import java.util.logging.Logger; + +/** + * An RPC transport that sends protocol buffers over HTTP. + * + */ +class RemoteRpc { + private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName()); + + private HttpRequestFactory client; + private String url; + private int rpcCount = 0; + + RemoteRpc(HttpRequestFactory client, String url) { + this.client = client; + this.url = url; + try { + resolveURL("dummyRpc"); + } catch (Exception e) { + throw new IllegalArgumentException( + "Unable to construct RemoteRpc due to unsupported url: <" + url + ">", e); + } + } + + /** + * Makes an RPC call using the client. Logs how long it took and any exceptions. + * + * NOTE: The request could be an InputStream too, but the http client will need to + * find its length, which will require buffering it anyways. + * + * @throws DatastoreException if the RPC fails. + */ + InputStream call(String methodName, MessageLite request) throws DatastoreException { + logger.fine("remote datastore call " + methodName); + + long startTime = System.currentTimeMillis(); + try { + HttpResponse httpResponse; + try { + rpcCount++; + ProtoHttpContent payload = new ProtoHttpContent(request); + httpResponse = client.buildPostRequest(resolveURL(methodName), payload).execute(); + return httpResponse.getContent(); + } catch (HttpResponseException e) { + throw makeException(url, methodName, e.getStatusCode(), e.getContent(), e); + } catch (IOException e) { + throw makeException(url, methodName, HttpStatusCodes.STATUS_CODE_SERVICE_UNAVAILABLE, + "I/O error", e); + } + } finally { + long elapsedTime = System.currentTimeMillis() - startTime; + logger.fine("remote datastore call " + methodName + " took " + elapsedTime + " ms"); + } + } + + void resetRpcCount() { + rpcCount = 0; + } + + int getRpcCount() { + return rpcCount; + } + + String getUrl() { + return url; + } + + GenericUrl resolveURL(String path) { + return new GenericUrl(url + "/" + path); + } + + HttpRequestFactory getHttpRequestFactory() { + return client; + } + + static DatastoreException makeException( + String url, String methodName, int code, String message, Throwable cause) { + logger.fine("remote datastore call " + methodName + " against " + url + " failed: " + message); + return new DatastoreException(methodName, code, message, cause); + } +} From ce63aab012e9d3331ddb9bbedb36162db313a540 Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Tue, 6 Aug 2013 19:25:34 -0700 Subject: [PATCH 0002/1784] v1beta1-rev2-1.0.1 ------------------ - GQL support. - Metadata query support. - Command line tool improvements. - Microsoft Windows support (`gcd.cmd`). - Testing mode. - More intuitive `update_indexes` command (renamed to `updateindexes`). - New `create` command and simplified `start` command. - Improved integration with existing App Engine applications. - Ruby samples. - Java helper for query splitting. --- .../datastore/client/DatastoreFactory.java | 16 +- .../datastore/client/DatastoreHelper.java | 71 +++++- .../datastore/client/DatastoreOptions.java | 8 +- .../datastore/client/QuerySplitter.java | 42 ++++ .../datastore/client/QuerySplitterImpl.java | 232 ++++++++++++++++++ 5 files changed, 361 insertions(+), 8 deletions(-) create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java index acd72c80d360..a8d0492beeaf 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java @@ -72,7 +72,8 @@ RemoteRpc newRemoteRpc(DatastoreOptions options) { throw new IllegalArgumentException("options not set"); } HttpRequestFactory client = makeClient(options); - return new RemoteRpc(client, buildUrl(options)); + return new RemoteRpc(client, + buildUrl(options, System.getenv("DATASTORE_URL_INTERNAL_OVERRIDE"))); } /** @@ -102,14 +103,19 @@ public HttpRequestFactory makeClient(DatastoreOptions options) { /** * Build a valid datastore URL. */ - private String buildUrl(DatastoreOptions options) { + String buildUrl(DatastoreOptions options, String overrideUrl) { try { if (options.getDataset() == null) { throw new IllegalArgumentException("datastore dataset not set in options"); } - URI validUri = new URI(String.format("%s/datastore/%s/datasets/%s", - options.getHost(), VERSION, options.getDataset())); - return validUri.toString(); + String url; + if (overrideUrl != null) { + url = String.format("%s/datasets/%s", overrideUrl, options.getDataset()); + } else { + url = String.format("%s/datastore/%s/datasets/%s", + options.getHost(), VERSION, options.getDataset()); + } + return new URI(url).toString(); } catch (URISyntaxException e) { throw new IllegalArgumentException(e); } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java index ab576bdbf9a5..65ddb3c4514d 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java @@ -42,8 +42,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.logging.Logger; @@ -55,6 +57,59 @@ public class DatastoreHelper { private static final Logger logger = Logger.getLogger(DatastoreHelper.class.getName()); + /** The property used in the Datastore to give us a random distribution. **/ + public static final String SCATTER_PROPERTY_NAME = "__scatter__"; + + /** The property used in the Datastore to get the key of the entity. **/ + public static final String KEY_PROPERTY_NAME = "__key__"; + + /** + * Comparator for Keys + */ + private static final class KeyComparator implements Comparator { + + static final KeyComparator INSTANCE = new KeyComparator(); + + private int comparePathElement(PathElement thisElement, PathElement otherElement) { + int result = thisElement.getKind().compareTo(otherElement.getKind()); + if (result != 0) { + return result; + } + if (thisElement.hasId()) { + if (!otherElement.hasId()) { + return -1; + } + return Long.valueOf(thisElement.getId()).compareTo(otherElement.getId()); + } + if (otherElement.hasId()) { + return 1; + } + + return thisElement.getName().compareTo(otherElement.getName()); + } + + @Override + public int compare(Key thisKey, Key otherKey) { + if (!thisKey.getPartitionId().equals(otherKey.getPartitionId())) { + throw new IllegalArgumentException("Cannot compare keys with different partition ids."); + } + + Iterator thisPath = thisKey.getPathElementList().iterator(); + Iterator otherPath = otherKey.getPathElementList().iterator(); + while (thisPath.hasNext()) { + if (!otherPath.hasNext()) { + return 1; + } + int result = comparePathElement(thisPath.next(), otherPath.next()); + if (result != 0) { + return result; + } + } + + return otherPath.hasNext() ? -1 : 0; + } + } + private DatastoreHelper() {} /** @@ -91,7 +146,7 @@ public static Credential getServiceAccountCredential(String account, String priv .setTransport(transport) .setJsonFactory(jsonFactory) .setServiceAccountId(account) - .setServiceAccountScopes(DatastoreOptions.SCOPE) + .setServiceAccountScopes(DatastoreOptions.SCOPES) .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile)) .build(); } @@ -134,6 +189,20 @@ public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, I return DatastoreFactory.get().create(getOptionsfromEnv().build()); } + /** + * Gets a {@link QuerySplitter}. + * + * The returned {@link QuerySplitter#getSplits} cannot accept a query that contains inequality + * filters, a sort filter, or a missing kind. + */ + public static QuerySplitter getQuerySplitter() { + return QuerySplitterImpl.INSTANCE; + } + + public static Comparator getKeyComparator() { + return KeyComparator.INSTANCE; + } + /** * Make a sort order for use in a query. */ diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java index 44278959ef15..dc6bf1db38a7 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java @@ -17,6 +17,9 @@ import com.google.api.client.auth.oauth2.Credential; +import java.util.Arrays; +import java.util.List; + /** * A mutable object containing settings for the datastore. * @@ -40,8 +43,9 @@ public class DatastoreOptions { private static final String DEFAULT_HOST = "https://www.googleapis.com"; private final Credential credential; - public static final String SCOPE = "https://www.googleapis.com/auth/datastore" + - " https://www.googleapis.com/auth/userinfo.email"; + public static final List SCOPES = Arrays.asList( + "https://www.googleapis.com/auth/datastore", + "https://www.googleapis.com/auth/userinfo.email"); DatastoreOptions(String dataset, String host, Credential credential) { this.dataset = dataset; diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java new file mode 100644 index 000000000000..f9b750b95f1e --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java @@ -0,0 +1,42 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.services.datastore.DatastoreV1.Query; + +import java.util.List; + +/** + * Provides the ability to split a query into multiple shards. + * + */ +public interface QuerySplitter { + + /** + * Returns a list of sharded {@link Query}s for the given query. + * + * This will create up to the desired number of splits, however it may return less splits if + * the desired number of splits is unavailable. + * + * @param query the query to split. + * @param numSplits the desired number of splits. + * @param datastore the datastore to run on. + * @throws DatastoreException if there was a datastore error while generating query splits. + * @throws IllegalArgumentException if the given query or numSplits was invalid. + */ + List getSplits(Query query, int numSplits, Datastore datastore) + throws DatastoreException; +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java new file mode 100644 index 000000000000..f36b5e67eee6 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java @@ -0,0 +1,232 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.services.datastore.DatastoreV1.EntityResult; +import com.google.api.services.datastore.DatastoreV1.Filter; +import com.google.api.services.datastore.DatastoreV1.Key; +import com.google.api.services.datastore.DatastoreV1.PropertyExpression; +import com.google.api.services.datastore.DatastoreV1.PropertyFilter; +import com.google.api.services.datastore.DatastoreV1.PropertyFilter.Operator; +import com.google.api.services.datastore.DatastoreV1.PropertyOrder.Direction; +import com.google.api.services.datastore.DatastoreV1.PropertyReference; +import com.google.api.services.datastore.DatastoreV1.Query; +import com.google.api.services.datastore.DatastoreV1.QueryResultBatch; +import com.google.api.services.datastore.DatastoreV1.QueryResultBatch.MoreResultsType; +import com.google.api.services.datastore.DatastoreV1.RunQueryRequest; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * An implementation of {@link QuerySplitter} for the Datastore. + * + * Runs a query on the scatter property to get a random sampling of entities. + * + **/ +final class QuerySplitterImpl implements QuerySplitter { + + /** The number of keys to sample for each split. **/ + private static final int KEYS_PER_SPLIT = 32; + + static final QuerySplitter INSTANCE = new QuerySplitterImpl(); + + QuerySplitterImpl() { + // No initialization required. + } + + /** + * @see QuerySplitter#getSplits + */ + @Override + public List getSplits(Query query, int numSplits, Datastore datastore) + throws DatastoreException, IllegalArgumentException { + + validateQuery(query); + validateSplitSize(numSplits); + + List splits = new ArrayList(); + List scatterKeys = getScatterKeys(numSplits, query, datastore); + Key lastKey = null; + for (Key nextKey : getSplitKey(scatterKeys, numSplits)) { + splits.add(createSplit(lastKey, nextKey, query)); + lastKey = nextKey; + } + splits.add(createSplit(lastKey, null, query)); + return splits; + } + + /** + * Helper to determine if a filter operator is an inequality. + */ + private boolean isInequality(Operator operator) { + return operator == Operator.LESS_THAN || + operator == Operator.LESS_THAN_OR_EQUAL || + operator == Operator.GREATER_THAN || + operator == Operator.GREATER_THAN_OR_EQUAL; + } + + /** + * Verify that the given number of splits is not out of bounds. + * @param numSplits the number of splits. + * @throws IllegalArgumentException if the split size is invalid. + */ + private void validateSplitSize(int numSplits) throws IllegalArgumentException { + if (numSplits < 1) { + throw new IllegalArgumentException("The number of splits must be greater than 0."); + } + } + + /** + * Validate that we only have allowable filters. + * + * Note that equality and ancestor filters are allowed, however they may result in + * inefficient sharding. + */ + private void validateFilter(Filter filter) throws IllegalArgumentException { + if (filter.hasCompositeFilter()) { + for (Filter subFilter : filter.getCompositeFilter().getFilterList()) { + validateFilter(subFilter); + } + } else if (filter.hasPropertyFilter()) { + if (isInequality(filter.getPropertyFilter().getOperator())) { + throw new IllegalArgumentException("Query cannot have an inequality filter.", + new IllegalArgumentException()); + } + } + } + + /** + * Verify that the given query can be properly scattered. + * + * @param query the query to verify + * @throws IllegalArgumentException if the query is invalid. + */ + private void validateQuery(Query query) throws IllegalArgumentException { + if (query.getKindCount() != 1) { + throw new IllegalArgumentException("Query must have exactly one kind."); + } + if (query.getOrderCount() != 0) { + throw new IllegalArgumentException("Query cannot have a sort order."); + } + if (query.hasFilter()) { + validateFilter(query.getFilter()); + } + } + + /** + * Create a new {@link Query} given the query and range. + * + * @param lastKey the previous key. If null then assumed to be the beginning. + * @param nextKey the next key. If null then assumed to be the end. + * @param query the desired query. + */ + private Query createSplit(Key lastKey, Key nextKey, Query query) { + List keyFilters = new ArrayList(); + if (query.hasFilter()) { + keyFilters.add(query.getFilter()); + } + if (lastKey != null) { + keyFilters.add(DatastoreHelper.makeFilter( + DatastoreHelper.KEY_PROPERTY_NAME, PropertyFilter.Operator.GREATER_THAN_OR_EQUAL, + DatastoreHelper.makeValue(lastKey)).build()); + } + if (nextKey != null) { + keyFilters.add(DatastoreHelper.makeFilter( + DatastoreHelper.KEY_PROPERTY_NAME, PropertyFilter.Operator.LESS_THAN, + DatastoreHelper.makeValue(nextKey)).build()); + } + return Query.newBuilder(query).setFilter( + DatastoreHelper.makeCompositeFilter(keyFilters)).build(); + } + + /** + * Given a number of desired splits gets a list of scatter keys with multiples at each split. + * + * @param numSplits the number of desired splits. + * @param query the user query. + * @param datastore the datastore containing the data. + * @throws DatastoreException if there was an error when executing the datastore query. + */ + private List getScatterKeys(int numSplits, Query query, Datastore datastore) + throws DatastoreException { + Query.Builder scatterPointQuery = createScatterQuery(query, numSplits); + + List keySplits = new ArrayList(); + + QueryResultBatch batch = null; + do { + batch = datastore.runQuery(RunQueryRequest.newBuilder().setQuery(query).build()).getBatch(); + for (EntityResult result : batch.getEntityResultList()) { + keySplits.add(result.getEntity().getKey()); + } + scatterPointQuery.setStartCursor(batch.getEndCursor()); + scatterPointQuery.setLimit(scatterPointQuery.getLimit() - batch.getEntityResultCount()); + } while (batch.getMoreResults() == MoreResultsType.NOT_FINISHED); + + Collections.sort(keySplits, DatastoreHelper.getKeyComparator()); + return keySplits; + } + + /** + * Creates a scatter query from the given user query + * + * @param query the user's query. + * @param numSplits the number of splits to create. + */ + private Query.Builder createScatterQuery(Query query, int numSplits) { + // TODO(user): We can potentially support better splits with equality filters in our query + // if there exists a composite index on property, __scatter__, __key__. Until an API for + // metadata exists, this isn't possible. Note that ancestor and inequality queries fall into + // the same category. + Query.Builder scatterPointQuery = Query.newBuilder(); + scatterPointQuery.addAllKind(query.getKindList()); + scatterPointQuery.addOrder(DatastoreHelper.makeOrder( + DatastoreHelper.SCATTER_PROPERTY_NAME, Direction.ASCENDING)); + scatterPointQuery.setLimit(numSplits * KEYS_PER_SPLIT - 1); + scatterPointQuery.addProjection(PropertyExpression.newBuilder().setProperty( + PropertyReference.newBuilder().setName("__key__"))); + return scatterPointQuery; + } + + /** + * Given a list of keys and a number of splits find the keys to split on. + * @param keys the list of keys. + * @param numSplits the number of splits. + */ + private Iterable getSplitKey(List keys, int numSplits) { + // If the number of keys is less than the number of splits, we are limited in the number of + // splits we can make. + if (keys.size() < numSplits - 1) { + return keys; + } + + // Calculate the number of keys per split. This should be {@link KEYS_PER_SPLIT}, but may + // be less if there are not KEYS_PER_SPLIT * numSplits scatter properties. + double numKeysPerSplit = Math.max(1.0, (keys.size() + 1) / numSplits); + + List keysList = new ArrayList(numSplits - 1); + // Grab the last sample for each split, otherwise the first split will be too small. + for (int i = 1; i < numSplits; i++) { + int splitIndex = ((int) (i * numKeysPerSplit)) - 1; + keysList.add(keys.get(splitIndex)); + } + + return keysList; + } + +} From 45831c286a3609e18868e1d23f9503f723a03d41 Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Tue, 24 Sep 2013 15:17:26 -0700 Subject: [PATCH 0003/1784] v1beta2-rev1-2.0.0 ------------------ - API changes: - `BlindWrite` method merged into `Commit`. - Added `list_value` to `Value` and changed `value` to a non-repeated field in `Property`. - In JSON API, string constants are now uppercase and underscore-separated instead of camel-cased (e.g. `LESS_THAN_OR_EQUAL` instead of `lessThanOrEqual`). - GQL changes: - New synthetic literals: `BLOB`, `BLOBKEY`, `DATETIME`, `KEY`. - Support for `IS NULL`. - Fixed partition ID handling for binding arguments. - Documentation changes: - All documentation has been updated to the v1beta2 API. - Getting started guide for Node.js now uses v0.4.5 of google-api-nodejs-client. - Fixed partition ID handling for query requests that include an explicit partition ID. - Fixed scopes in discovery document. - https://github.com/GoogleCloudPlatform/google-cloud-datastore/issues/9 - Fixed an issue where command line tool didn't work for some locales. - https://github.com/GoogleCloudPlatform/google-cloud-datastore/issues/12 --- .../services/datastore/client/Datastore.java | 10 - .../datastore/client/DatastoreException.java | 18 +- .../datastore/client/DatastoreFactory.java | 2 +- .../datastore/client/DatastoreHelper.java | 201 ++++++++++++------ .../datastore/client/QuerySplitter.java | 6 +- .../datastore/client/QuerySplitterImpl.java | 101 +++++---- 6 files changed, 219 insertions(+), 119 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java index f3b0a31078fb..6765609f36c7 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java @@ -20,8 +20,6 @@ import com.google.api.services.datastore.DatastoreV1.AllocateIdsResponse; import com.google.api.services.datastore.DatastoreV1.BeginTransactionRequest; import com.google.api.services.datastore.DatastoreV1.BeginTransactionResponse; -import com.google.api.services.datastore.DatastoreV1.BlindWriteRequest; -import com.google.api.services.datastore.DatastoreV1.BlindWriteResponse; import com.google.api.services.datastore.DatastoreV1.CommitRequest; import com.google.api.services.datastore.DatastoreV1.CommitResponse; import com.google.api.services.datastore.DatastoreV1.LookupRequest; @@ -113,12 +111,4 @@ public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreExcept throw invalidResponseException("runQuery", exception); } } - - public BlindWriteResponse blindWrite(BlindWriteRequest request) throws DatastoreException { - try { - return BlindWriteResponse.parseFrom(remoteRpc.call("blindWrite", request)); - } catch (IOException exception) { - throw invalidResponseException("blindWrite", exception); - } - } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java index 54f144474b9f..09c4cac4b51f 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java @@ -20,8 +20,22 @@ * */ public class DatastoreException extends Exception { - public final String methodName; - public final int code; + private final String methodName; + private final int code; + + /** + * @return the HTTP response code + */ + public int getCode() { + return code; + } + + /** + * @return the datastore method name + */ + public String getMethodName() { + return methodName; + } public DatastoreException(String methodName, int code, String message, Throwable cause) { super(message, cause); diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java index a8d0492beeaf..2325546902c0 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java @@ -39,7 +39,7 @@ public class DatastoreFactory { /** Singleton factory instance. */ private static final DatastoreFactory INSTANCE = new DatastoreFactory(); - private static final String VERSION = "v1beta1"; + private static final String VERSION = "v1beta2"; // Lazy load this because we might be running inside App Engine and this // class isn't on the whitelist. diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java index 65ddb3c4514d..b099b11f6af9 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java @@ -39,7 +39,6 @@ import java.io.File; import java.io.IOException; import java.security.GeneralSecurityException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; @@ -238,8 +237,8 @@ public static Filter.Builder makeFilter(String property, PropertyFilter.Operator * * Uses AND to combine filters. */ - public static Filter.Builder makeFilter(Filter ...subfilters) { - return makeCompositeFilter(Arrays.asList(subfilters)); + public static Filter.Builder makeFilter(Filter... subfilters) { + return makeFilter(Arrays.asList(subfilters)); } /** @@ -247,7 +246,7 @@ public static Filter.Builder makeFilter(Filter ...subfilters) { * * Uses AND to combine filters. */ - public static Filter.Builder makeCompositeFilter(Iterable subfilters) { + public static Filter.Builder makeFilter(Iterable subfilters) { return Filter.newBuilder() .setCompositeFilter(CompositeFilter.newBuilder() .addAllFilter(subfilters) @@ -258,7 +257,7 @@ public static Filter.Builder makeCompositeFilter(Iterable subfilters) { * Make an entity property with the specified value. */ public static Property.Builder makeProperty(String name, Value value) { - return Property.newBuilder().setName(name).addValue(value); + return Property.newBuilder().setName(name).setValue(value); } /** @@ -269,35 +268,35 @@ public static Property.Builder makeProperty(String name, Value.Builder value) { } /** - * Make an entity property with the specified values. + * Make a property reference for use in a query. */ - public static Property.Builder makeProperty(String name, Iterable values) { - return Property.newBuilder().setName(name).setMulti(true).addAllValue(values); + public static PropertyReference.Builder makePropertyReference(String propertyName) { + return PropertyReference.newBuilder().setName(propertyName); } /** - * Make an entity property with the specified values. + * Make an entity value with the specified list values. */ - public static Property.Builder makeProperty(String name, Value ...values) { - return makeProperty(name, Arrays.asList(values)); + public static Value.Builder makeValue(Iterable listValues) { + return Value.newBuilder().addAllListValue(listValues); } /** - * Make an entity property with the specified values. + * Make an entity value with the specified list values. */ - public static Property.Builder makeProperty(String name, Value.Builder ...builders) { - Property.Builder prop = makeProperty(name, Collections.emptyList()); - for (Value.Builder builder : builders) { - prop.addValue(builder); - } - return prop; + public static Value.Builder makeValue(Value... values) { + return makeValue(Arrays.asList(values)); } /** - * Make a property reference for use in a query. + * Make an entity value with the specified list values. */ - public static PropertyReference.Builder makePropertyReference(String propertyName) { - return PropertyReference.newBuilder().setName(propertyName); + public static Value.Builder makeValue(Value.Builder... builders) { + Value.Builder value = Value.newBuilder(); + for (Value.Builder builder : builders) { + value.addListValue(builder); + } + return value; } /** @@ -419,64 +418,140 @@ public static Key.Builder makeKey(Object... elements) { } /** - * Return a map of property name to java object. - * - * Looses microseconds on timestamp values, meaning and indexing information. - * - * @param entity the entity to search for the property. - * @return The property value, or null if it's not found. + * @return a map of property name to value */ - public static Map getPropertyMap(EntityOrBuilder entity) { - Map result = new HashMap(); + public static Map getPropertyMap(EntityOrBuilder entity) { + Map result = new HashMap(); for (PropertyOrBuilder property : entity.getPropertyList()) { - Object value; - if (property.getMulti()) { - List values = new ArrayList(property.getValueCount()); - for (ValueOrBuilder subValue : property.getValueList()) { - values.add(getValue(subValue)); - } - value = values; - } else { - value = getValue(property.getValue(0)); - } - result.put(property.getName(), value); + result.put(property.getName(), property.getValue()); } return Collections.unmodifiableMap(result); } /** - * Convert a Value to a Java Object. Ignores meaning. - * - * Looses microseconds on timestamp values, meaning and indexing information. + * @return the double contained in value + * @throws IllegalArgumentException if the value does not contain a double. */ - public static Object getValue(ValueOrBuilder value) { - if (value.hasBooleanValue()) { - return value.getBooleanValue(); + public static double getDouble(ValueOrBuilder value) { + if (!value.hasDoubleValue()) { + throw new IllegalArgumentException("Value does not contain a double."); } - if (value.hasIntegerValue()) { - return value.getIntegerValue(); + return value.getDoubleValue(); + } + + /** + * @return the key contained in value + * @throws IllegalArgumentException if the value does not contain a key. + */ + public static Key getKey(ValueOrBuilder value) { + if (!value.hasKeyValue()) { + throw new IllegalArgumentException("Value does not contain a key."); + } + return value.getKeyValue(); + } + + /** + * @return the blob contained in value + * @throws IllegalArgumentException if the value does not contain a blob. + */ + public static ByteString getByteString(ValueOrBuilder value) { + if (value.getMeaning() == 18 && value.hasStringValue()) { + return value.getStringValueBytes(); + } else if (value.hasBlobValue()) { + return value.getBlobValue(); } - if (value.hasDoubleValue()) { - return value.getDoubleValue(); + throw new IllegalArgumentException("Value does not contain a bob."); + } + + /** + * @return the blob key contained in value + * @throws IllegalArgumentException if the value does not contain a blob key. + */ + public static String getBlobKey(ValueOrBuilder value) { + if (value.getMeaning() == 18 && value.hasStringValue()) { + return value.getStringValue(); + } else if (value.hasBlobKeyValue()) { + return value.getBlobKeyValue(); } - if (value.hasTimestampMicrosecondsValue()) { - return new Date(value.getTimestampMicrosecondsValue() / 1000L); + throw new IllegalArgumentException("Value does not contain a bob key."); + } + + /** + * @return the entity contained in value + * @throws IllegalArgumentException if the value does not contain an entity. + */ + public static Entity getEntity(ValueOrBuilder value) { + if (!value.hasEntityValue()) { + throw new IllegalArgumentException("Value does not contain an Entity."); } - if (value.hasKeyValue()) { - return value.getKeyValue(); + return value.getEntityValue(); + } + + /** + * @return the string contained in value + * @throws IllegalArgumentException if the value does not contain a string. + */ + public static String getString(ValueOrBuilder value) { + if (!value.hasStringValue()) { + throw new IllegalArgumentException("Value does not contain a string."); } - if (value.hasBlobKeyValue()) { - return value; // Returning value directly to avoid loosing type info. + return value.getStringValue(); + } + + /** + * @return the boolean contained in value + * @throws IllegalArgumentException if the value does not contain a boolean. + */ + public static boolean getBoolean(ValueOrBuilder value) { + if (!value.hasBooleanValue()) { + throw new IllegalArgumentException("Value does not contain a boolean."); } - if (value.hasStringValue()) { - return value.getStringValue(); + return value.getBooleanValue(); + } + + /** + * @return the long contained in value + * @throws IllegalArgumentException if the value does not contain a long. + */ + public static long getLong(ValueOrBuilder value) { + if (!value.hasIntegerValue()) { + throw new IllegalArgumentException("Value does not contain an integer."); } - if (value.hasBlobValue()) { - return value.getBlobValue(); + return value.getIntegerValue(); + } + + /** + * @return the timestamp in microseconds contained in value + * @throws IllegalArgumentException if the value does not contain a timestamp. + */ + public static long getTimestamp(ValueOrBuilder value) { + if (value.getMeaning() == 18 && value.hasIntegerValue()) { + return value.getIntegerValue(); + } else if (value.hasTimestampMicrosecondsValue()) { + return value.getTimestampMicrosecondsValue(); } - if (value.hasEntityValue()) { - return value.getEntityValue(); + throw new IllegalArgumentException("Value does not contain a timestamp."); + } + + /** + * @return the list contained in value + * @throws IllegalArgumentException if the value does not contain a list. + */ + public static List getList(ValueOrBuilder value) { + if (value.getListValueCount() == 0) { + throw new IllegalArgumentException("Value does not contain a list."); } - return null; + return value.getListValueList(); + } + + /** + * Convert a timestamp value into a {@link Date} clipping off the microseconds. + * + * @param value a timestamp value to convert + * @return the resulting {@link Date} + * @throws IllegalArgumentException if the value does not contain a timestamp. + */ + public static Date toDate(ValueOrBuilder value) { + return new Date(getTimestamp(value) / 1000); } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java index f9b750b95f1e..a2228b9c4e31 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java @@ -28,8 +28,10 @@ public interface QuerySplitter { /** * Returns a list of sharded {@link Query}s for the given query. * - * This will create up to the desired number of splits, however it may return less splits if - * the desired number of splits is unavailable. + *

This will create up to the desired number of splits, however it may return less splits if + * the desired number of splits is unavailable. This will happen if the number of split points + * provided by the underlying Datastore is less than the desired number, which will occur if the + * number of results for the query is too small. * * @param query the query to split. * @param numSplits the desired number of splits. diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java index f36b5e67eee6..290965504c1a 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java @@ -15,6 +15,8 @@ */ package com.google.api.services.datastore.client; +import static com.google.api.services.datastore.client.DatastoreHelper.makeFilter; + import com.google.api.services.datastore.DatastoreV1.EntityResult; import com.google.api.services.datastore.DatastoreV1.Filter; import com.google.api.services.datastore.DatastoreV1.Key; @@ -30,12 +32,14 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.EnumSet; import java.util.List; /** - * An implementation of {@link QuerySplitter} for the Datastore. + * Provides the ability to split a query into multiple shards using Cloud Datastore. * - * Runs a query on the scatter property to get a random sampling of entities. + *

This implementation of the QuerySplitter uses the __scatter__ property to gather + * random split points for a query. * **/ final class QuerySplitterImpl implements QuerySplitter { @@ -43,15 +47,15 @@ final class QuerySplitterImpl implements QuerySplitter { /** The number of keys to sample for each split. **/ private static final int KEYS_PER_SPLIT = 32; + private static final EnumSet UNSUPPORTED_OPERATORS = EnumSet.of(Operator.LESS_THAN, + Operator.LESS_THAN_OR_EQUAL, Operator.GREATER_THAN, Operator.GREATER_THAN_OR_EQUAL); + static final QuerySplitter INSTANCE = new QuerySplitterImpl(); - QuerySplitterImpl() { + private QuerySplitterImpl() { // No initialization required. } - /** - * @see QuerySplitter#getSplits - */ @Override public List getSplits(Query query, int numSplits, Datastore datastore) throws DatastoreException, IllegalArgumentException { @@ -59,7 +63,7 @@ public List getSplits(Query query, int numSplits, Datastore datastore) validateQuery(query); validateSplitSize(numSplits); - List splits = new ArrayList(); + List splits = new ArrayList(numSplits); List scatterKeys = getScatterKeys(numSplits, query, datastore); Key lastKey = null; for (Key nextKey : getSplitKey(scatterKeys, numSplits)) { @@ -70,16 +74,6 @@ public List getSplits(Query query, int numSplits, Datastore datastore) return splits; } - /** - * Helper to determine if a filter operator is an inequality. - */ - private boolean isInequality(Operator operator) { - return operator == Operator.LESS_THAN || - operator == Operator.LESS_THAN_OR_EQUAL || - operator == Operator.GREATER_THAN || - operator == Operator.GREATER_THAN_OR_EQUAL; - } - /** * Verify that the given number of splits is not out of bounds. * @param numSplits the number of splits. @@ -92,9 +86,9 @@ private void validateSplitSize(int numSplits) throws IllegalArgumentException { } /** - * Validate that we only have allowable filters. + * Validates that we only have allowable filters. * - * Note that equality and ancestor filters are allowed, however they may result in + *

Note that equality and ancestor filters are allowed, however they may result in * inefficient sharding. */ private void validateFilter(Filter filter) throws IllegalArgumentException { @@ -103,15 +97,14 @@ private void validateFilter(Filter filter) throws IllegalArgumentException { validateFilter(subFilter); } } else if (filter.hasPropertyFilter()) { - if (isInequality(filter.getPropertyFilter().getOperator())) { - throw new IllegalArgumentException("Query cannot have an inequality filter.", - new IllegalArgumentException()); + if (UNSUPPORTED_OPERATORS.contains(filter.getPropertyFilter().getOperator())) { + throw new IllegalArgumentException("Query cannot have any inequality filters."); } } } /** - * Verify that the given query can be properly scattered. + * Verifies that the given query can be properly scattered. * * @param query the query to verify * @throws IllegalArgumentException if the query is invalid. @@ -121,7 +114,7 @@ private void validateQuery(Query query) throws IllegalArgumentException { throw new IllegalArgumentException("Query must have exactly one kind."); } if (query.getOrderCount() != 0) { - throw new IllegalArgumentException("Query cannot have a sort order."); + throw new IllegalArgumentException("Query cannot have any sort orders."); } if (query.hasFilter()) { validateFilter(query.getFilter()); @@ -141,21 +134,26 @@ private Query createSplit(Key lastKey, Key nextKey, Query query) { keyFilters.add(query.getFilter()); } if (lastKey != null) { - keyFilters.add(DatastoreHelper.makeFilter( - DatastoreHelper.KEY_PROPERTY_NAME, PropertyFilter.Operator.GREATER_THAN_OR_EQUAL, - DatastoreHelper.makeValue(lastKey)).build()); + Filter lowerBound = DatastoreHelper.makeFilter(DatastoreHelper.KEY_PROPERTY_NAME, + PropertyFilter.Operator.GREATER_THAN_OR_EQUAL, + DatastoreHelper.makeValue(lastKey)).build(); + keyFilters.add(lowerBound); } if (nextKey != null) { - keyFilters.add(DatastoreHelper.makeFilter( - DatastoreHelper.KEY_PROPERTY_NAME, PropertyFilter.Operator.LESS_THAN, - DatastoreHelper.makeValue(nextKey)).build()); + Filter upperBound = DatastoreHelper.makeFilter(DatastoreHelper.KEY_PROPERTY_NAME, + PropertyFilter.Operator.LESS_THAN, + DatastoreHelper.makeValue(nextKey)).build(); + keyFilters.add(upperBound); } - return Query.newBuilder(query).setFilter( - DatastoreHelper.makeCompositeFilter(keyFilters)).build(); + return Query.newBuilder(query).setFilter(makeFilter(keyFilters)).build(); } /** - * Given a number of desired splits gets a list of scatter keys with multiples at each split. + * Gets a list of split keys given a desired number of splits. + * + *

This list will contain multiple split keys for each split. Only a single split key + * will be chosen as the split point, however providing multiple keys allows for more uniform + * sharding. * * @param numSplits the number of desired splits. * @param query the user query. @@ -168,16 +166,17 @@ private List getScatterKeys(int numSplits, Query query, Datastore datastore List keySplits = new ArrayList(); - QueryResultBatch batch = null; + QueryResultBatch batch; do { - batch = datastore.runQuery(RunQueryRequest.newBuilder().setQuery(query).build()).getBatch(); + RunQueryRequest scatterRequest = RunQueryRequest.newBuilder() + .setQuery(scatterPointQuery).build(); + batch = datastore.runQuery(scatterRequest).getBatch(); for (EntityResult result : batch.getEntityResultList()) { keySplits.add(result.getEntity().getKey()); } scatterPointQuery.setStartCursor(batch.getEndCursor()); scatterPointQuery.setLimit(scatterPointQuery.getLimit() - batch.getEntityResultCount()); } while (batch.getMoreResults() == MoreResultsType.NOT_FINISHED); - Collections.sort(keySplits, DatastoreHelper.getKeyComparator()); return keySplits; } @@ -197,7 +196,12 @@ private Query.Builder createScatterQuery(Query query, int numSplits) { scatterPointQuery.addAllKind(query.getKindList()); scatterPointQuery.addOrder(DatastoreHelper.makeOrder( DatastoreHelper.SCATTER_PROPERTY_NAME, Direction.ASCENDING)); - scatterPointQuery.setLimit(numSplits * KEYS_PER_SPLIT - 1); + // There is a split containing entities before and after each scatter entity: + // ||---*------*------*------*------*------*------*---|| = scatter entity + // If we represent each split as a region before a scatter entity, there is an extra region + // following the last scatter point. Thus, we do not need the scatter entities for the last + // region. + scatterPointQuery.setLimit((numSplits - 1) * KEYS_PER_SPLIT); scatterPointQuery.addProjection(PropertyExpression.newBuilder().setProperty( PropertyReference.newBuilder().setName("__key__"))); return scatterPointQuery; @@ -205,6 +209,7 @@ private Query.Builder createScatterQuery(Query query, int numSplits) { /** * Given a list of keys and a number of splits find the keys to split on. + * * @param keys the list of keys. * @param numSplits the number of splits. */ @@ -215,14 +220,28 @@ private Iterable getSplitKey(List keys, int numSplits) { return keys; } - // Calculate the number of keys per split. This should be {@link KEYS_PER_SPLIT}, but may - // be less if there are not KEYS_PER_SPLIT * numSplits scatter properties. - double numKeysPerSplit = Math.max(1.0, (keys.size() + 1) / numSplits); + // Calculate the number of keys per split. This should be KEYS_PER_SPLIT, but may + // be less if there are not KEYS_PER_SPLIT * (numSplits - 1) scatter entities. + // + // Consider the following dataset, where - represents an entity and * represents an entity + // that is returned as a scatter entity: + // ||---*-----*----*-----*-----*------*----*----|| + // If we want 4 splits in this data, the optimal split would look like: + // ||---*-----*----*-----*-----*------*----*----|| + // | | | + // The scatter keys in the last region are not useful to us, so we never request them: + // ||---*-----*----*-----*-----*------*---------|| + // | | | + // With 6 scatter keys we want to set scatter points at indexes: 1, 3, 5. + // + // We keep this as a double so that any "fractional" keys per split get distributed throughout + // the splits and don't make the last split significantly larger than the rest. + double numKeysPerSplit = Math.max(1.0, ((double) keys.size()) / (numSplits - 1)); List keysList = new ArrayList(numSplits - 1); // Grab the last sample for each split, otherwise the first split will be too small. for (int i = 1; i < numSplits; i++) { - int splitIndex = ((int) (i * numKeysPerSplit)) - 1; + int splitIndex = (int) Math.round(i * numKeysPerSplit) - 1; keysList.add(keys.get(splitIndex)); } From 4c28630668dca7b6145dfc0ac3d131c256966a49 Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Wed, 2 Oct 2013 16:50:25 -0700 Subject: [PATCH 0004/1784] python: fix #23 java: add http initializer proto: better comments --- .../datastore/client/DatastoreFactory.java | 2 +- .../datastore/client/DatastoreOptions.java | 24 ++++++++++++++++--- .../services/datastore/client/RemoteRpc.java | 17 +++++++++---- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java index 2325546902c0..18a232e3f4e7 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java @@ -72,7 +72,7 @@ RemoteRpc newRemoteRpc(DatastoreOptions options) { throw new IllegalArgumentException("options not set"); } HttpRequestFactory client = makeClient(options); - return new RemoteRpc(client, + return new RemoteRpc(client, options.getInitializer(), buildUrl(options, System.getenv("DATASTORE_URL_INTERNAL_OVERRIDE"))); } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java index dc6bf1db38a7..f20b096ccbf3 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java @@ -16,6 +16,7 @@ package com.google.api.services.datastore.client; import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.HttpRequestInitializer; import java.util.Arrays; import java.util.List; @@ -42,14 +43,18 @@ public class DatastoreOptions { private final String host; private static final String DEFAULT_HOST = "https://www.googleapis.com"; + private final HttpRequestInitializer initializer; + private final Credential credential; public static final List SCOPES = Arrays.asList( "https://www.googleapis.com/auth/datastore", "https://www.googleapis.com/auth/userinfo.email"); - DatastoreOptions(String dataset, String host, Credential credential) { + DatastoreOptions(String dataset, String host, HttpRequestInitializer initializer, + Credential credential) { this.dataset = dataset; this.host = host != null ? host : DEFAULT_HOST; + this.initializer = initializer; this.credential = credential; } @@ -59,6 +64,7 @@ public class DatastoreOptions { public static class Builder { private String dataset; private String host; + private HttpRequestInitializer initializer; private Credential credential; public Builder() { } @@ -66,11 +72,12 @@ public Builder() { } public Builder(DatastoreOptions options) { this.dataset = options.dataset; this.host = options.host; + this.initializer = options.initializer; this.credential = options.credential; } public DatastoreOptions build() { - return new DatastoreOptions(dataset, host, credential); + return new DatastoreOptions(dataset, host, initializer, credential); } /** @@ -89,6 +96,14 @@ public Builder host(String newHost) { return this; } + /** + * Sets the (optional) initializer to run on HTTP requests to the API. + */ + public Builder initializer(HttpRequestInitializer newInitializer) { + initializer = newInitializer; + return this; + } + /** * Sets the Google APIs credentials used to access the API. */ @@ -108,8 +123,11 @@ public String getHost() { return host; } + public HttpRequestInitializer getInitializer() { + return initializer; + } + public Credential getCredential() { return credential; } - } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java index 60f30395faa2..edc5894b4e92 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java @@ -16,12 +16,13 @@ package com.google.api.services.datastore.client; import com.google.api.client.http.GenericUrl; +import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpResponse; import com.google.api.client.http.HttpResponseException; import com.google.api.client.http.HttpStatusCodes; import com.google.api.client.http.protobuf.ProtoHttpContent; - import com.google.protobuf.MessageLite; import java.io.IOException; @@ -35,12 +36,14 @@ class RemoteRpc { private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName()); - private HttpRequestFactory client; - private String url; + private final HttpRequestFactory client; + private final HttpRequestInitializer initializer; + private final String url; private int rpcCount = 0; - RemoteRpc(HttpRequestFactory client, String url) { + RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) { this.client = client; + this.initializer = initializer; this.url = url; try { resolveURL("dummyRpc"); @@ -67,7 +70,11 @@ InputStream call(String methodName, MessageLite request) throws DatastoreExcepti try { rpcCount++; ProtoHttpContent payload = new ProtoHttpContent(request); - httpResponse = client.buildPostRequest(resolveURL(methodName), payload).execute(); + HttpRequest httpRequest = client.buildPostRequest(resolveURL(methodName), payload); + if (initializer != null) { + initializer.initialize(httpRequest); + } + httpResponse = httpRequest.execute(); return httpResponse.getContent(); } catch (HttpResponseException e) { throw makeException(url, methodName, e.getStatusCode(), e.getContent(), e); From 118b49dce984c4993b9cc874db47a904442b1dc3 Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Mon, 16 Dec 2013 11:14:46 -0800 Subject: [PATCH 0005/1784] v1beta2-rev1-2.1.0 --- .../api/services/datastore/client/DatastoreFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java index 18a232e3f4e7..26d0a6a9e1ff 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java @@ -39,7 +39,9 @@ public class DatastoreFactory { /** Singleton factory instance. */ private static final DatastoreFactory INSTANCE = new DatastoreFactory(); - private static final String VERSION = "v1beta2"; + + /** API version. */ + public static final String VERSION = "v1beta2"; // Lazy load this because we might be running inside App Engine and this // class isn't on the whitelist. From 084830c09e807ea08ea924dfa1ad41bb9dcfe710 Mon Sep 17 00:00:00 2001 From: Arie Date: Tue, 17 Feb 2015 09:26:49 -0800 Subject: [PATCH 0006/1784] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000000..4eedc0116add --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. From 49a43b9655712806c0c58b27be91adb4c996c9cc Mon Sep 17 00:00:00 2001 From: bmenasha Date: Tue, 5 May 2015 10:53:07 -0400 Subject: [PATCH 0007/1784] changed class usage in comment to match code In the class comment, the example code was invoking the wrong methods: datastore.stopDatastore() is named datastore.stop() datastore.clearDatastore() is named datastore.clear() --- .../services/datastore/client/LocalDevelopmentDatastore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java index 5b92cfc176a7..3a65df8eb100 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java @@ -56,12 +56,12 @@ * * {@literal @}Before * public void setUp() throws LocalDevelopmentDatastoreException { - * datastore.clearDatastore(); + * datastore.clear(); * } * * {@literal @}AfterClass * public static void stopLocalDatastore() throws LocalDevelopmentDatastoreException { - * datastore.stopDatastore(); + * datastore.stop(); * } * * {@literal @}Test From f4f606f0b119cd41d3639c3414b59c28e5942262 Mon Sep 17 00:00:00 2001 From: Steven Kim Date: Tue, 26 May 2015 16:11:08 -0400 Subject: [PATCH 0008/1784] Corrects error message on exceptions --- .../google/api/services/datastore/client/DatastoreHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java index b099b11f6af9..0035b5c10985 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java @@ -460,7 +460,7 @@ public static ByteString getByteString(ValueOrBuilder value) { } else if (value.hasBlobValue()) { return value.getBlobValue(); } - throw new IllegalArgumentException("Value does not contain a bob."); + throw new IllegalArgumentException("Value does not contain a blob."); } /** @@ -473,7 +473,7 @@ public static String getBlobKey(ValueOrBuilder value) { } else if (value.hasBlobKeyValue()) { return value.getBlobKeyValue(); } - throw new IllegalArgumentException("Value does not contain a bob key."); + throw new IllegalArgumentException("Value does not contain a blob key."); } /** From 229dc4c62cfab33fddfacff00aca3a3fea4b0071 Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Mon, 31 Aug 2015 13:50:43 -0700 Subject: [PATCH 0009/1784] v1beta2-rev1-3.0.0 --- .../client/BaseDatastoreFactory.java | 113 ++++++++++++++++++ .../datastore/client/DatastoreFactory.java | 79 +----------- .../datastore/client/DatastoreHelper.java | 78 +++++++++--- .../datastore/client/DatastoreOptions.java | 41 +++++-- .../client/LocalDevelopmentDatastore.java | 104 ++++++++++++---- .../LocalDevelopmentDatastoreFactory.java | 8 +- .../LocalDevelopmentDatastoreOptions.java | 53 ++++++++ .../datastore/client/QuerySplitter.java | 23 +++- .../datastore/client/QuerySplitterImpl.java | 21 +++- .../services/datastore/client/RemoteRpc.java | 15 +-- 10 files changed, 399 insertions(+), 136 deletions(-) create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/BaseDatastoreFactory.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreOptions.java diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/BaseDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/BaseDatastoreFactory.java new file mode 100644 index 000000000000..e71d87794ff4 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/BaseDatastoreFactory.java @@ -0,0 +1,113 @@ +/* + * Copyright 2013 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.HttpRequestInitializer; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.javanet.NetHttpTransport; + +import java.util.Arrays; +import java.util.logging.ConsoleHandler; +import java.util.logging.Formatter; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; +import java.util.logging.StreamHandler; + +/** + * Client factory for {@link Datastore}. + * + */ +abstract class BaseDatastoreFactory { + + // Non-javadoc. + // This class allows RemoteRpc to be used by factory implementations defined + // outside of this package. + public static class RemoteRpc + extends com.google.api.services.datastore.client.RemoteRpc { + public RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) { + super(client, initializer, url); + } + } + + private static final Logger logger = Logger.getLogger(BaseDatastoreFactory.class.getName()); + + // Lazy load this because we might be running inside App Engine and this + // class isn't on the whitelist. + private static ConsoleHandler methodHandler; + + protected abstract String buildUrl(DatastoreOptions options, String overrideUrl); + public abstract T create(DatastoreOptions options) throws IllegalArgumentException; + + // TODO(user): Support something other than console handler for when we're + // running in App Engine + private static synchronized StreamHandler getStreamHandler() { + if (methodHandler == null) { + methodHandler = new ConsoleHandler(); + methodHandler.setFormatter(new Formatter() { + @Override + public String format(LogRecord record) { + return record.getMessage() + "\n"; + } + }); + methodHandler.setLevel(Level.FINE); + } + return methodHandler; + } + + protected BaseDatastoreFactory() { } + + protected RemoteRpc + newRemoteRpc(DatastoreOptions options) { + return newRemoteRpc(options, System.getenv("DATASTORE_URL_INTERNAL_OVERRIDE")); + } + + protected RemoteRpc newRemoteRpc(DatastoreOptions options, String urlOverride) { + if (options == null) { + throw new IllegalArgumentException("options not set"); + } + HttpRequestFactory client = makeClient(options); + return new RemoteRpc(client, options.getInitializer(), buildUrl(options, urlOverride)); + } + + /** + * Constructs a Google APIs HTTP client with the associated credentials. + */ + public HttpRequestFactory makeClient(DatastoreOptions options) { + Credential credential = options.getCredential(); + if (credential == null) { + logger.warning("Not using any credentials"); + } + HttpTransport transport = options.getTransport(); + if (transport == null) { + transport = credential == null ? new NetHttpTransport() : credential.getTransport(); + } + return transport.createRequestFactory(credential); + } + + /** + * Starts logging datastore method calls to the console. (Useful within tests.) + */ + public static void logMethodCalls() { + Logger logger = Logger.getLogger(Datastore.class.getName()); + logger.setLevel(Level.FINE); + if (!Arrays.asList(logger.getHandlers()).contains(getStreamHandler())) { + logger.addHandler(getStreamHandler()); + } + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java index 26d0a6a9e1ff..cfd9d84c8eae 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java @@ -15,69 +15,24 @@ */ package com.google.api.services.datastore.client; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import java.net.URI; import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.logging.ConsoleHandler; -import java.util.logging.Formatter; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; -import java.util.logging.StreamHandler; /** * Client factory for {@link Datastore}. * */ -public class DatastoreFactory { - private static final Logger logger = Logger.getLogger(DatastoreFactory.class.getName()); - +public class DatastoreFactory extends BaseDatastoreFactory{ /** Singleton factory instance. */ private static final DatastoreFactory INSTANCE = new DatastoreFactory(); - + /** API version. */ public static final String VERSION = "v1beta2"; - // Lazy load this because we might be running inside App Engine and this - // class isn't on the whitelist. - private static ConsoleHandler methodHandler; - public static DatastoreFactory get() { return INSTANCE; } - // TODO(user): Support something other than console handler for when we're - // running in App Engine - private static synchronized StreamHandler getStreamHandler() { - if (methodHandler == null) { - methodHandler = new ConsoleHandler(); - methodHandler.setFormatter(new Formatter() { - @Override - public String format(LogRecord record) { - return record.getMessage() + "\n"; - } - }); - methodHandler.setLevel(Level.FINE); - } - return methodHandler; - } - - DatastoreFactory() { } - - RemoteRpc newRemoteRpc(DatastoreOptions options) { - if (options == null) { - throw new IllegalArgumentException("options not set"); - } - HttpRequestFactory client = makeClient(options); - return new RemoteRpc(client, options.getInitializer(), - buildUrl(options, System.getenv("DATASTORE_URL_INTERNAL_OVERRIDE"))); - } - /** * Provides access to a datastore using the provided options. Logs * into the application using the credentials available via these @@ -85,27 +40,16 @@ RemoteRpc newRemoteRpc(DatastoreOptions options) { * * @throws IllegalArgumentException if the server or credentials weren't provided. */ + @Override public Datastore create(DatastoreOptions options) throws IllegalArgumentException { return new Datastore(newRemoteRpc(options)); } - /** - * Constructs a Google APIs HTTP client with the associated credentials. - */ - public HttpRequestFactory makeClient(DatastoreOptions options) { - Credential credential = options.getCredential(); - if (credential == null) { - logger.warning("Not using any credentials"); - return new NetHttpTransport().createRequestFactory(); - } - HttpTransport transport = credential.getTransport(); - return transport.createRequestFactory(credential); - } - /** * Build a valid datastore URL. */ - String buildUrl(DatastoreOptions options, String overrideUrl) { + @Override + protected String buildUrl(DatastoreOptions options, String overrideUrl) { try { if (options.getDataset() == null) { throw new IllegalArgumentException("datastore dataset not set in options"); @@ -122,15 +66,4 @@ String buildUrl(DatastoreOptions options, String overrideUrl) { throw new IllegalArgumentException(e); } } - - /** - * Starts logging datastore method calls to the console. (Useful within tests.) - */ - public static void logMethodCalls() { - Logger logger = Logger.getLogger(Datastore.class.getName()); - logger.setLevel(Level.FINE); - if (!Arrays.asList(logger.getHandlers()).contains(getStreamHandler())) { - logger.addHandler(getStreamHandler()); - } - } -} +} \ No newline at end of file diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java index 0035b5c10985..9724ea3fb477 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java @@ -39,7 +39,9 @@ import java.io.File; import java.io.IOException; import java.security.GeneralSecurityException; +import java.security.PrivateKey; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.Date; @@ -53,7 +55,7 @@ * Helper methods for {@link Datastore}. * */ -public class DatastoreHelper { +public final class DatastoreHelper { private static final Logger logger = Logger.getLogger(DatastoreHelper.class.getName()); /** The property used in the Datastore to give us a random distribution. **/ @@ -139,53 +141,93 @@ public static Credential getComputeEngineCredential() */ public static Credential getServiceAccountCredential(String account, String privateKeyFile) throws GeneralSecurityException, IOException { + return getServiceAccountCredential(account, privateKeyFile, DatastoreOptions.SCOPES); + } + + /** + * Constructs credentials for the given account and key file. + * + * @param account the account to use. + * @param privateKeyFile the file name from which to get the private key. + * @param serviceAccountScopes Collection of OAuth scopes to use with the the service + * account flow or {@code null} if not. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential(String account, String privateKeyFile, + Collection serviceAccountScopes) throws GeneralSecurityException, IOException { + return getCredentialBuilderWithoutPrivateKey(account, serviceAccountScopes) + .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile)) + .build(); + } + + /** + * Constructs credentials for the given account and key. + * + * @param account the account to use. + * @param privateKey the private key for the given account. + * @param serviceAccountScopes Collection of OAuth scopes to use with the the service + * account flow or {@code null} if not. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential(String account, PrivateKey privateKey, + Collection serviceAccountScopes) throws GeneralSecurityException, IOException { + return getCredentialBuilderWithoutPrivateKey(account, serviceAccountScopes) + .setServiceAccountPrivateKey(privateKey) + .build(); + } + + private static GoogleCredential.Builder getCredentialBuilderWithoutPrivateKey( + String account, Collection scopes) throws GeneralSecurityException, IOException { NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport(); JacksonFactory jsonFactory = new JacksonFactory(); return new GoogleCredential.Builder() .setTransport(transport) .setJsonFactory(jsonFactory) .setServiceAccountId(account) - .setServiceAccountScopes(DatastoreOptions.SCOPES) - .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile)) - .build(); + .setServiceAccountScopes(scopes); } /** - * Uses the following enviorment variables to construct a {@link Datastore}: + * Uses the following environment variables to construct a {@link Datastore}: * DATASTORE_DATASET - the datastore dataset id * DATASTORE_HOST - the host to use to access the datastore - * e.g: https://www.googleapis.com/datastore/v1/datasets/{dataset} + * e.g: https://www.googleapis.com * DATASTORE_SERVICE_ACCOUNT - (optional) service account name * DATASTORE_PRIVATE_KEY_FILE - (optional) service account private key file * * Preference of credentials is: - * - ComputeEngine * - Service Account (specified by DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE) + * - ComputeEngine * - no-credentials (for local development environment) */ - public static DatastoreOptions.Builder getOptionsfromEnv() + public static DatastoreOptions.Builder getOptionsFromEnv() throws GeneralSecurityException, IOException { DatastoreOptions.Builder options = new DatastoreOptions.Builder(); options.dataset(System.getenv("DATASTORE_DATASET")); options.host(System.getenv("DATASTORE_HOST")); - Credential credential = getComputeEngineCredential(); - if (credential != null) { - logger.info("Using Compute Engine credential."); - } else if (System.getenv("DATASTORE_SERVICE_ACCOUNT") != null && - System.getenv("DATASTORE_PRIVATE_KEY_FILE") != null) { + Credential credential; + if (System.getenv("DATASTORE_SERVICE_ACCOUNT") != null + && System.getenv("DATASTORE_PRIVATE_KEY_FILE") != null) { credential = getServiceAccountCredential(System.getenv("DATASTORE_SERVICE_ACCOUNT"), System.getenv("DATASTORE_PRIVATE_KEY_FILE")); logger.info("Using JWT Service Account credential."); + } else { + credential = getComputeEngineCredential(); + if (credential != null) { + logger.info("Using Compute Engine credential."); + } else { + logger.info("Using no credential."); + } } options.credential(credential); return options; } /** - * @see #getOptionsfromEnv() + * @see #getOptionsFromEnv() */ public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException { - return DatastoreFactory.get().create(getOptionsfromEnv().build()); + return DatastoreFactory.get().create(getOptionsFromEnv().build()); } /** @@ -328,7 +370,7 @@ public static Value.Builder makeValue(double value) { } /** - * Make a floating point value. + * Make a boolean value. */ public static Value.Builder makeValue(boolean value) { return Value.newBuilder().setBooleanValue(value); @@ -342,7 +384,7 @@ public static Value.Builder makeValue(String value) { } /** - * Make a key value. + * Make an entity value. */ public static Value.Builder makeValue(Entity entity) { return Value.newBuilder().setEntityValue(entity); @@ -356,7 +398,7 @@ public static Value.Builder makeValue(Entity.Builder entity) { } /** - * Make a entity value. + * Make a ByteString value. */ public static Value.Builder makeValue(ByteString blob) { return Value.newBuilder().setBlobValue(blob); diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java index f20b096ccbf3..a66f22eb8b54 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java @@ -17,19 +17,21 @@ import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.http.HttpRequestInitializer; +import com.google.api.client.http.HttpTransport; import java.util.Arrays; import java.util.List; /** - * A mutable object containing settings for the datastore. + * An immutable object containing settings for the datastore. * *

Example for connecting to a datastore:

* * 
- * DatastoreOptions options = new DatastoreOptions()
- *     .dataset("my-dataset-id"),
- *     .credential(DatastoreHelper.getGceCredential());
+ * DatastoreOptions options = new DatastoreOptions.Builder()
+ *     .dataset("my-dataset-id")
+ *     .credential(DatastoreHelper.getComputeEngineCredential())
+ *     .build();
  * DatastoreFactory.get().create(options);
  *
* @@ -46,16 +48,17 @@ public class DatastoreOptions { private final HttpRequestInitializer initializer; private final Credential credential; + private final HttpTransport transport; public static final List SCOPES = Arrays.asList( "https://www.googleapis.com/auth/datastore", "https://www.googleapis.com/auth/userinfo.email"); - DatastoreOptions(String dataset, String host, HttpRequestInitializer initializer, - Credential credential) { - this.dataset = dataset; - this.host = host != null ? host : DEFAULT_HOST; - this.initializer = initializer; - this.credential = credential; + DatastoreOptions(Builder b) { + this.dataset = b.dataset; + this.host = b.host != null ? b.host : DEFAULT_HOST; + this.initializer = b.initializer; + this.credential = b.credential; + this.transport = b.transport; } /** @@ -66,6 +69,7 @@ public static class Builder { private String host; private HttpRequestInitializer initializer; private Credential credential; + private HttpTransport transport; public Builder() { } @@ -74,10 +78,11 @@ public Builder(DatastoreOptions options) { this.host = options.host; this.initializer = options.initializer; this.credential = options.credential; + this.transport = options.transport; } public DatastoreOptions build() { - return new DatastoreOptions(dataset, host, initializer, credential); + return new DatastoreOptions(this); } /** @@ -111,6 +116,14 @@ public Builder credential(Credential newCredential) { credential = newCredential; return this; } + + /** + * Sets the transport used to access the API. + */ + public Builder transport(HttpTransport transport) { + this.transport = transport; + return this; + } } // === getters === @@ -130,4 +143,8 @@ public HttpRequestInitializer getInitializer() { public Credential getCredential() { return credential; } -} + + public HttpTransport getTransport() { + return transport; + } +} \ No newline at end of file diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java index 3a65df8eb100..39f81665d33c 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java @@ -15,17 +15,21 @@ */ package com.google.api.services.datastore.client; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpRequestFactory; import com.google.api.client.http.HttpResponse; import com.google.api.client.http.UrlEncodedContent; -import com.google.api.client.util.Preconditions; import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.file.Files; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -51,7 +55,7 @@ * .dataset("myapp") * .build(); * datastore = LocalDevelopmentDatastoreFactory.get().create(opts); - * datastore.start("/usr/local/gcdsdk", "myapp"); + * datastore.start("/usr/local/gcd-sdk", "myapp"); * } * * {@literal @}Before @@ -75,18 +79,23 @@ * */ public class LocalDevelopmentDatastore extends Datastore { - private static final int STARTUP_TIMEOUT_SECS = 5; + private static final int STARTUP_TIMEOUT_SECS = 30; private final String host; + private LocalDevelopmentDatastoreOptions localDevelopmentOptions; /** Internal state lifecycle management. */ enum State {NEW, STARTED, STOPPED} - private State state = State.NEW; + private volatile State state = State.NEW; + + private File datasetDirectory; - LocalDevelopmentDatastore(RemoteRpc rpc, String host) { + LocalDevelopmentDatastore(RemoteRpc rpc, String host, + LocalDevelopmentDatastoreOptions localDevelopmentOptions) { super(rpc); this.host = host; + this.localDevelopmentOptions = localDevelopmentOptions; } /** @@ -125,9 +134,9 @@ public void clear() throws LocalDevelopmentDatastoreException { */ public synchronized void start(String sdkPath, String dataset, String... cmdLineOptions) throws LocalDevelopmentDatastoreException { - Preconditions.checkNotNull(sdkPath, "sdkPath cannot be null"); - Preconditions.checkNotNull(dataset, "dataset cannot be null"); - Preconditions.checkState(state == State.NEW, "Cannot call start() more than once."); + checkNotNull(sdkPath, "sdkPath cannot be null"); + checkNotNull(dataset, "dataset cannot be null"); + checkState(state == State.NEW, "Cannot call start() more than once."); try { startDatastoreInternal(sdkPath, dataset, cmdLineOptions); state = State.STARTED; @@ -142,23 +151,29 @@ public synchronized void start(String sdkPath, String dataset, String... cmdLine void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOptions) throws LocalDevelopmentDatastoreException { - List cmd = Arrays.asList("./gcd.sh", "start", dataset, "--allow_remote_shutdown", - "--property=datastore.no_storage"); + File datasetDirectory = createDatastore(sdkPath, dataset); + List cmd = new ArrayList( + Arrays.asList("./gcd.sh", "start", "--allow_remote_shutdown", "--store_on_disk=false")); cmd.addAll(Arrays.asList(cmdLineOptions)); - ProcessBuilder builder = new ProcessBuilder(cmd); - builder.directory(new File(sdkPath)); - builder.redirectErrorStream(true); - Process devDatastoreServerProcess; + cmd.add(datasetDirectory.getPath()); + final Process gcdStartProcess; try { - devDatastoreServerProcess = builder.start(); + gcdStartProcess = newGcdProcess(sdkPath, cmd).start(); } catch (IOException e) { throw new LocalDevelopmentDatastoreException("Could not start dev server", e); } - StartupMonitor monitor = new StartupMonitor(devDatastoreServerProcess.getInputStream()); + // Ensure we don't leak the stub instance if tests end prematurely. + Runtime.getRuntime().addShutdownHook(new Thread() { + @Override + public void run() { + gcdStartProcess.destroy(); + } + }); + StartupMonitor monitor = new StartupMonitor(gcdStartProcess.getInputStream()); try { monitor.start(); if (!monitor.startupCompleteLatch.await(STARTUP_TIMEOUT_SECS, TimeUnit.SECONDS)) { - throw new LocalDevelopmentDatastoreException("Dev server did not start within 5 seconds"); + throw new LocalDevelopmentDatastoreException("Dev server did not start within 30 seconds"); } if (!monitor.success) { throw new LocalDevelopmentDatastoreException("Server did not start normally"); @@ -169,6 +184,42 @@ void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOpt } } + private File createDatastore(String sdkPath, String dataset) + throws LocalDevelopmentDatastoreException { + try { + datasetDirectory = Files.createTempDirectory("local-development-datastore").toFile(); + } catch (IOException e) { + throw new LocalDevelopmentDatastoreException("Could not create dataset tmp directory", e); + } + List cmd = Arrays.asList("./gcd.sh", "create", "--project_id=" + dataset, + datasetDirectory.getPath()); + try { + int retCode = newGcdProcess(sdkPath, cmd).start().waitFor(); + if (retCode != 0) { + throw new LocalDevelopmentDatastoreException( + String.format("Could not create dataset (retcode=%d)", retCode)); + } + } catch (IOException e) { + throw new LocalDevelopmentDatastoreException("Could not create dataset", e); + } catch (InterruptedException e) { + throw new LocalDevelopmentDatastoreException("Received an interrupt", e); + } + return datasetDirectory; + } + + private ProcessBuilder newGcdProcess(String sdkPath, List cmd) { + ProcessBuilder builder = new ProcessBuilder(cmd); + builder.directory(new File(sdkPath)); + builder.redirectErrorStream(true); + builder.environment().putAll(localDevelopmentOptions.getEnvVars()); + return builder; + } + + public File getDatasetDirectory() { + checkState(state == State.STARTED); + return datasetDirectory; + } + /** * Stops the local datastore. Multiple calls are allowed. * @@ -178,7 +229,20 @@ public synchronized void stop() throws LocalDevelopmentDatastoreException { // We intentionally don't check the internal state. If people want to try and stop the server // multiple times that's fine. stopDatastoreInternal(); - state = State.STOPPED; + if (state != State.STOPPED) { + state = State.STOPPED; + if (datasetDirectory != null) { + try { + Process process = + new ProcessBuilder("rm", "-r", datasetDirectory.getAbsolutePath()).start(); + if (process.waitFor() != 0) { + throw new IOException("Temp directory delete exited with " + process.exitValue()); + } + } catch (IOException | InterruptedException e) { + throw new IllegalStateException("Dataset directory wipe failed.", e); + } + } + } } void stopDatastoreInternal() throws LocalDevelopmentDatastoreException { @@ -191,8 +255,8 @@ void stopDatastoreInternal() throws LocalDevelopmentDatastoreException { HttpResponse httpResponse = client.buildPostRequest(url, content).execute(); if (!httpResponse.isSuccessStatusCode()) { throw new LocalDevelopmentDatastoreException( - "Request to shutdown local datastore returned http error code " + - httpResponse.getStatusCode()); + "Request to shutdown local datastore returned http error code " + + httpResponse.getStatusCode()); } } catch (IOException e) { throw new LocalDevelopmentDatastoreException( diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java index c0c90c7f0ed6..824f6b604f9b 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java @@ -35,7 +35,13 @@ public static LocalDevelopmentDatastoreFactory get() { @Override public LocalDevelopmentDatastore create(DatastoreOptions options) throws IllegalArgumentException { + return create(options, new LocalDevelopmentDatastoreOptions.Builder().build()); + } + + public LocalDevelopmentDatastore create(DatastoreOptions options, + LocalDevelopmentDatastoreOptions localDevelopmentOptions) { RemoteRpc rpc = newRemoteRpc(options); - return new LocalDevelopmentDatastore(rpc, options.getHost()); + return new LocalDevelopmentDatastore(rpc, options.getHost(), + localDevelopmentOptions); } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreOptions.java new file mode 100644 index 000000000000..b59f8734ed02 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreOptions.java @@ -0,0 +1,53 @@ +/* + * Copyright 2014 Google Inc. All Rights Reserved. + * + * 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.api.services.datastore.client; + +import java.util.HashMap; +import java.util.Map; + +/** + * An immutable object containing settings for a {@link LocalDevelopmentDatastore}. + */ +public class LocalDevelopmentDatastoreOptions { + private final Map envVars; + + LocalDevelopmentDatastoreOptions(Map envVars) { + this.envVars = envVars; + } + + /** + * Builder for {@link LocalDevelopmentDatastoreOptions}. + */ + public static class Builder { + private final Map envVars = new HashMap(); + + public LocalDevelopmentDatastoreOptions build() { + return new LocalDevelopmentDatastoreOptions(envVars); + } + + /** + * Adds an environment variable to pass to the GCD tool. + */ + public Builder addEnvVar(String var, String value) { + envVars.put(var, value); + return this; + } + } + + public Map getEnvVars() { + return envVars; + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java index a2228b9c4e31..528349cc9751 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java @@ -15,6 +15,7 @@ */ package com.google.api.services.datastore.client; +import com.google.api.services.datastore.DatastoreV1.PartitionId; import com.google.api.services.datastore.DatastoreV1.Query; import java.util.List; @@ -38,7 +39,27 @@ public interface QuerySplitter { * @param datastore the datastore to run on. * @throws DatastoreException if there was a datastore error while generating query splits. * @throws IllegalArgumentException if the given query or numSplits was invalid. + * @deprecated Use {@link getSplits(Query, PartitionId, int, Datastore)} instead, which provides + * the ability to supply a namespace. */ - List getSplits(Query query, int numSplits, Datastore datastore) + @Deprecated + List getSplits(Query query, int numSplits, Datastore datastore) throws DatastoreException; + + /** + * Returns a list of sharded {@link Query}s for the given query. + * + *

This will create up to the desired number of splits, however it may return less splits if + * the desired number of splits is unavailable. This will happen if the number of split points + * provided by the underlying Datastore is less than the desired number, which will occur if the + * number of results for the query is too small. + * + * @param query the query to split. + * @param partition the partition to run in. + * @param numSplits the desired number of splits. + * @param datastore the datastore to run on. + * @throws DatastoreException if there was a datastore error while generating query splits. + * @throws IllegalArgumentException if the given query or numSplits was invalid. + */ + List getSplits(Query query, PartitionId partition, int numSplits, Datastore datastore) throws DatastoreException; } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java index 290965504c1a..215633b256a1 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java @@ -20,6 +20,7 @@ import com.google.api.services.datastore.DatastoreV1.EntityResult; import com.google.api.services.datastore.DatastoreV1.Filter; import com.google.api.services.datastore.DatastoreV1.Key; +import com.google.api.services.datastore.DatastoreV1.PartitionId; import com.google.api.services.datastore.DatastoreV1.PropertyExpression; import com.google.api.services.datastore.DatastoreV1.PropertyFilter; import com.google.api.services.datastore.DatastoreV1.PropertyFilter.Operator; @@ -57,14 +58,21 @@ private QuerySplitterImpl() { } @Override + @Deprecated public List getSplits(Query query, int numSplits, Datastore datastore) throws DatastoreException, IllegalArgumentException { + return getSplits(query, PartitionId.newBuilder().build(), numSplits, datastore); + } + @Override + public List getSplits( + Query query, PartitionId partition, int numSplits, Datastore datastore) + throws DatastoreException, IllegalArgumentException { validateQuery(query); validateSplitSize(numSplits); List splits = new ArrayList(numSplits); - List scatterKeys = getScatterKeys(numSplits, query, datastore); + List scatterKeys = getScatterKeys(numSplits, query, partition, datastore); Key lastKey = null; for (Key nextKey : getSplitKey(scatterKeys, numSplits)) { splits.add(createSplit(lastKey, nextKey, query)); @@ -157,10 +165,12 @@ private Query createSplit(Key lastKey, Key nextKey, Query query) { * * @param numSplits the number of desired splits. * @param query the user query. + * @param partition the partition to run the query in. * @param datastore the datastore containing the data. * @throws DatastoreException if there was an error when executing the datastore query. */ - private List getScatterKeys(int numSplits, Query query, Datastore datastore) + private List getScatterKeys( + int numSplits, Query query, PartitionId partition, Datastore datastore) throws DatastoreException { Query.Builder scatterPointQuery = createScatterQuery(query, numSplits); @@ -168,8 +178,11 @@ private List getScatterKeys(int numSplits, Query query, Datastore datastore QueryResultBatch batch; do { - RunQueryRequest scatterRequest = RunQueryRequest.newBuilder() - .setQuery(scatterPointQuery).build(); + RunQueryRequest scatterRequest = + RunQueryRequest.newBuilder() + .setPartitionId(partition) + .setQuery(scatterPointQuery) + .build(); batch = datastore.runQuery(scatterRequest).getBatch(); for (EntityResult result : batch.getEntityResultList()) { keySplits.add(result.getEntity().getKey()); diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java index edc5894b4e92..80c6d5c81719 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.InputStream; +import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; /** @@ -39,7 +40,7 @@ class RemoteRpc { private final HttpRequestFactory client; private final HttpRequestInitializer initializer; private final String url; - private int rpcCount = 0; + private final AtomicInteger rpcCount = new AtomicInteger(0); RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) { this.client = client; @@ -61,14 +62,14 @@ class RemoteRpc { * * @throws DatastoreException if the RPC fails. */ - InputStream call(String methodName, MessageLite request) throws DatastoreException { + public InputStream call(String methodName, MessageLite request) throws DatastoreException { logger.fine("remote datastore call " + methodName); long startTime = System.currentTimeMillis(); try { HttpResponse httpResponse; try { - rpcCount++; + rpcCount.incrementAndGet(); ProtoHttpContent payload = new ProtoHttpContent(request); HttpRequest httpRequest = client.buildPostRequest(resolveURL(methodName), payload); if (initializer != null) { @@ -89,14 +90,14 @@ InputStream call(String methodName, MessageLite request) throws DatastoreExcepti } void resetRpcCount() { - rpcCount = 0; + rpcCount.set(0); } int getRpcCount() { - return rpcCount; + return rpcCount.get(); } - String getUrl() { + public String getUrl() { return url; } @@ -108,7 +109,7 @@ HttpRequestFactory getHttpRequestFactory() { return client; } - static DatastoreException makeException( + public static DatastoreException makeException( String url, String methodName, int code, String message, Throwable cause) { logger.fine("remote datastore call " + methodName + " against " + url + " failed: " + message); return new DatastoreException(methodName, code, message, cause); From 3a74434b6dbafb159ff34b2e203f5b7dcf71563b Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Thu, 10 Sep 2015 18:47:29 -0700 Subject: [PATCH 0010/1784] v1beta2-rev1-3.0.1 --- .../api/services/datastore/client/QuerySplitterImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java index 215633b256a1..c351981a0403 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java @@ -137,6 +137,9 @@ private void validateQuery(Query query) throws IllegalArgumentException { * @param query the desired query. */ private Query createSplit(Key lastKey, Key nextKey, Query query) { + if (lastKey == null && nextKey == null) { + return query; + } List keyFilters = new ArrayList(); if (query.hasFilter()) { keyFilters.add(query.getFilter()); From 35cdd302923693cb4f809d432d5d3d134c7666d5 Mon Sep 17 00:00:00 2001 From: Pieter De Maeyer Date: Wed, 23 Sep 2015 09:50:29 +0200 Subject: [PATCH 0011/1784] Fix bug in LocalDevelopmentDatastore --- .../services/datastore/client/LocalDevelopmentDatastore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java index 39f81665d33c..018238ccbc87 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java @@ -191,7 +191,7 @@ private File createDatastore(String sdkPath, String dataset) } catch (IOException e) { throw new LocalDevelopmentDatastoreException("Could not create dataset tmp directory", e); } - List cmd = Arrays.asList("./gcd.sh", "create", "--project_id=" + dataset, + List cmd = Arrays.asList("./gcd.sh", "create", "--dataset_id=" + dataset, datasetDirectory.getPath()); try { int retCode = newGcdProcess(sdkPath, cmd).start().waitFor(); From 7fc6cc0352cda3ae3311da8ab3187f4cdc0e4a86 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Tue, 9 Feb 2016 10:34:03 -0800 Subject: [PATCH 0012/1784] Initial commit for datastore concepts snippets and getting started sample app. --- .../google/datastore/snippets/Concepts.java | 1058 +++++++++++++++++ .../google/datastore/snippets/TaskList.java | 232 ++++ 2 files changed, 1290 insertions(+) create mode 100644 samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java create mode 100644 samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java new file mode 100644 index 000000000000..ae38b0070aaf --- /dev/null +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -0,0 +1,1058 @@ +/* + * Copyright 2016 Google Inc. All Rights Reserved. + * + * 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.snippets; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; +import com.google.common.collect.Multimap; +import com.google.gcloud.datastore.Batch; +import com.google.gcloud.datastore.Cursor; +import com.google.gcloud.datastore.Datastore; +import com.google.gcloud.datastore.DatastoreException; +import com.google.gcloud.datastore.DatastoreOptions; +import com.google.gcloud.datastore.DateTime; +import com.google.gcloud.datastore.Entity; +import com.google.gcloud.datastore.EntityQuery; +import com.google.gcloud.datastore.FullEntity; +import com.google.gcloud.datastore.IncompleteKey; +import com.google.gcloud.datastore.Key; +import com.google.gcloud.datastore.KeyFactory; +import com.google.gcloud.datastore.PathElement; +import com.google.gcloud.datastore.ProjectionEntity; +import com.google.gcloud.datastore.Query; +import com.google.gcloud.datastore.Query.ResultType; +import com.google.gcloud.datastore.QueryResults; +import com.google.gcloud.datastore.StringValue; +import com.google.gcloud.datastore.StructuredQuery; +import com.google.gcloud.datastore.StructuredQuery.CompositeFilter; +import com.google.gcloud.datastore.StructuredQuery.OrderBy; +import com.google.gcloud.datastore.StructuredQuery.PropertyFilter; +import com.google.gcloud.datastore.Transaction; +import com.google.gcloud.datastore.Value; +import com.google.gcloud.datastore.testing.LocalGcdHelper; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.TimeZone; + +/** + * Contains Cloud Datastore snippets linked from the Concepts documentation. + * + * @see Key Datastore Concepts + */ +public class Concepts { + + private static final String PROJECT_ID = LocalGcdHelper.DEFAULT_PROJECT_ID; + private static LocalGcdHelper gcdHelper; + private static final int PORT = LocalGcdHelper.findAvailablePort(LocalGcdHelper.DEFAULT_PORT); + private static final FullEntity TEST_FULL_ENTITY = FullEntity.builder().build(); + + private Datastore datastore; + private KeyFactory keyFactory; + private Key taskKey; + private Entity testEntity; + private DateTime startDate; + private DateTime endDate; + private DateTime includedDate; + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + /** + * Starts the local Datastore emulator. + * + * @throws IOException if there are errors starting the local Datastore + * @throws InterruptedException if there are errors starting the local Datastore + */ + @BeforeClass + public static void beforeClass() throws IOException, InterruptedException { + if (!LocalGcdHelper.isActive(PROJECT_ID, PORT)) { + gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT); + } + } + + /** + * Initializes Datastore and cleans out any residual values. Also initializes global variables + * used for testing. + */ + @Before + public void setUp() { + datastore = DatastoreOptions.builder() + .projectId(PROJECT_ID) + .namespace("ghijklmnop") // for namespace metadata query + .host("http://localhost:" + PORT) + .build() + .service(); + StructuredQuery query = Query.keyQueryBuilder().build(); + QueryResults result = datastore.run(query); + datastore.delete(Iterators.toArray(result, Key.class)); + keyFactory = datastore.newKeyFactory().kind("Task"); + taskKey = keyFactory.newKey("some-arbitrary-key"); + testEntity = Entity.builder(taskKey, TEST_FULL_ENTITY).build(); + Calendar startDateCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + startDateCalendar.set(1990, 1, 1); + startDate = DateTime.copyFrom(startDateCalendar); + Calendar endDateCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + endDateCalendar.set(2000, 1, 1); + endDate = DateTime.copyFrom(endDateCalendar); + Calendar includedCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + includedCalendar.set(1999, 12, 31); + includedDate = DateTime.copyFrom(includedCalendar); + } + + /** + * Stops the local Datastore emulator. + * + * @throws IOException if there are errors stopping the local Datastore + * @throws InterruptedException if there are errors stopping the local Datastore + */ + @AfterClass + public static void afterClass() throws IOException, InterruptedException { + if (gcdHelper != null) { + gcdHelper.stop(); + } + } + + private void assertValidKey(Key taskKey) { + datastore.put(Entity.builder(taskKey, TEST_FULL_ENTITY).build()); + } + + @Test + public void testIncompleteKey() { + // [START incomplete_key] + KeyFactory keyFactory = datastore.newKeyFactory().kind("Task"); + Key taskKey = datastore.allocateId(keyFactory.newKey()); + // [END incomplete_key] + assertValidKey(taskKey); + } + + @Test + public void testNamedKey() { + // [START named_key] + KeyFactory keyFactory = datastore.newKeyFactory().kind("Task"); + Key taskKey = keyFactory.newKey("sampleTask"); + // [END named_key] + assertValidKey(taskKey); + } + + @Test + public void testKeyWithParent() { + // [START key_with_parent] + KeyFactory keyFactory = + datastore.newKeyFactory().ancestors(PathElement.of("TaskList", "default")).kind("Task"); + Key taskKey = keyFactory.newKey("sampleTask"); + // [END key_with_parent] + assertValidKey(taskKey); + } + + @Test + public void testKeyWithMultilevelParent() { + // [START key_with_multilevel_parent] + KeyFactory keyFactory = datastore.newKeyFactory() + .ancestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default")) + .kind("Task"); + Key taskKey = keyFactory.newKey("sampleTask"); + // [END key_with_multilevel_parent] + assertValidKey(taskKey); + } + + private void assertValidEntity(Entity original) { + datastore.put(original); + assertEquals(original, datastore.get(original.key())); + } + + @Test + public void testEntityWithParent() { + // [START entity_with_parent] + KeyFactory keyFactory = + datastore.newKeyFactory().ancestors(PathElement.of("TaskList", "default")).kind("Task"); + Entity task = Entity.builder(keyFactory.newKey("sampleTask")) + .set("type", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); + // [END entity_with_parent] + assertValidEntity(task); + } + + @Test + public void testProperties() { + // [START properties] + Entity task = Entity.builder(taskKey) + .set("type", "Personal") + .set("created", DateTime.now()) + .set("done", false) + .set("priority", 4) + .set("percent_complete", 10.0) + .set("description", "Learn Cloud Datastore") + .build(); + // [END properties] + assertValidEntity(task); + } + + @Test + public void testArrayValue() { + // [START array_value] + Entity task = Entity.builder(taskKey) + .set("tags", StringValue.of("fun"), StringValue.of("programming")) + .set("collaborators", StringValue.of("alice"), StringValue.of("bob")) + .build(); + // [END array_value] + assertValidEntity(task); + } + + @Test + public void testBasicEntity() { + // [START basic_entity] + Entity task = Entity.builder(taskKey) + .set("type", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); + // [END basic_entity] + assertValidEntity(task); + } + + @Test + public void testUpsert() { + // [START upsert] + Key taskKey = datastore.allocateId(keyFactory.newKey()); + Entity task = Entity.builder(taskKey).build(); + datastore.put(task); + // [END upsert] + assertEquals(task, datastore.get(task.key())); + } + + @Test + public void testInsert() { + // [START insert] + Entity task = Entity.builder(taskKey).build(); + Key taskKey = datastore.add(task).key(); + // [END insert] + assertEquals(task, datastore.get(taskKey)); + } + + @Test + public void testLookup() { + datastore.put(testEntity); + // [START lookup] + Entity task = datastore.get(taskKey); + // [END lookup] + assertEquals(testEntity, task); + } + + @Test + public void testUpdate() { + datastore.put(testEntity); + // [START update] + Entity task = Entity.builder(datastore.get(taskKey)).set("priority", 5).build(); + datastore.update(task); + // [END update] + assertEquals(task, datastore.get(taskKey)); + } + + @Test + public void testDelete() { + datastore.put(testEntity); + // [START delete] + datastore.delete(taskKey); + // [END delete] + assertNull(datastore.get(taskKey)); + } + + private List setUpBatchTests(Key taskKey1, Key taskKey2) { + Entity task1 = Entity.builder(taskKey1) + .set("type", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); + Entity task2 = Entity.builder(taskKey2) + .set("type", "Personal") + .set("done", false) + .set("priority", 5) + .set("description", "Integrate Cloud Datastore") + .build(); + datastore.put(task1, task2); + return ImmutableList.of(task1, task2); + } + + @Test + public void testBatchUpsert() { + Key taskKey1 = keyFactory.newKey(1); + Key taskKey2 = keyFactory.newKey(2); + Entity task1 = Entity.builder(taskKey1) + .set("type", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); + Entity task2 = Entity.builder(taskKey2) + .set("type", "Personal") + .set("done", false) + .set("priority", 5) + .set("description", "Integrate Cloud Datastore") + .build(); + // [START batch_upsert] + Batch batch = datastore.newBatch(); + batch.put(task1, task2); + batch.submit(); + // [END batch_upsert] + assertEquals(task1, datastore.get(taskKey1)); + assertEquals(task2, datastore.get(taskKey2)); + } + + @Test + public void testBatchLookup() { + Key taskKey1 = keyFactory.newKey(1); + Key taskKey2 = keyFactory.newKey(2); + List expectedTasks = setUpBatchTests(taskKey1, taskKey2); + // [START batch_lookup] + Iterator tasks = datastore.get(taskKey1, taskKey2); + // [END batch_lookup] + assertEquals(expectedTasks.get(0), tasks.next()); + assertEquals(expectedTasks.get(1), tasks.next()); + } + + @Test + public void testBatchDelete() { + Key taskKey1 = keyFactory.newKey(1); + Key taskKey2 = keyFactory.newKey(2); + setUpBatchTests(taskKey1, taskKey2); + // [START batch_delete] + Batch batch = datastore.newBatch(); + batch.delete(taskKey1, taskKey2); + batch.submit(); + // [END batch_delete] + assertNull(datastore.get(taskKey1)); + assertNull(datastore.get(taskKey2)); + } + + private void setUpQueryTests() { + KeyFactory keyFactory = + datastore.newKeyFactory().kind("Task").ancestors(PathElement.of("TaskList", "default")); + datastore.put(Entity.builder(keyFactory.newKey("someTask")) + .set("type", "Personal") + .set("done", false) + .set("completed", false) + .set("priority", 4) + .set("created", includedDate) + .set("percent_complete", 10.0) + .set("description", StringValue.builder("Learn Cloud Datastore").indexed(false).build()) + .set("tag", ImmutableList.of(StringValue.of("fun"), StringValue.of("l"), + StringValue.of("programming"))) + .build()); + } + + private V assertValidQuery(Query query) { + QueryResults results = datastore.run(query); + V result = results.next(); + assertFalse(results.hasNext()); + return result; + } + + private void assertInvalidQuery(Query query) { + thrown.expect(DatastoreException.class); + datastore.run(query); + } + + @Test + public void testBasicQuery() { + setUpQueryTests(); + // [START basic_query] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(CompositeFilter.and( + PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4))) + .orderBy(OrderBy.desc("priority")) + .build(); + // [END basic_query] + assertValidQuery(query); + } + + @Test + public void testRunQuery() { + setUpQueryTests(); + Query query = Query.entityQueryBuilder().kind("Task").build(); + // [START run_query] + QueryResults tasks = datastore.run(query); + // [END run_query] + assertNotNull(tasks.next()); + assertFalse(tasks.hasNext()); + } + + @Test + public void testPropertyFilter() { + setUpQueryTests(); + // [START property_filter] + Query query = + Query.entityQueryBuilder().kind("Task").filter(PropertyFilter.eq("done", false)).build(); + // [END property_filter] + assertValidQuery(query); + } + + @Test + public void testCompositeFilter() { + setUpQueryTests(); + // [START composite_filter] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter( + CompositeFilter.and(PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4))) + .build(); + // [END composite_filter] + assertValidQuery(query); + } + + @Test + public void testKeyFilter() { + setUpQueryTests(); + // [START key_filter] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) + .build(); + // [END key_filter] + assertValidQuery(query); + } + + @Test + public void testAscendingSort() { + setUpQueryTests(); + // [START ascending_sort] + Query query = + Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build(); + // [END ascending_sort] + assertValidQuery(query); + } + + @Test + public void testDescendingSort() { + setUpQueryTests(); + // [START descending_sort] + Query query = + Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.desc("created")).build(); + // [END descending_sort] + assertValidQuery(query); + } + + @Test + public void testMultiSort() { + setUpQueryTests(); + // [START multi_sort] + Query query = Query.entityQueryBuilder() + .kind("Task") + .orderBy(OrderBy.desc("priority"), OrderBy.asc("created")) + .build(); + // [END multi_sort] + assertValidQuery(query); + } + + @Test + public void testKindlessQuery() { + Key lastSeenKey = keyFactory.newKey("a"); + setUpQueryTests(); + // [START kindless_query] + Query query = + Query.entityQueryBuilder().filter(PropertyFilter.gt("__key__", lastSeenKey)).build(); + // [END kindless_query] + assertValidQuery(query); + } + + @Test + public void testAncestorQuery() { + setUpQueryTests(); + // [START ancestor_query] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.hasAncestor( + datastore.newKeyFactory().kind("TaskList").newKey("default"))) + .build(); + // [END ancestor_query] + assertValidQuery(query); + } + + @Test + public void testProjectionQuery() { + setUpQueryTests(); + // [START projection_query] + Query query = Query.projectionEntityQueryBuilder() + .kind("Task") + .projection( + StructuredQuery.Projection.property("priority"), + StructuredQuery.Projection.property("percent_complete")) + .build(); + // [END projection_query] + assertValidQuery(query); + } + + @Test + public void testRunProjectionQuery() { + setUpQueryTests(); + Query query = Query.projectionEntityQueryBuilder() + .kind("Task") + .projection( + StructuredQuery.Projection.property("priority"), + StructuredQuery.Projection.property("percent_complete")) + .build(); + List priorities = new LinkedList<>(); + List percentCompletes = new LinkedList<>(); + // [START run_query_projection] + QueryResults tasks = datastore.run(query); + while (tasks.hasNext()) { + ProjectionEntity task = tasks.next(); + priorities.add(task.getLong("priority")); + percentCompletes.add(task.getDouble("percent_complete")); + } + // [END run_query_projection] + assertEquals(ImmutableList.of(4L), priorities); + assertEquals(ImmutableList.of(10.0), percentCompletes); + } + + @Test + public void testKeysOnlyQuery() { + setUpQueryTests(); + // [START keys_only_query] + Query query = Query.keyQueryBuilder().kind("Task").build(); + // [END keys_only_query] + assertValidQuery(query); + } + + @Test + public void testRunKeysOnlyQuery() { + setUpQueryTests(); + Query query = Query.keyQueryBuilder().kind("Task").build(); + // [START run_keys_only_query] + QueryResults taskKeys = datastore.run(query); + // [END run_keys_only_query] + assertNotNull(taskKeys.next()); + assertFalse(taskKeys.hasNext()); + } + + @Test + public void testDistinctQuery() { + setUpQueryTests(); + // [START distinct_query] + Query query = Query.projectionEntityQueryBuilder() + .kind("Task") + .projection(StructuredQuery.Projection.property("type"), + StructuredQuery.Projection.property("priority")) + .groupBy("type", "priority") + .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) + .build(); + // [END distinct_query] + assertValidQuery(query); + } + + @Test + public void testDistinctOnQuery() { + setUpQueryTests(); + // [START distinct_on_query] + Query query = Query.projectionEntityQueryBuilder() + .kind("Task") + .projection(StructuredQuery.Projection.property("type"), + StructuredQuery.Projection.first("priority")) + .groupBy("type") + .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) + .build(); + // [END distinct_on_query] + assertValidQuery(query); + } + + @Test + public void testArrayValueInequalityRange() { + setUpQueryTests(); + // [START array_value_inequality_range] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(CompositeFilter.and( + PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math"))) + .build(); + // [END array_value_inequality_range] + QueryResults results = datastore.run(query); + assertFalse(results.hasNext()); + } + + @Test + public void testArrayValueEquality() { + setUpQueryTests(); + // [START array_value_equality] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(CompositeFilter.and( + PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming"))) + .build(); + // [END array_value_equality] + assertValidQuery(query); + } + + @Test + public void testInequalityRange() { + setUpQueryTests(); + // [START inequality_range] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(CompositeFilter.and( + PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) + .build(); + // [END inequality_range] + assertValidQuery(query); + } + + @Test + public void testInequalityInvalid() { + // [START inequality_invalid] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(CompositeFilter.and( + PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3))) + .build(); + // [END inequality_invalid] + assertInvalidQuery(query); + } + + @Test + public void testEqualAndInequalityRange() { + setUpQueryTests(); + // [START equal_and_inequality_range] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(CompositeFilter.and(PropertyFilter.eq("priority", 4), + PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) + .build(); + // [END equal_and_inequality_range] + assertValidQuery(query); + } + + @Test + public void testInequalitySort() { + setUpQueryTests(); + // [START inequality_sort] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.gt("priority", 3)) + .orderBy(OrderBy.asc("priority"), OrderBy.asc("created")) + .build(); + // [END inequality_sort] + assertValidQuery(query); + } + + @Test + public void testInequalitySortInvalidNotSame() { + // [START inequality_sort_invalid_not_same] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.gt("priority", 3)) + .orderBy(OrderBy.asc("created")) + .build(); + // [END inequality_sort_invalid_not_same] + assertInvalidQuery(query); + } + + @Test + public void testInequalitySortInvalidNotFirst() { + // [START inequality_sort_invalid_not_first] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.gt("priority", 3)) + .orderBy(OrderBy.asc("created"), OrderBy.asc("priority")) + .build(); + // [END inequality_sort_invalid_not_first] + assertInvalidQuery(query); + } + + @Test + public void testLimit() { + setUpQueryTests(); + // [START limit] + Query query = Query.entityQueryBuilder().kind("Task").limit(5).build(); + // [END limit] + assertValidQuery(query); + } + + @Test + public void testCursorPaging() { + setUpQueryTests(); + datastore.put(testEntity); + Cursor nextPageCursor = cursorPaging(1, null); + assertNotNull(nextPageCursor); + nextPageCursor = cursorPaging(1, nextPageCursor); + assertNotNull(nextPageCursor); + } + + private Cursor cursorPaging(int pageSize, Cursor pageCursor) { + // [START cursor_paging] + EntityQuery.Builder queryBuilder = Query.entityQueryBuilder().kind("Task").limit(pageSize); + if (pageCursor != null) { + queryBuilder.startCursor(pageCursor); + } + QueryResults tasks = datastore.run(queryBuilder.build()); + Entity task = null; + while (tasks.hasNext()) { + task = tasks.next(); + // do something with the task + } + Cursor nextPageCursor = null; + if (task != null && tasks.cursorAfter() != null) { + nextPageCursor = tasks.cursorAfter(); + // Call nextPageCursor.toUrlSafe() if you want an encoded cursor that can be used as part of a + // URL. + } + // [END cursor_paging] + return nextPageCursor; + } + + @Test + public void testEventualConsistentQuery() { + setUpQueryTests(); + // [START eventual_consistent_query] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.hasAncestor( + datastore.newKeyFactory().kind("TaskList").newKey("default"))) + .build(); + // [END eventual_consistent_query] + assertValidQuery(query); + } + + @Test + public void testUnindexedPropertyQuery() { + setUpQueryTests(); + // [START unindexed_property_query] + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.eq("description", "A task description")) + .build(); + // [END unindexed_property_query] + QueryResults results = datastore.run(query); + assertFalse(results.hasNext()); + } + + @Test + public void testExplodingProperties() { + // [START exploding_properties] + Entity task = Entity.builder(taskKey) + .set("tags", StringValue.of("fun"), StringValue.of("programming"), StringValue.of("learn")) + .set("collaborators", StringValue.of("alice"), StringValue.of("bob"), + StringValue.of("charlie")) + .set("created", DateTime.now()) + .build(); + // [END exploding_properties] + assertValidEntity(task); + } + + private List setUpTransferTests() { + KeyFactory keyFactory = datastore.newKeyFactory().kind("People"); + Key from = keyFactory.newKey("from"); + Key to = keyFactory.newKey("to"); + datastore.put(Entity.builder(from).set("balance", 100).build()); + datastore.put(Entity.builder(to).set("balance", 0).build()); + return ImmutableList.of(from, to); + } + + private void assertSuccessfulTransfer(Key from, Key to) { + assertEquals(90, datastore.get(from).getLong("balance")); + assertEquals(10, datastore.get(to).getLong("balance")); + } + + @Test + public void testTransactionalUpdate() { + List keys = setUpTransferTests(); + transferFunds(keys.get(0), keys.get(1), 10); + assertSuccessfulTransfer(keys.get(0), keys.get(1)); + } + + private void transferFunds(Key fromKey, Key toKey, long amount) { + // [START transactional_update] + Transaction txn = datastore.newTransaction(); + try { + Entity from = txn.get(fromKey); + Entity updatedFrom = + Entity.builder(from).set("balance", from.getLong("balance") - amount).build(); + Entity to = txn.get(toKey); + Entity updatedTo = Entity.builder(to).set("balance", to.getLong("balance") + amount).build(); + txn.put(updatedFrom, updatedTo); + txn.commit(); + } finally { + if (txn.active()) { + txn.rollback(); + } + } + // [END transactional_update] + } + + @Test + public void testTransactionalRetry() { + List keys = setUpTransferTests(); + Key fromKey = keys.get(0); + Key toKey = keys.get(1); + // [START transactional_retry] + int retries = 5; + while (true) { + try { + transferFunds(fromKey, toKey, 10); + break; + } catch (DatastoreException e) { + if (retries == 0) { + throw e; + } + --retries; + } + } + // [END transactional_retry] + assertSuccessfulTransfer(keys.get(0), keys.get(1)); + } + + @Test + public void testTransactionalGetOrCreate() { + // [START transactional_get_or_create] + Entity task; + Transaction txn = datastore.newTransaction(); + try { + try { + task = txn.get(taskKey); + } catch (DatastoreException e) { + task = Entity.builder(taskKey).build(); + txn.put(task); + txn.commit(); + } + } finally { + if (txn.active()) { + txn.rollback(); + } + } + // [END transactional_get_or_create] + assertEquals(task, datastore.get(taskKey)); + } + + @Test + public void testTransactionalSingleEntityGroupReadOnly() { + setUpQueryTests(); + Key taskListKey = datastore.newKeyFactory().kind("TaskList").newKey("default"); + Entity taskListEntity = Entity.builder(taskListKey).build(); + datastore.put(taskListEntity); + // [START transactional_single_entity_group_read_only] + Entity taskList; + QueryResults tasks; + Transaction txn = datastore.newTransaction(); + try { + taskList = txn.get(taskListKey); + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.hasAncestor(taskListKey)) + .build(); + tasks = txn.run(query); + txn.commit(); + } finally { + if (txn.active()) { + txn.rollback(); + } + } + // [END transactional_single_entity_group_read_only] + assertEquals(taskListEntity, taskList); + assertNotNull(tasks.next()); + assertFalse(tasks.hasNext()); + } + + @Test + public void testNamespaceRunQuery() { + setUpQueryTests(); + // [START namespace_run_query] + KeyFactory keyFactory = datastore.newKeyFactory().kind("__namespace__"); + Key startNamespace = keyFactory.newKey("g"); + Key endNamespace = keyFactory.newKey("h"); + Query query = Query.keyQueryBuilder() + .kind("__namespace__") + .filter(CompositeFilter.and( + PropertyFilter.gt("__key__", startNamespace), + PropertyFilter.lt("__key__", endNamespace))) + .build(); + List namespaces = new ArrayList<>(); + QueryResults results = datastore.run(query); + while (results.hasNext()) { + namespaces.add(results.next().name()); + } + // [END namespace_run_query] + assertEquals(ImmutableList.of("ghijklmnop"), namespaces); + } + + @Test + public void testKindRunQuery() { + setUpQueryTests(); + // [START kind_run_query] + Query query = Query.keyQueryBuilder().kind("__kind__").build(); + List kinds = new ArrayList<>(); + QueryResults results = datastore.run(query); + while (results.hasNext()) { + kinds.add(results.next().name()); + } + // [END kind_run_query] + assertEquals(ImmutableList.of("Task"), kinds); + } + + @Test + public void testPropertyRunQuery() { + setUpQueryTests(); + // [START property_run_query] + Query query = Query.keyQueryBuilder().kind("__property__").build(); + QueryResults results = datastore.run(query); + Multimap propertiesByKind = HashMultimap.create(); + while (results.hasNext()) { + Key property = results.next(); + String kind = property.ancestors().get(property.ancestors().size() - 1).name(); + String propertyName = property.name(); + propertiesByKind.put(kind, propertyName); + } + // [END property_run_query] + Multimap expected = HashMultimap.create(); + expected.put("Task", "type"); + expected.put("Task", "done"); + expected.put("Task", "completed"); + expected.put("Task", "priority"); + expected.put("Task", "created"); + expected.put("Task", "percent_complete"); + expected.put("Task", "tag"); + assertEquals(expected, propertiesByKind); + } + + @Test + public void testPropertyByKindRunQuery() { + setUpQueryTests(); + // [START property_by_kind_run_query] + KeyFactory keyFactory = datastore.newKeyFactory().kind("__kind__"); + Query query = Query.entityQueryBuilder() + .kind("__property__") + .filter(PropertyFilter.hasAncestor(keyFactory.newKey("Task"))) + .build(); + QueryResults results = datastore.run(query); + Multimap representationsByProperty = HashMultimap.create(); + while (results.hasNext()) { + Entity property = results.next(); + String propertyName = property.key().name(); + List> representations = property.getList("property_representation"); + for (Value value : representations) { + representationsByProperty.put(propertyName, (String) value.get()); + } + } + // [END property_by_kind_run_query] + Multimap expected = HashMultimap.create(); + expected.put("type", "STRING"); + expected.put("done", "BOOLEAN"); + expected.put("completed", "BOOLEAN"); + expected.put("priority", "INT64"); + expected.put("created", "INT64"); + expected.put("percent_complete", "DOUBLE"); + expected.put("tag", "STRING"); + assertEquals(expected, representationsByProperty); + } + + @Test + public void testPropertyFilteringRunQuery() { + setUpQueryTests(); + // [START property_filtering_run_query] + KeyFactory keyFactory = datastore.newKeyFactory() + .kind("__property__") + .ancestors(PathElement.of("__kind__", "Task")); + Query query = Query.keyQueryBuilder() + .kind("__property__") + .filter(PropertyFilter.ge("__key__", keyFactory.newKey("priority"))) + .build(); + Multimap propertiesByKind = HashMultimap.create(); + QueryResults results = datastore.run(query); + while (results.hasNext()) { + Key property = results.next(); + String kind = property.ancestors().get(property.ancestors().size() - 1).name(); + String propertyName = property.name(); + propertiesByKind.put(kind, propertyName); + } + // [END property_filtering_run_query] + Multimap expected = HashMultimap.create(); + expected.put("Task", "priority"); + expected.put("Task", "tag"); + expected.put("Task", "type"); + assertEquals(expected, propertiesByKind); + } + + @Test + public void testGqlRunQuery() { + setUpQueryTests(); + // [START gql_run_query] + Query query = + Query.gqlQueryBuilder(ResultType.ENTITY, "select * from Task order by created asc").build(); + // [END gql_run_query] + assertValidQuery(query); + } + + @Test + public void testGqlNamedBindingQuery() { + setUpQueryTests(); + // [START gql_named_binding_query] + Query query = + Query.gqlQueryBuilder( + ResultType.ENTITY, + "select * from Task where completed = @completed and priority = @priority") + .setBinding("completed", false) + .setBinding("priority", 4) + .build(); + // [END gql_named_binding_query] + assertValidQuery(query); + } + + @Test + public void testGqlPositionalBindingQuery() { + setUpQueryTests(); + // [START gql_positional_binding_query] + Query query = Query.gqlQueryBuilder( + ResultType.ENTITY, "select * from Task where completed = @1 and priority = @2") + .addBinding(false) + .addBinding(4) + .build(); + // [END gql_positional_binding_query] + assertValidQuery(query); + } + + @Test + public void testGqlLiteralQuery() { + setUpQueryTests(); + // [START gql_literal_query] + Query query = Query.gqlQueryBuilder( + ResultType.ENTITY, "select * from Task where completed = false and priority = 4") + .allowLiteral(true) + .build(); + // [END gql_literal_query] + assertValidQuery(query); + } +} diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java new file mode 100644 index 000000000000..e5d9b8a04909 --- /dev/null +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -0,0 +1,232 @@ +/* + * Copyright 2016 Google Inc. All Rights Reserved. + * + * 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.snippets; + +import com.google.gcloud.datastore.Datastore; +import com.google.gcloud.datastore.DatastoreException; +import com.google.gcloud.datastore.DatastoreOptions; +import com.google.gcloud.datastore.DateTime; +import com.google.gcloud.datastore.Entity; +import com.google.gcloud.datastore.Key; +import com.google.gcloud.datastore.KeyFactory; +import com.google.gcloud.datastore.Query; +import com.google.gcloud.datastore.StringValue; +import com.google.gcloud.datastore.StructuredQuery.OrderBy; +import com.google.gcloud.datastore.Transaction; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * A simple Task List application demonstrating how to connect to Cloud Datastore, create, modify, + * delete, and query entities. + */ +public class TaskList { + + // [START build_service] + // Create an authorized Datastore service using Application Default Credentials. + private final Datastore datastore = DatastoreOptions.defaultInstance().service(); + + // Create a Key factory to construct keys associated with this project. + private final KeyFactory keyFactory = datastore.newKeyFactory().kind("Task"); + // [END build_service] + + // [START add_entity] + /** + * Adds a task entity to the Datastore. + * + * @param description The task description + * + * @return The {@link Key} of the entity. + */ + Key addTask(String description) { + Key key = datastore.allocateId(keyFactory.newKey()); + Entity task = Entity.builder(key) + .set("description", StringValue.builder(description).indexed(false).build()) + .set("created", DateTime.now()) + .set("done", false) + .build(); + datastore.put(task); + return key; + } + // [END add_entity] + + // [START update_entity] + /** + * Marks a task entity as done. + * + * @param id The ID of the task entity as given by {@link Key#id()} + * @throws DatastoreException if the task does not exist + */ + void markDone(long id) { + Transaction transaction = datastore.newTransaction(); + try { + Entity task = transaction.get(keyFactory.newKey(id)); + transaction.put(Entity.builder(task).set("done", true).build()); + transaction.commit(); + } finally { + if (transaction.active()) { + transaction.rollback(); + } + } + } + // [END update_entity] + + // [START retrieve_entities] + /** + * Returns a list of all task entities in ascending order of creation time. + */ + Iterator listTasks() { + Query query = + Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build(); + return datastore.run(query); + } + // [END retrieve_entities] + + // [START delete_entity] + /** + * Deletes a task entity. + * + * @param id The ID of the task entity as given by {@link Key#id()} + */ + void deleteTask(long id) { + datastore.delete(keyFactory.newKey(id)); + } + // [END delete_entity] + + // [START format_results] + /** + * Converts a list of task entities to a list of formatted task strings. + * + * @param tasks An iterator over task entities + * @returns A list of tasks strings, one per entity + */ + static List formatTasks(Iterator tasks) { + List strings = new ArrayList<>(); + while (tasks.hasNext()) { + Entity task = tasks.next(); + if (task.getBoolean("done")) { + strings.add( + String.format("%d : %s (done)", task.key().id(), task.getString("description"))); + } else { + strings.add(String.format("%d : %s (created %s)", task.key().id(), + task.getString("description"), task.getDateTime("created"))); + } + } + return strings; + } + // [END format_results] + + /** + * Handles a single command. + * + * @param commandLine A line of input provided by the user + */ + void handleCommandLine(String commandLine) { + String[] args = commandLine.split("\\s+"); + + if (args.length < 1) { + throw new IllegalArgumentException("not enough args"); + } + + String command = args[0]; + switch (command) { + case "new": + // Everything after the first whitespace token is interpreted to be the description. + args = commandLine.split("\\s+", 2); + if (args.length != 2) { + throw new IllegalArgumentException("missing description"); + } + // Set created to NOW() and done to false. + addTask(args[1]); + System.out.println("task added"); + break; + case "done": + assertArgsLength(args, 2); + long id = Long.parseLong(args[1]); + try { + markDone(id); + System.out.println("task marked done"); + } catch (DatastoreException e) { + System.out.printf("did not find a Task entity with ID %d\n", id); + } + break; + case "list": + assertArgsLength(args, 1); + List tasks = formatTasks(listTasks()); + System.out.printf("found %d tasks:\n", tasks.size()); + System.out.println("task ID : description"); + System.out.println("---------------------"); + for (String taskString : tasks) { + System.out.println(taskString); + } + break; + case "delete": + assertArgsLength(args, 2); + deleteTask(Long.parseLong(args[1])); + System.out.println("task deleted"); + break; + default: + throw new IllegalArgumentException("unrecognized command: " + command); + } + } + + private void assertArgsLength(String[] args, int expectedLength) { + if (args.length != expectedLength) { + throw new IllegalArgumentException( + String.format("expected exactly %d arg(s), found %d", expectedLength, args.length)); + } + } + + /** + * Exercises the methods defined in this class. + * + *

Assumes that you are authenticated using the Google Cloud SDK (using + * {@code gcloud auth login}). + */ + public static void main(String[] args) throws Exception { + TaskList taskList = new TaskList(); + System.out.println("Cloud Datastore Task List"); + System.out.println(); + printUsage(); + while (true) { + String commandLine = System.console().readLine("> "); + if (commandLine.trim().isEmpty()) { + break; + } + try { + taskList.handleCommandLine(commandLine); + } catch (IllegalArgumentException e) { + System.out.println(e.getMessage()); + printUsage(); + } + } + System.out.println("exiting"); + System.exit(0); + } + + private static void printUsage() { + System.out.println("Usage:"); + System.out.println(); + System.out.println(" new Adds a task with a description "); + System.out.println(" done Marks a task as done"); + System.out.println(" list Lists all tasks by creation time"); + System.out.println(" delete Deletes a task"); + System.out.println(); + } +} From 9f747fcffde02e102f7fd7ebf7a70033faaa482d Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Wed, 10 Feb 2016 14:31:23 -0800 Subject: [PATCH 0013/1784] Minor fixes --- .../google/datastore/snippets/Concepts.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index ae38b0070aaf..b1b5624c59a7 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -312,8 +312,9 @@ private List setUpBatchTests(Key taskKey1, Key taskKey2) { @Test public void testBatchUpsert() { - Key taskKey1 = keyFactory.newKey(1); - Key taskKey2 = keyFactory.newKey(2); + // [START batch_upsert] + Key taskKey1 = datastore.allocateId(keyFactory.newKey()); + Key taskKey2 = datastore.allocateId(keyFactory.newKey()); Entity task1 = Entity.builder(taskKey1) .set("type", "Personal") .set("done", false) @@ -326,7 +327,6 @@ public void testBatchUpsert() { .set("priority", 5) .set("description", "Integrate Cloud Datastore") .build(); - // [START batch_upsert] Batch batch = datastore.newBatch(); batch.put(task1, task2); batch.submit(); @@ -737,15 +737,9 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) { @Test public void testEventualConsistentQuery() { - setUpQueryTests(); // [START eventual_consistent_query] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.hasAncestor( - datastore.newKeyFactory().kind("TaskList").newKey("default"))) - .build(); + // Read consistency cannot be specified in gcloud-java. // [END eventual_consistent_query] - assertValidQuery(query); } @Test @@ -795,8 +789,8 @@ public void testTransactionalUpdate() { assertSuccessfulTransfer(keys.get(0), keys.get(1)); } - private void transferFunds(Key fromKey, Key toKey, long amount) { - // [START transactional_update] + // [START transactional_update] + void transferFunds(Key fromKey, Key toKey, long amount) { Transaction txn = datastore.newTransaction(); try { Entity from = txn.get(fromKey); @@ -811,8 +805,8 @@ private void transferFunds(Key fromKey, Key toKey, long amount) { txn.rollback(); } } - // [END transactional_update] } + // [END transactional_update] @Test public void testTransactionalRetry() { From 27f89144302e656600a144548a19314bc334b5e3 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Wed, 10 Feb 2016 16:54:24 -0800 Subject: [PATCH 0014/1784] Fix batchUpsert snippet + minor changes for consiceness --- .../google/datastore/snippets/Concepts.java | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index b1b5624c59a7..640ea130d285 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -110,7 +110,7 @@ public static void beforeClass() throws IOException, InterruptedException { public void setUp() { datastore = DatastoreOptions.builder() .projectId(PROJECT_ID) - .namespace("ghijklmnop") // for namespace metadata query + .namespace("ghijklmnop") .host("http://localhost:" + PORT) .build() .service(); @@ -120,15 +120,13 @@ public void setUp() { keyFactory = datastore.newKeyFactory().kind("Task"); taskKey = keyFactory.newKey("some-arbitrary-key"); testEntity = Entity.builder(taskKey, TEST_FULL_ENTITY).build(); - Calendar startDateCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - startDateCalendar.set(1990, 1, 1); - startDate = DateTime.copyFrom(startDateCalendar); - Calendar endDateCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - endDateCalendar.set(2000, 1, 1); - endDate = DateTime.copyFrom(endDateCalendar); - Calendar includedCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - includedCalendar.set(1999, 12, 31); - includedDate = DateTime.copyFrom(includedCalendar); + Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + calendar.set(1990, 1, 1); + startDate = DateTime.copyFrom(calendar); + calendar.set(2000, 1, 1); + endDate = DateTime.copyFrom(calendar); + calendar.set(1999, 12, 31); + includedDate = DateTime.copyFrom(calendar); } /** @@ -195,9 +193,11 @@ private void assertValidEntity(Entity original) { @Test public void testEntityWithParent() { // [START entity_with_parent] - KeyFactory keyFactory = - datastore.newKeyFactory().ancestors(PathElement.of("TaskList", "default")).kind("Task"); - Entity task = Entity.builder(keyFactory.newKey("sampleTask")) + Key taskKey = datastore.newKeyFactory() + .ancestors(PathElement.of("TaskList", "default")) + .kind("Task") + .newKey("sampleTask"); + Entity task = Entity.builder(taskKey) .set("type", "Personal") .set("done", false) .set("priority", 4) @@ -313,26 +313,25 @@ private List setUpBatchTests(Key taskKey1, Key taskKey2) { @Test public void testBatchUpsert() { // [START batch_upsert] - Key taskKey1 = datastore.allocateId(keyFactory.newKey()); - Key taskKey2 = datastore.allocateId(keyFactory.newKey()); - Entity task1 = Entity.builder(taskKey1) + FullEntity task1 = FullEntity.builder(keyFactory.newKey()) .set("type", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") .build(); - Entity task2 = Entity.builder(taskKey2) + FullEntity task2 = Entity.builder(keyFactory.newKey()) .set("type", "Personal") .set("done", false) .set("priority", 5) .set("description", "Integrate Cloud Datastore") .build(); Batch batch = datastore.newBatch(); - batch.put(task1, task2); - batch.submit(); + batch.addWithDeferredIdAllocation(task1, task2); + Batch.Response response = batch.submit(); + List taskKeys = response.generatedKeys(); // keys listed in order of insertion // [END batch_upsert] - assertEquals(task1, datastore.get(taskKey1)); - assertEquals(task2, datastore.get(taskKey2)); + assertEquals(Entity.builder(taskKeys.get(0), task1).build(), datastore.get(taskKeys.get(0))); + assertEquals(Entity.builder(taskKeys.get(1), task2).build(), datastore.get(taskKeys.get(1))); } @Test @@ -443,7 +442,7 @@ public void testKeyFilter() { // [START key_filter] Query query = Query.entityQueryBuilder() .kind("Task") - .filter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) + .filter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) .build(); // [END key_filter] assertValidQuery(query); @@ -946,10 +945,10 @@ public void testPropertyRunQuery() { public void testPropertyByKindRunQuery() { setUpQueryTests(); // [START property_by_kind_run_query] - KeyFactory keyFactory = datastore.newKeyFactory().kind("__kind__"); + Key key = datastore.newKeyFactory().kind("__kind__").newKey("Task"); Query query = Query.entityQueryBuilder() .kind("__property__") - .filter(PropertyFilter.hasAncestor(keyFactory.newKey("Task"))) + .filter(PropertyFilter.hasAncestor(key)) .build(); QueryResults results = datastore.run(query); Multimap representationsByProperty = HashMultimap.create(); @@ -977,12 +976,14 @@ public void testPropertyByKindRunQuery() { public void testPropertyFilteringRunQuery() { setUpQueryTests(); // [START property_filtering_run_query] - KeyFactory keyFactory = datastore.newKeyFactory() + Key key = + datastore.newKeyFactory() .kind("__property__") - .ancestors(PathElement.of("__kind__", "Task")); + .ancestors(PathElement.of("__kind__", "Task")) + .newKey("priority"); Query query = Query.keyQueryBuilder() .kind("__property__") - .filter(PropertyFilter.ge("__key__", keyFactory.newKey("priority"))) + .filter(PropertyFilter.ge("__key__", key)) .build(); Multimap propertiesByKind = HashMultimap.create(); QueryResults results = datastore.run(query); From 846946cc636c930338f9a4881a9d90bbce18c0db Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 11 Feb 2016 10:10:27 -0800 Subject: [PATCH 0015/1784] Style fixes and minor bug fixes --- .../google/datastore/snippets/Concepts.java | 154 +++++++++--------- .../google/datastore/snippets/TaskList.java | 9 +- 2 files changed, 79 insertions(+), 84 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index 640ea130d285..0fac1d1b125c 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -16,16 +16,16 @@ package com.google.datastore.snippets; +import static java.util.Calendar.DECEMBER; +import static java.util.Calendar.JANUARY; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; -import com.google.common.collect.Multimap; -import com.google.gcloud.datastore.Batch; import com.google.gcloud.datastore.Cursor; import com.google.gcloud.datastore.Datastore; import com.google.gcloud.datastore.DatastoreException; @@ -46,6 +46,7 @@ import com.google.gcloud.datastore.StructuredQuery; import com.google.gcloud.datastore.StructuredQuery.CompositeFilter; import com.google.gcloud.datastore.StructuredQuery.OrderBy; +import com.google.gcloud.datastore.StructuredQuery.Projection; import com.google.gcloud.datastore.StructuredQuery.PropertyFilter; import com.google.gcloud.datastore.Transaction; import com.google.gcloud.datastore.Value; @@ -61,9 +62,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.TimeZone; /** @@ -121,11 +127,11 @@ public void setUp() { taskKey = keyFactory.newKey("some-arbitrary-key"); testEntity = Entity.builder(taskKey, TEST_FULL_ENTITY).build(); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - calendar.set(1990, 1, 1); + calendar.set(1990, JANUARY, 1); startDate = DateTime.copyFrom(calendar); - calendar.set(2000, 1, 1); + calendar.set(2000, JANUARY, 1); endDate = DateTime.copyFrom(calendar); - calendar.set(1999, 12, 31); + calendar.set(1999, DECEMBER, 31); includedDate = DateTime.copyFrom(calendar); } @@ -158,8 +164,7 @@ public void testIncompleteKey() { @Test public void testNamedKey() { // [START named_key] - KeyFactory keyFactory = datastore.newKeyFactory().kind("Task"); - Key taskKey = keyFactory.newKey("sampleTask"); + Key taskKey = datastore.newKeyFactory().kind("Task").newKey("sampleTask"); // [END named_key] assertValidKey(taskKey); } @@ -167,9 +172,10 @@ public void testNamedKey() { @Test public void testKeyWithParent() { // [START key_with_parent] - KeyFactory keyFactory = - datastore.newKeyFactory().ancestors(PathElement.of("TaskList", "default")).kind("Task"); - Key taskKey = keyFactory.newKey("sampleTask"); + Key taskKey = datastore.newKeyFactory() + .ancestors(PathElement.of("TaskList", "default")) + .kind("Task") + .newKey("sampleTask"); // [END key_with_parent] assertValidKey(taskKey); } @@ -249,8 +255,7 @@ public void testBasicEntity() { @Test public void testUpsert() { // [START upsert] - Key taskKey = datastore.allocateId(keyFactory.newKey()); - Entity task = Entity.builder(taskKey).build(); + Entity task = Entity.builder(keyFactory.newKey("sampleTask")).build(); datastore.put(task); // [END upsert] assertEquals(task, datastore.get(task.key())); @@ -259,10 +264,9 @@ public void testUpsert() { @Test public void testInsert() { // [START insert] - Entity task = Entity.builder(taskKey).build(); - Key taskKey = datastore.add(task).key(); + Key taskKey = datastore.add(FullEntity.builder(keyFactory.newKey()).build()).key(); // [END insert] - assertEquals(task, datastore.get(taskKey)); + assertEquals(FullEntity.builder(taskKey).build(), datastore.get(taskKey)); } @Test @@ -325,13 +329,12 @@ public void testBatchUpsert() { .set("priority", 5) .set("description", "Integrate Cloud Datastore") .build(); - Batch batch = datastore.newBatch(); - batch.addWithDeferredIdAllocation(task1, task2); - Batch.Response response = batch.submit(); - List taskKeys = response.generatedKeys(); // keys listed in order of insertion + List tasks = datastore.add(task1, task2); + Key taskKey1 = tasks.get(0).key(); + Key taskKey2 = tasks.get(1).key(); // [END batch_upsert] - assertEquals(Entity.builder(taskKeys.get(0), task1).build(), datastore.get(taskKeys.get(0))); - assertEquals(Entity.builder(taskKeys.get(1), task2).build(), datastore.get(taskKeys.get(1))); + assertEquals(Entity.builder(taskKey1, task1).build(), datastore.get(taskKey1)); + assertEquals(Entity.builder(taskKey2, task2).build(), datastore.get(taskKey2)); } @Test @@ -352,18 +355,18 @@ public void testBatchDelete() { Key taskKey2 = keyFactory.newKey(2); setUpBatchTests(taskKey1, taskKey2); // [START batch_delete] - Batch batch = datastore.newBatch(); - batch.delete(taskKey1, taskKey2); - batch.submit(); + datastore.delete(taskKey1, taskKey2); // [END batch_delete] assertNull(datastore.get(taskKey1)); assertNull(datastore.get(taskKey2)); } private void setUpQueryTests() { - KeyFactory keyFactory = - datastore.newKeyFactory().kind("Task").ancestors(PathElement.of("TaskList", "default")); - datastore.put(Entity.builder(keyFactory.newKey("someTask")) + Key taskKey = datastore.newKeyFactory() + .kind("Task") + .ancestors(PathElement.of("TaskList", "default")) + .newKey("someTask"); + datastore.put(Entity.builder(taskKey) .set("type", "Personal") .set("done", false) .set("completed", false) @@ -371,8 +374,7 @@ private void setUpQueryTests() { .set("created", includedDate) .set("percent_complete", 10.0) .set("description", StringValue.builder("Learn Cloud Datastore").indexed(false).build()) - .set("tag", ImmutableList.of(StringValue.of("fun"), StringValue.of("l"), - StringValue.of("programming"))) + .set("tag", StringValue.of("fun"), StringValue.of("l"), StringValue.of("programming")) .build()); } @@ -510,9 +512,7 @@ public void testProjectionQuery() { // [START projection_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection( - StructuredQuery.Projection.property("priority"), - StructuredQuery.Projection.property("percent_complete")) + .projection(Projection.property("priority"), Projection.property("percent_complete")) .build(); // [END projection_query] assertValidQuery(query); @@ -523,13 +523,11 @@ public void testRunProjectionQuery() { setUpQueryTests(); Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection( - StructuredQuery.Projection.property("priority"), - StructuredQuery.Projection.property("percent_complete")) + .projection(Projection.property("priority"), Projection.property("percent_complete")) .build(); + // [START run_query_projection] List priorities = new LinkedList<>(); List percentCompletes = new LinkedList<>(); - // [START run_query_projection] QueryResults tasks = datastore.run(query); while (tasks.hasNext()) { ProjectionEntity task = tasks.next(); @@ -567,8 +565,7 @@ public void testDistinctQuery() { // [START distinct_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection(StructuredQuery.Projection.property("type"), - StructuredQuery.Projection.property("priority")) + .projection(Projection.property("type"), Projection.property("priority")) .groupBy("type", "priority") .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) .build(); @@ -582,8 +579,7 @@ public void testDistinctOnQuery() { // [START distinct_on_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection(StructuredQuery.Projection.property("type"), - StructuredQuery.Projection.first("priority")) + .projection(Projection.property("type"), Projection.first("priority")) .groupBy("type") .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) .build(); @@ -719,17 +715,12 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) { queryBuilder.startCursor(pageCursor); } QueryResults tasks = datastore.run(queryBuilder.build()); - Entity task = null; + Entity task; while (tasks.hasNext()) { task = tasks.next(); // do something with the task } - Cursor nextPageCursor = null; - if (task != null && tasks.cursorAfter() != null) { - nextPageCursor = tasks.cursorAfter(); - // Call nextPageCursor.toUrlSafe() if you want an encoded cursor that can be used as part of a - // URL. - } + Cursor nextPageCursor = tasks.cursorAfter(); // [END cursor_paging] return nextPageCursor; } @@ -792,10 +783,11 @@ public void testTransactionalUpdate() { void transferFunds(Key fromKey, Key toKey, long amount) { Transaction txn = datastore.newTransaction(); try { - Entity from = txn.get(fromKey); + List entities = txn.fetch(fromKey, toKey); + Entity from = entities.get(0); Entity updatedFrom = Entity.builder(from).set("balance", from.getLong("balance") - amount).build(); - Entity to = txn.get(toKey); + Entity to = entities.get(1); Entity updatedTo = Entity.builder(to).set("balance", to.getLong("balance") + amount).build(); txn.put(updatedFrom, updatedTo); txn.commit(); @@ -825,6 +817,7 @@ public void testTransactionalRetry() { --retries; } } + // Retry handling can also be configured and automatically applied using gcloud-java. // [END transactional_retry] assertSuccessfulTransfer(keys.get(0), keys.get(1)); } @@ -835,9 +828,8 @@ public void testTransactionalGetOrCreate() { Entity task; Transaction txn = datastore.newTransaction(); try { - try { - task = txn.get(taskKey); - } catch (DatastoreException e) { + task = txn.get(taskKey); + if (task == null) { task = Entity.builder(taskKey).build(); txn.put(task); txn.commit(); @@ -922,22 +914,22 @@ public void testPropertyRunQuery() { // [START property_run_query] Query query = Query.keyQueryBuilder().kind("__property__").build(); QueryResults results = datastore.run(query); - Multimap propertiesByKind = HashMultimap.create(); + Map> propertiesByKind = new HashMap<>(); while (results.hasNext()) { Key property = results.next(); String kind = property.ancestors().get(property.ancestors().size() - 1).name(); String propertyName = property.name(); - propertiesByKind.put(kind, propertyName); + if (!propertiesByKind.containsKey(kind)) { + propertiesByKind.put(kind, new HashSet()); + } + propertiesByKind.get(kind).add(propertyName); } // [END property_run_query] - Multimap expected = HashMultimap.create(); - expected.put("Task", "type"); - expected.put("Task", "done"); - expected.put("Task", "completed"); - expected.put("Task", "priority"); - expected.put("Task", "created"); - expected.put("Task", "percent_complete"); - expected.put("Task", "tag"); + Map> expected = new HashMap<>(); + expected.put( + "Task", + ImmutableSet.of( + "done", "type", "done", "completed", "priority", "created", "percent_complete", "tag")); assertEquals(expected, propertiesByKind); } @@ -951,24 +943,27 @@ public void testPropertyByKindRunQuery() { .filter(PropertyFilter.hasAncestor(key)) .build(); QueryResults results = datastore.run(query); - Multimap representationsByProperty = HashMultimap.create(); + Map> representationsByProperty = new HashMap<>(); while (results.hasNext()) { Entity property = results.next(); String propertyName = property.key().name(); List> representations = property.getList("property_representation"); + if (!representationsByProperty.containsKey(propertyName)) { + representationsByProperty.put(propertyName, new HashSet()); + } for (Value value : representations) { - representationsByProperty.put(propertyName, (String) value.get()); + representationsByProperty.get(propertyName).add((String) value.get()); } } // [END property_by_kind_run_query] - Multimap expected = HashMultimap.create(); - expected.put("type", "STRING"); - expected.put("done", "BOOLEAN"); - expected.put("completed", "BOOLEAN"); - expected.put("priority", "INT64"); - expected.put("created", "INT64"); - expected.put("percent_complete", "DOUBLE"); - expected.put("tag", "STRING"); + Map> expected = new HashMap<>(); + expected.put("type", Collections.singleton("STRING")); + expected.put("done", Collections.singleton("BOOLEAN")); + expected.put("completed", Collections.singleton("BOOLEAN")); + expected.put("priority", Collections.singleton("INT64")); + expected.put("created", Collections.singleton("INT64")); + expected.put("percent_complete", Collections.singleton("DOUBLE")); + expected.put("tag", Collections.singleton("STRING")); assertEquals(expected, representationsByProperty); } @@ -985,19 +980,20 @@ public void testPropertyFilteringRunQuery() { .kind("__property__") .filter(PropertyFilter.ge("__key__", key)) .build(); - Multimap propertiesByKind = HashMultimap.create(); + Map> propertiesByKind = new HashMap<>(); QueryResults results = datastore.run(query); while (results.hasNext()) { Key property = results.next(); String kind = property.ancestors().get(property.ancestors().size() - 1).name(); String propertyName = property.name(); - propertiesByKind.put(kind, propertyName); + if (!propertiesByKind.containsKey(kind)) { + propertiesByKind.put(kind, new HashSet()); + } + propertiesByKind.get(kind).add(propertyName); } // [END property_filtering_run_query] - Multimap expected = HashMultimap.create(); - expected.put("Task", "priority"); - expected.put("Task", "tag"); - expected.put("Task", "type"); + Map> expected = new HashMap<>(); + expected.put("Task", ImmutableSet.of("priority", "tag", "type")); assertEquals(expected, propertiesByKind); } diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index e5d9b8a04909..40920e291cda 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -51,7 +51,6 @@ public class TaskList { * Adds a task entity to the Datastore. * * @param description The task description - * * @return The {@link Key} of the entity. */ Key addTask(String description) { @@ -114,7 +113,7 @@ void deleteTask(long id) { * Converts a list of task entities to a list of formatted task strings. * * @param tasks An iterator over task entities - * @returns A list of tasks strings, one per entity + * @return A list of tasks strings, one per entity */ static List formatTasks(Iterator tasks) { List strings = new ArrayList<>(); @@ -152,7 +151,7 @@ void handleCommandLine(String commandLine) { if (args.length != 2) { throw new IllegalArgumentException("missing description"); } - // Set created to NOW() and done to false. + // Set created to now() and done to false. addTask(args[1]); System.out.println("task added"); break; @@ -163,13 +162,13 @@ void handleCommandLine(String commandLine) { markDone(id); System.out.println("task marked done"); } catch (DatastoreException e) { - System.out.printf("did not find a Task entity with ID %d\n", id); + System.out.printf("did not find a Task entity with ID %d%n", id); } break; case "list": assertArgsLength(args, 1); List tasks = formatTasks(listTasks()); - System.out.printf("found %d tasks:\n", tasks.size()); + System.out.printf("found %d tasks:%n", tasks.size()); System.out.println("task ID : description"); System.out.println("---------------------"); for (String taskString : tasks) { From 5f308aa0741e2961b314e13e8c7d3c8415854210 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 11 Feb 2016 16:38:45 -0800 Subject: [PATCH 0016/1784] Fix nits in pom/README/concept snippets --- .../google/datastore/snippets/Concepts.java | 64 ++++++++++--------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index 0fac1d1b125c..eedd05c7bdca 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertNull; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; import com.google.gcloud.datastore.Cursor; @@ -49,7 +50,6 @@ import com.google.gcloud.datastore.StructuredQuery.Projection; import com.google.gcloud.datastore.StructuredQuery.PropertyFilter; import com.google.gcloud.datastore.Transaction; -import com.google.gcloud.datastore.Value; import com.google.gcloud.datastore.testing.LocalGcdHelper; import org.junit.AfterClass; @@ -715,9 +715,8 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) { queryBuilder.startCursor(pageCursor); } QueryResults tasks = datastore.run(queryBuilder.build()); - Entity task; while (tasks.hasNext()) { - task = tasks.next(); + Entity task = tasks.next(); // do something with the task } Cursor nextPageCursor = tasks.cursorAfter(); @@ -919,17 +918,16 @@ public void testPropertyRunQuery() { Key property = results.next(); String kind = property.ancestors().get(property.ancestors().size() - 1).name(); String propertyName = property.name(); - if (!propertiesByKind.containsKey(kind)) { - propertiesByKind.put(kind, new HashSet()); + Collection properties = propertiesByKind.get(kind); + if (properties == null) { + properties = new HashSet<>(); + propertiesByKind.put(kind, properties); } - propertiesByKind.get(kind).add(propertyName); + properties.add(propertyName); } // [END property_run_query] - Map> expected = new HashMap<>(); - expected.put( - "Task", - ImmutableSet.of( - "done", "type", "done", "completed", "priority", "created", "percent_complete", "tag")); + Map> expected = ImmutableMap.of("Task", ImmutableSet.of( + "done", "type", "done", "completed", "priority", "created", "percent_complete", "tag")); assertEquals(expected, propertiesByKind); } @@ -940,30 +938,34 @@ public void testPropertyByKindRunQuery() { Key key = datastore.newKeyFactory().kind("__kind__").newKey("Task"); Query query = Query.entityQueryBuilder() .kind("__property__") - .filter(PropertyFilter.hasAncestor(key)) + .filter(PropertyFilter.hasAncestor(key)) .build(); QueryResults results = datastore.run(query); Map> representationsByProperty = new HashMap<>(); while (results.hasNext()) { Entity property = results.next(); String propertyName = property.key().name(); - List> representations = property.getList("property_representation"); - if (!representationsByProperty.containsKey(propertyName)) { - representationsByProperty.put(propertyName, new HashSet()); + List representations = + (List) property.getList("property_representation"); + Collection currentRepresentations = representationsByProperty.get(propertyName); + if (currentRepresentations == null) { + currentRepresentations = new HashSet<>(); + representationsByProperty.put(propertyName, currentRepresentations); } - for (Value value : representations) { - representationsByProperty.get(propertyName).add((String) value.get()); + for (StringValue value : representations) { + currentRepresentations.add(value.get()); } } // [END property_by_kind_run_query] - Map> expected = new HashMap<>(); - expected.put("type", Collections.singleton("STRING")); - expected.put("done", Collections.singleton("BOOLEAN")); - expected.put("completed", Collections.singleton("BOOLEAN")); - expected.put("priority", Collections.singleton("INT64")); - expected.put("created", Collections.singleton("INT64")); - expected.put("percent_complete", Collections.singleton("DOUBLE")); - expected.put("tag", Collections.singleton("STRING")); + Map> expected = ImmutableMap.>builder() + .put("type", Collections.singleton("STRING")) + .put("done", Collections.singleton("BOOLEAN")) + .put("completed", Collections.singleton("BOOLEAN")) + .put("priority", Collections.singleton("INT64")) + .put("created", Collections.singleton("INT64")) + .put("percent_complete", Collections.singleton("DOUBLE")) + .put("tag", Collections.singleton("STRING")) + .build(); assertEquals(expected, representationsByProperty); } @@ -986,14 +988,16 @@ public void testPropertyFilteringRunQuery() { Key property = results.next(); String kind = property.ancestors().get(property.ancestors().size() - 1).name(); String propertyName = property.name(); - if (!propertiesByKind.containsKey(kind)) { - propertiesByKind.put(kind, new HashSet()); + Collection properties = propertiesByKind.get(kind); + if (properties == null) { + properties = new HashSet(); + propertiesByKind.put(kind, properties); } - propertiesByKind.get(kind).add(propertyName); + properties.add(propertyName); } // [END property_filtering_run_query] - Map> expected = new HashMap<>(); - expected.put("Task", ImmutableSet.of("priority", "tag", "type")); + Map> expected = + ImmutableMap.of("Task", ImmutableSet.of("priority", "tag", "type")); assertEquals(expected, propertiesByKind); } From e78031b61c88b3c0c93cc381c44d797ba9421198 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Tue, 16 Feb 2016 09:09:24 -0800 Subject: [PATCH 0017/1784] Indentation fix --- .../java/com/google/datastore/snippets/Concepts.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index eedd05c7bdca..1f6295524c5b 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -973,14 +973,13 @@ public void testPropertyByKindRunQuery() { public void testPropertyFilteringRunQuery() { setUpQueryTests(); // [START property_filtering_run_query] - Key key = - datastore.newKeyFactory() + Key key = datastore.newKeyFactory() .kind("__property__") - .ancestors(PathElement.of("__kind__", "Task")) - .newKey("priority"); + .ancestors(PathElement.of("__kind__", "Task")) + .newKey("priority"); Query query = Query.keyQueryBuilder() .kind("__property__") - .filter(PropertyFilter.ge("__key__", key)) + .filter(PropertyFilter.ge("__key__", key)) .build(); Map> propertiesByKind = new HashMap<>(); QueryResults results = datastore.run(query); From 978e334caa0df04b75c53ab6e44276805316dcf1 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 19 Feb 2016 16:58:04 -0800 Subject: [PATCH 0018/1784] Set source/target to jdk 1.7 and use latest gcloud-java release features --- .../google/datastore/snippets/Concepts.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index 1f6295524c5b..cf07e725d334 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -104,7 +104,7 @@ public class Concepts { @BeforeClass public static void beforeClass() throws IOException, InterruptedException { if (!LocalGcdHelper.isActive(PROJECT_ID, PORT)) { - gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT); + gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT, 1.0); } } @@ -232,8 +232,8 @@ public void testProperties() { public void testArrayValue() { // [START array_value] Entity task = Entity.builder(taskKey) - .set("tags", StringValue.of("fun"), StringValue.of("programming")) - .set("collaborators", StringValue.of("alice"), StringValue.of("bob")) + .set("tags", "fun", "programming") + .set("collaborators", "alice", "bob") .build(); // [END array_value] assertValidEntity(task); @@ -374,7 +374,7 @@ private void setUpQueryTests() { .set("created", includedDate) .set("percent_complete", 10.0) .set("description", StringValue.builder("Learn Cloud Datastore").indexed(false).build()) - .set("tag", StringValue.of("fun"), StringValue.of("l"), StringValue.of("programming")) + .set("tag", "fun", "l", "programming") .build()); } @@ -748,9 +748,8 @@ public void testUnindexedPropertyQuery() { public void testExplodingProperties() { // [START exploding_properties] Entity task = Entity.builder(taskKey) - .set("tags", StringValue.of("fun"), StringValue.of("programming"), StringValue.of("learn")) - .set("collaborators", StringValue.of("alice"), StringValue.of("bob"), - StringValue.of("charlie")) + .set("tags", "fun", "programming", "learn") + .set("collaborators", "alice", "bob", "charlie") .set("created", DateTime.now()) .build(); // [END exploding_properties] @@ -916,7 +915,7 @@ public void testPropertyRunQuery() { Map> propertiesByKind = new HashMap<>(); while (results.hasNext()) { Key property = results.next(); - String kind = property.ancestors().get(property.ancestors().size() - 1).name(); + String kind = property.parent().name(); String propertyName = property.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { @@ -945,8 +944,7 @@ public void testPropertyByKindRunQuery() { while (results.hasNext()) { Entity property = results.next(); String propertyName = property.key().name(); - List representations = - (List) property.getList("property_representation"); + List representations = property.getList("property_representation"); Collection currentRepresentations = representationsByProperty.get(propertyName); if (currentRepresentations == null) { currentRepresentations = new HashSet<>(); @@ -985,7 +983,7 @@ public void testPropertyFilteringRunQuery() { QueryResults results = datastore.run(query); while (results.hasNext()) { Key property = results.next(); - String kind = property.ancestors().get(property.ancestors().size() - 1).name(); + String kind = property.parent().name(); String propertyName = property.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { From e07336cb2c8d715f89bbaabe1425d5f2768dc010 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Mon, 22 Feb 2016 08:08:55 -0800 Subject: [PATCH 0019/1784] Variable renames --- .../google/datastore/snippets/Concepts.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index cf07e725d334..30954447e8bd 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -911,12 +911,12 @@ public void testPropertyRunQuery() { setUpQueryTests(); // [START property_run_query] Query query = Query.keyQueryBuilder().kind("__property__").build(); - QueryResults results = datastore.run(query); + QueryResults keys = datastore.run(query); Map> propertiesByKind = new HashMap<>(); - while (results.hasNext()) { - Key property = results.next(); - String kind = property.parent().name(); - String propertyName = property.name(); + while (keys.hasNext()) { + Key key = keys.next(); + String kind = key.parent().name(); + String propertyName = key.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { properties = new HashSet<>(); @@ -942,9 +942,9 @@ public void testPropertyByKindRunQuery() { QueryResults results = datastore.run(query); Map> representationsByProperty = new HashMap<>(); while (results.hasNext()) { - Entity property = results.next(); - String propertyName = property.key().name(); - List representations = property.getList("property_representation"); + Entity result = results.next(); + String propertyName = result.key().name(); + List representations = result.getList("property_representation"); Collection currentRepresentations = representationsByProperty.get(propertyName); if (currentRepresentations == null) { currentRepresentations = new HashSet<>(); @@ -971,20 +971,20 @@ public void testPropertyByKindRunQuery() { public void testPropertyFilteringRunQuery() { setUpQueryTests(); // [START property_filtering_run_query] - Key key = datastore.newKeyFactory() + Key startKey = datastore.newKeyFactory() .kind("__property__") .ancestors(PathElement.of("__kind__", "Task")) .newKey("priority"); Query query = Query.keyQueryBuilder() .kind("__property__") - .filter(PropertyFilter.ge("__key__", key)) + .filter(PropertyFilter.ge("__key__", startKey)) .build(); Map> propertiesByKind = new HashMap<>(); - QueryResults results = datastore.run(query); - while (results.hasNext()) { - Key property = results.next(); - String kind = property.parent().name(); - String propertyName = property.name(); + QueryResults keys = datastore.run(query); + while (keys.hasNext()) { + Key key = keys.next(); + String kind = key.parent().name(); + String propertyName = key.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { properties = new HashSet(); From 34bfe3c13a23f8d76d45e2167cd6e71071ec8fb7 Mon Sep 17 00:00:00 2001 From: Patrick Costello Date: Tue, 29 Mar 2016 14:40:00 -0700 Subject: [PATCH 0020/1784] Update to v1beta3. Change-Id: I045ae46d2ac2c4a8685ed8538137a8dbdf94028d --- .../datastore/client/DatastoreFactory.java | 69 -- .../datastore/client/DatastoreHelper.java | 599 -------------- .../datastore/client/DatastoreOptions.java | 150 ---- .../v1beta3}/client/Datastore.java | 37 +- .../v1beta3}/client/DatastoreException.java | 28 +- .../v1beta3/client/DatastoreFactory.java} | 119 +-- .../v1beta3/client/DatastoreHelper.java | 749 ++++++++++++++++++ .../v1beta3/client/DatastoreOptions.java | 188 +++++ .../client/LocalDevelopmentDatastore.java | 66 +- .../LocalDevelopmentDatastoreException.java | 5 +- .../LocalDevelopmentDatastoreFactory.java | 8 +- .../LocalDevelopmentDatastoreOptions.java | 4 +- .../v1beta3}/client/QuerySplitter.java | 30 +- .../v1beta3}/client/QuerySplitterImpl.java | 78 +- .../v1beta3}/client/RemoteRpc.java | 80 +- .../v1beta3/client/DatastoreFactoryTest.java | 107 +++ .../v1beta3/client/DatastoreHelperTest.java | 355 +++++++++ .../v1beta3/client/DatastoreTest.java | 362 +++++++++ .../client/LocalDevelopmentDatastoreTest.java | 96 +++ .../v1beta3/client/RemoteRpcTest.java | 87 ++ 20 files changed, 2199 insertions(+), 1018 deletions(-) delete mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java delete mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java delete mode 100644 datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/Datastore.java (70%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/DatastoreException.java (69%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore/client/BaseDatastoreFactory.java => datastore/v1beta3/client/DatastoreFactory.java} (55%) create mode 100644 datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java create mode 100644 datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/LocalDevelopmentDatastore.java (86%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/LocalDevelopmentDatastoreException.java (89%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/LocalDevelopmentDatastoreFactory.java (89%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/LocalDevelopmentDatastoreOptions.java (93%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/QuerySplitter.java (55%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/QuerySplitterImpl.java (79%) rename datastore-v1-proto-client/src/main/java/com/google/{api/services/datastore => datastore/v1beta3}/client/RemoteRpc.java (53%) create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreFactoryTest.java create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreHelperTest.java create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreTest.java create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/RemoteRpcTest.java diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java deleted file mode 100644 index cfd9d84c8eae..000000000000 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreFactory.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2013 Google Inc. All Rights Reserved. - * - * 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.api.services.datastore.client; - -import java.net.URI; -import java.net.URISyntaxException; - -/** - * Client factory for {@link Datastore}. - * - */ -public class DatastoreFactory extends BaseDatastoreFactory{ - /** Singleton factory instance. */ - private static final DatastoreFactory INSTANCE = new DatastoreFactory(); - - /** API version. */ - public static final String VERSION = "v1beta2"; - - public static DatastoreFactory get() { - return INSTANCE; - } - - /** - * Provides access to a datastore using the provided options. Logs - * into the application using the credentials available via these - * options. - * - * @throws IllegalArgumentException if the server or credentials weren't provided. - */ - @Override - public Datastore create(DatastoreOptions options) throws IllegalArgumentException { - return new Datastore(newRemoteRpc(options)); - } - - /** - * Build a valid datastore URL. - */ - @Override - protected String buildUrl(DatastoreOptions options, String overrideUrl) { - try { - if (options.getDataset() == null) { - throw new IllegalArgumentException("datastore dataset not set in options"); - } - String url; - if (overrideUrl != null) { - url = String.format("%s/datasets/%s", overrideUrl, options.getDataset()); - } else { - url = String.format("%s/datastore/%s/datasets/%s", - options.getHost(), VERSION, options.getDataset()); - } - return new URI(url).toString(); - } catch (URISyntaxException e) { - throw new IllegalArgumentException(e); - } - } -} \ No newline at end of file diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java deleted file mode 100644 index 9724ea3fb477..000000000000 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreHelper.java +++ /dev/null @@ -1,599 +0,0 @@ -/* - * Copyright 2013 Google Inc. All Rights Reserved. - * - * 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.api.services.datastore.client; - -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; -import com.google.api.client.googleapis.compute.ComputeCredential; -import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.client.json.jackson.JacksonFactory; -import com.google.api.services.datastore.DatastoreV1.CompositeFilter; -import com.google.api.services.datastore.DatastoreV1.Entity; -import com.google.api.services.datastore.DatastoreV1.EntityOrBuilder; -import com.google.api.services.datastore.DatastoreV1.Filter; -import com.google.api.services.datastore.DatastoreV1.Key; -import com.google.api.services.datastore.DatastoreV1.Key.PathElement; -import com.google.api.services.datastore.DatastoreV1.Property; -import com.google.api.services.datastore.DatastoreV1.PropertyFilter; -import com.google.api.services.datastore.DatastoreV1.PropertyOrBuilder; -import com.google.api.services.datastore.DatastoreV1.PropertyOrder; -import com.google.api.services.datastore.DatastoreV1.PropertyReference; -import com.google.api.services.datastore.DatastoreV1.Value; -import com.google.api.services.datastore.DatastoreV1.ValueOrBuilder; -import com.google.protobuf.ByteString; - -import java.io.File; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.PrivateKey; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -/** - * Helper methods for {@link Datastore}. - * - */ -public final class DatastoreHelper { - private static final Logger logger = Logger.getLogger(DatastoreHelper.class.getName()); - - /** The property used in the Datastore to give us a random distribution. **/ - public static final String SCATTER_PROPERTY_NAME = "__scatter__"; - - /** The property used in the Datastore to get the key of the entity. **/ - public static final String KEY_PROPERTY_NAME = "__key__"; - - /** - * Comparator for Keys - */ - private static final class KeyComparator implements Comparator { - - static final KeyComparator INSTANCE = new KeyComparator(); - - private int comparePathElement(PathElement thisElement, PathElement otherElement) { - int result = thisElement.getKind().compareTo(otherElement.getKind()); - if (result != 0) { - return result; - } - if (thisElement.hasId()) { - if (!otherElement.hasId()) { - return -1; - } - return Long.valueOf(thisElement.getId()).compareTo(otherElement.getId()); - } - if (otherElement.hasId()) { - return 1; - } - - return thisElement.getName().compareTo(otherElement.getName()); - } - - @Override - public int compare(Key thisKey, Key otherKey) { - if (!thisKey.getPartitionId().equals(otherKey.getPartitionId())) { - throw new IllegalArgumentException("Cannot compare keys with different partition ids."); - } - - Iterator thisPath = thisKey.getPathElementList().iterator(); - Iterator otherPath = otherKey.getPathElementList().iterator(); - while (thisPath.hasNext()) { - if (!otherPath.hasNext()) { - return 1; - } - int result = comparePathElement(thisPath.next(), otherPath.next()); - if (result != 0) { - return result; - } - } - - return otherPath.hasNext() ? -1 : 0; - } - } - - private DatastoreHelper() {} - - /** - * Attempts to get credentials from Google Compute Engine. - * - * @return valid credentials or {@code null} - */ - public static Credential getComputeEngineCredential() - throws GeneralSecurityException, IOException { - NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport(); - try { - // Try to connect using Google Compute Engine service account credentials. - ComputeCredential credential = new ComputeCredential(transport, new JacksonFactory()); - // Force token refresh to detect if we are running on Google Compute Engine. - credential.refreshToken(); - return credential; - } catch (IOException e) { - return null; - } - } - - /** - * Constructs credentials for the given account and key. - * - * @param account the account to use. - * @param privateKeyFile the file name from which to get the private key. - * @return valid credentials or {@code null} - */ - public static Credential getServiceAccountCredential(String account, String privateKeyFile) - throws GeneralSecurityException, IOException { - return getServiceAccountCredential(account, privateKeyFile, DatastoreOptions.SCOPES); - } - - /** - * Constructs credentials for the given account and key file. - * - * @param account the account to use. - * @param privateKeyFile the file name from which to get the private key. - * @param serviceAccountScopes Collection of OAuth scopes to use with the the service - * account flow or {@code null} if not. - * @return valid credentials or {@code null} - */ - public static Credential getServiceAccountCredential(String account, String privateKeyFile, - Collection serviceAccountScopes) throws GeneralSecurityException, IOException { - return getCredentialBuilderWithoutPrivateKey(account, serviceAccountScopes) - .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile)) - .build(); - } - - /** - * Constructs credentials for the given account and key. - * - * @param account the account to use. - * @param privateKey the private key for the given account. - * @param serviceAccountScopes Collection of OAuth scopes to use with the the service - * account flow or {@code null} if not. - * @return valid credentials or {@code null} - */ - public static Credential getServiceAccountCredential(String account, PrivateKey privateKey, - Collection serviceAccountScopes) throws GeneralSecurityException, IOException { - return getCredentialBuilderWithoutPrivateKey(account, serviceAccountScopes) - .setServiceAccountPrivateKey(privateKey) - .build(); - } - - private static GoogleCredential.Builder getCredentialBuilderWithoutPrivateKey( - String account, Collection scopes) throws GeneralSecurityException, IOException { - NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport(); - JacksonFactory jsonFactory = new JacksonFactory(); - return new GoogleCredential.Builder() - .setTransport(transport) - .setJsonFactory(jsonFactory) - .setServiceAccountId(account) - .setServiceAccountScopes(scopes); - } - - /** - * Uses the following environment variables to construct a {@link Datastore}: - * DATASTORE_DATASET - the datastore dataset id - * DATASTORE_HOST - the host to use to access the datastore - * e.g: https://www.googleapis.com - * DATASTORE_SERVICE_ACCOUNT - (optional) service account name - * DATASTORE_PRIVATE_KEY_FILE - (optional) service account private key file - * - * Preference of credentials is: - * - Service Account (specified by DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE) - * - ComputeEngine - * - no-credentials (for local development environment) - */ - public static DatastoreOptions.Builder getOptionsFromEnv() - throws GeneralSecurityException, IOException { - DatastoreOptions.Builder options = new DatastoreOptions.Builder(); - options.dataset(System.getenv("DATASTORE_DATASET")); - options.host(System.getenv("DATASTORE_HOST")); - Credential credential; - if (System.getenv("DATASTORE_SERVICE_ACCOUNT") != null - && System.getenv("DATASTORE_PRIVATE_KEY_FILE") != null) { - credential = getServiceAccountCredential(System.getenv("DATASTORE_SERVICE_ACCOUNT"), - System.getenv("DATASTORE_PRIVATE_KEY_FILE")); - logger.info("Using JWT Service Account credential."); - } else { - credential = getComputeEngineCredential(); - if (credential != null) { - logger.info("Using Compute Engine credential."); - } else { - logger.info("Using no credential."); - } - } - options.credential(credential); - return options; - } - - /** - * @see #getOptionsFromEnv() - */ - public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException { - return DatastoreFactory.get().create(getOptionsFromEnv().build()); - } - - /** - * Gets a {@link QuerySplitter}. - * - * The returned {@link QuerySplitter#getSplits} cannot accept a query that contains inequality - * filters, a sort filter, or a missing kind. - */ - public static QuerySplitter getQuerySplitter() { - return QuerySplitterImpl.INSTANCE; - } - - public static Comparator getKeyComparator() { - return KeyComparator.INSTANCE; - } - - /** - * Make a sort order for use in a query. - */ - public static PropertyOrder.Builder makeOrder(String property, - PropertyOrder.Direction direction) { - return PropertyOrder.newBuilder() - .setProperty(makePropertyReference(property)) - .setDirection(direction); - } - - /** - * Make a filter on a property for use in a query. - */ - public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator, - Value value) { - return Filter.newBuilder() - .setPropertyFilter(PropertyFilter.newBuilder() - .setProperty(makePropertyReference(property)) - .setOperator(operator) - .setValue(value)); - } - - /** - * Make a filter on a property for use in a query. - */ - public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator, - Value.Builder value) { - return makeFilter(property, operator, value.build()); - } - - /** - * Make a composite filter from the given sub-filters. - * - * Uses AND to combine filters. - */ - public static Filter.Builder makeFilter(Filter... subfilters) { - return makeFilter(Arrays.asList(subfilters)); - } - - /** - * Make a composite filter from the given sub-filters. - * - * Uses AND to combine filters. - */ - public static Filter.Builder makeFilter(Iterable subfilters) { - return Filter.newBuilder() - .setCompositeFilter(CompositeFilter.newBuilder() - .addAllFilter(subfilters) - .setOperator(CompositeFilter.Operator.AND)); - } - - /** - * Make an entity property with the specified value. - */ - public static Property.Builder makeProperty(String name, Value value) { - return Property.newBuilder().setName(name).setValue(value); - } - - /** - * Make an entity property with the specified value. - */ - public static Property.Builder makeProperty(String name, Value.Builder value) { - return makeProperty(name, value.build()); - } - - /** - * Make a property reference for use in a query. - */ - public static PropertyReference.Builder makePropertyReference(String propertyName) { - return PropertyReference.newBuilder().setName(propertyName); - } - - /** - * Make an entity value with the specified list values. - */ - public static Value.Builder makeValue(Iterable listValues) { - return Value.newBuilder().addAllListValue(listValues); - } - - /** - * Make an entity value with the specified list values. - */ - public static Value.Builder makeValue(Value... values) { - return makeValue(Arrays.asList(values)); - } - - /** - * Make an entity value with the specified list values. - */ - public static Value.Builder makeValue(Value.Builder... builders) { - Value.Builder value = Value.newBuilder(); - for (Value.Builder builder : builders) { - value.addListValue(builder); - } - return value; - } - - /** - * Make a key value. - */ - public static Value.Builder makeValue(Key key) { - return Value.newBuilder().setKeyValue(key); - } - - /** - * Make a key value. - */ - public static Value.Builder makeValue(Key.Builder key) { - return makeValue(key.build()); - } - - /** - * Make an integer value. - */ - public static Value.Builder makeValue(long key) { - return Value.newBuilder().setIntegerValue(key); - } - - /** - * Make a floating point value. - */ - public static Value.Builder makeValue(double value) { - return Value.newBuilder().setDoubleValue(value); - } - - /** - * Make a boolean value. - */ - public static Value.Builder makeValue(boolean value) { - return Value.newBuilder().setBooleanValue(value); - } - - /** - * Make a string value. - */ - public static Value.Builder makeValue(String value) { - return Value.newBuilder().setStringValue(value); - } - - /** - * Make an entity value. - */ - public static Value.Builder makeValue(Entity entity) { - return Value.newBuilder().setEntityValue(entity); - } - - /** - * Make a entity value. - */ - public static Value.Builder makeValue(Entity.Builder entity) { - return makeValue(entity.build()); - } - - /** - * Make a ByteString value. - */ - public static Value.Builder makeValue(ByteString blob) { - return Value.newBuilder().setBlobValue(blob); - } - - /** - * Make a date value given a time in milliseconds. - */ - public static Value.Builder makeValue(Date date) { - return Value.newBuilder().setTimestampMicrosecondsValue(date.getTime() * 1000L); - } - - /** - * Make a key from the specified path of kind/id-or-name pairs. - * - * The id-or-name values must be either Key, String, Long, Integer or Short. - * - * The last id-or-name value may be omitted, in which case an entity without - * an id is created (for use with automatic id allocation). - */ - public static Key.Builder makeKey(Object... elements) { - Key.Builder key = Key.newBuilder(); - for (int pathIndex = 0; pathIndex < elements.length; pathIndex += 2) { - PathElement.Builder pathElement = PathElement.newBuilder(); - Object element = elements[pathIndex]; - if (element instanceof Key) { - key.addAllPathElement(((Key) element).getPathElementList()); - // We increment by 2, but since we got a Key argument we're only consuming 1 element in this - // iteration of the loop. Decrement the index so that when we jump by 2 we end up in the - // right spot. - pathIndex--; - } else { - String kind; - try { - kind = (String) element; - } catch (ClassCastException e) { - throw new IllegalArgumentException("Expected string or Key, got: " + element.getClass()); - } - pathElement.setKind(kind); - if (pathIndex + 1 < elements.length) { - Object value = elements[pathIndex + 1]; - if (value instanceof String) { - pathElement.setName((String) value); - } else if (value instanceof Long) { - pathElement.setId((Long) value); - } else if (value instanceof Integer) { - pathElement.setId((Integer) value); - } else if (value instanceof Short) { - pathElement.setId((Short) value); - } else { - throw new IllegalArgumentException( - "Expected string or integer, got: " + value.getClass()); - } - } - key.addPathElement(pathElement); - } - } - return key; - } - - /** - * @return a map of property name to value - */ - public static Map getPropertyMap(EntityOrBuilder entity) { - Map result = new HashMap(); - for (PropertyOrBuilder property : entity.getPropertyList()) { - result.put(property.getName(), property.getValue()); - } - return Collections.unmodifiableMap(result); - } - - /** - * @return the double contained in value - * @throws IllegalArgumentException if the value does not contain a double. - */ - public static double getDouble(ValueOrBuilder value) { - if (!value.hasDoubleValue()) { - throw new IllegalArgumentException("Value does not contain a double."); - } - return value.getDoubleValue(); - } - - /** - * @return the key contained in value - * @throws IllegalArgumentException if the value does not contain a key. - */ - public static Key getKey(ValueOrBuilder value) { - if (!value.hasKeyValue()) { - throw new IllegalArgumentException("Value does not contain a key."); - } - return value.getKeyValue(); - } - - /** - * @return the blob contained in value - * @throws IllegalArgumentException if the value does not contain a blob. - */ - public static ByteString getByteString(ValueOrBuilder value) { - if (value.getMeaning() == 18 && value.hasStringValue()) { - return value.getStringValueBytes(); - } else if (value.hasBlobValue()) { - return value.getBlobValue(); - } - throw new IllegalArgumentException("Value does not contain a blob."); - } - - /** - * @return the blob key contained in value - * @throws IllegalArgumentException if the value does not contain a blob key. - */ - public static String getBlobKey(ValueOrBuilder value) { - if (value.getMeaning() == 18 && value.hasStringValue()) { - return value.getStringValue(); - } else if (value.hasBlobKeyValue()) { - return value.getBlobKeyValue(); - } - throw new IllegalArgumentException("Value does not contain a blob key."); - } - - /** - * @return the entity contained in value - * @throws IllegalArgumentException if the value does not contain an entity. - */ - public static Entity getEntity(ValueOrBuilder value) { - if (!value.hasEntityValue()) { - throw new IllegalArgumentException("Value does not contain an Entity."); - } - return value.getEntityValue(); - } - - /** - * @return the string contained in value - * @throws IllegalArgumentException if the value does not contain a string. - */ - public static String getString(ValueOrBuilder value) { - if (!value.hasStringValue()) { - throw new IllegalArgumentException("Value does not contain a string."); - } - return value.getStringValue(); - } - - /** - * @return the boolean contained in value - * @throws IllegalArgumentException if the value does not contain a boolean. - */ - public static boolean getBoolean(ValueOrBuilder value) { - if (!value.hasBooleanValue()) { - throw new IllegalArgumentException("Value does not contain a boolean."); - } - return value.getBooleanValue(); - } - - /** - * @return the long contained in value - * @throws IllegalArgumentException if the value does not contain a long. - */ - public static long getLong(ValueOrBuilder value) { - if (!value.hasIntegerValue()) { - throw new IllegalArgumentException("Value does not contain an integer."); - } - return value.getIntegerValue(); - } - - /** - * @return the timestamp in microseconds contained in value - * @throws IllegalArgumentException if the value does not contain a timestamp. - */ - public static long getTimestamp(ValueOrBuilder value) { - if (value.getMeaning() == 18 && value.hasIntegerValue()) { - return value.getIntegerValue(); - } else if (value.hasTimestampMicrosecondsValue()) { - return value.getTimestampMicrosecondsValue(); - } - throw new IllegalArgumentException("Value does not contain a timestamp."); - } - - /** - * @return the list contained in value - * @throws IllegalArgumentException if the value does not contain a list. - */ - public static List getList(ValueOrBuilder value) { - if (value.getListValueCount() == 0) { - throw new IllegalArgumentException("Value does not contain a list."); - } - return value.getListValueList(); - } - - /** - * Convert a timestamp value into a {@link Date} clipping off the microseconds. - * - * @param value a timestamp value to convert - * @return the resulting {@link Date} - * @throws IllegalArgumentException if the value does not contain a timestamp. - */ - public static Date toDate(ValueOrBuilder value) { - return new Date(getTimestamp(value) / 1000); - } -} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java deleted file mode 100644 index a66f22eb8b54..000000000000 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreOptions.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright 2013 Google Inc. All Rights Reserved. - * - * 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.api.services.datastore.client; - -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestInitializer; -import com.google.api.client.http.HttpTransport; - -import java.util.Arrays; -import java.util.List; - -/** - * An immutable object containing settings for the datastore. - * - *

Example for connecting to a datastore:

- * - * 
- * DatastoreOptions options = new DatastoreOptions.Builder()
- *     .dataset("my-dataset-id")
- *     .credential(DatastoreHelper.getComputeEngineCredential())
- *     .build();
- * DatastoreFactory.get().create(options);
- *
- * - *

- * The options should be passed to {@link DatastoreFactory#create}. - *

- * - */ -public class DatastoreOptions { - private final String dataset; - private final String host; - private static final String DEFAULT_HOST = "https://www.googleapis.com"; - - private final HttpRequestInitializer initializer; - - private final Credential credential; - private final HttpTransport transport; - public static final List SCOPES = Arrays.asList( - "https://www.googleapis.com/auth/datastore", - "https://www.googleapis.com/auth/userinfo.email"); - - DatastoreOptions(Builder b) { - this.dataset = b.dataset; - this.host = b.host != null ? b.host : DEFAULT_HOST; - this.initializer = b.initializer; - this.credential = b.credential; - this.transport = b.transport; - } - - /** - * Builder for {@link DatastoreOptions}. - */ - public static class Builder { - private String dataset; - private String host; - private HttpRequestInitializer initializer; - private Credential credential; - private HttpTransport transport; - - public Builder() { } - - public Builder(DatastoreOptions options) { - this.dataset = options.dataset; - this.host = options.host; - this.initializer = options.initializer; - this.credential = options.credential; - this.transport = options.transport; - } - - public DatastoreOptions build() { - return new DatastoreOptions(this); - } - - /** - * Sets the dataset used to access the datastore. - */ - public Builder dataset(String newDataset) { - dataset = newDataset; - return this; - } - - /** - * Sets the host used to access the datastore. - */ - public Builder host(String newHost) { - host = newHost; - return this; - } - - /** - * Sets the (optional) initializer to run on HTTP requests to the API. - */ - public Builder initializer(HttpRequestInitializer newInitializer) { - initializer = newInitializer; - return this; - } - - /** - * Sets the Google APIs credentials used to access the API. - */ - public Builder credential(Credential newCredential) { - credential = newCredential; - return this; - } - - /** - * Sets the transport used to access the API. - */ - public Builder transport(HttpTransport transport) { - this.transport = transport; - return this; - } - } - - // === getters === - - public String getDataset() { - return dataset; - } - - public String getHost() { - return host; - } - - public HttpRequestInitializer getInitializer() { - return initializer; - } - - public Credential getCredential() { - return credential; - } - - public HttpTransport getTransport() { - return transport; - } -} \ No newline at end of file diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java similarity index 70% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java index 6765609f36c7..bd5a0280918e 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/Datastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,27 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; -import com.google.api.client.http.HttpStatusCodes; -import com.google.api.services.datastore.DatastoreV1.AllocateIdsRequest; -import com.google.api.services.datastore.DatastoreV1.AllocateIdsResponse; -import com.google.api.services.datastore.DatastoreV1.BeginTransactionRequest; -import com.google.api.services.datastore.DatastoreV1.BeginTransactionResponse; -import com.google.api.services.datastore.DatastoreV1.CommitRequest; -import com.google.api.services.datastore.DatastoreV1.CommitResponse; -import com.google.api.services.datastore.DatastoreV1.LookupRequest; -import com.google.api.services.datastore.DatastoreV1.LookupResponse; -import com.google.api.services.datastore.DatastoreV1.RollbackRequest; -import com.google.api.services.datastore.DatastoreV1.RollbackResponse; -import com.google.api.services.datastore.DatastoreV1.RunQueryRequest; -import com.google.api.services.datastore.DatastoreV1.RunQueryResponse; +import com.google.datastore.v1beta3.AllocateIdsRequest; +import com.google.datastore.v1beta3.AllocateIdsResponse; +import com.google.datastore.v1beta3.BeginTransactionRequest; +import com.google.datastore.v1beta3.BeginTransactionResponse; +import com.google.datastore.v1beta3.CommitRequest; +import com.google.datastore.v1beta3.CommitResponse; +import com.google.datastore.v1beta3.LookupRequest; +import com.google.datastore.v1beta3.LookupResponse; +import com.google.datastore.v1beta3.RollbackRequest; +import com.google.datastore.v1beta3.RollbackResponse; +import com.google.datastore.v1beta3.RunQueryRequest; +import com.google.datastore.v1beta3.RunQueryResponse; +import com.google.rpc.Code; import java.io.IOException; /** - * Provides access to the Datastore. - * + * Provides access to Cloud Datastore. */ public class Datastore { @@ -59,8 +58,8 @@ public int getRpcCount() { } private DatastoreException invalidResponseException(String method, IOException exception) { - return RemoteRpc.makeException(remoteRpc.getUrl(), method, - HttpStatusCodes.STATUS_CODE_SERVICE_UNAVAILABLE, "Invalid response", exception); + return RemoteRpc.makeException(remoteRpc.getUrl(), method, Code.UNAVAILABLE, + "Invalid response", exception); } public AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws DatastoreException { diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreException.java similarity index 69% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreException.java index 09c4cac4b51f..70bfc2f4a7a9 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/DatastoreException.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreException.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,20 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; + +import com.google.rpc.Code; /** * Indicates an error in a {@link Datastore} call. - * */ public class DatastoreException extends Exception { private final String methodName; - private final int code; + private final Code code; + + public DatastoreException(String methodName, Code code, String message, Throwable cause) { + super(message, cause); + this.methodName = methodName; + this.code = code; + } /** - * @return the HTTP response code + * @return the canonical error code */ - public int getCode() { + public Code getCode() { return code; } @@ -36,10 +43,9 @@ public int getCode() { public String getMethodName() { return methodName; } - - public DatastoreException(String methodName, int code, String message, Throwable cause) { - super(message, cause); - this.methodName = methodName; - this.code = code; + + @Override + public String toString() { + return String.format("%s, code=%s", super.toString(), code); } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/BaseDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java similarity index 55% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/BaseDatastoreFactory.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java index e71d87794ff4..60cc87c1899b 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/BaseDatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; + +import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Arrays; import java.util.logging.ConsoleHandler; import java.util.logging.Formatter; @@ -31,67 +34,44 @@ /** * Client factory for {@link Datastore}. - * */ -abstract class BaseDatastoreFactory { - - // Non-javadoc. - // This class allows RemoteRpc to be used by factory implementations defined - // outside of this package. - public static class RemoteRpc - extends com.google.api.services.datastore.client.RemoteRpc { - public RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) { - super(client, initializer, url); - } - } - - private static final Logger logger = Logger.getLogger(BaseDatastoreFactory.class.getName()); +public class DatastoreFactory { + private static final Logger logger = Logger.getLogger(DatastoreFactory.class.getName()); // Lazy load this because we might be running inside App Engine and this // class isn't on the whitelist. private static ConsoleHandler methodHandler; - protected abstract String buildUrl(DatastoreOptions options, String overrideUrl); - public abstract T create(DatastoreOptions options) throws IllegalArgumentException; + /** API version. */ + public static final String VERSION = "v1beta3"; - // TODO(user): Support something other than console handler for when we're - // running in App Engine - private static synchronized StreamHandler getStreamHandler() { - if (methodHandler == null) { - methodHandler = new ConsoleHandler(); - methodHandler.setFormatter(new Formatter() { - @Override - public String format(LogRecord record) { - return record.getMessage() + "\n"; - } - }); - methodHandler.setLevel(Level.FINE); - } - return methodHandler; - } + public static final String DEFAULT_HOST = "https://datastore.googleapis.com"; - protected BaseDatastoreFactory() { } + /** Singleton factory instance. */ + private static final DatastoreFactory INSTANCE = new DatastoreFactory(); - protected RemoteRpc - newRemoteRpc(DatastoreOptions options) { - return newRemoteRpc(options, System.getenv("DATASTORE_URL_INTERNAL_OVERRIDE")); + public static DatastoreFactory get() { + return INSTANCE; } - protected RemoteRpc newRemoteRpc(DatastoreOptions options, String urlOverride) { - if (options == null) { - throw new IllegalArgumentException("options not set"); - } - HttpRequestFactory client = makeClient(options); - return new RemoteRpc(client, options.getInitializer(), buildUrl(options, urlOverride)); + /** + * Provides access to a datastore using the provided options. Logs + * into the application using the credentials available via these + * options. + * + * @throws IllegalArgumentException if the server or credentials weren't provided. + */ + public Datastore create(DatastoreOptions options) throws IllegalArgumentException { + return new Datastore(newRemoteRpc(options)); } - + /** * Constructs a Google APIs HTTP client with the associated credentials. */ public HttpRequestFactory makeClient(DatastoreOptions options) { Credential credential = options.getCredential(); if (credential == null) { - logger.warning("Not using any credentials"); + logger.info("Not using any credentials"); } HttpTransport transport = options.getTransport(); if (transport == null) { @@ -110,4 +90,51 @@ public static void logMethodCalls() { logger.addHandler(getStreamHandler()); } } + + /** + * Build a valid datastore URL. + */ + String buildProjectEndpoint(DatastoreOptions options) { + if (options.getProjectEndpoint() != null) { + return options.getProjectEndpoint(); + } + // DatastoreOptions ensures either project endpoint or project ID is set. + String projectId = checkNotNull(options.getProjectId()); + if (options.getLocalHost() != null) { + return validateUrl(String.format("http://%s/datastore/%s/projects/%s", + options.getLocalHost(), VERSION, projectId)); + } + return validateUrl(String.format("%s/%s/projects/%s", + DEFAULT_HOST, VERSION, projectId)); + } + + protected RemoteRpc newRemoteRpc(DatastoreOptions options) { + checkNotNull(options); + HttpRequestFactory client = makeClient(options); + return new RemoteRpc(client, options.getInitializer(), buildProjectEndpoint(options)); + } + + static String validateUrl(String url) { + try { + return new URI(url).toString(); + } catch (URISyntaxException e) { + throw new IllegalArgumentException(e); + } + } + + // TODO: Support something other than console handler for when we're + // running in App Engine + private static synchronized StreamHandler getStreamHandler() { + if (methodHandler == null) { + methodHandler = new ConsoleHandler(); + methodHandler.setFormatter(new Formatter() { + @Override + public String format(LogRecord record) { + return record.getMessage() + "\n"; + } + }); + methodHandler.setLevel(Level.FINE); + } + return methodHandler; + } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java new file mode 100644 index 000000000000..a170cc0fa202 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java @@ -0,0 +1,749 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * + * 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.v1beta3.client; + +import static com.google.datastore.v1beta3.client.DatastoreFactory.validateUrl; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; +import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; +import com.google.api.client.http.GenericUrl; +import com.google.api.client.http.HttpRequest; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.json.JsonFactory; +import com.google.api.client.json.jackson.JacksonFactory; +import com.google.datastore.v1beta3.ArrayValue; +import com.google.datastore.v1beta3.CompositeFilter; +import com.google.datastore.v1beta3.Entity; +import com.google.datastore.v1beta3.Filter; +import com.google.datastore.v1beta3.Key; +import com.google.datastore.v1beta3.Key.PathElement; +import com.google.datastore.v1beta3.Key.PathElement.IdTypeCase; +import com.google.datastore.v1beta3.Mutation; +import com.google.datastore.v1beta3.PartitionId; +import com.google.datastore.v1beta3.PropertyFilter; +import com.google.datastore.v1beta3.PropertyOrder; +import com.google.datastore.v1beta3.PropertyReference; +import com.google.datastore.v1beta3.Value; +import com.google.datastore.v1beta3.Value.ValueTypeCase; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; +import com.google.protobuf.TimestampOrBuilder; +import com.google.type.LatLng; + +import java.io.File; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.PrivateKey; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Helper methods for {@link Datastore}. + */ +// TODO: Accept OrBuilders when possible. +public final class DatastoreHelper { + private static final Logger logger = Logger.getLogger(DatastoreHelper.class.getName()); + + private static final int MICROSECONDS_PER_SECOND = 1000 * 1000; + private static final int NANOSECONDS_PER_MICROSECOND = 1000; + + /** The property used in the Datastore to give us a random distribution. **/ + public static final String SCATTER_PROPERTY_NAME = "__scatter__"; + + /** The property used in the Datastore to get the key of the entity. **/ + public static final String KEY_PROPERTY_NAME = "__key__"; + + /** + * Name of the environment variable used to set the project ID. + */ + public static final String PROJECT_ID_ENV_VAR = "DATASTORE_PROJECT_ID"; + + /** + * Name of the environment variable used to set the local host. + */ + public static final String LOCAL_HOST_ENV_VAR = "DATASTORE_EMULATOR_HOST"; + + /** + * Name of the environment variable used to set the service account. + */ + public static final String SERVICE_ACCOUNT_ENV_VAR = "DATASTORE_SERVICE_ACCOUNT"; + + /** + * Name of the environment variable used to set the private key file. + */ + public static final String PRIVATE_KEY_FILE_ENV_VAR = "DATASTORE_PRIVATE_KEY_FILE"; + + private static final String URL_OVERRIDE_ENV_VAR = "__DATASTORE_URL_OVERRIDE"; + + /** + * Comparator for Keys + */ + private static final class KeyComparator implements Comparator { + + static final KeyComparator INSTANCE = new KeyComparator(); + + private int comparePathElement(PathElement thisElement, PathElement otherElement) { + int result = thisElement.getKind().compareTo(otherElement.getKind()); + if (result != 0) { + return result; + } + if (thisElement.getIdTypeCase() == IdTypeCase.ID) { + if (otherElement.getIdTypeCase() != IdTypeCase.ID) { + return -1; + } + return Long.valueOf(thisElement.getId()).compareTo(otherElement.getId()); + } + if (otherElement.getIdTypeCase() == IdTypeCase.ID) { + return 1; + } + + return thisElement.getName().compareTo(otherElement.getName()); + } + + @Override + public int compare(Key thisKey, Key otherKey) { + if (!thisKey.getPartitionId().equals(otherKey.getPartitionId())) { + throw new IllegalArgumentException("Cannot compare keys with different partition ids."); + } + + Iterator thisPath = thisKey.getPathList().iterator(); + Iterator otherPath = otherKey.getPathList().iterator(); + while (thisPath.hasNext()) { + if (!otherPath.hasNext()) { + return 1; + } + int result = comparePathElement(thisPath.next(), otherPath.next()); + if (result != 0) { + return result; + } + } + + return otherPath.hasNext() ? -1 : 0; + } + } + + private DatastoreHelper() {} + + private static HttpTransport newTransport() throws GeneralSecurityException, IOException { + return GoogleNetHttpTransport.newTrustedTransport(); + } + + static JsonFactory newJsonFactory() { + return new JacksonFactory(); + } + + /** + * Constructs credentials for the given account and key. + * + * @param serviceAccountId service account ID (typically an e-mail address). + * @param privateKeyFile the file name from which to get the private key. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential(String serviceAccountId, + String privateKeyFile) throws GeneralSecurityException, IOException { + return getServiceAccountCredential(serviceAccountId, privateKeyFile, DatastoreOptions.SCOPES); + } + + /** + * Constructs credentials for the given account and key file. + * + * @param serviceAccountId service account ID (typically an e-mail address). + * @param privateKeyFile the file name from which to get the private key. + * @param serviceAccountScopes Collection of OAuth scopes to use with the the service + * account flow or {@code null} if not. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential(String serviceAccountId, + String privateKeyFile, Collection serviceAccountScopes) + throws GeneralSecurityException, IOException { + return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes) + .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile)) + .build(); + } + + /** + * Constructs credentials for the given account and key. + * + * @param serviceAccountId service account ID (typically an e-mail address). + * @param privateKey the private key for the given account. + * @param serviceAccountScopes Collection of OAuth scopes to use with the the service + * account flow or {@code null} if not. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential(String serviceAccountId, + PrivateKey privateKey, Collection serviceAccountScopes) + throws GeneralSecurityException, IOException { + return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes) + .setServiceAccountPrivateKey(privateKey) + .build(); + } + + private static GoogleCredential.Builder getCredentialBuilderWithoutPrivateKey( + String serviceAccountId, Collection serviceAccountScopes) + throws GeneralSecurityException, IOException { + HttpTransport transport = newTransport(); + JsonFactory jsonFactory = newJsonFactory(); + return new GoogleCredential.Builder() + .setTransport(transport) + .setJsonFactory(jsonFactory) + .setServiceAccountId(serviceAccountId) + .setServiceAccountScopes(serviceAccountScopes); + } + + /** + * Constructs a {@link Datastore} from environment variables and/or the Compute Engine metadata + * server. + * + *

The project ID is determined from, in order of preference: + *

    + *
  • DATASTORE_PROJECT_ID environment variable + *
  • Compute Engine + *
+ * + *

Credentials are taken from, in order of preference: + *

    + *
  1. No credentials (if the DATASTORE_EMULATOR_HOST environment variable is set) + *
  2. Service Account specified by the DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE + * environment variables + *
  3. Google Application Default as described at + * {@link "https://developers.google.com/identity/protocols/application-default-credentials"} + *
+ */ + public static DatastoreOptions.Builder getOptionsFromEnv() + throws GeneralSecurityException, IOException { + DatastoreOptions.Builder options = new DatastoreOptions.Builder(); + setProjectEndpointFromEnv(options); + options.credential(getCredentialFromEnv()); + return options; + } + + private static Credential getCredentialFromEnv() throws GeneralSecurityException, IOException { + if (System.getenv(LOCAL_HOST_ENV_VAR) != null) { + logger.log(Level.INFO, "{0} environment variable was set. Not using credentials.", + new Object[] {LOCAL_HOST_ENV_VAR}); + return null; + } + String serviceAccount = System.getenv(SERVICE_ACCOUNT_ENV_VAR); + String privateKeyFile = System.getenv(PRIVATE_KEY_FILE_ENV_VAR); + if (serviceAccount != null && privateKeyFile != null) { + logger.log(Level.INFO, "{0} and {1} environment variables were set. " + + "Using service account credential.", + new Object[] {SERVICE_ACCOUNT_ENV_VAR, PRIVATE_KEY_FILE_ENV_VAR}); + return getServiceAccountCredential(serviceAccount, privateKeyFile); + } + return GoogleCredential.getApplicationDefault() + .createScoped(DatastoreOptions.SCOPES); + } + + /** + * Determines the project id from the environment. Uses the following sources in order of + * preference: + *
    + *
  1. Value of the DATASTORE_PROJECT_ID environment variable + *
  2. Compute Engine + *
+ * + * @throws IllegalStateException if the project ID cannot be determined + */ + private static String getProjectIdFromEnv() { + if (System.getenv(PROJECT_ID_ENV_VAR) != null) { + return System.getenv(PROJECT_ID_ENV_VAR); + } + String projectIdFromComputeEngine = getProjectIdFromComputeEngine(); + if (projectIdFromComputeEngine != null) { + return projectIdFromComputeEngine; + } + throw new IllegalStateException(String.format("Could not determine project ID." + + " If you are not running on Compute Engine, set the" + + " %s environment variable.", PROJECT_ID_ENV_VAR)); + } + + /** + * Gets the project ID from the Compute Engine metadata server. Returns {@code null} if the + * project ID cannot be determined (because, for instance, the code is not running on Compute + * Engine). + */ + public static String getProjectIdFromComputeEngine() { + HttpTransport transport; + try { + transport = newTransport(); + } catch (GeneralSecurityException | IOException e) { + logger.log(Level.WARNING, "Failed to create HttpTransport.", e); + return null; + } + try { + GenericUrl projectIdUrl = + new GenericUrl("http://metadata/computeMetadata/v1/project/project-id"); + HttpRequest request = transport.createRequestFactory().buildGetRequest(projectIdUrl); + request.getHeaders().set("Metadata-Flavor", "Google"); + return request.execute().parseAsString(); + } catch (IOException e) { + logger.log(Level.INFO, "Could not determine project ID from Compute Engine.", e); + return null; + } + } + + private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options) { + // DATASTORE_HOST is deprecated. + if (System.getenv("DATASTORE_HOST") != null) { + logger.warning(String.format( + "Ignoring value of environment variable DATASTORE_HOST. " + + "To point datastore to a host running locally, use " + + "the environment variable %s.", + LOCAL_HOST_ENV_VAR)); + } + String projectId = getProjectIdFromEnv(); + if (System.getenv(URL_OVERRIDE_ENV_VAR) != null) { + options.projectEndpoint(validateUrl(String.format("%s/projects/%s", + System.getenv(URL_OVERRIDE_ENV_VAR), projectId))); + return; + } + if (System.getenv(LOCAL_HOST_ENV_VAR) != null) { + options.projectId(projectId); + options.localHost(System.getenv(LOCAL_HOST_ENV_VAR)); + return; + } + options.projectId(projectId); + return; + } + + /** + * @see #getOptionsFromEnv() + */ + public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException { + return DatastoreFactory.get().create(getOptionsFromEnv().build()); + } + + /** + * Gets a {@link QuerySplitter}. + * + * The returned {@link QuerySplitter#getSplits} cannot accept a query that contains inequality + * filters, a sort filter, or a missing kind. + */ + public static QuerySplitter getQuerySplitter() { + return QuerySplitterImpl.INSTANCE; + } + + public static Comparator getKeyComparator() { + return KeyComparator.INSTANCE; + } + + /** + * Make a sort order for use in a query. + */ + public static PropertyOrder.Builder makeOrder(String property, + PropertyOrder.Direction direction) { + return PropertyOrder.newBuilder() + .setProperty(makePropertyReference(property)) + .setDirection(direction); + } + + /** + * Make a filter on a property for use in a query. + */ + public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator, + Value value) { + return Filter.newBuilder() + .setPropertyFilter(PropertyFilter.newBuilder() + .setProperty(makePropertyReference(property)) + .setOp(operator) + .setValue(value)); + } + + /** + * Make a filter on a property for use in a query. + */ + public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator, + Value.Builder value) { + return makeFilter(property, operator, value.build()); + } + + /** + * Make a composite filter from the given sub-filters using AND to combine filters. + */ + public static Filter.Builder makeAndFilter(Filter... subfilters) { + return makeAndFilter(Arrays.asList(subfilters)); + } + + /** + * Make a composite filter from the given sub-filters using AND to combine filters. + */ + public static Filter.Builder makeAndFilter(Iterable subfilters) { + return Filter.newBuilder() + .setCompositeFilter(CompositeFilter.newBuilder() + .addAllFilters(subfilters) + .setOp(CompositeFilter.Operator.AND)); + } + + /** + * Make a property reference for use in a query. + */ + public static PropertyReference.Builder makePropertyReference(String propertyName) { + return PropertyReference.newBuilder().setName(propertyName); + } + + /** + * Make an array value containing the specified values. + */ + public static Value.Builder makeValue(Iterable values) { + return Value.newBuilder().setArrayValue(ArrayValue.newBuilder().addAllValues(values)); + } + + /** + * Make a list value containing the specified values. + */ + public static Value.Builder makeValue(Value value1, Value value2, Value... rest) { + ArrayValue.Builder arrayValue = ArrayValue.newBuilder(); + arrayValue.addValues(value1); + arrayValue.addValues(value2); + arrayValue.addAllValues(Arrays.asList(rest)); + return Value.newBuilder().setArrayValue(arrayValue); + } + + /** + * Make an array value containing the specified values. + */ + public static Value.Builder makeValue(Value.Builder value1, Value.Builder value2, + Value.Builder... rest) { + ArrayValue.Builder arrayValue = ArrayValue.newBuilder(); + arrayValue.addValues(value1); + arrayValue.addValues(value2); + for (Value.Builder builder : rest) { + arrayValue.addValues(builder); + } + return Value.newBuilder().setArrayValue(arrayValue); + } + + /** + * Make a key value. + */ + public static Value.Builder makeValue(Key key) { + return Value.newBuilder().setKeyValue(key); + } + + /** + * Make a key value. + */ + public static Value.Builder makeValue(Key.Builder key) { + return makeValue(key.build()); + } + + /** + * Make an integer value. + */ + public static Value.Builder makeValue(long key) { + return Value.newBuilder().setIntegerValue(key); + } + + /** + * Make a floating point value. + */ + public static Value.Builder makeValue(double value) { + return Value.newBuilder().setDoubleValue(value); + } + + /** + * Make a boolean value. + */ + public static Value.Builder makeValue(boolean value) { + return Value.newBuilder().setBooleanValue(value); + } + + /** + * Make a string value. + */ + public static Value.Builder makeValue(String value) { + return Value.newBuilder().setStringValue(value); + } + + /** + * Make an entity value. + */ + public static Value.Builder makeValue(Entity entity) { + return Value.newBuilder().setEntityValue(entity); + } + + /** + * Make a entity value. + */ + public static Value.Builder makeValue(Entity.Builder entity) { + return makeValue(entity.build()); + } + + /** + * Make a ByteString value. + */ + public static Value.Builder makeValue(ByteString blob) { + return Value.newBuilder().setBlobValue(blob); + } + + /** + * Make a timestamp value given a date. + */ + public static Value.Builder makeValue(Date date) { + return Value.newBuilder().setTimestampValue(toTimestamp(date.getTime() * 1000L)); + } + + private static Timestamp.Builder toTimestamp(long microseconds) { + long seconds = microseconds / MICROSECONDS_PER_SECOND; + long microsecondsRemainder = microseconds % MICROSECONDS_PER_SECOND; + if (microsecondsRemainder < 0) { + // Nanos must be positive even if microseconds is negative. + // Java modulus doesn't take care of this for us. + microsecondsRemainder += MICROSECONDS_PER_SECOND; + seconds -= 1; + } + return Timestamp.newBuilder() + .setSeconds(seconds) + .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. + * + *

The id-or-name values must be either String, Long, Integer or Short. + * + *

The last id-or-name value may be omitted, in which case an entity without + * an id is created (for use with automatic id allocation). + * + *

The PartitionIds of all Keys in the path must be equal. The returned + * Key.Builder will use this PartitionId. + */ + public static Key.Builder makeKey(Object... elements) { + Key.Builder key = Key.newBuilder(); + PartitionId partitionId = null; + for (int pathIndex = 0; pathIndex < elements.length; pathIndex += 2) { + PathElement.Builder pathElement = PathElement.newBuilder(); + Object element = elements[pathIndex]; + if (element instanceof Key) { + Key subKey = (Key) element; + if (partitionId == null) { + partitionId = subKey.getPartitionId(); + } else if (!partitionId.equals(subKey.getPartitionId())) { + throw new IllegalArgumentException("Partition IDs did not match, found: " + + partitionId + " and " + subKey.getPartitionId()); + } + key.addAllPath(((Key) element).getPathList()); + // We increment by 2, but since we got a Key argument we're only consuming 1 element in this + // iteration of the loop. Decrement the index so that when we jump by 2 we end up in the + // right spot. + pathIndex--; + } else { + String kind; + try { + kind = (String) element; + } catch (ClassCastException e) { + throw new IllegalArgumentException("Expected string or Key, got: " + element.getClass()); + } + pathElement.setKind(kind); + if (pathIndex + 1 < elements.length) { + Object value = elements[pathIndex + 1]; + if (value instanceof String) { + pathElement.setName((String) value); + } else if (value instanceof Long) { + pathElement.setId((Long) value); + } else if (value instanceof Integer) { + pathElement.setId((Integer) value); + } else if (value instanceof Short) { + pathElement.setId((Short) value); + } else { + throw new IllegalArgumentException( + "Expected string or integer, got: " + value.getClass()); + } + } + key.addPath(pathElement); + } + } + if (partitionId != null && !partitionId.equals(PartitionId.getDefaultInstance())) { + key.setPartitionId(partitionId); + } + return key; + } + + /** + * @return the double contained in value + * @throws IllegalArgumentException if the value does not contain a double. + */ + public static double getDouble(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.DOUBLE_VALUE) { + throw new IllegalArgumentException("Value does not contain a double."); + } + return value.getDoubleValue(); + } + + /** + * @return the key contained in value + * @throws IllegalArgumentException if the value does not contain a key. + */ + public static Key getKey(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.KEY_VALUE) { + throw new IllegalArgumentException("Value does not contain a key."); + } + return value.getKeyValue(); + } + + /** + * @return the blob contained in value + * @throws IllegalArgumentException if the value does not contain a blob. + */ + public static ByteString getByteString(Value value) { + if (value.getMeaning() == 18 && value.getValueTypeCase() == ValueTypeCase.STRING_VALUE) { + return value.getStringValueBytes(); + } else if (value.getValueTypeCase() == ValueTypeCase.BLOB_VALUE) { + return value.getBlobValue(); + } + throw new IllegalArgumentException("Value does not contain a blob."); + } + + /** + * @return the entity contained in value + * @throws IllegalArgumentException if the value does not contain an entity. + */ + public static Entity getEntity(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.ENTITY_VALUE) { + throw new IllegalArgumentException("Value does not contain an Entity."); + } + return value.getEntityValue(); + } + + /** + * @return the string contained in value + * @throws IllegalArgumentException if the value does not contain a string. + */ + public static String getString(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.STRING_VALUE) { + throw new IllegalArgumentException("Value does not contain a string."); + } + return value.getStringValue(); + } + + /** + * @return the boolean contained in value + * @throws IllegalArgumentException if the value does not contain a boolean. + */ + public static boolean getBoolean(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.BOOLEAN_VALUE) { + throw new IllegalArgumentException("Value does not contain a boolean."); + } + return value.getBooleanValue(); + } + + /** + * @return the long contained in value + * @throws IllegalArgumentException if the value does not contain a long. + */ + public static long getLong(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.INTEGER_VALUE) { + throw new IllegalArgumentException("Value does not contain an integer."); + } + return value.getIntegerValue(); + } + + /** + * @return the timestamp in microseconds contained in value + * @throws IllegalArgumentException if the value does not contain a timestamp. + */ + public static long getTimestamp(Value value) { + if (value.getMeaning() == 18 && value.getValueTypeCase() == ValueTypeCase.INTEGER_VALUE) { + return value.getIntegerValue(); + } else if (value.getValueTypeCase() == ValueTypeCase.TIMESTAMP_VALUE) { + return toMicroseconds(value.getTimestampValue()); + } + throw new IllegalArgumentException("Value does not contain a timestamp."); + } + + private static long toMicroseconds(TimestampOrBuilder timestamp) { + // Nanosecond precision is lost. + return timestamp.getSeconds() * MICROSECONDS_PER_SECOND + + timestamp.getNanos() / NANOSECONDS_PER_MICROSECOND; + } + + /** + * @return the array contained in value as a list. + * @throws IllegalArgumentException if the value does not contain an array. + */ + public static List getList(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.ARRAY_VALUE) { + throw new IllegalArgumentException("Value does not contain an array."); + } + return value.getArrayValue().getValuesList(); + } + + /** + * Convert a timestamp value into a {@link Date} clipping off the microseconds. + * + * @param value a timestamp value to convert + * @return the resulting {@link Date} + * @throws IllegalArgumentException if the value does not contain a timestamp. + */ + public static Date toDate(Value value) { + return new Date(getTimestamp(value) / 1000); + } + + /** + * @param entity the entity to insert + * @return a mutation that will insert an entity + */ + public static Mutation.Builder makeInsert(Entity entity) { + return Mutation.newBuilder().setInsert(entity); + } + + /** + * @param entity the entity to update + * @return a mutation that will update an entity + */ + public static Mutation.Builder makeUpdate(Entity entity) { + return Mutation.newBuilder().setUpdate(entity); + } + + /** + * @param entity the entity to upsert + * @return a mutation that will upsert an entity + */ + public static Mutation.Builder makeUpsert(Entity entity) { + return Mutation.newBuilder().setUpsert(entity); + } + + /** + * @param key the key of the entity to delete + * @return a mutation that will delete an entity + */ + public static Mutation.Builder makeDelete(Key key) { + return Mutation.newBuilder().setDelete(key); + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java new file mode 100644 index 000000000000..fbcdf77a3107 --- /dev/null +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java @@ -0,0 +1,188 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * + * 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.v1beta3.client; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.HttpRequestInitializer; +import com.google.api.client.http.HttpTransport; + +import java.util.Arrays; +import java.util.List; + +/** + * An immutable object containing settings for the datastore. + * + *

Example for connecting to a datastore: + * + * 

+ * DatastoreOptions options = new DatastoreOptions.Builder()
+ *     .projectId("my-project-id")
+ *     .credential(DatastoreHelper.getComputeEngineCredential())
+ *     .build();
+ * DatastoreFactory.get().create(options);
+ *
+ * + *

The options should be passed to {@link DatastoreFactory#create}. + */ +public class DatastoreOptions { + private final String projectId; + private final String projectEndpoint; + private final String localHost; + + private final HttpRequestInitializer initializer; + + private final Credential credential; + private final HttpTransport transport; + public static final List SCOPES = Arrays.asList( + "https://www.googleapis.com/auth/datastore"); + + DatastoreOptions(Builder b) { + checkArgument(b.projectId != null || b.projectEndpoint != null, + "Either project ID or project endpoint must be provided."); + this.projectId = b.projectId; + this.projectEndpoint = b.projectEndpoint; + this.localHost = b.localHost; + this.initializer = b.initializer; + this.credential = b.credential; + this.transport = b.transport; + } + + /** + * Builder for {@link DatastoreOptions}. + */ + public static class Builder { + private static final String PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR = + "Cannot set both project endpoint and project ID."; + private static final String PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR = + "Cannot set both project endpoint and local host."; + + private String projectId; + private String projectEndpoint; + private String localHost; + private HttpRequestInitializer initializer; + private Credential credential; + private HttpTransport transport; + + public Builder() { } + + public Builder(DatastoreOptions options) { + this.projectId = options.projectId; + this.projectEndpoint = options.projectEndpoint; + this.localHost = options.localHost; + this.initializer = options.initializer; + this.credential = options.credential; + this.transport = options.transport; + } + + public DatastoreOptions build() { + return new DatastoreOptions(this); + } + + /** + * Sets the project ID used to access Datastore. + */ + public Builder projectId(String projectId) { + checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR); + this.projectId = projectId; + return this; + } + + /** + * Sets the host used to access Datastore. + */ + public Builder localHost(String localHost) { + checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR); + DatastoreFactory.validateUrl(localHost); + if (includesScheme(localHost)) { + throw new IllegalArgumentException( + String.format("Local host \"%s\" must not include scheme.", localHost)); + } + this.localHost = localHost; + return this; + } + + /** + * Sets the project endpoint used to access Datastore. Prefer using {@link #projectId} + * and/or {@link #localHost} when possible. + */ + public Builder projectEndpoint(String projectEndpoint) { + checkArgument(projectId == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR); + checkArgument(localHost == null, PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR); + DatastoreFactory.validateUrl(projectEndpoint); + if (!includesScheme(projectEndpoint)) { + throw new IllegalArgumentException(String.format( + "Project endpoint \"%s\" must include scheme.", projectEndpoint)); + } + this.projectEndpoint = projectEndpoint; + return this; + } + + /** + * Sets the (optional) initializer to run on HTTP requests to Datastore. + */ + public Builder initializer(HttpRequestInitializer initializer) { + this.initializer = initializer; + return this; + } + + /** + * Sets the Google APIs {@link Credential} used to access Datastore. + */ + public Builder credential(Credential credential) { + this.credential = credential; + return this; + } + + /** + * Sets the transport used to access Datastore. + */ + public Builder transport(HttpTransport transport) { + this.transport = transport; + return this; + } + + private static boolean includesScheme(String url) { + return url.startsWith("http://") || url.startsWith("https://"); + } + } + + public String getProjectId() { + return projectId; + } + + public String getProjectEndpoint() { + return projectEndpoint; + } + + public String getLocalHost() { + return localHost; + } + + public HttpRequestInitializer getInitializer() { + return initializer; + } + + public Credential getCredential() { + return credential; + } + + public HttpTransport getTransport() { + return transport; + } +} diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastore.java similarity index 86% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastore.java index 39f81665d33c..0a0d7a045a89 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastore.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +package com.google.datastore.v1beta3.client; import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpRequestFactory; import com.google.api.client.http.HttpResponse; import com.google.api.client.http.UrlEncodedContent; +import com.google.api.client.util.Preconditions; import java.io.BufferedReader; import java.io.File; @@ -51,11 +49,11 @@ * {@literal @}BeforeClass * public static void startLocalDatastore() throws LocalDevelopmentDatastoreException { * DatastoreOptions opts = new DatastoreOptions.Builder() - * .host("http://localhost:8080") - * .dataset("myapp") + * .localHost("localhost:8080") + * .projectId("my-project-id") * .build(); * datastore = LocalDevelopmentDatastoreFactory.get().create(opts); - * datastore.start("/usr/local/gcd-sdk", "myapp"); + * datastore.start("/usr/local/gcd-sdk", "my-project-id"); * } * * {@literal @}Before @@ -76,7 +74,6 @@ * * } * - * */ public class LocalDevelopmentDatastore extends Datastore { private static final int STARTUP_TIMEOUT_SECS = 30; @@ -89,12 +86,12 @@ enum State {NEW, STARTED, STOPPED} private volatile State state = State.NEW; - private File datasetDirectory; + private File projectDirectory; - LocalDevelopmentDatastore(RemoteRpc rpc, String host, + LocalDevelopmentDatastore(RemoteRpc rpc, String localHost, LocalDevelopmentDatastoreOptions localDevelopmentOptions) { super(rpc); - this.host = host; + this.host = "http://" + localHost; this.localDevelopmentOptions = localDevelopmentOptions; } @@ -127,18 +124,18 @@ public void clear() throws LocalDevelopmentDatastoreException { * {@link #stop} to ensure the server is not running regardless of the result of this method. * * @param sdkPath The path to the GCD SDK, eg /usr/local/dev/gcd - * @param dataset The name of the GCD dataset + * @param projectId The GCD project ID * @param cmdLineOptions Command line options to pass to the script that launches the dev server * @throws LocalDevelopmentDatastoreException If {@link #start} has already been called or the * server does not start successfully. */ - public synchronized void start(String sdkPath, String dataset, String... cmdLineOptions) + public synchronized void start(String sdkPath, String projectId, String... cmdLineOptions) throws LocalDevelopmentDatastoreException { - checkNotNull(sdkPath, "sdkPath cannot be null"); - checkNotNull(dataset, "dataset cannot be null"); - checkState(state == State.NEW, "Cannot call start() more than once."); + Preconditions.checkNotNull(sdkPath, "sdkPath cannot be null"); + Preconditions.checkNotNull(projectId, "projectId cannot be null"); + Preconditions.checkState(state == State.NEW, "Cannot call start() more than once."); try { - startDatastoreInternal(sdkPath, dataset, cmdLineOptions); + startDatastoreInternal(sdkPath, projectId, cmdLineOptions); state = State.STARTED; } finally { if (state != State.STARTED) { @@ -149,13 +146,13 @@ public synchronized void start(String sdkPath, String dataset, String... cmdLine } } - void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOptions) + void startDatastoreInternal(String sdkPath, String projectId, String... cmdLineOptions) throws LocalDevelopmentDatastoreException { - File datasetDirectory = createDatastore(sdkPath, dataset); + File projectDirectory = createProjectDirectory(sdkPath, projectId); List cmd = new ArrayList( Arrays.asList("./gcd.sh", "start", "--allow_remote_shutdown", "--store_on_disk=false")); cmd.addAll(Arrays.asList(cmdLineOptions)); - cmd.add(datasetDirectory.getPath()); + cmd.add(projectDirectory.getPath()); final Process gcdStartProcess; try { gcdStartProcess = newGcdProcess(sdkPath, cmd).start(); @@ -184,27 +181,27 @@ public void run() { } } - private File createDatastore(String sdkPath, String dataset) + private File createProjectDirectory(String sdkPath, String projectId) throws LocalDevelopmentDatastoreException { try { - datasetDirectory = Files.createTempDirectory("local-development-datastore").toFile(); + projectDirectory = Files.createTempDirectory("local-development-datastore").toFile(); } catch (IOException e) { - throw new LocalDevelopmentDatastoreException("Could not create dataset tmp directory", e); + throw new LocalDevelopmentDatastoreException("Could not create project tmp directory", e); } - List cmd = Arrays.asList("./gcd.sh", "create", "--project_id=" + dataset, - datasetDirectory.getPath()); + List cmd = Arrays.asList("./gcd.sh", "create", "--project_id=" + projectId, + projectDirectory.getPath()); try { int retCode = newGcdProcess(sdkPath, cmd).start().waitFor(); if (retCode != 0) { throw new LocalDevelopmentDatastoreException( - String.format("Could not create dataset (retcode=%d)", retCode)); + String.format("Could not create project (retcode=%d)", retCode)); } } catch (IOException e) { - throw new LocalDevelopmentDatastoreException("Could not create dataset", e); + throw new LocalDevelopmentDatastoreException("Could not create project", e); } catch (InterruptedException e) { throw new LocalDevelopmentDatastoreException("Received an interrupt", e); } - return datasetDirectory; + return projectDirectory; } private ProcessBuilder newGcdProcess(String sdkPath, List cmd) { @@ -215,11 +212,6 @@ private ProcessBuilder newGcdProcess(String sdkPath, List cmd) { return builder; } - public File getDatasetDirectory() { - checkState(state == State.STARTED); - return datasetDirectory; - } - /** * Stops the local datastore. Multiple calls are allowed. * @@ -231,15 +223,15 @@ public synchronized void stop() throws LocalDevelopmentDatastoreException { stopDatastoreInternal(); if (state != State.STOPPED) { state = State.STOPPED; - if (datasetDirectory != null) { + if (projectDirectory != null) { try { Process process = - new ProcessBuilder("rm", "-r", datasetDirectory.getAbsolutePath()).start(); + new ProcessBuilder("rm", "-r", projectDirectory.getAbsolutePath()).start(); if (process.waitFor() != 0) { throw new IOException("Temp directory delete exited with " + process.exitValue()); } } catch (IOException | InterruptedException e) { - throw new IllegalStateException("Dataset directory wipe failed.", e); + throw new IllegalStateException("Project directory wipe failed.", e); } } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreException.java similarity index 89% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreException.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreException.java index deaec195703a..258dcd853e97 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreException.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreException.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; /** * An exception related to the local development {@link Datastore}. - * */ public class LocalDevelopmentDatastoreException extends Exception { public LocalDevelopmentDatastoreException(String message) { diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreFactory.java similarity index 89% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreFactory.java index 824f6b604f9b..37302ab5f172 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; - +package com.google.datastore.v1beta3.client; /** * Factory for {@link LocalDevelopmentDatastore}. - * */ public class LocalDevelopmentDatastoreFactory extends DatastoreFactory { @@ -41,7 +39,7 @@ public LocalDevelopmentDatastore create(DatastoreOptions options) public LocalDevelopmentDatastore create(DatastoreOptions options, LocalDevelopmentDatastoreOptions localDevelopmentOptions) { RemoteRpc rpc = newRemoteRpc(options); - return new LocalDevelopmentDatastore(rpc, options.getHost(), + return new LocalDevelopmentDatastore(rpc, options.getLocalHost(), localDevelopmentOptions); } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreOptions.java similarity index 93% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreOptions.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreOptions.java index b59f8734ed02..8fd519ed25cf 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastoreOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; import java.util.HashMap; import java.util.Map; diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitter.java similarity index 55% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitter.java index 528349cc9751..190cf783a7fc 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitter.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; -import com.google.api.services.datastore.DatastoreV1.PartitionId; -import com.google.api.services.datastore.DatastoreV1.Query; +import com.google.datastore.v1beta3.PartitionId; +import com.google.datastore.v1beta3.Query; import java.util.List; /** * Provides the ability to split a query into multiple shards. - * */ public interface QuerySplitter { @@ -35,26 +34,7 @@ public interface QuerySplitter { * number of results for the query is too small. * * @param query the query to split. - * @param numSplits the desired number of splits. - * @param datastore the datastore to run on. - * @throws DatastoreException if there was a datastore error while generating query splits. - * @throws IllegalArgumentException if the given query or numSplits was invalid. - * @deprecated Use {@link getSplits(Query, PartitionId, int, Datastore)} instead, which provides - * the ability to supply a namespace. - */ - @Deprecated - List getSplits(Query query, int numSplits, Datastore datastore) throws DatastoreException; - - /** - * Returns a list of sharded {@link Query}s for the given query. - * - *

This will create up to the desired number of splits, however it may return less splits if - * the desired number of splits is unavailable. This will happen if the number of split points - * provided by the underlying Datastore is less than the desired number, which will occur if the - * number of results for the query is too small. - * - * @param query the query to split. - * @param partition the partition to run in. + * @param partition the partition the query is running in. * @param numSplits the desired number of splits. * @param datastore the datastore to run on. * @throws DatastoreException if there was a datastore error while generating query splits. diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitterImpl.java similarity index 79% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitterImpl.java index c351981a0403..dab377148a0d 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/QuerySplitterImpl.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitterImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; -import static com.google.api.services.datastore.client.DatastoreHelper.makeFilter; +import static com.google.datastore.v1beta3.client.DatastoreHelper.makeAndFilter; -import com.google.api.services.datastore.DatastoreV1.EntityResult; -import com.google.api.services.datastore.DatastoreV1.Filter; -import com.google.api.services.datastore.DatastoreV1.Key; -import com.google.api.services.datastore.DatastoreV1.PartitionId; -import com.google.api.services.datastore.DatastoreV1.PropertyExpression; -import com.google.api.services.datastore.DatastoreV1.PropertyFilter; -import com.google.api.services.datastore.DatastoreV1.PropertyFilter.Operator; -import com.google.api.services.datastore.DatastoreV1.PropertyOrder.Direction; -import com.google.api.services.datastore.DatastoreV1.PropertyReference; -import com.google.api.services.datastore.DatastoreV1.Query; -import com.google.api.services.datastore.DatastoreV1.QueryResultBatch; -import com.google.api.services.datastore.DatastoreV1.QueryResultBatch.MoreResultsType; -import com.google.api.services.datastore.DatastoreV1.RunQueryRequest; +import com.google.datastore.v1beta3.EntityResult; +import com.google.datastore.v1beta3.Filter; +import com.google.datastore.v1beta3.Key; +import com.google.datastore.v1beta3.PartitionId; +import com.google.datastore.v1beta3.Projection; +import com.google.datastore.v1beta3.PropertyFilter; +import com.google.datastore.v1beta3.PropertyFilter.Operator; +import com.google.datastore.v1beta3.PropertyOrder.Direction; +import com.google.datastore.v1beta3.PropertyReference; +import com.google.datastore.v1beta3.Query; +import com.google.datastore.v1beta3.QueryResultBatch; +import com.google.datastore.v1beta3.QueryResultBatch.MoreResultsType; +import com.google.datastore.v1beta3.RunQueryRequest; import java.util.ArrayList; import java.util.Collections; @@ -41,8 +41,7 @@ * *

This implementation of the QuerySplitter uses the __scatter__ property to gather * random split points for a query. - * - **/ + */ final class QuerySplitterImpl implements QuerySplitter { /** The number of keys to sample for each split. **/ @@ -57,17 +56,11 @@ private QuerySplitterImpl() { // No initialization required. } - @Override - @Deprecated - public List getSplits(Query query, int numSplits, Datastore datastore) - throws DatastoreException, IllegalArgumentException { - return getSplits(query, PartitionId.newBuilder().build(), numSplits, datastore); - } - @Override public List getSplits( Query query, PartitionId partition, int numSplits, Datastore datastore) throws DatastoreException, IllegalArgumentException { + validateQuery(query); validateSplitSize(numSplits); @@ -100,14 +93,20 @@ private void validateSplitSize(int numSplits) throws IllegalArgumentException { * inefficient sharding. */ private void validateFilter(Filter filter) throws IllegalArgumentException { - if (filter.hasCompositeFilter()) { - for (Filter subFilter : filter.getCompositeFilter().getFilterList()) { - validateFilter(subFilter); - } - } else if (filter.hasPropertyFilter()) { - if (UNSUPPORTED_OPERATORS.contains(filter.getPropertyFilter().getOperator())) { - throw new IllegalArgumentException("Query cannot have any inequality filters."); - } + switch (filter.getFilterTypeCase()) { + case COMPOSITE_FILTER: + for (Filter subFilter : filter.getCompositeFilter().getFiltersList()) { + validateFilter(subFilter); + } + break; + case PROPERTY_FILTER: + if (UNSUPPORTED_OPERATORS.contains(filter.getPropertyFilter().getOp())) { + throw new IllegalArgumentException("Query cannot have any inequality filters."); + } + break; + default: + throw new IllegalArgumentException( + "Unsupported filter type: " + filter.getFilterTypeCase()); } } @@ -156,7 +155,7 @@ private Query createSplit(Key lastKey, Key nextKey, Query query) { DatastoreHelper.makeValue(nextKey)).build(); keyFilters.add(upperBound); } - return Query.newBuilder(query).setFilter(makeFilter(keyFilters)).build(); + return Query.newBuilder(query).setFilter(makeAndFilter(keyFilters)).build(); } /** @@ -187,11 +186,12 @@ private List getScatterKeys( .setQuery(scatterPointQuery) .build(); batch = datastore.runQuery(scatterRequest).getBatch(); - for (EntityResult result : batch.getEntityResultList()) { + for (EntityResult result : batch.getEntityResultsList()) { keySplits.add(result.getEntity().getKey()); } scatterPointQuery.setStartCursor(batch.getEndCursor()); - scatterPointQuery.setLimit(scatterPointQuery.getLimit() - batch.getEntityResultCount()); + scatterPointQuery.getLimitBuilder().setValue( + scatterPointQuery.getLimit().getValue() - batch.getEntityResultsCount()); } while (batch.getMoreResults() == MoreResultsType.NOT_FINISHED); Collections.sort(keySplits, DatastoreHelper.getKeyComparator()); return keySplits; @@ -204,7 +204,7 @@ private List getScatterKeys( * @param numSplits the number of splits to create. */ private Query.Builder createScatterQuery(Query query, int numSplits) { - // TODO(user): We can potentially support better splits with equality filters in our query + // TODO(pcostello): We can potentially support better splits with equality filters in our query // if there exists a composite index on property, __scatter__, __key__. Until an API for // metadata exists, this isn't possible. Note that ancestor and inequality queries fall into // the same category. @@ -217,8 +217,8 @@ private Query.Builder createScatterQuery(Query query, int numSplits) { // If we represent each split as a region before a scatter entity, there is an extra region // following the last scatter point. Thus, we do not need the scatter entities for the last // region. - scatterPointQuery.setLimit((numSplits - 1) * KEYS_PER_SPLIT); - scatterPointQuery.addProjection(PropertyExpression.newBuilder().setProperty( + scatterPointQuery.getLimitBuilder().setValue((numSplits - 1) * KEYS_PER_SPLIT); + scatterPointQuery.addProjection(Projection.newBuilder().setProperty( PropertyReference.newBuilder().setName("__key__"))); return scatterPointQuery; } diff --git a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java similarity index 53% rename from datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java index 80c6d5c81719..bf7918706048 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/api/services/datastore/client/RemoteRpc.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Google Inc. All Rights Reserved. + * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,30 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.api.services.datastore.client; +package com.google.datastore.v1beta3.client; import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpRequestFactory; import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpResponse; -import com.google.api.client.http.HttpResponseException; -import com.google.api.client.http.HttpStatusCodes; import com.google.api.client.http.protobuf.ProtoHttpContent; +import com.google.api.client.util.IOUtils; import com.google.protobuf.MessageLite; +import com.google.rpc.Code; +import com.google.rpc.Status; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.Charset; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; /** * An RPC transport that sends protocol buffers over HTTP. - * */ class RemoteRpc { private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName()); + private static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version"; + private static final String API_FORMAT_VERSION = "2"; + private final HttpRequestFactory client; private final HttpRequestInitializer initializer; private final String url; @@ -72,16 +77,22 @@ public InputStream call(String methodName, MessageLite request) throws Datastore rpcCount.incrementAndGet(); ProtoHttpContent payload = new ProtoHttpContent(request); HttpRequest httpRequest = client.buildPostRequest(resolveURL(methodName), payload); + httpRequest.getHeaders().put(API_FORMAT_VERSION_HEADER, API_FORMAT_VERSION); + // 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); if (initializer != null) { initializer.initialize(httpRequest); } httpResponse = httpRequest.execute(); + if (!httpResponse.isSuccessStatusCode()) { + throw makeException(url, methodName, httpResponse.getContent(), + httpResponse.getContentType(), httpResponse.getContentCharset(), null, + httpResponse.getStatusCode()); + } return httpResponse.getContent(); - } catch (HttpResponseException e) { - throw makeException(url, methodName, e.getStatusCode(), e.getContent(), e); } catch (IOException e) { - throw makeException(url, methodName, HttpStatusCodes.STATUS_CODE_SERVICE_UNAVAILABLE, - "I/O error", e); + throw makeException(url, methodName, Code.UNAVAILABLE, "I/O error", e); } } finally { long elapsedTime = System.currentTimeMillis() - startTime; @@ -102,16 +113,59 @@ public String getUrl() { } GenericUrl resolveURL(String path) { - return new GenericUrl(url + "/" + path); + return new GenericUrl(url + ":" + path); } HttpRequestFactory getHttpRequestFactory() { return client; } - - public static DatastoreException makeException( - String url, String methodName, int code, String message, Throwable cause) { + + public static DatastoreException makeException(String url, String methodName, Code code, + String message, Throwable cause) { logger.fine("remote datastore call " + methodName + " against " + url + " failed: " + message); return new DatastoreException(methodName, code, message, cause); } + + static DatastoreException makeException(String url, String methodName, InputStream content, + String contentType, Charset contentCharset, Throwable cause, int httpStatusCode) { + if (!contentType.equals("application/x-protobuf")) { + String responseContent; + try { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + IOUtils.copy(content, out); + responseContent = out.toString(contentCharset.name()); + } catch (IOException e) { + responseContent = ""; + } + return makeException(url, methodName, Code.INTERNAL, + String.format( + "Non-protobuf error: %s. HTTP status code was %d.", responseContent, httpStatusCode), + cause); + } + + Status rpcStatus; + try { + rpcStatus = Status.parseFrom(content); + } catch (IOException e) { + return makeException(url, methodName, Code.INTERNAL, + String.format( + "Unable to parse Status protocol buffer: HTTP status code was %s.", httpStatusCode), + e); + } + + Code code = Code.forNumber(rpcStatus.getCode()); + if (code == null) { + return makeException(url, methodName, Code.INTERNAL, + String.format( + "Invalid error code: %d. Message: %s.", rpcStatus.getCode(), rpcStatus.getMessage()), + cause); + } else if (code == Code.OK) { + return makeException(url, methodName, Code.INTERNAL, + String.format("Unexpected OK error code with HTTP status code of %d. Message: %s.", + httpStatusCode, rpcStatus.getMessage()), + cause); + } + + return makeException(url, methodName, code, rpcStatus.getMessage(), cause); + } } diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreFactoryTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreFactoryTest.java new file mode 100644 index 000000000000..3a76d6110e07 --- /dev/null +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreFactoryTest.java @@ -0,0 +1,107 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * + * 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.v1beta3.client; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.javanet.NetHttpTransport; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** + * Test for {@link DatastoreFactory}. + */ +@RunWith(JUnit4.class) +public class DatastoreFactoryTest { + private static final String PROJECT_ID = "project-id"; + + private DatastoreFactory factory = DatastoreFactory.get(); + + /** + * Without specifying a credential or transport, the factory will create + * a default transport on its own. + */ + @Test + public void makeClient_Default() { + DatastoreOptions options = new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .build(); + HttpRequestFactory f = factory.makeClient(options); + assertNotNull(f.getTransport()); + assertTrue(f.getTransport() instanceof NetHttpTransport); + } + + /** + * Specifying a credential, but not a transport, the factory will use the + * transport from the credential. + */ + @Test + public void makeClient_WithCredential() { + NetHttpTransport transport = new NetHttpTransport(); + GoogleCredential credential = new GoogleCredential.Builder() + .setTransport(transport) + .build(); + DatastoreOptions options = new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .credential(credential) + .build(); + HttpRequestFactory f = factory.makeClient(options); + assertEquals(transport, f.getTransport()); + } + + /** + * Specifying a transport, but not a credential, the factory will use the + * transport specified. + */ + @Test + public void makeClient_WithTransport() { + NetHttpTransport transport = new NetHttpTransport(); + DatastoreOptions options = new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .transport(transport) + .build(); + HttpRequestFactory f = factory.makeClient(options); + assertEquals(transport, f.getTransport()); + } + + /** + * Specifying both credential and transport, the factory will use the + * transport specified and not the one in the credential. + */ + @Test + public void makeClient_WithCredentialTransport() { + NetHttpTransport credTransport = new NetHttpTransport(); + NetHttpTransport transport = new NetHttpTransport(); + GoogleCredential credential = new GoogleCredential.Builder() + .setTransport(credTransport) + .build(); + DatastoreOptions options = new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .credential(credential) + .transport(transport) + .build(); + HttpRequestFactory f = factory.makeClient(options); + assertNotSame(credTransport, f.getTransport()); + assertEquals(transport, f.getTransport()); + } +} diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreHelperTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreHelperTest.java new file mode 100644 index 000000000000..11ec8aeed68d --- /dev/null +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreHelperTest.java @@ -0,0 +1,355 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * + * 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.v1beta3.client; + +import static com.google.datastore.v1beta3.client.DatastoreHelper.getByteString; +import static com.google.datastore.v1beta3.client.DatastoreHelper.makeKey; +import static com.google.datastore.v1beta3.client.DatastoreHelper.makeValue; +import static com.google.datastore.v1beta3.client.DatastoreHelper.toDate; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import com.google.datastore.v1beta3.Key; +import com.google.datastore.v1beta3.PartitionId; +import com.google.datastore.v1beta3.Value; +import com.google.datastore.v1beta3.Value.ValueTypeCase; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.util.Date; + +/** + * Tests for {@link DatastoreHelper}. + */ +@RunWith(JUnit4.class) +public class DatastoreHelperTest { + + private static final Key PARENT = Key.newBuilder() + .addPath(Key.PathElement.newBuilder() + .setKind("Parent") + .setId(23L)) + .build(); + private static final Key GRANDPARENT = Key.newBuilder() + .addPath(Key.PathElement.newBuilder() + .setKind("Grandparent") + .setId(24L)) + .build(); + private static final Key CHILD = Key.newBuilder() + .addPath(Key.PathElement.newBuilder() + .setKind("Child") + .setId(26L)) + .build(); + + @Test + public void testMakeKey_BadTypeForKind() { + try { + DatastoreHelper.makeKey(new Object()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } + + @Test + public void testMakeKey_BadTypeForNameId() { + try { + DatastoreHelper.makeKey("kind", new Object()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } + + @Test + public void testMakeKey_Empty() { + assertEquals(Key.newBuilder().build(), DatastoreHelper.makeKey().build()); + } + + @Test + public void testMakeKey_Incomplete() { + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Foo")) + .build(), + makeKey("Foo").build()); + } + + @Test + public void testMakeKey_IdInt() { + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)) + .build(), + makeKey("Foo", 1).build()); + } + + @Test + public void testMakeKey_IdLong() { + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)) + .build(), + makeKey("Foo", 1L).build()); + } + + @Test + public void testMakeKey_IdShort() { + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)) + .build(), + makeKey("Foo", (short) 1).build()); + } + + @Test + public void testMakeKey_Name() { + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi")) + .build(), + makeKey("Foo", "hi").build()); + } + + @Test + public void testMakeKey_KindNameKind() { + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi")) + .addPath(Key.PathElement.newBuilder().setKind("Bar")) + .build(), + makeKey("Foo", "hi", "Bar").build()); + } + + @Test + public void testMakeKey_KeyKind() { + // 1 key at the beginning of the series + assertEquals( + Key.newBuilder() + .addPath(PARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Child")) + .build(), + makeKey(PARENT, "Child").build()); + } + + @Test + public void testMakeKey_KindIdKeyKind() { + // 1 key in the middle of the series + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L)) + .addPath(PARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Child")) + .build(), + makeKey("Grandparent", 24L, PARENT, "Child").build()); + } + + @Test + public void testMakeKey_KindIdKey() { + // 1 key at the end of the series + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L)) + .addPath(PARENT.getPath(0)) + .build(), + makeKey("Grandparent", 24L, PARENT).build()); + } + + @Test + public void testMakeKey_KeyKindIdKey() { + // 1 key at the beginning and 1 key at the end of the series + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Parent").setId(23L)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(GRANDPARENT, "Parent", 23, CHILD).build()); + } + + @Test + public void testMakeKey_Key() { + // Just 1 key + assertEquals( + Key.newBuilder() + .addPath(CHILD.getPath(0)) + .build(), + makeKey(CHILD).build()); + } + + @Test + public void testMakeKey_KeyKey() { + // Just 2 keys + assertEquals( + Key.newBuilder() + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(PARENT, CHILD).build()); + } + + @Test + public void testMakeKey_KeyKeyKey() { + // Just 3 keys + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(GRANDPARENT, PARENT, CHILD).build()); + } + + @Test + public void testMakeKey_KeyMultiLevelKey() { + // 1 key with 2 elements + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(GRANDPARENT, makeKey(PARENT, CHILD).build()).build()); + } + + @Test + public void testMakeKey_MultiLevelKeyKey() { + // 1 key with 2 elements + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(makeKey(GRANDPARENT, PARENT).build(), CHILD).build()); + } + + @Test + public void testMakeKey_MultiLevelKey() { + // 1 key with 3 elements + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(makeKey(GRANDPARENT, PARENT, CHILD).build()).build()); + } + + @Test + public void testMakeKey_PartitionId() { + PartitionId partitionId = PartitionId.newBuilder() + .setNamespaceId("namespace-id") + .build(); + Key parent = PARENT.toBuilder() + .setPartitionId(partitionId) + .build(); + assertEquals( + Key.newBuilder() + .setPartitionId(partitionId) + .addPath(PARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Child")) + .build(), + makeKey(parent, "Child").build()); + } + + @Test + public void testMakeKey_NonMatchingPartitionId2() { + PartitionId partitionId1 = PartitionId.newBuilder() + .setNamespaceId("namespace-id") + .build(); + PartitionId partitionId2 = PartitionId.newBuilder() + .setNamespaceId("another-namespace-id") + .build(); + try { + makeKey( + PARENT.toBuilder().setPartitionId(partitionId1).build(), + CHILD.toBuilder().setPartitionId(partitionId2).build()); + fail("expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } + + @Test + public void testMakeTimestampValue() throws Exception { + // Test cases with nanos == 0. + assertConversion(-50_000, -50, 0); + assertConversion(-1_000, -1, 0); + assertConversion(0, 0, 0); + assertConversion(1_000, 1, 0); + assertConversion(2_000, 2, 0); + assertConversion(100_000, 100, 0); + + // Test cases with nanos % 1_000_000 == 0 (no loss of precision). + assertConversion(2, 0, 2_000_000); + assertConversion(1_003, 1, 3_000_000); + assertConversion(2_005, 2, 5_000_000); + + // Timestamp specification requires that nanos >= 0 even if the timestamp + // is before the epoch. + assertConversion(0, 0, 0); + assertConversion(-250, -1, 750_000_000); // 1/4 second before epoch + assertConversion(-500, -1, 500_000_000); // 1/2 second before epoch + assertConversion(-750, -1, 250_000_000); // 3/4 second before epoch + + // If nanos % 1_000_000 != 0, precision is lost (via truncation) when + // converting to milliseconds. + assertTimestampToMilliseconds(3_100, 3, 100_000_999); + assertMillisecondsToTimestamp(3_100, 3, 100_000_000); + assertTimestampToMilliseconds(5_999, 5, 999_999_999); + assertMillisecondsToTimestamp(5_999, 5, 999_000_000); + assertTimestampToMilliseconds(7_100, 7, 100_000_001); + assertMillisecondsToTimestamp(7_100, 7, 100_000_000); + } + + private void assertConversion(long millis, long seconds, int nanos) { + assertMillisecondsToTimestamp(millis, seconds, nanos); + assertTimestampToMilliseconds(millis, seconds, nanos); + } + + private void assertMillisecondsToTimestamp(long millis, long seconds, long nanos) { + Value timestampValue = makeValue(new Date(millis)).build(); + assertEquals(ValueTypeCase.TIMESTAMP_VALUE, timestampValue.getValueTypeCase()); + assertEquals(seconds, timestampValue.getTimestampValue().getSeconds()); + assertEquals(nanos, timestampValue.getTimestampValue().getNanos()); + } + + private void assertTimestampToMilliseconds(long millis, long seconds, int nanos) { + Value.Builder value = Value.newBuilder().setTimestampValue(Timestamp.newBuilder() + .setSeconds(seconds) + .setNanos(nanos)); + assertEquals(millis, DatastoreHelper.toDate(value.build()).getTime()); + } + + @Test + public void testProjectionHandling() { + assertEquals(ByteString.copyFromUtf8("hi"), + getByteString(makeValue("hi").setMeaning(18).build())); + try { + getByteString(makeValue("hi").build()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + + assertEquals(new Date(1), toDate(makeValue(1000).setMeaning(18).build())); + try { + toDate(makeValue(1000).build()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } +} diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java new file mode 100644 index 000000000000..00ce0025634c --- /dev/null +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java @@ -0,0 +1,362 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * + * 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.v1beta3.client; + +import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.GenericUrl; +import com.google.api.client.http.HttpRequest; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.HttpRequestInitializer; +import com.google.api.client.http.HttpStatusCodes; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.LowLevelHttpRequest; +import com.google.api.client.http.LowLevelHttpResponse; +import com.google.api.client.testing.http.MockHttpTransport; +import com.google.api.client.testing.http.MockLowLevelHttpRequest; +import com.google.api.client.testing.http.MockLowLevelHttpResponse; +import com.google.api.client.testing.util.TestableByteArrayInputStream; +import com.google.common.collect.Iterables; +import com.google.datastore.v1beta3.AllocateIdsRequest; +import com.google.datastore.v1beta3.AllocateIdsResponse; +import com.google.datastore.v1beta3.BeginTransactionRequest; +import com.google.datastore.v1beta3.BeginTransactionResponse; +import com.google.datastore.v1beta3.CommitRequest; +import com.google.datastore.v1beta3.CommitResponse; +import com.google.datastore.v1beta3.EntityResult; +import com.google.datastore.v1beta3.LookupRequest; +import com.google.datastore.v1beta3.LookupResponse; +import com.google.datastore.v1beta3.QueryResultBatch; +import com.google.datastore.v1beta3.RollbackRequest; +import com.google.datastore.v1beta3.RollbackResponse; +import com.google.datastore.v1beta3.RunQueryRequest; +import com.google.datastore.v1beta3.RunQueryResponse; +import com.google.protobuf.ByteString; +import com.google.protobuf.Message; +import com.google.rpc.Code; +import com.google.rpc.Status; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.List; + +/** + * Tests for {@link DatastoreFactory} and {@link Datastore}. + */ +@RunWith(JUnit4.class) +public class DatastoreTest { + private static final String PROJECT_ID = "project-id"; + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private DatastoreFactory factory = new MockDatastoreFactory(); + private DatastoreOptions.Builder options = new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .credential(new MockCredential()); + + @Test + public void options_NoProjectIdOrProjectEndpoint() throws Exception { + options = new DatastoreOptions.Builder(); + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Either project ID or project endpoint must be provided"); + options.build(); + } + + @Test + public void options_ProjectIdAndProjectEndpoint() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Cannot set both project endpoint and project ID"); + options = new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id"); + } + + @Test + public void options_LocalHostAndProjectEndpoint() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Cannot set both project endpoint and local host"); + options = new DatastoreOptions.Builder() + .localHost("localhost:8080") + .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id"); + } + + @Test + public void options_InvalidLocalHost() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Illegal character"); + new DatastoreOptions.Builder() + .localHost("!not a valid url!"); + } + + @Test + public void options_SchemeInLocalHost() { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Local host \"http://localhost:8080\" must not include scheme"); + new DatastoreOptions.Builder() + .localHost("http://localhost:8080"); + } + + @Test + public void create_NullOptions() throws Exception { + thrown.expect(NullPointerException.class); + factory.create(null); + } + + @Test + public void create_LocalHost() { + Datastore datastore = factory.create(new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .localHost("localhost:8080") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("http://localhost:8080/datastore/v1beta3/projects/project-id"); + } + + @Test + public void create_DefaultHost() { + Datastore datastore = factory.create(new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("https://datastore.googleapis.com/v1beta3/projects/project-id"); + } + + @Test + public void create_ProjectEndpoint() { + Datastore datastore = factory.create(new DatastoreOptions.Builder() + .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("http://prom-qa/datastore/v1beta42/projects/project-id"); + } + + @Test + public void initializer() throws Exception { + options.initializer(new HttpRequestInitializer() { + @Override + public void initialize(HttpRequest request) { + request.getHeaders().setCookie("magic"); + } + }); + Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + AllocateIdsRequest request = AllocateIdsRequest.newBuilder().build(); + AllocateIdsResponse response = AllocateIdsResponse.newBuilder().build(); + mockClient.setNextResponse(response); + assertEquals(response, datastore.allocateIds(request)); + assertEquals("magic", mockClient.lastCookies.get(0)); + } + + @Test + public void allocateIds() throws Exception { + AllocateIdsRequest.Builder request = AllocateIdsRequest.newBuilder(); + AllocateIdsResponse.Builder response = AllocateIdsResponse.newBuilder(); + expectRpc("allocateIds", request.build(), response.build()); + } + + @Test + public void lookup() throws Exception { + LookupRequest.Builder request = LookupRequest.newBuilder(); + LookupResponse.Builder response = LookupResponse.newBuilder(); + expectRpc("lookup", request.build(), response.build()); + } + + @Test + public void beginTransaction() throws Exception { + BeginTransactionRequest.Builder request = BeginTransactionRequest.newBuilder(); + BeginTransactionResponse.Builder response = BeginTransactionResponse.newBuilder(); + response.setTransaction(ByteString.copyFromUtf8("project-id")); + expectRpc("beginTransaction", request.build(), response.build()); + } + + @Test + public void commit() throws Exception { + CommitRequest.Builder request = CommitRequest.newBuilder(); + request.setTransaction(ByteString.copyFromUtf8("project-id")); + CommitResponse.Builder response = CommitResponse.newBuilder(); + expectRpc("commit", request.build(), response.build()); + } + + @Test + public void rollback() throws Exception { + RollbackRequest.Builder request = RollbackRequest.newBuilder(); + request.setTransaction(ByteString.copyFromUtf8("project-id")); + RollbackResponse.Builder response = RollbackResponse.newBuilder(); + expectRpc("rollback", request.build(), response.build()); + } + + @Test + public void runQuery() throws Exception { + RunQueryRequest.Builder request = RunQueryRequest.newBuilder(); + request.getQueryBuilder(); + RunQueryResponse.Builder response = RunQueryResponse.newBuilder(); + response.getBatchBuilder() + .setEntityResultType(EntityResult.ResultType.FULL) + .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED); + expectRpc("runQuery", request.build(), response.build()); + } + + private void expectRpc(String methodName, Message request, Message response) throws Exception { + Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + + mockClient.setNextResponse(response); + @SuppressWarnings("rawtypes") + Class[] methodArgs = { request.getClass() }; + Method call = Datastore.class.getMethod(methodName, methodArgs); + Object[] callArgs = { request }; + assertEquals(response, call.invoke(datastore, callArgs)); + + assertEquals("/v1beta3/projects/project-id:" + methodName, mockClient.lastPath); + assertEquals("application/x-protobuf", mockClient.lastMimeType); + assertEquals("2", mockClient.lastApiFormatHeaderValue); + assertArrayEquals(request.toByteArray(), mockClient.lastBody); + assertEquals(1, datastore.getRpcCount()); + + datastore.resetRpcCount(); + assertEquals(0, datastore.getRpcCount()); + + mockClient.setNextError(400, Code.INVALID_ARGUMENT, "oops"); + try { + call.invoke(datastore, callArgs); + fail(); + } catch (InvocationTargetException targetException) { + DatastoreException exception = (DatastoreException) targetException.getCause(); + assertEquals(Code.INVALID_ARGUMENT, exception.getCode()); + assertEquals(methodName, exception.getMethodName()); + assertEquals("oops", exception.getMessage()); + } + + IOException ioException = new IOException("non"); + mockClient.setNextException(ioException); + try { + call.invoke(datastore, callArgs); + fail(); + } catch (InvocationTargetException targetException) { + DatastoreException exception = (DatastoreException) targetException.getCause(); + assertEquals(Code.UNAVAILABLE, exception.getCode()); + assertEquals(methodName, exception.getMethodName()); + assertEquals("I/O error", exception.getMessage()); + assertSame(ioException, exception.getCause()); + } + + assertEquals(2, datastore.getRpcCount()); + } + + private static class MockCredential extends Credential { + MockCredential() { + super(new AccessMethod() { + @Override + public void intercept(HttpRequest request, String accessToken) throws IOException { + } + @Override + public String getAccessTokenFromRequest(HttpRequest request) { + return "MockAccessToken"; + } + }); + } + } + + private static class MockDatastoreFactory extends DatastoreFactory { + int nextStatus; + Message nextResponse; + Status nextError; + IOException nextException; + + String lastPath; + String lastMimeType; + byte[] lastBody; + List lastCookies; + String lastApiFormatHeaderValue; + + void setNextResponse(Message response) { + nextStatus = HttpStatusCodes.STATUS_CODE_OK; + nextResponse = response; + nextError = null; + nextException = null; + } + + void setNextError(int status, Code code, String message) { + nextStatus = status; + nextResponse = null; + nextError = makeErrorContent(message, code); + nextException = null; + } + + void setNextException(IOException exception) { + nextStatus = 0; + nextResponse = null; + nextError = null; + nextException = exception; + } + + @Override + public HttpRequestFactory makeClient(DatastoreOptions options) { + HttpTransport transport = new MockHttpTransport() { + @Override + public LowLevelHttpRequest buildRequest(String method, String url) { + return new MockLowLevelHttpRequest(url) { + @Override + public LowLevelHttpResponse execute() throws IOException { + lastPath = new GenericUrl(getUrl()).getRawPath(); + lastMimeType = getContentType(); + lastCookies = getHeaderValues("Cookie"); + lastApiFormatHeaderValue = + Iterables.getOnlyElement(getHeaderValues("X-Goog-Api-Format-Version")); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + getStreamingContent().writeTo(out); + lastBody = out.toByteArray(); + if (nextException != null) { + throw nextException; + } + MockLowLevelHttpResponse response = new MockLowLevelHttpResponse() + .setStatusCode(nextStatus) + .setContentType("application/x-protobuf"); + if (nextError != null) { + assertNull(nextResponse); + response.setContent(new TestableByteArrayInputStream(nextError.toByteArray())); + } else { + response.setContent(new TestableByteArrayInputStream(nextResponse.toByteArray())); + } + return response; + } + }; + } + }; + Credential credential = options.getCredential(); + return transport.createRequestFactory(credential); + } + } + + private static Status makeErrorContent(String message, Code code) { + return Status.newBuilder().setCode(code.getNumber()).setMessage(message).build(); + } +} diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreTest.java new file mode 100644 index 000000000000..d0c789f3e991 --- /dev/null +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreTest.java @@ -0,0 +1,96 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * + * 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.v1beta3.client; + +import static org.junit.Assert.fail; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** + * Tests for {@link LocalDevelopmentDatastore}. + */ +@RunWith(JUnit4.class) +public class LocalDevelopmentDatastoreTest { + + private static final LocalDevelopmentDatastoreOptions options = + new LocalDevelopmentDatastoreOptions.Builder().build(); + + @Test + public void testArgs() throws LocalDevelopmentDatastoreException { + LocalDevelopmentDatastore datastore = new LocalDevelopmentDatastore(null, "blar", options) { + @Override + void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOpts) { + // no-op for testing + } + }; + + try { + datastore.start(null, "dataset"); + fail("expected exception"); + } catch (NullPointerException npe) { + // good + } + + try { + datastore.start("path/to/sdk", null); + fail("expected exception"); + } catch (NullPointerException npe) { + // good + } + + datastore.start("path/to/sdk", "dataset"); + } + + @Test + public void testLifecycle() throws LocalDevelopmentDatastoreException { + LocalDevelopmentDatastore datastore = new LocalDevelopmentDatastore(null, "blar", options) { + @Override + void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOpts) { + // no-op for testing + } + + @Override + protected void stopDatastoreInternal() { + // no-op for testing + } + }; + + String sdkPath = "/yar"; + String myApp = "myapp"; + + datastore.start(sdkPath, myApp); + try { + datastore.start(sdkPath, myApp); + fail("expected exception"); + } catch (IllegalStateException e) { + // good + } + + datastore.stop(); + // it's ok to stop if we've already stopped + datastore.stop(); + + // once we've stopped we can't start again + try { + datastore.start(sdkPath, myApp); + fail("expected exception"); + } catch (IllegalStateException e) { + // good + } + } +} diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/RemoteRpcTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/RemoteRpcTest.java new file mode 100644 index 000000000000..bde089ad3992 --- /dev/null +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/RemoteRpcTest.java @@ -0,0 +1,87 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * + * 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.v1beta3.client; + +import static org.junit.Assert.assertEquals; + +import com.google.api.client.util.Charsets; +import com.google.rpc.Code; +import com.google.rpc.Status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.io.ByteArrayInputStream; + +/** + * Test for {@link RemoteRpc}. + */ +@RunWith(JUnit4.class) +public class RemoteRpcTest { + + private static final String METHOD_NAME = "methodName"; + + @Test + public void testException() { + Status statusProto = + Status.newBuilder() + .setCode(Code.UNAUTHENTICATED_VALUE) + .setMessage("The request does not have valid authentication credentials.") + .build(); + DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME, + new ByteArrayInputStream(statusProto.toByteArray()), "application/x-protobuf", + Charsets.UTF_8, new RuntimeException(), 401); + assertEquals(Code.UNAUTHENTICATED, exception.getCode()); + assertEquals("The request does not have valid authentication credentials.", + exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testInvalidProtoException() { + DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME, + new ByteArrayInputStream("".getBytes()), "application/x-protobuf", + Charsets.UTF_8, new RuntimeException(), 401); + assertEquals(Code.INTERNAL, exception.getCode()); + assertEquals("Unable to parse Status protocol buffer: HTTP status code was 401.", + exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testEmptyProtoException() { + Status statusProto = Status.newBuilder().build(); + DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME, + new ByteArrayInputStream(statusProto.toByteArray()), "application/x-protobuf", + Charsets.UTF_8, new RuntimeException(), 401); + assertEquals(Code.INTERNAL, exception.getCode()); + assertEquals("Unexpected OK error code with HTTP status code of 401. Message: .", + exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testPlainTextException() { + DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME, + new ByteArrayInputStream("Text Error".getBytes()), "text/plain", Charsets.UTF_8, + new RuntimeException(), 401); + assertEquals(Code.INTERNAL, exception.getCode()); + assertEquals( + "Non-protobuf error: Text Error. HTTP status code was 401.", exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } +} From 6b53466752e414de59ecf6876448a937e4d0ddce Mon Sep 17 00:00:00 2001 From: Patrick Costello Date: Wed, 30 Mar 2016 10:41:35 -0700 Subject: [PATCH 0021/1784] Update RemoteRpc to use correct version of proto library. --- .../java/com/google/datastore/v1beta3/client/RemoteRpc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java index bf7918706048..5cd091947d7c 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java @@ -153,7 +153,7 @@ static DatastoreException makeException(String url, String methodName, InputStre e); } - Code code = Code.forNumber(rpcStatus.getCode()); + Code code = Code.valueOf(rpcStatus.getCode()); if (code == null) { return makeException(url, methodName, Code.INTERNAL, String.format( From 6a4406152af39e065d4de09617b0bade239f44b9 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 31 Mar 2016 16:52:48 -0700 Subject: [PATCH 0022/1784] Changes for v1beta3 --- .../google/datastore/snippets/Concepts.java | 26 ++++++++++++------- .../google/datastore/snippets/TaskList.java | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index 30954447e8bd..67d32a11c5d2 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -43,11 +43,11 @@ import com.google.gcloud.datastore.Query; import com.google.gcloud.datastore.Query.ResultType; import com.google.gcloud.datastore.QueryResults; +import com.google.gcloud.datastore.ReadOption; import com.google.gcloud.datastore.StringValue; import com.google.gcloud.datastore.StructuredQuery; import com.google.gcloud.datastore.StructuredQuery.CompositeFilter; import com.google.gcloud.datastore.StructuredQuery.OrderBy; -import com.google.gcloud.datastore.StructuredQuery.Projection; import com.google.gcloud.datastore.StructuredQuery.PropertyFilter; import com.google.gcloud.datastore.Transaction; import com.google.gcloud.datastore.testing.LocalGcdHelper; @@ -373,7 +373,8 @@ private void setUpQueryTests() { .set("priority", 4) .set("created", includedDate) .set("percent_complete", 10.0) - .set("description", StringValue.builder("Learn Cloud Datastore").indexed(false).build()) + .set("description", + StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build()) .set("tag", "fun", "l", "programming") .build()); } @@ -512,7 +513,7 @@ public void testProjectionQuery() { // [START projection_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection(Projection.property("priority"), Projection.property("percent_complete")) + .projection("priority", "percent_complete") .build(); // [END projection_query] assertValidQuery(query); @@ -523,7 +524,7 @@ public void testRunProjectionQuery() { setUpQueryTests(); Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection(Projection.property("priority"), Projection.property("percent_complete")) + .projection("priority", "percent_complete") .build(); // [START run_query_projection] List priorities = new LinkedList<>(); @@ -565,8 +566,8 @@ public void testDistinctQuery() { // [START distinct_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection(Projection.property("type"), Projection.property("priority")) - .groupBy("type", "priority") + .projection("type", "priority") + .distinctOn("type", "priority") .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) .build(); // [END distinct_query] @@ -579,8 +580,8 @@ public void testDistinctOnQuery() { // [START distinct_on_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection(Projection.property("type"), Projection.first("priority")) - .groupBy("type") + .projection("type", "priority") + .distinctOn("type") .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) .build(); // [END distinct_on_query] @@ -726,9 +727,16 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) { @Test public void testEventualConsistentQuery() { + setUpQueryTests(); // [START eventual_consistent_query] - // Read consistency cannot be specified in gcloud-java. + Query query = Query.entityQueryBuilder() + .kind("Task") + .filter(PropertyFilter.hasAncestor( + datastore.newKeyFactory().kind("TaskList").newKey("default"))) + .build(); + datastore.run(query, ReadOption.eventualConsistency()); // [END eventual_consistent_query] + assertValidQuery(query); } @Test diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 40920e291cda..b26ea4fc17d8 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -56,7 +56,7 @@ public class TaskList { Key addTask(String description) { Key key = datastore.allocateId(keyFactory.newKey()); Entity task = Entity.builder(key) - .set("description", StringValue.builder(description).indexed(false).build()) + .set("description", StringValue.builder(description).excludeFromIndexes(true).build()) .set("created", DateTime.now()) .set("done", false) .build(); From a17f2c134bb804900d2e4f034453039bdc1c416e Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 1 Apr 2016 18:18:44 -0700 Subject: [PATCH 0023/1784] Cleanup error handling/docs in TaskList --- .../google/datastore/snippets/TaskList.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index b26ea4fc17d8..aa38b1191ebf 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -17,7 +17,6 @@ package com.google.datastore.snippets; import com.google.gcloud.datastore.Datastore; -import com.google.gcloud.datastore.DatastoreException; import com.google.gcloud.datastore.DatastoreOptions; import com.google.gcloud.datastore.DateTime; import com.google.gcloud.datastore.Entity; @@ -51,7 +50,8 @@ public class TaskList { * Adds a task entity to the Datastore. * * @param description The task description - * @return The {@link Key} of the entity. + * @return The {@link Key} of the entity + * @throws DatastoreException if the Datastore put fails */ Key addTask(String description) { Key key = datastore.allocateId(keyFactory.newKey()); @@ -70,14 +70,18 @@ Key addTask(String description) { * Marks a task entity as done. * * @param id The ID of the task entity as given by {@link Key#id()} - * @throws DatastoreException if the task does not exist + * @return true if the task was found, false if not + * @throws DatastoreException if the transaction commit fails */ - void markDone(long id) { + boolean markDone(long id) { Transaction transaction = datastore.newTransaction(); try { Entity task = transaction.get(keyFactory.newKey(id)); - transaction.put(Entity.builder(task).set("done", true).build()); + if (task != null) { + transaction.put(Entity.builder(task).set("done", true).build()); + } transaction.commit(); + return task != null; } finally { if (transaction.active()) { transaction.rollback(); @@ -89,6 +93,8 @@ void markDone(long id) { // [START retrieve_entities] /** * Returns a list of all task entities in ascending order of creation time. + * + * @throws DatastoreException if the query fails */ Iterator listTasks() { Query query = @@ -102,6 +108,7 @@ Iterator listTasks() { * Deletes a task entity. * * @param id The ID of the task entity as given by {@link Key#id()} + * @throws DatastoreException if the delete fails */ void deleteTask(long id) { datastore.delete(keyFactory.newKey(id)); @@ -158,10 +165,9 @@ void handleCommandLine(String commandLine) { case "done": assertArgsLength(args, 2); long id = Long.parseLong(args[1]); - try { - markDone(id); + if (markDone(id)) { System.out.println("task marked done"); - } catch (DatastoreException e) { + } else { System.out.printf("did not find a Task entity with ID %d%n", id); } break; @@ -178,7 +184,7 @@ void handleCommandLine(String commandLine) { case "delete": assertArgsLength(args, 2); deleteTask(Long.parseLong(args[1])); - System.out.println("task deleted"); + System.out.println("task deleted (if it existed)"); break; default: throw new IllegalArgumentException("unrecognized command: " + command); From 5aade877d965145e2f2b11f7aaf970af14cddd75 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Sat, 2 Apr 2016 09:06:45 -0700 Subject: [PATCH 0024/1784] Correct throws statements --- .../src/main/java/com/google/datastore/snippets/TaskList.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index aa38b1191ebf..371d41e35f46 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -51,7 +51,7 @@ public class TaskList { * * @param description The task description * @return The {@link Key} of the entity - * @throws DatastoreException if the Datastore put fails + * @throws DatastoreException if the ID allocation or put fails */ Key addTask(String description) { Key key = datastore.allocateId(keyFactory.newKey()); @@ -71,7 +71,7 @@ Key addTask(String description) { * * @param id The ID of the task entity as given by {@link Key#id()} * @return true if the task was found, false if not - * @throws DatastoreException if the transaction commit fails + * @throws DatastoreException if the transaction fails */ boolean markDone(long id) { Transaction transaction = datastore.newTransaction(); From 17d14c7a9c79f8f80b13f27e6f518d483a41b8e5 Mon Sep 17 00:00:00 2001 From: Patrick Costello Date: Wed, 6 Apr 2016 11:19:17 -0700 Subject: [PATCH 0025/1784] Add a helper for ancestor filters. --- .../google/datastore/v1beta3/client/DatastoreHelper.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java index a170cc0fa202..9d54d323e7b1 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java @@ -358,6 +358,15 @@ public static PropertyOrder.Builder makeOrder(String property, .setDirection(direction); } + /** + * Makes an ancestor filter. + */ + public static Filter.Builder makeAncestorFilter(Key ancestor) { + return makeFilter( + DatastoreHelper.KEY_PROPERTY_NAME, PropertyFilter.Operator.HAS_ANCESTOR, + makeValue(ancestor)); + } + /** * Make a filter on a property for use in a query. */ From a4a4247a5c92221a51c2278f38b1fe2ab95572d2 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 7 Apr 2016 14:08:57 -0700 Subject: [PATCH 0026/1784] Remove log that credentials aren't provided. --- .../com/google/datastore/v1beta3/client/DatastoreFactory.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java index 60cc87c1899b..1b16c17bc4d4 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java @@ -70,9 +70,6 @@ public Datastore create(DatastoreOptions options) throws IllegalArgumentExceptio */ public HttpRequestFactory makeClient(DatastoreOptions options) { Credential credential = options.getCredential(); - if (credential == null) { - logger.info("Not using any credentials"); - } HttpTransport transport = options.getTransport(); if (transport == null) { transport = credential == null ? new NetHttpTransport() : credential.getTransport(); From 1bfd8bbed986ef721fe0031fd974f13328a5fc4b Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Thu, 7 Apr 2016 16:05:08 -0700 Subject: [PATCH 0027/1784] Datastore.java closes InputStreams --- .../datastore/v1beta3/client/Datastore.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java index bd5a0280918e..dee8f2df2bca 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java @@ -30,6 +30,7 @@ import com.google.rpc.Code; import java.io.IOException; +import java.io.InputStream; /** * Provides access to Cloud Datastore. @@ -63,8 +64,8 @@ private DatastoreException invalidResponseException(String method, IOException e } public AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws DatastoreException { - try { - return AllocateIdsResponse.parseFrom(remoteRpc.call("allocateIds", request)); + try (InputStream is = remoteRpc.call("allocateIds", request)) { + return AllocateIdsResponse.parseFrom(is); } catch (IOException exception) { throw invalidResponseException("allocateIds", exception); } @@ -72,40 +73,40 @@ public AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws Datast public BeginTransactionResponse beginTransaction(BeginTransactionRequest request) throws DatastoreException { - try { - return BeginTransactionResponse.parseFrom(remoteRpc.call("beginTransaction", request)); + try (InputStream is = remoteRpc.call("beginTransaction", request)) { + return BeginTransactionResponse.parseFrom(is); } catch (IOException exception) { throw invalidResponseException("beginTransaction", exception); } } public CommitResponse commit(CommitRequest request) throws DatastoreException { - try { - return CommitResponse.parseFrom(remoteRpc.call("commit", request)); + try (InputStream is = remoteRpc.call("commit", request)) { + return CommitResponse.parseFrom(is); } catch (IOException exception) { throw invalidResponseException("commit", exception); } } public LookupResponse lookup(LookupRequest request) throws DatastoreException { - try { - return LookupResponse.parseFrom(remoteRpc.call("lookup", request)); + try (InputStream is = remoteRpc.call("lookup", request)) { + return LookupResponse.parseFrom(is); } catch (IOException exception) { throw invalidResponseException("lookup", exception); } } public RollbackResponse rollback(RollbackRequest request) throws DatastoreException { - try { - return RollbackResponse.parseFrom(remoteRpc.call("rollback", request)); + try (InputStream is = remoteRpc.call("rollback", request)) { + return RollbackResponse.parseFrom(is); } catch (IOException exception) { throw invalidResponseException("rollback", exception); } } public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreException { - try { - return RunQueryResponse.parseFrom(remoteRpc.call("runQuery", request)); + try (InputStream is = remoteRpc.call("runQuery", request)) { + return RunQueryResponse.parseFrom(is); } catch (IOException exception) { throw invalidResponseException("runQuery", exception); } From df73bbee8aab8f3f5ca777f208f04c4234ad2e55 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Tue, 12 Apr 2016 13:11:42 -0700 Subject: [PATCH 0028/1784] Update gcloud-java dependency and imports --- .../google/datastore/snippets/Concepts.java | 66 ++++++++----------- .../google/datastore/snippets/TaskList.java | 20 +++--- 2 files changed, 37 insertions(+), 49 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index 67d32a11c5d2..1817cee78de7 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -23,34 +23,33 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import com.google.cloud.datastore.Cursor; +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreException; +import com.google.cloud.datastore.DateTime; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.EntityQuery; +import com.google.cloud.datastore.FullEntity; +import com.google.cloud.datastore.IncompleteKey; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.KeyFactory; +import com.google.cloud.datastore.PathElement; +import com.google.cloud.datastore.ProjectionEntity; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.Query.ResultType; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.ReadOption; +import com.google.cloud.datastore.StringValue; +import com.google.cloud.datastore.StructuredQuery; +import com.google.cloud.datastore.StructuredQuery.CompositeFilter; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +import com.google.cloud.datastore.Transaction; +import com.google.cloud.datastore.testing.LocalDatastoreHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; -import com.google.gcloud.datastore.Cursor; -import com.google.gcloud.datastore.Datastore; -import com.google.gcloud.datastore.DatastoreException; -import com.google.gcloud.datastore.DatastoreOptions; -import com.google.gcloud.datastore.DateTime; -import com.google.gcloud.datastore.Entity; -import com.google.gcloud.datastore.EntityQuery; -import com.google.gcloud.datastore.FullEntity; -import com.google.gcloud.datastore.IncompleteKey; -import com.google.gcloud.datastore.Key; -import com.google.gcloud.datastore.KeyFactory; -import com.google.gcloud.datastore.PathElement; -import com.google.gcloud.datastore.ProjectionEntity; -import com.google.gcloud.datastore.Query; -import com.google.gcloud.datastore.Query.ResultType; -import com.google.gcloud.datastore.QueryResults; -import com.google.gcloud.datastore.ReadOption; -import com.google.gcloud.datastore.StringValue; -import com.google.gcloud.datastore.StructuredQuery; -import com.google.gcloud.datastore.StructuredQuery.CompositeFilter; -import com.google.gcloud.datastore.StructuredQuery.OrderBy; -import com.google.gcloud.datastore.StructuredQuery.PropertyFilter; -import com.google.gcloud.datastore.Transaction; -import com.google.gcloud.datastore.testing.LocalGcdHelper; import org.junit.AfterClass; import org.junit.Before; @@ -79,9 +78,7 @@ */ public class Concepts { - private static final String PROJECT_ID = LocalGcdHelper.DEFAULT_PROJECT_ID; - private static LocalGcdHelper gcdHelper; - private static final int PORT = LocalGcdHelper.findAvailablePort(LocalGcdHelper.DEFAULT_PORT); + private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0); private static final FullEntity TEST_FULL_ENTITY = FullEntity.builder().build(); private Datastore datastore; @@ -103,9 +100,7 @@ public class Concepts { */ @BeforeClass public static void beforeClass() throws IOException, InterruptedException { - if (!LocalGcdHelper.isActive(PROJECT_ID, PORT)) { - gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT, 1.0); - } + HELPER.start(); } /** @@ -114,12 +109,7 @@ public static void beforeClass() throws IOException, InterruptedException { */ @Before public void setUp() { - datastore = DatastoreOptions.builder() - .projectId(PROJECT_ID) - .namespace("ghijklmnop") - .host("http://localhost:" + PORT) - .build() - .service(); + datastore = HELPER.options().toBuilder().namespace("ghijklmnop").build().service(); StructuredQuery query = Query.keyQueryBuilder().build(); QueryResults result = datastore.run(query); datastore.delete(Iterators.toArray(result, Key.class)); @@ -143,9 +133,7 @@ public void setUp() { */ @AfterClass public static void afterClass() throws IOException, InterruptedException { - if (gcdHelper != null) { - gcdHelper.stop(); - } + HELPER.stop(); } private void assertValidKey(Key taskKey) { diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 371d41e35f46..8ff5b53059ab 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -16,16 +16,16 @@ package com.google.datastore.snippets; -import com.google.gcloud.datastore.Datastore; -import com.google.gcloud.datastore.DatastoreOptions; -import com.google.gcloud.datastore.DateTime; -import com.google.gcloud.datastore.Entity; -import com.google.gcloud.datastore.Key; -import com.google.gcloud.datastore.KeyFactory; -import com.google.gcloud.datastore.Query; -import com.google.gcloud.datastore.StringValue; -import com.google.gcloud.datastore.StructuredQuery.OrderBy; -import com.google.gcloud.datastore.Transaction; +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.DateTime; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.KeyFactory; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.StringValue; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.Transaction; import java.util.ArrayList; import java.util.Iterator; From 54cc83131d0a2645726af6a4b03347c1f3f7c849 Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Mon, 9 May 2016 10:36:36 -0700 Subject: [PATCH 0029/1784] Do all URL validation in DatastoreFactory --- .../v1beta3/client/DatastoreFactory.java | 2 +- .../v1beta3/client/DatastoreHelper.java | 6 ++-- .../v1beta3/client/DatastoreOptions.java | 8 ++--- .../v1beta3/client/DatastoreTest.java | 29 +++++++++++++++++-- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java index 1b16c17bc4d4..fd72d4069f1b 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java @@ -111,7 +111,7 @@ protected RemoteRpc newRemoteRpc(DatastoreOptions options) { return new RemoteRpc(client, options.getInitializer(), buildProjectEndpoint(options)); } - static String validateUrl(String url) { + private static String validateUrl(String url) { try { return new URI(url).toString(); } catch (URISyntaxException e) { diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java index 9d54d323e7b1..143c47e1dfc7 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java @@ -15,8 +15,6 @@ */ package com.google.datastore.v1beta3.client; -import static com.google.datastore.v1beta3.client.DatastoreFactory.validateUrl; - import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; @@ -314,8 +312,8 @@ private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options) } String projectId = getProjectIdFromEnv(); if (System.getenv(URL_OVERRIDE_ENV_VAR) != null) { - options.projectEndpoint(validateUrl(String.format("%s/projects/%s", - System.getenv(URL_OVERRIDE_ENV_VAR), projectId))); + options.projectEndpoint(String.format("%s/projects/%s", + System.getenv(URL_OVERRIDE_ENV_VAR), projectId)); return; } if (System.getenv(LOCAL_HOST_ENV_VAR) != null) { diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java index fbcdf77a3107..a5a2e16c4aa4 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java @@ -108,7 +108,6 @@ public Builder projectId(String projectId) { */ public Builder localHost(String localHost) { checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR); - DatastoreFactory.validateUrl(localHost); if (includesScheme(localHost)) { throw new IllegalArgumentException( String.format("Local host \"%s\" must not include scheme.", localHost)); @@ -124,7 +123,6 @@ public Builder localHost(String localHost) { public Builder projectEndpoint(String projectEndpoint) { checkArgument(projectId == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR); checkArgument(localHost == null, PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR); - DatastoreFactory.validateUrl(projectEndpoint); if (!includesScheme(projectEndpoint)) { throw new IllegalArgumentException(String.format( "Project endpoint \"%s\" must include scheme.", projectEndpoint)); @@ -156,7 +154,7 @@ public Builder transport(HttpTransport transport) { this.transport = transport; return this; } - + private static boolean includesScheme(String url) { return url.startsWith("http://") || url.startsWith("https://"); } @@ -165,7 +163,7 @@ private static boolean includesScheme(String url) { public String getProjectId() { return projectId; } - + public String getProjectEndpoint() { return projectEndpoint; } @@ -181,7 +179,7 @@ public HttpRequestInitializer getInitializer() { public Credential getCredential() { return credential; } - + public HttpTransport getTransport() { return transport; } diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java index 00ce0025634c..b4cd7086c704 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java @@ -87,7 +87,7 @@ public void options_NoProjectIdOrProjectEndpoint() throws Exception { options = new DatastoreOptions.Builder(); thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Either project ID or project endpoint must be provided"); - options.build(); + factory.create(options.build()); } @Test @@ -112,8 +112,10 @@ public void options_LocalHostAndProjectEndpoint() throws Exception { public void options_InvalidLocalHost() throws Exception { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Illegal character"); - new DatastoreOptions.Builder() - .localHost("!not a valid url!"); + factory.create(new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .localHost("!not a valid url!") + .build()); } @Test @@ -140,6 +142,16 @@ public void create_LocalHost() { .isEqualTo("http://localhost:8080/datastore/v1beta3/projects/project-id"); } + @Test + public void create_LocalHostIp() { + Datastore datastore = factory.create(new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .localHost("127.0.0.1:8080") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("http://127.0.0.1:8080/datastore/v1beta3/projects/project-id"); + } + @Test public void create_DefaultHost() { Datastore datastore = factory.create(new DatastoreOptions.Builder() @@ -158,6 +170,17 @@ public void create_ProjectEndpoint() { .isEqualTo("http://prom-qa/datastore/v1beta42/projects/project-id"); } + @Test + public void create_ProjectEndpointNoScheme() { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage( + "Project endpoint \"prom-qa/datastore/v1beta42/projects/project-id\" must" + + " include scheme."); + factory.create(new DatastoreOptions.Builder() + .projectEndpoint("prom-qa/datastore/v1beta42/projects/project-id") + .build()); + } + @Test public void initializer() throws Exception { options.initializer(new HttpRequestInitializer() { From a3152476a2367f4679888bb534a8941ce226376a Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Mon, 9 May 2016 10:53:59 -0700 Subject: [PATCH 0030/1784] s/prom-qa/localhost:1234/ --- .../google/datastore/v1beta3/client/DatastoreTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java index b4cd7086c704..44e5206059a8 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java @@ -96,7 +96,7 @@ public void options_ProjectIdAndProjectEndpoint() throws Exception { thrown.expectMessage("Cannot set both project endpoint and project ID"); options = new DatastoreOptions.Builder() .projectId(PROJECT_ID) - .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id"); + .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id"); } @Test @@ -105,7 +105,7 @@ public void options_LocalHostAndProjectEndpoint() throws Exception { thrown.expectMessage("Cannot set both project endpoint and local host"); options = new DatastoreOptions.Builder() .localHost("localhost:8080") - .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id"); + .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id"); } @Test @@ -174,10 +174,10 @@ public void create_ProjectEndpoint() { public void create_ProjectEndpointNoScheme() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage( - "Project endpoint \"prom-qa/datastore/v1beta42/projects/project-id\" must" + "Project endpoint \"localhost:1234/datastore/v1beta42/projects/project-id\" must" + " include scheme."); factory.create(new DatastoreOptions.Builder() - .projectEndpoint("prom-qa/datastore/v1beta42/projects/project-id") + .projectEndpoint("localhost:1234/datastore/v1beta42/projects/project-id") .build()); } From 9830715f50fdbe5c5858695906837e877b18a577 Mon Sep 17 00:00:00 2001 From: Walter Poupore Date: Tue, 12 Jul 2016 10:18:45 -0700 Subject: [PATCH 0031/1784] Excluded a property from the index (#270) * Excluded a property from the index For doc purposes * Update Concepts.java --- .../src/main/java/com/google/datastore/snippets/Concepts.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index 1817cee78de7..2a666b26a9e7 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -210,7 +210,8 @@ public void testProperties() { .set("done", false) .set("priority", 4) .set("percent_complete", 10.0) - .set("description", "Learn Cloud Datastore") + .set("description", + StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build()) .build(); // [END properties] assertValidEntity(task); From 29249d4ee511efdd4e1d72a605405085ed2dda35 Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Mon, 15 Aug 2016 11:03:28 -0700 Subject: [PATCH 0032/1784] Update to use the v1 API --- .../{v1beta3 => v1}/client/Datastore.java | 26 ++++++------- .../client/DatastoreException.java | 2 +- .../client/DatastoreFactory.java | 4 +- .../client/DatastoreHelper.java | 30 +++++++-------- .../client/DatastoreOptions.java | 2 +- .../client/LocalDevelopmentDatastore.java | 2 +- .../LocalDevelopmentDatastoreException.java | 2 +- .../LocalDevelopmentDatastoreFactory.java | 2 +- .../LocalDevelopmentDatastoreOptions.java | 2 +- .../{v1beta3 => v1}/client/QuerySplitter.java | 6 +-- .../client/QuerySplitterImpl.java | 30 +++++++-------- .../{v1beta3 => v1}/client/RemoteRpc.java | 2 +- .../client/DatastoreFactoryTest.java | 2 +- .../client/DatastoreHelperTest.java | 18 ++++----- .../{v1beta3 => v1}/client/DatastoreTest.java | 38 +++++++++---------- .../client/LocalDevelopmentDatastoreTest.java | 2 +- .../{v1beta3 => v1}/client/RemoteRpcTest.java | 2 +- 17 files changed, 86 insertions(+), 86 deletions(-) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/Datastore.java (82%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/DatastoreException.java (96%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/DatastoreFactory.java (97%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/DatastoreHelper.java (97%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/DatastoreOptions.java (99%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/LocalDevelopmentDatastore.java (99%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/LocalDevelopmentDatastoreException.java (95%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/LocalDevelopmentDatastoreFactory.java (97%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/LocalDevelopmentDatastoreOptions.java (97%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/QuerySplitter.java (92%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/QuerySplitterImpl.java (92%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/{v1beta3 => v1}/client/RemoteRpc.java (99%) rename datastore-v1-proto-client/src/test/java/com/google/datastore/{v1beta3 => v1}/client/DatastoreFactoryTest.java (98%) rename datastore-v1-proto-client/src/test/java/com/google/datastore/{v1beta3 => v1}/client/DatastoreHelperTest.java (95%) rename datastore-v1-proto-client/src/test/java/com/google/datastore/{v1beta3 => v1}/client/DatastoreTest.java (92%) rename datastore-v1-proto-client/src/test/java/com/google/datastore/{v1beta3 => v1}/client/LocalDevelopmentDatastoreTest.java (98%) rename datastore-v1-proto-client/src/test/java/com/google/datastore/{v1beta3 => v1}/client/RemoteRpcTest.java (98%) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java similarity index 82% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java index dee8f2df2bca..e753dc331dc6 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/Datastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; -import com.google.datastore.v1beta3.AllocateIdsRequest; -import com.google.datastore.v1beta3.AllocateIdsResponse; -import com.google.datastore.v1beta3.BeginTransactionRequest; -import com.google.datastore.v1beta3.BeginTransactionResponse; -import com.google.datastore.v1beta3.CommitRequest; -import com.google.datastore.v1beta3.CommitResponse; -import com.google.datastore.v1beta3.LookupRequest; -import com.google.datastore.v1beta3.LookupResponse; -import com.google.datastore.v1beta3.RollbackRequest; -import com.google.datastore.v1beta3.RollbackResponse; -import com.google.datastore.v1beta3.RunQueryRequest; -import com.google.datastore.v1beta3.RunQueryResponse; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; import com.google.rpc.Code; import java.io.IOException; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java similarity index 96% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreException.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java index 70bfc2f4a7a9..e259aa9e6c02 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreException.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import com.google.rpc.Code; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java similarity index 97% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java index fd72d4069f1b..e5de9f7841db 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import static com.google.common.base.Preconditions.checkNotNull; @@ -43,7 +43,7 @@ public class DatastoreFactory { private static ConsoleHandler methodHandler; /** API version. */ - public static final String VERSION = "v1beta3"; + public static final String VERSION = "v1"; public static final String DEFAULT_HOST = "https://datastore.googleapis.com"; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java similarity index 97% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java index 143c47e1dfc7..6b2c042be40d 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; @@ -23,20 +23,20 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; import com.google.api.client.json.jackson.JacksonFactory; -import com.google.datastore.v1beta3.ArrayValue; -import com.google.datastore.v1beta3.CompositeFilter; -import com.google.datastore.v1beta3.Entity; -import com.google.datastore.v1beta3.Filter; -import com.google.datastore.v1beta3.Key; -import com.google.datastore.v1beta3.Key.PathElement; -import com.google.datastore.v1beta3.Key.PathElement.IdTypeCase; -import com.google.datastore.v1beta3.Mutation; -import com.google.datastore.v1beta3.PartitionId; -import com.google.datastore.v1beta3.PropertyFilter; -import com.google.datastore.v1beta3.PropertyOrder; -import com.google.datastore.v1beta3.PropertyReference; -import com.google.datastore.v1beta3.Value; -import com.google.datastore.v1beta3.Value.ValueTypeCase; +import com.google.datastore.v1.ArrayValue; +import com.google.datastore.v1.CompositeFilter; +import com.google.datastore.v1.Entity; +import com.google.datastore.v1.Filter; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.Key.PathElement; +import com.google.datastore.v1.Key.PathElement.IdTypeCase; +import com.google.datastore.v1.Mutation; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.PropertyFilter; +import com.google.datastore.v1.PropertyOrder; +import com.google.datastore.v1.PropertyReference; +import com.google.datastore.v1.Value; +import com.google.datastore.v1.Value.ValueTypeCase; import com.google.protobuf.ByteString; import com.google.protobuf.Timestamp; import com.google.protobuf.TimestampOrBuilder; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java similarity index 99% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java index a5a2e16c4aa4..ac76133c9da7 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/DatastoreOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastore.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastore.java similarity index 99% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastore.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastore.java index 0a0d7a045a89..7e6e6b158afe 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastore.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpRequestFactory; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreException.java similarity index 95% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreException.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreException.java index 258dcd853e97..f335674a8701 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreException.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; /** * An exception related to the local development {@link Datastore}. diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreFactory.java similarity index 97% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreFactory.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreFactory.java index 37302ab5f172..12ddbe859f1b 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; /** * Factory for {@link LocalDevelopmentDatastore}. diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreOptions.java similarity index 97% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreOptions.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreOptions.java index 8fd519ed25cf..0d4b00124cc6 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import java.util.HashMap; import java.util.Map; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java similarity index 92% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitter.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java index 190cf783a7fc..e220ad35cad4 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitter.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; -import com.google.datastore.v1beta3.PartitionId; -import com.google.datastore.v1beta3.Query; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.Query; import java.util.List; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitterImpl.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java similarity index 92% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitterImpl.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java index dab377148a0d..c10ef0563a51 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/QuerySplitterImpl.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; -import static com.google.datastore.v1beta3.client.DatastoreHelper.makeAndFilter; +import static com.google.datastore.v1.client.DatastoreHelper.makeAndFilter; -import com.google.datastore.v1beta3.EntityResult; -import com.google.datastore.v1beta3.Filter; -import com.google.datastore.v1beta3.Key; -import com.google.datastore.v1beta3.PartitionId; -import com.google.datastore.v1beta3.Projection; -import com.google.datastore.v1beta3.PropertyFilter; -import com.google.datastore.v1beta3.PropertyFilter.Operator; -import com.google.datastore.v1beta3.PropertyOrder.Direction; -import com.google.datastore.v1beta3.PropertyReference; -import com.google.datastore.v1beta3.Query; -import com.google.datastore.v1beta3.QueryResultBatch; -import com.google.datastore.v1beta3.QueryResultBatch.MoreResultsType; -import com.google.datastore.v1beta3.RunQueryRequest; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.Filter; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.Projection; +import com.google.datastore.v1.PropertyFilter; +import com.google.datastore.v1.PropertyFilter.Operator; +import com.google.datastore.v1.PropertyOrder.Direction; +import com.google.datastore.v1.PropertyReference; +import com.google.datastore.v1.Query; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.QueryResultBatch.MoreResultsType; +import com.google.datastore.v1.RunQueryRequest; import java.util.ArrayList; import java.util.Collections; diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java similarity index 99% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java index 5cd091947d7c..386775c545b9 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1beta3/client/RemoteRpc.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpRequest; diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreFactoryTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java similarity index 98% rename from datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreFactoryTest.java rename to datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java index 3a76d6110e07..22e1459967bc 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreFactoryTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreHelperTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java similarity index 95% rename from datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreHelperTest.java rename to datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java index 11ec8aeed68d..1bd166bcc1c6 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreHelperTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; -import static com.google.datastore.v1beta3.client.DatastoreHelper.getByteString; -import static com.google.datastore.v1beta3.client.DatastoreHelper.makeKey; -import static com.google.datastore.v1beta3.client.DatastoreHelper.makeValue; -import static com.google.datastore.v1beta3.client.DatastoreHelper.toDate; +import static com.google.datastore.v1.client.DatastoreHelper.getByteString; +import static com.google.datastore.v1.client.DatastoreHelper.makeKey; +import static com.google.datastore.v1.client.DatastoreHelper.makeValue; +import static com.google.datastore.v1.client.DatastoreHelper.toDate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.google.datastore.v1beta3.Key; -import com.google.datastore.v1beta3.PartitionId; -import com.google.datastore.v1beta3.Value; -import com.google.datastore.v1beta3.Value.ValueTypeCase; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.Value; +import com.google.datastore.v1.Value.ValueTypeCase; import com.google.protobuf.ByteString; import com.google.protobuf.Timestamp; diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java similarity index 92% rename from datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java rename to datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java index 44e5206059a8..323568e01b93 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/DatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertArrayEquals; @@ -36,20 +36,20 @@ import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.api.client.testing.util.TestableByteArrayInputStream; import com.google.common.collect.Iterables; -import com.google.datastore.v1beta3.AllocateIdsRequest; -import com.google.datastore.v1beta3.AllocateIdsResponse; -import com.google.datastore.v1beta3.BeginTransactionRequest; -import com.google.datastore.v1beta3.BeginTransactionResponse; -import com.google.datastore.v1beta3.CommitRequest; -import com.google.datastore.v1beta3.CommitResponse; -import com.google.datastore.v1beta3.EntityResult; -import com.google.datastore.v1beta3.LookupRequest; -import com.google.datastore.v1beta3.LookupResponse; -import com.google.datastore.v1beta3.QueryResultBatch; -import com.google.datastore.v1beta3.RollbackRequest; -import com.google.datastore.v1beta3.RollbackResponse; -import com.google.datastore.v1beta3.RunQueryRequest; -import com.google.datastore.v1beta3.RunQueryResponse; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; import com.google.protobuf.ByteString; import com.google.protobuf.Message; import com.google.rpc.Code; @@ -139,7 +139,7 @@ public void create_LocalHost() { .localHost("localhost:8080") .build()); assertThat(datastore.remoteRpc.getUrl()) - .isEqualTo("http://localhost:8080/datastore/v1beta3/projects/project-id"); + .isEqualTo("http://localhost:8080/datastore/v1/projects/project-id"); } @Test @@ -149,7 +149,7 @@ public void create_LocalHostIp() { .localHost("127.0.0.1:8080") .build()); assertThat(datastore.remoteRpc.getUrl()) - .isEqualTo("http://127.0.0.1:8080/datastore/v1beta3/projects/project-id"); + .isEqualTo("http://127.0.0.1:8080/datastore/v1/projects/project-id"); } @Test @@ -158,7 +158,7 @@ public void create_DefaultHost() { .projectId(PROJECT_ID) .build()); assertThat(datastore.remoteRpc.getUrl()) - .isEqualTo("https://datastore.googleapis.com/v1beta3/projects/project-id"); + .isEqualTo("https://datastore.googleapis.com/v1/projects/project-id"); } @Test @@ -258,7 +258,7 @@ private void expectRpc(String methodName, Message request, Message response) thr Object[] callArgs = { request }; assertEquals(response, call.invoke(datastore, callArgs)); - assertEquals("/v1beta3/projects/project-id:" + methodName, mockClient.lastPath); + assertEquals("/v1/projects/project-id:" + methodName, mockClient.lastPath); assertEquals("application/x-protobuf", mockClient.lastMimeType); assertEquals("2", mockClient.lastApiFormatHeaderValue); assertArrayEquals(request.toByteArray(), mockClient.lastBody); diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreTest.java similarity index 98% rename from datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreTest.java rename to datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreTest.java index d0c789f3e991..e7cd32bd56ac 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/LocalDevelopmentDatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import static org.junit.Assert.fail; diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/RemoteRpcTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java similarity index 98% rename from datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/RemoteRpcTest.java rename to datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java index bde089ad3992..bceee04b368d 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1beta3/client/RemoteRpcTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.datastore.v1beta3.client; +package com.google.datastore.v1.client; import static org.junit.Assert.assertEquals; From 15fe82df484b8968f37938141bcd72e29bb586ee Mon Sep 17 00:00:00 2001 From: Walter Poupore Date: Mon, 15 Aug 2016 19:16:28 -0700 Subject: [PATCH 0033/1784] Changes property name (#294) * Uses 'category' instead of 'type' as a property name * 'type' > 'category' --- .../google/datastore/snippets/Concepts.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index 2a666b26a9e7..b29cb890c530 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -192,7 +192,7 @@ public void testEntityWithParent() { .kind("Task") .newKey("sampleTask"); Entity task = Entity.builder(taskKey) - .set("type", "Personal") + .set("category", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") @@ -205,7 +205,7 @@ public void testEntityWithParent() { public void testProperties() { // [START properties] Entity task = Entity.builder(taskKey) - .set("type", "Personal") + .set("category", "Personal") .set("created", DateTime.now()) .set("done", false) .set("priority", 4) @@ -232,7 +232,7 @@ public void testArrayValue() { public void testBasicEntity() { // [START basic_entity] Entity task = Entity.builder(taskKey) - .set("type", "Personal") + .set("category", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") @@ -288,13 +288,13 @@ public void testDelete() { private List setUpBatchTests(Key taskKey1, Key taskKey2) { Entity task1 = Entity.builder(taskKey1) - .set("type", "Personal") + .set("category", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") .build(); Entity task2 = Entity.builder(taskKey2) - .set("type", "Personal") + .set("category", "Personal") .set("done", false) .set("priority", 5) .set("description", "Integrate Cloud Datastore") @@ -307,13 +307,13 @@ private List setUpBatchTests(Key taskKey1, Key taskKey2) { public void testBatchUpsert() { // [START batch_upsert] FullEntity task1 = FullEntity.builder(keyFactory.newKey()) - .set("type", "Personal") + .set("category", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") .build(); FullEntity task2 = Entity.builder(keyFactory.newKey()) - .set("type", "Personal") + .set("category", "Personal") .set("done", false) .set("priority", 5) .set("description", "Integrate Cloud Datastore") @@ -356,7 +356,7 @@ private void setUpQueryTests() { .ancestors(PathElement.of("TaskList", "default")) .newKey("someTask"); datastore.put(Entity.builder(taskKey) - .set("type", "Personal") + .set("category", "Personal") .set("done", false) .set("completed", false) .set("priority", 4) @@ -555,9 +555,9 @@ public void testDistinctQuery() { // [START distinct_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection("type", "priority") - .distinctOn("type", "priority") - .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) + .projection("category", "priority") + .distinctOn("category", "priority") + .orderBy(OrderBy.asc("category"), OrderBy.asc("priority")) .build(); // [END distinct_query] assertValidQuery(query); @@ -569,9 +569,9 @@ public void testDistinctOnQuery() { // [START distinct_on_query] Query query = Query.projectionEntityQueryBuilder() .kind("Task") - .projection("type", "priority") - .distinctOn("type") - .orderBy(OrderBy.asc("type"), OrderBy.asc("priority")) + .projection("category", "priority") + .distinctOn("category") + .orderBy(OrderBy.asc("category"), OrderBy.asc("priority")) .build(); // [END distinct_on_query] assertValidQuery(query); @@ -923,7 +923,7 @@ public void testPropertyRunQuery() { } // [END property_run_query] Map> expected = ImmutableMap.of("Task", ImmutableSet.of( - "done", "type", "done", "completed", "priority", "created", "percent_complete", "tag")); + "done", "category", "done", "completed", "priority", "created", "percent_complete", "tag")); assertEquals(expected, propertiesByKind); } @@ -953,7 +953,7 @@ public void testPropertyByKindRunQuery() { } // [END property_by_kind_run_query] Map> expected = ImmutableMap.>builder() - .put("type", Collections.singleton("STRING")) + .put("category", Collections.singleton("STRING")) .put("done", Collections.singleton("BOOLEAN")) .put("completed", Collections.singleton("BOOLEAN")) .put("priority", Collections.singleton("INT64")) @@ -991,7 +991,7 @@ public void testPropertyFilteringRunQuery() { } // [END property_filtering_run_query] Map> expected = - ImmutableMap.of("Task", ImmutableSet.of("priority", "tag", "type")); + ImmutableMap.of("Task", ImmutableSet.of("priority", "tag", "category")); assertEquals(expected, propertiesByKind); } From aef3e35d6141935a53944f6545dd7965a83959fa Mon Sep 17 00:00:00 2001 From: eddavisson Date: Wed, 17 Aug 2016 10:18:57 -0700 Subject: [PATCH 0034/1784] Remove 'datatore' from path and prepare for release (#135) --- .../java/com/google/datastore/v1/client/DatastoreFactory.java | 4 ++-- .../java/com/google/datastore/v1/client/DatastoreTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java index e5de9f7841db..809f8beabbb6 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java @@ -64,7 +64,7 @@ public static DatastoreFactory get() { public Datastore create(DatastoreOptions options) throws IllegalArgumentException { return new Datastore(newRemoteRpc(options)); } - + /** * Constructs a Google APIs HTTP client with the associated credentials. */ @@ -98,7 +98,7 @@ String buildProjectEndpoint(DatastoreOptions options) { // DatastoreOptions ensures either project endpoint or project ID is set. String projectId = checkNotNull(options.getProjectId()); if (options.getLocalHost() != null) { - return validateUrl(String.format("http://%s/datastore/%s/projects/%s", + return validateUrl(String.format("http://%s/%s/projects/%s", options.getLocalHost(), VERSION, projectId)); } return validateUrl(String.format("%s/%s/projects/%s", diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java index 323568e01b93..bcdbe18de2c1 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java @@ -139,7 +139,7 @@ public void create_LocalHost() { .localHost("localhost:8080") .build()); assertThat(datastore.remoteRpc.getUrl()) - .isEqualTo("http://localhost:8080/datastore/v1/projects/project-id"); + .isEqualTo("http://localhost:8080/v1/projects/project-id"); } @Test @@ -149,7 +149,7 @@ public void create_LocalHostIp() { .localHost("127.0.0.1:8080") .build()); assertThat(datastore.remoteRpc.getUrl()) - .isEqualTo("http://127.0.0.1:8080/datastore/v1/projects/project-id"); + .isEqualTo("http://127.0.0.1:8080/v1/projects/project-id"); } @Test From 26904dfb2a9b21202bc22f931f64761cfacd65ff Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Fri, 2 Sep 2016 10:56:59 -0700 Subject: [PATCH 0035/1784] datastore: Remove broken link in Concepts.java Fixes #325. --- .../src/main/java/com/google/datastore/snippets/Concepts.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java index b29cb890c530..78c773eee8d7 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java @@ -72,9 +72,7 @@ import java.util.TimeZone; /** - * Contains Cloud Datastore snippets linked from the Concepts documentation. - * - * @see Key Datastore Concepts + * Contains Cloud Datastore snippets demonstrating concepts for documentation. */ public class Concepts { From e1c8dc8c5060f48410c9fa284e78a7019f84e190 Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Mon, 12 Sep 2016 17:31:47 -0700 Subject: [PATCH 0036/1784] Rename Java testing harness --- .../{LocalDevelopmentDatastore.java => DatastoreEmulator.java} | 0 ...entDatastoreException.java => DatastoreEmulatorException.java} | 0 ...lopmentDatastoreFactory.java => DatastoreEmulatorFactory.java} | 0 ...lopmentDatastoreOptions.java => DatastoreEmulatorOptions.java} | 0 ...alDevelopmentDatastoreTest.java => DatastoreEmulatorTest.java} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/{LocalDevelopmentDatastore.java => DatastoreEmulator.java} (100%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/{LocalDevelopmentDatastoreException.java => DatastoreEmulatorException.java} (100%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/{LocalDevelopmentDatastoreFactory.java => DatastoreEmulatorFactory.java} (100%) rename datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/{LocalDevelopmentDatastoreOptions.java => DatastoreEmulatorOptions.java} (100%) rename datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/{LocalDevelopmentDatastoreTest.java => DatastoreEmulatorTest.java} (100%) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastore.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java similarity index 100% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastore.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java similarity index 100% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreException.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java similarity index 100% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreFactory.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java similarity index 100% rename from datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreOptions.java rename to datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java similarity index 100% rename from datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/LocalDevelopmentDatastoreTest.java rename to datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java From 8d62ff4142d70e9439950090472dacebbaead11d Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Mon, 12 Sep 2016 14:47:36 -0700 Subject: [PATCH 0037/1784] Update test harnesses to use the emulator. --- .../v1/client/DatastoreEmulator.java | 218 +++++++++--------- .../v1/client/DatastoreEmulatorException.java | 10 +- .../v1/client/DatastoreEmulatorFactory.java | 25 +- .../v1/client/DatastoreEmulatorOptions.java | 28 +-- .../v1/client/DatastoreEmulatorTest.java | 68 +++--- 5 files changed, 172 insertions(+), 177 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java index 7e6e6b158afe..2dc80fe06438 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java @@ -15,12 +15,12 @@ */ package com.google.datastore.v1.client; +import static com.google.api.client.util.Preconditions.checkNotNull; +import static com.google.api.client.util.Preconditions.checkState; + import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpRequestFactory; import com.google.api.client.http.HttpResponse; -import com.google.api.client.http.UrlEncodedContent; -import com.google.api.client.util.Preconditions; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -29,57 +29,55 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; +import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; /** - * An extension to {@link Datastore} that provides lifecycle management for a development datastore - * server. + * An extension to {@link Datastore} that provides lifecycle management for a datastore emulator. * - * In order to use a development datastore for a JUnit 4 test you might do something like this: + *

In order to use the emulator for a JUnit 4 test you might do something like this: * * 

  * public class MyTest {
  *
- *   static LocalDevelopmentDatastore datastore;
+ *   static DatastoreEmulator datastore;
  *
  *   {@literal @}BeforeClass
- *   public static void startLocalDatastore() throws LocalDevelopmentDatastoreException {
- *     DatastoreOptions opts = new DatastoreOptions.Builder()
+ *   public static void startEmulator() throws DatastoreEmulatorException {
+ *     DatastoreOptions options = new DatastoreOptions.Builder()
  *         .localHost("localhost:8080")
  *         .projectId("my-project-id")
  *         .build();
- *     datastore = LocalDevelopmentDatastoreFactory.get().create(opts);
- *     datastore.start("/usr/local/gcd-sdk", "my-project-id");
+ *     datastore = DatastoreEmulatorFactory.get().create(options);
+ *     datastore.start("/usr/local/cloud-datastore-emulator", "my-project-id");
  *   }
  *
  *   {@literal @}Before
- *   public void setUp() throws LocalDevelopmentDatastoreException {
+ *   public void setUp() throws DatastoreEmulatorException {
  *     datastore.clear();
  *   }
  *
  *   {@literal @}AfterClass
- *   public static void stopLocalDatastore() throws LocalDevelopmentDatastoreException {
+ *   public static void stopEmulator() throws DatastoreEmulatorException {
  *     datastore.stop();
  *   }
  *
  *   {@literal @}Test
  *   public void testFoo1() { }
-
+ *
  *   {@literal @}Test
  *   public void testFoo2() { }
  *
  * }
  *
*/ -public class LocalDevelopmentDatastore extends Datastore { +public class DatastoreEmulator extends Datastore { private static final int STARTUP_TIMEOUT_SECS = 30; private final String host; - private LocalDevelopmentDatastoreOptions localDevelopmentOptions; + private final DatastoreEmulatorOptions options; /** Internal state lifecycle management. */ enum State {NEW, STARTED, STOPPED} @@ -88,54 +86,49 @@ enum State {NEW, STARTED, STOPPED} private File projectDirectory; - LocalDevelopmentDatastore(RemoteRpc rpc, String localHost, - LocalDevelopmentDatastoreOptions localDevelopmentOptions) { + DatastoreEmulator(RemoteRpc rpc, String localHost, DatastoreEmulatorOptions options) { super(rpc); this.host = "http://" + localHost; - this.localDevelopmentOptions = localDevelopmentOptions; + this.options = options; } /** - * Clears all data in the Datastore. + * Clears all data in the emulator. * - * @throws LocalDevelopmentDatastoreException + * @throws DatastoreEmulatorException if the clear fails */ - public void clear() throws LocalDevelopmentDatastoreException { + public void clear() throws DatastoreEmulatorException { HttpRequestFactory client = remoteRpc.getHttpRequestFactory(); try { - Map params = new HashMap(); - params.put("action", "Clear Datastore"); - UrlEncodedContent content = new UrlEncodedContent(params); - GenericUrl url = new GenericUrl(host + "/_ah/admin/datastore"); - HttpResponse httpResponse = client.buildPostRequest(url, content).execute(); + GenericUrl url = new GenericUrl(host + "/reset"); + HttpResponse httpResponse = client.buildPostRequest(url, null).execute(); if (!httpResponse.isSuccessStatusCode()) { - throw new LocalDevelopmentDatastoreException( - "Clear Datastore returned http status " + httpResponse.getStatusCode()); + throw new DatastoreEmulatorException( + "POST request to /reset returned HTTP status " + httpResponse.getStatusCode()); } } catch (IOException e) { - throw new LocalDevelopmentDatastoreException( - "Exception trying to clear the dev datastore", e); + throw new DatastoreEmulatorException("Exception trying to clear the emulator", e); } } /** - * Starts the local datastore. It is the caller's responsibility to call {@link #stop}. Note that + * Starts the emulator. It is the caller's responsibility to call {@link #stop}. Note that * receiving an exception does not indicate that the server did not start. We recommend calling * {@link #stop} to ensure the server is not running regardless of the result of this method. * - * @param sdkPath The path to the GCD SDK, eg /usr/local/dev/gcd - * @param projectId The GCD project ID - * @param cmdLineOptions Command line options to pass to the script that launches the dev server - * @throws LocalDevelopmentDatastoreException If {@link #start} has already been called or the - * server does not start successfully. + * @param emulatorDir The path to the emulator directory, e.g. /usr/local/cloud-datastore-emulator + * @param projectId The project ID + * @param commandLineOptions Command line options to pass to the emulator on startup + * @throws DatastoreEmulatorException If {@link #start} has already been called or the server does + * not start successfully. */ - public synchronized void start(String sdkPath, String projectId, String... cmdLineOptions) - throws LocalDevelopmentDatastoreException { - Preconditions.checkNotNull(sdkPath, "sdkPath cannot be null"); - Preconditions.checkNotNull(projectId, "projectId cannot be null"); - Preconditions.checkState(state == State.NEW, "Cannot call start() more than once."); + public synchronized void start(String emulatorDir, String projectId, String... commandLineOptions) + throws DatastoreEmulatorException { + checkNotNull(emulatorDir, "emulatorDir cannot be null"); + checkNotNull(projectId, "projectId cannot be null"); + checkState(state == State.NEW, "Cannot call start() more than once."); try { - startDatastoreInternal(sdkPath, projectId, cmdLineOptions); + startEmulatorInternal(emulatorDir, projectId, commandLineOptions); state = State.STARTED; } finally { if (state != State.STARTED) { @@ -146,81 +139,89 @@ public synchronized void start(String sdkPath, String projectId, String... cmdLi } } - void startDatastoreInternal(String sdkPath, String projectId, String... cmdLineOptions) - throws LocalDevelopmentDatastoreException { - File projectDirectory = createProjectDirectory(sdkPath, projectId); - List cmd = new ArrayList( - Arrays.asList("./gcd.sh", "start", "--allow_remote_shutdown", "--store_on_disk=false")); - cmd.addAll(Arrays.asList(cmdLineOptions)); + void startEmulatorInternal(String emulatorDir, String projectId, String... commandLineOptions) + throws DatastoreEmulatorException { + projectDirectory = createProjectDirectory(emulatorDir, projectId); + List cmd = + new ArrayList<>(Arrays.asList("./cloud_datastore_emulator", "start", "--testing")); + Collections.addAll(cmd, commandLineOptions); cmd.add(projectDirectory.getPath()); - final Process gcdStartProcess; + final Process emulatorStartProcess; try { - gcdStartProcess = newGcdProcess(sdkPath, cmd).start(); + emulatorStartProcess = newEmulatorProcess(emulatorDir, cmd).start(); } catch (IOException e) { - throw new LocalDevelopmentDatastoreException("Could not start dev server", e); - } - // Ensure we don't leak the stub instance if tests end prematurely. - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - gcdStartProcess.destroy(); + throw new DatastoreEmulatorException("Could not start emulator", e); } - }); - StartupMonitor monitor = new StartupMonitor(gcdStartProcess.getInputStream()); + // Ensure we don't leak the emulator instance if tests end prematurely. + Runtime.getRuntime() + .addShutdownHook( + new Thread() { + @Override + public void run() { + emulatorStartProcess.destroy(); + } + }); + StartupMonitor monitor = new StartupMonitor(emulatorStartProcess.getInputStream()); try { monitor.start(); if (!monitor.startupCompleteLatch.await(STARTUP_TIMEOUT_SECS, TimeUnit.SECONDS)) { - throw new LocalDevelopmentDatastoreException("Dev server did not start within 30 seconds"); + throw new DatastoreEmulatorException("Emulator did not start within 30 seconds"); } if (!monitor.success) { - throw new LocalDevelopmentDatastoreException("Server did not start normally"); + throw new DatastoreEmulatorException("Emulator did not start normally"); } } catch (InterruptedException e) { - // not sure why this would happen - throw new LocalDevelopmentDatastoreException("Received an interrupt", e); + Thread.currentThread().interrupt(); + throw new DatastoreEmulatorException("Received an interrupt", e); } } - private File createProjectDirectory(String sdkPath, String projectId) - throws LocalDevelopmentDatastoreException { + private File createProjectDirectory(String emulatorDir, String projectId) + throws DatastoreEmulatorException { + File projectDirectory; try { - projectDirectory = Files.createTempDirectory("local-development-datastore").toFile(); + projectDirectory = Files.createTempDirectory("datastore-emulator").toFile(); } catch (IOException e) { - throw new LocalDevelopmentDatastoreException("Could not create project tmp directory", e); + throw new DatastoreEmulatorException("Could not create temporary project directory", e); } - List cmd = Arrays.asList("./gcd.sh", "create", "--project_id=" + projectId, - projectDirectory.getPath()); + List cmd = + Arrays.asList( + "./cloud_datastore_emulator", + "create", + "--project_id=" + projectId, + projectDirectory.getPath()); try { - int retCode = newGcdProcess(sdkPath, cmd).start().waitFor(); + int retCode = newEmulatorProcess(emulatorDir, cmd).start().waitFor(); if (retCode != 0) { - throw new LocalDevelopmentDatastoreException( + throw new DatastoreEmulatorException( String.format("Could not create project (retcode=%d)", retCode)); } } catch (IOException e) { - throw new LocalDevelopmentDatastoreException("Could not create project", e); + throw new DatastoreEmulatorException("Could not create project", e); } catch (InterruptedException e) { - throw new LocalDevelopmentDatastoreException("Received an interrupt", e); + Thread.currentThread().interrupt(); + throw new DatastoreEmulatorException("Received an interrupt", e); } return projectDirectory; } - private ProcessBuilder newGcdProcess(String sdkPath, List cmd) { + private ProcessBuilder newEmulatorProcess(String emulatorDir, List cmd) { ProcessBuilder builder = new ProcessBuilder(cmd); - builder.directory(new File(sdkPath)); + builder.directory(new File(emulatorDir)); builder.redirectErrorStream(true); - builder.environment().putAll(localDevelopmentOptions.getEnvVars()); + builder.environment().putAll(options.getEnvVars()); return builder; } /** - * Stops the local datastore. Multiple calls are allowed. + * Stops the emulator. Multiple calls are allowed. * - * @throws LocalDevelopmentDatastoreException + * @throws DatastoreEmulatorException if the emulator cannot be stopped */ - public synchronized void stop() throws LocalDevelopmentDatastoreException { + public synchronized void stop() throws DatastoreEmulatorException { // We intentionally don't check the internal state. If people want to try and stop the server // multiple times that's fine. - stopDatastoreInternal(); + stopEmulatorInternal(); if (state != State.STOPPED) { state = State.STOPPED; if (projectDirectory != null) { @@ -228,40 +229,44 @@ public synchronized void stop() throws LocalDevelopmentDatastoreException { Process process = new ProcessBuilder("rm", "-r", projectDirectory.getAbsolutePath()).start(); if (process.waitFor() != 0) { - throw new IOException("Temp directory delete exited with " + process.exitValue()); + throw new IOException( + "Temporary project directory deletion exited with " + process.exitValue()); } - } catch (IOException | InterruptedException e) { - throw new IllegalStateException("Project directory wipe failed.", e); + } catch (IOException e) { + throw new IllegalStateException("Could not delete temporary project directory", e); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IllegalStateException("Could not delete temporary project directory", e); } } } } - void stopDatastoreInternal() throws LocalDevelopmentDatastoreException { + public synchronized File getProjectDirectory() { + checkState(state == State.STARTED); + return projectDirectory; + } + + void stopEmulatorInternal() throws DatastoreEmulatorException { // No need to kill the process we started, this function will take care of it. HttpRequestFactory client = remoteRpc.getHttpRequestFactory(); - Map params = new HashMap(); - UrlEncodedContent content = new UrlEncodedContent(params); - GenericUrl url = new GenericUrl(host + "/_ah/admin/quit"); + GenericUrl url = new GenericUrl(host + "/shutdown"); try { - HttpResponse httpResponse = client.buildPostRequest(url, content).execute(); + HttpResponse httpResponse = client.buildPostRequest(url, null).execute(); if (!httpResponse.isSuccessStatusCode()) { - throw new LocalDevelopmentDatastoreException( - "Request to shutdown local datastore returned http error code " - + httpResponse.getStatusCode()); + throw new DatastoreEmulatorException( + "POST request to /shutdown returned HTTP status " + httpResponse.getStatusCode()); } } catch (IOException e) { - throw new LocalDevelopmentDatastoreException( - "Exception trying to stop the dev datastore", e); + throw new DatastoreEmulatorException("Exception trying to stop the emulator", e); } } /** - * Monitors the provided input stream for evidence that the dev server has started successfully - * and redirects the output of the dev server process to sysout for this process. + * Monitors the provided input stream for evidence that the emulator has started successfully and + * redirects the output of the emulator process to sysout for this process. */ static class StartupMonitor extends Thread { - private final InputStream inputStream; private volatile boolean success = false; /** This latch will reach 0 once server startup has completed. */ @@ -278,8 +283,9 @@ public void run() { BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); String line; while ((line = br.readLine()) != null) { - // redirect to sysout for our process + // Redirect to sysout for our process. System.out.println(line); + // TODO(pcostello): Just make a request to "/" and look for an HTTP 200. if (!success && line.contains("Dev App Server is now running")) { success = true; startupCompleteLatch.countDown(); @@ -287,13 +293,15 @@ public void run() { } } catch (IOException ioe) { if (!success) { - System.err.println("Received an IOException before the dev server startup completed. " - + "Dev server is in an unknown state."); + System.err.println( + "Received an IOException before emulator startup completed. " + + "Emulator is in an unknown state."); } else { // We got an exception after the server started successfully. We'll lose the ability - // to log the output of the dev server but there's no need to shut anything down. - System.err.println("Received an exception handling output from the dev server. " - + "Logging will stop but the dev server is probably ok."); + // to log the output of the emulator but there's no need to shut anything down. + System.err.println( + "Received an exception handling output from the emulator. " + + "Logging will stop but the emulator is probably ok."); } ioe.printStackTrace(); } finally { diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java index f335674a8701..f0f3a177f620 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java @@ -15,15 +15,13 @@ */ package com.google.datastore.v1.client; -/** - * An exception related to the local development {@link Datastore}. - */ -public class LocalDevelopmentDatastoreException extends Exception { - public LocalDevelopmentDatastoreException(String message) { +/** An exception related to the {@link DatastoreEmulator}. */ +public class DatastoreEmulatorException extends Exception { + public DatastoreEmulatorException(String message) { super(message); } - public LocalDevelopmentDatastoreException(String message, Throwable cause) { + public DatastoreEmulatorException(String message, Throwable cause) { super(message, cause); } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java index 12ddbe859f1b..c8cc6ab29f91 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java @@ -15,31 +15,26 @@ */ package com.google.datastore.v1.client; -/** - * Factory for {@link LocalDevelopmentDatastore}. - */ -public class LocalDevelopmentDatastoreFactory extends DatastoreFactory { +/** Factory for {@link DatastoreEmulator}. */ +public class DatastoreEmulatorFactory extends DatastoreFactory { /** Singleton factory instance. */ - private static final LocalDevelopmentDatastoreFactory INSTANCE = - new LocalDevelopmentDatastoreFactory(); + private static final DatastoreEmulatorFactory INSTANCE = new DatastoreEmulatorFactory(); - public static LocalDevelopmentDatastoreFactory get() { + public static DatastoreEmulatorFactory get() { return INSTANCE; } - LocalDevelopmentDatastoreFactory() { } + DatastoreEmulatorFactory() {} @Override - public LocalDevelopmentDatastore create(DatastoreOptions options) - throws IllegalArgumentException { - return create(options, new LocalDevelopmentDatastoreOptions.Builder().build()); + public DatastoreEmulator create(DatastoreOptions options) throws IllegalArgumentException { + return create(options, new DatastoreEmulatorOptions.Builder().build()); } - public LocalDevelopmentDatastore create(DatastoreOptions options, - LocalDevelopmentDatastoreOptions localDevelopmentOptions) { + public DatastoreEmulator create( + DatastoreOptions options, DatastoreEmulatorOptions localDevelopmentOptions) { RemoteRpc rpc = newRemoteRpc(options); - return new LocalDevelopmentDatastore(rpc, options.getLocalHost(), - localDevelopmentOptions); + return new DatastoreEmulator(rpc, options.getLocalHost(), localDevelopmentOptions); } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java index 0d4b00124cc6..446b60cec005 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java @@ -18,35 +18,29 @@ import java.util.HashMap; import java.util.Map; -/** - * An immutable object containing settings for a {@link LocalDevelopmentDatastore}. - */ -public class LocalDevelopmentDatastoreOptions { +/** An immutable object containing settings for a {@link DatastoreEmulator}. */ +public class DatastoreEmulatorOptions { private final Map envVars; - - LocalDevelopmentDatastoreOptions(Map envVars) { + + DatastoreEmulatorOptions(Map envVars) { this.envVars = envVars; } - - /** - * Builder for {@link LocalDevelopmentDatastoreOptions}. - */ + + /** Builder for {@link DatastoreEmulatorOptions}. */ public static class Builder { private final Map envVars = new HashMap(); - public LocalDevelopmentDatastoreOptions build() { - return new LocalDevelopmentDatastoreOptions(envVars); + public DatastoreEmulatorOptions build() { + return new DatastoreEmulatorOptions(envVars); } - - /** - * Adds an environment variable to pass to the GCD tool. - */ + + /** Adds an environment variable to pass to the emulator. */ public Builder addEnvVar(String var, String value) { envVars.put(var, value); return this; } } - + public Map getEnvVars() { return envVars; } diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java index e7cd32bd56ac..fbe573b761ae 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java @@ -21,73 +21,73 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** - * Tests for {@link LocalDevelopmentDatastore}. - */ +/** Tests for {@link DatastoreEmulator}. */ @RunWith(JUnit4.class) -public class LocalDevelopmentDatastoreTest { +public class DatastoreEmulatorTest { - private static final LocalDevelopmentDatastoreOptions options = - new LocalDevelopmentDatastoreOptions.Builder().build(); + private static final DatastoreEmulatorOptions options = + new DatastoreEmulatorOptions.Builder().build(); @Test - public void testArgs() throws LocalDevelopmentDatastoreException { - LocalDevelopmentDatastore datastore = new LocalDevelopmentDatastore(null, "blar", options) { - @Override - void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOpts) { - // no-op for testing - } - }; + public void testArgs() throws DatastoreEmulatorException { + DatastoreEmulator datastore = + new DatastoreEmulator(null, "blar", options) { + @Override + void startEmulatorInternal(String emulatorDir, String projectId, String... cmdLineOpts) { + // no-op for testing + } + }; try { - datastore.start(null, "dataset"); + datastore.start(null, "projectId"); fail("expected exception"); } catch (NullPointerException npe) { // good } try { - datastore.start("path/to/sdk", null); + datastore.start("path/to/emulator", null); fail("expected exception"); } catch (NullPointerException npe) { // good } - datastore.start("path/to/sdk", "dataset"); + datastore.start("path/to/emulator", "projectId"); } @Test - public void testLifecycle() throws LocalDevelopmentDatastoreException { - LocalDevelopmentDatastore datastore = new LocalDevelopmentDatastore(null, "blar", options) { - @Override - void startDatastoreInternal(String sdkPath, String dataset, String... cmdLineOpts) { - // no-op for testing - } + public void testLifecycle() throws DatastoreEmulatorException { + DatastoreEmulator datastore = + new DatastoreEmulator(null, "blar", options) { + @Override + void startEmulatorInternal(String emulatorDir, String projectId, String... cmdLineOpts) { + // no-op for testing + } - @Override - protected void stopDatastoreInternal() { - // no-op for testing - } - }; + @Override + protected void stopEmulatorInternal() { + // no-op for testing + } + }; - String sdkPath = "/yar"; - String myApp = "myapp"; + String emulatorDir = "/yar"; + String myProject = "myproject"; - datastore.start(sdkPath, myApp); + datastore.start(emulatorDir, myProject); try { - datastore.start(sdkPath, myApp); + datastore.start(emulatorDir, myProject); fail("expected exception"); } catch (IllegalStateException e) { // good } datastore.stop(); - // it's ok to stop if we've already stopped + // It's ok to stop if we've already stopped. datastore.stop(); - // once we've stopped we can't start again + // Once we've stopped we can't start again. try { - datastore.start(sdkPath, myApp); + datastore.start(emulatorDir, myProject); fail("expected exception"); } catch (IllegalStateException e) { // good From 731524ebbc7f1493622e083b1d0ff7c673ae370a Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Thu, 6 Oct 2016 16:31:51 -0700 Subject: [PATCH 0038/1784] Add Datastore quickstart sample. --- .../example/datastore/QuickstartSample.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java new file mode 100644 index 000000000000..f595a391f97d --- /dev/null +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -0,0 +1,46 @@ +/* + Copyright 2016, Google, Inc. + + 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.example.datastore; + +// [START bigquery_quickstart] +// Imports the Google Cloud client library +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.KeyFactory; + +public class QuickstartSample { + public static void main(String... args) throws Exception { + // Instantiates a client + Datastore datastore = DatastoreOptions.defaultInstance().service(); + // The kind for the new entity + String kind = "Task"; + // The name/ID for the new entity + String name = "sampletask1"; + // The Cloud Datastore key for the new entity + Key taskKey = datastore.newKeyFactory().kind(kind).newKey(name); + // Prepares the new entity + Entity task = Entity.builder(taskKey) + .set("description", "Buy milk") + .build(); + // Saves the entity + datastore.put(task); + System.out.printf("Saved %s: %s%n", task.key().name(), task.getString("description")); + } +} +// [END bigquery_quickstart] From 53c3733de9d495d2a1f37d9782dee8f7e71de9f1 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Thu, 6 Oct 2016 16:34:15 -0700 Subject: [PATCH 0039/1784] Remove import. --- .../src/main/java/com/example/datastore/QuickstartSample.java | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index f595a391f97d..d2a85856f65e 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -22,7 +22,6 @@ import com.google.cloud.datastore.DatastoreOptions; import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.Key; -import com.google.cloud.datastore.KeyFactory; public class QuickstartSample { public static void main(String... args) throws Exception { From 617be64bd36874b856be8f1db6a5afcd1c127ae6 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Thu, 6 Oct 2016 16:34:59 -0700 Subject: [PATCH 0040/1784] Fixed region tag. --- .../src/main/java/com/example/datastore/QuickstartSample.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index d2a85856f65e..51704ffd8a97 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -16,7 +16,7 @@ package com.example.datastore; -// [START bigquery_quickstart] +// [START datastore_quickstart] // Imports the Google Cloud client library import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreOptions; @@ -42,4 +42,4 @@ public static void main(String... args) throws Exception { System.out.printf("Saved %s: %s%n", task.key().name(), task.getString("description")); } } -// [END bigquery_quickstart] +// [END datastore_quickstart] From f2d29ec964e1d2e0f20d8372c73ae80e87dc442f Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Fri, 7 Oct 2016 10:23:52 -0700 Subject: [PATCH 0041/1784] Add Storage quickstart sample. --- .../src/main/java/com/example/datastore/QuickstartSample.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index 51704ffd8a97..397e842d5478 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -27,18 +27,22 @@ public class QuickstartSample { public static void main(String... args) throws Exception { // Instantiates a client Datastore datastore = DatastoreOptions.defaultInstance().service(); + // The kind for the new entity String kind = "Task"; // The name/ID for the new entity String name = "sampletask1"; // The Cloud Datastore key for the new entity Key taskKey = datastore.newKeyFactory().kind(kind).newKey(name); + // Prepares the new entity Entity task = Entity.builder(taskKey) .set("description", "Buy milk") .build(); + // Saves the entity datastore.put(task); + System.out.printf("Saved %s: %s%n", task.key().name(), task.getString("description")); } } From 28f4c924397cfd4629c529c493b5025107b023cc Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Mon, 24 Oct 2016 17:29:58 -0700 Subject: [PATCH 0042/1784] Add integration tests for Datastore quickstart. --- .../example/datastore/QuickstartSample.java | 4 +- .../example/datastore/QuickstartSampleIT.java | 72 +++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index 397e842d5478..1864a1e8f100 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -37,8 +37,8 @@ public static void main(String... args) throws Exception { // Prepares the new entity Entity task = Entity.builder(taskKey) - .set("description", "Buy milk") - .build(); + .set("description", "Buy milk") + .build(); // Saves the entity datastore.put(task); diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java new file mode 100644 index 000000000000..cd7d8adc00de --- /dev/null +++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java @@ -0,0 +1,72 @@ +/* + Copyright 2016, Google, Inc. + + 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.example.datastore; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Key; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +/** + * Tests for quickstart sample. + */ +@RunWith(JUnit4.class) +@SuppressWarnings("checkstyle:abbreviationaswordinname") +public class QuickstartSampleIT { + private ByteArrayOutputStream bout; + private PrintStream out; + + private static final void deleteTestEntity() { + Datastore datastore = DatastoreOptions.defaultInstance().service(); + String kind = "Task"; + String name = "sampletask1"; + Key taskKey = datastore.newKeyFactory().kind(kind).newKey(name); + datastore.delete(taskKey); + } + + @Before + public void setUp() { + deleteTestEntity(); + + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + } + + @After + public void tearDown() { + System.setOut(null); + deleteTestEntity(); + } + + @Test + public void testQuickstart() throws Exception { + QuickstartSample.main(); + String got = bout.toString(); + assertThat(got).contains("Saved sampletask1: Buy milk"); + } +} +// [END datastore_quickstart] From fffec057aed36b9007b486926ccfaabb5804e078 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 26 Oct 2016 16:16:22 -0700 Subject: [PATCH 0043/1784] Move Datastore concepts to test directory so the tests actually run. --- .../java/com/google/datastore/snippets/Concepts.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename samples/snippets/src/{main => test}/java/com/google/datastore/snippets/Concepts.java (100%) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/test/java/com/google/datastore/snippets/Concepts.java similarity index 100% rename from samples/snippets/src/main/java/com/google/datastore/snippets/Concepts.java rename to samples/snippets/src/test/java/com/google/datastore/snippets/Concepts.java From ea193477662510852294a282353d17e5fa22b790 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Thu, 27 Oct 2016 09:40:48 -0700 Subject: [PATCH 0044/1784] Rename Concepts.java and add runWith so tests run Also, some a test was failing, so I changed it's assertion to match what was actually getting returned. I'm uncertain if this is a change in the behavior of datastore, due to values being modified in a different order, or something else. --- .../snippets/{Concepts.java => ConceptsTest.java} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename samples/snippets/src/test/java/com/google/datastore/snippets/{Concepts.java => ConceptsTest.java} (99%) diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/Concepts.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java similarity index 99% rename from samples/snippets/src/test/java/com/google/datastore/snippets/Concepts.java rename to samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 78c773eee8d7..764fa13385f7 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/Concepts.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -57,6 +57,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import java.io.IOException; import java.util.ArrayList; @@ -74,7 +76,8 @@ /** * Contains Cloud Datastore snippets demonstrating concepts for documentation. */ -public class Concepts { +@RunWith(JUnit4.class) +public class ConceptsTest { private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0); private static final FullEntity TEST_FULL_ENTITY = FullEntity.builder().build(); @@ -989,7 +992,7 @@ public void testPropertyFilteringRunQuery() { } // [END property_filtering_run_query] Map> expected = - ImmutableMap.of("Task", ImmutableSet.of("priority", "tag", "category")); + ImmutableMap.of("Task", ImmutableSet.of("priority", "tag")); assertEquals(expected, propertiesByKind); } From 4354a4b01c128a5a113305c432d51673783697f6 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Fri, 28 Oct 2016 12:45:59 -0700 Subject: [PATCH 0045/1784] Remove references to gcloud-java. We were still using the old artifactId in some pom.xml files, so dpebot could not update these. Also, some READMEs needed updating from my grep search. --- .../test/java/com/google/datastore/snippets/ConceptsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 764fa13385f7..b518ffb5324a 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -813,7 +813,7 @@ public void testTransactionalRetry() { --retries; } } - // Retry handling can also be configured and automatically applied using gcloud-java. + // Retry handling can also be configured and automatically applied using google-cloud-java. // [END transactional_retry] assertSuccessfulTransfer(keys.get(0), keys.get(1)); } From efab0afa01c7e42ea4eb2881a1b8b3dbd556cf3f Mon Sep 17 00:00:00 2001 From: Guillaume Laforge Date: Mon, 7 Nov 2016 20:29:21 +0100 Subject: [PATCH 0046/1784] Use getters for DatastoreOptions and the Datastore service (#401) `defaultInstance()` and `service()` seem to be deprecated in favor of `getDefaultInstance()` and `getService()` --- .../src/main/java/com/example/datastore/QuickstartSample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index 1864a1e8f100..f163222afafd 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -26,7 +26,7 @@ public class QuickstartSample { public static void main(String... args) throws Exception { // Instantiates a client - Datastore datastore = DatastoreOptions.defaultInstance().service(); + Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); // The kind for the new entity String kind = "Task"; From b0d0d68ba5eb224f9ba04a9d049cae2ce2bf00fc Mon Sep 17 00:00:00 2001 From: Guillaume Laforge Date: Mon, 7 Nov 2016 20:29:21 +0100 Subject: [PATCH 0047/1784] Use getters for DatastoreOptions and the Datastore service (#401) `defaultInstance()` and `service()` seem to be deprecated in favor of `getDefaultInstance()` and `getService()` --- .../src/main/java/com/example/datastore/QuickstartSample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index 1864a1e8f100..f163222afafd 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -26,7 +26,7 @@ public class QuickstartSample { public static void main(String... args) throws Exception { // Instantiates a client - Datastore datastore = DatastoreOptions.defaultInstance().service(); + Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); // The kind for the new entity String kind = "Task"; From b2a00d5fd1b1ab3d616f98c6b4bf19c6b09eff13 Mon Sep 17 00:00:00 2001 From: Jerjou Date: Tue, 29 Nov 2016 20:43:49 -0800 Subject: [PATCH 0048/1784] deprecated methods -> undeprecated versions. (#428) --- .../main/java/com/example/datastore/QuickstartSample.java | 6 +++--- .../test/java/com/example/datastore/QuickstartSampleIT.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index f163222afafd..a8e0614fe04f 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -33,17 +33,17 @@ public static void main(String... args) throws Exception { // The name/ID for the new entity String name = "sampletask1"; // The Cloud Datastore key for the new entity - Key taskKey = datastore.newKeyFactory().kind(kind).newKey(name); + Key taskKey = datastore.newKeyFactory().setKind(kind).newKey(name); // Prepares the new entity - Entity task = Entity.builder(taskKey) + Entity task = Entity.newBuilder(taskKey) .set("description", "Buy milk") .build(); // Saves the entity datastore.put(task); - System.out.printf("Saved %s: %s%n", task.key().name(), task.getString("description")); + System.out.printf("Saved %s: %s%n", task.getKey().getName(), task.getString("description")); } } // [END datastore_quickstart] diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java index cd7d8adc00de..8257a2082284 100644 --- a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java +++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java @@ -40,10 +40,10 @@ public class QuickstartSampleIT { private PrintStream out; private static final void deleteTestEntity() { - Datastore datastore = DatastoreOptions.defaultInstance().service(); + Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); String kind = "Task"; String name = "sampletask1"; - Key taskKey = datastore.newKeyFactory().kind(kind).newKey(name); + Key taskKey = datastore.newKeyFactory().setKind(kind).newKey(name); datastore.delete(taskKey); } From 03c5d80a9292e7c576d52b790871be4cab0a0f5b Mon Sep 17 00:00:00 2001 From: Jerjou Date: Tue, 29 Nov 2016 20:43:49 -0800 Subject: [PATCH 0049/1784] deprecated methods -> undeprecated versions. (#428) --- .../google/datastore/snippets/TaskList.java | 18 +- .../datastore/snippets/ConceptsTest.java | 319 +++++++++--------- 2 files changed, 170 insertions(+), 167 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 8ff5b53059ab..495864f23642 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -39,10 +39,10 @@ public class TaskList { // [START build_service] // Create an authorized Datastore service using Application Default Credentials. - private final Datastore datastore = DatastoreOptions.defaultInstance().service(); + private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); // Create a Key factory to construct keys associated with this project. - private final KeyFactory keyFactory = datastore.newKeyFactory().kind("Task"); + private final KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task"); // [END build_service] // [START add_entity] @@ -55,8 +55,8 @@ public class TaskList { */ Key addTask(String description) { Key key = datastore.allocateId(keyFactory.newKey()); - Entity task = Entity.builder(key) - .set("description", StringValue.builder(description).excludeFromIndexes(true).build()) + Entity task = Entity.newBuilder(key) + .set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build()) .set("created", DateTime.now()) .set("done", false) .build(); @@ -78,12 +78,12 @@ boolean markDone(long id) { try { Entity task = transaction.get(keyFactory.newKey(id)); if (task != null) { - transaction.put(Entity.builder(task).set("done", true).build()); + transaction.put(Entity.newBuilder(task).set("done", true).build()); } transaction.commit(); return task != null; } finally { - if (transaction.active()) { + if (transaction.isActive()) { transaction.rollback(); } } @@ -98,7 +98,7 @@ boolean markDone(long id) { */ Iterator listTasks() { Query query = - Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build(); + Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build(); return datastore.run(query); } // [END retrieve_entities] @@ -128,9 +128,9 @@ static List formatTasks(Iterator tasks) { Entity task = tasks.next(); if (task.getBoolean("done")) { strings.add( - String.format("%d : %s (done)", task.key().id(), task.getString("description"))); + String.format("%d : %s (done)", task.getKey().getId(), task.getString("description"))); } else { - strings.add(String.format("%d : %s (created %s)", task.key().id(), + strings.add(String.format("%d : %s (created %s)", task.getKey().getId(), task.getString("description"), task.getDateTime("created"))); } } diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index b518ffb5324a..e00b09011e64 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -80,7 +80,7 @@ public class ConceptsTest { private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0); - private static final FullEntity TEST_FULL_ENTITY = FullEntity.builder().build(); + private static final FullEntity TEST_FULL_ENTITY = FullEntity.newBuilder().build(); private Datastore datastore; private KeyFactory keyFactory; @@ -110,13 +110,13 @@ public static void beforeClass() throws IOException, InterruptedException { */ @Before public void setUp() { - datastore = HELPER.options().toBuilder().namespace("ghijklmnop").build().service(); - StructuredQuery query = Query.keyQueryBuilder().build(); + datastore = HELPER.getOptions().toBuilder().setNamespace("ghijklmnop").build().getService(); + StructuredQuery query = Query.newKeyQueryBuilder().build(); QueryResults result = datastore.run(query); datastore.delete(Iterators.toArray(result, Key.class)); - keyFactory = datastore.newKeyFactory().kind("Task"); + keyFactory = datastore.newKeyFactory().setKind("Task"); taskKey = keyFactory.newKey("some-arbitrary-key"); - testEntity = Entity.builder(taskKey, TEST_FULL_ENTITY).build(); + testEntity = Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build(); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); calendar.set(1990, JANUARY, 1); startDate = DateTime.copyFrom(calendar); @@ -138,13 +138,13 @@ public static void afterClass() throws IOException, InterruptedException { } private void assertValidKey(Key taskKey) { - datastore.put(Entity.builder(taskKey, TEST_FULL_ENTITY).build()); + datastore.put(Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build()); } @Test public void testIncompleteKey() { // [START incomplete_key] - KeyFactory keyFactory = datastore.newKeyFactory().kind("Task"); + KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task"); Key taskKey = datastore.allocateId(keyFactory.newKey()); // [END incomplete_key] assertValidKey(taskKey); @@ -153,7 +153,7 @@ public void testIncompleteKey() { @Test public void testNamedKey() { // [START named_key] - Key taskKey = datastore.newKeyFactory().kind("Task").newKey("sampleTask"); + Key taskKey = datastore.newKeyFactory().setKind("Task").newKey("sampleTask"); // [END named_key] assertValidKey(taskKey); } @@ -162,8 +162,8 @@ public void testNamedKey() { public void testKeyWithParent() { // [START key_with_parent] Key taskKey = datastore.newKeyFactory() - .ancestors(PathElement.of("TaskList", "default")) - .kind("Task") + .addAncestors(PathElement.of("TaskList", "default")) + .setKind("Task") .newKey("sampleTask"); // [END key_with_parent] assertValidKey(taskKey); @@ -173,8 +173,8 @@ public void testKeyWithParent() { public void testKeyWithMultilevelParent() { // [START key_with_multilevel_parent] KeyFactory keyFactory = datastore.newKeyFactory() - .ancestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default")) - .kind("Task"); + .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default")) + .setKind("Task"); Key taskKey = keyFactory.newKey("sampleTask"); // [END key_with_multilevel_parent] assertValidKey(taskKey); @@ -182,17 +182,17 @@ public void testKeyWithMultilevelParent() { private void assertValidEntity(Entity original) { datastore.put(original); - assertEquals(original, datastore.get(original.key())); + assertEquals(original, datastore.get(original.getKey())); } @Test public void testEntityWithParent() { // [START entity_with_parent] Key taskKey = datastore.newKeyFactory() - .ancestors(PathElement.of("TaskList", "default")) - .kind("Task") + .addAncestors(PathElement.of("TaskList", "default")) + .setKind("Task") .newKey("sampleTask"); - Entity task = Entity.builder(taskKey) + Entity task = Entity.newBuilder(taskKey) .set("category", "Personal") .set("done", false) .set("priority", 4) @@ -205,14 +205,14 @@ public void testEntityWithParent() { @Test public void testProperties() { // [START properties] - Entity task = Entity.builder(taskKey) + Entity task = Entity.newBuilder(taskKey) .set("category", "Personal") .set("created", DateTime.now()) .set("done", false) .set("priority", 4) .set("percent_complete", 10.0) .set("description", - StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build()) + StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build()) .build(); // [END properties] assertValidEntity(task); @@ -221,7 +221,7 @@ public void testProperties() { @Test public void testArrayValue() { // [START array_value] - Entity task = Entity.builder(taskKey) + Entity task = Entity.newBuilder(taskKey) .set("tags", "fun", "programming") .set("collaborators", "alice", "bob") .build(); @@ -232,7 +232,7 @@ public void testArrayValue() { @Test public void testBasicEntity() { // [START basic_entity] - Entity task = Entity.builder(taskKey) + Entity task = Entity.newBuilder(taskKey) .set("category", "Personal") .set("done", false) .set("priority", 4) @@ -245,18 +245,18 @@ public void testBasicEntity() { @Test public void testUpsert() { // [START upsert] - Entity task = Entity.builder(keyFactory.newKey("sampleTask")).build(); + Entity task = Entity.newBuilder(keyFactory.newKey("sampleTask")).build(); datastore.put(task); // [END upsert] - assertEquals(task, datastore.get(task.key())); + assertEquals(task, datastore.get(task.getKey())); } @Test public void testInsert() { // [START insert] - Key taskKey = datastore.add(FullEntity.builder(keyFactory.newKey()).build()).key(); + Key taskKey = datastore.add(FullEntity.newBuilder(keyFactory.newKey()).build()).getKey(); // [END insert] - assertEquals(FullEntity.builder(taskKey).build(), datastore.get(taskKey)); + assertEquals(FullEntity.newBuilder(taskKey).build(), datastore.get(taskKey)); } @Test @@ -272,7 +272,7 @@ public void testLookup() { public void testUpdate() { datastore.put(testEntity); // [START update] - Entity task = Entity.builder(datastore.get(taskKey)).set("priority", 5).build(); + Entity task = Entity.newBuilder(datastore.get(taskKey)).set("priority", 5).build(); datastore.update(task); // [END update] assertEquals(task, datastore.get(taskKey)); @@ -288,13 +288,13 @@ public void testDelete() { } private List setUpBatchTests(Key taskKey1, Key taskKey2) { - Entity task1 = Entity.builder(taskKey1) + Entity task1 = Entity.newBuilder(taskKey1) .set("category", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") .build(); - Entity task2 = Entity.builder(taskKey2) + Entity task2 = Entity.newBuilder(taskKey2) .set("category", "Personal") .set("done", false) .set("priority", 5) @@ -307,24 +307,24 @@ private List setUpBatchTests(Key taskKey1, Key taskKey2) { @Test public void testBatchUpsert() { // [START batch_upsert] - FullEntity task1 = FullEntity.builder(keyFactory.newKey()) + FullEntity task1 = FullEntity.newBuilder(keyFactory.newKey()) .set("category", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") .build(); - FullEntity task2 = Entity.builder(keyFactory.newKey()) + FullEntity task2 = Entity.newBuilder(keyFactory.newKey()) .set("category", "Personal") .set("done", false) .set("priority", 5) .set("description", "Integrate Cloud Datastore") .build(); List tasks = datastore.add(task1, task2); - Key taskKey1 = tasks.get(0).key(); - Key taskKey2 = tasks.get(1).key(); + Key taskKey1 = tasks.get(0).getKey(); + Key taskKey2 = tasks.get(1).getKey(); // [END batch_upsert] - assertEquals(Entity.builder(taskKey1, task1).build(), datastore.get(taskKey1)); - assertEquals(Entity.builder(taskKey2, task2).build(), datastore.get(taskKey2)); + assertEquals(Entity.newBuilder(taskKey1, task1).build(), datastore.get(taskKey1)); + assertEquals(Entity.newBuilder(taskKey2, task2).build(), datastore.get(taskKey2)); } @Test @@ -353,10 +353,10 @@ public void testBatchDelete() { private void setUpQueryTests() { Key taskKey = datastore.newKeyFactory() - .kind("Task") - .ancestors(PathElement.of("TaskList", "default")) + .setKind("Task") + .addAncestors(PathElement.of("TaskList", "default")) .newKey("someTask"); - datastore.put(Entity.builder(taskKey) + datastore.put(Entity.newBuilder(taskKey) .set("category", "Personal") .set("done", false) .set("completed", false) @@ -364,7 +364,7 @@ private void setUpQueryTests() { .set("created", includedDate) .set("percent_complete", 10.0) .set("description", - StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build()) + StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build()) .set("tag", "fun", "l", "programming") .build()); } @@ -385,11 +385,11 @@ private void assertInvalidQuery(Query query) { public void testBasicQuery() { setUpQueryTests(); // [START basic_query] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(CompositeFilter.and( + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(CompositeFilter.and( PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4))) - .orderBy(OrderBy.desc("priority")) + .setOrderBy(OrderBy.desc("priority")) .build(); // [END basic_query] assertValidQuery(query); @@ -398,7 +398,7 @@ public void testBasicQuery() { @Test public void testRunQuery() { setUpQueryTests(); - Query query = Query.entityQueryBuilder().kind("Task").build(); + Query query = Query.newEntityQueryBuilder().setKind("Task").build(); // [START run_query] QueryResults tasks = datastore.run(query); // [END run_query] @@ -411,7 +411,8 @@ public void testPropertyFilter() { setUpQueryTests(); // [START property_filter] Query query = - Query.entityQueryBuilder().kind("Task").filter(PropertyFilter.eq("done", false)).build(); + Query.newEntityQueryBuilder().setKind("Task").setFilter(PropertyFilter.eq("done", false)) + .build(); // [END property_filter] assertValidQuery(query); } @@ -420,9 +421,9 @@ public void testPropertyFilter() { public void testCompositeFilter() { setUpQueryTests(); // [START composite_filter] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter( + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( CompositeFilter.and(PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4))) .build(); // [END composite_filter] @@ -433,9 +434,9 @@ public void testCompositeFilter() { public void testKeyFilter() { setUpQueryTests(); // [START key_filter] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) .build(); // [END key_filter] assertValidQuery(query); @@ -446,7 +447,7 @@ public void testAscendingSort() { setUpQueryTests(); // [START ascending_sort] Query query = - Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build(); + Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build(); // [END ascending_sort] assertValidQuery(query); } @@ -456,7 +457,7 @@ public void testDescendingSort() { setUpQueryTests(); // [START descending_sort] Query query = - Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.desc("created")).build(); + Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.desc("created")).build(); // [END descending_sort] assertValidQuery(query); } @@ -465,9 +466,9 @@ public void testDescendingSort() { public void testMultiSort() { setUpQueryTests(); // [START multi_sort] - Query query = Query.entityQueryBuilder() - .kind("Task") - .orderBy(OrderBy.desc("priority"), OrderBy.asc("created")) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created")) .build(); // [END multi_sort] assertValidQuery(query); @@ -479,7 +480,7 @@ public void testKindlessQuery() { setUpQueryTests(); // [START kindless_query] Query query = - Query.entityQueryBuilder().filter(PropertyFilter.gt("__key__", lastSeenKey)).build(); + Query.newEntityQueryBuilder().setFilter(PropertyFilter.gt("__key__", lastSeenKey)).build(); // [END kindless_query] assertValidQuery(query); } @@ -488,10 +489,10 @@ public void testKindlessQuery() { public void testAncestorQuery() { setUpQueryTests(); // [START ancestor_query] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.hasAncestor( - datastore.newKeyFactory().kind("TaskList").newKey("default"))) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.hasAncestor( + datastore.newKeyFactory().setKind("TaskList").newKey("default"))) .build(); // [END ancestor_query] assertValidQuery(query); @@ -501,9 +502,9 @@ public void testAncestorQuery() { public void testProjectionQuery() { setUpQueryTests(); // [START projection_query] - Query query = Query.projectionEntityQueryBuilder() - .kind("Task") - .projection("priority", "percent_complete") + Query query = Query.newProjectionEntityQueryBuilder() + .setKind("Task") + .setProjection("priority", "percent_complete") .build(); // [END projection_query] assertValidQuery(query); @@ -512,9 +513,9 @@ public void testProjectionQuery() { @Test public void testRunProjectionQuery() { setUpQueryTests(); - Query query = Query.projectionEntityQueryBuilder() - .kind("Task") - .projection("priority", "percent_complete") + Query query = Query.newProjectionEntityQueryBuilder() + .setKind("Task") + .setProjection("priority", "percent_complete") .build(); // [START run_query_projection] List priorities = new LinkedList<>(); @@ -534,7 +535,7 @@ public void testRunProjectionQuery() { public void testKeysOnlyQuery() { setUpQueryTests(); // [START keys_only_query] - Query query = Query.keyQueryBuilder().kind("Task").build(); + Query query = Query.newKeyQueryBuilder().setKind("Task").build(); // [END keys_only_query] assertValidQuery(query); } @@ -542,7 +543,7 @@ public void testKeysOnlyQuery() { @Test public void testRunKeysOnlyQuery() { setUpQueryTests(); - Query query = Query.keyQueryBuilder().kind("Task").build(); + Query query = Query.newKeyQueryBuilder().setKind("Task").build(); // [START run_keys_only_query] QueryResults taskKeys = datastore.run(query); // [END run_keys_only_query] @@ -554,11 +555,11 @@ public void testRunKeysOnlyQuery() { public void testDistinctQuery() { setUpQueryTests(); // [START distinct_query] - Query query = Query.projectionEntityQueryBuilder() - .kind("Task") - .projection("category", "priority") - .distinctOn("category", "priority") - .orderBy(OrderBy.asc("category"), OrderBy.asc("priority")) + Query query = Query.newProjectionEntityQueryBuilder() + .setKind("Task") + .setProjection("category", "priority") + .setDistinctOn("category", "priority") + .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority")) .build(); // [END distinct_query] assertValidQuery(query); @@ -568,11 +569,11 @@ public void testDistinctQuery() { public void testDistinctOnQuery() { setUpQueryTests(); // [START distinct_on_query] - Query query = Query.projectionEntityQueryBuilder() - .kind("Task") - .projection("category", "priority") - .distinctOn("category") - .orderBy(OrderBy.asc("category"), OrderBy.asc("priority")) + Query query = Query.newProjectionEntityQueryBuilder() + .setKind("Task") + .setProjection("category", "priority") + .setDistinctOn("category") + .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority")) .build(); // [END distinct_on_query] assertValidQuery(query); @@ -582,9 +583,9 @@ public void testDistinctOnQuery() { public void testArrayValueInequalityRange() { setUpQueryTests(); // [START array_value_inequality_range] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(CompositeFilter.and( + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(CompositeFilter.and( PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math"))) .build(); // [END array_value_inequality_range] @@ -596,9 +597,9 @@ public void testArrayValueInequalityRange() { public void testArrayValueEquality() { setUpQueryTests(); // [START array_value_equality] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(CompositeFilter.and( + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(CompositeFilter.and( PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming"))) .build(); // [END array_value_equality] @@ -609,9 +610,9 @@ public void testArrayValueEquality() { public void testInequalityRange() { setUpQueryTests(); // [START inequality_range] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(CompositeFilter.and( + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(CompositeFilter.and( PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) .build(); // [END inequality_range] @@ -621,9 +622,9 @@ public void testInequalityRange() { @Test public void testInequalityInvalid() { // [START inequality_invalid] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(CompositeFilter.and( + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(CompositeFilter.and( PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3))) .build(); // [END inequality_invalid] @@ -634,9 +635,9 @@ public void testInequalityInvalid() { public void testEqualAndInequalityRange() { setUpQueryTests(); // [START equal_and_inequality_range] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(CompositeFilter.and(PropertyFilter.eq("priority", 4), + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(CompositeFilter.and(PropertyFilter.eq("priority", 4), PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) .build(); // [END equal_and_inequality_range] @@ -647,10 +648,10 @@ public void testEqualAndInequalityRange() { public void testInequalitySort() { setUpQueryTests(); // [START inequality_sort] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.gt("priority", 3)) - .orderBy(OrderBy.asc("priority"), OrderBy.asc("created")) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("priority", 3)) + .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created")) .build(); // [END inequality_sort] assertValidQuery(query); @@ -659,10 +660,10 @@ public void testInequalitySort() { @Test public void testInequalitySortInvalidNotSame() { // [START inequality_sort_invalid_not_same] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.gt("priority", 3)) - .orderBy(OrderBy.asc("created")) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("priority", 3)) + .setOrderBy(OrderBy.asc("created")) .build(); // [END inequality_sort_invalid_not_same] assertInvalidQuery(query); @@ -671,10 +672,10 @@ public void testInequalitySortInvalidNotSame() { @Test public void testInequalitySortInvalidNotFirst() { // [START inequality_sort_invalid_not_first] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.gt("priority", 3)) - .orderBy(OrderBy.asc("created"), OrderBy.asc("priority")) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("priority", 3)) + .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority")) .build(); // [END inequality_sort_invalid_not_first] assertInvalidQuery(query); @@ -684,7 +685,7 @@ public void testInequalitySortInvalidNotFirst() { public void testLimit() { setUpQueryTests(); // [START limit] - Query query = Query.entityQueryBuilder().kind("Task").limit(5).build(); + Query query = Query.newEntityQueryBuilder().setKind("Task").setLimit(5).build(); // [END limit] assertValidQuery(query); } @@ -701,16 +702,17 @@ public void testCursorPaging() { private Cursor cursorPaging(int pageSize, Cursor pageCursor) { // [START cursor_paging] - EntityQuery.Builder queryBuilder = Query.entityQueryBuilder().kind("Task").limit(pageSize); + EntityQuery.Builder queryBuilder = Query.newEntityQueryBuilder().setKind("Task") + .setLimit(pageSize); if (pageCursor != null) { - queryBuilder.startCursor(pageCursor); + queryBuilder.setStartCursor(pageCursor); } QueryResults tasks = datastore.run(queryBuilder.build()); while (tasks.hasNext()) { Entity task = tasks.next(); // do something with the task } - Cursor nextPageCursor = tasks.cursorAfter(); + Cursor nextPageCursor = tasks.getCursorAfter(); // [END cursor_paging] return nextPageCursor; } @@ -719,10 +721,10 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) { public void testEventualConsistentQuery() { setUpQueryTests(); // [START eventual_consistent_query] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.hasAncestor( - datastore.newKeyFactory().kind("TaskList").newKey("default"))) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.hasAncestor( + datastore.newKeyFactory().setKind("TaskList").newKey("default"))) .build(); datastore.run(query, ReadOption.eventualConsistency()); // [END eventual_consistent_query] @@ -733,9 +735,9 @@ public void testEventualConsistentQuery() { public void testUnindexedPropertyQuery() { setUpQueryTests(); // [START unindexed_property_query] - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.eq("description", "A task description")) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.eq("description", "A task description")) .build(); // [END unindexed_property_query] QueryResults results = datastore.run(query); @@ -745,7 +747,7 @@ public void testUnindexedPropertyQuery() { @Test public void testExplodingProperties() { // [START exploding_properties] - Entity task = Entity.builder(taskKey) + Entity task = Entity.newBuilder(taskKey) .set("tags", "fun", "programming", "learn") .set("collaborators", "alice", "bob", "charlie") .set("created", DateTime.now()) @@ -755,11 +757,11 @@ public void testExplodingProperties() { } private List setUpTransferTests() { - KeyFactory keyFactory = datastore.newKeyFactory().kind("People"); + KeyFactory keyFactory = datastore.newKeyFactory().setKind("People"); Key from = keyFactory.newKey("from"); Key to = keyFactory.newKey("to"); - datastore.put(Entity.builder(from).set("balance", 100).build()); - datastore.put(Entity.builder(to).set("balance", 0).build()); + datastore.put(Entity.newBuilder(from).set("balance", 100).build()); + datastore.put(Entity.newBuilder(to).set("balance", 0).build()); return ImmutableList.of(from, to); } @@ -782,13 +784,14 @@ void transferFunds(Key fromKey, Key toKey, long amount) { List entities = txn.fetch(fromKey, toKey); Entity from = entities.get(0); Entity updatedFrom = - Entity.builder(from).set("balance", from.getLong("balance") - amount).build(); + Entity.newBuilder(from).set("balance", from.getLong("balance") - amount).build(); Entity to = entities.get(1); - Entity updatedTo = Entity.builder(to).set("balance", to.getLong("balance") + amount).build(); + Entity updatedTo = Entity.newBuilder(to).set("balance", to.getLong("balance") + amount) + .build(); txn.put(updatedFrom, updatedTo); txn.commit(); } finally { - if (txn.active()) { + if (txn.isActive()) { txn.rollback(); } } @@ -826,12 +829,12 @@ public void testTransactionalGetOrCreate() { try { task = txn.get(taskKey); if (task == null) { - task = Entity.builder(taskKey).build(); + task = Entity.newBuilder(taskKey).build(); txn.put(task); txn.commit(); } } finally { - if (txn.active()) { + if (txn.isActive()) { txn.rollback(); } } @@ -842,8 +845,8 @@ public void testTransactionalGetOrCreate() { @Test public void testTransactionalSingleEntityGroupReadOnly() { setUpQueryTests(); - Key taskListKey = datastore.newKeyFactory().kind("TaskList").newKey("default"); - Entity taskListEntity = Entity.builder(taskListKey).build(); + Key taskListKey = datastore.newKeyFactory().setKind("TaskList").newKey("default"); + Entity taskListEntity = Entity.newBuilder(taskListKey).build(); datastore.put(taskListEntity); // [START transactional_single_entity_group_read_only] Entity taskList; @@ -851,14 +854,14 @@ public void testTransactionalSingleEntityGroupReadOnly() { Transaction txn = datastore.newTransaction(); try { taskList = txn.get(taskListKey); - Query query = Query.entityQueryBuilder() - .kind("Task") - .filter(PropertyFilter.hasAncestor(taskListKey)) + Query query = Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.hasAncestor(taskListKey)) .build(); tasks = txn.run(query); txn.commit(); } finally { - if (txn.active()) { + if (txn.isActive()) { txn.rollback(); } } @@ -872,19 +875,19 @@ public void testTransactionalSingleEntityGroupReadOnly() { public void testNamespaceRunQuery() { setUpQueryTests(); // [START namespace_run_query] - KeyFactory keyFactory = datastore.newKeyFactory().kind("__namespace__"); + KeyFactory keyFactory = datastore.newKeyFactory().setKind("__namespace__"); Key startNamespace = keyFactory.newKey("g"); Key endNamespace = keyFactory.newKey("h"); - Query query = Query.keyQueryBuilder() - .kind("__namespace__") - .filter(CompositeFilter.and( + Query query = Query.newKeyQueryBuilder() + .setKind("__namespace__") + .setFilter(CompositeFilter.and( PropertyFilter.gt("__key__", startNamespace), PropertyFilter.lt("__key__", endNamespace))) .build(); List namespaces = new ArrayList<>(); QueryResults results = datastore.run(query); while (results.hasNext()) { - namespaces.add(results.next().name()); + namespaces.add(results.next().getName()); } // [END namespace_run_query] assertEquals(ImmutableList.of("ghijklmnop"), namespaces); @@ -894,11 +897,11 @@ public void testNamespaceRunQuery() { public void testKindRunQuery() { setUpQueryTests(); // [START kind_run_query] - Query query = Query.keyQueryBuilder().kind("__kind__").build(); + Query query = Query.newKeyQueryBuilder().setKind("__kind__").build(); List kinds = new ArrayList<>(); QueryResults results = datastore.run(query); while (results.hasNext()) { - kinds.add(results.next().name()); + kinds.add(results.next().getName()); } // [END kind_run_query] assertEquals(ImmutableList.of("Task"), kinds); @@ -908,13 +911,13 @@ public void testKindRunQuery() { public void testPropertyRunQuery() { setUpQueryTests(); // [START property_run_query] - Query query = Query.keyQueryBuilder().kind("__property__").build(); + Query query = Query.newKeyQueryBuilder().setKind("__property__").build(); QueryResults keys = datastore.run(query); Map> propertiesByKind = new HashMap<>(); while (keys.hasNext()) { Key key = keys.next(); - String kind = key.parent().name(); - String propertyName = key.name(); + String kind = key.getParent().getName(); + String propertyName = key.getName(); Collection properties = propertiesByKind.get(kind); if (properties == null) { properties = new HashSet<>(); @@ -932,16 +935,16 @@ public void testPropertyRunQuery() { public void testPropertyByKindRunQuery() { setUpQueryTests(); // [START property_by_kind_run_query] - Key key = datastore.newKeyFactory().kind("__kind__").newKey("Task"); - Query query = Query.entityQueryBuilder() - .kind("__property__") - .filter(PropertyFilter.hasAncestor(key)) + Key key = datastore.newKeyFactory().setKind("__kind__").newKey("Task"); + Query query = Query.newEntityQueryBuilder() + .setKind("__property__") + .setFilter(PropertyFilter.hasAncestor(key)) .build(); QueryResults results = datastore.run(query); Map> representationsByProperty = new HashMap<>(); while (results.hasNext()) { Entity result = results.next(); - String propertyName = result.key().name(); + String propertyName = result.getKey().getName(); List representations = result.getList("property_representation"); Collection currentRepresentations = representationsByProperty.get(propertyName); if (currentRepresentations == null) { @@ -970,19 +973,19 @@ public void testPropertyFilteringRunQuery() { setUpQueryTests(); // [START property_filtering_run_query] Key startKey = datastore.newKeyFactory() - .kind("__property__") - .ancestors(PathElement.of("__kind__", "Task")) + .setKind("__property__") + .addAncestors(PathElement.of("__kind__", "Task")) .newKey("priority"); - Query query = Query.keyQueryBuilder() - .kind("__property__") - .filter(PropertyFilter.ge("__key__", startKey)) + Query query = Query.newKeyQueryBuilder() + .setKind("__property__") + .setFilter(PropertyFilter.ge("__key__", startKey)) .build(); Map> propertiesByKind = new HashMap<>(); QueryResults keys = datastore.run(query); while (keys.hasNext()) { Key key = keys.next(); - String kind = key.parent().name(); - String propertyName = key.name(); + String kind = key.getParent().getName(); + String propertyName = key.getName(); Collection properties = propertiesByKind.get(kind); if (properties == null) { properties = new HashSet(); @@ -1000,8 +1003,8 @@ public void testPropertyFilteringRunQuery() { public void testGqlRunQuery() { setUpQueryTests(); // [START gql_run_query] - Query query = - Query.gqlQueryBuilder(ResultType.ENTITY, "select * from Task order by created asc").build(); + Query query = Query.newGqlQueryBuilder( + ResultType.ENTITY, "select * from Task order by created asc").build(); // [END gql_run_query] assertValidQuery(query); } @@ -1011,7 +1014,7 @@ public void testGqlNamedBindingQuery() { setUpQueryTests(); // [START gql_named_binding_query] Query query = - Query.gqlQueryBuilder( + Query.newGqlQueryBuilder( ResultType.ENTITY, "select * from Task where completed = @completed and priority = @priority") .setBinding("completed", false) @@ -1025,7 +1028,7 @@ public void testGqlNamedBindingQuery() { public void testGqlPositionalBindingQuery() { setUpQueryTests(); // [START gql_positional_binding_query] - Query query = Query.gqlQueryBuilder( + Query query = Query.newGqlQueryBuilder( ResultType.ENTITY, "select * from Task where completed = @1 and priority = @2") .addBinding(false) .addBinding(4) @@ -1038,9 +1041,9 @@ public void testGqlPositionalBindingQuery() { public void testGqlLiteralQuery() { setUpQueryTests(); // [START gql_literal_query] - Query query = Query.gqlQueryBuilder( + Query query = Query.newGqlQueryBuilder( ResultType.ENTITY, "select * from Task where completed = false and priority = 4") - .allowLiteral(true) + .setAllowLiteral(true) .build(); // [END gql_literal_query] assertValidQuery(query); From ee579b9f4032385d8da4f142c65b51a893a2bc4c Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Wed, 7 Dec 2016 20:32:29 -0800 Subject: [PATCH 0050/1784] Add NL quickstart sample. Fix some other quickstarts. (#438) --- .../src/test/java/com/example/datastore/QuickstartSampleIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java index 8257a2082284..3bf69d77b739 100644 --- a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java +++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java @@ -69,4 +69,3 @@ public void testQuickstart() throws Exception { assertThat(got).contains("Saved sampletask1: Buy milk"); } } -// [END datastore_quickstart] From a1d833a12b29e2b249f90b6375cff3d3d870f99f Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Fri, 9 Dec 2016 13:04:43 -0800 Subject: [PATCH 0051/1784] Use latest (beta) versions of cloud client libraries. Note this wasn't automatically done because dpebot currently skips beta releases. We can look at how to add an exception for the com.google.cloud libraries if they are going to stay beta a while. --- .../java/com/google/datastore/snippets/ConceptsTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index e00b09011e64..8970e83e2bad 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -51,6 +51,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; +import org.joda.time.Duration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -72,6 +73,7 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; +import java.util.concurrent.TimeoutException; /** * Contains Cloud Datastore snippets demonstrating concepts for documentation. @@ -133,8 +135,8 @@ public void setUp() { * @throws InterruptedException if there are errors stopping the local Datastore */ @AfterClass - public static void afterClass() throws IOException, InterruptedException { - HELPER.stop(); + public static void afterClass() throws IOException, InterruptedException, TimeoutException { + HELPER.stop(Duration.standardMinutes(1)); } private void assertValidKey(Key taskKey) { From c77c3cd27c7c65b424ee3dc8fa1c390230cc37ca Mon Sep 17 00:00:00 2001 From: Ed Davisson Date: Tue, 10 Jan 2017 12:41:45 -0800 Subject: [PATCH 0052/1784] Add a host() option to DatastoreOptions --- .../datastore/v1/client/DatastoreFactory.java | 5 +- .../datastore/v1/client/DatastoreOptions.java | 51 ++++++++++++++----- .../datastore/v1/client/DatastoreTest.java | 49 +++++++++++++++++- 3 files changed, 91 insertions(+), 14 deletions(-) diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java index 809f8beabbb6..8fe5ad7f2bd3 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java @@ -97,7 +97,10 @@ String buildProjectEndpoint(DatastoreOptions options) { } // DatastoreOptions ensures either project endpoint or project ID is set. String projectId = checkNotNull(options.getProjectId()); - if (options.getLocalHost() != null) { + if (options.getHost() != null) { + return validateUrl(String.format("https://%s/%s/projects/%s", + options.getHost(), VERSION, projectId)); + } else if (options.getLocalHost() != null) { return validateUrl(String.format("http://%s/%s/projects/%s", options.getLocalHost(), VERSION, projectId)); } 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 ac76133c9da7..8f3523a951c1 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 @@ -43,6 +43,7 @@ public class DatastoreOptions { private final String projectId; private final String projectEndpoint; + private final String host; private final String localHost; private final HttpRequestInitializer initializer; @@ -57,6 +58,7 @@ public class DatastoreOptions { "Either project ID or project endpoint must be provided."); this.projectId = b.projectId; this.projectEndpoint = b.projectEndpoint; + this.host = b.host; this.localHost = b.localHost; this.initializer = b.initializer; this.credential = b.credential; @@ -67,13 +69,14 @@ public class DatastoreOptions { * Builder for {@link DatastoreOptions}. */ public static class Builder { - private static final String PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR = + private static final String PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR = "Cannot set both project endpoint and project ID."; - private static final String PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR = - "Cannot set both project endpoint and local host."; + private static final String PROJECT_ENDPOINT_AND_HOST_ERROR = + "Can set at most one of project endpoint, host, and local host."; private String projectId; private String projectEndpoint; + private String host; private String localHost; private HttpRequestInitializer initializer; private Credential credential; @@ -84,6 +87,7 @@ public Builder() { } public Builder(DatastoreOptions options) { this.projectId = options.projectId; this.projectEndpoint = options.projectEndpoint; + this.host = options.host; this.localHost = options.localHost; this.initializer = options.initializer; this.credential = options.credential; @@ -95,7 +99,7 @@ public DatastoreOptions build() { } /** - * Sets the project ID used to access Datastore. + * Sets the project ID used to access Cloud Datastore. */ public Builder projectId(String projectId) { checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR); @@ -104,10 +108,26 @@ public Builder projectId(String projectId) { } /** - * Sets the host used to access Datastore. + * Sets the host used to access Cloud Datastore. To connect to the Cloud Datastore Emulator, + * use {@link #localHost} instead. + */ + public Builder host(String host) { + checkArgument(projectEndpoint == null && localHost == null, PROJECT_ENDPOINT_AND_HOST_ERROR); + if (includesScheme(host)) { + throw new IllegalArgumentException( + String.format("Host \"%s\" must not include scheme.", host)); + } + this.host = host; + return this; + } + + /** + * Configures the client to access Cloud Datastore on a local host (typically a Cloud Datastore + * Emulator instance). Call this method also configures the client not to attach credentials + * to requests. */ public Builder localHost(String localHost) { - checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR); + checkArgument(projectEndpoint == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR); if (includesScheme(localHost)) { throw new IllegalArgumentException( String.format("Local host \"%s\" must not include scheme.", localHost)); @@ -117,12 +137,15 @@ public Builder localHost(String localHost) { } /** - * Sets the project endpoint used to access Datastore. Prefer using {@link #projectId} - * and/or {@link #localHost} when possible. + * @deprecated Use {@link #projectId} and/or {@link #host}/{@link #localHost} instead. + * + * Sets the project endpoint used to access Cloud Datastore. Prefer using {@link #projectId} + * and/or {@link #host}/{@link #localHost} when possible. */ + @Deprecated public Builder projectEndpoint(String projectEndpoint) { checkArgument(projectId == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR); - checkArgument(localHost == null, PROJECT_ENDPOINT_AND_LOCAL_HOST_ERROR); + checkArgument(localHost == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR); if (!includesScheme(projectEndpoint)) { throw new IllegalArgumentException(String.format( "Project endpoint \"%s\" must include scheme.", projectEndpoint)); @@ -132,7 +155,7 @@ public Builder projectEndpoint(String projectEndpoint) { } /** - * Sets the (optional) initializer to run on HTTP requests to Datastore. + * Sets the (optional) initializer to run on HTTP requests to Cloud Datastore. */ public Builder initializer(HttpRequestInitializer initializer) { this.initializer = initializer; @@ -140,7 +163,7 @@ public Builder initializer(HttpRequestInitializer initializer) { } /** - * Sets the Google APIs {@link Credential} used to access Datastore. + * Sets the Google APIs {@link Credential} used to access Cloud Datastore. */ public Builder credential(Credential credential) { this.credential = credential; @@ -148,7 +171,7 @@ public Builder credential(Credential credential) { } /** - * Sets the transport used to access Datastore. + * Sets the transport used to access Cloud Datastore. */ public Builder transport(HttpTransport transport) { this.transport = transport; @@ -168,6 +191,10 @@ public String getProjectEndpoint() { return projectEndpoint; } + public String getHost() { + return host; + } + public String getLocalHost() { return localHost; } diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java index bcdbe18de2c1..4454be66c30a 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java @@ -102,12 +102,30 @@ public void options_ProjectIdAndProjectEndpoint() throws Exception { @Test public void options_LocalHostAndProjectEndpoint() throws Exception { thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("Cannot set both project endpoint and local host"); + thrown.expectMessage("Can set at most one of project endpoint, host, and local host"); options = new DatastoreOptions.Builder() .localHost("localhost:8080") .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id"); } + @Test + public void options_HostAndProjectEndpoint() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Can set at most one of project endpoint, host, and local host"); + options = new DatastoreOptions.Builder() + .host("foo-datastore.googleapis.com") + .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id"); + } + + @Test + public void options_HostAndLocalHost() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Can set at most one of project endpoint, host, and local host"); + options = new DatastoreOptions.Builder() + .host("foo-datastore.googleapis.com") + .localHost("localhost:8080"); + } + @Test public void options_InvalidLocalHost() throws Exception { thrown.expect(IllegalArgumentException.class); @@ -126,12 +144,41 @@ public void options_SchemeInLocalHost() { .localHost("http://localhost:8080"); } + @Test + public void options_InvalidHost() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Illegal character"); + factory.create(new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .host("!not a valid url!") + .build()); + } + + @Test + public void options_SchemeInHost() { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage( + "Host \"http://foo-datastore.googleapis.com\" must not include scheme"); + new DatastoreOptions.Builder() + .host("http://foo-datastore.googleapis.com"); + } + @Test public void create_NullOptions() throws Exception { thrown.expect(NullPointerException.class); factory.create(null); } + @Test + public void create_Host() { + Datastore datastore = factory.create(new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .host("foo-datastore.googleapis.com") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("https://foo-datastore.googleapis.com/v1/projects/project-id"); + } + @Test public void create_LocalHost() { Datastore datastore = factory.create(new DatastoreOptions.Builder() From 5c97e9e1ebdc6795bc8ebcf39bf4df41b99d3d98 Mon Sep 17 00:00:00 2001 From: Jisha Abubaker Date: Wed, 15 Feb 2017 14:37:27 -0800 Subject: [PATCH 0053/1784] Adding retrieve entity to quickstart --- .../main/java/com/example/datastore/QuickstartSample.java | 6 ++++++ .../test/java/com/example/datastore/QuickstartSampleIT.java | 1 + 2 files changed, 7 insertions(+) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index a8e0614fe04f..03f207662346 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -44,6 +44,12 @@ public static void main(String... args) throws Exception { datastore.put(task); System.out.printf("Saved %s: %s%n", task.getKey().getName(), task.getString("description")); + + //Retrieve entity + Entity retrieved = datastore.get(taskKey); + + System.out.printf("Retrieved %s: %s%n", taskKey.getName(), retrieved.getString("description")); + } } // [END datastore_quickstart] diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java index 3bf69d77b739..fa0a2f0fa5ad 100644 --- a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java +++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java @@ -67,5 +67,6 @@ public void testQuickstart() throws Exception { QuickstartSample.main(); String got = bout.toString(); assertThat(got).contains("Saved sampletask1: Buy milk"); + assertThat(got).contains("Retrieved sampletask1: Buy milk"); } } From f0a51110417eb18d8f8ffb53a629e91a08b1f2f4 Mon Sep 17 00:00:00 2001 From: Bill Prin Date: Thu, 9 Mar 2017 15:49:30 -0800 Subject: [PATCH 0054/1784] Replace all auth commands with ADC (#555) --- .../src/main/java/com/google/datastore/snippets/TaskList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 495864f23642..1482e0784ba3 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -202,7 +202,7 @@ private void assertArgsLength(String[] args, int expectedLength) { * Exercises the methods defined in this class. * *

Assumes that you are authenticated using the Google Cloud SDK (using - * {@code gcloud auth login}). + * {@code gcloud auth application-default login}). */ public static void main(String[] args) throws Exception { TaskList taskList = new TaskList(); From 9d82cfcce96fe8f32975a03b0146004832a33c8b Mon Sep 17 00:00:00 2001 From: Jisha Abubaker Date: Wed, 19 Apr 2017 13:04:13 -0700 Subject: [PATCH 0055/1784] updating license header to remove ARR (#621) --- .../src/main/java/com/google/datastore/snippets/TaskList.java | 2 +- .../test/java/com/google/datastore/snippets/ConceptsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 1482e0784ba3..43af1c2e0d2d 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Google Inc. All Rights Reserved. + * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 8970e83e2bad..b388e657d263 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Google Inc. All Rights Reserved. + * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From e7fccd36eaa3d98427492c2b2cd0a23b34ac5f1e Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 1 May 2017 16:14:30 -0700 Subject: [PATCH 0056/1784] Auto-update dependencies. (#636) * Auto-update dependencies. * Roll back speech & Vision due to weird GAX issues. Fix for GA Datastore, Storage, and more. * Fix pom.xml Downgrade to prior version. --- .../google/datastore/snippets/TaskList.java | 6 ++--- .../datastore/snippets/ConceptsTest.java | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 43af1c2e0d2d..fed6fc3fa44b 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -16,9 +16,9 @@ package com.google.datastore.snippets; +import com.google.cloud.Timestamp; import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreOptions; -import com.google.cloud.datastore.DateTime; import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.Key; import com.google.cloud.datastore.KeyFactory; @@ -57,7 +57,7 @@ Key addTask(String description) { Key key = datastore.allocateId(keyFactory.newKey()); Entity task = Entity.newBuilder(key) .set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build()) - .set("created", DateTime.now()) + .set("created", Timestamp.now()) .set("done", false) .build(); datastore.put(task); @@ -131,7 +131,7 @@ static List formatTasks(Iterator tasks) { String.format("%d : %s (done)", task.getKey().getId(), task.getString("description"))); } else { strings.add(String.format("%d : %s (created %s)", task.getKey().getId(), - task.getString("description"), task.getDateTime("created"))); + task.getString("description"), task.getTimestamp("created"))); } } return strings; diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index b388e657d263..928718a8f488 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -23,10 +23,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import com.google.cloud.Timestamp; import com.google.cloud.datastore.Cursor; import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreException; -import com.google.cloud.datastore.DateTime; import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.EntityQuery; import com.google.cloud.datastore.FullEntity; @@ -51,7 +51,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; -import org.joda.time.Duration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -60,6 +59,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import org.threeten.bp.Duration; import java.io.IOException; import java.util.ArrayList; @@ -88,9 +88,9 @@ public class ConceptsTest { private KeyFactory keyFactory; private Key taskKey; private Entity testEntity; - private DateTime startDate; - private DateTime endDate; - private DateTime includedDate; + private Timestamp startDate; + private Timestamp endDate; + private Timestamp includedDate; @Rule public ExpectedException thrown = ExpectedException.none(); @@ -121,11 +121,11 @@ public void setUp() { testEntity = Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build(); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); calendar.set(1990, JANUARY, 1); - startDate = DateTime.copyFrom(calendar); + startDate = Timestamp.of(calendar.getTime()); calendar.set(2000, JANUARY, 1); - endDate = DateTime.copyFrom(calendar); + endDate = Timestamp.of(calendar.getTime()); calendar.set(1999, DECEMBER, 31); - includedDate = DateTime.copyFrom(calendar); + includedDate = Timestamp.of(calendar.getTime()); } /** @@ -136,7 +136,7 @@ public void setUp() { */ @AfterClass public static void afterClass() throws IOException, InterruptedException, TimeoutException { - HELPER.stop(Duration.standardMinutes(1)); + HELPER.stop(Duration.ofMinutes(1)); } private void assertValidKey(Key taskKey) { @@ -209,7 +209,7 @@ public void testProperties() { // [START properties] Entity task = Entity.newBuilder(taskKey) .set("category", "Personal") - .set("created", DateTime.now()) + .set("created", Timestamp.now()) .set("done", false) .set("priority", 4) .set("percent_complete", 10.0) @@ -752,7 +752,7 @@ public void testExplodingProperties() { Entity task = Entity.newBuilder(taskKey) .set("tags", "fun", "programming", "learn") .set("collaborators", "alice", "bob", "charlie") - .set("created", DateTime.now()) + .set("created", Timestamp.now()) .build(); // [END exploding_properties] assertValidEntity(task); From 6f1ffea6a36bb5b4699440f5182ca7fc333965b3 Mon Sep 17 00:00:00 2001 From: Will Hayworth Date: Mon, 9 Oct 2017 17:23:47 -0700 Subject: [PATCH 0057/1784] Sync from CL 170707635. --- .../google/datastore/v1/client/Datastore.java | 3 +- .../v1/client/DatastoreEmulator.java | 104 ++++---- .../v1/client/DatastoreEmulatorOptions.java | 53 +++- .../datastore/v1/client/DatastoreFactory.java | 1 + .../datastore/v1/client/DatastoreOptions.java | 2 - .../v1/client/QuerySplitterImpl.java | 6 +- .../google/datastore/v1/client/RemoteRpc.java | 110 +++++++- .../v1/client/DatastoreEmulatorTest.java | 7 +- .../datastore/v1/client/DatastoreTest.java | 30 ++- .../datastore/v1/client/RemoteRpcTest.java | 243 +++++++++++++++++- 10 files changed, 485 insertions(+), 74 deletions(-) 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 e753dc331dc6..e105987708d6 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 @@ -28,12 +28,13 @@ import com.google.datastore.v1.RunQueryRequest; import com.google.datastore.v1.RunQueryResponse; import com.google.rpc.Code; - import java.io.IOException; import java.io.InputStream; /** * Provides access to Cloud Datastore. + * + *

This class is thread-safe. */ public class Datastore { diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java index 2dc80fe06438..a6c656df5bef 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java @@ -18,18 +18,16 @@ import static com.google.api.client.util.Preconditions.checkNotNull; import static com.google.api.client.util.Preconditions.checkState; -import com.google.api.client.http.GenericUrl; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpResponse; import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -98,17 +96,7 @@ enum State {NEW, STARTED, STOPPED} * @throws DatastoreEmulatorException if the clear fails */ public void clear() throws DatastoreEmulatorException { - HttpRequestFactory client = remoteRpc.getHttpRequestFactory(); - try { - GenericUrl url = new GenericUrl(host + "/reset"); - HttpResponse httpResponse = client.buildPostRequest(url, null).execute(); - if (!httpResponse.isSuccessStatusCode()) { - throw new DatastoreEmulatorException( - "POST request to /reset returned HTTP status " + httpResponse.getStatusCode()); - } - } catch (IOException e) { - throw new DatastoreEmulatorException("Exception trying to clear the emulator", e); - } + sendEmptyRequest("/reset", "POST"); } /** @@ -121,14 +109,31 @@ public void clear() throws DatastoreEmulatorException { * @param commandLineOptions Command line options to pass to the emulator on startup * @throws DatastoreEmulatorException If {@link #start} has already been called or the server does * not start successfully. + * @deprecated prefer setting options in the emulator options and calling {#start()}. */ + @Deprecated public synchronized void start(String emulatorDir, String projectId, String... commandLineOptions) throws DatastoreEmulatorException { checkNotNull(emulatorDir, "emulatorDir cannot be null"); checkNotNull(projectId, "projectId cannot be null"); checkState(state == State.NEW, "Cannot call start() more than once."); try { - startEmulatorInternal(emulatorDir, projectId, commandLineOptions); + startEmulatorInternal( + emulatorDir + "/cloud_datastore_emulator", projectId, Arrays.asList(commandLineOptions)); + state = State.STARTED; + } finally { + if (state != State.STARTED) { + // If we're not able to start the server we don't want people trying again. Just move it + // straight to the STOPPED state. + state = State.STOPPED; + } + } + } + + public synchronized void start() throws DatastoreEmulatorException { + checkState(state == State.NEW, "Cannot call start() more than once."); + try { + startEmulatorInternal(options.getCmd(), options.getProjectId(), options.getCmdLineOptions()); state = State.STARTED; } finally { if (state != State.STARTED) { @@ -139,16 +144,15 @@ public synchronized void start(String emulatorDir, String projectId, String... c } } - void startEmulatorInternal(String emulatorDir, String projectId, String... commandLineOptions) + void startEmulatorInternal(String emulatorCmd, String projectId, List commandLineOptions) throws DatastoreEmulatorException { - projectDirectory = createProjectDirectory(emulatorDir, projectId); - List cmd = - new ArrayList<>(Arrays.asList("./cloud_datastore_emulator", "start", "--testing")); - Collections.addAll(cmd, commandLineOptions); + projectDirectory = createProjectDirectory(emulatorCmd, projectId); + List cmd = new ArrayList<>(Arrays.asList(emulatorCmd, "start", "--testing")); + cmd.addAll(commandLineOptions); cmd.add(projectDirectory.getPath()); final Process emulatorStartProcess; try { - emulatorStartProcess = newEmulatorProcess(emulatorDir, cmd).start(); + emulatorStartProcess = newEmulatorProcess(cmd).start(); } catch (IOException e) { throw new DatastoreEmulatorException("Could not start emulator", e); } @@ -176,7 +180,7 @@ public void run() { } } - private File createProjectDirectory(String emulatorDir, String projectId) + private File createProjectDirectory(String emulatorCmd, String projectId) throws DatastoreEmulatorException { File projectDirectory; try { @@ -186,12 +190,9 @@ private File createProjectDirectory(String emulatorDir, String projectId) } List cmd = Arrays.asList( - "./cloud_datastore_emulator", - "create", - "--project_id=" + projectId, - projectDirectory.getPath()); + emulatorCmd, "create", "--project_id=" + projectId, projectDirectory.getPath()); try { - int retCode = newEmulatorProcess(emulatorDir, cmd).start().waitFor(); + int retCode = newEmulatorProcess(cmd).start().waitFor(); if (retCode != 0) { throw new DatastoreEmulatorException( String.format("Could not create project (retcode=%d)", retCode)); @@ -205,9 +206,8 @@ private File createProjectDirectory(String emulatorDir, String projectId) return projectDirectory; } - private ProcessBuilder newEmulatorProcess(String emulatorDir, List cmd) { + private ProcessBuilder newEmulatorProcess(List cmd) { ProcessBuilder builder = new ProcessBuilder(cmd); - builder.directory(new File(emulatorDir)); builder.redirectErrorStream(true); builder.environment().putAll(options.getEnvVars()); return builder; @@ -242,26 +242,15 @@ public synchronized void stop() throws DatastoreEmulatorException { } } + protected void stopEmulatorInternal() throws DatastoreEmulatorException { + sendEmptyRequest("/shutdown", "POST"); + } + public synchronized File getProjectDirectory() { checkState(state == State.STARTED); return projectDirectory; } - void stopEmulatorInternal() throws DatastoreEmulatorException { - // No need to kill the process we started, this function will take care of it. - HttpRequestFactory client = remoteRpc.getHttpRequestFactory(); - GenericUrl url = new GenericUrl(host + "/shutdown"); - try { - HttpResponse httpResponse = client.buildPostRequest(url, null).execute(); - if (!httpResponse.isSuccessStatusCode()) { - throw new DatastoreEmulatorException( - "POST request to /shutdown returned HTTP status " + httpResponse.getStatusCode()); - } - } catch (IOException e) { - throw new DatastoreEmulatorException("Exception trying to stop the emulator", e); - } - } - /** * Monitors the provided input stream for evidence that the emulator has started successfully and * redirects the output of the emulator process to sysout for this process. @@ -314,4 +303,29 @@ public void run() { } } } + + /** Send an empty request using a standard HTTP connection. */ + private void sendEmptyRequest(String path, String method) throws DatastoreEmulatorException { + HttpURLConnection connection = null; + try { + URL url = new URL(this.host + path); + connection = (HttpURLConnection) url.openConnection(); + connection.setDoOutput(true); + connection.setRequestMethod(method); + connection.getOutputStream().close(); + if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) { + throw new DatastoreEmulatorException( + String.format( + "%s request to %s returned HTTP status %s", + method, path, connection.getResponseCode())); + } + } catch (IOException e) { + throw new DatastoreEmulatorException( + String.format("Exception connecting to emulator on %s request to %s", method, path), e); + } finally { + if (connection != null) { + connection.disconnect(); + } + } + } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java index 446b60cec005..83348319bf0c 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java @@ -15,23 +15,37 @@ */ package com.google.datastore.v1.client; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; +import javax.annotation.Nullable; /** An immutable object containing settings for a {@link DatastoreEmulator}. */ public class DatastoreEmulatorOptions { private final Map envVars; + private final String cmd; + private final List cmdLineOptions; + private final String projectId; - DatastoreEmulatorOptions(Map envVars) { + DatastoreEmulatorOptions( + Map envVars, String cmd, List cmdLineOptions, String projectId) { this.envVars = envVars; + this.cmd = cmd; + this.cmdLineOptions = cmdLineOptions; + this.projectId = projectId; } /** Builder for {@link DatastoreEmulatorOptions}. */ public static class Builder { - private final Map envVars = new HashMap(); + private final Map envVars = new HashMap<>(); + private final List cmdLineOptions = new ArrayList<>(); + private String cmd = "./cloud_datastore_emulator"; + private String projectId; public DatastoreEmulatorOptions build() { - return new DatastoreEmulatorOptions(envVars); + return new DatastoreEmulatorOptions(envVars, cmd, cmdLineOptions, projectId); } /** Adds an environment variable to pass to the emulator. */ @@ -39,9 +53,42 @@ public Builder addEnvVar(String var, String value) { envVars.put(var, value); return this; } + + public Builder addCmdLineOption(String option) { + cmdLineOptions.add(option); + return this; + } + + public Builder addCmdLineOptions(Collection options) { + cmdLineOptions.addAll(options); + return this; + } + + public Builder setCommand(String cmd) { + this.cmd = cmd; + return this; + } + + public Builder setProjectId(String projectId) { + this.projectId = projectId; + return this; + } } public Map getEnvVars() { return envVars; } + + public List getCmdLineOptions() { + return cmdLineOptions; + } + + public String getCmd() { + return cmd; + } + + @Nullable + public String getProjectId() { + return projectId; + } } diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java index 8fe5ad7f2bd3..acbea4f16c80 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java @@ -73,6 +73,7 @@ public HttpRequestFactory makeClient(DatastoreOptions options) { HttpTransport transport = options.getTransport(); if (transport == null) { transport = credential == null ? new NetHttpTransport() : credential.getTransport(); + transport = transport == null ? new NetHttpTransport() : transport; } return transport.createRequestFactory(credential); } 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 8f3523a951c1..4ccde164ffc9 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 @@ -16,12 +16,10 @@ package com.google.datastore.v1.client; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkState; import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; - import java.util.Arrays; import java.util.List; 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 c10ef0563a51..91c7fb4b260c 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 @@ -61,10 +61,14 @@ public List getSplits( Query query, PartitionId partition, int numSplits, Datastore datastore) throws DatastoreException, IllegalArgumentException { + List splits = new ArrayList(numSplits); + if (numSplits == 1) { + splits.add(query); + return splits; + } validateQuery(query); validateSplitSize(numSplits); - List splits = new ArrayList(numSplits); List scatterKeys = getScatterKeys(numSplits, query, partition, datastore); Key lastKey = null; for (Key nextKey : getSplitKey(scatterKeys, numSplits)) { 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 386775c545b9..e01383b664dd 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 @@ -20,25 +20,118 @@ import com.google.api.client.http.HttpRequestFactory; import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpResponse; +import com.google.api.client.http.HttpStatusCodes; import com.google.api.client.http.protobuf.ProtoHttpContent; import com.google.api.client.util.IOUtils; +import com.google.common.base.Preconditions; import com.google.protobuf.MessageLite; import com.google.rpc.Code; import com.google.rpc.Status; - import java.io.ByteArrayOutputStream; +import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Field; +import java.net.SocketTimeoutException; import java.nio.charset.Charset; import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Level; import java.util.logging.Logger; +import java.util.zip.GZIPInputStream; /** * An RPC transport that sends protocol buffers over HTTP. + * + *

This class is thread-safe. */ class RemoteRpc { private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName()); + /** + * An input stream that wraps a {@link GZIPInputStream} and forces it to fully consume its + * underlying {@link InputStream} before calling close() on it. + * + * @see href="https://github.com/google/google-http-java-client/issues/367" + */ + static class GzipFixingInputStream extends InputStream { + + // How many extra read() calls we have made on the underlying stream. + int callsToRead = 0; + + // Experimentally, it is only necessary to consume 1 extra byte. Consuming a bit more than that + // should not affect performance, but we set an upper bound for safety. + private static final int MAX_BYTES_TO_CONSUME = 100; + + private static final Field gzipUnderlyingInputStreamField = getGzipUnderlyingInputStreamField(); + + private static Field getGzipUnderlyingInputStreamField() { + try { + // FilterInputStream is a superclass of GZIPInputStream and stores the underlying + // InputStream. + Field gzipInputStreamIsField = FilterInputStream.class.getDeclaredField("in"); + gzipInputStreamIsField.setAccessible(true); + return gzipInputStreamIsField; + } catch (Exception e) { + logger.log( + Level.INFO, + "Failed to find field \"in\" in FilterInputStream. This" + + " may prevent keep-alive from working correctly.", + e); + return null; + } + } + + public static InputStream maybeWrap(InputStream inputStream) { + if (gzipUnderlyingInputStreamField != null && inputStream instanceof GZIPInputStream) { + return new GzipFixingInputStream((GZIPInputStream) inputStream); + } + return inputStream; + } + + private final GZIPInputStream gzipInputStream; + + private GzipFixingInputStream(GZIPInputStream gzipInputStream) { + Preconditions.checkNotNull(gzipUnderlyingInputStreamField); + this.gzipInputStream = gzipInputStream; + } + + @Override + public int read() throws IOException { + return gzipInputStream.read(); + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + return gzipInputStream.read(b, off, len); + } + + @Override + public void close() throws IOException { + // If possible, finish consuming the underlying InputStream before closing it. + if (gzipUnderlyingInputStreamField != null) { + try { + InputStream underlyingInputStream = + (InputStream) gzipUnderlyingInputStreamField.get(gzipInputStream); + boolean reachedEndOfStream = false; + while (!reachedEndOfStream && callsToRead < MAX_BYTES_TO_CONSUME) { + callsToRead++; + if (underlyingInputStream.read() == -1) { + reachedEndOfStream = true; + } + } + if (!reachedEndOfStream) { + logger.log(Level.FINER, "Gave up consuming underlying InputStream"); + } + } catch (Exception e) { + // If this fails for any reason, log and move on. + logger.log( + Level.FINER, "Failed to consume underlying InputStream from GZIPInputStream", e); + } + } + gzipInputStream.close(); + } + } + private static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version"; private static final String API_FORMAT_VERSION = "2"; @@ -81,6 +174,9 @@ public InputStream call(String methodName, MessageLite request) throws Datastore // 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); + // Datastore requests typically time out after 60s; set the read timeout to slightly longer + // than that by default (can be overridden via the HttpRequestInitializer). + httpRequest.setReadTimeout(65 * 1000); if (initializer != null) { initializer.initialize(httpRequest); } @@ -90,7 +186,9 @@ public InputStream call(String methodName, MessageLite request) throws Datastore httpResponse.getContentType(), httpResponse.getContentCharset(), null, httpResponse.getStatusCode()); } - return httpResponse.getContent(); + return GzipFixingInputStream.maybeWrap(httpResponse.getContent()); + } catch (SocketTimeoutException e) { + throw makeException(url, methodName, Code.DEADLINE_EXCEEDED, "Deadline exceeded", e); } catch (IOException e) { throw makeException(url, methodName, Code.UNAVAILABLE, "I/O error", e); } @@ -119,7 +217,7 @@ GenericUrl resolveURL(String path) { HttpRequestFactory getHttpRequestFactory() { return client; } - + public static DatastoreException makeException(String url, String methodName, Code code, String message, Throwable cause) { logger.fine("remote datastore call " + methodName + " against " + url + " failed: " + message); @@ -160,6 +258,12 @@ static DatastoreException makeException(String url, String methodName, InputStre "Invalid error code: %d. Message: %s.", rpcStatus.getCode(), rpcStatus.getMessage()), cause); } else if (code == Code.OK) { + // We can end up here because there was no response body (and we successfully parsed an + // empty Status message). This may happen for 401s in particular due to special handling + // in low-level HTTP libraries. + if (httpStatusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) { + return makeException(url, methodName, Code.UNAUTHENTICATED, "Unauthenticated.", cause); + } return makeException(url, methodName, Code.INTERNAL, String.format("Unexpected OK error code with HTTP status code of %d. Message: %s.", httpStatusCode, rpcStatus.getMessage()), diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java index fbe573b761ae..477bd6a5012d 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java @@ -17,6 +17,7 @@ import static org.junit.Assert.fail; +import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -33,7 +34,8 @@ public void testArgs() throws DatastoreEmulatorException { DatastoreEmulator datastore = new DatastoreEmulator(null, "blar", options) { @Override - void startEmulatorInternal(String emulatorDir, String projectId, String... cmdLineOpts) { + void startEmulatorInternal( + String emulatorDir, String projectId, List cmdLineOpts) { // no-op for testing } }; @@ -60,7 +62,8 @@ public void testLifecycle() throws DatastoreEmulatorException { DatastoreEmulator datastore = new DatastoreEmulator(null, "blar", options) { @Override - void startEmulatorInternal(String emulatorDir, String projectId, String... cmdLineOpts) { + void startEmulatorInternal( + String emulatorDir, String projectId, List cmdLineOpts) { // no-op for testing } diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java index 4454be66c30a..6a48d258013f 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java @@ -54,18 +54,17 @@ import com.google.protobuf.Message; import com.google.rpc.Code; import com.google.rpc.Status; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.net.SocketTimeoutException; import java.util.List; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link DatastoreFactory} and {@link Datastore}. @@ -325,7 +324,20 @@ private void expectRpc(String methodName, Message request, Message response) thr assertEquals("oops", exception.getMessage()); } - IOException ioException = new IOException("non"); + SocketTimeoutException socketTimeoutException = new SocketTimeoutException("ste"); + mockClient.setNextException(socketTimeoutException); + try { + call.invoke(datastore, callArgs); + fail(); + } catch (InvocationTargetException targetException) { + DatastoreException exception = (DatastoreException) targetException.getCause(); + assertEquals(Code.DEADLINE_EXCEEDED, exception.getCode()); + assertEquals(methodName, exception.getMethodName()); + assertEquals("Deadline exceeded", exception.getMessage()); + assertSame(socketTimeoutException, exception.getCause()); + } + + IOException ioException = new IOException("ioe"); mockClient.setNextException(ioException); try { call.invoke(datastore, callArgs); @@ -338,7 +350,7 @@ private void expectRpc(String methodName, Message request, Message response) thr assertSame(ioException, exception.getCause()); } - assertEquals(2, datastore.getRpcCount()); + assertEquals(3, datastore.getRpcCount()); } private static class MockCredential extends Credential { 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 bceee04b368d..66b26c6e5a69 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 @@ -16,17 +16,28 @@ package com.google.datastore.v1.client; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.LowLevelHttpRequest; +import com.google.api.client.http.LowLevelHttpResponse; import com.google.api.client.util.Charsets; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.client.RemoteRpc.GzipFixingInputStream; +import com.google.protobuf.ByteString; import com.google.rpc.Code; import com.google.rpc.Status; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.zip.GZIPOutputStream; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayInputStream; - /** * Test for {@link RemoteRpc}. */ @@ -61,19 +72,43 @@ public void testInvalidProtoException() { exception.getMessage()); assertEquals(METHOD_NAME, exception.getMethodName()); } - + @Test public void testEmptyProtoException() { Status statusProto = Status.newBuilder().build(); - DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME, - new ByteArrayInputStream(statusProto.toByteArray()), "application/x-protobuf", - Charsets.UTF_8, new RuntimeException(), 401); + DatastoreException exception = + RemoteRpc.makeException( + "url", + METHOD_NAME, + new ByteArrayInputStream(statusProto.toByteArray()), + "application/x-protobuf", + Charsets.UTF_8, + new RuntimeException(), + 404); assertEquals(Code.INTERNAL, exception.getCode()); - assertEquals("Unexpected OK error code with HTTP status code of 401. Message: .", + assertEquals( + "Unexpected OK error code with HTTP status code of 404. Message: .", exception.getMessage()); assertEquals(METHOD_NAME, exception.getMethodName()); } + @Test + public void testEmptyProtoExceptionUnauthenticated() { + Status statusProto = Status.newBuilder().build(); + DatastoreException exception = + RemoteRpc.makeException( + "url", + METHOD_NAME, + new ByteArrayInputStream(statusProto.toByteArray()), + "application/x-protobuf", + Charsets.UTF_8, + new RuntimeException(), + 401); + assertEquals(Code.UNAUTHENTICATED, exception.getCode()); + assertEquals("Unauthenticated.", exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + @Test public void testPlainTextException() { DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME, @@ -84,4 +119,196 @@ public void testPlainTextException() { "Non-protobuf error: Text Error. HTTP status code was 401.", exception.getMessage()); assertEquals(METHOD_NAME, exception.getMethodName()); } + + @Test + public void testGzipHack_NonGzip() throws Exception { + BeginTransactionResponse resp = newBeginTransactionResp(); + InjectedTestValues injectedTestValues = + new InjectedTestValues(resp.toByteArray(), new byte[0], false); + RemoteRpc rpc = newRemoteRpc(injectedTestValues); + + InputStream is = rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance()); + BeginTransactionResponse parsedResp = BeginTransactionResponse.parseFrom(is); + is.close(); + + assertEquals(resp, parsedResp); + assertFalse(is instanceof GzipFixingInputStream); + } + + @Test + public void testGzipHack_Gzip() throws Exception { + BeginTransactionResponse resp = newBeginTransactionResp(); + InjectedTestValues injectedTestValues = new InjectedTestValues(gzip(resp), new byte[1], true); + RemoteRpc rpc = newRemoteRpc(injectedTestValues); + + InputStream is = rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance()); + BeginTransactionResponse parsedResp = BeginTransactionResponse.parseFrom(is); + is.close(); + + assertEquals(resp, parsedResp); + assertTrue(is instanceof GzipFixingInputStream); + assertEquals(1, ((GzipFixingInputStream) is).callsToRead); + // Check that the underlying stream is exhausted. + assertEquals(-1, injectedTestValues.inputStream.read()); + } + + @Test + public void testGzipHack_GzipTooManyExtraBytes() throws Exception { + BeginTransactionResponse resp = newBeginTransactionResp(); + // NOTE(eddavisson): We might expect 101 extra bytes to be enough that the underlying input + // stream is not exhausted, but this is not the case (likely due to a buffer somewhere). 1000 + // extra bytes seems to be enough. We check the value of callsToRead directly to make sure + // we eventually stopped trying to consume the underlying stream. + InjectedTestValues injectedTestValues = + new InjectedTestValues(gzip(resp), new byte[1000], true); + RemoteRpc rpc = newRemoteRpc(injectedTestValues); + + InputStream is = rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance()); + BeginTransactionResponse parsedResp = BeginTransactionResponse.parseFrom(is); + is.close(); + + assertEquals(resp, parsedResp); + assertTrue(is instanceof GzipFixingInputStream); + assertEquals(100, ((GzipFixingInputStream) is).callsToRead); + // Check that the underlying stream is _not_ exhausted. + assertNotEquals(-1, injectedTestValues.inputStream.read()); + } + + private static BeginTransactionResponse newBeginTransactionResp() { + return BeginTransactionResponse.newBuilder() + .setTransaction(ByteString.copyFromUtf8("blah-blah-blah")) + .build(); + } + + private static RemoteRpc newRemoteRpc(InjectedTestValues injectedTestValues) { + return new RemoteRpc( + new MyHttpTransport(injectedTestValues).createRequestFactory(), + null, + "https://www.example.com/v1/projects/p"); + } + + private byte[] gzip(BeginTransactionResponse resp) throws IOException { + ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(); + try (GZIPOutputStream gzipOut = new GZIPOutputStream(bytesOut)) { + resp.writeTo(gzipOut); + } + return bytesOut.toByteArray(); + } + + private static class InjectedTestValues { + private final InputStream inputStream; + private final int contentLength; + private final boolean isGzip; + + public InjectedTestValues(byte[] messageBytes, byte[] additionalBytes, boolean isGzip) { + byte[] allBytes = concat(messageBytes, additionalBytes); + this.inputStream = new ByteArrayInputStream(allBytes); + this.contentLength = allBytes.length; + this.isGzip = isGzip; + } + + private static byte[] concat(byte[] a, byte[] b) { + byte[] c = new byte[a.length + b.length]; + System.arraycopy(a, 0, c, 0, a.length); + System.arraycopy(b, 0, c, a.length, b.length); + return c; + } + } + + /** {@link HttpTransport} that allows injection of the returned {@link LowLevelHttpRequest}. */ + private static class MyHttpTransport extends HttpTransport { + + private final InjectedTestValues injectedTestValues; + + public MyHttpTransport(InjectedTestValues injectedTestValues) { + this.injectedTestValues = injectedTestValues; + } + + @Override + protected LowLevelHttpRequest buildRequest(String method, String url) throws IOException { + return new MyLowLevelHttpRequest(injectedTestValues); + } + } + + /** + * {@link LowLevelHttpRequest} that allows injection of the returned {@link LowLevelHttpResponse}. + */ + private static class MyLowLevelHttpRequest extends LowLevelHttpRequest { + + private final InjectedTestValues injectedTestValues; + + public MyLowLevelHttpRequest(InjectedTestValues injectedTestValues) { + this.injectedTestValues = injectedTestValues; + } + + @Override + public void addHeader(String name, String value) throws IOException { + // Do nothing. + } + + @Override + public LowLevelHttpResponse execute() throws IOException { + return new MyLowLevelHttpResponse(injectedTestValues); + } + } + + /** {@link LowLevelHttpResponse} that allows injected properties. */ + private static class MyLowLevelHttpResponse extends LowLevelHttpResponse { + + private final InjectedTestValues injectedTestValues; + + public MyLowLevelHttpResponse(InjectedTestValues injectedTestValues) { + this.injectedTestValues = injectedTestValues; + } + + @Override + public InputStream getContent() throws IOException { + return injectedTestValues.inputStream; + } + + @Override + public String getContentEncoding() throws IOException { + return injectedTestValues.isGzip ? "gzip" : ""; + } + + @Override + public long getContentLength() throws IOException { + return injectedTestValues.contentLength; + } + + @Override + public String getContentType() throws IOException { + return "application/x-protobuf"; + } + + @Override + public String getStatusLine() throws IOException { + return null; + } + + @Override + public int getStatusCode() throws IOException { + return 200; + } + + @Override + public String getReasonPhrase() throws IOException { + return null; + } + + @Override + public int getHeaderCount() throws IOException { + return 0; + } + + @Override + public String getHeaderName(int index) throws IOException { + return null; + } + + @Override + public String getHeaderValue(int index) throws IOException { + return null; + } + } } From 3caba37fc546f293f1b63c6a5bf3ccbd894a30df Mon Sep 17 00:00:00 2001 From: wsh Date: Wed, 11 Oct 2017 18:53:08 -0700 Subject: [PATCH 0058/1784] Remove V1 ID reservation flag guarding in low-level Java proto client now that the feature has been released. Bump proto library version to 1.5. Bump proto client version to 1.5. Bump google-http-client version to 1.23. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=171906809 --- .../java/com/google/datastore/v1/client/Datastore.java | 10 ++++++++++ .../com/google/datastore/v1/client/DatastoreTest.java | 9 +++++++++ 2 files changed, 19 insertions(+) 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 e105987708d6..eb33dc6276ba 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 @@ -23,6 +23,8 @@ import com.google.datastore.v1.CommitResponse; import com.google.datastore.v1.LookupRequest; import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; import com.google.datastore.v1.RollbackRequest; import com.google.datastore.v1.RollbackResponse; import com.google.datastore.v1.RunQueryRequest; @@ -97,6 +99,14 @@ public LookupResponse lookup(LookupRequest request) throws DatastoreException { } } + public ReserveIdsResponse reserveIds(ReserveIdsRequest request) throws DatastoreException { + try (InputStream is = remoteRpc.call("reserveIds", request)) { + return ReserveIdsResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("reserveIds", exception); + } + } + public RollbackResponse rollback(RollbackRequest request) throws DatastoreException { try (InputStream is = remoteRpc.call("rollback", request)) { return RollbackResponse.parseFrom(is); diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java index 6a48d258013f..617960bd3fa9 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java @@ -46,6 +46,8 @@ import com.google.datastore.v1.LookupRequest; import com.google.datastore.v1.LookupResponse; import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; import com.google.datastore.v1.RollbackRequest; import com.google.datastore.v1.RollbackResponse; import com.google.datastore.v1.RunQueryRequest; @@ -274,6 +276,13 @@ public void commit() throws Exception { expectRpc("commit", request.build(), response.build()); } + @Test + public void reserveIds() throws Exception { + ReserveIdsRequest.Builder request = ReserveIdsRequest.newBuilder(); + ReserveIdsResponse.Builder response = ReserveIdsResponse.newBuilder(); + expectRpc("reserveIds", request.build(), response.build()); + } + @Test public void rollback() throws Exception { RollbackRequest.Builder request = RollbackRequest.newBuilder(); From b48b0915bb75cc8cc497f763686e368782ed87f2 Mon Sep 17 00:00:00 2001 From: Christian Maan Date: Wed, 25 Oct 2017 10:37:37 +0200 Subject: [PATCH 0059/1784] =?UTF-8?q?=F0=9F=9A=91=20fix=20http=20connectio?= =?UTF-8?q?n=20leak=20on=20Datastore=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/google/datastore/v1/client/RemoteRpc.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 e01383b664dd..f63440d31c07 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 @@ -182,9 +182,11 @@ public InputStream call(String methodName, MessageLite request) throws Datastore } httpResponse = httpRequest.execute(); if (!httpResponse.isSuccessStatusCode()) { - throw makeException(url, methodName, httpResponse.getContent(), - httpResponse.getContentType(), httpResponse.getContentCharset(), null, - httpResponse.getStatusCode()); + try (InputStream content = httpResponse.getContent()) { + throw makeException(url, methodName, content, + httpResponse.getContentType(), httpResponse.getContentCharset(), null, + httpResponse.getStatusCode()); + } } return GzipFixingInputStream.maybeWrap(httpResponse.getContent()); } catch (SocketTimeoutException e) { @@ -230,7 +232,7 @@ static DatastoreException makeException(String url, String methodName, InputStre String responseContent; try { ByteArrayOutputStream out = new ByteArrayOutputStream(); - IOUtils.copy(content, out); + IOUtils.copy(content, out, false); responseContent = out.toString(contentCharset.name()); } catch (IOException e) { responseContent = ""; From 3eef7f73c1daaf543bcd6738799a3864d64fc851 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Thu, 11 Jan 2018 09:17:23 -0800 Subject: [PATCH 0060/1784] Updated dataflow, datastore, dlp, errorreporting, firestore, iap, and iot folders. (#986) * Updated dataflow/spanner-io * Updated datastore. * Updated dlp * Updated errorreporting. * Updated firestore/ * Updated iap/ * Updated iot. * Updated datastore/cloud-client. * Re-updated dlp samples. --- .../google/datastore/snippets/TaskList.java | 1 - .../datastore/snippets/ConceptsTest.java | 20 +++++++++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index fed6fc3fa44b..4c4910d55e19 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -26,7 +26,6 @@ import com.google.cloud.datastore.StringValue; import com.google.cloud.datastore.StructuredQuery.OrderBy; import com.google.cloud.datastore.Transaction; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 928718a8f488..a9308d97f15e 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -50,17 +50,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; - -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.threeten.bp.Duration; - import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; @@ -74,6 +63,15 @@ import java.util.Map; import java.util.TimeZone; import java.util.concurrent.TimeoutException; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.threeten.bp.Duration; /** * Contains Cloud Datastore snippets demonstrating concepts for documentation. From 9cf79b089698309c73d918811eff6905f324dfa1 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Thu, 11 Jan 2018 09:17:23 -0800 Subject: [PATCH 0061/1784] Updated dataflow, datastore, dlp, errorreporting, firestore, iap, and iot folders. (#986) * Updated dataflow/spanner-io * Updated datastore. * Updated dlp * Updated errorreporting. * Updated firestore/ * Updated iap/ * Updated iot. * Updated datastore/cloud-client. * Re-updated dlp samples. --- .../example/datastore/QuickstartSample.java | 28 ++++++++-------- .../example/datastore/QuickstartSampleIT.java | 33 +++++++++---------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index 03f207662346..ba1a677062eb 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -1,18 +1,18 @@ /* - Copyright 2016, Google, Inc. - - 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. -*/ + * Copyright 2016 Google Inc. + * + * 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.example.datastore; diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java index fa0a2f0fa5ad..6bb2dfe30e4a 100644 --- a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java +++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java @@ -1,18 +1,18 @@ /* - Copyright 2016, Google, Inc. - - 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. -*/ + * Copyright 2016 Google Inc. + * + * 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.example.datastore; @@ -21,15 +21,14 @@ import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreOptions; import com.google.cloud.datastore.Key; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - /** * Tests for quickstart sample. */ From cff0e2e311e2217c86e1daab5f5921c69fe0da4a Mon Sep 17 00:00:00 2001 From: eddavisson Date: Thu, 14 Dec 2017 14:14:15 -0800 Subject: [PATCH 0062/1784] Also use GzipFixingInputStream for error response content. This will allow connection reuse on errors where there was an actual response but the HTTP response code was not 200. This applies to cases where ESF returned an error or forwarded one from the backend (e.g. validation errors, contention, etc.). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=179095258 --- .../src/main/java/com/google/datastore/v1/client/RemoteRpc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f63440d31c07..3576c02e0b53 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 @@ -182,7 +182,7 @@ public InputStream call(String methodName, MessageLite request) throws Datastore } httpResponse = httpRequest.execute(); if (!httpResponse.isSuccessStatusCode()) { - try (InputStream content = httpResponse.getContent()) { + try (InputStream content = GzipFixingInputStream.maybeWrap(httpResponse.getContent())) { throw makeException(url, methodName, content, httpResponse.getContentType(), httpResponse.getContentCharset(), null, httpResponse.getStatusCode()); From 09ce8dfce2da4417c807d1667201309565f9b67c Mon Sep 17 00:00:00 2001 From: wsh Date: Tue, 2 Jan 2018 13:20:39 -0800 Subject: [PATCH 0063/1784] Cache project ID information retrieved from Compute Engine. Note: this uses an AtomicReference to avoid synchronized static methods (and the class-level lock they entail). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=180584318 --- .../datastore/v1/client/DatastoreHelper.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 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 6b2c042be40d..79132cce767b 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 @@ -41,7 +41,6 @@ import com.google.protobuf.Timestamp; import com.google.protobuf.TimestampOrBuilder; import com.google.type.LatLng; - import java.io.File; import java.io.IOException; import java.security.GeneralSecurityException; @@ -52,8 +51,10 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; +import javax.annotation.Nullable; /** * Helper methods for {@link Datastore}. @@ -93,6 +94,8 @@ public final class DatastoreHelper { private static final String URL_OVERRIDE_ENV_VAR = "__DATASTORE_URL_OVERRIDE"; + private static final AtomicReference projectIdFromComputeEngine = new AtomicReference<>(); + /** * Comparator for Keys */ @@ -281,20 +284,31 @@ private static String getProjectIdFromEnv() { * project ID cannot be determined (because, for instance, the code is not running on Compute * Engine). */ + @Nullable public static String getProjectIdFromComputeEngine() { + String cachedProjectId = projectIdFromComputeEngine.get(); + return cachedProjectId != null ? cachedProjectId : queryProjectIdFromComputeEngine(); + } + + @Nullable + private static String queryProjectIdFromComputeEngine() { HttpTransport transport; + try { transport = newTransport(); } catch (GeneralSecurityException | IOException e) { logger.log(Level.WARNING, "Failed to create HttpTransport.", e); return null; } + try { GenericUrl projectIdUrl = new GenericUrl("http://metadata/computeMetadata/v1/project/project-id"); HttpRequest request = transport.createRequestFactory().buildGetRequest(projectIdUrl); request.getHeaders().set("Metadata-Flavor", "Google"); - return request.execute().parseAsString(); + String result = request.execute().parseAsString(); + projectIdFromComputeEngine.set(result); + return result; } catch (IOException e) { logger.log(Level.INFO, "Could not determine project ID from Compute Engine.", e); return null; From 7cc854fbafb32cc8c1037fa3240ca965881e7ce5 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Mon, 30 Apr 2018 20:53:04 -0700 Subject: [PATCH 0064/1784] Move grpc/proto pacckages to google-cloud-java from api-client-staging. (#3212) --- proto-google-cloud-datastore-v1/pom.xml | 31 + .../datastore/v1/AllocateIdsRequest.java | 1015 ++++++ .../v1/AllocateIdsRequestOrBuilder.java | 76 + .../datastore/v1/AllocateIdsResponse.java | 857 +++++ .../v1/AllocateIdsResponseOrBuilder.java | 58 + .../com/google/datastore/v1/ArrayValue.java | 880 +++++ .../datastore/v1/ArrayValueOrBuilder.java | 63 + .../datastore/v1/BeginTransactionRequest.java | 781 +++++ .../v1/BeginTransactionRequestOrBuilder.java | 52 + .../v1/BeginTransactionResponse.java | 474 +++ .../v1/BeginTransactionResponseOrBuilder.java | 18 + .../google/datastore/v1/CommitRequest.java | 1614 +++++++++ .../datastore/v1/CommitRequestOrBuilder.java | 146 + .../google/datastore/v1/CommitResponse.java | 938 ++++++ .../datastore/v1/CommitResponseOrBuilder.java | 68 + .../google/datastore/v1/CompositeFilter.java | 1089 ++++++ .../v1/CompositeFilterOrBuilder.java | 75 + .../google/datastore/v1/DatastoreProto.java | 366 ++ .../java/com/google/datastore/v1/Entity.java | 1056 ++++++ .../google/datastore/v1/EntityOrBuilder.java | 125 + .../com/google/datastore/v1/EntityProto.java | 161 + .../com/google/datastore/v1/EntityResult.java | 962 ++++++ .../datastore/v1/EntityResultOrBuilder.java | 59 + .../java/com/google/datastore/v1/Filter.java | 969 ++++++ .../google/datastore/v1/FilterOrBuilder.java | 61 + .../com/google/datastore/v1/GqlQuery.java | 1504 +++++++++ .../datastore/v1/GqlQueryOrBuilder.java | 169 + .../datastore/v1/GqlQueryParameter.java | 812 +++++ .../v1/GqlQueryParameterOrBuilder.java | 46 + .../java/com/google/datastore/v1/Key.java | 2400 ++++++++++++++ .../com/google/datastore/v1/KeyOrBuilder.java | 149 + .../google/datastore/v1/KindExpression.java | 552 +++ .../datastore/v1/KindExpressionOrBuilder.java | 27 + .../google/datastore/v1/LookupRequest.java | 1221 +++++++ .../datastore/v1/LookupRequestOrBuilder.java | 96 + .../google/datastore/v1/LookupResponse.java | 1842 ++++++++++ .../datastore/v1/LookupResponseOrBuilder.java | 171 + .../com/google/datastore/v1/Mutation.java | 1682 ++++++++++ .../datastore/v1/MutationOrBuilder.java | 135 + .../google/datastore/v1/MutationResult.java | 808 +++++ .../datastore/v1/MutationResultOrBuilder.java | 60 + .../com/google/datastore/v1/PartitionId.java | 735 ++++ .../datastore/v1/PartitionIdOrBuilder.java | 45 + .../com/google/datastore/v1/Projection.java | 626 ++++ .../datastore/v1/ProjectionOrBuilder.java | 34 + .../google/datastore/v1/PropertyFilter.java | 1169 +++++++ .../datastore/v1/PropertyFilterOrBuilder.java | 76 + .../google/datastore/v1/PropertyOrder.java | 872 +++++ .../datastore/v1/PropertyOrderOrBuilder.java | 51 + .../datastore/v1/PropertyReference.java | 559 ++++ .../v1/PropertyReferenceOrBuilder.java | 29 + .../java/com/google/datastore/v1/Query.java | 2953 +++++++++++++++++ .../google/datastore/v1/QueryOrBuilder.java | 291 ++ .../com/google/datastore/v1/QueryProto.java | 263 ++ .../google/datastore/v1/QueryResultBatch.java | 1565 +++++++++ .../v1/QueryResultBatchOrBuilder.java | 131 + .../com/google/datastore/v1/ReadOptions.java | 839 +++++ .../datastore/v1/ReadOptionsOrBuilder.java | 41 + .../datastore/v1/ReserveIdsRequest.java | 1170 +++++++ .../v1/ReserveIdsRequestOrBuilder.java | 94 + .../datastore/v1/ReserveIdsResponse.java | 396 +++ .../v1/ReserveIdsResponseOrBuilder.java | 9 + .../google/datastore/v1/RollbackRequest.java | 633 ++++ .../v1/RollbackRequestOrBuilder.java | 37 + .../google/datastore/v1/RollbackResponse.java | 398 +++ .../v1/RollbackResponseOrBuilder.java | 9 + .../google/datastore/v1/RunQueryRequest.java | 1618 +++++++++ .../v1/RunQueryRequestOrBuilder.java | 138 + .../google/datastore/v1/RunQueryResponse.java | 855 +++++ .../v1/RunQueryResponseOrBuilder.java | 59 + .../datastore/v1/TransactionOptions.java | 1852 +++++++++++ .../v1/TransactionOptionsOrBuilder.java | 61 + .../java/com/google/datastore/v1/Value.java | 2677 +++++++++++++++ .../google/datastore/v1/ValueOrBuilder.java | 257 ++ .../proto/google/datastore/v1/datastore.proto | 395 +++ .../proto/google/datastore/v1/entity.proto | 204 ++ .../proto/google/datastore/v1/query.proto | 310 ++ 77 files changed, 45119 insertions(+) create mode 100644 proto-google-cloud-datastore-v1/pom.xml create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java create mode 100644 proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto create mode 100644 proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto create mode 100644 proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml new file mode 100644 index 000000000000..e9bbdf243743 --- /dev/null +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + proto-google-cloud-datastore-v1 + 0.11.1-SNAPSHOT + proto-google-cloud-datastore-v1 + PROTO library for proto-google-cloud-datastore-v1 + + com.google.api.grpc + google-api-grpc-pom + 0.11.1-SNAPSHOT + + + + com.google.protobuf + protobuf-java + compile + + + com.google.api + api-common + compile + + + com.google.api.grpc + proto-google-common-protos + compile + + + \ No newline at end of file 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 new file mode 100644 index 000000000000..400846c83530 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -0,0 +1,1015 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 

+ * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ *
+ * + * Protobuf type {@code google.datastore.v1.AllocateIdsRequest} + */ +public final class AllocateIdsRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsRequest) + AllocateIdsRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use AllocateIdsRequest.newBuilder() to construct. + private AllocateIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private AllocateIdsRequest() { + projectId_ = ""; + keys_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private AllocateIdsRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + keys_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + keys_.add( + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AllocateIdsRequest.class, com.google.datastore.v1.AllocateIdsRequest.Builder.class); + } + + private int bitField0_; + public static final int PROJECT_ID_FIELD_NUMBER = 8; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int KEYS_FIELD_NUMBER = 1; + private java.util.List keys_; + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List getKeysList() { + return keys_; + } + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysOrBuilderList() { + return keys_; + } + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public int getKeysCount() { + return keys_.size(); + } + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key getKeys(int index) { + return keys_.get(index); + } + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + return keys_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < keys_.size(); i++) { + output.writeMessage(1, keys_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < keys_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, keys_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.AllocateIdsRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.AllocateIdsRequest other = (com.google.datastore.v1.AllocateIdsRequest) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && getKeysList() + .equals(other.getKeysList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + if (getKeysCount() > 0) { + hash = (37 * hash) + KEYS_FIELD_NUMBER; + hash = (53 * hash) + getKeysList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.AllocateIdsRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   *
+ * + * Protobuf type {@code google.datastore.v1.AllocateIdsRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.AllocateIdsRequest) + com.google.datastore.v1.AllocateIdsRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AllocateIdsRequest.class, com.google.datastore.v1.AllocateIdsRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.AllocateIdsRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKeysFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + keysBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; + } + + public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { + return com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance(); + } + + public com.google.datastore.v1.AllocateIdsRequest build() { + com.google.datastore.v1.AllocateIdsRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.AllocateIdsRequest buildPartial() { + com.google.datastore.v1.AllocateIdsRequest result = new com.google.datastore.v1.AllocateIdsRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.projectId_ = projectId_; + if (keysBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.keys_ = keys_; + } else { + result.keys_ = keysBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.AllocateIdsRequest) { + return mergeFrom((com.google.datastore.v1.AllocateIdsRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) { + if (other == com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (keysBuilder_ == null) { + if (!other.keys_.isEmpty()) { + if (keys_.isEmpty()) { + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureKeysIsMutable(); + keys_.addAll(other.keys_); + } + onChanged(); + } + } else { + if (!other.keys_.isEmpty()) { + if (keysBuilder_.isEmpty()) { + keysBuilder_.dispose(); + keysBuilder_ = null; + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000002); + keysBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKeysFieldBuilder() : null; + } else { + keysBuilder_.addAllMessages(other.keys_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.AllocateIdsRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.AllocateIdsRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private java.util.List keys_ = + java.util.Collections.emptyList(); + private void ensureKeysIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + keys_ = new java.util.ArrayList(keys_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_; + + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List getKeysList() { + if (keysBuilder_ == null) { + return java.util.Collections.unmodifiableList(keys_); + } else { + return keysBuilder_.getMessageList(); + } + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public int getKeysCount() { + if (keysBuilder_ == null) { + return keys_.size(); + } else { + return keysBuilder_.getCount(); + } + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key getKeys(int index) { + if (keysBuilder_ == null) { + return keys_.get(index); + } else { + return keysBuilder_.getMessage(index); + } + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.set(index, value); + onChanged(); + } else { + keysBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.set(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys(com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(value); + onChanged(); + } else { + keysBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(index, value); + onChanged(); + } else { + keysBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addAllKeys( + java.lang.Iterable values) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, keys_); + onChanged(); + } else { + keysBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder clearKeys() { + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + keysBuilder_.clear(); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder removeKeys(int index) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.remove(index); + onChanged(); + } else { + keysBuilder_.remove(index); + } + return this; + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder getKeysBuilder( + int index) { + return getKeysFieldBuilder().getBuilder(index); + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + if (keysBuilder_ == null) { + return keys_.get(index); } else { + return keysBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysOrBuilderList() { + if (keysBuilder_ != null) { + return keysBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(keys_); + } + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder() { + return getKeysFieldBuilder().addBuilder( + com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder( + int index) { + return getKeysFieldBuilder().addBuilder( + index, com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * A list of keys with incomplete key paths for which to allocate IDs.
+     * No key may be reserved/read-only.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysBuilderList() { + return getKeysFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getKeysFieldBuilder() { + if (keysBuilder_ == null) { + keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + keys_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + keys_ = null; + } + return keysBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AllocateIdsRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsRequest) + private static final com.google.datastore.v1.AllocateIdsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.AllocateIdsRequest(); + } + + public static com.google.datastore.v1.AllocateIdsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public AllocateIdsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new AllocateIdsRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..34be6854f2d4 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java @@ -0,0 +1,76 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface AllocateIdsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.AllocateIdsRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + java.util.List + getKeysList(); + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + com.google.datastore.v1.Key getKeys(int index); + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + int getKeysCount(); + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + java.util.List + getKeysOrBuilderList(); + /** + * 
+   * A list of keys with incomplete key paths for which to allocate IDs.
+   * No key may be reserved/read-only.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..ee62ee5fec98 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java @@ -0,0 +1,857 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ *
+ * + * Protobuf type {@code google.datastore.v1.AllocateIdsResponse} + */ +public final class AllocateIdsResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsResponse) + AllocateIdsResponseOrBuilder { +private static final long serialVersionUID = 0L; + // Use AllocateIdsResponse.newBuilder() to construct. + private AllocateIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private AllocateIdsResponse() { + keys_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private AllocateIdsResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + keys_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + keys_.add( + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AllocateIdsResponse.class, com.google.datastore.v1.AllocateIdsResponse.Builder.class); + } + + public static final int KEYS_FIELD_NUMBER = 1; + private java.util.List keys_; + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List getKeysList() { + return keys_; + } + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysOrBuilderList() { + return keys_; + } + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public int getKeysCount() { + return keys_.size(); + } + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key getKeys(int index) { + return keys_.get(index); + } + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + return keys_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < keys_.size(); i++) { + output.writeMessage(1, keys_.get(i)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < keys_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, keys_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.AllocateIdsResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.AllocateIdsResponse other = (com.google.datastore.v1.AllocateIdsResponse) obj; + + boolean result = true; + result = result && getKeysList() + .equals(other.getKeysList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getKeysCount() > 0) { + hash = (37 * hash) + KEYS_FIELD_NUMBER; + hash = (53 * hash) + getKeysList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.AllocateIdsResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.AllocateIdsResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   *
+ * + * Protobuf type {@code google.datastore.v1.AllocateIdsResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.AllocateIdsResponse) + com.google.datastore.v1.AllocateIdsResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AllocateIdsResponse.class, com.google.datastore.v1.AllocateIdsResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.AllocateIdsResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKeysFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + keysBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; + } + + public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { + return com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance(); + } + + public com.google.datastore.v1.AllocateIdsResponse build() { + com.google.datastore.v1.AllocateIdsResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.AllocateIdsResponse buildPartial() { + com.google.datastore.v1.AllocateIdsResponse result = new com.google.datastore.v1.AllocateIdsResponse(this); + int from_bitField0_ = bitField0_; + if (keysBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.keys_ = keys_; + } else { + result.keys_ = keysBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.AllocateIdsResponse) { + return mergeFrom((com.google.datastore.v1.AllocateIdsResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) { + if (other == com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance()) return this; + if (keysBuilder_ == null) { + if (!other.keys_.isEmpty()) { + if (keys_.isEmpty()) { + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKeysIsMutable(); + keys_.addAll(other.keys_); + } + onChanged(); + } + } else { + if (!other.keys_.isEmpty()) { + if (keysBuilder_.isEmpty()) { + keysBuilder_.dispose(); + keysBuilder_ = null; + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000001); + keysBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKeysFieldBuilder() : null; + } else { + keysBuilder_.addAllMessages(other.keys_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.AllocateIdsResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.AllocateIdsResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List keys_ = + java.util.Collections.emptyList(); + private void ensureKeysIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + keys_ = new java.util.ArrayList(keys_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_; + + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List getKeysList() { + if (keysBuilder_ == null) { + return java.util.Collections.unmodifiableList(keys_); + } else { + return keysBuilder_.getMessageList(); + } + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public int getKeysCount() { + if (keysBuilder_ == null) { + return keys_.size(); + } else { + return keysBuilder_.getCount(); + } + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key getKeys(int index) { + if (keysBuilder_ == null) { + return keys_.get(index); + } else { + return keysBuilder_.getMessage(index); + } + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.set(index, value); + onChanged(); + } else { + keysBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.set(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys(com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(value); + onChanged(); + } else { + keysBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(index, value); + onChanged(); + } else { + keysBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addAllKeys( + java.lang.Iterable values) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, keys_); + onChanged(); + } else { + keysBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder clearKeys() { + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + keysBuilder_.clear(); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder removeKeys(int index) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.remove(index); + onChanged(); + } else { + keysBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder getKeysBuilder( + int index) { + return getKeysFieldBuilder().getBuilder(index); + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + if (keysBuilder_ == null) { + return keys_.get(index); } else { + return keysBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysOrBuilderList() { + if (keysBuilder_ != null) { + return keysBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(keys_); + } + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder() { + return getKeysFieldBuilder().addBuilder( + com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder( + int index) { + return getKeysFieldBuilder().addBuilder( + index, com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * The keys specified in the request (in the same order), each with
+     * its key path completed with a newly allocated ID.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysBuilderList() { + return getKeysFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getKeysFieldBuilder() { + if (keysBuilder_ == null) { + keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + keys_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + keys_ = null; + } + return keysBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AllocateIdsResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsResponse) + private static final com.google.datastore.v1.AllocateIdsResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.AllocateIdsResponse(); + } + + public static com.google.datastore.v1.AllocateIdsResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public AllocateIdsResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new AllocateIdsResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java new file mode 100644 index 000000000000..aaa99648538e --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java @@ -0,0 +1,58 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface AllocateIdsResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.AllocateIdsResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + java.util.List + getKeysList(); + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + com.google.datastore.v1.Key getKeys(int index); + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + int getKeysCount(); + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + java.util.List + getKeysOrBuilderList(); + /** + * 
+   * The keys specified in the request (in the same order), each with
+   * its key path completed with a newly allocated ID.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..fe6b290e9322 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java @@ -0,0 +1,880 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +/** + * 
+ * An array value.
+ *
+ * + * Protobuf type {@code google.datastore.v1.ArrayValue} + */ +public final class ArrayValue extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.ArrayValue) + ArrayValueOrBuilder { +private static final long serialVersionUID = 0L; + // Use ArrayValue.newBuilder() to construct. + private ArrayValue(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ArrayValue() { + values_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ArrayValue( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + values_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + values_.add( + input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + values_ = java.util.Collections.unmodifiableList(values_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ArrayValue.class, com.google.datastore.v1.ArrayValue.Builder.class); + } + + public static final int VALUES_FIELD_NUMBER = 1; + private java.util.List values_; + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public java.util.List getValuesList() { + return values_; + } + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public java.util.List + getValuesOrBuilderList() { + return values_; + } + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public int getValuesCount() { + return values_.size(); + } + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public com.google.datastore.v1.Value getValues(int index) { + return values_.get(index); + } + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder( + int index) { + return values_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < values_.size(); i++) { + output.writeMessage(1, values_.get(i)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < values_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, values_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.ArrayValue)) { + return super.equals(obj); + } + com.google.datastore.v1.ArrayValue other = (com.google.datastore.v1.ArrayValue) obj; + + boolean result = true; + result = result && getValuesList() + .equals(other.getValuesList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getValuesCount() > 0) { + hash = (37 * hash) + VALUES_FIELD_NUMBER; + hash = (53 * hash) + getValuesList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.ArrayValue parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ArrayValue parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ArrayValue parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ArrayValue parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ArrayValue parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ArrayValue parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ArrayValue parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ArrayValue parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ArrayValue parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ArrayValue parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ArrayValue parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ArrayValue parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.ArrayValue prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * An array value.
+   *
+ * + * Protobuf type {@code google.datastore.v1.ArrayValue} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.ArrayValue) + com.google.datastore.v1.ArrayValueOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ArrayValue.class, com.google.datastore.v1.ArrayValue.Builder.class); + } + + // Construct using com.google.datastore.v1.ArrayValue.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getValuesFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + if (valuesBuilder_ == null) { + values_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + valuesBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; + } + + public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + + public com.google.datastore.v1.ArrayValue build() { + com.google.datastore.v1.ArrayValue result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.ArrayValue buildPartial() { + com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this); + int from_bitField0_ = bitField0_; + if (valuesBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + values_ = java.util.Collections.unmodifiableList(values_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.values_ = values_; + } else { + result.values_ = valuesBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.ArrayValue) { + return mergeFrom((com.google.datastore.v1.ArrayValue)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) { + if (other == com.google.datastore.v1.ArrayValue.getDefaultInstance()) return this; + if (valuesBuilder_ == null) { + if (!other.values_.isEmpty()) { + if (values_.isEmpty()) { + values_ = other.values_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureValuesIsMutable(); + values_.addAll(other.values_); + } + onChanged(); + } + } else { + if (!other.values_.isEmpty()) { + if (valuesBuilder_.isEmpty()) { + valuesBuilder_.dispose(); + valuesBuilder_ = null; + values_ = other.values_; + bitField0_ = (bitField0_ & ~0x00000001); + valuesBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getValuesFieldBuilder() : null; + } else { + valuesBuilder_.addAllMessages(other.values_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.ArrayValue parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.ArrayValue) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List values_ = + java.util.Collections.emptyList(); + private void ensureValuesIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + values_ = new java.util.ArrayList(values_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valuesBuilder_; + + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public java.util.List getValuesList() { + if (valuesBuilder_ == null) { + return java.util.Collections.unmodifiableList(values_); + } else { + return valuesBuilder_.getMessageList(); + } + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public int getValuesCount() { + if (valuesBuilder_ == null) { + return values_.size(); + } else { + return valuesBuilder_.getCount(); + } + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public com.google.datastore.v1.Value getValues(int index) { + if (valuesBuilder_ == null) { + return values_.get(index); + } else { + return valuesBuilder_.getMessage(index); + } + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder setValues( + int index, com.google.datastore.v1.Value value) { + if (valuesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureValuesIsMutable(); + values_.set(index, value); + onChanged(); + } else { + valuesBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder setValues( + int index, com.google.datastore.v1.Value.Builder builderForValue) { + if (valuesBuilder_ == null) { + ensureValuesIsMutable(); + values_.set(index, builderForValue.build()); + onChanged(); + } else { + valuesBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder addValues(com.google.datastore.v1.Value value) { + if (valuesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureValuesIsMutable(); + values_.add(value); + onChanged(); + } else { + valuesBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder addValues( + int index, com.google.datastore.v1.Value value) { + if (valuesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureValuesIsMutable(); + values_.add(index, value); + onChanged(); + } else { + valuesBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder addValues( + com.google.datastore.v1.Value.Builder builderForValue) { + if (valuesBuilder_ == null) { + ensureValuesIsMutable(); + values_.add(builderForValue.build()); + onChanged(); + } else { + valuesBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder addValues( + int index, com.google.datastore.v1.Value.Builder builderForValue) { + if (valuesBuilder_ == null) { + ensureValuesIsMutable(); + values_.add(index, builderForValue.build()); + onChanged(); + } else { + valuesBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder addAllValues( + java.lang.Iterable values) { + if (valuesBuilder_ == null) { + ensureValuesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, values_); + onChanged(); + } else { + valuesBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder clearValues() { + if (valuesBuilder_ == null) { + values_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + valuesBuilder_.clear(); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public Builder removeValues(int index) { + if (valuesBuilder_ == null) { + ensureValuesIsMutable(); + values_.remove(index); + onChanged(); + } else { + valuesBuilder_.remove(index); + } + return this; + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public com.google.datastore.v1.Value.Builder getValuesBuilder( + int index) { + return getValuesFieldBuilder().getBuilder(index); + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder( + int index) { + if (valuesBuilder_ == null) { + return values_.get(index); } else { + return valuesBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public java.util.List + getValuesOrBuilderList() { + if (valuesBuilder_ != null) { + return valuesBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(values_); + } + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public com.google.datastore.v1.Value.Builder addValuesBuilder() { + return getValuesFieldBuilder().addBuilder( + com.google.datastore.v1.Value.getDefaultInstance()); + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public com.google.datastore.v1.Value.Builder addValuesBuilder( + int index) { + return getValuesFieldBuilder().addBuilder( + index, com.google.datastore.v1.Value.getDefaultInstance()); + } + /** + * 
+     * Values in the array.
+     * The order of this array may not be preserved if it contains a mix of
+     * indexed and unindexed values.
+     *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + public java.util.List + getValuesBuilderList() { + return getValuesFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> + getValuesFieldBuilder() { + if (valuesBuilder_ == null) { + valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>( + values_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + values_ = null; + } + return valuesBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.ArrayValue) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.ArrayValue) + private static final com.google.datastore.v1.ArrayValue DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.ArrayValue(); + } + + public static com.google.datastore.v1.ArrayValue getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public ArrayValue parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ArrayValue(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java new file mode 100644 index 000000000000..b6feeca1382a --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java @@ -0,0 +1,63 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +public interface ArrayValueOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.ArrayValue) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + java.util.List + getValuesList(); + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + com.google.datastore.v1.Value getValues(int index); + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + int getValuesCount(); + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + java.util.List + getValuesOrBuilderList(); + /** + * 
+   * Values in the array.
+   * The order of this array may not be preserved if it contains a mix of
+   * indexed and unindexed values.
+   *
+ * + * repeated .google.datastore.v1.Value values = 1; + */ + com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..2fdd90689108 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java @@ -0,0 +1,781 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ *
+ * + * Protobuf type {@code google.datastore.v1.BeginTransactionRequest} + */ +public final class BeginTransactionRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionRequest) + BeginTransactionRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use BeginTransactionRequest.newBuilder() to construct. + private BeginTransactionRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private BeginTransactionRequest() { + projectId_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private BeginTransactionRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + case 82: { + com.google.datastore.v1.TransactionOptions.Builder subBuilder = null; + if (transactionOptions_ != null) { + subBuilder = transactionOptions_.toBuilder(); + } + transactionOptions_ = input.readMessage(com.google.datastore.v1.TransactionOptions.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(transactionOptions_); + transactionOptions_ = subBuilder.buildPartial(); + } + + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.BeginTransactionRequest.class, com.google.datastore.v1.BeginTransactionRequest.Builder.class); + } + + public static final int PROJECT_ID_FIELD_NUMBER = 8; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int TRANSACTION_OPTIONS_FIELD_NUMBER = 10; + private com.google.datastore.v1.TransactionOptions transactionOptions_; + /** + * 
+   * Options for a new transaction.
+   *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public boolean hasTransactionOptions() { + return transactionOptions_ != null; + } + /** + * 
+   * Options for a new transaction.
+   *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public com.google.datastore.v1.TransactionOptions getTransactionOptions() { + return transactionOptions_ == null ? com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_; + } + /** + * 
+   * Options for a new transaction.
+   *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptionsOrBuilder() { + return getTransactionOptions(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + if (transactionOptions_ != null) { + output.writeMessage(10, getTransactionOptions()); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + if (transactionOptions_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, getTransactionOptions()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.BeginTransactionRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.BeginTransactionRequest other = (com.google.datastore.v1.BeginTransactionRequest) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && (hasTransactionOptions() == other.hasTransactionOptions()); + if (hasTransactionOptions()) { + result = result && getTransactionOptions() + .equals(other.getTransactionOptions()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + if (hasTransactionOptions()) { + hash = (37 * hash) + TRANSACTION_OPTIONS_FIELD_NUMBER; + hash = (53 * hash) + getTransactionOptions().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.BeginTransactionRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.BeginTransactionRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * Protobuf type {@code google.datastore.v1.BeginTransactionRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.BeginTransactionRequest) + com.google.datastore.v1.BeginTransactionRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.BeginTransactionRequest.class, com.google.datastore.v1.BeginTransactionRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.BeginTransactionRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + if (transactionOptionsBuilder_ == null) { + transactionOptions_ = null; + } else { + transactionOptions_ = null; + transactionOptionsBuilder_ = null; + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; + } + + public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { + return com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance(); + } + + public com.google.datastore.v1.BeginTransactionRequest build() { + com.google.datastore.v1.BeginTransactionRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.BeginTransactionRequest buildPartial() { + com.google.datastore.v1.BeginTransactionRequest result = new com.google.datastore.v1.BeginTransactionRequest(this); + result.projectId_ = projectId_; + if (transactionOptionsBuilder_ == null) { + result.transactionOptions_ = transactionOptions_; + } else { + result.transactionOptions_ = transactionOptionsBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.BeginTransactionRequest) { + return mergeFrom((com.google.datastore.v1.BeginTransactionRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other) { + if (other == com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (other.hasTransactionOptions()) { + mergeTransactionOptions(other.getTransactionOptions()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.BeginTransactionRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.BeginTransactionRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private com.google.datastore.v1.TransactionOptions transactionOptions_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> transactionOptionsBuilder_; + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public boolean hasTransactionOptions() { + return transactionOptionsBuilder_ != null || transactionOptions_ != null; + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public com.google.datastore.v1.TransactionOptions getTransactionOptions() { + if (transactionOptionsBuilder_ == null) { + return transactionOptions_ == null ? com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_; + } else { + return transactionOptionsBuilder_.getMessage(); + } + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public Builder setTransactionOptions(com.google.datastore.v1.TransactionOptions value) { + if (transactionOptionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + transactionOptions_ = value; + onChanged(); + } else { + transactionOptionsBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public Builder setTransactionOptions( + com.google.datastore.v1.TransactionOptions.Builder builderForValue) { + if (transactionOptionsBuilder_ == null) { + transactionOptions_ = builderForValue.build(); + onChanged(); + } else { + transactionOptionsBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOptions value) { + if (transactionOptionsBuilder_ == null) { + if (transactionOptions_ != null) { + transactionOptions_ = + com.google.datastore.v1.TransactionOptions.newBuilder(transactionOptions_).mergeFrom(value).buildPartial(); + } else { + transactionOptions_ = value; + } + onChanged(); + } else { + transactionOptionsBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public Builder clearTransactionOptions() { + if (transactionOptionsBuilder_ == null) { + transactionOptions_ = null; + onChanged(); + } else { + transactionOptions_ = null; + transactionOptionsBuilder_ = null; + } + + return this; + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public com.google.datastore.v1.TransactionOptions.Builder getTransactionOptionsBuilder() { + + onChanged(); + return getTransactionOptionsFieldBuilder().getBuilder(); + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptionsOrBuilder() { + if (transactionOptionsBuilder_ != null) { + return transactionOptionsBuilder_.getMessageOrBuilder(); + } else { + return transactionOptions_ == null ? + com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_; + } + } + /** + * 
+     * Options for a new transaction.
+     *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> + getTransactionOptionsFieldBuilder() { + if (transactionOptionsBuilder_ == null) { + transactionOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder>( + getTransactionOptions(), + getParentForChildren(), + isClean()); + transactionOptions_ = null; + } + return transactionOptionsBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.BeginTransactionRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionRequest) + private static final com.google.datastore.v1.BeginTransactionRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.BeginTransactionRequest(); + } + + public static com.google.datastore.v1.BeginTransactionRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public BeginTransactionRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new BeginTransactionRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..9fc80e2500b3 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java @@ -0,0 +1,52 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface BeginTransactionRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.BeginTransactionRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * Options for a new transaction.
+   *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + boolean hasTransactionOptions(); + /** + * 
+   * Options for a new transaction.
+   *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + com.google.datastore.v1.TransactionOptions getTransactionOptions(); + /** + * 
+   * Options for a new transaction.
+   *
+ * + * .google.datastore.v1.TransactionOptions transaction_options = 10; + */ + com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptionsOrBuilder(); +} 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 new file mode 100644 index 000000000000..0bb48d6a6899 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java @@ -0,0 +1,474 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ *
+ * + * Protobuf type {@code google.datastore.v1.BeginTransactionResponse} + */ +public final class BeginTransactionResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionResponse) + BeginTransactionResponseOrBuilder { +private static final long serialVersionUID = 0L; + // Use BeginTransactionResponse.newBuilder() to construct. + private BeginTransactionResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private BeginTransactionResponse() { + transaction_ = com.google.protobuf.ByteString.EMPTY; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private BeginTransactionResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + + transaction_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.BeginTransactionResponse.class, com.google.datastore.v1.BeginTransactionResponse.Builder.class); + } + + public static final int TRANSACTION_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString transaction_; + /** + * 
+   * The transaction identifier (always present).
+   *
+ * + * bytes transaction = 1; + */ + public com.google.protobuf.ByteString getTransaction() { + return transaction_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!transaction_.isEmpty()) { + output.writeBytes(1, transaction_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!transaction_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, transaction_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.BeginTransactionResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.BeginTransactionResponse other = (com.google.datastore.v1.BeginTransactionResponse) obj; + + boolean result = true; + result = result && getTransaction() + .equals(other.getTransaction()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TRANSACTION_FIELD_NUMBER; + hash = (53 * hash) + getTransaction().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.BeginTransactionResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.BeginTransactionResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * Protobuf type {@code google.datastore.v1.BeginTransactionResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.BeginTransactionResponse) + com.google.datastore.v1.BeginTransactionResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.BeginTransactionResponse.class, com.google.datastore.v1.BeginTransactionResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.BeginTransactionResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + transaction_ = com.google.protobuf.ByteString.EMPTY; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; + } + + public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { + return com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance(); + } + + public com.google.datastore.v1.BeginTransactionResponse build() { + com.google.datastore.v1.BeginTransactionResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.BeginTransactionResponse buildPartial() { + com.google.datastore.v1.BeginTransactionResponse result = new com.google.datastore.v1.BeginTransactionResponse(this); + result.transaction_ = transaction_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.BeginTransactionResponse) { + return mergeFrom((com.google.datastore.v1.BeginTransactionResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other) { + if (other == com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance()) return this; + if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) { + setTransaction(other.getTransaction()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.BeginTransactionResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.BeginTransactionResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * The transaction identifier (always present).
+     *
+ * + * bytes transaction = 1; + */ + public com.google.protobuf.ByteString getTransaction() { + return transaction_; + } + /** + * 
+     * The transaction identifier (always present).
+     *
+ * + * bytes transaction = 1; + */ + public Builder setTransaction(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + transaction_ = value; + onChanged(); + return this; + } + /** + * 
+     * The transaction identifier (always present).
+     *
+ * + * bytes transaction = 1; + */ + public Builder clearTransaction() { + + transaction_ = getDefaultInstance().getTransaction(); + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.BeginTransactionResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionResponse) + private static final com.google.datastore.v1.BeginTransactionResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.BeginTransactionResponse(); + } + + public static com.google.datastore.v1.BeginTransactionResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public BeginTransactionResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new BeginTransactionResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java new file mode 100644 index 000000000000..e623e74cba09 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java @@ -0,0 +1,18 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface BeginTransactionResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.BeginTransactionResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The transaction identifier (always present).
+   *
+ * + * bytes transaction = 1; + */ + com.google.protobuf.ByteString getTransaction(); +} 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 new file mode 100644 index 000000000000..ffae15d56af6 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java @@ -0,0 +1,1614 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
+ *
+ * + * Protobuf type {@code google.datastore.v1.CommitRequest} + */ +public final class CommitRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitRequest) + CommitRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use CommitRequest.newBuilder() to construct. + private CommitRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CommitRequest() { + projectId_ = ""; + mode_ = 0; + mutations_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CommitRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + transactionSelectorCase_ = 1; + transactionSelector_ = input.readBytes(); + break; + } + case 40: { + int rawValue = input.readEnum(); + + mode_ = rawValue; + break; + } + case 50: { + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + mutations_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000008; + } + mutations_.add( + input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry)); + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + mutations_ = java.util.Collections.unmodifiableList(mutations_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.CommitRequest.class, com.google.datastore.v1.CommitRequest.Builder.class); + } + + /** + * 
+   * The modes available for commits.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.CommitRequest.Mode} + */ + public enum Mode + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * MODE_UNSPECIFIED = 0; + */ + MODE_UNSPECIFIED(0), + /** + * 
+     * Transactional: The mutations are either all applied, or none are applied.
+     * Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions).
+     *
+ * + * TRANSACTIONAL = 1; + */ + TRANSACTIONAL(1), + /** + * 
+     * Non-transactional: The mutations may not apply as all or none.
+     *
+ * + * NON_TRANSACTIONAL = 2; + */ + NON_TRANSACTIONAL(2), + UNRECOGNIZED(-1), + ; + + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * MODE_UNSPECIFIED = 0; + */ + public static final int MODE_UNSPECIFIED_VALUE = 0; + /** + * 
+     * Transactional: The mutations are either all applied, or none are applied.
+     * Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions).
+     *
+ * + * TRANSACTIONAL = 1; + */ + public static final int TRANSACTIONAL_VALUE = 1; + /** + * 
+     * Non-transactional: The mutations may not apply as all or none.
+     *
+ * + * NON_TRANSACTIONAL = 2; + */ + public static final int NON_TRANSACTIONAL_VALUE = 2; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static Mode valueOf(int value) { + return forNumber(value); + } + + public static Mode forNumber(int value) { + switch (value) { + case 0: return MODE_UNSPECIFIED; + case 1: return TRANSACTIONAL; + case 2: return NON_TRANSACTIONAL; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + Mode> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Mode findValueByNumber(int number) { + return Mode.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.google.datastore.v1.CommitRequest.getDescriptor().getEnumTypes().get(0); + } + + private static final Mode[] VALUES = values(); + + public static Mode valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private Mode(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.CommitRequest.Mode) + } + + private int bitField0_; + private int transactionSelectorCase_ = 0; + private java.lang.Object transactionSelector_; + public enum TransactionSelectorCase + implements com.google.protobuf.Internal.EnumLite { + TRANSACTION(1), + TRANSACTIONSELECTOR_NOT_SET(0); + private final int value; + private TransactionSelectorCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static TransactionSelectorCase valueOf(int value) { + return forNumber(value); + } + + public static TransactionSelectorCase forNumber(int value) { + switch (value) { + case 1: return TRANSACTION; + case 0: return TRANSACTIONSELECTOR_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public TransactionSelectorCase + getTransactionSelectorCase() { + return TransactionSelectorCase.forNumber( + transactionSelectorCase_); + } + + public static final int PROJECT_ID_FIELD_NUMBER = 8; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int MODE_FIELD_NUMBER = 5; + private int mode_; + /** + * 
+   * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+   *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + public int getModeValue() { + return mode_; + } + /** + * 
+   * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+   *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + public com.google.datastore.v1.CommitRequest.Mode getMode() { + com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); + return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; + } + + public static final int TRANSACTION_FIELD_NUMBER = 1; + /** + * 
+   * The identifier of the transaction associated with the commit. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * bytes transaction = 1; + */ + public com.google.protobuf.ByteString getTransaction() { + if (transactionSelectorCase_ == 1) { + return (com.google.protobuf.ByteString) transactionSelector_; + } + return com.google.protobuf.ByteString.EMPTY; + } + + public static final int MUTATIONS_FIELD_NUMBER = 6; + private java.util.List mutations_; + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public java.util.List getMutationsList() { + return mutations_; + } + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public java.util.List + getMutationsOrBuilderList() { + return mutations_; + } + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public int getMutationsCount() { + return mutations_.size(); + } + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public com.google.datastore.v1.Mutation getMutations(int index) { + return mutations_.get(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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder( + int index) { + return mutations_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (transactionSelectorCase_ == 1) { + output.writeBytes( + 1, (com.google.protobuf.ByteString) transactionSelector_); + } + if (mode_ != com.google.datastore.v1.CommitRequest.Mode.MODE_UNSPECIFIED.getNumber()) { + output.writeEnum(5, mode_); + } + for (int i = 0; i < mutations_.size(); i++) { + output.writeMessage(6, mutations_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (transactionSelectorCase_ == 1) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize( + 1, (com.google.protobuf.ByteString) transactionSelector_); + } + if (mode_ != com.google.datastore.v1.CommitRequest.Mode.MODE_UNSPECIFIED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(5, mode_); + } + for (int i = 0; i < mutations_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, mutations_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.CommitRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.CommitRequest other = (com.google.datastore.v1.CommitRequest) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && mode_ == other.mode_; + result = result && getMutationsList() + .equals(other.getMutationsList()); + result = result && getTransactionSelectorCase().equals( + other.getTransactionSelectorCase()); + if (!result) return false; + switch (transactionSelectorCase_) { + case 1: + result = result && getTransaction() + .equals(other.getTransaction()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + hash = (37 * hash) + MODE_FIELD_NUMBER; + hash = (53 * hash) + mode_; + if (getMutationsCount() > 0) { + hash = (37 * hash) + MUTATIONS_FIELD_NUMBER; + hash = (53 * hash) + getMutationsList().hashCode(); + } + switch (transactionSelectorCase_) { + case 1: + hash = (37 * hash) + TRANSACTION_FIELD_NUMBER; + hash = (53 * hash) + getTransaction().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.CommitRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CommitRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CommitRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CommitRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CommitRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CommitRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CommitRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CommitRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.CommitRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CommitRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.CommitRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CommitRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.CommitRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
+   *
+ * + * Protobuf type {@code google.datastore.v1.CommitRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.CommitRequest) + com.google.datastore.v1.CommitRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.CommitRequest.class, com.google.datastore.v1.CommitRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.CommitRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getMutationsFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + mode_ = 0; + + if (mutationsBuilder_ == null) { + mutations_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + } else { + mutationsBuilder_.clear(); + } + transactionSelectorCase_ = 0; + transactionSelector_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; + } + + public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { + return com.google.datastore.v1.CommitRequest.getDefaultInstance(); + } + + public com.google.datastore.v1.CommitRequest build() { + com.google.datastore.v1.CommitRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.CommitRequest buildPartial() { + com.google.datastore.v1.CommitRequest result = new com.google.datastore.v1.CommitRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.projectId_ = projectId_; + result.mode_ = mode_; + if (transactionSelectorCase_ == 1) { + result.transactionSelector_ = transactionSelector_; + } + if (mutationsBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { + mutations_ = java.util.Collections.unmodifiableList(mutations_); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.mutations_ = mutations_; + } else { + result.mutations_ = mutationsBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + result.transactionSelectorCase_ = transactionSelectorCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.CommitRequest) { + return mergeFrom((com.google.datastore.v1.CommitRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) { + if (other == com.google.datastore.v1.CommitRequest.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (other.mode_ != 0) { + setModeValue(other.getModeValue()); + } + if (mutationsBuilder_ == null) { + if (!other.mutations_.isEmpty()) { + if (mutations_.isEmpty()) { + mutations_ = other.mutations_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureMutationsIsMutable(); + mutations_.addAll(other.mutations_); + } + onChanged(); + } + } else { + if (!other.mutations_.isEmpty()) { + if (mutationsBuilder_.isEmpty()) { + mutationsBuilder_.dispose(); + mutationsBuilder_ = null; + mutations_ = other.mutations_; + bitField0_ = (bitField0_ & ~0x00000008); + mutationsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getMutationsFieldBuilder() : null; + } else { + mutationsBuilder_.addAllMessages(other.mutations_); + } + } + } + switch (other.getTransactionSelectorCase()) { + case TRANSACTION: { + setTransaction(other.getTransaction()); + break; + } + case TRANSACTIONSELECTOR_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.CommitRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.CommitRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int transactionSelectorCase_ = 0; + private java.lang.Object transactionSelector_; + public TransactionSelectorCase + getTransactionSelectorCase() { + return TransactionSelectorCase.forNumber( + transactionSelectorCase_); + } + + public Builder clearTransactionSelector() { + transactionSelectorCase_ = 0; + transactionSelector_ = null; + onChanged(); + return this; + } + + private int bitField0_; + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private int mode_ = 0; + /** + * 
+     * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+     *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + public int getModeValue() { + return mode_; + } + /** + * 
+     * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+     *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + public Builder setModeValue(int value) { + mode_ = value; + onChanged(); + return this; + } + /** + * 
+     * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+     *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + public com.google.datastore.v1.CommitRequest.Mode getMode() { + com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); + return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; + } + /** + * 
+     * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+     *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) { + if (value == null) { + throw new NullPointerException(); + } + + mode_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+     *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + public Builder clearMode() { + + mode_ = 0; + onChanged(); + return this; + } + + /** + * 
+     * The identifier of the transaction associated with the commit. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 1; + */ + public com.google.protobuf.ByteString getTransaction() { + if (transactionSelectorCase_ == 1) { + return (com.google.protobuf.ByteString) transactionSelector_; + } + return com.google.protobuf.ByteString.EMPTY; + } + /** + * 
+     * The identifier of the transaction associated with the commit. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 1; + */ + public Builder setTransaction(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + transactionSelectorCase_ = 1; + transactionSelector_ = value; + onChanged(); + return this; + } + /** + * 
+     * The identifier of the transaction associated with the commit. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 1; + */ + public Builder clearTransaction() { + if (transactionSelectorCase_ == 1) { + transactionSelectorCase_ = 0; + transactionSelector_ = null; + onChanged(); + } + return this; + } + + private java.util.List mutations_ = + java.util.Collections.emptyList(); + private void ensureMutationsIsMutable() { + if (!((bitField0_ & 0x00000008) == 0x00000008)) { + mutations_ = new java.util.ArrayList(mutations_); + bitField0_ |= 0x00000008; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder> mutationsBuilder_; + + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public java.util.List getMutationsList() { + if (mutationsBuilder_ == null) { + return java.util.Collections.unmodifiableList(mutations_); + } else { + return mutationsBuilder_.getMessageList(); + } + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public int getMutationsCount() { + if (mutationsBuilder_ == null) { + return mutations_.size(); + } else { + return mutationsBuilder_.getCount(); + } + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public com.google.datastore.v1.Mutation getMutations(int index) { + if (mutationsBuilder_ == null) { + return mutations_.get(index); + } else { + return mutationsBuilder_.getMessage(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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder setMutations( + int index, com.google.datastore.v1.Mutation value) { + if (mutationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMutationsIsMutable(); + mutations_.set(index, value); + onChanged(); + } else { + mutationsBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder setMutations( + int index, com.google.datastore.v1.Mutation.Builder builderForValue) { + if (mutationsBuilder_ == null) { + ensureMutationsIsMutable(); + mutations_.set(index, builderForValue.build()); + onChanged(); + } else { + mutationsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder addMutations(com.google.datastore.v1.Mutation value) { + if (mutationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMutationsIsMutable(); + mutations_.add(value); + onChanged(); + } else { + mutationsBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder addMutations( + int index, com.google.datastore.v1.Mutation value) { + if (mutationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMutationsIsMutable(); + mutations_.add(index, value); + onChanged(); + } else { + mutationsBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder addMutations( + com.google.datastore.v1.Mutation.Builder builderForValue) { + if (mutationsBuilder_ == null) { + ensureMutationsIsMutable(); + mutations_.add(builderForValue.build()); + onChanged(); + } else { + mutationsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder addMutations( + int index, com.google.datastore.v1.Mutation.Builder builderForValue) { + if (mutationsBuilder_ == null) { + ensureMutationsIsMutable(); + mutations_.add(index, builderForValue.build()); + onChanged(); + } else { + mutationsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder addAllMutations( + java.lang.Iterable values) { + if (mutationsBuilder_ == null) { + ensureMutationsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, mutations_); + onChanged(); + } else { + mutationsBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder clearMutations() { + if (mutationsBuilder_ == null) { + mutations_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + } else { + mutationsBuilder_.clear(); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public Builder removeMutations(int index) { + if (mutationsBuilder_ == null) { + ensureMutationsIsMutable(); + mutations_.remove(index); + onChanged(); + } else { + mutationsBuilder_.remove(index); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public com.google.datastore.v1.Mutation.Builder getMutationsBuilder( + int index) { + return getMutationsFieldBuilder().getBuilder(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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder( + int index) { + if (mutationsBuilder_ == null) { + return mutations_.get(index); } else { + return mutationsBuilder_.getMessageOrBuilder(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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public java.util.List + getMutationsOrBuilderList() { + if (mutationsBuilder_ != null) { + return mutationsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(mutations_); + } + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() { + return getMutationsFieldBuilder().addBuilder( + com.google.datastore.v1.Mutation.getDefaultInstance()); + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public com.google.datastore.v1.Mutation.Builder addMutationsBuilder( + int index) { + return getMutationsFieldBuilder().addBuilder( + index, com.google.datastore.v1.Mutation.getDefaultInstance()); + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + public java.util.List + getMutationsBuilderList() { + return getMutationsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder> + getMutationsFieldBuilder() { + if (mutationsBuilder_ == null) { + mutationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder>( + mutations_, + ((bitField0_ & 0x00000008) == 0x00000008), + getParentForChildren(), + isClean()); + mutations_ = null; + } + return mutationsBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.CommitRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.CommitRequest) + private static final com.google.datastore.v1.CommitRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.CommitRequest(); + } + + public static com.google.datastore.v1.CommitRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public CommitRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CommitRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..ff941068c372 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java @@ -0,0 +1,146 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface CommitRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.CommitRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+   *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + int getModeValue(); + /** + * 
+   * The type of commit to perform. Defaults to `TRANSACTIONAL`.
+   *
+ * + * .google.datastore.v1.CommitRequest.Mode mode = 5; + */ + com.google.datastore.v1.CommitRequest.Mode getMode(); + + /** + * 
+   * The identifier of the transaction associated with the commit. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * bytes transaction = 1; + */ + com.google.protobuf.ByteString getTransaction(); + + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + java.util.List + getMutationsOrBuilderList(); + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Mutation mutations = 6; + */ + com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder( + int index); + + public 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 new file mode 100644 index 000000000000..05ae3dda3d70 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java @@ -0,0 +1,938 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
+ *
+ * + * Protobuf type {@code google.datastore.v1.CommitResponse} + */ +public final class CommitResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitResponse) + CommitResponseOrBuilder { +private static final long serialVersionUID = 0L; + // Use CommitResponse.newBuilder() to construct. + private CommitResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CommitResponse() { + mutationResults_ = java.util.Collections.emptyList(); + indexUpdates_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CommitResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + mutationResults_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + mutationResults_.add( + input.readMessage(com.google.datastore.v1.MutationResult.parser(), extensionRegistry)); + break; + } + case 32: { + + indexUpdates_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.CommitResponse.class, com.google.datastore.v1.CommitResponse.Builder.class); + } + + private int bitField0_; + public static final int MUTATION_RESULTS_FIELD_NUMBER = 3; + private java.util.List mutationResults_; + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public java.util.List getMutationResultsList() { + return mutationResults_; + } + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public java.util.List + getMutationResultsOrBuilderList() { + return mutationResults_; + } + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public int getMutationResultsCount() { + return mutationResults_.size(); + } + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public com.google.datastore.v1.MutationResult getMutationResults(int index) { + return mutationResults_.get(index); + } + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder( + int index) { + return mutationResults_.get(index); + } + + public static final int INDEX_UPDATES_FIELD_NUMBER = 4; + private int indexUpdates_; + /** + * 
+   * The number of index entries updated during the commit, or zero if none were
+   * updated.
+   *
+ * + * int32 index_updates = 4; + */ + public int getIndexUpdates() { + return indexUpdates_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < mutationResults_.size(); i++) { + output.writeMessage(3, mutationResults_.get(i)); + } + if (indexUpdates_ != 0) { + output.writeInt32(4, indexUpdates_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < mutationResults_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, mutationResults_.get(i)); + } + if (indexUpdates_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, indexUpdates_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.CommitResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.CommitResponse other = (com.google.datastore.v1.CommitResponse) obj; + + boolean result = true; + result = result && getMutationResultsList() + .equals(other.getMutationResultsList()); + result = result && (getIndexUpdates() + == other.getIndexUpdates()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getMutationResultsCount() > 0) { + hash = (37 * hash) + MUTATION_RESULTS_FIELD_NUMBER; + hash = (53 * hash) + getMutationResultsList().hashCode(); + } + hash = (37 * hash) + INDEX_UPDATES_FIELD_NUMBER; + hash = (53 * hash) + getIndexUpdates(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.CommitResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CommitResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CommitResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CommitResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CommitResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CommitResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CommitResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CommitResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.CommitResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CommitResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.CommitResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CommitResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.CommitResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
+   *
+ * + * Protobuf type {@code google.datastore.v1.CommitResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.CommitResponse) + com.google.datastore.v1.CommitResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.CommitResponse.class, com.google.datastore.v1.CommitResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.CommitResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getMutationResultsFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + if (mutationResultsBuilder_ == null) { + mutationResults_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + mutationResultsBuilder_.clear(); + } + indexUpdates_ = 0; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; + } + + public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { + return com.google.datastore.v1.CommitResponse.getDefaultInstance(); + } + + public com.google.datastore.v1.CommitResponse build() { + com.google.datastore.v1.CommitResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.CommitResponse buildPartial() { + com.google.datastore.v1.CommitResponse result = new com.google.datastore.v1.CommitResponse(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (mutationResultsBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.mutationResults_ = mutationResults_; + } else { + result.mutationResults_ = mutationResultsBuilder_.build(); + } + result.indexUpdates_ = indexUpdates_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.CommitResponse) { + return mergeFrom((com.google.datastore.v1.CommitResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) { + if (other == com.google.datastore.v1.CommitResponse.getDefaultInstance()) return this; + if (mutationResultsBuilder_ == null) { + if (!other.mutationResults_.isEmpty()) { + if (mutationResults_.isEmpty()) { + mutationResults_ = other.mutationResults_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureMutationResultsIsMutable(); + mutationResults_.addAll(other.mutationResults_); + } + onChanged(); + } + } else { + if (!other.mutationResults_.isEmpty()) { + if (mutationResultsBuilder_.isEmpty()) { + mutationResultsBuilder_.dispose(); + mutationResultsBuilder_ = null; + mutationResults_ = other.mutationResults_; + bitField0_ = (bitField0_ & ~0x00000001); + mutationResultsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getMutationResultsFieldBuilder() : null; + } else { + mutationResultsBuilder_.addAllMessages(other.mutationResults_); + } + } + } + if (other.getIndexUpdates() != 0) { + setIndexUpdates(other.getIndexUpdates()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.CommitResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.CommitResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List mutationResults_ = + java.util.Collections.emptyList(); + private void ensureMutationResultsIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + mutationResults_ = new java.util.ArrayList(mutationResults_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder> mutationResultsBuilder_; + + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public java.util.List getMutationResultsList() { + if (mutationResultsBuilder_ == null) { + return java.util.Collections.unmodifiableList(mutationResults_); + } else { + return mutationResultsBuilder_.getMessageList(); + } + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public int getMutationResultsCount() { + if (mutationResultsBuilder_ == null) { + return mutationResults_.size(); + } else { + return mutationResultsBuilder_.getCount(); + } + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public com.google.datastore.v1.MutationResult getMutationResults(int index) { + if (mutationResultsBuilder_ == null) { + return mutationResults_.get(index); + } else { + return mutationResultsBuilder_.getMessage(index); + } + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder setMutationResults( + int index, com.google.datastore.v1.MutationResult value) { + if (mutationResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMutationResultsIsMutable(); + mutationResults_.set(index, value); + onChanged(); + } else { + mutationResultsBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder setMutationResults( + int index, com.google.datastore.v1.MutationResult.Builder builderForValue) { + if (mutationResultsBuilder_ == null) { + ensureMutationResultsIsMutable(); + mutationResults_.set(index, builderForValue.build()); + onChanged(); + } else { + mutationResultsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder addMutationResults(com.google.datastore.v1.MutationResult value) { + if (mutationResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMutationResultsIsMutable(); + mutationResults_.add(value); + onChanged(); + } else { + mutationResultsBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder addMutationResults( + int index, com.google.datastore.v1.MutationResult value) { + if (mutationResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMutationResultsIsMutable(); + mutationResults_.add(index, value); + onChanged(); + } else { + mutationResultsBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder addMutationResults( + com.google.datastore.v1.MutationResult.Builder builderForValue) { + if (mutationResultsBuilder_ == null) { + ensureMutationResultsIsMutable(); + mutationResults_.add(builderForValue.build()); + onChanged(); + } else { + mutationResultsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder addMutationResults( + int index, com.google.datastore.v1.MutationResult.Builder builderForValue) { + if (mutationResultsBuilder_ == null) { + ensureMutationResultsIsMutable(); + mutationResults_.add(index, builderForValue.build()); + onChanged(); + } else { + mutationResultsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder addAllMutationResults( + java.lang.Iterable values) { + if (mutationResultsBuilder_ == null) { + ensureMutationResultsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, mutationResults_); + onChanged(); + } else { + mutationResultsBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder clearMutationResults() { + if (mutationResultsBuilder_ == null) { + mutationResults_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + mutationResultsBuilder_.clear(); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public Builder removeMutationResults(int index) { + if (mutationResultsBuilder_ == null) { + ensureMutationResultsIsMutable(); + mutationResults_.remove(index); + onChanged(); + } else { + mutationResultsBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder( + int index) { + return getMutationResultsFieldBuilder().getBuilder(index); + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder( + int index) { + if (mutationResultsBuilder_ == null) { + return mutationResults_.get(index); } else { + return mutationResultsBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public java.util.List + getMutationResultsOrBuilderList() { + if (mutationResultsBuilder_ != null) { + return mutationResultsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(mutationResults_); + } + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder() { + return getMutationResultsFieldBuilder().addBuilder( + com.google.datastore.v1.MutationResult.getDefaultInstance()); + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder( + int index) { + return getMutationResultsFieldBuilder().addBuilder( + index, com.google.datastore.v1.MutationResult.getDefaultInstance()); + } + /** + * 
+     * The result of performing the mutations.
+     * The i-th mutation result corresponds to the i-th mutation in the request.
+     *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + public java.util.List + getMutationResultsBuilderList() { + return getMutationResultsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder> + getMutationResultsFieldBuilder() { + if (mutationResultsBuilder_ == null) { + mutationResultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder>( + mutationResults_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + mutationResults_ = null; + } + return mutationResultsBuilder_; + } + + private int indexUpdates_ ; + /** + * 
+     * The number of index entries updated during the commit, or zero if none were
+     * updated.
+     *
+ * + * int32 index_updates = 4; + */ + public int getIndexUpdates() { + return indexUpdates_; + } + /** + * 
+     * The number of index entries updated during the commit, or zero if none were
+     * updated.
+     *
+ * + * int32 index_updates = 4; + */ + public Builder setIndexUpdates(int value) { + + indexUpdates_ = value; + onChanged(); + return this; + } + /** + * 
+     * The number of index entries updated during the commit, or zero if none were
+     * updated.
+     *
+ * + * int32 index_updates = 4; + */ + public Builder clearIndexUpdates() { + + indexUpdates_ = 0; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.CommitResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.CommitResponse) + private static final com.google.datastore.v1.CommitResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.CommitResponse(); + } + + public static com.google.datastore.v1.CommitResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public CommitResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CommitResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java new file mode 100644 index 000000000000..014a598a4823 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java @@ -0,0 +1,68 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface CommitResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.CommitResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + java.util.List + getMutationResultsList(); + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + com.google.datastore.v1.MutationResult getMutationResults(int index); + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + int getMutationResultsCount(); + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + java.util.List + getMutationResultsOrBuilderList(); + /** + * 
+   * The result of performing the mutations.
+   * The i-th mutation result corresponds to the i-th mutation in the request.
+   *
+ * + * repeated .google.datastore.v1.MutationResult mutation_results = 3; + */ + com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder( + int index); + + /** + * 
+   * The number of index entries updated during the commit, or zero if none were
+   * updated.
+   *
+ * + * int32 index_updates = 4; + */ + int getIndexUpdates(); +} 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 new file mode 100644 index 000000000000..acb487899c4d --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java @@ -0,0 +1,1089 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A filter that merges multiple other filters using the given operator.
+ *
+ * + * Protobuf type {@code google.datastore.v1.CompositeFilter} + */ +public final class CompositeFilter extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.CompositeFilter) + CompositeFilterOrBuilder { +private static final long serialVersionUID = 0L; + // Use CompositeFilter.newBuilder() to construct. + private CompositeFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CompositeFilter() { + op_ = 0; + filters_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CompositeFilter( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + + op_ = rawValue; + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + filters_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + filters_.add( + input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + filters_ = java.util.Collections.unmodifiableList(filters_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.CompositeFilter.class, com.google.datastore.v1.CompositeFilter.Builder.class); + } + + /** + * 
+   * A composite filter operator.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.CompositeFilter.Operator} + */ + public enum Operator + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * OPERATOR_UNSPECIFIED = 0; + */ + OPERATOR_UNSPECIFIED(0), + /** + * 
+     * The results are required to satisfy each of the combined filters.
+     *
+ * + * AND = 1; + */ + AND(1), + UNRECOGNIZED(-1), + ; + + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * OPERATOR_UNSPECIFIED = 0; + */ + public static final int OPERATOR_UNSPECIFIED_VALUE = 0; + /** + * 
+     * The results are required to satisfy each of the combined filters.
+     *
+ * + * AND = 1; + */ + public static final int AND_VALUE = 1; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static Operator valueOf(int value) { + return forNumber(value); + } + + public static Operator forNumber(int value) { + switch (value) { + case 0: return OPERATOR_UNSPECIFIED; + case 1: return AND; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + Operator> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Operator findValueByNumber(int number) { + return Operator.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.google.datastore.v1.CompositeFilter.getDescriptor().getEnumTypes().get(0); + } + + private static final Operator[] VALUES = values(); + + public static Operator valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private Operator(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.CompositeFilter.Operator) + } + + private int bitField0_; + public static final int OP_FIELD_NUMBER = 1; + private int op_; + /** + * 
+   * The operator for combining multiple filters.
+   *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + public int getOpValue() { + return op_; + } + /** + * 
+   * The operator for combining multiple filters.
+   *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + public com.google.datastore.v1.CompositeFilter.Operator getOp() { + com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); + return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; + } + + public static final int FILTERS_FIELD_NUMBER = 2; + private java.util.List filters_; + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public java.util.List getFiltersList() { + return filters_; + } + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public java.util.List + getFiltersOrBuilderList() { + return filters_; + } + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public int getFiltersCount() { + return filters_.size(); + } + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public com.google.datastore.v1.Filter getFilters(int index) { + return filters_.get(index); + } + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder( + int index) { + return filters_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) { + output.writeEnum(1, op_); + } + for (int i = 0; i < filters_.size(); i++) { + output.writeMessage(2, filters_.get(i)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, op_); + } + for (int i = 0; i < filters_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, filters_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.CompositeFilter)) { + return super.equals(obj); + } + com.google.datastore.v1.CompositeFilter other = (com.google.datastore.v1.CompositeFilter) obj; + + boolean result = true; + result = result && op_ == other.op_; + result = result && getFiltersList() + .equals(other.getFiltersList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + OP_FIELD_NUMBER; + hash = (53 * hash) + op_; + if (getFiltersCount() > 0) { + hash = (37 * hash) + FILTERS_FIELD_NUMBER; + hash = (53 * hash) + getFiltersList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.CompositeFilter parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CompositeFilter parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CompositeFilter parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CompositeFilter parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CompositeFilter parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.CompositeFilter parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.CompositeFilter parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CompositeFilter parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.CompositeFilter parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.CompositeFilter parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.CompositeFilter prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A filter that merges multiple other filters using the given operator.
+   *
+ * + * Protobuf type {@code google.datastore.v1.CompositeFilter} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.CompositeFilter) + com.google.datastore.v1.CompositeFilterOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.CompositeFilter.class, com.google.datastore.v1.CompositeFilter.Builder.class); + } + + // Construct using com.google.datastore.v1.CompositeFilter.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getFiltersFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + op_ = 0; + + if (filtersBuilder_ == null) { + filters_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + filtersBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; + } + + public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { + return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); + } + + public com.google.datastore.v1.CompositeFilter build() { + com.google.datastore.v1.CompositeFilter result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.CompositeFilter buildPartial() { + com.google.datastore.v1.CompositeFilter result = new com.google.datastore.v1.CompositeFilter(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.op_ = op_; + if (filtersBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + filters_ = java.util.Collections.unmodifiableList(filters_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.filters_ = filters_; + } else { + result.filters_ = filtersBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.CompositeFilter) { + return mergeFrom((com.google.datastore.v1.CompositeFilter)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) { + if (other == com.google.datastore.v1.CompositeFilter.getDefaultInstance()) return this; + if (other.op_ != 0) { + setOpValue(other.getOpValue()); + } + if (filtersBuilder_ == null) { + if (!other.filters_.isEmpty()) { + if (filters_.isEmpty()) { + filters_ = other.filters_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureFiltersIsMutable(); + filters_.addAll(other.filters_); + } + onChanged(); + } + } else { + if (!other.filters_.isEmpty()) { + if (filtersBuilder_.isEmpty()) { + filtersBuilder_.dispose(); + filtersBuilder_ = null; + filters_ = other.filters_; + bitField0_ = (bitField0_ & ~0x00000002); + filtersBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getFiltersFieldBuilder() : null; + } else { + filtersBuilder_.addAllMessages(other.filters_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.CompositeFilter parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.CompositeFilter) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private int op_ = 0; + /** + * 
+     * The operator for combining multiple filters.
+     *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + public int getOpValue() { + return op_; + } + /** + * 
+     * The operator for combining multiple filters.
+     *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + public Builder setOpValue(int value) { + op_ = value; + onChanged(); + return this; + } + /** + * 
+     * The operator for combining multiple filters.
+     *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + public com.google.datastore.v1.CompositeFilter.Operator getOp() { + com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); + return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; + } + /** + * 
+     * The operator for combining multiple filters.
+     *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) { + if (value == null) { + throw new NullPointerException(); + } + + op_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * The operator for combining multiple filters.
+     *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + public Builder clearOp() { + + op_ = 0; + onChanged(); + return this; + } + + private java.util.List filters_ = + java.util.Collections.emptyList(); + private void ensureFiltersIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + filters_ = new java.util.ArrayList(filters_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> filtersBuilder_; + + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public java.util.List getFiltersList() { + if (filtersBuilder_ == null) { + return java.util.Collections.unmodifiableList(filters_); + } else { + return filtersBuilder_.getMessageList(); + } + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public int getFiltersCount() { + if (filtersBuilder_ == null) { + return filters_.size(); + } else { + return filtersBuilder_.getCount(); + } + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public com.google.datastore.v1.Filter getFilters(int index) { + if (filtersBuilder_ == null) { + return filters_.get(index); + } else { + return filtersBuilder_.getMessage(index); + } + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder setFilters( + int index, com.google.datastore.v1.Filter value) { + if (filtersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFiltersIsMutable(); + filters_.set(index, value); + onChanged(); + } else { + filtersBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder setFilters( + int index, com.google.datastore.v1.Filter.Builder builderForValue) { + if (filtersBuilder_ == null) { + ensureFiltersIsMutable(); + filters_.set(index, builderForValue.build()); + onChanged(); + } else { + filtersBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder addFilters(com.google.datastore.v1.Filter value) { + if (filtersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFiltersIsMutable(); + filters_.add(value); + onChanged(); + } else { + filtersBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder addFilters( + int index, com.google.datastore.v1.Filter value) { + if (filtersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFiltersIsMutable(); + filters_.add(index, value); + onChanged(); + } else { + filtersBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder addFilters( + com.google.datastore.v1.Filter.Builder builderForValue) { + if (filtersBuilder_ == null) { + ensureFiltersIsMutable(); + filters_.add(builderForValue.build()); + onChanged(); + } else { + filtersBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder addFilters( + int index, com.google.datastore.v1.Filter.Builder builderForValue) { + if (filtersBuilder_ == null) { + ensureFiltersIsMutable(); + filters_.add(index, builderForValue.build()); + onChanged(); + } else { + filtersBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder addAllFilters( + java.lang.Iterable values) { + if (filtersBuilder_ == null) { + ensureFiltersIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, filters_); + onChanged(); + } else { + filtersBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder clearFilters() { + if (filtersBuilder_ == null) { + filters_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + filtersBuilder_.clear(); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public Builder removeFilters(int index) { + if (filtersBuilder_ == null) { + ensureFiltersIsMutable(); + filters_.remove(index); + onChanged(); + } else { + filtersBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public com.google.datastore.v1.Filter.Builder getFiltersBuilder( + int index) { + return getFiltersFieldBuilder().getBuilder(index); + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder( + int index) { + if (filtersBuilder_ == null) { + return filters_.get(index); } else { + return filtersBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public java.util.List + getFiltersOrBuilderList() { + if (filtersBuilder_ != null) { + return filtersBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(filters_); + } + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public com.google.datastore.v1.Filter.Builder addFiltersBuilder() { + return getFiltersFieldBuilder().addBuilder( + com.google.datastore.v1.Filter.getDefaultInstance()); + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public com.google.datastore.v1.Filter.Builder addFiltersBuilder( + int index) { + return getFiltersFieldBuilder().addBuilder( + index, com.google.datastore.v1.Filter.getDefaultInstance()); + } + /** + * 
+     * The list of filters to combine.
+     * Must contain at least one filter.
+     *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + public java.util.List + getFiltersBuilderList() { + return getFiltersFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> + getFiltersFieldBuilder() { + if (filtersBuilder_ == null) { + filtersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder>( + filters_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + filters_ = null; + } + return filtersBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.CompositeFilter) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.CompositeFilter) + private static final com.google.datastore.v1.CompositeFilter DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.CompositeFilter(); + } + + public static com.google.datastore.v1.CompositeFilter getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public CompositeFilter parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CompositeFilter(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..d3642bcdb223 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java @@ -0,0 +1,75 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface CompositeFilterOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.CompositeFilter) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The operator for combining multiple filters.
+   *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + int getOpValue(); + /** + * 
+   * The operator for combining multiple filters.
+   *
+ * + * .google.datastore.v1.CompositeFilter.Operator op = 1; + */ + com.google.datastore.v1.CompositeFilter.Operator getOp(); + + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + java.util.List + getFiltersList(); + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + com.google.datastore.v1.Filter getFilters(int index); + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + int getFiltersCount(); + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + java.util.List + getFiltersOrBuilderList(); + /** + * 
+   * The list of filters to combine.
+   * Must contain at least one filter.
+   *
+ * + * repeated .google.datastore.v1.Filter filters = 2; + */ + com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..0ef9ef973d45 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java @@ -0,0 +1,366 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public final class DatastoreProto { + private DatastoreProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_LookupRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_LookupResponse_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_RunQueryRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_RunQueryResponse_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_RollbackRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_RollbackResponse_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_CommitRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_CommitResponse_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Mutation_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Mutation_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_MutationResult_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_MutationResult_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_ReadOptions_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_TransactionOptions_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n#google/datastore/v1/datastore.proto\022\023g" + + "oogle.datastore.v1\032\034google/api/annotatio" + + "ns.proto\032 google/datastore/v1/entity.pro" + + "to\032\037google/datastore/v1/query.proto\"\203\001\n\r" + + "LookupRequest\022\022\n\nproject_id\030\010 \001(\t\0226\n\014rea" + + "d_options\030\001 \001(\0132 .google.datastore.v1.Re" + + "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" + + "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " + + "\003(\0132!.google.datastore.v1.EntityResult\0222" + + "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" + + "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" + + "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" + + "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" + + "oogle.datastore.v1.PartitionId\0226\n\014read_o" + + "ptions\030\001 \001(\0132 .google.datastore.v1.ReadO" + + "ptions\022+\n\005query\030\003 \001(\0132\032.google.datastore" + + ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." + + "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" + + "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" + + "e.datastore.v1.QueryResultBatch\022)\n\005query" + + "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" + + "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" + + "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." + + "datastore.v1.TransactionOptions\"/\n\030Begin" + + "TransactionResponse\022\023\n\013transaction\030\001 \001(\014" + + "\":\n\017RollbackRequest\022\022\n\nproject_id\030\010 \001(\t\022" + + "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" + + "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" + + "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" + + "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" + + "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" + + "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" + + "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" + + "\n\024transaction_selector\"f\n\016CommitResponse" + + "\022=\n\020mutation_results\030\003 \003(\0132#.google.data" + + "store.v1.MutationResult\022\025\n\rindex_updates" + + "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" + + "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" + + "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" + + "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" + + "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" + + "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" + + "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" + + "Mutation\022-\n\006insert\030\004 \001(\0132\033.google.datast" + + "ore.v1.EntityH\000\022-\n\006update\030\005 \001(\0132\033.google" + + ".datastore.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033" + + ".google.datastore.v1.EntityH\000\022*\n\006delete\030" + + "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" + + "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" + + "ct_detection_strategy\"c\n\016MutationResult\022" + + "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" + + "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" + + "(\010\"\325\001\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\"" + + "M\n\017ReadConsistency\022 \n\034READ_CONSISTENCY_U" + + "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" + + "\n\020consistency_type\"\343\001\n\022TransactionOption" + + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" + + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" + + "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" + + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" + + "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" + + "B\006\n\004mode2\354\007\n\tDatastore\022~\n\006Lookup\022\".googl" + + "e.datastore.v1.LookupRequest\032#.google.da" + + "tastore.v1.LookupResponse\"+\202\323\344\223\002%\" /v1/p" + + "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" + + "ery\022$.google.datastore.v1.RunQueryReques" + + "t\032%.google.datastore.v1.RunQueryResponse" + + "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" + + "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" + + "tastore.v1.BeginTransactionRequest\032-.goo" + + "gle.datastore.v1.BeginTransactionRespons" + + "e\"5\202\323\344\223\002/\"*/v1/projects/{project_id}:beg" + + "inTransaction:\001*\022~\n\006Commit\022\".google.data" + + "store.v1.CommitRequest\032#.google.datastor" + + "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" + + "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." + + "google.datastore.v1.RollbackRequest\032%.go" + + "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" + + "\002\'\"\"/v1/projects/{project_id}:rollback:\001" + + "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." + + "AllocateIdsRequest\032(.google.datastore.v1" + + ".AllocateIdsResponse\"0\202\323\344\223\002*\"%/v1/projec" + + "ts/{project_id}:allocateIds:\001*\022\216\001\n\nReser" + + "veIds\022&.google.datastore.v1.ReserveIdsRe" + + "quest\032\'.google.datastore.v1.ReserveIdsRe" + + "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" + + "}:reserveIds:\001*B\241\001\n\027com.google.datastore" + + ".v1B\016DatastoreProtoP\001Z + * A Datastore data object. + * An entity is limited to 1 megabyte when stored. That _roughly_ + * corresponds to a limit of 1 megabyte for the serialized form of this + * message. + * + * + * Protobuf type {@code google.datastore.v1.Entity} + */ +public final class Entity extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Entity) + EntityOrBuilder { +private static final long serialVersionUID = 0L; + // Use Entity.newBuilder() to construct. + private Entity(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Entity() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Entity( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.Key.Builder subBuilder = null; + if (key_ != null) { + subBuilder = key_.toBuilder(); + } + key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(key_); + key_ = subBuilder.buildPartial(); + } + + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + properties_ = com.google.protobuf.MapField.newMapField( + PropertiesDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000002; + } + com.google.protobuf.MapEntry + properties__ = input.readMessage( + PropertiesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + properties_.getMutableMap().put( + properties__.getKey(), properties__.getValue()); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMapField( + int number) { + switch (number) { + case 3: + return internalGetProperties(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class); + } + + private int bitField0_; + public static final int KEY_FIELD_NUMBER = 1; + private com.google.datastore.v1.Key key_; + /** + * 
+   * 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,
+   * or null if it has no key.
+   *
+ * + * .google.datastore.v1.Key key = 1; + */ + public boolean hasKey() { + return key_ != null; + } + /** + * 
+   * 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,
+   * or null if it has no key.
+   *
+ * + * .google.datastore.v1.Key key = 1; + */ + public com.google.datastore.v1.Key getKey() { + return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; + } + /** + * 
+   * 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,
+   * or null if it has no key.
+   *
+ * + * .google.datastore.v1.Key key = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { + return getKey(); + } + + public static final int PROPERTIES_FIELD_NUMBER = 3; + private static final class PropertiesDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.String, com.google.datastore.v1.Value> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.MESSAGE, + com.google.datastore.v1.Value.getDefaultInstance()); + } + private com.google.protobuf.MapField< + java.lang.String, com.google.datastore.v1.Value> properties_; + private com.google.protobuf.MapField + internalGetProperties() { + if (properties_ == null) { + return com.google.protobuf.MapField.emptyMapField( + PropertiesDefaultEntryHolder.defaultEntry); + } + return properties_; + } + + public int getPropertiesCount() { + return internalGetProperties().getMap().size(); + } + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public boolean containsProperties( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetProperties().getMap().containsKey(key); + } + /** + * Use {@link #getPropertiesMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getProperties() { + return getPropertiesMap(); + } + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public java.util.Map getPropertiesMap() { + return internalGetProperties().getMap(); + } + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public com.google.datastore.v1.Value getPropertiesOrDefault( + java.lang.String key, + com.google.datastore.v1.Value defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetProperties().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public com.google.datastore.v1.Value getPropertiesOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetProperties().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (key_ != null) { + output.writeMessage(1, getKey()); + } + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetProperties(), + PropertiesDefaultEntryHolder.defaultEntry, + 3); + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (key_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getKey()); + } + for (java.util.Map.Entry entry + : internalGetProperties().getMap().entrySet()) { + com.google.protobuf.MapEntry + properties__ = PropertiesDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, properties__); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Entity)) { + return super.equals(obj); + } + com.google.datastore.v1.Entity other = (com.google.datastore.v1.Entity) obj; + + boolean result = true; + result = result && (hasKey() == other.hasKey()); + if (hasKey()) { + result = result && getKey() + .equals(other.getKey()); + } + result = result && internalGetProperties().equals( + other.internalGetProperties()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasKey()) { + hash = (37 * hash) + KEY_FIELD_NUMBER; + hash = (53 * hash) + getKey().hashCode(); + } + if (!internalGetProperties().getMap().isEmpty()) { + hash = (37 * hash) + PROPERTIES_FIELD_NUMBER; + hash = (53 * hash) + internalGetProperties().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Entity parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Entity parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Entity parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Entity parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Entity parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Entity parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Entity parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Entity parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Entity parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Entity parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Entity parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Entity parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Entity prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A Datastore data object.
+   * An entity is limited to 1 megabyte when stored. That _roughly_
+   * corresponds to a limit of 1 megabyte for the serialized form of this
+   * message.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Entity} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Entity) + com.google.datastore.v1.EntityOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMapField( + int number) { + switch (number) { + case 3: + return internalGetProperties(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMutableMapField( + int number) { + switch (number) { + case 3: + return internalGetMutableProperties(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class); + } + + // Construct using com.google.datastore.v1.Entity.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + if (keyBuilder_ == null) { + key_ = null; + } else { + key_ = null; + keyBuilder_ = null; + } + internalGetMutableProperties().clear(); + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor; + } + + public com.google.datastore.v1.Entity getDefaultInstanceForType() { + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + + public com.google.datastore.v1.Entity build() { + com.google.datastore.v1.Entity result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Entity buildPartial() { + com.google.datastore.v1.Entity result = new com.google.datastore.v1.Entity(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (keyBuilder_ == null) { + result.key_ = key_; + } else { + result.key_ = keyBuilder_.build(); + } + result.properties_ = internalGetProperties(); + result.properties_.makeImmutable(); + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Entity) { + return mergeFrom((com.google.datastore.v1.Entity)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Entity other) { + if (other == com.google.datastore.v1.Entity.getDefaultInstance()) return this; + if (other.hasKey()) { + mergeKey(other.getKey()); + } + internalGetMutableProperties().mergeFrom( + other.internalGetProperties()); + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Entity parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Entity) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private com.google.datastore.v1.Key key_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_; + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public boolean hasKey() { + return keyBuilder_ != null || key_ != null; + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public com.google.datastore.v1.Key getKey() { + if (keyBuilder_ == null) { + return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; + } else { + return keyBuilder_.getMessage(); + } + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public Builder setKey(com.google.datastore.v1.Key value) { + if (keyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + key_ = value; + onChanged(); + } else { + keyBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public Builder setKey( + com.google.datastore.v1.Key.Builder builderForValue) { + if (keyBuilder_ == null) { + key_ = builderForValue.build(); + onChanged(); + } else { + keyBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public Builder mergeKey(com.google.datastore.v1.Key value) { + if (keyBuilder_ == null) { + if (key_ != null) { + key_ = + com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial(); + } else { + key_ = value; + } + onChanged(); + } else { + keyBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public Builder clearKey() { + if (keyBuilder_ == null) { + key_ = null; + onChanged(); + } else { + key_ = null; + keyBuilder_ = null; + } + + return this; + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public com.google.datastore.v1.Key.Builder getKeyBuilder() { + + onChanged(); + return getKeyFieldBuilder().getBuilder(); + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { + if (keyBuilder_ != null) { + return keyBuilder_.getMessageOrBuilder(); + } else { + return key_ == null ? + com.google.datastore.v1.Key.getDefaultInstance() : key_; + } + } + /** + * 
+     * 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,
+     * or null if it has no key.
+     *
+ * + * .google.datastore.v1.Key key = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getKeyFieldBuilder() { + if (keyBuilder_ == null) { + keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + getKey(), + getParentForChildren(), + isClean()); + key_ = null; + } + return keyBuilder_; + } + + private com.google.protobuf.MapField< + java.lang.String, com.google.datastore.v1.Value> properties_; + private com.google.protobuf.MapField + internalGetProperties() { + if (properties_ == null) { + return com.google.protobuf.MapField.emptyMapField( + PropertiesDefaultEntryHolder.defaultEntry); + } + return properties_; + } + private com.google.protobuf.MapField + internalGetMutableProperties() { + onChanged();; + if (properties_ == null) { + properties_ = com.google.protobuf.MapField.newMapField( + PropertiesDefaultEntryHolder.defaultEntry); + } + if (!properties_.isMutable()) { + properties_ = properties_.copy(); + } + return properties_; + } + + public int getPropertiesCount() { + return internalGetProperties().getMap().size(); + } + /** + * 
+     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The name must not contain more than 500 characters.
+     * The name cannot be `""`.
+     *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public boolean containsProperties( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetProperties().getMap().containsKey(key); + } + /** + * Use {@link #getPropertiesMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getProperties() { + return getPropertiesMap(); + } + /** + * 
+     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The name must not contain more than 500 characters.
+     * The name cannot be `""`.
+     *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public java.util.Map getPropertiesMap() { + return internalGetProperties().getMap(); + } + /** + * 
+     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The name must not contain more than 500 characters.
+     * The name cannot be `""`.
+     *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public com.google.datastore.v1.Value getPropertiesOrDefault( + java.lang.String key, + com.google.datastore.v1.Value defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetProperties().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * 
+     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The name must not contain more than 500 characters.
+     * The name cannot be `""`.
+     *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public com.google.datastore.v1.Value getPropertiesOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetProperties().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearProperties() { + internalGetMutableProperties().getMutableMap() + .clear(); + return this; + } + /** + * 
+     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The name must not contain more than 500 characters.
+     * The name cannot be `""`.
+     *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public Builder removeProperties( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + internalGetMutableProperties().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableProperties() { + return internalGetMutableProperties().getMutableMap(); + } + /** + * 
+     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The name must not contain more than 500 characters.
+     * The name cannot be `""`.
+     *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + public Builder putProperties( + java.lang.String key, + com.google.datastore.v1.Value value) { + if (key == null) { throw new java.lang.NullPointerException(); } + if (value == null) { throw new java.lang.NullPointerException(); } + internalGetMutableProperties().getMutableMap() + .put(key, value); + return this; + } + /** + * 
+     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The name must not contain more than 500 characters.
+     * The name cannot be `""`.
+     *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + public Builder putAllProperties( + java.util.Map values) { + internalGetMutableProperties().getMutableMap() + .putAll(values); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Entity) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Entity) + private static final com.google.datastore.v1.Entity DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Entity(); + } + + public static com.google.datastore.v1.Entity getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Entity parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Entity(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Entity getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..131d3e01f815 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java @@ -0,0 +1,125 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +public interface EntityOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Entity) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * 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,
+   * or null if it has no key.
+   *
+ * + * .google.datastore.v1.Key key = 1; + */ + 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,
+   * or null if it has no key.
+   *
+ * + * .google.datastore.v1.Key key = 1; + */ + 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,
+   * or null if it has no key.
+   *
+ * + * .google.datastore.v1.Key key = 1; + */ + com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder(); + + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + int getPropertiesCount(); + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + boolean containsProperties( + java.lang.String key); + /** + * Use {@link #getPropertiesMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getProperties(); + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + java.util.Map + getPropertiesMap(); + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + com.google.datastore.v1.Value getPropertiesOrDefault( + java.lang.String key, + com.google.datastore.v1.Value defaultValue); + /** + * 
+   * The entity's properties.
+   * The map's keys are property names.
+   * A property name matching regex `__.*__` is reserved.
+   * A reserved property name is forbidden in certain documented contexts.
+   * The name must not contain more than 500 characters.
+   * The name cannot be `""`.
+   *
+ * + * map<string, .google.datastore.v1.Value> properties = 3; + */ + + com.google.datastore.v1.Value getPropertiesOrThrow( + java.lang.String key); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java new file mode 100644 index 000000000000..880839ab0087 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java @@ -0,0 +1,161 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +public final class EntityProto { + private EntityProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_PartitionId_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_PartitionId_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Key_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Key_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Key_PathElement_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_ArrayValue_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Value_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Value_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Entity_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Entity_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Entity_PropertiesEntry_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n google/datastore/v1/entity.proto\022\023goog" + + "le.datastore.v1\032\034google/api/annotations." + + "proto\032\034google/protobuf/struct.proto\032\037goo" + + "gle/protobuf/timestamp.proto\032\030google/typ" + + "e/latlng.proto\"7\n\013PartitionId\022\022\n\nproject" + + "_id\030\002 \001(\t\022\024\n\014namespace_id\030\004 \001(\t\"\267\001\n\003Key\022" + + "6\n\014partition_id\030\001 \001(\0132 .google.datastore" + + ".v1.PartitionId\0222\n\004path\030\002 \003(\0132$.google.d" + + "atastore.v1.Key.PathElement\032D\n\013PathEleme" + + "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003" + + " \001(\tH\000B\t\n\007id_type\"8\n\nArrayValue\022*\n\006value" + + "s\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n\005" + + "Value\0220\n\nnull_value\030\013 \001(\0162\032.google.proto" + + "buf.NullValueH\000\022\027\n\rboolean_value\030\001 \001(\010H\000" + + "\022\027\n\rinteger_value\030\002 \001(\003H\000\022\026\n\014double_valu" + + "e\030\003 \001(\001H\000\0225\n\017timestamp_value\030\n \001(\0132\032.goo" + + "gle.protobuf.TimestampH\000\022-\n\tkey_value\030\005 " + + "\001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014strin" + + "g_value\030\021 \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n" + + "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat" + + "LngH\000\0223\n\014entity_value\030\006 \001(\0132\033.google.dat" + + "astore.v1.EntityH\000\0226\n\013array_value\030\t \001(\0132" + + "\037.google.datastore.v1.ArrayValueH\000\022\017\n\007me" + + "aning\030\016 \001(\005\022\034\n\024exclude_from_indexes\030\023 \001(" + + "\010B\014\n\nvalue_type\"\277\001\n\006Entity\022%\n\003key\030\001 \001(\0132" + + "\030.google.datastore.v1.Key\022?\n\nproperties\030" + + "\003 \003(\0132+.google.datastore.v1.Entity.Prope" + + "rtiesEntry\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001" + + "(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore.v1." + + "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E" + + "ntityProtoP\001Z + * The result of fetching an entity from Datastore. + * + * + * Protobuf type {@code google.datastore.v1.EntityResult} + */ +public final class EntityResult extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.EntityResult) + EntityResultOrBuilder { +private static final long serialVersionUID = 0L; + // Use EntityResult.newBuilder() to construct. + private EntityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private EntityResult() { + version_ = 0L; + cursor_ = com.google.protobuf.ByteString.EMPTY; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private EntityResult( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.Entity.Builder subBuilder = null; + if (entity_ != null) { + subBuilder = entity_.toBuilder(); + } + entity_ = input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(entity_); + entity_ = subBuilder.buildPartial(); + } + + break; + } + case 26: { + + cursor_ = input.readBytes(); + break; + } + case 32: { + + version_ = input.readInt64(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.EntityResult.class, com.google.datastore.v1.EntityResult.Builder.class); + } + + /** + * 
+   * Specifies what data the 'entity' field contains.
+   * A `ResultType` is either implied (for example, in `LookupResponse.missing`
+   * from `datastore.proto`, it is always `KEY_ONLY`) or specified by context
+   * (for example, in message `QueryResultBatch`, field `entity_result_type`
+   * specifies a `ResultType` for all the values in field `entity_results`).
+   *
+ * + * Protobuf enum {@code google.datastore.v1.EntityResult.ResultType} + */ + public enum ResultType + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+     * Unspecified. This value is never used.
+     *
+ * + * RESULT_TYPE_UNSPECIFIED = 0; + */ + RESULT_TYPE_UNSPECIFIED(0), + /** + * 
+     * The key and properties.
+     *
+ * + * FULL = 1; + */ + FULL(1), + /** + * 
+     * A projected subset of properties. The entity may have no key.
+     *
+ * + * PROJECTION = 2; + */ + PROJECTION(2), + /** + * 
+     * Only the key.
+     *
+ * + * KEY_ONLY = 3; + */ + KEY_ONLY(3), + UNRECOGNIZED(-1), + ; + + /** + * 
+     * Unspecified. This value is never used.
+     *
+ * + * RESULT_TYPE_UNSPECIFIED = 0; + */ + public static final int RESULT_TYPE_UNSPECIFIED_VALUE = 0; + /** + * 
+     * The key and properties.
+     *
+ * + * FULL = 1; + */ + public static final int FULL_VALUE = 1; + /** + * 
+     * A projected subset of properties. The entity may have no key.
+     *
+ * + * PROJECTION = 2; + */ + public static final int PROJECTION_VALUE = 2; + /** + * 
+     * Only the key.
+     *
+ * + * KEY_ONLY = 3; + */ + public static final int KEY_ONLY_VALUE = 3; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ResultType valueOf(int value) { + return forNumber(value); + } + + public static ResultType forNumber(int value) { + switch (value) { + case 0: return RESULT_TYPE_UNSPECIFIED; + case 1: return FULL; + case 2: return PROJECTION; + case 3: return KEY_ONLY; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + ResultType> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ResultType findValueByNumber(int number) { + return ResultType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.google.datastore.v1.EntityResult.getDescriptor().getEnumTypes().get(0); + } + + private static final ResultType[] VALUES = values(); + + public static ResultType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ResultType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.EntityResult.ResultType) + } + + public static final int ENTITY_FIELD_NUMBER = 1; + private com.google.datastore.v1.Entity entity_; + /** + * 
+   * The resulting entity.
+   *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public boolean hasEntity() { + return entity_ != null; + } + /** + * 
+   * The resulting entity.
+   *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public com.google.datastore.v1.Entity getEntity() { + return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_; + } + /** + * 
+   * The resulting entity.
+   *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() { + return getEntity(); + } + + public static final int VERSION_FIELD_NUMBER = 4; + private long version_; + /** + * 
+   * 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.
+   *
+ * + * int64 version = 4; + */ + public long getVersion() { + return version_; + } + + public static final int CURSOR_FIELD_NUMBER = 3; + private com.google.protobuf.ByteString cursor_; + /** + * 
+   * A cursor that points to the position after the result entity.
+   * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
+   *
+ * + * bytes cursor = 3; + */ + public com.google.protobuf.ByteString getCursor() { + return cursor_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (entity_ != null) { + output.writeMessage(1, getEntity()); + } + if (!cursor_.isEmpty()) { + output.writeBytes(3, cursor_); + } + if (version_ != 0L) { + output.writeInt64(4, version_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (entity_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getEntity()); + } + if (!cursor_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, cursor_); + } + if (version_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(4, version_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.EntityResult)) { + return super.equals(obj); + } + com.google.datastore.v1.EntityResult other = (com.google.datastore.v1.EntityResult) obj; + + boolean result = true; + result = result && (hasEntity() == other.hasEntity()); + if (hasEntity()) { + result = result && getEntity() + .equals(other.getEntity()); + } + result = result && (getVersion() + == other.getVersion()); + result = result && getCursor() + .equals(other.getCursor()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasEntity()) { + hash = (37 * hash) + ENTITY_FIELD_NUMBER; + hash = (53 * hash) + getEntity().hashCode(); + } + hash = (37 * hash) + VERSION_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getVersion()); + hash = (37 * hash) + CURSOR_FIELD_NUMBER; + hash = (53 * hash) + getCursor().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.EntityResult parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.EntityResult parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.EntityResult parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.EntityResult parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.EntityResult parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.EntityResult parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.EntityResult parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.EntityResult parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.EntityResult parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.EntityResult parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.EntityResult parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.EntityResult parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.EntityResult prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The result of fetching an entity from Datastore.
+   *
+ * + * Protobuf type {@code google.datastore.v1.EntityResult} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.EntityResult) + com.google.datastore.v1.EntityResultOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.EntityResult.class, com.google.datastore.v1.EntityResult.Builder.class); + } + + // Construct using com.google.datastore.v1.EntityResult.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + if (entityBuilder_ == null) { + entity_ = null; + } else { + entity_ = null; + entityBuilder_ = null; + } + version_ = 0L; + + cursor_ = com.google.protobuf.ByteString.EMPTY; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor; + } + + public com.google.datastore.v1.EntityResult getDefaultInstanceForType() { + return com.google.datastore.v1.EntityResult.getDefaultInstance(); + } + + public com.google.datastore.v1.EntityResult build() { + com.google.datastore.v1.EntityResult result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.EntityResult buildPartial() { + com.google.datastore.v1.EntityResult result = new com.google.datastore.v1.EntityResult(this); + if (entityBuilder_ == null) { + result.entity_ = entity_; + } else { + result.entity_ = entityBuilder_.build(); + } + result.version_ = version_; + result.cursor_ = cursor_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.EntityResult) { + return mergeFrom((com.google.datastore.v1.EntityResult)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.EntityResult other) { + if (other == com.google.datastore.v1.EntityResult.getDefaultInstance()) return this; + if (other.hasEntity()) { + mergeEntity(other.getEntity()); + } + if (other.getVersion() != 0L) { + setVersion(other.getVersion()); + } + if (other.getCursor() != com.google.protobuf.ByteString.EMPTY) { + setCursor(other.getCursor()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.EntityResult parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.EntityResult) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.datastore.v1.Entity entity_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityBuilder_; + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public boolean hasEntity() { + return entityBuilder_ != null || entity_ != null; + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public com.google.datastore.v1.Entity getEntity() { + if (entityBuilder_ == null) { + return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_; + } else { + return entityBuilder_.getMessage(); + } + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public Builder setEntity(com.google.datastore.v1.Entity value) { + if (entityBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + entity_ = value; + onChanged(); + } else { + entityBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public Builder setEntity( + com.google.datastore.v1.Entity.Builder builderForValue) { + if (entityBuilder_ == null) { + entity_ = builderForValue.build(); + onChanged(); + } else { + entityBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public Builder mergeEntity(com.google.datastore.v1.Entity value) { + if (entityBuilder_ == null) { + if (entity_ != null) { + entity_ = + com.google.datastore.v1.Entity.newBuilder(entity_).mergeFrom(value).buildPartial(); + } else { + entity_ = value; + } + onChanged(); + } else { + entityBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public Builder clearEntity() { + if (entityBuilder_ == null) { + entity_ = null; + onChanged(); + } else { + entity_ = null; + entityBuilder_ = null; + } + + return this; + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public com.google.datastore.v1.Entity.Builder getEntityBuilder() { + + onChanged(); + return getEntityFieldBuilder().getBuilder(); + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() { + if (entityBuilder_ != null) { + return entityBuilder_.getMessageOrBuilder(); + } else { + return entity_ == null ? + com.google.datastore.v1.Entity.getDefaultInstance() : entity_; + } + } + /** + * 
+     * The resulting entity.
+     *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> + getEntityFieldBuilder() { + if (entityBuilder_ == null) { + entityBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>( + getEntity(), + getParentForChildren(), + isClean()); + entity_ = null; + } + return entityBuilder_; + } + + private long version_ ; + /** + * 
+     * 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.
+     *
+ * + * int64 version = 4; + */ + public long getVersion() { + return version_; + } + /** + * 
+     * 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.
+     *
+ * + * int64 version = 4; + */ + public Builder setVersion(long value) { + + version_ = value; + onChanged(); + return this; + } + /** + * 
+     * 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.
+     *
+ * + * int64 version = 4; + */ + public Builder clearVersion() { + + version_ = 0L; + onChanged(); + return this; + } + + private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * A cursor that points to the position after the result entity.
+     * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
+     *
+ * + * bytes cursor = 3; + */ + public com.google.protobuf.ByteString getCursor() { + return cursor_; + } + /** + * 
+     * A cursor that points to the position after the result entity.
+     * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
+     *
+ * + * bytes cursor = 3; + */ + public Builder setCursor(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + cursor_ = value; + onChanged(); + return this; + } + /** + * 
+     * A cursor that points to the position after the result entity.
+     * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
+     *
+ * + * bytes cursor = 3; + */ + public Builder clearCursor() { + + cursor_ = getDefaultInstance().getCursor(); + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.EntityResult) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.EntityResult) + private static final com.google.datastore.v1.EntityResult DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.EntityResult(); + } + + public static com.google.datastore.v1.EntityResult getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public EntityResult parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new EntityResult(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.EntityResult getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..2bb2b1ff6b04 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java @@ -0,0 +1,59 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface EntityResultOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.EntityResult) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The resulting entity.
+   *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + boolean hasEntity(); + /** + * 
+   * The resulting entity.
+   *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + com.google.datastore.v1.Entity getEntity(); + /** + * 
+   * The resulting entity.
+   *
+ * + * .google.datastore.v1.Entity entity = 1; + */ + 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.
+   *
+ * + * int64 version = 4; + */ + long getVersion(); + + /** + * 
+   * A cursor that points to the position after the result entity.
+   * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
+   *
+ * + * bytes cursor = 3; + */ + com.google.protobuf.ByteString getCursor(); +} 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 new file mode 100644 index 000000000000..c4b2cf762023 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java @@ -0,0 +1,969 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A holder for any type of filter.
+ *
+ * + * Protobuf type {@code google.datastore.v1.Filter} + */ +public final class Filter extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Filter) + FilterOrBuilder { +private static final long serialVersionUID = 0L; + // Use Filter.newBuilder() to construct. + private Filter(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Filter() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Filter( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.CompositeFilter.Builder subBuilder = null; + if (filterTypeCase_ == 1) { + subBuilder = ((com.google.datastore.v1.CompositeFilter) filterType_).toBuilder(); + } + filterType_ = + input.readMessage(com.google.datastore.v1.CompositeFilter.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.CompositeFilter) filterType_); + filterType_ = subBuilder.buildPartial(); + } + filterTypeCase_ = 1; + break; + } + case 18: { + com.google.datastore.v1.PropertyFilter.Builder subBuilder = null; + if (filterTypeCase_ == 2) { + subBuilder = ((com.google.datastore.v1.PropertyFilter) filterType_).toBuilder(); + } + filterType_ = + input.readMessage(com.google.datastore.v1.PropertyFilter.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.PropertyFilter) filterType_); + filterType_ = subBuilder.buildPartial(); + } + filterTypeCase_ = 2; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Filter.class, com.google.datastore.v1.Filter.Builder.class); + } + + private int filterTypeCase_ = 0; + private java.lang.Object filterType_; + public enum FilterTypeCase + implements com.google.protobuf.Internal.EnumLite { + COMPOSITE_FILTER(1), + PROPERTY_FILTER(2), + FILTERTYPE_NOT_SET(0); + private final int value; + private FilterTypeCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static FilterTypeCase valueOf(int value) { + return forNumber(value); + } + + public static FilterTypeCase forNumber(int value) { + switch (value) { + case 1: return COMPOSITE_FILTER; + case 2: return PROPERTY_FILTER; + case 0: return FILTERTYPE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public FilterTypeCase + getFilterTypeCase() { + return FilterTypeCase.forNumber( + filterTypeCase_); + } + + public static final int COMPOSITE_FILTER_FIELD_NUMBER = 1; + /** + * 
+   * A composite filter.
+   *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public boolean hasCompositeFilter() { + return filterTypeCase_ == 1; + } + /** + * 
+   * A composite filter.
+   *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public com.google.datastore.v1.CompositeFilter getCompositeFilter() { + if (filterTypeCase_ == 1) { + return (com.google.datastore.v1.CompositeFilter) filterType_; + } + return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); + } + /** + * 
+   * A composite filter.
+   *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder() { + if (filterTypeCase_ == 1) { + return (com.google.datastore.v1.CompositeFilter) filterType_; + } + return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); + } + + public static final int PROPERTY_FILTER_FIELD_NUMBER = 2; + /** + * 
+   * A filter on a property.
+   *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public boolean hasPropertyFilter() { + return filterTypeCase_ == 2; + } + /** + * 
+   * A filter on a property.
+   *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public com.google.datastore.v1.PropertyFilter getPropertyFilter() { + if (filterTypeCase_ == 2) { + return (com.google.datastore.v1.PropertyFilter) filterType_; + } + return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); + } + /** + * 
+   * A filter on a property.
+   *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder() { + if (filterTypeCase_ == 2) { + return (com.google.datastore.v1.PropertyFilter) filterType_; + } + return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (filterTypeCase_ == 1) { + output.writeMessage(1, (com.google.datastore.v1.CompositeFilter) filterType_); + } + if (filterTypeCase_ == 2) { + output.writeMessage(2, (com.google.datastore.v1.PropertyFilter) filterType_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (filterTypeCase_ == 1) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, (com.google.datastore.v1.CompositeFilter) filterType_); + } + if (filterTypeCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, (com.google.datastore.v1.PropertyFilter) filterType_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Filter)) { + return super.equals(obj); + } + com.google.datastore.v1.Filter other = (com.google.datastore.v1.Filter) obj; + + boolean result = true; + result = result && getFilterTypeCase().equals( + other.getFilterTypeCase()); + if (!result) return false; + switch (filterTypeCase_) { + case 1: + result = result && getCompositeFilter() + .equals(other.getCompositeFilter()); + break; + case 2: + result = result && getPropertyFilter() + .equals(other.getPropertyFilter()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + switch (filterTypeCase_) { + case 1: + hash = (37 * hash) + COMPOSITE_FILTER_FIELD_NUMBER; + hash = (53 * hash) + getCompositeFilter().hashCode(); + break; + case 2: + hash = (37 * hash) + PROPERTY_FILTER_FIELD_NUMBER; + hash = (53 * hash) + getPropertyFilter().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Filter parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Filter parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Filter parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Filter parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Filter parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Filter parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Filter parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Filter parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Filter parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Filter parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Filter parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Filter parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Filter prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A holder for any type of filter.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Filter} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Filter) + com.google.datastore.v1.FilterOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Filter.class, com.google.datastore.v1.Filter.Builder.class); + } + + // Construct using com.google.datastore.v1.Filter.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + filterTypeCase_ = 0; + filterType_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; + } + + public com.google.datastore.v1.Filter getDefaultInstanceForType() { + return com.google.datastore.v1.Filter.getDefaultInstance(); + } + + public com.google.datastore.v1.Filter build() { + com.google.datastore.v1.Filter result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Filter buildPartial() { + com.google.datastore.v1.Filter result = new com.google.datastore.v1.Filter(this); + if (filterTypeCase_ == 1) { + if (compositeFilterBuilder_ == null) { + result.filterType_ = filterType_; + } else { + result.filterType_ = compositeFilterBuilder_.build(); + } + } + if (filterTypeCase_ == 2) { + if (propertyFilterBuilder_ == null) { + result.filterType_ = filterType_; + } else { + result.filterType_ = propertyFilterBuilder_.build(); + } + } + result.filterTypeCase_ = filterTypeCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Filter) { + return mergeFrom((com.google.datastore.v1.Filter)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Filter other) { + if (other == com.google.datastore.v1.Filter.getDefaultInstance()) return this; + switch (other.getFilterTypeCase()) { + case COMPOSITE_FILTER: { + mergeCompositeFilter(other.getCompositeFilter()); + break; + } + case PROPERTY_FILTER: { + mergePropertyFilter(other.getPropertyFilter()); + break; + } + case FILTERTYPE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Filter parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Filter) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int filterTypeCase_ = 0; + private java.lang.Object filterType_; + public FilterTypeCase + getFilterTypeCase() { + return FilterTypeCase.forNumber( + filterTypeCase_); + } + + public Builder clearFilterType() { + filterTypeCase_ = 0; + filterType_ = null; + onChanged(); + return this; + } + + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder> compositeFilterBuilder_; + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public boolean hasCompositeFilter() { + return filterTypeCase_ == 1; + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public com.google.datastore.v1.CompositeFilter getCompositeFilter() { + if (compositeFilterBuilder_ == null) { + if (filterTypeCase_ == 1) { + return (com.google.datastore.v1.CompositeFilter) filterType_; + } + return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); + } else { + if (filterTypeCase_ == 1) { + return compositeFilterBuilder_.getMessage(); + } + return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); + } + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public Builder setCompositeFilter(com.google.datastore.v1.CompositeFilter value) { + if (compositeFilterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + filterType_ = value; + onChanged(); + } else { + compositeFilterBuilder_.setMessage(value); + } + filterTypeCase_ = 1; + return this; + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public Builder setCompositeFilter( + com.google.datastore.v1.CompositeFilter.Builder builderForValue) { + if (compositeFilterBuilder_ == null) { + filterType_ = builderForValue.build(); + onChanged(); + } else { + compositeFilterBuilder_.setMessage(builderForValue.build()); + } + filterTypeCase_ = 1; + return this; + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter value) { + if (compositeFilterBuilder_ == null) { + if (filterTypeCase_ == 1 && + filterType_ != com.google.datastore.v1.CompositeFilter.getDefaultInstance()) { + filterType_ = com.google.datastore.v1.CompositeFilter.newBuilder((com.google.datastore.v1.CompositeFilter) filterType_) + .mergeFrom(value).buildPartial(); + } else { + filterType_ = value; + } + onChanged(); + } else { + if (filterTypeCase_ == 1) { + compositeFilterBuilder_.mergeFrom(value); + } + compositeFilterBuilder_.setMessage(value); + } + filterTypeCase_ = 1; + return this; + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public Builder clearCompositeFilter() { + if (compositeFilterBuilder_ == null) { + if (filterTypeCase_ == 1) { + filterTypeCase_ = 0; + filterType_ = null; + onChanged(); + } + } else { + if (filterTypeCase_ == 1) { + filterTypeCase_ = 0; + filterType_ = null; + } + compositeFilterBuilder_.clear(); + } + return this; + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public com.google.datastore.v1.CompositeFilter.Builder getCompositeFilterBuilder() { + return getCompositeFilterFieldBuilder().getBuilder(); + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder() { + if ((filterTypeCase_ == 1) && (compositeFilterBuilder_ != null)) { + return compositeFilterBuilder_.getMessageOrBuilder(); + } else { + if (filterTypeCase_ == 1) { + return (com.google.datastore.v1.CompositeFilter) filterType_; + } + return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); + } + } + /** + * 
+     * A composite filter.
+     *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder> + getCompositeFilterFieldBuilder() { + if (compositeFilterBuilder_ == null) { + if (!(filterTypeCase_ == 1)) { + filterType_ = com.google.datastore.v1.CompositeFilter.getDefaultInstance(); + } + compositeFilterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder>( + (com.google.datastore.v1.CompositeFilter) filterType_, + getParentForChildren(), + isClean()); + filterType_ = null; + } + filterTypeCase_ = 1; + onChanged();; + return compositeFilterBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder> propertyFilterBuilder_; + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public boolean hasPropertyFilter() { + return filterTypeCase_ == 2; + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public com.google.datastore.v1.PropertyFilter getPropertyFilter() { + if (propertyFilterBuilder_ == null) { + if (filterTypeCase_ == 2) { + return (com.google.datastore.v1.PropertyFilter) filterType_; + } + return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); + } else { + if (filterTypeCase_ == 2) { + return propertyFilterBuilder_.getMessage(); + } + return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); + } + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public Builder setPropertyFilter(com.google.datastore.v1.PropertyFilter value) { + if (propertyFilterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + filterType_ = value; + onChanged(); + } else { + propertyFilterBuilder_.setMessage(value); + } + filterTypeCase_ = 2; + return this; + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public Builder setPropertyFilter( + com.google.datastore.v1.PropertyFilter.Builder builderForValue) { + if (propertyFilterBuilder_ == null) { + filterType_ = builderForValue.build(); + onChanged(); + } else { + propertyFilterBuilder_.setMessage(builderForValue.build()); + } + filterTypeCase_ = 2; + return this; + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value) { + if (propertyFilterBuilder_ == null) { + if (filterTypeCase_ == 2 && + filterType_ != com.google.datastore.v1.PropertyFilter.getDefaultInstance()) { + filterType_ = com.google.datastore.v1.PropertyFilter.newBuilder((com.google.datastore.v1.PropertyFilter) filterType_) + .mergeFrom(value).buildPartial(); + } else { + filterType_ = value; + } + onChanged(); + } else { + if (filterTypeCase_ == 2) { + propertyFilterBuilder_.mergeFrom(value); + } + propertyFilterBuilder_.setMessage(value); + } + filterTypeCase_ = 2; + return this; + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public Builder clearPropertyFilter() { + if (propertyFilterBuilder_ == null) { + if (filterTypeCase_ == 2) { + filterTypeCase_ = 0; + filterType_ = null; + onChanged(); + } + } else { + if (filterTypeCase_ == 2) { + filterTypeCase_ = 0; + filterType_ = null; + } + propertyFilterBuilder_.clear(); + } + return this; + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public com.google.datastore.v1.PropertyFilter.Builder getPropertyFilterBuilder() { + return getPropertyFilterFieldBuilder().getBuilder(); + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder() { + if ((filterTypeCase_ == 2) && (propertyFilterBuilder_ != null)) { + return propertyFilterBuilder_.getMessageOrBuilder(); + } else { + if (filterTypeCase_ == 2) { + return (com.google.datastore.v1.PropertyFilter) filterType_; + } + return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); + } + } + /** + * 
+     * A filter on a property.
+     *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder> + getPropertyFilterFieldBuilder() { + if (propertyFilterBuilder_ == null) { + if (!(filterTypeCase_ == 2)) { + filterType_ = com.google.datastore.v1.PropertyFilter.getDefaultInstance(); + } + propertyFilterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder>( + (com.google.datastore.v1.PropertyFilter) filterType_, + getParentForChildren(), + isClean()); + filterType_ = null; + } + filterTypeCase_ = 2; + onChanged();; + return propertyFilterBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Filter) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Filter) + private static final com.google.datastore.v1.Filter DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Filter(); + } + + public static com.google.datastore.v1.Filter getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Filter parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Filter(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Filter getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..514085ad201e --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java @@ -0,0 +1,61 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface FilterOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Filter) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * A composite filter.
+   *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + boolean hasCompositeFilter(); + /** + * 
+   * A composite filter.
+   *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + com.google.datastore.v1.CompositeFilter getCompositeFilter(); + /** + * 
+   * A composite filter.
+   *
+ * + * .google.datastore.v1.CompositeFilter composite_filter = 1; + */ + com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder(); + + /** + * 
+   * A filter on a property.
+   *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + boolean hasPropertyFilter(); + /** + * 
+   * A filter on a property.
+   *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + com.google.datastore.v1.PropertyFilter getPropertyFilter(); + /** + * 
+   * A filter on a property.
+   *
+ * + * .google.datastore.v1.PropertyFilter property_filter = 2; + */ + com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder(); + + public 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 new file mode 100644 index 000000000000..7a0060dbb08a --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java @@ -0,0 +1,1504 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+ *
+ * + * Protobuf type {@code google.datastore.v1.GqlQuery} + */ +public final class GqlQuery extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQuery) + GqlQueryOrBuilder { +private static final long serialVersionUID = 0L; + // Use GqlQuery.newBuilder() to construct. + private GqlQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GqlQuery() { + queryString_ = ""; + allowLiterals_ = false; + positionalBindings_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private GqlQuery( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + queryString_ = s; + break; + } + case 16: { + + allowLiterals_ = input.readBool(); + break; + } + case 34: { + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + positionalBindings_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000008; + } + positionalBindings_.add( + input.readMessage(com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry)); + break; + } + case 42: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + namedBindings_ = com.google.protobuf.MapField.newMapField( + NamedBindingsDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000004; + } + com.google.protobuf.MapEntry + namedBindings__ = input.readMessage( + NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + namedBindings_.getMutableMap().put( + namedBindings__.getKey(), namedBindings__.getValue()); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMapField( + int number) { + switch (number) { + case 5: + return internalGetNamedBindings(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.GqlQuery.class, com.google.datastore.v1.GqlQuery.Builder.class); + } + + private int bitField0_; + public static final int QUERY_STRING_FIELD_NUMBER = 1; + private volatile java.lang.Object queryString_; + /** + * 
+   * A string of the format described
+   * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+   *
+ * + * string query_string = 1; + */ + public java.lang.String getQueryString() { + java.lang.Object ref = queryString_; + 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(); + queryString_ = s; + return s; + } + } + /** + * 
+   * A string of the format described
+   * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+   *
+ * + * string query_string = 1; + */ + public com.google.protobuf.ByteString + getQueryStringBytes() { + java.lang.Object ref = queryString_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + queryString_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int ALLOW_LITERALS_FIELD_NUMBER = 2; + private boolean allowLiterals_; + /** + * 
+   * When false, the query string must not contain any literals and instead must
+   * bind all values. For example,
+   * `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while
+   * `SELECT * FROM Kind WHERE a = @value` is.
+   *
+ * + * bool allow_literals = 2; + */ + public boolean getAllowLiterals() { + return allowLiterals_; + } + + public static final int NAMED_BINDINGS_FIELD_NUMBER = 5; + private static final class NamedBindingsDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.String, com.google.datastore.v1.GqlQueryParameter> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.MESSAGE, + com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()); + } + private com.google.protobuf.MapField< + java.lang.String, com.google.datastore.v1.GqlQueryParameter> namedBindings_; + private com.google.protobuf.MapField + internalGetNamedBindings() { + if (namedBindings_ == null) { + return com.google.protobuf.MapField.emptyMapField( + NamedBindingsDefaultEntryHolder.defaultEntry); + } + return namedBindings_; + } + + public int getNamedBindingsCount() { + return internalGetNamedBindings().getMap().size(); + } + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public boolean containsNamedBindings( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetNamedBindings().getMap().containsKey(key); + } + /** + * Use {@link #getNamedBindingsMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getNamedBindings() { + return getNamedBindingsMap(); + } + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public java.util.Map getNamedBindingsMap() { + return internalGetNamedBindings().getMap(); + } + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( + java.lang.String key, + com.google.datastore.v1.GqlQueryParameter defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetNamedBindings().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetNamedBindings().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public static final int POSITIONAL_BINDINGS_FIELD_NUMBER = 4; + private java.util.List positionalBindings_; + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public java.util.List getPositionalBindingsList() { + return positionalBindings_; + } + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public java.util.List + getPositionalBindingsOrBuilderList() { + return positionalBindings_; + } + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public int getPositionalBindingsCount() { + return positionalBindings_.size(); + } + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index) { + return positionalBindings_.get(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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder( + int index) { + return positionalBindings_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getQueryStringBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, queryString_); + } + if (allowLiterals_ != false) { + output.writeBool(2, allowLiterals_); + } + for (int i = 0; i < positionalBindings_.size(); i++) { + output.writeMessage(4, positionalBindings_.get(i)); + } + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetNamedBindings(), + NamedBindingsDefaultEntryHolder.defaultEntry, + 5); + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getQueryStringBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, queryString_); + } + if (allowLiterals_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(2, allowLiterals_); + } + for (int i = 0; i < positionalBindings_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, positionalBindings_.get(i)); + } + for (java.util.Map.Entry entry + : internalGetNamedBindings().getMap().entrySet()) { + com.google.protobuf.MapEntry + namedBindings__ = NamedBindingsDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, namedBindings__); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.GqlQuery)) { + return super.equals(obj); + } + com.google.datastore.v1.GqlQuery other = (com.google.datastore.v1.GqlQuery) obj; + + boolean result = true; + result = result && getQueryString() + .equals(other.getQueryString()); + result = result && (getAllowLiterals() + == other.getAllowLiterals()); + result = result && internalGetNamedBindings().equals( + other.internalGetNamedBindings()); + result = result && getPositionalBindingsList() + .equals(other.getPositionalBindingsList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + QUERY_STRING_FIELD_NUMBER; + hash = (53 * hash) + getQueryString().hashCode(); + hash = (37 * hash) + ALLOW_LITERALS_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getAllowLiterals()); + if (!internalGetNamedBindings().getMap().isEmpty()) { + hash = (37 * hash) + NAMED_BINDINGS_FIELD_NUMBER; + hash = (53 * hash) + internalGetNamedBindings().hashCode(); + } + if (getPositionalBindingsCount() > 0) { + hash = (37 * hash) + POSITIONAL_BINDINGS_FIELD_NUMBER; + hash = (53 * hash) + getPositionalBindingsList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.GqlQuery parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.GqlQuery parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.GqlQuery parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.GqlQuery parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.GqlQuery parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.GqlQuery parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.GqlQuery parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.GqlQuery parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.GqlQuery parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.GqlQuery parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.GqlQuery parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.GqlQuery parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.GqlQuery prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+   *
+ * + * Protobuf type {@code google.datastore.v1.GqlQuery} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.GqlQuery) + com.google.datastore.v1.GqlQueryOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMapField( + int number) { + switch (number) { + case 5: + return internalGetNamedBindings(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMutableMapField( + int number) { + switch (number) { + case 5: + return internalGetMutableNamedBindings(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.GqlQuery.class, com.google.datastore.v1.GqlQuery.Builder.class); + } + + // Construct using com.google.datastore.v1.GqlQuery.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPositionalBindingsFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + queryString_ = ""; + + allowLiterals_ = false; + + internalGetMutableNamedBindings().clear(); + if (positionalBindingsBuilder_ == null) { + positionalBindings_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + } else { + positionalBindingsBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor; + } + + public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + + public com.google.datastore.v1.GqlQuery build() { + com.google.datastore.v1.GqlQuery result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.GqlQuery buildPartial() { + com.google.datastore.v1.GqlQuery result = new com.google.datastore.v1.GqlQuery(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.queryString_ = queryString_; + result.allowLiterals_ = allowLiterals_; + result.namedBindings_ = internalGetNamedBindings(); + result.namedBindings_.makeImmutable(); + if (positionalBindingsBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { + positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.positionalBindings_ = positionalBindings_; + } else { + result.positionalBindings_ = positionalBindingsBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.GqlQuery) { + return mergeFrom((com.google.datastore.v1.GqlQuery)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) { + if (other == com.google.datastore.v1.GqlQuery.getDefaultInstance()) return this; + if (!other.getQueryString().isEmpty()) { + queryString_ = other.queryString_; + onChanged(); + } + if (other.getAllowLiterals() != false) { + setAllowLiterals(other.getAllowLiterals()); + } + internalGetMutableNamedBindings().mergeFrom( + other.internalGetNamedBindings()); + if (positionalBindingsBuilder_ == null) { + if (!other.positionalBindings_.isEmpty()) { + if (positionalBindings_.isEmpty()) { + positionalBindings_ = other.positionalBindings_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensurePositionalBindingsIsMutable(); + positionalBindings_.addAll(other.positionalBindings_); + } + onChanged(); + } + } else { + if (!other.positionalBindings_.isEmpty()) { + if (positionalBindingsBuilder_.isEmpty()) { + positionalBindingsBuilder_.dispose(); + positionalBindingsBuilder_ = null; + positionalBindings_ = other.positionalBindings_; + bitField0_ = (bitField0_ & ~0x00000008); + positionalBindingsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getPositionalBindingsFieldBuilder() : null; + } else { + positionalBindingsBuilder_.addAllMessages(other.positionalBindings_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.GqlQuery parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.GqlQuery) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.lang.Object queryString_ = ""; + /** + * 
+     * A string of the format described
+     * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+     *
+ * + * string query_string = 1; + */ + public java.lang.String getQueryString() { + java.lang.Object ref = queryString_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + queryString_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * A string of the format described
+     * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+     *
+ * + * string query_string = 1; + */ + public com.google.protobuf.ByteString + getQueryStringBytes() { + java.lang.Object ref = queryString_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + queryString_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * A string of the format described
+     * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+     *
+ * + * string query_string = 1; + */ + public Builder setQueryString( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + queryString_ = value; + onChanged(); + return this; + } + /** + * 
+     * A string of the format described
+     * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+     *
+ * + * string query_string = 1; + */ + public Builder clearQueryString() { + + queryString_ = getDefaultInstance().getQueryString(); + onChanged(); + return this; + } + /** + * 
+     * A string of the format described
+     * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+     *
+ * + * string query_string = 1; + */ + public Builder setQueryStringBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + queryString_ = value; + onChanged(); + return this; + } + + private boolean allowLiterals_ ; + /** + * 
+     * When false, the query string must not contain any literals and instead must
+     * bind all values. For example,
+     * `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while
+     * `SELECT * FROM Kind WHERE a = @value` is.
+     *
+ * + * bool allow_literals = 2; + */ + public boolean getAllowLiterals() { + return allowLiterals_; + } + /** + * 
+     * When false, the query string must not contain any literals and instead must
+     * bind all values. For example,
+     * `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while
+     * `SELECT * FROM Kind WHERE a = @value` is.
+     *
+ * + * bool allow_literals = 2; + */ + public Builder setAllowLiterals(boolean value) { + + allowLiterals_ = value; + onChanged(); + return this; + } + /** + * 
+     * When false, the query string must not contain any literals and instead must
+     * bind all values. For example,
+     * `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while
+     * `SELECT * FROM Kind WHERE a = @value` is.
+     *
+ * + * bool allow_literals = 2; + */ + public Builder clearAllowLiterals() { + + allowLiterals_ = false; + onChanged(); + return this; + } + + private com.google.protobuf.MapField< + java.lang.String, com.google.datastore.v1.GqlQueryParameter> namedBindings_; + private com.google.protobuf.MapField + internalGetNamedBindings() { + if (namedBindings_ == null) { + return com.google.protobuf.MapField.emptyMapField( + NamedBindingsDefaultEntryHolder.defaultEntry); + } + return namedBindings_; + } + private com.google.protobuf.MapField + internalGetMutableNamedBindings() { + onChanged();; + if (namedBindings_ == null) { + namedBindings_ = com.google.protobuf.MapField.newMapField( + NamedBindingsDefaultEntryHolder.defaultEntry); + } + if (!namedBindings_.isMutable()) { + namedBindings_ = namedBindings_.copy(); + } + return namedBindings_; + } + + public int getNamedBindingsCount() { + return internalGetNamedBindings().getMap().size(); + } + /** + * 
+     * 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 `""`.
+     *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public boolean containsNamedBindings( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetNamedBindings().getMap().containsKey(key); + } + /** + * Use {@link #getNamedBindingsMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getNamedBindings() { + return getNamedBindingsMap(); + } + /** + * 
+     * 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 `""`.
+     *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public java.util.Map getNamedBindingsMap() { + return internalGetNamedBindings().getMap(); + } + /** + * 
+     * 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 `""`.
+     *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( + java.lang.String key, + com.google.datastore.v1.GqlQueryParameter defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetNamedBindings().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * 
+     * 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 `""`.
+     *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetNamedBindings().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearNamedBindings() { + internalGetMutableNamedBindings().getMutableMap() + .clear(); + return this; + } + /** + * 
+     * 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 `""`.
+     *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public Builder removeNamedBindings( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + internalGetMutableNamedBindings().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableNamedBindings() { + return internalGetMutableNamedBindings().getMutableMap(); + } + /** + * 
+     * 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 `""`.
+     *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + public Builder putNamedBindings( + java.lang.String key, + com.google.datastore.v1.GqlQueryParameter value) { + if (key == null) { throw new java.lang.NullPointerException(); } + if (value == null) { throw new java.lang.NullPointerException(); } + internalGetMutableNamedBindings().getMutableMap() + .put(key, value); + return this; + } + /** + * 
+     * 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 `""`.
+     *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + public Builder putAllNamedBindings( + java.util.Map values) { + internalGetMutableNamedBindings().getMutableMap() + .putAll(values); + return this; + } + + private java.util.List positionalBindings_ = + java.util.Collections.emptyList(); + private void ensurePositionalBindingsIsMutable() { + if (!((bitField0_ & 0x00000008) == 0x00000008)) { + positionalBindings_ = new java.util.ArrayList(positionalBindings_); + bitField0_ |= 0x00000008; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder> positionalBindingsBuilder_; + + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public java.util.List getPositionalBindingsList() { + if (positionalBindingsBuilder_ == null) { + return java.util.Collections.unmodifiableList(positionalBindings_); + } else { + return positionalBindingsBuilder_.getMessageList(); + } + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public int getPositionalBindingsCount() { + if (positionalBindingsBuilder_ == null) { + return positionalBindings_.size(); + } else { + return positionalBindingsBuilder_.getCount(); + } + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index) { + if (positionalBindingsBuilder_ == null) { + return positionalBindings_.get(index); + } else { + return positionalBindingsBuilder_.getMessage(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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder setPositionalBindings( + int index, com.google.datastore.v1.GqlQueryParameter value) { + if (positionalBindingsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePositionalBindingsIsMutable(); + positionalBindings_.set(index, value); + onChanged(); + } else { + positionalBindingsBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder setPositionalBindings( + int index, com.google.datastore.v1.GqlQueryParameter.Builder builderForValue) { + if (positionalBindingsBuilder_ == null) { + ensurePositionalBindingsIsMutable(); + positionalBindings_.set(index, builderForValue.build()); + onChanged(); + } else { + positionalBindingsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder addPositionalBindings(com.google.datastore.v1.GqlQueryParameter value) { + if (positionalBindingsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePositionalBindingsIsMutable(); + positionalBindings_.add(value); + onChanged(); + } else { + positionalBindingsBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder addPositionalBindings( + int index, com.google.datastore.v1.GqlQueryParameter value) { + if (positionalBindingsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePositionalBindingsIsMutable(); + positionalBindings_.add(index, value); + onChanged(); + } else { + positionalBindingsBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder addPositionalBindings( + com.google.datastore.v1.GqlQueryParameter.Builder builderForValue) { + if (positionalBindingsBuilder_ == null) { + ensurePositionalBindingsIsMutable(); + positionalBindings_.add(builderForValue.build()); + onChanged(); + } else { + positionalBindingsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder addPositionalBindings( + int index, com.google.datastore.v1.GqlQueryParameter.Builder builderForValue) { + if (positionalBindingsBuilder_ == null) { + ensurePositionalBindingsIsMutable(); + positionalBindings_.add(index, builderForValue.build()); + onChanged(); + } else { + positionalBindingsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder addAllPositionalBindings( + java.lang.Iterable values) { + if (positionalBindingsBuilder_ == null) { + ensurePositionalBindingsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, positionalBindings_); + onChanged(); + } else { + positionalBindingsBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder clearPositionalBindings() { + if (positionalBindingsBuilder_ == null) { + positionalBindings_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + } else { + positionalBindingsBuilder_.clear(); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public Builder removePositionalBindings(int index) { + if (positionalBindingsBuilder_ == null) { + ensurePositionalBindingsIsMutable(); + positionalBindings_.remove(index); + onChanged(); + } else { + positionalBindingsBuilder_.remove(index); + } + return this; + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBuilder( + int index) { + return getPositionalBindingsFieldBuilder().getBuilder(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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder( + int index) { + if (positionalBindingsBuilder_ == null) { + return positionalBindings_.get(index); } else { + return positionalBindingsBuilder_.getMessageOrBuilder(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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public java.util.List + getPositionalBindingsOrBuilderList() { + if (positionalBindingsBuilder_ != null) { + return positionalBindingsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(positionalBindings_); + } + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBuilder() { + return getPositionalBindingsFieldBuilder().addBuilder( + com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()); + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBuilder( + int index) { + return getPositionalBindingsFieldBuilder().addBuilder( + index, com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()); + } + /** + * 
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + public java.util.List + getPositionalBindingsBuilderList() { + return getPositionalBindingsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder> + getPositionalBindingsFieldBuilder() { + if (positionalBindingsBuilder_ == null) { + positionalBindingsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder>( + positionalBindings_, + ((bitField0_ & 0x00000008) == 0x00000008), + getParentForChildren(), + isClean()); + positionalBindings_ = null; + } + return positionalBindingsBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.GqlQuery) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQuery) + private static final com.google.datastore.v1.GqlQuery DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.GqlQuery(); + } + + public static com.google.datastore.v1.GqlQuery getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public GqlQuery parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GqlQuery(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..8953cf34380b --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java @@ -0,0 +1,169 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface GqlQueryOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.GqlQuery) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * A string of the format described
+   * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+   *
+ * + * string query_string = 1; + */ + java.lang.String getQueryString(); + /** + * 
+   * A string of the format described
+   * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+   *
+ * + * string query_string = 1; + */ + com.google.protobuf.ByteString + getQueryStringBytes(); + + /** + * 
+   * When false, the query string must not contain any literals and instead must
+   * bind all values. For example,
+   * `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while
+   * `SELECT * FROM Kind WHERE a = @value` is.
+   *
+ * + * bool allow_literals = 2; + */ + boolean getAllowLiterals(); + + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + boolean containsNamedBindings( + java.lang.String key); + /** + * Use {@link #getNamedBindingsMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getNamedBindings(); + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + java.util.Map + getNamedBindingsMap(); + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( + java.lang.String key, + com.google.datastore.v1.GqlQueryParameter defaultValue); + /** + * 
+   * 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 `""`.
+   *
+ * + * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; + */ + + com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow( + java.lang.String key); + + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + java.util.List + getPositionalBindingsList(); + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + java.util.List + getPositionalBindingsOrBuilderList(); + /** + * 
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; + */ + com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..d0a1c0edc8e7 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java @@ -0,0 +1,812 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A binding parameter for a GQL query.
+ *
+ * + * Protobuf type {@code google.datastore.v1.GqlQueryParameter} + */ +public final class GqlQueryParameter extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQueryParameter) + GqlQueryParameterOrBuilder { +private static final long serialVersionUID = 0L; + // Use GqlQueryParameter.newBuilder() to construct. + private GqlQueryParameter(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GqlQueryParameter() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private GqlQueryParameter( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 18: { + com.google.datastore.v1.Value.Builder subBuilder = null; + if (parameterTypeCase_ == 2) { + subBuilder = ((com.google.datastore.v1.Value) parameterType_).toBuilder(); + } + parameterType_ = + input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Value) parameterType_); + parameterType_ = subBuilder.buildPartial(); + } + parameterTypeCase_ = 2; + break; + } + case 26: { + parameterTypeCase_ = 3; + parameterType_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.GqlQueryParameter.class, com.google.datastore.v1.GqlQueryParameter.Builder.class); + } + + private int parameterTypeCase_ = 0; + private java.lang.Object parameterType_; + public enum ParameterTypeCase + implements com.google.protobuf.Internal.EnumLite { + VALUE(2), + CURSOR(3), + PARAMETERTYPE_NOT_SET(0); + private final int value; + private ParameterTypeCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ParameterTypeCase valueOf(int value) { + return forNumber(value); + } + + public static ParameterTypeCase forNumber(int value) { + switch (value) { + case 2: return VALUE; + case 3: return CURSOR; + case 0: return PARAMETERTYPE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public ParameterTypeCase + getParameterTypeCase() { + return ParameterTypeCase.forNumber( + parameterTypeCase_); + } + + public static final int VALUE_FIELD_NUMBER = 2; + /** + * 
+   * A value parameter.
+   *
+ * + * .google.datastore.v1.Value value = 2; + */ + public boolean hasValue() { + return parameterTypeCase_ == 2; + } + /** + * 
+   * A value parameter.
+   *
+ * + * .google.datastore.v1.Value value = 2; + */ + public com.google.datastore.v1.Value getValue() { + if (parameterTypeCase_ == 2) { + return (com.google.datastore.v1.Value) parameterType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + /** + * 
+   * A value parameter.
+   *
+ * + * .google.datastore.v1.Value value = 2; + */ + public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { + if (parameterTypeCase_ == 2) { + return (com.google.datastore.v1.Value) parameterType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + + public static final int CURSOR_FIELD_NUMBER = 3; + /** + * 
+   * A query cursor. Query cursors are returned in query
+   * result batches.
+   *
+ * + * bytes cursor = 3; + */ + public com.google.protobuf.ByteString getCursor() { + if (parameterTypeCase_ == 3) { + return (com.google.protobuf.ByteString) parameterType_; + } + return com.google.protobuf.ByteString.EMPTY; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (parameterTypeCase_ == 2) { + output.writeMessage(2, (com.google.datastore.v1.Value) parameterType_); + } + if (parameterTypeCase_ == 3) { + output.writeBytes( + 3, (com.google.protobuf.ByteString) parameterType_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (parameterTypeCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, (com.google.datastore.v1.Value) parameterType_); + } + if (parameterTypeCase_ == 3) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize( + 3, (com.google.protobuf.ByteString) parameterType_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.GqlQueryParameter)) { + return super.equals(obj); + } + com.google.datastore.v1.GqlQueryParameter other = (com.google.datastore.v1.GqlQueryParameter) obj; + + boolean result = true; + result = result && getParameterTypeCase().equals( + other.getParameterTypeCase()); + if (!result) return false; + switch (parameterTypeCase_) { + case 2: + result = result && getValue() + .equals(other.getValue()); + break; + case 3: + result = result && getCursor() + .equals(other.getCursor()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + switch (parameterTypeCase_) { + case 2: + hash = (37 * hash) + VALUE_FIELD_NUMBER; + hash = (53 * hash) + getValue().hashCode(); + break; + case 3: + hash = (37 * hash) + CURSOR_FIELD_NUMBER; + hash = (53 * hash) + getCursor().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.GqlQueryParameter parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.GqlQueryParameter prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A binding parameter for a GQL query.
+   *
+ * + * Protobuf type {@code google.datastore.v1.GqlQueryParameter} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.GqlQueryParameter) + com.google.datastore.v1.GqlQueryParameterOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.GqlQueryParameter.class, com.google.datastore.v1.GqlQueryParameter.Builder.class); + } + + // Construct using com.google.datastore.v1.GqlQueryParameter.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + parameterTypeCase_ = 0; + parameterType_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; + } + + public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { + return com.google.datastore.v1.GqlQueryParameter.getDefaultInstance(); + } + + public com.google.datastore.v1.GqlQueryParameter build() { + com.google.datastore.v1.GqlQueryParameter result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.GqlQueryParameter buildPartial() { + com.google.datastore.v1.GqlQueryParameter result = new com.google.datastore.v1.GqlQueryParameter(this); + if (parameterTypeCase_ == 2) { + if (valueBuilder_ == null) { + result.parameterType_ = parameterType_; + } else { + result.parameterType_ = valueBuilder_.build(); + } + } + if (parameterTypeCase_ == 3) { + result.parameterType_ = parameterType_; + } + result.parameterTypeCase_ = parameterTypeCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.GqlQueryParameter) { + return mergeFrom((com.google.datastore.v1.GqlQueryParameter)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) { + if (other == com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()) return this; + switch (other.getParameterTypeCase()) { + case VALUE: { + mergeValue(other.getValue()); + break; + } + case CURSOR: { + setCursor(other.getCursor()); + break; + } + case PARAMETERTYPE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.GqlQueryParameter parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.GqlQueryParameter) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int parameterTypeCase_ = 0; + private java.lang.Object parameterType_; + public ParameterTypeCase + getParameterTypeCase() { + return ParameterTypeCase.forNumber( + parameterTypeCase_); + } + + public Builder clearParameterType() { + parameterTypeCase_ = 0; + parameterType_ = null; + onChanged(); + return this; + } + + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_; + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public boolean hasValue() { + return parameterTypeCase_ == 2; + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public com.google.datastore.v1.Value getValue() { + if (valueBuilder_ == null) { + if (parameterTypeCase_ == 2) { + return (com.google.datastore.v1.Value) parameterType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } else { + if (parameterTypeCase_ == 2) { + return valueBuilder_.getMessage(); + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public Builder setValue(com.google.datastore.v1.Value value) { + if (valueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + parameterType_ = value; + onChanged(); + } else { + valueBuilder_.setMessage(value); + } + parameterTypeCase_ = 2; + return this; + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public Builder setValue( + com.google.datastore.v1.Value.Builder builderForValue) { + if (valueBuilder_ == null) { + parameterType_ = builderForValue.build(); + onChanged(); + } else { + valueBuilder_.setMessage(builderForValue.build()); + } + parameterTypeCase_ = 2; + return this; + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public Builder mergeValue(com.google.datastore.v1.Value value) { + if (valueBuilder_ == null) { + if (parameterTypeCase_ == 2 && + parameterType_ != com.google.datastore.v1.Value.getDefaultInstance()) { + parameterType_ = com.google.datastore.v1.Value.newBuilder((com.google.datastore.v1.Value) parameterType_) + .mergeFrom(value).buildPartial(); + } else { + parameterType_ = value; + } + onChanged(); + } else { + if (parameterTypeCase_ == 2) { + valueBuilder_.mergeFrom(value); + } + valueBuilder_.setMessage(value); + } + parameterTypeCase_ = 2; + return this; + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public Builder clearValue() { + if (valueBuilder_ == null) { + if (parameterTypeCase_ == 2) { + parameterTypeCase_ = 0; + parameterType_ = null; + onChanged(); + } + } else { + if (parameterTypeCase_ == 2) { + parameterTypeCase_ = 0; + parameterType_ = null; + } + valueBuilder_.clear(); + } + return this; + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public com.google.datastore.v1.Value.Builder getValueBuilder() { + return getValueFieldBuilder().getBuilder(); + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { + if ((parameterTypeCase_ == 2) && (valueBuilder_ != null)) { + return valueBuilder_.getMessageOrBuilder(); + } else { + if (parameterTypeCase_ == 2) { + return (com.google.datastore.v1.Value) parameterType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * 
+     * A value parameter.
+     *
+ * + * .google.datastore.v1.Value value = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> + getValueFieldBuilder() { + if (valueBuilder_ == null) { + if (!(parameterTypeCase_ == 2)) { + parameterType_ = com.google.datastore.v1.Value.getDefaultInstance(); + } + valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>( + (com.google.datastore.v1.Value) parameterType_, + getParentForChildren(), + isClean()); + parameterType_ = null; + } + parameterTypeCase_ = 2; + onChanged();; + return valueBuilder_; + } + + /** + * 
+     * A query cursor. Query cursors are returned in query
+     * result batches.
+     *
+ * + * bytes cursor = 3; + */ + public com.google.protobuf.ByteString getCursor() { + if (parameterTypeCase_ == 3) { + return (com.google.protobuf.ByteString) parameterType_; + } + return com.google.protobuf.ByteString.EMPTY; + } + /** + * 
+     * A query cursor. Query cursors are returned in query
+     * result batches.
+     *
+ * + * bytes cursor = 3; + */ + public Builder setCursor(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + parameterTypeCase_ = 3; + parameterType_ = value; + onChanged(); + return this; + } + /** + * 
+     * A query cursor. Query cursors are returned in query
+     * result batches.
+     *
+ * + * bytes cursor = 3; + */ + public Builder clearCursor() { + if (parameterTypeCase_ == 3) { + parameterTypeCase_ = 0; + parameterType_ = null; + onChanged(); + } + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.GqlQueryParameter) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQueryParameter) + private static final com.google.datastore.v1.GqlQueryParameter DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.GqlQueryParameter(); + } + + public static com.google.datastore.v1.GqlQueryParameter getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public GqlQueryParameter parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GqlQueryParameter(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..d764a7260567 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java @@ -0,0 +1,46 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface GqlQueryParameterOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.GqlQueryParameter) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * A value parameter.
+   *
+ * + * .google.datastore.v1.Value value = 2; + */ + boolean hasValue(); + /** + * 
+   * A value parameter.
+   *
+ * + * .google.datastore.v1.Value value = 2; + */ + com.google.datastore.v1.Value getValue(); + /** + * 
+   * A value parameter.
+   *
+ * + * .google.datastore.v1.Value value = 2; + */ + com.google.datastore.v1.ValueOrBuilder getValueOrBuilder(); + + /** + * 
+   * A query cursor. Query cursors are returned in query
+   * result batches.
+   *
+ * + * bytes cursor = 3; + */ + com.google.protobuf.ByteString getCursor(); + + public 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 new file mode 100644 index 000000000000..337e4b440353 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java @@ -0,0 +1,2400 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +/** + * 
+ * A unique identifier for an entity.
+ * If a key's partition ID or any of its path kinds or names are
+ * reserved/read-only, the key is reserved/read-only.
+ * A reserved/read-only key is forbidden in certain documented contexts.
+ *
+ * + * Protobuf type {@code google.datastore.v1.Key} + */ +public final class Key extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Key) + KeyOrBuilder { +private static final long serialVersionUID = 0L; + // Use Key.newBuilder() to construct. + private Key(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Key() { + path_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Key( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.PartitionId.Builder subBuilder = null; + if (partitionId_ != null) { + subBuilder = partitionId_.toBuilder(); + } + partitionId_ = input.readMessage(com.google.datastore.v1.PartitionId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(partitionId_); + partitionId_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + path_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + path_.add( + input.readMessage(com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + path_ = java.util.Collections.unmodifiableList(path_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class); + } + + public interface PathElementOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Key.PathElement) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * 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 `""`.
+     *
+ * + * string kind = 1; + */ + 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 `""`.
+     *
+ * + * string kind = 1; + */ + 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.
+     *
+ * + * int64 id = 2; + */ + 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 `""`.
+     *
+ * + * string name = 3; + */ + 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 `""`.
+     *
+ * + * string name = 3; + */ + com.google.protobuf.ByteString + getNameBytes(); + + public 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.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Key.PathElement} + */ + public static final class PathElement extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Key.PathElement) + PathElementOrBuilder { + private static final long serialVersionUID = 0L; + // Use PathElement.newBuilder() to construct. + private PathElement(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PathElement() { + kind_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PathElement( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + kind_ = s; + break; + } + case 16: { + idTypeCase_ = 2; + idType_ = input.readInt64(); + break; + } + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + idTypeCase_ = 3; + idType_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Key.PathElement.class, com.google.datastore.v1.Key.PathElement.Builder.class); + } + + private int idTypeCase_ = 0; + private java.lang.Object idType_; + public enum IdTypeCase + implements com.google.protobuf.Internal.EnumLite { + ID(2), + NAME(3), + IDTYPE_NOT_SET(0); + private final int value; + private IdTypeCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static IdTypeCase valueOf(int value) { + return forNumber(value); + } + + public static IdTypeCase forNumber(int value) { + switch (value) { + case 2: return ID; + case 3: return NAME; + case 0: return IDTYPE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public IdTypeCase + getIdTypeCase() { + return IdTypeCase.forNumber( + idTypeCase_); + } + + public static final int KIND_FIELD_NUMBER = 1; + private volatile java.lang.Object kind_; + /** + * 
+     * 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 `""`.
+     *
+ * + * string kind = 1; + */ + public java.lang.String getKind() { + java.lang.Object ref = kind_; + 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(); + kind_ = s; + return s; + } + } + /** + * 
+     * 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 `""`.
+     *
+ * + * string kind = 1; + */ + public com.google.protobuf.ByteString + getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int ID_FIELD_NUMBER = 2; + /** + * 
+     * 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.
+     *
+ * + * int64 id = 2; + */ + public long getId() { + if (idTypeCase_ == 2) { + return (java.lang.Long) idType_; + } + return 0L; + } + + public static final int NAME_FIELD_NUMBER = 3; + /** + * 
+     * 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 `""`.
+     *
+ * + * string name = 3; + */ + public java.lang.String getName() { + java.lang.Object ref = ""; + if (idTypeCase_ == 3) { + ref = idType_; + } + 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(); + if (idTypeCase_ == 3) { + idType_ = s; + } + return s; + } + } + /** + * 
+     * 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 `""`.
+     *
+ * + * string name = 3; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = ""; + if (idTypeCase_ == 3) { + ref = idType_; + } + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (idTypeCase_ == 3) { + idType_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getKindBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kind_); + } + if (idTypeCase_ == 2) { + output.writeInt64( + 2, (long)((java.lang.Long) idType_)); + } + if (idTypeCase_ == 3) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, idType_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getKindBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kind_); + } + if (idTypeCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size( + 2, (long)((java.lang.Long) idType_)); + } + if (idTypeCase_ == 3) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, idType_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Key.PathElement)) { + return super.equals(obj); + } + com.google.datastore.v1.Key.PathElement other = (com.google.datastore.v1.Key.PathElement) obj; + + boolean result = true; + result = result && getKind() + .equals(other.getKind()); + result = result && getIdTypeCase().equals( + other.getIdTypeCase()); + if (!result) return false; + switch (idTypeCase_) { + case 2: + result = result && (getId() + == other.getId()); + break; + case 3: + result = result && getName() + .equals(other.getName()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + getKind().hashCode(); + switch (idTypeCase_) { + case 2: + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getId()); + break; + case 3: + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Key.PathElement parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Key.PathElement parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Key.PathElement parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Key.PathElement parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Key.PathElement parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Key.PathElement parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Key.PathElement parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Key.PathElement parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Key.PathElement parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Key.PathElement parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Key.PathElement prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * 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.
+     *
+ * + * Protobuf type {@code google.datastore.v1.Key.PathElement} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Key.PathElement) + com.google.datastore.v1.Key.PathElementOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Key.PathElement.class, com.google.datastore.v1.Key.PathElement.Builder.class); + } + + // Construct using com.google.datastore.v1.Key.PathElement.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + kind_ = ""; + + idTypeCase_ = 0; + idType_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; + } + + public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { + return com.google.datastore.v1.Key.PathElement.getDefaultInstance(); + } + + public com.google.datastore.v1.Key.PathElement build() { + com.google.datastore.v1.Key.PathElement result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Key.PathElement buildPartial() { + com.google.datastore.v1.Key.PathElement result = new com.google.datastore.v1.Key.PathElement(this); + result.kind_ = kind_; + if (idTypeCase_ == 2) { + result.idType_ = idType_; + } + if (idTypeCase_ == 3) { + result.idType_ = idType_; + } + result.idTypeCase_ = idTypeCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Key.PathElement) { + return mergeFrom((com.google.datastore.v1.Key.PathElement)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) { + if (other == com.google.datastore.v1.Key.PathElement.getDefaultInstance()) return this; + if (!other.getKind().isEmpty()) { + kind_ = other.kind_; + onChanged(); + } + switch (other.getIdTypeCase()) { + case ID: { + setId(other.getId()); + break; + } + case NAME: { + idTypeCase_ = 3; + idType_ = other.idType_; + onChanged(); + break; + } + case IDTYPE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Key.PathElement parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Key.PathElement) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int idTypeCase_ = 0; + private java.lang.Object idType_; + public IdTypeCase + getIdTypeCase() { + return IdTypeCase.forNumber( + idTypeCase_); + } + + public Builder clearIdType() { + idTypeCase_ = 0; + idType_ = null; + onChanged(); + return this; + } + + + private java.lang.Object kind_ = ""; + /** + * 
+       * 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 `""`.
+       *
+ * + * string kind = 1; + */ + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string kind = 1; + */ + public com.google.protobuf.ByteString + getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string kind = 1; + */ + public Builder setKind( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kind_ = value; + onChanged(); + return this; + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string kind = 1; + */ + public Builder clearKind() { + + kind_ = getDefaultInstance().getKind(); + onChanged(); + return this; + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string kind = 1; + */ + public Builder setKindBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kind_ = value; + onChanged(); + return this; + } + + /** + * 
+       * 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.
+       *
+ * + * int64 id = 2; + */ + public long getId() { + if (idTypeCase_ == 2) { + return (java.lang.Long) idType_; + } + return 0L; + } + /** + * 
+       * 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.
+       *
+ * + * int64 id = 2; + */ + public Builder setId(long value) { + idTypeCase_ = 2; + idType_ = value; + onChanged(); + return this; + } + /** + * 
+       * 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.
+       *
+ * + * int64 id = 2; + */ + public Builder clearId() { + if (idTypeCase_ == 2) { + idTypeCase_ = 0; + idType_ = null; + onChanged(); + } + return this; + } + + /** + * 
+       * 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 `""`.
+       *
+ * + * string name = 3; + */ + public java.lang.String getName() { + java.lang.Object ref = ""; + if (idTypeCase_ == 3) { + ref = idType_; + } + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (idTypeCase_ == 3) { + idType_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string name = 3; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = ""; + if (idTypeCase_ == 3) { + ref = idType_; + } + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (idTypeCase_ == 3) { + idType_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string name = 3; + */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + idTypeCase_ = 3; + idType_ = value; + onChanged(); + return this; + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string name = 3; + */ + public Builder clearName() { + if (idTypeCase_ == 3) { + idTypeCase_ = 0; + idType_ = null; + onChanged(); + } + return this; + } + /** + * 
+       * 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 `""`.
+       *
+ * + * string name = 3; + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + idTypeCase_ = 3; + idType_ = value; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Key.PathElement) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Key.PathElement) + private static final com.google.datastore.v1.Key.PathElement DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Key.PathElement(); + } + + public static com.google.datastore.v1.Key.PathElement getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public PathElement parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PathElement(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private int bitField0_; + public static final int PARTITION_ID_FIELD_NUMBER = 1; + private com.google.datastore.v1.PartitionId partitionId_; + /** + * 
+   * Entities are partitioned into subsets, currently identified by a project
+   * ID and namespace ID.
+   * Queries are scoped to a single partition.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public boolean hasPartitionId() { + return partitionId_ != null; + } + /** + * 
+   * Entities are partitioned into subsets, currently identified by a project
+   * ID and namespace ID.
+   * Queries are scoped to a single partition.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public com.google.datastore.v1.PartitionId getPartitionId() { + return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; + } + /** + * 
+   * Entities are partitioned into subsets, currently identified by a project
+   * ID and namespace ID.
+   * Queries are scoped to a single partition.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { + return getPartitionId(); + } + + public static final int PATH_FIELD_NUMBER = 2; + private java.util.List path_; + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public java.util.List getPathList() { + return path_; + } + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public java.util.List + getPathOrBuilderList() { + return path_; + } + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public int getPathCount() { + return path_.size(); + } + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public com.google.datastore.v1.Key.PathElement getPath(int index) { + return path_.get(index); + } + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder( + int index) { + return path_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (partitionId_ != null) { + output.writeMessage(1, getPartitionId()); + } + for (int i = 0; i < path_.size(); i++) { + output.writeMessage(2, path_.get(i)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (partitionId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getPartitionId()); + } + for (int i = 0; i < path_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, path_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Key)) { + return super.equals(obj); + } + com.google.datastore.v1.Key other = (com.google.datastore.v1.Key) obj; + + boolean result = true; + result = result && (hasPartitionId() == other.hasPartitionId()); + if (hasPartitionId()) { + result = result && getPartitionId() + .equals(other.getPartitionId()); + } + result = result && getPathList() + .equals(other.getPathList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPartitionId()) { + hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER; + hash = (53 * hash) + getPartitionId().hashCode(); + } + if (getPathCount() > 0) { + hash = (37 * hash) + PATH_FIELD_NUMBER; + hash = (53 * hash) + getPathList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Key parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Key parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Key parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Key parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Key parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Key parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Key parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Key parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Key parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Key parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Key parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Key parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Key prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A unique identifier for an entity.
+   * If a key's partition ID or any of its path kinds or names are
+   * reserved/read-only, the key is reserved/read-only.
+   * A reserved/read-only key is forbidden in certain documented contexts.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Key} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Key) + com.google.datastore.v1.KeyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class); + } + + // Construct using com.google.datastore.v1.Key.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPathFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + if (partitionIdBuilder_ == null) { + partitionId_ = null; + } else { + partitionId_ = null; + partitionIdBuilder_ = null; + } + if (pathBuilder_ == null) { + path_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + pathBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; + } + + public com.google.datastore.v1.Key getDefaultInstanceForType() { + return com.google.datastore.v1.Key.getDefaultInstance(); + } + + public com.google.datastore.v1.Key build() { + com.google.datastore.v1.Key result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Key buildPartial() { + com.google.datastore.v1.Key result = new com.google.datastore.v1.Key(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (partitionIdBuilder_ == null) { + result.partitionId_ = partitionId_; + } else { + result.partitionId_ = partitionIdBuilder_.build(); + } + if (pathBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + path_ = java.util.Collections.unmodifiableList(path_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.path_ = path_; + } else { + result.path_ = pathBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Key) { + return mergeFrom((com.google.datastore.v1.Key)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Key other) { + if (other == com.google.datastore.v1.Key.getDefaultInstance()) return this; + if (other.hasPartitionId()) { + mergePartitionId(other.getPartitionId()); + } + if (pathBuilder_ == null) { + if (!other.path_.isEmpty()) { + if (path_.isEmpty()) { + path_ = other.path_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensurePathIsMutable(); + path_.addAll(other.path_); + } + onChanged(); + } + } else { + if (!other.path_.isEmpty()) { + if (pathBuilder_.isEmpty()) { + pathBuilder_.dispose(); + pathBuilder_ = null; + path_ = other.path_; + bitField0_ = (bitField0_ & ~0x00000002); + pathBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getPathFieldBuilder() : null; + } else { + pathBuilder_.addAllMessages(other.path_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Key parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Key) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private com.google.datastore.v1.PartitionId partitionId_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_; + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public boolean hasPartitionId() { + return partitionIdBuilder_ != null || partitionId_ != null; + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public com.google.datastore.v1.PartitionId getPartitionId() { + if (partitionIdBuilder_ == null) { + return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; + } else { + return partitionIdBuilder_.getMessage(); + } + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public Builder setPartitionId(com.google.datastore.v1.PartitionId value) { + if (partitionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + partitionId_ = value; + onChanged(); + } else { + partitionIdBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public Builder setPartitionId( + com.google.datastore.v1.PartitionId.Builder builderForValue) { + if (partitionIdBuilder_ == null) { + partitionId_ = builderForValue.build(); + onChanged(); + } else { + partitionIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) { + if (partitionIdBuilder_ == null) { + if (partitionId_ != null) { + partitionId_ = + com.google.datastore.v1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial(); + } else { + partitionId_ = value; + } + onChanged(); + } else { + partitionIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public Builder clearPartitionId() { + if (partitionIdBuilder_ == null) { + partitionId_ = null; + onChanged(); + } else { + partitionId_ = null; + partitionIdBuilder_ = null; + } + + return this; + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() { + + onChanged(); + return getPartitionIdFieldBuilder().getBuilder(); + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { + if (partitionIdBuilder_ != null) { + return partitionIdBuilder_.getMessageOrBuilder(); + } else { + return partitionId_ == null ? + com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; + } + } + /** + * 
+     * Entities are partitioned into subsets, currently identified by a project
+     * ID and namespace ID.
+     * Queries are scoped to a single partition.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> + getPartitionIdFieldBuilder() { + if (partitionIdBuilder_ == null) { + partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder>( + getPartitionId(), + getParentForChildren(), + isClean()); + partitionId_ = null; + } + return partitionIdBuilder_; + } + + private java.util.List path_ = + java.util.Collections.emptyList(); + private void ensurePathIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + path_ = new java.util.ArrayList(path_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder> pathBuilder_; + + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public java.util.List getPathList() { + if (pathBuilder_ == null) { + return java.util.Collections.unmodifiableList(path_); + } else { + return pathBuilder_.getMessageList(); + } + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public int getPathCount() { + if (pathBuilder_ == null) { + return path_.size(); + } else { + return pathBuilder_.getCount(); + } + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public com.google.datastore.v1.Key.PathElement getPath(int index) { + if (pathBuilder_ == null) { + return path_.get(index); + } else { + return pathBuilder_.getMessage(index); + } + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder setPath( + int index, com.google.datastore.v1.Key.PathElement value) { + if (pathBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePathIsMutable(); + path_.set(index, value); + onChanged(); + } else { + pathBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder setPath( + int index, com.google.datastore.v1.Key.PathElement.Builder builderForValue) { + if (pathBuilder_ == null) { + ensurePathIsMutable(); + path_.set(index, builderForValue.build()); + onChanged(); + } else { + pathBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder addPath(com.google.datastore.v1.Key.PathElement value) { + if (pathBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePathIsMutable(); + path_.add(value); + onChanged(); + } else { + pathBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder addPath( + int index, com.google.datastore.v1.Key.PathElement value) { + if (pathBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePathIsMutable(); + path_.add(index, value); + onChanged(); + } else { + pathBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder addPath( + com.google.datastore.v1.Key.PathElement.Builder builderForValue) { + if (pathBuilder_ == null) { + ensurePathIsMutable(); + path_.add(builderForValue.build()); + onChanged(); + } else { + pathBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder addPath( + int index, com.google.datastore.v1.Key.PathElement.Builder builderForValue) { + if (pathBuilder_ == null) { + ensurePathIsMutable(); + path_.add(index, builderForValue.build()); + onChanged(); + } else { + pathBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder addAllPath( + java.lang.Iterable values) { + if (pathBuilder_ == null) { + ensurePathIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, path_); + onChanged(); + } else { + pathBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder clearPath() { + if (pathBuilder_ == null) { + path_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + pathBuilder_.clear(); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public Builder removePath(int index) { + if (pathBuilder_ == null) { + ensurePathIsMutable(); + path_.remove(index); + onChanged(); + } else { + pathBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder( + int index) { + return getPathFieldBuilder().getBuilder(index); + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder( + int index) { + if (pathBuilder_ == null) { + return path_.get(index); } else { + return pathBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public java.util.List + getPathOrBuilderList() { + if (pathBuilder_ != null) { + return pathBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(path_); + } + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() { + return getPathFieldBuilder().addBuilder( + com.google.datastore.v1.Key.PathElement.getDefaultInstance()); + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder( + int index) { + return getPathFieldBuilder().addBuilder( + index, com.google.datastore.v1.Key.PathElement.getDefaultInstance()); + } + /** + * 
+     * The entity path.
+     * An entity path consists of one or more elements composed of a kind and a
+     * string or numerical identifier, which identify entities. The first
+     * element identifies a _root entity_, the second element identifies
+     * 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.
+     *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + public java.util.List + getPathBuilderList() { + return getPathFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder> + getPathFieldBuilder() { + if (pathBuilder_ == null) { + pathBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder>( + path_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + path_ = null; + } + return pathBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Key) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Key) + private static final com.google.datastore.v1.Key DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Key(); + } + + public static com.google.datastore.v1.Key getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Key parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Key(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Key getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..c50a8f56d715 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java @@ -0,0 +1,149 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +public interface KeyOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Key) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * Entities are partitioned into subsets, currently identified by a project
+   * ID and namespace ID.
+   * Queries are scoped to a single partition.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + boolean hasPartitionId(); + /** + * 
+   * Entities are partitioned into subsets, currently identified by a project
+   * ID and namespace ID.
+   * Queries are scoped to a single partition.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + com.google.datastore.v1.PartitionId getPartitionId(); + /** + * 
+   * Entities are partitioned into subsets, currently identified by a project
+   * ID and namespace ID.
+   * Queries are scoped to a single partition.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 1; + */ + com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder(); + + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + java.util.List + getPathList(); + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + com.google.datastore.v1.Key.PathElement getPath(int index); + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + int getPathCount(); + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + java.util.List + getPathOrBuilderList(); + /** + * 
+   * The entity path.
+   * An entity path consists of one or more elements composed of a kind and a
+   * string or numerical identifier, which identify entities. The first
+   * element identifies a _root entity_, the second element identifies
+   * 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.
+   *
+ * + * repeated .google.datastore.v1.Key.PathElement path = 2; + */ + com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..db90f1cd4313 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java @@ -0,0 +1,552 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A representation of a kind.
+ *
+ * + * Protobuf type {@code google.datastore.v1.KindExpression} + */ +public final class KindExpression extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.KindExpression) + KindExpressionOrBuilder { +private static final long serialVersionUID = 0L; + // Use KindExpression.newBuilder() to construct. + private KindExpression(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private KindExpression() { + name_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private KindExpression( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.KindExpression.class, com.google.datastore.v1.KindExpression.Builder.class); + } + + public static final int NAME_FIELD_NUMBER = 1; + private volatile java.lang.Object name_; + /** + * 
+   * The name of the kind.
+   *
+ * + * string name = 1; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + 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(); + name_ = s; + return s; + } + } + /** + * 
+   * The name of the kind.
+   *
+ * + * string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.KindExpression)) { + return super.equals(obj); + } + com.google.datastore.v1.KindExpression other = (com.google.datastore.v1.KindExpression) obj; + + boolean result = true; + result = result && getName() + .equals(other.getName()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.KindExpression parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.KindExpression parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.KindExpression parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.KindExpression parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.KindExpression parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.KindExpression parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.KindExpression parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.KindExpression parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.KindExpression parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.KindExpression parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.KindExpression parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.KindExpression parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.KindExpression prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A representation of a kind.
+   *
+ * + * Protobuf type {@code google.datastore.v1.KindExpression} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.KindExpression) + com.google.datastore.v1.KindExpressionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.KindExpression.class, com.google.datastore.v1.KindExpression.Builder.class); + } + + // Construct using com.google.datastore.v1.KindExpression.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + name_ = ""; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; + } + + public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { + return com.google.datastore.v1.KindExpression.getDefaultInstance(); + } + + public com.google.datastore.v1.KindExpression build() { + com.google.datastore.v1.KindExpression result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.KindExpression buildPartial() { + com.google.datastore.v1.KindExpression result = new com.google.datastore.v1.KindExpression(this); + result.name_ = name_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.KindExpression) { + return mergeFrom((com.google.datastore.v1.KindExpression)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.KindExpression other) { + if (other == com.google.datastore.v1.KindExpression.getDefaultInstance()) return this; + if (!other.getName().isEmpty()) { + name_ = other.name_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.KindExpression parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.KindExpression) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object name_ = ""; + /** + * 
+     * The name of the kind.
+     *
+ * + * string name = 1; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The name of the kind.
+     *
+ * + * string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The name of the kind.
+     *
+ * + * string name = 1; + */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + name_ = value; + onChanged(); + return this; + } + /** + * 
+     * The name of the kind.
+     *
+ * + * string name = 1; + */ + public Builder clearName() { + + name_ = getDefaultInstance().getName(); + onChanged(); + return this; + } + /** + * 
+     * The name of the kind.
+     *
+ * + * string name = 1; + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + name_ = value; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.KindExpression) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.KindExpression) + private static final com.google.datastore.v1.KindExpression DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.KindExpression(); + } + + public static com.google.datastore.v1.KindExpression getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public KindExpression parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new KindExpression(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java new file mode 100644 index 000000000000..8b79326a297d --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java @@ -0,0 +1,27 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface KindExpressionOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.KindExpression) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The name of the kind.
+   *
+ * + * string name = 1; + */ + java.lang.String getName(); + /** + * 
+   * The name of the kind.
+   *
+ * + * string name = 1; + */ + com.google.protobuf.ByteString + getNameBytes(); +} 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 new file mode 100644 index 000000000000..e833a9567497 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java @@ -0,0 +1,1221 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
+ *
+ * + * Protobuf type {@code google.datastore.v1.LookupRequest} + */ +public final class LookupRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupRequest) + LookupRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use LookupRequest.newBuilder() to construct. + private LookupRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private LookupRequest() { + projectId_ = ""; + keys_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private LookupRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.ReadOptions.Builder subBuilder = null; + if (readOptions_ != null) { + subBuilder = readOptions_.toBuilder(); + } + readOptions_ = input.readMessage(com.google.datastore.v1.ReadOptions.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(readOptions_); + readOptions_ = subBuilder.buildPartial(); + } + + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + keys_.add( + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.LookupRequest.class, com.google.datastore.v1.LookupRequest.Builder.class); + } + + private int bitField0_; + public static final int PROJECT_ID_FIELD_NUMBER = 8; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int READ_OPTIONS_FIELD_NUMBER = 1; + private com.google.datastore.v1.ReadOptions readOptions_; + /** + * 
+   * The options for this lookup request.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public boolean hasReadOptions() { + return readOptions_ != null; + } + /** + * 
+   * The options for this lookup request.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptions getReadOptions() { + return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; + } + /** + * 
+   * The options for this lookup request.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { + return getReadOptions(); + } + + public static final int KEYS_FIELD_NUMBER = 3; + private java.util.List keys_; + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public java.util.List getKeysList() { + return keys_; + } + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public java.util.List + getKeysOrBuilderList() { + return keys_; + } + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public int getKeysCount() { + return keys_.size(); + } + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public com.google.datastore.v1.Key getKeys(int index) { + return keys_.get(index); + } + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + return keys_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (readOptions_ != null) { + output.writeMessage(1, getReadOptions()); + } + for (int i = 0; i < keys_.size(); i++) { + output.writeMessage(3, keys_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (readOptions_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getReadOptions()); + } + for (int i = 0; i < keys_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, keys_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.LookupRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.LookupRequest other = (com.google.datastore.v1.LookupRequest) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && (hasReadOptions() == other.hasReadOptions()); + if (hasReadOptions()) { + result = result && getReadOptions() + .equals(other.getReadOptions()); + } + result = result && getKeysList() + .equals(other.getKeysList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + if (hasReadOptions()) { + hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER; + hash = (53 * hash) + getReadOptions().hashCode(); + } + if (getKeysCount() > 0) { + hash = (37 * hash) + KEYS_FIELD_NUMBER; + hash = (53 * hash) + getKeysList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.LookupRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.LookupRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.LookupRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.LookupRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.LookupRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.LookupRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.LookupRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.LookupRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.LookupRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.LookupRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.LookupRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.LookupRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.LookupRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
+   *
+ * + * Protobuf type {@code google.datastore.v1.LookupRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.LookupRequest) + com.google.datastore.v1.LookupRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.LookupRequest.class, com.google.datastore.v1.LookupRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.LookupRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKeysFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + if (readOptionsBuilder_ == null) { + readOptions_ = null; + } else { + readOptions_ = null; + readOptionsBuilder_ = null; + } + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + keysBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; + } + + public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { + return com.google.datastore.v1.LookupRequest.getDefaultInstance(); + } + + public com.google.datastore.v1.LookupRequest build() { + com.google.datastore.v1.LookupRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.LookupRequest buildPartial() { + com.google.datastore.v1.LookupRequest result = new com.google.datastore.v1.LookupRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.projectId_ = projectId_; + if (readOptionsBuilder_ == null) { + result.readOptions_ = readOptions_; + } else { + result.readOptions_ = readOptionsBuilder_.build(); + } + if (keysBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.keys_ = keys_; + } else { + result.keys_ = keysBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.LookupRequest) { + return mergeFrom((com.google.datastore.v1.LookupRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) { + if (other == com.google.datastore.v1.LookupRequest.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (other.hasReadOptions()) { + mergeReadOptions(other.getReadOptions()); + } + if (keysBuilder_ == null) { + if (!other.keys_.isEmpty()) { + if (keys_.isEmpty()) { + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureKeysIsMutable(); + keys_.addAll(other.keys_); + } + onChanged(); + } + } else { + if (!other.keys_.isEmpty()) { + if (keysBuilder_.isEmpty()) { + keysBuilder_.dispose(); + keysBuilder_ = null; + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000004); + keysBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKeysFieldBuilder() : null; + } else { + keysBuilder_.addAllMessages(other.keys_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.LookupRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.LookupRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private com.google.datastore.v1.ReadOptions readOptions_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_; + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public boolean hasReadOptions() { + return readOptionsBuilder_ != null || readOptions_ != null; + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptions getReadOptions() { + if (readOptionsBuilder_ == null) { + return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; + } else { + return readOptionsBuilder_.getMessage(); + } + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) { + if (readOptionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + readOptions_ = value; + onChanged(); + } else { + readOptionsBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder setReadOptions( + com.google.datastore.v1.ReadOptions.Builder builderForValue) { + if (readOptionsBuilder_ == null) { + readOptions_ = builderForValue.build(); + onChanged(); + } else { + readOptionsBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) { + if (readOptionsBuilder_ == null) { + if (readOptions_ != null) { + readOptions_ = + com.google.datastore.v1.ReadOptions.newBuilder(readOptions_).mergeFrom(value).buildPartial(); + } else { + readOptions_ = value; + } + onChanged(); + } else { + readOptionsBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder clearReadOptions() { + if (readOptionsBuilder_ == null) { + readOptions_ = null; + onChanged(); + } else { + readOptions_ = null; + readOptionsBuilder_ = null; + } + + return this; + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() { + + onChanged(); + return getReadOptionsFieldBuilder().getBuilder(); + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { + if (readOptionsBuilder_ != null) { + return readOptionsBuilder_.getMessageOrBuilder(); + } else { + return readOptions_ == null ? + com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; + } + } + /** + * 
+     * The options for this lookup request.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> + getReadOptionsFieldBuilder() { + if (readOptionsBuilder_ == null) { + readOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder>( + getReadOptions(), + getParentForChildren(), + isClean()); + readOptions_ = null; + } + return readOptionsBuilder_; + } + + private java.util.List keys_ = + java.util.Collections.emptyList(); + private void ensureKeysIsMutable() { + if (!((bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = new java.util.ArrayList(keys_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_; + + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public java.util.List getKeysList() { + if (keysBuilder_ == null) { + return java.util.Collections.unmodifiableList(keys_); + } else { + return keysBuilder_.getMessageList(); + } + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public int getKeysCount() { + if (keysBuilder_ == null) { + return keys_.size(); + } else { + return keysBuilder_.getCount(); + } + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public com.google.datastore.v1.Key getKeys(int index) { + if (keysBuilder_ == null) { + return keys_.get(index); + } else { + return keysBuilder_.getMessage(index); + } + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.set(index, value); + onChanged(); + } else { + keysBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.set(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder addKeys(com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(value); + onChanged(); + } else { + keysBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(index, value); + onChanged(); + } else { + keysBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder addKeys( + com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder addAllKeys( + java.lang.Iterable values) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, keys_); + onChanged(); + } else { + keysBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder clearKeys() { + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + keysBuilder_.clear(); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public Builder removeKeys(int index) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.remove(index); + onChanged(); + } else { + keysBuilder_.remove(index); + } + return this; + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public com.google.datastore.v1.Key.Builder getKeysBuilder( + int index) { + return getKeysFieldBuilder().getBuilder(index); + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + if (keysBuilder_ == null) { + return keys_.get(index); } else { + return keysBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public java.util.List + getKeysOrBuilderList() { + if (keysBuilder_ != null) { + return keysBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(keys_); + } + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder() { + return getKeysFieldBuilder().addBuilder( + com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder( + int index) { + return getKeysFieldBuilder().addBuilder( + index, com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * Keys of entities to look up.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + public java.util.List + getKeysBuilderList() { + return getKeysFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getKeysFieldBuilder() { + if (keysBuilder_ == null) { + keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + keys_, + ((bitField0_ & 0x00000004) == 0x00000004), + getParentForChildren(), + isClean()); + keys_ = null; + } + return keysBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.LookupRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.LookupRequest) + private static final com.google.datastore.v1.LookupRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.LookupRequest(); + } + + public static com.google.datastore.v1.LookupRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public LookupRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new LookupRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..935d543e91d1 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java @@ -0,0 +1,96 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface LookupRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.LookupRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * The options for this lookup request.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + boolean hasReadOptions(); + /** + * 
+   * The options for this lookup request.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + com.google.datastore.v1.ReadOptions getReadOptions(); + /** + * 
+   * The options for this lookup request.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder(); + + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + java.util.List + getKeysList(); + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + com.google.datastore.v1.Key getKeys(int index); + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + int getKeysCount(); + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + java.util.List + getKeysOrBuilderList(); + /** + * 
+   * Keys of entities to look up.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 3; + */ + com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..be92567863b7 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java @@ -0,0 +1,1842 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
+ *
+ * + * Protobuf type {@code google.datastore.v1.LookupResponse} + */ +public final class LookupResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupResponse) + LookupResponseOrBuilder { +private static final long serialVersionUID = 0L; + // Use LookupResponse.newBuilder() to construct. + private LookupResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private LookupResponse() { + found_ = java.util.Collections.emptyList(); + missing_ = java.util.Collections.emptyList(); + deferred_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private LookupResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + found_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + found_.add( + input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry)); + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + missing_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + missing_.add( + input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry)); + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + deferred_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + deferred_.add( + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + found_ = java.util.Collections.unmodifiableList(found_); + } + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + missing_ = java.util.Collections.unmodifiableList(missing_); + } + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + deferred_ = java.util.Collections.unmodifiableList(deferred_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.LookupResponse.class, com.google.datastore.v1.LookupResponse.Builder.class); + } + + public static final int FOUND_FIELD_NUMBER = 1; + private java.util.List found_; + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public java.util.List getFoundList() { + return found_; + } + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public java.util.List + getFoundOrBuilderList() { + return found_; + } + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public int getFoundCount() { + return found_.size(); + } + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public com.google.datastore.v1.EntityResult getFound(int index) { + return found_.get(index); + } + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder( + int index) { + return found_.get(index); + } + + public static final int MISSING_FIELD_NUMBER = 2; + private java.util.List missing_; + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public java.util.List getMissingList() { + return missing_; + } + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public java.util.List + getMissingOrBuilderList() { + return missing_; + } + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public int getMissingCount() { + return missing_.size(); + } + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public com.google.datastore.v1.EntityResult getMissing(int index) { + return missing_.get(index); + } + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder( + int index) { + return missing_.get(index); + } + + public static final int DEFERRED_FIELD_NUMBER = 3; + private java.util.List deferred_; + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public java.util.List getDeferredList() { + return deferred_; + } + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public java.util.List + getDeferredOrBuilderList() { + return deferred_; + } + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public int getDeferredCount() { + return deferred_.size(); + } + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public com.google.datastore.v1.Key getDeferred(int index) { + return deferred_.get(index); + } + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder( + int index) { + return deferred_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < found_.size(); i++) { + output.writeMessage(1, found_.get(i)); + } + for (int i = 0; i < missing_.size(); i++) { + output.writeMessage(2, missing_.get(i)); + } + for (int i = 0; i < deferred_.size(); i++) { + output.writeMessage(3, deferred_.get(i)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < found_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, found_.get(i)); + } + for (int i = 0; i < missing_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, missing_.get(i)); + } + for (int i = 0; i < deferred_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, deferred_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.LookupResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.LookupResponse other = (com.google.datastore.v1.LookupResponse) obj; + + boolean result = true; + result = result && getFoundList() + .equals(other.getFoundList()); + result = result && getMissingList() + .equals(other.getMissingList()); + result = result && getDeferredList() + .equals(other.getDeferredList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getFoundCount() > 0) { + hash = (37 * hash) + FOUND_FIELD_NUMBER; + hash = (53 * hash) + getFoundList().hashCode(); + } + if (getMissingCount() > 0) { + hash = (37 * hash) + MISSING_FIELD_NUMBER; + hash = (53 * hash) + getMissingList().hashCode(); + } + if (getDeferredCount() > 0) { + hash = (37 * hash) + DEFERRED_FIELD_NUMBER; + hash = (53 * hash) + getDeferredList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.LookupResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.LookupResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.LookupResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.LookupResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.LookupResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.LookupResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.LookupResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.LookupResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.LookupResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.LookupResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.LookupResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.LookupResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.LookupResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
+   *
+ * + * Protobuf type {@code google.datastore.v1.LookupResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.LookupResponse) + com.google.datastore.v1.LookupResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.LookupResponse.class, com.google.datastore.v1.LookupResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.LookupResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getFoundFieldBuilder(); + getMissingFieldBuilder(); + getDeferredFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + if (foundBuilder_ == null) { + found_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + foundBuilder_.clear(); + } + if (missingBuilder_ == null) { + missing_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + missingBuilder_.clear(); + } + if (deferredBuilder_ == null) { + deferred_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + deferredBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; + } + + public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { + return com.google.datastore.v1.LookupResponse.getDefaultInstance(); + } + + public com.google.datastore.v1.LookupResponse build() { + com.google.datastore.v1.LookupResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.LookupResponse buildPartial() { + com.google.datastore.v1.LookupResponse result = new com.google.datastore.v1.LookupResponse(this); + int from_bitField0_ = bitField0_; + if (foundBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + found_ = java.util.Collections.unmodifiableList(found_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.found_ = found_; + } else { + result.found_ = foundBuilder_.build(); + } + if (missingBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + missing_ = java.util.Collections.unmodifiableList(missing_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.missing_ = missing_; + } else { + result.missing_ = missingBuilder_.build(); + } + if (deferredBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { + deferred_ = java.util.Collections.unmodifiableList(deferred_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.deferred_ = deferred_; + } else { + result.deferred_ = deferredBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.LookupResponse) { + return mergeFrom((com.google.datastore.v1.LookupResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) { + if (other == com.google.datastore.v1.LookupResponse.getDefaultInstance()) return this; + if (foundBuilder_ == null) { + if (!other.found_.isEmpty()) { + if (found_.isEmpty()) { + found_ = other.found_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureFoundIsMutable(); + found_.addAll(other.found_); + } + onChanged(); + } + } else { + if (!other.found_.isEmpty()) { + if (foundBuilder_.isEmpty()) { + foundBuilder_.dispose(); + foundBuilder_ = null; + found_ = other.found_; + bitField0_ = (bitField0_ & ~0x00000001); + foundBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getFoundFieldBuilder() : null; + } else { + foundBuilder_.addAllMessages(other.found_); + } + } + } + if (missingBuilder_ == null) { + if (!other.missing_.isEmpty()) { + if (missing_.isEmpty()) { + missing_ = other.missing_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureMissingIsMutable(); + missing_.addAll(other.missing_); + } + onChanged(); + } + } else { + if (!other.missing_.isEmpty()) { + if (missingBuilder_.isEmpty()) { + missingBuilder_.dispose(); + missingBuilder_ = null; + missing_ = other.missing_; + bitField0_ = (bitField0_ & ~0x00000002); + missingBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getMissingFieldBuilder() : null; + } else { + missingBuilder_.addAllMessages(other.missing_); + } + } + } + if (deferredBuilder_ == null) { + if (!other.deferred_.isEmpty()) { + if (deferred_.isEmpty()) { + deferred_ = other.deferred_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureDeferredIsMutable(); + deferred_.addAll(other.deferred_); + } + onChanged(); + } + } else { + if (!other.deferred_.isEmpty()) { + if (deferredBuilder_.isEmpty()) { + deferredBuilder_.dispose(); + deferredBuilder_ = null; + deferred_ = other.deferred_; + bitField0_ = (bitField0_ & ~0x00000004); + deferredBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getDeferredFieldBuilder() : null; + } else { + deferredBuilder_.addAllMessages(other.deferred_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.LookupResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.LookupResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List found_ = + java.util.Collections.emptyList(); + private void ensureFoundIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + found_ = new java.util.ArrayList(found_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> foundBuilder_; + + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public java.util.List getFoundList() { + if (foundBuilder_ == null) { + return java.util.Collections.unmodifiableList(found_); + } else { + return foundBuilder_.getMessageList(); + } + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public int getFoundCount() { + if (foundBuilder_ == null) { + return found_.size(); + } else { + return foundBuilder_.getCount(); + } + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public com.google.datastore.v1.EntityResult getFound(int index) { + if (foundBuilder_ == null) { + return found_.get(index); + } else { + return foundBuilder_.getMessage(index); + } + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder setFound( + int index, com.google.datastore.v1.EntityResult value) { + if (foundBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFoundIsMutable(); + found_.set(index, value); + onChanged(); + } else { + foundBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder setFound( + int index, com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (foundBuilder_ == null) { + ensureFoundIsMutable(); + found_.set(index, builderForValue.build()); + onChanged(); + } else { + foundBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder addFound(com.google.datastore.v1.EntityResult value) { + if (foundBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFoundIsMutable(); + found_.add(value); + onChanged(); + } else { + foundBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder addFound( + int index, com.google.datastore.v1.EntityResult value) { + if (foundBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFoundIsMutable(); + found_.add(index, value); + onChanged(); + } else { + foundBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder addFound( + com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (foundBuilder_ == null) { + ensureFoundIsMutable(); + found_.add(builderForValue.build()); + onChanged(); + } else { + foundBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder addFound( + int index, com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (foundBuilder_ == null) { + ensureFoundIsMutable(); + found_.add(index, builderForValue.build()); + onChanged(); + } else { + foundBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder addAllFound( + java.lang.Iterable values) { + if (foundBuilder_ == null) { + ensureFoundIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, found_); + onChanged(); + } else { + foundBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder clearFound() { + if (foundBuilder_ == null) { + found_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + foundBuilder_.clear(); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public Builder removeFound(int index) { + if (foundBuilder_ == null) { + ensureFoundIsMutable(); + found_.remove(index); + onChanged(); + } else { + foundBuilder_.remove(index); + } + return this; + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public com.google.datastore.v1.EntityResult.Builder getFoundBuilder( + int index) { + return getFoundFieldBuilder().getBuilder(index); + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder( + int index) { + if (foundBuilder_ == null) { + return found_.get(index); } else { + return foundBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public java.util.List + getFoundOrBuilderList() { + if (foundBuilder_ != null) { + return foundBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(found_); + } + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public com.google.datastore.v1.EntityResult.Builder addFoundBuilder() { + return getFoundFieldBuilder().addBuilder( + com.google.datastore.v1.EntityResult.getDefaultInstance()); + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public com.google.datastore.v1.EntityResult.Builder addFoundBuilder( + int index) { + return getFoundFieldBuilder().addBuilder( + index, com.google.datastore.v1.EntityResult.getDefaultInstance()); + } + /** + * 
+     * Entities found as `ResultType.FULL` entities. The order of results in this
+     * field is undefined and has no relation to the order of the keys in the
+     * input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + public java.util.List + getFoundBuilderList() { + return getFoundFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> + getFoundFieldBuilder() { + if (foundBuilder_ == null) { + foundBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>( + found_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + found_ = null; + } + return foundBuilder_; + } + + private java.util.List missing_ = + java.util.Collections.emptyList(); + private void ensureMissingIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + missing_ = new java.util.ArrayList(missing_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> missingBuilder_; + + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public java.util.List getMissingList() { + if (missingBuilder_ == null) { + return java.util.Collections.unmodifiableList(missing_); + } else { + return missingBuilder_.getMessageList(); + } + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public int getMissingCount() { + if (missingBuilder_ == null) { + return missing_.size(); + } else { + return missingBuilder_.getCount(); + } + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public com.google.datastore.v1.EntityResult getMissing(int index) { + if (missingBuilder_ == null) { + return missing_.get(index); + } else { + return missingBuilder_.getMessage(index); + } + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder setMissing( + int index, com.google.datastore.v1.EntityResult value) { + if (missingBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMissingIsMutable(); + missing_.set(index, value); + onChanged(); + } else { + missingBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder setMissing( + int index, com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (missingBuilder_ == null) { + ensureMissingIsMutable(); + missing_.set(index, builderForValue.build()); + onChanged(); + } else { + missingBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder addMissing(com.google.datastore.v1.EntityResult value) { + if (missingBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMissingIsMutable(); + missing_.add(value); + onChanged(); + } else { + missingBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder addMissing( + int index, com.google.datastore.v1.EntityResult value) { + if (missingBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMissingIsMutable(); + missing_.add(index, value); + onChanged(); + } else { + missingBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder addMissing( + com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (missingBuilder_ == null) { + ensureMissingIsMutable(); + missing_.add(builderForValue.build()); + onChanged(); + } else { + missingBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder addMissing( + int index, com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (missingBuilder_ == null) { + ensureMissingIsMutable(); + missing_.add(index, builderForValue.build()); + onChanged(); + } else { + missingBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder addAllMissing( + java.lang.Iterable values) { + if (missingBuilder_ == null) { + ensureMissingIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, missing_); + onChanged(); + } else { + missingBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder clearMissing() { + if (missingBuilder_ == null) { + missing_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + missingBuilder_.clear(); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public Builder removeMissing(int index) { + if (missingBuilder_ == null) { + ensureMissingIsMutable(); + missing_.remove(index); + onChanged(); + } else { + missingBuilder_.remove(index); + } + return this; + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public com.google.datastore.v1.EntityResult.Builder getMissingBuilder( + int index) { + return getMissingFieldBuilder().getBuilder(index); + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder( + int index) { + if (missingBuilder_ == null) { + return missing_.get(index); } else { + return missingBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public java.util.List + getMissingOrBuilderList() { + if (missingBuilder_ != null) { + return missingBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(missing_); + } + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public com.google.datastore.v1.EntityResult.Builder addMissingBuilder() { + return getMissingFieldBuilder().addBuilder( + com.google.datastore.v1.EntityResult.getDefaultInstance()); + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public com.google.datastore.v1.EntityResult.Builder addMissingBuilder( + int index) { + return getMissingFieldBuilder().addBuilder( + index, com.google.datastore.v1.EntityResult.getDefaultInstance()); + } + /** + * 
+     * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+     * in this field is undefined and has no relation to the order of the keys
+     * in the input.
+     *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + public java.util.List + getMissingBuilderList() { + return getMissingFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> + getMissingFieldBuilder() { + if (missingBuilder_ == null) { + missingBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>( + missing_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + missing_ = null; + } + return missingBuilder_; + } + + private java.util.List deferred_ = + java.util.Collections.emptyList(); + private void ensureDeferredIsMutable() { + if (!((bitField0_ & 0x00000004) == 0x00000004)) { + deferred_ = new java.util.ArrayList(deferred_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> deferredBuilder_; + + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public java.util.List getDeferredList() { + if (deferredBuilder_ == null) { + return java.util.Collections.unmodifiableList(deferred_); + } else { + return deferredBuilder_.getMessageList(); + } + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public int getDeferredCount() { + if (deferredBuilder_ == null) { + return deferred_.size(); + } else { + return deferredBuilder_.getCount(); + } + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public com.google.datastore.v1.Key getDeferred(int index) { + if (deferredBuilder_ == null) { + return deferred_.get(index); + } else { + return deferredBuilder_.getMessage(index); + } + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder setDeferred( + int index, com.google.datastore.v1.Key value) { + if (deferredBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDeferredIsMutable(); + deferred_.set(index, value); + onChanged(); + } else { + deferredBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder setDeferred( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (deferredBuilder_ == null) { + ensureDeferredIsMutable(); + deferred_.set(index, builderForValue.build()); + onChanged(); + } else { + deferredBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder addDeferred(com.google.datastore.v1.Key value) { + if (deferredBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDeferredIsMutable(); + deferred_.add(value); + onChanged(); + } else { + deferredBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder addDeferred( + int index, com.google.datastore.v1.Key value) { + if (deferredBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDeferredIsMutable(); + deferred_.add(index, value); + onChanged(); + } else { + deferredBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder addDeferred( + com.google.datastore.v1.Key.Builder builderForValue) { + if (deferredBuilder_ == null) { + ensureDeferredIsMutable(); + deferred_.add(builderForValue.build()); + onChanged(); + } else { + deferredBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder addDeferred( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (deferredBuilder_ == null) { + ensureDeferredIsMutable(); + deferred_.add(index, builderForValue.build()); + onChanged(); + } else { + deferredBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder addAllDeferred( + java.lang.Iterable values) { + if (deferredBuilder_ == null) { + ensureDeferredIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, deferred_); + onChanged(); + } else { + deferredBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder clearDeferred() { + if (deferredBuilder_ == null) { + deferred_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + deferredBuilder_.clear(); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public Builder removeDeferred(int index) { + if (deferredBuilder_ == null) { + ensureDeferredIsMutable(); + deferred_.remove(index); + onChanged(); + } else { + deferredBuilder_.remove(index); + } + return this; + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public com.google.datastore.v1.Key.Builder getDeferredBuilder( + int index) { + return getDeferredFieldBuilder().getBuilder(index); + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder( + int index) { + if (deferredBuilder_ == null) { + return deferred_.get(index); } else { + return deferredBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public java.util.List + getDeferredOrBuilderList() { + if (deferredBuilder_ != null) { + return deferredBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(deferred_); + } + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public com.google.datastore.v1.Key.Builder addDeferredBuilder() { + return getDeferredFieldBuilder().addBuilder( + com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public com.google.datastore.v1.Key.Builder addDeferredBuilder( + int index) { + return getDeferredFieldBuilder().addBuilder( + index, com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * A list of keys that were not looked up due to resource constraints. The
+     * order of results in this field is undefined and has no relation to the
+     * order of the keys in the input.
+     *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + public java.util.List + getDeferredBuilderList() { + return getDeferredFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getDeferredFieldBuilder() { + if (deferredBuilder_ == null) { + deferredBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + deferred_, + ((bitField0_ & 0x00000004) == 0x00000004), + getParentForChildren(), + isClean()); + deferred_ = null; + } + return deferredBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.LookupResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.LookupResponse) + private static final com.google.datastore.v1.LookupResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.LookupResponse(); + } + + public static com.google.datastore.v1.LookupResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public LookupResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new LookupResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..7bef708cc4b9 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java @@ -0,0 +1,171 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface LookupResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.LookupResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + java.util.List + getFoundList(); + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + com.google.datastore.v1.EntityResult getFound(int index); + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + int getFoundCount(); + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + java.util.List + getFoundOrBuilderList(); + /** + * 
+   * Entities found as `ResultType.FULL` entities. The order of results in this
+   * field is undefined and has no relation to the order of the keys in the
+   * input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult found = 1; + */ + com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder( + int index); + + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + java.util.List + getMissingList(); + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + com.google.datastore.v1.EntityResult getMissing(int index); + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + int getMissingCount(); + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + java.util.List + getMissingOrBuilderList(); + /** + * 
+   * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
+   * in this field is undefined and has no relation to the order of the keys
+   * in the input.
+   *
+ * + * repeated .google.datastore.v1.EntityResult missing = 2; + */ + com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder( + int index); + + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + java.util.List + getDeferredList(); + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + com.google.datastore.v1.Key getDeferred(int index); + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + int getDeferredCount(); + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + java.util.List + getDeferredOrBuilderList(); + /** + * 
+   * A list of keys that were not looked up due to resource constraints. The
+   * order of results in this field is undefined and has no relation to the
+   * order of the keys in the input.
+   *
+ * + * repeated .google.datastore.v1.Key deferred = 3; + */ + com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..db0c72f94cd5 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -0,0 +1,1682 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * A mutation to apply to an entity.
+ *
+ * + * Protobuf type {@code google.datastore.v1.Mutation} + */ +public final class Mutation extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Mutation) + MutationOrBuilder { +private static final long serialVersionUID = 0L; + // Use Mutation.newBuilder() to construct. + private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Mutation() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Mutation( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 34: { + com.google.datastore.v1.Entity.Builder subBuilder = null; + if (operationCase_ == 4) { + subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder(); + } + operation_ = + input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_); + operation_ = subBuilder.buildPartial(); + } + operationCase_ = 4; + break; + } + case 42: { + com.google.datastore.v1.Entity.Builder subBuilder = null; + if (operationCase_ == 5) { + subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder(); + } + operation_ = + input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_); + operation_ = subBuilder.buildPartial(); + } + operationCase_ = 5; + break; + } + case 50: { + com.google.datastore.v1.Entity.Builder subBuilder = null; + if (operationCase_ == 6) { + subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder(); + } + operation_ = + input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_); + operation_ = subBuilder.buildPartial(); + } + operationCase_ = 6; + break; + } + case 58: { + com.google.datastore.v1.Key.Builder subBuilder = null; + if (operationCase_ == 7) { + subBuilder = ((com.google.datastore.v1.Key) operation_).toBuilder(); + } + operation_ = + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Key) operation_); + operation_ = subBuilder.buildPartial(); + } + operationCase_ = 7; + break; + } + case 64: { + conflictDetectionStrategyCase_ = 8; + conflictDetectionStrategy_ = input.readInt64(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class); + } + + private int operationCase_ = 0; + private java.lang.Object operation_; + public enum OperationCase + implements com.google.protobuf.Internal.EnumLite { + INSERT(4), + UPDATE(5), + UPSERT(6), + DELETE(7), + OPERATION_NOT_SET(0); + private final int value; + private OperationCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static OperationCase valueOf(int value) { + return forNumber(value); + } + + public static OperationCase forNumber(int value) { + switch (value) { + case 4: return INSERT; + case 5: return UPDATE; + case 6: return UPSERT; + case 7: return DELETE; + case 0: return OPERATION_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public OperationCase + getOperationCase() { + return OperationCase.forNumber( + operationCase_); + } + + private int conflictDetectionStrategyCase_ = 0; + private java.lang.Object conflictDetectionStrategy_; + public enum ConflictDetectionStrategyCase + implements com.google.protobuf.Internal.EnumLite { + BASE_VERSION(8), + CONFLICTDETECTIONSTRATEGY_NOT_SET(0); + private final int value; + private ConflictDetectionStrategyCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ConflictDetectionStrategyCase valueOf(int value) { + return forNumber(value); + } + + public static ConflictDetectionStrategyCase forNumber(int value) { + switch (value) { + case 8: return BASE_VERSION; + case 0: return CONFLICTDETECTIONSTRATEGY_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public ConflictDetectionStrategyCase + getConflictDetectionStrategyCase() { + return ConflictDetectionStrategyCase.forNumber( + conflictDetectionStrategyCase_); + } + + public static final int INSERT_FIELD_NUMBER = 4; + /** + * 
+   * The entity to insert. The entity must not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public boolean hasInsert() { + return operationCase_ == 4; + } + /** + * 
+   * The entity to insert. The entity must not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public com.google.datastore.v1.Entity getInsert() { + if (operationCase_ == 4) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + /** + * 
+   * The entity to insert. The entity must not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() { + if (operationCase_ == 4) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + + public static final int UPDATE_FIELD_NUMBER = 5; + /** + * 
+   * The entity to update. The entity must already exist.
+   * Must have a complete key path.
+   *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public boolean hasUpdate() { + return operationCase_ == 5; + } + /** + * 
+   * The entity to update. The entity must already exist.
+   * Must have a complete key path.
+   *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public com.google.datastore.v1.Entity getUpdate() { + if (operationCase_ == 5) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + /** + * 
+   * The entity to update. The entity must already exist.
+   * Must have a complete key path.
+   *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() { + if (operationCase_ == 5) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + + public static final int UPSERT_FIELD_NUMBER = 6; + /** + * 
+   * The entity to upsert. The entity may or may not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public boolean hasUpsert() { + return operationCase_ == 6; + } + /** + * 
+   * The entity to upsert. The entity may or may not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public com.google.datastore.v1.Entity getUpsert() { + if (operationCase_ == 6) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + /** + * 
+   * The entity to upsert. The entity may or may not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() { + if (operationCase_ == 6) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + + public static final int DELETE_FIELD_NUMBER = 7; + /** + * 
+   * The key of the entity to delete. The entity may or may not already exist.
+   * Must have a complete key path and must not be reserved/read-only.
+   *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public boolean hasDelete() { + return operationCase_ == 7; + } + /** + * 
+   * The key of the entity to delete. The entity may or may not already exist.
+   * Must have a complete key path and must not be reserved/read-only.
+   *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public com.google.datastore.v1.Key getDelete() { + if (operationCase_ == 7) { + return (com.google.datastore.v1.Key) operation_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + /** + * 
+   * The key of the entity to delete. The entity may or may not already exist.
+   * Must have a complete key path and must not be reserved/read-only.
+   *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() { + if (operationCase_ == 7) { + return (com.google.datastore.v1.Key) operation_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + + public static final int BASE_VERSION_FIELD_NUMBER = 8; + /** + * 
+   * The version of the entity that this mutation is being applied to. If this
+   * does not match the current version on the server, the mutation conflicts.
+   *
+ * + * int64 base_version = 8; + */ + public long getBaseVersion() { + if (conflictDetectionStrategyCase_ == 8) { + return (java.lang.Long) conflictDetectionStrategy_; + } + return 0L; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (operationCase_ == 4) { + output.writeMessage(4, (com.google.datastore.v1.Entity) operation_); + } + if (operationCase_ == 5) { + output.writeMessage(5, (com.google.datastore.v1.Entity) operation_); + } + if (operationCase_ == 6) { + output.writeMessage(6, (com.google.datastore.v1.Entity) operation_); + } + if (operationCase_ == 7) { + output.writeMessage(7, (com.google.datastore.v1.Key) operation_); + } + if (conflictDetectionStrategyCase_ == 8) { + output.writeInt64( + 8, (long)((java.lang.Long) conflictDetectionStrategy_)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (operationCase_ == 4) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, (com.google.datastore.v1.Entity) operation_); + } + if (operationCase_ == 5) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, (com.google.datastore.v1.Entity) operation_); + } + if (operationCase_ == 6) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, (com.google.datastore.v1.Entity) operation_); + } + if (operationCase_ == 7) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, (com.google.datastore.v1.Key) operation_); + } + if (conflictDetectionStrategyCase_ == 8) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size( + 8, (long)((java.lang.Long) conflictDetectionStrategy_)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Mutation)) { + return super.equals(obj); + } + com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj; + + boolean result = true; + result = result && getOperationCase().equals( + other.getOperationCase()); + if (!result) return false; + switch (operationCase_) { + case 4: + result = result && getInsert() + .equals(other.getInsert()); + break; + case 5: + result = result && getUpdate() + .equals(other.getUpdate()); + break; + case 6: + result = result && getUpsert() + .equals(other.getUpsert()); + break; + case 7: + result = result && getDelete() + .equals(other.getDelete()); + break; + case 0: + default: + } + result = result && getConflictDetectionStrategyCase().equals( + other.getConflictDetectionStrategyCase()); + if (!result) return false; + switch (conflictDetectionStrategyCase_) { + case 8: + result = result && (getBaseVersion() + == other.getBaseVersion()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + switch (operationCase_) { + case 4: + hash = (37 * hash) + INSERT_FIELD_NUMBER; + hash = (53 * hash) + getInsert().hashCode(); + break; + case 5: + hash = (37 * hash) + UPDATE_FIELD_NUMBER; + hash = (53 * hash) + getUpdate().hashCode(); + break; + case 6: + hash = (37 * hash) + UPSERT_FIELD_NUMBER; + hash = (53 * hash) + getUpsert().hashCode(); + break; + case 7: + hash = (37 * hash) + DELETE_FIELD_NUMBER; + hash = (53 * hash) + getDelete().hashCode(); + break; + case 0: + default: + } + switch (conflictDetectionStrategyCase_) { + case 8: + hash = (37 * hash) + BASE_VERSION_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getBaseVersion()); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Mutation parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Mutation parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Mutation parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Mutation parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Mutation parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Mutation parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Mutation parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Mutation parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Mutation parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Mutation parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Mutation parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Mutation parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Mutation prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A mutation to apply to an entity.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Mutation} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Mutation) + com.google.datastore.v1.MutationOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class); + } + + // Construct using com.google.datastore.v1.Mutation.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + operationCase_ = 0; + operation_ = null; + conflictDetectionStrategyCase_ = 0; + conflictDetectionStrategy_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; + } + + public com.google.datastore.v1.Mutation getDefaultInstanceForType() { + return com.google.datastore.v1.Mutation.getDefaultInstance(); + } + + public com.google.datastore.v1.Mutation build() { + com.google.datastore.v1.Mutation result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Mutation buildPartial() { + com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this); + if (operationCase_ == 4) { + if (insertBuilder_ == null) { + result.operation_ = operation_; + } else { + result.operation_ = insertBuilder_.build(); + } + } + if (operationCase_ == 5) { + if (updateBuilder_ == null) { + result.operation_ = operation_; + } else { + result.operation_ = updateBuilder_.build(); + } + } + if (operationCase_ == 6) { + if (upsertBuilder_ == null) { + result.operation_ = operation_; + } else { + result.operation_ = upsertBuilder_.build(); + } + } + if (operationCase_ == 7) { + if (deleteBuilder_ == null) { + result.operation_ = operation_; + } else { + result.operation_ = deleteBuilder_.build(); + } + } + if (conflictDetectionStrategyCase_ == 8) { + result.conflictDetectionStrategy_ = conflictDetectionStrategy_; + } + result.operationCase_ = operationCase_; + result.conflictDetectionStrategyCase_ = conflictDetectionStrategyCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Mutation) { + return mergeFrom((com.google.datastore.v1.Mutation)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Mutation other) { + if (other == com.google.datastore.v1.Mutation.getDefaultInstance()) return this; + switch (other.getOperationCase()) { + case INSERT: { + mergeInsert(other.getInsert()); + break; + } + case UPDATE: { + mergeUpdate(other.getUpdate()); + break; + } + case UPSERT: { + mergeUpsert(other.getUpsert()); + break; + } + case DELETE: { + mergeDelete(other.getDelete()); + break; + } + case OPERATION_NOT_SET: { + break; + } + } + switch (other.getConflictDetectionStrategyCase()) { + case BASE_VERSION: { + setBaseVersion(other.getBaseVersion()); + break; + } + case CONFLICTDETECTIONSTRATEGY_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Mutation parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Mutation) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int operationCase_ = 0; + private java.lang.Object operation_; + public OperationCase + getOperationCase() { + return OperationCase.forNumber( + operationCase_); + } + + public Builder clearOperation() { + operationCase_ = 0; + operation_ = null; + onChanged(); + return this; + } + + private int conflictDetectionStrategyCase_ = 0; + private java.lang.Object conflictDetectionStrategy_; + public ConflictDetectionStrategyCase + getConflictDetectionStrategyCase() { + return ConflictDetectionStrategyCase.forNumber( + conflictDetectionStrategyCase_); + } + + public Builder clearConflictDetectionStrategy() { + conflictDetectionStrategyCase_ = 0; + conflictDetectionStrategy_ = null; + onChanged(); + return this; + } + + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> insertBuilder_; + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public boolean hasInsert() { + return operationCase_ == 4; + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public com.google.datastore.v1.Entity getInsert() { + if (insertBuilder_ == null) { + if (operationCase_ == 4) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } else { + if (operationCase_ == 4) { + return insertBuilder_.getMessage(); + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public Builder setInsert(com.google.datastore.v1.Entity value) { + if (insertBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + operation_ = value; + onChanged(); + } else { + insertBuilder_.setMessage(value); + } + operationCase_ = 4; + return this; + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public Builder setInsert( + com.google.datastore.v1.Entity.Builder builderForValue) { + if (insertBuilder_ == null) { + operation_ = builderForValue.build(); + onChanged(); + } else { + insertBuilder_.setMessage(builderForValue.build()); + } + operationCase_ = 4; + return this; + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public Builder mergeInsert(com.google.datastore.v1.Entity value) { + if (insertBuilder_ == null) { + if (operationCase_ == 4 && + operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) { + operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_) + .mergeFrom(value).buildPartial(); + } else { + operation_ = value; + } + onChanged(); + } else { + if (operationCase_ == 4) { + insertBuilder_.mergeFrom(value); + } + insertBuilder_.setMessage(value); + } + operationCase_ = 4; + return this; + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public Builder clearInsert() { + if (insertBuilder_ == null) { + if (operationCase_ == 4) { + operationCase_ = 0; + operation_ = null; + onChanged(); + } + } else { + if (operationCase_ == 4) { + operationCase_ = 0; + operation_ = null; + } + insertBuilder_.clear(); + } + return this; + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public com.google.datastore.v1.Entity.Builder getInsertBuilder() { + return getInsertFieldBuilder().getBuilder(); + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() { + if ((operationCase_ == 4) && (insertBuilder_ != null)) { + return insertBuilder_.getMessageOrBuilder(); + } else { + if (operationCase_ == 4) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * The entity to insert. The entity must not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> + getInsertFieldBuilder() { + if (insertBuilder_ == null) { + if (!(operationCase_ == 4)) { + operation_ = com.google.datastore.v1.Entity.getDefaultInstance(); + } + insertBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>( + (com.google.datastore.v1.Entity) operation_, + getParentForChildren(), + isClean()); + operation_ = null; + } + operationCase_ = 4; + onChanged();; + return insertBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> updateBuilder_; + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public boolean hasUpdate() { + return operationCase_ == 5; + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public com.google.datastore.v1.Entity getUpdate() { + if (updateBuilder_ == null) { + if (operationCase_ == 5) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } else { + if (operationCase_ == 5) { + return updateBuilder_.getMessage(); + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public Builder setUpdate(com.google.datastore.v1.Entity value) { + if (updateBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + operation_ = value; + onChanged(); + } else { + updateBuilder_.setMessage(value); + } + operationCase_ = 5; + return this; + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public Builder setUpdate( + com.google.datastore.v1.Entity.Builder builderForValue) { + if (updateBuilder_ == null) { + operation_ = builderForValue.build(); + onChanged(); + } else { + updateBuilder_.setMessage(builderForValue.build()); + } + operationCase_ = 5; + return this; + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public Builder mergeUpdate(com.google.datastore.v1.Entity value) { + if (updateBuilder_ == null) { + if (operationCase_ == 5 && + operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) { + operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_) + .mergeFrom(value).buildPartial(); + } else { + operation_ = value; + } + onChanged(); + } else { + if (operationCase_ == 5) { + updateBuilder_.mergeFrom(value); + } + updateBuilder_.setMessage(value); + } + operationCase_ = 5; + return this; + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public Builder clearUpdate() { + if (updateBuilder_ == null) { + if (operationCase_ == 5) { + operationCase_ = 0; + operation_ = null; + onChanged(); + } + } else { + if (operationCase_ == 5) { + operationCase_ = 0; + operation_ = null; + } + updateBuilder_.clear(); + } + return this; + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public com.google.datastore.v1.Entity.Builder getUpdateBuilder() { + return getUpdateFieldBuilder().getBuilder(); + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() { + if ((operationCase_ == 5) && (updateBuilder_ != null)) { + return updateBuilder_.getMessageOrBuilder(); + } else { + if (operationCase_ == 5) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * The entity to update. The entity must already exist.
+     * Must have a complete key path.
+     *
+ * + * .google.datastore.v1.Entity update = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> + getUpdateFieldBuilder() { + if (updateBuilder_ == null) { + if (!(operationCase_ == 5)) { + operation_ = com.google.datastore.v1.Entity.getDefaultInstance(); + } + updateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>( + (com.google.datastore.v1.Entity) operation_, + getParentForChildren(), + isClean()); + operation_ = null; + } + operationCase_ = 5; + onChanged();; + return updateBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> upsertBuilder_; + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public boolean hasUpsert() { + return operationCase_ == 6; + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public com.google.datastore.v1.Entity getUpsert() { + if (upsertBuilder_ == null) { + if (operationCase_ == 6) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } else { + if (operationCase_ == 6) { + return upsertBuilder_.getMessage(); + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public Builder setUpsert(com.google.datastore.v1.Entity value) { + if (upsertBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + operation_ = value; + onChanged(); + } else { + upsertBuilder_.setMessage(value); + } + operationCase_ = 6; + return this; + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public Builder setUpsert( + com.google.datastore.v1.Entity.Builder builderForValue) { + if (upsertBuilder_ == null) { + operation_ = builderForValue.build(); + onChanged(); + } else { + upsertBuilder_.setMessage(builderForValue.build()); + } + operationCase_ = 6; + return this; + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public Builder mergeUpsert(com.google.datastore.v1.Entity value) { + if (upsertBuilder_ == null) { + if (operationCase_ == 6 && + operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) { + operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_) + .mergeFrom(value).buildPartial(); + } else { + operation_ = value; + } + onChanged(); + } else { + if (operationCase_ == 6) { + upsertBuilder_.mergeFrom(value); + } + upsertBuilder_.setMessage(value); + } + operationCase_ = 6; + return this; + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public Builder clearUpsert() { + if (upsertBuilder_ == null) { + if (operationCase_ == 6) { + operationCase_ = 0; + operation_ = null; + onChanged(); + } + } else { + if (operationCase_ == 6) { + operationCase_ = 0; + operation_ = null; + } + upsertBuilder_.clear(); + } + return this; + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public com.google.datastore.v1.Entity.Builder getUpsertBuilder() { + return getUpsertFieldBuilder().getBuilder(); + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() { + if ((operationCase_ == 6) && (upsertBuilder_ != null)) { + return upsertBuilder_.getMessageOrBuilder(); + } else { + if (operationCase_ == 6) { + return (com.google.datastore.v1.Entity) operation_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * The entity to upsert. The entity may or may not already exist.
+     * The entity key's final path element may be incomplete.
+     *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> + getUpsertFieldBuilder() { + if (upsertBuilder_ == null) { + if (!(operationCase_ == 6)) { + operation_ = com.google.datastore.v1.Entity.getDefaultInstance(); + } + upsertBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>( + (com.google.datastore.v1.Entity) operation_, + getParentForChildren(), + isClean()); + operation_ = null; + } + operationCase_ = 6; + onChanged();; + return upsertBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> deleteBuilder_; + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public boolean hasDelete() { + return operationCase_ == 7; + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public com.google.datastore.v1.Key getDelete() { + if (deleteBuilder_ == null) { + if (operationCase_ == 7) { + return (com.google.datastore.v1.Key) operation_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } else { + if (operationCase_ == 7) { + return deleteBuilder_.getMessage(); + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public Builder setDelete(com.google.datastore.v1.Key value) { + if (deleteBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + operation_ = value; + onChanged(); + } else { + deleteBuilder_.setMessage(value); + } + operationCase_ = 7; + return this; + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public Builder setDelete( + com.google.datastore.v1.Key.Builder builderForValue) { + if (deleteBuilder_ == null) { + operation_ = builderForValue.build(); + onChanged(); + } else { + deleteBuilder_.setMessage(builderForValue.build()); + } + operationCase_ = 7; + return this; + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public Builder mergeDelete(com.google.datastore.v1.Key value) { + if (deleteBuilder_ == null) { + if (operationCase_ == 7 && + operation_ != com.google.datastore.v1.Key.getDefaultInstance()) { + operation_ = com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) operation_) + .mergeFrom(value).buildPartial(); + } else { + operation_ = value; + } + onChanged(); + } else { + if (operationCase_ == 7) { + deleteBuilder_.mergeFrom(value); + } + deleteBuilder_.setMessage(value); + } + operationCase_ = 7; + return this; + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public Builder clearDelete() { + if (deleteBuilder_ == null) { + if (operationCase_ == 7) { + operationCase_ = 0; + operation_ = null; + onChanged(); + } + } else { + if (operationCase_ == 7) { + operationCase_ = 0; + operation_ = null; + } + deleteBuilder_.clear(); + } + return this; + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public com.google.datastore.v1.Key.Builder getDeleteBuilder() { + return getDeleteFieldBuilder().getBuilder(); + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() { + if ((operationCase_ == 7) && (deleteBuilder_ != null)) { + return deleteBuilder_.getMessageOrBuilder(); + } else { + if (operationCase_ == 7) { + return (com.google.datastore.v1.Key) operation_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + } + /** + * 
+     * The key of the entity to delete. The entity may or may not already exist.
+     * Must have a complete key path and must not be reserved/read-only.
+     *
+ * + * .google.datastore.v1.Key delete = 7; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getDeleteFieldBuilder() { + if (deleteBuilder_ == null) { + if (!(operationCase_ == 7)) { + operation_ = com.google.datastore.v1.Key.getDefaultInstance(); + } + deleteBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + (com.google.datastore.v1.Key) operation_, + getParentForChildren(), + isClean()); + operation_ = null; + } + operationCase_ = 7; + onChanged();; + return deleteBuilder_; + } + + /** + * 
+     * The version of the entity that this mutation is being applied to. If this
+     * does not match the current version on the server, the mutation conflicts.
+     *
+ * + * int64 base_version = 8; + */ + public long getBaseVersion() { + if (conflictDetectionStrategyCase_ == 8) { + return (java.lang.Long) conflictDetectionStrategy_; + } + return 0L; + } + /** + * 
+     * The version of the entity that this mutation is being applied to. If this
+     * does not match the current version on the server, the mutation conflicts.
+     *
+ * + * int64 base_version = 8; + */ + public Builder setBaseVersion(long value) { + conflictDetectionStrategyCase_ = 8; + conflictDetectionStrategy_ = value; + onChanged(); + return this; + } + /** + * 
+     * The version of the entity that this mutation is being applied to. If this
+     * does not match the current version on the server, the mutation conflicts.
+     *
+ * + * int64 base_version = 8; + */ + public Builder clearBaseVersion() { + if (conflictDetectionStrategyCase_ == 8) { + conflictDetectionStrategyCase_ = 0; + conflictDetectionStrategy_ = null; + onChanged(); + } + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Mutation) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Mutation) + private static final com.google.datastore.v1.Mutation DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Mutation(); + } + + public static com.google.datastore.v1.Mutation getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Mutation parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Mutation(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Mutation getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..d55fd0937112 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java @@ -0,0 +1,135 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface MutationOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Mutation) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The entity to insert. The entity must not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + boolean hasInsert(); + /** + * 
+   * The entity to insert. The entity must not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + com.google.datastore.v1.Entity getInsert(); + /** + * 
+   * The entity to insert. The entity must not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity insert = 4; + */ + com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder(); + + /** + * 
+   * The entity to update. The entity must already exist.
+   * Must have a complete key path.
+   *
+ * + * .google.datastore.v1.Entity update = 5; + */ + boolean hasUpdate(); + /** + * 
+   * The entity to update. The entity must already exist.
+   * Must have a complete key path.
+   *
+ * + * .google.datastore.v1.Entity update = 5; + */ + com.google.datastore.v1.Entity getUpdate(); + /** + * 
+   * The entity to update. The entity must already exist.
+   * Must have a complete key path.
+   *
+ * + * .google.datastore.v1.Entity update = 5; + */ + com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder(); + + /** + * 
+   * The entity to upsert. The entity may or may not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + boolean hasUpsert(); + /** + * 
+   * The entity to upsert. The entity may or may not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + com.google.datastore.v1.Entity getUpsert(); + /** + * 
+   * The entity to upsert. The entity may or may not already exist.
+   * The entity key's final path element may be incomplete.
+   *
+ * + * .google.datastore.v1.Entity upsert = 6; + */ + com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder(); + + /** + * 
+   * The key of the entity to delete. The entity may or may not already exist.
+   * Must have a complete key path and must not be reserved/read-only.
+   *
+ * + * .google.datastore.v1.Key delete = 7; + */ + boolean hasDelete(); + /** + * 
+   * The key of the entity to delete. The entity may or may not already exist.
+   * Must have a complete key path and must not be reserved/read-only.
+   *
+ * + * .google.datastore.v1.Key delete = 7; + */ + com.google.datastore.v1.Key getDelete(); + /** + * 
+   * The key of the entity to delete. The entity may or may not already exist.
+   * Must have a complete key path and must not be reserved/read-only.
+   *
+ * + * .google.datastore.v1.Key delete = 7; + */ + com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder(); + + /** + * 
+   * The version of the entity that this mutation is being applied to. If this
+   * does not match the current version on the server, the mutation conflicts.
+   *
+ * + * int64 base_version = 8; + */ + long getBaseVersion(); + + public com.google.datastore.v1.Mutation.OperationCase getOperationCase(); + + public 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 new file mode 100644 index 000000000000..2fc11b0ab801 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java @@ -0,0 +1,808 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The result of applying a mutation.
+ *
+ * + * Protobuf type {@code google.datastore.v1.MutationResult} + */ +public final class MutationResult extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.MutationResult) + MutationResultOrBuilder { +private static final long serialVersionUID = 0L; + // Use MutationResult.newBuilder() to construct. + private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private MutationResult() { + version_ = 0L; + conflictDetected_ = false; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private MutationResult( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 26: { + com.google.datastore.v1.Key.Builder subBuilder = null; + if (key_ != null) { + subBuilder = key_.toBuilder(); + } + key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(key_); + key_ = subBuilder.buildPartial(); + } + + break; + } + case 32: { + + version_ = input.readInt64(); + break; + } + case 40: { + + conflictDetected_ = input.readBool(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.MutationResult.class, com.google.datastore.v1.MutationResult.Builder.class); + } + + public static final int KEY_FIELD_NUMBER = 3; + private com.google.datastore.v1.Key key_; + /** + * 
+   * The automatically allocated key.
+   * Set only when the mutation allocated a key.
+   *
+ * + * .google.datastore.v1.Key key = 3; + */ + public boolean hasKey() { + return key_ != null; + } + /** + * 
+   * The automatically allocated key.
+   * Set only when the mutation allocated a key.
+   *
+ * + * .google.datastore.v1.Key key = 3; + */ + public com.google.datastore.v1.Key getKey() { + return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; + } + /** + * 
+   * The automatically allocated key.
+   * Set only when the mutation allocated a key.
+   *
+ * + * .google.datastore.v1.Key key = 3; + */ + public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { + return getKey(); + } + + public static final int VERSION_FIELD_NUMBER = 4; + private long version_; + /** + * 
+   * The version of the entity on the server after processing the mutation. If
+   * the mutation doesn't change anything on the server, then the version will
+   * be the version of the current entity or, if no entity is present, a version
+   * that is strictly greater than the version of any previous entity and less
+   * than the version of any possible future entity.
+   *
+ * + * int64 version = 4; + */ + public long getVersion() { + return version_; + } + + public static final int CONFLICT_DETECTED_FIELD_NUMBER = 5; + private boolean conflictDetected_; + /** + * 
+   * Whether a conflict was detected for this mutation. Always false when a
+   * conflict detection strategy field is not set in the mutation.
+   *
+ * + * bool conflict_detected = 5; + */ + public boolean getConflictDetected() { + return conflictDetected_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (key_ != null) { + output.writeMessage(3, getKey()); + } + if (version_ != 0L) { + output.writeInt64(4, version_); + } + if (conflictDetected_ != false) { + output.writeBool(5, conflictDetected_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (key_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getKey()); + } + if (version_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(4, version_); + } + if (conflictDetected_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(5, conflictDetected_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.MutationResult)) { + return super.equals(obj); + } + com.google.datastore.v1.MutationResult other = (com.google.datastore.v1.MutationResult) obj; + + boolean result = true; + result = result && (hasKey() == other.hasKey()); + if (hasKey()) { + result = result && getKey() + .equals(other.getKey()); + } + result = result && (getVersion() + == other.getVersion()); + result = result && (getConflictDetected() + == other.getConflictDetected()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasKey()) { + hash = (37 * hash) + KEY_FIELD_NUMBER; + hash = (53 * hash) + getKey().hashCode(); + } + hash = (37 * hash) + VERSION_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getVersion()); + hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getConflictDetected()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.MutationResult parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.MutationResult parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.MutationResult parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.MutationResult parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.MutationResult parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.MutationResult parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.MutationResult parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.MutationResult parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.MutationResult parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.MutationResult parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.MutationResult parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.MutationResult parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.MutationResult prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The result of applying a mutation.
+   *
+ * + * Protobuf type {@code google.datastore.v1.MutationResult} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.MutationResult) + com.google.datastore.v1.MutationResultOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.MutationResult.class, com.google.datastore.v1.MutationResult.Builder.class); + } + + // Construct using com.google.datastore.v1.MutationResult.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + if (keyBuilder_ == null) { + key_ = null; + } else { + key_ = null; + keyBuilder_ = null; + } + version_ = 0L; + + conflictDetected_ = false; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; + } + + public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { + return com.google.datastore.v1.MutationResult.getDefaultInstance(); + } + + public com.google.datastore.v1.MutationResult build() { + com.google.datastore.v1.MutationResult result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.MutationResult buildPartial() { + com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this); + if (keyBuilder_ == null) { + result.key_ = key_; + } else { + result.key_ = keyBuilder_.build(); + } + result.version_ = version_; + result.conflictDetected_ = conflictDetected_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.MutationResult) { + return mergeFrom((com.google.datastore.v1.MutationResult)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.MutationResult other) { + if (other == com.google.datastore.v1.MutationResult.getDefaultInstance()) return this; + if (other.hasKey()) { + mergeKey(other.getKey()); + } + if (other.getVersion() != 0L) { + setVersion(other.getVersion()); + } + if (other.getConflictDetected() != false) { + setConflictDetected(other.getConflictDetected()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.MutationResult parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.MutationResult) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.datastore.v1.Key key_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_; + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public boolean hasKey() { + return keyBuilder_ != null || key_ != null; + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public com.google.datastore.v1.Key getKey() { + if (keyBuilder_ == null) { + return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; + } else { + return keyBuilder_.getMessage(); + } + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public Builder setKey(com.google.datastore.v1.Key value) { + if (keyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + key_ = value; + onChanged(); + } else { + keyBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public Builder setKey( + com.google.datastore.v1.Key.Builder builderForValue) { + if (keyBuilder_ == null) { + key_ = builderForValue.build(); + onChanged(); + } else { + keyBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public Builder mergeKey(com.google.datastore.v1.Key value) { + if (keyBuilder_ == null) { + if (key_ != null) { + key_ = + com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial(); + } else { + key_ = value; + } + onChanged(); + } else { + keyBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public Builder clearKey() { + if (keyBuilder_ == null) { + key_ = null; + onChanged(); + } else { + key_ = null; + keyBuilder_ = null; + } + + return this; + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public com.google.datastore.v1.Key.Builder getKeyBuilder() { + + onChanged(); + return getKeyFieldBuilder().getBuilder(); + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { + if (keyBuilder_ != null) { + return keyBuilder_.getMessageOrBuilder(); + } else { + return key_ == null ? + com.google.datastore.v1.Key.getDefaultInstance() : key_; + } + } + /** + * 
+     * The automatically allocated key.
+     * Set only when the mutation allocated a key.
+     *
+ * + * .google.datastore.v1.Key key = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getKeyFieldBuilder() { + if (keyBuilder_ == null) { + keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + getKey(), + getParentForChildren(), + isClean()); + key_ = null; + } + return keyBuilder_; + } + + private long version_ ; + /** + * 
+     * The version of the entity on the server after processing the mutation. If
+     * the mutation doesn't change anything on the server, then the version will
+     * be the version of the current entity or, if no entity is present, a version
+     * that is strictly greater than the version of any previous entity and less
+     * than the version of any possible future entity.
+     *
+ * + * int64 version = 4; + */ + public long getVersion() { + return version_; + } + /** + * 
+     * The version of the entity on the server after processing the mutation. If
+     * the mutation doesn't change anything on the server, then the version will
+     * be the version of the current entity or, if no entity is present, a version
+     * that is strictly greater than the version of any previous entity and less
+     * than the version of any possible future entity.
+     *
+ * + * int64 version = 4; + */ + public Builder setVersion(long value) { + + version_ = value; + onChanged(); + return this; + } + /** + * 
+     * The version of the entity on the server after processing the mutation. If
+     * the mutation doesn't change anything on the server, then the version will
+     * be the version of the current entity or, if no entity is present, a version
+     * that is strictly greater than the version of any previous entity and less
+     * than the version of any possible future entity.
+     *
+ * + * int64 version = 4; + */ + public Builder clearVersion() { + + version_ = 0L; + onChanged(); + return this; + } + + private boolean conflictDetected_ ; + /** + * 
+     * Whether a conflict was detected for this mutation. Always false when a
+     * conflict detection strategy field is not set in the mutation.
+     *
+ * + * bool conflict_detected = 5; + */ + public boolean getConflictDetected() { + return conflictDetected_; + } + /** + * 
+     * Whether a conflict was detected for this mutation. Always false when a
+     * conflict detection strategy field is not set in the mutation.
+     *
+ * + * bool conflict_detected = 5; + */ + public Builder setConflictDetected(boolean value) { + + conflictDetected_ = value; + onChanged(); + return this; + } + /** + * 
+     * Whether a conflict was detected for this mutation. Always false when a
+     * conflict detection strategy field is not set in the mutation.
+     *
+ * + * bool conflict_detected = 5; + */ + public Builder clearConflictDetected() { + + conflictDetected_ = false; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.MutationResult) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.MutationResult) + private static final com.google.datastore.v1.MutationResult DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.MutationResult(); + } + + public static com.google.datastore.v1.MutationResult getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public MutationResult parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new MutationResult(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java new file mode 100644 index 000000000000..fd19d2fa265e --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java @@ -0,0 +1,60 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface MutationResultOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.MutationResult) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The automatically allocated key.
+   * Set only when the mutation allocated a key.
+   *
+ * + * .google.datastore.v1.Key key = 3; + */ + boolean hasKey(); + /** + * 
+   * The automatically allocated key.
+   * Set only when the mutation allocated a key.
+   *
+ * + * .google.datastore.v1.Key key = 3; + */ + com.google.datastore.v1.Key getKey(); + /** + * 
+   * The automatically allocated key.
+   * Set only when the mutation allocated a key.
+   *
+ * + * .google.datastore.v1.Key key = 3; + */ + com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder(); + + /** + * 
+   * The version of the entity on the server after processing the mutation. If
+   * the mutation doesn't change anything on the server, then the version will
+   * be the version of the current entity or, if no entity is present, a version
+   * that is strictly greater than the version of any previous entity and less
+   * than the version of any possible future entity.
+   *
+ * + * int64 version = 4; + */ + long getVersion(); + + /** + * 
+   * Whether a conflict was detected for this mutation. Always false when a
+   * conflict detection strategy field is not set in the mutation.
+   *
+ * + * bool conflict_detected = 5; + */ + boolean getConflictDetected(); +} 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 new file mode 100644 index 000000000000..c78b352e0324 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java @@ -0,0 +1,735 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +/** + * 
+ * 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}`
+ * If the value of any dimension matches regex `__.*__`, the partition is
+ * 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 an active state.
+ *
+ * + * Protobuf type {@code google.datastore.v1.PartitionId} + */ +public final class PartitionId extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.PartitionId) + PartitionIdOrBuilder { +private static final long serialVersionUID = 0L; + // Use PartitionId.newBuilder() to construct. + private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PartitionId() { + projectId_ = ""; + namespaceId_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PartitionId( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + case 34: { + java.lang.String s = input.readStringRequireUtf8(); + + namespaceId_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PartitionId.class, com.google.datastore.v1.PartitionId.Builder.class); + } + + public static final int PROJECT_ID_FIELD_NUMBER = 2; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project to which the entities belong.
+   *
+ * + * string project_id = 2; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project to which the entities belong.
+   *
+ * + * string project_id = 2; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int NAMESPACE_ID_FIELD_NUMBER = 4; + private volatile java.lang.Object namespaceId_; + /** + * 
+   * If not empty, the ID of the namespace to which the entities belong.
+   *
+ * + * string namespace_id = 4; + */ + public java.lang.String getNamespaceId() { + java.lang.Object ref = namespaceId_; + 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(); + namespaceId_ = s; + return s; + } + } + /** + * 
+   * If not empty, the ID of the namespace to which the entities belong.
+   *
+ * + * string namespace_id = 4; + */ + public com.google.protobuf.ByteString + getNamespaceIdBytes() { + java.lang.Object ref = namespaceId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + namespaceId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectId_); + } + if (!getNamespaceIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectId_); + } + if (!getNamespaceIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.PartitionId)) { + return super.equals(obj); + } + com.google.datastore.v1.PartitionId other = (com.google.datastore.v1.PartitionId) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && getNamespaceId() + .equals(other.getNamespaceId()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + hash = (37 * hash) + NAMESPACE_ID_FIELD_NUMBER; + hash = (53 * hash) + getNamespaceId().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.PartitionId parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PartitionId parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PartitionId parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PartitionId parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PartitionId parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PartitionId parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PartitionId parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PartitionId parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PartitionId parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PartitionId parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PartitionId parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PartitionId parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.PartitionId prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * 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}`
+   * If the value of any dimension matches regex `__.*__`, the partition is
+   * 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 an active state.
+   *
+ * + * Protobuf type {@code google.datastore.v1.PartitionId} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.PartitionId) + com.google.datastore.v1.PartitionIdOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PartitionId.class, com.google.datastore.v1.PartitionId.Builder.class); + } + + // Construct using com.google.datastore.v1.PartitionId.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + namespaceId_ = ""; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; + } + + public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { + return com.google.datastore.v1.PartitionId.getDefaultInstance(); + } + + public com.google.datastore.v1.PartitionId build() { + com.google.datastore.v1.PartitionId result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.PartitionId buildPartial() { + com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this); + result.projectId_ = projectId_; + result.namespaceId_ = namespaceId_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.PartitionId) { + return mergeFrom((com.google.datastore.v1.PartitionId)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.PartitionId other) { + if (other == com.google.datastore.v1.PartitionId.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (!other.getNamespaceId().isEmpty()) { + namespaceId_ = other.namespaceId_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.PartitionId parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.PartitionId) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project to which the entities belong.
+     *
+ * + * string project_id = 2; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project to which the entities belong.
+     *
+ * + * string project_id = 2; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project to which the entities belong.
+     *
+ * + * string project_id = 2; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project to which the entities belong.
+     *
+ * + * string project_id = 2; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project to which the entities belong.
+     *
+ * + * string project_id = 2; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private java.lang.Object namespaceId_ = ""; + /** + * 
+     * If not empty, the ID of the namespace to which the entities belong.
+     *
+ * + * string namespace_id = 4; + */ + public java.lang.String getNamespaceId() { + java.lang.Object ref = namespaceId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + namespaceId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * If not empty, the ID of the namespace to which the entities belong.
+     *
+ * + * string namespace_id = 4; + */ + public com.google.protobuf.ByteString + getNamespaceIdBytes() { + java.lang.Object ref = namespaceId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + namespaceId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * If not empty, the ID of the namespace to which the entities belong.
+     *
+ * + * string namespace_id = 4; + */ + public Builder setNamespaceId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + namespaceId_ = value; + onChanged(); + return this; + } + /** + * 
+     * If not empty, the ID of the namespace to which the entities belong.
+     *
+ * + * string namespace_id = 4; + */ + public Builder clearNamespaceId() { + + namespaceId_ = getDefaultInstance().getNamespaceId(); + onChanged(); + return this; + } + /** + * 
+     * If not empty, the ID of the namespace to which the entities belong.
+     *
+ * + * string namespace_id = 4; + */ + public Builder setNamespaceIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + namespaceId_ = value; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.PartitionId) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.PartitionId) + private static final com.google.datastore.v1.PartitionId DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.PartitionId(); + } + + public static com.google.datastore.v1.PartitionId getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public PartitionId parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PartitionId(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java new file mode 100644 index 000000000000..1c378fd56d71 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java @@ -0,0 +1,45 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +public interface PartitionIdOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.PartitionId) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project to which the entities belong.
+   *
+ * + * string project_id = 2; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project to which the entities belong.
+   *
+ * + * string project_id = 2; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * If not empty, the ID of the namespace to which the entities belong.
+   *
+ * + * string namespace_id = 4; + */ + java.lang.String getNamespaceId(); + /** + * 
+   * If not empty, the ID of the namespace to which the entities belong.
+   *
+ * + * string namespace_id = 4; + */ + com.google.protobuf.ByteString + getNamespaceIdBytes(); +} 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 new file mode 100644 index 000000000000..4aa346d4ad29 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java @@ -0,0 +1,626 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A representation of a property in a projection.
+ *
+ * + * Protobuf type {@code google.datastore.v1.Projection} + */ +public final class Projection extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Projection) + ProjectionOrBuilder { +private static final long serialVersionUID = 0L; + // Use Projection.newBuilder() to construct. + private Projection(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Projection() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Projection( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.PropertyReference.Builder subBuilder = null; + if (property_ != null) { + subBuilder = property_.toBuilder(); + } + property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(property_); + property_ = subBuilder.buildPartial(); + } + + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Projection.class, com.google.datastore.v1.Projection.Builder.class); + } + + public static final int PROPERTY_FIELD_NUMBER = 1; + private com.google.datastore.v1.PropertyReference property_; + /** + * 
+   * The property to project.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public boolean hasProperty() { + return property_ != null; + } + /** + * 
+   * The property to project.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference getProperty() { + return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } + /** + * 
+   * The property to project.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() { + return getProperty(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (property_ != null) { + output.writeMessage(1, getProperty()); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (property_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getProperty()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Projection)) { + return super.equals(obj); + } + com.google.datastore.v1.Projection other = (com.google.datastore.v1.Projection) obj; + + boolean result = true; + result = result && (hasProperty() == other.hasProperty()); + if (hasProperty()) { + result = result && getProperty() + .equals(other.getProperty()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasProperty()) { + hash = (37 * hash) + PROPERTY_FIELD_NUMBER; + hash = (53 * hash) + getProperty().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Projection parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Projection parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Projection parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Projection parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Projection parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Projection parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Projection parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Projection parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Projection parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Projection parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Projection parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Projection parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Projection prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A representation of a property in a projection.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Projection} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Projection) + com.google.datastore.v1.ProjectionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Projection.class, com.google.datastore.v1.Projection.Builder.class); + } + + // Construct using com.google.datastore.v1.Projection.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + if (propertyBuilder_ == null) { + property_ = null; + } else { + property_ = null; + propertyBuilder_ = null; + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; + } + + public com.google.datastore.v1.Projection getDefaultInstanceForType() { + return com.google.datastore.v1.Projection.getDefaultInstance(); + } + + public com.google.datastore.v1.Projection build() { + com.google.datastore.v1.Projection result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Projection buildPartial() { + com.google.datastore.v1.Projection result = new com.google.datastore.v1.Projection(this); + if (propertyBuilder_ == null) { + result.property_ = property_; + } else { + result.property_ = propertyBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Projection) { + return mergeFrom((com.google.datastore.v1.Projection)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Projection other) { + if (other == com.google.datastore.v1.Projection.getDefaultInstance()) return this; + if (other.hasProperty()) { + mergeProperty(other.getProperty()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Projection parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Projection) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.datastore.v1.PropertyReference property_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public boolean hasProperty() { + return propertyBuilder_ != null || property_ != null; + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference getProperty() { + if (propertyBuilder_ == null) { + return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } else { + return propertyBuilder_.getMessage(); + } + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder setProperty(com.google.datastore.v1.PropertyReference value) { + if (propertyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + property_ = value; + onChanged(); + } else { + propertyBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder setProperty( + com.google.datastore.v1.PropertyReference.Builder builderForValue) { + if (propertyBuilder_ == null) { + property_ = builderForValue.build(); + onChanged(); + } else { + propertyBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { + if (propertyBuilder_ == null) { + if (property_ != null) { + property_ = + com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial(); + } else { + property_ = value; + } + onChanged(); + } else { + propertyBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder clearProperty() { + if (propertyBuilder_ == null) { + property_ = null; + onChanged(); + } else { + property_ = null; + propertyBuilder_ = null; + } + + return this; + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { + + onChanged(); + return getPropertyFieldBuilder().getBuilder(); + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() { + if (propertyBuilder_ != null) { + return propertyBuilder_.getMessageOrBuilder(); + } else { + return property_ == null ? + com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } + } + /** + * 
+     * The property to project.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> + getPropertyFieldBuilder() { + if (propertyBuilder_ == null) { + propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>( + getProperty(), + getParentForChildren(), + isClean()); + property_ = null; + } + return propertyBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Projection) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Projection) + private static final com.google.datastore.v1.Projection DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Projection(); + } + + public static com.google.datastore.v1.Projection getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Projection parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Projection(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Projection getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java new file mode 100644 index 000000000000..648a76a8b9a1 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java @@ -0,0 +1,34 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface ProjectionOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Projection) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The property to project.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + boolean hasProperty(); + /** + * 
+   * The property to project.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + com.google.datastore.v1.PropertyReference getProperty(); + /** + * 
+   * The property to project.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder(); +} 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 new file mode 100644 index 000000000000..d78c077e298f --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java @@ -0,0 +1,1169 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A filter on a specific property.
+ *
+ * + * Protobuf type {@code google.datastore.v1.PropertyFilter} + */ +public final class PropertyFilter extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyFilter) + PropertyFilterOrBuilder { +private static final long serialVersionUID = 0L; + // Use PropertyFilter.newBuilder() to construct. + private PropertyFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PropertyFilter() { + op_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PropertyFilter( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.PropertyReference.Builder subBuilder = null; + if (property_ != null) { + subBuilder = property_.toBuilder(); + } + property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(property_); + property_ = subBuilder.buildPartial(); + } + + break; + } + case 16: { + int rawValue = input.readEnum(); + + op_ = rawValue; + break; + } + case 26: { + com.google.datastore.v1.Value.Builder subBuilder = null; + if (value_ != null) { + subBuilder = value_.toBuilder(); + } + value_ = input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(value_); + value_ = subBuilder.buildPartial(); + } + + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyFilter.class, com.google.datastore.v1.PropertyFilter.Builder.class); + } + + /** + * 
+   * A property filter operator.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.PropertyFilter.Operator} + */ + public enum Operator + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * OPERATOR_UNSPECIFIED = 0; + */ + OPERATOR_UNSPECIFIED(0), + /** + * 
+     * Less than.
+     *
+ * + * LESS_THAN = 1; + */ + LESS_THAN(1), + /** + * 
+     * Less than or equal.
+     *
+ * + * LESS_THAN_OR_EQUAL = 2; + */ + LESS_THAN_OR_EQUAL(2), + /** + * 
+     * Greater than.
+     *
+ * + * GREATER_THAN = 3; + */ + GREATER_THAN(3), + /** + * 
+     * Greater than or equal.
+     *
+ * + * GREATER_THAN_OR_EQUAL = 4; + */ + GREATER_THAN_OR_EQUAL(4), + /** + * 
+     * Equal.
+     *
+ * + * EQUAL = 5; + */ + EQUAL(5), + /** + * 
+     * Has ancestor.
+     *
+ * + * HAS_ANCESTOR = 11; + */ + HAS_ANCESTOR(11), + UNRECOGNIZED(-1), + ; + + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * OPERATOR_UNSPECIFIED = 0; + */ + public static final int OPERATOR_UNSPECIFIED_VALUE = 0; + /** + * 
+     * Less than.
+     *
+ * + * LESS_THAN = 1; + */ + public static final int LESS_THAN_VALUE = 1; + /** + * 
+     * Less than or equal.
+     *
+ * + * LESS_THAN_OR_EQUAL = 2; + */ + public static final int LESS_THAN_OR_EQUAL_VALUE = 2; + /** + * 
+     * Greater than.
+     *
+ * + * GREATER_THAN = 3; + */ + public static final int GREATER_THAN_VALUE = 3; + /** + * 
+     * Greater than or equal.
+     *
+ * + * GREATER_THAN_OR_EQUAL = 4; + */ + public static final int GREATER_THAN_OR_EQUAL_VALUE = 4; + /** + * 
+     * Equal.
+     *
+ * + * EQUAL = 5; + */ + public static final int EQUAL_VALUE = 5; + /** + * 
+     * Has ancestor.
+     *
+ * + * HAS_ANCESTOR = 11; + */ + public static final int HAS_ANCESTOR_VALUE = 11; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static Operator valueOf(int value) { + return forNumber(value); + } + + public static Operator forNumber(int value) { + switch (value) { + case 0: return OPERATOR_UNSPECIFIED; + case 1: return LESS_THAN; + case 2: return LESS_THAN_OR_EQUAL; + case 3: return GREATER_THAN; + case 4: return GREATER_THAN_OR_EQUAL; + case 5: return EQUAL; + case 11: return HAS_ANCESTOR; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + Operator> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Operator findValueByNumber(int number) { + return Operator.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.google.datastore.v1.PropertyFilter.getDescriptor().getEnumTypes().get(0); + } + + private static final Operator[] VALUES = values(); + + public static Operator valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private Operator(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.PropertyFilter.Operator) + } + + public static final int PROPERTY_FIELD_NUMBER = 1; + private com.google.datastore.v1.PropertyReference property_; + /** + * 
+   * The property to filter by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public boolean hasProperty() { + return property_ != null; + } + /** + * 
+   * The property to filter by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference getProperty() { + return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } + /** + * 
+   * The property to filter by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() { + return getProperty(); + } + + public static final int OP_FIELD_NUMBER = 2; + private int op_; + /** + * 
+   * The operator to filter by.
+   *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + public int getOpValue() { + return op_; + } + /** + * 
+   * The operator to filter by.
+   *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + public com.google.datastore.v1.PropertyFilter.Operator getOp() { + com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); + return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; + } + + public static final int VALUE_FIELD_NUMBER = 3; + private com.google.datastore.v1.Value value_; + /** + * 
+   * The value to compare the property to.
+   *
+ * + * .google.datastore.v1.Value value = 3; + */ + public boolean hasValue() { + return value_ != null; + } + /** + * 
+   * The value to compare the property to.
+   *
+ * + * .google.datastore.v1.Value value = 3; + */ + public com.google.datastore.v1.Value getValue() { + return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_; + } + /** + * 
+   * The value to compare the property to.
+   *
+ * + * .google.datastore.v1.Value value = 3; + */ + public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { + return getValue(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (property_ != null) { + output.writeMessage(1, getProperty()); + } + if (op_ != com.google.datastore.v1.PropertyFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) { + output.writeEnum(2, op_); + } + if (value_ != null) { + output.writeMessage(3, getValue()); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (property_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getProperty()); + } + if (op_ != com.google.datastore.v1.PropertyFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(2, op_); + } + if (value_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getValue()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.PropertyFilter)) { + return super.equals(obj); + } + com.google.datastore.v1.PropertyFilter other = (com.google.datastore.v1.PropertyFilter) obj; + + boolean result = true; + result = result && (hasProperty() == other.hasProperty()); + if (hasProperty()) { + result = result && getProperty() + .equals(other.getProperty()); + } + result = result && op_ == other.op_; + result = result && (hasValue() == other.hasValue()); + if (hasValue()) { + result = result && getValue() + .equals(other.getValue()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasProperty()) { + hash = (37 * hash) + PROPERTY_FIELD_NUMBER; + hash = (53 * hash) + getProperty().hashCode(); + } + hash = (37 * hash) + OP_FIELD_NUMBER; + hash = (53 * hash) + op_; + if (hasValue()) { + hash = (37 * hash) + VALUE_FIELD_NUMBER; + hash = (53 * hash) + getValue().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.PropertyFilter parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyFilter parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyFilter parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyFilter parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyFilter parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyFilter parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyFilter parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyFilter parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PropertyFilter parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyFilter parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PropertyFilter parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyFilter parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.PropertyFilter prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A filter on a specific property.
+   *
+ * + * Protobuf type {@code google.datastore.v1.PropertyFilter} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyFilter) + com.google.datastore.v1.PropertyFilterOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyFilter.class, com.google.datastore.v1.PropertyFilter.Builder.class); + } + + // Construct using com.google.datastore.v1.PropertyFilter.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + if (propertyBuilder_ == null) { + property_ = null; + } else { + property_ = null; + propertyBuilder_ = null; + } + op_ = 0; + + if (valueBuilder_ == null) { + value_ = null; + } else { + value_ = null; + valueBuilder_ = null; + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; + } + + public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { + return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); + } + + public com.google.datastore.v1.PropertyFilter build() { + com.google.datastore.v1.PropertyFilter result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.PropertyFilter buildPartial() { + com.google.datastore.v1.PropertyFilter result = new com.google.datastore.v1.PropertyFilter(this); + if (propertyBuilder_ == null) { + result.property_ = property_; + } else { + result.property_ = propertyBuilder_.build(); + } + result.op_ = op_; + if (valueBuilder_ == null) { + result.value_ = value_; + } else { + result.value_ = valueBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.PropertyFilter) { + return mergeFrom((com.google.datastore.v1.PropertyFilter)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.PropertyFilter other) { + if (other == com.google.datastore.v1.PropertyFilter.getDefaultInstance()) return this; + if (other.hasProperty()) { + mergeProperty(other.getProperty()); + } + if (other.op_ != 0) { + setOpValue(other.getOpValue()); + } + if (other.hasValue()) { + mergeValue(other.getValue()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.PropertyFilter parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.PropertyFilter) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.datastore.v1.PropertyReference property_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public boolean hasProperty() { + return propertyBuilder_ != null || property_ != null; + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference getProperty() { + if (propertyBuilder_ == null) { + return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } else { + return propertyBuilder_.getMessage(); + } + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder setProperty(com.google.datastore.v1.PropertyReference value) { + if (propertyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + property_ = value; + onChanged(); + } else { + propertyBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder setProperty( + com.google.datastore.v1.PropertyReference.Builder builderForValue) { + if (propertyBuilder_ == null) { + property_ = builderForValue.build(); + onChanged(); + } else { + propertyBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { + if (propertyBuilder_ == null) { + if (property_ != null) { + property_ = + com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial(); + } else { + property_ = value; + } + onChanged(); + } else { + propertyBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder clearProperty() { + if (propertyBuilder_ == null) { + property_ = null; + onChanged(); + } else { + property_ = null; + propertyBuilder_ = null; + } + + return this; + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { + + onChanged(); + return getPropertyFieldBuilder().getBuilder(); + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() { + if (propertyBuilder_ != null) { + return propertyBuilder_.getMessageOrBuilder(); + } else { + return property_ == null ? + com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } + } + /** + * 
+     * The property to filter by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> + getPropertyFieldBuilder() { + if (propertyBuilder_ == null) { + propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>( + getProperty(), + getParentForChildren(), + isClean()); + property_ = null; + } + return propertyBuilder_; + } + + private int op_ = 0; + /** + * 
+     * The operator to filter by.
+     *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + public int getOpValue() { + return op_; + } + /** + * 
+     * The operator to filter by.
+     *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + public Builder setOpValue(int value) { + op_ = value; + onChanged(); + return this; + } + /** + * 
+     * The operator to filter by.
+     *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + public com.google.datastore.v1.PropertyFilter.Operator getOp() { + com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); + return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; + } + /** + * 
+     * The operator to filter by.
+     *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) { + if (value == null) { + throw new NullPointerException(); + } + + op_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * The operator to filter by.
+     *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + public Builder clearOp() { + + op_ = 0; + onChanged(); + return this; + } + + private com.google.datastore.v1.Value value_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_; + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public boolean hasValue() { + return valueBuilder_ != null || value_ != null; + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public com.google.datastore.v1.Value getValue() { + if (valueBuilder_ == null) { + return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_; + } else { + return valueBuilder_.getMessage(); + } + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public Builder setValue(com.google.datastore.v1.Value value) { + if (valueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + value_ = value; + onChanged(); + } else { + valueBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public Builder setValue( + com.google.datastore.v1.Value.Builder builderForValue) { + if (valueBuilder_ == null) { + value_ = builderForValue.build(); + onChanged(); + } else { + valueBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public Builder mergeValue(com.google.datastore.v1.Value value) { + if (valueBuilder_ == null) { + if (value_ != null) { + value_ = + com.google.datastore.v1.Value.newBuilder(value_).mergeFrom(value).buildPartial(); + } else { + value_ = value; + } + onChanged(); + } else { + valueBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public Builder clearValue() { + if (valueBuilder_ == null) { + value_ = null; + onChanged(); + } else { + value_ = null; + valueBuilder_ = null; + } + + return this; + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public com.google.datastore.v1.Value.Builder getValueBuilder() { + + onChanged(); + return getValueFieldBuilder().getBuilder(); + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { + if (valueBuilder_ != null) { + return valueBuilder_.getMessageOrBuilder(); + } else { + return value_ == null ? + com.google.datastore.v1.Value.getDefaultInstance() : value_; + } + } + /** + * 
+     * The value to compare the property to.
+     *
+ * + * .google.datastore.v1.Value value = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> + getValueFieldBuilder() { + if (valueBuilder_ == null) { + valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>( + getValue(), + getParentForChildren(), + isClean()); + value_ = null; + } + return valueBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyFilter) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyFilter) + private static final com.google.datastore.v1.PropertyFilter DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyFilter(); + } + + public static com.google.datastore.v1.PropertyFilter getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public PropertyFilter parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PropertyFilter(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java new file mode 100644 index 000000000000..bea00389b63c --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java @@ -0,0 +1,76 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface PropertyFilterOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyFilter) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The property to filter by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + boolean hasProperty(); + /** + * 
+   * The property to filter by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + com.google.datastore.v1.PropertyReference getProperty(); + /** + * 
+   * The property to filter by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder(); + + /** + * 
+   * The operator to filter by.
+   *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + int getOpValue(); + /** + * 
+   * The operator to filter by.
+   *
+ * + * .google.datastore.v1.PropertyFilter.Operator op = 2; + */ + com.google.datastore.v1.PropertyFilter.Operator getOp(); + + /** + * 
+   * The value to compare the property to.
+   *
+ * + * .google.datastore.v1.Value value = 3; + */ + boolean hasValue(); + /** + * 
+   * The value to compare the property to.
+   *
+ * + * .google.datastore.v1.Value value = 3; + */ + com.google.datastore.v1.Value getValue(); + /** + * 
+   * The value to compare the property to.
+   *
+ * + * .google.datastore.v1.Value value = 3; + */ + com.google.datastore.v1.ValueOrBuilder getValueOrBuilder(); +} 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 new file mode 100644 index 000000000000..06b738e0ff48 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java @@ -0,0 +1,872 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * The desired order for a specific property.
+ *
+ * + * Protobuf type {@code google.datastore.v1.PropertyOrder} + */ +public final class PropertyOrder extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyOrder) + PropertyOrderOrBuilder { +private static final long serialVersionUID = 0L; + // Use PropertyOrder.newBuilder() to construct. + private PropertyOrder(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PropertyOrder() { + direction_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PropertyOrder( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.PropertyReference.Builder subBuilder = null; + if (property_ != null) { + subBuilder = property_.toBuilder(); + } + property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(property_); + property_ = subBuilder.buildPartial(); + } + + break; + } + case 16: { + int rawValue = input.readEnum(); + + direction_ = rawValue; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyOrder.class, com.google.datastore.v1.PropertyOrder.Builder.class); + } + + /** + * 
+   * The sort direction.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.PropertyOrder.Direction} + */ + public enum Direction + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * DIRECTION_UNSPECIFIED = 0; + */ + DIRECTION_UNSPECIFIED(0), + /** + * 
+     * Ascending.
+     *
+ * + * ASCENDING = 1; + */ + ASCENDING(1), + /** + * 
+     * Descending.
+     *
+ * + * DESCENDING = 2; + */ + DESCENDING(2), + UNRECOGNIZED(-1), + ; + + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * DIRECTION_UNSPECIFIED = 0; + */ + public static final int DIRECTION_UNSPECIFIED_VALUE = 0; + /** + * 
+     * Ascending.
+     *
+ * + * ASCENDING = 1; + */ + public static final int ASCENDING_VALUE = 1; + /** + * 
+     * Descending.
+     *
+ * + * DESCENDING = 2; + */ + public static final int DESCENDING_VALUE = 2; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static Direction valueOf(int value) { + return forNumber(value); + } + + public static Direction forNumber(int value) { + switch (value) { + case 0: return DIRECTION_UNSPECIFIED; + case 1: return ASCENDING; + case 2: return DESCENDING; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + Direction> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Direction findValueByNumber(int number) { + return Direction.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.google.datastore.v1.PropertyOrder.getDescriptor().getEnumTypes().get(0); + } + + private static final Direction[] VALUES = values(); + + public static Direction valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private Direction(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.PropertyOrder.Direction) + } + + public static final int PROPERTY_FIELD_NUMBER = 1; + private com.google.datastore.v1.PropertyReference property_; + /** + * 
+   * The property to order by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public boolean hasProperty() { + return property_ != null; + } + /** + * 
+   * The property to order by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference getProperty() { + return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } + /** + * 
+   * The property to order by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() { + return getProperty(); + } + + public static final int DIRECTION_FIELD_NUMBER = 2; + private int direction_; + /** + * 
+   * The direction to order by. Defaults to `ASCENDING`.
+   *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + public int getDirectionValue() { + return direction_; + } + /** + * 
+   * The direction to order by. Defaults to `ASCENDING`.
+   *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + public com.google.datastore.v1.PropertyOrder.Direction getDirection() { + com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); + return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (property_ != null) { + output.writeMessage(1, getProperty()); + } + if (direction_ != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) { + output.writeEnum(2, direction_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (property_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getProperty()); + } + if (direction_ != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(2, direction_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.PropertyOrder)) { + return super.equals(obj); + } + com.google.datastore.v1.PropertyOrder other = (com.google.datastore.v1.PropertyOrder) obj; + + boolean result = true; + result = result && (hasProperty() == other.hasProperty()); + if (hasProperty()) { + result = result && getProperty() + .equals(other.getProperty()); + } + result = result && direction_ == other.direction_; + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasProperty()) { + hash = (37 * hash) + PROPERTY_FIELD_NUMBER; + hash = (53 * hash) + getProperty().hashCode(); + } + hash = (37 * hash) + DIRECTION_FIELD_NUMBER; + hash = (53 * hash) + direction_; + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.PropertyOrder parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyOrder parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyOrder parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyOrder parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyOrder parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyOrder parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyOrder parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyOrder parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PropertyOrder parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyOrder parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PropertyOrder parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyOrder parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.PropertyOrder prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The desired order for a specific property.
+   *
+ * + * Protobuf type {@code google.datastore.v1.PropertyOrder} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyOrder) + com.google.datastore.v1.PropertyOrderOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyOrder.class, com.google.datastore.v1.PropertyOrder.Builder.class); + } + + // Construct using com.google.datastore.v1.PropertyOrder.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + if (propertyBuilder_ == null) { + property_ = null; + } else { + property_ = null; + propertyBuilder_ = null; + } + direction_ = 0; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; + } + + public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { + return com.google.datastore.v1.PropertyOrder.getDefaultInstance(); + } + + public com.google.datastore.v1.PropertyOrder build() { + com.google.datastore.v1.PropertyOrder result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.PropertyOrder buildPartial() { + com.google.datastore.v1.PropertyOrder result = new com.google.datastore.v1.PropertyOrder(this); + if (propertyBuilder_ == null) { + result.property_ = property_; + } else { + result.property_ = propertyBuilder_.build(); + } + result.direction_ = direction_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.PropertyOrder) { + return mergeFrom((com.google.datastore.v1.PropertyOrder)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.PropertyOrder other) { + if (other == com.google.datastore.v1.PropertyOrder.getDefaultInstance()) return this; + if (other.hasProperty()) { + mergeProperty(other.getProperty()); + } + if (other.direction_ != 0) { + setDirectionValue(other.getDirectionValue()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.PropertyOrder parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.PropertyOrder) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.datastore.v1.PropertyReference property_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public boolean hasProperty() { + return propertyBuilder_ != null || property_ != null; + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference getProperty() { + if (propertyBuilder_ == null) { + return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } else { + return propertyBuilder_.getMessage(); + } + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder setProperty(com.google.datastore.v1.PropertyReference value) { + if (propertyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + property_ = value; + onChanged(); + } else { + propertyBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder setProperty( + com.google.datastore.v1.PropertyReference.Builder builderForValue) { + if (propertyBuilder_ == null) { + property_ = builderForValue.build(); + onChanged(); + } else { + propertyBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { + if (propertyBuilder_ == null) { + if (property_ != null) { + property_ = + com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial(); + } else { + property_ = value; + } + onChanged(); + } else { + propertyBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public Builder clearProperty() { + if (propertyBuilder_ == null) { + property_ = null; + onChanged(); + } else { + property_ = null; + propertyBuilder_ = null; + } + + return this; + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { + + onChanged(); + return getPropertyFieldBuilder().getBuilder(); + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() { + if (propertyBuilder_ != null) { + return propertyBuilder_.getMessageOrBuilder(); + } else { + return property_ == null ? + com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; + } + } + /** + * 
+     * The property to order by.
+     *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> + getPropertyFieldBuilder() { + if (propertyBuilder_ == null) { + propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>( + getProperty(), + getParentForChildren(), + isClean()); + property_ = null; + } + return propertyBuilder_; + } + + private int direction_ = 0; + /** + * 
+     * The direction to order by. Defaults to `ASCENDING`.
+     *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + public int getDirectionValue() { + return direction_; + } + /** + * 
+     * The direction to order by. Defaults to `ASCENDING`.
+     *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + public Builder setDirectionValue(int value) { + direction_ = value; + onChanged(); + return this; + } + /** + * 
+     * The direction to order by. Defaults to `ASCENDING`.
+     *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + public com.google.datastore.v1.PropertyOrder.Direction getDirection() { + com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); + return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; + } + /** + * 
+     * The direction to order by. Defaults to `ASCENDING`.
+     *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction value) { + if (value == null) { + throw new NullPointerException(); + } + + direction_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * The direction to order by. Defaults to `ASCENDING`.
+     *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + public Builder clearDirection() { + + direction_ = 0; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyOrder) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyOrder) + private static final com.google.datastore.v1.PropertyOrder DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyOrder(); + } + + public static com.google.datastore.v1.PropertyOrder getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public PropertyOrder parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PropertyOrder(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java new file mode 100644 index 000000000000..6b4f9e536093 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java @@ -0,0 +1,51 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface PropertyOrderOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyOrder) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The property to order by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + boolean hasProperty(); + /** + * 
+   * The property to order by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + com.google.datastore.v1.PropertyReference getProperty(); + /** + * 
+   * The property to order by.
+   *
+ * + * .google.datastore.v1.PropertyReference property = 1; + */ + com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder(); + + /** + * 
+   * The direction to order by. Defaults to `ASCENDING`.
+   *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + int getDirectionValue(); + /** + * 
+   * The direction to order by. Defaults to `ASCENDING`.
+   *
+ * + * .google.datastore.v1.PropertyOrder.Direction direction = 2; + */ + com.google.datastore.v1.PropertyOrder.Direction getDirection(); +} 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 new file mode 100644 index 000000000000..a4c1c4715256 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java @@ -0,0 +1,559 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A reference to a property relative to the kind expressions.
+ *
+ * + * Protobuf type {@code google.datastore.v1.PropertyReference} + */ +public final class PropertyReference extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyReference) + PropertyReferenceOrBuilder { +private static final long serialVersionUID = 0L; + // Use PropertyReference.newBuilder() to construct. + private PropertyReference(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PropertyReference() { + name_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PropertyReference( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyReference.class, com.google.datastore.v1.PropertyReference.Builder.class); + } + + public static final int NAME_FIELD_NUMBER = 2; + private volatile java.lang.Object name_; + /** + * 
+   * The name of the property.
+   * If name includes "."s, it may be interpreted as a property name path.
+   *
+ * + * string name = 2; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + 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(); + name_ = s; + return s; + } + } + /** + * 
+   * The name of the property.
+   * If name includes "."s, it may be interpreted as a property name path.
+   *
+ * + * string name = 2; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.PropertyReference)) { + return super.equals(obj); + } + com.google.datastore.v1.PropertyReference other = (com.google.datastore.v1.PropertyReference) obj; + + boolean result = true; + result = result && getName() + .equals(other.getName()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.PropertyReference parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyReference parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyReference parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyReference parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyReference parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.PropertyReference parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.PropertyReference parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyReference parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PropertyReference parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyReference parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.PropertyReference parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.PropertyReference parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.PropertyReference prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A reference to a property relative to the kind expressions.
+   *
+ * + * Protobuf type {@code google.datastore.v1.PropertyReference} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyReference) + com.google.datastore.v1.PropertyReferenceOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyReference.class, com.google.datastore.v1.PropertyReference.Builder.class); + } + + // Construct using com.google.datastore.v1.PropertyReference.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + name_ = ""; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; + } + + public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { + return com.google.datastore.v1.PropertyReference.getDefaultInstance(); + } + + public com.google.datastore.v1.PropertyReference build() { + com.google.datastore.v1.PropertyReference result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.PropertyReference buildPartial() { + com.google.datastore.v1.PropertyReference result = new com.google.datastore.v1.PropertyReference(this); + result.name_ = name_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.PropertyReference) { + return mergeFrom((com.google.datastore.v1.PropertyReference)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) { + if (other == com.google.datastore.v1.PropertyReference.getDefaultInstance()) return this; + if (!other.getName().isEmpty()) { + name_ = other.name_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.PropertyReference parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.PropertyReference) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object name_ = ""; + /** + * 
+     * The name of the property.
+     * If name includes "."s, it may be interpreted as a property name path.
+     *
+ * + * string name = 2; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The name of the property.
+     * If name includes "."s, it may be interpreted as a property name path.
+     *
+ * + * string name = 2; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The name of the property.
+     * If name includes "."s, it may be interpreted as a property name path.
+     *
+ * + * string name = 2; + */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + name_ = value; + onChanged(); + return this; + } + /** + * 
+     * The name of the property.
+     * If name includes "."s, it may be interpreted as a property name path.
+     *
+ * + * string name = 2; + */ + public Builder clearName() { + + name_ = getDefaultInstance().getName(); + onChanged(); + return this; + } + /** + * 
+     * The name of the property.
+     * If name includes "."s, it may be interpreted as a property name path.
+     *
+ * + * string name = 2; + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + name_ = value; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyReference) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyReference) + private static final com.google.datastore.v1.PropertyReference DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyReference(); + } + + public static com.google.datastore.v1.PropertyReference getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public PropertyReference parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PropertyReference(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java new file mode 100644 index 000000000000..c8dc42d72b3c --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java @@ -0,0 +1,29 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface PropertyReferenceOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyReference) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The name of the property.
+   * If name includes "."s, it may be interpreted as a property name path.
+   *
+ * + * string name = 2; + */ + java.lang.String getName(); + /** + * 
+   * The name of the property.
+   * If name includes "."s, it may be interpreted as a property name path.
+   *
+ * + * string name = 2; + */ + com.google.protobuf.ByteString + getNameBytes(); +} 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 new file mode 100644 index 000000000000..7435b5582e57 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java @@ -0,0 +1,2953 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * 
+ * A query for entities.
+ *
+ * + * Protobuf type {@code google.datastore.v1.Query} + */ +public final class Query extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Query) + QueryOrBuilder { +private static final long serialVersionUID = 0L; + // Use Query.newBuilder() to construct. + private Query(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Query() { + projection_ = java.util.Collections.emptyList(); + kind_ = java.util.Collections.emptyList(); + order_ = java.util.Collections.emptyList(); + distinctOn_ = java.util.Collections.emptyList(); + startCursor_ = com.google.protobuf.ByteString.EMPTY; + endCursor_ = com.google.protobuf.ByteString.EMPTY; + offset_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Query( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + projection_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + projection_.add( + input.readMessage(com.google.datastore.v1.Projection.parser(), extensionRegistry)); + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + kind_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + kind_.add( + input.readMessage(com.google.datastore.v1.KindExpression.parser(), extensionRegistry)); + break; + } + case 34: { + com.google.datastore.v1.Filter.Builder subBuilder = null; + if (filter_ != null) { + subBuilder = filter_.toBuilder(); + } + filter_ = input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(filter_); + filter_ = subBuilder.buildPartial(); + } + + break; + } + case 42: { + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + order_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000008; + } + order_.add( + input.readMessage(com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry)); + break; + } + case 50: { + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + distinctOn_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000010; + } + distinctOn_.add( + input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry)); + break; + } + case 58: { + + startCursor_ = input.readBytes(); + break; + } + case 66: { + + endCursor_ = input.readBytes(); + break; + } + case 80: { + + offset_ = input.readInt32(); + break; + } + case 98: { + com.google.protobuf.Int32Value.Builder subBuilder = null; + if (limit_ != null) { + subBuilder = limit_.toBuilder(); + } + limit_ = input.readMessage(com.google.protobuf.Int32Value.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(limit_); + limit_ = subBuilder.buildPartial(); + } + + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + projection_ = java.util.Collections.unmodifiableList(projection_); + } + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + kind_ = java.util.Collections.unmodifiableList(kind_); + } + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + order_ = java.util.Collections.unmodifiableList(order_); + } + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class); + } + + private int bitField0_; + public static final int PROJECTION_FIELD_NUMBER = 2; + private java.util.List projection_; + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public java.util.List getProjectionList() { + return projection_; + } + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public java.util.List + getProjectionOrBuilderList() { + return projection_; + } + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public int getProjectionCount() { + return projection_.size(); + } + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public com.google.datastore.v1.Projection getProjection(int index) { + return projection_.get(index); + } + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder( + int index) { + return projection_.get(index); + } + + public static final int KIND_FIELD_NUMBER = 3; + private java.util.List kind_; + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public java.util.List getKindList() { + return kind_; + } + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public java.util.List + getKindOrBuilderList() { + return kind_; + } + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public int getKindCount() { + return kind_.size(); + } + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public com.google.datastore.v1.KindExpression getKind(int index) { + return kind_.get(index); + } + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder( + int index) { + return kind_.get(index); + } + + public static final int FILTER_FIELD_NUMBER = 4; + private com.google.datastore.v1.Filter filter_; + /** + * 
+   * The filter to apply.
+   *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public boolean hasFilter() { + return filter_ != null; + } + /** + * 
+   * The filter to apply.
+   *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public com.google.datastore.v1.Filter getFilter() { + return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_; + } + /** + * 
+   * The filter to apply.
+   *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() { + return getFilter(); + } + + public static final int ORDER_FIELD_NUMBER = 5; + private java.util.List order_; + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public java.util.List getOrderList() { + return order_; + } + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public java.util.List + getOrderOrBuilderList() { + return order_; + } + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public int getOrderCount() { + return order_.size(); + } + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public com.google.datastore.v1.PropertyOrder getOrder(int index) { + return order_.get(index); + } + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder( + int index) { + return order_.get(index); + } + + public static final int DISTINCT_ON_FIELD_NUMBER = 6; + private java.util.List distinctOn_; + /** + * 
+   * 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public java.util.List getDistinctOnList() { + return distinctOn_; + } + /** + * 
+   * 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public java.util.List + getDistinctOnOrBuilderList() { + return distinctOn_; + } + /** + * 
+   * 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public int getDistinctOnCount() { + return distinctOn_.size(); + } + /** + * 
+   * 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public com.google.datastore.v1.PropertyReference getDistinctOn(int index) { + return distinctOn_.get(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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder( + int index) { + return distinctOn_.get(index); + } + + public static final int START_CURSOR_FIELD_NUMBER = 7; + private com.google.protobuf.ByteString startCursor_; + /** + * 
+   * A starting point for the query results. Query cursors are
+   * returned in query result batches and
+   * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   *
+ * + * bytes start_cursor = 7; + */ + public com.google.protobuf.ByteString getStartCursor() { + return startCursor_; + } + + public static final int END_CURSOR_FIELD_NUMBER = 8; + private com.google.protobuf.ByteString endCursor_; + /** + * 
+   * An ending point for the query results. Query cursors are
+   * returned in query result batches and
+   * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   *
+ * + * bytes end_cursor = 8; + */ + public com.google.protobuf.ByteString getEndCursor() { + return endCursor_; + } + + public static final int OFFSET_FIELD_NUMBER = 10; + private int offset_; + /** + * 
+   * The number of results to skip. Applies before limit, but after all other
+   * constraints. Optional. Must be >= 0 if specified.
+   *
+ * + * int32 offset = 10; + */ + public int getOffset() { + return offset_; + } + + public static final int LIMIT_FIELD_NUMBER = 12; + private com.google.protobuf.Int32Value limit_; + /** + * 
+   * The maximum number of results to return. Applies after all other
+   * constraints. Optional.
+   * Unspecified is interpreted as no limit.
+   * Must be >= 0 if specified.
+   *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public boolean hasLimit() { + return limit_ != null; + } + /** + * 
+   * The maximum number of results to return. Applies after all other
+   * constraints. Optional.
+   * Unspecified is interpreted as no limit.
+   * Must be >= 0 if specified.
+   *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public com.google.protobuf.Int32Value getLimit() { + return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; + } + /** + * 
+   * The maximum number of results to return. Applies after all other
+   * constraints. Optional.
+   * Unspecified is interpreted as no limit.
+   * Must be >= 0 if specified.
+   *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { + return getLimit(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < projection_.size(); i++) { + output.writeMessage(2, projection_.get(i)); + } + for (int i = 0; i < kind_.size(); i++) { + output.writeMessage(3, kind_.get(i)); + } + if (filter_ != null) { + output.writeMessage(4, getFilter()); + } + for (int i = 0; i < order_.size(); i++) { + output.writeMessage(5, order_.get(i)); + } + for (int i = 0; i < distinctOn_.size(); i++) { + output.writeMessage(6, distinctOn_.get(i)); + } + if (!startCursor_.isEmpty()) { + output.writeBytes(7, startCursor_); + } + if (!endCursor_.isEmpty()) { + output.writeBytes(8, endCursor_); + } + if (offset_ != 0) { + output.writeInt32(10, offset_); + } + if (limit_ != null) { + output.writeMessage(12, getLimit()); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < projection_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, projection_.get(i)); + } + for (int i = 0; i < kind_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, kind_.get(i)); + } + if (filter_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getFilter()); + } + for (int i = 0; i < order_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, order_.get(i)); + } + for (int i = 0; i < distinctOn_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, distinctOn_.get(i)); + } + if (!startCursor_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(7, startCursor_); + } + if (!endCursor_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(8, endCursor_); + } + if (offset_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(10, offset_); + } + if (limit_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(12, getLimit()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Query)) { + return super.equals(obj); + } + com.google.datastore.v1.Query other = (com.google.datastore.v1.Query) obj; + + boolean result = true; + result = result && getProjectionList() + .equals(other.getProjectionList()); + result = result && getKindList() + .equals(other.getKindList()); + result = result && (hasFilter() == other.hasFilter()); + if (hasFilter()) { + result = result && getFilter() + .equals(other.getFilter()); + } + result = result && getOrderList() + .equals(other.getOrderList()); + result = result && getDistinctOnList() + .equals(other.getDistinctOnList()); + result = result && getStartCursor() + .equals(other.getStartCursor()); + result = result && getEndCursor() + .equals(other.getEndCursor()); + result = result && (getOffset() + == other.getOffset()); + result = result && (hasLimit() == other.hasLimit()); + if (hasLimit()) { + result = result && getLimit() + .equals(other.getLimit()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getProjectionCount() > 0) { + hash = (37 * hash) + PROJECTION_FIELD_NUMBER; + hash = (53 * hash) + getProjectionList().hashCode(); + } + if (getKindCount() > 0) { + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + getKindList().hashCode(); + } + if (hasFilter()) { + hash = (37 * hash) + FILTER_FIELD_NUMBER; + hash = (53 * hash) + getFilter().hashCode(); + } + if (getOrderCount() > 0) { + hash = (37 * hash) + ORDER_FIELD_NUMBER; + hash = (53 * hash) + getOrderList().hashCode(); + } + if (getDistinctOnCount() > 0) { + hash = (37 * hash) + DISTINCT_ON_FIELD_NUMBER; + hash = (53 * hash) + getDistinctOnList().hashCode(); + } + hash = (37 * hash) + START_CURSOR_FIELD_NUMBER; + hash = (53 * hash) + getStartCursor().hashCode(); + hash = (37 * hash) + END_CURSOR_FIELD_NUMBER; + hash = (53 * hash) + getEndCursor().hashCode(); + hash = (37 * hash) + OFFSET_FIELD_NUMBER; + hash = (53 * hash) + getOffset(); + if (hasLimit()) { + hash = (37 * hash) + LIMIT_FIELD_NUMBER; + hash = (53 * hash) + getLimit().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Query parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Query parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Query parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Query parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Query parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Query parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Query parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Query parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Query parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Query parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Query parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Query parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Query prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A query for entities.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Query} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Query) + com.google.datastore.v1.QueryOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class); + } + + // Construct using com.google.datastore.v1.Query.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getProjectionFieldBuilder(); + getKindFieldBuilder(); + getOrderFieldBuilder(); + getDistinctOnFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + if (projectionBuilder_ == null) { + projection_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + projectionBuilder_.clear(); + } + if (kindBuilder_ == null) { + kind_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + kindBuilder_.clear(); + } + if (filterBuilder_ == null) { + filter_ = null; + } else { + filter_ = null; + filterBuilder_ = null; + } + if (orderBuilder_ == null) { + order_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + } else { + orderBuilder_.clear(); + } + if (distinctOnBuilder_ == null) { + distinctOn_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + } else { + distinctOnBuilder_.clear(); + } + startCursor_ = com.google.protobuf.ByteString.EMPTY; + + endCursor_ = com.google.protobuf.ByteString.EMPTY; + + offset_ = 0; + + if (limitBuilder_ == null) { + limit_ = null; + } else { + limit_ = null; + limitBuilder_ = null; + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; + } + + public com.google.datastore.v1.Query getDefaultInstanceForType() { + return com.google.datastore.v1.Query.getDefaultInstance(); + } + + public com.google.datastore.v1.Query build() { + com.google.datastore.v1.Query result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Query buildPartial() { + com.google.datastore.v1.Query result = new com.google.datastore.v1.Query(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (projectionBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + projection_ = java.util.Collections.unmodifiableList(projection_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.projection_ = projection_; + } else { + result.projection_ = projectionBuilder_.build(); + } + if (kindBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + kind_ = java.util.Collections.unmodifiableList(kind_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.kind_ = kind_; + } else { + result.kind_ = kindBuilder_.build(); + } + if (filterBuilder_ == null) { + result.filter_ = filter_; + } else { + result.filter_ = filterBuilder_.build(); + } + if (orderBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { + order_ = java.util.Collections.unmodifiableList(order_); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.order_ = order_; + } else { + result.order_ = orderBuilder_.build(); + } + if (distinctOnBuilder_ == null) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { + distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.distinctOn_ = distinctOn_; + } else { + result.distinctOn_ = distinctOnBuilder_.build(); + } + result.startCursor_ = startCursor_; + result.endCursor_ = endCursor_; + result.offset_ = offset_; + if (limitBuilder_ == null) { + result.limit_ = limit_; + } else { + result.limit_ = limitBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Query) { + return mergeFrom((com.google.datastore.v1.Query)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Query other) { + if (other == com.google.datastore.v1.Query.getDefaultInstance()) return this; + if (projectionBuilder_ == null) { + if (!other.projection_.isEmpty()) { + if (projection_.isEmpty()) { + projection_ = other.projection_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureProjectionIsMutable(); + projection_.addAll(other.projection_); + } + onChanged(); + } + } else { + if (!other.projection_.isEmpty()) { + if (projectionBuilder_.isEmpty()) { + projectionBuilder_.dispose(); + projectionBuilder_ = null; + projection_ = other.projection_; + bitField0_ = (bitField0_ & ~0x00000001); + projectionBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getProjectionFieldBuilder() : null; + } else { + projectionBuilder_.addAllMessages(other.projection_); + } + } + } + if (kindBuilder_ == null) { + if (!other.kind_.isEmpty()) { + if (kind_.isEmpty()) { + kind_ = other.kind_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureKindIsMutable(); + kind_.addAll(other.kind_); + } + onChanged(); + } + } else { + if (!other.kind_.isEmpty()) { + if (kindBuilder_.isEmpty()) { + kindBuilder_.dispose(); + kindBuilder_ = null; + kind_ = other.kind_; + bitField0_ = (bitField0_ & ~0x00000002); + kindBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKindFieldBuilder() : null; + } else { + kindBuilder_.addAllMessages(other.kind_); + } + } + } + if (other.hasFilter()) { + mergeFilter(other.getFilter()); + } + if (orderBuilder_ == null) { + if (!other.order_.isEmpty()) { + if (order_.isEmpty()) { + order_ = other.order_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureOrderIsMutable(); + order_.addAll(other.order_); + } + onChanged(); + } + } else { + if (!other.order_.isEmpty()) { + if (orderBuilder_.isEmpty()) { + orderBuilder_.dispose(); + orderBuilder_ = null; + order_ = other.order_; + bitField0_ = (bitField0_ & ~0x00000008); + orderBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getOrderFieldBuilder() : null; + } else { + orderBuilder_.addAllMessages(other.order_); + } + } + } + if (distinctOnBuilder_ == null) { + if (!other.distinctOn_.isEmpty()) { + if (distinctOn_.isEmpty()) { + distinctOn_ = other.distinctOn_; + bitField0_ = (bitField0_ & ~0x00000010); + } else { + ensureDistinctOnIsMutable(); + distinctOn_.addAll(other.distinctOn_); + } + onChanged(); + } + } else { + if (!other.distinctOn_.isEmpty()) { + if (distinctOnBuilder_.isEmpty()) { + distinctOnBuilder_.dispose(); + distinctOnBuilder_ = null; + distinctOn_ = other.distinctOn_; + bitField0_ = (bitField0_ & ~0x00000010); + distinctOnBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getDistinctOnFieldBuilder() : null; + } else { + distinctOnBuilder_.addAllMessages(other.distinctOn_); + } + } + } + if (other.getStartCursor() != com.google.protobuf.ByteString.EMPTY) { + setStartCursor(other.getStartCursor()); + } + if (other.getEndCursor() != com.google.protobuf.ByteString.EMPTY) { + setEndCursor(other.getEndCursor()); + } + if (other.getOffset() != 0) { + setOffset(other.getOffset()); + } + if (other.hasLimit()) { + mergeLimit(other.getLimit()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Query parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Query) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List projection_ = + java.util.Collections.emptyList(); + private void ensureProjectionIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + projection_ = new java.util.ArrayList(projection_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder> projectionBuilder_; + + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public java.util.List getProjectionList() { + if (projectionBuilder_ == null) { + return java.util.Collections.unmodifiableList(projection_); + } else { + return projectionBuilder_.getMessageList(); + } + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public int getProjectionCount() { + if (projectionBuilder_ == null) { + return projection_.size(); + } else { + return projectionBuilder_.getCount(); + } + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public com.google.datastore.v1.Projection getProjection(int index) { + if (projectionBuilder_ == null) { + return projection_.get(index); + } else { + return projectionBuilder_.getMessage(index); + } + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder setProjection( + int index, com.google.datastore.v1.Projection value) { + if (projectionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureProjectionIsMutable(); + projection_.set(index, value); + onChanged(); + } else { + projectionBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder setProjection( + int index, com.google.datastore.v1.Projection.Builder builderForValue) { + if (projectionBuilder_ == null) { + ensureProjectionIsMutable(); + projection_.set(index, builderForValue.build()); + onChanged(); + } else { + projectionBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder addProjection(com.google.datastore.v1.Projection value) { + if (projectionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureProjectionIsMutable(); + projection_.add(value); + onChanged(); + } else { + projectionBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder addProjection( + int index, com.google.datastore.v1.Projection value) { + if (projectionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureProjectionIsMutable(); + projection_.add(index, value); + onChanged(); + } else { + projectionBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder addProjection( + com.google.datastore.v1.Projection.Builder builderForValue) { + if (projectionBuilder_ == null) { + ensureProjectionIsMutable(); + projection_.add(builderForValue.build()); + onChanged(); + } else { + projectionBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder addProjection( + int index, com.google.datastore.v1.Projection.Builder builderForValue) { + if (projectionBuilder_ == null) { + ensureProjectionIsMutable(); + projection_.add(index, builderForValue.build()); + onChanged(); + } else { + projectionBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder addAllProjection( + java.lang.Iterable values) { + if (projectionBuilder_ == null) { + ensureProjectionIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, projection_); + onChanged(); + } else { + projectionBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder clearProjection() { + if (projectionBuilder_ == null) { + projection_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + projectionBuilder_.clear(); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public Builder removeProjection(int index) { + if (projectionBuilder_ == null) { + ensureProjectionIsMutable(); + projection_.remove(index); + onChanged(); + } else { + projectionBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public com.google.datastore.v1.Projection.Builder getProjectionBuilder( + int index) { + return getProjectionFieldBuilder().getBuilder(index); + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder( + int index) { + if (projectionBuilder_ == null) { + return projection_.get(index); } else { + return projectionBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public java.util.List + getProjectionOrBuilderList() { + if (projectionBuilder_ != null) { + return projectionBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(projection_); + } + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public com.google.datastore.v1.Projection.Builder addProjectionBuilder() { + return getProjectionFieldBuilder().addBuilder( + com.google.datastore.v1.Projection.getDefaultInstance()); + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public com.google.datastore.v1.Projection.Builder addProjectionBuilder( + int index) { + return getProjectionFieldBuilder().addBuilder( + index, com.google.datastore.v1.Projection.getDefaultInstance()); + } + /** + * 
+     * The projection to return. Defaults to returning all properties.
+     *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + public java.util.List + getProjectionBuilderList() { + return getProjectionFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder> + getProjectionFieldBuilder() { + if (projectionBuilder_ == null) { + projectionBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder>( + projection_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + projection_ = null; + } + return projectionBuilder_; + } + + private java.util.List kind_ = + java.util.Collections.emptyList(); + private void ensureKindIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + kind_ = new java.util.ArrayList(kind_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder> kindBuilder_; + + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public java.util.List getKindList() { + if (kindBuilder_ == null) { + return java.util.Collections.unmodifiableList(kind_); + } else { + return kindBuilder_.getMessageList(); + } + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public int getKindCount() { + if (kindBuilder_ == null) { + return kind_.size(); + } else { + return kindBuilder_.getCount(); + } + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public com.google.datastore.v1.KindExpression getKind(int index) { + if (kindBuilder_ == null) { + return kind_.get(index); + } else { + return kindBuilder_.getMessage(index); + } + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder setKind( + int index, com.google.datastore.v1.KindExpression value) { + if (kindBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKindIsMutable(); + kind_.set(index, value); + onChanged(); + } else { + kindBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder setKind( + int index, com.google.datastore.v1.KindExpression.Builder builderForValue) { + if (kindBuilder_ == null) { + ensureKindIsMutable(); + kind_.set(index, builderForValue.build()); + onChanged(); + } else { + kindBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder addKind(com.google.datastore.v1.KindExpression value) { + if (kindBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKindIsMutable(); + kind_.add(value); + onChanged(); + } else { + kindBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder addKind( + int index, com.google.datastore.v1.KindExpression value) { + if (kindBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKindIsMutable(); + kind_.add(index, value); + onChanged(); + } else { + kindBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder addKind( + com.google.datastore.v1.KindExpression.Builder builderForValue) { + if (kindBuilder_ == null) { + ensureKindIsMutable(); + kind_.add(builderForValue.build()); + onChanged(); + } else { + kindBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder addKind( + int index, com.google.datastore.v1.KindExpression.Builder builderForValue) { + if (kindBuilder_ == null) { + ensureKindIsMutable(); + kind_.add(index, builderForValue.build()); + onChanged(); + } else { + kindBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder addAllKind( + java.lang.Iterable values) { + if (kindBuilder_ == null) { + ensureKindIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kind_); + onChanged(); + } else { + kindBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder clearKind() { + if (kindBuilder_ == null) { + kind_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + kindBuilder_.clear(); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public Builder removeKind(int index) { + if (kindBuilder_ == null) { + ensureKindIsMutable(); + kind_.remove(index); + onChanged(); + } else { + kindBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public com.google.datastore.v1.KindExpression.Builder getKindBuilder( + int index) { + return getKindFieldBuilder().getBuilder(index); + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder( + int index) { + if (kindBuilder_ == null) { + return kind_.get(index); } else { + return kindBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public java.util.List + getKindOrBuilderList() { + if (kindBuilder_ != null) { + return kindBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(kind_); + } + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public com.google.datastore.v1.KindExpression.Builder addKindBuilder() { + return getKindFieldBuilder().addBuilder( + com.google.datastore.v1.KindExpression.getDefaultInstance()); + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public com.google.datastore.v1.KindExpression.Builder addKindBuilder( + int index) { + return getKindFieldBuilder().addBuilder( + index, com.google.datastore.v1.KindExpression.getDefaultInstance()); + } + /** + * 
+     * The kinds to query (if empty, returns entities of all kinds).
+     * Currently at most 1 kind may be specified.
+     *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + public java.util.List + getKindBuilderList() { + return getKindFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder> + getKindFieldBuilder() { + if (kindBuilder_ == null) { + kindBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder>( + kind_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + kind_ = null; + } + return kindBuilder_; + } + + private com.google.datastore.v1.Filter filter_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> filterBuilder_; + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public boolean hasFilter() { + return filterBuilder_ != null || filter_ != null; + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public com.google.datastore.v1.Filter getFilter() { + if (filterBuilder_ == null) { + return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_; + } else { + return filterBuilder_.getMessage(); + } + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public Builder setFilter(com.google.datastore.v1.Filter value) { + if (filterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + filter_ = value; + onChanged(); + } else { + filterBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public Builder setFilter( + com.google.datastore.v1.Filter.Builder builderForValue) { + if (filterBuilder_ == null) { + filter_ = builderForValue.build(); + onChanged(); + } else { + filterBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public Builder mergeFilter(com.google.datastore.v1.Filter value) { + if (filterBuilder_ == null) { + if (filter_ != null) { + filter_ = + com.google.datastore.v1.Filter.newBuilder(filter_).mergeFrom(value).buildPartial(); + } else { + filter_ = value; + } + onChanged(); + } else { + filterBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public Builder clearFilter() { + if (filterBuilder_ == null) { + filter_ = null; + onChanged(); + } else { + filter_ = null; + filterBuilder_ = null; + } + + return this; + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public com.google.datastore.v1.Filter.Builder getFilterBuilder() { + + onChanged(); + return getFilterFieldBuilder().getBuilder(); + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() { + if (filterBuilder_ != null) { + return filterBuilder_.getMessageOrBuilder(); + } else { + return filter_ == null ? + com.google.datastore.v1.Filter.getDefaultInstance() : filter_; + } + } + /** + * 
+     * The filter to apply.
+     *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> + getFilterFieldBuilder() { + if (filterBuilder_ == null) { + filterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder>( + getFilter(), + getParentForChildren(), + isClean()); + filter_ = null; + } + return filterBuilder_; + } + + private java.util.List order_ = + java.util.Collections.emptyList(); + private void ensureOrderIsMutable() { + if (!((bitField0_ & 0x00000008) == 0x00000008)) { + order_ = new java.util.ArrayList(order_); + bitField0_ |= 0x00000008; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder> orderBuilder_; + + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public java.util.List getOrderList() { + if (orderBuilder_ == null) { + return java.util.Collections.unmodifiableList(order_); + } else { + return orderBuilder_.getMessageList(); + } + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public int getOrderCount() { + if (orderBuilder_ == null) { + return order_.size(); + } else { + return orderBuilder_.getCount(); + } + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public com.google.datastore.v1.PropertyOrder getOrder(int index) { + if (orderBuilder_ == null) { + return order_.get(index); + } else { + return orderBuilder_.getMessage(index); + } + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder setOrder( + int index, com.google.datastore.v1.PropertyOrder value) { + if (orderBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureOrderIsMutable(); + order_.set(index, value); + onChanged(); + } else { + orderBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder setOrder( + int index, com.google.datastore.v1.PropertyOrder.Builder builderForValue) { + if (orderBuilder_ == null) { + ensureOrderIsMutable(); + order_.set(index, builderForValue.build()); + onChanged(); + } else { + orderBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder addOrder(com.google.datastore.v1.PropertyOrder value) { + if (orderBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureOrderIsMutable(); + order_.add(value); + onChanged(); + } else { + orderBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder addOrder( + int index, com.google.datastore.v1.PropertyOrder value) { + if (orderBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureOrderIsMutable(); + order_.add(index, value); + onChanged(); + } else { + orderBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder addOrder( + com.google.datastore.v1.PropertyOrder.Builder builderForValue) { + if (orderBuilder_ == null) { + ensureOrderIsMutable(); + order_.add(builderForValue.build()); + onChanged(); + } else { + orderBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder addOrder( + int index, com.google.datastore.v1.PropertyOrder.Builder builderForValue) { + if (orderBuilder_ == null) { + ensureOrderIsMutable(); + order_.add(index, builderForValue.build()); + onChanged(); + } else { + orderBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder addAllOrder( + java.lang.Iterable values) { + if (orderBuilder_ == null) { + ensureOrderIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, order_); + onChanged(); + } else { + orderBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder clearOrder() { + if (orderBuilder_ == null) { + order_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + } else { + orderBuilder_.clear(); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public Builder removeOrder(int index) { + if (orderBuilder_ == null) { + ensureOrderIsMutable(); + order_.remove(index); + onChanged(); + } else { + orderBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public com.google.datastore.v1.PropertyOrder.Builder getOrderBuilder( + int index) { + return getOrderFieldBuilder().getBuilder(index); + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder( + int index) { + if (orderBuilder_ == null) { + return order_.get(index); } else { + return orderBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public java.util.List + getOrderOrBuilderList() { + if (orderBuilder_ != null) { + return orderBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(order_); + } + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder() { + return getOrderFieldBuilder().addBuilder( + com.google.datastore.v1.PropertyOrder.getDefaultInstance()); + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder( + int index) { + return getOrderFieldBuilder().addBuilder( + index, com.google.datastore.v1.PropertyOrder.getDefaultInstance()); + } + /** + * 
+     * The order to apply to the query results (if empty, order is unspecified).
+     *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + public java.util.List + getOrderBuilderList() { + return getOrderFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder> + getOrderFieldBuilder() { + if (orderBuilder_ == null) { + orderBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder>( + order_, + ((bitField0_ & 0x00000008) == 0x00000008), + getParentForChildren(), + isClean()); + order_ = null; + } + return orderBuilder_; + } + + private java.util.List distinctOn_ = + java.util.Collections.emptyList(); + private void ensureDistinctOnIsMutable() { + if (!((bitField0_ & 0x00000010) == 0x00000010)) { + distinctOn_ = new java.util.ArrayList(distinctOn_); + bitField0_ |= 0x00000010; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> distinctOnBuilder_; + + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public java.util.List getDistinctOnList() { + if (distinctOnBuilder_ == null) { + return java.util.Collections.unmodifiableList(distinctOn_); + } else { + return distinctOnBuilder_.getMessageList(); + } + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public int getDistinctOnCount() { + if (distinctOnBuilder_ == null) { + return distinctOn_.size(); + } else { + return distinctOnBuilder_.getCount(); + } + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public com.google.datastore.v1.PropertyReference getDistinctOn(int index) { + if (distinctOnBuilder_ == null) { + return distinctOn_.get(index); + } else { + return distinctOnBuilder_.getMessage(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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder setDistinctOn( + int index, com.google.datastore.v1.PropertyReference value) { + if (distinctOnBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDistinctOnIsMutable(); + distinctOn_.set(index, value); + onChanged(); + } else { + distinctOnBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder setDistinctOn( + int index, com.google.datastore.v1.PropertyReference.Builder builderForValue) { + if (distinctOnBuilder_ == null) { + ensureDistinctOnIsMutable(); + distinctOn_.set(index, builderForValue.build()); + onChanged(); + } else { + distinctOnBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) { + if (distinctOnBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDistinctOnIsMutable(); + distinctOn_.add(value); + onChanged(); + } else { + distinctOnBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder addDistinctOn( + int index, com.google.datastore.v1.PropertyReference value) { + if (distinctOnBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDistinctOnIsMutable(); + distinctOn_.add(index, value); + onChanged(); + } else { + distinctOnBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder addDistinctOn( + com.google.datastore.v1.PropertyReference.Builder builderForValue) { + if (distinctOnBuilder_ == null) { + ensureDistinctOnIsMutable(); + distinctOn_.add(builderForValue.build()); + onChanged(); + } else { + distinctOnBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder addDistinctOn( + int index, com.google.datastore.v1.PropertyReference.Builder builderForValue) { + if (distinctOnBuilder_ == null) { + ensureDistinctOnIsMutable(); + distinctOn_.add(index, builderForValue.build()); + onChanged(); + } else { + distinctOnBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder addAllDistinctOn( + java.lang.Iterable values) { + if (distinctOnBuilder_ == null) { + ensureDistinctOnIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, distinctOn_); + onChanged(); + } else { + distinctOnBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder clearDistinctOn() { + if (distinctOnBuilder_ == null) { + distinctOn_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + } else { + distinctOnBuilder_.clear(); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public Builder removeDistinctOn(int index) { + if (distinctOnBuilder_ == null) { + ensureDistinctOnIsMutable(); + distinctOn_.remove(index); + onChanged(); + } else { + distinctOnBuilder_.remove(index); + } + return this; + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder( + int index) { + return getDistinctOnFieldBuilder().getBuilder(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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder( + int index) { + if (distinctOnBuilder_ == null) { + return distinctOn_.get(index); } else { + return distinctOnBuilder_.getMessageOrBuilder(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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public java.util.List + getDistinctOnOrBuilderList() { + if (distinctOnBuilder_ != null) { + return distinctOnBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(distinctOn_); + } + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder() { + return getDistinctOnFieldBuilder().addBuilder( + com.google.datastore.v1.PropertyReference.getDefaultInstance()); + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder( + int index) { + return getDistinctOnFieldBuilder().addBuilder( + index, com.google.datastore.v1.PropertyReference.getDefaultInstance()); + } + /** + * 
+     * 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).
+     *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + public java.util.List + getDistinctOnBuilderList() { + return getDistinctOnFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> + getDistinctOnFieldBuilder() { + if (distinctOnBuilder_ == null) { + distinctOnBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>( + distinctOn_, + ((bitField0_ & 0x00000010) == 0x00000010), + getParentForChildren(), + isClean()); + distinctOn_ = null; + } + return distinctOnBuilder_; + } + + private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * A starting point for the query results. Query cursors are
+     * returned in query result batches and
+     * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     *
+ * + * bytes start_cursor = 7; + */ + public com.google.protobuf.ByteString getStartCursor() { + return startCursor_; + } + /** + * 
+     * A starting point for the query results. Query cursors are
+     * returned in query result batches and
+     * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     *
+ * + * bytes start_cursor = 7; + */ + public Builder setStartCursor(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + startCursor_ = value; + onChanged(); + return this; + } + /** + * 
+     * A starting point for the query results. Query cursors are
+     * returned in query result batches and
+     * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     *
+ * + * bytes start_cursor = 7; + */ + public Builder clearStartCursor() { + + startCursor_ = getDefaultInstance().getStartCursor(); + onChanged(); + return this; + } + + private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * An ending point for the query results. Query cursors are
+     * returned in query result batches and
+     * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     *
+ * + * bytes end_cursor = 8; + */ + public com.google.protobuf.ByteString getEndCursor() { + return endCursor_; + } + /** + * 
+     * An ending point for the query results. Query cursors are
+     * returned in query result batches and
+     * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     *
+ * + * bytes end_cursor = 8; + */ + public Builder setEndCursor(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + endCursor_ = value; + onChanged(); + return this; + } + /** + * 
+     * An ending point for the query results. Query cursors are
+     * returned in query result batches and
+     * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     *
+ * + * bytes end_cursor = 8; + */ + public Builder clearEndCursor() { + + endCursor_ = getDefaultInstance().getEndCursor(); + onChanged(); + return this; + } + + private int offset_ ; + /** + * 
+     * The number of results to skip. Applies before limit, but after all other
+     * constraints. Optional. Must be >= 0 if specified.
+     *
+ * + * int32 offset = 10; + */ + public int getOffset() { + return offset_; + } + /** + * 
+     * The number of results to skip. Applies before limit, but after all other
+     * constraints. Optional. Must be >= 0 if specified.
+     *
+ * + * int32 offset = 10; + */ + public Builder setOffset(int value) { + + offset_ = value; + onChanged(); + return this; + } + /** + * 
+     * The number of results to skip. Applies before limit, but after all other
+     * constraints. Optional. Must be >= 0 if specified.
+     *
+ * + * int32 offset = 10; + */ + public Builder clearOffset() { + + offset_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.Int32Value limit_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> limitBuilder_; + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public boolean hasLimit() { + return limitBuilder_ != null || limit_ != null; + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public com.google.protobuf.Int32Value getLimit() { + if (limitBuilder_ == null) { + return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; + } else { + return limitBuilder_.getMessage(); + } + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public Builder setLimit(com.google.protobuf.Int32Value value) { + if (limitBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + limit_ = value; + onChanged(); + } else { + limitBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public Builder setLimit( + com.google.protobuf.Int32Value.Builder builderForValue) { + if (limitBuilder_ == null) { + limit_ = builderForValue.build(); + onChanged(); + } else { + limitBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public Builder mergeLimit(com.google.protobuf.Int32Value value) { + if (limitBuilder_ == null) { + if (limit_ != null) { + limit_ = + com.google.protobuf.Int32Value.newBuilder(limit_).mergeFrom(value).buildPartial(); + } else { + limit_ = value; + } + onChanged(); + } else { + limitBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public Builder clearLimit() { + if (limitBuilder_ == null) { + limit_ = null; + onChanged(); + } else { + limit_ = null; + limitBuilder_ = null; + } + + return this; + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public com.google.protobuf.Int32Value.Builder getLimitBuilder() { + + onChanged(); + return getLimitFieldBuilder().getBuilder(); + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { + if (limitBuilder_ != null) { + return limitBuilder_.getMessageOrBuilder(); + } else { + return limit_ == null ? + com.google.protobuf.Int32Value.getDefaultInstance() : limit_; + } + } + /** + * 
+     * The maximum number of results to return. Applies after all other
+     * constraints. Optional.
+     * Unspecified is interpreted as no limit.
+     * Must be >= 0 if specified.
+     *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> + getLimitFieldBuilder() { + if (limitBuilder_ == null) { + limitBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder>( + getLimit(), + getParentForChildren(), + isClean()); + limit_ = null; + } + return limitBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Query) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Query) + private static final com.google.datastore.v1.Query DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Query(); + } + + public static com.google.datastore.v1.Query getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Query parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Query(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Query getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..086f3ff46405 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java @@ -0,0 +1,291 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface QueryOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Query) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + java.util.List + getProjectionList(); + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + com.google.datastore.v1.Projection getProjection(int index); + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + int getProjectionCount(); + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + java.util.List + getProjectionOrBuilderList(); + /** + * 
+   * The projection to return. Defaults to returning all properties.
+   *
+ * + * repeated .google.datastore.v1.Projection projection = 2; + */ + com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder( + int index); + + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + java.util.List + getKindList(); + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + com.google.datastore.v1.KindExpression getKind(int index); + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + int getKindCount(); + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + java.util.List + getKindOrBuilderList(); + /** + * 
+   * The kinds to query (if empty, returns entities of all kinds).
+   * Currently at most 1 kind may be specified.
+   *
+ * + * repeated .google.datastore.v1.KindExpression kind = 3; + */ + com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder( + int index); + + /** + * 
+   * The filter to apply.
+   *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + boolean hasFilter(); + /** + * 
+   * The filter to apply.
+   *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + com.google.datastore.v1.Filter getFilter(); + /** + * 
+   * The filter to apply.
+   *
+ * + * .google.datastore.v1.Filter filter = 4; + */ + com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder(); + + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + java.util.List + getOrderList(); + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + com.google.datastore.v1.PropertyOrder getOrder(int index); + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + int getOrderCount(); + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + java.util.List + getOrderOrBuilderList(); + /** + * 
+   * The order to apply to the query results (if empty, order is unspecified).
+   *
+ * + * repeated .google.datastore.v1.PropertyOrder order = 5; + */ + com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder( + 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + java.util.List + getDistinctOnList(); + /** + * 
+   * 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + java.util.List + getDistinctOnOrBuilderList(); + /** + * 
+   * 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).
+   *
+ * + * repeated .google.datastore.v1.PropertyReference distinct_on = 6; + */ + com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder( + int index); + + /** + * 
+   * A starting point for the query results. Query cursors are
+   * returned in query result batches and
+   * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   *
+ * + * bytes start_cursor = 7; + */ + com.google.protobuf.ByteString getStartCursor(); + + /** + * 
+   * An ending point for the query results. Query cursors are
+   * returned in query result batches and
+   * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   *
+ * + * bytes end_cursor = 8; + */ + com.google.protobuf.ByteString getEndCursor(); + + /** + * 
+   * The number of results to skip. Applies before limit, but after all other
+   * constraints. Optional. Must be >= 0 if specified.
+   *
+ * + * int32 offset = 10; + */ + int getOffset(); + + /** + * 
+   * The maximum number of results to return. Applies after all other
+   * constraints. Optional.
+   * Unspecified is interpreted as no limit.
+   * Must be >= 0 if specified.
+   *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + boolean hasLimit(); + /** + * 
+   * The maximum number of results to return. Applies after all other
+   * constraints. Optional.
+   * Unspecified is interpreted as no limit.
+   * Must be >= 0 if specified.
+   *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + com.google.protobuf.Int32Value getLimit(); + /** + * 
+   * The maximum number of results to return. Applies after all other
+   * constraints. Optional.
+   * Unspecified is interpreted as no limit.
+   * Must be >= 0 if specified.
+   *
+ * + * .google.protobuf.Int32Value limit = 12; + */ + com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder(); +} 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 new file mode 100644 index 000000000000..6a2c87081b1d --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java @@ -0,0 +1,263 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public final class QueryProto { + private QueryProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_EntityResult_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_EntityResult_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Query_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Query_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_KindExpression_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_KindExpression_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_PropertyReference_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Projection_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Projection_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_PropertyOrder_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_Filter_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_Filter_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_CompositeFilter_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_PropertyFilter_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_GqlQuery_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_GqlQueryParameter_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_QueryResultBatch_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\037google/datastore/v1/query.proto\022\023googl" + + "e.datastore.v1\032\034google/api/annotations.p" + + "roto\032 google/datastore/v1/entity.proto\032\036" + + "google/protobuf/wrappers.proto\032\030google/t" + + "ype/latlng.proto\"\257\001\n\014EntityResult\022+\n\006ent" + + "ity\030\001 \001(\0132\033.google.datastore.v1.Entity\022\017" + + "\n\007version\030\004 \001(\003\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResul" + + "tType\022\033\n\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FU" + + "LL\020\001\022\016\n\nPROJECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Q" + + "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast" + + "ore.v1.Projection\0221\n\004kind\030\003 \003(\0132#.google" + + ".datastore.v1.KindExpression\022+\n\006filter\030\004" + + " \001(\0132\033.google.datastore.v1.Filter\0221\n\005ord" + + "er\030\005 \003(\0132\".google.datastore.v1.PropertyO" + + "rder\022;\n\013distinct_on\030\006 \003(\0132&.google.datas" + + "tore.v1.PropertyReference\022\024\n\014start_curso" + + "r\030\007 \001(\014\022\022\n\nend_cursor\030\010 \001(\014\022\016\n\006offset\030\n " + + "\001(\005\022*\n\005limit\030\014 \001(\0132\033.google.protobuf.Int" + + "32Value\"\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\"" + + "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr" + + "ojection\0228\n\010property\030\001 \001(\0132&.google.data" + + "store.v1.PropertyReference\"\321\001\n\rPropertyO" + + "rder\0228\n\010property\030\001 \001(\0132&.google.datastor" + + "e.v1.PropertyReference\022?\n\tdirection\030\002 \001(" + + "\0162,.google.datastore.v1.PropertyOrder.Di" + + "rection\"E\n\tDirection\022\031\n\025DIRECTION_UNSPEC" + + "IFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"\231" + + "\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$.go" + + "ogle.datastore.v1.CompositeFilterH\000\022>\n\017p" + + "roperty_filter\030\002 \001(\0132#.google.datastore." + + "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" + + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" + + "store.v1.CompositeFilter.Operator\022,\n\007fil" + + "ters\030\002 \003(\0132\033.google.datastore.v1.Filter\"" + + "-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\007\n" + + "\003AND\020\001\"\307\002\n\016PropertyFilter\0228\n\010property\030\001 " + + "\001(\0132&.google.datastore.v1.PropertyRefere" + + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" + + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" + + "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" + + "\n\014HAS_ANCESTOR\020\013\"\245\002\n\010GqlQuery\022\024\n\014query_s" + + "tring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016n" + + "amed_bindings\030\005 \003(\01320.google.datastore.v" + + "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" + + "nal_bindings\030\004 \003(\0132&.google.datastore.v1" + + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" + + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" + + "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" + + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" + + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" + + "parameter_type\"\336\003\n\020QueryResultBatch\022\027\n\017s" + + "kipped_results\030\006 \001(\005\022\026\n\016skipped_cursor\030\003" + + " \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,.googl" + + "e.datastore.v1.EntityResult.ResultType\0229" + + "\n\016entity_results\030\002 \003(\0132!.google.datastor" + + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" + + "\014more_results\030\005 \001(\01625.google.datastore.v" + + "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" + + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" + + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" + + "OT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTER_LIMI" + + "T\020\002\022\035\n\031MORE_RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO" + + "_MORE_RESULTS\020\003B\235\001\n\027com.google.datastore" + + ".v1B\nQueryProtoP\001Z + * A batch of results produced by a query. + * + * + * Protobuf type {@code google.datastore.v1.QueryResultBatch} + */ +public final class QueryResultBatch extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.QueryResultBatch) + QueryResultBatchOrBuilder { +private static final long serialVersionUID = 0L; + // Use QueryResultBatch.newBuilder() to construct. + private QueryResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private QueryResultBatch() { + skippedResults_ = 0; + skippedCursor_ = com.google.protobuf.ByteString.EMPTY; + entityResultType_ = 0; + entityResults_ = java.util.Collections.emptyList(); + endCursor_ = com.google.protobuf.ByteString.EMPTY; + moreResults_ = 0; + snapshotVersion_ = 0L; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private QueryResultBatch( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + + entityResultType_ = rawValue; + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + entityResults_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000008; + } + entityResults_.add( + input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry)); + break; + } + case 26: { + + skippedCursor_ = input.readBytes(); + break; + } + case 34: { + + endCursor_ = input.readBytes(); + break; + } + case 40: { + int rawValue = input.readEnum(); + + moreResults_ = rawValue; + break; + } + case 48: { + + skippedResults_ = input.readInt32(); + break; + } + case 56: { + + snapshotVersion_ = input.readInt64(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + entityResults_ = java.util.Collections.unmodifiableList(entityResults_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.QueryResultBatch.class, com.google.datastore.v1.QueryResultBatch.Builder.class); + } + + /** + * 
+   * The possible values for the `more_results` field.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.QueryResultBatch.MoreResultsType} + */ + public enum MoreResultsType + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+     * Unspecified. This value is never used.
+     *
+ * + * MORE_RESULTS_TYPE_UNSPECIFIED = 0; + */ + MORE_RESULTS_TYPE_UNSPECIFIED(0), + /** + * 
+     * There may be additional batches to fetch from this query.
+     *
+ * + * NOT_FINISHED = 1; + */ + NOT_FINISHED(1), + /** + * 
+     * The query is finished, but there may be more results after the limit.
+     *
+ * + * MORE_RESULTS_AFTER_LIMIT = 2; + */ + MORE_RESULTS_AFTER_LIMIT(2), + /** + * 
+     * The query is finished, but there may be more results after the end
+     * cursor.
+     *
+ * + * MORE_RESULTS_AFTER_CURSOR = 4; + */ + MORE_RESULTS_AFTER_CURSOR(4), + /** + * 
+     * The query is finished, and there are no more results.
+     *
+ * + * NO_MORE_RESULTS = 3; + */ + NO_MORE_RESULTS(3), + UNRECOGNIZED(-1), + ; + + /** + * 
+     * Unspecified. This value is never used.
+     *
+ * + * MORE_RESULTS_TYPE_UNSPECIFIED = 0; + */ + public static final int MORE_RESULTS_TYPE_UNSPECIFIED_VALUE = 0; + /** + * 
+     * There may be additional batches to fetch from this query.
+     *
+ * + * NOT_FINISHED = 1; + */ + public static final int NOT_FINISHED_VALUE = 1; + /** + * 
+     * The query is finished, but there may be more results after the limit.
+     *
+ * + * MORE_RESULTS_AFTER_LIMIT = 2; + */ + public static final int MORE_RESULTS_AFTER_LIMIT_VALUE = 2; + /** + * 
+     * The query is finished, but there may be more results after the end
+     * cursor.
+     *
+ * + * MORE_RESULTS_AFTER_CURSOR = 4; + */ + public static final int MORE_RESULTS_AFTER_CURSOR_VALUE = 4; + /** + * 
+     * The query is finished, and there are no more results.
+     *
+ * + * NO_MORE_RESULTS = 3; + */ + public static final int NO_MORE_RESULTS_VALUE = 3; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static MoreResultsType valueOf(int value) { + return forNumber(value); + } + + public static MoreResultsType forNumber(int value) { + switch (value) { + case 0: return MORE_RESULTS_TYPE_UNSPECIFIED; + case 1: return NOT_FINISHED; + case 2: return MORE_RESULTS_AFTER_LIMIT; + case 4: return MORE_RESULTS_AFTER_CURSOR; + case 3: return NO_MORE_RESULTS; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + MoreResultsType> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public MoreResultsType findValueByNumber(int number) { + return MoreResultsType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.google.datastore.v1.QueryResultBatch.getDescriptor().getEnumTypes().get(0); + } + + private static final MoreResultsType[] VALUES = values(); + + public static MoreResultsType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private MoreResultsType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.QueryResultBatch.MoreResultsType) + } + + private int bitField0_; + public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6; + private int skippedResults_; + /** + * 
+   * The number of results skipped, typically because of an offset.
+   *
+ * + * int32 skipped_results = 6; + */ + public int getSkippedResults() { + return skippedResults_; + } + + public static final int SKIPPED_CURSOR_FIELD_NUMBER = 3; + private com.google.protobuf.ByteString skippedCursor_; + /** + * 
+   * A cursor that points to the position after the last skipped result.
+   * Will be set when `skipped_results` != 0.
+   *
+ * + * bytes skipped_cursor = 3; + */ + public com.google.protobuf.ByteString getSkippedCursor() { + return skippedCursor_; + } + + public static final int ENTITY_RESULT_TYPE_FIELD_NUMBER = 1; + private int entityResultType_; + /** + * 
+   * The result type for every entity in `entity_results`.
+   *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + public int getEntityResultTypeValue() { + return entityResultType_; + } + /** + * 
+   * The result type for every entity in `entity_results`.
+   *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { + com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); + return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; + } + + public static final int ENTITY_RESULTS_FIELD_NUMBER = 2; + private java.util.List entityResults_; + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public java.util.List getEntityResultsList() { + return entityResults_; + } + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public java.util.List + getEntityResultsOrBuilderList() { + return entityResults_; + } + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public int getEntityResultsCount() { + return entityResults_.size(); + } + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public com.google.datastore.v1.EntityResult getEntityResults(int index) { + return entityResults_.get(index); + } + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder( + int index) { + return entityResults_.get(index); + } + + public static final int END_CURSOR_FIELD_NUMBER = 4; + private com.google.protobuf.ByteString endCursor_; + /** + * 
+   * A cursor that points to the position after the last result in the batch.
+   *
+ * + * bytes end_cursor = 4; + */ + public com.google.protobuf.ByteString getEndCursor() { + return endCursor_; + } + + public static final int MORE_RESULTS_FIELD_NUMBER = 5; + private int moreResults_; + /** + * 
+   * The state of the query after the current batch.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + public int getMoreResultsValue() { + return moreResults_; + } + /** + * 
+   * The state of the query after the current batch.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { + com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); + return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; + } + + public static final int SNAPSHOT_VERSION_FIELD_NUMBER = 7; + private long snapshotVersion_; + /** + * 
+   * The version number of the snapshot this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater snapshot version number. Each batch's snapshot version
+   * is valid for all preceding batches.
+   * The value will be zero for eventually consistent queries.
+   *
+ * + * int64 snapshot_version = 7; + */ + public long getSnapshotVersion() { + return snapshotVersion_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) { + output.writeEnum(1, entityResultType_); + } + for (int i = 0; i < entityResults_.size(); i++) { + output.writeMessage(2, entityResults_.get(i)); + } + if (!skippedCursor_.isEmpty()) { + output.writeBytes(3, skippedCursor_); + } + if (!endCursor_.isEmpty()) { + output.writeBytes(4, endCursor_); + } + if (moreResults_ != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED.getNumber()) { + output.writeEnum(5, moreResults_); + } + if (skippedResults_ != 0) { + output.writeInt32(6, skippedResults_); + } + if (snapshotVersion_ != 0L) { + output.writeInt64(7, snapshotVersion_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, entityResultType_); + } + for (int i = 0; i < entityResults_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, entityResults_.get(i)); + } + if (!skippedCursor_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, skippedCursor_); + } + if (!endCursor_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(4, endCursor_); + } + if (moreResults_ != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(5, moreResults_); + } + if (skippedResults_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(6, skippedResults_); + } + if (snapshotVersion_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(7, snapshotVersion_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.QueryResultBatch)) { + return super.equals(obj); + } + com.google.datastore.v1.QueryResultBatch other = (com.google.datastore.v1.QueryResultBatch) obj; + + boolean result = true; + result = result && (getSkippedResults() + == other.getSkippedResults()); + result = result && getSkippedCursor() + .equals(other.getSkippedCursor()); + result = result && entityResultType_ == other.entityResultType_; + result = result && getEntityResultsList() + .equals(other.getEntityResultsList()); + result = result && getEndCursor() + .equals(other.getEndCursor()); + result = result && moreResults_ == other.moreResults_; + result = result && (getSnapshotVersion() + == other.getSnapshotVersion()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + SKIPPED_RESULTS_FIELD_NUMBER; + hash = (53 * hash) + getSkippedResults(); + hash = (37 * hash) + SKIPPED_CURSOR_FIELD_NUMBER; + hash = (53 * hash) + getSkippedCursor().hashCode(); + hash = (37 * hash) + ENTITY_RESULT_TYPE_FIELD_NUMBER; + hash = (53 * hash) + entityResultType_; + if (getEntityResultsCount() > 0) { + hash = (37 * hash) + ENTITY_RESULTS_FIELD_NUMBER; + hash = (53 * hash) + getEntityResultsList().hashCode(); + } + hash = (37 * hash) + END_CURSOR_FIELD_NUMBER; + hash = (53 * hash) + getEndCursor().hashCode(); + hash = (37 * hash) + MORE_RESULTS_FIELD_NUMBER; + hash = (53 * hash) + moreResults_; + hash = (37 * hash) + SNAPSHOT_VERSION_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getSnapshotVersion()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.QueryResultBatch parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.QueryResultBatch parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.QueryResultBatch prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A batch of results produced by a query.
+   *
+ * + * Protobuf type {@code google.datastore.v1.QueryResultBatch} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.QueryResultBatch) + com.google.datastore.v1.QueryResultBatchOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.QueryResultBatch.class, com.google.datastore.v1.QueryResultBatch.Builder.class); + } + + // Construct using com.google.datastore.v1.QueryResultBatch.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getEntityResultsFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + skippedResults_ = 0; + + skippedCursor_ = com.google.protobuf.ByteString.EMPTY; + + entityResultType_ = 0; + + if (entityResultsBuilder_ == null) { + entityResults_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + } else { + entityResultsBuilder_.clear(); + } + endCursor_ = com.google.protobuf.ByteString.EMPTY; + + moreResults_ = 0; + + snapshotVersion_ = 0L; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; + } + + public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { + return com.google.datastore.v1.QueryResultBatch.getDefaultInstance(); + } + + public com.google.datastore.v1.QueryResultBatch build() { + com.google.datastore.v1.QueryResultBatch result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.QueryResultBatch buildPartial() { + com.google.datastore.v1.QueryResultBatch result = new com.google.datastore.v1.QueryResultBatch(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.skippedResults_ = skippedResults_; + result.skippedCursor_ = skippedCursor_; + result.entityResultType_ = entityResultType_; + if (entityResultsBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { + entityResults_ = java.util.Collections.unmodifiableList(entityResults_); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.entityResults_ = entityResults_; + } else { + result.entityResults_ = entityResultsBuilder_.build(); + } + result.endCursor_ = endCursor_; + result.moreResults_ = moreResults_; + result.snapshotVersion_ = snapshotVersion_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.QueryResultBatch) { + return mergeFrom((com.google.datastore.v1.QueryResultBatch)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) { + if (other == com.google.datastore.v1.QueryResultBatch.getDefaultInstance()) return this; + if (other.getSkippedResults() != 0) { + setSkippedResults(other.getSkippedResults()); + } + if (other.getSkippedCursor() != com.google.protobuf.ByteString.EMPTY) { + setSkippedCursor(other.getSkippedCursor()); + } + if (other.entityResultType_ != 0) { + setEntityResultTypeValue(other.getEntityResultTypeValue()); + } + if (entityResultsBuilder_ == null) { + if (!other.entityResults_.isEmpty()) { + if (entityResults_.isEmpty()) { + entityResults_ = other.entityResults_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureEntityResultsIsMutable(); + entityResults_.addAll(other.entityResults_); + } + onChanged(); + } + } else { + if (!other.entityResults_.isEmpty()) { + if (entityResultsBuilder_.isEmpty()) { + entityResultsBuilder_.dispose(); + entityResultsBuilder_ = null; + entityResults_ = other.entityResults_; + bitField0_ = (bitField0_ & ~0x00000008); + entityResultsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getEntityResultsFieldBuilder() : null; + } else { + entityResultsBuilder_.addAllMessages(other.entityResults_); + } + } + } + if (other.getEndCursor() != com.google.protobuf.ByteString.EMPTY) { + setEndCursor(other.getEndCursor()); + } + if (other.moreResults_ != 0) { + setMoreResultsValue(other.getMoreResultsValue()); + } + if (other.getSnapshotVersion() != 0L) { + setSnapshotVersion(other.getSnapshotVersion()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.QueryResultBatch parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.QueryResultBatch) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private int skippedResults_ ; + /** + * 
+     * The number of results skipped, typically because of an offset.
+     *
+ * + * int32 skipped_results = 6; + */ + public int getSkippedResults() { + return skippedResults_; + } + /** + * 
+     * The number of results skipped, typically because of an offset.
+     *
+ * + * int32 skipped_results = 6; + */ + public Builder setSkippedResults(int value) { + + skippedResults_ = value; + onChanged(); + return this; + } + /** + * 
+     * The number of results skipped, typically because of an offset.
+     *
+ * + * int32 skipped_results = 6; + */ + public Builder clearSkippedResults() { + + skippedResults_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * A cursor that points to the position after the last skipped result.
+     * Will be set when `skipped_results` != 0.
+     *
+ * + * bytes skipped_cursor = 3; + */ + public com.google.protobuf.ByteString getSkippedCursor() { + return skippedCursor_; + } + /** + * 
+     * A cursor that points to the position after the last skipped result.
+     * Will be set when `skipped_results` != 0.
+     *
+ * + * bytes skipped_cursor = 3; + */ + public Builder setSkippedCursor(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + skippedCursor_ = value; + onChanged(); + return this; + } + /** + * 
+     * A cursor that points to the position after the last skipped result.
+     * Will be set when `skipped_results` != 0.
+     *
+ * + * bytes skipped_cursor = 3; + */ + public Builder clearSkippedCursor() { + + skippedCursor_ = getDefaultInstance().getSkippedCursor(); + onChanged(); + return this; + } + + private int entityResultType_ = 0; + /** + * 
+     * The result type for every entity in `entity_results`.
+     *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + public int getEntityResultTypeValue() { + return entityResultType_; + } + /** + * 
+     * The result type for every entity in `entity_results`.
+     *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + public Builder setEntityResultTypeValue(int value) { + entityResultType_ = value; + onChanged(); + return this; + } + /** + * 
+     * The result type for every entity in `entity_results`.
+     *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { + com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); + return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; + } + /** + * 
+     * The result type for every entity in `entity_results`.
+     *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultType value) { + if (value == null) { + throw new NullPointerException(); + } + + entityResultType_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * The result type for every entity in `entity_results`.
+     *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + public Builder clearEntityResultType() { + + entityResultType_ = 0; + onChanged(); + return this; + } + + private java.util.List entityResults_ = + java.util.Collections.emptyList(); + private void ensureEntityResultsIsMutable() { + if (!((bitField0_ & 0x00000008) == 0x00000008)) { + entityResults_ = new java.util.ArrayList(entityResults_); + bitField0_ |= 0x00000008; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> entityResultsBuilder_; + + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public java.util.List getEntityResultsList() { + if (entityResultsBuilder_ == null) { + return java.util.Collections.unmodifiableList(entityResults_); + } else { + return entityResultsBuilder_.getMessageList(); + } + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public int getEntityResultsCount() { + if (entityResultsBuilder_ == null) { + return entityResults_.size(); + } else { + return entityResultsBuilder_.getCount(); + } + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public com.google.datastore.v1.EntityResult getEntityResults(int index) { + if (entityResultsBuilder_ == null) { + return entityResults_.get(index); + } else { + return entityResultsBuilder_.getMessage(index); + } + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder setEntityResults( + int index, com.google.datastore.v1.EntityResult value) { + if (entityResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureEntityResultsIsMutable(); + entityResults_.set(index, value); + onChanged(); + } else { + entityResultsBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder setEntityResults( + int index, com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (entityResultsBuilder_ == null) { + ensureEntityResultsIsMutable(); + entityResults_.set(index, builderForValue.build()); + onChanged(); + } else { + entityResultsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder addEntityResults(com.google.datastore.v1.EntityResult value) { + if (entityResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureEntityResultsIsMutable(); + entityResults_.add(value); + onChanged(); + } else { + entityResultsBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder addEntityResults( + int index, com.google.datastore.v1.EntityResult value) { + if (entityResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureEntityResultsIsMutable(); + entityResults_.add(index, value); + onChanged(); + } else { + entityResultsBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder addEntityResults( + com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (entityResultsBuilder_ == null) { + ensureEntityResultsIsMutable(); + entityResults_.add(builderForValue.build()); + onChanged(); + } else { + entityResultsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder addEntityResults( + int index, com.google.datastore.v1.EntityResult.Builder builderForValue) { + if (entityResultsBuilder_ == null) { + ensureEntityResultsIsMutable(); + entityResults_.add(index, builderForValue.build()); + onChanged(); + } else { + entityResultsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder addAllEntityResults( + java.lang.Iterable values) { + if (entityResultsBuilder_ == null) { + ensureEntityResultsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, entityResults_); + onChanged(); + } else { + entityResultsBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder clearEntityResults() { + if (entityResultsBuilder_ == null) { + entityResults_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + } else { + entityResultsBuilder_.clear(); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public Builder removeEntityResults(int index) { + if (entityResultsBuilder_ == null) { + ensureEntityResultsIsMutable(); + entityResults_.remove(index); + onChanged(); + } else { + entityResultsBuilder_.remove(index); + } + return this; + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public com.google.datastore.v1.EntityResult.Builder getEntityResultsBuilder( + int index) { + return getEntityResultsFieldBuilder().getBuilder(index); + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder( + int index) { + if (entityResultsBuilder_ == null) { + return entityResults_.get(index); } else { + return entityResultsBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public java.util.List + getEntityResultsOrBuilderList() { + if (entityResultsBuilder_ != null) { + return entityResultsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(entityResults_); + } + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder() { + return getEntityResultsFieldBuilder().addBuilder( + com.google.datastore.v1.EntityResult.getDefaultInstance()); + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder( + int index) { + return getEntityResultsFieldBuilder().addBuilder( + index, com.google.datastore.v1.EntityResult.getDefaultInstance()); + } + /** + * 
+     * The results for this batch.
+     *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + public java.util.List + getEntityResultsBuilderList() { + return getEntityResultsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> + getEntityResultsFieldBuilder() { + if (entityResultsBuilder_ == null) { + entityResultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>( + entityResults_, + ((bitField0_ & 0x00000008) == 0x00000008), + getParentForChildren(), + isClean()); + entityResults_ = null; + } + return entityResultsBuilder_; + } + + private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * A cursor that points to the position after the last result in the batch.
+     *
+ * + * bytes end_cursor = 4; + */ + public com.google.protobuf.ByteString getEndCursor() { + return endCursor_; + } + /** + * 
+     * A cursor that points to the position after the last result in the batch.
+     *
+ * + * bytes end_cursor = 4; + */ + public Builder setEndCursor(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + endCursor_ = value; + onChanged(); + return this; + } + /** + * 
+     * A cursor that points to the position after the last result in the batch.
+     *
+ * + * bytes end_cursor = 4; + */ + public Builder clearEndCursor() { + + endCursor_ = getDefaultInstance().getEndCursor(); + onChanged(); + return this; + } + + private int moreResults_ = 0; + /** + * 
+     * The state of the query after the current batch.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + public int getMoreResultsValue() { + return moreResults_; + } + /** + * 
+     * The state of the query after the current batch.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + public Builder setMoreResultsValue(int value) { + moreResults_ = value; + onChanged(); + return this; + } + /** + * 
+     * The state of the query after the current batch.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { + com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); + return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; + } + /** + * 
+     * The state of the query after the current batch.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResultsType value) { + if (value == null) { + throw new NullPointerException(); + } + + moreResults_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * The state of the query after the current batch.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + public Builder clearMoreResults() { + + moreResults_ = 0; + onChanged(); + return this; + } + + private long snapshotVersion_ ; + /** + * 
+     * The version number of the snapshot this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater snapshot version number. Each batch's snapshot version
+     * is valid for all preceding batches.
+     * The value will be zero for eventually consistent queries.
+     *
+ * + * int64 snapshot_version = 7; + */ + public long getSnapshotVersion() { + return snapshotVersion_; + } + /** + * 
+     * The version number of the snapshot this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater snapshot version number. Each batch's snapshot version
+     * is valid for all preceding batches.
+     * The value will be zero for eventually consistent queries.
+     *
+ * + * int64 snapshot_version = 7; + */ + public Builder setSnapshotVersion(long value) { + + snapshotVersion_ = value; + onChanged(); + return this; + } + /** + * 
+     * The version number of the snapshot this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater snapshot version number. Each batch's snapshot version
+     * is valid for all preceding batches.
+     * The value will be zero for eventually consistent queries.
+     *
+ * + * int64 snapshot_version = 7; + */ + public Builder clearSnapshotVersion() { + + snapshotVersion_ = 0L; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.QueryResultBatch) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.QueryResultBatch) + private static final com.google.datastore.v1.QueryResultBatch DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.QueryResultBatch(); + } + + public static com.google.datastore.v1.QueryResultBatch getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public QueryResultBatch parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new QueryResultBatch(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java new file mode 100644 index 000000000000..1b0adcc496ae --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java @@ -0,0 +1,131 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface QueryResultBatchOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.QueryResultBatch) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The number of results skipped, typically because of an offset.
+   *
+ * + * int32 skipped_results = 6; + */ + int getSkippedResults(); + + /** + * 
+   * A cursor that points to the position after the last skipped result.
+   * Will be set when `skipped_results` != 0.
+   *
+ * + * bytes skipped_cursor = 3; + */ + com.google.protobuf.ByteString getSkippedCursor(); + + /** + * 
+   * The result type for every entity in `entity_results`.
+   *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + int getEntityResultTypeValue(); + /** + * 
+   * The result type for every entity in `entity_results`.
+   *
+ * + * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; + */ + com.google.datastore.v1.EntityResult.ResultType getEntityResultType(); + + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + java.util.List + getEntityResultsList(); + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + com.google.datastore.v1.EntityResult getEntityResults(int index); + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + int getEntityResultsCount(); + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + java.util.List + getEntityResultsOrBuilderList(); + /** + * 
+   * The results for this batch.
+   *
+ * + * repeated .google.datastore.v1.EntityResult entity_results = 2; + */ + com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder( + int index); + + /** + * 
+   * A cursor that points to the position after the last result in the batch.
+   *
+ * + * bytes end_cursor = 4; + */ + com.google.protobuf.ByteString getEndCursor(); + + /** + * 
+   * The state of the query after the current batch.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + int getMoreResultsValue(); + /** + * 
+   * The state of the query after the current batch.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; + */ + com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults(); + + /** + * 
+   * The version number of the snapshot this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater snapshot version number. Each batch's snapshot version
+   * is valid for all preceding batches.
+   * The value will be zero for eventually consistent queries.
+   *
+ * + * int64 snapshot_version = 7; + */ + long getSnapshotVersion(); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java new file mode 100644 index 000000000000..048ee2dabfaf --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -0,0 +1,839 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The options shared by read requests.
+ *
+ * + * Protobuf type {@code google.datastore.v1.ReadOptions} + */ +public final class ReadOptions extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.ReadOptions) + ReadOptionsOrBuilder { +private static final long serialVersionUID = 0L; + // Use ReadOptions.newBuilder() to construct. + private ReadOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ReadOptions() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ReadOptions( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + consistencyTypeCase_ = 1; + consistencyType_ = rawValue; + break; + } + case 18: { + consistencyTypeCase_ = 2; + consistencyType_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ReadOptions.class, com.google.datastore.v1.ReadOptions.Builder.class); + } + + /** + * 
+   * The possible values for read consistencies.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.ReadOptions.ReadConsistency} + */ + public enum ReadConsistency + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * READ_CONSISTENCY_UNSPECIFIED = 0; + */ + READ_CONSISTENCY_UNSPECIFIED(0), + /** + * 
+     * Strong consistency.
+     *
+ * + * STRONG = 1; + */ + STRONG(1), + /** + * 
+     * Eventual consistency.
+     *
+ * + * EVENTUAL = 2; + */ + EVENTUAL(2), + UNRECOGNIZED(-1), + ; + + /** + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * READ_CONSISTENCY_UNSPECIFIED = 0; + */ + public static final int READ_CONSISTENCY_UNSPECIFIED_VALUE = 0; + /** + * 
+     * Strong consistency.
+     *
+ * + * STRONG = 1; + */ + public static final int STRONG_VALUE = 1; + /** + * 
+     * Eventual consistency.
+     *
+ * + * EVENTUAL = 2; + */ + public static final int EVENTUAL_VALUE = 2; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ReadConsistency valueOf(int value) { + return forNumber(value); + } + + public static ReadConsistency forNumber(int value) { + switch (value) { + case 0: return READ_CONSISTENCY_UNSPECIFIED; + case 1: return STRONG; + case 2: return EVENTUAL; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + ReadConsistency> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ReadConsistency findValueByNumber(int number) { + return ReadConsistency.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.google.datastore.v1.ReadOptions.getDescriptor().getEnumTypes().get(0); + } + + private static final ReadConsistency[] VALUES = values(); + + public static ReadConsistency valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ReadConsistency(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.ReadOptions.ReadConsistency) + } + + private int consistencyTypeCase_ = 0; + private java.lang.Object consistencyType_; + public enum ConsistencyTypeCase + implements com.google.protobuf.Internal.EnumLite { + READ_CONSISTENCY(1), + TRANSACTION(2), + CONSISTENCYTYPE_NOT_SET(0); + private final int value; + private ConsistencyTypeCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ConsistencyTypeCase valueOf(int value) { + return forNumber(value); + } + + public static ConsistencyTypeCase forNumber(int value) { + switch (value) { + case 1: return READ_CONSISTENCY; + case 2: return TRANSACTION; + case 0: return CONSISTENCYTYPE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public ConsistencyTypeCase + getConsistencyTypeCase() { + return ConsistencyTypeCase.forNumber( + consistencyTypeCase_); + } + + public static final int READ_CONSISTENCY_FIELD_NUMBER = 1; + /** + * 
+   * The non-transactional read consistency to use.
+   * Cannot be set to `STRONG` for global queries.
+   *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + public int getReadConsistencyValue() { + if (consistencyTypeCase_ == 1) { + return (java.lang.Integer) consistencyType_; + } + return 0; + } + /** + * 
+   * The non-transactional read consistency to use.
+   * Cannot be set to `STRONG` for global queries.
+   *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { + if (consistencyTypeCase_ == 1) { + com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( + (java.lang.Integer) consistencyType_); + return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; + } + return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED; + } + + public static final int TRANSACTION_FIELD_NUMBER = 2; + /** + * 
+   * The identifier of the transaction in which to read. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * bytes transaction = 2; + */ + public com.google.protobuf.ByteString getTransaction() { + if (consistencyTypeCase_ == 2) { + return (com.google.protobuf.ByteString) consistencyType_; + } + return com.google.protobuf.ByteString.EMPTY; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (consistencyTypeCase_ == 1) { + output.writeEnum(1, ((java.lang.Integer) consistencyType_)); + } + if (consistencyTypeCase_ == 2) { + output.writeBytes( + 2, (com.google.protobuf.ByteString) consistencyType_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (consistencyTypeCase_ == 1) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, ((java.lang.Integer) consistencyType_)); + } + if (consistencyTypeCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize( + 2, (com.google.protobuf.ByteString) consistencyType_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.ReadOptions)) { + return super.equals(obj); + } + com.google.datastore.v1.ReadOptions other = (com.google.datastore.v1.ReadOptions) obj; + + boolean result = true; + result = result && getConsistencyTypeCase().equals( + other.getConsistencyTypeCase()); + if (!result) return false; + switch (consistencyTypeCase_) { + case 1: + result = result && getReadConsistencyValue() + == other.getReadConsistencyValue(); + break; + case 2: + result = result && getTransaction() + .equals(other.getTransaction()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + switch (consistencyTypeCase_) { + case 1: + hash = (37 * hash) + READ_CONSISTENCY_FIELD_NUMBER; + hash = (53 * hash) + getReadConsistencyValue(); + break; + case 2: + hash = (37 * hash) + TRANSACTION_FIELD_NUMBER; + hash = (53 * hash) + getTransaction().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.ReadOptions parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReadOptions parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReadOptions parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReadOptions parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReadOptions parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReadOptions parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReadOptions parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReadOptions parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ReadOptions parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReadOptions parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ReadOptions parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReadOptions parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.ReadOptions prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The options shared by read requests.
+   *
+ * + * Protobuf type {@code google.datastore.v1.ReadOptions} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReadOptions) + com.google.datastore.v1.ReadOptionsOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ReadOptions.class, com.google.datastore.v1.ReadOptions.Builder.class); + } + + // Construct using com.google.datastore.v1.ReadOptions.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + consistencyTypeCase_ = 0; + consistencyType_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; + } + + public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { + return com.google.datastore.v1.ReadOptions.getDefaultInstance(); + } + + public com.google.datastore.v1.ReadOptions build() { + com.google.datastore.v1.ReadOptions result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.ReadOptions buildPartial() { + com.google.datastore.v1.ReadOptions result = new com.google.datastore.v1.ReadOptions(this); + if (consistencyTypeCase_ == 1) { + result.consistencyType_ = consistencyType_; + } + if (consistencyTypeCase_ == 2) { + result.consistencyType_ = consistencyType_; + } + result.consistencyTypeCase_ = consistencyTypeCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.ReadOptions) { + return mergeFrom((com.google.datastore.v1.ReadOptions)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) { + if (other == com.google.datastore.v1.ReadOptions.getDefaultInstance()) return this; + switch (other.getConsistencyTypeCase()) { + case READ_CONSISTENCY: { + setReadConsistencyValue(other.getReadConsistencyValue()); + break; + } + case TRANSACTION: { + setTransaction(other.getTransaction()); + break; + } + case CONSISTENCYTYPE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.ReadOptions parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.ReadOptions) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int consistencyTypeCase_ = 0; + private java.lang.Object consistencyType_; + public ConsistencyTypeCase + getConsistencyTypeCase() { + return ConsistencyTypeCase.forNumber( + consistencyTypeCase_); + } + + public Builder clearConsistencyType() { + consistencyTypeCase_ = 0; + consistencyType_ = null; + onChanged(); + return this; + } + + + /** + * 
+     * The non-transactional read consistency to use.
+     * Cannot be set to `STRONG` for global queries.
+     *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + public int getReadConsistencyValue() { + if (consistencyTypeCase_ == 1) { + return ((java.lang.Integer) consistencyType_).intValue(); + } + return 0; + } + /** + * 
+     * The non-transactional read consistency to use.
+     * Cannot be set to `STRONG` for global queries.
+     *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + public Builder setReadConsistencyValue(int value) { + consistencyTypeCase_ = 1; + consistencyType_ = value; + onChanged(); + return this; + } + /** + * 
+     * The non-transactional read consistency to use.
+     * Cannot be set to `STRONG` for global queries.
+     *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { + if (consistencyTypeCase_ == 1) { + com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( + (java.lang.Integer) consistencyType_); + return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; + } + return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED; + } + /** + * 
+     * The non-transactional read consistency to use.
+     * Cannot be set to `STRONG` for global queries.
+     *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsistency value) { + if (value == null) { + throw new NullPointerException(); + } + consistencyTypeCase_ = 1; + consistencyType_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * The non-transactional read consistency to use.
+     * Cannot be set to `STRONG` for global queries.
+     *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + public Builder clearReadConsistency() { + if (consistencyTypeCase_ == 1) { + consistencyTypeCase_ = 0; + consistencyType_ = null; + onChanged(); + } + return this; + } + + /** + * 
+     * The identifier of the transaction in which to read. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 2; + */ + public com.google.protobuf.ByteString getTransaction() { + if (consistencyTypeCase_ == 2) { + return (com.google.protobuf.ByteString) consistencyType_; + } + return com.google.protobuf.ByteString.EMPTY; + } + /** + * 
+     * The identifier of the transaction in which to read. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 2; + */ + public Builder setTransaction(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + consistencyTypeCase_ = 2; + consistencyType_ = value; + onChanged(); + return this; + } + /** + * 
+     * The identifier of the transaction in which to read. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 2; + */ + public Builder clearTransaction() { + if (consistencyTypeCase_ == 2) { + consistencyTypeCase_ = 0; + consistencyType_ = null; + onChanged(); + } + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReadOptions) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.ReadOptions) + private static final com.google.datastore.v1.ReadOptions DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.ReadOptions(); + } + + public static com.google.datastore.v1.ReadOptions getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public ReadOptions parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReadOptions(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..332bccda4a34 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java @@ -0,0 +1,41 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface ReadOptionsOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReadOptions) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The non-transactional read consistency to use.
+   * Cannot be set to `STRONG` for global queries.
+   *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + int getReadConsistencyValue(); + /** + * 
+   * The non-transactional read consistency to use.
+   * Cannot be set to `STRONG` for global queries.
+   *
+ * + * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1; + */ + com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency(); + + /** + * 
+   * The identifier of the transaction in which to read. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * bytes transaction = 2; + */ + com.google.protobuf.ByteString getTransaction(); + + public 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 new file mode 100644 index 000000000000..2ffd5b09e1ac --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java @@ -0,0 +1,1170 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ *
+ * + * Protobuf type {@code google.datastore.v1.ReserveIdsRequest} + */ +public final class ReserveIdsRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsRequest) + ReserveIdsRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use ReserveIdsRequest.newBuilder() to construct. + private ReserveIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ReserveIdsRequest() { + projectId_ = ""; + databaseId_ = ""; + keys_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ReserveIdsRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + keys_.add( + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + case 74: { + java.lang.String s = input.readStringRequireUtf8(); + + databaseId_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ReserveIdsRequest.class, com.google.datastore.v1.ReserveIdsRequest.Builder.class); + } + + private int bitField0_; + public static final int PROJECT_ID_FIELD_NUMBER = 8; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int DATABASE_ID_FIELD_NUMBER = 9; + private volatile java.lang.Object databaseId_; + /** + * 
+   * If not empty, the ID of the database against which to make the request.
+   *
+ * + * string database_id = 9; + */ + 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; + } + } + /** + * 
+   * If not empty, the ID of the database against which to make the request.
+   *
+ * + * string database_id = 9; + */ + 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 KEYS_FIELD_NUMBER = 1; + private java.util.List keys_; + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List getKeysList() { + return keys_; + } + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysOrBuilderList() { + return keys_; + } + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public int getKeysCount() { + return keys_.size(); + } + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key getKeys(int index) { + return keys_.get(index); + } + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + return keys_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < keys_.size(); i++) { + output.writeMessage(1, keys_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + if (!getDatabaseIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < keys_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, keys_.get(i)); + } + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + if (!getDatabaseIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.ReserveIdsRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.ReserveIdsRequest other = (com.google.datastore.v1.ReserveIdsRequest) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && getDatabaseId() + .equals(other.getDatabaseId()); + result = result && getKeysList() + .equals(other.getKeysList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + 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 (getKeysCount() > 0) { + hash = (37 * hash) + KEYS_FIELD_NUMBER; + hash = (53 * hash) + getKeysList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReserveIdsRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.ReserveIdsRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   *
+ * + * Protobuf type {@code google.datastore.v1.ReserveIdsRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReserveIdsRequest) + com.google.datastore.v1.ReserveIdsRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ReserveIdsRequest.class, com.google.datastore.v1.ReserveIdsRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.ReserveIdsRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKeysFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + databaseId_ = ""; + + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + keysBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; + } + + public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { + return com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance(); + } + + public com.google.datastore.v1.ReserveIdsRequest build() { + com.google.datastore.v1.ReserveIdsRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.ReserveIdsRequest buildPartial() { + com.google.datastore.v1.ReserveIdsRequest result = new com.google.datastore.v1.ReserveIdsRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.projectId_ = projectId_; + result.databaseId_ = databaseId_; + if (keysBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = java.util.Collections.unmodifiableList(keys_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.keys_ = keys_; + } else { + result.keys_ = keysBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.ReserveIdsRequest) { + return mergeFrom((com.google.datastore.v1.ReserveIdsRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) { + if (other == com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (!other.getDatabaseId().isEmpty()) { + databaseId_ = other.databaseId_; + onChanged(); + } + if (keysBuilder_ == null) { + if (!other.keys_.isEmpty()) { + if (keys_.isEmpty()) { + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureKeysIsMutable(); + keys_.addAll(other.keys_); + } + onChanged(); + } + } else { + if (!other.keys_.isEmpty()) { + if (keysBuilder_.isEmpty()) { + keysBuilder_.dispose(); + keysBuilder_ = null; + keys_ = other.keys_; + bitField0_ = (bitField0_ & ~0x00000004); + keysBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKeysFieldBuilder() : null; + } else { + keysBuilder_.addAllMessages(other.keys_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.ReserveIdsRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.ReserveIdsRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private java.lang.Object databaseId_ = ""; + /** + * 
+     * If not empty, the ID of the database against which to make the request.
+     *
+ * + * string database_id = 9; + */ + 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; + } + } + /** + * 
+     * If not empty, the ID of the database against which to make the request.
+     *
+ * + * string database_id = 9; + */ + 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; + } + } + /** + * 
+     * If not empty, the ID of the database against which to make the request.
+     *
+ * + * string database_id = 9; + */ + public Builder setDatabaseId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + databaseId_ = value; + onChanged(); + return this; + } + /** + * 
+     * If not empty, the ID of the database against which to make the request.
+     *
+ * + * string database_id = 9; + */ + public Builder clearDatabaseId() { + + databaseId_ = getDefaultInstance().getDatabaseId(); + onChanged(); + return this; + } + /** + * 
+     * If not empty, the ID of the database against which to make the request.
+     *
+ * + * string database_id = 9; + */ + public Builder setDatabaseIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + databaseId_ = value; + onChanged(); + return this; + } + + private java.util.List keys_ = + java.util.Collections.emptyList(); + private void ensureKeysIsMutable() { + if (!((bitField0_ & 0x00000004) == 0x00000004)) { + keys_ = new java.util.ArrayList(keys_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_; + + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List getKeysList() { + if (keysBuilder_ == null) { + return java.util.Collections.unmodifiableList(keys_); + } else { + return keysBuilder_.getMessageList(); + } + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public int getKeysCount() { + if (keysBuilder_ == null) { + return keys_.size(); + } else { + return keysBuilder_.getCount(); + } + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key getKeys(int index) { + if (keysBuilder_ == null) { + return keys_.get(index); + } else { + return keysBuilder_.getMessage(index); + } + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.set(index, value); + onChanged(); + } else { + keysBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder setKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.set(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys(com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(value); + onChanged(); + } else { + keysBuilder_.addMessage(value); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key value) { + if (keysBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKeysIsMutable(); + keys_.add(index, value); + onChanged(); + } else { + keysBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(index, builderForValue.build()); + onChanged(); + } else { + keysBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder addAllKeys( + java.lang.Iterable values) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, keys_); + onChanged(); + } else { + keysBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder clearKeys() { + if (keysBuilder_ == null) { + keys_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + keysBuilder_.clear(); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public Builder removeKeys(int index) { + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.remove(index); + onChanged(); + } else { + keysBuilder_.remove(index); + } + return this; + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder getKeysBuilder( + int index) { + return getKeysFieldBuilder().getBuilder(index); + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { + if (keysBuilder_ == null) { + return keys_.get(index); } else { + return keysBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysOrBuilderList() { + if (keysBuilder_ != null) { + return keysBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(keys_); + } + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder() { + return getKeysFieldBuilder().addBuilder( + com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public com.google.datastore.v1.Key.Builder addKeysBuilder( + int index) { + return getKeysFieldBuilder().addBuilder( + index, com.google.datastore.v1.Key.getDefaultInstance()); + } + /** + * 
+     * A list of keys with complete key paths whose numeric IDs should not be
+     * auto-allocated.
+     *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + public java.util.List + getKeysBuilderList() { + return getKeysFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getKeysFieldBuilder() { + if (keysBuilder_ == null) { + keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + keys_, + ((bitField0_ & 0x00000004) == 0x00000004), + getParentForChildren(), + isClean()); + keys_ = null; + } + return keysBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReserveIdsRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.ReserveIdsRequest) + private static final com.google.datastore.v1.ReserveIdsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.ReserveIdsRequest(); + } + + public static com.google.datastore.v1.ReserveIdsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public ReserveIdsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReserveIdsRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..008c521ac809 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java @@ -0,0 +1,94 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface ReserveIdsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReserveIdsRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * If not empty, the ID of the database against which to make the request.
+   *
+ * + * string database_id = 9; + */ + java.lang.String getDatabaseId(); + /** + * 
+   * If not empty, the ID of the database against which to make the request.
+   *
+ * + * string database_id = 9; + */ + com.google.protobuf.ByteString + getDatabaseIdBytes(); + + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + java.util.List + getKeysList(); + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + com.google.datastore.v1.Key getKeys(int index); + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + int getKeysCount(); + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + java.util.List + getKeysOrBuilderList(); + /** + * 
+   * A list of keys with complete key paths whose numeric IDs should not be
+   * auto-allocated.
+   *
+ * + * repeated .google.datastore.v1.Key keys = 1; + */ + com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index); +} 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 new file mode 100644 index 000000000000..1a905db7ea25 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java @@ -0,0 +1,396 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ *
+ * + * Protobuf type {@code google.datastore.v1.ReserveIdsResponse} + */ +public final class ReserveIdsResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsResponse) + ReserveIdsResponseOrBuilder { +private static final long serialVersionUID = 0L; + // Use ReserveIdsResponse.newBuilder() to construct. + private ReserveIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ReserveIdsResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ReserveIdsResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ReserveIdsResponse.class, com.google.datastore.v1.ReserveIdsResponse.Builder.class); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.ReserveIdsResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.ReserveIdsResponse other = (com.google.datastore.v1.ReserveIdsResponse) obj; + + boolean result = true; + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.ReserveIdsResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.ReserveIdsResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   *
+ * + * Protobuf type {@code google.datastore.v1.ReserveIdsResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReserveIdsResponse) + com.google.datastore.v1.ReserveIdsResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.ReserveIdsResponse.class, com.google.datastore.v1.ReserveIdsResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.ReserveIdsResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; + } + + public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { + return com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance(); + } + + public com.google.datastore.v1.ReserveIdsResponse build() { + com.google.datastore.v1.ReserveIdsResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.ReserveIdsResponse buildPartial() { + com.google.datastore.v1.ReserveIdsResponse result = new com.google.datastore.v1.ReserveIdsResponse(this); + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.ReserveIdsResponse) { + return mergeFrom((com.google.datastore.v1.ReserveIdsResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.ReserveIdsResponse other) { + if (other == com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance()) return this; + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.ReserveIdsResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.ReserveIdsResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReserveIdsResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.ReserveIdsResponse) + private static final com.google.datastore.v1.ReserveIdsResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.ReserveIdsResponse(); + } + + public static com.google.datastore.v1.ReserveIdsResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public ReserveIdsResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReserveIdsResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java new file mode 100644 index 000000000000..3a99406d3d5b --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java @@ -0,0 +1,9 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface ReserveIdsResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReserveIdsResponse) + com.google.protobuf.MessageOrBuilder { +} 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 new file mode 100644 index 000000000000..16c714da64b5 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java @@ -0,0 +1,633 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
+ *
+ * + * Protobuf type {@code google.datastore.v1.RollbackRequest} + */ +public final class RollbackRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackRequest) + RollbackRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use RollbackRequest.newBuilder() to construct. + private RollbackRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private RollbackRequest() { + projectId_ = ""; + transaction_ = com.google.protobuf.ByteString.EMPTY; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private RollbackRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + + transaction_ = input.readBytes(); + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RollbackRequest.class, com.google.datastore.v1.RollbackRequest.Builder.class); + } + + public static final int PROJECT_ID_FIELD_NUMBER = 8; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int TRANSACTION_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString transaction_; + /** + * 
+   * The transaction identifier, returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * bytes transaction = 1; + */ + public com.google.protobuf.ByteString getTransaction() { + return transaction_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!transaction_.isEmpty()) { + output.writeBytes(1, transaction_); + } + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!transaction_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, transaction_); + } + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.RollbackRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.RollbackRequest other = (com.google.datastore.v1.RollbackRequest) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && getTransaction() + .equals(other.getTransaction()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + hash = (37 * hash) + TRANSACTION_FIELD_NUMBER; + hash = (53 * hash) + getTransaction().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.RollbackRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RollbackRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RollbackRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RollbackRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RollbackRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RollbackRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RollbackRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RollbackRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RollbackRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RollbackRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.RollbackRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
+   *
+ * + * Protobuf type {@code google.datastore.v1.RollbackRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.RollbackRequest) + com.google.datastore.v1.RollbackRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RollbackRequest.class, com.google.datastore.v1.RollbackRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.RollbackRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + transaction_ = com.google.protobuf.ByteString.EMPTY; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; + } + + public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { + return com.google.datastore.v1.RollbackRequest.getDefaultInstance(); + } + + public com.google.datastore.v1.RollbackRequest build() { + com.google.datastore.v1.RollbackRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.RollbackRequest buildPartial() { + com.google.datastore.v1.RollbackRequest result = new com.google.datastore.v1.RollbackRequest(this); + result.projectId_ = projectId_; + result.transaction_ = transaction_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.RollbackRequest) { + return mergeFrom((com.google.datastore.v1.RollbackRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) { + if (other == com.google.datastore.v1.RollbackRequest.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) { + setTransaction(other.getTransaction()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.RollbackRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.RollbackRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * The transaction identifier, returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 1; + */ + public com.google.protobuf.ByteString getTransaction() { + return transaction_; + } + /** + * 
+     * The transaction identifier, returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 1; + */ + public Builder setTransaction(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + transaction_ = value; + onChanged(); + return this; + } + /** + * 
+     * The transaction identifier, returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     *
+ * + * bytes transaction = 1; + */ + public Builder clearTransaction() { + + transaction_ = getDefaultInstance().getTransaction(); + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.RollbackRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackRequest) + private static final com.google.datastore.v1.RollbackRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.RollbackRequest(); + } + + public static com.google.datastore.v1.RollbackRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public RollbackRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new RollbackRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..271bd5d430a9 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java @@ -0,0 +1,37 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface RollbackRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.RollbackRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * The transaction identifier, returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   *
+ * + * bytes transaction = 1; + */ + com.google.protobuf.ByteString getTransaction(); +} 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 new file mode 100644 index 000000000000..8570e62626f8 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java @@ -0,0 +1,398 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
+ * (an empty message).
+ *
+ * + * Protobuf type {@code google.datastore.v1.RollbackResponse} + */ +public final class RollbackResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackResponse) + RollbackResponseOrBuilder { +private static final long serialVersionUID = 0L; + // Use RollbackResponse.newBuilder() to construct. + private RollbackResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private RollbackResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private RollbackResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RollbackResponse.class, com.google.datastore.v1.RollbackResponse.Builder.class); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.RollbackResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.RollbackResponse other = (com.google.datastore.v1.RollbackResponse) obj; + + boolean result = true; + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.RollbackResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RollbackResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RollbackResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RollbackResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RollbackResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RollbackResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RollbackResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RollbackResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RollbackResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RollbackResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.RollbackResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
+   * (an empty message).
+   *
+ * + * Protobuf type {@code google.datastore.v1.RollbackResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.RollbackResponse) + com.google.datastore.v1.RollbackResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RollbackResponse.class, com.google.datastore.v1.RollbackResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.RollbackResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; + } + + public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { + return com.google.datastore.v1.RollbackResponse.getDefaultInstance(); + } + + public com.google.datastore.v1.RollbackResponse build() { + com.google.datastore.v1.RollbackResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.RollbackResponse buildPartial() { + com.google.datastore.v1.RollbackResponse result = new com.google.datastore.v1.RollbackResponse(this); + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.RollbackResponse) { + return mergeFrom((com.google.datastore.v1.RollbackResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.RollbackResponse other) { + if (other == com.google.datastore.v1.RollbackResponse.getDefaultInstance()) return this; + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.RollbackResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.RollbackResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.RollbackResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackResponse) + private static final com.google.datastore.v1.RollbackResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.RollbackResponse(); + } + + public static com.google.datastore.v1.RollbackResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public RollbackResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new RollbackResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java new file mode 100644 index 000000000000..5259ab5a88df --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java @@ -0,0 +1,9 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface RollbackResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.RollbackResponse) + com.google.protobuf.MessageOrBuilder { +} 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 new file mode 100644 index 000000000000..f06507679d03 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -0,0 +1,1618 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+ *
+ * + * Protobuf type {@code google.datastore.v1.RunQueryRequest} + */ +public final class RunQueryRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryRequest) + RunQueryRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use RunQueryRequest.newBuilder() to construct. + private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private RunQueryRequest() { + projectId_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private RunQueryRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.ReadOptions.Builder subBuilder = null; + if (readOptions_ != null) { + subBuilder = readOptions_.toBuilder(); + } + readOptions_ = input.readMessage(com.google.datastore.v1.ReadOptions.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(readOptions_); + readOptions_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + com.google.datastore.v1.PartitionId.Builder subBuilder = null; + if (partitionId_ != null) { + subBuilder = partitionId_.toBuilder(); + } + partitionId_ = input.readMessage(com.google.datastore.v1.PartitionId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(partitionId_); + partitionId_ = subBuilder.buildPartial(); + } + + break; + } + case 26: { + com.google.datastore.v1.Query.Builder subBuilder = null; + if (queryTypeCase_ == 3) { + subBuilder = ((com.google.datastore.v1.Query) queryType_).toBuilder(); + } + queryType_ = + input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Query) queryType_); + queryType_ = subBuilder.buildPartial(); + } + queryTypeCase_ = 3; + break; + } + case 58: { + com.google.datastore.v1.GqlQuery.Builder subBuilder = null; + if (queryTypeCase_ == 7) { + subBuilder = ((com.google.datastore.v1.GqlQuery) queryType_).toBuilder(); + } + queryType_ = + input.readMessage(com.google.datastore.v1.GqlQuery.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.GqlQuery) queryType_); + queryType_ = subBuilder.buildPartial(); + } + queryTypeCase_ = 7; + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + + projectId_ = s; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunQueryRequest.class, com.google.datastore.v1.RunQueryRequest.Builder.class); + } + + private int queryTypeCase_ = 0; + private java.lang.Object queryType_; + public enum QueryTypeCase + implements com.google.protobuf.Internal.EnumLite { + QUERY(3), + GQL_QUERY(7), + QUERYTYPE_NOT_SET(0); + private final int value; + private QueryTypeCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static QueryTypeCase valueOf(int value) { + return forNumber(value); + } + + public static QueryTypeCase forNumber(int value) { + switch (value) { + case 3: return QUERY; + case 7: return GQL_QUERY; + case 0: return QUERYTYPE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public QueryTypeCase + getQueryTypeCase() { + return QueryTypeCase.forNumber( + queryTypeCase_); + } + + public static final int PROJECT_ID_FIELD_NUMBER = 8; + private volatile java.lang.Object projectId_; + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + 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(); + projectId_ = s; + return s; + } + } + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = 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_; + /** + * 
+   * 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
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public boolean hasPartitionId() { + return partitionId_ != null; + } + /** + * 
+   * 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
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public com.google.datastore.v1.PartitionId getPartitionId() { + return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; + } + /** + * 
+   * 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
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { + return getPartitionId(); + } + + public static final int READ_OPTIONS_FIELD_NUMBER = 1; + private com.google.datastore.v1.ReadOptions readOptions_; + /** + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public boolean hasReadOptions() { + return readOptions_ != null; + } + /** + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptions getReadOptions() { + return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; + } + /** + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { + return getReadOptions(); + } + + public static final int QUERY_FIELD_NUMBER = 3; + /** + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.Query query = 3; + */ + public boolean hasQuery() { + return queryTypeCase_ == 3; + } + /** + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.Query query = 3; + */ + public com.google.datastore.v1.Query getQuery() { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + /** + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.Query query = 3; + */ + public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + + public static final int GQL_QUERY_FIELD_NUMBER = 7; + /** + * 
+   * The GQL query to run.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public boolean hasGqlQuery() { + return queryTypeCase_ == 7; + } + /** + * 
+   * The GQL query to run.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public com.google.datastore.v1.GqlQuery getGqlQuery() { + if (queryTypeCase_ == 7) { + return (com.google.datastore.v1.GqlQuery) queryType_; + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + /** + * 
+   * The GQL query to run.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { + if (queryTypeCase_ == 7) { + return (com.google.datastore.v1.GqlQuery) queryType_; + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (readOptions_ != null) { + output.writeMessage(1, getReadOptions()); + } + if (partitionId_ != null) { + output.writeMessage(2, getPartitionId()); + } + if (queryTypeCase_ == 3) { + output.writeMessage(3, (com.google.datastore.v1.Query) queryType_); + } + if (queryTypeCase_ == 7) { + output.writeMessage(7, (com.google.datastore.v1.GqlQuery) queryType_); + } + if (!getProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (readOptions_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getReadOptions()); + } + if (partitionId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getPartitionId()); + } + if (queryTypeCase_ == 3) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, (com.google.datastore.v1.Query) queryType_); + } + if (queryTypeCase_ == 7) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, (com.google.datastore.v1.GqlQuery) queryType_); + } + if (!getProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.RunQueryRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.RunQueryRequest other = (com.google.datastore.v1.RunQueryRequest) obj; + + boolean result = true; + result = result && getProjectId() + .equals(other.getProjectId()); + result = result && (hasPartitionId() == other.hasPartitionId()); + if (hasPartitionId()) { + result = result && getPartitionId() + .equals(other.getPartitionId()); + } + result = result && (hasReadOptions() == other.hasReadOptions()); + if (hasReadOptions()) { + result = result && getReadOptions() + .equals(other.getReadOptions()); + } + result = result && getQueryTypeCase().equals( + other.getQueryTypeCase()); + if (!result) return false; + switch (queryTypeCase_) { + case 3: + result = result && getQuery() + .equals(other.getQuery()); + break; + case 7: + result = result && getGqlQuery() + .equals(other.getGqlQuery()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + if (hasPartitionId()) { + hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER; + hash = (53 * hash) + getPartitionId().hashCode(); + } + if (hasReadOptions()) { + hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER; + hash = (53 * hash) + getReadOptions().hashCode(); + } + switch (queryTypeCase_) { + case 3: + hash = (37 * hash) + QUERY_FIELD_NUMBER; + hash = (53 * hash) + getQuery().hashCode(); + break; + case 7: + hash = (37 * hash) + GQL_QUERY_FIELD_NUMBER; + hash = (53 * hash) + getGqlQuery().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.RunQueryRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RunQueryRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.RunQueryRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+   *
+ * + * Protobuf type {@code google.datastore.v1.RunQueryRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunQueryRequest) + com.google.datastore.v1.RunQueryRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunQueryRequest.class, com.google.datastore.v1.RunQueryRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.RunQueryRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + projectId_ = ""; + + if (partitionIdBuilder_ == null) { + partitionId_ = null; + } else { + partitionId_ = null; + partitionIdBuilder_ = null; + } + if (readOptionsBuilder_ == null) { + readOptions_ = null; + } else { + readOptions_ = null; + readOptionsBuilder_ = null; + } + queryTypeCase_ = 0; + queryType_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; + } + + public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { + return com.google.datastore.v1.RunQueryRequest.getDefaultInstance(); + } + + public com.google.datastore.v1.RunQueryRequest build() { + com.google.datastore.v1.RunQueryRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.RunQueryRequest buildPartial() { + com.google.datastore.v1.RunQueryRequest result = new com.google.datastore.v1.RunQueryRequest(this); + result.projectId_ = projectId_; + if (partitionIdBuilder_ == null) { + result.partitionId_ = partitionId_; + } else { + result.partitionId_ = partitionIdBuilder_.build(); + } + if (readOptionsBuilder_ == null) { + result.readOptions_ = readOptions_; + } else { + result.readOptions_ = readOptionsBuilder_.build(); + } + if (queryTypeCase_ == 3) { + if (queryBuilder_ == null) { + result.queryType_ = queryType_; + } else { + result.queryType_ = queryBuilder_.build(); + } + } + if (queryTypeCase_ == 7) { + if (gqlQueryBuilder_ == null) { + result.queryType_ = queryType_; + } else { + result.queryType_ = gqlQueryBuilder_.build(); + } + } + result.queryTypeCase_ = queryTypeCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.RunQueryRequest) { + return mergeFrom((com.google.datastore.v1.RunQueryRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) { + if (other == com.google.datastore.v1.RunQueryRequest.getDefaultInstance()) return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (other.hasPartitionId()) { + mergePartitionId(other.getPartitionId()); + } + if (other.hasReadOptions()) { + mergeReadOptions(other.getReadOptions()); + } + switch (other.getQueryTypeCase()) { + case QUERY: { + mergeQuery(other.getQuery()); + break; + } + case GQL_QUERY: { + mergeGqlQuery(other.getGqlQuery()); + break; + } + case QUERYTYPE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.RunQueryRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.RunQueryRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int queryTypeCase_ = 0; + private java.lang.Object queryType_; + public QueryTypeCase + getQueryTypeCase() { + return QueryTypeCase.forNumber( + queryTypeCase_); + } + + public Builder clearQueryType() { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + return this; + } + + + private java.lang.Object projectId_ = ""; + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public com.google.protobuf.ByteString + getProjectIdBytes() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + projectId_ = value; + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder clearProjectId() { + + projectId_ = getDefaultInstance().getProjectId(); + onChanged(); + return this; + } + /** + * 
+     * The ID of the project against which to make the request.
+     *
+ * + * string project_id = 8; + */ + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private com.google.datastore.v1.PartitionId partitionId_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_; + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public boolean hasPartitionId() { + return partitionIdBuilder_ != null || partitionId_ != null; + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public com.google.datastore.v1.PartitionId getPartitionId() { + if (partitionIdBuilder_ == null) { + return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; + } else { + return partitionIdBuilder_.getMessage(); + } + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public Builder setPartitionId(com.google.datastore.v1.PartitionId value) { + if (partitionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + partitionId_ = value; + onChanged(); + } else { + partitionIdBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public Builder setPartitionId( + com.google.datastore.v1.PartitionId.Builder builderForValue) { + if (partitionIdBuilder_ == null) { + partitionId_ = builderForValue.build(); + onChanged(); + } else { + partitionIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) { + if (partitionIdBuilder_ == null) { + if (partitionId_ != null) { + partitionId_ = + com.google.datastore.v1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial(); + } else { + partitionId_ = value; + } + onChanged(); + } else { + partitionIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public Builder clearPartitionId() { + if (partitionIdBuilder_ == null) { + partitionId_ = null; + onChanged(); + } else { + partitionId_ = null; + partitionIdBuilder_ = null; + } + + return this; + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() { + + onChanged(); + return getPartitionIdFieldBuilder().getBuilder(); + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { + if (partitionIdBuilder_ != null) { + return partitionIdBuilder_.getMessageOrBuilder(); + } else { + return partitionId_ == null ? + com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; + } + } + /** + * 
+     * 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
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> + getPartitionIdFieldBuilder() { + if (partitionIdBuilder_ == null) { + partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder>( + getPartitionId(), + getParentForChildren(), + isClean()); + partitionId_ = null; + } + return partitionIdBuilder_; + } + + private com.google.datastore.v1.ReadOptions readOptions_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_; + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public boolean hasReadOptions() { + return readOptionsBuilder_ != null || readOptions_ != null; + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptions getReadOptions() { + if (readOptionsBuilder_ == null) { + return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; + } else { + return readOptionsBuilder_.getMessage(); + } + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) { + if (readOptionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + readOptions_ = value; + onChanged(); + } else { + readOptionsBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder setReadOptions( + com.google.datastore.v1.ReadOptions.Builder builderForValue) { + if (readOptionsBuilder_ == null) { + readOptions_ = builderForValue.build(); + onChanged(); + } else { + readOptionsBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) { + if (readOptionsBuilder_ == null) { + if (readOptions_ != null) { + readOptions_ = + com.google.datastore.v1.ReadOptions.newBuilder(readOptions_).mergeFrom(value).buildPartial(); + } else { + readOptions_ = value; + } + onChanged(); + } else { + readOptionsBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder clearReadOptions() { + if (readOptionsBuilder_ == null) { + readOptions_ = null; + onChanged(); + } else { + readOptions_ = null; + readOptionsBuilder_ = null; + } + + return this; + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() { + + onChanged(); + return getReadOptionsFieldBuilder().getBuilder(); + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { + if (readOptionsBuilder_ != null) { + return readOptionsBuilder_.getMessageOrBuilder(); + } else { + return readOptions_ == null ? + com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; + } + } + /** + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> + getReadOptionsFieldBuilder() { + if (readOptionsBuilder_ == null) { + readOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder>( + getReadOptions(), + getParentForChildren(), + isClean()); + readOptions_ = null; + } + return readOptionsBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_; + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public boolean hasQuery() { + return queryTypeCase_ == 3; + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public com.google.datastore.v1.Query getQuery() { + if (queryBuilder_ == null) { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } else { + if (queryTypeCase_ == 3) { + return queryBuilder_.getMessage(); + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public Builder setQuery(com.google.datastore.v1.Query value) { + if (queryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + queryType_ = value; + onChanged(); + } else { + queryBuilder_.setMessage(value); + } + queryTypeCase_ = 3; + return this; + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public Builder setQuery( + com.google.datastore.v1.Query.Builder builderForValue) { + if (queryBuilder_ == null) { + queryType_ = builderForValue.build(); + onChanged(); + } else { + queryBuilder_.setMessage(builderForValue.build()); + } + queryTypeCase_ = 3; + return this; + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public Builder mergeQuery(com.google.datastore.v1.Query value) { + if (queryBuilder_ == null) { + if (queryTypeCase_ == 3 && + queryType_ != com.google.datastore.v1.Query.getDefaultInstance()) { + queryType_ = com.google.datastore.v1.Query.newBuilder((com.google.datastore.v1.Query) queryType_) + .mergeFrom(value).buildPartial(); + } else { + queryType_ = value; + } + onChanged(); + } else { + if (queryTypeCase_ == 3) { + queryBuilder_.mergeFrom(value); + } + queryBuilder_.setMessage(value); + } + queryTypeCase_ = 3; + return this; + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public Builder clearQuery() { + if (queryBuilder_ == null) { + if (queryTypeCase_ == 3) { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + } + } else { + if (queryTypeCase_ == 3) { + queryTypeCase_ = 0; + queryType_ = null; + } + queryBuilder_.clear(); + } + return this; + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public com.google.datastore.v1.Query.Builder getQueryBuilder() { + return getQueryFieldBuilder().getBuilder(); + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { + if ((queryTypeCase_ == 3) && (queryBuilder_ != null)) { + return queryBuilder_.getMessageOrBuilder(); + } else { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + } + /** + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.Query query = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> + getQueryFieldBuilder() { + if (queryBuilder_ == null) { + if (!(queryTypeCase_ == 3)) { + queryType_ = com.google.datastore.v1.Query.getDefaultInstance(); + } + queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder>( + (com.google.datastore.v1.Query) queryType_, + getParentForChildren(), + isClean()); + queryType_ = null; + } + queryTypeCase_ = 3; + onChanged();; + return queryBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> gqlQueryBuilder_; + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public boolean hasGqlQuery() { + return queryTypeCase_ == 7; + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public com.google.datastore.v1.GqlQuery getGqlQuery() { + if (gqlQueryBuilder_ == null) { + if (queryTypeCase_ == 7) { + return (com.google.datastore.v1.GqlQuery) queryType_; + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } else { + if (queryTypeCase_ == 7) { + return gqlQueryBuilder_.getMessage(); + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) { + if (gqlQueryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + queryType_ = value; + onChanged(); + } else { + gqlQueryBuilder_.setMessage(value); + } + queryTypeCase_ = 7; + return this; + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public Builder setGqlQuery( + com.google.datastore.v1.GqlQuery.Builder builderForValue) { + if (gqlQueryBuilder_ == null) { + queryType_ = builderForValue.build(); + onChanged(); + } else { + gqlQueryBuilder_.setMessage(builderForValue.build()); + } + queryTypeCase_ = 7; + return this; + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) { + if (gqlQueryBuilder_ == null) { + if (queryTypeCase_ == 7 && + queryType_ != com.google.datastore.v1.GqlQuery.getDefaultInstance()) { + queryType_ = com.google.datastore.v1.GqlQuery.newBuilder((com.google.datastore.v1.GqlQuery) queryType_) + .mergeFrom(value).buildPartial(); + } else { + queryType_ = value; + } + onChanged(); + } else { + if (queryTypeCase_ == 7) { + gqlQueryBuilder_.mergeFrom(value); + } + gqlQueryBuilder_.setMessage(value); + } + queryTypeCase_ = 7; + return this; + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public Builder clearGqlQuery() { + if (gqlQueryBuilder_ == null) { + if (queryTypeCase_ == 7) { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + } + } else { + if (queryTypeCase_ == 7) { + queryTypeCase_ = 0; + queryType_ = null; + } + gqlQueryBuilder_.clear(); + } + return this; + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() { + return getGqlQueryFieldBuilder().getBuilder(); + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { + if ((queryTypeCase_ == 7) && (gqlQueryBuilder_ != null)) { + return gqlQueryBuilder_.getMessageOrBuilder(); + } else { + if (queryTypeCase_ == 7) { + return (com.google.datastore.v1.GqlQuery) queryType_; + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + } + /** + * 
+     * The GQL query to run.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> + getGqlQueryFieldBuilder() { + if (gqlQueryBuilder_ == null) { + if (!(queryTypeCase_ == 7)) { + queryType_ = com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + gqlQueryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder>( + (com.google.datastore.v1.GqlQuery) queryType_, + getParentForChildren(), + isClean()); + queryType_ = null; + } + queryTypeCase_ = 7; + onChanged();; + return gqlQueryBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunQueryRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryRequest) + private static final com.google.datastore.v1.RunQueryRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.RunQueryRequest(); + } + + public static com.google.datastore.v1.RunQueryRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public RunQueryRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new RunQueryRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..11b904153d1e --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java @@ -0,0 +1,138 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface RunQueryRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunQueryRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + java.lang.String getProjectId(); + /** + * 
+   * The ID of the project against which to make the request.
+   *
+ * + * string project_id = 8; + */ + com.google.protobuf.ByteString + getProjectIdBytes(); + + /** + * 
+   * 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
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + boolean hasPartitionId(); + /** + * 
+   * 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
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + com.google.datastore.v1.PartitionId getPartitionId(); + /** + * 
+   * 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
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder(); + + /** + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + boolean hasReadOptions(); + /** + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + com.google.datastore.v1.ReadOptions getReadOptions(); + /** + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder(); + + /** + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.Query query = 3; + */ + boolean hasQuery(); + /** + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.Query query = 3; + */ + com.google.datastore.v1.Query getQuery(); + /** + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.Query query = 3; + */ + com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder(); + + /** + * 
+   * The GQL query to run.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + boolean hasGqlQuery(); + /** + * 
+   * The GQL query to run.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + com.google.datastore.v1.GqlQuery getGqlQuery(); + /** + * 
+   * The GQL query to run.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder(); + + public 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 new file mode 100644 index 000000000000..3f7dd2858e68 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java @@ -0,0 +1,855 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+ *
+ * + * Protobuf type {@code google.datastore.v1.RunQueryResponse} + */ +public final class RunQueryResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryResponse) + RunQueryResponseOrBuilder { +private static final long serialVersionUID = 0L; + // Use RunQueryResponse.newBuilder() to construct. + private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private RunQueryResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private RunQueryResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null; + if (batch_ != null) { + subBuilder = batch_.toBuilder(); + } + batch_ = input.readMessage(com.google.datastore.v1.QueryResultBatch.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(batch_); + batch_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + com.google.datastore.v1.Query.Builder subBuilder = null; + if (query_ != null) { + subBuilder = query_.toBuilder(); + } + query_ = input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(query_); + query_ = subBuilder.buildPartial(); + } + + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunQueryResponse.class, com.google.datastore.v1.RunQueryResponse.Builder.class); + } + + public static final int BATCH_FIELD_NUMBER = 1; + private com.google.datastore.v1.QueryResultBatch batch_; + /** + * 
+   * A batch of query results (always present).
+   *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public boolean hasBatch() { + return batch_ != null; + } + /** + * 
+   * A batch of query results (always present).
+   *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public com.google.datastore.v1.QueryResultBatch getBatch() { + return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_; + } + /** + * 
+   * A batch of query results (always present).
+   *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { + return getBatch(); + } + + public static final int QUERY_FIELD_NUMBER = 2; + private com.google.datastore.v1.Query query_; + /** + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.Query query = 2; + */ + public boolean hasQuery() { + return query_ != null; + } + /** + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.Query query = 2; + */ + public com.google.datastore.v1.Query getQuery() { + return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_; + } + /** + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.Query query = 2; + */ + public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { + return getQuery(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (batch_ != null) { + output.writeMessage(1, getBatch()); + } + if (query_ != null) { + output.writeMessage(2, getQuery()); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (batch_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getBatch()); + } + if (query_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getQuery()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.RunQueryResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.RunQueryResponse other = (com.google.datastore.v1.RunQueryResponse) obj; + + boolean result = true; + result = result && (hasBatch() == other.hasBatch()); + if (hasBatch()) { + result = result && getBatch() + .equals(other.getBatch()); + } + result = result && (hasQuery() == other.hasQuery()); + if (hasQuery()) { + result = result && getQuery() + .equals(other.getQuery()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasBatch()) { + hash = (37 * hash) + BATCH_FIELD_NUMBER; + hash = (53 * hash) + getBatch().hashCode(); + } + if (hasQuery()) { + hash = (37 * hash) + QUERY_FIELD_NUMBER; + hash = (53 * hash) + getQuery().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.RunQueryResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.RunQueryResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.RunQueryResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+   *
+ * + * Protobuf type {@code google.datastore.v1.RunQueryResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunQueryResponse) + com.google.datastore.v1.RunQueryResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunQueryResponse.class, com.google.datastore.v1.RunQueryResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.RunQueryResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + if (batchBuilder_ == null) { + batch_ = null; + } else { + batch_ = null; + batchBuilder_ = null; + } + if (queryBuilder_ == null) { + query_ = null; + } else { + query_ = null; + queryBuilder_ = null; + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; + } + + public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { + return com.google.datastore.v1.RunQueryResponse.getDefaultInstance(); + } + + public com.google.datastore.v1.RunQueryResponse build() { + com.google.datastore.v1.RunQueryResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.RunQueryResponse buildPartial() { + com.google.datastore.v1.RunQueryResponse result = new com.google.datastore.v1.RunQueryResponse(this); + if (batchBuilder_ == null) { + result.batch_ = batch_; + } else { + result.batch_ = batchBuilder_.build(); + } + if (queryBuilder_ == null) { + result.query_ = query_; + } else { + result.query_ = queryBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.RunQueryResponse) { + return mergeFrom((com.google.datastore.v1.RunQueryResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) { + if (other == com.google.datastore.v1.RunQueryResponse.getDefaultInstance()) return this; + if (other.hasBatch()) { + mergeBatch(other.getBatch()); + } + if (other.hasQuery()) { + mergeQuery(other.getQuery()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.RunQueryResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.RunQueryResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.datastore.v1.QueryResultBatch batch_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder> batchBuilder_; + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public boolean hasBatch() { + return batchBuilder_ != null || batch_ != null; + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public com.google.datastore.v1.QueryResultBatch getBatch() { + if (batchBuilder_ == null) { + return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_; + } else { + return batchBuilder_.getMessage(); + } + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public Builder setBatch(com.google.datastore.v1.QueryResultBatch value) { + if (batchBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + batch_ = value; + onChanged(); + } else { + batchBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public Builder setBatch( + com.google.datastore.v1.QueryResultBatch.Builder builderForValue) { + if (batchBuilder_ == null) { + batch_ = builderForValue.build(); + onChanged(); + } else { + batchBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) { + if (batchBuilder_ == null) { + if (batch_ != null) { + batch_ = + com.google.datastore.v1.QueryResultBatch.newBuilder(batch_).mergeFrom(value).buildPartial(); + } else { + batch_ = value; + } + onChanged(); + } else { + batchBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public Builder clearBatch() { + if (batchBuilder_ == null) { + batch_ = null; + onChanged(); + } else { + batch_ = null; + batchBuilder_ = null; + } + + return this; + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public com.google.datastore.v1.QueryResultBatch.Builder getBatchBuilder() { + + onChanged(); + return getBatchFieldBuilder().getBuilder(); + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { + if (batchBuilder_ != null) { + return batchBuilder_.getMessageOrBuilder(); + } else { + return batch_ == null ? + com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_; + } + } + /** + * 
+     * A batch of query results (always present).
+     *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder> + getBatchFieldBuilder() { + if (batchBuilder_ == null) { + batchBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder>( + getBatch(), + getParentForChildren(), + isClean()); + batch_ = null; + } + return batchBuilder_; + } + + private com.google.datastore.v1.Query query_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_; + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public boolean hasQuery() { + return queryBuilder_ != null || query_ != null; + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public com.google.datastore.v1.Query getQuery() { + if (queryBuilder_ == null) { + return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_; + } else { + return queryBuilder_.getMessage(); + } + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public Builder setQuery(com.google.datastore.v1.Query value) { + if (queryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + query_ = value; + onChanged(); + } else { + queryBuilder_.setMessage(value); + } + + return this; + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public Builder setQuery( + com.google.datastore.v1.Query.Builder builderForValue) { + if (queryBuilder_ == null) { + query_ = builderForValue.build(); + onChanged(); + } else { + queryBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public Builder mergeQuery(com.google.datastore.v1.Query value) { + if (queryBuilder_ == null) { + if (query_ != null) { + query_ = + com.google.datastore.v1.Query.newBuilder(query_).mergeFrom(value).buildPartial(); + } else { + query_ = value; + } + onChanged(); + } else { + queryBuilder_.mergeFrom(value); + } + + return this; + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public Builder clearQuery() { + if (queryBuilder_ == null) { + query_ = null; + onChanged(); + } else { + query_ = null; + queryBuilder_ = null; + } + + return this; + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public com.google.datastore.v1.Query.Builder getQueryBuilder() { + + onChanged(); + return getQueryFieldBuilder().getBuilder(); + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { + if (queryBuilder_ != null) { + return queryBuilder_.getMessageOrBuilder(); + } else { + return query_ == null ? + com.google.datastore.v1.Query.getDefaultInstance() : query_; + } + } + /** + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.Query query = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> + getQueryFieldBuilder() { + if (queryBuilder_ == null) { + queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder>( + getQuery(), + getParentForChildren(), + isClean()); + query_ = null; + } + return queryBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunQueryResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryResponse) + private static final com.google.datastore.v1.RunQueryResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.RunQueryResponse(); + } + + public static com.google.datastore.v1.RunQueryResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public RunQueryResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new RunQueryResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..8045ff9d606f --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java @@ -0,0 +1,59 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface RunQueryResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunQueryResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * A batch of query results (always present).
+   *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + boolean hasBatch(); + /** + * 
+   * A batch of query results (always present).
+   *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + com.google.datastore.v1.QueryResultBatch getBatch(); + /** + * 
+   * A batch of query results (always present).
+   *
+ * + * .google.datastore.v1.QueryResultBatch batch = 1; + */ + com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder(); + + /** + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.Query query = 2; + */ + boolean hasQuery(); + /** + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.Query query = 2; + */ + com.google.datastore.v1.Query getQuery(); + /** + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.Query query = 2; + */ + com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder(); +} 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 new file mode 100644 index 000000000000..697ff5bae265 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java @@ -0,0 +1,1852 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * 
+ * 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
+ * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+ *
+ * + * Protobuf type {@code google.datastore.v1.TransactionOptions} + */ +public final class TransactionOptions extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions) + TransactionOptionsOrBuilder { +private static final long serialVersionUID = 0L; + // Use TransactionOptions.newBuilder() to construct. + private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private TransactionOptions() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private TransactionOptions( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null; + if (modeCase_ == 1) { + subBuilder = ((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_).toBuilder(); + } + mode_ = + input.readMessage(com.google.datastore.v1.TransactionOptions.ReadWrite.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_); + mode_ = subBuilder.buildPartial(); + } + modeCase_ = 1; + break; + } + case 18: { + com.google.datastore.v1.TransactionOptions.ReadOnly.Builder subBuilder = null; + if (modeCase_ == 2) { + subBuilder = ((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_).toBuilder(); + } + mode_ = + input.readMessage(com.google.datastore.v1.TransactionOptions.ReadOnly.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_); + mode_ = subBuilder.buildPartial(); + } + modeCase_ = 2; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.TransactionOptions.class, com.google.datastore.v1.TransactionOptions.Builder.class); + } + + public interface ReadWriteOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions.ReadWrite) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * The transaction identifier of the transaction being retried.
+     *
+ * + * bytes previous_transaction = 1; + */ + com.google.protobuf.ByteString getPreviousTransaction(); + } + /** + * 
+   * Options specific to read / write transactions.
+   *
+ * + * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadWrite} + */ + public static final class ReadWrite extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadWrite) + ReadWriteOrBuilder { + private static final long serialVersionUID = 0L; + // Use ReadWrite.newBuilder() to construct. + private ReadWrite(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ReadWrite() { + previousTransaction_ = com.google.protobuf.ByteString.EMPTY; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ReadWrite( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + + previousTransaction_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.TransactionOptions.ReadWrite.class, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class); + } + + public static final int PREVIOUS_TRANSACTION_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString previousTransaction_; + /** + * 
+     * The transaction identifier of the transaction being retried.
+     *
+ * + * bytes previous_transaction = 1; + */ + public com.google.protobuf.ByteString getPreviousTransaction() { + return previousTransaction_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!previousTransaction_.isEmpty()) { + output.writeBytes(1, previousTransaction_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!previousTransaction_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, previousTransaction_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.TransactionOptions.ReadWrite)) { + return super.equals(obj); + } + com.google.datastore.v1.TransactionOptions.ReadWrite other = (com.google.datastore.v1.TransactionOptions.ReadWrite) obj; + + boolean result = true; + result = result && getPreviousTransaction() + .equals(other.getPreviousTransaction()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PREVIOUS_TRANSACTION_FIELD_NUMBER; + hash = (53 * hash) + getPreviousTransaction().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadWrite prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * Options specific to read / write transactions.
+     *
+ * + * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadWrite} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions.ReadWrite) + com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.TransactionOptions.ReadWrite.class, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class); + } + + // Construct using com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + previousTransaction_ = com.google.protobuf.ByteString.EMPTY; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; + } + + public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { + return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); + } + + public com.google.datastore.v1.TransactionOptions.ReadWrite build() { + com.google.datastore.v1.TransactionOptions.ReadWrite result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() { + com.google.datastore.v1.TransactionOptions.ReadWrite result = new com.google.datastore.v1.TransactionOptions.ReadWrite(this); + result.previousTransaction_ = previousTransaction_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.TransactionOptions.ReadWrite) { + return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite other) { + if (other == com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) return this; + if (other.getPreviousTransaction() != com.google.protobuf.ByteString.EMPTY) { + setPreviousTransaction(other.getPreviousTransaction()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.TransactionOptions.ReadWrite parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.protobuf.ByteString previousTransaction_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+       * The transaction identifier of the transaction being retried.
+       *
+ * + * bytes previous_transaction = 1; + */ + public com.google.protobuf.ByteString getPreviousTransaction() { + return previousTransaction_; + } + /** + * 
+       * The transaction identifier of the transaction being retried.
+       *
+ * + * bytes previous_transaction = 1; + */ + public Builder setPreviousTransaction(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + previousTransaction_ = value; + onChanged(); + return this; + } + /** + * 
+       * The transaction identifier of the transaction being retried.
+       *
+ * + * bytes previous_transaction = 1; + */ + public Builder clearPreviousTransaction() { + + previousTransaction_ = getDefaultInstance().getPreviousTransaction(); + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions.ReadWrite) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions.ReadWrite) + private static final com.google.datastore.v1.TransactionOptions.ReadWrite DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions.ReadWrite(); + } + + public static com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public ReadWrite parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReadWrite(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface ReadOnlyOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions.ReadOnly) + com.google.protobuf.MessageOrBuilder { + } + /** + * 
+   * Options specific to read-only transactions.
+   *
+ * + * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadOnly} + */ + public static final class ReadOnly extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadOnly) + ReadOnlyOrBuilder { + private static final long serialVersionUID = 0L; + // Use ReadOnly.newBuilder() to construct. + private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ReadOnly() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ReadOnly( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.TransactionOptions.ReadOnly.class, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.TransactionOptions.ReadOnly)) { + return super.equals(obj); + } + com.google.datastore.v1.TransactionOptions.ReadOnly other = (com.google.datastore.v1.TransactionOptions.ReadOnly) obj; + + boolean result = true; + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadOnly prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * Options specific to read-only transactions.
+     *
+ * + * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadOnly} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions.ReadOnly) + com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.TransactionOptions.ReadOnly.class, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class); + } + + // Construct using com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; + } + + public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { + return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); + } + + public com.google.datastore.v1.TransactionOptions.ReadOnly build() { + com.google.datastore.v1.TransactionOptions.ReadOnly result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() { + com.google.datastore.v1.TransactionOptions.ReadOnly result = new com.google.datastore.v1.TransactionOptions.ReadOnly(this); + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.TransactionOptions.ReadOnly) { + return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly other) { + if (other == com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) return this; + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.TransactionOptions.ReadOnly parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions.ReadOnly) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions.ReadOnly) + private static final com.google.datastore.v1.TransactionOptions.ReadOnly DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions.ReadOnly(); + } + + public static com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public ReadOnly parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReadOnly(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private int modeCase_ = 0; + private java.lang.Object mode_; + public enum ModeCase + implements com.google.protobuf.Internal.EnumLite { + READ_WRITE(1), + READ_ONLY(2), + MODE_NOT_SET(0); + private final int value; + private ModeCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ModeCase valueOf(int value) { + return forNumber(value); + } + + public static ModeCase forNumber(int value) { + switch (value) { + case 1: return READ_WRITE; + case 2: return READ_ONLY; + case 0: return MODE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public ModeCase + getModeCase() { + return ModeCase.forNumber( + modeCase_); + } + + public static final int READ_WRITE_FIELD_NUMBER = 1; + /** + * 
+   * The transaction should allow both reads and writes.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public boolean hasReadWrite() { + return modeCase_ == 1; + } + /** + * 
+   * The transaction should allow both reads and writes.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() { + if (modeCase_ == 1) { + return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); + } + /** + * 
+   * The transaction should allow both reads and writes.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() { + if (modeCase_ == 1) { + return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); + } + + public static final int READ_ONLY_FIELD_NUMBER = 2; + /** + * 
+   * The transaction should only allow reads.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public boolean hasReadOnly() { + return modeCase_ == 2; + } + /** + * 
+   * The transaction should only allow reads.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() { + if (modeCase_ == 2) { + return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); + } + /** + * 
+   * The transaction should only allow reads.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() { + if (modeCase_ == 2) { + return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (modeCase_ == 1) { + output.writeMessage(1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_); + } + if (modeCase_ == 2) { + output.writeMessage(2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (modeCase_ == 1) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_); + } + if (modeCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.TransactionOptions)) { + return super.equals(obj); + } + com.google.datastore.v1.TransactionOptions other = (com.google.datastore.v1.TransactionOptions) obj; + + boolean result = true; + result = result && getModeCase().equals( + other.getModeCase()); + if (!result) return false; + switch (modeCase_) { + case 1: + result = result && getReadWrite() + .equals(other.getReadWrite()); + break; + case 2: + result = result && getReadOnly() + .equals(other.getReadOnly()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + switch (modeCase_) { + case 1: + hash = (37 * hash) + READ_WRITE_FIELD_NUMBER; + hash = (53 * hash) + getReadWrite().hashCode(); + break; + case 2: + hash = (37 * hash) + READ_ONLY_FIELD_NUMBER; + hash = (53 * hash) + getReadOnly().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.TransactionOptions parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.TransactionOptions parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.TransactionOptions parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.TransactionOptions parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.TransactionOptions prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * 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
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+   *
+ * + * Protobuf type {@code google.datastore.v1.TransactionOptions} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions) + com.google.datastore.v1.TransactionOptionsOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.TransactionOptions.class, com.google.datastore.v1.TransactionOptions.Builder.class); + } + + // Construct using com.google.datastore.v1.TransactionOptions.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + modeCase_ = 0; + mode_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; + } + + public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { + return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); + } + + public com.google.datastore.v1.TransactionOptions build() { + com.google.datastore.v1.TransactionOptions result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.TransactionOptions buildPartial() { + com.google.datastore.v1.TransactionOptions result = new com.google.datastore.v1.TransactionOptions(this); + if (modeCase_ == 1) { + if (readWriteBuilder_ == null) { + result.mode_ = mode_; + } else { + result.mode_ = readWriteBuilder_.build(); + } + } + if (modeCase_ == 2) { + if (readOnlyBuilder_ == null) { + result.mode_ = mode_; + } else { + result.mode_ = readOnlyBuilder_.build(); + } + } + result.modeCase_ = modeCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.TransactionOptions) { + return mergeFrom((com.google.datastore.v1.TransactionOptions)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) { + if (other == com.google.datastore.v1.TransactionOptions.getDefaultInstance()) return this; + switch (other.getModeCase()) { + case READ_WRITE: { + mergeReadWrite(other.getReadWrite()); + break; + } + case READ_ONLY: { + mergeReadOnly(other.getReadOnly()); + break; + } + case MODE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.TransactionOptions parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.TransactionOptions) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int modeCase_ = 0; + private java.lang.Object mode_; + public ModeCase + getModeCase() { + return ModeCase.forNumber( + modeCase_); + } + + public Builder clearMode() { + modeCase_ = 0; + mode_ = null; + onChanged(); + return this; + } + + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder> readWriteBuilder_; + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public boolean hasReadWrite() { + return modeCase_ == 1; + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() { + if (readWriteBuilder_ == null) { + if (modeCase_ == 1) { + return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); + } else { + if (modeCase_ == 1) { + return readWriteBuilder_.getMessage(); + } + return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); + } + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public Builder setReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite value) { + if (readWriteBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + mode_ = value; + onChanged(); + } else { + readWriteBuilder_.setMessage(value); + } + modeCase_ = 1; + return this; + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public Builder setReadWrite( + com.google.datastore.v1.TransactionOptions.ReadWrite.Builder builderForValue) { + if (readWriteBuilder_ == null) { + mode_ = builderForValue.build(); + onChanged(); + } else { + readWriteBuilder_.setMessage(builderForValue.build()); + } + modeCase_ = 1; + return this; + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite value) { + if (readWriteBuilder_ == null) { + if (modeCase_ == 1 && + mode_ != com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) { + mode_ = com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_) + .mergeFrom(value).buildPartial(); + } else { + mode_ = value; + } + onChanged(); + } else { + if (modeCase_ == 1) { + readWriteBuilder_.mergeFrom(value); + } + readWriteBuilder_.setMessage(value); + } + modeCase_ = 1; + return this; + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public Builder clearReadWrite() { + if (readWriteBuilder_ == null) { + if (modeCase_ == 1) { + modeCase_ = 0; + mode_ = null; + onChanged(); + } + } else { + if (modeCase_ == 1) { + modeCase_ = 0; + mode_ = null; + } + readWriteBuilder_.clear(); + } + return this; + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public com.google.datastore.v1.TransactionOptions.ReadWrite.Builder getReadWriteBuilder() { + return getReadWriteFieldBuilder().getBuilder(); + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() { + if ((modeCase_ == 1) && (readWriteBuilder_ != null)) { + return readWriteBuilder_.getMessageOrBuilder(); + } else { + if (modeCase_ == 1) { + return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); + } + } + /** + * 
+     * The transaction should allow both reads and writes.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder> + getReadWriteFieldBuilder() { + if (readWriteBuilder_ == null) { + if (!(modeCase_ == 1)) { + mode_ = com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); + } + readWriteBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>( + (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_, + getParentForChildren(), + isClean()); + mode_ = null; + } + modeCase_ = 1; + onChanged();; + return readWriteBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder> readOnlyBuilder_; + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public boolean hasReadOnly() { + return modeCase_ == 2; + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() { + if (readOnlyBuilder_ == null) { + if (modeCase_ == 2) { + return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); + } else { + if (modeCase_ == 2) { + return readOnlyBuilder_.getMessage(); + } + return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); + } + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public Builder setReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly value) { + if (readOnlyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + mode_ = value; + onChanged(); + } else { + readOnlyBuilder_.setMessage(value); + } + modeCase_ = 2; + return this; + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public Builder setReadOnly( + com.google.datastore.v1.TransactionOptions.ReadOnly.Builder builderForValue) { + if (readOnlyBuilder_ == null) { + mode_ = builderForValue.build(); + onChanged(); + } else { + readOnlyBuilder_.setMessage(builderForValue.build()); + } + modeCase_ = 2; + return this; + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly value) { + if (readOnlyBuilder_ == null) { + if (modeCase_ == 2 && + mode_ != com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) { + mode_ = com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_) + .mergeFrom(value).buildPartial(); + } else { + mode_ = value; + } + onChanged(); + } else { + if (modeCase_ == 2) { + readOnlyBuilder_.mergeFrom(value); + } + readOnlyBuilder_.setMessage(value); + } + modeCase_ = 2; + return this; + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public Builder clearReadOnly() { + if (readOnlyBuilder_ == null) { + if (modeCase_ == 2) { + modeCase_ = 0; + mode_ = null; + onChanged(); + } + } else { + if (modeCase_ == 2) { + modeCase_ = 0; + mode_ = null; + } + readOnlyBuilder_.clear(); + } + return this; + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public com.google.datastore.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBuilder() { + return getReadOnlyFieldBuilder().getBuilder(); + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() { + if ((modeCase_ == 2) && (readOnlyBuilder_ != null)) { + return readOnlyBuilder_.getMessageOrBuilder(); + } else { + if (modeCase_ == 2) { + return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_; + } + return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); + } + } + /** + * 
+     * The transaction should only allow reads.
+     *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder> + getReadOnlyFieldBuilder() { + if (readOnlyBuilder_ == null) { + if (!(modeCase_ == 2)) { + mode_ = com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); + } + readOnlyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>( + (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_, + getParentForChildren(), + isClean()); + mode_ = null; + } + modeCase_ = 2; + onChanged();; + return readOnlyBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions) + private static final com.google.datastore.v1.TransactionOptions DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions(); + } + + public static com.google.datastore.v1.TransactionOptions getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public TransactionOptions parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TransactionOptions(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..031fc620ccc1 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java @@ -0,0 +1,61 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface TransactionOptionsOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * The transaction should allow both reads and writes.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + boolean hasReadWrite(); + /** + * 
+   * The transaction should allow both reads and writes.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite(); + /** + * 
+   * The transaction should allow both reads and writes.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1; + */ + com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder(); + + /** + * 
+   * The transaction should only allow reads.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + boolean hasReadOnly(); + /** + * 
+   * The transaction should only allow reads.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly(); + /** + * 
+   * The transaction should only allow reads.
+   *
+ * + * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2; + */ + com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder(); + + public 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 new file mode 100644 index 000000000000..6070573eb5eb --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java @@ -0,0 +1,2677 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +/** + * 
+ * A message that can hold any of the supported value types and associated
+ * metadata.
+ *
+ * + * Protobuf type {@code google.datastore.v1.Value} + */ +public final class Value extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.Value) + ValueOrBuilder { +private static final long serialVersionUID = 0L; + // Use Value.newBuilder() to construct. + private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Value() { + meaning_ = 0; + excludeFromIndexes_ = false; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Value( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + valueTypeCase_ = 1; + valueType_ = input.readBool(); + break; + } + case 16: { + valueTypeCase_ = 2; + valueType_ = input.readInt64(); + break; + } + case 25: { + valueTypeCase_ = 3; + valueType_ = input.readDouble(); + break; + } + case 42: { + com.google.datastore.v1.Key.Builder subBuilder = null; + if (valueTypeCase_ == 5) { + subBuilder = ((com.google.datastore.v1.Key) valueType_).toBuilder(); + } + valueType_ = + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Key) valueType_); + valueType_ = subBuilder.buildPartial(); + } + valueTypeCase_ = 5; + break; + } + case 50: { + com.google.datastore.v1.Entity.Builder subBuilder = null; + if (valueTypeCase_ == 6) { + subBuilder = ((com.google.datastore.v1.Entity) valueType_).toBuilder(); + } + valueType_ = + input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.Entity) valueType_); + valueType_ = subBuilder.buildPartial(); + } + valueTypeCase_ = 6; + break; + } + case 66: { + com.google.type.LatLng.Builder subBuilder = null; + if (valueTypeCase_ == 8) { + subBuilder = ((com.google.type.LatLng) valueType_).toBuilder(); + } + valueType_ = + input.readMessage(com.google.type.LatLng.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.type.LatLng) valueType_); + valueType_ = subBuilder.buildPartial(); + } + valueTypeCase_ = 8; + break; + } + case 74: { + com.google.datastore.v1.ArrayValue.Builder subBuilder = null; + if (valueTypeCase_ == 9) { + subBuilder = ((com.google.datastore.v1.ArrayValue) valueType_).toBuilder(); + } + valueType_ = + input.readMessage(com.google.datastore.v1.ArrayValue.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.datastore.v1.ArrayValue) valueType_); + valueType_ = subBuilder.buildPartial(); + } + valueTypeCase_ = 9; + break; + } + case 82: { + com.google.protobuf.Timestamp.Builder subBuilder = null; + if (valueTypeCase_ == 10) { + subBuilder = ((com.google.protobuf.Timestamp) valueType_).toBuilder(); + } + valueType_ = + input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.protobuf.Timestamp) valueType_); + valueType_ = subBuilder.buildPartial(); + } + valueTypeCase_ = 10; + break; + } + case 88: { + int rawValue = input.readEnum(); + valueTypeCase_ = 11; + valueType_ = rawValue; + break; + } + case 112: { + + meaning_ = input.readInt32(); + break; + } + case 138: { + java.lang.String s = input.readStringRequireUtf8(); + valueTypeCase_ = 17; + valueType_ = s; + break; + } + case 146: { + valueTypeCase_ = 18; + valueType_ = input.readBytes(); + break; + } + case 152: { + + excludeFromIndexes_ = input.readBool(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Value.class, com.google.datastore.v1.Value.Builder.class); + } + + private int valueTypeCase_ = 0; + private java.lang.Object valueType_; + public enum ValueTypeCase + implements com.google.protobuf.Internal.EnumLite { + NULL_VALUE(11), + BOOLEAN_VALUE(1), + INTEGER_VALUE(2), + DOUBLE_VALUE(3), + TIMESTAMP_VALUE(10), + KEY_VALUE(5), + STRING_VALUE(17), + BLOB_VALUE(18), + GEO_POINT_VALUE(8), + ENTITY_VALUE(6), + ARRAY_VALUE(9), + VALUETYPE_NOT_SET(0); + private final int value; + private ValueTypeCase(int value) { + this.value = value; + } + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ValueTypeCase valueOf(int value) { + return forNumber(value); + } + + public static ValueTypeCase forNumber(int value) { + switch (value) { + case 11: return NULL_VALUE; + case 1: return BOOLEAN_VALUE; + case 2: return INTEGER_VALUE; + case 3: return DOUBLE_VALUE; + case 10: return TIMESTAMP_VALUE; + case 5: return KEY_VALUE; + case 17: return STRING_VALUE; + case 18: return BLOB_VALUE; + case 8: return GEO_POINT_VALUE; + case 6: return ENTITY_VALUE; + case 9: return ARRAY_VALUE; + case 0: return VALUETYPE_NOT_SET; + default: return null; + } + } + public int getNumber() { + return this.value; + } + }; + + public ValueTypeCase + getValueTypeCase() { + return ValueTypeCase.forNumber( + valueTypeCase_); + } + + public static final int NULL_VALUE_FIELD_NUMBER = 11; + /** + * 
+   * A null value.
+   *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + public int getNullValueValue() { + if (valueTypeCase_ == 11) { + return (java.lang.Integer) valueType_; + } + return 0; + } + /** + * 
+   * A null value.
+   *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + public com.google.protobuf.NullValue getNullValue() { + if (valueTypeCase_ == 11) { + com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( + (java.lang.Integer) valueType_); + return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; + } + return com.google.protobuf.NullValue.NULL_VALUE; + } + + public static final int BOOLEAN_VALUE_FIELD_NUMBER = 1; + /** + * 
+   * A boolean value.
+   *
+ * + * bool boolean_value = 1; + */ + public boolean getBooleanValue() { + if (valueTypeCase_ == 1) { + return (java.lang.Boolean) valueType_; + } + return false; + } + + public static final int INTEGER_VALUE_FIELD_NUMBER = 2; + /** + * 
+   * An integer value.
+   *
+ * + * int64 integer_value = 2; + */ + public long getIntegerValue() { + if (valueTypeCase_ == 2) { + return (java.lang.Long) valueType_; + } + return 0L; + } + + public static final int DOUBLE_VALUE_FIELD_NUMBER = 3; + /** + * 
+   * A double value.
+   *
+ * + * double double_value = 3; + */ + public double getDoubleValue() { + if (valueTypeCase_ == 3) { + return (java.lang.Double) valueType_; + } + return 0D; + } + + public static final int TIMESTAMP_VALUE_FIELD_NUMBER = 10; + /** + * 
+   * A timestamp value.
+   * When stored in the Datastore, precise only to microseconds;
+   * any additional precision is rounded down.
+   *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public boolean hasTimestampValue() { + return valueTypeCase_ == 10; + } + /** + * 
+   * A timestamp value.
+   * When stored in the Datastore, precise only to microseconds;
+   * any additional precision is rounded down.
+   *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public com.google.protobuf.Timestamp getTimestampValue() { + if (valueTypeCase_ == 10) { + return (com.google.protobuf.Timestamp) valueType_; + } + return com.google.protobuf.Timestamp.getDefaultInstance(); + } + /** + * 
+   * A timestamp value.
+   * When stored in the Datastore, precise only to microseconds;
+   * any additional precision is rounded down.
+   *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() { + if (valueTypeCase_ == 10) { + return (com.google.protobuf.Timestamp) valueType_; + } + return com.google.protobuf.Timestamp.getDefaultInstance(); + } + + public static final int KEY_VALUE_FIELD_NUMBER = 5; + /** + * 
+   * A key value.
+   *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public boolean hasKeyValue() { + return valueTypeCase_ == 5; + } + /** + * 
+   * A key value.
+   *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public com.google.datastore.v1.Key getKeyValue() { + if (valueTypeCase_ == 5) { + return (com.google.datastore.v1.Key) valueType_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + /** + * 
+   * A key value.
+   *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() { + if (valueTypeCase_ == 5) { + return (com.google.datastore.v1.Key) valueType_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + + public static final int STRING_VALUE_FIELD_NUMBER = 17; + /** + * 
+   * A UTF-8 encoded string value.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
+   *
+ * + * string string_value = 17; + */ + public java.lang.String getStringValue() { + java.lang.Object ref = ""; + if (valueTypeCase_ == 17) { + ref = valueType_; + } + 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(); + if (valueTypeCase_ == 17) { + valueType_ = s; + } + return s; + } + } + /** + * 
+   * A UTF-8 encoded string value.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
+   *
+ * + * string string_value = 17; + */ + public com.google.protobuf.ByteString + getStringValueBytes() { + java.lang.Object ref = ""; + if (valueTypeCase_ == 17) { + ref = valueType_; + } + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (valueTypeCase_ == 17) { + valueType_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int BLOB_VALUE_FIELD_NUMBER = 18; + /** + * 
+   * A blob value.
+   * May have at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+   * In JSON requests, must be base64-encoded.
+   *
+ * + * bytes blob_value = 18; + */ + public com.google.protobuf.ByteString getBlobValue() { + if (valueTypeCase_ == 18) { + return (com.google.protobuf.ByteString) valueType_; + } + return com.google.protobuf.ByteString.EMPTY; + } + + public static final int GEO_POINT_VALUE_FIELD_NUMBER = 8; + /** + * 
+   * A geo point value representing a point on the surface of Earth.
+   *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public boolean hasGeoPointValue() { + return valueTypeCase_ == 8; + } + /** + * 
+   * A geo point value representing a point on the surface of Earth.
+   *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public com.google.type.LatLng getGeoPointValue() { + if (valueTypeCase_ == 8) { + return (com.google.type.LatLng) valueType_; + } + return com.google.type.LatLng.getDefaultInstance(); + } + /** + * 
+   * A geo point value representing a point on the surface of Earth.
+   *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() { + if (valueTypeCase_ == 8) { + return (com.google.type.LatLng) valueType_; + } + return com.google.type.LatLng.getDefaultInstance(); + } + + public static final int ENTITY_VALUE_FIELD_NUMBER = 6; + /** + * 
+   * An entity value.
+   * - May have no key.
+   * - May have a key with an incomplete key path.
+   * - May have a reserved/read-only key.
+   *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public boolean hasEntityValue() { + return valueTypeCase_ == 6; + } + /** + * 
+   * An entity value.
+   * - May have no key.
+   * - May have a key with an incomplete key path.
+   * - May have a reserved/read-only key.
+   *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public com.google.datastore.v1.Entity getEntityValue() { + if (valueTypeCase_ == 6) { + return (com.google.datastore.v1.Entity) valueType_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + /** + * 
+   * An entity value.
+   * - May have no key.
+   * - May have a key with an incomplete key path.
+   * - May have a reserved/read-only key.
+   *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() { + if (valueTypeCase_ == 6) { + return (com.google.datastore.v1.Entity) valueType_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + + public static final int ARRAY_VALUE_FIELD_NUMBER = 9; + /** + * 
+   * An array value.
+   * Cannot contain another array value.
+   * A `Value` instance that sets field `array_value` must not set fields
+   * `meaning` or `exclude_from_indexes`.
+   *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public boolean hasArrayValue() { + return valueTypeCase_ == 9; + } + /** + * 
+   * An array value.
+   * Cannot contain another array value.
+   * A `Value` instance that sets field `array_value` must not set fields
+   * `meaning` or `exclude_from_indexes`.
+   *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public com.google.datastore.v1.ArrayValue getArrayValue() { + if (valueTypeCase_ == 9) { + return (com.google.datastore.v1.ArrayValue) valueType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + /** + * 
+   * An array value.
+   * Cannot contain another array value.
+   * A `Value` instance that sets field `array_value` must not set fields
+   * `meaning` or `exclude_from_indexes`.
+   *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() { + if (valueTypeCase_ == 9) { + return (com.google.datastore.v1.ArrayValue) valueType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + + public static final int MEANING_FIELD_NUMBER = 14; + private int meaning_; + /** + * 
+   * The `meaning` field should only be populated for backwards compatibility.
+   *
+ * + * int32 meaning = 14; + */ + public int getMeaning() { + return meaning_; + } + + public static final int EXCLUDE_FROM_INDEXES_FIELD_NUMBER = 19; + private boolean excludeFromIndexes_; + /** + * 
+   * If the value should be excluded from all indexes including those defined
+   * explicitly.
+   *
+ * + * bool exclude_from_indexes = 19; + */ + public boolean getExcludeFromIndexes() { + return excludeFromIndexes_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (valueTypeCase_ == 1) { + output.writeBool( + 1, (boolean)((java.lang.Boolean) valueType_)); + } + if (valueTypeCase_ == 2) { + output.writeInt64( + 2, (long)((java.lang.Long) valueType_)); + } + if (valueTypeCase_ == 3) { + output.writeDouble( + 3, (double)((java.lang.Double) valueType_)); + } + if (valueTypeCase_ == 5) { + output.writeMessage(5, (com.google.datastore.v1.Key) valueType_); + } + if (valueTypeCase_ == 6) { + output.writeMessage(6, (com.google.datastore.v1.Entity) valueType_); + } + if (valueTypeCase_ == 8) { + output.writeMessage(8, (com.google.type.LatLng) valueType_); + } + if (valueTypeCase_ == 9) { + output.writeMessage(9, (com.google.datastore.v1.ArrayValue) valueType_); + } + if (valueTypeCase_ == 10) { + output.writeMessage(10, (com.google.protobuf.Timestamp) valueType_); + } + if (valueTypeCase_ == 11) { + output.writeEnum(11, ((java.lang.Integer) valueType_)); + } + if (meaning_ != 0) { + output.writeInt32(14, meaning_); + } + if (valueTypeCase_ == 17) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 17, valueType_); + } + if (valueTypeCase_ == 18) { + output.writeBytes( + 18, (com.google.protobuf.ByteString) valueType_); + } + if (excludeFromIndexes_ != false) { + output.writeBool(19, excludeFromIndexes_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (valueTypeCase_ == 1) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize( + 1, (boolean)((java.lang.Boolean) valueType_)); + } + if (valueTypeCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size( + 2, (long)((java.lang.Long) valueType_)); + } + if (valueTypeCase_ == 3) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize( + 3, (double)((java.lang.Double) valueType_)); + } + if (valueTypeCase_ == 5) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, (com.google.datastore.v1.Key) valueType_); + } + if (valueTypeCase_ == 6) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, (com.google.datastore.v1.Entity) valueType_); + } + if (valueTypeCase_ == 8) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, (com.google.type.LatLng) valueType_); + } + if (valueTypeCase_ == 9) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(9, (com.google.datastore.v1.ArrayValue) valueType_); + } + if (valueTypeCase_ == 10) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, (com.google.protobuf.Timestamp) valueType_); + } + if (valueTypeCase_ == 11) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(11, ((java.lang.Integer) valueType_)); + } + if (meaning_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(14, meaning_); + } + if (valueTypeCase_ == 17) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, valueType_); + } + if (valueTypeCase_ == 18) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize( + 18, (com.google.protobuf.ByteString) valueType_); + } + if (excludeFromIndexes_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(19, excludeFromIndexes_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.Value)) { + return super.equals(obj); + } + com.google.datastore.v1.Value other = (com.google.datastore.v1.Value) obj; + + boolean result = true; + result = result && (getMeaning() + == other.getMeaning()); + result = result && (getExcludeFromIndexes() + == other.getExcludeFromIndexes()); + result = result && getValueTypeCase().equals( + other.getValueTypeCase()); + if (!result) return false; + switch (valueTypeCase_) { + case 11: + result = result && getNullValueValue() + == other.getNullValueValue(); + break; + case 1: + result = result && (getBooleanValue() + == other.getBooleanValue()); + break; + case 2: + result = result && (getIntegerValue() + == other.getIntegerValue()); + break; + case 3: + result = result && ( + java.lang.Double.doubleToLongBits(getDoubleValue()) + == java.lang.Double.doubleToLongBits( + other.getDoubleValue())); + break; + case 10: + result = result && getTimestampValue() + .equals(other.getTimestampValue()); + break; + case 5: + result = result && getKeyValue() + .equals(other.getKeyValue()); + break; + case 17: + result = result && getStringValue() + .equals(other.getStringValue()); + break; + case 18: + result = result && getBlobValue() + .equals(other.getBlobValue()); + break; + case 8: + result = result && getGeoPointValue() + .equals(other.getGeoPointValue()); + break; + case 6: + result = result && getEntityValue() + .equals(other.getEntityValue()); + break; + case 9: + result = result && getArrayValue() + .equals(other.getArrayValue()); + break; + case 0: + default: + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MEANING_FIELD_NUMBER; + hash = (53 * hash) + getMeaning(); + hash = (37 * hash) + EXCLUDE_FROM_INDEXES_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getExcludeFromIndexes()); + switch (valueTypeCase_) { + case 11: + hash = (37 * hash) + NULL_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getNullValueValue(); + break; + case 1: + hash = (37 * hash) + BOOLEAN_VALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getBooleanValue()); + break; + case 2: + hash = (37 * hash) + INTEGER_VALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getIntegerValue()); + break; + case 3: + hash = (37 * hash) + DOUBLE_VALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getDoubleValue())); + break; + case 10: + hash = (37 * hash) + TIMESTAMP_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getTimestampValue().hashCode(); + break; + case 5: + hash = (37 * hash) + KEY_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getKeyValue().hashCode(); + break; + case 17: + hash = (37 * hash) + STRING_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringValue().hashCode(); + break; + case 18: + hash = (37 * hash) + BLOB_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getBlobValue().hashCode(); + break; + case 8: + hash = (37 * hash) + GEO_POINT_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getGeoPointValue().hashCode(); + break; + case 6: + hash = (37 * hash) + ENTITY_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getEntityValue().hashCode(); + break; + case 9: + hash = (37 * hash) + ARRAY_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getArrayValue().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.Value parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Value parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Value parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Value parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Value parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.google.datastore.v1.Value parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.google.datastore.v1.Value parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Value parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Value parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Value parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.google.datastore.v1.Value parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.google.datastore.v1.Value parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.google.datastore.v1.Value prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * A message that can hold any of the supported value types and associated
+   * metadata.
+   *
+ * + * Protobuf type {@code google.datastore.v1.Value} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.Value) + com.google.datastore.v1.ValueOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.Value.class, com.google.datastore.v1.Value.Builder.class); + } + + // Construct using com.google.datastore.v1.Value.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + meaning_ = 0; + + excludeFromIndexes_ = false; + + valueTypeCase_ = 0; + valueType_ = null; + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; + } + + public com.google.datastore.v1.Value getDefaultInstanceForType() { + return com.google.datastore.v1.Value.getDefaultInstance(); + } + + public com.google.datastore.v1.Value build() { + com.google.datastore.v1.Value result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.google.datastore.v1.Value buildPartial() { + com.google.datastore.v1.Value result = new com.google.datastore.v1.Value(this); + if (valueTypeCase_ == 11) { + result.valueType_ = valueType_; + } + if (valueTypeCase_ == 1) { + result.valueType_ = valueType_; + } + if (valueTypeCase_ == 2) { + result.valueType_ = valueType_; + } + if (valueTypeCase_ == 3) { + result.valueType_ = valueType_; + } + if (valueTypeCase_ == 10) { + if (timestampValueBuilder_ == null) { + result.valueType_ = valueType_; + } else { + result.valueType_ = timestampValueBuilder_.build(); + } + } + if (valueTypeCase_ == 5) { + if (keyValueBuilder_ == null) { + result.valueType_ = valueType_; + } else { + result.valueType_ = keyValueBuilder_.build(); + } + } + if (valueTypeCase_ == 17) { + result.valueType_ = valueType_; + } + if (valueTypeCase_ == 18) { + result.valueType_ = valueType_; + } + if (valueTypeCase_ == 8) { + if (geoPointValueBuilder_ == null) { + result.valueType_ = valueType_; + } else { + result.valueType_ = geoPointValueBuilder_.build(); + } + } + if (valueTypeCase_ == 6) { + if (entityValueBuilder_ == null) { + result.valueType_ = valueType_; + } else { + result.valueType_ = entityValueBuilder_.build(); + } + } + if (valueTypeCase_ == 9) { + if (arrayValueBuilder_ == null) { + result.valueType_ = valueType_; + } else { + result.valueType_ = arrayValueBuilder_.build(); + } + } + result.meaning_ = meaning_; + result.excludeFromIndexes_ = excludeFromIndexes_; + result.valueTypeCase_ = valueTypeCase_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.Value) { + return mergeFrom((com.google.datastore.v1.Value)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.Value other) { + if (other == com.google.datastore.v1.Value.getDefaultInstance()) return this; + if (other.getMeaning() != 0) { + setMeaning(other.getMeaning()); + } + if (other.getExcludeFromIndexes() != false) { + setExcludeFromIndexes(other.getExcludeFromIndexes()); + } + switch (other.getValueTypeCase()) { + case NULL_VALUE: { + setNullValueValue(other.getNullValueValue()); + break; + } + case BOOLEAN_VALUE: { + setBooleanValue(other.getBooleanValue()); + break; + } + case INTEGER_VALUE: { + setIntegerValue(other.getIntegerValue()); + break; + } + case DOUBLE_VALUE: { + setDoubleValue(other.getDoubleValue()); + break; + } + case TIMESTAMP_VALUE: { + mergeTimestampValue(other.getTimestampValue()); + break; + } + case KEY_VALUE: { + mergeKeyValue(other.getKeyValue()); + break; + } + case STRING_VALUE: { + valueTypeCase_ = 17; + valueType_ = other.valueType_; + onChanged(); + break; + } + case BLOB_VALUE: { + setBlobValue(other.getBlobValue()); + break; + } + case GEO_POINT_VALUE: { + mergeGeoPointValue(other.getGeoPointValue()); + break; + } + case ENTITY_VALUE: { + mergeEntityValue(other.getEntityValue()); + break; + } + case ARRAY_VALUE: { + mergeArrayValue(other.getArrayValue()); + break; + } + case VALUETYPE_NOT_SET: { + break; + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.datastore.v1.Value parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.google.datastore.v1.Value) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int valueTypeCase_ = 0; + private java.lang.Object valueType_; + public ValueTypeCase + getValueTypeCase() { + return ValueTypeCase.forNumber( + valueTypeCase_); + } + + public Builder clearValueType() { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + return this; + } + + + /** + * 
+     * A null value.
+     *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + public int getNullValueValue() { + if (valueTypeCase_ == 11) { + return ((java.lang.Integer) valueType_).intValue(); + } + return 0; + } + /** + * 
+     * A null value.
+     *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + public Builder setNullValueValue(int value) { + valueTypeCase_ = 11; + valueType_ = value; + onChanged(); + return this; + } + /** + * 
+     * A null value.
+     *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + public com.google.protobuf.NullValue getNullValue() { + if (valueTypeCase_ == 11) { + com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( + (java.lang.Integer) valueType_); + return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; + } + return com.google.protobuf.NullValue.NULL_VALUE; + } + /** + * 
+     * A null value.
+     *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + public Builder setNullValue(com.google.protobuf.NullValue value) { + if (value == null) { + throw new NullPointerException(); + } + valueTypeCase_ = 11; + valueType_ = value.getNumber(); + onChanged(); + return this; + } + /** + * 
+     * A null value.
+     *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + public Builder clearNullValue() { + if (valueTypeCase_ == 11) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + return this; + } + + /** + * 
+     * A boolean value.
+     *
+ * + * bool boolean_value = 1; + */ + public boolean getBooleanValue() { + if (valueTypeCase_ == 1) { + return (java.lang.Boolean) valueType_; + } + return false; + } + /** + * 
+     * A boolean value.
+     *
+ * + * bool boolean_value = 1; + */ + public Builder setBooleanValue(boolean value) { + valueTypeCase_ = 1; + valueType_ = value; + onChanged(); + return this; + } + /** + * 
+     * A boolean value.
+     *
+ * + * bool boolean_value = 1; + */ + public Builder clearBooleanValue() { + if (valueTypeCase_ == 1) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + return this; + } + + /** + * 
+     * An integer value.
+     *
+ * + * int64 integer_value = 2; + */ + public long getIntegerValue() { + if (valueTypeCase_ == 2) { + return (java.lang.Long) valueType_; + } + return 0L; + } + /** + * 
+     * An integer value.
+     *
+ * + * int64 integer_value = 2; + */ + public Builder setIntegerValue(long value) { + valueTypeCase_ = 2; + valueType_ = value; + onChanged(); + return this; + } + /** + * 
+     * An integer value.
+     *
+ * + * int64 integer_value = 2; + */ + public Builder clearIntegerValue() { + if (valueTypeCase_ == 2) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + return this; + } + + /** + * 
+     * A double value.
+     *
+ * + * double double_value = 3; + */ + public double getDoubleValue() { + if (valueTypeCase_ == 3) { + return (java.lang.Double) valueType_; + } + return 0D; + } + /** + * 
+     * A double value.
+     *
+ * + * double double_value = 3; + */ + public Builder setDoubleValue(double value) { + valueTypeCase_ = 3; + valueType_ = value; + onChanged(); + return this; + } + /** + * 
+     * A double value.
+     *
+ * + * double double_value = 3; + */ + public Builder clearDoubleValue() { + if (valueTypeCase_ == 3) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + return this; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> timestampValueBuilder_; + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public boolean hasTimestampValue() { + return valueTypeCase_ == 10; + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public com.google.protobuf.Timestamp getTimestampValue() { + if (timestampValueBuilder_ == null) { + if (valueTypeCase_ == 10) { + return (com.google.protobuf.Timestamp) valueType_; + } + return com.google.protobuf.Timestamp.getDefaultInstance(); + } else { + if (valueTypeCase_ == 10) { + return timestampValueBuilder_.getMessage(); + } + return com.google.protobuf.Timestamp.getDefaultInstance(); + } + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public Builder setTimestampValue(com.google.protobuf.Timestamp value) { + if (timestampValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + valueType_ = value; + onChanged(); + } else { + timestampValueBuilder_.setMessage(value); + } + valueTypeCase_ = 10; + return this; + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public Builder setTimestampValue( + com.google.protobuf.Timestamp.Builder builderForValue) { + if (timestampValueBuilder_ == null) { + valueType_ = builderForValue.build(); + onChanged(); + } else { + timestampValueBuilder_.setMessage(builderForValue.build()); + } + valueTypeCase_ = 10; + return this; + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) { + if (timestampValueBuilder_ == null) { + if (valueTypeCase_ == 10 && + valueType_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + valueType_ = com.google.protobuf.Timestamp.newBuilder((com.google.protobuf.Timestamp) valueType_) + .mergeFrom(value).buildPartial(); + } else { + valueType_ = value; + } + onChanged(); + } else { + if (valueTypeCase_ == 10) { + timestampValueBuilder_.mergeFrom(value); + } + timestampValueBuilder_.setMessage(value); + } + valueTypeCase_ = 10; + return this; + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public Builder clearTimestampValue() { + if (timestampValueBuilder_ == null) { + if (valueTypeCase_ == 10) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + } else { + if (valueTypeCase_ == 10) { + valueTypeCase_ = 0; + valueType_ = null; + } + timestampValueBuilder_.clear(); + } + return this; + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() { + return getTimestampValueFieldBuilder().getBuilder(); + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() { + if ((valueTypeCase_ == 10) && (timestampValueBuilder_ != null)) { + return timestampValueBuilder_.getMessageOrBuilder(); + } else { + if (valueTypeCase_ == 10) { + return (com.google.protobuf.Timestamp) valueType_; + } + return com.google.protobuf.Timestamp.getDefaultInstance(); + } + } + /** + * 
+     * A timestamp value.
+     * When stored in the Datastore, precise only to microseconds;
+     * any additional precision is rounded down.
+     *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> + getTimestampValueFieldBuilder() { + if (timestampValueBuilder_ == null) { + if (!(valueTypeCase_ == 10)) { + valueType_ = com.google.protobuf.Timestamp.getDefaultInstance(); + } + timestampValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>( + (com.google.protobuf.Timestamp) valueType_, + getParentForChildren(), + isClean()); + valueType_ = null; + } + valueTypeCase_ = 10; + onChanged();; + return timestampValueBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyValueBuilder_; + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public boolean hasKeyValue() { + return valueTypeCase_ == 5; + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public com.google.datastore.v1.Key getKeyValue() { + if (keyValueBuilder_ == null) { + if (valueTypeCase_ == 5) { + return (com.google.datastore.v1.Key) valueType_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } else { + if (valueTypeCase_ == 5) { + return keyValueBuilder_.getMessage(); + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public Builder setKeyValue(com.google.datastore.v1.Key value) { + if (keyValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + valueType_ = value; + onChanged(); + } else { + keyValueBuilder_.setMessage(value); + } + valueTypeCase_ = 5; + return this; + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public Builder setKeyValue( + com.google.datastore.v1.Key.Builder builderForValue) { + if (keyValueBuilder_ == null) { + valueType_ = builderForValue.build(); + onChanged(); + } else { + keyValueBuilder_.setMessage(builderForValue.build()); + } + valueTypeCase_ = 5; + return this; + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public Builder mergeKeyValue(com.google.datastore.v1.Key value) { + if (keyValueBuilder_ == null) { + if (valueTypeCase_ == 5 && + valueType_ != com.google.datastore.v1.Key.getDefaultInstance()) { + valueType_ = com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) valueType_) + .mergeFrom(value).buildPartial(); + } else { + valueType_ = value; + } + onChanged(); + } else { + if (valueTypeCase_ == 5) { + keyValueBuilder_.mergeFrom(value); + } + keyValueBuilder_.setMessage(value); + } + valueTypeCase_ = 5; + return this; + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public Builder clearKeyValue() { + if (keyValueBuilder_ == null) { + if (valueTypeCase_ == 5) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + } else { + if (valueTypeCase_ == 5) { + valueTypeCase_ = 0; + valueType_ = null; + } + keyValueBuilder_.clear(); + } + return this; + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public com.google.datastore.v1.Key.Builder getKeyValueBuilder() { + return getKeyValueFieldBuilder().getBuilder(); + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() { + if ((valueTypeCase_ == 5) && (keyValueBuilder_ != null)) { + return keyValueBuilder_.getMessageOrBuilder(); + } else { + if (valueTypeCase_ == 5) { + return (com.google.datastore.v1.Key) valueType_; + } + return com.google.datastore.v1.Key.getDefaultInstance(); + } + } + /** + * 
+     * A key value.
+     *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> + getKeyValueFieldBuilder() { + if (keyValueBuilder_ == null) { + if (!(valueTypeCase_ == 5)) { + valueType_ = com.google.datastore.v1.Key.getDefaultInstance(); + } + keyValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + (com.google.datastore.v1.Key) valueType_, + getParentForChildren(), + isClean()); + valueType_ = null; + } + valueTypeCase_ = 5; + onChanged();; + return keyValueBuilder_; + } + + /** + * 
+     * A UTF-8 encoded string value.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
+     *
+ * + * string string_value = 17; + */ + public java.lang.String getStringValue() { + java.lang.Object ref = ""; + if (valueTypeCase_ == 17) { + ref = valueType_; + } + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (valueTypeCase_ == 17) { + valueType_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * A UTF-8 encoded string value.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
+     *
+ * + * string string_value = 17; + */ + public com.google.protobuf.ByteString + getStringValueBytes() { + java.lang.Object ref = ""; + if (valueTypeCase_ == 17) { + ref = valueType_; + } + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (valueTypeCase_ == 17) { + valueType_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * A UTF-8 encoded string value.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
+     *
+ * + * string string_value = 17; + */ + public Builder setStringValue( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + valueTypeCase_ = 17; + valueType_ = value; + onChanged(); + return this; + } + /** + * 
+     * A UTF-8 encoded string value.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
+     *
+ * + * string string_value = 17; + */ + public Builder clearStringValue() { + if (valueTypeCase_ == 17) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + return this; + } + /** + * 
+     * A UTF-8 encoded string value.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
+     *
+ * + * string string_value = 17; + */ + public Builder setStringValueBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + valueTypeCase_ = 17; + valueType_ = value; + onChanged(); + return this; + } + + /** + * 
+     * A blob value.
+     * May have at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+     * In JSON requests, must be base64-encoded.
+     *
+ * + * bytes blob_value = 18; + */ + public com.google.protobuf.ByteString getBlobValue() { + if (valueTypeCase_ == 18) { + return (com.google.protobuf.ByteString) valueType_; + } + return com.google.protobuf.ByteString.EMPTY; + } + /** + * 
+     * A blob value.
+     * May have at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+     * In JSON requests, must be base64-encoded.
+     *
+ * + * bytes blob_value = 18; + */ + public Builder setBlobValue(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + valueTypeCase_ = 18; + valueType_ = value; + onChanged(); + return this; + } + /** + * 
+     * A blob value.
+     * May have at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+     * In JSON requests, must be base64-encoded.
+     *
+ * + * bytes blob_value = 18; + */ + public Builder clearBlobValue() { + if (valueTypeCase_ == 18) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + return this; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> geoPointValueBuilder_; + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public boolean hasGeoPointValue() { + return valueTypeCase_ == 8; + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public com.google.type.LatLng getGeoPointValue() { + if (geoPointValueBuilder_ == null) { + if (valueTypeCase_ == 8) { + return (com.google.type.LatLng) valueType_; + } + return com.google.type.LatLng.getDefaultInstance(); + } else { + if (valueTypeCase_ == 8) { + return geoPointValueBuilder_.getMessage(); + } + return com.google.type.LatLng.getDefaultInstance(); + } + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public Builder setGeoPointValue(com.google.type.LatLng value) { + if (geoPointValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + valueType_ = value; + onChanged(); + } else { + geoPointValueBuilder_.setMessage(value); + } + valueTypeCase_ = 8; + return this; + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public Builder setGeoPointValue( + com.google.type.LatLng.Builder builderForValue) { + if (geoPointValueBuilder_ == null) { + valueType_ = builderForValue.build(); + onChanged(); + } else { + geoPointValueBuilder_.setMessage(builderForValue.build()); + } + valueTypeCase_ = 8; + return this; + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public Builder mergeGeoPointValue(com.google.type.LatLng value) { + if (geoPointValueBuilder_ == null) { + if (valueTypeCase_ == 8 && + valueType_ != com.google.type.LatLng.getDefaultInstance()) { + valueType_ = com.google.type.LatLng.newBuilder((com.google.type.LatLng) valueType_) + .mergeFrom(value).buildPartial(); + } else { + valueType_ = value; + } + onChanged(); + } else { + if (valueTypeCase_ == 8) { + geoPointValueBuilder_.mergeFrom(value); + } + geoPointValueBuilder_.setMessage(value); + } + valueTypeCase_ = 8; + return this; + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public Builder clearGeoPointValue() { + if (geoPointValueBuilder_ == null) { + if (valueTypeCase_ == 8) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + } else { + if (valueTypeCase_ == 8) { + valueTypeCase_ = 0; + valueType_ = null; + } + geoPointValueBuilder_.clear(); + } + return this; + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public com.google.type.LatLng.Builder getGeoPointValueBuilder() { + return getGeoPointValueFieldBuilder().getBuilder(); + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() { + if ((valueTypeCase_ == 8) && (geoPointValueBuilder_ != null)) { + return geoPointValueBuilder_.getMessageOrBuilder(); + } else { + if (valueTypeCase_ == 8) { + return (com.google.type.LatLng) valueType_; + } + return com.google.type.LatLng.getDefaultInstance(); + } + } + /** + * 
+     * A geo point value representing a point on the surface of Earth.
+     *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> + getGeoPointValueFieldBuilder() { + if (geoPointValueBuilder_ == null) { + if (!(valueTypeCase_ == 8)) { + valueType_ = com.google.type.LatLng.getDefaultInstance(); + } + geoPointValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>( + (com.google.type.LatLng) valueType_, + getParentForChildren(), + isClean()); + valueType_ = null; + } + valueTypeCase_ = 8; + onChanged();; + return geoPointValueBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityValueBuilder_; + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public boolean hasEntityValue() { + return valueTypeCase_ == 6; + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public com.google.datastore.v1.Entity getEntityValue() { + if (entityValueBuilder_ == null) { + if (valueTypeCase_ == 6) { + return (com.google.datastore.v1.Entity) valueType_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } else { + if (valueTypeCase_ == 6) { + return entityValueBuilder_.getMessage(); + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public Builder setEntityValue(com.google.datastore.v1.Entity value) { + if (entityValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + valueType_ = value; + onChanged(); + } else { + entityValueBuilder_.setMessage(value); + } + valueTypeCase_ = 6; + return this; + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public Builder setEntityValue( + com.google.datastore.v1.Entity.Builder builderForValue) { + if (entityValueBuilder_ == null) { + valueType_ = builderForValue.build(); + onChanged(); + } else { + entityValueBuilder_.setMessage(builderForValue.build()); + } + valueTypeCase_ = 6; + return this; + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public Builder mergeEntityValue(com.google.datastore.v1.Entity value) { + if (entityValueBuilder_ == null) { + if (valueTypeCase_ == 6 && + valueType_ != com.google.datastore.v1.Entity.getDefaultInstance()) { + valueType_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) valueType_) + .mergeFrom(value).buildPartial(); + } else { + valueType_ = value; + } + onChanged(); + } else { + if (valueTypeCase_ == 6) { + entityValueBuilder_.mergeFrom(value); + } + entityValueBuilder_.setMessage(value); + } + valueTypeCase_ = 6; + return this; + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public Builder clearEntityValue() { + if (entityValueBuilder_ == null) { + if (valueTypeCase_ == 6) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + } else { + if (valueTypeCase_ == 6) { + valueTypeCase_ = 0; + valueType_ = null; + } + entityValueBuilder_.clear(); + } + return this; + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public com.google.datastore.v1.Entity.Builder getEntityValueBuilder() { + return getEntityValueFieldBuilder().getBuilder(); + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() { + if ((valueTypeCase_ == 6) && (entityValueBuilder_ != null)) { + return entityValueBuilder_.getMessageOrBuilder(); + } else { + if (valueTypeCase_ == 6) { + return (com.google.datastore.v1.Entity) valueType_; + } + return com.google.datastore.v1.Entity.getDefaultInstance(); + } + } + /** + * 
+     * An entity value.
+     * - May have no key.
+     * - May have a key with an incomplete key path.
+     * - May have a reserved/read-only key.
+     *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> + getEntityValueFieldBuilder() { + if (entityValueBuilder_ == null) { + if (!(valueTypeCase_ == 6)) { + valueType_ = com.google.datastore.v1.Entity.getDefaultInstance(); + } + entityValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>( + (com.google.datastore.v1.Entity) valueType_, + getParentForChildren(), + isClean()); + valueType_ = null; + } + valueTypeCase_ = 6; + onChanged();; + return entityValueBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> arrayValueBuilder_; + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public boolean hasArrayValue() { + return valueTypeCase_ == 9; + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public com.google.datastore.v1.ArrayValue getArrayValue() { + if (arrayValueBuilder_ == null) { + if (valueTypeCase_ == 9) { + return (com.google.datastore.v1.ArrayValue) valueType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } else { + if (valueTypeCase_ == 9) { + return arrayValueBuilder_.getMessage(); + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public Builder setArrayValue(com.google.datastore.v1.ArrayValue value) { + if (arrayValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + valueType_ = value; + onChanged(); + } else { + arrayValueBuilder_.setMessage(value); + } + valueTypeCase_ = 9; + return this; + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public Builder setArrayValue( + com.google.datastore.v1.ArrayValue.Builder builderForValue) { + if (arrayValueBuilder_ == null) { + valueType_ = builderForValue.build(); + onChanged(); + } else { + arrayValueBuilder_.setMessage(builderForValue.build()); + } + valueTypeCase_ = 9; + return this; + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) { + if (arrayValueBuilder_ == null) { + if (valueTypeCase_ == 9 && + valueType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) { + valueType_ = com.google.datastore.v1.ArrayValue.newBuilder((com.google.datastore.v1.ArrayValue) valueType_) + .mergeFrom(value).buildPartial(); + } else { + valueType_ = value; + } + onChanged(); + } else { + if (valueTypeCase_ == 9) { + arrayValueBuilder_.mergeFrom(value); + } + arrayValueBuilder_.setMessage(value); + } + valueTypeCase_ = 9; + return this; + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public Builder clearArrayValue() { + if (arrayValueBuilder_ == null) { + if (valueTypeCase_ == 9) { + valueTypeCase_ = 0; + valueType_ = null; + onChanged(); + } + } else { + if (valueTypeCase_ == 9) { + valueTypeCase_ = 0; + valueType_ = null; + } + arrayValueBuilder_.clear(); + } + return this; + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public com.google.datastore.v1.ArrayValue.Builder getArrayValueBuilder() { + return getArrayValueFieldBuilder().getBuilder(); + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() { + if ((valueTypeCase_ == 9) && (arrayValueBuilder_ != null)) { + return arrayValueBuilder_.getMessageOrBuilder(); + } else { + if (valueTypeCase_ == 9) { + return (com.google.datastore.v1.ArrayValue) valueType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + } + /** + * 
+     * An array value.
+     * Cannot contain another array value.
+     * A `Value` instance that sets field `array_value` must not set fields
+     * `meaning` or `exclude_from_indexes`.
+     *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> + getArrayValueFieldBuilder() { + if (arrayValueBuilder_ == null) { + if (!(valueTypeCase_ == 9)) { + valueType_ = com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + arrayValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder>( + (com.google.datastore.v1.ArrayValue) valueType_, + getParentForChildren(), + isClean()); + valueType_ = null; + } + valueTypeCase_ = 9; + onChanged();; + return arrayValueBuilder_; + } + + private int meaning_ ; + /** + * 
+     * The `meaning` field should only be populated for backwards compatibility.
+     *
+ * + * int32 meaning = 14; + */ + public int getMeaning() { + return meaning_; + } + /** + * 
+     * The `meaning` field should only be populated for backwards compatibility.
+     *
+ * + * int32 meaning = 14; + */ + public Builder setMeaning(int value) { + + meaning_ = value; + onChanged(); + return this; + } + /** + * 
+     * The `meaning` field should only be populated for backwards compatibility.
+     *
+ * + * int32 meaning = 14; + */ + public Builder clearMeaning() { + + meaning_ = 0; + onChanged(); + return this; + } + + private boolean excludeFromIndexes_ ; + /** + * 
+     * If the value should be excluded from all indexes including those defined
+     * explicitly.
+     *
+ * + * bool exclude_from_indexes = 19; + */ + public boolean getExcludeFromIndexes() { + return excludeFromIndexes_; + } + /** + * 
+     * If the value should be excluded from all indexes including those defined
+     * explicitly.
+     *
+ * + * bool exclude_from_indexes = 19; + */ + public Builder setExcludeFromIndexes(boolean value) { + + excludeFromIndexes_ = value; + onChanged(); + return this; + } + /** + * 
+     * If the value should be excluded from all indexes including those defined
+     * explicitly.
+     *
+ * + * bool exclude_from_indexes = 19; + */ + public Builder clearExcludeFromIndexes() { + + excludeFromIndexes_ = false; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.Value) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.Value) + private static final com.google.datastore.v1.Value DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.Value(); + } + + public static com.google.datastore.v1.Value getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Value parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Value(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.google.datastore.v1.Value getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + 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 new file mode 100644 index 000000000000..6915eae21f52 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java @@ -0,0 +1,257 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/entity.proto + +package com.google.datastore.v1; + +public interface ValueOrBuilder extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.Value) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * A null value.
+   *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + int getNullValueValue(); + /** + * 
+   * A null value.
+   *
+ * + * .google.protobuf.NullValue null_value = 11; + */ + com.google.protobuf.NullValue getNullValue(); + + /** + * 
+   * A boolean value.
+   *
+ * + * bool boolean_value = 1; + */ + boolean getBooleanValue(); + + /** + * 
+   * An integer value.
+   *
+ * + * int64 integer_value = 2; + */ + long getIntegerValue(); + + /** + * 
+   * A double value.
+   *
+ * + * double double_value = 3; + */ + double getDoubleValue(); + + /** + * 
+   * A timestamp value.
+   * When stored in the Datastore, precise only to microseconds;
+   * any additional precision is rounded down.
+   *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + boolean hasTimestampValue(); + /** + * 
+   * A timestamp value.
+   * When stored in the Datastore, precise only to microseconds;
+   * any additional precision is rounded down.
+   *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + com.google.protobuf.Timestamp getTimestampValue(); + /** + * 
+   * A timestamp value.
+   * When stored in the Datastore, precise only to microseconds;
+   * any additional precision is rounded down.
+   *
+ * + * .google.protobuf.Timestamp timestamp_value = 10; + */ + com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder(); + + /** + * 
+   * A key value.
+   *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + boolean hasKeyValue(); + /** + * 
+   * A key value.
+   *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + com.google.datastore.v1.Key getKeyValue(); + /** + * 
+   * A key value.
+   *
+ * + * .google.datastore.v1.Key key_value = 5; + */ + com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder(); + + /** + * 
+   * A UTF-8 encoded string value.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
+   *
+ * + * string string_value = 17; + */ + java.lang.String getStringValue(); + /** + * 
+   * A UTF-8 encoded string value.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
+   *
+ * + * string string_value = 17; + */ + com.google.protobuf.ByteString + getStringValueBytes(); + + /** + * 
+   * A blob value.
+   * May have at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+   * In JSON requests, must be base64-encoded.
+   *
+ * + * bytes blob_value = 18; + */ + com.google.protobuf.ByteString getBlobValue(); + + /** + * 
+   * A geo point value representing a point on the surface of Earth.
+   *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + boolean hasGeoPointValue(); + /** + * 
+   * A geo point value representing a point on the surface of Earth.
+   *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + com.google.type.LatLng getGeoPointValue(); + /** + * 
+   * A geo point value representing a point on the surface of Earth.
+   *
+ * + * .google.type.LatLng geo_point_value = 8; + */ + 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.
+   *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + 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.
+   *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + 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.
+   *
+ * + * .google.datastore.v1.Entity entity_value = 6; + */ + com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder(); + + /** + * 
+   * An array value.
+   * Cannot contain another array value.
+   * A `Value` instance that sets field `array_value` must not set fields
+   * `meaning` or `exclude_from_indexes`.
+   *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + boolean hasArrayValue(); + /** + * 
+   * An array value.
+   * Cannot contain another array value.
+   * A `Value` instance that sets field `array_value` must not set fields
+   * `meaning` or `exclude_from_indexes`.
+   *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + com.google.datastore.v1.ArrayValue getArrayValue(); + /** + * 
+   * An array value.
+   * Cannot contain another array value.
+   * A `Value` instance that sets field `array_value` must not set fields
+   * `meaning` or `exclude_from_indexes`.
+   *
+ * + * .google.datastore.v1.ArrayValue array_value = 9; + */ + com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder(); + + /** + * 
+   * The `meaning` field should only be populated for backwards compatibility.
+   *
+ * + * int32 meaning = 14; + */ + int getMeaning(); + + /** + * 
+   * If the value should be excluded from all indexes including those defined
+   * explicitly.
+   *
+ * + * bool exclude_from_indexes = 19; + */ + boolean getExcludeFromIndexes(); + + public com.google.datastore.v1.Value.ValueTypeCase getValueTypeCase(); +} 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 new file mode 100644 index 000000000000..2a29a58cec72 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto @@ -0,0 +1,395 @@ +// Copyright 2018 Google Inc. +// +// 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. + +syntax = "proto3"; + +package google.datastore.v1; + +import "google/api/annotations.proto"; +import "google/datastore/v1/entity.proto"; +import "google/datastore/v1/query.proto"; + +option csharp_namespace = "Google.Cloud.Datastore.V1"; +option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore"; +option java_multiple_files = true; +option java_outer_classname = "DatastoreProto"; +option java_package = "com.google.datastore.v1"; +option php_namespace = "Google\\Cloud\\Datastore\\V1"; + + +// Each RPC normalizes the partition IDs of the keys in its input entities, +// and always returns entities with keys with normalized partition IDs. +// This applies to all keys and entities, including those in values, except keys +// with both an empty path and an empty or unset partition ID. Normalization of +// input keys sets the project ID (if not already set) to the project ID from +// the request. +// +service Datastore { + // Looks up entities by key. + rpc Lookup(LookupRequest) returns (LookupResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:lookup" + body: "*" + }; + } + + // Queries for entities. + rpc RunQuery(RunQueryRequest) returns (RunQueryResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:runQuery" + body: "*" + }; + } + + // Begins a new transaction. + rpc BeginTransaction(BeginTransactionRequest) returns (BeginTransactionResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:beginTransaction" + body: "*" + }; + } + + // Commits a transaction, optionally creating, deleting or modifying some + // entities. + rpc Commit(CommitRequest) returns (CommitResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:commit" + body: "*" + }; + } + + // Rolls back a transaction. + rpc Rollback(RollbackRequest) returns (RollbackResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:rollback" + body: "*" + }; + } + + // Allocates IDs for the given keys, which is useful for referencing an entity + // before it is inserted. + rpc AllocateIds(AllocateIdsRequest) returns (AllocateIdsResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:allocateIds" + body: "*" + }; + } + + // Prevents the supplied keys' IDs from being auto-allocated by Cloud + // Datastore. + rpc ReserveIds(ReserveIdsRequest) returns (ReserveIdsResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:reserveIds" + body: "*" + }; + } +} + +// The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup]. +message LookupRequest { + // The ID of the project against which to make the request. + string project_id = 8; + + // The options for this lookup request. + ReadOptions read_options = 1; + + // Keys of entities to look up. + repeated Key keys = 3; +} + +// The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup]. +message LookupResponse { + // Entities found as `ResultType.FULL` entities. The order of results in this + // field is undefined and has no relation to the order of the keys in the + // input. + repeated EntityResult found = 1; + + // Entities not found as `ResultType.KEY_ONLY` entities. The order of results + // in this field is undefined and has no relation to the order of the keys + // in the input. + repeated EntityResult missing = 2; + + // A list of keys that were not looked up due to resource constraints. The + // order of results in this field is undefined and has no relation to the + // order of the keys in the input. + repeated Key deferred = 3; +} + +// The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery]. +message RunQueryRequest { + // The ID of the project against which to make the request. + string project_id = 8; + + // 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 + // partition ID. + PartitionId partition_id = 2; + + // The options for this query. + ReadOptions read_options = 1; + + // The type of query. + oneof query_type { + // The query to run. + Query query = 3; + + // The GQL query to run. + GqlQuery gql_query = 7; + } +} + +// The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery]. +message RunQueryResponse { + // A batch of query results (always present). + QueryResultBatch batch = 1; + + // The parsed form of the `GqlQuery` from the request, if it was set. + Query query = 2; +} + +// The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. +message BeginTransactionRequest { + // The ID of the project against which to make the request. + string project_id = 8; + + // Options for a new transaction. + TransactionOptions transaction_options = 10; +} + +// The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. +message BeginTransactionResponse { + // The transaction identifier (always present). + bytes transaction = 1; +} + +// The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. +message RollbackRequest { + // The ID of the project against which to make the request. + string project_id = 8; + + // The transaction identifier, returned by a call to + // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. + bytes transaction = 1; +} + +// The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. +// (an empty message). +message RollbackResponse { + +} + +// The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit]. +message CommitRequest { + // The modes available for commits. + enum Mode { + // Unspecified. This value must not be used. + MODE_UNSPECIFIED = 0; + + // Transactional: The mutations are either all applied, or none are applied. + // Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions). + TRANSACTIONAL = 1; + + // Non-transactional: The mutations may not apply as all or none. + NON_TRANSACTIONAL = 2; + } + + // The ID of the project against which to make the request. + string project_id = 8; + + // The type of commit to perform. Defaults to `TRANSACTIONAL`. + Mode mode = 5; + + // Must be set when mode is `TRANSACTIONAL`. + oneof transaction_selector { + // The identifier of the transaction associated with the commit. A + // transaction identifier is returned by a call to + // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. + bytes transaction = 1; + } + + // 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. + repeated Mutation mutations = 6; +} + +// The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit]. +message CommitResponse { + // The result of performing the mutations. + // The i-th mutation result corresponds to the i-th mutation in the request. + repeated MutationResult mutation_results = 3; + + // The number of index entries updated during the commit, or zero if none were + // updated. + int32 index_updates = 4; +} + +// The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds]. +message AllocateIdsRequest { + // The ID of the project against which to make the request. + string project_id = 8; + + // A list of keys with incomplete key paths for which to allocate IDs. + // No key may be reserved/read-only. + repeated Key keys = 1; +} + +// The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds]. +message AllocateIdsResponse { + // The keys specified in the request (in the same order), each with + // its key path completed with a newly allocated ID. + repeated Key keys = 1; +} + +// The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds]. +message ReserveIdsRequest { + // The ID of the project against which to make the request. + string project_id = 8; + + // If not empty, the ID of the database against which to make the request. + string database_id = 9; + + // A list of keys with complete key paths whose numeric IDs should not be + // auto-allocated. + repeated Key keys = 1; +} + +// The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds]. +message ReserveIdsResponse { + +} + +// A mutation to apply to an entity. +message Mutation { + // The mutation operation. + // + // For `insert`, `update`, and `upsert`: + // - The entity's key must not be reserved/read-only. + // - No property in the entity may have a reserved name, + // not even a property in an entity in a value. + // - No value in the entity may have meaning 18, + // not even a value in an entity in another value. + oneof operation { + // The entity to insert. The entity must not already exist. + // The entity key's final path element may be incomplete. + Entity insert = 4; + + // The entity to update. The entity must already exist. + // Must have a complete key path. + Entity update = 5; + + // The entity to upsert. The entity may or may not already exist. + // The entity key's final path element may be incomplete. + Entity upsert = 6; + + // The key of the entity to delete. The entity may or may not already exist. + // Must have a complete key path and must not be reserved/read-only. + Key delete = 7; + } + + // When set, the server will detect whether or not this mutation conflicts + // with the current version of the entity on the server. Conflicting mutations + // are not applied, and are marked as such in MutationResult. + oneof conflict_detection_strategy { + // The version of the entity that this mutation is being applied to. If this + // does not match the current version on the server, the mutation conflicts. + int64 base_version = 8; + } +} + +// The result of applying a mutation. +message MutationResult { + // The automatically allocated key. + // Set only when the mutation allocated a key. + Key key = 3; + + // The version of the entity on the server after processing the mutation. If + // the mutation doesn't change anything on the server, then the version will + // be the version of the current entity or, if no entity is present, a version + // that is strictly greater than the version of any previous entity and less + // than the version of any possible future entity. + int64 version = 4; + + // Whether a conflict was detected for this mutation. Always false when a + // conflict detection strategy field is not set in the mutation. + bool conflict_detected = 5; +} + +// The options shared by read requests. +message ReadOptions { + // The possible values for read consistencies. + enum ReadConsistency { + // Unspecified. This value must not be used. + READ_CONSISTENCY_UNSPECIFIED = 0; + + // Strong consistency. + STRONG = 1; + + // Eventual consistency. + EVENTUAL = 2; + } + + // If not specified, lookups and ancestor queries default to + // `read_consistency`=`STRONG`, global queries default to + // `read_consistency`=`EVENTUAL`. + oneof consistency_type { + // The non-transactional read consistency to use. + // Cannot be set to `STRONG` for global queries. + ReadConsistency read_consistency = 1; + + // The identifier of the transaction in which to read. A + // transaction identifier is returned by a call to + // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. + bytes transaction = 2; + } +} + +// 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 +// [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests. +message TransactionOptions { + // Options specific to read / write transactions. + message ReadWrite { + // The transaction identifier of the transaction being retried. + bytes previous_transaction = 1; + } + + // Options specific to read-only transactions. + message ReadOnly { + + } + + // The `mode` of the transaction, indicating whether write operations are + // supported. + oneof mode { + // The transaction should allow both reads and writes. + ReadWrite read_write = 1; + + // The transaction should only allow reads. + ReadOnly read_only = 2; + } +} 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 new file mode 100644 index 000000000000..bab7953d62e2 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto @@ -0,0 +1,204 @@ +// Copyright 2018 Google Inc. +// +// 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. + +syntax = "proto3"; + +package google.datastore.v1; + +import "google/api/annotations.proto"; +import "google/protobuf/struct.proto"; +import "google/protobuf/timestamp.proto"; +import "google/type/latlng.proto"; + +option csharp_namespace = "Google.Cloud.Datastore.V1"; +option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore"; +option java_multiple_files = true; +option java_outer_classname = "EntityProto"; +option java_package = "com.google.datastore.v1"; +option php_namespace = "Google\\Cloud\\Datastore\\V1"; + + +// 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}` +// If the value of any dimension matches regex `__.*__`, the partition is +// 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 an active state. +message PartitionId { + // The ID of the project to which the entities belong. + string project_id = 2; + + // If not empty, the ID of the namespace to which the entities belong. + string namespace_id = 4; +} + +// A unique identifier for an entity. +// If a key's partition ID or any of its path kinds or names are +// reserved/read-only, the key is reserved/read-only. +// A reserved/read-only key is forbidden in certain documented contexts. +message Key { + // 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. + message PathElement { + // 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 `""`. + string kind = 1; + + // The type of ID. + oneof id_type { + // 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. + int64 id = 2; + + // 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 `""`. + string name = 3; + } + } + + // Entities are partitioned into subsets, currently identified by a project + // ID and namespace ID. + // Queries are scoped to a single partition. + PartitionId partition_id = 1; + + // The entity path. + // An entity path consists of one or more elements composed of a kind and a + // string or numerical identifier, which identify entities. The first + // element identifies a _root entity_, the second element identifies + // 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. + repeated PathElement path = 2; +} + +// An array value. +message ArrayValue { + // Values in the array. + // The order of this array may not be preserved if it contains a mix of + // indexed and unindexed values. + repeated Value values = 1; +} + +// A message that can hold any of the supported value types and associated +// metadata. +message Value { + // Must have a value set. + oneof value_type { + // A null value. + google.protobuf.NullValue null_value = 11; + + // A boolean value. + bool boolean_value = 1; + + // An integer value. + int64 integer_value = 2; + + // A double value. + double double_value = 3; + + // A timestamp value. + // When stored in the Datastore, precise only to microseconds; + // any additional precision is rounded down. + google.protobuf.Timestamp timestamp_value = 10; + + // A key value. + Key key_value = 5; + + // A UTF-8 encoded string value. + // When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes. + // Otherwise, may be set to at least 1,000,000 bytes. + string string_value = 17; + + // A blob value. + // May have at most 1,000,000 bytes. + // When `exclude_from_indexes` is false, may have at most 1500 bytes. + // In JSON requests, must be base64-encoded. + bytes blob_value = 18; + + // A geo point value representing a point on the surface of Earth. + google.type.LatLng geo_point_value = 8; + + // An entity value. + // + // - May have no key. + // - May have a key with an incomplete key path. + // - May have a reserved/read-only key. + Entity entity_value = 6; + + // An array value. + // Cannot contain another array value. + // A `Value` instance that sets field `array_value` must not set fields + // `meaning` or `exclude_from_indexes`. + ArrayValue array_value = 9; + } + + // The `meaning` field should only be populated for backwards compatibility. + int32 meaning = 14; + + // If the value should be excluded from all indexes including those defined + // explicitly. + bool exclude_from_indexes = 19; +} + +// A Datastore data object. +// +// An entity is limited to 1 megabyte when stored. That _roughly_ +// corresponds to a limit of 1 megabyte for the serialized form of this +// message. +message Entity { + // 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, + // or null if it has no key. + Key key = 1; + + // The entity's properties. + // The map's keys are property names. + // A property name matching regex `__.*__` is reserved. + // A reserved property name is forbidden in certain documented contexts. + // The name must not contain more than 500 characters. + // The name cannot be `""`. + map properties = 3; +} 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 new file mode 100644 index 000000000000..2efed915a74e --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto @@ -0,0 +1,310 @@ +// Copyright 2018 Google Inc. +// +// 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. + +syntax = "proto3"; + +package google.datastore.v1; + +import "google/api/annotations.proto"; +import "google/datastore/v1/entity.proto"; +import "google/protobuf/wrappers.proto"; +import "google/type/latlng.proto"; + +option csharp_namespace = "Google.Cloud.Datastore.V1"; +option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore"; +option java_multiple_files = true; +option java_outer_classname = "QueryProto"; +option java_package = "com.google.datastore.v1"; +option php_namespace = "Google\\Cloud\\Datastore\\V1"; + + +// The result of fetching an entity from Datastore. +message EntityResult { + // Specifies what data the 'entity' field contains. + // A `ResultType` is either implied (for example, in `LookupResponse.missing` + // from `datastore.proto`, it is always `KEY_ONLY`) or specified by context + // (for example, in message `QueryResultBatch`, field `entity_result_type` + // specifies a `ResultType` for all the values in field `entity_results`). + enum ResultType { + // Unspecified. This value is never used. + RESULT_TYPE_UNSPECIFIED = 0; + + // The key and properties. + FULL = 1; + + // A projected subset of properties. The entity may have no key. + PROJECTION = 2; + + // Only the key. + KEY_ONLY = 3; + } + + // The resulting entity. + Entity entity = 1; + + // 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. + int64 version = 4; + + // A cursor that points to the position after the result entity. + // Set only when the `EntityResult` is part of a `QueryResultBatch` message. + bytes cursor = 3; +} + +// A query for entities. +message Query { + // The projection to return. Defaults to returning all properties. + repeated Projection projection = 2; + + // The kinds to query (if empty, returns entities of all kinds). + // Currently at most 1 kind may be specified. + repeated KindExpression kind = 3; + + // The filter to apply. + Filter filter = 4; + + // The order to apply to the query results (if empty, order is unspecified). + repeated PropertyOrder order = 5; + + // 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). + repeated PropertyReference distinct_on = 6; + + // A starting point for the query results. Query cursors are + // returned in query result batches and + // [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets). + bytes start_cursor = 7; + + // An ending point for the query results. Query cursors are + // returned in query result batches and + // [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets). + bytes end_cursor = 8; + + // The number of results to skip. Applies before limit, but after all other + // constraints. Optional. Must be >= 0 if specified. + int32 offset = 10; + + // The maximum number of results to return. Applies after all other + // constraints. Optional. + // Unspecified is interpreted as no limit. + // Must be >= 0 if specified. + google.protobuf.Int32Value limit = 12; +} + +// A representation of a kind. +message KindExpression { + // The name of the kind. + string name = 1; +} + +// A reference to a property relative to the kind expressions. +message PropertyReference { + // The name of the property. + // If name includes "."s, it may be interpreted as a property name path. + string name = 2; +} + +// A representation of a property in a projection. +message Projection { + // The property to project. + PropertyReference property = 1; +} + +// The desired order for a specific property. +message PropertyOrder { + // The sort direction. + enum Direction { + // Unspecified. This value must not be used. + DIRECTION_UNSPECIFIED = 0; + + // Ascending. + ASCENDING = 1; + + // Descending. + DESCENDING = 2; + } + + // The property to order by. + PropertyReference property = 1; + + // The direction to order by. Defaults to `ASCENDING`. + Direction direction = 2; +} + +// A holder for any type of filter. +message Filter { + // The type of filter. + oneof filter_type { + // A composite filter. + CompositeFilter composite_filter = 1; + + // A filter on a property. + PropertyFilter property_filter = 2; + } +} + +// A filter that merges multiple other filters using the given operator. +message CompositeFilter { + // A composite filter operator. + enum Operator { + // Unspecified. This value must not be used. + OPERATOR_UNSPECIFIED = 0; + + // The results are required to satisfy each of the combined filters. + AND = 1; + } + + // The operator for combining multiple filters. + Operator op = 1; + + // The list of filters to combine. + // Must contain at least one filter. + repeated Filter filters = 2; +} + +// A filter on a specific property. +message PropertyFilter { + // A property filter operator. + enum Operator { + // Unspecified. This value must not be used. + OPERATOR_UNSPECIFIED = 0; + + // Less than. + LESS_THAN = 1; + + // Less than or equal. + LESS_THAN_OR_EQUAL = 2; + + // Greater than. + GREATER_THAN = 3; + + // Greater than or equal. + GREATER_THAN_OR_EQUAL = 4; + + // Equal. + EQUAL = 5; + + // Has ancestor. + HAS_ANCESTOR = 11; + } + + // The property to filter by. + PropertyReference property = 1; + + // The operator to filter by. + Operator op = 2; + + // The value to compare the property to. + Value value = 3; +} + +// A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference). +message GqlQuery { + // A string of the format described + // [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference). + string query_string = 1; + + // When false, the query string must not contain any literals and instead must + // bind all values. For example, + // `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while + // `SELECT * FROM Kind WHERE a = @value` is. + bool allow_literals = 2; + + // 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 `""`. + map named_bindings = 5; + + // 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. + repeated GqlQueryParameter positional_bindings = 4; +} + +// A binding parameter for a GQL query. +message GqlQueryParameter { + // The type of parameter. + oneof parameter_type { + // A value parameter. + Value value = 2; + + // A query cursor. Query cursors are returned in query + // result batches. + bytes cursor = 3; + } +} + +// A batch of results produced by a query. +message QueryResultBatch { + // The possible values for the `more_results` field. + enum MoreResultsType { + // Unspecified. This value is never used. + MORE_RESULTS_TYPE_UNSPECIFIED = 0; + + // There may be additional batches to fetch from this query. + NOT_FINISHED = 1; + + // The query is finished, but there may be more results after the limit. + MORE_RESULTS_AFTER_LIMIT = 2; + + // The query is finished, but there may be more results after the end + // cursor. + MORE_RESULTS_AFTER_CURSOR = 4; + + // The query is finished, and there are no more results. + NO_MORE_RESULTS = 3; + } + + // The number of results skipped, typically because of an offset. + int32 skipped_results = 6; + + // A cursor that points to the position after the last skipped result. + // Will be set when `skipped_results` != 0. + bytes skipped_cursor = 3; + + // The result type for every entity in `entity_results`. + EntityResult.ResultType entity_result_type = 1; + + // The results for this batch. + repeated EntityResult entity_results = 2; + + // A cursor that points to the position after the last result in the batch. + bytes end_cursor = 4; + + // The state of the query after the current batch. + MoreResultsType more_results = 5; + + // The version number of the snapshot this batch was returned from. + // This applies to the range of results from the query's `start_cursor` (or + // the beginning of the query if no cursor was given) to this batch's + // `end_cursor` (not the query's `end_cursor`). + // + // In a single transaction, subsequent query result batches for the same query + // can have a greater snapshot version number. Each batch's snapshot version + // is valid for all preceding batches. + // The value will be zero for eventually consistent queries. + int64 snapshot_version = 7; +} From 13b93551e4fc26f459be58b9fd2b65a4ee67a6f2 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Thu, 10 May 2018 10:54:50 -0700 Subject: [PATCH 0065/1784] Move grpc and proto artifacts to google-cloud-java from api-client-staging (second part) (#3251) 1) Radically change the structure of the repo. Now the root `pom.xml` file is not deployed to maven and is not a parent pom for any of the other modules, but is simply an aggregator pom, which aggregates other mostly independent of each other modules. 2) Update proto and grpc artifact to the latest generated versions as of time of this PR. 3) Add `cloudiot-v1` and `websecurityscanner-v1alpha` proto and grp artifacts (not released yet even in api-client-staging). Note, gapic clients for this apis are not added yet. 4) Rename `google-cloud-pom` parent artifact (for manual and gapic clients) to `google-cloud-clients`. 5) Move all manual and gapic clients from root directory to `google-cloud-clients` sub directory. 6) Make `google-cloud-bom` not a child of `google-cloud-clients` (former `google-cloud-pom`) anymore, keep it on root level so it becomes a sibling of `google-cloud-clients` (module which used to be its parent). 7) Similarly make `google-cloud-examples`, `google-cloud-testing` and `google-cloud-util` not children of `google-cloud-clients` and keep them on root level. Make these three modules also excluded from maven deployment (they will not be published to maven anymore). After this PR is done, additional work is required to fix circleci individual IT tests runs (should be trivial). Also deployment and documentation scripts must be modified accordingly (will be done right after pushing this PR). --- google-cloud-datastore/README.md | 229 ++++ google-cloud-datastore/pom.xml | 69 + .../datastore/BaseDatastoreBatchWriter.java | 276 ++++ .../google/cloud/datastore/BaseEntity.java | 670 ++++++++++ .../com/google/cloud/datastore/BaseKey.java | 233 ++++ .../com/google/cloud/datastore/Batch.java | 80 ++ .../com/google/cloud/datastore/BatchImpl.java | 73 ++ .../java/com/google/cloud/datastore/Blob.java | 151 +++ .../com/google/cloud/datastore/BlobValue.java | 84 ++ .../google/cloud/datastore/BooleanValue.java | 84 ++ .../com/google/cloud/datastore/Cursor.java | 91 ++ .../com/google/cloud/datastore/Datastore.java | 437 +++++++ .../cloud/datastore/DatastoreBatchWriter.java | 117 ++ .../cloud/datastore/DatastoreException.java | 83 ++ .../cloud/datastore/DatastoreFactory.java | 26 + .../cloud/datastore/DatastoreHelper.java | 90 ++ .../google/cloud/datastore/DatastoreImpl.java | 538 ++++++++ .../cloud/datastore/DatastoreOptions.java | 206 +++ .../cloud/datastore/DatastoreReader.java | 58 + .../datastore/DatastoreReaderWriter.java | 24 + .../cloud/datastore/DatastoreWriter.java | 85 ++ .../google/cloud/datastore/DoubleValue.java | 84 ++ .../com/google/cloud/datastore/Entity.java | 97 ++ .../google/cloud/datastore/EntityQuery.java | 65 + .../google/cloud/datastore/EntityValue.java | 84 ++ .../google/cloud/datastore/FullEntity.java | 72 ++ .../com/google/cloud/datastore/GqlQuery.java | 525 ++++++++ .../google/cloud/datastore/IncompleteKey.java | 116 ++ .../java/com/google/cloud/datastore/Key.java | 228 ++++ .../google/cloud/datastore/KeyFactory.java | 75 ++ .../com/google/cloud/datastore/KeyQuery.java | 66 + .../com/google/cloud/datastore/KeyValue.java | 84 ++ .../com/google/cloud/datastore/LatLng.java | 90 ++ .../google/cloud/datastore/LatLngValue.java | 85 ++ .../com/google/cloud/datastore/ListValue.java | 328 +++++ .../com/google/cloud/datastore/LongValue.java | 84 ++ .../com/google/cloud/datastore/NullValue.java | 92 ++ .../google/cloud/datastore/PathElement.java | 152 +++ .../cloud/datastore/ProjectionEntity.java | 83 ++ .../datastore/ProjectionEntityQuery.java | 114 ++ .../com/google/cloud/datastore/Query.java | 275 ++++ .../google/cloud/datastore/QueryResults.java | 58 + .../cloud/datastore/QueryResultsImpl.java | 117 ++ .../com/google/cloud/datastore/RawValue.java | 87 ++ .../google/cloud/datastore/ReadOption.java | 68 + .../google/cloud/datastore/StringValue.java | 84 ++ .../cloud/datastore/StructuredQuery.java | 1125 +++++++++++++++++ .../cloud/datastore/TimestampValue.java | 86 ++ .../google/cloud/datastore/Transaction.java | 451 +++++++ .../TransactionExceptionHandler.java | 66 + .../cloud/datastore/TransactionImpl.java | 135 ++ .../com/google/cloud/datastore/Validator.java | 62 + .../com/google/cloud/datastore/Value.java | 226 ++++ .../google/cloud/datastore/ValueBuilder.java | 55 + .../cloud/datastore/ValueMarshaller.java | 32 + .../com/google/cloud/datastore/ValueType.java | 116 ++ .../google/cloud/datastore/package-info.java | 61 + .../datastore/spi/DatastoreRpcFactory.java | 29 + .../cloud/datastore/spi/v1/DatastoreRpc.java | 81 ++ .../datastore/spi/v1/HttpDatastoreRpc.java | 185 +++ .../testing/LocalDatastoreHelper.java | 255 ++++ .../testing/RemoteDatastoreHelper.java | 107 ++ .../cloud/datastore/testing/package-info.java | 36 + .../BaseDatastoreBatchWriterTest.java | 354 ++++++ .../cloud/datastore/BaseEntityTest.java | 243 ++++ .../google/cloud/datastore/BaseKeyTest.java | 132 ++ .../com/google/cloud/datastore/BlobTest.java | 112 ++ .../google/cloud/datastore/BlobValueTest.java | 51 + .../cloud/datastore/BooleanValueTest.java | 50 + .../google/cloud/datastore/CursorTest.java | 52 + .../datastore/DatastoreExceptionTest.java | 126 ++ .../cloud/datastore/DatastoreHelperTest.java | 156 +++ .../cloud/datastore/DatastoreOptionsTest.java | 94 ++ .../google/cloud/datastore/DatastoreTest.java | 1050 +++++++++++++++ .../cloud/datastore/DoubleValueTest.java | 52 + .../google/cloud/datastore/EntityTest.java | 60 + .../cloud/datastore/EntityValueTest.java | 53 + .../cloud/datastore/FullEntityTest.java | 72 ++ .../cloud/datastore/IncompleteKeyTest.java | 64 + .../cloud/datastore/KeyFactoryTest.java | 127 ++ .../com/google/cloud/datastore/KeyTest.java | 84 ++ .../google/cloud/datastore/KeyValueTest.java | 52 + .../google/cloud/datastore/LatLngTest.java | 83 ++ .../cloud/datastore/LatLngValueTest.java | 52 + .../google/cloud/datastore/ListValueTest.java | 203 +++ .../google/cloud/datastore/LongValueTest.java | 52 + .../google/cloud/datastore/NullValueTest.java | 50 + .../cloud/datastore/PathElementTest.java | 75 ++ .../cloud/datastore/ProjectionEntityTest.java | 70 + .../google/cloud/datastore/RawValueTest.java | 51 + .../cloud/datastore/SerializationTest.java | 131 ++ .../cloud/datastore/StringValueTest.java | 51 + .../cloud/datastore/StructuredQueryTest.java | 176 +++ .../cloud/datastore/TimestampValueTest.java | 52 + .../TransactionExceptionHandlerTest.java | 74 ++ .../com/google/cloud/datastore/ValueTest.java | 173 +++ .../cloud/datastore/it/ITDatastoreTest.java | 854 +++++++++++++ .../testing/LocalDatastoreHelperTest.java | 91 ++ proto-google-cloud-datastore-v1/pom.xml | 6 +- 99 files changed, 15250 insertions(+), 3 deletions(-) create mode 100644 google-cloud-datastore/README.md create mode 100644 google-cloud-datastore/pom.xml create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md new file mode 100644 index 000000000000..9ef5db4378fa --- /dev/null +++ b/google-cloud-datastore/README.md @@ -0,0 +1,229 @@ +Google Cloud Java Client for Datastore +====================================== + +Java idiomatic client for [Google Cloud Datastore][cloud-datastore]. + +[![CircleCI](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master.svg?style=shield)](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master) +[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/google-cloud-java?branch=master) +[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg)]( https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg) +[![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java) +[![Dependency Status](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772/badge.svg?style=flat)](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772) + +- [Product Documentation][datastore-product-docs] +- [Client Library Documentation][datastore-client-lib-docs] + +Quickstart +---------- + +[//]: # ({x-version-update-start:google-cloud-datastore:released}) +If you are using Maven, add this to your pom.xml file +```xml + + com.google.cloud + google-cloud-datastore + 1.29.0 + +``` +If you are using Gradle, add this to your dependencies +```Groovy +compile 'com.google.cloud:google-cloud-datastore:1.29.0' +``` +If you are using SBT, add this to your dependencies +```Scala +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.29.0" +``` +[//]: # ({x-version-update-end}) + +Example Applications +-------------------- +- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). +- [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf. + - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service. +- [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site. +- [`GuestBook`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/appengine/guestbook-cloud-datastore) - An App Engine Standard guestbook that uses Cloud Datastore. +- [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks. + - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/sparkjava#how-does-it-work). +- [`TaskList`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/datastore/src/main/java/com/google/datastore/snippets/TaskList.java) - A command line application that uses Cloud Datastore to manage a to-do list. + - Read about how to run the application on its [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/datastore). + +Authentication +-------------- + +See the [Authentication](https://github.com/GoogleCloudPlatform/google-cloud-java#authentication) section in the base directory's README. + +About Google Cloud Datastore +---------------------------- + +Google [Cloud Datastore][cloud-datastore] is a fully managed, schemaless database for +storing non-relational data. Cloud Datastore automatically scales with +your users and supports ACID transactions, high availability of reads and +writes, strong consistency for reads and ancestor queries, and eventual +consistency for all other queries. + +See the [Google Cloud Datastore docs][cloud-datastore-activation] for more details on how to activate +Cloud Datastore for your project. + +See the [Datastore client library docs][datastore-client-lib-docs] to learn how to interact +with the Cloud Datastore using this Client Library. + +Getting Started +--------------- +#### Prerequisites +For this tutorial, you will need a [Google Developers Console](https://console.developers.google.com/) project with the Datastore API enabled. [Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. + +#### Installation and setup +You'll need to obtain the `google-cloud-datastore` library. See the [Quickstart](#quickstart) section to add `google-cloud-datastore` as a dependency in your code. + +#### Creating an authorized service object +To make authenticated requests to Google Cloud Datastore, you must create a service object with credentials. You can then make API calls by calling methods on the Datastore service object. The simplest way to authenticate is to use [Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials). These credentials are automatically inferred from your environment, so you only need the following code to create your service object: + +```java +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; + +Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); +``` + +For other authentication options, see the [Authentication](https://github.com/GoogleCloudPlatform/google-cloud-java#authentication) page. + +#### Storing data +Objects in Datastore are known as entities. Entities are grouped by "kind" and have keys for easy access. In this code snippet, we will create a new entity representing a person and store that data by the person's email. First, add the following imports at the top of your file: + +```java +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.KeyFactory; +``` + +Then add the following code to put an entity in Datastore. + +```java +KeyFactory keyFactory = datastore.newKeyFactory().setKind("Person"); +Key key = keyFactory.newKey("john.doe@gmail.com"); +Entity entity = Entity.newBuilder(key) + .set("name", "John Doe") + .set("age", 51) + .set("favorite_food", "pizza") + .build(); +datastore.put(entity); +``` + +Later, if you want to get this entity back, add the following to your code: + +```java +Entity johnEntity = datastore.get(key); +``` + +#### Running a query +In addition to retrieving entities by their keys, you can perform queries to retrieve entities by +the values of their properties. A typical query includes an entity kind, filters to select entities +with matching values, and sort orders to sequence the results. `google-cloud-datastore` supports two +types of queries: `StructuredQuery` (that allows you to construct query elements) and `GqlQuery` +(which operates using [GQL syntax](https://cloud.google.com/datastore/docs/apis/gql/gql_reference)) +in string format. In this tutorial, we will use a simple `StructuredQuery`. + +Suppose that you've added more people to Datastore, and now you want to find all people whose favorite food is pizza. Import the following: + +```java +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.StructuredQuery; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +``` + +Then add the following code to your program: + +```java +Query query = Query.newEntityQueryBuilder() + .setKind("Person") + .setFilter(PropertyFilter.eq("favorite_food", "pizza")) + .build(); +QueryResults results = datastore.run(query); +while (results.hasNext()) { + Entity currentEntity = results.next(); + System.out.println(currentEntity.getString("name") + ", you're invited to a pizza party!"); +} +``` + +Cloud Datastore relies on indexing to run queries. Indexing is turned on by default for most types of properties. To read more about indexing, see the [Cloud Datastore Index Configuration documentation](https://cloud.google.com/datastore/docs/tools/indexconfig). + +#### Updating data +Another thing you'll probably want to do is update your data. The following snippet shows how to update a Datastore entity if it exists. + +``` java +KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind"); +Key key = keyFactory.newKey("keyName"); +Entity entity = datastore.get(key); +if (entity != null) { + System.out.println("Updating access_time for " + entity.getString("name")); + entity = Entity.newBuilder(entity) + .set("access_time", DateTime.now()) + .build(); + datastore.update(entity); +} +``` + +The complete source code can be found at +[UpdateEntity.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java). + +#### Complete source code + +In +[AddEntitiesAndRunQuery.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java) +we put together all the code to store data and run queries into one program. The program assumes that you are +running on Compute Engine or from your own desktop. To run the example on App Engine, simply move +the code from the main method to your application's servlet class and change the print statements to +display on your webpage. + +Troubleshooting +--------------- + +To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting). + +Transport +--------- +Datastore uses HTTP for the transport layer. + +Java Versions +------------- + +Java 7 or above is required for using this client. + +Testing +------- + +This library has tools to help write tests for code that uses the Datastore. + +See [TESTING] to read more about testing. + +Versioning +---------- + +This library follows [Semantic Versioning](http://semver.org/). + +It is currently in major version one (``1.y.z``), which means that the public API should be considered stable. + +Contributing +------------ + +Contributions to this library are always welcome and highly encouraged. + +See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started. + +Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + +License +------- + +Apache 2.0 - See [LICENSE] for more information. + + +[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CONTRIBUTING.md +[code-of-conduct]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[LICENSE]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/LICENSE +[TESTING]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore +[cloud-platform]: https://cloud.google.com/ +[cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate +[cloud-datastore]: https://cloud.google.com/datastore/ +[datastore-product-docs]: https://cloud.google.com/datastore/docs/ +[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/datastore/package-summary.html diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml new file mode 100644 index 000000000000..1b9d8dde869c --- /dev/null +++ b/google-cloud-datastore/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + google-cloud-datastore + 1.29.1-SNAPSHOT + jar + Google Cloud Datastore + https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore + + Java idiomatic client for Google Cloud Datastore. + + + com.google.cloud + google-cloud-clients + 0.47.1-alpha-SNAPSHOT + + + google-cloud-datastore + + + + ${project.groupId} + google-cloud-core + + + ${project.groupId} + google-cloud-core-http + + + com.google.api.grpc + proto-google-cloud-datastore-v1 + + + com.google.cloud.datastore + datastore-v1-proto-client + + + com.google.guava + guava-jdk5 + + + + + io.grpc + grpc-core + + + ${project.groupId} + google-cloud-core + test-jar + test + + + junit + junit + test + + + org.easymock + easymock + test + + + org.objenesis + objenesis + test + + + diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java new file mode 100644 index 000000000000..bed06837f1b4 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java @@ -0,0 +1,276 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Base class for DatastoreBatchWriter. + */ +public abstract class BaseDatastoreBatchWriter implements DatastoreBatchWriter { + + private final String name; + private final Map> toAdd = new LinkedHashMap<>(); + private final List> toAddAutoId = new LinkedList<>(); + private final Map> toUpdate = new LinkedHashMap<>(); + private final Map> toPut = new LinkedHashMap<>(); + private final Set toDelete = new LinkedHashSet<>(); + private boolean active = true; + + BaseDatastoreBatchWriter(String name) { + this.name = name; + } + + @SuppressWarnings("unchecked") + @Override + public final void addWithDeferredIdAllocation(FullEntity... entities) { + validateActive(); + for (FullEntity entity : entities) { + IncompleteKey key = entity.getKey(); + Preconditions.checkArgument(key != null, "Entity must have a key"); + if (key instanceof Key) { + addInternal((FullEntity) entity); + } else { + toAddAutoId.add((FullEntity) entity); + } + } + } + + private void addInternal(FullEntity entity) { + Key key = entity.getKey(); + if (toAdd.containsKey(key) || toUpdate.containsKey(key) || toPut.containsKey(key)) { + throw newInvalidRequest("Entity with the key %s was already added or updated in this %s", + entity.getKey(), name); + } + if (toDelete.remove(key)) { + toPut.put(key, entity); + } else { + toAdd.put(key, entity); + } + } + + @Override + public final Entity add(FullEntity entity) { + return DatastoreHelper.add(this, entity); + } + + @SuppressWarnings("unchecked") + @Override + public final List add(FullEntity... entities) { + validateActive(); + List incompleteKeys = Lists.newArrayListWithExpectedSize(entities.length); + for (FullEntity entity : entities) { + IncompleteKey key = entity.getKey(); + Preconditions.checkArgument(key != null, "Entity must have a key"); + if (!(key instanceof Key)) { + incompleteKeys.add(key); + } + } + Iterator allocated; + if (!incompleteKeys.isEmpty()) { + IncompleteKey[] toAllocate = Iterables.toArray(incompleteKeys, IncompleteKey.class); + allocated = getDatastore().allocateId(toAllocate).iterator(); + } else { + allocated = Collections.emptyIterator(); + } + List answer = Lists.newArrayListWithExpectedSize(entities.length); + for (FullEntity entity : entities) { + if (entity.getKey() instanceof Key) { + addInternal((FullEntity) entity); + answer.add(Entity.convert((FullEntity) entity)); + } else { + Entity entityWithAllocatedId = Entity.newBuilder(allocated.next(), entity).build(); + addInternal(entityWithAllocatedId); + answer.add(entityWithAllocatedId); + } + } + return answer; + } + + @SafeVarargs + @Override + public final void update(Entity... entities) { + validateActive(); + for (Entity entity : entities) { + Key key = entity.getKey(); + if (toDelete.contains(key)) { + throw newInvalidRequest("Entity with the key %s was already deleted in this %s", + entity.getKey(), name); + } + if (toAdd.remove(key) != null || toPut.containsKey(key)) { + toPut.put(key, entity); + } else { + toUpdate.put(key, entity); + } + } + } + + private void putInternal(FullEntity entity) { + Key key = entity.getKey(); + toAdd.remove(key); + toUpdate.remove(key); + toDelete.remove(key); + toPut.put(key, entity); + } + + @Override + public final Entity put(FullEntity entity) { + return DatastoreHelper.put(this, entity); + } + + @SuppressWarnings("unchecked") + @Override + public final void putWithDeferredIdAllocation(FullEntity... entities) { + validateActive(); + for (FullEntity entity : entities) { + IncompleteKey key = entity.getKey(); + Preconditions.checkArgument(key != null, "Entity must have a key"); + if (key instanceof Key) { + putInternal(Entity.convert((FullEntity) entity)); + } else { + toAddAutoId.add((FullEntity) entity); + } + } + } + + @SuppressWarnings("unchecked") + @Override + public final List put(FullEntity... entities) { + validateActive(); + List incompleteKeys = Lists.newArrayListWithExpectedSize(entities.length); + for (FullEntity entity : entities) { + IncompleteKey key = entity.getKey(); + Preconditions.checkArgument(key != null, "Entity must have a key"); + if (!(key instanceof Key)) { + incompleteKeys.add(key); + } + } + Iterator allocated; + if (!incompleteKeys.isEmpty()) { + IncompleteKey[] toAllocate = Iterables.toArray(incompleteKeys, IncompleteKey.class); + allocated = getDatastore().allocateId(toAllocate).iterator(); + } else { + allocated = Collections.emptyIterator(); + } + List answer = Lists.newArrayListWithExpectedSize(entities.length); + for (FullEntity entity : entities) { + if (entity.getKey() instanceof Key) { + putInternal((FullEntity) entity); + answer.add(Entity.convert((FullEntity) entity)); + } else { + Entity entityWithAllocatedId = Entity.newBuilder(allocated.next(), entity).build(); + putInternal(entityWithAllocatedId); + answer.add(entityWithAllocatedId); + } + } + return answer; + } + + @Override + public final void delete(Key... keys) { + validateActive(); + for (Key key : keys) { + toAdd.remove(key); + toUpdate.remove(key); + toPut.remove(key); + toDelete.add(key); + } + } + + + @Override + public boolean isActive() { + return active; + } + + protected String getName() { + return name; + } + + protected Map> toAdd() { + return toAdd; + } + + protected List> toAddAutoId() { + return toAddAutoId; + } + + protected Map> toUpdate() { + return toUpdate; + } + + protected Map> toPut() { + return toPut; + } + + protected Set toDelete() { + return toDelete; + } + + protected void deactivate() { + active = false; + } + + protected void validateActive() { + if (!active) { + throw newInvalidRequest("%s is no longer active", name); + } + } + + protected DatastoreException newInvalidRequest(String msg, Object... params) { + return DatastoreException.throwInvalidRequest(String.format(msg, params)); + } + + protected List toMutationPbList() { + List mutationsPb = new ArrayList<>(); + for (FullEntity entity : toAddAutoId()) { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setInsert(entity.toPb()).build()); + } + for (FullEntity entity : toAdd().values()) { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setInsert(entity.toPb()).build()); + } + for (FullEntity entity : toUpdate().values()) { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build()); + } + for (FullEntity entity : toPut().values()) { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + } + for (Key key : toDelete()) { + mutationsPb.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(key.toPb()).build()); + } + return mutationsPb; + } + + + protected abstract Datastore getDatastore(); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java new file mode 100644 index 000000000000..1168ae20ce20 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java @@ -0,0 +1,670 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.cloud.datastore.BlobValue.of; +import static com.google.cloud.datastore.BooleanValue.of; +import static com.google.cloud.datastore.TimestampValue.of; +import static com.google.cloud.datastore.DoubleValue.of; +import static com.google.cloud.datastore.EntityValue.of; +import static com.google.cloud.datastore.KeyValue.of; +import static com.google.cloud.datastore.LatLngValue.of; +import static com.google.cloud.datastore.ListValue.of; +import static com.google.cloud.datastore.LongValue.of; +import static com.google.cloud.datastore.NullValue.of; +import static com.google.cloud.datastore.StringValue.of; + +import com.google.cloud.Timestamp; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableSortedMap; +import com.google.common.collect.Maps; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +/** + * A base class for entities (key and properties). + * An entity is a Google Cloud Datastore persistent data object. + * An entity holds one or more properties, represented by a name (as {@link String}) + * and a value (as {@link com.google.cloud.datastore.Value}), and may be associated with a + * key. For a list of possible values see {@link ValueType}. + * + * @see Google Cloud Datastore + * Entities, Properties, and Keys + */ +public abstract class BaseEntity implements Serializable { + + private static final long serialVersionUID = -9070588108769487081L; + private final ImmutableSortedMap> properties; + private final K key; + + public abstract static class Builder> { + + private K key; + private final Map> properties = new HashMap<>(); + + Builder() { + } + + Builder(K key) { + setKey(key); + } + + Builder(BaseEntity entity) { + this(entity.key, entity); + } + + Builder(K key, BaseEntity entity) { + setKey(key); + setProperties(entity.properties); + } + + protected K key() { + return key; + } + + protected Map> setProperties() { + return properties; + } + + @SuppressWarnings("unchecked") + private B self() { + return (B) this; + } + + @SuppressWarnings("unchecked") + B fill(com.google.datastore.v1.Entity entityPb) { + Map> copiedProperties = Maps.newHashMap(); + for (Map.Entry entry : + entityPb.getPropertiesMap().entrySet()) { + copiedProperties.put(entry.getKey(), Value.fromPb(entry.getValue())); + } + setProperties(copiedProperties); + if (entityPb.hasKey()) { + setKey((K) IncompleteKey.fromPb(entityPb.getKey())); + } + return self(); + } + + protected B setProperties(Map> properties) { + this.properties.putAll(properties); + return self(); + } + + + /** + * Sets the key for the entity. + */ + public B setKey(K key) { + this.key = key; + return self(); + } + + /** + * Clears all the properties. + */ + public B clear() { + properties.clear(); + return self(); + } + + /** + * Removes a property with the given {@code name}. + */ + public B remove(String name) { + properties.remove(name); + return self(); + } + + /** + * Sets a property. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, Value value) { + properties.put(name, value); + return self(); + } + + /** + * Sets a property of type {@link StringValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, String value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link StringValue}. + * + * @param name name of the property + * @param first the first string in the list + * @param second the second string in the list + * @param others other strings in the list + */ + public B set(String name, String first, String second, String... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (String other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link LongValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, long value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link LongValue}. + * + * @param name name of the property + * @param first the first long in the list + * @param second the second long in the list + * @param others other longs in the list + */ + public B set(String name, long first, long second, long... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (long other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link DoubleValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, double value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link DoubleValue}. + * + * @param name name of the property + * @param first the first double in the list + * @param second the second double in the list + * @param others other doubles in the list + */ + public B set(String name, double first, double second, double... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (double other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link BooleanValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, boolean value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link BooleanValue}. + * + * @param name name of the property + * @param first the first boolean in the list + * @param second the second boolean in the list + * @param others other booleans in the list + */ + public B set(String name, boolean first, boolean second, boolean... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (boolean other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link TimestampValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, Timestamp value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link TimestampValue}. + * + * @param name name of the property + * @param first the first {@link Timestamp} in the list + * @param second the second {@link Timestamp} in the list + * @param others other {@link Timestamp}s in the list + */ + public B set(String name, Timestamp first, Timestamp second, Timestamp... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (Timestamp other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link LatLng}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, LatLng value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link LatLng}. + * + * @param name name of the property + * @param first the first {@link LatLng} in the list + * @param second the second {@link LatLng} in the list + * @param others other {@link LatLng}s in the list + */ + public B set(String name, LatLng first, LatLng second, LatLng... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (LatLng other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link KeyValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, Key value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link KeyValue}. + * + * @param name name of the property + * @param first the first {@link Key} in the list + * @param second the second {@link Key} in the list + * @param others other {@link Key}s in the list + */ + public B set(String name, Key first, Key second, Key... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (Key other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link EntityValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, FullEntity value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link EntityValue}. + * + * @param name name of the property + * @param first the first {@link FullEntity} in the list + * @param second the second {@link FullEntity} in the list + * @param others other entities in the list + */ + public B set(String name, FullEntity first, FullEntity second, FullEntity... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (FullEntity other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link ListValue}. + * + * @param name name of the property + * @param values list of values associated with the property + */ + public B set(String name, List> values) { + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@link ListValue}. + * + * @param name name of the property + * @param first the first value in the list + * @param second the second value in the list + * @param others other values in the list + */ + public B set(String name, Value first, Value second, Value... others) { + properties.put(name, ListValue.newBuilder().addValue(first).addValue(second, others).build()); + return self(); + } + + /** + * Sets a property of type {@link BlobValue}. + * + * @param name name of the property + * @param value value associated with the property + */ + public B set(String name, Blob value) { + properties.put(name, of(value)); + return self(); + } + + /** + * Sets a list property containing elements of type {@link BlobValue}. + * + * @param name name of the property + * @param first the first {@link Blob} in the list + * @param second the second {@link Blob} in the list + * @param others other {@link Blob}s in the list + */ + public B set(String name, Blob first, Blob second, Blob... others) { + List values = new LinkedList<>(); + values.add(of(first)); + values.add(of(second)); + for (Blob other : others) { + values.add(of(other)); + } + properties.put(name, of(values)); + return self(); + } + + /** + * Sets a property of type {@code NullValue}. + * + * @param name name of the property + */ + public B setNull(String name) { + properties.put(name, of()); + return self(); + } + + public abstract BaseEntity build(); + } + + BaseEntity(Builder builder) { + this.key = builder.key; + this.properties = ImmutableSortedMap.copyOf(builder.properties); + } + + BaseEntity(BaseEntity from) { + this.key = from.getKey(); + this.properties = from.properties; + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("key", key) + .add("properties", properties) + .toString(); + } + + @Override + public int hashCode() { + return Objects.hash(key, properties); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof BaseEntity)) { + return false; + } + BaseEntity other = (BaseEntity) obj; + return Objects.equals(key, other.key) + && Objects.equals(properties, other.properties); + } + + /** + * Returns true if entity has a non-null key. + */ + public boolean hasKey() { + return key != null; + } + + + /** + * Returns the associated key or null if it does not have one. + */ + public K getKey() { + return key; + } + + /** + * Returns {@code true} if the entity contains a property with the given {@code name}. + */ + public boolean contains(String name) { + return properties.containsKey(name); + } + + /** + * Returns the {@link Value} for the given property {@code name}. + * + * @throws DatastoreException if no such property + */ + public > V getValue(String name) { + @SuppressWarnings("unchecked") + V property = (V) properties.get(name); + if (property == null) { + throw DatastoreException.throwInvalidRequest("No such property %s", name); + } + return property; + } + + /** + * Returns true if property is an instance of NullValue. + * + * @throws DatastoreException if no such property + */ + public boolean isNull(String name) { + return getValue(name) instanceof NullValue; + } + + + /** + * Returns the property value as a string. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a string + */ + @SuppressWarnings("unchecked") + public String getString(String name) { + return ((Value) getValue(name)).get(); + } + + /** + * Returns the property value as long. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a long + */ + @SuppressWarnings("unchecked") + public long getLong(String name) { + return ((Value) getValue(name)).get(); + } + + /** + * Returns the property value as a double. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a double + */ + @SuppressWarnings("unchecked") + public double getDouble(String name) { + return ((Value) getValue(name)).get(); + } + + /** + * Returns the property value as a boolean. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a boolean + */ + @SuppressWarnings("unchecked") + public boolean getBoolean(String name) { + return ((Value) getValue(name)).get(); + } + + /** + * Returns the property value as a Timestamp. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a Timestamp + */ + @SuppressWarnings("unchecked") + public Timestamp getTimestamp(String name) { + return ((Value) getValue(name)).get(); + } + + /** + * Returns the property value as a LatLng. + * + * @throws DatastoreException if no such property. + * @throws ClassCastException if value is not a LatLng. + */ + @SuppressWarnings("unchecked") + public LatLng getLatLng(String name) { + return ((Value) getValue(name)).get(); + } + + /** + * Returns the property value as a Key. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a Key + */ + @SuppressWarnings("unchecked") + public Key getKey(String name) { + return ((Value) getValue(name)).get(); + } + + /** + * Returns the property value as an entity. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not an entity + */ + @SuppressWarnings("unchecked") + public FullEntity getEntity(String name) { + return ((Value>) getValue(name)).get(); + } + + /** + * Returns the property value as a list of values. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a list of values + */ + @SuppressWarnings("unchecked") + public > List getList(String name) { + return (List) getValue(name).get(); + } + + /** + * Returns the property value as a blob. + * + * @throws DatastoreException if no such property + * @throws ClassCastException if value is not a blob + */ + @SuppressWarnings("unchecked") + public Blob getBlob(String name) { + return ((Value) getValue(name)).get(); + } + + + /** + * Returns the properties name. + */ + public Set getNames() { + return properties.keySet(); + } + + ImmutableSortedMap> getProperties() { + return properties; + } + + final com.google.datastore.v1.Entity toPb() { + com.google.datastore.v1.Entity.Builder entityPb = com.google.datastore.v1.Entity.newBuilder(); + for (Map.Entry> entry : properties.entrySet()) { + entityPb.putProperties(entry.getKey(), entry.getValue().toPb()); + } + if (key != null) { + entityPb.setKey(key.toPb()); + } + return entityPb.build(); + } +} 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 new file mode 100644 index 000000000000..3e0f5d2539b1 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java @@ -0,0 +1,233 @@ +/* + * Copyright 2015 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.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 com.google.common.base.MoreObjects; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.io.Serializable; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; + +/** + * Base class for keys. + */ +public abstract class BaseKey implements Serializable { + + private static final long serialVersionUID = -5897863400209818325L; + + private final String projectId; + private final String namespace; + private final ImmutableList path; + + /** + * Base class for key builders. + * + * @param the key builder. + */ + public abstract static class Builder> { + + String projectId = ""; + String namespace = ""; + String kind; + final List ancestors; + + private static final int MAX_PATH = 100; + + Builder(String projectId) { + this.projectId = validateDatabase(projectId); + ancestors = new LinkedList<>(); + } + + Builder(String projectId, String kind) { + this(projectId); + this.kind = validateKind(kind); + } + + Builder(BaseKey copyFrom) { + projectId = copyFrom.getProjectId(); + namespace = copyFrom.getNamespace(); + ancestors = new LinkedList<>(copyFrom.getAncestors()); + kind = copyFrom.getKind(); + } + + @SuppressWarnings("unchecked") + B self() { + return (B) this; + } + + + /** + * Adds an ancestor for this key. + */ + public B addAncestor(PathElement ancestor) { + Preconditions.checkState(ancestors.size() < MAX_PATH, "path can have at most 100 elements"); + ancestors.add(ancestor); + return self(); + } + + + /** + * Adds the provided ancestors to the key. + */ + public B addAncestors(PathElement ancestor, PathElement... other) { + return addAncestors(ImmutableList.builder().add(ancestor).add(other).build()); + } + + + /** + * Adds the provided ancestors to the key. + */ + public B addAncestors(Iterable ancestors) { + ImmutableList list = ImmutableList.copyOf(ancestors); + Preconditions.checkState(this.ancestors.size() + list.size() < MAX_PATH, + "path can have at most 100 elements"); + this.ancestors.addAll(list); + return self(); + } + + + /** + * Sets the kind of the key. + */ + public B setKind(String kind) { + this.kind = validateKind(kind); + return self(); + } + + + /** + * Sets the project ID of the key. + */ + public B setProjectId(String projectId) { + this.projectId = validateDatabase(projectId); + return self(); + } + + + /** + * Sets the namespace of the key. + */ + public B setNamespace(String namespace) { + this.namespace = validateNamespace(namespace); + return self(); + } + + protected abstract BaseKey build(); + } + + BaseKey(String projectId, String namespace, ImmutableList path) { + Preconditions.checkArgument(!path.isEmpty(), "Path must not be empty"); + this.projectId = projectId; + this.namespace = namespace; + this.path = path; + } + + + /** + * Returns the key's projectId. + */ + public String getProjectId() { + return projectId; + } + + + /** + * Returns the key's namespace or {@code null} if not provided. + */ + public String getNamespace() { + return namespace; + } + + + /** + * Returns an immutable list with the key's ancestors. + */ + public List getAncestors() { + return getPath().subList(0, getPath().size() - 1); + } + + + /** + * Returns an immutable list of the key's path (ancestors + self). + */ + List getPath() { + return path; + } + + PathElement getLeaf() { + return getPath().get(getPath().size() - 1); + } + + + /** + * Returns the key's kind. + */ + public String getKind() { + return getLeaf().getKind(); + } + + + abstract BaseKey getParent(); + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("projectId", projectId) + .add("namespace", namespace) + .add("path", path) + .toString(); + } + + @Override + public int hashCode() { + return Objects.hash(getProjectId(), getNamespace(), getPath()); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof BaseKey)) { + return false; + } + BaseKey other = (BaseKey) obj; + return Objects.equals(getProjectId(), other.getProjectId()) + && Objects.equals(getNamespace(), other.getNamespace()) + && Objects.equals(getPath(), other.getPath()); + } + + com.google.datastore.v1.Key toPb() { + com.google.datastore.v1.Key.Builder keyPb = com.google.datastore.v1.Key.newBuilder(); + com.google.datastore.v1.PartitionId.Builder partitionIdPb = + com.google.datastore.v1.PartitionId.newBuilder(); + partitionIdPb.setProjectId(projectId); + partitionIdPb.setNamespaceId(namespace); + keyPb.setPartitionId(partitionIdPb.build()); + for (PathElement pathEntry : path) { + keyPb.addPath(pathEntry.toPb()); + } + return keyPb.build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java new file mode 100644 index 000000000000..ee90aefe2955 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java @@ -0,0 +1,80 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import java.util.List; + +/** + * An interface to represent a batch of write operations. + * Any write operation that is applied on a batch will only be sent + * to the Datastore upon {@link #submit}. + * A usage example: + * 
 {@code
+ * Entity entity1 = datastore.get(key1);
+ * Batch batch = datastore.newBatch();
+ * Entity entity2 = Entity.newBuilder(key2).set("name", "John").build();
+ * entity1 = Entity.newBuilder(entity1).clear().setNull("bla").build();
+ * Entity entity3 = Entity.newBuilder(key3).set("title", "title").build();
+ * batch.update(entity1);
+ * batch.add(entity2, entity3);
+ * batch.submit();
+ * }
+ */ +public interface Batch extends DatastoreBatchWriter { + + interface Response { + + /** + * Returns a list of keys generated by a batch. + */ + List getGeneratedKeys(); + } + + /** + * {@inheritDoc} + * + *

If an entity for {@code entity.getKey()} does not exists, {@code entity} is inserted. + * Otherwise, {@link #submit()} will throw a {@link DatastoreException} with + * {@link DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. + */ + @Override + Entity add(FullEntity entity); + + /** + * {@inheritDoc} + * + *

If none of entities' keys exist, all entities are inserted. If any of entities' keys already + * exists, {@link #submit()} will throw a {@link DatastoreException} with + * {@link DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in + * {@code entities} whose key did not exist are inserted. + */ + @Override + List add(FullEntity... entities); + + /** + * Submit the batch to the Datastore. + * + * @throws DatastoreException if there was any failure or if batch is not longer active + */ + Response submit(); + + + /** + * Returns the batch associated {@link Datastore}. + */ + Datastore getDatastore(); +} 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 new file mode 100644 index 000000000000..dc02db735109 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java @@ -0,0 +1,73 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +class BatchImpl extends BaseDatastoreBatchWriter implements Batch { + + private final DatastoreImpl datastore; + + static class ResponseImpl implements Batch.Response { + + private final com.google.datastore.v1.CommitResponse response; + private final int numAutoAllocatedIds; + + ResponseImpl(com.google.datastore.v1.CommitResponse response, int numAutoAllocatedIds) { + this.response = response; + this.numAutoAllocatedIds = numAutoAllocatedIds; + } + + + @Override + public List getGeneratedKeys() { + Iterator results = + response.getMutationResultsList().iterator(); + List generated = new ArrayList<>(numAutoAllocatedIds); + for (int i = 0; i < numAutoAllocatedIds; i++) { + generated.add(Key.fromPb(results.next().getKey())); + } + return generated; + } + } + + BatchImpl(DatastoreImpl datastore) { + super("batch"); + this.datastore = datastore; + } + + @Override + public Batch.Response submit() { + validateActive(); + List mutationsPb = toMutationPbList(); + com.google.datastore.v1.CommitRequest.Builder requestPb = + com.google.datastore.v1.CommitRequest.newBuilder(); + requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.NON_TRANSACTIONAL); + requestPb.addAllMutations(mutationsPb); + com.google.datastore.v1.CommitResponse responsePb = datastore.commit(requestPb.build()); + deactivate(); + return new ResponseImpl(responsePb, toAddAutoId().size()); + } + + + @Override + public Datastore getDatastore() { + return datastore; + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java new file mode 100644 index 000000000000..211d34ceccf9 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java @@ -0,0 +1,151 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; +import com.google.protobuf.ByteString; + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; +import java.nio.ByteBuffer; + +/** + * A Google Cloud Datastore Blob. + * This class is immutable. + * + * @see + * Google Cloud Datastore Entities, Properties, and Keys + */ +public final class Blob implements Serializable { + + private static final long serialVersionUID = 7311366042557240313L; + + private final ByteString byteString; + + Blob(ByteString byteString) { + this.byteString = checkNotNull(byteString); + } + + @Override + public String toString() { + ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + StringBuilder stBuilder = new StringBuilder(); + for (int i = 0; i < Math.min(256, byteString.size()); i++) { + stBuilder.append(String.format("%02x", byteString.byteAt(i))); + } + if (byteString.size() > 256) { + stBuilder.append("..."); + } + return toStringHelper.add("bytes", stBuilder.toString()).toString(); + } + + @Override + public int hashCode() { + return byteString.hashCode(); + } + + @Override + public boolean equals(Object obj) { + return obj == this || obj instanceof Blob && byteString.equals(((Blob) obj).byteString); + } + + + /** + * Returns the size of this blob. + */ + public int getLength() { + return byteString.size(); + } + + /** + * Returns a copy as byte array. + */ + public byte[] toByteArray() { + return byteString.toByteArray(); + } + + /** + * Returns a read-only {@link ByteBuffer} for this blob content. + */ + public ByteBuffer asReadOnlyByteBuffer() { + return byteString.asReadOnlyByteBuffer(); + } + + /** + * Returns an {@link InputStream} for this blob content. + */ + public InputStream asInputStream() { + final ByteBuffer byteBuffer = asReadOnlyByteBuffer(); + return new InputStream() { + @Override public int read() { + return !byteBuffer.hasRemaining() ? -1 : byteBuffer.get() & 0xFF; + } + }; + } + + /** + * Copies bytes into a ByteBuffer. + * + * @throws java.nio.ReadOnlyBufferException if the target is read-only + * @throws java.nio.BufferOverflowException if the target's remaining() space is not large + * enough to hold the data + */ + public void copyTo(ByteBuffer target) { + byteString.copyTo(target); + } + + /** + * Copies bytes into a buffer. + * + * @throws IndexOutOfBoundsException if an offset or size is negative or too large + */ + public void copyTo(byte[] target) { + byteString.copyTo(target, 0, 0, getLength()); + } + + ByteString getByteString() { + return byteString; + } + + public static Blob copyFrom(byte[] bytes) { + return new Blob(ByteString.copyFrom(bytes)); + } + + public static Blob copyFrom(ByteBuffer bytes) { + return new Blob(ByteString.copyFrom(bytes)); + } + + public static Blob copyFrom(InputStream input) throws IOException { + BufferedInputStream bufferedInput = new BufferedInputStream(input); + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + int value; + while ((value = bufferedInput.read()) != -1) { + bytes.write(value); + } + return copyFrom(bytes.toByteArray()); + } + + com.google.datastore.v1.Value toPb() { + return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java new file mode 100644 index 000000000000..c3f4a53743cf --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.BLOB_VALUE_FIELD_NUMBER; + +public final class BlobValue extends Value { + + private static final long serialVersionUID = -5096238337676649540L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -739627441374592171L; + + @Override + public int getProtoFieldId() { + return BLOB_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(Blob value) { + return BlobValue.newBuilder(value); + } + + @Override + protected Blob getValue(com.google.datastore.v1.Value from) { + return new Blob(from.getBlobValue()); + } + + @Override + protected void setValue(BlobValue from, com.google.datastore.v1.Value.Builder to) { + to.setBlobValue(from.get().getByteString()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + private Builder() { + super(ValueType.BLOB); + } + + @Override + public BlobValue build() { + return new BlobValue(this); + } + } + + public BlobValue(Blob blob) { + this(newBuilder(blob)); + } + + private BlobValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static BlobValue of(Blob blob) { + return new BlobValue(blob); + } + + + public static Builder newBuilder(Blob blob) { + return new Builder().set(blob); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java new file mode 100644 index 000000000000..9674cba913b4 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.BOOLEAN_VALUE_FIELD_NUMBER; + +public final class BooleanValue extends Value { + + private static final long serialVersionUID = -6692551696100439451L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = 5178009712526977429L; + + @Override + public int getProtoFieldId() { + return BOOLEAN_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(Boolean value) { + return BooleanValue.newBuilder(value); + } + + @Override + protected Boolean getValue(com.google.datastore.v1.Value from) { + return from.getBooleanValue(); + } + + @Override + protected void setValue(BooleanValue from, com.google.datastore.v1.Value.Builder to) { + to.setBooleanValue(from.get()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + private Builder() { + super(ValueType.BOOLEAN); + } + + @Override + public BooleanValue build() { + return new BooleanValue(this); + } + } + + public BooleanValue(boolean value) { + this(newBuilder(value)); + } + + private BooleanValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static BooleanValue of(boolean value) { + return new BooleanValue(value); + } + + + public static Builder newBuilder(boolean value) { + return new Builder().set(value); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java new file mode 100644 index 000000000000..0dc911962eaa --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java @@ -0,0 +1,91 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; +import com.google.common.io.BaseEncoding; +import com.google.protobuf.ByteString; + +import java.io.Serializable; + +/** + * A Google Cloud Datastore cursor. + * The cursor can be used to as a starting point or an ending point for a {@link Query} + */ +public final class Cursor implements Serializable { + + private static final long serialVersionUID = 4688656124180503551L; + + private final ByteString byteString; + + Cursor(ByteString byteString) { + this.byteString = byteString; + } + + @Override + public int hashCode() { + return byteString.hashCode(); + } + + @Override + public boolean equals(Object obj) { + return obj == this || obj instanceof Cursor && byteString.equals(((Cursor) obj).byteString); + } + + @Override + public String toString() { + ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + StringBuilder stBuilder = new StringBuilder(); + for (int i = 0; i < byteString.size(); i++) { + stBuilder.append(String.format("%02x", byteString.byteAt(i))); + } + return toStringHelper.add("bytes", stBuilder.toString()).toString(); + } + + ByteString getByteString() { + return byteString; + } + + /** + * Returns the cursor in an encoded form that can be used as part of a URL. + */ + public String toUrlSafe() { + return BaseEncoding.base64Url().encode(byteString.toByteArray()); + } + + /** + * Create a {@code Cursor} given its URL safe encoded form. + */ + public static Cursor fromUrlSafe(String urlSafe) { + try { + return Cursor.copyFrom(BaseEncoding.base64Url().decode(urlSafe)); + } catch (IllegalArgumentException e) { + throw new IllegalStateException("Unexpected decoding exception", e); + } + } + + public static Cursor copyFrom(byte[] bytes) { + return new Cursor(ByteString.copyFrom(checkNotNull(bytes))); + } + + com.google.datastore.v1.Value toPb() { + return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java new file mode 100644 index 000000000000..1917d92c5ffe --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java @@ -0,0 +1,437 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.cloud.Service; +import com.google.datastore.v1.TransactionOptions; +import java.util.Iterator; +import java.util.List; + +/** + * An interface for Google Cloud Datastore. + */ +public interface Datastore extends Service, DatastoreReaderWriter { + + /** + * Returns a new Datastore transaction. + * + * @param options a transaction option indicating the mode of the transaction (read-only or read-write) + * @throws DatastoreException upon failure + */ + Transaction newTransaction(TransactionOptions options); + + /** + * Returns a new Datastore transaction. + * + * @throws DatastoreException upon failure + */ + Transaction newTransaction(); + + /** + * A callback for running with a transactional + * {@link com.google.cloud.datastore.DatastoreReaderWriter}. + * The associated transaction will be committed after a successful return from the {@code run} + * method. Any propagated exception will cause the transaction to be rolled-back. + * + * @param the type of the return value + */ + interface TransactionCallable { + T run(DatastoreReaderWriter readerWriter) throws Exception; + } + + /** + * Invokes the callback's {@link Datastore.TransactionCallable#run} method with a + * {@link DatastoreReaderWriter} that is associated with a new transaction. + * The transaction will be committed upon successful invocation. + * Any thrown exception will cause the transaction to rollback and will be propagated + * as a {@link DatastoreException} with the original exception as its root cause. + * + *

Example of running in a transaction. + * 

 {@code
+   * String callableResult = "my_callable_result";
+   * TransactionCallable callable = new TransactionCallable() {
+   *   public String run(DatastoreReaderWriter readerWriter) {
+   *     // use readerWriter to run in transaction
+   *     return callableResult;
+   *   }
+   * };
+   * String result = datastore.runInTransaction(callable);
+   * }
+ * + * @param callable the callback to call with a newly created transactional readerWriter + * @throws DatastoreException upon failure + */ + T runInTransaction(TransactionCallable callable); + + + /** + * Invokes the callback's {@link Datastore.TransactionCallable#run} method with a + * {@link DatastoreReaderWriter} that is associated with a new transaction. + * The transaction will be committed upon successful invocation. + * Any thrown exception will cause the transaction to rollback and will be propagated + * as a {@link DatastoreException} with the original exception as its root cause. + * If {@link TransactionOptions} is set to read-write mode, previous transaction Id + * in the options will be automatically populated each time a transaction is retried. + * + *

Example of running in a transaction. + * 

 {@code
+   * String callableResult = "my_callable_result";
+   * TransactionCallable callable = new TransactionCallable() {
+   *   public String run(DatastoreReaderWriter readerWriter) {
+   *     // use readerWriter to run in transaction
+   *     return callableResult;
+   *   }
+   * };
+   *
+   * TransactionOptions options = TransactionOptions.newBuilder()
+   *     .setReadWrite(TransactionOptions.ReadWrite
+   *         .getDefaultInstance())
+   *     .build();
+   *
+   * String result = datastore.runInTransaction(callable, options);
+   * }
+ * + * @param callable the callback to call with a newly created transactional readerWriter + * @param options the Transaction options indicating whether the transaction mode is Read-only or Read-Write + * @throws DatastoreException upon failure + */ + T runInTransaction(TransactionCallable callable, TransactionOptions options); + + /** + * Returns a new Batch for processing multiple write operations in one request. + * + *

Example of starting a new batch. + * 

 {@code
+   * String keyName1 = "my_key_name_1";
+   * String keyName2 = "my_key_name_2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * Batch batch = datastore.newBatch();
+   * Entity entity1 = Entity.newBuilder(key1).set("name", "John").build();
+   * Entity entity2 = Entity.newBuilder(key2).set("title", "title").build();
+   * batch.add(entity1);
+   * batch.add(entity2);
+   * batch.submit();
+   * }
+ * + */ + Batch newBatch(); + + /** + * Allocate a unique id for the given key. + * The returned key will have the same information (projectId, kind, namespace and ancestors) + * as the given key and will have a newly assigned id. + * + *

Example of allocating an id. + * 

 {@code
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * IncompleteKey incompleteKey = keyFactory.newKey();
+   * 
+   * // let cloud datastore automatically assign an id
+   * Key key = datastore.allocateId(incompleteKey);
+   * }
+ * + * @throws DatastoreException upon failure + */ + Key allocateId(IncompleteKey key); + + /** + * Returns a list of keys using the allocated ids ordered by the input. + * + *

Example of allocating multiple ids in a single batch. + * 

 {@code
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * IncompleteKey incompleteKey1 = keyFactory.newKey();
+   * IncompleteKey incompleteKey2 = keyFactory.newKey();
+   * 
+   * // let cloud datastore automatically assign the ids
+   * List keys = datastore.allocateId(incompleteKey1, incompleteKey2);
+   * }
+ * + * @throws DatastoreException upon failure + * @see #allocateId(IncompleteKey) + */ + List allocateId(IncompleteKey... keys); + + /** + * {@inheritDoc} + * + *

If an entity for {@code entity.getKey()} does not exist, {@code entity} is inserted. + * Otherwise, a {@link DatastoreException} is thrown with {@link DatastoreException#getReason()} + * equal to {@code "ALREADY_EXISTS"}. + * + *

Example of adding a single entity. + * 

 {@code
+   * String keyName = "my_key_name";
+   * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
+   * Entity.Builder entityBuilder = Entity.newBuilder(key);
+   * entityBuilder.set("propertyName", "value");
+   * Entity entity = entityBuilder.build();
+   * try {
+   *   datastore.add(entity);
+   * } catch (DatastoreException ex) {
+   *   if ("ALREADY_EXISTS".equals(ex.getReason())) {
+   *     // entity.getKey() already exists
+   *   }
+   * }
+   * }
+ * + * @throws DatastoreException upon failure or if an entity for {@code entity.getKey()} already + * exists + */ + @Override + Entity add(FullEntity entity); + + /** + * {@inheritDoc} + * + *

If none of entities' keys exist, all entities are inserted. If any of entities' keys already + * exists the method throws a {@link DatastoreException} with + * {@link DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in + * {@code entities} whose key did not exist are inserted. To achieve a transactional behavior, + * use {@link Transaction}. + * + *

Example of adding multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name1";
+   * String keyName2 = "my_key_name2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "value1");
+   * Entity entity1 = entityBuilder1.build();
+   * 
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "value2");
+   * Entity entity2 = entityBuilder2.build();
+   * 
+   * try {
+   *   datastore.add(entity1, entity2);
+   * } catch (DatastoreException ex) {
+   *   if ("ALREADY_EXISTS".equals(ex.getReason())) {
+   *     // at least one of entity1.getKey() and entity2.getKey() already exists
+   *   }
+   * }
+   * }
+ * + * @throws DatastoreException upon failure or if any of entities' keys already exists + */ + @Override + List add(FullEntity... entities); + + /** + * {@inheritDoc} + * + *

Example of updating multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name_1";
+   * String keyName2 = "my_key_name_2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "updatedValue1");
+   * Entity entity1 = entityBuilder1.build();
+   * 
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "updatedValue2");
+   * Entity entity2 = entityBuilder2.build();
+   * 
+   * datastore.update(entity1, entity2);
+   * }
+ * + * @throws DatastoreException upon failure + */ + @Override + void update(Entity... entities); + + /** + * {@inheritDoc} + * + *

Example of putting a single entity. + * 

 {@code
+   * String keyName = "my_key_name";
+   * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
+   * Entity.Builder entityBuilder = Entity.newBuilder(key);
+   * entityBuilder.set("propertyName", "value");
+   * Entity entity = entityBuilder.build();
+   * datastore.put(entity);
+   * }
+ * + * @throws DatastoreException upon failure + */ + @Override + Entity put(FullEntity entity); + + /** + * {@inheritDoc} + * + *

Example of putting multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name1";
+   * String keyName2 = "my_key_name2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "value1");
+   * Entity entity1 = entityBuilder1.build();
+   * 
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "value2");
+   * Entity entity2 = entityBuilder2.build();
+   * 
+   * datastore.put(entity1, entity2);
+   * }
+ * + * @throws DatastoreException upon failure + */ + @Override + List put(FullEntity... entities); + + /** + * {@inheritDoc} + * + *

Example of deleting multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name1";
+   * String keyName2 = "my_key_name2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * datastore.delete(key1, key2);
+   * }
+ * + * @throws DatastoreException upon failure + */ + @Override + void delete(Key... keys); + + /** + * Returns a new KeyFactory for this service + * + *

Example of creating a {@code KeyFactory}. + * 

 {@code
+   * KeyFactory keyFactory = datastore.newKeyFactory();
+   * }
+ * + */ + KeyFactory newKeyFactory(); + + /** + * Returns an {@link Entity} for the given {@link Key} or {@code null} if it doesn't exist. + * {@link ReadOption}s can be specified if desired. + * + *

Example of getting an entity. + * 

 {@code
+   * String keyName = "my_key_name";
+   * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
+   * Entity entity = datastore.get(key);
+   * // Do something with the entity
+   * }
+ * + * @throws DatastoreException upon failure + */ + Entity get(Key key, ReadOption... options); + + /** + * Returns an {@link Entity} for each given {@link Key} that exists in the Datastore. The order of + * the result is unspecified. Results are loaded lazily, so it is possible to get a + * {@code DatastoreException} from the returned {@code Iterator}'s + * {@link Iterator#hasNext hasNext} or {@link Iterator#next next} methods. {@link ReadOption}s can + * be specified if desired. + * + *

Example of getting multiple entity objects. + * 

 {@code
+   * String firstKeyName = "my_first_key_name";
+   * String secondKeyName = "my_second_key_name";
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key firstKey = keyFactory.newKey(firstKeyName);
+   * Key secondKey = keyFactory.newKey(secondKeyName);
+   * Iterator entitiesIterator = datastore.get(Lists.newArrayList(firstKey, secondKey));
+   * List entities = Lists.newArrayList();
+   * while (entitiesIterator.hasNext()) {
+   *   Entity entity = entitiesIterator.next();
+   *   // do something with the entity
+   *   entities.add(entity);
+   * }
+   * }
+ * + * @throws DatastoreException upon failure + * @see #get(Key) + */ + Iterator get(Iterable keys, ReadOption... options); + + /** + * Returns a list with a value for each given key (ordered by input). {@code null} values are + * returned for nonexistent keys. When possible prefer using {@link #get(Key...)} to avoid eagerly + * loading the results. {@link ReadOption}s can be specified if desired. + * + *

Example of fetching a list of Entity objects. + * 

 {@code
+   * String firstKeyName = "my_first_key_name";
+   * String secondKeyName = "my_second_key_name";
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key firstKey = keyFactory.newKey(firstKeyName);
+   * Key secondKey = keyFactory.newKey(secondKeyName);
+   * List entities = datastore.fetch(Lists.newArrayList(firstKey, secondKey));
+   * for (Entity entity : entities) {
+   *   // do something with the entity
+   * }
+   * }
+ * + */ + List fetch(Iterable keys, ReadOption... options); + + /** + * Submits a {@link Query} and returns its result. {@link ReadOption}s can be specified if + * desired. + * + *

Example of running a query to find all entities of one kind. + * 

 {@code
+   * String kind = "my_kind";
+   * StructuredQuery query = Query.newEntityQueryBuilder()
+   *     .setKind(kind)
+   *     .build();
+   * QueryResults results = datastore.run(query);
+   * List entities = Lists.newArrayList();
+   * while (results.hasNext()) {
+   *   Entity result = results.next();
+   *   // do something with result
+   *   entities.add(result);
+   * }
+   * }
+ * + *

Example of running a query to find all entities with a matching property value. + * 

 {@code
+   * String kind = "my_kind";
+   * String property = "my_property";
+   * String value = "my_value";
+   * StructuredQuery query = Query.newEntityQueryBuilder()
+   *     .setKind(kind)
+   *     .setFilter(PropertyFilter.eq(property, value))
+   *     .build();
+   * QueryResults results = datastore.run(query);
+   * List entities = Lists.newArrayList();
+   * while (results.hasNext()) {
+   *   Entity result = results.next();
+   *   // do something with result
+   *   entities.add(result);
+   * }
+   * }
+ * + * @throws DatastoreException upon failure + */ + QueryResults run(Query query, ReadOption... options); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java new file mode 100644 index 000000000000..c713c2bf52ed --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java @@ -0,0 +1,117 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import java.util.List; + +/** + * An interface to represent a batch of write operations. All write operation for a batch writer + * will be applied to the Datastore in one RPC call. + */ +interface DatastoreBatchWriter extends DatastoreWriter { + + /** + * Datastore add operation. This method will also allocate id for any entity with an incomplete + * key. As opposed to {@link #add(FullEntity)} and {@link #add(FullEntity...)}, this method will + * defer any necessary id allocation to submit time. + * + * @throws IllegalArgumentException if any of the given entities is missing a key + * @throws DatastoreException if a given entity with a complete key was already added to this + * writer or if not active + */ + void addWithDeferredIdAllocation(FullEntity... entities); + + /** + * {@inheritDoc} + * If {@code entity} has a complete key and was already marked for deletion in this writer, the + * operation will be changed to {@link #put}. + * + * @throws DatastoreException if a given entity with the same complete key was already added to + * this writer, if writer is not active or if id allocation for an entity with an incomplete + * key failed + */ + @Override + Entity add(FullEntity entity); + + /** + * {@inheritDoc} + * For entities with complete keys that were marked for deletion in this writer the operation + * will be changed to {@link #put}. + * + * @throws DatastoreException if a given entity with the same complete key was already added to + * this writer, if writer is not active or if id allocation for an entity with an incomplete + * key failed + */ + @Override + List add(FullEntity... entities); + + /** + * {@inheritDoc} + * This operation will be converted to {@link #put} operation for entities that were already + * added or put in this writer. + * + * @throws DatastoreException if an entity is marked for deletion in this writer or if not active + */ + @Override + void update(Entity... entities); + + /** + * {@inheritDoc} + * This operation will also remove from this batch any prior writes for entities with the same + * keys. + * + * @throws DatastoreException if not active + */ + @Override + void delete(Key... keys); + + /** + * Datastore put operation. This method will also allocate id for any entity with an incomplete + * key. As opposed to {@link #put(FullEntity)} and {@link #put(FullEntity...)}, this method will + * defer any necessary id allocation to submit time. + * + * @throws IllegalArgumentException if any of the given entities is missing a key + * @throws DatastoreException if not active + */ + void putWithDeferredIdAllocation(FullEntity... entities); + + /** + * {@inheritDoc} + * This operation will also remove from this writer any prior writes for the same entity. + * + * @throws DatastoreException if not active or if id allocation for an entity with an incomplete + * key failed + */ + @Override + Entity put(FullEntity entity); + + /** + * {@inheritDoc} + * This operation will also remove from this writer any prior writes for the same entities. + * + * @throws DatastoreException if not active or if id allocation for an entity with an incomplete + * key failed + */ + @Override + List put(FullEntity... entities); + + + /** + * Returns {@code true} if still active (write operations were not sent to the Datastore). + */ + boolean isActive(); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java new file mode 100644 index 000000000000..50392f4afece --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java @@ -0,0 +1,83 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.cloud.BaseServiceException; +import com.google.cloud.RetryHelper.RetryHelperException; +import com.google.cloud.http.BaseHttpServiceException; +import com.google.common.collect.ImmutableSet; +import java.io.IOException; +import java.util.Set; + +/** + * Datastore service exception. + * + * @see Google Cloud + * Datastore error codes + */ +public final class DatastoreException extends BaseHttpServiceException { + + // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes" + private static final Set RETRYABLE_ERRORS = ImmutableSet.of( + new Error(10, "ABORTED", false), + new Error(4, "DEADLINE_EXCEEDED", false), + new Error(14, "UNAVAILABLE", true)); + private static final long serialVersionUID = 2663750991205874435L; + + public DatastoreException(int code, String message, String reason) { + this(code, message, reason, true, null); + } + + public DatastoreException(int code, String message, String reason, Throwable cause) { + super(code, message, reason, true, RETRYABLE_ERRORS, cause); + } + + public DatastoreException(int code, String message, String reason, boolean idempotent, + Throwable cause) { + super(code, message, reason, idempotent, RETRYABLE_ERRORS, cause); + } + + public DatastoreException(IOException exception) { + super(exception, true, RETRYABLE_ERRORS); + } + + /** + * Translate RetryHelperException to the DatastoreException that caused the error. This method + * will always throw an exception. + * + * @throws DatastoreException when {@code ex} was caused by a {@code DatastoreException} + */ + static DatastoreException translateAndThrow(RetryHelperException ex) { + BaseServiceException.translate(ex); + throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null, ex.getCause()); + } + + /** + * Throw a DatastoreException with {@code FAILED_PRECONDITION} reason and the {@code message} in a + * nested exception. + * + * @throws DatastoreException every time + */ + static DatastoreException throwInvalidRequest(String massage, Object... params) { + throw new DatastoreException(UNKNOWN_CODE, String.format(massage, params), + "FAILED_PRECONDITION"); + } + + static DatastoreException propagateUserException(Exception ex) { + throw new DatastoreException(BaseServiceException.UNKNOWN_CODE, ex.getMessage(), null, ex); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java new file mode 100644 index 000000000000..98c1bcfa8e9c --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java @@ -0,0 +1,26 @@ +/* + * Copyright 2015 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.cloud.datastore; + + +import com.google.cloud.ServiceFactory; + +/** + * An interface for Datastore factories. + */ +public interface DatastoreFactory extends ServiceFactory { +} 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 new file mode 100644 index 000000000000..3c9d29a3472f --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java @@ -0,0 +1,90 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.common.collect.Iterators; +import com.google.common.collect.Maps; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +/** + * Provide functionality that should be added to the appropriate interfaces + * via Java 8 default methods. + */ +class DatastoreHelper { + + private DatastoreHelper() { + } + + static Key allocateId(Datastore service, IncompleteKey key) { + return service.allocateId(new IncompleteKey[]{key}).get(0); + } + + static Entity get(Transaction reader, Key key) { + return Iterators.getNext(reader.get(new Key[] {key}), null); + } + + static Entity get(Datastore reader, Key key, ReadOption... options) { + return Iterators.getNext(reader.get(Collections.singletonList(key), options), null); + } + + static Entity add(DatastoreWriter writer, FullEntity entity) { + return writer.add(new FullEntity[] {entity}).get(0); + } + + static Entity put(DatastoreWriter writer, FullEntity entity) { + return writer.put(new FullEntity[] {entity}).get(0); + } + + static KeyFactory newKeyFactory(DatastoreOptions options) { + return new KeyFactory(options.getProjectId(), options.getNamespace()); + } + + /** + * Returns a list with a value for each given key (ordered by input). {@code null} values are + * returned for nonexistent keys. + */ + static List fetch(Transaction reader, Key... keys) { + return compileEntities(keys, reader.get(keys)); + } + + /** + * Returns a list with a value for each given key (ordered by input). {@code null} values are + * returned for nonexistent keys. + */ + static List fetch(Datastore reader, Key[] keys, ReadOption... options) { + return compileEntities(keys, reader.get(Arrays.asList(keys), options)); + } + + private static List compileEntities(Key[] keys, Iterator entities) { + Map map = Maps.newHashMapWithExpectedSize(keys.length); + while (entities.hasNext()) { + Entity entity = entities.next(); + map.put(entity.getKey(), entity); + } + List list = new ArrayList<>(keys.length); + for (Key key : keys) { + // this will include nulls for nonexistent keys + list.add(map.get(key)); + } + return list; + } +} 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 new file mode 100644 index 000000000000..45fa212c8839 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java @@ -0,0 +1,538 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.api.gax.retrying.RetrySettings; +import com.google.cloud.BaseService; +import com.google.cloud.ExceptionHandler; +import com.google.cloud.RetryHelper; +import com.google.cloud.RetryHelper.RetryHelperException; +import com.google.cloud.ServiceOptions; +import com.google.cloud.datastore.ReadOption.EventualConsistency; +import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import com.google.common.base.MoreObjects; +import com.google.common.base.Preconditions; +import com.google.common.collect.AbstractIterator; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import com.google.datastore.v1.ReadOptions.ReadConsistency; +import com.google.datastore.v1.TransactionOptions; +import com.google.protobuf.ByteString; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; + +final class DatastoreImpl extends BaseService implements Datastore { + + private final DatastoreRpc datastoreRpc; + private final RetrySettings retrySettings; + private static final ExceptionHandler TRANSACTION_EXCEPTION_HANDLER = + TransactionExceptionHandler.build(); + + DatastoreImpl(DatastoreOptions options) { + super(options); + this.datastoreRpc = options.getDatastoreRpcV1(); + retrySettings = MoreObjects + .firstNonNull(options.getRetrySettings(), ServiceOptions.getNoRetrySettings()); + } + + @Override + public Batch newBatch() { + return new BatchImpl(this); + } + + @Override + public Transaction newTransaction(TransactionOptions transactionOptions) { + return new TransactionImpl(this, transactionOptions); + } + + @Override + public Transaction newTransaction() { + return new TransactionImpl(this); + } + + static class ReadWriteTransactionCallable implements Callable { + private final Datastore datastore; + private final TransactionCallable callable; + private volatile TransactionOptions options; + private volatile Transaction transaction; + + ReadWriteTransactionCallable(Datastore datastore, TransactionCallable callable, TransactionOptions options) { + this.datastore = datastore; + this.callable = callable; + this.options = options; + this.transaction = null; + } + + Datastore getDatastore() { + return datastore; + } + + TransactionOptions getOptions() { + return options; + } + + Transaction getTransaction() { + return transaction; + } + + void setPrevTransactionId(ByteString transactionId) { + TransactionOptions.ReadWrite readWrite = + TransactionOptions.ReadWrite.newBuilder().setPreviousTransaction(transactionId).build(); + options = options.toBuilder().setReadWrite(readWrite).build(); + } + + @Override + public T call() throws DatastoreException { + transaction = datastore.newTransaction(options); + try { + T value = callable.run(transaction); + transaction.commit(); + return value; + } catch (Exception ex) { + transaction.rollback(); + throw DatastoreException.propagateUserException(ex); + } finally { + if (transaction.isActive()) { + transaction.rollback(); + } + if (options != null && options.getModeCase().equals(TransactionOptions.ModeCase.READ_WRITE)) { + setPrevTransactionId(transaction.getTransactionId()); + } + } + } + } + + @Override + public T runInTransaction(final TransactionCallable callable) { + final DatastoreImpl self = this; + try { + return RetryHelper.runWithRetries( + new ReadWriteTransactionCallable(self, callable, null), + retrySettings, + TRANSACTION_EXCEPTION_HANDLER, + getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } + + @Override + public T runInTransaction(final TransactionCallable callable, TransactionOptions transactionOptions) { + final DatastoreImpl self = this; + try { + return RetryHelper.runWithRetries( + new ReadWriteTransactionCallable(self, callable, transactionOptions), + retrySettings, + TRANSACTION_EXCEPTION_HANDLER, + getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } + + @Override + public QueryResults run(Query query) { + return run(null, query); + } + + @Override + public QueryResults run(Query query, ReadOption... options) { + return run(toReadOptionsPb(options), query); + } + + QueryResults run(com.google.datastore.v1.ReadOptions readOptionsPb, Query query) { + return new QueryResultsImpl<>(this, readOptionsPb, query); + } + + com.google.datastore.v1.RunQueryResponse runQuery( + final com.google.datastore.v1.RunQueryRequest requestPb) { + try { + return RetryHelper.runWithRetries( + new Callable() { + @Override + public com.google.datastore.v1.RunQueryResponse call() + throws DatastoreException { + return datastoreRpc.runQuery(requestPb); + } + }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } + + @Override + public Key allocateId(IncompleteKey key) { + return DatastoreHelper.allocateId(this, key); + } + + private boolean verifyIncompleteKeyType(IncompleteKey... keys) { + for (IncompleteKey key : keys) { + if (key instanceof Key) { + return false; + } + } + return true; + } + + @Override + public List allocateId(IncompleteKey... keys) { + Preconditions.checkArgument(verifyIncompleteKeyType(keys), "keys must be IncompleteKey instances"); + if (keys.length == 0) { + return Collections.emptyList(); + } + com.google.datastore.v1.AllocateIdsRequest.Builder requestPb = + com.google.datastore.v1.AllocateIdsRequest.newBuilder(); + for (IncompleteKey key : keys) { + requestPb.addKeys(trimNameOrId(key).toPb()); + } + com.google.datastore.v1.AllocateIdsResponse responsePb = allocateIds(requestPb.build()); + ImmutableList.Builder keyList = ImmutableList.builder(); + for (com.google.datastore.v1.Key keyPb : responsePb.getKeysList()) { + keyList.add(Key.fromPb(keyPb)); + } + return keyList.build(); + } + + private com.google.datastore.v1.AllocateIdsResponse allocateIds( + final com.google.datastore.v1.AllocateIdsRequest requestPb) { + try { + return RetryHelper.runWithRetries( + new Callable() { + @Override + public com.google.datastore.v1.AllocateIdsResponse call() + throws DatastoreException { + return datastoreRpc.allocateIds(requestPb); + } + }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } + + private IncompleteKey trimNameOrId(IncompleteKey key) { + if (key instanceof Key) { + return IncompleteKey.newBuilder(key).build(); + } + return key; + } + + @Override + public Entity add(FullEntity entity) { + return DatastoreHelper.add(this, entity); + } + + @SuppressWarnings("unchecked") + @Override + public List add(FullEntity... entities) { + if (entities.length == 0) { + return Collections.emptyList(); + } + List mutationsPb = new ArrayList<>(); + Map completeEntities = new LinkedHashMap<>(); + for (FullEntity entity : entities) { + Entity completeEntity = null; + if (entity.getKey() instanceof Key) { + completeEntity = Entity.convert((FullEntity) entity); + } + if (completeEntity != null) { + if (completeEntities.put(completeEntity.getKey(), completeEntity) != null) { + throw DatastoreException.throwInvalidRequest( + "Duplicate entity with the key %s", entity.getKey()); + } + } else { + Preconditions.checkArgument(entity.hasKey(), "Entity %s is missing a key", entity); + } + mutationsPb.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(entity.toPb()).build()); + } + com.google.datastore.v1.CommitResponse commitResponse = commitMutation(mutationsPb); + Iterator mutationResults = + commitResponse.getMutationResultsList().iterator(); + ImmutableList.Builder responseBuilder = ImmutableList.builder(); + for (FullEntity entity : entities) { + Entity completeEntity = completeEntities.get(entity.getKey()); + if (completeEntity != null) { + responseBuilder.add(completeEntity); + mutationResults.next(); + } else { + responseBuilder.add( + Entity.newBuilder(Key.fromPb(mutationResults.next().getKey()), entity).build()); + } + } + return responseBuilder.build(); + } + + @Override + public Entity get(Key key) { + return DatastoreHelper.get(this, key); + } + + @Override + public Entity get(Key key, ReadOption... options) { + return DatastoreHelper.get(this, key, options); + } + + @Override + public Iterator get(Key... keys) { + return get(null, keys); + } + + @Override + public Iterator get(Iterable keys, ReadOption... options) { + return get(toReadOptionsPb(options), Iterables.toArray(keys, Key.class)); + } + + private static com.google.datastore.v1.ReadOptions toReadOptionsPb(ReadOption... options) { + com.google.datastore.v1.ReadOptions readOptionsPb = null; + if (options != null + && ReadOption.asImmutableMap(options).containsKey(EventualConsistency.class)) { + readOptionsPb = com.google.datastore.v1.ReadOptions.newBuilder() + .setReadConsistency(ReadConsistency.EVENTUAL) + .build(); + } + return readOptionsPb; + } + + @Override + public List fetch(Key... keys) { + return DatastoreHelper.fetch(this, keys); + } + + @Override + public List fetch(Iterable keys, ReadOption... options) { + return DatastoreHelper.fetch(this, Iterables.toArray(keys, Key.class), options); + } + + Iterator get(com.google.datastore.v1.ReadOptions readOptionsPb, final Key... keys) { + if (keys.length == 0) { + return Collections.emptyIterator(); + } + com.google.datastore.v1.LookupRequest.Builder requestPb = + com.google.datastore.v1.LookupRequest.newBuilder(); + if (readOptionsPb != null) { + requestPb.setReadOptions(readOptionsPb); + } + for (Key k : Sets.newLinkedHashSet(Arrays.asList(keys))) { + requestPb.addKeys(k.toPb()); + } + return new ResultsIterator(requestPb); + } + + final class ResultsIterator extends AbstractIterator { + + private final com.google.datastore.v1.LookupRequest.Builder requestPb; + Iterator iter; + + ResultsIterator(com.google.datastore.v1.LookupRequest.Builder requestPb) { + this.requestPb = requestPb; + loadResults(); + } + + private void loadResults() { + com.google.datastore.v1.LookupResponse responsePb = lookup(requestPb.build()); + iter = responsePb.getFoundList().iterator(); + requestPb.clearKeys(); + if (responsePb.getDeferredCount() > 0) { + requestPb.addAllKeys(responsePb.getDeferredList()); + } + } + + @SuppressWarnings("unchecked") + @Override + protected Entity computeNext() { + while (!iter.hasNext()) { + if (requestPb.getKeysCount() == 0) { + return endOfData(); + } + loadResults(); + } + return Entity.fromPb(iter.next().getEntity()); + } + } + + com.google.datastore.v1.LookupResponse lookup( + final com.google.datastore.v1.LookupRequest requestPb) { + try { + return RetryHelper.runWithRetries( + new Callable() { + @Override + public com.google.datastore.v1.LookupResponse call() + throws DatastoreException { + return datastoreRpc.lookup(requestPb); + } + }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } + + @Override + public void update(Entity... entities) { + if (entities.length > 0) { + List mutationsPb = new ArrayList<>(); + Map dedupEntities = new LinkedHashMap<>(); + for (Entity entity : entities) { + dedupEntities.put(entity.getKey(), entity); + } + for (Entity entity : dedupEntities.values()) { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build()); + } + commitMutation(mutationsPb); + } + } + + @Override + public Entity put(FullEntity entity) { + return DatastoreHelper.put(this, entity); + } + + @SuppressWarnings("unchecked") + @Override + public List put(FullEntity... entities) { + if (entities.length == 0) { + return Collections.emptyList(); + } + List mutationsPb = new ArrayList<>(); + Map dedupEntities = new LinkedHashMap<>(); + for (FullEntity entity : entities) { + Preconditions.checkArgument(entity.hasKey(), "Entity %s is missing a key", entity); + if (entity.getKey() instanceof Key) { + Entity completeEntity = Entity.convert((FullEntity) entity); + dedupEntities.put(completeEntity.getKey(), completeEntity); + } else { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + } + } + for (Entity entity : dedupEntities.values()) { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + } + com.google.datastore.v1.CommitResponse commitResponse = commitMutation(mutationsPb); + Iterator mutationResults = + commitResponse.getMutationResultsList().iterator(); + ImmutableList.Builder responseBuilder = ImmutableList.builder(); + for (FullEntity entity : entities) { + Entity completeEntity = dedupEntities.get(entity.getKey()); + if (completeEntity != null) { + responseBuilder.add(completeEntity); + } else { + responseBuilder.add( + Entity.newBuilder(Key.fromPb(mutationResults.next().getKey()), entity).build()); + } + } + return responseBuilder.build(); + } + + @Override + public void delete(Key... keys) { + if (keys.length > 0) { + List mutationsPb = new ArrayList<>(); + Set dedupKeys = new LinkedHashSet<>(Arrays.asList(keys)); + for (Key key : dedupKeys) { + mutationsPb.add( + com.google.datastore.v1.Mutation.newBuilder().setDelete(key.toPb()).build()); + } + commitMutation(mutationsPb); + } + } + + @Override + public KeyFactory newKeyFactory() { + return DatastoreHelper.newKeyFactory(getOptions()); + } + + private com.google.datastore.v1.CommitResponse commitMutation( + List mutationsPb) { + com.google.datastore.v1.CommitRequest.Builder requestPb = + com.google.datastore.v1.CommitRequest.newBuilder(); + requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.NON_TRANSACTIONAL); + requestPb.addAllMutations(mutationsPb); + return commit(requestPb.build()); + } + + com.google.datastore.v1.CommitResponse commit( + final com.google.datastore.v1.CommitRequest requestPb) { + try { + return RetryHelper.runWithRetries( + new Callable() { + @Override + public com.google.datastore.v1.CommitResponse call() throws DatastoreException { + return datastoreRpc.commit(requestPb); + } + }, + retrySettings, + EXCEPTION_HANDLER, getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } + + ByteString requestTransactionId( + com.google.datastore.v1.BeginTransactionRequest.Builder requestPb) { + return beginTransaction(requestPb.build()).getTransaction(); + } + + com.google.datastore.v1.BeginTransactionResponse beginTransaction( + final com.google.datastore.v1.BeginTransactionRequest requestPb) { + try { + return RetryHelper.runWithRetries( + new Callable() { + @Override + public com.google.datastore.v1.BeginTransactionResponse call() + throws DatastoreException { + return datastoreRpc.beginTransaction(requestPb); + } + }, + retrySettings, + EXCEPTION_HANDLER, getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } + + void rollbackTransaction(ByteString transaction) { + com.google.datastore.v1.RollbackRequest.Builder requestPb = + com.google.datastore.v1.RollbackRequest.newBuilder(); + requestPb.setTransaction(transaction); + rollback(requestPb.build()); + } + + void rollback(final com.google.datastore.v1.RollbackRequest requestPb) { + try { + RetryHelper.runWithRetries(new Callable() { + @Override + public Void call() throws DatastoreException { + datastoreRpc.rollback(requestPb); + return null; + } + }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock()); + } catch (RetryHelperException e) { + throw DatastoreException.translateAndThrow(e); + } + } +} 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 new file mode 100644 index 000000000000..8182d9833490 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java @@ -0,0 +1,206 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.cloud.datastore.Validator.validateNamespace; + +import com.google.cloud.http.HttpTransportOptions; +import com.google.cloud.ServiceDefaults; +import com.google.cloud.ServiceOptions; +import com.google.cloud.ServiceRpc; +import com.google.cloud.TransportOptions; +import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import com.google.cloud.datastore.spi.DatastoreRpcFactory; +import com.google.cloud.datastore.spi.v1.HttpDatastoreRpc; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableSet; +import java.lang.reflect.Method; +import java.util.Objects; +import java.util.Set; + +public class DatastoreOptions + extends ServiceOptions { + + private static final long serialVersionUID = -1018382430058137336L; + private static final String API_SHORT_NAME = "Datastore"; + private static final String DATASTORE_SCOPE = "https://www.googleapis.com/auth/datastore"; + private static final Set SCOPES = ImmutableSet.of(DATASTORE_SCOPE); + + private final String namespace; + + public static class DefaultDatastoreFactory implements DatastoreFactory { + + private static final DatastoreFactory INSTANCE = new DefaultDatastoreFactory(); + + @Override + public Datastore create(DatastoreOptions options) { + return new DatastoreImpl(options); + } + } + + public static class DefaultDatastoreRpcFactory implements DatastoreRpcFactory { + + private static final DatastoreRpcFactory INSTANCE = new DefaultDatastoreRpcFactory(); + + @Override + public ServiceRpc create(DatastoreOptions options) { + return new HttpDatastoreRpc(options); + } + } + + public static class Builder extends + ServiceOptions.Builder { + + private String namespace; + + private Builder() { + } + + private Builder(DatastoreOptions options) { + super(options); + namespace = options.namespace; + } + + @Override + public Builder setTransportOptions(TransportOptions transportOptions) { + if (!(transportOptions instanceof HttpTransportOptions)) { + throw new IllegalArgumentException( + "Only http transport is allowed for " + API_SHORT_NAME + "."); + } + return super.setTransportOptions(transportOptions); + } + + @Override + public DatastoreOptions build() { + return new DatastoreOptions(this); + } + + /** + * Sets the default namespace to be used by the datastore service. + */ + public Builder setNamespace(String namespace) { + this.namespace = validateNamespace(namespace); + return this; + } + } + + private DatastoreOptions(Builder builder) { + super(DatastoreFactory.class, DatastoreRpcFactory.class, builder, new DatastoreDefaults()); + namespace = builder.namespace != null ? builder.namespace : defaultNamespace(); + } + + @Override + protected String getDefaultHost() { + String host = System.getProperty( + com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR, + System.getenv(com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR)); + return host != null ? host : com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST; + } + + @Override + protected String getDefaultProject() { + String projectId = System.getProperty( + com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR, + System.getenv(com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR)); + return projectId != null ? projectId : super.getDefaultProject(); + } + + private static class DatastoreDefaults implements + ServiceDefaults { + + @Override + public DatastoreFactory getDefaultServiceFactory() { + return DefaultDatastoreFactory.INSTANCE; + } + + @Override + public DatastoreRpcFactory getDefaultRpcFactory() { + return DefaultDatastoreRpcFactory.INSTANCE; + } + + @Override + public TransportOptions getDefaultTransportOptions() { + return getDefaultHttpTransportOptions(); + } + } + + public static HttpTransportOptions getDefaultHttpTransportOptions() { + return HttpTransportOptions.newBuilder().build(); + } + + + /** + * Returns the default namespace to be used by the datastore service. + */ + public String getNamespace() { + return namespace; + } + + + /** + * Returns a default {@code DatastoreOptions} instance. + */ + public static DatastoreOptions getDefaultInstance() { + return newBuilder().build(); + } + + private static String defaultNamespace() { + try { + Class clazz = Class.forName("com.google.appengine.api.NamespaceManager"); + Method method = clazz.getMethod("get"); + String namespace = (String) method.invoke(null); + return MoreObjects.firstNonNull(namespace, ""); + } catch (Exception ignore) { + // return empty string (Datastore default namespace) if could not automatically determine + return ""; + } + } + + @Override + protected Set getScopes() { + return SCOPES; + } + + protected DatastoreRpc getDatastoreRpcV1() { + return (DatastoreRpc) getRpc(); + } + + @SuppressWarnings("unchecked") + @Override + public Builder toBuilder() { + return new Builder(this); + } + + @Override + public int hashCode() { + return Objects.hash(baseHashCode(), namespace); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof DatastoreOptions)) { + return false; + } + DatastoreOptions other = (DatastoreOptions) obj; + return baseEquals(other) && Objects.equals(namespace, other.namespace); + } + + + public static Builder newBuilder() { + return new Builder(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java new file mode 100644 index 000000000000..93c6b5053589 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java @@ -0,0 +1,58 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import java.util.Iterator; +import java.util.List; + +/** + * An interface to represent Google Cloud Datastore read operations. + */ +public interface DatastoreReader { + + /** + * Returns an {@link Entity} for the given {@link Key} or {@code null} if it doesn't exist. + * + * @throws DatastoreException upon failure + */ + Entity get(Key key); + + /** + * Returns an {@link Entity} for each given {@link Key} that exists in the Datastore. The order of + * the result is unspecified. Results are loaded lazily, so it is possible to get a + * {@code DatastoreException} from the returned {@code Iterator}'s + * {@link Iterator#hasNext hasNext} or {@link Iterator#next next} methods. + * + * @throws DatastoreException upon failure + * @see #get(Key) + */ + Iterator get(Key... keys); + + /** + * Returns a list with a value for each given key (ordered by input). {@code null} values are + * returned for nonexistent keys. When possible prefer using {@link #get(Key...)} to avoid eagerly + * loading the results. + */ + List fetch(Key... keys); + + /** + * Submits a {@link Query} and returns its result. + * + * @throws DatastoreException upon failure + */ + QueryResults run(Query query); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java new file mode 100644 index 000000000000..30ed9998dde5 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java @@ -0,0 +1,24 @@ +/* + * Copyright 2015 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.cloud.datastore; + + +/** + * An interface that combines both Google Cloud Datastore read and write operations. + */ +public interface DatastoreReaderWriter extends DatastoreReader, DatastoreWriter { +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java new file mode 100644 index 000000000000..6d18e95908b5 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java @@ -0,0 +1,85 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import java.util.List; + +/** + * An interface to represent Google Cloud Datastore write operations. + */ +public interface DatastoreWriter { + + /** + * Datastore add operation: inserts the provided entity. This method will automatically allocate + * an id if necessary. + * + * @param entity the entity to add + * @return an {@code Entity} with the same properties and a key that is either newly allocated + * or the same one if key is already complete + * @throws DatastoreException upon failure + * @throws IllegalArgumentException if the given entity is missing a key + */ + Entity add(FullEntity entity); + + /** + * Datastore add operation: inserts the provided entities. This method will automatically allocate + * id for any entity with an incomplete key. + * + * @return a list of {@code Entity} ordered by input with the same properties and a key that + * is either newly allocated or the same one if was already complete + * @throws DatastoreException upon failure + * @throws IllegalArgumentException if any of the given entities is missing a key + * @see #add(FullEntity) + */ + List add(FullEntity... entities); + + /** + * A Datastore update operation. The operation will fail if an entity with the same key does not + * already exist. + * + * @throws DatastoreException upon failure + */ + void update(Entity... entities); + + /** + * A Datastore put (a.k.a upsert) operation: inserts an entity if it does not exist, updates it + * otherwise. This method will automatically allocate an id if necessary. + * + * @param entity the entity to put + * @return an {@code Entity} with the same properties and a key that is either newly allocated + * or the same one if key is already complete + * @throws DatastoreException upon failure + * @throws IllegalArgumentException if the given entity is missing a key + */ + Entity put(FullEntity entity); + + /** + * A Datastore put (a.k.a upsert) operation: creates an entity if it does not exist, updates it + * otherwise. This method will automatically allocate id for any entity with an incomplete key. + * + * @return a list of updated or inserted {@code Entity}, ordered by input. Returned keys are + * either newly allocated or the same one if was already complete. + * @throws DatastoreException upon failure + * @throws IllegalArgumentException if any of the given entities is missing a key + */ + List put(FullEntity... entities); + + /** + * A datastore delete operation. It is OK to request the deletion of a non-existing key. + */ + void delete(Key... keys); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java new file mode 100644 index 000000000000..3e049c664038 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.DOUBLE_VALUE_FIELD_NUMBER; + +public final class DoubleValue extends Value { + + private static final long serialVersionUID = -6282769624277370453L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -48735616199736169L; + + @Override + public int getProtoFieldId() { + return DOUBLE_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(Double value) { + return DoubleValue.newBuilder(value); + } + + @Override + protected Double getValue(com.google.datastore.v1.Value from) { + return from.getDoubleValue(); + } + + @Override + protected void setValue(DoubleValue from, com.google.datastore.v1.Value.Builder to) { + to.setDoubleValue(from.get()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + public Builder() { + super(ValueType.DOUBLE); + } + + @Override + public DoubleValue build() { + return new DoubleValue(this); + } + } + + public DoubleValue(double value) { + this(newBuilder(value)); + } + + private DoubleValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static DoubleValue of(double value) { + return new DoubleValue(value); + } + + + public static Builder newBuilder(double value) { + return new Builder().set(value); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java new file mode 100644 index 000000000000..bc9f4c70c941 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java @@ -0,0 +1,97 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.Preconditions; + +/** + * An entity is the Google Cloud Datastore persistent data object for a specific key. + * An entity will always have a complete {@link Key}. + */ +public final class Entity extends FullEntity { + + private static final long serialVersionUID = 2312315289215899118L; + + public static final class Builder extends BaseEntity.Builder { + + private Builder() { + } + + private Builder(Key key) { + super(checkNotNull(key)); + } + + private Builder(Entity entity) { + super(entity); + } + + private Builder(Key key, FullEntity entity) { + setProperties(entity.getProperties()); + setKey(key); + } + + + @Override + public Builder setKey(Key key) { + super.setKey(checkNotNull(key)); + return this; + } + + @Override + public Entity build() { + Preconditions.checkState(key() != null); + return new Entity(this); + } + } + + Entity(Builder builder) { + super(builder); + } + + Entity(FullEntity from) { + super(from); + Preconditions.checkArgument(from.getKey() != null); + } + + static Entity convert(FullEntity from) { + if (from instanceof Entity) { + return (Entity) from; + } + return new Entity(from); + } + + + public static Builder newBuilder(Key key) { + return new Builder(key); + } + + + public static Builder newBuilder(Entity copyFrom) { + return new Builder(copyFrom); + } + + + public static Builder newBuilder(Key key, FullEntity copyFrom) { + return new Builder(key, copyFrom); + } + + static Entity fromPb(com.google.datastore.v1.Entity entityPb) { + return new Builder().fill(entityPb).build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java new file mode 100644 index 000000000000..47e7cc8b9146 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java @@ -0,0 +1,65 @@ +/* + * Copyright 2015 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.cloud.datastore; + +/** + * An implementation of a Google Cloud Datastore entity query that can be constructed by providing + * all the specific query elements. + * + * @see Datastore + * queries + */ +public final class EntityQuery extends StructuredQuery { + + private static final long serialVersionUID = -4748310327736758820L; + + /** + * A {@code EntityQuery} builder for queries that return {@link Entity} results. + */ + public static final class Builder extends StructuredQuery.BuilderImpl { + + Builder(EntityQuery query) { + super(query); + } + + Builder() { + super(ResultType.ENTITY); + } + + @Override + Builder mergeFrom(com.google.datastore.v1.Query queryPb) { + super.mergeFrom(queryPb); + clearProjection(); + clearDistinctOn(); + return this; + } + + @Override + public EntityQuery build() { + return new EntityQuery(this); + } + } + + EntityQuery(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder(this); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java new file mode 100644 index 000000000000..07b00b164df3 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.ENTITY_VALUE_FIELD_NUMBER; + +public class EntityValue extends Value> { + + private static final long serialVersionUID = 2231420223179039760L; + + static final BaseMarshaller, EntityValue, Builder> MARSHALLER = + new BaseMarshaller, EntityValue, Builder>() { + + private static final long serialVersionUID = 7349141367266671632L; + + @Override + public int getProtoFieldId() { + return ENTITY_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(FullEntity value) { + return EntityValue.newBuilder(value); + } + + @Override + protected FullEntity getValue(com.google.datastore.v1.Value from) { + return FullEntity.fromPb(from.getEntityValue()); + } + + @Override + protected void setValue(EntityValue from, com.google.datastore.v1.Value.Builder to) { + to.setEntityValue(from.get().toPb()); + } + }; + + public static final class Builder extends Value.BaseBuilder, EntityValue, Builder> { + + private Builder() { + super(ValueType.ENTITY); + } + + @Override + public EntityValue build() { + return new EntityValue(this); + } + } + + public EntityValue(FullEntity entity) { + this(newBuilder(entity)); + } + + private EntityValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static EntityValue of(FullEntity entity) { + return new EntityValue(entity); + } + + + public static Builder newBuilder(FullEntity entity) { + return new Builder().set(entity); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java new file mode 100644 index 000000000000..9f0fa547aa30 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java @@ -0,0 +1,72 @@ +/* + * Copyright 2015 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.cloud.datastore; + +/** + * A full entity is a {@link BaseEntity} that holds all the properties associated with a + * Datastore entity (as opposed to {@link ProjectionEntity}). + */ +public class FullEntity extends BaseEntity { + + private static final long serialVersionUID = -2075539363782670624L; + + public static class Builder extends BaseEntity.Builder> { + + Builder() { + } + + Builder(K key) { + super(key); + } + + Builder(FullEntity entity) { + super(entity); + } + + @Override + public FullEntity build() { + return new FullEntity<>(this); + } + } + + FullEntity(BaseEntity.Builder builder) { + super(builder); + } + + FullEntity(FullEntity from) { + super(from); + } + + + public static Builder newBuilder() { + return new Builder<>(); + } + + + public static Builder newBuilder(K key) { + return new Builder<>(key); + } + + + public static Builder newBuilder(FullEntity copyFrom) { + return new Builder<>(copyFrom); + } + + static FullEntity fromPb(com.google.datastore.v1.Entity entityPb) { + return new Builder<>().fill(entityPb).build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java new file mode 100644 index 000000000000..c3c40a3d3e2f --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java @@ -0,0 +1,525 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.cloud.datastore.Validator.validateNamespace; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.cloud.Timestamp; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSortedMap; +import com.google.common.primitives.Booleans; +import com.google.common.primitives.Doubles; +import com.google.common.primitives.Longs; +import io.grpc.Status; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; + +/** + * A Google Cloud Datastore GQL query. + * + *

A usage example:

+ * + *

When the type of the results is known the preferred usage would be: + * 

 {@code
+ * Query query =
+ *     Query.newGqlQueryBuilder(Query.ResultType.ENTITY, "select * from kind").build();
+ * QueryResults results = datastore.run(query);
+ * while (results.hasNext()) {
+ *   Entity entity = results.next();
+ *   ...
+ * }
+ * }
+ * + *

When the type of the results is unknown you can use this approach: + * 

 {@code
+ * Query query = Query.newGqlQueryBuilder("select __key__ from kind").build();
+ * QueryResults results = datastore.run(query);
+ * if (Key.class.isAssignableFrom(results.getResultClass())) {
+ *   QueryResults keys = (QueryResults) results;
+ *   while (keys.hasNext()) {
+ *     Key key = keys.next();
+ *     ...
+ *   }
+ * }
+ * }
+ * + * @param the type of the result values this query will produce + * @see GQL Reference + */ +public final class GqlQuery extends Query { + + private static final long serialVersionUID = -5514894742849230793L; + + private final String queryString; + private final boolean allowLiteral; + private final ImmutableMap namedBindings; + private final ImmutableList positionalBindings; + + static final class Binding implements Serializable { + + private static final long serialVersionUID = 2344746877591371548L; + + private final Cursor cursor; + private final Value value; + + Binding(Cursor cursor) { + this.cursor = checkNotNull(cursor); + value = null; + } + + Binding(Value value) { + this.value = checkNotNull(value); + cursor = null; + } + + Object getCursorOrValue() { + return MoreObjects.firstNonNull(cursor, value); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this).add("cursor", cursor).add("value", value).toString(); + } + + @Override + public int hashCode() { + return Objects.hash(cursor, value); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof Binding)) { + return false; + } + Binding other = (Binding) obj; + return Objects.equals(cursor, other.cursor) && Objects.equals(value, other.value); + } + + com.google.datastore.v1.GqlQueryParameter toPb() { + com.google.datastore.v1.GqlQueryParameter.Builder argPb = + com.google.datastore.v1.GqlQueryParameter.newBuilder(); + if (cursor != null) { + argPb.setCursor(cursor.getByteString()); + } + if (value != null) { + argPb.setValue(value.toPb()); + } + return argPb.build(); + } + + static Binding fromPb(com.google.datastore.v1.GqlQueryParameter argPb) { + switch (argPb.getParameterTypeCase()) { + case CURSOR: + return new Binding(new Cursor(argPb.getCursor())); + case VALUE: + return new Binding(Value.fromPb(argPb.getValue())); + default: + throw new AssertionError("Unexpected enum value " + argPb.getParameterTypeCase()); + } + } + } + + /** + * A GQL query builder. + */ + public static final class Builder { + + private final ResultType resultType; + private String namespace; + private String queryString; + private boolean allowLiteral; + private final Map namedBindings = new TreeMap<>(); + private final List positionalBindings = new LinkedList<>(); + + Builder(ResultType resultType, String query) { + this.resultType = checkNotNull(resultType); + queryString = checkNotNull(query); + } + + + /** + * Sets the GQL query. + */ + public Builder setQuery(String query) { + queryString = checkNotNull(query); + return this; + } + + + /** + * Sets the namespace for the GQL query. + */ + public Builder setNamespace(String namespace) { + this.namespace = validateNamespace(namespace); + return this; + } + + + /** + * Sets whether the query string can contain literals. When {@code false}, the query string + * must not contain any literals and instead must bind all values. + */ + public Builder setAllowLiteral(boolean allowLiteral) { + this.allowLiteral = allowLiteral; + return this; + } + + public Builder clearBindings() { + namedBindings.clear(); + positionalBindings.clear(); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param cursor a {@link Cursor} object that binds to a given name + */ + public Builder setBinding(String name, Cursor cursor) { + namedBindings.put(name, new Binding(cursor)); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a String object or a list of String objects that binds to a + * given name + */ + public Builder setBinding(String name, String... value) { + namedBindings.put(name, toBinding(StringValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a long value or a list of long values that binds to a given name + */ + public Builder setBinding(String name, long... value) { + namedBindings.put(name, toBinding(LongValue.MARSHALLER, Longs.asList(value))); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a double value or a list of double values that binds to a given name + */ + public Builder setBinding(String name, double... value) { + namedBindings.put(name, toBinding(DoubleValue.MARSHALLER, Doubles.asList(value))); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a boolean value or a list of boolean values that binds to a given name + */ + public Builder setBinding(String name, boolean... value) { + namedBindings.put(name, toBinding(BooleanValue.MARSHALLER, Booleans.asList(value))); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a {@link Timestamp} object or a list of {@link Timestamp} objects that binds to + * a given name + */ + public Builder setBinding(String name, Timestamp... value) { + namedBindings.put(name, toBinding(TimestampValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a {@link Key} object or a list of {@link Key} objects that binds to a given name + */ + public Builder setBinding(String name, Key... value) { + namedBindings.put(name, toBinding(KeyValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a {@link FullEntity} object or a list of {@link FullEntity} objects that binds + * to a given name + */ + @Deprecated + public Builder setBinding(String name, FullEntity... value) { + throw new DatastoreException(Status.Code.UNIMPLEMENTED.value(), "Binding entities is not supported.", "UNIMPLEMENTED"); + } + + /** + * Sets a new named binding. + * + * @param name name of the binding + * @param value a {@link Blob} object or list of {@link Blob} objects that binds to a given name + */ + public Builder setBinding(String name, Blob... value) { + namedBindings.put(name, toBinding(BlobValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + /** + * Sets a new positional binding. + * + * @param cursor a {@link Cursor} object to be set as a new positional binding + */ + public Builder addBinding(Cursor cursor) { + positionalBindings.add(new Binding(cursor)); + return this; + } + + /** + * Sets a new positional binding. + * + * @param value a String object or a list of String objects to be set as a new + * positional binding + */ + public Builder addBinding(String... value) { + positionalBindings.add(toBinding(StringValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + /** + * Sets a new positional binding. + * + * @param value a long value or a list of long values to be set as a new positional binding + */ + public Builder addBinding(long... value) { + positionalBindings.add(toBinding(LongValue.MARSHALLER, Longs.asList(value))); + return this; + } + + /** + * Sets a new positional binding. + * + * @param value a double value or a list of double values to be set as a new positional binding + */ + public Builder addBinding(double... value) { + positionalBindings.add(toBinding(DoubleValue.MARSHALLER, Doubles.asList(value))); + return this; + } + + /** + * Sets a new positional binding. + * + * @param value a boolean value or a list of boolean values to be set as a new positional + * binding + */ + public Builder addBinding(boolean... value) { + positionalBindings.add(toBinding(BooleanValue.MARSHALLER, Booleans.asList(value))); + return this; + } + + /** + * Sets a new positional binding. + * + * @param value a {@link Timestamp} object or a list of {@link Timestamp} objects to be set as a + * new positional binding + */ + public Builder addBinding(Timestamp... value) { + positionalBindings.add(toBinding(TimestampValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + /** + * Sets a new positional binding. + * + * @param value a {@link Key} object or a list of {@link Key} objects to be set as a new + * positional binding + */ + public Builder addBinding(Key... value) { + positionalBindings.add(toBinding(KeyValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + /** + * Sets a new positional binding. + * + * @param value a {@link FullEntity} object or a list of {@link FullEntity} objects to be set as + * a new positional binding + */ + @Deprecated + public Builder addBinding(FullEntity... value) { + throw new DatastoreException(Status.Code.UNIMPLEMENTED.value(), "Binding entities is not supported.", "UNIMPLEMENTED"); + } + + /** + * Sets a new positional binding. + * + * @param value a {@link Blob} object or a list of {@link Blob} objects to be set as a new + * positional binding + */ + public Builder addBinding(Blob... value) { + positionalBindings.add(toBinding(BlobValue.MARSHALLER, Arrays.asList(value))); + return this; + } + + public GqlQuery build() { + return new GqlQuery<>(this); + } + + private static Binding toBinding(Value.BuilderFactory builderFactory, + List values) { + List> list = new ArrayList<>(values.size()); + for (Object object : values) { + @SuppressWarnings("unchecked") + V v = (V) object; + list.add(builderFactory.newBuilder(v).build()); + } + Value value; + if (list.isEmpty()) { + value = new NullValue(); + } else if (list.size() == 1) { + value = list.get(0); + } else { + value = new ListValue(list); + } + return new Binding(value); + } + } + + private GqlQuery(Builder builder) { + super(builder.resultType, builder.namespace); + queryString = builder.queryString; + allowLiteral = builder.allowLiteral; + namedBindings = ImmutableMap.copyOf(builder.namedBindings); + positionalBindings = ImmutableList.copyOf(builder.positionalBindings); + } + + + /** + * Returns the query string for this query. + */ + public String getQueryString() { + return queryString; + } + + /** + * Returns whether the query string can contain literals. When {@code false}, the query string + * must not contain any literals and instead must bind all values. + */ + public boolean allowLiteral() { + return allowLiteral; + } + + + /** + * Returns an immutable map of named bindings. + */ + public Map getNamedBindings() { + ImmutableMap.Builder builder = ImmutableSortedMap.naturalOrder(); + for (Map.Entry binding : namedBindings.entrySet()) { + builder.put(binding.getKey(), binding.getValue().getCursorOrValue()); + } + return builder.build(); + } + + + /** + * Returns an immutable list of positional bindings (using original order). + */ + public List getNumberArgs() { + ImmutableList.Builder builder = ImmutableList.builder(); + for (Binding binding : positionalBindings) { + builder.add(binding.getCursorOrValue()); + } + return builder.build(); + } + + @Override + public String toString() { + return super.toStringHelper() + .add("queryString", queryString) + .add("allowLiteral", allowLiteral) + .add("namedBindings", namedBindings) + .add("positionalBindings", positionalBindings) + .toString(); + } + + @Override + public int hashCode() { + return Objects.hash(getNamespace(), queryString, allowLiteral, namedBindings, + positionalBindings); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof GqlQuery)) { + return false; + } + GqlQuery other = (GqlQuery) obj; + return Objects.equals(getNamespace(), other.getNamespace()) + && Objects.equals(queryString, other.queryString) + && allowLiteral == other.allowLiteral + && Objects.equals(namedBindings, other.namedBindings) + && Objects.equals(positionalBindings, other.positionalBindings); + } + + com.google.datastore.v1.GqlQuery toPb() { + com.google.datastore.v1.GqlQuery.Builder queryPb = + com.google.datastore.v1.GqlQuery.newBuilder(); + queryPb.setQueryString(queryString); + queryPb.setAllowLiterals(allowLiteral); + for (Map.Entry entry : namedBindings.entrySet()) { + queryPb.putNamedBindings(entry.getKey(), entry.getValue().toPb()); + } + for (Binding argument : positionalBindings) { + queryPb.addPositionalBindings(argument.toPb()); + } + return queryPb.build(); + } + + @Override + void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) { + requestPb.setGqlQuery(toPb()); + } + + @Override + Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) { + return StructuredQuery.fromPb(getType(), getNamespace(), responsePb.getQuery()) + .nextQuery(responsePb); + } +} 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 new file mode 100644 index 000000000000..194a0bbe9366 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java @@ -0,0 +1,116 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.util.List; + +/** + * An incomplete key (without a name or id). + * This class is immutable. + */ +public class IncompleteKey extends BaseKey { + + private static final long serialVersionUID = 4947014765344279019L; + + public static class Builder extends BaseKey.Builder { + + private Builder(String projectId, String kind) { + super(projectId, kind); + } + + private Builder(IncompleteKey copyFrom) { + super(copyFrom); + } + + @Override + public IncompleteKey build() { + ImmutableList path = ImmutableList.builder() + .addAll(ancestors).add(PathElement.of(kind)).build(); + return new IncompleteKey(projectId, namespace, path); + } + } + + IncompleteKey(String projectId, String namespace, ImmutableList path) { + super(projectId, namespace, path); + } + + static IncompleteKey fromPb(com.google.datastore.v1.Key keyPb) { + String projectId = ""; + String namespace = ""; + if (keyPb.hasPartitionId()) { + com.google.datastore.v1.PartitionId partitionIdPb = keyPb.getPartitionId(); + projectId = partitionIdPb.getProjectId(); + namespace = partitionIdPb.getNamespaceId(); + } + List pathElementsPb = keyPb.getPathList(); + Preconditions.checkArgument(!pathElementsPb.isEmpty(), "Path must not be empty"); + ImmutableList.Builder pathBuilder = ImmutableList.builder(); + for (com.google.datastore.v1.Key.PathElement pathElementPb : pathElementsPb) { + pathBuilder.add(PathElement.fromPb(pathElementPb)); + } + ImmutableList path = pathBuilder.build(); + PathElement leaf = path.get(path.size() - 1); + if (leaf.getNameOrId() != null) { + return new Key(projectId, namespace, path); + } + return new IncompleteKey(projectId, namespace, path); + } + + + /** + * Returns the key's parent. + */ + @Override + public Key getParent() { + List ancestors = getAncestors(); + if (ancestors.isEmpty()) { + return null; + } + PathElement parent = ancestors.get(ancestors.size() - 1); + Key.Builder keyBuilder; + if (parent.hasName()) { + keyBuilder = Key.newBuilder(getProjectId(), parent.getKind(), parent.getName()); + } else { + keyBuilder = Key.newBuilder(getProjectId(), parent.getKind(), parent.getId()); + } + String namespace = getNamespace(); + if (namespace != null) { + keyBuilder.setNamespace(namespace); + } + return keyBuilder.addAncestors(ancestors.subList(0, ancestors.size() - 1)).build(); + } + + + public static Builder newBuilder(String projectId, String kind) { + return new Builder(projectId, kind); + } + + + public static Builder newBuilder(IncompleteKey copyFrom) { + return new Builder(copyFrom); + } + + + public static Builder newBuilder(Key parent, String kind) { + return newBuilder(parent.getProjectId(), kind) + .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 new file mode 100644 index 000000000000..8f43ceb84a2a --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java @@ -0,0 +1,228 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.protobuf.TextFormat; + +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; + +/** + * A key that is guaranteed to be complete and could be used to reference a + * Google Cloud Datastore {@link Entity}. + * This class is immutable. + * + * @see Google Cloud Datastore + * Entities, Properties, and Keys + */ +public final class Key extends IncompleteKey { + + private static final long serialVersionUID = 2563249643000943477L; + + public static final class Builder extends BaseKey.Builder { + + private String name; + private Long id; + + private Builder(String projectId, String kind, String name) { + super(projectId, kind); + this.name = name; + } + + private Builder(String projectId, String kind, long id) { + super(projectId, kind); + this.id = id; + } + + private Builder(IncompleteKey copyFrom, String name) { + super(copyFrom); + this.name = name; + } + + private Builder(IncompleteKey copyFrom, long id) { + super(copyFrom); + this.id = id; + } + + private Builder(Key copyFrom) { + super(copyFrom); + if (copyFrom.hasId()) { + id = copyFrom.getId(); + } else { + name = copyFrom.getName(); + } + } + + + /** + * Sets the name of this key. + */ + public Builder setName(String name) { + this.name = name; + id = null; + return this; + } + + + /** + * Sets the ID of this key. + */ + public Builder setId(long id) { + this.id = id; + name = null; + return this; + } + + @Override + public Key build() { + ImmutableList.Builder pathBuilder = + ImmutableList.builder().addAll(ancestors); + if (id == null) { + pathBuilder.add(PathElement.of(kind, name)); + } else { + pathBuilder.add(PathElement.of(kind, id)); + } + return new Key(projectId, namespace, pathBuilder.build()); + } + } + + Key(String projectId, String namespace, ImmutableList path) { + super(projectId, namespace, path); + Preconditions.checkArgument(getNameOrId() != null); + } + + public boolean hasId() { + return getLeaf().hasId(); + } + + + /** + * Returns the key's id or {@code null} if it has a name instead. + */ + public Long getId() { + return getLeaf().getId(); + } + + public boolean hasName() { + return getLeaf().hasName(); + } + + + /** + * Returns the key's name or {@code null} if it has an id instead. + */ + public String getName() { + return getLeaf().getName(); + } + + + /** + * Returns the key's ID (as {@link Long}) or name (as {@link String}). Never {@code null}. + */ + public Object getNameOrId() { + return getLeaf().getNameOrId(); + } + + /** + * Returns the key in an encoded form that can be used as part of a URL. + */ + public String toUrlSafe() { + try { + return URLEncoder.encode(TextFormat.printToString(toPb()), UTF_8.name()); + } catch (UnsupportedEncodingException e) { + throw new IllegalStateException("Unexpected encoding exception", e); + } + } + + /** + * Create a {@code Key} given its URL safe encoded form. + * + * @throws IllegalArgumentException when decoding fails + */ + public static Key fromUrlSafe(String urlSafe) { + try { + String utf8Str = URLDecoder.decode(urlSafe, UTF_8.name()); + com.google.datastore.v1.Key.Builder builder = com.google.datastore.v1.Key.newBuilder(); + TextFormat.merge(utf8Str, builder); + return fromPb(builder.build()); + } catch (UnsupportedEncodingException e) { + throw new IllegalStateException("Unexpected decoding exception", e); + } catch (TextFormat.ParseException e) { + throw new IllegalArgumentException("Could not parse key", e); + } + } + + static Key fromPb(com.google.datastore.v1.Key keyPb) { + IncompleteKey key = IncompleteKey.fromPb(keyPb); + Preconditions.checkState(key instanceof Key, "Key is not complete"); + return (Key) key; + } + + + public static Builder newBuilder(String projectId, String kind, String name) { + return new Builder(projectId, kind, name); + } + + + public static Builder newBuilder(String projectId, String kind, long id) { + return new Builder(projectId, kind, id); + } + + + public static Builder newBuilder(Key copyFrom) { + return new Builder(copyFrom); + } + + + public static Builder newBuilder(IncompleteKey copyFrom, String name) { + return new Builder(copyFrom, name); + } + + + public static Builder newBuilder(IncompleteKey copyFrom, long id) { + return new Builder(copyFrom, id); + } + + + public static Builder newBuilder(Key parent, String kind, String name) { + Builder builder = newBuilder(parent.getProjectId(), kind, name); + addParentToBuilder(parent, builder); + return builder; + } + + + public static Builder newBuilder(Key parent, String kind, long id) { + Builder builder = newBuilder(parent.getProjectId(), kind, id); + addParentToBuilder(parent, builder); + return builder; + } + + private static void addParentToBuilder(Key parent, Builder builder) { + builder.setNamespace(parent.getNamespace()); + builder.addAncestors(parent.getAncestors()); + if (parent.hasId()) { + builder.addAncestors(PathElement.of(parent.getKind(), parent.getId())); + } else { + builder.addAncestors(PathElement.of(parent.getKind(), parent.getName())); + } + } +} 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 new file mode 100644 index 000000000000..62b79cba90e8 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java @@ -0,0 +1,75 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.common.collect.ImmutableList; + +/** + * A helper for creating keys for a specific {@link Datastore}, + * using its associated projectId and namespace. + */ +public final class KeyFactory extends BaseKey.Builder { + + private final String pi; + private final String ns; + + public KeyFactory(String projectId) { + this(projectId, ""); + } + + public KeyFactory(String projectId, String namespace) { + super(projectId); + setNamespace(namespace); + this.pi = projectId; + this.ns = namespace; + } + + public IncompleteKey newKey() { + ImmutableList path = ImmutableList.builder() + .addAll(ancestors).add(PathElement.of(kind)).build(); + return new IncompleteKey(projectId, namespace, path); + } + + public Key newKey(String name) { + ImmutableList path = ImmutableList.builder() + .addAll(ancestors).add(PathElement.of(kind, name)).build(); + return new Key(projectId, namespace, path); + } + + public Key newKey(long id) { + ImmutableList path = ImmutableList.builder() + .addAll(ancestors).add(PathElement.of(kind, id)).build(); + return new Key(projectId, namespace, path); + } + + /** + * Resets the KeyFactory to its initial state. + * @return {@code this} for chaining + */ + public KeyFactory reset() { + setProjectId(pi); + setNamespace(ns); + kind = null; + ancestors.clear(); + return this; + } + + @Override + protected IncompleteKey build() { + return newKey(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java new file mode 100644 index 000000000000..d1c660ec3c81 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java @@ -0,0 +1,66 @@ +/* + * Copyright 2015 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.cloud.datastore; + +/** + * An implementation of a Google Cloud Datastore key-only query that can be constructed by providing + * all the specific query elements. + * + * @see Datastore + * queries + */ +public final class KeyQuery extends StructuredQuery { + + private static final long serialVersionUID = 1187064062245269457L; + + /** + * A {@code KeyQuery} builder for queries that return {@link Key} results. + */ + public static final class Builder extends StructuredQuery.BuilderImpl { + + Builder(KeyQuery query) { + super(query); + } + + Builder() { + super(ResultType.KEY); + setProjection(KEY_PROPERTY_NAME); + } + + @Override + Builder mergeFrom(com.google.datastore.v1.Query queryPb) { + super.mergeFrom(queryPb); + setProjection(KEY_PROPERTY_NAME); + clearDistinctOn(); + return this; + } + + @Override + public KeyQuery build() { + return new KeyQuery(this); + } + } + + KeyQuery(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder(this); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java new file mode 100644 index 000000000000..94ce1e297f5d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.KEY_VALUE_FIELD_NUMBER; + +public final class KeyValue extends Value { + + private static final long serialVersionUID = 571775607775319610L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -4653913699919198594L; + + @Override + public int getProtoFieldId() { + return KEY_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(Key key) { + return KeyValue.newBuilder(key); + } + + @Override + protected Key getValue(com.google.datastore.v1.Value from) { + return Key.fromPb(from.getKeyValue()); + } + + @Override + protected void setValue(KeyValue from, com.google.datastore.v1.Value.Builder to) { + to.setKeyValue(from.get().toPb()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + public Builder() { + super(ValueType.KEY); + } + + @Override + public KeyValue build() { + return new KeyValue(this); + } + } + + public KeyValue(Key key) { + this(newBuilder(key)); + } + + private KeyValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static KeyValue of(Key key) { + return new KeyValue(key); + } + + + public static Builder newBuilder(Key key) { + return new Builder().set(key); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java new file mode 100644 index 000000000000..1a198a649075 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java @@ -0,0 +1,90 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkArgument; + +import java.io.Serializable; +import java.util.Objects; + +/** + * A Google Cloud Datastore LatLng (represented by latitude and longitude in degrees). + * This class is immutable. + * + * @see Google Cloud Datastore + * Entities, Properties, and Keys + */ +public final class LatLng implements Serializable { + + private static final long serialVersionUID = -3739859034159591779L; + + private final double latitude; + private final double longitude; + + LatLng(double latitude, double longitude) { + checkArgument( + latitude >= -90.0 && latitude <= 90.0, "latitude must be in the range [-90, 90] degrees"); + checkArgument( + longitude >= -180.0 && longitude <= 180.0, + "latitude must be in the range [-180, 180] degrees"); + this.latitude = latitude; + this.longitude = longitude; + } + + + /** + * Returns the latitude. + */ + public double getLatitude() { + return latitude; + } + + + /** + * Returns the longitude. + */ + public double getLongitude() { + return longitude; + } + + @Override + public String toString() { + return Double.toString(latitude) + ", " + Double.toString(longitude); + } + + @Override + public int hashCode() { + return Objects.hash(latitude, longitude); + } + + @Override + public boolean equals(Object obj) { + return obj == this || (obj instanceof LatLng && this.latitude == ((LatLng) obj).latitude + && this.longitude == ((LatLng) obj).longitude); + } + + public static LatLng of(double latitude, double longitude) { + return new LatLng(latitude, longitude); + } + + protected com.google.type.LatLng toPb() { + return com.google.type.LatLng.newBuilder() + .setLatitude(latitude) + .setLongitude(longitude) + .build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java new file mode 100644 index 000000000000..c8096eef122d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java @@ -0,0 +1,85 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.GEO_POINT_VALUE_FIELD_NUMBER; + +public final class LatLngValue extends Value { + + private static final long serialVersionUID = 565308388087634597L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -5226207069346124222L; + + @Override + public int getProtoFieldId() { + return GEO_POINT_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(LatLng value) { + return LatLngValue.newBuilder(value); + } + + @Override + protected LatLng getValue(com.google.datastore.v1.Value from) { + return new LatLng( + from.getGeoPointValue().getLatitude(), from.getGeoPointValue().getLongitude()); + } + + @Override + protected void setValue(LatLngValue from, com.google.datastore.v1.Value.Builder to) { + to.setGeoPointValue(from.get().toPb()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + private Builder() { + super(ValueType.LAT_LNG); + } + + @Override + public LatLngValue build() { + return new LatLngValue(this); + } + } + + public LatLngValue(LatLng value) { + this(newBuilder(value)); + } + + private LatLngValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static LatLngValue of(LatLng value) { + return new LatLngValue(value); + } + + + public static Builder newBuilder(LatLng value) { + return new Builder().set(value); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java new file mode 100644 index 000000000000..efe28d579466 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java @@ -0,0 +1,328 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.ARRAY_VALUE_FIELD_NUMBER; + +import com.google.cloud.Timestamp; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.util.ArrayList; +import java.util.List; + +/** + * A Google Cloud Datastore list value. A list value is a list of {@link Value} objects. + */ +public final class ListValue extends Value>> { + + private static final long serialVersionUID = -5121887228607148857L; + + static final BaseMarshaller>, ListValue, Builder> MARSHALLER = + new BaseMarshaller>, ListValue, Builder>() { + + private static final long serialVersionUID = 7720473855548179942L; + + @Override + public int getProtoFieldId() { + return ARRAY_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(List> values) { + return ListValue.newBuilder().set(values); + } + + @Override + protected List> getValue(com.google.datastore.v1.Value from) { + List> properties = new ArrayList<>(from.getArrayValue().getValuesCount()); + for (com.google.datastore.v1.Value valuePb : from.getArrayValue().getValuesList()) { + properties.add(Value.fromPb(valuePb)); + } + return properties; + } + + @Override + protected void setValue(ListValue from, com.google.datastore.v1.Value.Builder to) { + List propertiesPb = new ArrayList<>(); + for (Value property : from.get()) { + propertiesPb.add(property.toPb()); + } + to.setArrayValue(com.google.datastore.v1.ArrayValue.newBuilder() + .addAllValues(propertiesPb)); + } + }; + + public static final class Builder extends + Value.BaseBuilder>, ListValue, Builder> { + + private ImmutableList.Builder> listBuilder = ImmutableList.builder(); + + private Builder() { + super(ValueType.LIST); + } + + private void addValueHelper(Value value) { + // see datastore.proto definition for list_value + Preconditions.checkArgument(value.getType() != ValueType.LIST, "Cannot contain another list"); + listBuilder.add(value); + } + + /** + * Adds the provided values to the {@code ListValue} builder. + */ + public Builder addValue(Value first, Value... other) { + addValueHelper(first); + for (Value value : other) { + addValueHelper(value); + } + return this; + } + + /** + * Adds the provided string values to the {@code ListValue} builder. + */ + public Builder addValue(String first, String... other) { + listBuilder.add(StringValue.of(first)); + for (String value : other) { + listBuilder.add(StringValue.of(value)); + } + return this; + } + + /** + * Adds the provided long values to the {@code ListValue} builder. + */ + public Builder addValue(long first, long... other) { + listBuilder.add(LongValue.of(first)); + for (long value : other) { + listBuilder.add(LongValue.of(value)); + } + return this; + } + + /** + * Adds the provided double values to the {@code ListValue} builder. + */ + public Builder addValue(double first, double... other) { + listBuilder.add(DoubleValue.of(first)); + for (double value : other) { + listBuilder.add(DoubleValue.of(value)); + } + return this; + } + + /** + * Adds the provided boolean values to the {@code ListValue} builder. + */ + public Builder addValue(boolean first, boolean... other) { + listBuilder.add(BooleanValue.of(first)); + for (boolean value : other) { + listBuilder.add(BooleanValue.of(value)); + } + return this; + } + + /** + * Adds the provided {@code Timestamp} values to the {@code ListValue} builder. + */ + public Builder addValue(Timestamp first, Timestamp... other) { + listBuilder.add(TimestampValue.of(first)); + for (Timestamp value : other) { + listBuilder.add(TimestampValue.of(value)); + } + return this; + } + + /** + * Adds the provided {@code LatLng} values to the {@code ListValue} builder. + */ + public Builder addValue(LatLng first, LatLng... other) { + listBuilder.add(LatLngValue.of(first)); + for (LatLng value : other) { + listBuilder.add(LatLngValue.of(value)); + } + return this; + } + + /** + * Adds the provided {@code Key} values to the {@code ListValue} builder. + */ + public Builder addValue(Key first, Key... other) { + listBuilder.add(KeyValue.of(first)); + for (Key value : other) { + listBuilder.add(KeyValue.of(value)); + } + return this; + } + + /** + * Adds the provided {@code FullEntity} values to the {@code ListValue} builder. + */ + public Builder addValue(FullEntity first, FullEntity... other) { + listBuilder.add(EntityValue.of(first)); + for (FullEntity value : other) { + listBuilder.add(EntityValue.of(value)); + } + return this; + } + + /** + * Adds the provided {@code Blob} values to the {@code ListValue} builder. + */ + public Builder addValue(Blob first, Blob... other) { + listBuilder.add(BlobValue.of(first)); + for (Blob value : other) { + listBuilder.add(BlobValue.of(value)); + } + return this; + } + + /** + * Sets the list of values of this {@code ListValue} builder to {@code values}. The provided + * list is copied. + * + * @see com.google.cloud.datastore.Value.BaseBuilder#set(java.lang.Object) + */ + @Override + public Builder set(List> values) { + listBuilder = ImmutableList.builder(); + for (Value value : values) { + addValue(value); + } + return this; + } + + @Override + public List> get() { + return listBuilder.build(); + } + + /** + * Creates a {@code ListValue} object. + */ + @Override + public ListValue build() { + return new ListValue(this); + } + } + + public ListValue(List> values) { + this(newBuilder().set(values)); + } + + public ListValue(Value first, Value... other) { + this(new Builder().addValue(first, other)); + } + + private ListValue(Builder builder) { + super(builder); + } + + /** + * Returns a builder for the list value object. + */ + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + /** + * Creates a {@code ListValue} object given a list of {@code Value} objects. + */ + public static ListValue of(List> values) { + return new ListValue(values); + } + + /** + * Creates a {@code ListValue} object given a number of {@code Value} objects. + */ + public static ListValue of(Value first, Value... other) { + return new ListValue(first, other); + } + + /** + * Creates a {@code ListValue} object given a number of string values. + */ + public static ListValue of(String first, String... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of long values. + */ + public static ListValue of(long first, long... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of double values. + */ + public static ListValue of(double first, double... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of boolean values. + */ + public static ListValue of(boolean first, boolean... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of {@code Timestamp} values. + */ + public static ListValue of(Timestamp first, Timestamp... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of {@code LatLng} values. + */ + public static ListValue of(LatLng first, LatLng... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of {@code Key} values. + */ + public static ListValue of(Key first, Key... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of {@code FullEntity} values. + */ + public static ListValue of(FullEntity first, FullEntity... other) { + return newBuilder().addValue(first, other).build(); + } + + /** + * Creates a {@code ListValue} object given a number of {@code Blob} values. + */ + public static ListValue of(Blob first, Blob... other) { + return newBuilder().addValue(first, other).build(); + } + + + /** + * Returns a builder for {@code ListValue} objects. + */ + public static Builder newBuilder() { + return new Builder(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java new file mode 100644 index 000000000000..8f3f36f07db8 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.INTEGER_VALUE_FIELD_NUMBER; + +public final class LongValue extends Value { + + private static final long serialVersionUID = -3433015349912039278L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -8359920606872800391L; + + @Override + public int getProtoFieldId() { + return INTEGER_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(Long value) { + return LongValue.newBuilder(value); + } + + @Override + protected Long getValue(com.google.datastore.v1.Value from) { + return from.getIntegerValue(); + } + + @Override + protected void setValue(LongValue from, com.google.datastore.v1.Value.Builder to) { + to.setIntegerValue(from.get()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + private Builder() { + super(ValueType.LONG); + } + + @Override + public LongValue build() { + return new LongValue(this); + } + } + + public LongValue(long value) { + this(newBuilder(value)); + } + + private LongValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static LongValue of(long value) { + return new LongValue(value); + } + + + public static Builder newBuilder(long value) { + return new Builder().set(value); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java new file mode 100644 index 000000000000..c47fe16952a9 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java @@ -0,0 +1,92 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.datastore.v1.Value.NULL_VALUE_FIELD_NUMBER; + +public final class NullValue extends Value { + + private static final long serialVersionUID = 2089084567599008130L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = 6997769137212338027L; + + @Override + public Builder newBuilder(Void value) { + return NullValue.newBuilder(); + } + + @Override + public int getProtoFieldId() { + return NULL_VALUE_FIELD_NUMBER; + } + + @Override + protected Void getValue(com.google.datastore.v1.Value from) { + return null; + } + + @Override + protected void setValue(NullValue from, com.google.datastore.v1.Value.Builder to) { + to.setNullValue(com.google.protobuf.NullValue.NULL_VALUE); + } + }; + + public static final class Builder + extends Value.BaseBuilder { + + private Builder() { + super(ValueType.NULL); + } + + @Override + public NullValue build() { + return new NullValue(this); + } + + @Override + public Builder set(Void value) { + checkArgument(value == null, "Only null values are allowed"); + return this; + } + } + + public NullValue() { + this(newBuilder()); + } + + private NullValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static NullValue of() { + return new NullValue(); + } + + + public static Builder newBuilder() { + return new Builder(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java new file mode 100644 index 000000000000..588ec72a0238 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java @@ -0,0 +1,152 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; + +import java.io.Serializable; +import java.util.Objects; + +/** + * Represents a single element in a key's path. + */ +public final class PathElement implements Serializable { + + private static final long serialVersionUID = -777300414390493910L; + + private final String kind; + private final Long id; + private final String name; + + private PathElement(String kind, String name, Long id) { + this.kind = checkNotNull(kind, "kind must not be null"); + this.name = name; + this.id = id; + } + + + /** + * Returns the kind of this path element. + */ + public String getKind() { + return kind; + } + + public boolean hasId() { + return id != null; + } + + + /** + * Returns the ID of this path element. + */ + public Long getId() { + return id; + } + + public boolean hasName() { + return name != null; + } + + + /** + * Returns the name of this path element. + */ + public String getName() { + return name; + } + + + /** + * Returns the path element's ID (as {@link Long}) or name (as {@link String}). Never + * {@code null}. + */ + public Object getNameOrId() { + return id == null ? name : id; + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("kind", kind) + .add("id", id) + .add("name", name) + .toString(); + } + + @Override + public int hashCode() { + return Objects.hash(kind, id, name); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof PathElement)) { + return false; + } + PathElement other = (PathElement) obj; + return Objects.equals(kind, other.kind) + && Objects.equals(id, other.id) + && Objects.equals(name, other.name); + } + + com.google.datastore.v1.Key.PathElement toPb() { + com.google.datastore.v1.Key.PathElement.Builder pathElementPb = + com.google.datastore.v1.Key.PathElement.newBuilder(); + pathElementPb.setKind(kind); + if (id != null) { + pathElementPb.setId(id); + } else if (name != null) { + pathElementPb.setName(name); + } + return pathElementPb.build(); + } + + static PathElement fromPb(com.google.datastore.v1.Key.PathElement pathElementPb) { + String kind = pathElementPb.getKind(); + switch (pathElementPb.getIdTypeCase()) { + case ID: + return of(kind, pathElementPb.getId()); + case NAME: + return of(kind, pathElementPb.getName()); + default: + return of(kind); + } + } + + static PathElement of(String kind) { + return new PathElement(kind, null, null); + } + + public static PathElement of(String kind, String name) { + checkArgument(!Strings.isNullOrEmpty(name) , "name must not be empty or null"); + checkArgument(name.length() <= 500, "name must not exceed 500 characters"); + return new PathElement(kind, name, null); + } + + public static PathElement of(String kind, long id) { + checkArgument(id != 0, "id must not be equal to zero"); + return new PathElement(kind, null, id); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java new file mode 100644 index 000000000000..a76e1ec8efd0 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java @@ -0,0 +1,83 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.cloud.Timestamp; +import com.google.protobuf.ByteString; + +/** + * A projection entity is a result of a Google Cloud Datastore projection query. + * A projection entity holds one or more properties, represented by a name (as {@link String}) + * and a value (as {@link Value}), and may have a {@link Key}. + * + * @see Google Cloud + * Datastore projection queries + * @see Google Cloud Datastore + * Entities, Properties, and Keys + */ +public final class ProjectionEntity extends BaseEntity { + + private static final long serialVersionUID = -3399517537444851544L; + + public static final class Builder extends BaseEntity.Builder { + + Builder() { + } + + private Builder(ProjectionEntity entity) { + super(entity); + } + + @Override + public ProjectionEntity build() { + return new ProjectionEntity(this); + } + } + + ProjectionEntity(Builder builder) { + super(builder); + } + + @SuppressWarnings({"unchecked", "deprecation"}) + @Override + public Timestamp getTimestamp(String name) { + Value value = getValue(name); + if (value.getMeaning() == 18 && value instanceof LongValue) { + return Timestamp.ofTimeMicroseconds(getLong(name)); + } + return ((Value) value).get(); + } + + @SuppressWarnings({"unchecked", "deprecation"}) + @Override + public Blob getBlob(String name) { + Value value = getValue(name); + if (value.getMeaning() == 18 && value instanceof StringValue) { + return new Blob(ByteString.copyFromUtf8(getString(name))); + } + return ((Value) value).get(); + } + + static ProjectionEntity fromPb(com.google.datastore.v1.Entity entityPb) { + return new Builder().fill(entityPb).build(); + } + + + public static Builder newBuilder(ProjectionEntity copyFrom) { + return new Builder(copyFrom); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java new file mode 100644 index 000000000000..68684843f5a6 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java @@ -0,0 +1,114 @@ +/* + * Copyright 2015 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.cloud.datastore; + +/** + * An implementation of a Google Cloud Datastore projection entity query that can be constructed by + * providing all the specific query elements. + * + * @see Datastore + * queries + */ +public final class ProjectionEntityQuery extends StructuredQuery { + + private static final long serialVersionUID = 6217728277947673577L; + + /** + * A {@code ProjectionEntityQuery} builder for queries that return {@link ProjectionEntity} + * results. + */ + public static final class Builder extends StructuredQuery.BuilderImpl { + + Builder(ProjectionEntityQuery query) { + super(query); + } + + Builder() { + super(ResultType.PROJECTION_ENTITY); + } + + /** + * Clears the projection clause. + */ + @Override + public Builder clearProjection() { + super.clearProjection(); + return this; + } + + + /** + * Sets the query's projection clause (clearing any previously specified Projection settings). + */ + @Override + public Builder setProjection(String projection, String... others) { + super.setProjection(projection, others); + return this; + } + + /** + * Adds one or more projections to the existing projection clause. + */ + @Override + public Builder addProjection(String projection, String... others) { + super.addProjection(projection, others); + return this; + } + + /** + * Clears the group by clause. + */ + @Override + public Builder clearDistinctOn() { + super.clearDistinctOn(); + return this; + } + + + /** + * Sets the query's distinct on clause (clearing any previously specified distinct on settings). + */ + @Override + public Builder setDistinctOn(String property, String... others) { + super.setDistinctOn(property, others); + return this; + } + + /** + * Adds one or more properties to the existing group by clause. + */ + @Override + public Builder addDistinctOn(String property, String... others) { + super.addDistinctOn(property, others); + return this; + } + + @Override + public ProjectionEntityQuery build() { + return new ProjectionEntityQuery(this); + } + } + + ProjectionEntityQuery(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder(this); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java new file mode 100644 index 000000000000..bbb8dd46907e --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java @@ -0,0 +1,275 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; +import com.google.common.collect.Maps; + +import java.io.Serializable; +import java.util.Map; + +/** + * A Google Cloud Datastore query. + * For usage examples see {@link GqlQuery} and {@link StructuredQuery}. + * + *

Note that queries require proper indexing. See + * + * Cloud Datastore Index Configuration for help configuring indexes. + * + * @param the type of the values returned by this query. + * @see Datastore Queries + */ +public abstract class Query implements Serializable { + + private static final long serialVersionUID = 7967659059395653941L; + + private final ResultType resultType; + private final String namespace; + + /** + * This class represents the expected type of the result. + * ENTITY: A full entity represented by {@link Entity}. + * PROJECTION_ENTITY: A projection entity, represented by {@link ProjectionEntity}. + * KEY: An entity's {@link Key}. + */ + public abstract static class ResultType implements Serializable { + + private static final long serialVersionUID = 2104157695425806623L; + private static final Map> + PB_TO_INSTANCE = Maps.newEnumMap( + com.google.datastore.v1.EntityResult.ResultType.class); + + static final ResultType UNKNOWN = new ResultType(null, Object.class) { + + private static final long serialVersionUID = 1602329532153860907L; + + @Override + Object convert(com.google.datastore.v1.Entity entityPb) { + if (entityPb.getPropertiesMap().isEmpty()) { + if (!entityPb.hasKey()) { + return null; + } + return Key.fromPb(entityPb.getKey()); + } + return ProjectionEntity.fromPb(entityPb); + } + }; + + public static final ResultType ENTITY = + new ResultType(com.google.datastore.v1.EntityResult.ResultType.FULL, Entity.class) { + + private static final long serialVersionUID = 7712959777507168274L; + + @Override + Entity convert(com.google.datastore.v1.Entity entityPb) { + return Entity.fromPb(entityPb); + } + }; + + public static final ResultType KEY = + new ResultType(com.google.datastore.v1.EntityResult.ResultType.KEY_ONLY, Key.class) { + + private static final long serialVersionUID = -8514289244104446252L; + + @Override + Key convert(com.google.datastore.v1.Entity entityPb) { + return Key.fromPb(entityPb.getKey()); + } + }; + + public static final ResultType PROJECTION_ENTITY = + new ResultType(com.google.datastore.v1.EntityResult.ResultType.PROJECTION, + ProjectionEntity.class) { + + private static final long serialVersionUID = -7591409419690650246L; + + @Override + ProjectionEntity convert(com.google.datastore.v1.Entity entityPb) { + return ProjectionEntity.fromPb(entityPb); + } + }; + + private final Class resultClass; + private final com.google.datastore.v1.EntityResult.ResultType queryType; + + private ResultType(com.google.datastore.v1.EntityResult.ResultType queryType, + Class resultClass) { + this.queryType = queryType; + this.resultClass = resultClass; + if (queryType != null) { + PB_TO_INSTANCE.put(queryType, this); + } + } + + public Class resultClass() { + return resultClass; + } + + @Override + public int hashCode() { + return resultClass.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof ResultType)) { + return false; + } + ResultType other = (ResultType) obj; + return resultClass.equals(other.resultClass); + } + + @Override + public String toString() { + ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + toStringHelper.add("queryType", queryType); + toStringHelper.add("resultClass", resultClass); + return toStringHelper.toString(); + } + + boolean isAssignableFrom(ResultType otherResultType) { + return resultClass.isAssignableFrom(otherResultType.resultClass); + } + + abstract V convert(com.google.datastore.v1.Entity entityPb); + + static ResultType fromPb(com.google.datastore.v1.EntityResult.ResultType typePb) { + return MoreObjects.firstNonNull(PB_TO_INSTANCE.get(typePb), UNKNOWN); + } + } + + Query(ResultType resultType, String namespace) { + this.resultType = checkNotNull(resultType); + this.namespace = namespace; + } + + ResultType getType() { + return resultType; + } + + + public String getNamespace() { + return namespace; + } + + ToStringHelper toStringHelper() { + return MoreObjects.toStringHelper(this).add("type", resultType).add("namespace", namespace); + } + + abstract void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb); + + abstract Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb); + + + /** + * Returns a new {@link GqlQuery} builder. + * + *

Example of creating and running a GQL query. + * 

 {@code
+   * String kind = "my_kind";
+   * String gqlQuery = "select * from " + kind;
+   * Query query = Query.newGqlQueryBuilder(gqlQuery).build();
+   * QueryResults results = datastore.run(query);
+   * // Use results
+   * }
+ * + * @see GQL Reference + */ + public static GqlQuery.Builder newGqlQueryBuilder(String gql) { + return newGqlQueryBuilder(ResultType.UNKNOWN, gql); + } + + + /** + * Returns a new {@link GqlQuery} builder. + * + *

Example of creating and running a typed GQL query. + * 

 {@code
+   * String kind = "my_kind";
+   * String gqlQuery = "select * from " + kind;
+   * Query query = Query.newGqlQueryBuilder(Query.ResultType.ENTITY, gqlQuery).build();
+   * QueryResults results = datastore.run(query);
+   * // Use results
+   * }
+ * + * @see GQL Reference + */ + public static GqlQuery.Builder newGqlQueryBuilder(ResultType resultType, String gql) { + return new GqlQuery.Builder<>(resultType, gql); + } + + + /** + * Returns a new {@link StructuredQuery} builder for full (complete entities) queries. + * + *

Example of creating and running an entity query. + * 

 {@code
+   * String kind = "my_kind";
+   * Query query = Query.newEntityQueryBuilder().setKind(kind).build();
+   * QueryResults results = datastore.run(query);
+   * // Use results
+   * }
+ * + */ + public static EntityQuery.Builder newEntityQueryBuilder() { + return new EntityQuery.Builder(); + } + + + /** + * Returns a new {@link StructuredQuery} builder for key only queries. + * + *

Example of creating and running a key query. + * 

 {@code
+   * String kind = "my_kind";
+   * Query query = Query.newKeyQueryBuilder().setKind(kind).build();
+   * QueryResults results = datastore.run(query);
+   * // Use results
+   * }
+ * + */ + public static KeyQuery.Builder newKeyQueryBuilder() { + return new KeyQuery.Builder(); + } + + + /** + * Returns a new {@link StructuredQuery} builder for projection queries. + * + *

Example of creating and running a projection entity query. + * 

 {@code
+   * String kind = "my_kind";
+   * String property = "my_property";
+   * Query query = Query.newProjectionEntityQueryBuilder()
+   *     .setKind(kind)
+   *     .addProjection(property)
+   *     .build();
+   * QueryResults results = datastore.run(query);
+   * // Use results
+   * }
+ * + */ + public static ProjectionEntityQuery.Builder newProjectionEntityQueryBuilder() { + return new ProjectionEntityQuery.Builder(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java new file mode 100644 index 000000000000..8e4818ddc73e --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java @@ -0,0 +1,58 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import java.util.Iterator; + +/** + * The result of a Google Cloud Datastore query submission. + * When the result is not typed it is possible to cast it to its appropriate type according to + * the {@link #getResultClass} value. + * Results are loaded lazily in batches, where batch size is set by Cloud Datastore. As a result, it + * is possible to get a {@code DatastoreException} upon {@link Iterator#hasNext hasNext} or + * {@link Iterator#next next} calls. + * + * @param the type of the results value. + */ +public interface QueryResults extends Iterator { + + + /** + * Returns the actual class of the result's values. + */ + Class getResultClass(); + + + /** + * Returns the Cursor for the point after the value returned in the last {@link #next} call. This + * cursor can be used to issue subsequent queries (with the same constraints) that may return + * additional results. + * + *

A simple use case: + * 

 {@code
+   * Query query = Query.newEntityQueryBuilder()
+   *     .setKind("Person")
+   *     .setFilter(PropertyFilter.eq("favoriteFood", "pizza"))
+   *     .build();
+   * QueryResults results = datastore.run(query);
+   * // Consume some results (using results.next()) and do any other actions as necessary.
+   * query = query.toBuilder().setStartCursor(results.getCursorAfter()).build();
+   * results = datastore.run(query); // now we will iterate over all entities not yet consumed
+   * }
+ */ + Cursor getCursorAfter(); +} 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 new file mode 100644 index 000000000000..a3156093dcc6 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java @@ -0,0 +1,117 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.cloud.datastore.Query.ResultType; +import com.google.common.base.Preconditions; +import com.google.common.collect.AbstractIterator; +import com.google.datastore.v1.QueryResultBatch.MoreResultsType; +import com.google.protobuf.ByteString; + +import java.util.Iterator; +import java.util.Objects; + +class QueryResultsImpl extends AbstractIterator implements QueryResults { + + private final DatastoreImpl datastore; + private final com.google.datastore.v1.ReadOptions readOptionsPb; + private final com.google.datastore.v1.PartitionId partitionIdPb; + private final ResultType queryResultType; + private Query query; + private ResultType actualResultType; + private com.google.datastore.v1.RunQueryResponse runQueryResponsePb; + private com.google.datastore.v1.Query mostRecentQueryPb; + private boolean lastBatch; + private Iterator entityResultPbIter; + private ByteString cursor; + + QueryResultsImpl(DatastoreImpl datastore, com.google.datastore.v1.ReadOptions readOptionsPb, + Query query) { + this.datastore = datastore; + this.readOptionsPb = readOptionsPb; + this.query = query; + queryResultType = query.getType(); + com.google.datastore.v1.PartitionId.Builder pbBuilder = + com.google.datastore.v1.PartitionId.newBuilder(); + pbBuilder.setProjectId(datastore.getOptions().getProjectId()); + if (query.getNamespace() != null) { + pbBuilder.setNamespaceId(query.getNamespace()); + } else if (datastore.getOptions().getNamespace() != null) { + pbBuilder.setNamespaceId(datastore.getOptions().getNamespace()); + } + partitionIdPb = pbBuilder.build(); + sendRequest(); + if (runQueryResponsePb.getBatch().getSkippedResults() > 0) { + cursor = runQueryResponsePb.getBatch().getSkippedCursor(); + } else { + cursor = mostRecentQueryPb.getStartCursor(); + } + } + + private void sendRequest() { + com.google.datastore.v1.RunQueryRequest.Builder requestPb = + com.google.datastore.v1.RunQueryRequest.newBuilder(); + if (readOptionsPb != null) { + requestPb.setReadOptions(readOptionsPb); + } + requestPb.setPartitionId(partitionIdPb); + query.populatePb(requestPb); + runQueryResponsePb = datastore.runQuery(requestPb.build()); + mostRecentQueryPb = runQueryResponsePb.getQuery(); + if (mostRecentQueryPb == null) { + mostRecentQueryPb = requestPb.getQuery(); + } + lastBatch = runQueryResponsePb.getBatch().getMoreResults() != MoreResultsType.NOT_FINISHED; + entityResultPbIter = runQueryResponsePb.getBatch().getEntityResultsList().iterator(); + actualResultType = ResultType.fromPb(runQueryResponsePb.getBatch().getEntityResultType()); + if (Objects.equals(queryResultType, ResultType.PROJECTION_ENTITY)) { + // projection entity can represent all type of results + actualResultType = ResultType.PROJECTION_ENTITY; + } + Preconditions.checkState(queryResultType.isAssignableFrom(actualResultType), + "Unexpected result type " + actualResultType + " vs " + queryResultType); + } + + @Override + protected T computeNext() { + while (!entityResultPbIter.hasNext() && !lastBatch) { + query = query.nextQuery(runQueryResponsePb); + sendRequest(); + } + if (!entityResultPbIter.hasNext()) { + cursor = runQueryResponsePb.getBatch().getEndCursor(); + return endOfData(); + } + com.google.datastore.v1.EntityResult entityResultPb = entityResultPbIter.next(); + cursor = entityResultPb.getCursor(); + @SuppressWarnings("unchecked") + T result = (T) actualResultType.convert(entityResultPb.getEntity()); + return result; + } + + + @Override + public Class getResultClass() { + return actualResultType.resultClass(); + } + + + @Override + public Cursor getCursorAfter() { + return new Cursor(cursor); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java new file mode 100644 index 000000000000..2db0507e415d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java @@ -0,0 +1,87 @@ +/* + * Copyright 2015 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.cloud.datastore; + +public final class RawValue extends Value { + + private static final long serialVersionUID = 6615860024753061102L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -5724906360924425548L; + + @Override + public Builder newBuilder(com.google.datastore.v1.Value value) { + return RawValue.newBuilder(value); + } + + @Override + public int getProtoFieldId() { + return 0; + } + + @Override + protected com.google.datastore.v1.Value getValue( + com.google.datastore.v1.Value from) { + return from; + } + + @Override + protected void setValue(RawValue from, com.google.datastore.v1.Value.Builder to) { + to.mergeFrom(from.get()); + } + }; + + public static final class Builder + extends Value.BaseBuilder { + + private Builder() { + super(ValueType.RAW_VALUE); + } + + @Override + public RawValue build() { + return new RawValue(this); + } + } + + private RawValue(Builder builder) { + super(builder); + } + + RawValue(com.google.datastore.v1.Value valuePb) { + this(newBuilder(valuePb)); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + static RawValue of(com.google.datastore.v1.Value valuePb) { + return new RawValue(valuePb); + } + + static Builder newBuilder(com.google.datastore.v1.Value valuePb) { + Builder builder = new Builder(); + builder.setExcludeFromIndexes(valuePb.getExcludeFromIndexes()); + builder.setMeaning(valuePb.getMeaning()); + builder.set(valuePb); + return builder; + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java new file mode 100644 index 000000000000..9e9fca387fdc --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java @@ -0,0 +1,68 @@ +/* + * Copyright 2016 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.cloud.datastore; + +import com.google.common.collect.ImmutableMap; + +import java.io.Serializable; +import java.util.Map; + +/** + * Specifies options for read operations in Datastore, namely getting/fetching entities and running + * queries. + */ +public abstract class ReadOption implements Serializable { + + private static final long serialVersionUID = -4406964829189800528L; + + /** + * Specifies eventual consistency for reads from Datastore. Lookups and ancestor queries using + * this option permit Datastore to return stale results. + */ + public static final class EventualConsistency extends ReadOption { + + private static final long serialVersionUID = -6959530217724666172L; + + private final boolean eventualConsistency; + + private EventualConsistency(boolean eventualConsistency) { + this.eventualConsistency = eventualConsistency; + } + + public boolean isEventual() { + return eventualConsistency; + } + } + + private ReadOption() {} + + /** + * Returns a {@code ReadOption} that specifies eventual consistency, allowing Datastore to return + * stale results from gets, fetches, and ancestor queries. + */ + public static EventualConsistency eventualConsistency() { + return new EventualConsistency(true); + } + + static Map, ReadOption> asImmutableMap(ReadOption... options) { + ImmutableMap.Builder, ReadOption> builder = ImmutableMap.builder(); + for (ReadOption option : options) { + builder.put(option.getClass(), option); + } + return builder.build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java new file mode 100644 index 000000000000..a687835d5636 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.STRING_VALUE_FIELD_NUMBER; + +public final class StringValue extends Value { + + private static final long serialVersionUID = -8709280401468276732L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -635109599283869091L; + + @Override + public int getProtoFieldId() { + return STRING_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(String value) { + return StringValue.newBuilder(value); + } + + @Override + protected String getValue(com.google.datastore.v1.Value from) { + return from.getStringValue(); + } + + @Override + protected void setValue(StringValue from, com.google.datastore.v1.Value.Builder to) { + to.setStringValue(from.get()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + private Builder() { + super(ValueType.STRING); + } + + @Override + public StringValue build() { + return new StringValue(this); + } + } + + public StringValue(String value) { + this(newBuilder(value)); + } + + private StringValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static StringValue of(String value) { + return new StringValue(value); + } + + + public static Builder newBuilder(String value) { + return new Builder().set(value); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java new file mode 100644 index 000000000000..f0b099aeabc4 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java @@ -0,0 +1,1125 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.cloud.datastore.BlobValue.of; +import static com.google.cloud.datastore.BooleanValue.of; +import static com.google.cloud.datastore.DoubleValue.of; +import static com.google.cloud.datastore.KeyValue.of; +import static com.google.cloud.datastore.LongValue.of; +import static com.google.cloud.datastore.StringValue.of; +import static com.google.cloud.datastore.TimestampValue.of; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.api.core.ApiFunction; +import com.google.cloud.StringEnumType; +import com.google.cloud.StringEnumValue; +import com.google.cloud.Timestamp; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; + +/** + * An implementation of a Google Cloud Datastore Query that can be constructed by providing + * all the specific query elements. + * + *

A usage example:

+ * + *

A simple query that returns all entities for a specific kind + * 

 {@code
+ * Query query = Query.newEntityQueryBuilder().setKind(kind).build();
+ * QueryResults results = datastore.run(query);
+ * while (results.hasNext()) {
+ *   Entity entity = results.next();
+ *   ...
+ * }
+ * }
+ * + *

A simple key-only query of all entities for a specific kind + * 

 {@code
+ * Query keyOnlyQuery =  Query.newKeyQueryBuilder().setKind(KIND1).build();
+ * QueryResults results = datastore.run(keyOnlyQuery);
+ * ...
+ * }
+ * + *

A less trivial example of a projection query that returns the first 10 results + * of "age" and "name" properties (sorted and grouped by "age") with an age greater than 18 + * 

 {@code
+ * Query query = Query.newProjectionEntityQueryBuilder()
+ *     .setKind(kind)
+ *     .setProjection(Projection.property("age"), Projection.first("name"))
+ *     .setFilter(PropertyFilter.gt("age", 18))
+ *     .setGroupBy("age")
+ *     .setOrderBy(OrderBy.asc("age"))
+ *     .setLimit(10)
+ *     .build();
+ * QueryResults results = datastore.run(query);
+ * ...
+ * }
+ * + * @param the type of the result values this query will produce + * @see Datastore + * queries + */ +public abstract class StructuredQuery extends Query { + + private static final long serialVersionUID = 546838955624019594L; + static final String KEY_PROPERTY_NAME = "__key__"; + + private final String kind; + private final ImmutableList projection; + private final Filter filter; + private final ImmutableList distinctOn; + private final ImmutableList orderBy; + private final Cursor startCursor; + private final Cursor endCursor; + private final int offset; + private final Integer limit; + + public abstract static class Filter implements Serializable { + + private static final long serialVersionUID = -6443285436239990860L; + + Filter() { + } + + abstract com.google.datastore.v1.Filter toPb(); + + static Filter fromPb(com.google.datastore.v1.Filter filterPb) { + switch (filterPb.getFilterTypeCase()) { + case COMPOSITE_FILTER: + return CompositeFilter.fromPb(filterPb.getCompositeFilter()); + case PROPERTY_FILTER: + return PropertyFilter.fromPb(filterPb.getPropertyFilter()); + default: + throw new AssertionError("Unexpected enum value " + filterPb.getFilterTypeCase()); + } + } + } + + /** + * A class representing a filter composed of a combination of other filters. + */ + public static final class CompositeFilter extends Filter { + + private static final long serialVersionUID = 3610352685739360009L; + private final Operator operator; + private final ImmutableList filters; + + static final class Operator extends StringEnumValue { + private static final long serialVersionUID = -4806600805752138487L; + + private Operator(String constant) { + super(constant); + } + + private static final ApiFunction CONSTRUCTOR = + new ApiFunction() { + @Override + public Operator apply(String constant) { + return new Operator(constant); + } + }; + + private static final StringEnumType type = new StringEnumType( + Operator.class, + CONSTRUCTOR); + + static final Operator AND = type.createAndRegister("AND"); + + com.google.datastore.v1.CompositeFilter.Operator toPb() { + return com.google.datastore.v1.CompositeFilter.Operator.valueOf(name()); + } + + static Operator fromPb(com.google.datastore.v1.CompositeFilter.Operator operatorPb) { + return valueOf(operatorPb.name()); + } + + /** + * Get the Operator for the given String constant, and throw an exception if the constant is + * not recognized. + */ + static Operator valueOfStrict(String constant) { + return type.valueOfStrict(constant); + } + + /** + * Get the Operator for the given String constant, and allow unrecognized values. + */ + static Operator valueOf(String constant) { + return type.valueOf(constant); + } + + /** + * Return the known values for Operator. + */ + static Operator[] values() { + return type.values(); + } + } + + private CompositeFilter(Operator operator, Filter first, Filter... other) { + this.operator = operator; + this.filters = + ImmutableList.builder().add(first).addAll(Arrays.asList(other)).build(); + } + + private CompositeFilter(Operator operator, ImmutableList filters) { + this.operator = operator; + this.filters = filters; + Preconditions.checkArgument(!filters.isEmpty(), "filters list must not be empty"); + } + + @Override + public String toString() { + ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + toStringHelper.add("operator", operator); + toStringHelper.add("filters", filters); + return toStringHelper.toString(); + } + + @Override + public int hashCode() { + return Objects.hash(operator, filters); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof CompositeFilter)) { + return false; + } + CompositeFilter other = (CompositeFilter) obj; + return operator.equals(other.operator) + && filters.equals(other.filters); + } + + static CompositeFilter fromPb(com.google.datastore.v1.CompositeFilter compositeFilterPb) { + Operator operator = Operator.fromPb(compositeFilterPb.getOp()); + ImmutableList.Builder filters = ImmutableList.builder(); + for (com.google.datastore.v1.Filter filterPb : compositeFilterPb.getFiltersList()) { + Filter currFilter = Filter.fromPb(filterPb); + if (currFilter != null) { + filters.add(currFilter); + } + } + return new CompositeFilter(operator, filters.build()); + } + + public static CompositeFilter and(Filter first, Filter... other) { + return new CompositeFilter(Operator.AND, first, other); + } + + @Override + com.google.datastore.v1.Filter toPb() { + com.google.datastore.v1.Filter.Builder filterPb = com.google.datastore.v1.Filter.newBuilder(); + com.google.datastore.v1.CompositeFilter.Builder compositeFilterPb = + filterPb.getCompositeFilterBuilder(); + compositeFilterPb.setOp(operator.toPb()); + for (Filter filter : filters) { + compositeFilterPb.addFilters(filter.toPb()); + } + return filterPb.build(); + } + } + + /** + * A class representing a filter based on a single property or ancestor. + */ + public static final class PropertyFilter extends Filter { + + private static final long serialVersionUID = -4514695915258598597L; + + private final String property; + private final Operator operator; + private final Value value; + + static final class Operator extends StringEnumValue { + private static final long serialVersionUID = 4105765859141068029L; + + private Operator(String constant) { + super(constant); + } + + private static final ApiFunction CONSTRUCTOR = + new ApiFunction() { + @Override + public Operator apply(String constant) { + return new Operator(constant); + } + }; + + private static final StringEnumType type = new StringEnumType( + Operator.class, + CONSTRUCTOR); + + static final Operator LESS_THAN = type.createAndRegister("LESS_THAN"); + static final Operator LESS_THAN_OR_EQUAL = type + .createAndRegister("LESS_THAN_OR_EQUAL"); + static final Operator GREATER_THAN = type.createAndRegister("GREATER_THAN"); + static final Operator GREATER_THAN_OR_EQUAL = type + .createAndRegister("GREATER_THAN_OR_EQUAL"); + static final Operator EQUAL = type.createAndRegister("EQUAL"); + static final Operator HAS_ANCESTOR = type.createAndRegister("HAS_ANCESTOR"); + + com.google.datastore.v1.PropertyFilter.Operator toPb() { + return com.google.datastore.v1.PropertyFilter.Operator.valueOf(name()); + } + + static Operator fromPb(com.google.datastore.v1.PropertyFilter.Operator operatorPb) { + return valueOf(operatorPb.name()); + } + + /** + * Get the Operator for the given String constant, and throw an exception if the constant is + * not recognized. + */ + static Operator valueOfStrict(String constant) { + return type.valueOfStrict(constant); + } + + /** + * Get the Operator for the given String constant, and allow unrecognized values. + */ + static Operator valueOf(String constant) { + return type.valueOf(constant); + } + + /** + * Return the known values for Operator. + */ + static Operator[] values() { + return type.values(); + } + } + + private PropertyFilter(String property, Operator operator, Value value) { + this.property = checkNotNull(property); + this.operator = checkNotNull(operator); + this.value = checkNotNull(value); + } + + static PropertyFilter fromPb(com.google.datastore.v1.PropertyFilter propertyFilterPb) { + String property = propertyFilterPb.getProperty().getName(); + Operator operator = Operator.fromPb(propertyFilterPb.getOp()); + Value value = Value.fromPb(propertyFilterPb.getValue()); + return new PropertyFilter(property, operator, value); + } + + @Override + public String toString() { + ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + toStringHelper.add("property", property); + toStringHelper.add("operator", operator); + toStringHelper.add("value", value); + return toStringHelper.toString(); + } + + @Override + public int hashCode() { + return Objects.hash(property, operator, value); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof PropertyFilter)) { + return false; + } + PropertyFilter other = (PropertyFilter) obj; + return property.equals(other.property) + && operator.equals(other.operator) + && Objects.equals(value, other.value); + } + + public static PropertyFilter lt(String property, Value value) { + return new PropertyFilter(property, Operator.LESS_THAN, value); + } + + public static PropertyFilter lt(String property, String value) { + return new PropertyFilter(property, Operator.LESS_THAN, of(value)); + } + + public static PropertyFilter lt(String property, long value) { + return new PropertyFilter(property, Operator.LESS_THAN, of(value)); + } + + public static PropertyFilter lt(String property, double value) { + return new PropertyFilter(property, Operator.LESS_THAN, of(value)); + } + + public static PropertyFilter lt(String property, boolean value) { + return new PropertyFilter(property, Operator.LESS_THAN, of(value)); + } + + public static PropertyFilter lt(String property, Timestamp value) { + return new PropertyFilter(property, Operator.LESS_THAN, of(value)); + } + + public static PropertyFilter lt(String property, Key value) { + return new PropertyFilter(property, Operator.LESS_THAN, of(value)); + } + + public static PropertyFilter lt(String property, Blob value) { + return new PropertyFilter(property, Operator.LESS_THAN, of(value)); + } + + public static PropertyFilter le(String property, Value value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, value); + } + + public static PropertyFilter le(String property, String value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter le(String property, long value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter le(String property, double value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter le(String property, boolean value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter le(String property, Timestamp value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter le(String property, Key value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter le(String property, Blob value) { + return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter gt(String property, Value value) { + return new PropertyFilter(property, Operator.GREATER_THAN, value); + } + + public static PropertyFilter gt(String property, String value) { + return new PropertyFilter(property, Operator.GREATER_THAN, of(value)); + } + + public static PropertyFilter gt(String property, long value) { + return new PropertyFilter(property, Operator.GREATER_THAN, of(value)); + } + + public static PropertyFilter gt(String property, double value) { + return new PropertyFilter(property, Operator.GREATER_THAN, of(value)); + } + + public static PropertyFilter gt(String property, boolean value) { + return new PropertyFilter(property, Operator.GREATER_THAN, of(value)); + } + + public static PropertyFilter gt(String property, Timestamp value) { + return new PropertyFilter(property, Operator.GREATER_THAN, of(value)); + } + + public static PropertyFilter gt(String property, Key value) { + return new PropertyFilter(property, Operator.GREATER_THAN, of(value)); + } + + public static PropertyFilter gt(String property, Blob value) { + return new PropertyFilter(property, Operator.GREATER_THAN, of(value)); + } + + public static PropertyFilter ge(String property, Value value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, value); + } + + public static PropertyFilter ge(String property, String value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter ge(String property, long value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter ge(String property, double value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter ge(String property, boolean value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter ge(String property, Timestamp value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter ge(String property, Key value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter ge(String property, Blob value) { + return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value)); + } + + public static PropertyFilter eq(String property, Value value) { + return new PropertyFilter(property, Operator.EQUAL, value); + } + + public static PropertyFilter eq(String property, String value) { + return new PropertyFilter(property, Operator.EQUAL, of(value)); + } + + public static PropertyFilter eq(String property, long value) { + return new PropertyFilter(property, Operator.EQUAL, of(value)); + } + + public static PropertyFilter eq(String property, double value) { + return new PropertyFilter(property, Operator.EQUAL, of(value)); + } + + public static PropertyFilter eq(String property, boolean value) { + return new PropertyFilter(property, Operator.EQUAL, of(value)); + } + + public static PropertyFilter eq(String property, Timestamp value) { + return new PropertyFilter(property, Operator.EQUAL, of(value)); + } + + public static PropertyFilter eq(String property, Key value) { + return new PropertyFilter(property, Operator.EQUAL, of(value)); + } + + public static PropertyFilter eq(String property, Blob value) { + return new PropertyFilter(property, Operator.EQUAL, of(value)); + } + + public static PropertyFilter hasAncestor(Key key) { + return new PropertyFilter(KEY_PROPERTY_NAME, Operator.HAS_ANCESTOR, of(key)); + } + + public static PropertyFilter isNull(String property) { + return new PropertyFilter(property, Operator.EQUAL, NullValue.of()); + } + + @Override + com.google.datastore.v1.Filter toPb() { + com.google.datastore.v1.Filter.Builder filterPb = com.google.datastore.v1.Filter.newBuilder(); + com.google.datastore.v1.PropertyFilter.Builder propertyFilterPb = + filterPb.getPropertyFilterBuilder(); + propertyFilterPb.getPropertyBuilder().setName(property); + propertyFilterPb.setOp(operator.toPb()); + if (value != null) { + propertyFilterPb.setValue(value.toPb()); + } + return filterPb.build(); + } + } + + public static final class OrderBy implements Serializable { + + private static final long serialVersionUID = 4091186784814400031L; + + private final String property; + private final Direction direction; + + public static final class Direction extends StringEnumValue { + private static final long serialVersionUID = -6938125060419556331L; + + private Direction(String constant) { + super(constant); + } + + private static final ApiFunction CONSTRUCTOR = + new ApiFunction() { + @Override + public Direction apply(String constant) { + return new Direction(constant); + } + }; + + private static final StringEnumType type = new StringEnumType( + Direction.class, + CONSTRUCTOR); + + public static final Direction ASCENDING = type.createAndRegister("ASCENDING"); + public static final Direction DESCENDING = type.createAndRegister("DESCENDING"); + + com.google.datastore.v1.PropertyOrder.Direction toPb() { + return com.google.datastore.v1.PropertyOrder.Direction.valueOf(name()); + } + + static Direction fromPb(com.google.datastore.v1.PropertyOrder.Direction directionPb) { + return valueOf(directionPb.name()); + } + + /** + * Get the Direction for the given String constant, and throw an exception if the constant is + * not recognized. + */ + static Direction valueOfStrict(String constant) { + return type.valueOfStrict(constant); + } + + /** + * Get the Direction for the given String constant, and allow unrecognized values. + */ + static Direction valueOf(String constant) { + return type.valueOf(constant); + } + + /** + * Return the known values for Direction. + */ + static Direction[] values() { + return type.values(); + } + } + + public OrderBy(String property, Direction direction) { + this.property = checkNotNull(property); + this.direction = checkNotNull(direction); + } + + @Override + public int hashCode() { + return Objects.hash(property, direction); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof OrderBy)) { + return false; + } + OrderBy other = (OrderBy) obj; + return property.equals(other.property) + && direction.equals(other.direction); + } + + + /** + * Returns the property according to which the query result should be ordered. + */ + public String getProperty() { + return property; + } + + + /** + * Returns the order's direction. + */ + public Direction getDirection() { + return direction; + } + + com.google.datastore.v1.PropertyOrder toPb() { + return com.google.datastore.v1.PropertyOrder.newBuilder() + .setDirection(direction.toPb()) + .setProperty(com.google.datastore.v1.PropertyReference.newBuilder() + .setName(property).build()) + .build(); + } + + public static OrderBy asc(String property) { + return new OrderBy(property, OrderBy.Direction.ASCENDING); + } + + public static OrderBy desc(String property) { + return new OrderBy(property, OrderBy.Direction.DESCENDING); + } + + static OrderBy fromPb(com.google.datastore.v1.PropertyOrder propertyOrderPb) { + String property = propertyOrderPb.getProperty().getName(); + Direction direction = Direction.fromPb(propertyOrderPb.getDirection()); + return new OrderBy(property, direction); + } + + @Override + public String toString() { + ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + toStringHelper.add("property", getProperty()); + toStringHelper.add("direction", getDirection()); + return toStringHelper.toString(); + } + } + + /** + * Interface for StructuredQuery builders. + * + * @param the type of result the query returns. + */ + public interface Builder { + + + /** + * Sets the namespace for the query. + */ + Builder setNamespace(String namespace); + + + /** + * Sets the kind for the query. + */ + Builder setKind(String kind); + + + /** + * Sets the start cursor for the query. + */ + Builder setStartCursor(Cursor startCursor); + + + /** + * Sets the end cursor for the query. + */ + Builder setEndCursor(Cursor endCursor); + + + /** + * Sets the offset for the query. + */ + Builder setOffset(int offset); + + + /** + * Sets the limit for the query. + */ + Builder setLimit(Integer limit); + + + Builder setFilter(Filter filter); + + /** + * Clears any previously specified order by settings. + */ + Builder clearOrderBy(); + + + /** + * Sets the query's order by clause (clearing any previously specified order by settings). + */ + Builder setOrderBy(OrderBy orderBy, OrderBy... others); + + /** + * Adds settings to the existing order by clause. + */ + Builder addOrderBy(OrderBy orderBy, OrderBy... others); + + StructuredQuery build(); + } + + /** + * Base class for StructuredQuery builders. + * + * @param the type of result the query returns. + * @param the query builder. + */ + abstract static class BuilderImpl> implements Builder { + + private final ResultType resultType; + private String namespace; + private String kind; + private final List projection = new LinkedList<>(); + private Filter filter; + private final List distinctOn = new LinkedList<>(); + private final List orderBy = new LinkedList<>(); + private Cursor startCursor; + private Cursor endCursor; + private int offset; + private Integer limit; + + BuilderImpl(ResultType resultType) { + this.resultType = resultType; + } + + BuilderImpl(StructuredQuery query) { + this(query.getType()); + namespace = query.getNamespace(); + kind = query.kind; + projection.addAll(query.projection); + filter = query.filter; + distinctOn.addAll(query.distinctOn); + orderBy.addAll(query.orderBy); + startCursor = query.startCursor; + endCursor = query.endCursor; + offset = query.offset; + limit = query.limit; + } + + @SuppressWarnings("unchecked") + B self() { + return (B) this; + } + + + @Override + public B setNamespace(String namespace) { + this.namespace = namespace; + return self(); + } + + + @Override + public B setKind(String kind) { + this.kind = kind; + return self(); + } + + + @Override + public B setStartCursor(Cursor startCursor) { + this.startCursor = startCursor; + return self(); + } + + + @Override + public B setEndCursor(Cursor endCursor) { + this.endCursor = endCursor; + return self(); + } + + + @Override + public B setOffset(int offset) { + Preconditions.checkArgument(offset >= 0, "offset must not be negative"); + this.offset = offset; + return self(); + } + + + @Override + public B setLimit(Integer limit) { + Preconditions.checkArgument(limit == null || limit > 0, "limit must be positive"); + this.limit = limit; + return self(); + } + + + @Override + public B setFilter(Filter filter) { + this.filter = filter; + return self(); + } + + @Override + public B clearOrderBy() { + orderBy.clear(); + return self(); + } + + + @Override + public B setOrderBy(OrderBy orderBy, OrderBy... others) { + clearOrderBy(); + addOrderBy(orderBy, others); + return self(); + } + + @Override + public B addOrderBy(OrderBy orderBy, OrderBy... others) { + this.orderBy.add(orderBy); + Collections.addAll(this.orderBy, others); + return self(); + } + + B clearProjection() { + projection.clear(); + return self(); + } + + + B setProjection(String projection, String... others) { + clearProjection(); + addProjection(projection, others); + return self(); + } + + B addProjection(String projection, String... others) { + this.projection.add(projection); + Collections.addAll(this.projection, others); + return self(); + } + + B clearDistinctOn() { + distinctOn.clear(); + return self(); + } + + + B setDistinctOn(String property, String... others) { + clearDistinctOn(); + addDistinctOn(property, others); + return self(); + } + + B addDistinctOn(String property, String... others) { + this.distinctOn.add(property); + Collections.addAll(this.distinctOn, others); + return self(); + } + + B mergeFrom(com.google.datastore.v1.Query queryPb) { + if (queryPb.getKindCount() > 0) { + setKind(queryPb.getKind(0).getName()); + } + if (!queryPb.getStartCursor().isEmpty()) { + setStartCursor(new Cursor(queryPb.getStartCursor())); + } + if (!queryPb.getEndCursor().isEmpty()) { + setEndCursor(new Cursor(queryPb.getEndCursor())); + } + setOffset(queryPb.getOffset()); + if (queryPb.hasLimit()) { + setLimit(queryPb.getLimit().getValue()); + } + if (queryPb.hasFilter()) { + Filter currFilter = Filter.fromPb(queryPb.getFilter()); + if (currFilter != null) { + setFilter(currFilter); + } + } + for (com.google.datastore.v1.PropertyOrder orderByPb : queryPb.getOrderList()) { + addOrderBy(OrderBy.fromPb(orderByPb)); + } + for (com.google.datastore.v1.Projection projectionPb : queryPb.getProjectionList()) { + addProjection(projectionPb.getProperty().getName()); + } + for (com.google.datastore.v1.PropertyReference distinctOnPb : queryPb.getDistinctOnList()) { + addDistinctOn(distinctOnPb.getName()); + } + return self(); + } + } + + StructuredQuery(BuilderImpl builder) { + super(builder.resultType, builder.namespace); + kind = builder.kind; + projection = ImmutableList.copyOf(builder.projection); + filter = builder.filter; + distinctOn = ImmutableList.copyOf(builder.distinctOn); + orderBy = ImmutableList.copyOf(builder.orderBy); + startCursor = builder.startCursor; + endCursor = builder.endCursor; + offset = builder.offset; + limit = builder.limit; + } + + @Override + public String toString() { + return toStringHelper() + .add("kind", kind) + .add("startCursor", startCursor) + .add("endCursor", endCursor) + .add("offset", offset) + .add("limit", limit) + .add("filter", filter) + .add("orderBy", orderBy) + .add("projection", projection) + .add("distinctOn", distinctOn) + .toString(); + } + + @Override + public int hashCode() { + return Objects.hash(getNamespace(), kind, startCursor, endCursor, offset, limit, filter, + orderBy, projection, distinctOn); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof StructuredQuery)) { + return false; + } + StructuredQuery other = (StructuredQuery) obj; + return Objects.equals(getNamespace(), other.getNamespace()) + && Objects.equals(kind, other.kind) + && Objects.equals(startCursor, other.startCursor) + && Objects.equals(endCursor, other.endCursor) + && Objects.equals(offset, other.offset) + && Objects.equals(limit, other.limit) + && Objects.equals(filter, other.filter) + && Objects.equals(orderBy, other.orderBy) + && Objects.equals(projection, other.projection) + && Objects.equals(distinctOn, other.distinctOn); + + } + + + /** + * Returns the kind for this query. + */ + public String getKind() { + return kind; + } + + boolean isKeyOnly() { + return projection.size() == 1 && KEY_PROPERTY_NAME.equals(projection.get(0)); + } + + + /** + * Returns the projection for this query. + */ + public List getProjection() { + return projection; + } + + + /** + * Returns the filter for this query. + */ + public Filter getFilter() { + return filter; + } + + + /** + * Returns the distinct on clause for this query. + */ + public List getDistinctOn() { + return distinctOn; + } + + + /** + * Returns the order by clause for this query. + */ + public List getOrderBy() { + return orderBy; + } + + + /** + * Returns the start cursor for this query. + */ + public Cursor getStartCursor() { + return startCursor; + } + + + /** + * Returns the end cursor for this query. + */ + public Cursor getEndCursor() { + return endCursor; + } + + + /** + * Returns the offset for this query. + */ + public int getOffset() { + return offset; + } + + + /** + * Returns the limit for this query. + */ + public Integer getLimit() { + return limit; + } + + public abstract Builder toBuilder(); + + @Override + void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) { + requestPb.setQuery(toPb()); + } + + @Override + StructuredQuery nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) { + Builder builder = toBuilder(); + builder.setStartCursor(new Cursor(responsePb.getBatch().getEndCursor())); + if (offset > 0 && responsePb.getBatch().getSkippedResults() < offset) { + builder.setOffset(offset - responsePb.getBatch().getSkippedResults()); + } else { + builder.setOffset(0); + if (limit != null) { + builder.setLimit(limit - responsePb.getBatch().getEntityResultsCount()); + } + } + return builder.build(); + } + + com.google.datastore.v1.Query toPb() { + com.google.datastore.v1.Query.Builder queryPb = com.google.datastore.v1.Query.newBuilder(); + if (kind != null) { + queryPb.addKindBuilder().setName(kind); + } + if (startCursor != null) { + queryPb.setStartCursor(startCursor.getByteString()); + } + if (endCursor != null) { + queryPb.setEndCursor(endCursor.getByteString()); + } + if (offset > 0) { + queryPb.setOffset(offset); + } + if (limit != null) { + queryPb.setLimit(com.google.protobuf.Int32Value.newBuilder().setValue(limit)); + } + if (filter != null) { + queryPb.setFilter(filter.toPb()); + } + for (OrderBy value : orderBy) { + queryPb.addOrder(value.toPb()); + } + for (String value : distinctOn) { + queryPb.addDistinctOn(com.google.datastore.v1.PropertyReference.newBuilder() + .setName(value).build()); + } + for (String value : projection) { + com.google.datastore.v1.Projection.Builder expressionPb = + com.google.datastore.v1.Projection.newBuilder(); + expressionPb.setProperty( + com.google.datastore.v1.PropertyReference.newBuilder().setName(value).build()); + queryPb.addProjection(expressionPb.build()); + } + return queryPb.build(); + } + + @SuppressWarnings("unchecked") + static StructuredQuery fromPb(ResultType resultType, String namespace, + com.google.datastore.v1.Query queryPb) { + BuilderImpl builder; + if (resultType.equals(ResultType.ENTITY)) { + builder = new EntityQuery.Builder(); + } else if (resultType.equals(ResultType.KEY)) { + builder = new KeyQuery.Builder(); + } else { + builder = new ProjectionEntityQuery.Builder(); + } + return (StructuredQuery) builder.setNamespace(namespace).mergeFrom(queryPb).build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java new file mode 100644 index 000000000000..db599ec75d99 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java @@ -0,0 +1,86 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.datastore.v1.Value.TIMESTAMP_VALUE_FIELD_NUMBER; + +import com.google.cloud.Timestamp; + +public final class TimestampValue extends Value { + + private static final long serialVersionUID = -8502433575902990648L; + + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { + + private static final long serialVersionUID = -5789520029958113745L; + + @Override + public int getProtoFieldId() { + return TIMESTAMP_VALUE_FIELD_NUMBER; + } + + @Override + public Builder newBuilder(Timestamp value) { + return TimestampValue.newBuilder(value); + } + + @Override + protected Timestamp getValue(com.google.datastore.v1.Value from) { + return Timestamp.fromProto(from.getTimestampValue()); + } + + @Override + protected void setValue(TimestampValue from, com.google.datastore.v1.Value.Builder to) { + to.setTimestampValue(from.get().toProto()); + } + }; + + public static final class Builder extends Value.BaseBuilder { + + private Builder() { + super(ValueType.TIMESTAMP); + } + + @Override + public TimestampValue build() { + return new TimestampValue(this); + } + } + + public TimestampValue(Timestamp timestamp) { + this(newBuilder(timestamp)); + } + + private TimestampValue(Builder builder) { + super(builder); + } + + @Override + public Builder toBuilder() { + return new Builder().mergeFrom(this); + } + + public static TimestampValue of(Timestamp timestamp) { + return new TimestampValue(timestamp); + } + + + public static Builder newBuilder(Timestamp timestamp) { + return new Builder().set(timestamp); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java new file mode 100644 index 000000000000..035ddecaa6a8 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java @@ -0,0 +1,451 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.protobuf.ByteString; +import java.util.Iterator; +import java.util.List; + +/** + * A Google cloud datastore transaction. + * Similar to {@link Batch} any write operation that is applied on a transaction will only be sent + * to the Datastore upon {@link #commit}. A call to {@link #rollback} will invalidate + * the transaction and discard the changes. Any read operation that is done by a transaction + * will be part of it and therefore a {@code commit} is guaranteed to fail if an entity + * was modified outside of the transaction after it was read. Write operation on this + * transaction will not be reflected by read operation (as the changes are only sent to + * the Datastore upon {@code commit}. + * A usage example: + * 
 {@code
+ * Transaction transaction = datastore.newTransaction();
+ * try {
+ *   Entity entity = transaction.get(key);
+ *   if (!entity.contains("last_name") || entity.isNull("last_name")) {
+ *     String[] name = entity.getString("name").split(" ");
+ *     entity = Entity.newBuilder(entity)
+ *         .remove("name")
+ *         .set("first_name", name[0])
+ *         .set("last_name", name[1])
+ *         .build();
+ *     transaction.update(entity);
+ *     transaction.commit();
+ *   }
+ * } finally {
+ *   if (transaction.isActive()) {
+ *     transaction.rollback();
+ *   }
+ * }
+ * }
+ * + * @see + * Google Cloud Datastore transactions + * + */ +public interface Transaction extends DatastoreBatchWriter, DatastoreReaderWriter { + + interface Response { + + /** + * Returns a list of keys generated by a transaction. + */ + List getGeneratedKeys(); + } + + /** + * {@inheritDoc} + * The requested entity will be part of this Datastore transaction (so a commit is guaranteed + * to fail if entity was changed by others after it was seen by this transaction) but any + * write changes in this transaction will not be reflected by the returned entity. + * + *

Example of getting an entity for a given key. + * 

 {@code
+   * String keyName = "my_key_name";
+   * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
+   * Entity entity = transaction.get(key);
+   * transaction.commit();
+   * // Do something with the entity
+   * }
+ * + * @throws DatastoreException upon failure or if no longer active + */ + @Override + Entity get(Key key); + + /** + * {@inheritDoc} + * The requested entities will be part of this Datastore transaction (so a commit is guaranteed + * to fail if any of the entities was changed by others after they were seen by this transaction) + * but any write changes in this transaction will not be reflected by the returned entities. + * + *

Example of getting entities for several keys. + * 

 {@code
+   * String firstKeyName = "my_first_key_name";
+   * String secondKeyName = "my_second_key_name";
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key firstKey = keyFactory.newKey(firstKeyName);
+   * Key secondKey = keyFactory.newKey(secondKeyName);
+   * Iterator entitiesIterator = transaction.get(firstKey, secondKey);
+   * List entities = Lists.newArrayList();
+   * while (entitiesIterator.hasNext()) {
+   *   Entity entity = entitiesIterator.next();
+   *   // do something with the entity
+   *   entities.add(entity);
+   * }
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException upon failure or if no longer active + */ + @Override + Iterator get(Key... key); + + /** + * {@inheritDoc} + * The requested entities will be part of this Datastore transaction (so a commit is guaranteed + * to fail if any of the entities was changed by others after they were seen by this transaction) + * but any write changes in this transaction will not be reflected by the returned entities. + * + *

Example of fetching a list of entities for several keys. + * 

 {@code
+   * String firstKeyName = "my_first_key_name";
+   * String secondKeyName = "my_second_key_name";
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key firstKey = keyFactory.newKey(firstKeyName);
+   * Key secondKey = keyFactory.newKey(secondKeyName);
+   * List entities = transaction.fetch(firstKey, secondKey);
+   * for (Entity entity : entities) {
+   *   // do something with the entity
+   * }
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException upon failure or if no longer active + */ + @Override + List fetch(Key... keys); + + /** + * {@inheritDoc} + * The entities returned by the result of this query will be part of this Datastore transaction + * (so a commit is guaranteed to fail if any of the entities was changed by others after the + * query was performed) but any write changes in this transaction will not be reflected by + * the result. + * + *

Example of running a query to find all entities with an ancestor. + * 

 {@code
+   * String parentKeyName = "my_parent_key_name";
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("ParentKind");
+   * Key parentKey = keyFactory.newKey(parentKeyName);
+   * // Build a query
+   * Query query = Query.newEntityQueryBuilder()
+   *     .setKind("MyKind")
+   *     .setFilter(PropertyFilter.hasAncestor(parentKey))
+   *     .build();
+   * QueryResults results = transaction.run(query);
+   * List entities = Lists.newArrayList();
+   * while (results.hasNext()) {
+   *   Entity result = results.next();
+   *   // do something with result
+   *   entities.add(result);
+   * }
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException upon failure or if no longer active + */ + @Override + QueryResults run(Query query); + + /** + * Datastore add operation. This method will also allocate id for any entity with an incomplete + * key. As opposed to {@link #add(FullEntity)} and {@link #add(FullEntity...)}, this method will + * defer any necessary id allocation to commit time. + * + *

Example of adding multiple entities with deferred id allocation. + * 

 {@code
+   * IncompleteKey key1 = datastore.newKeyFactory().setKind("MyKind").newKey();
+   * FullEntity.Builder entityBuilder1 = FullEntity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "value1");
+   * FullEntity entity1 = entityBuilder1.build();
+   * 
+   * IncompleteKey key2 = datastore.newKeyFactory().setKind("MyKind").newKey();
+   * FullEntity.Builder entityBuilder2 = FullEntity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "value2");
+   * FullEntity entity2 = entityBuilder2.build();
+   * 
+   * transaction.addWithDeferredIdAllocation(entity1, entity2);
+   * Response response = transaction.commit();
+   * }
+ * + * @throws DatastoreException if a given entity with a complete key was already added to this + * transaction or if the transaction is no longer active + */ + void addWithDeferredIdAllocation(FullEntity... entities); + + /** + * {@inheritDoc} + * + *

Example of adding a single entity. + * 

 {@code
+   * String keyName = "my_key_name";
+   * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
+   * Entity.Builder entityBuilder = Entity.newBuilder(key);
+   * entityBuilder.set("propertyName", "value");
+   * Entity entity = entityBuilder.build();
+   * transaction.add(entity);
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException if a given entity with the same complete key was already added to + * this writer, if the transaction is no longer active or if id allocation for an entity with + * an incomplete key failed + */ + @Override + Entity add(FullEntity entity); + + /** + * {@inheritDoc} + * + *

Example of adding multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name1";
+   * String keyName2 = "my_key_name2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "value1");
+   * Entity entity1 = entityBuilder1.build();
+   * 
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "value2");
+   * Entity entity2 = entityBuilder2.build();
+   * 
+   * transaction.add(entity1, entity2);
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException if a given entity with the same complete key was already added to + * this writer, if the transaction is no longer active or if id allocation for an entity with + * an incomplete key failed + */ + @Override + List add(FullEntity... entities); + + /** + * {@inheritDoc} + * This operation will be converted to {@link #put} operation for entities that were already + * added or put in this writer. + * + *

Example of updating multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name1";
+   * String keyName2 = "my_key_name2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "value3");
+   * Entity entity1 = entityBuilder1.build();
+   * 
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "value4");
+   * Entity entity2 = entityBuilder2.build();
+   * 
+   * transaction.update(entity1, entity2);
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException if an entity is marked for deletion in this transaction or if the + * transaction is no longer active + */ + @Override + void update(Entity... entities); + + /** + * {@inheritDoc} + * This operation will also remove from this transaction any prior writes for entities with the + * same keys. + * + *

Example of deleting multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name1";
+   * String keyName2 = "my_key_name2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * transaction.delete(key1, key2);
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException upon failure or if no longer active + */ + @Override + void delete(Key... keys); + + /** + * Datastore put operation. This method will also allocate id for any entity with an incomplete + * key. As opposed to {@link #put(FullEntity)} and {@link #put(FullEntity...)}, this method will + * defer any necessary id allocation to commit time. + * + *

Example of putting multiple entities with deferred id allocation. + * 

 {@code
+   * IncompleteKey key1 = datastore.newKeyFactory().setKind("MyKind").newKey();
+   * FullEntity.Builder entityBuilder1 = FullEntity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "value1");
+   * FullEntity entity1 = entityBuilder1.build();
+   * 
+   * IncompleteKey key2 = datastore.newKeyFactory().setKind("MyKind").newKey();
+   * FullEntity.Builder entityBuilder2 = FullEntity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "value2");
+   * FullEntity entity2 = entityBuilder2.build();
+   * 
+   * transaction.putWithDeferredIdAllocation(entity1, entity2);
+   * Response response = transaction.commit();
+   * }
+ * + * @throws IllegalArgumentException if any of the given entities is missing a key + * @throws DatastoreException if no longer active + */ + void putWithDeferredIdAllocation(FullEntity... entities); + + /** + * {@inheritDoc} + * This operation will also remove from this transaction any prior writes for the same entity. + * + *

Example of putting a single entity. + * 

 {@code
+   * String keyName = "my_key_name";
+   * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
+   * Entity.Builder entityBuilder = Entity.newBuilder(key);
+   * entityBuilder.set("propertyName", "value");
+   * Entity entity = entityBuilder.build();
+   * transaction.put(entity);
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException if id allocation for an entity with an incomplete key failed or if + * the transaction is no longer active + */ + @Override + Entity put(FullEntity entity); + + /** + * {@inheritDoc} + * This operation will also remove from this transaction any prior writes for the same entities. + * + *

Example of putting multiple entities. + * 

 {@code
+   * String keyName1 = "my_key_name1";
+   * String keyName2 = "my_key_name2";
+   * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
+   * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
+   * entityBuilder1.set("propertyName", "value1");
+   * Entity entity1 = entityBuilder1.build();
+   * 
+   * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
+   * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
+   * entityBuilder2.set("propertyName", "value2");
+   * Entity entity2 = entityBuilder2.build();
+   * 
+   * transaction.put(entity1, entity2);
+   * transaction.commit();
+   * }
+ * + * @throws DatastoreException if id allocation for an entity with an incomplete key failed or if + * the transaction is no longer active + */ + @Override + List put(FullEntity... entities); + + /** + * Commit the transaction. + * + *

Example of committing a transaction. + * 

 {@code
+   * // create an entity
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key key = datastore.allocateId(keyFactory.newKey());
+   * Entity entity = Entity.newBuilder(key).set("description", "commit()").build();
+   * 
+   * // add the entity and commit
+   * try {
+   *   transaction.put(entity);
+   *   transaction.commit();
+   * } catch (DatastoreException ex) {
+   *   // handle exception
+   * }
+   * }
+ * + * @throws DatastoreException if could not commit the transaction or if no longer active + */ + Response commit(); + + /** + * Rollback the transaction. + * + *

Example of rolling back a transaction. + * 

 {@code
+   * // create an entity
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key key = datastore.allocateId(keyFactory.newKey());
+   * Entity entity = Entity.newBuilder(key).set("description", "rollback()").build();
+   * 
+   * // add the entity and rollback
+   * transaction.put(entity);
+   * transaction.rollback();
+   * // calling transaction.commit() now would fail
+   * }
+ * + * @throws DatastoreException if transaction was already committed + */ + void rollback(); + + + /** + * Returns {@code true} if the transaction is still active (was not committed or rolledback). + * + *

Example of verifying if a transaction is active. + * 

 {@code
+   * // create an entity
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key key = datastore.allocateId(keyFactory.newKey());
+   * Entity entity = Entity.newBuilder(key).set("description", "active()").build();
+   * // calling transaction.active() now would return true
+   * try {
+   *   // add the entity and commit
+   *   transaction.put(entity);
+   *   transaction.commit();
+   * } finally {
+   *   // if committing succeeded
+   *   // then transaction.active() will be false
+   *   if (transaction.isActive()) {
+   *     // otherwise it's true and we need to rollback
+   *     transaction.rollback();
+   *   }
+   * }
+   * }
+ * + */ + @Override + boolean isActive(); + + + /** + * Returns the transaction associated {@link Datastore}. + */ + Datastore getDatastore(); + + ByteString getTransactionId(); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java new file mode 100644 index 000000000000..0d8d9ff9723d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java @@ -0,0 +1,66 @@ +/* + * Copyright 2017 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.cloud.datastore; + +import com.google.api.core.BetaApi; +import com.google.cloud.ExceptionHandler; +import com.google.cloud.ExceptionHandler.Interceptor; + +@BetaApi +public class TransactionExceptionHandler { + public static final Interceptor TRANSACTION_EXCEPTION_HANDLER_INTERCEPTOR = + new Interceptor() { + + private static final long serialVersionUID = -1240723093072535978L; + + private static final int ABORTED_CODE = 10; + + @Override + public RetryResult beforeEval(Exception exception) { + if (exception instanceof DatastoreException) { + DatastoreException e = getInnerException((DatastoreException) exception); + if (e.getCode() == ABORTED_CODE || e.getReason()!=null && e.getReason().equals("ABORTED")) { + return Interceptor.RetryResult.RETRY; + } + } + return Interceptor.RetryResult.CONTINUE_EVALUATION; + } + + @Override + public RetryResult afterEval(Exception exception, RetryResult retryResult) { + return Interceptor.RetryResult.CONTINUE_EVALUATION; + } + + private DatastoreException getInnerException(DatastoreException exception) { + while (exception.getCause() instanceof DatastoreException) { + exception = (DatastoreException) exception.getCause(); + } + return exception; + } + }; + + public static ExceptionHandler build() { + return ExceptionHandler.newBuilder() + .abortOn(RuntimeException.class) + .addInterceptors( + DatastoreImpl.EXCEPTION_HANDLER_INTERCEPTOR, TRANSACTION_EXCEPTION_HANDLER_INTERCEPTOR) + .build(); + } + + /** Intentionally private empty constructor to disable instantiation of this class. */ + private TransactionExceptionHandler() {} +} 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 new file mode 100644 index 000000000000..d413b76ba105 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java @@ -0,0 +1,135 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.datastore.v1.TransactionOptions; +import com.google.protobuf.ByteString; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +final class TransactionImpl extends BaseDatastoreBatchWriter implements Transaction { + + private final DatastoreImpl datastore; + private final ByteString transactionId; + private boolean rolledback; + + static class ResponseImpl implements Transaction.Response { + + private final com.google.datastore.v1.CommitResponse response; + private final int numAutoAllocatedIds; + + ResponseImpl(com.google.datastore.v1.CommitResponse response, int numAutoAllocatedIds) { + this.response = response; + this.numAutoAllocatedIds = numAutoAllocatedIds; + } + + + @Override + public List getGeneratedKeys() { + Iterator results = + response.getMutationResultsList().iterator(); + List generated = new ArrayList<>(numAutoAllocatedIds); + for (int i = 0; i < numAutoAllocatedIds; i++) { + generated.add(Key.fromPb(results.next().getKey())); + } + return generated; + } + } + + TransactionImpl(DatastoreImpl datastore) { + this(datastore, null); + } + + TransactionImpl(DatastoreImpl datastore, TransactionOptions options) { + super("transaction"); + this.datastore = datastore; + com.google.datastore.v1.BeginTransactionRequest.Builder requestPb = + com.google.datastore.v1.BeginTransactionRequest.newBuilder(); + + if (options != null) { + requestPb.setTransactionOptions(options); + } + + transactionId = datastore.requestTransactionId(requestPb); + } + + @Override + public Entity get(Key key) { + return DatastoreHelper.get(this, key); + } + + @Override + public Iterator get(Key... keys) { + validateActive(); + com.google.datastore.v1.ReadOptions.Builder readOptionsPb = + com.google.datastore.v1.ReadOptions.newBuilder(); + readOptionsPb.setTransaction(transactionId); + return datastore.get(readOptionsPb.build(), keys); + } + + @Override + public List fetch(Key... keys) { + validateActive(); + return DatastoreHelper.fetch(this, keys); + } + + @Override + public QueryResults run(Query query) { + validateActive(); + com.google.datastore.v1.ReadOptions.Builder readOptionsPb = + com.google.datastore.v1.ReadOptions.newBuilder(); + readOptionsPb.setTransaction(transactionId); + return datastore.run(readOptionsPb.build(), query); + } + + @Override + public Transaction.Response commit() { + validateActive(); + List mutationsPb = toMutationPbList(); + com.google.datastore.v1.CommitRequest.Builder requestPb = + com.google.datastore.v1.CommitRequest.newBuilder(); + requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.TRANSACTIONAL); + requestPb.setTransaction(transactionId); + requestPb.addAllMutations(mutationsPb); + com.google.datastore.v1.CommitResponse responsePb = datastore.commit(requestPb.build()); + deactivate(); + return new ResponseImpl(responsePb, toAddAutoId().size()); + } + + @Override + public void rollback() { + if (rolledback) { + return; + } + validateActive(); + datastore.rollbackTransaction(transactionId); + deactivate(); + rolledback = true; + } + + + @Override + public Datastore getDatastore() { + return datastore; + } + + @Override + public ByteString getTransactionId() { + return transactionId; + } +} 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 new file mode 100644 index 000000000000..11eb0b71380d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java @@ -0,0 +1,62 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkArgument; + +import com.google.common.base.Strings; + +import java.util.regex.Pattern; + +/** + * Utility to validate Datastore type/values. + */ +final class Validator { + + private static final Pattern PROJECT_ID_PATTERN = Pattern.compile( + "([a-z\\d\\-]{1,100}~)?([a-z\\d][a-z\\d\\-\\.]{0,99}:)?([a-z\\d][a-z\\d\\-]{0,99})"); + private static final int MAX_NAMESPACE_LENGTH = 100; + private static final Pattern NAMESPACE_PATTERN = + Pattern.compile("[0-9A-Za-z\\._\\-]{0," + MAX_NAMESPACE_LENGTH + "}"); + + private Validator() { + // utility class + } + + static String validateDatabase(String projectId) { + checkArgument(!Strings.isNullOrEmpty(projectId), "projectId can't be empty or null"); + checkArgument(PROJECT_ID_PATTERN.matcher(projectId).matches(), + "projectId must match the following pattern: " + PROJECT_ID_PATTERN.pattern()); + return projectId; + } + + static String validateNamespace(String namespace) { + checkArgument(namespace != null, "Namespace cannot be null. Leave unset for default."); + checkArgument(namespace.length() <= MAX_NAMESPACE_LENGTH, + "namespace must not contain more than 100 characters"); + checkArgument(NAMESPACE_PATTERN.matcher(namespace).matches(), + "namespace must the following pattern: " + NAMESPACE_PATTERN.pattern()); + return namespace; + } + + static String validateKind(String kind) { + checkArgument(!Strings.isNullOrEmpty(kind), "kind must not be empty or null"); + return kind; + } + + +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java new file mode 100644 index 000000000000..a97a072927c6 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java @@ -0,0 +1,226 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.cloud.GcpLaunchStage; +import com.google.common.base.MoreObjects; +import com.google.datastore.v1.Value.ValueTypeCase; + +import java.io.Serializable; +import java.util.Objects; + +/** + * Base class for all Google Cloud Datastore value types. + * All values must be associated with a non-null content (except {@link NullValue}). + * All values are immutable (including their content). To edit (a copy) use {@link #toBuilder()}. + * Unsupported value (deprecated or unrecognized) would be represented by {@link RawValue}. + * + * @param the type of the content for this value + */ +public abstract class Value implements Serializable { + + private static final long serialVersionUID = 8532411152601335280L; + + private final ValueType valueType; + private final boolean excludeFromIndexes; + private final int meaning; + private final V value; + + interface BuilderFactory, B extends ValueBuilder> + extends java.io.Serializable { + B newBuilder(V value); + } + + abstract static class BaseMarshaller, B extends ValueBuilder> + implements ValueMarshaller, BuilderFactory { + + private static final long serialVersionUID = -5224067974180563797L; + + @SuppressWarnings("deprecation") + @Override + public final B fromProto(com.google.datastore.v1.Value proto) { + B builder = newBuilder(getValue(proto)); + builder.setExcludeFromIndexes(proto.getExcludeFromIndexes()); + builder.setMeaning(proto.getMeaning()); + return builder; + } + + @SuppressWarnings("deprecation") + @Override + public final com.google.datastore.v1.Value toProto(P value) { + com.google.datastore.v1.Value.Builder builder = com.google.datastore.v1.Value.newBuilder(); + builder.setExcludeFromIndexes(value.excludeFromIndexes()); + builder.setMeaning(value.getMeaning()); + setValue(value, builder); + return builder.build(); + } + + BaseMarshaller() { + } + + protected abstract V getValue(com.google.datastore.v1.Value from); + + protected abstract void setValue(P from, com.google.datastore.v1.Value.Builder to); + } + + abstract static class BaseBuilder, B extends BaseBuilder> + implements ValueBuilder { + + private final ValueType valueType; + private boolean excludeFromIndexes; + private int meaning; + private V value; + + BaseBuilder(ValueType valueType) { + this.valueType = valueType; + } + + @Override + public ValueType getValueType() { + return valueType; + } + + @Override + public B mergeFrom(P other) { + excludeFromIndexes = other.excludeFromIndexes(); + meaning = other.getMeaning(); + set(other.get()); + return self(); + } + + @Override + public boolean getExcludeFromIndexes() { + return excludeFromIndexes; + } + + @Override + public B setExcludeFromIndexes(boolean excludeFromIndexes) { + this.excludeFromIndexes = excludeFromIndexes; + return self(); + } + + @GcpLaunchStage.Deprecated + @Override + public int getMeaning() { + return meaning; + } + + @GcpLaunchStage.Deprecated + @Override + public B setMeaning(int meaning) { + this.meaning = meaning; + return self(); + } + + @Override + public V get() { + return value; + } + + @Override + public B set(V value) { + this.value = checkNotNull(value); + return self(); + } + + @SuppressWarnings("unchecked") + private B self() { + return (B) this; + } + + @Override + public abstract P build(); + } + + @SuppressWarnings("deprecation") +

, B extends BaseBuilder> Value(ValueBuilder builder) { + valueType = builder.getValueType(); + excludeFromIndexes = builder.getExcludeFromIndexes(); + meaning = builder.getMeaning(); + value = builder.get(); + } + + /** + * Returns the type of this value. + */ + public final ValueType getType() { + return valueType; + } + + /** + * Returns whether this value should be excluded from indexes. + */ + public final boolean excludeFromIndexes() { + return excludeFromIndexes; + } + + @GcpLaunchStage.Deprecated + final int getMeaning() { + return meaning; + } + + public final V get() { + return value; + } + + public abstract ValueBuilder toBuilder(); + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("valueType", valueType) + .add("excludeFromIndexes", excludeFromIndexes) + .add("meaning", meaning) + .add("value", value) + .toString(); + } + + @Override + public int hashCode() { + return Objects.hash(valueType, excludeFromIndexes, meaning, value); + } + + @Override + @SuppressWarnings("unchecked") + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!getClass().isInstance(obj)) { + return false; + } + Value other = (Value) obj; + return Objects.equals(valueType, other.valueType) + && Objects.equals(excludeFromIndexes, other.excludeFromIndexes) + && Objects.equals(meaning, other.meaning) + && Objects.equals(value, other.value); + } + + @SuppressWarnings("unchecked") + com.google.datastore.v1.Value toPb() { + return getType().getMarshaller().toProto(this); + } + + static Value fromPb(com.google.datastore.v1.Value proto) { + ValueTypeCase descriptorId = proto.getValueTypeCase(); + ValueType valueType = ValueType.getByDescriptorId(descriptorId.getNumber()); + return valueType == null ? RawValue.MARSHALLER.fromProto(proto).build() + : valueType.getMarshaller().fromProto(proto).build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java new file mode 100644 index 000000000000..39b4143e208d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java @@ -0,0 +1,55 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.cloud.GcpLaunchStage; + +/** + * A common interface for Value builders. + * + * @param the data type that the {@code Value} object holds. + * @param

the value type. + * @param the value type's associated builder. + */ +public interface ValueBuilder, B extends ValueBuilder> { + + ValueType getValueType(); + + B mergeFrom(P other); + + boolean getExcludeFromIndexes(); + + B setExcludeFromIndexes(boolean excludeFromIndexes); + + /** + * Deprecated. This library preserves the field for backwards compatibility. + */ + @GcpLaunchStage.Deprecated + int getMeaning(); + + /** + * Deprecated. This library preserves the field for backwards compatibility. + */ + @GcpLaunchStage.Deprecated + B setMeaning(int meaning); + + V get(); + + B set(V value); + + P build(); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java new file mode 100644 index 000000000000..57eee7e20edd --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java @@ -0,0 +1,32 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import java.io.Serializable; + +/** + * A common interface for Value marshallers. + */ +interface ValueMarshaller, B extends ValueBuilder> + extends Serializable { + + B fromProto(com.google.datastore.v1.Value proto); + + com.google.datastore.v1.Value toProto(P value); + + int getProtoFieldId(); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java new file mode 100644 index 000000000000..48a318c6eea2 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java @@ -0,0 +1,116 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import com.google.common.collect.ImmutableMap; + +/** + * The type of a Datastore property. + * + * @see Google Cloud Datastore types + */ +public enum ValueType { + + /** + * Represents a {@code null} value. + */ + NULL(NullValue.MARSHALLER), + + /** + * Represents a {@code string} value. + */ + STRING(StringValue.MARSHALLER), + + /** + * Represents an entity value. + */ + ENTITY(EntityValue.MARSHALLER), + + /** + * Represents a {@code list} of {@link Value}s. + */ + LIST(ListValue.MARSHALLER), + + /** + * Represents a {@code key} as a value. + */ + KEY(KeyValue.MARSHALLER), + + /** + * Represents a {@code long} value. + */ + LONG(LongValue.MARSHALLER), + + /** + * Represents a {@code double} value. + */ + DOUBLE(DoubleValue.MARSHALLER), + + /** + * Represents a {@code boolean} value. + */ + BOOLEAN(BooleanValue.MARSHALLER), + + /** + * Represents a {@link com.google.cloud.Timestamp} value. + */ + TIMESTAMP(TimestampValue.MARSHALLER), + + /** + * Represents a {@link Blob} value. + */ + BLOB(BlobValue.MARSHALLER), + + /** + * Represents a raw/unparsed value. + */ + RAW_VALUE(RawValue.MARSHALLER), + + /** + * Represents a {@link LatLng} value. + */ + LAT_LNG(LatLngValue.MARSHALLER); + + private static final ImmutableMap DESCRIPTOR_TO_TYPE_MAP; + + @SuppressWarnings("rawtypes") private final ValueMarshaller marshaller; + + static { + ImmutableMap.Builder builder = ImmutableMap.builder(); + for (ValueType valueType : ValueType.values()) { + int fieldId = valueType.getMarshaller().getProtoFieldId(); + if (fieldId > 0) { + builder.put(fieldId, valueType); + } + } + DESCRIPTOR_TO_TYPE_MAP = builder.build(); + } + + + , B extends ValueBuilder> + ValueType(ValueMarshaller marshaller) { + this.marshaller = marshaller; + } + + ValueMarshaller getMarshaller() { + return marshaller; + } + + static ValueType getByDescriptorId(int descriptorId) { + return DESCRIPTOR_TO_TYPE_MAP.get(descriptorId); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java new file mode 100644 index 000000000000..77b8d9d669a7 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java @@ -0,0 +1,61 @@ +/* + * Copyright 2015 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. + */ + +/** + * A client for Cloud Datastore – A highly-scalable NoSQL database for web and mobile + * applications. + * + *

Here's a simple usage example for using google-cloud from App/Compute Engine. This example + * shows how to create a Datastore entity. For the complete source code see + * + * CreateEntity.java. + * 

 {@code
+ * Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+ * KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
+ * Key key = keyFactory.newKey("keyName");
+ * Entity entity = Entity.newBuilder(key)
+ *     .set("name", "John Doe")
+ *     .set("age", 30)
+ *     .set("access_time", Timestamp.now())
+ *     .build();
+ * datastore.put(entity);
+ * }
+ *

+ * This second example shows how to get and update a Datastore entity if it exists. For the complete + * source code see + * + * UpdateEntity.java. + * 

 {@code
+ * Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+ * KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
+ * Key key = keyFactory.newKey("keyName");
+ * Entity entity = datastore.get(key);
+ * if (entity != null) {
+ *   System.out.println("Updating access_time for " + entity.getString("name"));
+ *   entity = Entity.newBuilder(entity)
+ *       .set("access_time", Timestamp.now())
+ *       .build();
+ *   datastore.update(entity);
+ * }}
+ *

When using google-cloud from outside of App/Compute Engine, you have to specify a + * project ID and + * provide + * credentials. + * + * @see Google Cloud Datastore + */ +package com.google.cloud.datastore; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java new file mode 100644 index 000000000000..d03b263b065c --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java @@ -0,0 +1,29 @@ +/* + * Copyright 2015 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.cloud.datastore.spi; + +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.spi.ServiceRpcFactory; + +/** + * An interface for Datastore RPC factory. + * Implementation will be loaded via {@link java.util.ServiceLoader}. + */ +public interface DatastoreRpcFactory extends + ServiceRpcFactory { +} + diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java new file mode 100644 index 000000000000..dd6e36e2ed9a --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java @@ -0,0 +1,81 @@ +/* + * Copyright 2015 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.cloud.datastore.spi.v1; + +import com.google.cloud.ServiceRpc; +import com.google.cloud.datastore.DatastoreException; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; + +/** + * Provides access to the remote Datastore service. + */ +public interface DatastoreRpc extends ServiceRpc { + + /** + * Sends an allocate IDs request. + * + * @throws DatastoreException upon failure + */ + AllocateIdsResponse allocateIds(AllocateIdsRequest request); + + /** + * Sends a begin transaction request. + * + * @throws DatastoreException upon failure + */ + BeginTransactionResponse beginTransaction(BeginTransactionRequest request) + throws DatastoreException; + + /** + * Sends a commit request. + * + * @throws DatastoreException upon failure + */ + CommitResponse commit(CommitRequest request); + + /** + * Sends a lookup request. + * + * @throws DatastoreException upon failure + */ + LookupResponse lookup(LookupRequest request); + + /** + * Sends a rollback request. + * + * @throws DatastoreException upon failure + */ + RollbackResponse rollback(RollbackRequest request); + + /** + * Sends a request to run a query. + * + * @throws DatastoreException upon failure + */ + RunQueryResponse runQuery(RunQueryRequest request); +} 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 new file mode 100644 index 000000000000..f4c82137c04a --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java @@ -0,0 +1,185 @@ +/* + * Copyright 2015 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.cloud.datastore.spi.v1; + +import com.google.api.client.http.HttpRequest; +import com.google.api.client.http.HttpRequestInitializer; +import com.google.api.client.http.HttpTransport; +import com.google.cloud.datastore.DatastoreException; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.http.HttpTransportOptions; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URL; + +public class HttpDatastoreRpc implements DatastoreRpc { + + private final com.google.datastore.v1.client.Datastore client; + + public HttpDatastoreRpc(DatastoreOptions options) { + HttpTransportOptions httpTransportOptions = (HttpTransportOptions) options + .getTransportOptions(); + HttpTransport transport = httpTransportOptions.getHttpTransportFactory().create(); + com.google.datastore.v1.client.DatastoreOptions.Builder clientBuilder = + new com.google.datastore.v1.client.DatastoreOptions.Builder() + .projectId(options.getProjectId()) + .initializer(getHttpRequestInitializer(options, httpTransportOptions)) + .transport(transport); + String normalizedHost = options.getHost() != null ? options.getHost().toLowerCase() : ""; + if (isLocalHost(normalizedHost)) { + clientBuilder = clientBuilder.localHost(removeScheme(normalizedHost)); + } else if (!removeScheme(com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST) + .equals(removeScheme(normalizedHost)) + && !normalizedHost.isEmpty()) { + String fullUrl = normalizedHost; + if (fullUrl.charAt(fullUrl.length() - 1) != '/') { + fullUrl = fullUrl + '/'; + } + fullUrl = fullUrl + + com.google.datastore.v1.client.DatastoreFactory.VERSION + + "/projects/" + + options.getProjectId(); + clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullUrl); + } + client = com.google.datastore.v1.client.DatastoreFactory.get() + .create(clientBuilder.build()); + } + + private HttpRequestInitializer getHttpRequestInitializer(final DatastoreOptions options, + HttpTransportOptions httpTransportOptions) { + final HttpRequestInitializer delegate = httpTransportOptions + .getHttpRequestInitializer(options); + final String applicationName = options.getApplicationName(); + return new HttpRequestInitializer() { + @Override + public void initialize(HttpRequest httpRequest) throws IOException { + delegate.initialize(httpRequest); + httpRequest.getHeaders().setUserAgent(applicationName); + } + }; + } + + private static boolean isLocalHost(String host) { + if (!host.isEmpty()) { + try { + String normalizedHost = "http://" + removeScheme(host); + InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost()); + return hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress(); + } catch (Exception e) { + // ignore + } + } + return false; + } + + private static String removeScheme(String url) { + if (url != null) { + if (url.startsWith("https://")) { + return url.substring("https://".length()); + } else if (url.startsWith("http://")) { + return url.substring("http://".length()); + } + } + return url; + } + + private static DatastoreException translate( + com.google.datastore.v1.client.DatastoreException exception) { + return translate(exception, true); + } + + private static DatastoreException translate( + com.google.datastore.v1.client.DatastoreException exception, boolean idempotent) { + String reason = ""; + if (exception.getCode() != null) { + reason = exception.getCode().name(); + } + if (reason.isEmpty()) { + if (exception.getCause() instanceof IOException) { + return new DatastoreException((IOException) exception.getCause()); + } + } + return new DatastoreException( + exception.getCode().getNumber(), exception.getMessage(), reason, idempotent, exception); + } + + @Override + public AllocateIdsResponse allocateIds(AllocateIdsRequest request) { + try { + return client.allocateIds(request); + } catch (com.google.datastore.v1.client.DatastoreException ex) { + throw translate(ex); + } + } + + @Override + public BeginTransactionResponse beginTransaction(BeginTransactionRequest request) { + try { + return client.beginTransaction(request); + } catch (com.google.datastore.v1.client.DatastoreException ex) { + throw translate(ex); + } + } + + @Override + public CommitResponse commit(CommitRequest request) { + try { + return client.commit(request); + } catch (com.google.datastore.v1.client.DatastoreException ex) { + throw translate(ex, request.getMode() == CommitRequest.Mode.NON_TRANSACTIONAL); + } + } + + @Override + public LookupResponse lookup(LookupRequest request) { + try { + return client.lookup(request); + } catch (com.google.datastore.v1.client.DatastoreException ex) { + throw translate(ex); + } + } + + @Override + public RollbackResponse rollback(RollbackRequest request) { + try { + return client.rollback(request); + } catch (com.google.datastore.v1.client.DatastoreException ex) { + throw translate(ex); + } + } + + @Override + public RunQueryResponse runQuery(RunQueryRequest request) { + try { + return client.runQuery(request); + } catch (com.google.datastore.v1.client.DatastoreException ex) { + throw translate(ex); + } + } +} 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 new file mode 100644 index 000000000000..9bf22abf4101 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -0,0 +1,255 @@ +/* + * Copyright 2015 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.cloud.datastore.testing; + +import com.google.api.core.InternalApi; +import com.google.cloud.NoCredentials; +import com.google.cloud.ServiceOptions; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.testing.BaseEmulatorHelper; +import com.google.common.collect.ImmutableList; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.TimeoutException; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.threeten.bp.Duration; + +/** + * Utility to start and stop local Google Cloud Datastore emulators. + * + *

This class is unstable. + */ +@InternalApi +public class LocalDatastoreHelper extends BaseEmulatorHelper { + + private final List emulatorRunners; + private final double consistency; + private final Path gcdPath; + + // Gcloud emulator settings + private static final String GCLOUD_CMD_TEXT = "gcloud beta emulators datastore start"; + private static final String GCLOUD_CMD_PORT_FLAG = "--host-port="; + private static final String VERSION_PREFIX = "cloud-datastore-emulator "; + private static final String MIN_VERSION = "1.2.0"; + + // Downloadable emulator settings + private static final String BIN_NAME = "cloud-datastore-emulator/cloud_datastore_emulator"; + private static final String FILENAME = "cloud-datastore-emulator-" + MIN_VERSION + ".zip"; + private static final String MD5_CHECKSUM = "ec2237a0f0ac54964c6bd95e12c73720"; + private static final String BIN_CMD_PORT_FLAG = "--port="; + private static final URL EMULATOR_URL; + + // Common settings + private static final String CONSISTENCY_FLAG = "--consistency="; + private static final double DEFAULT_CONSISTENCY = 0.9; + + private static final Logger LOGGER = Logger.getLogger(LocalDatastoreHelper.class.getName()); + + static { + try { + EMULATOR_URL = new URL("http://storage.googleapis.com/gcd/tools/" + FILENAME); + } catch (MalformedURLException ex) { + throw new IllegalStateException(ex); + } + } + + private LocalDatastoreHelper(double consistency) { + super("datastore", BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT), + PROJECT_ID_PREFIX + UUID.randomUUID().toString()); + Path tmpDirectory = null; + try { + tmpDirectory = Files.createTempDirectory("gcd"); + } catch (IOException ex) { + getLogger().log(Level.WARNING, "Failed to create temporary directory"); + } + this.gcdPath = tmpDirectory; + this.consistency = consistency; + String binName = BIN_NAME; + if (isWindows()) { + binName = BIN_NAME.replace("/", "\\"); + } + List gcloudCommand = new ArrayList<>(Arrays.asList(GCLOUD_CMD_TEXT.split(" "))); + gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + "localhost:" + getPort()); + gcloudCommand.add(CONSISTENCY_FLAG + consistency); + gcloudCommand.add("--no-store-on-disk"); + GcloudEmulatorRunner gcloudRunner = + new GcloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION); + List binCommand = new ArrayList<>(Arrays.asList(binName, "start")); + binCommand.add("--testing"); + binCommand.add(BIN_CMD_PORT_FLAG + getPort()); + binCommand.add(CONSISTENCY_FLAG + consistency); + if (gcdPath != null) { + gcloudCommand.add("--data-dir=" + gcdPath.toString()); + } + DownloadableEmulatorRunner downloadRunner = + new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM); + emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner); + } + + @Override + protected List getEmulatorRunners() { + return emulatorRunners; + } + + @Override + 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(); + } + + + /** + * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on + * localhost. The default namespace is set to {@code namespace}. + */ + public DatastoreOptions getOptions(String namespace) { + return optionsBuilder().setNamespace(namespace).build(); + } + + + + /** + * Returns the consistency setting for the local Datastore emulator. + */ + public double getConsistency() { + return consistency; + } + + /** + * Creates a local Datastore helper with the specified settings for project ID and consistency. + * + * @param consistency the fraction of Datastore writes that are immediately visible to global + * queries, with 0.0 meaning no writes are immediately visible and 1.0 meaning all writes + * are immediately visible. Note that setting this to 1.0 may mask incorrect assumptions + * about the consistency of non-ancestor queries; non-ancestor queries are eventually + * consistent. + */ + public static LocalDatastoreHelper create(double consistency) { + return new LocalDatastoreHelper(consistency); + } + + /** + * Creates a local Datastore helper with a placeholder project ID and the default consistency + * setting of 0.9. Consistency refers to the fraction of Datastore writes that are immediately + * visible to global queries, with 0.0 meaning no writes are immediately visible and 1.0 meaning + * all writes are immediately visible. + */ + public static LocalDatastoreHelper create() { + return create(DEFAULT_CONSISTENCY); + } + + /** + * Starts the local Datastore emulator through {@code gcloud}, downloads and caches the zip file + * if user does not have {@code gcloud} or a compatible emulator version installed. + * + *

Currently the emulator does not persist any state across runs. + */ + @Override + public void start() throws IOException, InterruptedException { + String blockUntilOutput = "Dev App Server is now running"; + startProcess(blockUntilOutput); + } + + /** + * Resets the internal state of the Datastore emulator. + * + *

When running tests, one might {@code reset()} before each test, so earlier tests would not + * affect later ones. + */ + @Override + public void reset() throws IOException { + sendPostRequest("/reset"); + } + + /** + * Stops the Datastore emulator. + * + *

It is important to stop the emulator. Since the emulator runs in its own process, not + * stopping it might cause it to become orphan. + * + *

It is not required to call {@link #reset()} before {@code stop}. + * + * @param timeout The duration to wait for the emulator process to stop. It is recommended to set + * this value high to ensure proper shutdown, like 5 seconds or more. + */ + @Override + public void stop(Duration timeout) throws IOException, InterruptedException, TimeoutException { + sendPostRequest("/shutdown"); + waitForProcess(timeout); + deleteRecursively(gcdPath); + } + + /** + * Stops the Datastore emulator. The same as {@link stop(Duration)} but with timeout duration of + * 20 seconds. + * + *

It is important to stop the emulator. Since the emulator runs in its own process, not + * stopping it might cause it to become orphan. + * + *

It is not required to call {@link #reset()} before {@code stop()}. + */ + public void stop() throws IOException, InterruptedException, TimeoutException { + stop(Duration.ofSeconds(20)); + } + + private static void deleteRecursively(Path path) throws IOException { + if (path == null || !Files.exists(path)) { + return; + } + Files.walkFileTree(path, new SimpleFileVisitor() { + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + Files.delete(dir); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Files.delete(file); + return FileVisitResult.CONTINUE; + } + }); + } +} 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 new file mode 100644 index 000000000000..9f41a900537a --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java @@ -0,0 +1,107 @@ +/* + * Copyright 2016 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.cloud.datastore.testing; + +import com.google.cloud.http.HttpTransportOptions; +import com.google.api.core.InternalApi; +import com.google.api.gax.retrying.RetrySettings; +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.StructuredQuery; + +import java.util.UUID; +import org.threeten.bp.Duration; + +/** + * Utility to create a remote datastore configuration for testing. Datastore options can be obtained + * via the {@link #getOptions()} method. Returned options use a randomly generated namespace + * ({@link DatastoreOptions#getNamespace()}) that can be used to run the tests. Once the tests are + * run, all entities in the namespace can be deleted using {@link #deleteNamespace()}. Returned + * options also have custom {@link DatastoreOptions#getRetrySettings()}: + * {@link RetrySettings#getMaxAttempts()} is {@code 10}, + * {@link RetrySettings#getMaxRetryDelay()} is {@code 30000}, + * {@link RetrySettings#getTotalTimeout()} is {@code 120000} and + * {@link RetrySettings#getInitialRetryDelay()} is {@code 250}. + * {@link HttpTransportOptions#getConnectTimeout()} and + * {@link HttpTransportOptions#getReadTimeout()} are both + * both set to {@code 60000}. + * + * Internal testing use only + */ +@InternalApi +public class RemoteDatastoreHelper { + + private final DatastoreOptions options; + private final Datastore datastore; + private final String namespace; + + private RemoteDatastoreHelper(DatastoreOptions options) { + this.options = options; + this.datastore = options.getService(); + this.namespace = options.getNamespace(); + } + + + /** + * Returns a {@link DatastoreOptions} object to be used for testing. The options are associated + * to a randomly generated namespace. + */ + public DatastoreOptions getOptions() { + return options; + } + + /** + * Deletes all entities in the namespace associated with this {@link RemoteDatastoreHelper}. + */ + public void deleteNamespace() { + StructuredQuery query = Query.newKeyQueryBuilder().setNamespace(namespace).build(); + QueryResults keys = datastore.run(query); + while (keys.hasNext()) { + datastore.delete(keys.next()); + } + } + + /** + * Creates a {@code RemoteStorageHelper} object. + */ + public static RemoteDatastoreHelper create() { + HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions(); + transportOptions = transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000) + .build(); + DatastoreOptions datastoreOption = DatastoreOptions.newBuilder() + .setNamespace(UUID.randomUUID().toString()) + .setRetrySettings(retrySettings()) + .setTransportOptions(transportOptions) + .build(); + return new RemoteDatastoreHelper(datastoreOption); + } + + private static RetrySettings retrySettings() { + return RetrySettings.newBuilder().setMaxAttempts(10) + .setMaxRetryDelay(Duration.ofMillis(30000L)) + .setTotalTimeout(Duration.ofMillis(120000L)) + .setInitialRetryDelay(Duration.ofMillis(250L)) + .setRetryDelayMultiplier(1.0) + .setInitialRpcTimeout(Duration.ofMillis(120000L)) + .setRpcTimeoutMultiplier(1.0) + .setMaxRpcTimeout(Duration.ofMillis(120000L)) + .build(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java new file mode 100644 index 000000000000..84b3f07d8814 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java @@ -0,0 +1,36 @@ +/* + * Copyright 2015 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. + */ + +/** + * A testing helper for Google Cloud Datastore. + * + *

A simple usage example: + *

Before the test: + * 

 {@code
+ * LocalDatastoreHelper helper = LocalDatastoreHelper.create();
+ * helper.start();
+ * Datastore localDatastore = helper.getOptions().getService();
+ * }
+ * + *

After the test: + * 

 {@code
+ * helper.stop();
+ * }
+ * + * @see + * Google Cloud Java tools for testing + */ +package com.google.cloud.datastore.testing; diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java new file mode 100644 index 000000000000..36fa11e9116b --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java @@ -0,0 +1,354 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; + +import com.google.common.collect.ImmutableList; + +import org.easymock.EasyMock; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.LinkedList; +import java.util.List; + +public class BaseDatastoreBatchWriterTest { + + private static final Key KEY1 = Key.newBuilder("dataset1", "kind1", "name1").build(); + private static final Key KEY2 = Key.newBuilder(KEY1, 1).build(); + private static final Key KEY3 = Key.newBuilder(KEY1, 2).build(); + private static final IncompleteKey INCOMPLETE_KEY = IncompleteKey.newBuilder(KEY1).build(); + private static final Entity ENTITY1 = Entity.newBuilder(KEY1).build(); + private static final Entity ENTITY2 = Entity.newBuilder(KEY2).set("bak", true).build(); + private static final Entity ENTITY3 = Entity.newBuilder(KEY3).set("bak", true).build(); + private static final FullEntity INCOMPLETE_ENTITY_1 = + Entity.newBuilder(INCOMPLETE_KEY).build(); + private static final FullEntity INCOMPLETE_ENTITY_2 = + Entity.newBuilder(INCOMPLETE_KEY).set("name", "dan").build(); + + private DatastoreBatchWriter batchWriter; + + private class DatastoreBatchWriter extends BaseDatastoreBatchWriter { + + private final Datastore datastore; + + protected DatastoreBatchWriter() { + super("test"); + datastore = EasyMock.createMock(Datastore.class); + IncompleteKey[] expected = {INCOMPLETE_KEY, INCOMPLETE_KEY}; + List result = ImmutableList.of(KEY2, KEY3); + expect(datastore.allocateId(expected)).andReturn(result).times(0, 1); + replay(datastore); + } + + + @Override + protected Datastore getDatastore() { + return datastore; + } + + void finish() { + verify(datastore); + } + } + + @Before + public void setUp() { + batchWriter = new DatastoreBatchWriter(); + } + + @After + public void tearDown() { + batchWriter.finish(); + } + + @Test + public void testAdd() throws Exception { + Entity entity2 = + Entity.newBuilder(ENTITY2).setKey(Key.newBuilder(KEY1).setName("name2").build()).build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build().toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build().toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(entity2.toPb()).build()); + List entities = batchWriter + .add(ENTITY1, INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2, entity2); + assertEquals(pbs, batchWriter.toMutationPbList()); + assertEquals(ENTITY1, entities.get(0)); + assertEquals(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build(), entities.get(1)); + assertEquals(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build(), entities.get(2)); + assertEquals(entity2, entities.get(3)); + } + + @Test + public void testAddAfterDelete() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + batchWriter.delete(KEY1); + batchWriter.add(ENTITY1); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test(expected = DatastoreException.class) + public void testAddDuplicate() throws Exception { + batchWriter.add(ENTITY1); + batchWriter.add(ENTITY1); + } + + @Test(expected = DatastoreException.class) + public void testAddAfterPut() throws Exception { + batchWriter.put(ENTITY1); + batchWriter.add(ENTITY1); + } + + @Test(expected = DatastoreException.class) + public void testAddAfterUpdate() throws Exception { + batchWriter.update(ENTITY1); + batchWriter.add(ENTITY1); + } + + @Test(expected = DatastoreException.class) + public void testAddWhenNotActive() throws Exception { + batchWriter.deactivate(); + batchWriter.add(ENTITY1); + } + + @Test + public void testAddWithDeferredAllocation() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(INCOMPLETE_ENTITY_1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(INCOMPLETE_ENTITY_2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build()); + batchWriter.addWithDeferredIdAllocation(ENTITY1, INCOMPLETE_ENTITY_1); + batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_2); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test(expected = DatastoreException.class) + public void testAddWithDeferredAllocationWhenNotActive() throws Exception { + batchWriter.deactivate(); + batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_1); + } + + @Test + public void testUpdate() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY3.toPb()).build()); + batchWriter.update(ENTITY1, ENTITY2); + batchWriter.update(ENTITY3); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testUpdateAfterUpdate() throws Exception { + Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build()); + batchWriter.update(ENTITY1); + batchWriter.update(entity); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testUpdateAfterAdd() throws Exception { + Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + batchWriter.add(ENTITY1); + batchWriter.update(entity); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testUpdateAfterPut() throws Exception { + Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + batchWriter.put(ENTITY1); + batchWriter.update(entity); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test(expected = DatastoreException.class) + public void testUpdateAfterDelete() throws Exception { + batchWriter.delete(KEY1); + batchWriter.update(ENTITY1, ENTITY2); + } + + @Test(expected = DatastoreException.class) + public void testUpdateWhenNotActive() throws Exception { + batchWriter.deactivate(); + batchWriter.update(ENTITY1); + } + + @Test + public void testPut() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY3.toPb()).build()); + List putEntities = batchWriter.put(ENTITY1, ENTITY2); + Entity putEntity = batchWriter.put(ENTITY3); + assertEquals(ENTITY1, putEntities.get(0)); + assertEquals(ENTITY2, putEntities.get(1)); + assertEquals(ENTITY3, putEntity); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testPutIncompleteKey() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setUpsert(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build().toPb()) + .build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setUpsert(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build().toPb()) + .build()); + Entity putEntity = batchWriter.put(ENTITY1); + List putEntities = batchWriter.put(INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2); + assertEquals(ENTITY1, putEntity); + assertEquals(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build(), putEntities.get(0)); + assertEquals(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build(), putEntities.get(1)); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testPutWithDeferredAllocation() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(INCOMPLETE_ENTITY_1.toPb()) + .build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(INCOMPLETE_ENTITY_2.toPb()) + .build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + batchWriter.put(ENTITY1); + batchWriter.putWithDeferredIdAllocation(INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testPutAfterPut() throws Exception { + Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + Entity putEntity1 = batchWriter.put(ENTITY1); + Entity putEntity2 = batchWriter.put(entity); + assertEquals(ENTITY1, putEntity1); + assertEquals(entity, putEntity2); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testPutAfterAdd() throws Exception { + Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + batchWriter.add(ENTITY1); + batchWriter.put(entity); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testPutAfterUpdate() throws Exception { + Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + batchWriter.update(ENTITY1); + Entity putEntity = batchWriter.put(entity); + assertEquals(entity, putEntity); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testPutAfterDelete() throws Exception { + Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build(); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + batchWriter.delete(KEY1); + Entity putEntity = batchWriter.put(entity); + assertEquals(entity, putEntity); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test(expected = DatastoreException.class) + public void testPutWhenNotActive() throws Exception { + batchWriter.deactivate(); + batchWriter.put(ENTITY1); + } + + @Test + public void testDelete() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY3.toPb()).build()); + batchWriter.delete(KEY1, KEY2); + batchWriter.delete(KEY3); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testDeleteAfterAdd() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() + .setInsert(INCOMPLETE_ENTITY_1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + batchWriter.add(ENTITY1); + batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_1); + batchWriter.delete(KEY1); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + + @Test + public void testDeleteAfterUpdate() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + batchWriter.update(ENTITY1); + batchWriter.delete(KEY1); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test + public void testDeleteAfterPut() throws Exception { + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + batchWriter.put(ENTITY1); + batchWriter.delete(KEY1); + assertEquals(pbs, batchWriter.toMutationPbList()); + } + + @Test(expected = DatastoreException.class) + public void testDeleteWhenNotActive() throws Exception { + batchWriter.deactivate(); + batchWriter.delete(KEY1); + } +} + diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java new file mode 100644 index 000000000000..14e399e4b991 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java @@ -0,0 +1,243 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.Timestamp; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + +import org.junit.Before; +import org.junit.Test; + +import java.util.Calendar; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +public class BaseEntityTest { + + private static final Blob BLOB = Blob.copyFrom(new byte[]{1, 2}); + private static final Timestamp TIMESTAMP = Timestamp.now(); + private static final LatLng LAT_LNG = new LatLng(37.422035, -122.084124); + private static final Key KEY = Key.newBuilder("ds1", "k1", "n1").build(); + private static final Entity ENTITY = Entity.newBuilder(KEY).set("name", "foo").build(); + private static final IncompleteKey INCOMPLETE_KEY = IncompleteKey.newBuilder("ds1", "k1").build(); + private static final FullEntity PARTIAL_ENTITY = + Entity.newBuilder(INCOMPLETE_KEY).build(); + + private Builder builder; + + private class Builder extends BaseEntity.Builder { + + @Override public BaseEntity build() { + + return new BaseEntity(this) {}; + } + } + + @Before + public void setUp() { + builder = new Builder(); + builder.set("blob", BLOB).set("boolean", true).set("timestamp", TIMESTAMP); + builder.set("double", 1.25).set("key", KEY).set("string", "hello world"); + builder.set("long", 125).setNull("null").set("entity", ENTITY).set("latLng", LAT_LNG); + builder.set("partialEntity", PARTIAL_ENTITY).set("stringValue", StringValue.of("bla")); + builder.set("list1", NullValue.of(), StringValue.of("foo"), LatLngValue.of(LAT_LNG)); + builder.set("list2", ImmutableList.of(LongValue.of(10), DoubleValue.of(2))); + builder.set("list3", Collections.singletonList(BooleanValue.of(true))); + builder.set( + "blobList", BLOB, Blob.copyFrom(new byte[] {3, 4}), Blob.copyFrom(new byte[] {5, 6})); + builder.set("booleanList", true, false, true); + builder.set("timestampList", Timestamp.now(), Timestamp.now(), Timestamp.now()); + builder.set("doubleList", 12.3, 4.56, .789); + builder.set("keyList", KEY, Key.newBuilder("ds2", "k2", "n2").build(), + Key.newBuilder("ds3", "k3", "n3").build()); + builder.set("entityList", ENTITY, PARTIAL_ENTITY); + builder.set("stringList", "s1", "s2", "s3"); + builder.set("longList", 1, 23, 456); + builder.set("latLngList", LAT_LNG, LAT_LNG); + } + + @Test + public void testContains() throws Exception { + BaseEntity entity = builder.build(); + assertTrue(entity.contains("list1")); + assertFalse(entity.contains("bla")); + entity = builder.clear().build(); + assertFalse(entity.contains("list1")); + } + + @Test + public void testGetValue() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(BlobValue.of(BLOB), entity.getValue("blob")); + } + + @Test(expected = DatastoreException.class) + public void testGetValueNotFound() throws Exception { + BaseEntity entity = builder.clear().build(); + entity.getValue("blob"); + } + + @Test + public void testIsNull() throws Exception { + BaseEntity entity = builder.build(); + assertTrue(entity.isNull("null")); + assertFalse(entity.isNull("blob")); + entity = builder.setNull("blob").build(); + assertTrue(entity.isNull("blob")); + } + + @Test(expected = DatastoreException.class) + public void testIsNullNotFound() throws Exception { + BaseEntity entity = builder.clear().build(); + entity.isNull("null"); + } + + @Test + public void testGetString() throws Exception { + BaseEntity entity = builder.build(); + assertEquals("hello world", entity.getString("string")); + assertEquals("bla", entity.getString("stringValue")); + entity = builder.set("string", "foo").build(); + assertEquals("foo", entity.getString("string")); + } + + @Test + public void testGetLong() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(125, entity.getLong("long")); + entity = builder.set("long", LongValue.of(10)).build(); + assertEquals(10, entity.getLong("long")); + } + + @Test + public void testGetDouble() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(1.25, entity.getDouble("double"), 0); + entity = builder.set("double", DoubleValue.of(10)).build(); + assertEquals(10, entity.getDouble("double"), 0); + } + + @Test + public void testGetBoolean() throws Exception { + BaseEntity entity = builder.build(); + assertTrue(entity.getBoolean("boolean")); + entity = builder.set("boolean", BooleanValue.of(false)).build(); + assertFalse(entity.getBoolean("boolean")); + } + + @Test + public void testGetTimestamp() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(TIMESTAMP, entity.getTimestamp("timestamp")); + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.DATE, -1); + Timestamp timestamp = Timestamp.of(cal.getTime()); + entity = builder.set("timestamp", TimestampValue.of(timestamp)).build(); + assertEquals(timestamp, entity.getTimestamp("timestamp")); + } + + @Test + public void testGetLatLng() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(LAT_LNG, entity.getLatLng("latLng")); + } + + @Test + public void testGetKey() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(KEY, entity.getKey("key")); + Key key = Key.newBuilder(KEY).setName("BLA").build(); + entity = builder.set("key", key).build(); + assertEquals(key, entity.getKey("key")); + } + + @Test + public void testGetEntity() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(ENTITY, entity.getEntity("entity")); + assertEquals(PARTIAL_ENTITY, entity.getEntity("partialEntity")); + entity = builder.set("entity", EntityValue.of(PARTIAL_ENTITY)).build(); + assertEquals(PARTIAL_ENTITY, entity.getEntity("entity")); + } + + @Test + public void testGetList() throws Exception { + BaseEntity entity = builder.build(); + List> list = entity.getList("list1"); + assertEquals(3, list.size()); + assertEquals(NullValue.of(), list.get(0)); + assertEquals("foo", list.get(1).get()); + assertEquals(LAT_LNG, list.get(2).get()); + list = entity.getList("list2"); + assertEquals(2, list.size()); + assertEquals(Long.valueOf(10), list.get(0).get()); + assertEquals(Double.valueOf(2), list.get(1).get()); + list = entity.getList("list3"); + assertEquals(1, list.size()); + assertEquals(Boolean.TRUE, list.get(0).get()); + entity = builder.set("list1", ListValue.of(list)).build(); + assertEquals(list, entity.getList("list1")); + List> stringList = entity.getList("stringList"); + assertEquals( + ImmutableList.of(StringValue.of("s1"), StringValue.of("s2"), StringValue.of("s3")), + stringList); + List> doubleList = entity.getList("doubleList"); + assertEquals( + ImmutableList.of(DoubleValue.of(12.3), DoubleValue.of(4.56), DoubleValue.of(.789)), + doubleList); + List entityList = entity.getList("entityList"); + assertEquals( + ImmutableList.of(EntityValue.of(ENTITY), EntityValue.of(PARTIAL_ENTITY)), entityList); + } + + @Test + public void testGetBlob() throws Exception { + BaseEntity entity = builder.build(); + assertEquals(BLOB, entity.getBlob("blob")); + Blob blob = Blob.copyFrom(new byte[] {}); + entity = builder.set("blob", BlobValue.of(blob)).build(); + assertEquals(blob, entity.getBlob("blob")); + } + + @Test + public void testNames() throws Exception { + Set names = + ImmutableSet.builder() + .add("string", "stringValue", "boolean", "double", "long", "list1", "list2", "list3") + .add("entity", "partialEntity", "null", "timestamp", "blob", "key", "blobList") + .add("booleanList", "timestampList", "doubleList", "keyList", "entityList", "stringList") + .add("longList", "latLng", "latLngList") + .build(); + BaseEntity entity = builder.build(); + assertEquals(names, entity.getNames()); + } + + + @Test + public void testKey() throws Exception { + builder.setKey(KEY); + BaseEntity entity = builder.build(); + assertEquals(KEY, entity.getKey()); + } +} + 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 new file mode 100644 index 000000000000..826a397fc80f --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java @@ -0,0 +1,132 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import com.google.common.collect.ImmutableList; + +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +public class BaseKeyTest { + + private class Builder extends BaseKey.Builder { + + Builder(String projectId) { + super(projectId); + } + + Builder(String projectId, String kind) { + super(projectId, kind); + } + + @Override + protected BaseKey build() { + ImmutableList.Builder path = ImmutableList.builder(); + path.addAll(ancestors); + path.add(PathElement.of(kind)); + return new BaseKey(projectId, namespace, path.build()) { + + + @Override + protected BaseKey getParent() { + return null; + } + }; + } + } + + @Test + public void testProjectId() throws Exception { + Builder builder = new Builder("ds1", "k"); + BaseKey key = builder.build(); + assertEquals("ds1", key.getProjectId()); + key = builder.setProjectId("ds2").build(); + assertEquals("ds2", key.getProjectId()); + } + + + @Test(expected = IllegalArgumentException.class) + public void testBadDatasetInConstructor() throws Exception { + new Builder(" ", "k"); + } + + @Test(expected = IllegalArgumentException.class) + public void testBadDatasetInSetter() throws Exception { + Builder builder = new Builder("d", "k"); + builder.setProjectId(" "); + } + + + @Test + public void testNamespace() throws Exception { + Builder builder = new Builder("ds", "k"); + BaseKey key = builder.build(); + assertTrue(key.getNamespace() != null); + assertTrue(key.getNamespace().isEmpty()); + key = builder.setNamespace("ns").build(); + assertEquals("ns", key.getNamespace()); + } + + + @Test + public void testKind() throws Exception { + Builder builder = new Builder("ds", "k1"); + BaseKey key = builder.build(); + assertEquals("k1", key.getKind()); + key = builder.setKind("k2").build(); + assertEquals("k2", key.getKind()); + } + + + @Test(expected = NullPointerException.class) + public void testNoKind() throws Exception { + Builder builder = new Builder("ds"); + builder.build(); + } + + @Test(expected = IllegalArgumentException.class) + public void testBadKindInConstructor() throws Exception { + new Builder("ds", ""); + } + + @Test(expected = IllegalArgumentException.class) + public void testBadKindInSetter() throws Exception { + Builder builder = new Builder("ds", "k1"); + builder.setKind(""); + } + + + @Test + public void testAncestors() throws Exception { + Builder builder = new Builder("ds", "k"); + BaseKey key = builder.build(); + assertTrue(key.getAncestors().isEmpty()); + List path = new ArrayList<>(); + path.add(PathElement.of("p1", "v1")); + key = builder.addAncestor(path.get(0)).build(); + assertEquals(path, key.getAncestors()); + path.add(PathElement.of("p2", "v2")); + key = builder.addAncestor(path.get(1)).build(); + assertEquals(path, key.getAncestors()); + } +} + diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java new file mode 100644 index 000000000000..5e6ce3fc4560 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java @@ -0,0 +1,112 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; + +import org.junit.Before; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.util.Random; + +public class BlobTest { + + private static final byte[] bytes1 = new byte[10]; + private static final byte[] bytes2 = new byte[11]; + private Blob blob1; + private Blob blob2; + + + @Before + public void setUp() { + Random rnd = new Random(); + rnd.nextBytes(bytes1); + rnd.nextBytes(bytes2); + blob1 = Blob.copyFrom(bytes1); + blob2 = Blob.copyFrom(bytes2); + } + + @Test + public void testEquals() throws Exception { + assertEquals(blob1, blob1); + assertEquals(blob1, Blob.copyFrom(bytes1)); + assertNotEquals(blob1, blob2); + } + + @Test + public void testLength() throws Exception { + assertEquals(bytes1.length, blob1.getLength()); + assertEquals(bytes2.length, blob2.getLength()); + } + + + @Test + public void testToByteArray() throws Exception { + assertArrayEquals(bytes1, blob1.toByteArray()); + assertArrayEquals(bytes2, blob2.toByteArray()); + } + + @Test + public void testAsReadOnlyByteBuffer() throws Exception { + ByteBuffer buffer = blob1.asReadOnlyByteBuffer(); + byte[] bytes = new byte[bytes1.length]; + buffer.get(bytes); + assertFalse(buffer.hasRemaining()); + assertArrayEquals(bytes1, bytes); + } + + @Test + public void testAsInputStream() throws Exception { + byte[] bytes = new byte[bytes1.length]; + InputStream in = blob1.asInputStream(); + assertEquals(bytes1.length, in.read(bytes)); + assertEquals(-1, in.read()); + assertArrayEquals(bytes1, bytes); + } + + @Test + public void testCopyTo() throws Exception { + byte[] bytes = new byte[bytes1.length]; + blob1.copyTo(bytes); + assertArrayEquals(bytes1, bytes); + + ByteBuffer buffer = ByteBuffer.allocate(bytes1.length); + blob1.copyTo(buffer); + buffer.flip(); + bytes = new byte[bytes1.length]; + buffer.get(bytes); + assertFalse(buffer.hasRemaining()); + assertArrayEquals(bytes1, bytes); + } + + @Test + public void testCopyFrom() throws Exception { + Blob blob = Blob.copyFrom(ByteBuffer.wrap(bytes1)); + assertEquals(blob1, blob); + assertArrayEquals(bytes1, blob.toByteArray()); + + blob = Blob.copyFrom(new ByteArrayInputStream(bytes2)); + assertEquals(blob2, blob); + assertArrayEquals(bytes2, blob.toByteArray()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java new file mode 100644 index 000000000000..6df282950288 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java @@ -0,0 +1,51 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class BlobValueTest { + + private static final Blob CONTENT = Blob.copyFrom(new byte[] {1, 2}); + + @Test + public void testToBuilder() throws Exception { + BlobValue value = BlobValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @Test + public void testOf() throws Exception { + BlobValue value = BlobValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + BlobValue.Builder builder = BlobValue.newBuilder(CONTENT); + BlobValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java new file mode 100644 index 000000000000..a18bf18f02d9 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java @@ -0,0 +1,50 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class BooleanValueTest { + + @Test + public void testToBuilder() throws Exception { + BooleanValue value = BooleanValue.of(true); + assertEquals(value, value.toBuilder().build()); + } + + @Test + public void testOf() throws Exception { + BooleanValue value = BooleanValue.of(false); + assertFalse(value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + BooleanValue.Builder builder = BooleanValue.newBuilder(true); + BooleanValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertTrue(value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} + diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java new file mode 100644 index 000000000000..a5cb43453d24 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import com.google.protobuf.ByteString; + +import org.junit.Before; +import org.junit.Test; + +public class CursorTest { + + private static final byte[] bytes1 = {1, 2, 3, '%', '<', '+'}; + private static final byte[] bytes2 = {10, 20, 30}; + private Cursor cursor1; + private Cursor cursor2; + + @Before + public void setUp() throws Exception { + cursor1 = new Cursor(ByteString.copyFrom(bytes1)); + cursor2 = new Cursor(ByteString.copyFrom(bytes2)); + } + + @Test + public void testToFromUrlSafe() throws Exception { + String urlSafe = cursor1.toUrlSafe(); + assertEquals(cursor1, Cursor.fromUrlSafe(urlSafe)); + } + + @Test + public void testCopyFrom() throws Exception { + Cursor cursor = Cursor.copyFrom(bytes2); + assertEquals(cursor2, cursor); + assertNotEquals(cursor1, cursor); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java new file mode 100644 index 000000000000..37b646c064d9 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java @@ -0,0 +1,126 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import com.google.cloud.BaseServiceException; +import com.google.cloud.RetryHelper; + +import org.junit.Test; + +import java.io.IOException; +import java.net.SocketTimeoutException; + +public class DatastoreExceptionTest { + + @Test + public void testDatastoreException() throws Exception { + DatastoreException exception = new DatastoreException(10, "message", "ABORTED"); + assertEquals(10, exception.getCode()); + assertEquals("ABORTED", exception.getReason()); + assertEquals("message", exception.getMessage()); + assertTrue(exception.isRetryable()); + + exception = new DatastoreException(4, "message", "DEADLINE_EXCEEDED"); + assertEquals(4, exception.getCode()); + assertEquals("DEADLINE_EXCEEDED", exception.getReason()); + assertEquals("message", exception.getMessage()); + assertTrue(exception.isRetryable()); + + exception = new DatastoreException(14, "message", "UNAVAILABLE"); + assertEquals(14, exception.getCode()); + assertEquals("UNAVAILABLE", exception.getReason()); + assertEquals("message", exception.getMessage()); + assertTrue(exception.isRetryable()); + + exception = new DatastoreException(2, "message", "INTERNAL"); + assertEquals(2, exception.getCode()); + assertEquals("INTERNAL", exception.getReason()); + assertEquals("message", exception.getMessage()); + assertFalse(exception.isRetryable()); + + IOException cause = new SocketTimeoutException("socketTimeoutMessage"); + exception = new DatastoreException(cause); + assertEquals(DatastoreException.UNKNOWN_CODE, exception.getCode()); + assertNull(exception.getReason()); + assertEquals("socketTimeoutMessage", exception.getMessage()); + assertEquals(cause, exception.getCause()); + assertTrue(exception.isRetryable()); + assertSame(cause, exception.getCause()); + + exception = new DatastoreException(2, "message", "INTERNAL", cause); + assertEquals(2, exception.getCode()); + assertEquals("INTERNAL", exception.getReason()); + assertEquals("message", exception.getMessage()); + assertFalse(exception.isRetryable()); + assertSame(cause, exception.getCause()); + } + + @Test + public void testTranslateAndThrow() throws Exception { + Exception cause = new DatastoreException(14, "message", "UNAVAILABLE"); + RetryHelper.RetryHelperException exceptionMock = + createMock(RetryHelper.RetryHelperException.class); + expect(exceptionMock.getCause()).andReturn(cause).times(2); + replay(exceptionMock); + try { + DatastoreException.translateAndThrow(exceptionMock); + } catch (BaseServiceException ex) { + assertEquals(14, ex.getCode()); + assertEquals("message", ex.getMessage()); + assertTrue(ex.isRetryable()); + } finally { + verify(exceptionMock); + } + cause = new IllegalArgumentException("message"); + exceptionMock = createMock(RetryHelper.RetryHelperException.class); + expect(exceptionMock.getMessage()).andReturn("message").times(1); + expect(exceptionMock.getCause()).andReturn(cause).times(2); + replay(exceptionMock); + try { + DatastoreException.translateAndThrow(exceptionMock); + } catch (BaseServiceException ex) { + assertEquals(DatastoreException.UNKNOWN_CODE, ex.getCode()); + assertEquals("message", ex.getMessage()); + assertFalse(ex.isRetryable()); + assertSame(cause, ex.getCause()); + } finally { + verify(exceptionMock); + } + } + + @Test + public void testThrowInvalidRequest() throws Exception { + try { + DatastoreException.throwInvalidRequest("message %s %d", "a", 1); + fail("Exception expected"); + } catch (DatastoreException ex) { + assertEquals("FAILED_PRECONDITION", ex.getReason()); + assertEquals("message a 1", ex.getMessage()); + } + } +} 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 new file mode 100644 index 000000000000..94121cf78f10 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java @@ -0,0 +1,156 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; +import java.util.Collections; +import java.util.List; +import org.junit.Test; + +public class DatastoreHelperTest { + + @Test + public void testNewKeyFactory() { + DatastoreOptions options = createMock(DatastoreOptions.class); + expect(options.getProjectId()).andReturn("ds1").once(); + expect(options.getNamespace()).andReturn("ns1").once(); + replay(options); + KeyFactory keyFactory = DatastoreHelper.newKeyFactory(options); + Key key = keyFactory.setKind("k").newKey("bla"); + assertEquals("ds1", key.getProjectId()); + assertEquals("ns1", key.getNamespace()); + assertEquals("k", key.getKind()); + assertEquals("bla", key.getName()); + verify(options); + } + + @Test + public void testAllocateId() throws Exception { + Datastore datastore = createStrictMock(Datastore.class); + IncompleteKey pKey1 = IncompleteKey.newBuilder("ds", "k").build(); + Key key1 = Key.newBuilder(pKey1, 1).build(); + expect(datastore.allocateId(new IncompleteKey[] {pKey1})) + .andReturn(Collections.singletonList(key1)); + replay(datastore); + assertEquals(key1, DatastoreHelper.allocateId(datastore, pKey1)); + verify(datastore); + } + + @Test + public void testGetWithDatastore() throws Exception { + Datastore datastore = createStrictMock(Datastore.class); + IncompleteKey pKey1 = IncompleteKey.newBuilder("ds", "k").build(); + Key key1 = Key.newBuilder(pKey1, 1).build(); + Entity entity1 = Entity.newBuilder(key1).build(); + Key key2 = Key.newBuilder(pKey1, 2).build(); + ReadOption eventualConsistency = ReadOption.eventualConsistency(); + expect(datastore.get(Collections.singletonList(key1))) + .andReturn(Collections.singletonList(entity1).iterator()); + expect(datastore.get(Collections.singletonList(key2))) + .andReturn(Collections.emptyIterator()); + expect(datastore.get(Collections.singletonList(key1), eventualConsistency)) + .andReturn(Collections.singletonList(entity1).iterator()); + replay(datastore); + assertEquals(entity1, DatastoreHelper.get(datastore, key1)); + assertNull(DatastoreHelper.get(datastore, key2)); + assertEquals(entity1, DatastoreHelper.get(datastore, key1, eventualConsistency)); + verify(datastore); + } + + @Test + public void testGetWithTransaction() throws Exception { + Transaction transaction = createStrictMock(Transaction.class); + IncompleteKey pKey1 = IncompleteKey.newBuilder("ds", "k").build(); + Key key1 = Key.newBuilder(pKey1, 1).build(); + Entity entity1 = Entity.newBuilder(key1).build(); + Key key2 = Key.newBuilder(pKey1, 2).build(); + expect(transaction.get(new Key[] {key1})) + .andReturn(Collections.singletonList(entity1).iterator()); + expect(transaction.get(new Key[] {key2})).andReturn(Collections.emptyIterator()); + replay(transaction); + assertEquals(entity1, DatastoreHelper.get(transaction, key1)); + assertNull(DatastoreHelper.get(transaction, key2)); + verify(transaction); + } + + @Test + public void testAdd() throws Exception { + Datastore datastore = createStrictMock(Datastore.class); + IncompleteKey pKey = IncompleteKey.newBuilder("ds", "k").build(); + Key key = Key.newBuilder(pKey, 1).build(); + Entity entity = Entity.newBuilder(key).build(); + expect(datastore.add(new Entity[] {entity})).andReturn(Collections.singletonList(entity)); + replay(datastore); + assertEquals(entity, DatastoreHelper.add(datastore, entity)); + verify(datastore); + } + + @Test + public void testFetchWithDatastore() throws Exception { + Datastore datastore = createStrictMock(Datastore.class); + IncompleteKey pKey1 = IncompleteKey.newBuilder("ds", "k").build(); + Key key1 = Key.newBuilder(pKey1, 1).build(); + Key key2 = Key.newBuilder(pKey1, "a").build(); + Entity entity1 = Entity.newBuilder(key1).build(); + Entity entity2 = Entity.newBuilder(key2).build(); + ReadOption eventualConsistency = ReadOption.eventualConsistency(); + expect(datastore.get(ImmutableList.of(key1, key2))) + .andReturn(Iterators.forArray(entity1, entity2)) + .once(); + expect(datastore.get(ImmutableList.of(key1, key2), eventualConsistency)) + .andReturn(Iterators.forArray(entity1, entity2)) + .once(); + replay(datastore); + List values = DatastoreHelper.fetch(datastore, new Key[] {key1, key2}); + assertEquals(2, values.size()); + assertEquals(entity1, values.get(0)); + assertEquals(entity2, values.get(1)); + values = DatastoreHelper.fetch(datastore, new Key[] {key1, key2}, eventualConsistency); + assertEquals(2, values.size()); + assertEquals(entity1, values.get(0)); + assertEquals(entity2, values.get(1)); + verify(datastore); + } + + @Test + public void testFetchWithTransaction() throws Exception { + Transaction transaction = createStrictMock(Transaction.class); + IncompleteKey pKey1 = IncompleteKey.newBuilder("ds", "k").build(); + Key key1 = Key.newBuilder(pKey1, 1).build(); + Key key2 = Key.newBuilder(pKey1, "a").build(); + Entity entity1 = Entity.newBuilder(key1).build(); + Entity entity2 = Entity.newBuilder(key2).build(); + expect(transaction.get(new Key[] {key1, key2})) + .andReturn(Iterators.forArray(entity1, entity2)) + .once(); + replay(transaction); + List values = DatastoreHelper.fetch(transaction, new Key[] {key1, key2}); + assertEquals(2, values.size()); + assertEquals(entity1, values.get(0)); + assertEquals(entity2, values.get(1)); + verify(transaction); + } +} 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 new file mode 100644 index 000000000000..f00cbd913dd9 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java @@ -0,0 +1,94 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.TransportOptions; +import com.google.cloud.datastore.spi.DatastoreRpcFactory; +import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import org.easymock.EasyMock; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +public class DatastoreOptionsTest { + + private static final String PROJECT_ID = "project-id"; + private static final int PORT = 8080; + private DatastoreRpcFactory datastoreRpcFactory; + private DatastoreRpc datastoreRpc; + private DatastoreOptions.Builder options; + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Before + public void setUp() { + datastoreRpcFactory = EasyMock.createMock(DatastoreRpcFactory.class); + datastoreRpc = EasyMock.createMock(DatastoreRpc.class); + options = DatastoreOptions.newBuilder() + .setServiceRpcFactory(datastoreRpcFactory) + .setProjectId(PROJECT_ID) + .setHost("http://localhost:" + PORT); + EasyMock.expect(datastoreRpcFactory.create(EasyMock.anyObject(DatastoreOptions.class))) + .andReturn(datastoreRpc) + .anyTimes(); + EasyMock.replay(datastoreRpcFactory, datastoreRpc); + } + + @Test + public void testProjectId() throws Exception { + assertEquals(PROJECT_ID, options.build().getProjectId()); + } + + @Test + public void testHost() throws Exception { + assertEquals("http://localhost:" + PORT, options.build().getHost()); + } + + @Test + public void testNamespace() throws Exception { + assertTrue(options.build().getNamespace().isEmpty()); + assertEquals("ns1", options.setNamespace("ns1").build().getNamespace()); + } + + @Test + public void testDatastore() throws Exception { + assertSame(datastoreRpc, options.build().getRpc()); + } + + @Test + public void testToBuilder() throws Exception { + DatastoreOptions original = options.setNamespace("ns1").build(); + DatastoreOptions copy = original.toBuilder().build(); + assertEquals(original.getProjectId(), copy.getProjectId()); + assertEquals(original.getNamespace(), copy.getNamespace()); + assertEquals(original.getHost(), copy.getHost()); + assertEquals(original.getRetrySettings(), copy.getRetrySettings()); + assertEquals(original.getCredentials(), copy.getCredentials()); + } + + @Test + public void testInvalidTransport() { + thrown.expect(IllegalArgumentException.class); + DatastoreOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class)); + } +} 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 new file mode 100644 index 000000000000..329f4e7ea7d4 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java @@ -0,0 +1,1050 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import com.google.cloud.ServiceOptions; +import com.google.cloud.Timestamp; +import com.google.cloud.datastore.Query.ResultType; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +import com.google.cloud.datastore.spi.DatastoreRpcFactory; +import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import com.google.cloud.datastore.testing.LocalDatastoreHelper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.ReadOptions; +import com.google.datastore.v1.ReadOptions.ReadConsistency; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.datastore.v1.TransactionOptions; +import com.google.protobuf.ByteString; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeoutException; +import org.easymock.EasyMock; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.threeten.bp.Duration; + +@RunWith(JUnit4.class) +public class DatastoreTest { + + private static LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0); + 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 KIND1 = "kind1"; + private static final String KIND2 = "kind2"; + private static final String KIND3 = "kind3"; + private static final NullValue NULL_VALUE = NullValue.of(); + private static final StringValue STR_VALUE = StringValue.of("str"); + private static final BooleanValue BOOL_VALUE = BooleanValue.newBuilder(false) + .setExcludeFromIndexes(true).build(); + private static final IncompleteKey INCOMPLETE_KEY1 = + IncompleteKey.newBuilder(PROJECT_ID, KIND1).build(); + private static final IncompleteKey INCOMPLETE_KEY2 = + IncompleteKey.newBuilder(PROJECT_ID, KIND2).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").build(); + private static final Key KEY4 = Key.newBuilder(KEY2).setName("newName1").build(); + private static final Key KEY5 = Key.newBuilder(KEY2).setName("newName2").build(); + private static final KeyValue KEY_VALUE = KeyValue.of(KEY1); + 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(new LatLng(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 DatastoreOptions rpcMockOptions; + private DatastoreRpcFactory rpcFactoryMock; + private DatastoreRpc rpcMock; + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @BeforeClass + public static void beforeClass() throws IOException, InterruptedException { + helper.start(); + } + + @Before + public void setUp() { + rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class); + rpcMock = EasyMock.createStrictMock(DatastoreRpc.class); + rpcMockOptions = options + .toBuilder() + .setRetrySettings(ServiceOptions.getDefaultRetrySettings()) + .setServiceRpcFactory(rpcFactoryMock) + .build(); + EasyMock.expect(rpcFactoryMock.create(rpcMockOptions)).andReturn(rpcMock); + StructuredQuery query = Query.newKeyQueryBuilder().build(); + QueryResults result = datastore.run(query); + datastore.delete(Iterators.toArray(result, Key.class)); + datastore.add(ENTITY1, ENTITY2); + } + + @AfterClass + public static void afterClass() throws IOException, InterruptedException, TimeoutException { + helper.stop(Duration.ofMinutes(1)); + } + + @Test + public void testGetOptions() { + assertSame(options, datastore.getOptions()); + } + + @Test + public void testNewTransactionCommit() { + Transaction transaction = datastore.newTransaction(); + transaction.add(ENTITY3); + Entity entity2 = Entity.newBuilder(ENTITY2) + .clear() + .setNull("bla") + .build(); + transaction.update(entity2); + transaction.delete(KEY1); + transaction.commit(); + + List list = datastore.fetch(KEY1, KEY2, KEY3); + assertNull(list.get(0)); + assertEquals(entity2, list.get(1)); + assertEquals(ENTITY3, list.get(2)); + assertEquals(3, list.size()); + + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + + try { + transaction.rollback(); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + + verifyNotUsable(transaction); + } + + @Test + public void testTransactionWithRead() { + Transaction transaction = datastore.newTransaction(); + assertNull(transaction.get(KEY3)); + transaction.add(ENTITY3); + transaction.commit(); + assertEquals(ENTITY3, datastore.get(KEY3)); + + transaction = datastore.newTransaction(); + assertEquals(ENTITY3, transaction.get(KEY3)); + // update entity3 during the transaction + datastore.put(Entity.newBuilder(ENTITY3).clear().build()); + transaction.update(ENTITY2); + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("ABORTED", expected.getReason()); + } + } + + @Test + public void testTransactionWithQuery() { + Query query = Query.newEntityQueryBuilder() + .setKind(KIND2) + .setFilter(PropertyFilter.hasAncestor(KEY2)) + .build(); + Transaction transaction = datastore.newTransaction(); + QueryResults results = transaction.run(query); + assertEquals(ENTITY2, results.next()); + assertFalse(results.hasNext()); + transaction.add(ENTITY3); + transaction.commit(); + assertEquals(ENTITY3, datastore.get(KEY3)); + + transaction = datastore.newTransaction(); + results = transaction.run(query); + assertEquals(ENTITY2, results.next()); + transaction.delete(ENTITY3.getKey()); + // update entity2 during the transaction + datastore.put(Entity.newBuilder(ENTITY2).clear().build()); + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("ABORTED", expected.getReason()); + } + } + + @Test + public void testNewTransactionRollback() { + Transaction transaction = datastore.newTransaction(); + transaction.add(ENTITY3); + Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla") + .set("list3", StringValue.of("bla"), StringValue.newBuilder("bla").build()).build(); + transaction.update(entity2); + transaction.delete(KEY1); + transaction.rollback(); + transaction.rollback(); // should be safe to repeat rollback calls + + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + + verifyNotUsable(transaction); + + List list = datastore.fetch(KEY1, KEY2, KEY3); + assertEquals(ENTITY1, list.get(0)); + assertEquals(ENTITY2, list.get(1)); + assertNull(list.get(2)); + assertEquals(3, list.size()); + } + + @Test + public void testRunInTransactionWithReadWriteOption() { + + EasyMock.expect(rpcMock.beginTransaction(EasyMock.anyObject(BeginTransactionRequest.class))) + .andReturn(BeginTransactionResponse.getDefaultInstance()); + EasyMock.expect(rpcMock.rollback(EasyMock.anyObject(RollbackRequest.class))) + .andReturn(RollbackResponse.getDefaultInstance()) + .once(); + + EasyMock.expect(rpcMock.beginTransaction(EasyMock.anyObject(BeginTransactionRequest.class))) + .andReturn(BeginTransactionResponse.getDefaultInstance()); + EasyMock.expect(rpcMock.commit(EasyMock.anyObject(CommitRequest.class))) + .andReturn(CommitResponse.newBuilder().build()); + + EasyMock.replay(rpcFactoryMock, rpcMock); + + Datastore mockDatastore = rpcMockOptions.getService(); + + Datastore.TransactionCallable callable = + new Datastore.TransactionCallable() { + private Integer attempts = 1; + + @Override + public Integer run(DatastoreReaderWriter transaction) { + if (attempts < 2) { + ++attempts; + throw new DatastoreException(10, "", "ABORTED", false, null); + } + return attempts; + } + }; + + TransactionOptions options = TransactionOptions.newBuilder().setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()).build(); + Integer result = mockDatastore.runInTransaction(callable, options); + EasyMock.verify(rpcFactoryMock, rpcMock); + assertEquals(2, result.intValue()); + } + + private void verifyNotUsable(DatastoreWriter writer) { + try { + writer.add(ENTITY3); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + + try { + writer.put(ENTITY3); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + + try { + writer.update(ENTITY3); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + + try { + writer.delete(ENTITY3.getKey()); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + } + + @Test + public void testNewBatch() { + 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(); + Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build(); + + List entities = batch.add(entity4, PARTIAL_ENTITY2, entity5); + Entity entity6 = entities.get(1); + assertSame(entity4, entities.get(0)); + assertEquals(PARTIAL_ENTITY2.getProperties(), entity6.getProperties()); + assertEquals(PARTIAL_ENTITY2.getKey().getProjectId(), entity6.getKey().getProjectId()); + assertEquals(PARTIAL_ENTITY2.getKey().getNamespace(), entity6.getKey().getNamespace()); + assertEquals(PARTIAL_ENTITY2.getKey().getAncestors(), entity6.getKey().getAncestors()); + assertEquals(PARTIAL_ENTITY2.getKey().getKind(), entity6.getKey().getKind()); + assertEquals(PARTIAL_ENTITY2.getKey(), IncompleteKey.newBuilder(entity6.getKey()).build()); + assertNotEquals(PARTIAL_ENTITY2.getKey().getPath(), entity6.getKey().getPath()); + assertNotEquals(PARTIAL_ENTITY2.getKey(), entity6.getKey()); + assertSame(entity5, entities.get(2)); + batch.addWithDeferredIdAllocation(PARTIAL_ENTITY3); + batch.put(ENTITY3, entity1, entity2); + + Batch.Response response = batch.submit(); + entities = + 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)); + assertEquals(entity4, entities.get(3)); + assertEquals(entity5, entities.get(4)); + assertEquals(entity6, entities.get(5)); + assertEquals(6, entities.size()); + List generatedKeys = response.getGeneratedKeys(); + assertEquals(1, generatedKeys.size()); + assertEquals(PARTIAL_ENTITY3.getProperties(), datastore.get(generatedKeys.get(0)).getProperties()); + assertEquals(PARTIAL_ENTITY3.getKey(), IncompleteKey.newBuilder(generatedKeys.get(0)).build()); + + try { + batch.submit(); + fail("Expecting a failure"); + } catch (DatastoreException ex) { + // expected to fail + } + verifyNotUsable(batch); + + batch = datastore.newBatch(); + batch.delete(entity4.getKey(), entity5.getKey()); + batch.update(ENTITY1, ENTITY2, ENTITY3); + batch.submit(); + entities = datastore.fetch(KEY1, KEY2, KEY3, entity4.getKey(), entity5.getKey()); + assertEquals(ENTITY1, entities.get(0)); + assertEquals(ENTITY2, entities.get(1)); + assertEquals(ENTITY3, entities.get(2)); + assertNull(entities.get(3)); + assertNull(entities.get(4)); + assertEquals(5, entities.size()); + } + + @Test + public void testRunGqlQueryNoCasting() { + Query query1 = + Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND1).build(); + QueryResults results1 = datastore.run(query1); + assertTrue(results1.hasNext()); + assertEquals(ENTITY1, results1.next()); + assertFalse(results1.hasNext()); + + datastore.put(ENTITY3); + Query query2 = Query.newGqlQueryBuilder( + ResultType.ENTITY, "select * from " + KIND2 + " order by __key__").build(); + QueryResults results2 = datastore.run(query2); + assertTrue(results2.hasNext()); + assertEquals(ENTITY2, results2.next()); + assertTrue(results2.hasNext()); + assertEquals(ENTITY3, results2.next()); + assertFalse(results2.hasNext()); + + query1 = Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from bla").build(); + results1 = datastore.run(query1); + assertFalse(results1.hasNext()); + + Query keyOnlyQuery = + Query.newGqlQueryBuilder(ResultType.KEY, "select __key__ from " + KIND1).build(); + QueryResults keyOnlyResults = datastore.run(keyOnlyQuery); + assertTrue(keyOnlyResults.hasNext()); + assertEquals(KEY1, keyOnlyResults.next()); + assertFalse(keyOnlyResults.hasNext()); + + GqlQuery keyProjectionQuery = Query.newGqlQueryBuilder( + ResultType.PROJECTION_ENTITY, "select __key__ from " + KIND1).build(); + QueryResults keyProjectionResult = datastore.run(keyProjectionQuery); + assertTrue(keyProjectionResult.hasNext()); + ProjectionEntity projectionEntity = keyProjectionResult.next(); + assertEquals(KEY1, projectionEntity.getKey()); + assertTrue(projectionEntity.getProperties().isEmpty()); + assertFalse(keyProjectionResult.hasNext()); + + GqlQuery projectionQuery = Query.newGqlQueryBuilder( + ResultType.PROJECTION_ENTITY, "select str, date from " + KIND1).build(); + + QueryResults projectionResult = datastore.run(projectionQuery); + assertTrue(projectionResult.hasNext()); + projectionEntity = projectionResult.next(); + assertEquals("str", projectionEntity.getString("str")); + assertEquals(TIMESTAMP_VALUE.get(), projectionEntity.getTimestamp("date")); + assertEquals(2, projectionEntity.getNames().size()); + assertFalse(projectionResult.hasNext()); + } + + @Test + public void testRunGqlQueryWithCasting() { + @SuppressWarnings("unchecked") + Query query1 = + (Query) Query.newGqlQueryBuilder("select * from " + KIND1).build(); + QueryResults results1 = datastore.run(query1); + assertTrue(results1.hasNext()); + assertEquals(ENTITY1, results1.next()); + assertFalse(results1.hasNext()); + + Query query2 = Query.newGqlQueryBuilder("select * from " + KIND1).build(); + QueryResults results2 = datastore.run(query2); + assertSame(Entity.class, results2.getResultClass()); + @SuppressWarnings("unchecked") + QueryResults results3 = (QueryResults) results2; + assertTrue(results3.hasNext()); + assertEquals(ENTITY1, results3.next()); + assertFalse(results3.hasNext()); + } + + @Test + public void testGqlQueryPagination() throws DatastoreException { + List responses = buildResponsesForQueryPagination(); + for (int i = 0; i < responses.size(); i++) { + EasyMock.expect(rpcMock.runQuery(EasyMock.anyObject(RunQueryRequest.class))) + .andReturn(responses.get(i)); + } + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore mockDatastore = rpcMockOptions.getService(); + QueryResults results = + mockDatastore.run(Query.newGqlQueryBuilder(ResultType.KEY, "select __key__ from *").build()); + int count = 0; + while (results.hasNext()) { + count += 1; + results.next(); + } + assertEquals(count, 5); + EasyMock.verify(rpcFactoryMock, rpcMock); + } + + @Test + public void testRunStructuredQuery() { + Query query = + Query.newEntityQueryBuilder().setKind(KIND1).setOrderBy(OrderBy.asc("__key__")).build(); + QueryResults results1 = datastore.run(query); + assertTrue(results1.hasNext()); + assertEquals(ENTITY1, results1.next()); + assertFalse(results1.hasNext()); + + Query keyOnlyQuery = Query.newKeyQueryBuilder().setKind(KIND1).build(); + QueryResults results2 = datastore.run(keyOnlyQuery); + assertTrue(results2.hasNext()); + assertEquals(ENTITY1.getKey(), results2.next()); + assertFalse(results2.hasNext()); + + StructuredQuery keyOnlyProjectionQuery = + Query.newProjectionEntityQueryBuilder() + .setKind(KIND1).setProjection("__key__").build(); + QueryResults results3 = datastore.run(keyOnlyProjectionQuery); + assertTrue(results3.hasNext()); + ProjectionEntity projectionEntity = results3.next(); + assertEquals(ENTITY1.getKey(), projectionEntity.getKey()); + assertTrue(projectionEntity.getNames().isEmpty()); + assertFalse(results2.hasNext()); + + StructuredQuery projectionQuery = Query.newProjectionEntityQueryBuilder() + .setKind(KIND2) + .setProjection("age") + .setFilter(PropertyFilter.gt("age", 18)) + .setDistinctOn("age") + .setOrderBy(OrderBy.asc("age")) + .setLimit(10) + .build(); + + QueryResults results4 = datastore.run(projectionQuery); + assertTrue(results4.hasNext()); + ProjectionEntity entity = results4.next(); + assertEquals(ENTITY2.getKey(), entity.getKey()); + assertEquals(20, entity.getLong("age")); + assertEquals(1, entity.getProperties().size()); + assertFalse(results4.hasNext()); + } + + @Test + public void testStructuredQueryPagination() throws DatastoreException { + List responses = buildResponsesForQueryPagination(); + for (int i = 0; i < responses.size(); i++) { + EasyMock.expect(rpcMock.runQuery(EasyMock.anyObject(RunQueryRequest.class))) + .andReturn(responses.get(i)); + } + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore datastore = rpcMockOptions.getService(); + QueryResults results = datastore.run(Query.newKeyQueryBuilder().build()); + int count = 0; + while (results.hasNext()) { + count += 1; + results.next(); + } + assertEquals(count, 5); + EasyMock.verify(rpcFactoryMock, rpcMock); + } + + private List buildResponsesForQueryPagination() { + Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build(); + Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build(); + datastore.add(ENTITY3, entity4, entity5); + List responses = new ArrayList<>(); + Query query = Query.newKeyQueryBuilder().build(); + RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder(); + query.populatePb(requestPb); + QueryResultBatch queryResultBatchPb = RunQueryResponse.newBuilder() + .mergeFrom(((DatastoreImpl) datastore).runQuery(requestPb.build())) + .getBatch(); + QueryResultBatch queryResultBatchPb1 = QueryResultBatch.newBuilder() + .mergeFrom(queryResultBatchPb) + .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED) + .clearEntityResults() + .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(0, 1)) + .setEndCursor(queryResultBatchPb.getEntityResultsList().get(0).getCursor()) + .build(); + responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb1).build()); + QueryResultBatch queryResultBatchPb2 = QueryResultBatch.newBuilder() + .mergeFrom(queryResultBatchPb) + .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED) + .clearEntityResults() + .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(1, 3)) + .setEndCursor(queryResultBatchPb.getEntityResultsList().get(2).getCursor()) + .build(); + responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build()); + QueryResultBatch queryResultBatchPb3 = QueryResultBatch.newBuilder() + .mergeFrom(queryResultBatchPb) + .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS) + .clearEntityResults() + .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(3, 5)) + .setEndCursor(queryResultBatchPb.getEntityResultsList().get(4).getCursor()) + .build(); + responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb3).build()); + return responses; + } + + @Test + public void testQueryPaginationWithLimit() throws DatastoreException { + List responses = buildResponsesForQueryPaginationWithLimit(); + List endCursors = Lists.newArrayListWithCapacity(responses.size()); + for (RunQueryResponse response : responses) { + EasyMock.expect(rpcMock.runQuery(EasyMock.anyObject(RunQueryRequest.class))) + .andReturn(response); + if (response.getBatch().getMoreResults() != QueryResultBatch.MoreResultsType.NOT_FINISHED) { + endCursors.add(response.getBatch().getEndCursor()); + } + } + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore datastore = rpcMockOptions.getService(); + int limit = 2; + int totalCount = 0; + Iterator cursorIter = endCursors.iterator(); + StructuredQuery query = Query.newEntityQueryBuilder().setLimit(limit).build(); + while (true) { + QueryResults results = datastore.run(query); + int resultCount = 0; + while (results.hasNext()) { + results.next(); + resultCount++; + totalCount++; + } + assertTrue(cursorIter.hasNext()); + Cursor expectedEndCursor = Cursor.copyFrom(cursorIter.next().toByteArray()); + assertEquals(expectedEndCursor, results.getCursorAfter()); + if (resultCount < limit) { + break; + } + query = query.toBuilder().setStartCursor(results.getCursorAfter()).build(); + } + assertEquals(5, totalCount); + EasyMock.verify(rpcFactoryMock, rpcMock); + } + + private List buildResponsesForQueryPaginationWithLimit() { + Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build(); + Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build(); + datastore.add(ENTITY3, entity4, entity5); + DatastoreRpc datastoreRpc = datastore.getOptions().getDatastoreRpcV1(); + List responses = new ArrayList<>(); + Query query = Query.newEntityQueryBuilder().build(); + RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder(); + query.populatePb(requestPb); + QueryResultBatch queryResultBatchPb = RunQueryResponse.newBuilder() + .mergeFrom(datastoreRpc.runQuery(requestPb.build())) + .getBatch(); + QueryResultBatch queryResultBatchPb1 = QueryResultBatch.newBuilder() + .mergeFrom(queryResultBatchPb) + .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED) + .clearEntityResults() + .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(0, 1)) + .setEndCursor(ByteString.copyFromUtf8("a")) + .build(); + responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb1).build()); + QueryResultBatch queryResultBatchPb2 = QueryResultBatch.newBuilder() + .mergeFrom(queryResultBatchPb) + .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT) + .clearEntityResults() + .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(1, 2)) + .setEndCursor( + ByteString.copyFrom(new byte[] {(byte) 0x80})) // test invalid UTF-8 string + .build(); + responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build()); + QueryResultBatch queryResultBatchPb3 = QueryResultBatch.newBuilder() + .mergeFrom(queryResultBatchPb) + .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT) + .clearEntityResults() + .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(2, 4)) + .setEndCursor(ByteString.copyFromUtf8("b")) + .build(); + responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb3).build()); + QueryResultBatch queryResultBatchPb4 = QueryResultBatch.newBuilder() + .mergeFrom(queryResultBatchPb) + .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS) + .clearEntityResults() + .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(4, 5)) + .setEndCursor(ByteString.copyFromUtf8("c")) + .build(); + responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb4).build()); + return responses; + } + + @Test + public void testEventualConsistencyQuery() { + ReadOptions readOption = + ReadOptions.newBuilder().setReadConsistencyValue(ReadConsistency.EVENTUAL_VALUE).build(); + com.google.datastore.v1.GqlQuery query = com.google.datastore.v1.GqlQuery.newBuilder() + .setQueryString("FROM * SELECT *") + .build(); + RunQueryRequest.Builder expectedRequest = RunQueryRequest.newBuilder() + .setReadOptions(readOption) + .setGqlQuery(query) + .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID) + .build()); + EasyMock.expect(rpcMock.runQuery(expectedRequest.build())) + .andReturn(RunQueryResponse.newBuilder().build()); + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore datastore = rpcMockOptions.getService(); + datastore.run( + Query.newGqlQueryBuilder("FROM * SELECT *").build(), ReadOption.eventualConsistency()); + EasyMock.verify(rpcFactoryMock, rpcMock); + } + + @Test + public void testToUrlSafe() { + byte[][] invalidUtf8 = + new byte[][] {{(byte) 0xfe}, {(byte) 0xc1, (byte) 0xbf}, {(byte) 0xc0}, {(byte) 0x80}}; + for (byte[] bytes : invalidUtf8) { + assertFalse(ByteString.copyFrom(bytes).isValidUtf8()); + Cursor cursor = new Cursor(ByteString.copyFrom(bytes)); + assertEquals(cursor, Cursor.fromUrlSafe(cursor.toUrlSafe())); + } + } + + @Test + public void testAllocateId() { + KeyFactory keyFactory = datastore.newKeyFactory().setKind(KIND1); + IncompleteKey pk1 = keyFactory.newKey(); + Key key1 = datastore.allocateId(pk1); + assertEquals(key1.getProjectId(), pk1.getProjectId()); + assertEquals(key1.getNamespace(), pk1.getNamespace()); + assertEquals(key1.getAncestors(), pk1.getAncestors()); + assertEquals(key1.getKind(), pk1.getKind()); + assertTrue(key1.hasId()); + assertFalse(key1.hasName()); + assertEquals(Key.newBuilder(pk1, key1.getId()).build(), key1); + + Key key2 = datastore.allocateId(pk1); + assertNotEquals(key1, key2); + assertEquals(Key.newBuilder(pk1, key2.getId()).build(), key2); + + try { + datastore.allocateId(key1); + fail("Expecting a failure"); + } catch (IllegalArgumentException expected) { + assertEquals(expected.getMessage(), "keys must be IncompleteKey instances"); + } + } + + @Test + public void testAllocateIdArray() { + KeyFactory keyFactory = datastore.newKeyFactory().setKind(KIND1); + IncompleteKey incompleteKey1 = keyFactory.newKey(); + IncompleteKey incompleteKey2 = + keyFactory.setKind(KIND2).addAncestor(PathElement.of(KIND1, 10)).newKey(); + Key key3 = keyFactory.newKey("name"); + List result1 = + datastore.allocateId(incompleteKey1, incompleteKey2, incompleteKey1); + assertEquals(3, result1.size()); + assertEquals(Key.newBuilder(incompleteKey1, result1.get(0).getId()).build(), result1.get(0)); + assertEquals(Key.newBuilder(incompleteKey1, result1.get(2).getId()).build(), result1.get(2)); + assertEquals(Key.newBuilder(incompleteKey2, result1.get(1).getId()).build(), result1.get(1)); + + try { + datastore.allocateId(incompleteKey1, incompleteKey2, key3); + fail("expecting a failure"); + } catch(IllegalArgumentException expected) { + assertEquals(expected.getMessage(), "keys must be IncompleteKey instances"); + + } + } + + @Test + public void testGet() { + Entity entity = datastore.get(KEY3); + assertNull(entity); + + entity = datastore.get(KEY1); + assertEquals(ENTITY1, entity); + StringValue value1 = entity.getValue("str"); + assertEquals(STR_VALUE, value1); + BooleanValue value2 = entity.getValue("bool"); + assertEquals(BOOL_VALUE, value2); + ListValue value3 = entity.getValue("list"); + assertEquals(LIST_VALUE2, value3); + TimestampValue value4 = entity.getValue("date"); + assertEquals(TIMESTAMP_VALUE, value4); + LatLngValue value5 = entity.getValue("latLng"); + assertEquals(LAT_LNG_VALUE, value5); + FullEntity value6 = entity.getEntity("partial1"); + assertEquals(PARTIAL_ENTITY1, value6); + ListValue value7 = entity.getValue("emptyList"); + assertEquals(EMPTY_LIST_VALUE, value7); + assertEquals(7, entity.getNames().size()); + assertFalse(entity.contains("bla")); + } + + @Test + public void testLookupEventualConsistency() { + ReadOptions readOption = + ReadOptions.newBuilder().setReadConsistencyValue(ReadConsistency.EVENTUAL_VALUE).build(); + com.google.datastore.v1.Key key = com.google.datastore.v1.Key.newBuilder() + .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build()) + .addPath(com.google.datastore.v1.Key.PathElement.newBuilder() + .setKind("kind1").setName("name").build()) + .build(); + LookupRequest lookupRequest = + LookupRequest.newBuilder().setReadOptions(readOption).addKeys(key).build(); + EasyMock.expect(rpcMock.lookup(lookupRequest)) + .andReturn(LookupResponse.newBuilder().build()) + .times(3); + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore datastore = rpcMockOptions.getService(); + datastore.get(KEY1, ReadOption.eventualConsistency()); + datastore.get(ImmutableList.of(KEY1), ReadOption.eventualConsistency()); + datastore.fetch(ImmutableList.of(KEY1), ReadOption.eventualConsistency()); + EasyMock.verify(rpcFactoryMock, rpcMock); + } + + @Test + public void testGetArrayNoDeferredResults() { + datastore.put(ENTITY3); + Iterator result = + datastore.fetch(KEY1, Key.newBuilder(KEY1).setName("bla").build(), KEY2, KEY3).iterator(); + assertEquals(ENTITY1, result.next()); + assertNull(result.next()); + assertEquals(ENTITY2, result.next()); + Entity entity3 = result.next(); + assertEquals(ENTITY3, entity3); + assertTrue(entity3.isNull("null")); + assertFalse(entity3.getBoolean("bool")); + assertEquals(LIST_VALUE2.get(), entity3.getList("list")); + FullEntity partial1 = entity3.getEntity("partial1"); + FullEntity partial2 = entity3.getEntity("partial2"); + assertEquals(PARTIAL_ENTITY2, partial1); + assertEquals(ENTITY2, partial2); + assertEquals(ValueType.BOOLEAN, entity3.getValue("bool").getType()); + assertEquals(LAT_LNG_VALUE, entity3.getValue("latLng")); + assertEquals(EMPTY_LIST_VALUE, entity3.getValue("emptyList")); + assertEquals(8, entity3.getNames().size()); + assertFalse(entity3.contains("bla")); + try { + entity3.getString("str"); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + // expected - no such property + } + assertFalse(result.hasNext()); + } + + @Test + public void testGetArrayDeferredResults() throws DatastoreException { + Set requestedKeys = new HashSet<>(); + requestedKeys.add(KEY1); + requestedKeys.add(KEY2); + requestedKeys.add(KEY3); + requestedKeys.add(KEY4); + requestedKeys.add(KEY5); + Iterator iter = createDatastoreForDeferredLookup().get(KEY1, KEY2, KEY3, KEY4, KEY5); + Set keysOfFoundEntities = new HashSet<>(); + while (iter.hasNext()) { + keysOfFoundEntities.add(iter.next().getKey()); + } + assertEquals(requestedKeys, keysOfFoundEntities); + } + + @Test + public void testFetchArrayDeferredResults() throws DatastoreException { + List foundEntities = + createDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5); + assertEquals(foundEntities.get(0).getKey(), KEY1); + assertEquals(foundEntities.get(1).getKey(), KEY2); + assertEquals(foundEntities.get(2).getKey(), KEY3); + assertEquals(foundEntities.get(3).getKey(), KEY4); + assertEquals(foundEntities.get(4).getKey(), KEY5); + assertEquals(foundEntities.size(), 5); + } + + private Datastore createDatastoreForDeferredLookup() throws DatastoreException { + List keysPb = new ArrayList<>(); + keysPb.add(KEY1.toPb()); + keysPb.add(KEY2.toPb()); + keysPb.add(KEY3.toPb()); + keysPb.add(KEY4.toPb()); + keysPb.add(KEY5.toPb()); + List lookupRequests = new ArrayList<>(); + lookupRequests.add(LookupRequest.newBuilder().addAllKeys(keysPb).build()); + lookupRequests.add( + LookupRequest.newBuilder() + .addKeys(keysPb.get(1)) + .addKeys(keysPb.get(2)) + .addKeys(keysPb.get(4)) + .build()); + lookupRequests.add(LookupRequest.newBuilder().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<>(); + lookupResponses.add( + LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb())) + .addFound(EntityResult.newBuilder().setEntity(entity4.toPb())) + .addDeferred(keysPb.get(1)) + .addDeferred(keysPb.get(2)) + .addDeferred(keysPb.get(4)) + .build()); + lookupResponses.add( + LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(ENTITY2.toPb())) + .addFound(EntityResult.newBuilder().setEntity(ENTITY3.toPb())) + .addDeferred(keysPb.get(4)) + .build()); + lookupResponses.add( + LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(entity5.toPb())) + .build()); + for (int i = 0; i < lookupRequests.size(); i++) { + EasyMock.expect(rpcMock.lookup(lookupRequests.get(i))).andReturn(lookupResponses.get(i)); + } + EasyMock.replay(rpcFactoryMock, rpcMock); + return rpcMockOptions.getService(); + } + + @Test + public void testAddEntity() { + 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); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + // expected; + } + + List entities = datastore.add(ENTITY3, PARTIAL_ENTITY1, PARTIAL_ENTITY2); + assertEquals(ENTITY3, datastore.get(ENTITY3.getKey())); + assertEquals(ENTITY3, entities.get(0)); + assertEquals(PARTIAL_ENTITY1.getProperties(), entities.get(1).getProperties()); + assertEquals(PARTIAL_ENTITY1.getKey().getAncestors(), entities.get(1).getKey().getAncestors()); + assertNotNull(datastore.get(entities.get(1).getKey())); + assertEquals(PARTIAL_ENTITY2.getProperties(), entities.get(2).getProperties()); + assertEquals(PARTIAL_ENTITY2.getKey().getAncestors(), entities.get(2).getKey().getAncestors()); + assertNotNull(datastore.get(entities.get(2).getKey())); + } + + @Test + public void testUpdate() { + 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); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + // expected; + } + 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())); + } + + @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())); + + Entity entity2 = Entity.newBuilder(ENTITY2).clear().set("bla", new NullValue()).build(); + assertNotEquals(ENTITY2, entity2); + 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.getProperties(), entities.get(3).getProperties()); + 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(entities.get(3), entity); + } + + @Test + public void testDelete() { + Iterator keys = + 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(); + assertNull(keys.next()); + assertNull(keys.next()); + assertNull(keys.next()); + assertFalse(keys.hasNext()); + } + + @Test + public void testKeyFactory() { + KeyFactory keyFactory = datastore.newKeyFactory().setKind(KIND1); + assertEquals(INCOMPLETE_KEY1, keyFactory.newKey()); + assertEquals(IncompleteKey.newBuilder(INCOMPLETE_KEY1).setKind(KIND2).build(), + datastore.newKeyFactory().setKind(KIND2).newKey()); + assertEquals(KEY1, keyFactory.newKey("name")); + assertEquals(Key.newBuilder(KEY1).setId(2).build(), keyFactory.newKey(2)); + } + + @Test + public void testRetryableException() throws Exception { + LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build(); + LookupResponse responsePb = LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb())) + .build(); + EasyMock.expect(rpcMock.lookup(requestPb)) + .andThrow(new DatastoreException(14, "UNAVAILABLE", "UNAVAILABLE", null)) + .andReturn(responsePb); + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore datastore = rpcMockOptions.getService(); + Entity entity = datastore.get(KEY1); + assertEquals(ENTITY1, entity); + EasyMock.verify(rpcFactoryMock, rpcMock); + } + + @Test + public void testNonRetryableException() throws Exception { + LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build(); + EasyMock.expect(rpcMock.lookup(requestPb)) + .andThrow( + new DatastoreException(DatastoreException.UNKNOWN_CODE, "denied", "PERMISSION_DENIED")) + .times(1); + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore datastore = rpcMockOptions.getService(); + thrown.expect(DatastoreException.class); + thrown.expectMessage("denied"); + datastore.get(KEY1); + EasyMock.verify(rpcFactoryMock, rpcMock); + } + + @Test + public void testRuntimeException() throws Exception { + LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build(); + String exceptionMessage = "Artificial runtime exception"; + EasyMock.expect(rpcMock.lookup(requestPb)).andThrow(new RuntimeException(exceptionMessage)); + EasyMock.replay(rpcFactoryMock, rpcMock); + Datastore datastore = rpcMockOptions.getService(); + thrown.expect(DatastoreException.class); + thrown.expectMessage(exceptionMessage); + datastore.get(KEY1); + EasyMock.verify(rpcFactoryMock, rpcMock); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java new file mode 100644 index 000000000000..4ec8839451db --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class DoubleValueTest { + + private static final Double CONTENT = 1.25; + + @Test + public void testToBuilder() throws Exception { + DoubleValue value = DoubleValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @SuppressWarnings("deprecation") + @Test + public void testOf() throws Exception { + DoubleValue value = DoubleValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + DoubleValue.Builder builder = DoubleValue.newBuilder(CONTENT); + DoubleValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java new file mode 100644 index 000000000000..9a797586f83a --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java @@ -0,0 +1,60 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class EntityTest { + + private static final Key KEY1 = Key.newBuilder("ds1", "k1", "n1").build(); + private static final Key KEY2 = Key.newBuilder("ds1", "k2", 1).build(); + private static final IncompleteKey INCOMPLETE_KEY = IncompleteKey.newBuilder("ds1", "k2").build(); + private static final Entity ENTITY = Entity.newBuilder(KEY1).set("foo", "bar").build(); + private static final FullEntity INCOMPLETE_ENTITY = + Entity.newBuilder(INCOMPLETE_KEY).set("a", "b").build(); + + @Test + public void testEntity() throws Exception { + assertTrue(ENTITY.hasKey()); + assertEquals(KEY1, ENTITY.getKey()); + assertEquals("bar", ENTITY.getString("foo")); + } + + + @Test + public void testCopyFrom() throws Exception { + Entity.Builder builder = Entity.newBuilder(ENTITY); + assertEquals(ENTITY, builder.build()); + Entity entity = builder.setKey(KEY2).build(); + assertNotEquals(ENTITY, entity); + assertEquals(KEY2, entity.getKey()); + assertEquals(ENTITY.getProperties(), entity.getProperties()); + } + + + @Test + public void testCopyFromIncompleteEntity() throws Exception { + Entity.Builder builder = Entity.newBuilder(KEY2, INCOMPLETE_ENTITY); + Entity entity = builder.build(); + assertNotEquals(INCOMPLETE_ENTITY, entity); + assertEquals(INCOMPLETE_ENTITY.getProperties(), entity.getProperties()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java new file mode 100644 index 000000000000..dd15dc054e50 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java @@ -0,0 +1,53 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class EntityValueTest { + + private static final Key KEY = Key.newBuilder("ds", "kind", 1).build(); + private static final Entity CONTENT = Entity.newBuilder(KEY).set("FOO", "BAR").build(); + + @Test + public void testToBuilder() throws Exception { + EntityValue value = EntityValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @SuppressWarnings("deprecation") + @Test + public void testOf() throws Exception { + EntityValue value = EntityValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + EntityValue.Builder builder = EntityValue.newBuilder(CONTENT); + EntityValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java new file mode 100644 index 000000000000..dc98f2e032e8 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java @@ -0,0 +1,72 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class FullEntityTest { + + private static final Key KEY1 = Key.newBuilder("ds1", "k1", "n1").build(); + private static final Key KEY2 = Key.newBuilder("ds1", "k2", 1).build(); + private static final IncompleteKey INCOMPLETE_KEY = IncompleteKey.newBuilder("ds1", "k2").build(); + private static final Entity ENTITY = Entity.newBuilder(KEY1).set("foo", "bar").build(); + private static final FullEntity COMPLETE_ENTITY1 = ENTITY; + private static final FullEntity COMPLETE_ENTITY2 = + FullEntity.newBuilder(KEY2).set("foo", "bar").build(); + private static final FullEntity INCOMPLETE_ENTITY = + Entity.newBuilder(INCOMPLETE_KEY).set("a", "b").build(); + + @Test + public void testFullEntity() throws Exception { + assertTrue(COMPLETE_ENTITY1.hasKey()); + assertEquals(KEY1, COMPLETE_ENTITY1.getKey()); + assertEquals("bar", COMPLETE_ENTITY1.getString("foo")); + + assertTrue(COMPLETE_ENTITY2.hasKey()); + assertEquals(KEY2, COMPLETE_ENTITY2.getKey()); + assertEquals("bar", COMPLETE_ENTITY2.getString("foo")); + } + + @Test + public void testNoKey() throws Exception { + FullEntity entity = FullEntity.newBuilder().set("foo", "bar").build(); + assertFalse(entity.hasKey()); + assertNull(entity.getKey()); + assertEquals("bar", entity.getString("foo")); + + entity = FullEntity.newBuilder((IncompleteKey) null).build(); + assertFalse(entity.hasKey()); + assertNull(entity.getKey()); + } + + @Test + public void testCopyFrom() throws Exception { + FullEntity.Builder builder1 = FullEntity.newBuilder(ENTITY); + assertEquals(ENTITY, builder1.build()); + + builder1 = FullEntity.newBuilder(COMPLETE_ENTITY1); + assertEquals(COMPLETE_ENTITY1, builder1.build()); + + FullEntity.Builder builder2 = FullEntity.newBuilder(INCOMPLETE_ENTITY); + assertEquals(INCOMPLETE_ENTITY, builder2.build()); + } +} 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 new file mode 100644 index 000000000000..b7aa2f5058e2 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java @@ -0,0 +1,64 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; + +public class IncompleteKeyTest { + + private static IncompleteKey pk1, pk2; + private static IncompleteKey deprecatedPk1, deprecatedPk2; + private static Key parent1; + + @Before + public void setUp() { + pk1 = IncompleteKey.newBuilder("ds", "kind1").build(); + parent1 = Key.newBuilder("ds", "kind2", 10).setNamespace("ns").build(); + pk2 = IncompleteKey.newBuilder(parent1, "kind3").build(); + } + + @Test + public void testBuilders() throws Exception { + assertEquals("ds", pk1.getProjectId()); + assertEquals("kind1", pk1.getKind()); + assertTrue(pk1.getAncestors().isEmpty()); + + assertEquals("ds", pk2.getProjectId()); + 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("kind4", pk3.getKind()); + assertEquals(parent1.getPath(), pk3.getAncestors()); + } + + @Test + public void testParent() { + assertNull(pk1.getParent()); + assertEquals(parent1, pk2.getParent()); + Key parent2 = Key.newBuilder("ds", "kind3", "name").setNamespace("ns").build(); + IncompleteKey pk3 = IncompleteKey.newBuilder(parent2, "kind3").build(); + assertEquals(parent2, pk3.getParent()); + } +} 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 new file mode 100644 index 000000000000..bd935b4028ab --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java @@ -0,0 +1,127 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; + +import java.util.Iterator; + +public class KeyFactoryTest { + + private static final String PROJECT_ID = "projectid"; + + private KeyFactory keyFactory; + private KeyFactory deprecatedKeyFactory; + + @Before + public void setUp() { + keyFactory = new KeyFactory(PROJECT_ID).setKind("k"); + } + + @Test + public void testReset() { + IncompleteKey key = keyFactory + .setProjectId("ds1") + .setNamespace("ns1") + .addAncestor(PathElement.of("p", 1)) + .build(); + assertEquals("k", key.getKind()); + assertEquals("ds1", key.getProjectId()); + 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()); + 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("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 testNewKey() throws Exception { + Key key = keyFactory.newKey(1); + verifyKey(key, 1L, ""); + key = keyFactory.newKey("n"); + verifyKey(key, "n", ""); + PathElement p1 = PathElement.of("k1", "n"); + PathElement p2 = PathElement.of("k2", 10); + key = keyFactory.setNamespace("ns").addAncestors(p1, p2).newKey("k3"); + verifyKey(key, "k3", "ns", p1, p2); + } + + + @Test + public void testNewIncompleteKey() throws Exception { + IncompleteKey key = keyFactory.newKey(); + verifyIncompleteKey(key, ""); + PathElement p1 = PathElement.of("k1", "n"); + PathElement p2 = PathElement.of("k2", 10); + key = keyFactory.setNamespace("ns").addAncestors(p1, p2).newKey(); + verifyIncompleteKey(key, "ns", p1, p2); + } + + + @Test(expected = NullPointerException.class) + public void testNewIncompleteWithNoKind() { + new KeyFactory(PROJECT_ID).build(); + } + + private void verifyKey(Key key, String name, String namespace, PathElement... ancestors) { + assertEquals(name, key.getName()); + verifyIncompleteKey(key, namespace, ancestors); + } + + private void verifyKey(Key key, Long id, String namespace, PathElement... ancestors) { + assertEquals(id, key.getId()); + verifyIncompleteKey(key, namespace, ancestors); + } + + private void verifyIncompleteKey(IncompleteKey key, String namespace, PathElement... ancestors) { + assertEquals("k", key.getKind()); + assertEquals(PROJECT_ID, key.getProjectId()); + assertEquals(namespace, key.getNamespace()); + assertEquals(ancestors.length, key.getAncestors().size()); + Iterator iter = key.getAncestors().iterator(); + for (PathElement ancestor : ancestors) { + assertEquals(ancestor, iter.next()); + } + } +} 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 new file mode 100644 index 000000000000..4ad1a4fecf0e --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java @@ -0,0 +1,84 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class KeyTest { + + @Test + public void testHasId() throws Exception { + Key.Builder builder = Key.newBuilder("d", "k", 10); + Key key = builder.build(); + assertTrue(key.hasId()); + key = builder.setName("bla").build(); + assertFalse(key.hasId()); + } + + + @Test + public void testId() throws Exception { + Key.Builder builder = Key.newBuilder("d", "k", 10); + Key key = builder.build(); + assertEquals(Long.valueOf(10), key.getId()); + key = builder.setId(100).build(); + assertEquals(Long.valueOf(100), key.getId()); + } + + + @Test + public void testHasName() throws Exception { + Key.Builder builder = Key.newBuilder("d", "k", "n"); + Key key = builder.build(); + assertTrue(key.hasName()); + key = builder.setId(1).build(); + assertFalse(key.hasName()); + } + + + @Test + public void testName() throws Exception { + Key.Builder builder = Key.newBuilder("d", "k", "n"); + Key key = builder.build(); + assertEquals("n", key.getName()); + key = builder.setName("o").build(); + assertEquals("o", key.getName()); + } + + + @Test + public void testNameOrId() throws Exception { + Key.Builder builder = Key.newBuilder("d", "k", "n"); + Key key = builder.build(); + assertEquals("n", key.getNameOrId()); + key = builder.setId(1).build(); + assertEquals(Long.valueOf(1), key.getNameOrId()); + } + + + @Test + public void testToAndFromUrlSafe() throws Exception { + Key key = Key.newBuilder("d", "k", "n").build(); + String urlSafe = key.toUrlSafe(); + Key copy = Key.fromUrlSafe(urlSafe); + assertEquals(key, copy); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java new file mode 100644 index 000000000000..81feb8938220 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class KeyValueTest { + + private static final Key CONTENT = Key.newBuilder("ds", "kind", 1).build(); + + @Test + public void testToBuilder() throws Exception { + KeyValue value = KeyValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @SuppressWarnings("deprecation") + @Test + public void testOf() throws Exception { + KeyValue value = KeyValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + KeyValue.Builder builder = KeyValue.newBuilder(CONTENT); + KeyValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java new file mode 100644 index 000000000000..b943bfdf4fe4 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java @@ -0,0 +1,83 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +public class LatLngTest { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private static LatLng gp1 = new LatLng(37.422035, -122.084124); + private static LatLng gp2 = new LatLng(0.0, 0.0); + + private static final String INVALID_LAT_MESSAGE = + "latitude must be in the range [-90, 90] degrees"; + private static final String INVALID_LNG_MESSAGE = + "latitude must be in the range [-180, 180] degrees"; + + @Test + public void testLatLng() { + assertEquals(37.422035, gp1.getLatitude(), 0); + assertEquals(-122.084124, gp1.getLongitude(), 0); + } + + + @Test + public void testEquals() { + assertEquals(gp1, gp1); + assertNotEquals(gp1, gp2); + } + + @Test + public void testUpperLatRange() { + new LatLng(90, 0); + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage(INVALID_LAT_MESSAGE); + new LatLng(91, 0); + } + + @Test + public void testLowerLatRange() { + new LatLng(-90, 0); + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage(INVALID_LAT_MESSAGE); + new LatLng(-91, 0); + } + + @Test + public void testUpperLngRange() { + new LatLng(0, 180); + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage(INVALID_LNG_MESSAGE); + new LatLng(0, 181); + } + + @Test + public void testLowerLngRange() { + new LatLng(0, 180); + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage(INVALID_LNG_MESSAGE); + new LatLng(0, -181); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java new file mode 100644 index 000000000000..eafb458f6e2a --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class LatLngValueTest { + +private static final LatLng CONTENT = new LatLng(37.4, -122.1); + + @Test + public void testToBuilder() throws Exception { + LatLngValue value = LatLngValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @SuppressWarnings("deprecation") + @Test + public void testOf() throws Exception { + LatLngValue value = LatLngValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + LatLngValue.Builder builder = LatLngValue.newBuilder(CONTENT); + LatLngValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java new file mode 100644 index 000000000000..376b83673fab --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java @@ -0,0 +1,203 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.Timestamp; +import com.google.common.collect.ImmutableList; + +import org.junit.Test; + +import java.util.Collections; +import java.util.List; + +public class ListValueTest { + + private static final List> CONTENT = + ImmutableList.of(NullValue.of(), StringValue.of("foo")); + private static final String STRING1 = "string1"; + private static final String STRING2 = "string2"; + private static final long LONG1 = 1L; + private static final long LONG2 = 2L; + private static final double DOUBLE1 = 1.0; + private static final double DOUBLE2 = 2.0; + private static final boolean BOOLEAN1 = true; + private static final boolean BOOLEAN2 = false; + private static final Timestamp TIMESTAMP1 = Timestamp.ofTimeMicroseconds(1); + private static final Timestamp TIMESTAMP2 = Timestamp.ofTimeMicroseconds(2); + private static final LatLng LATLNG1 = LatLng.of(DOUBLE1, DOUBLE2); + private static final LatLng LATLNG2 = LatLng.of(DOUBLE2, DOUBLE1); + private static final Key KEY1 = Key.newBuilder("project", "kind", "name1").build(); + private static final Key KEY2 = Key.newBuilder("project", "kind", "name2").build(); + private static final FullEntity ENTITY1 = FullEntity.newBuilder(KEY1).build(); + private static final FullEntity ENTITY2 = FullEntity.newBuilder(KEY2).build(); + private static final Blob BLOB1 = Blob.copyFrom(new byte[]{0xD, 0xE, 0xA, 0xD}); + private static final Blob BLOB2 = Blob.copyFrom(new byte[]{0xB, 0x0, 0x0, 0x0}); + + @Test + public void testToBuilder() throws Exception { + ListValue value = ListValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @Test + public void testOf() throws Exception { + ListValue value = ListValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + value = ListValue.of(Collections.>emptyList()); + assertEquals(Collections.>emptyList(), value.get()); + assertFalse(value.excludeFromIndexes()); + value = ListValue.of(STRING1); + assertEquals(ImmutableList.of(StringValue.of(STRING1)), value.get()); + value = ListValue.of(STRING1, STRING2); + assertEquals(ImmutableList.of(StringValue.of(STRING1), StringValue.of(STRING2)), value.get()); + value = ListValue.of(LONG1); + assertEquals(ImmutableList.of(LongValue.of(LONG1)), value.get()); + value = ListValue.of(LONG1, LONG2); + assertEquals(ImmutableList.of(LongValue.of(LONG1), LongValue.of(LONG2)), value.get()); + value = ListValue.of(DOUBLE1); + assertEquals(ImmutableList.of(DoubleValue.of(DOUBLE1)), value.get()); + value = ListValue.of(DOUBLE1, DOUBLE2); + assertEquals(ImmutableList.of(DoubleValue.of(DOUBLE1), DoubleValue.of(DOUBLE2)), value.get()); + value = ListValue.of(BOOLEAN1); + assertEquals(ImmutableList.of(BooleanValue.of(BOOLEAN1)), value.get()); + value = ListValue.of(BOOLEAN1, BOOLEAN2); + assertEquals(ImmutableList.of(BooleanValue.of(BOOLEAN1), BooleanValue.of(BOOLEAN2)), + value.get()); + value = ListValue.of(TIMESTAMP1); + assertEquals(ImmutableList.of(TimestampValue.of(TIMESTAMP1)), value.get()); + value = ListValue.of(TIMESTAMP1, TIMESTAMP2); + assertEquals(ImmutableList.of(TimestampValue.of(TIMESTAMP1), TimestampValue.of(TIMESTAMP2)), + value.get()); + value = ListValue.of(LATLNG1); + assertEquals(ImmutableList.of(LatLngValue.of(LATLNG1)), value.get()); + value = ListValue.of(LATLNG1, LATLNG2); + assertEquals(ImmutableList.of(LatLngValue.of(LATLNG1), LatLngValue.of(LATLNG2)), value.get()); + value = ListValue.of(KEY1); + assertEquals(ImmutableList.of(KeyValue.of(KEY1)), value.get()); + value = ListValue.of(KEY1, KEY2); + assertEquals(ImmutableList.of(KeyValue.of(KEY1), KeyValue.of(KEY2)), value.get()); + value = ListValue.of(ENTITY1); + assertEquals(ImmutableList.of(EntityValue.of(ENTITY1)), value.get()); + value = ListValue.of(ENTITY1, ENTITY2); + assertEquals(ImmutableList.of(EntityValue.of(ENTITY1), EntityValue.of(ENTITY2)), value.get()); + value = ListValue.of(BLOB1); + assertEquals(ImmutableList.of(BlobValue.of(BLOB1)), value.get()); + value = ListValue.of(BLOB1, BLOB2); + assertEquals(ImmutableList.of(BlobValue.of(BLOB1), BlobValue.of(BLOB2)), value.get()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + ListValue.Builder builder = ListValue.newBuilder().set(CONTENT); + ListValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + + builder = ListValue.newBuilder(); + for (Value v : CONTENT) { + builder.addValue(v); + } + assertEquals(CONTENT, builder.build().get()); + + builder = builder.set(Collections.>emptyList()); + assertEquals(Collections.>emptyList(), builder.build().get()); + + builder = builder.addValue(STRING1); + assertEquals(ImmutableList.of(StringValue.of(STRING1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(STRING1, STRING2); + assertEquals(ImmutableList.of(StringValue.of(STRING1), StringValue.of(STRING2)), + builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(LONG1); + assertEquals(ImmutableList.of(LongValue.of(LONG1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(LONG1, LONG2); + assertEquals(ImmutableList.of(LongValue.of(LONG1), LongValue.of(LONG2)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(DOUBLE1); + assertEquals(ImmutableList.of(DoubleValue.of(DOUBLE1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(DOUBLE1, DOUBLE2); + assertEquals(ImmutableList.of(DoubleValue.of(DOUBLE1), DoubleValue.of(DOUBLE2)), + builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(BOOLEAN1); + assertEquals(ImmutableList.of(BooleanValue.of(BOOLEAN1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(BOOLEAN1, BOOLEAN2); + assertEquals(ImmutableList.of(BooleanValue.of(BOOLEAN1), BooleanValue.of(BOOLEAN2)), + builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(TIMESTAMP1); + assertEquals(ImmutableList.of(TimestampValue.of(TIMESTAMP1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(TIMESTAMP1, TIMESTAMP2); + assertEquals(ImmutableList.of(TimestampValue.of(TIMESTAMP1), TimestampValue.of(TIMESTAMP2)), + builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(LATLNG1); + assertEquals(ImmutableList.of(LatLngValue.of(LATLNG1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(LATLNG1, LATLNG2); + assertEquals(ImmutableList.of(LatLngValue.of(LATLNG1), LatLngValue.of(LATLNG2)), + builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(KEY1); + assertEquals(ImmutableList.of(KeyValue.of(KEY1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(KEY1, KEY2); + assertEquals(ImmutableList.of(KeyValue.of(KEY1), KeyValue.of(KEY2)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(ENTITY1); + assertEquals(ImmutableList.of(EntityValue.of(ENTITY1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(ENTITY1, ENTITY2); + assertEquals(ImmutableList.of(EntityValue.of(ENTITY1), EntityValue.of(ENTITY2)), + builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(BLOB1); + assertEquals(ImmutableList.of(BlobValue.of(BLOB1)), builder.build().get()); + builder = builder.set(Collections.>emptyList()); + + builder = builder.addValue(BLOB1, BLOB2); + assertEquals(ImmutableList.of(BlobValue.of(BLOB1), BlobValue.of(BLOB2)), builder.build().get()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java new file mode 100644 index 000000000000..07d9191c227c --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class LongValueTest { + + private static final Long CONTENT = 125L; + + @Test + public void testToBuilder() throws Exception { + LongValue value = LongValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @SuppressWarnings("deprecation") + @Test + public void testOf() throws Exception { + LongValue value = LongValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + LongValue.Builder builder = LongValue.newBuilder(CONTENT); + LongValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java new file mode 100644 index 000000000000..d19635c4933e --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java @@ -0,0 +1,50 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class NullValueTest { + + @Test + public void testToBuilder() throws Exception { + NullValue value = NullValue.of(); + assertEquals(value, value.toBuilder().build()); + } + + @Test + public void testOf() throws Exception { + NullValue value = NullValue.of(); + assertNull(value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + NullValue.Builder builder = NullValue.newBuilder(); + NullValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertNull(value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java new file mode 100644 index 000000000000..46859ec4e607 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java @@ -0,0 +1,75 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class PathElementTest { + + private static final PathElement PE_1 = PathElement.of("k1"); + private static final PathElement PE_2 = PathElement.of("k2", "n"); + private static final PathElement PE_3 = PathElement.of("k3", 1); + + @Test + public void testKind() throws Exception { + assertEquals("k1", PE_1.getKind()); + assertEquals("k2", PE_2.getKind()); + assertEquals("k3", PE_3.getKind()); + } + + @Test + public void testHasId() throws Exception { + assertFalse(PE_1.hasId()); + assertFalse(PE_2.hasId()); + assertTrue(PE_3.hasId()); + } + + @Test + public void testId() throws Exception { + assertNull(PE_1.getId()); + assertNull(PE_2.getId()); + assertEquals(Long.valueOf(1), PE_3.getId()); + } + + + @Test + public void testHasName() throws Exception { + assertFalse(PE_1.hasName()); + assertTrue(PE_2.hasName()); + assertFalse(PE_3.hasName()); + } + + @Test + public void testName() throws Exception { + assertNull(PE_1.getName()); + assertEquals("n", PE_2.getName()); + assertNull(PE_3.getName()); + } + + + @Test + public void testNameOrId() throws Exception { + assertNull(PE_1.getNameOrId()); + assertEquals("n", PE_2.getNameOrId()); + assertEquals(Long.valueOf(1), PE_3.getNameOrId()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java new file mode 100644 index 000000000000..34defe0b2d76 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java @@ -0,0 +1,70 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.Timestamp; +import org.junit.Test; + +public class ProjectionEntityTest { + + private static final Key KEY = Key.newBuilder("ds1", "k1", "n1").build(); + private static final StringValue STRING_INDEX_VALUE = + StringValue.newBuilder("foo").setMeaning(18).build(); + private static final BlobValue BLOB_VALUE = BlobValue.of(Blob.copyFrom(new byte[]{1})); + private static final TimestampValue TIMESTAMP_VALUE = TimestampValue.of(Timestamp.now()); + private static final LongValue LONG_INDEX_VALUE = + LongValue.newBuilder(TIMESTAMP_VALUE.get().getSeconds() * 1000000 + + TIMESTAMP_VALUE.get().getNanos() / 1000).setMeaning(18).build(); + private static final ProjectionEntity ENTITY1 = + new ProjectionEntity.Builder().setKey(KEY).set("a", "b").build(); + private static final ProjectionEntity ENTITY2 = new ProjectionEntity.Builder() + .set("a", STRING_INDEX_VALUE) + .set("b", BLOB_VALUE) + .set("c", TIMESTAMP_VALUE) + .set("d", LONG_INDEX_VALUE) + .build(); + + @Test + public void testHasKey() throws Exception { + assertTrue(ENTITY1.hasKey()); + assertFalse(ENTITY2.hasKey()); + } + + @Test + public void testKey() throws Exception { + assertEquals(KEY, ENTITY1.getKey()); + assertNull(ENTITY2.getKey()); + } + + @Test + public void testGetBlob() throws Exception { + assertArrayEquals(STRING_INDEX_VALUE.get().getBytes(), ENTITY2.getBlob("a").toByteArray()); + assertEquals(BLOB_VALUE.get(), ENTITY2.getBlob("b")); + } + + @Test + public void testGetTimestamp() throws Exception { + assertEquals(TIMESTAMP_VALUE.get(), ENTITY2.getTimestamp("c")); + assertEquals(TIMESTAMP_VALUE.get(), ENTITY2.getTimestamp("d")); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java new file mode 100644 index 000000000000..7718672effe5 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java @@ -0,0 +1,51 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class RawValueTest { + + private static final com.google.datastore.v1.Value CONTENT = StringValue.of("hello").toPb(); + + @Test + public void testToBuilder() throws Exception { + RawValue value = RawValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @Test + public void testOf() throws Exception { + RawValue value = RawValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + RawValue.Builder builder = RawValue.newBuilder(CONTENT); + RawValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java new file mode 100644 index 000000000000..acca226c92b6 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java @@ -0,0 +1,131 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import com.google.cloud.BaseSerializationTest; +import com.google.cloud.NoCredentials; +import com.google.cloud.Restorable; +import com.google.cloud.Timestamp; +import com.google.cloud.datastore.StructuredQuery.CompositeFilter; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; + +public class SerializationTest extends BaseSerializationTest { + + private static final IncompleteKey INCOMPLETE_KEY1 = + IncompleteKey.newBuilder("ds", "k").addAncestor(PathElement.of("p", 1)).build(); + private static final Key KEY1 = Key.newBuilder("ds", "k", "n").build(); + private static final IncompleteKey INCOMPLETE_KEY2 = + IncompleteKey.newBuilder(KEY1, "v").addAncestor(PathElement.of("p", 1)).build(); + private static final Key KEY2 = Key.newBuilder(KEY1, "v", 2).build(); + private static final Timestamp TIMESTAMP = Timestamp.now(); + private static final LatLng LAT_LNG = new LatLng(37.422035, -122.084124); + private static final Blob BLOB1 = Blob.copyFrom(UTF_8.encode("hello world")); + private static final Cursor CURSOR1 = Cursor.copyFrom(new byte[] {1, 2}); + private static final Cursor CURSOR2 = Cursor.copyFrom(new byte[] {10}); + private static final Query GQL1 = + Query.newGqlQueryBuilder("select * from kind1 where name = @name and age > @1") + .setBinding("name", "name1") + .addBinding(20) + .setNamespace("ns1") + .build(); + private static final Query GQL2 = + Query.newGqlQueryBuilder( + Query.ResultType.ENTITY, "select * from kind1 where name = @name and age > @1") + .setBinding("name", "name1") + .addBinding(20) + .setNamespace("ns1") + .build(); + private static final Query QUERY1 = + Query.newEntityQueryBuilder().setKind("kind1").build(); + private static final Query QUERY2 = Query.newKeyQueryBuilder() + .setKind("k") + .setFilter(PropertyFilter.eq("p1", "hello")) + .build(); + private static final Query QUERY3 = + Query.newProjectionEntityQueryBuilder() + .setKind("k") + .setNamespace("ns1") + .addProjection("p") + .setLimit(100) + .setOffset(5) + .setStartCursor(CURSOR1) + .setEndCursor(CURSOR2) + .setFilter(CompositeFilter.and(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v"))) + .addDistinctOn("p") + .addOrderBy(OrderBy.asc("p")) + .build(); + private static final KeyValue KEY_VALUE = KeyValue.of(KEY1); + private static final NullValue NULL_VALUE = + NullValue.newBuilder().setExcludeFromIndexes(true).build(); + private static final StringValue STRING_VALUE = StringValue.of("hello"); + private static final LongValue LONG_VALUE = LongValue.of(123); + private static final DoubleValue DOUBLE_VALUE = DoubleValue.of(12.34); + private static final BooleanValue BOOLEAN_VALUE = BooleanValue.of(true); + private static final TimestampValue TIMESTAMP_VALUE = TimestampValue.of(Timestamp.now()); + private static final BlobValue BLOB_VALUE = BlobValue.of(BLOB1); + private static final RawValue RAW_VALUE = + RawValue.of(com.google.datastore.v1.Value.newBuilder().setMeaning(18).build()); + private static final LatLngValue LAT_LNG_VALUE = LatLngValue.of(LAT_LNG); + private static final Entity ENTITY1 = Entity.newBuilder(KEY1).build(); + private static final Entity ENTITY2 = + Entity.newBuilder(KEY2).set("null", NullValue.of()).build(); + private static final Entity ENTITY3 = Entity.newBuilder(KEY2) + .set("p1", StringValue.newBuilder("hi1").setMeaning(10).build()) + .set("p2", StringValue.newBuilder("hi2").setMeaning(11).setExcludeFromIndexes(true).build()) + .set("p3", LongValue.newBuilder(100).setExcludeFromIndexes(true).setMeaning(100).build()) + .set("blob", BLOB1) + .build(); + private static final FullEntity EMBEDDED_ENTITY = + Entity.newBuilder(INCOMPLETE_KEY1) + .set("p1", STRING_VALUE) + .set("p2", LongValue.newBuilder(100).setExcludeFromIndexes(true).setMeaning(100).build()) + .build(); + private static final EntityValue EMBEDDED_ENTITY_VALUE1 = EntityValue.of(ENTITY1); + private static final EntityValue EMBEDDED_ENTITY_VALUE2 = EntityValue.of(ENTITY2); + private static final EntityValue EMBEDDED_ENTITY_VALUE3 = EntityValue.of(EMBEDDED_ENTITY); + private static final ListValue LIST_VALUE = ListValue.newBuilder() + .addValue(NULL_VALUE) + .addValue(STRING_VALUE) + .addValue(new NullValue()) + .build(); + private static final ProjectionEntity PROJECTION_ENTITY = ProjectionEntity.fromPb(ENTITY1.toPb()); + private static final DatastoreException DATASTORE_EXCEPTION = + new DatastoreException(42, "message", "reason"); + + @Override + protected java.io.Serializable[] serializableObjects() { + DatastoreOptions options = DatastoreOptions.newBuilder() + .setCredentials(NoCredentials.getInstance()) + .setProjectId("ds1") + .build(); + DatastoreOptions otherOptions = options.toBuilder().setNamespace("ns1").build(); + return new java.io.Serializable[]{KEY1, KEY2, INCOMPLETE_KEY1, INCOMPLETE_KEY2, ENTITY1, + ENTITY2, ENTITY3, EMBEDDED_ENTITY, PROJECTION_ENTITY, TIMESTAMP, BLOB1, CURSOR1, GQL1, + GQL2, QUERY1, QUERY2, QUERY3, NULL_VALUE, KEY_VALUE, STRING_VALUE, EMBEDDED_ENTITY_VALUE1, + EMBEDDED_ENTITY_VALUE2, EMBEDDED_ENTITY_VALUE3, LIST_VALUE, LONG_VALUE, DOUBLE_VALUE, + BOOLEAN_VALUE, TIMESTAMP_VALUE, BLOB_VALUE, RAW_VALUE, LAT_LNG_VALUE, + DATASTORE_EXCEPTION, options, otherOptions}; + } + + @Override + protected Restorable[] restorableObjects() { + return null; + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java new file mode 100644 index 000000000000..4c3dbaef0a8d --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java @@ -0,0 +1,51 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class StringValueTest { + + private static final String CONTENT = "hello world"; + + @Test + public void testToBuilder() throws Exception { + StringValue value = StringValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @Test + public void testOf() throws Exception { + StringValue value = StringValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + StringValue.Builder builder = StringValue.newBuilder(CONTENT); + StringValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java new file mode 100644 index 000000000000..92cee6f6c4d0 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java @@ -0,0 +1,176 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.datastore.Query.ResultType; +import com.google.cloud.datastore.StructuredQuery.CompositeFilter; +import com.google.cloud.datastore.StructuredQuery.Filter; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +import com.google.common.collect.ImmutableList; + +import org.junit.Test; + +import java.util.List; + +public class StructuredQueryTest { + + private static final String NAMESPACE = "ns"; + private static final String KIND = "k"; + private static final Cursor START_CURSOR = Cursor.copyFrom(new byte[] {1, 2}); + private static final Cursor END_CURSOR = Cursor.copyFrom(new byte[] {10}); + private static final int OFFSET = 42; + private static final Integer LIMIT = 43; + private static final Filter FILTER = + CompositeFilter.and(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v")); + private static final OrderBy ORDER_BY_1 = OrderBy.asc("p2"); + private static final OrderBy ORDER_BY_2 = OrderBy.desc("p3"); + private static final List ORDER_BY = ImmutableList.of(ORDER_BY_1, ORDER_BY_2); + private static final String PROJECTION1 = "p4"; + private static final String PROJECTION2 = "p5"; + private static final List PROJECTION = ImmutableList.of(PROJECTION1, PROJECTION2); + private static final String DISTINCT_ON1 = "p6"; + private static final String DISTINCT_ON2 = "p7"; + private static final List DISTINCT_ON = ImmutableList.of(DISTINCT_ON1, DISTINCT_ON2); + private static final EntityQuery ENTITY_QUERY = Query.newEntityQueryBuilder() + .setNamespace(NAMESPACE) + .setKind(KIND) + .setStartCursor(START_CURSOR) + .setEndCursor(END_CURSOR) + .setOffset(OFFSET) + .setLimit(LIMIT) + .setFilter(FILTER) + .setOrderBy(ORDER_BY_1, ORDER_BY_2) + .build(); + private static final KeyQuery KEY_QUERY = Query.newKeyQueryBuilder() + .setNamespace(NAMESPACE) + .setKind(KIND) + .setStartCursor(START_CURSOR) + .setEndCursor(END_CURSOR) + .setOffset(OFFSET) + .setLimit(LIMIT) + .setFilter(FILTER) + .setOrderBy(ORDER_BY_1, ORDER_BY_2) + .build(); + private static final ProjectionEntityQuery PROJECTION_QUERY = + Query.newProjectionEntityQueryBuilder() + .setNamespace(NAMESPACE) + .setKind(KIND) + .setStartCursor(START_CURSOR) + .setEndCursor(END_CURSOR) + .setOffset(OFFSET) + .setLimit(LIMIT) + .setFilter(FILTER) + .setOrderBy(ORDER_BY_1, ORDER_BY_2) + .setProjection(PROJECTION1, PROJECTION2) + .setDistinctOn(DISTINCT_ON1, DISTINCT_ON2) + .build(); + + @Test + public void testEntityQueryBuilder() { + compareBaseBuilderFields(ENTITY_QUERY); + assertTrue(ENTITY_QUERY.getProjection().isEmpty()); + assertTrue(ENTITY_QUERY.getDistinctOn().isEmpty()); + } + + + @Test + public void testKeyQueryBuilder() { + compareBaseBuilderFields(KEY_QUERY); + assertEquals(ImmutableList.of(StructuredQuery.KEY_PROPERTY_NAME), KEY_QUERY.getProjection()); + assertTrue(KEY_QUERY.getDistinctOn().isEmpty()); + } + + + @Test + public void testProjectionEntityQueryBuilder() { + compareBaseBuilderFields(PROJECTION_QUERY); + assertEquals(PROJECTION, PROJECTION_QUERY.getProjection()); + assertEquals(DISTINCT_ON, PROJECTION_QUERY.getDistinctOn()); + } + + + private void compareBaseBuilderFields(StructuredQuery query) { + assertEquals(NAMESPACE, query.getNamespace()); + assertEquals(KIND, query.getKind()); + assertEquals(START_CURSOR, query.getStartCursor()); + assertEquals(END_CURSOR, query.getEndCursor()); + assertEquals(OFFSET, query.getOffset()); + assertEquals(LIMIT, query.getLimit()); + assertEquals(FILTER, query.getFilter()); + assertEquals(ORDER_BY, query.getOrderBy()); + } + + + @Test + public void mergeFrom() { + compareMergedQuery( + ENTITY_QUERY, new EntityQuery.Builder().mergeFrom(ENTITY_QUERY.toPb()).build()); + compareMergedQuery(KEY_QUERY, new KeyQuery.Builder().mergeFrom(KEY_QUERY.toPb()).build()); + compareMergedQuery( + PROJECTION_QUERY, + new ProjectionEntityQuery.Builder().mergeFrom(PROJECTION_QUERY.toPb()).build()); + } + + private void compareMergedQuery(StructuredQuery expected, StructuredQuery actual) { + assertEquals(expected.getKind(), actual.getKind()); + assertEquals(expected.getStartCursor(), actual.getStartCursor()); + assertEquals(expected.getEndCursor(), actual.getEndCursor()); + assertEquals(expected.getOffset(), actual.getOffset()); + assertEquals(expected.getLimit(), actual.getLimit()); + assertEquals(expected.getFilter(), actual.getFilter()); + assertEquals(expected.getOrderBy(), actual.getOrderBy()); + assertEquals(expected.getProjection(), actual.getProjection()); + assertEquals(expected.getDistinctOn(), actual.getDistinctOn()); + } + + @Test + public void testToAndFromPb() { + assertEquals( + ENTITY_QUERY, + StructuredQuery.fromPb(ResultType.ENTITY, ENTITY_QUERY.getNamespace(), + ENTITY_QUERY.toPb())); + assertEquals( + KEY_QUERY, StructuredQuery.fromPb(ResultType.KEY, KEY_QUERY.getNamespace(), + KEY_QUERY.toPb())); + assertEquals( + PROJECTION_QUERY, + StructuredQuery.fromPb( + ResultType.PROJECTION_ENTITY, PROJECTION_QUERY.getNamespace(), + PROJECTION_QUERY.toPb())); + } + + @Test + public void testToBuilder() { + List> queries = + ImmutableList.>of(ENTITY_QUERY, KEY_QUERY, PROJECTION_QUERY); + for (StructuredQuery query : queries) { + assertEquals(query, query.toBuilder().build()); + } + } + + @Test + public void testKeyOnly() { + assertTrue(KEY_QUERY.isKeyOnly()); + assertFalse(ENTITY_QUERY.isKeyOnly()); + assertFalse(PROJECTION_QUERY.isKeyOnly()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java new file mode 100644 index 000000000000..138a7f329ead --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.Timestamp; +import org.junit.Test; + +public class TimestampValueTest { + + private static final Timestamp CONTENT = Timestamp.now(); + + @Test + public void testToBuilder() throws Exception { + TimestampValue value = TimestampValue.of(CONTENT); + assertEquals(value, value.toBuilder().build()); + } + + @Test + public void testOf() throws Exception { + TimestampValue value = TimestampValue.of(CONTENT); + assertEquals(CONTENT, value.get()); + assertFalse(value.excludeFromIndexes()); + } + + @SuppressWarnings("deprecation") + @Test + public void testBuilder() throws Exception { + TimestampValue.Builder builder = TimestampValue.newBuilder(CONTENT); + TimestampValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build(); + assertEquals(CONTENT, value.get()); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java new file mode 100644 index 000000000000..9cfe66465caa --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java @@ -0,0 +1,74 @@ +/* + * Copyright 2017 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.cloud.datastore; + +import static junit.framework.TestCase.assertFalse; +import static junit.framework.TestCase.assertTrue; + +import com.google.cloud.BaseServiceException; +import com.google.cloud.ExceptionHandler; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +/** Tests for {@link TransactionExceptionHandler}. */ +public class TransactionExceptionHandlerTest { + + @Rule public ExpectedException thrown = ExpectedException.none(); + + @Test + public void testShouldTry() { + ExceptionHandler handler = + ExceptionHandler.newBuilder() + .abortOn(RuntimeException.class) + .addInterceptors(DatastoreImpl.EXCEPTION_HANDLER_INTERCEPTOR) + .build(); + ExceptionHandler transactionHandler = TransactionExceptionHandler.build(); + + assertFalse(handler.shouldRetry(new DatastoreException(10, "", "ABORTED", false, null), null)); + assertFalse(handler.shouldRetry(new DatastoreException(10, "", "", false, null), null)); + assertFalse(handler.shouldRetry(new DatastoreException(0, "", "", false, null), null)); + + assertTrue( + transactionHandler.shouldRetry( + new DatastoreException(10, "", "ABORTED", false, null), null)); + assertTrue( + transactionHandler.shouldRetry(new DatastoreException(10, "", "", false, null), null)); + assertFalse( + transactionHandler.shouldRetry(new DatastoreException(0, "", "", false, null), null)); + + DatastoreException nestedDatastoreException = + new DatastoreException( + BaseServiceException.UNKNOWN_CODE, + "", + null, + new DatastoreException(10, "", "ABORTED", false, null)); + + assertTrue(transactionHandler.shouldRetry(nestedDatastoreException, null)); + assertFalse(handler.shouldRetry(nestedDatastoreException, null)); + + DatastoreException nestedUserException = + new DatastoreException( + BaseServiceException.UNKNOWN_CODE, + "", + null, + new RuntimeException("")); + + assertFalse(transactionHandler.shouldRetry(nestedUserException, null)); + assertFalse(handler.shouldRetry(nestedDatastoreException, null)); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java new file mode 100644 index 000000000000..74c4cfdf070b --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java @@ -0,0 +1,173 @@ +/* + * Copyright 2015 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.cloud.datastore; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.Timestamp; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.primitives.Primitives; + +import org.junit.Before; +import org.junit.Test; + +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +public class ValueTest { + + private static final Key KEY = Key.newBuilder("ds", "kind", 1).build(); + private static final Blob BLOB = Blob.copyFrom(new byte[]{}); + private static final Timestamp TIMESTAMP = Timestamp.now(); + private static final Entity ENTITY = Entity.newBuilder(KEY).set("FOO", "BAR").build(); + private static final NullValue NULL_VALUE = NullValue.of(); + private static final StringValue STRING_VALUE = StringValue.of("hello"); + private static final RawValue RAW_VALUE = RawValue.of(STRING_VALUE.toPb()); + private static final LatLngValue LAT_LNG_VALUE = + LatLngValue.of(new LatLng(37.422035, -122.084124)); + private static final ImmutableMap TYPES = + ImmutableMap.builder() + .put(ValueType.NULL, new Object[] {NullValue.class, NULL_VALUE.get()}) + .put(ValueType.KEY, new Object[] {KeyValue.class, KEY}) + .put(ValueType.BLOB, new Object[] {BlobValue.class, BLOB}) + .put(ValueType.BOOLEAN, new Object[] {BooleanValue.class, Boolean.TRUE}) + .put(ValueType.TIMESTAMP, new Object[] {TimestampValue.class, TIMESTAMP}) + .put(ValueType.DOUBLE, new Object[] {DoubleValue.class, 1.25D}) + .put(ValueType.ENTITY, new Object[] {EntityValue.class, ENTITY}) + .put(ValueType.LIST, new Object[] { + ListValue.class, ImmutableList.of(NULL_VALUE, STRING_VALUE, RAW_VALUE)}) + .put(ValueType.LONG, new Object[] {LongValue.class, 123L}) + .put(ValueType.RAW_VALUE, new Object[] {RawValue.class, RAW_VALUE.get()}) + .put(ValueType.LAT_LNG, new Object[] {LatLngValue.class, LAT_LNG_VALUE.get()}) + .put(ValueType.STRING, new Object[] {StringValue.class, STRING_VALUE.get()}) + .build(); + + private ImmutableMap> typeToValue; + + @SuppressWarnings("rawtypes") + private class TestBuilder extends Value.BaseBuilder, TestBuilder> { + TestBuilder() { + super(ValueType.LIST); + } + + @SuppressWarnings({"unchecked"}) + @Override + public Value build() { + return new Value(this) { + + @Override + public TestBuilder toBuilder() { + return new TestBuilder().mergeFrom(this); + } + }; + } + } + + @Before + public void setUp() throws Exception { + ImmutableMap.Builder> builder = ImmutableMap.builder(); + for (ValueType valueType : ValueType.values()) { + Object[] values = TYPES.get(valueType); + @SuppressWarnings("unchecked") + Class> valueClass = (Class>) values[0]; + Object value = values[1]; + if (value == null) { + Method method = valueClass.getMethod("of"); + builder.put(valueType, (Value) method.invoke(null)); + } else { + boolean found = false; + for (Method method : valueClass.getDeclaredMethods()) { + if (method.getName().equals("of")) { + Class paramType = method.getParameterTypes()[0]; + if (paramType.isPrimitive()) { + paramType = Primitives.wrap(paramType); + } + if (paramType.isAssignableFrom(value.getClass())) { + builder.put(valueType, (Value) method.invoke(null, value)); + found = true; + break; + } + } + } + assertTrue("Could not find an of method for " + valueClass, found); + } + } + typeToValue = builder.build(); + } + + @Test + public void testType() throws Exception { + for (Map.Entry> entry : typeToValue.entrySet()) { + assertEquals(entry.getKey(), entry.getValue().getType()); + } + } + + + @Test + public void testExcludeFromIndexes() throws Exception { + for (Map.Entry> entry : typeToValue.entrySet()) { + assertFalse(entry.getValue().excludeFromIndexes()); + } + TestBuilder builder = new TestBuilder(); + assertFalse(builder.build().excludeFromIndexes()); + assertTrue(builder.setExcludeFromIndexes(true).build().excludeFromIndexes()); + assertFalse(builder.setExcludeFromIndexes(false).build().excludeFromIndexes()); + } + + + @SuppressWarnings("deprecation") + @Test + public void testMeaning() throws Exception { + TestBuilder builder = new TestBuilder(); + assertEquals(10, builder.setMeaning(10).build().getMeaning()); + } + + + @Test + public void testGet() throws Exception { + for (Map.Entry> entry : typeToValue.entrySet()) { + ValueType valueType = entry.getKey(); + Value value = entry.getValue(); + assertEquals(TYPES.get(valueType)[1], value.get()); + } + + TestBuilder builder = new TestBuilder(); + Set value = Collections.singleton("bla"); + assertEquals(value, builder.set(value).build().get()); + } + + @SuppressWarnings({"unchecked", "deprecation"}) + @Test + public void testToBuilder() throws Exception { + Set content = Collections.singleton("bla"); + @SuppressWarnings("rawtypes") + ValueBuilder builder = new TestBuilder(); + builder.setMeaning(1).set(content).setExcludeFromIndexes(true); + Value value = builder.build(); + builder = value.toBuilder(); + assertEquals(1, value.getMeaning()); + assertTrue(value.excludeFromIndexes()); + assertEquals(ValueType.LIST, value.getType()); + assertEquals(content, value.get()); + assertEquals(value, builder.build()); + } +} 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 new file mode 100644 index 000000000000..dab2145f3e19 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java @@ -0,0 +1,854 @@ +/* + * Copyright 2016 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.cloud.datastore.it; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import com.google.cloud.Timestamp; +import com.google.cloud.datastore.Batch; +import com.google.cloud.datastore.BooleanValue; +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreException; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.DatastoreReaderWriter; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.EntityValue; +import com.google.cloud.datastore.FullEntity; +import com.google.cloud.datastore.GqlQuery; +import com.google.cloud.datastore.IncompleteKey; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.KeyFactory; +import com.google.cloud.datastore.KeyValue; +import com.google.cloud.datastore.LatLng; +import com.google.cloud.datastore.LatLngValue; +import com.google.cloud.datastore.ListValue; +import com.google.cloud.datastore.NullValue; +import com.google.cloud.datastore.PathElement; +import com.google.cloud.datastore.ProjectionEntity; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.Query.ResultType; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.StringValue; +import com.google.cloud.datastore.StructuredQuery; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +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; +import com.google.datastore.v1.TransactionOptions; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.Timeout; + +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 String KIND1 = "kind1"; + private static final String KIND2 = "kind2"; + private static final String KIND3 = "kind3"; + private static final NullValue NULL_VALUE = NullValue.of(); + 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 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(); + + @Rule public Timeout globalTimeout = Timeout.seconds(100); + + @AfterClass + public static void afterClass() { + HELPER.deleteNamespace(); + } + + @Before + public void setUp() { + DATASTORE.put(ENTITY1, ENTITY2); + } + + @After + public void tearDown() { + DATASTORE.delete(KEY1, KEY2, KEY3); + } + + 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); + List scResultsCopy = makeResultsCopy(scResults); + Set scResultsSet = new HashSet<>(scResultsCopy); + int maxAttempts = 20; + + while (maxAttempts > 0) { + --maxAttempts; + QueryResults results = DATASTORE.run(query); + List resultsCopy = makeResultsCopy(results); + Set resultsSet = new HashSet<>(resultsCopy); + if (scResultsSet.size() == resultsSet.size() && scResultsSet.containsAll(resultsSet)) { + return resultsCopy.iterator(); + } + Thread.sleep(500); + } + + throw new RuntimeException( + "reached max number of attempts to get strongly consistent results."); + } + + private List makeResultsCopy(QueryResults scResults) { + Preconditions.checkNotNull(scResults); + List results = new ArrayList<>(); + while (scResults.hasNext()) { + results.add(scResults.next()); + } + return results; + } + + @Test + public void testNewTransactionCommit() { + Transaction transaction = DATASTORE.newTransaction(); + transaction.add(ENTITY3); + Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla").build(); + transaction.update(entity2); + transaction.delete(KEY1); + transaction.commit(); + assertFalse(transaction.isActive()); + + List list = DATASTORE.fetch(KEY1, KEY2, KEY3); + assertNull(list.get(0)); + assertEquals(entity2, list.get(1)); + assertEquals(ENTITY3, list.get(2)); + assertEquals(3, list.size()); + + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("FAILED_PRECONDITION", expected.getReason()); + } + + try { + transaction.rollback(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("FAILED_PRECONDITION", expected.getReason()); + } + } + + @Test + public void testTransactionWithRead() { + Transaction transaction = DATASTORE.newTransaction(); + assertNull(transaction.get(KEY3)); + transaction.add(ENTITY3); + transaction.commit(); + assertEquals(ENTITY3, DATASTORE.get(KEY3)); + + transaction = DATASTORE.newTransaction(); + assertEquals(ENTITY3, transaction.get(KEY3)); + // update entity3 during the transaction + DATASTORE.put(Entity.newBuilder(ENTITY2).clear().set("from", "datastore").build()); + transaction.update(Entity.newBuilder(ENTITY2).clear().set("from", "transaction").build()); + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("ABORTED", expected.getReason()); + } + } + + @Test + public void testTransactionWithQuery() throws InterruptedException { + Query query = + Query.newEntityQueryBuilder() + .setKind(KIND2) + .setFilter(PropertyFilter.hasAncestor(KEY2)) + .setNamespace(NAMESPACE) + .build(); + Transaction transaction = DATASTORE.newTransaction(); + QueryResults results = transaction.run(query); + assertTrue(results.hasNext()); + assertEquals(ENTITY2, results.next()); + assertFalse(results.hasNext()); + transaction.add(ENTITY3); + transaction.commit(); + assertEquals(ENTITY3, DATASTORE.get(KEY3)); + + transaction = DATASTORE.newTransaction(); + results = transaction.run(query); + assertTrue(results.hasNext()); + assertEquals(ENTITY2, results.next()); + assertFalse(results.hasNext()); + transaction.delete(ENTITY3.getKey()); + // update entity2 during the transaction + DATASTORE.put(Entity.newBuilder(ENTITY2).clear().build()); + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("ABORTED", expected.getReason()); + } + } + + @Test + public void testNewTransactionRollback() { + Transaction transaction = DATASTORE.newTransaction(); + transaction.add(ENTITY3); + Entity entity2 = + Entity.newBuilder(ENTITY2) + .clear() + .setNull("bla") + .set("list3", StringValue.of("bla"), StringValue.newBuilder("bla").build()) + .build(); + transaction.update(entity2); + transaction.delete(KEY1); + transaction.rollback(); + transaction.rollback(); // should be safe to repeat rollback calls + + try { + transaction.commit(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("FAILED_PRECONDITION", expected.getReason()); + } + + List list = DATASTORE.fetch(KEY1, KEY2, KEY3); + assertEquals(ENTITY1, list.get(0)); + assertEquals(ENTITY2, list.get(1)); + assertNull(list.get(2)); + assertEquals(3, list.size()); + } + + @Test + public void testNewBatch() { + 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(); + Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build(); + + List entities = batch.add(entity4, PARTIAL_ENTITY2, entity5); + Entity entity6 = entities.get(1); + assertSame(entity4, entities.get(0)); + assertEquals(PARTIAL_ENTITY2.getNames(), entity6.getNames()); + assertEquals(PARTIAL_ENTITY2.getKey().getProjectId(), entity6.getKey().getProjectId()); + assertEquals(PARTIAL_ENTITY2.getKey().getNamespace(), entity6.getKey().getNamespace()); + assertEquals(PARTIAL_ENTITY2.getKey().getAncestors(), entity6.getKey().getAncestors()); + assertEquals(PARTIAL_ENTITY2.getKey().getKind(), entity6.getKey().getKind()); + assertEquals(PARTIAL_ENTITY2.getKey(), IncompleteKey.newBuilder(entity6.getKey()).build()); + assertEquals(PARTIAL_ENTITY2.getKey().getAncestors(), entity6.getKey().getAncestors()); + assertNotEquals(PARTIAL_ENTITY2.getKey(), entity6.getKey()); + assertSame(entity5, entities.get(2)); + batch.addWithDeferredIdAllocation(PARTIAL_ENTITY3); + batch.put(ENTITY3, entity1, entity2); + + Batch.Response response = batch.submit(); + entities = + 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)); + assertEquals(entity4, entities.get(3)); + assertEquals(entity5, entities.get(4)); + assertEquals(entity6, entities.get(5)); + 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.getKey(), IncompleteKey.newBuilder(generatedKeys.get(0)).build()); + + try { + batch.submit(); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals("FAILED_PRECONDITION", expected.getReason()); + } + + 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()); + assertEquals(ENTITY1, entities.get(0)); + assertEquals(ENTITY2, entities.get(1)); + assertEquals(ENTITY3, entities.get(2)); + assertNull(entities.get(3)); + assertNull(entities.get(4)); + assertNull(entities.get(5)); + assertEquals(6, entities.size()); + } + + @Test + public void testRunGqlQueryNoCasting() throws InterruptedException { + Query query1 = + Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND1) + .setNamespace(NAMESPACE) + .build(); + Query scQuery1 = + Query.newEntityQueryBuilder() + .setNamespace(NAMESPACE) + .setKind(KIND1) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .build(); + + Iterator results1 = getStronglyConsistentResults(scQuery1, query1); + + assertTrue(results1.hasNext()); + assertEquals(ENTITY1, results1.next()); + assertFalse(results1.hasNext()); + + DATASTORE.put(ENTITY3); + Query query2 = + Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND2 + " order by __key__") + .setNamespace(NAMESPACE) + .build(); + Query scQuery2 = + Query.newEntityQueryBuilder() + .setNamespace(NAMESPACE) + .setKind(KIND2) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .setOrderBy(OrderBy.asc("__key__")) + .build(); + + Iterator results2 = getStronglyConsistentResults(scQuery2, query2); + assertTrue(results2.hasNext()); + assertEquals(ENTITY2, results2.next()); + assertTrue(results2.hasNext()); + assertEquals(ENTITY3, results2.next()); + assertFalse(results2.hasNext()); + + query1 = + Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from bla") + .setNamespace(NAMESPACE) + .build(); + scQuery1 = + Query.newEntityQueryBuilder() + .setNamespace(NAMESPACE) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .setKind("bla") + .build(); + results1 = getStronglyConsistentResults(scQuery1, query1); + assertFalse(results1.hasNext()); + + Query keyOnlyQuery = + Query.newGqlQueryBuilder(ResultType.KEY, "select __key__ from " + KIND1) + .setNamespace(NAMESPACE) + .build(); + Query scKeyOnlyQuery = + Query.newKeyQueryBuilder() + .setNamespace(NAMESPACE) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .setKind(KIND1) + .build(); + Iterator keyOnlyResults = getStronglyConsistentResults(scKeyOnlyQuery, keyOnlyQuery); + assertTrue(keyOnlyResults.hasNext()); + assertEquals(KEY1, keyOnlyResults.next()); + assertFalse(keyOnlyResults.hasNext()); + + GqlQuery keyProjectionQuery = + Query.newGqlQueryBuilder(ResultType.PROJECTION_ENTITY, "select __key__ from " + KIND1) + .setNamespace(NAMESPACE) + .build(); + Query scKeyProjectionQuery = + Query.newProjectionEntityQueryBuilder() + .addProjection("__key__") + .setNamespace(NAMESPACE) + .setKind(KIND1) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .build(); + + Iterator keyProjectionResult = + getStronglyConsistentResults(scKeyProjectionQuery, keyProjectionQuery); + assertTrue(keyProjectionResult.hasNext()); + ProjectionEntity projectionEntity = keyProjectionResult.next(); + assertEquals(KEY1, projectionEntity.getKey()); + assertTrue(projectionEntity.getNames().isEmpty()); + assertFalse(keyProjectionResult.hasNext()); + } + + @Test + public void testRunGqlQueryWithCasting() throws InterruptedException { + @SuppressWarnings("unchecked") + Query query1 = + (Query) + Query.newGqlQueryBuilder("select * from " + KIND1).setNamespace(NAMESPACE).build(); + Query scQuery1 = + Query.newEntityQueryBuilder() + .setNamespace(NAMESPACE) + .setKind(KIND1) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .build(); + Iterator results1 = getStronglyConsistentResults(scQuery1, query1); + assertTrue(results1.hasNext()); + assertEquals(ENTITY1, results1.next()); + assertFalse(results1.hasNext()); + + Query query2 = + Query.newGqlQueryBuilder("select * from " + KIND1).setNamespace(NAMESPACE).build(); + + QueryResults results2 = DATASTORE.run(query2); + + assertSame(Entity.class, results2.getResultClass()); + + Query scQuery2 = + Query.newEntityQueryBuilder() + .setNamespace(NAMESPACE) + .setKind(KIND1) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .build(); + + Iterator results3 = getStronglyConsistentResults(scQuery2, query2); + assertTrue(results3.hasNext()); + assertEquals(ENTITY1, results3.next()); + assertFalse(results3.hasNext()); + } + + @Test + public void testRunStructuredQuery() throws InterruptedException { + Query query = + Query.newEntityQueryBuilder().setKind(KIND1).setOrderBy(OrderBy.asc("__key__")).build(); + + Query scQuery = + Query.newEntityQueryBuilder() + .setKind(KIND1) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .setOrderBy(OrderBy.asc("__key__")) + .build(); + + Iterator results1 = getStronglyConsistentResults(scQuery, query); + + assertTrue(results1.hasNext()); + assertEquals(ENTITY1, results1.next()); + assertFalse(results1.hasNext()); + + Query keyOnlyQuery = Query.newKeyQueryBuilder().setKind(KIND1).build(); + Query scKeyOnlyQuery = + Query.newKeyQueryBuilder() + .setKind(KIND1) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .build(); + + Iterator results2 = getStronglyConsistentResults(scKeyOnlyQuery, keyOnlyQuery); + assertTrue(results2.hasNext()); + assertEquals(ENTITY1.getKey(), results2.next()); + assertFalse(results2.hasNext()); + + StructuredQuery keyOnlyProjectionQuery = + Query.newProjectionEntityQueryBuilder().setKind(KIND1).setProjection("__key__").build(); + StructuredQuery scKeyOnlyProjectionQuery = + Query.newProjectionEntityQueryBuilder() + .setKind(KIND1) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .setProjection("__key__") + .build(); + Iterator results3 = + getStronglyConsistentResults(scKeyOnlyProjectionQuery, keyOnlyProjectionQuery); + assertTrue(results3.hasNext()); + ProjectionEntity projectionEntity = results3.next(); + assertEquals(ENTITY1.getKey(), projectionEntity.getKey()); + assertTrue(projectionEntity.getNames().isEmpty()); + assertFalse(results3.hasNext()); + + StructuredQuery projectionQuery = + Query.newProjectionEntityQueryBuilder() + .setKind(KIND2) + .setProjection("age") + .setFilter(PropertyFilter.gt("age", 18)) + .setDistinctOn("age") + .setOrderBy(OrderBy.asc("age")) + .setLimit(10) + .build(); + + StructuredQuery scProjectionQuery = + Query.newProjectionEntityQueryBuilder() + .setKind(KIND2) + .setFilter(PropertyFilter.hasAncestor(ROOT_KEY)) + .setProjection("age") + .setFilter(PropertyFilter.gt("age", 18)) + .setDistinctOn("age") + .setOrderBy(OrderBy.asc("age")) + .setLimit(10) + .build(); + + Iterator results4 = + getStronglyConsistentResults(scProjectionQuery, projectionQuery); + assertTrue(results4.hasNext()); + ProjectionEntity entity = results4.next(); + assertEquals(ENTITY2.getKey(), entity.getKey()); + assertEquals(20, entity.getLong("age")); + assertEquals(1, entity.getNames().size()); + assertFalse(results4.hasNext()); + } + + @Test + public void testAllocateId() { + KeyFactory keyFactory = DATASTORE.newKeyFactory().setKind(KIND1); + IncompleteKey pk1 = keyFactory.newKey(); + Key key1 = DATASTORE.allocateId(pk1); + assertEquals(key1.getProjectId(), pk1.getProjectId()); + assertEquals(key1.getNamespace(), pk1.getNamespace()); + assertEquals(key1.getAncestors(), pk1.getAncestors()); + assertEquals(key1.getKind(), pk1.getKind()); + assertTrue(key1.hasId()); + assertFalse(key1.hasName()); + assertEquals(Key.newBuilder(pk1, key1.getId()).build(), key1); + + Key key2 = DATASTORE.allocateId(pk1); + assertNotEquals(key1, key2); + assertEquals(Key.newBuilder(pk1, key2.getId()).build(), key2); + } + + @Test + public void testAllocateIdArray() { + 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); + 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)); + assertEquals(Key.newBuilder(incompleteKey2, result.get(1).getId()).build(), result.get(1)); + } + + @Test + public void testGet() { + Entity entity = DATASTORE.get(KEY3); + assertNull(entity); + + entity = DATASTORE.get(KEY1); + assertEquals(ENTITY1, entity); + StringValue value1 = entity.getValue("str"); + assertEquals(STR_VALUE, value1); + BooleanValue value2 = entity.getValue("bool"); + assertEquals(BOOL_VALUE, value2); + ListValue value3 = entity.getValue("list"); + assertEquals(LIST_VALUE2, value3); + TimestampValue value4 = entity.getValue("date"); + assertEquals(TIMESTAMP_VALUE, value4); + LatLngValue value5 = entity.getValue("latLng"); + assertEquals(LAT_LNG_VALUE, value5); + FullEntity value6 = entity.getEntity("partial1"); + assertEquals(PARTIAL_ENTITY1, value6); + ListValue value7 = entity.getValue("emptyList"); + assertEquals(EMPTY_LIST_VALUE, value7); + assertEquals(7, entity.getNames().size()); + assertFalse(entity.contains("bla")); + } + + @Test + public void testGetArrayNoDeferredResults() { + DATASTORE.put(ENTITY3); + Iterator result = + DATASTORE.fetch(KEY1, Key.newBuilder(KEY1).setName("bla").build(), KEY2, KEY3).iterator(); + assertEquals(ENTITY1, result.next()); + assertNull(result.next()); + assertEquals(ENTITY2, result.next()); + Entity entity3 = result.next(); + assertEquals(ENTITY3, entity3); + assertTrue(entity3.isNull("null")); + assertFalse(entity3.getBoolean("bool")); + assertEquals(LIST_VALUE2.get(), entity3.getList("list")); + FullEntity partial1 = entity3.getEntity("partial1"); + FullEntity partial2 = entity3.getEntity("partial2"); + assertEquals(PARTIAL_ENTITY2, partial1); + assertEquals(ENTITY2, partial2); + assertEquals(ValueType.BOOLEAN, entity3.getValue("bool").getType()); + assertEquals(LAT_LNG_VALUE, entity3.getValue("latLng")); + assertEquals(EMPTY_LIST_VALUE, entity3.getValue("emptyList")); + assertEquals(8, entity3.getNames().size()); + assertFalse(entity3.contains("bla")); + try { + entity3.getString("str"); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + // expected - no such property + } + assertFalse(result.hasNext()); + } + + @Test + public void testAddEntity() { + 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); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + // expected; + } + + 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())); + 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())); + for (Entity entity : entities) { + DATASTORE.delete(entity.getKey()); + } + } + + @Test + public void testUpdate() { + 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); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + // expected; + } + 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())); + } + + @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())); + + Entity entity2 = Entity.newBuilder(ENTITY2).clear().set("bla", new NullValue()).build(); + assertNotEquals(ENTITY2, entity2); + 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(entities.get(3), entity); + for (Entity entityToDelete : entities) { + DATASTORE.delete(entityToDelete.getKey()); + } + } + + @Test + public void testDelete() { + Iterator keys = + 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(); + assertNull(keys.next()); + assertNull(keys.next()); + assertNull(keys.next()); + assertFalse(keys.hasNext()); + } + + @Test + public void testRunInTransaction() { + Datastore.TransactionCallable callable1 = + new Datastore.TransactionCallable() { + private Integer attempts = 1; + + @Override + public Integer run(DatastoreReaderWriter transaction) { + transaction.get(KEY1); + if (attempts < 2) { + ++attempts; + throw new DatastoreException(10, "", "ABORTED", false, null); + } + + return attempts; + } + }; + + int result = DATASTORE.runInTransaction(callable1); + assertEquals(result, 2); + + Datastore.TransactionCallable callable2 = + new Datastore.TransactionCallable() { + private Integer attempts = 1; + + @Override + public Integer run(DatastoreReaderWriter transaction) { + transaction.get(KEY1); + if (attempts < 2) { + ++attempts; + throw new DatastoreException(4, "", "DEADLINE_EXCEEDED", false, null); + } + return attempts; + } + }; + + try { + DATASTORE.runInTransaction(callable2); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals(4, ((DatastoreException) expected.getCause()).getCode()); + } + } + + @Test + public void testRunInTransactionReadWrite() { + + final Entity entity1 = Entity.newBuilder(ENTITY1).clear().setNull("bla").build(); + + Datastore.TransactionCallable callable1 = + new Datastore.TransactionCallable() { + private Integer attempts = 1; + + @Override + public Integer run(DatastoreReaderWriter transaction) { + transaction.update(entity1); + if (attempts < 2) { + ++attempts; + throw new DatastoreException(10, "", "ABORTED", false, null); + } + + return attempts; + } + }; + + int result = DATASTORE.runInTransaction(callable1); + assertEquals(result, 2); + + final Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla").build(); + Datastore.TransactionCallable callable2 = + new Datastore.TransactionCallable() { + private Integer attempts = 1; + + @Override + public Integer run(DatastoreReaderWriter transaction) { + transaction.update(entity2); + if (attempts < 2) { + ++attempts; + throw new DatastoreException(10, "", "ABORTED", false, null); + } + + return attempts; + } + }; + + TransactionOptions readOnlyOptions = + TransactionOptions.newBuilder() + .setReadOnly(TransactionOptions.ReadOnly.getDefaultInstance()) + .build(); + + try { + DATASTORE.runInTransaction(callable2, readOnlyOptions); + fail("Expecting a failure"); + } catch (DatastoreException expected) { + assertEquals(3, ((DatastoreException) expected.getCause()).getCode()); + } + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java new file mode 100644 index 000000000000..c46834052a10 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java @@ -0,0 +1,91 @@ +/* + * Copyright 2015 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.cloud.datastore.testing; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.NoCredentials; +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreException; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Key; + +import org.threeten.bp.Duration; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.io.IOException; +import java.util.concurrent.TimeoutException; + +@RunWith(JUnit4.class) +public class LocalDatastoreHelperTest { + + private static final double TOLERANCE = 0.00001; + private static final String PROJECT_ID_PREFIX = "test-project-"; + private static final String NAMESPACE = "namespace"; + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Test + public void testCreate() { + LocalDatastoreHelper helper = LocalDatastoreHelper.create(0.75); + assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE); + assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX)); + helper = LocalDatastoreHelper.create(); + assertTrue(Math.abs(0.9 - helper.getConsistency()) < TOLERANCE); + assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX)); + } + + + @Test + public void testOptions() { + LocalDatastoreHelper helper = LocalDatastoreHelper.create(); + DatastoreOptions options = helper.getOptions(); + assertTrue(options.getProjectId().startsWith(PROJECT_ID_PREFIX)); + assertTrue(options.getHost().startsWith("localhost:")); + assertSame(NoCredentials.getInstance(), options.getCredentials()); + options = helper.getOptions(NAMESPACE); + assertTrue(options.getProjectId().startsWith(PROJECT_ID_PREFIX)); + assertTrue(options.getHost().startsWith("localhost:")); + assertSame(NoCredentials.getInstance(), options.getCredentials()); + assertEquals(NAMESPACE, options.getNamespace()); + } + + @Test + public void testStartStopReset() throws IOException, InterruptedException, TimeoutException { + LocalDatastoreHelper helper = LocalDatastoreHelper.create(); + helper.start(); + Datastore datastore = helper.getOptions().getService(); + Key key = datastore.newKeyFactory().setKind("kind").newKey("name"); + datastore.put(Entity.newBuilder(key).build()); + assertNotNull(datastore.get(key)); + helper.reset(); + assertNull(datastore.get(key)); + helper.stop(Duration.ofMinutes(1)); + thrown.expect(DatastoreException.class); + datastore.get(key); + } +} diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e9bbdf243743..d3003828dcb4 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.11.1-SNAPSHOT + 0.12.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc - google-api-grpc-pom - 0.11.1-SNAPSHOT + google-api-grpc + 0.12.1-SNAPSHOT From 7e1ec8d83a44d81fb584f5039d400c81efafe2b8 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Fri, 18 May 2018 10:01:00 -0700 Subject: [PATCH 0066/1784] Bump version to 0.48.0 release (#3288) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 9ef5db4378fa..1fc8af4e9b5b 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.29.0 + 1.30.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.29.0' +compile 'com.google.cloud:google-cloud-datastore:1.30.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.29.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.30.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 1b9d8dde869c..6d4ba33544ea 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.29.1-SNAPSHOT + 1.30.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.47.1-alpha-SNAPSHOT + 0.48.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index d3003828dcb4..6ec0ad67682b 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.12.1-SNAPSHOT + 0.13.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.12.1-SNAPSHOT + 0.13.0 From e60b7da2245c6d55afbb92f7d6c05873bb6839e4 Mon Sep 17 00:00:00 2001 From: Billy Jacobson Date: Mon, 21 May 2018 09:21:48 -0700 Subject: [PATCH 0067/1784] Updating all the region tags to have a prefix of datastore (#1106) --- .../google/datastore/snippets/TaskList.java | 24 +- .../datastore/snippets/ConceptsTest.java | 232 +++++++++--------- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 4c4910d55e19..f276eb5c9773 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -36,15 +36,15 @@ */ public class TaskList { - // [START build_service] + // [START datastore_build_service] // Create an authorized Datastore service using Application Default Credentials. private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); // Create a Key factory to construct keys associated with this project. private final KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task"); - // [END build_service] + // [END datastore_build_service] - // [START add_entity] + // [START datastore_add_entity] /** * Adds a task entity to the Datastore. * @@ -62,9 +62,9 @@ Key addTask(String description) { datastore.put(task); return key; } - // [END add_entity] + // [END datastore_add_entity] - // [START update_entity] + // [START datastore_update_entity] /** * Marks a task entity as done. * @@ -87,9 +87,9 @@ boolean markDone(long id) { } } } - // [END update_entity] + // [END datastore_update_entity] - // [START retrieve_entities] + // [START datastore_retrieve_entities] /** * Returns a list of all task entities in ascending order of creation time. * @@ -100,9 +100,9 @@ Iterator listTasks() { Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build(); return datastore.run(query); } - // [END retrieve_entities] + // [END datastore_retrieve_entities] - // [START delete_entity] + // [START datastore_delete_entity] /** * Deletes a task entity. * @@ -112,9 +112,9 @@ Iterator listTasks() { void deleteTask(long id) { datastore.delete(keyFactory.newKey(id)); } - // [END delete_entity] + // [END datastore_delete_entity] - // [START format_results] + // [START datastore_format_results] /** * Converts a list of task entities to a list of formatted task strings. * @@ -135,7 +135,7 @@ static List formatTasks(Iterator tasks) { } return strings; } - // [END format_results] + // [END datastore_format_results] /** * Handles a single command. diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index a9308d97f15e..0d082143d7b7 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -143,40 +143,40 @@ private void assertValidKey(Key taskKey) { @Test public void testIncompleteKey() { - // [START incomplete_key] + // [START datastore_incomplete_key] KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task"); Key taskKey = datastore.allocateId(keyFactory.newKey()); - // [END incomplete_key] + // [END datastore_incomplete_key] assertValidKey(taskKey); } @Test public void testNamedKey() { - // [START named_key] + // [START datastore_named_key] Key taskKey = datastore.newKeyFactory().setKind("Task").newKey("sampleTask"); - // [END named_key] + // [END datastore_named_key] assertValidKey(taskKey); } @Test public void testKeyWithParent() { - // [START key_with_parent] + // [START datastore_key_with_parent] Key taskKey = datastore.newKeyFactory() .addAncestors(PathElement.of("TaskList", "default")) .setKind("Task") .newKey("sampleTask"); - // [END key_with_parent] + // [END datastore_key_with_parent] assertValidKey(taskKey); } @Test public void testKeyWithMultilevelParent() { - // [START key_with_multilevel_parent] + // [START datastore_key_with_multilevel_parent] KeyFactory keyFactory = datastore.newKeyFactory() .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default")) .setKind("Task"); Key taskKey = keyFactory.newKey("sampleTask"); - // [END key_with_multilevel_parent] + // [END datastore_key_with_multilevel_parent] assertValidKey(taskKey); } @@ -187,7 +187,7 @@ private void assertValidEntity(Entity original) { @Test public void testEntityWithParent() { - // [START entity_with_parent] + // [START datastore_entity_with_parent] Key taskKey = datastore.newKeyFactory() .addAncestors(PathElement.of("TaskList", "default")) .setKind("Task") @@ -198,13 +198,13 @@ public void testEntityWithParent() { .set("priority", 4) .set("description", "Learn Cloud Datastore") .build(); - // [END entity_with_parent] + // [END datastore_entity_with_parent] assertValidEntity(task); } @Test public void testProperties() { - // [START properties] + // [START datastore_properties] Entity task = Entity.newBuilder(taskKey) .set("category", "Personal") .set("created", Timestamp.now()) @@ -214,76 +214,76 @@ public void testProperties() { .set("description", StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build()) .build(); - // [END properties] + // [END datastore_properties] assertValidEntity(task); } @Test public void testArrayValue() { - // [START array_value] + // [START datastore_array_value] Entity task = Entity.newBuilder(taskKey) .set("tags", "fun", "programming") .set("collaborators", "alice", "bob") .build(); - // [END array_value] + // [END datastore_array_value] assertValidEntity(task); } @Test public void testBasicEntity() { - // [START basic_entity] + // [START datastore_basic_entity] Entity task = Entity.newBuilder(taskKey) .set("category", "Personal") .set("done", false) .set("priority", 4) .set("description", "Learn Cloud Datastore") .build(); - // [END basic_entity] + // [END datastore_basic_entity] assertValidEntity(task); } @Test public void testUpsert() { - // [START upsert] + // [START datastore_upsert] Entity task = Entity.newBuilder(keyFactory.newKey("sampleTask")).build(); datastore.put(task); - // [END upsert] + // [END datastore_upsert] assertEquals(task, datastore.get(task.getKey())); } @Test public void testInsert() { - // [START insert] + // [START datastore_insert] Key taskKey = datastore.add(FullEntity.newBuilder(keyFactory.newKey()).build()).getKey(); - // [END insert] + // [END datastore_insert] assertEquals(FullEntity.newBuilder(taskKey).build(), datastore.get(taskKey)); } @Test public void testLookup() { datastore.put(testEntity); - // [START lookup] + // [START datastore_lookup] Entity task = datastore.get(taskKey); - // [END lookup] + // [END datastore_lookup] assertEquals(testEntity, task); } @Test public void testUpdate() { datastore.put(testEntity); - // [START update] + // [START datastore_update] Entity task = Entity.newBuilder(datastore.get(taskKey)).set("priority", 5).build(); datastore.update(task); - // [END update] + // [END datastore_update] assertEquals(task, datastore.get(taskKey)); } @Test public void testDelete() { datastore.put(testEntity); - // [START delete] + // [START datastore_delete] datastore.delete(taskKey); - // [END delete] + // [END datastore_delete] assertNull(datastore.get(taskKey)); } @@ -306,7 +306,7 @@ private List setUpBatchTests(Key taskKey1, Key taskKey2) { @Test public void testBatchUpsert() { - // [START batch_upsert] + // [START datastore_batch_upsert] FullEntity task1 = FullEntity.newBuilder(keyFactory.newKey()) .set("category", "Personal") .set("done", false) @@ -322,7 +322,7 @@ public void testBatchUpsert() { List tasks = datastore.add(task1, task2); Key taskKey1 = tasks.get(0).getKey(); Key taskKey2 = tasks.get(1).getKey(); - // [END batch_upsert] + // [END datastore_batch_upsert] assertEquals(Entity.newBuilder(taskKey1, task1).build(), datastore.get(taskKey1)); assertEquals(Entity.newBuilder(taskKey2, task2).build(), datastore.get(taskKey2)); } @@ -332,9 +332,9 @@ public void testBatchLookup() { Key taskKey1 = keyFactory.newKey(1); Key taskKey2 = keyFactory.newKey(2); List expectedTasks = setUpBatchTests(taskKey1, taskKey2); - // [START batch_lookup] + // [START datastore_batch_lookup] Iterator tasks = datastore.get(taskKey1, taskKey2); - // [END batch_lookup] + // [END datastore_batch_lookup] assertEquals(expectedTasks.get(0), tasks.next()); assertEquals(expectedTasks.get(1), tasks.next()); } @@ -344,9 +344,9 @@ public void testBatchDelete() { Key taskKey1 = keyFactory.newKey(1); Key taskKey2 = keyFactory.newKey(2); setUpBatchTests(taskKey1, taskKey2); - // [START batch_delete] + // [START datastore_batch_delete] datastore.delete(taskKey1, taskKey2); - // [END batch_delete] + // [END datastore_batch_delete] assertNull(datastore.get(taskKey1)); assertNull(datastore.get(taskKey2)); } @@ -384,14 +384,14 @@ private void assertInvalidQuery(Query query) { @Test public void testBasicQuery() { setUpQueryTests(); - // [START basic_query] + // [START datastore_basic_query] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(CompositeFilter.and( PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4))) .setOrderBy(OrderBy.desc("priority")) .build(); - // [END basic_query] + // [END datastore_basic_query] assertValidQuery(query); } @@ -399,9 +399,9 @@ public void testBasicQuery() { public void testRunQuery() { setUpQueryTests(); Query query = Query.newEntityQueryBuilder().setKind("Task").build(); - // [START run_query] + // [START datastore_run_query] QueryResults tasks = datastore.run(query); - // [END run_query] + // [END datastore_run_query] assertNotNull(tasks.next()); assertFalse(tasks.hasNext()); } @@ -409,68 +409,68 @@ public void testRunQuery() { @Test public void testPropertyFilter() { setUpQueryTests(); - // [START property_filter] + // [START datastore_property_filter] Query query = Query.newEntityQueryBuilder().setKind("Task").setFilter(PropertyFilter.eq("done", false)) .build(); - // [END property_filter] + // [END datastore_property_filter] assertValidQuery(query); } @Test public void testCompositeFilter() { setUpQueryTests(); - // [START composite_filter] + // [START datastore_composite_filter] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter( CompositeFilter.and(PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4))) .build(); - // [END composite_filter] + // [END datastore_composite_filter] assertValidQuery(query); } @Test public void testKeyFilter() { setUpQueryTests(); - // [START key_filter] + // [START datastore_key_filter] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) .build(); - // [END key_filter] + // [END datastore_key_filter] assertValidQuery(query); } @Test public void testAscendingSort() { setUpQueryTests(); - // [START ascending_sort] + // [START datastore_ascending_sort] Query query = Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build(); - // [END ascending_sort] + // [END datastore_ascending_sort] assertValidQuery(query); } @Test public void testDescendingSort() { setUpQueryTests(); - // [START descending_sort] + // [START datastore_descending_sort] Query query = Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.desc("created")).build(); - // [END descending_sort] + // [END datastore_descending_sort] assertValidQuery(query); } @Test public void testMultiSort() { setUpQueryTests(); - // [START multi_sort] + // [START datastore_multi_sort] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created")) .build(); - // [END multi_sort] + // [END datastore_multi_sort] assertValidQuery(query); } @@ -478,35 +478,35 @@ public void testMultiSort() { public void testKindlessQuery() { Key lastSeenKey = keyFactory.newKey("a"); setUpQueryTests(); - // [START kindless_query] + // [START datastore_kindless_query] Query query = Query.newEntityQueryBuilder().setFilter(PropertyFilter.gt("__key__", lastSeenKey)).build(); - // [END kindless_query] + // [END datastore_kindless_query] assertValidQuery(query); } @Test public void testAncestorQuery() { setUpQueryTests(); - // [START ancestor_query] + // [START datastore_ancestor_query] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(PropertyFilter.hasAncestor( datastore.newKeyFactory().setKind("TaskList").newKey("default"))) .build(); - // [END ancestor_query] + // [END datastore_ancestor_query] assertValidQuery(query); } @Test public void testProjectionQuery() { setUpQueryTests(); - // [START projection_query] + // [START datastore_projection_query] Query query = Query.newProjectionEntityQueryBuilder() .setKind("Task") .setProjection("priority", "percent_complete") .build(); - // [END projection_query] + // [END datastore_projection_query] assertValidQuery(query); } @@ -517,7 +517,7 @@ public void testRunProjectionQuery() { .setKind("Task") .setProjection("priority", "percent_complete") .build(); - // [START run_query_projection] + // [START datastore_run_query_projection] List priorities = new LinkedList<>(); List percentCompletes = new LinkedList<>(); QueryResults tasks = datastore.run(query); @@ -526,7 +526,7 @@ public void testRunProjectionQuery() { priorities.add(task.getLong("priority")); percentCompletes.add(task.getDouble("percent_complete")); } - // [END run_query_projection] + // [END datastore_run_query_projection] assertEquals(ImmutableList.of(4L), priorities); assertEquals(ImmutableList.of(10.0), percentCompletes); } @@ -534,9 +534,9 @@ public void testRunProjectionQuery() { @Test public void testKeysOnlyQuery() { setUpQueryTests(); - // [START keys_only_query] + // [START datastore_keys_only_query] Query query = Query.newKeyQueryBuilder().setKind("Task").build(); - // [END keys_only_query] + // [END datastore_keys_only_query] assertValidQuery(query); } @@ -544,9 +544,9 @@ public void testKeysOnlyQuery() { public void testRunKeysOnlyQuery() { setUpQueryTests(); Query query = Query.newKeyQueryBuilder().setKind("Task").build(); - // [START run_keys_only_query] + // [START datastore_run_keys_only_query] QueryResults taskKeys = datastore.run(query); - // [END run_keys_only_query] + // [END datastore_run_keys_only_query] assertNotNull(taskKeys.next()); assertFalse(taskKeys.hasNext()); } @@ -554,41 +554,41 @@ public void testRunKeysOnlyQuery() { @Test public void testDistinctQuery() { setUpQueryTests(); - // [START distinct_query] + // [START datastore_distinct_query] Query query = Query.newProjectionEntityQueryBuilder() .setKind("Task") .setProjection("category", "priority") .setDistinctOn("category", "priority") .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority")) .build(); - // [END distinct_query] + // [END datastore_distinct_query] assertValidQuery(query); } @Test public void testDistinctOnQuery() { setUpQueryTests(); - // [START distinct_on_query] + // [START datastore_distinct_on_query] Query query = Query.newProjectionEntityQueryBuilder() .setKind("Task") .setProjection("category", "priority") .setDistinctOn("category") .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority")) .build(); - // [END distinct_on_query] + // [END datastore_distinct_on_query] assertValidQuery(query); } @Test public void testArrayValueInequalityRange() { setUpQueryTests(); - // [START array_value_inequality_range] + // [START datastore_array_value_inequality_range] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(CompositeFilter.and( PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math"))) .build(); - // [END array_value_inequality_range] + // [END datastore_array_value_inequality_range] QueryResults results = datastore.run(query); assertFalse(results.hasNext()); } @@ -596,97 +596,97 @@ public void testArrayValueInequalityRange() { @Test public void testArrayValueEquality() { setUpQueryTests(); - // [START array_value_equality] + // [START datastore_array_value_equality] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(CompositeFilter.and( PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming"))) .build(); - // [END array_value_equality] + // [END datastore_array_value_equality] assertValidQuery(query); } @Test public void testInequalityRange() { setUpQueryTests(); - // [START inequality_range] + // [START datastore_inequality_range] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(CompositeFilter.and( PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) .build(); - // [END inequality_range] + // [END datastore_inequality_range] assertValidQuery(query); } @Test public void testInequalityInvalid() { - // [START inequality_invalid] + // [START datastore_inequality_invalid] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(CompositeFilter.and( PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3))) .build(); - // [END inequality_invalid] + // [END datastore_inequality_invalid] assertInvalidQuery(query); } @Test public void testEqualAndInequalityRange() { setUpQueryTests(); - // [START equal_and_inequality_range] + // [START datastore_equal_and_inequality_range] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(CompositeFilter.and(PropertyFilter.eq("priority", 4), PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) .build(); - // [END equal_and_inequality_range] + // [END datastore_equal_and_inequality_range] assertValidQuery(query); } @Test public void testInequalitySort() { setUpQueryTests(); - // [START inequality_sort] + // [START datastore_inequality_sort] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(PropertyFilter.gt("priority", 3)) .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created")) .build(); - // [END inequality_sort] + // [END datastore_inequality_sort] assertValidQuery(query); } @Test public void testInequalitySortInvalidNotSame() { - // [START inequality_sort_invalid_not_same] + // [START datastore_inequality_sort_invalid_not_same] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(PropertyFilter.gt("priority", 3)) .setOrderBy(OrderBy.asc("created")) .build(); - // [END inequality_sort_invalid_not_same] + // [END datastore_inequality_sort_invalid_not_same] assertInvalidQuery(query); } @Test public void testInequalitySortInvalidNotFirst() { - // [START inequality_sort_invalid_not_first] + // [START datastore_inequality_sort_invalid_not_first] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(PropertyFilter.gt("priority", 3)) .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority")) .build(); - // [END inequality_sort_invalid_not_first] + // [END datastore_inequality_sort_invalid_not_first] assertInvalidQuery(query); } @Test public void testLimit() { setUpQueryTests(); - // [START limit] + // [START datastore_limit] Query query = Query.newEntityQueryBuilder().setKind("Task").setLimit(5).build(); - // [END limit] + // [END datastore_limit] assertValidQuery(query); } @@ -701,7 +701,7 @@ public void testCursorPaging() { } private Cursor cursorPaging(int pageSize, Cursor pageCursor) { - // [START cursor_paging] + // [START datastore_cursor_paging] EntityQuery.Builder queryBuilder = Query.newEntityQueryBuilder().setKind("Task") .setLimit(pageSize); if (pageCursor != null) { @@ -713,46 +713,46 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) { // do something with the task } Cursor nextPageCursor = tasks.getCursorAfter(); - // [END cursor_paging] + // [END datastore_cursor_paging] return nextPageCursor; } @Test public void testEventualConsistentQuery() { setUpQueryTests(); - // [START eventual_consistent_query] + // [START datastore_eventual_consistent_query] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(PropertyFilter.hasAncestor( datastore.newKeyFactory().setKind("TaskList").newKey("default"))) .build(); datastore.run(query, ReadOption.eventualConsistency()); - // [END eventual_consistent_query] + // [END datastore_eventual_consistent_query] assertValidQuery(query); } @Test public void testUnindexedPropertyQuery() { setUpQueryTests(); - // [START unindexed_property_query] + // [START datastore_unindexed_property_query] Query query = Query.newEntityQueryBuilder() .setKind("Task") .setFilter(PropertyFilter.eq("description", "A task description")) .build(); - // [END unindexed_property_query] + // [END datastore_unindexed_property_query] QueryResults results = datastore.run(query); assertFalse(results.hasNext()); } @Test public void testExplodingProperties() { - // [START exploding_properties] + // [START datastore_exploding_properties] Entity task = Entity.newBuilder(taskKey) .set("tags", "fun", "programming", "learn") .set("collaborators", "alice", "bob", "charlie") .set("created", Timestamp.now()) .build(); - // [END exploding_properties] + // [END datastore_exploding_properties] assertValidEntity(task); } @@ -777,7 +777,7 @@ public void testTransactionalUpdate() { assertSuccessfulTransfer(keys.get(0), keys.get(1)); } - // [START transactional_update] + // [START datastore_transactional_update] void transferFunds(Key fromKey, Key toKey, long amount) { Transaction txn = datastore.newTransaction(); try { @@ -796,14 +796,14 @@ void transferFunds(Key fromKey, Key toKey, long amount) { } } } - // [END transactional_update] + // [END datastore_transactional_update] @Test public void testTransactionalRetry() { List keys = setUpTransferTests(); Key fromKey = keys.get(0); Key toKey = keys.get(1); - // [START transactional_retry] + // [START datastore_transactional_retry] int retries = 5; while (true) { try { @@ -817,13 +817,13 @@ public void testTransactionalRetry() { } } // Retry handling can also be configured and automatically applied using google-cloud-java. - // [END transactional_retry] + // [END datastore_transactional_retry] assertSuccessfulTransfer(keys.get(0), keys.get(1)); } @Test public void testTransactionalGetOrCreate() { - // [START transactional_get_or_create] + // [START datastore_transactional_get_or_create] Entity task; Transaction txn = datastore.newTransaction(); try { @@ -838,7 +838,7 @@ public void testTransactionalGetOrCreate() { txn.rollback(); } } - // [END transactional_get_or_create] + // [END datastore_transactional_get_or_create] assertEquals(task, datastore.get(taskKey)); } @@ -848,7 +848,7 @@ public void testTransactionalSingleEntityGroupReadOnly() { Key taskListKey = datastore.newKeyFactory().setKind("TaskList").newKey("default"); Entity taskListEntity = Entity.newBuilder(taskListKey).build(); datastore.put(taskListEntity); - // [START transactional_single_entity_group_read_only] + // [START datastore_transactional_single_entity_group_read_only] Entity taskList; QueryResults tasks; Transaction txn = datastore.newTransaction(); @@ -865,7 +865,7 @@ public void testTransactionalSingleEntityGroupReadOnly() { txn.rollback(); } } - // [END transactional_single_entity_group_read_only] + // [END datastore_transactional_single_entity_group_read_only] assertEquals(taskListEntity, taskList); assertNotNull(tasks.next()); assertFalse(tasks.hasNext()); @@ -874,7 +874,7 @@ public void testTransactionalSingleEntityGroupReadOnly() { @Test public void testNamespaceRunQuery() { setUpQueryTests(); - // [START namespace_run_query] + // [START datastore_namespace_run_query] KeyFactory keyFactory = datastore.newKeyFactory().setKind("__namespace__"); Key startNamespace = keyFactory.newKey("g"); Key endNamespace = keyFactory.newKey("h"); @@ -889,28 +889,28 @@ public void testNamespaceRunQuery() { while (results.hasNext()) { namespaces.add(results.next().getName()); } - // [END namespace_run_query] + // [END datastore_namespace_run_query] assertEquals(ImmutableList.of("ghijklmnop"), namespaces); } @Test public void testKindRunQuery() { setUpQueryTests(); - // [START kind_run_query] + // [START datastore_kind_run_query] Query query = Query.newKeyQueryBuilder().setKind("__kind__").build(); List kinds = new ArrayList<>(); QueryResults results = datastore.run(query); while (results.hasNext()) { kinds.add(results.next().getName()); } - // [END kind_run_query] + // [END datastore_kind_run_query] assertEquals(ImmutableList.of("Task"), kinds); } @Test public void testPropertyRunQuery() { setUpQueryTests(); - // [START property_run_query] + // [START datastore_property_run_query] Query query = Query.newKeyQueryBuilder().setKind("__property__").build(); QueryResults keys = datastore.run(query); Map> propertiesByKind = new HashMap<>(); @@ -925,7 +925,7 @@ public void testPropertyRunQuery() { } properties.add(propertyName); } - // [END property_run_query] + // [END datastore_property_run_query] Map> expected = ImmutableMap.of("Task", ImmutableSet.of( "done", "category", "done", "completed", "priority", "created", "percent_complete", "tag")); assertEquals(expected, propertiesByKind); @@ -934,7 +934,7 @@ public void testPropertyRunQuery() { @Test public void testPropertyByKindRunQuery() { setUpQueryTests(); - // [START property_by_kind_run_query] + // [START datastore_property_by_kind_run_query] Key key = datastore.newKeyFactory().setKind("__kind__").newKey("Task"); Query query = Query.newEntityQueryBuilder() .setKind("__property__") @@ -955,7 +955,7 @@ public void testPropertyByKindRunQuery() { currentRepresentations.add(value.get()); } } - // [END property_by_kind_run_query] + // [END datastore_property_by_kind_run_query] Map> expected = ImmutableMap.>builder() .put("category", Collections.singleton("STRING")) .put("done", Collections.singleton("BOOLEAN")) @@ -971,7 +971,7 @@ public void testPropertyByKindRunQuery() { @Test public void testPropertyFilteringRunQuery() { setUpQueryTests(); - // [START property_filtering_run_query] + // [START datastore_property_filtering_run_query] Key startKey = datastore.newKeyFactory() .setKind("__property__") .addAncestors(PathElement.of("__kind__", "Task")) @@ -993,7 +993,7 @@ public void testPropertyFilteringRunQuery() { } properties.add(propertyName); } - // [END property_filtering_run_query] + // [END datastore_property_filtering_run_query] Map> expected = ImmutableMap.of("Task", ImmutableSet.of("priority", "tag")); assertEquals(expected, propertiesByKind); @@ -1002,17 +1002,17 @@ public void testPropertyFilteringRunQuery() { @Test public void testGqlRunQuery() { setUpQueryTests(); - // [START gql_run_query] + // [START datastore_gql_run_query] Query query = Query.newGqlQueryBuilder( ResultType.ENTITY, "select * from Task order by created asc").build(); - // [END gql_run_query] + // [END datastore_gql_run_query] assertValidQuery(query); } @Test public void testGqlNamedBindingQuery() { setUpQueryTests(); - // [START gql_named_binding_query] + // [START datastore_gql_named_binding_query] Query query = Query.newGqlQueryBuilder( ResultType.ENTITY, @@ -1020,32 +1020,32 @@ public void testGqlNamedBindingQuery() { .setBinding("completed", false) .setBinding("priority", 4) .build(); - // [END gql_named_binding_query] + // [END datastore_gql_named_binding_query] assertValidQuery(query); } @Test public void testGqlPositionalBindingQuery() { setUpQueryTests(); - // [START gql_positional_binding_query] + // [START datastore_gql_positional_binding_query] Query query = Query.newGqlQueryBuilder( ResultType.ENTITY, "select * from Task where completed = @1 and priority = @2") .addBinding(false) .addBinding(4) .build(); - // [END gql_positional_binding_query] + // [END datastore_gql_positional_binding_query] assertValidQuery(query); } @Test public void testGqlLiteralQuery() { setUpQueryTests(); - // [START gql_literal_query] + // [START datastore_gql_literal_query] Query query = Query.newGqlQueryBuilder( ResultType.ENTITY, "select * from Task where completed = false and priority = 4") .setAllowLiteral(true) .build(); - // [END gql_literal_query] + // [END datastore_gql_literal_query] assertValidQuery(query); } } From 11cee7662105d2a5b3f8ba65a10ca75aa06cd344 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Mon, 21 May 2018 14:01:41 -0700 Subject: [PATCH 0068/1784] Post-release cleanup and fixes (specific to recent repository restructure) (#3290) 1) Fix poms deployment config. 2) Fix documentaiton links in readmes. 3) Update main README (remove `goolge-cloud` metapackage reference). 4) Update `RELEASING.md` to reflect changes. The instructions try to avoid having mysterious scripts running in the release process and also ensures that all disruptive operations (actual release/push) are done explicitly and not somewhere in the middle of a mysterious script. 5) Remove `deploy.sh` and `finalize_release.sh` scripts. 6) Fix few previously broken links (bigquerydatatransfer and compute apidocs links) --- google-cloud-datastore/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 1fc8af4e9b5b..d087855ac7b4 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -36,7 +36,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.30.0" Example Applications -------------------- -- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). +- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf. - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service. - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site. @@ -226,4 +226,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate [cloud-datastore]: https://cloud.google.com/datastore/ [datastore-product-docs]: https://cloud.google.com/datastore/docs/ -[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/datastore/package-summary.html +[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/datastore/package-summary.html From fec257d85befb2fe00c48281825b780148912166 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Mon, 21 May 2018 14:56:28 -0700 Subject: [PATCH 0069/1784] Bump version to 0.48.1-SNASPHOT for development (#3294) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6d4ba33544ea..02bc47fc8582 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.30.0 + 1.30.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.48.0-alpha + 0.48.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 6ec0ad67682b..e50b29643497 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.13.0 + 0.13.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.13.0 + 0.13.1-SNAPSHOT From 20241113b020862d5f651ed98c5e04477ba5d6d9 Mon Sep 17 00:00:00 2001 From: neozwu Date: Thu, 24 May 2018 10:13:56 -0700 Subject: [PATCH 0070/1784] release 0.49.0 (#3310) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index d087855ac7b4..38a47726cd86 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.30.0 + 1.31.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.30.0' +compile 'com.google.cloud:google-cloud-datastore:1.31.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.30.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.31.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 02bc47fc8582..9ae9d93451e4 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.30.1-SNAPSHOT + 1.31.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.48.1-alpha-SNAPSHOT + 0.49.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e50b29643497..e5aeff1a21dd 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.13.1-SNAPSHOT + 0.14.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.13.1-SNAPSHOT + 0.14.0 From 95c7082c7cc8bdcbf2937d6ccf9681e44ab0da5b Mon Sep 17 00:00:00 2001 From: neozwu Date: Thu, 24 May 2018 11:10:53 -0700 Subject: [PATCH 0071/1784] bump version for development (#3311) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9ae9d93451e4..4fb56f75021a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.31.0 + 1.31.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.49.0-alpha + 0.49.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e5aeff1a21dd..d63819c98199 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.14.0 + 0.14.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.14.0 + 0.14.1-SNAPSHOT From 318f7953e9f154f20b36574ab3c012dfe7f2efa1 Mon Sep 17 00:00:00 2001 From: neozwu Date: Fri, 1 Jun 2018 10:55:00 -0700 Subject: [PATCH 0072/1784] fix example links (#3328) --- google-cloud-datastore/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 38a47726cd86..2a807d21de8f 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -36,7 +36,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.31.0" Example Applications -------------------- -- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). +- [`DatastoreExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf. - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service. - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site. @@ -164,12 +164,12 @@ if (entity != null) { ``` The complete source code can be found at -[UpdateEntity.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java). +[UpdateEntity.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java). #### Complete source code In -[AddEntitiesAndRunQuery.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java) +[AddEntitiesAndRunQuery.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java) we put together all the code to store data and run queries into one program. The program assumes that you are running on Compute Engine or from your own desktop. To run the example on App Engine, simply move the code from the main method to your application's servlet class and change the print statements to From 487030091225cf3e2d6ac8b49eedb480577c98e0 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Fri, 1 Jun 2018 13:15:13 -0700 Subject: [PATCH 0073/1784] Update gax-java, api-common dependecies to latest (#3335) * update gax deps to latest * remove ResourceNameType, update api-common to 1.6, update jsr to 3.0.2 * regenerate grpc/proto packages using new protoc-gapic-p: --- .../datastore/v1/AllocateIdsRequest.java | 5 +---- .../datastore/v1/AllocateIdsResponse.java | 5 +---- .../com/google/datastore/v1/ArrayValue.java | 5 +---- .../datastore/v1/BeginTransactionRequest.java | 5 +---- .../datastore/v1/BeginTransactionResponse.java | 5 +---- .../com/google/datastore/v1/CommitRequest.java | 5 +---- .../google/datastore/v1/CommitResponse.java | 5 +---- .../google/datastore/v1/CompositeFilter.java | 5 +---- .../google/datastore/v1/DatastoreProto.java | 18 +++++++++--------- .../java/com/google/datastore/v1/Entity.java | 5 +---- .../com/google/datastore/v1/EntityProto.java | 6 +++--- .../com/google/datastore/v1/EntityResult.java | 5 +---- .../java/com/google/datastore/v1/Filter.java | 5 +---- .../java/com/google/datastore/v1/GqlQuery.java | 5 +---- .../google/datastore/v1/GqlQueryParameter.java | 5 +---- .../main/java/com/google/datastore/v1/Key.java | 10 ++-------- .../google/datastore/v1/KindExpression.java | 5 +---- .../com/google/datastore/v1/LookupRequest.java | 5 +---- .../google/datastore/v1/LookupResponse.java | 5 +---- .../java/com/google/datastore/v1/Mutation.java | 5 +---- .../google/datastore/v1/MutationResult.java | 5 +---- .../com/google/datastore/v1/PartitionId.java | 5 +---- .../com/google/datastore/v1/Projection.java | 5 +---- .../google/datastore/v1/PropertyFilter.java | 5 +---- .../com/google/datastore/v1/PropertyOrder.java | 5 +---- .../google/datastore/v1/PropertyReference.java | 5 +---- .../java/com/google/datastore/v1/Query.java | 5 +---- .../com/google/datastore/v1/QueryProto.java | 12 ++++++------ .../google/datastore/v1/QueryResultBatch.java | 5 +---- .../com/google/datastore/v1/ReadOptions.java | 5 +---- .../google/datastore/v1/ReserveIdsRequest.java | 5 +---- .../datastore/v1/ReserveIdsResponse.java | 5 +---- .../google/datastore/v1/RollbackRequest.java | 5 +---- .../google/datastore/v1/RollbackResponse.java | 5 +---- .../google/datastore/v1/RunQueryRequest.java | 5 +---- .../google/datastore/v1/RunQueryResponse.java | 5 +---- .../datastore/v1/TransactionOptions.java | 15 +++------------ .../java/com/google/datastore/v1/Value.java | 5 +---- 38 files changed, 56 insertions(+), 170 deletions(-) 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 400846c83530..aebc798e7c23 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 @@ -34,9 +34,6 @@ private AllocateIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -994,7 +991,7 @@ public AllocateIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsRequest(input, extensionRegistry); + return new AllocateIdsRequest(input, extensionRegistry); } }; 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 ee62ee5fec98..3844547c3756 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 @@ -33,9 +33,6 @@ private AllocateIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -836,7 +833,7 @@ public AllocateIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsResponse(input, extensionRegistry); + return new AllocateIdsResponse(input, extensionRegistry); } }; 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 fe6b290e9322..ad0cb62648e6 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 @@ -33,9 +33,6 @@ private ArrayValue( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -859,7 +856,7 @@ public ArrayValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ArrayValue(input, extensionRegistry); + return new ArrayValue(input, extensionRegistry); } }; 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 2fdd90689108..e977c4250e83 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 @@ -33,9 +33,6 @@ private BeginTransactionRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -760,7 +757,7 @@ public BeginTransactionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionRequest(input, extensionRegistry); + return new BeginTransactionRequest(input, extensionRegistry); } }; 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 0bb48d6a6899..a511859f4210 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 @@ -33,9 +33,6 @@ private BeginTransactionResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -453,7 +450,7 @@ public BeginTransactionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionResponse(input, extensionRegistry); + return new BeginTransactionResponse(input, extensionRegistry); } }; 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 ffae15d56af6..3040ae1e25ab 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 @@ -35,9 +35,6 @@ private CommitRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1593,7 +1590,7 @@ public CommitRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitRequest(input, extensionRegistry); + return new CommitRequest(input, extensionRegistry); } }; 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 05ae3dda3d70..ff72b2e89499 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 @@ -34,9 +34,6 @@ private CommitResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -917,7 +914,7 @@ public CommitResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitResponse(input, extensionRegistry); + return new CommitResponse(input, extensionRegistry); } }; 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 acb487899c4d..20ab2f6c13fe 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 @@ -34,9 +34,6 @@ private CompositeFilter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1068,7 +1065,7 @@ public CompositeFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CompositeFilter(input, extensionRegistry); + return new CompositeFilter(input, extensionRegistry); } }; 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 0ef9ef973d45..c4079ab19db1 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 @@ -132,7 +132,7 @@ public static void registerAllExtensions( "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" + "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " + "\003(\0132!.google.datastore.v1.EntityResult\0222" + - "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" + + "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En", "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" + "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" + "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" + @@ -142,7 +142,7 @@ public static void registerAllExtensions( ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." + "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" + "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" + - "e.datastore.v1.QueryResultBatch\022)\n\005query" + + "e.datastore.v1.QueryResultBatch\022)\n\005query", "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" + "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" + "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." + @@ -152,7 +152,7 @@ public static void registerAllExtensions( "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" + "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" + "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" + - "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" + + "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t", "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" + "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" + "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" + @@ -162,7 +162,7 @@ public static void registerAllExtensions( "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" + "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" + "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" + - "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" + + "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser", "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" + "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" + "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" + @@ -172,7 +172,7 @@ public static void registerAllExtensions( ".google.datastore.v1.EntityH\000\022*\n\006delete\030" + "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" + "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" + - "ct_detection_strategy\"c\n\016MutationResult\022" + + "ct_detection_strategy\"c\n\016MutationResult\022", "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" + "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" + "(\010\"\325\001\n\013ReadOptions\022L\n\020read_consistency\030\001" + @@ -182,7 +182,7 @@ public static void registerAllExtensions( "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" + "\n\020consistency_type\"\343\001\n\022TransactionOption" + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" + - ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" + + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre", "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" + "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" + @@ -192,7 +192,7 @@ public static void registerAllExtensions( "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" + "ery\022$.google.datastore.v1.RunQueryReques" + "t\032%.google.datastore.v1.RunQueryResponse" + - "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" + + "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ", "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" + "tastore.v1.BeginTransactionRequest\032-.goo" + "gle.datastore.v1.BeginTransactionRespons" + @@ -202,7 +202,7 @@ public static void registerAllExtensions( "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" + "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." + "google.datastore.v1.RollbackRequest\032%.go" + - "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" + + "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223", "\002\'\"\"/v1/projects/{project_id}:rollback:\001" + "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." + "AllocateIdsRequest\032(.google.datastore.v1" + @@ -212,7 +212,7 @@ public static void registerAllExtensions( "quest\032\'.google.datastore.v1.ReserveIdsRe" + "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" + "}:reserveIds:\001*B\241\001\n\027com.google.datastore" + - ".v1B\016DatastoreProtoP\001Z\n\017p" + - "roperty_filter\030\002 \001(\0132#.google.datastore." + + "roperty_filter\030\002 \001(\0132#.google.datastore.", "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" + "store.v1.CompositeFilter.Operator\022,\n\007fil" + @@ -127,7 +127,7 @@ public static void registerAllExtensions( "\001(\0132&.google.datastore.v1.PropertyRefere" + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" + - "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n" + + "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" + @@ -137,7 +137,7 @@ public static void registerAllExtensions( "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" + "nal_bindings\030\004 \003(\0132&.google.datastore.v1" + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" + - "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" + + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da", "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" + @@ -147,7 +147,7 @@ public static void registerAllExtensions( "e.datastore.v1.EntityResult.ResultType\0229" + "\n\016entity_results\030\002 \003(\0132!.google.datastor" + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" + - "\014more_results\030\005 \001(\01625.google.datastore.v" + + "\014more_results\030\005 \001(\01625.google.datastore.v", "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index cea8e80d4c64..b1b10aa07ef9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -39,9 +39,6 @@ private QueryResultBatch( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1544,7 +1541,7 @@ public QueryResultBatch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new QueryResultBatch(input, extensionRegistry); + return new QueryResultBatch(input, extensionRegistry); } }; diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index 048ee2dabfaf..b2bcfaa948fc 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -32,9 +32,6 @@ private ReadOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -818,7 +815,7 @@ public ReadOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOptions(input, extensionRegistry); + return new ReadOptions(input, extensionRegistry); } }; 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 2ffd5b09e1ac..d5c5f26c5142 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 @@ -35,9 +35,6 @@ private ReserveIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1149,7 +1146,7 @@ public ReserveIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsRequest(input, extensionRegistry); + return new ReserveIdsRequest(input, extensionRegistry); } }; 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 1a905db7ea25..d5d38f6b6f60 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 @@ -32,9 +32,6 @@ private ReserveIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -375,7 +372,7 @@ public ReserveIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsResponse(input, extensionRegistry); + return new ReserveIdsResponse(input, extensionRegistry); } }; 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 16c714da64b5..0aa141f0cea0 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 @@ -34,9 +34,6 @@ private RollbackRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -612,7 +609,7 @@ public RollbackRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackRequest(input, extensionRegistry); + return new RollbackRequest(input, extensionRegistry); } }; 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 8570e62626f8..f309bbc17cf5 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 @@ -33,9 +33,6 @@ private RollbackResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -377,7 +374,7 @@ public RollbackResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackResponse(input, extensionRegistry); + return new RollbackResponse(input, extensionRegistry); } }; 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 f06507679d03..25ec2ddfa31d 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 @@ -33,9 +33,6 @@ private RunQueryRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1597,7 +1594,7 @@ public RunQueryRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryRequest(input, extensionRegistry); + return new RunQueryRequest(input, extensionRegistry); } }; 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 3f7dd2858e68..cf6f8aa66101 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 @@ -32,9 +32,6 @@ private RunQueryResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -834,7 +831,7 @@ public RunQueryResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryResponse(input, extensionRegistry); + return new RunQueryResponse(input, extensionRegistry); } }; 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 697ff5bae265..4c832a372d80 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 @@ -35,9 +35,6 @@ private TransactionOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -151,9 +148,6 @@ private ReadWrite( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -571,7 +565,7 @@ public ReadWrite parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadWrite(input, extensionRegistry); + return new ReadWrite(input, extensionRegistry); } }; @@ -623,9 +617,6 @@ private ReadOnly( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -966,7 +957,7 @@ public ReadOnly parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOnly(input, extensionRegistry); + return new ReadOnly(input, extensionRegistry); } }; @@ -1831,7 +1822,7 @@ public TransactionOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TransactionOptions(input, extensionRegistry); + return new TransactionOptions(input, extensionRegistry); } }; 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 6070573eb5eb..24a7ce3b5f03 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 @@ -35,9 +35,6 @@ private Value( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -2656,7 +2653,7 @@ public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Value(input, extensionRegistry); + return new Value(input, extensionRegistry); } }; From afa9fae9c5857982fba233acd5530af16c944cbf Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Fri, 1 Jun 2018 15:04:04 -0700 Subject: [PATCH 0074/1784] Release 0.50.0 (#3337) * Also add texttospeech v1 to versions.txt --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 2a807d21de8f..57dc695f3bf6 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.31.0 + 1.32.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.31.0' +compile 'com.google.cloud:google-cloud-datastore:1.32.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.31.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.32.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 4fb56f75021a..7389398e4b4b 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.31.1-SNAPSHOT + 1.32.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.49.1-alpha-SNAPSHOT + 0.50.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index d63819c98199..9e225fcc3a52 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.14.1-SNAPSHOT + 0.15.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.14.1-SNAPSHOT + 0.15.0 From 011f744c0113bf10dd473c351848b434ef465c1d Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Fri, 1 Jun 2018 15:14:47 -0700 Subject: [PATCH 0075/1784] Bump version for development (#3338) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 7389398e4b4b..abe561dbbd3a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.32.0 + 1.32.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.50.0-alpha + 0.50.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 9e225fcc3a52..4b56d113ada4 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.15.0 + 0.15.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.15.0 + 0.15.1-SNAPSHOT From e1d689a23afddc534f109ef7d9ff8f818ae20fab Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Thu, 7 Jun 2018 12:32:25 -0700 Subject: [PATCH 0076/1784] regenerate clients (#3354) --- .../datastore/v1/AllocateIdsRequest.java | 5 ++++- .../datastore/v1/AllocateIdsResponse.java | 5 ++++- .../com/google/datastore/v1/ArrayValue.java | 5 ++++- .../datastore/v1/BeginTransactionRequest.java | 5 ++++- .../datastore/v1/BeginTransactionResponse.java | 5 ++++- .../com/google/datastore/v1/CommitRequest.java | 5 ++++- .../google/datastore/v1/CommitResponse.java | 5 ++++- .../google/datastore/v1/CompositeFilter.java | 5 ++++- .../google/datastore/v1/DatastoreProto.java | 18 +++++++++--------- .../java/com/google/datastore/v1/Entity.java | 5 ++++- .../com/google/datastore/v1/EntityProto.java | 6 +++--- .../com/google/datastore/v1/EntityResult.java | 5 ++++- .../java/com/google/datastore/v1/Filter.java | 5 ++++- .../java/com/google/datastore/v1/GqlQuery.java | 5 ++++- .../google/datastore/v1/GqlQueryParameter.java | 5 ++++- .../main/java/com/google/datastore/v1/Key.java | 10 ++++++++-- .../google/datastore/v1/KindExpression.java | 5 ++++- .../com/google/datastore/v1/LookupRequest.java | 5 ++++- .../google/datastore/v1/LookupResponse.java | 5 ++++- .../java/com/google/datastore/v1/Mutation.java | 5 ++++- .../google/datastore/v1/MutationResult.java | 5 ++++- .../com/google/datastore/v1/PartitionId.java | 5 ++++- .../com/google/datastore/v1/Projection.java | 5 ++++- .../google/datastore/v1/PropertyFilter.java | 5 ++++- .../com/google/datastore/v1/PropertyOrder.java | 5 ++++- .../google/datastore/v1/PropertyReference.java | 5 ++++- .../java/com/google/datastore/v1/Query.java | 5 ++++- .../com/google/datastore/v1/QueryProto.java | 12 ++++++------ .../google/datastore/v1/QueryResultBatch.java | 5 ++++- .../com/google/datastore/v1/ReadOptions.java | 5 ++++- .../google/datastore/v1/ReserveIdsRequest.java | 5 ++++- .../datastore/v1/ReserveIdsResponse.java | 5 ++++- .../google/datastore/v1/RollbackRequest.java | 5 ++++- .../google/datastore/v1/RollbackResponse.java | 5 ++++- .../google/datastore/v1/RunQueryRequest.java | 5 ++++- .../google/datastore/v1/RunQueryResponse.java | 5 ++++- .../datastore/v1/TransactionOptions.java | 15 ++++++++++++--- .../java/com/google/datastore/v1/Value.java | 5 ++++- 38 files changed, 170 insertions(+), 56 deletions(-) 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 aebc798e7c23..400846c83530 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 @@ -34,6 +34,9 @@ private AllocateIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -991,7 +994,7 @@ public AllocateIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsRequest(input, extensionRegistry); + return new AllocateIdsRequest(input, extensionRegistry); } }; 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 3844547c3756..ee62ee5fec98 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 @@ -33,6 +33,9 @@ private AllocateIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -833,7 +836,7 @@ public AllocateIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsResponse(input, extensionRegistry); + return new AllocateIdsResponse(input, extensionRegistry); } }; 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 ad0cb62648e6..fe6b290e9322 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 @@ -33,6 +33,9 @@ private ArrayValue( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -856,7 +859,7 @@ public ArrayValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ArrayValue(input, extensionRegistry); + return new ArrayValue(input, extensionRegistry); } }; 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 e977c4250e83..2fdd90689108 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 @@ -33,6 +33,9 @@ private BeginTransactionRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -757,7 +760,7 @@ public BeginTransactionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionRequest(input, extensionRegistry); + return new BeginTransactionRequest(input, extensionRegistry); } }; 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 a511859f4210..0bb48d6a6899 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 @@ -33,6 +33,9 @@ private BeginTransactionResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -450,7 +453,7 @@ public BeginTransactionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionResponse(input, extensionRegistry); + return new BeginTransactionResponse(input, extensionRegistry); } }; 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 3040ae1e25ab..ffae15d56af6 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 @@ -35,6 +35,9 @@ private CommitRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1590,7 +1593,7 @@ public CommitRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitRequest(input, extensionRegistry); + return new CommitRequest(input, extensionRegistry); } }; 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 ff72b2e89499..05ae3dda3d70 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 @@ -34,6 +34,9 @@ private CommitResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -914,7 +917,7 @@ public CommitResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitResponse(input, extensionRegistry); + return new CommitResponse(input, extensionRegistry); } }; 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 20ab2f6c13fe..acb487899c4d 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 @@ -34,6 +34,9 @@ private CompositeFilter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1065,7 +1068,7 @@ public CompositeFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CompositeFilter(input, extensionRegistry); + return new CompositeFilter(input, extensionRegistry); } }; 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 c4079ab19db1..0ef9ef973d45 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 @@ -132,7 +132,7 @@ public static void registerAllExtensions( "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" + "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " + "\003(\0132!.google.datastore.v1.EntityResult\0222" + - "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En", + "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" + "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" + "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" + "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" + @@ -142,7 +142,7 @@ public static void registerAllExtensions( ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." + "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" + "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" + - "e.datastore.v1.QueryResultBatch\022)\n\005query", + "e.datastore.v1.QueryResultBatch\022)\n\005query" + "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" + "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" + "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." + @@ -152,7 +152,7 @@ public static void registerAllExtensions( "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" + "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" + "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" + - "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t", + "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" + "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" + "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" + "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" + @@ -162,7 +162,7 @@ public static void registerAllExtensions( "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" + "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" + "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" + - "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser", + "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" + "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" + "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" + "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" + @@ -172,7 +172,7 @@ public static void registerAllExtensions( ".google.datastore.v1.EntityH\000\022*\n\006delete\030" + "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" + "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" + - "ct_detection_strategy\"c\n\016MutationResult\022", + "ct_detection_strategy\"c\n\016MutationResult\022" + "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" + "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" + "(\010\"\325\001\n\013ReadOptions\022L\n\020read_consistency\030\001" + @@ -182,7 +182,7 @@ public static void registerAllExtensions( "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" + "\n\020consistency_type\"\343\001\n\022TransactionOption" + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" + - ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre", + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" + "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" + "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" + @@ -192,7 +192,7 @@ public static void registerAllExtensions( "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" + "ery\022$.google.datastore.v1.RunQueryReques" + "t\032%.google.datastore.v1.RunQueryResponse" + - "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ", + "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" + "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" + "tastore.v1.BeginTransactionRequest\032-.goo" + "gle.datastore.v1.BeginTransactionRespons" + @@ -202,7 +202,7 @@ public static void registerAllExtensions( "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" + "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." + "google.datastore.v1.RollbackRequest\032%.go" + - "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223", + "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" + "\002\'\"\"/v1/projects/{project_id}:rollback:\001" + "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." + "AllocateIdsRequest\032(.google.datastore.v1" + @@ -212,7 +212,7 @@ public static void registerAllExtensions( "quest\032\'.google.datastore.v1.ReserveIdsRe" + "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" + "}:reserveIds:\001*B\241\001\n\027com.google.datastore" + - ".v1B\016DatastoreProtoP\001Z\n\017p" + - "roperty_filter\030\002 \001(\0132#.google.datastore.", + "roperty_filter\030\002 \001(\0132#.google.datastore." + "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" + "store.v1.CompositeFilter.Operator\022,\n\007fil" + @@ -127,7 +127,7 @@ public static void registerAllExtensions( "\001(\0132&.google.datastore.v1.PropertyRefere" + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" + - "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n", + "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" + @@ -137,7 +137,7 @@ public static void registerAllExtensions( "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" + "nal_bindings\030\004 \003(\0132&.google.datastore.v1" + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" + - "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da", + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" + "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" + @@ -147,7 +147,7 @@ public static void registerAllExtensions( "e.datastore.v1.EntityResult.ResultType\0229" + "\n\016entity_results\030\002 \003(\0132!.google.datastor" + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" + - "\014more_results\030\005 \001(\01625.google.datastore.v", + "\014more_results\030\005 \001(\01625.google.datastore.v" + "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index b1b10aa07ef9..cea8e80d4c64 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -39,6 +39,9 @@ private QueryResultBatch( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1541,7 +1544,7 @@ public QueryResultBatch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new QueryResultBatch(input, extensionRegistry); + return new QueryResultBatch(input, extensionRegistry); } }; diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index b2bcfaa948fc..048ee2dabfaf 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -32,6 +32,9 @@ private ReadOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -815,7 +818,7 @@ public ReadOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOptions(input, extensionRegistry); + return new ReadOptions(input, extensionRegistry); } }; 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 d5c5f26c5142..2ffd5b09e1ac 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 @@ -35,6 +35,9 @@ private ReserveIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1146,7 +1149,7 @@ public ReserveIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsRequest(input, extensionRegistry); + return new ReserveIdsRequest(input, extensionRegistry); } }; 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 d5d38f6b6f60..1a905db7ea25 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 @@ -32,6 +32,9 @@ private ReserveIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -372,7 +375,7 @@ public ReserveIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsResponse(input, extensionRegistry); + return new ReserveIdsResponse(input, extensionRegistry); } }; 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 0aa141f0cea0..16c714da64b5 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 @@ -34,6 +34,9 @@ private RollbackRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -609,7 +612,7 @@ public RollbackRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackRequest(input, extensionRegistry); + return new RollbackRequest(input, extensionRegistry); } }; 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 f309bbc17cf5..8570e62626f8 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 @@ -33,6 +33,9 @@ private RollbackResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -374,7 +377,7 @@ public RollbackResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackResponse(input, extensionRegistry); + return new RollbackResponse(input, extensionRegistry); } }; 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 25ec2ddfa31d..f06507679d03 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 @@ -33,6 +33,9 @@ private RunQueryRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1594,7 +1597,7 @@ public RunQueryRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryRequest(input, extensionRegistry); + return new RunQueryRequest(input, extensionRegistry); } }; 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 cf6f8aa66101..3f7dd2858e68 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 @@ -32,6 +32,9 @@ private RunQueryResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -831,7 +834,7 @@ public RunQueryResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryResponse(input, extensionRegistry); + return new RunQueryResponse(input, extensionRegistry); } }; 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 4c832a372d80..697ff5bae265 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 @@ -35,6 +35,9 @@ private TransactionOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -148,6 +151,9 @@ private ReadWrite( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -565,7 +571,7 @@ public ReadWrite parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadWrite(input, extensionRegistry); + return new ReadWrite(input, extensionRegistry); } }; @@ -617,6 +623,9 @@ private ReadOnly( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -957,7 +966,7 @@ public ReadOnly parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOnly(input, extensionRegistry); + return new ReadOnly(input, extensionRegistry); } }; @@ -1822,7 +1831,7 @@ public TransactionOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TransactionOptions(input, extensionRegistry); + return new TransactionOptions(input, extensionRegistry); } }; 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 24a7ce3b5f03..6070573eb5eb 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 @@ -35,6 +35,9 @@ private Value( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -2653,7 +2656,7 @@ public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Value(input, extensionRegistry); + return new Value(input, extensionRegistry); } }; From 899f169549c525a17819be10fa9a3dbbe26bc475 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Thu, 7 Jun 2018 16:17:57 -0700 Subject: [PATCH 0077/1784] Release 0.51.0 (#3358) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 57dc695f3bf6..3b45c02bc53f 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.32.0 + 1.33.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.32.0' +compile 'com.google.cloud:google-cloud-datastore:1.33.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.32.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.33.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index abe561dbbd3a..073075267e68 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.32.1-SNAPSHOT + 1.33.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.50.1-alpha-SNAPSHOT + 0.51.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 4b56d113ada4..1882b9ec1041 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.15.1-SNAPSHOT + 0.16.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.15.1-SNAPSHOT + 0.16.0 From 8793e4a8860de542caf0010f304e0fe3e1b48e2e Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 8 Jun 2018 10:55:53 -0700 Subject: [PATCH 0078/1784] bump version for development (#3360) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 073075267e68..241dbc439208 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.33.0 + 1.33.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.51.0-alpha + 0.51.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 1882b9ec1041..d1d320c2a4f9 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.16.0 + 0.16.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.16.0 + 0.16.1-SNAPSHOT From f05ebd5782acd7e191990505db391c96a92341e2 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Thu, 14 Jun 2018 10:56:35 -0700 Subject: [PATCH 0079/1784] Release 0.52.0 (#3376) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 3b45c02bc53f..a65839887035 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.33.0 + 1.34.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.33.0' +compile 'com.google.cloud:google-cloud-datastore:1.34.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.33.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.34.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 241dbc439208..a7551d90c4db 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.33.1-SNAPSHOT + 1.34.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.51.1-alpha-SNAPSHOT + 0.52.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index d1d320c2a4f9..633d3a7c90d0 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.16.1-SNAPSHOT + 0.17.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.16.1-SNAPSHOT + 0.17.0 From 0d5db6ff5fff612c6236818f20cecc21b27ece3c Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Thu, 14 Jun 2018 14:53:09 -0700 Subject: [PATCH 0080/1784] Bumping to snapshot versions (#3380) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a7551d90c4db..5751627dea9f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.34.0 + 1.34.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.52.0-alpha + 0.52.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 633d3a7c90d0..1dfd980d2ca9 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.17.0 + 0.17.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.17.0 + 0.17.1-SNAPSHOT From dbd7fbcf44329de788c2676f4c29aeaf6677e259 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Wed, 20 Jun 2018 13:48:34 -0700 Subject: [PATCH 0081/1784] Delete unused Datastore region tags / samples. (#1138) --- .../google/datastore/snippets/TaskList.java | 2 - .../datastore/snippets/ConceptsTest.java | 75 ------------------- 2 files changed, 77 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index f276eb5c9773..3f035d3e3dec 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -114,7 +114,6 @@ void deleteTask(long id) { } // [END datastore_delete_entity] - // [START datastore_format_results] /** * Converts a list of task entities to a list of formatted task strings. * @@ -135,7 +134,6 @@ static List formatTasks(Iterator tasks) { } return strings; } - // [END datastore_format_results] /** * Handles a single command. diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 0d082143d7b7..0ae608bdc6f7 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -540,31 +540,6 @@ public void testKeysOnlyQuery() { assertValidQuery(query); } - @Test - public void testRunKeysOnlyQuery() { - setUpQueryTests(); - Query query = Query.newKeyQueryBuilder().setKind("Task").build(); - // [START datastore_run_keys_only_query] - QueryResults taskKeys = datastore.run(query); - // [END datastore_run_keys_only_query] - assertNotNull(taskKeys.next()); - assertFalse(taskKeys.hasNext()); - } - - @Test - public void testDistinctQuery() { - setUpQueryTests(); - // [START datastore_distinct_query] - Query query = Query.newProjectionEntityQueryBuilder() - .setKind("Task") - .setProjection("category", "priority") - .setDistinctOn("category", "priority") - .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority")) - .build(); - // [END datastore_distinct_query] - assertValidQuery(query); - } - @Test public void testDistinctOnQuery() { setUpQueryTests(); @@ -998,54 +973,4 @@ public void testPropertyFilteringRunQuery() { ImmutableMap.of("Task", ImmutableSet.of("priority", "tag")); assertEquals(expected, propertiesByKind); } - - @Test - public void testGqlRunQuery() { - setUpQueryTests(); - // [START datastore_gql_run_query] - Query query = Query.newGqlQueryBuilder( - ResultType.ENTITY, "select * from Task order by created asc").build(); - // [END datastore_gql_run_query] - assertValidQuery(query); - } - - @Test - public void testGqlNamedBindingQuery() { - setUpQueryTests(); - // [START datastore_gql_named_binding_query] - Query query = - Query.newGqlQueryBuilder( - ResultType.ENTITY, - "select * from Task where completed = @completed and priority = @priority") - .setBinding("completed", false) - .setBinding("priority", 4) - .build(); - // [END datastore_gql_named_binding_query] - assertValidQuery(query); - } - - @Test - public void testGqlPositionalBindingQuery() { - setUpQueryTests(); - // [START datastore_gql_positional_binding_query] - Query query = Query.newGqlQueryBuilder( - ResultType.ENTITY, "select * from Task where completed = @1 and priority = @2") - .addBinding(false) - .addBinding(4) - .build(); - // [END datastore_gql_positional_binding_query] - assertValidQuery(query); - } - - @Test - public void testGqlLiteralQuery() { - setUpQueryTests(); - // [START datastore_gql_literal_query] - Query query = Query.newGqlQueryBuilder( - ResultType.ENTITY, "select * from Task where completed = false and priority = 4") - .setAllowLiteral(true) - .build(); - // [END datastore_gql_literal_query] - assertValidQuery(query); - } } From 3fef4c92f22551ba3cd555710d638843f99153ac Mon Sep 17 00:00:00 2001 From: Hanzhen Yi <33737743+hzyi-google@users.noreply.github.com> Date: Thu, 21 Jun 2018 14:51:15 -0700 Subject: [PATCH 0082/1784] Release 0.53.0 (#3399) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index a65839887035..1a5cb8acf5b9 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.34.0 + 1.35.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.34.0' +compile 'com.google.cloud:google-cloud-datastore:1.35.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.34.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.35.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 5751627dea9f..6fdba8435376 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.34.1-SNAPSHOT + 1.35.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.52.1-alpha-SNAPSHOT + 0.53.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 1dfd980d2ca9..641caba8e9b5 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.17.1-SNAPSHOT + 0.18.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.17.1-SNAPSHOT + 0.18.0 From 88047a089e746d80ff28da1f80425b6d2fdf6884 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi <33737743+hzyi-google@users.noreply.github.com> Date: Fri, 22 Jun 2018 10:36:30 -0700 Subject: [PATCH 0083/1784] Bump to next snapshot version (#3401) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6fdba8435376..a5993cd9a324 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.35.0 + 1.35.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.53.0-alpha + 0.53.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 641caba8e9b5..9d115e9501df 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.18.0 + 0.18.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.18.0 + 0.18.1-SNAPSHOT From 1a18263146efc2559f125a57cfe55e556edb6752 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Thu, 12 Jul 2018 11:57:22 -0700 Subject: [PATCH 0084/1784] Release 0.54.0 (#3457) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 1a5cb8acf5b9..ecb072ce00ed 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.35.0 + 1.36.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.35.0' +compile 'com.google.cloud:google-cloud-datastore:1.36.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.35.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.36.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a5993cd9a324..9e4176952749 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.35.1-SNAPSHOT + 1.36.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.53.1-alpha-SNAPSHOT + 0.54.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 9d115e9501df..633f9dc2e56e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.18.1-SNAPSHOT + 0.19.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.18.1-SNAPSHOT + 0.19.0 From b7c4d49733202546627c4e364e623404c0a8e30f Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Thu, 12 Jul 2018 12:47:20 -0700 Subject: [PATCH 0085/1784] Bumping to snapshot versions (#3463) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9e4176952749..416ab0b4573e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.36.0 + 1.36.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.54.0-alpha + 0.54.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 633f9dc2e56e..1da39af03ca3 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.19.0 + 0.19.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.19.0 + 0.19.1-SNAPSHOT From c4225bdc2101304c4d6ccdfdfc0432e322132d03 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Thu, 19 Jul 2018 18:22:07 -0700 Subject: [PATCH 0086/1784] Release 0.55.0 (#3485) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index ecb072ce00ed..dd23d29286ca 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.36.0 + 1.37.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.36.0' +compile 'com.google.cloud:google-cloud-datastore:1.37.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.36.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.37.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 416ab0b4573e..9eb78b2a3432 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.36.1-SNAPSHOT + 1.37.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.54.1-alpha-SNAPSHOT + 0.55.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 1da39af03ca3..ebd94fb8f81d 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.19.1-SNAPSHOT + 0.20.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.19.1-SNAPSHOT + 0.20.0 From 6759956e3c4f439180e029db33e39fd45828e078 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 20 Jul 2018 11:26:20 -0700 Subject: [PATCH 0087/1784] bump version for development (#3486) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9eb78b2a3432..6bed9f0f9403 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.37.0 + 1.37.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.55.0-alpha + 0.55.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ebd94fb8f81d..f3d357e264cd 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.20.0 + 0.20.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.20.0 + 0.20.1-SNAPSHOT From f9bc12170e0309a64093fdce4db3342f1ff54926 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 20 Jul 2018 12:23:34 -0700 Subject: [PATCH 0088/1784] Release 0.55.1 (#3489) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index dd23d29286ca..6bdb68f6fd3f 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.37.0 + 1.37.1 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.37.0' +compile 'com.google.cloud:google-cloud-datastore:1.37.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.37.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.37.1" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6bed9f0f9403..a4b7ec7e7446 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.37.1-SNAPSHOT + 1.37.1 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.55.1-alpha-SNAPSHOT + 0.55.1-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index f3d357e264cd..5217b86d375a 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.20.1-SNAPSHOT + 0.20.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.20.1-SNAPSHOT + 0.20.1 From a5399cc42e414e28b9011d85c40f4442bf4026e3 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 20 Jul 2018 13:32:48 -0700 Subject: [PATCH 0089/1784] bump version for development (#3490) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a4b7ec7e7446..f2eb038c65f8 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.37.1 + 1.37.2-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.55.1-alpha + 0.55.2-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 5217b86d375a..10eb6c7d9f55 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.20.1 + 0.20.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.20.1 + 0.20.2-SNAPSHOT From a7dda8cc15f8a22c7d211d0b79bb44812d4d28d6 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi <33737743+hzyi-google@users.noreply.github.com> Date: Tue, 24 Jul 2018 11:21:16 -0700 Subject: [PATCH 0090/1784] Fix pom urls (#3499) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index f2eb038c65f8..8c1918c3f8e0 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -5,7 +5,7 @@ 1.37.2-SNAPSHOT jar Google Cloud Datastore - https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore + https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore Java idiomatic client for Google Cloud Datastore. From 3b55bd659331153c8e5eb33df901ceaf20f41c1d Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Wed, 25 Jul 2018 10:47:31 -0700 Subject: [PATCH 0091/1784] Regenerating with protoc 3.6.0 (#3506) --- .../datastore/v1/AllocateIdsRequest.java | 39 ++++++-- .../datastore/v1/AllocateIdsResponse.java | 39 ++++++-- .../com/google/datastore/v1/ArrayValue.java | 39 ++++++-- .../datastore/v1/BeginTransactionRequest.java | 39 ++++++-- .../v1/BeginTransactionResponse.java | 35 ++++++- .../google/datastore/v1/CommitRequest.java | 41 ++++++-- .../google/datastore/v1/CommitResponse.java | 39 ++++++-- .../google/datastore/v1/CompositeFilter.java | 41 ++++++-- .../java/com/google/datastore/v1/Entity.java | 40 ++++++-- .../com/google/datastore/v1/EntityResult.java | 39 ++++++-- .../java/com/google/datastore/v1/Filter.java | 39 ++++++-- .../com/google/datastore/v1/GqlQuery.java | 40 ++++++-- .../datastore/v1/GqlQueryParameter.java | 39 ++++++-- .../java/com/google/datastore/v1/Key.java | 78 ++++++++++++--- .../google/datastore/v1/KindExpression.java | 37 +++++-- .../google/datastore/v1/LookupRequest.java | 39 ++++++-- .../google/datastore/v1/LookupResponse.java | 39 ++++++-- .../com/google/datastore/v1/Mutation.java | 39 ++++++-- .../google/datastore/v1/MutationResult.java | 39 ++++++-- .../com/google/datastore/v1/PartitionId.java | 39 ++++++-- .../com/google/datastore/v1/Projection.java | 39 ++++++-- .../google/datastore/v1/PropertyFilter.java | 41 ++++++-- .../google/datastore/v1/PropertyOrder.java | 41 ++++++-- .../datastore/v1/PropertyReference.java | 37 +++++-- .../java/com/google/datastore/v1/Query.java | 39 ++++++-- .../google/datastore/v1/QueryResultBatch.java | 43 ++++++-- .../com/google/datastore/v1/ReadOptions.java | 41 ++++++-- .../datastore/v1/ReserveIdsRequest.java | 39 ++++++-- .../datastore/v1/ReserveIdsResponse.java | 25 +++++ .../google/datastore/v1/RollbackRequest.java | 39 ++++++-- .../google/datastore/v1/RollbackResponse.java | 25 +++++ .../google/datastore/v1/RunQueryRequest.java | 39 ++++++-- .../google/datastore/v1/RunQueryResponse.java | 39 ++++++-- .../datastore/v1/TransactionOptions.java | 99 ++++++++++++++++--- .../java/com/google/datastore/v1/Value.java | 41 ++++++-- 35 files changed, 1207 insertions(+), 239 deletions(-) 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 400846c83530..9eb469011ac9 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 @@ -48,13 +48,6 @@ private AllocateIdsRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { keys_ = new java.util.ArrayList(); @@ -70,6 +63,13 @@ private AllocateIdsRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,6 +90,7 @@ private AllocateIdsRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable @@ -201,6 +202,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -210,6 +212,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -221,6 +224,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -345,6 +349,7 @@ public static com.google.datastore.v1.AllocateIdsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -352,6 +357,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.AllocateIdsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -379,6 +385,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable @@ -402,6 +409,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -415,15 +423,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { return com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest build() { com.google.datastore.v1.AllocateIdsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -432,6 +443,7 @@ public com.google.datastore.v1.AllocateIdsRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest buildPartial() { com.google.datastore.v1.AllocateIdsRequest result = new com.google.datastore.v1.AllocateIdsRequest(this); int from_bitField0_ = bitField0_; @@ -451,32 +463,39 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.AllocateIdsRequest) { return mergeFrom((com.google.datastore.v1.AllocateIdsRequest)other); @@ -523,10 +542,12 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -964,11 +985,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -990,6 +1013,7 @@ public static com.google.datastore.v1.AllocateIdsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public AllocateIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1007,6 +1031,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ee62ee5fec98..c6e30f9ce017 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 @@ -47,13 +47,6 @@ private AllocateIdsResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { keys_ = new java.util.ArrayList(); @@ -63,6 +56,13 @@ private AllocateIdsResponse( input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,6 +83,7 @@ private AllocateIdsResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable @@ -151,6 +152,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -160,6 +162,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -168,6 +171,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -285,6 +289,7 @@ public static com.google.datastore.v1.AllocateIdsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -292,6 +297,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.AllocateIdsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -319,6 +325,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable @@ -342,6 +349,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (keysBuilder_ == null) { @@ -353,15 +361,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { return com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse build() { com.google.datastore.v1.AllocateIdsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -370,6 +381,7 @@ public com.google.datastore.v1.AllocateIdsResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse buildPartial() { com.google.datastore.v1.AllocateIdsResponse result = new com.google.datastore.v1.AllocateIdsResponse(this); int from_bitField0_ = bitField0_; @@ -386,32 +398,39 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.AllocateIdsResponse) { return mergeFrom((com.google.datastore.v1.AllocateIdsResponse)other); @@ -454,10 +473,12 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -806,11 +827,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -832,6 +855,7 @@ public static com.google.datastore.v1.AllocateIdsResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public AllocateIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -849,6 +873,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 fe6b290e9322..d2cdbd53a35a 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,13 +47,6 @@ private ArrayValue( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { values_ = new java.util.ArrayList(); @@ -63,6 +56,13 @@ private ArrayValue( input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,6 +83,7 @@ private ArrayValue( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable @@ -156,6 +157,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -165,6 +167,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < values_.size(); i++) { @@ -173,6 +176,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -290,6 +294,7 @@ public static com.google.datastore.v1.ArrayValue parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -297,6 +302,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ArrayValue prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -324,6 +330,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable @@ -347,6 +354,7 @@ private void maybeForceBuilderInitialization() { getValuesFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (valuesBuilder_ == null) { @@ -358,15 +366,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } + @java.lang.Override public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ArrayValue build() { com.google.datastore.v1.ArrayValue result = buildPartial(); if (!result.isInitialized()) { @@ -375,6 +386,7 @@ public com.google.datastore.v1.ArrayValue build() { return result; } + @java.lang.Override public com.google.datastore.v1.ArrayValue buildPartial() { com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this); int from_bitField0_ = bitField0_; @@ -391,32 +403,39 @@ public com.google.datastore.v1.ArrayValue buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ArrayValue) { return mergeFrom((com.google.datastore.v1.ArrayValue)other); @@ -459,10 +478,12 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -829,11 +850,13 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder( } return valuesBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -855,6 +878,7 @@ public static com.google.datastore.v1.ArrayValue getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ArrayValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -872,6 +896,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 2fdd90689108..ec9154096522 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 @@ -47,13 +47,6 @@ private BeginTransactionRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 66: { java.lang.String s = input.readStringRequireUtf8(); @@ -73,6 +66,13 @@ private BeginTransactionRequest( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,6 +90,7 @@ private BeginTransactionRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable @@ -173,6 +174,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -182,6 +184,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getProjectIdBytes().isEmpty()) { @@ -193,6 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -320,6 +324,7 @@ public static com.google.datastore.v1.BeginTransactionRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -327,6 +332,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.BeginTransactionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -354,6 +360,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable @@ -376,6 +383,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -389,15 +397,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { return com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest build() { com.google.datastore.v1.BeginTransactionRequest result = buildPartial(); if (!result.isInitialized()) { @@ -406,6 +417,7 @@ public com.google.datastore.v1.BeginTransactionRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest buildPartial() { com.google.datastore.v1.BeginTransactionRequest result = new com.google.datastore.v1.BeginTransactionRequest(this); result.projectId_ = projectId_; @@ -418,32 +430,39 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.BeginTransactionRequest) { return mergeFrom((com.google.datastore.v1.BeginTransactionRequest)other); @@ -467,10 +486,12 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other) return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -730,11 +751,13 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions } return transactionOptionsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -756,6 +779,7 @@ public static com.google.datastore.v1.BeginTransactionRequest getDefaultInstance private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public BeginTransactionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -773,6 +797,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 0bb48d6a6899..4d4c0b69ee91 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 @@ -47,6 +47,11 @@ private BeginTransactionResponse( case 0: done = true; break; + case 10: { + + transaction_ = input.readBytes(); + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -54,11 +59,6 @@ private BeginTransactionResponse( } break; } - case 10: { - - transaction_ = input.readBytes(); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -76,6 +76,7 @@ private BeginTransactionResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable @@ -97,6 +98,7 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -106,6 +108,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!transaction_.isEmpty()) { @@ -114,6 +117,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -229,6 +233,7 @@ public static com.google.datastore.v1.BeginTransactionResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -236,6 +241,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.BeginTransactionResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -263,6 +269,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable @@ -285,6 +292,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); transaction_ = com.google.protobuf.ByteString.EMPTY; @@ -292,15 +300,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { return com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse build() { com.google.datastore.v1.BeginTransactionResponse result = buildPartial(); if (!result.isInitialized()) { @@ -309,6 +320,7 @@ public com.google.datastore.v1.BeginTransactionResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse buildPartial() { com.google.datastore.v1.BeginTransactionResponse result = new com.google.datastore.v1.BeginTransactionResponse(this); result.transaction_ = transaction_; @@ -316,32 +328,39 @@ public com.google.datastore.v1.BeginTransactionResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.BeginTransactionResponse) { return mergeFrom((com.google.datastore.v1.BeginTransactionResponse)other); @@ -361,10 +380,12 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other) return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -423,11 +444,13 @@ public Builder clearTransaction() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -449,6 +472,7 @@ public static com.google.datastore.v1.BeginTransactionResponse getDefaultInstanc private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public BeginTransactionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -466,6 +490,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ffae15d56af6..258082f5b6c9 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 @@ -49,13 +49,6 @@ private CommitRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { transactionSelectorCase_ = 1; transactionSelector_ = input.readBytes(); @@ -82,6 +75,13 @@ private CommitRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -102,6 +102,7 @@ private CommitRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable @@ -345,6 +346,7 @@ public int getModeValue() { * .google.datastore.v1.CommitRequest.Mode mode = 5; */ public com.google.datastore.v1.CommitRequest.Mode getMode() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; } @@ -467,6 +469,7 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -476,6 +479,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (transactionSelectorCase_ == 1) { @@ -494,6 +498,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -649,6 +654,7 @@ public static com.google.datastore.v1.CommitRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -656,6 +662,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CommitRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -683,6 +690,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable @@ -706,6 +714,7 @@ private void maybeForceBuilderInitialization() { getMutationsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -723,15 +732,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { return com.google.datastore.v1.CommitRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.CommitRequest build() { com.google.datastore.v1.CommitRequest result = buildPartial(); if (!result.isInitialized()) { @@ -740,6 +752,7 @@ public com.google.datastore.v1.CommitRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.CommitRequest buildPartial() { com.google.datastore.v1.CommitRequest result = new com.google.datastore.v1.CommitRequest(this); int from_bitField0_ = bitField0_; @@ -764,32 +777,39 @@ public com.google.datastore.v1.CommitRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CommitRequest) { return mergeFrom((com.google.datastore.v1.CommitRequest)other); @@ -848,10 +868,12 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1006,6 +1028,7 @@ public Builder setModeValue(int value) { * .google.datastore.v1.CommitRequest.Mode mode = 5; */ public com.google.datastore.v1.CommitRequest.Mode getMode() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; } @@ -1563,11 +1586,13 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder( } return mutationsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1589,6 +1614,7 @@ public static com.google.datastore.v1.CommitRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public CommitRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1606,6 +1632,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 05ae3dda3d70..4ddc383d87f7 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 @@ -48,13 +48,6 @@ private CommitResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 26: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { mutationResults_ = new java.util.ArrayList(); @@ -69,6 +62,13 @@ private CommitResponse( indexUpdates_ = input.readInt32(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -89,6 +89,7 @@ private CommitResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable @@ -172,6 +173,7 @@ public int getIndexUpdates() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -181,6 +183,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < mutationResults_.size(); i++) { @@ -192,6 +195,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -317,6 +321,7 @@ public static com.google.datastore.v1.CommitResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -324,6 +329,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CommitResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -351,6 +357,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable @@ -374,6 +381,7 @@ private void maybeForceBuilderInitialization() { getMutationResultsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (mutationResultsBuilder_ == null) { @@ -387,15 +395,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { return com.google.datastore.v1.CommitResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.CommitResponse build() { com.google.datastore.v1.CommitResponse result = buildPartial(); if (!result.isInitialized()) { @@ -404,6 +415,7 @@ public com.google.datastore.v1.CommitResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.CommitResponse buildPartial() { com.google.datastore.v1.CommitResponse result = new com.google.datastore.v1.CommitResponse(this); int from_bitField0_ = bitField0_; @@ -423,32 +435,39 @@ public com.google.datastore.v1.CommitResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CommitResponse) { return mergeFrom((com.google.datastore.v1.CommitResponse)other); @@ -494,10 +513,12 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -887,11 +908,13 @@ public Builder clearIndexUpdates() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -913,6 +936,7 @@ public static com.google.datastore.v1.CommitResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public CommitResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -930,6 +954,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 acb487899c4d..6b1bd91e109f 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,13 +48,6 @@ private CompositeFilter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); @@ -70,6 +63,13 @@ private CompositeFilter( input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,6 +90,7 @@ private CompositeFilter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable @@ -236,6 +237,7 @@ public int getOpValue() { * .google.datastore.v1.CompositeFilter.Operator op = 1; */ public com.google.datastore.v1.CompositeFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; } @@ -301,6 +303,7 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -310,6 +313,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) { @@ -321,6 +325,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -445,6 +450,7 @@ public static com.google.datastore.v1.CompositeFilter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -452,6 +458,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CompositeFilter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -479,6 +486,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable @@ -502,6 +510,7 @@ private void maybeForceBuilderInitialization() { getFiltersFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); op_ = 0; @@ -515,15 +524,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } + @java.lang.Override public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.CompositeFilter build() { com.google.datastore.v1.CompositeFilter result = buildPartial(); if (!result.isInitialized()) { @@ -532,6 +544,7 @@ public com.google.datastore.v1.CompositeFilter build() { return result; } + @java.lang.Override public com.google.datastore.v1.CompositeFilter buildPartial() { com.google.datastore.v1.CompositeFilter result = new com.google.datastore.v1.CompositeFilter(this); int from_bitField0_ = bitField0_; @@ -551,32 +564,39 @@ public com.google.datastore.v1.CompositeFilter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CompositeFilter) { return mergeFrom((com.google.datastore.v1.CompositeFilter)other); @@ -622,10 +642,12 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -676,6 +698,7 @@ public Builder setOpValue(int value) { * .google.datastore.v1.CompositeFilter.Operator op = 1; */ public com.google.datastore.v1.CompositeFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; } @@ -1038,11 +1061,13 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder( } return filtersBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1064,6 +1089,7 @@ public static com.google.datastore.v1.CompositeFilter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public CompositeFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1081,6 +1107,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java index b2857ea4d2c7..20f337719aa8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java @@ -49,13 +49,6 @@ private Entity( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.Key.Builder subBuilder = null; if (key_ != null) { @@ -82,6 +75,13 @@ private Entity( properties__.getKey(), properties__.getValue()); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -100,6 +100,7 @@ private Entity( } @SuppressWarnings({"rawtypes"}) + @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -110,6 +111,7 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable @@ -276,6 +278,7 @@ public com.google.datastore.v1.Value getPropertiesOrThrow( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -285,6 +288,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (key_ != null) { @@ -299,6 +303,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -435,6 +440,7 @@ public static com.google.datastore.v1.Entity parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -442,6 +448,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Entity prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -494,6 +501,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable @@ -516,6 +524,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (keyBuilder_ == null) { @@ -528,15 +537,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor; } + @java.lang.Override public com.google.datastore.v1.Entity getDefaultInstanceForType() { return com.google.datastore.v1.Entity.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Entity build() { com.google.datastore.v1.Entity result = buildPartial(); if (!result.isInitialized()) { @@ -545,6 +557,7 @@ public com.google.datastore.v1.Entity build() { return result; } + @java.lang.Override public com.google.datastore.v1.Entity buildPartial() { com.google.datastore.v1.Entity result = new com.google.datastore.v1.Entity(this); int from_bitField0_ = bitField0_; @@ -561,32 +574,39 @@ public com.google.datastore.v1.Entity buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Entity) { return mergeFrom((com.google.datastore.v1.Entity)other); @@ -608,10 +628,12 @@ public Builder mergeFrom(com.google.datastore.v1.Entity other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1005,11 +1027,13 @@ public Builder putAllProperties( .putAll(values); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1031,6 +1055,7 @@ public static com.google.datastore.v1.Entity getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Entity parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1048,6 +1073,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Entity getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ed6f79d511c1..64a5131410b6 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 @@ -48,13 +48,6 @@ private EntityResult( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.Entity.Builder subBuilder = null; if (entity_ != null) { @@ -78,6 +71,13 @@ private EntityResult( version_ = input.readInt64(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -95,6 +95,7 @@ private EntityResult( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable @@ -325,6 +326,7 @@ public com.google.protobuf.ByteString getCursor() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -334,6 +336,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (entity_ != null) { @@ -348,6 +351,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -485,6 +489,7 @@ public static com.google.datastore.v1.EntityResult parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -492,6 +497,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.EntityResult prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -519,6 +525,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable @@ -541,6 +548,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (entityBuilder_ == null) { @@ -556,15 +564,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor; } + @java.lang.Override public com.google.datastore.v1.EntityResult getDefaultInstanceForType() { return com.google.datastore.v1.EntityResult.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.EntityResult build() { com.google.datastore.v1.EntityResult result = buildPartial(); if (!result.isInitialized()) { @@ -573,6 +584,7 @@ public com.google.datastore.v1.EntityResult build() { return result; } + @java.lang.Override public com.google.datastore.v1.EntityResult buildPartial() { com.google.datastore.v1.EntityResult result = new com.google.datastore.v1.EntityResult(this); if (entityBuilder_ == null) { @@ -586,32 +598,39 @@ public com.google.datastore.v1.EntityResult buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.EntityResult) { return mergeFrom((com.google.datastore.v1.EntityResult)other); @@ -637,10 +656,12 @@ public Builder mergeFrom(com.google.datastore.v1.EntityResult other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -911,11 +932,13 @@ public Builder clearCursor() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -937,6 +960,7 @@ public static com.google.datastore.v1.EntityResult getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public EntityResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -954,6 +978,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.EntityResult getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 c4b2cf762023..f6524f2efc3f 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 @@ -46,13 +46,6 @@ private Filter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.CompositeFilter.Builder subBuilder = null; if (filterTypeCase_ == 1) { @@ -81,6 +74,13 @@ private Filter( filterTypeCase_ = 2; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -98,6 +98,7 @@ private Filter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable @@ -220,6 +221,7 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -229,6 +231,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (filterTypeCase_ == 1) { @@ -240,6 +243,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -382,6 +386,7 @@ public static com.google.datastore.v1.Filter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -389,6 +394,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Filter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -416,6 +422,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable @@ -438,6 +445,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); filterTypeCase_ = 0; @@ -445,15 +453,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } + @java.lang.Override public com.google.datastore.v1.Filter getDefaultInstanceForType() { return com.google.datastore.v1.Filter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Filter build() { com.google.datastore.v1.Filter result = buildPartial(); if (!result.isInitialized()) { @@ -462,6 +473,7 @@ public com.google.datastore.v1.Filter build() { return result; } + @java.lang.Override public com.google.datastore.v1.Filter buildPartial() { com.google.datastore.v1.Filter result = new com.google.datastore.v1.Filter(this); if (filterTypeCase_ == 1) { @@ -483,32 +495,39 @@ public com.google.datastore.v1.Filter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Filter) { return mergeFrom((com.google.datastore.v1.Filter)other); @@ -538,10 +557,12 @@ public Builder mergeFrom(com.google.datastore.v1.Filter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -918,11 +939,13 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde onChanged();; return propertyFilterBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -944,6 +967,7 @@ public static com.google.datastore.v1.Filter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Filter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -961,6 +985,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Filter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 7a0060dbb08a..aa0971431bb0 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,13 +49,6 @@ private GqlQuery( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -89,6 +82,13 @@ private GqlQuery( namedBindings__.getKey(), namedBindings__.getValue()); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -110,6 +110,7 @@ private GqlQuery( } @SuppressWarnings({"rawtypes"}) + @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -120,6 +121,7 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable @@ -363,6 +365,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -372,6 +375,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getQueryStringBytes().isEmpty()) { @@ -392,6 +396,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -541,6 +546,7 @@ public static com.google.datastore.v1.GqlQuery parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -548,6 +554,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.GqlQuery prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -597,6 +604,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable @@ -620,6 +628,7 @@ private void maybeForceBuilderInitialization() { getPositionalBindingsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); queryString_ = ""; @@ -636,15 +645,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor; } + @java.lang.Override public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.GqlQuery build() { com.google.datastore.v1.GqlQuery result = buildPartial(); if (!result.isInitialized()) { @@ -653,6 +665,7 @@ public com.google.datastore.v1.GqlQuery build() { return result; } + @java.lang.Override public com.google.datastore.v1.GqlQuery buildPartial() { com.google.datastore.v1.GqlQuery result = new com.google.datastore.v1.GqlQuery(this); int from_bitField0_ = bitField0_; @@ -675,32 +688,39 @@ public com.google.datastore.v1.GqlQuery buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.GqlQuery) { return mergeFrom((com.google.datastore.v1.GqlQuery)other); @@ -752,10 +772,12 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1453,11 +1475,13 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu } return positionalBindingsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1479,6 +1503,7 @@ public static com.google.datastore.v1.GqlQuery getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public GqlQuery parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1496,6 +1521,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 d0a1c0edc8e7..89d6e7f8728d 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 @@ -46,13 +46,6 @@ private GqlQueryParameter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 18: { com.google.datastore.v1.Value.Builder subBuilder = null; if (parameterTypeCase_ == 2) { @@ -72,6 +65,13 @@ private GqlQueryParameter( parameterType_ = input.readBytes(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -89,6 +89,7 @@ private GqlQueryParameter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable @@ -189,6 +190,7 @@ public com.google.protobuf.ByteString getCursor() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -198,6 +200,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (parameterTypeCase_ == 2) { @@ -210,6 +213,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -353,6 +357,7 @@ public static com.google.datastore.v1.GqlQueryParameter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -360,6 +365,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.GqlQueryParameter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -387,6 +393,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable @@ -409,6 +416,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); parameterTypeCase_ = 0; @@ -416,15 +424,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { return com.google.datastore.v1.GqlQueryParameter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter build() { com.google.datastore.v1.GqlQueryParameter result = buildPartial(); if (!result.isInitialized()) { @@ -433,6 +444,7 @@ public com.google.datastore.v1.GqlQueryParameter build() { return result; } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter buildPartial() { com.google.datastore.v1.GqlQueryParameter result = new com.google.datastore.v1.GqlQueryParameter(this); if (parameterTypeCase_ == 2) { @@ -450,32 +462,39 @@ public com.google.datastore.v1.GqlQueryParameter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.GqlQueryParameter) { return mergeFrom((com.google.datastore.v1.GqlQueryParameter)other); @@ -505,10 +524,12 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -761,11 +782,13 @@ public Builder clearCursor() { } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -787,6 +810,7 @@ public static com.google.datastore.v1.GqlQueryParameter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public GqlQueryParameter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -804,6 +828,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 337e4b440353..4aa66ebd8577 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,13 +50,6 @@ private Key( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PartitionId.Builder subBuilder = null; if (partitionId_ != null) { @@ -79,6 +72,13 @@ private Key( input.readMessage(com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -99,6 +99,7 @@ private Key( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable @@ -217,13 +218,6 @@ private PathElement( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -241,6 +235,13 @@ private PathElement( idType_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -258,6 +259,7 @@ private PathElement( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable @@ -426,6 +428,7 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -435,6 +438,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getKindBytes().isEmpty()) { @@ -450,6 +454,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -600,6 +605,7 @@ public static com.google.datastore.v1.Key.PathElement parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -607,6 +613,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Key.PathElement prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -636,6 +643,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable @@ -658,6 +666,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); kind_ = ""; @@ -667,15 +676,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } + @java.lang.Override public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { return com.google.datastore.v1.Key.PathElement.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Key.PathElement build() { com.google.datastore.v1.Key.PathElement result = buildPartial(); if (!result.isInitialized()) { @@ -684,6 +696,7 @@ public com.google.datastore.v1.Key.PathElement build() { return result; } + @java.lang.Override public com.google.datastore.v1.Key.PathElement buildPartial() { com.google.datastore.v1.Key.PathElement result = new com.google.datastore.v1.Key.PathElement(this); result.kind_ = kind_; @@ -698,32 +711,39 @@ public com.google.datastore.v1.Key.PathElement buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Key.PathElement) { return mergeFrom((com.google.datastore.v1.Key.PathElement)other); @@ -759,10 +779,12 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1062,11 +1084,13 @@ public Builder setNameBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1088,6 +1112,7 @@ public static com.google.datastore.v1.Key.PathElement getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PathElement parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1105,6 +1130,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1272,6 +1298,7 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1281,6 +1308,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (partitionId_ != null) { @@ -1292,6 +1320,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1422,6 +1451,7 @@ public static com.google.datastore.v1.Key parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1429,6 +1459,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Key prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1459,6 +1490,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable @@ -1482,6 +1514,7 @@ private void maybeForceBuilderInitialization() { getPathFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (partitionIdBuilder_ == null) { @@ -1499,15 +1532,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } + @java.lang.Override public com.google.datastore.v1.Key getDefaultInstanceForType() { return com.google.datastore.v1.Key.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Key build() { com.google.datastore.v1.Key result = buildPartial(); if (!result.isInitialized()) { @@ -1516,6 +1552,7 @@ public com.google.datastore.v1.Key build() { return result; } + @java.lang.Override public com.google.datastore.v1.Key buildPartial() { com.google.datastore.v1.Key result = new com.google.datastore.v1.Key(this); int from_bitField0_ = bitField0_; @@ -1539,32 +1576,39 @@ public com.google.datastore.v1.Key buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Key) { return mergeFrom((com.google.datastore.v1.Key)other); @@ -1610,10 +1654,12 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2349,11 +2395,13 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder( } return pathBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2375,6 +2423,7 @@ public static com.google.datastore.v1.Key getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Key parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2392,6 +2441,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Key getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 db90f1cd4313..1b209dd97bce 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,6 +47,12 @@ private KindExpression( case 0: done = true; break; + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -54,12 +60,6 @@ private KindExpression( } break; } - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,6 +77,7 @@ private KindExpression( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable @@ -127,6 +128,7 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -136,6 +138,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -144,6 +147,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -258,6 +262,7 @@ public static com.google.datastore.v1.KindExpression parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -265,6 +270,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.KindExpression prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -292,6 +298,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable @@ -314,6 +321,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -321,15 +329,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } + @java.lang.Override public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { return com.google.datastore.v1.KindExpression.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.KindExpression build() { com.google.datastore.v1.KindExpression result = buildPartial(); if (!result.isInitialized()) { @@ -338,6 +349,7 @@ public com.google.datastore.v1.KindExpression build() { return result; } + @java.lang.Override public com.google.datastore.v1.KindExpression buildPartial() { com.google.datastore.v1.KindExpression result = new com.google.datastore.v1.KindExpression(this); result.name_ = name_; @@ -345,32 +357,39 @@ public com.google.datastore.v1.KindExpression buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.KindExpression) { return mergeFrom((com.google.datastore.v1.KindExpression)other); @@ -391,10 +410,12 @@ public Builder mergeFrom(com.google.datastore.v1.KindExpression other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -501,11 +522,13 @@ public Builder setNameBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -527,6 +550,7 @@ public static com.google.datastore.v1.KindExpression getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public KindExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -544,6 +568,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 e833a9567497..28bbc80dfa15 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 @@ -48,13 +48,6 @@ private LookupRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.ReadOptions.Builder subBuilder = null; if (readOptions_ != null) { @@ -83,6 +76,13 @@ private LookupRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -103,6 +103,7 @@ private LookupRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable @@ -242,6 +243,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -251,6 +253,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (readOptions_ != null) { @@ -265,6 +268,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -402,6 +406,7 @@ public static com.google.datastore.v1.LookupRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -409,6 +414,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.LookupRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -436,6 +442,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable @@ -459,6 +466,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -478,15 +486,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { return com.google.datastore.v1.LookupRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.LookupRequest build() { com.google.datastore.v1.LookupRequest result = buildPartial(); if (!result.isInitialized()) { @@ -495,6 +506,7 @@ public com.google.datastore.v1.LookupRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.LookupRequest buildPartial() { com.google.datastore.v1.LookupRequest result = new com.google.datastore.v1.LookupRequest(this); int from_bitField0_ = bitField0_; @@ -519,32 +531,39 @@ public com.google.datastore.v1.LookupRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.LookupRequest) { return mergeFrom((com.google.datastore.v1.LookupRequest)other); @@ -594,10 +613,12 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1170,11 +1191,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1196,6 +1219,7 @@ public static com.google.datastore.v1.LookupRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public LookupRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1213,6 +1237,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 be92567863b7..9e60ec806650 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 @@ -49,13 +49,6 @@ private LookupResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { found_ = new java.util.ArrayList(); @@ -83,6 +76,13 @@ private LookupResponse( input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -109,6 +109,7 @@ private LookupResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable @@ -312,6 +313,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -321,6 +323,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < found_.size(); i++) { @@ -335,6 +338,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -472,6 +476,7 @@ public static com.google.datastore.v1.LookupResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -479,6 +484,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.LookupResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -506,6 +512,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable @@ -531,6 +538,7 @@ private void maybeForceBuilderInitialization() { getDeferredFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (foundBuilder_ == null) { @@ -554,15 +562,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { return com.google.datastore.v1.LookupResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.LookupResponse build() { com.google.datastore.v1.LookupResponse result = buildPartial(); if (!result.isInitialized()) { @@ -571,6 +582,7 @@ public com.google.datastore.v1.LookupResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.LookupResponse buildPartial() { com.google.datastore.v1.LookupResponse result = new com.google.datastore.v1.LookupResponse(this); int from_bitField0_ = bitField0_; @@ -605,32 +617,39 @@ public com.google.datastore.v1.LookupResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.LookupResponse) { return mergeFrom((com.google.datastore.v1.LookupResponse)other); @@ -725,10 +744,12 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1791,11 +1812,13 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder( } return deferredBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1817,6 +1840,7 @@ public static com.google.datastore.v1.LookupResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public LookupResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1834,6 +1858,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 db0c72f94cd5..964394faf80c 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 @@ -46,13 +46,6 @@ private Mutation( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 34: { com.google.datastore.v1.Entity.Builder subBuilder = null; if (operationCase_ == 4) { @@ -114,6 +107,13 @@ private Mutation( conflictDetectionStrategy_ = input.readInt64(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -131,6 +131,7 @@ private Mutation( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable @@ -397,6 +398,7 @@ public long getBaseVersion() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -406,6 +408,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (operationCase_ == 4) { @@ -427,6 +430,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -618,6 +622,7 @@ public static com.google.datastore.v1.Mutation parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -625,6 +630,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Mutation prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -652,6 +658,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable @@ -674,6 +681,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); operationCase_ = 0; @@ -683,15 +691,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } + @java.lang.Override public com.google.datastore.v1.Mutation getDefaultInstanceForType() { return com.google.datastore.v1.Mutation.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Mutation build() { com.google.datastore.v1.Mutation result = buildPartial(); if (!result.isInitialized()) { @@ -700,6 +711,7 @@ public com.google.datastore.v1.Mutation build() { return result; } + @java.lang.Override public com.google.datastore.v1.Mutation buildPartial() { com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this); if (operationCase_ == 4) { @@ -739,32 +751,39 @@ public com.google.datastore.v1.Mutation buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Mutation) { return mergeFrom((com.google.datastore.v1.Mutation)other); @@ -811,10 +830,12 @@ public Builder mergeFrom(com.google.datastore.v1.Mutation other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1631,11 +1652,13 @@ public Builder clearBaseVersion() { } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1657,6 +1680,7 @@ public static com.google.datastore.v1.Mutation getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Mutation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1674,6 +1698,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Mutation getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 2fc11b0ab801..3a2fcf2cf9ab 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 @@ -48,13 +48,6 @@ private MutationResult( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 26: { com.google.datastore.v1.Key.Builder subBuilder = null; if (key_ != null) { @@ -78,6 +71,13 @@ private MutationResult( conflictDetected_ = input.readBool(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -95,6 +95,7 @@ private MutationResult( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable @@ -170,6 +171,7 @@ public boolean getConflictDetected() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -179,6 +181,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (key_ != null) { @@ -193,6 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -331,6 +335,7 @@ public static com.google.datastore.v1.MutationResult parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -338,6 +343,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.MutationResult prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -365,6 +371,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable @@ -387,6 +394,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (keyBuilder_ == null) { @@ -402,15 +410,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } + @java.lang.Override public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { return com.google.datastore.v1.MutationResult.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.MutationResult build() { com.google.datastore.v1.MutationResult result = buildPartial(); if (!result.isInitialized()) { @@ -419,6 +430,7 @@ public com.google.datastore.v1.MutationResult build() { return result; } + @java.lang.Override public com.google.datastore.v1.MutationResult buildPartial() { com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this); if (keyBuilder_ == null) { @@ -432,32 +444,39 @@ public com.google.datastore.v1.MutationResult buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.MutationResult) { return mergeFrom((com.google.datastore.v1.MutationResult)other); @@ -483,10 +502,12 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -757,11 +778,13 @@ public Builder clearConflictDetected() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -783,6 +806,7 @@ public static com.google.datastore.v1.MutationResult getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public MutationResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -800,6 +824,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 c78b352e0324..d2865ea2798a 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 @@ -62,13 +62,6 @@ private PartitionId( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 18: { java.lang.String s = input.readStringRequireUtf8(); @@ -81,6 +74,13 @@ private PartitionId( namespaceId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -98,6 +98,7 @@ private PartitionId( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable @@ -190,6 +191,7 @@ public java.lang.String getNamespaceId() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -199,6 +201,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getProjectIdBytes().isEmpty()) { @@ -210,6 +213,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -331,6 +335,7 @@ public static com.google.datastore.v1.PartitionId parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -338,6 +343,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PartitionId prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -379,6 +385,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable @@ -401,6 +408,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -410,15 +418,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } + @java.lang.Override public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { return com.google.datastore.v1.PartitionId.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PartitionId build() { com.google.datastore.v1.PartitionId result = buildPartial(); if (!result.isInitialized()) { @@ -427,6 +438,7 @@ public com.google.datastore.v1.PartitionId build() { return result; } + @java.lang.Override public com.google.datastore.v1.PartitionId buildPartial() { com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this); result.projectId_ = projectId_; @@ -435,32 +447,39 @@ public com.google.datastore.v1.PartitionId buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PartitionId) { return mergeFrom((com.google.datastore.v1.PartitionId)other); @@ -485,10 +504,12 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -684,11 +705,13 @@ public Builder setNamespaceIdBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -710,6 +733,7 @@ public static com.google.datastore.v1.PartitionId getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PartitionId parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -727,6 +751,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 4aa346d4ad29..e606620c8650 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 @@ -46,13 +46,6 @@ private Projection( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -66,6 +59,13 @@ private Projection( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,6 +83,7 @@ private Projection( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable @@ -124,6 +125,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -133,6 +135,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -141,6 +144,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -261,6 +265,7 @@ public static com.google.datastore.v1.Projection parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -268,6 +273,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Projection prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -295,6 +301,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable @@ -317,6 +324,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -328,15 +336,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } + @java.lang.Override public com.google.datastore.v1.Projection getDefaultInstanceForType() { return com.google.datastore.v1.Projection.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Projection build() { com.google.datastore.v1.Projection result = buildPartial(); if (!result.isInitialized()) { @@ -345,6 +356,7 @@ public com.google.datastore.v1.Projection build() { return result; } + @java.lang.Override public com.google.datastore.v1.Projection buildPartial() { com.google.datastore.v1.Projection result = new com.google.datastore.v1.Projection(this); if (propertyBuilder_ == null) { @@ -356,32 +368,39 @@ public com.google.datastore.v1.Projection buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Projection) { return mergeFrom((com.google.datastore.v1.Projection)other); @@ -401,10 +420,12 @@ public Builder mergeFrom(com.google.datastore.v1.Projection other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -575,11 +596,13 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } return propertyBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -601,6 +624,7 @@ public static com.google.datastore.v1.Projection getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Projection parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -618,6 +642,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Projection getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 d78c077e298f..9651ee87e9d1 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,13 +47,6 @@ private PropertyFilter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -86,6 +79,13 @@ private PropertyFilter( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -103,6 +103,7 @@ private PropertyFilter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable @@ -366,6 +367,7 @@ public int getOpValue() { * .google.datastore.v1.PropertyFilter.Operator op = 2; */ public com.google.datastore.v1.PropertyFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; } @@ -404,6 +406,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -413,6 +416,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -427,6 +431,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -567,6 +572,7 @@ public static com.google.datastore.v1.PropertyFilter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -574,6 +580,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyFilter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -601,6 +608,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable @@ -623,6 +631,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -642,15 +651,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } + @java.lang.Override public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PropertyFilter build() { com.google.datastore.v1.PropertyFilter result = buildPartial(); if (!result.isInitialized()) { @@ -659,6 +671,7 @@ public com.google.datastore.v1.PropertyFilter build() { return result; } + @java.lang.Override public com.google.datastore.v1.PropertyFilter buildPartial() { com.google.datastore.v1.PropertyFilter result = new com.google.datastore.v1.PropertyFilter(this); if (propertyBuilder_ == null) { @@ -676,32 +689,39 @@ public com.google.datastore.v1.PropertyFilter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyFilter) { return mergeFrom((com.google.datastore.v1.PropertyFilter)other); @@ -727,10 +747,12 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyFilter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -933,6 +955,7 @@ public Builder setOpValue(int value) { * .google.datastore.v1.PropertyFilter.Operator op = 2; */ public com.google.datastore.v1.PropertyFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; } @@ -1118,11 +1141,13 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { } return valueBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1144,6 +1169,7 @@ public static com.google.datastore.v1.PropertyFilter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PropertyFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1161,6 +1187,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 06b738e0ff48..f13b15baedbe 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,13 +47,6 @@ private PropertyOrder( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -73,6 +66,13 @@ private PropertyOrder( direction_ = rawValue; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,6 +90,7 @@ private PropertyOrder( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable @@ -285,11 +286,13 @@ public int getDirectionValue() { * .google.datastore.v1.PropertyOrder.Direction direction = 2; */ public com.google.datastore.v1.PropertyOrder.Direction getDirection() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -299,6 +302,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -310,6 +314,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -437,6 +442,7 @@ public static com.google.datastore.v1.PropertyOrder parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -444,6 +450,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyOrder prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -471,6 +478,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable @@ -493,6 +501,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -506,15 +515,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } + @java.lang.Override public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { return com.google.datastore.v1.PropertyOrder.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PropertyOrder build() { com.google.datastore.v1.PropertyOrder result = buildPartial(); if (!result.isInitialized()) { @@ -523,6 +535,7 @@ public com.google.datastore.v1.PropertyOrder build() { return result; } + @java.lang.Override public com.google.datastore.v1.PropertyOrder buildPartial() { com.google.datastore.v1.PropertyOrder result = new com.google.datastore.v1.PropertyOrder(this); if (propertyBuilder_ == null) { @@ -535,32 +548,39 @@ public com.google.datastore.v1.PropertyOrder buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyOrder) { return mergeFrom((com.google.datastore.v1.PropertyOrder)other); @@ -583,10 +603,12 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyOrder other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -789,6 +811,7 @@ public Builder setDirectionValue(int value) { * .google.datastore.v1.PropertyOrder.Direction direction = 2; */ public com.google.datastore.v1.PropertyOrder.Direction getDirection() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; } @@ -821,11 +844,13 @@ public Builder clearDirection() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -847,6 +872,7 @@ public static com.google.datastore.v1.PropertyOrder getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PropertyOrder parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -864,6 +890,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 a4c1c4715256..ae6196b33b1e 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,6 +47,12 @@ private PropertyReference( case 0: done = true; break; + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -54,12 +60,6 @@ private PropertyReference( } break; } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,6 +77,7 @@ private PropertyReference( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable @@ -129,6 +130,7 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -138,6 +140,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -146,6 +149,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -260,6 +264,7 @@ public static com.google.datastore.v1.PropertyReference parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -267,6 +272,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyReference prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -294,6 +300,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable @@ -316,6 +323,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -323,15 +331,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } + @java.lang.Override public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { return com.google.datastore.v1.PropertyReference.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PropertyReference build() { com.google.datastore.v1.PropertyReference result = buildPartial(); if (!result.isInitialized()) { @@ -340,6 +351,7 @@ public com.google.datastore.v1.PropertyReference build() { return result; } + @java.lang.Override public com.google.datastore.v1.PropertyReference buildPartial() { com.google.datastore.v1.PropertyReference result = new com.google.datastore.v1.PropertyReference(this); result.name_ = name_; @@ -347,32 +359,39 @@ public com.google.datastore.v1.PropertyReference buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyReference) { return mergeFrom((com.google.datastore.v1.PropertyReference)other); @@ -393,10 +412,12 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -508,11 +529,13 @@ public Builder setNameBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -534,6 +557,7 @@ public static com.google.datastore.v1.PropertyReference getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PropertyReference parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -551,6 +575,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 7435b5582e57..3e5e2298562a 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 @@ -53,13 +53,6 @@ private Query( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 18: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { projection_ = new java.util.ArrayList(); @@ -137,6 +130,13 @@ private Query( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -166,6 +166,7 @@ private Query( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable @@ -529,6 +530,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -538,6 +540,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < projection_.size(); i++) { @@ -570,6 +573,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -767,6 +771,7 @@ public static com.google.datastore.v1.Query parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -774,6 +779,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Query prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -801,6 +807,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable @@ -827,6 +834,7 @@ private void maybeForceBuilderInitialization() { getDistinctOnFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (projectionBuilder_ == null) { @@ -874,15 +882,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } + @java.lang.Override public com.google.datastore.v1.Query getDefaultInstanceForType() { return com.google.datastore.v1.Query.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Query build() { com.google.datastore.v1.Query result = buildPartial(); if (!result.isInitialized()) { @@ -891,6 +902,7 @@ public com.google.datastore.v1.Query build() { return result; } + @java.lang.Override public com.google.datastore.v1.Query buildPartial() { com.google.datastore.v1.Query result = new com.google.datastore.v1.Query(this); int from_bitField0_ = bitField0_; @@ -949,32 +961,39 @@ public com.google.datastore.v1.Query buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Query) { return mergeFrom((com.google.datastore.v1.Query)other); @@ -1110,10 +1129,12 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2902,11 +2923,13 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { } return limitBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2928,6 +2951,7 @@ public static com.google.datastore.v1.Query getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Query parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2945,6 +2969,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Query getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index cea8e80d4c64..ce62b3d62495 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -53,13 +53,6 @@ private QueryResultBatch( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); @@ -101,6 +94,13 @@ private QueryResultBatch( snapshotVersion_ = input.readInt64(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -121,6 +121,7 @@ private QueryResultBatch( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable @@ -347,6 +348,7 @@ public int getEntityResultTypeValue() { * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; */ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { + @SuppressWarnings("deprecation") com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; } @@ -439,6 +441,7 @@ public int getMoreResultsValue() { * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; */ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { + @SuppressWarnings("deprecation") com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } @@ -464,6 +467,7 @@ public long getSnapshotVersion() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -473,6 +477,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) { @@ -499,6 +504,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -663,6 +669,7 @@ public static com.google.datastore.v1.QueryResultBatch parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -670,6 +677,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.QueryResultBatch prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -697,6 +705,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable @@ -720,6 +729,7 @@ private void maybeForceBuilderInitialization() { getEntityResultsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); skippedResults_ = 0; @@ -743,15 +753,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { return com.google.datastore.v1.QueryResultBatch.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch build() { com.google.datastore.v1.QueryResultBatch result = buildPartial(); if (!result.isInitialized()) { @@ -760,6 +773,7 @@ public com.google.datastore.v1.QueryResultBatch build() { return result; } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch buildPartial() { com.google.datastore.v1.QueryResultBatch result = new com.google.datastore.v1.QueryResultBatch(this); int from_bitField0_ = bitField0_; @@ -784,32 +798,39 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.QueryResultBatch) { return mergeFrom((com.google.datastore.v1.QueryResultBatch)other); @@ -870,10 +891,12 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1006,6 +1029,7 @@ public Builder setEntityResultTypeValue(int value) { * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; */ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { + @SuppressWarnings("deprecation") com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; } @@ -1423,6 +1447,7 @@ public Builder setMoreResultsValue(int value) { * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; */ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { + @SuppressWarnings("deprecation") com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } @@ -1514,11 +1539,13 @@ public Builder clearSnapshotVersion() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1540,6 +1567,7 @@ public static com.google.datastore.v1.QueryResultBatch getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public QueryResultBatch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1557,6 +1585,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index 048ee2dabfaf..636a6d7aa754 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -46,13 +46,6 @@ private ReadOptions( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); consistencyTypeCase_ = 1; @@ -64,6 +57,13 @@ private ReadOptions( consistencyType_ = input.readBytes(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -81,6 +81,7 @@ private ReadOptions( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable @@ -286,6 +287,7 @@ public int getReadConsistencyValue() { */ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { if (consistencyTypeCase_ == 1) { + @SuppressWarnings("deprecation") com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( (java.lang.Integer) consistencyType_); return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; @@ -311,6 +313,7 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -320,6 +323,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (consistencyTypeCase_ == 1) { @@ -332,6 +336,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -475,6 +480,7 @@ public static com.google.datastore.v1.ReadOptions parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -482,6 +488,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReadOptions prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -509,6 +516,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable @@ -531,6 +539,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); consistencyTypeCase_ = 0; @@ -538,15 +547,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } + @java.lang.Override public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { return com.google.datastore.v1.ReadOptions.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ReadOptions build() { com.google.datastore.v1.ReadOptions result = buildPartial(); if (!result.isInitialized()) { @@ -555,6 +567,7 @@ public com.google.datastore.v1.ReadOptions build() { return result; } + @java.lang.Override public com.google.datastore.v1.ReadOptions buildPartial() { com.google.datastore.v1.ReadOptions result = new com.google.datastore.v1.ReadOptions(this); if (consistencyTypeCase_ == 1) { @@ -568,32 +581,39 @@ public com.google.datastore.v1.ReadOptions buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReadOptions) { return mergeFrom((com.google.datastore.v1.ReadOptions)other); @@ -623,10 +643,12 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -698,6 +720,7 @@ public Builder setReadConsistencyValue(int value) { */ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { if (consistencyTypeCase_ == 1) { + @SuppressWarnings("deprecation") com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( (java.lang.Integer) consistencyType_); return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; @@ -788,11 +811,13 @@ public Builder clearTransaction() { } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -814,6 +839,7 @@ public static com.google.datastore.v1.ReadOptions getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReadOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -831,6 +857,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 2ffd5b09e1ac..2ca48d034b44 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 @@ -49,13 +49,6 @@ private ReserveIdsRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { keys_ = new java.util.ArrayList(); @@ -77,6 +70,13 @@ private ReserveIdsRequest( databaseId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -97,6 +97,7 @@ private ReserveIdsRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable @@ -250,6 +251,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -259,6 +261,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -273,6 +276,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -404,6 +408,7 @@ public static com.google.datastore.v1.ReserveIdsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -411,6 +416,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReserveIdsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -438,6 +444,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable @@ -461,6 +468,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -476,15 +484,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { return com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest build() { com.google.datastore.v1.ReserveIdsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -493,6 +504,7 @@ public com.google.datastore.v1.ReserveIdsRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest buildPartial() { com.google.datastore.v1.ReserveIdsRequest result = new com.google.datastore.v1.ReserveIdsRequest(this); int from_bitField0_ = bitField0_; @@ -513,32 +525,39 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReserveIdsRequest) { return mergeFrom((com.google.datastore.v1.ReserveIdsRequest)other); @@ -589,10 +608,12 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1119,11 +1140,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1145,6 +1168,7 @@ public static com.google.datastore.v1.ReserveIdsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReserveIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1162,6 +1186,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 1a905db7ea25..7294241714ea 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 @@ -69,6 +69,7 @@ private ReserveIdsResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable @@ -77,6 +78,7 @@ private ReserveIdsResponse( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -86,11 +88,13 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -198,6 +202,7 @@ public static com.google.datastore.v1.ReserveIdsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -205,6 +210,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReserveIdsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -232,6 +238,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable @@ -254,20 +261,24 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { return com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse build() { com.google.datastore.v1.ReserveIdsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -276,38 +287,46 @@ public com.google.datastore.v1.ReserveIdsResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse buildPartial() { com.google.datastore.v1.ReserveIdsResponse result = new com.google.datastore.v1.ReserveIdsResponse(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReserveIdsResponse) { return mergeFrom((com.google.datastore.v1.ReserveIdsResponse)other); @@ -324,10 +343,12 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -345,11 +366,13 @@ public Builder mergeFrom( } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -371,6 +394,7 @@ public static com.google.datastore.v1.ReserveIdsResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReserveIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -388,6 +412,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 16c714da64b5..8d51f0be2032 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 @@ -48,13 +48,6 @@ private RollbackRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { transaction_ = input.readBytes(); @@ -66,6 +59,13 @@ private RollbackRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,6 +83,7 @@ private RollbackRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable @@ -147,6 +148,7 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -156,6 +158,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!transaction_.isEmpty()) { @@ -167,6 +170,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -289,6 +293,7 @@ public static com.google.datastore.v1.RollbackRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -296,6 +301,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RollbackRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -323,6 +329,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable @@ -345,6 +352,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -354,15 +362,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { return com.google.datastore.v1.RollbackRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RollbackRequest build() { com.google.datastore.v1.RollbackRequest result = buildPartial(); if (!result.isInitialized()) { @@ -371,6 +382,7 @@ public com.google.datastore.v1.RollbackRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.RollbackRequest buildPartial() { com.google.datastore.v1.RollbackRequest result = new com.google.datastore.v1.RollbackRequest(this); result.projectId_ = projectId_; @@ -379,32 +391,39 @@ public com.google.datastore.v1.RollbackRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RollbackRequest) { return mergeFrom((com.google.datastore.v1.RollbackRequest)other); @@ -428,10 +447,12 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -582,11 +603,13 @@ public Builder clearTransaction() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -608,6 +631,7 @@ public static com.google.datastore.v1.RollbackRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RollbackRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -625,6 +649,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 8570e62626f8..0690ba911eb3 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 @@ -70,6 +70,7 @@ private RollbackResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable @@ -78,6 +79,7 @@ private RollbackResponse( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -87,11 +89,13 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -199,6 +203,7 @@ public static com.google.datastore.v1.RollbackResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -206,6 +211,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RollbackResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -234,6 +240,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable @@ -256,20 +263,24 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { return com.google.datastore.v1.RollbackResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RollbackResponse build() { com.google.datastore.v1.RollbackResponse result = buildPartial(); if (!result.isInitialized()) { @@ -278,38 +289,46 @@ public com.google.datastore.v1.RollbackResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.RollbackResponse buildPartial() { com.google.datastore.v1.RollbackResponse result = new com.google.datastore.v1.RollbackResponse(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RollbackResponse) { return mergeFrom((com.google.datastore.v1.RollbackResponse)other); @@ -326,10 +345,12 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -347,11 +368,13 @@ public Builder mergeFrom( } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -373,6 +396,7 @@ public static com.google.datastore.v1.RollbackResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RollbackResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -390,6 +414,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 f06507679d03..ba7e2974b60d 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 @@ -47,13 +47,6 @@ private RunQueryRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.ReadOptions.Builder subBuilder = null; if (readOptions_ != null) { @@ -114,6 +107,13 @@ private RunQueryRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -131,6 +131,7 @@ private RunQueryRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable @@ -370,6 +371,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -379,6 +381,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (readOptions_ != null) { @@ -399,6 +402,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -574,6 +578,7 @@ public static com.google.datastore.v1.RunQueryRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -581,6 +586,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RunQueryRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -608,6 +614,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable @@ -630,6 +637,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -651,15 +659,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { return com.google.datastore.v1.RunQueryRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest build() { com.google.datastore.v1.RunQueryRequest result = buildPartial(); if (!result.isInitialized()) { @@ -668,6 +679,7 @@ public com.google.datastore.v1.RunQueryRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest buildPartial() { com.google.datastore.v1.RunQueryRequest result = new com.google.datastore.v1.RunQueryRequest(this); result.projectId_ = projectId_; @@ -700,32 +712,39 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RunQueryRequest) { return mergeFrom((com.google.datastore.v1.RunQueryRequest)other); @@ -765,10 +784,12 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1567,11 +1588,13 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { onChanged();; return gqlQueryBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1593,6 +1616,7 @@ public static com.google.datastore.v1.RunQueryRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RunQueryRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1610,6 +1634,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 3f7dd2858e68..e61be763e322 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 @@ -46,13 +46,6 @@ private RunQueryResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null; if (batch_ != null) { @@ -79,6 +72,13 @@ private RunQueryResponse( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -96,6 +96,7 @@ private RunQueryResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable @@ -170,6 +171,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -179,6 +181,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (batch_ != null) { @@ -190,6 +193,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -323,6 +327,7 @@ public static com.google.datastore.v1.RunQueryResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -330,6 +335,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RunQueryResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -357,6 +363,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable @@ -379,6 +386,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (batchBuilder_ == null) { @@ -396,15 +404,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { return com.google.datastore.v1.RunQueryResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse build() { com.google.datastore.v1.RunQueryResponse result = buildPartial(); if (!result.isInitialized()) { @@ -413,6 +424,7 @@ public com.google.datastore.v1.RunQueryResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse buildPartial() { com.google.datastore.v1.RunQueryResponse result = new com.google.datastore.v1.RunQueryResponse(this); if (batchBuilder_ == null) { @@ -429,32 +441,39 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RunQueryResponse) { return mergeFrom((com.google.datastore.v1.RunQueryResponse)other); @@ -477,10 +496,12 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -804,11 +825,13 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } return queryBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -830,6 +853,7 @@ public static com.google.datastore.v1.RunQueryResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RunQueryResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -847,6 +871,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 697ff5bae265..2bef782cd392 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 @@ -49,13 +49,6 @@ private TransactionOptions( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null; if (modeCase_ == 1) { @@ -84,6 +77,13 @@ private TransactionOptions( modeCase_ = 2; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -101,6 +101,7 @@ private TransactionOptions( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable @@ -165,6 +166,11 @@ private ReadWrite( case 0: done = true; break; + case 10: { + + previousTransaction_ = input.readBytes(); + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -172,11 +178,6 @@ private ReadWrite( } break; } - case 10: { - - previousTransaction_ = input.readBytes(); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -194,6 +195,7 @@ private ReadWrite( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable @@ -215,6 +217,7 @@ public com.google.protobuf.ByteString getPreviousTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -224,6 +227,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!previousTransaction_.isEmpty()) { @@ -232,6 +236,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -347,6 +352,7 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -354,6 +360,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadWrite prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -381,6 +388,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable @@ -403,6 +411,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); previousTransaction_ = com.google.protobuf.ByteString.EMPTY; @@ -410,15 +419,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite build() { com.google.datastore.v1.TransactionOptions.ReadWrite result = buildPartial(); if (!result.isInitialized()) { @@ -427,6 +439,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite build() { return result; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() { com.google.datastore.v1.TransactionOptions.ReadWrite result = new com.google.datastore.v1.TransactionOptions.ReadWrite(this); result.previousTransaction_ = previousTransaction_; @@ -434,32 +447,39 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions.ReadWrite) { return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite)other); @@ -479,10 +499,12 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite ot return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -541,11 +563,13 @@ public Builder clearPreviousTransaction() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -567,6 +591,7 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultIns private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReadWrite parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -584,6 +609,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -660,6 +686,7 @@ private ReadOnly( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable @@ -668,6 +695,7 @@ private ReadOnly( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -677,11 +705,13 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -789,6 +819,7 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -796,6 +827,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadOnly prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -823,6 +855,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable @@ -845,20 +878,24 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly build() { com.google.datastore.v1.TransactionOptions.ReadOnly result = buildPartial(); if (!result.isInitialized()) { @@ -867,38 +904,46 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() { return result; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() { com.google.datastore.v1.TransactionOptions.ReadOnly result = new com.google.datastore.v1.TransactionOptions.ReadOnly(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions.ReadOnly) { return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly)other); @@ -915,10 +960,12 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly oth return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -936,11 +983,13 @@ public Builder mergeFrom( } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -962,6 +1011,7 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInst private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReadOnly parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -979,6 +1029,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1100,6 +1151,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1109,6 +1161,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (modeCase_ == 1) { @@ -1120,6 +1173,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1262,6 +1316,7 @@ public static com.google.datastore.v1.TransactionOptions parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1269,6 +1324,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1299,6 +1355,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable @@ -1321,6 +1378,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); modeCase_ = 0; @@ -1328,15 +1386,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.TransactionOptions build() { com.google.datastore.v1.TransactionOptions result = buildPartial(); if (!result.isInitialized()) { @@ -1345,6 +1406,7 @@ public com.google.datastore.v1.TransactionOptions build() { return result; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions buildPartial() { com.google.datastore.v1.TransactionOptions result = new com.google.datastore.v1.TransactionOptions(this); if (modeCase_ == 1) { @@ -1366,32 +1428,39 @@ public com.google.datastore.v1.TransactionOptions buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions) { return mergeFrom((com.google.datastore.v1.TransactionOptions)other); @@ -1421,10 +1490,12 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1801,11 +1872,13 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO onChanged();; return readOnlyBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1827,6 +1900,7 @@ public static com.google.datastore.v1.TransactionOptions getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public TransactionOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1844,6 +1918,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 6070573eb5eb..545094844729 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 @@ -49,13 +49,6 @@ private Value( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { valueTypeCase_ = 1; valueType_ = input.readBool(); @@ -168,6 +161,13 @@ private Value( excludeFromIndexes_ = input.readBool(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -185,6 +185,7 @@ private Value( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable @@ -271,6 +272,7 @@ public int getNullValueValue() { */ public com.google.protobuf.NullValue getNullValue() { if (valueTypeCase_ == 11) { + @SuppressWarnings("deprecation") com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( (java.lang.Integer) valueType_); return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; @@ -638,6 +640,7 @@ public boolean getExcludeFromIndexes() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -647,6 +650,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (valueTypeCase_ == 1) { @@ -695,6 +699,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -970,6 +975,7 @@ public static com.google.datastore.v1.Value parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -977,6 +983,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Value prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1005,6 +1012,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable @@ -1027,6 +1035,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); meaning_ = 0; @@ -1038,15 +1047,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } + @java.lang.Override public com.google.datastore.v1.Value getDefaultInstanceForType() { return com.google.datastore.v1.Value.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Value build() { com.google.datastore.v1.Value result = buildPartial(); if (!result.isInitialized()) { @@ -1055,6 +1067,7 @@ public com.google.datastore.v1.Value build() { return result; } + @java.lang.Override public com.google.datastore.v1.Value buildPartial() { com.google.datastore.v1.Value result = new com.google.datastore.v1.Value(this); if (valueTypeCase_ == 11) { @@ -1117,32 +1130,39 @@ public com.google.datastore.v1.Value buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Value) { return mergeFrom((com.google.datastore.v1.Value)other); @@ -1216,10 +1236,12 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1288,6 +1310,7 @@ public Builder setNullValueValue(int value) { */ public com.google.protobuf.NullValue getNullValue() { if (valueTypeCase_ == 11) { + @SuppressWarnings("deprecation") com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( (java.lang.Integer) valueType_); return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; @@ -2626,11 +2649,13 @@ public Builder clearExcludeFromIndexes() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2652,6 +2677,7 @@ public static com.google.datastore.v1.Value getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2669,6 +2695,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Value getDefaultInstanceForType() { return DEFAULT_INSTANCE; } From dbcdc2b4fc06377341019d709f509e0aac8e4ac6 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Wed, 1 Aug 2018 15:23:45 -0700 Subject: [PATCH 0092/1784] Release 0.56.0 (#3521) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 6bdb68f6fd3f..311cd8b9140a 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.37.1 + 1.38.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.37.1' +compile 'com.google.cloud:google-cloud-datastore:1.38.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.37.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.38.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8c1918c3f8e0..4daed1b00f56 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.37.2-SNAPSHOT + 1.38.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.55.2-alpha-SNAPSHOT + 0.56.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 10eb6c7d9f55..19abf7659c43 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.20.2-SNAPSHOT + 0.21.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.20.2-SNAPSHOT + 0.21.0 From f9b8f3c61d94be3df006dfcc1c07c07ba7b8697d Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Wed, 1 Aug 2018 16:26:30 -0700 Subject: [PATCH 0093/1784] Bumping to snapshot versions (#3523) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 4daed1b00f56..a3007984db84 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.38.0 + 1.38.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.56.0-alpha + 0.56.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 19abf7659c43..e18365973b9d 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.21.0 + 0.21.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.21.0 + 0.21.1-SNAPSHOT From 013bad7d05a215d99c31cbc618a89c8690c72bfa Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 9 Aug 2018 16:25:03 -0700 Subject: [PATCH 0094/1784] Bump versions to 1.39.0/0.57.0 (#3548) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 311cd8b9140a..7ce7496429af 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.38.0 + 1.39.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.38.0' +compile 'com.google.cloud:google-cloud-datastore:1.39.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.38.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.39.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a3007984db84..a52a7e72f327 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.38.1-SNAPSHOT + 1.39.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.56.1-alpha-SNAPSHOT + 0.57.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e18365973b9d..37f419c87b61 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.21.1-SNAPSHOT + 0.22.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.21.1-SNAPSHOT + 0.22.0 From 1eb6324949da3b64317a5a41b966d752c91dc532 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Fri, 10 Aug 2018 10:13:44 -0700 Subject: [PATCH 0095/1784] Bump to snapshot (#3553) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a52a7e72f327..807262f479ec 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.39.0 + 1.39.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.57.0-alpha + 0.57.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 37f419c87b61..cc6edecee189 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.22.0 + 0.22.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.22.0 + 0.22.1-SNAPSHOT From 81b107b205d643d3c3d4573f7678094c082b0b59 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Wed, 15 Aug 2018 15:54:35 -0700 Subject: [PATCH 0096/1784] Release 0.58.0 and 1.40.0 (#3565) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 7ce7496429af..1d341d41b3d0 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.39.0 + 1.40.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.39.0' +compile 'com.google.cloud:google-cloud-datastore:1.40.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.39.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.40.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 807262f479ec..b5c877acf7a2 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.39.1-SNAPSHOT + 1.40.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.57.1-alpha-SNAPSHOT + 0.58.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index cc6edecee189..87f9a187dd0d 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.22.1-SNAPSHOT + 0.23.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.22.1-SNAPSHOT + 0.23.0 From 839d4ccc34fc9784277732b0a7248dda4eaeaa9e Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Wed, 15 Aug 2018 17:23:45 -0700 Subject: [PATCH 0097/1784] Bump version to 0.58.1-SNAPSHOT and 1.40.1-SNAPSHOT for development (#3566) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index b5c877acf7a2..515dcad0a9a0 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.40.0 + 1.40.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.58.0-alpha + 0.58.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 87f9a187dd0d..0891673a9285 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.23.0 + 0.23.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.23.0 + 0.23.1-SNAPSHOT From 21e0e2bf8f4736618ab7637dd6868d3cee0bbb31 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Wed, 22 Aug 2018 16:39:03 -0700 Subject: [PATCH 0098/1784] release 0.59.0 (#3598) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 1d341d41b3d0..c5c6470a2337 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.40.0 + 1.41.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.40.0' +compile 'com.google.cloud:google-cloud-datastore:1.41.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.40.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.41.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 515dcad0a9a0..b771fee20d52 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.40.1-SNAPSHOT + 1.41.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.58.1-alpha-SNAPSHOT + 0.59.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0891673a9285..b48e07a6aa9a 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.23.1-SNAPSHOT + 0.24.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.23.1-SNAPSHOT + 0.24.0 From f12d5891f85fdfdb9e974b19537102bfef491a0d Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Thu, 23 Aug 2018 19:32:16 -0700 Subject: [PATCH 0099/1784] bump version for development (#3599) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index b771fee20d52..7b51caa9845b 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.41.0 + 1.41.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.59.0-alpha + 0.59.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index b48e07a6aa9a..0c6aab2fa1c2 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.24.0 + 0.24.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.24.0 + 0.24.1-SNAPSHOT From 90336072e6d3cc02b766e1430f807e8219a829b4 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi <33737743+hzyi-google@users.noreply.github.com> Date: Thu, 30 Aug 2018 15:43:20 -0700 Subject: [PATCH 0100/1784] Release 0.60.0 (#3623) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index c5c6470a2337..07e25bf97e5a 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.41.0 + 1.42.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.41.0' +compile 'com.google.cloud:google-cloud-datastore:1.42.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.41.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.42.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 7b51caa9845b..3a06f0c51a50 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.41.1-SNAPSHOT + 1.42.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.59.1-alpha-SNAPSHOT + 0.60.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0c6aab2fa1c2..2dbd697d1a96 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.24.1-SNAPSHOT + 0.25.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.24.1-SNAPSHOT + 0.25.0 From 60347b81e4c83298aef15767f0d9d0001c4d862a Mon Sep 17 00:00:00 2001 From: Daniel Norberg Date: Thu, 6 Sep 2018 03:06:18 +0900 Subject: [PATCH 0101/1784] make DatastoreBatchWriter public (#3387) It would be useful for `DatastoreBatchWriter` to be public for instrumentation purposes. Its sibling interfaces `DatastoreWriter`, `DatastoreReaderWriter`, `DatastoreReader` etc are all public so I assume that it not being public is not intentional. --- .../java/com/google/cloud/datastore/DatastoreBatchWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java index c713c2bf52ed..f24d39691a41 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java @@ -22,7 +22,7 @@ * An interface to represent a batch of write operations. All write operation for a batch writer * will be applied to the Datastore in one RPC call. */ -interface DatastoreBatchWriter extends DatastoreWriter { +public interface DatastoreBatchWriter extends DatastoreWriter { /** * Datastore add operation. This method will also allocate id for any entity with an incomplete From f9a478d969398160390dda3b154bb48672461708 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 6 Sep 2018 11:21:42 -0700 Subject: [PATCH 0102/1784] Refresh all clients (#3647) --- .../datastore/v1/AllocateIdsRequest.java | 44 ++----- .../datastore/v1/AllocateIdsResponse.java | 44 ++----- .../com/google/datastore/v1/ArrayValue.java | 44 ++----- .../datastore/v1/BeginTransactionRequest.java | 44 ++----- .../v1/BeginTransactionResponse.java | 40 +----- .../google/datastore/v1/CommitRequest.java | 46 ++----- .../google/datastore/v1/CommitResponse.java | 44 ++----- .../google/datastore/v1/CompositeFilter.java | 46 ++----- .../google/datastore/v1/DatastoreProto.java | 18 +-- .../java/com/google/datastore/v1/Entity.java | 45 ++----- .../com/google/datastore/v1/EntityProto.java | 6 +- .../com/google/datastore/v1/EntityResult.java | 44 ++----- .../java/com/google/datastore/v1/Filter.java | 44 ++----- .../com/google/datastore/v1/GqlQuery.java | 45 ++----- .../datastore/v1/GqlQueryParameter.java | 44 ++----- .../java/com/google/datastore/v1/Key.java | 88 +++----------- .../google/datastore/v1/KindExpression.java | 42 ++----- .../google/datastore/v1/LookupRequest.java | 44 ++----- .../google/datastore/v1/LookupResponse.java | 44 ++----- .../com/google/datastore/v1/Mutation.java | 44 ++----- .../google/datastore/v1/MutationResult.java | 44 ++----- .../com/google/datastore/v1/PartitionId.java | 44 ++----- .../com/google/datastore/v1/Projection.java | 44 ++----- .../google/datastore/v1/PropertyFilter.java | 46 ++----- .../google/datastore/v1/PropertyOrder.java | 46 ++----- .../datastore/v1/PropertyReference.java | 42 ++----- .../java/com/google/datastore/v1/Query.java | 44 ++----- .../com/google/datastore/v1/QueryProto.java | 12 +- .../google/datastore/v1/QueryResultBatch.java | 48 ++------ .../com/google/datastore/v1/ReadOptions.java | 46 ++----- .../datastore/v1/ReserveIdsRequest.java | 44 ++----- .../datastore/v1/ReserveIdsResponse.java | 30 +---- .../google/datastore/v1/RollbackRequest.java | 44 ++----- .../google/datastore/v1/RollbackResponse.java | 30 +---- .../google/datastore/v1/RunQueryRequest.java | 44 ++----- .../google/datastore/v1/RunQueryResponse.java | 44 ++----- .../datastore/v1/TransactionOptions.java | 114 +++--------------- .../java/com/google/datastore/v1/Value.java | 46 ++----- 38 files changed, 295 insertions(+), 1377 deletions(-) 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 9eb469011ac9..aebc798e7c23 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 @@ -34,9 +34,6 @@ private AllocateIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -48,6 +45,13 @@ private AllocateIdsRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { keys_ = new java.util.ArrayList(); @@ -63,13 +67,6 @@ private AllocateIdsRequest( projectId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +87,6 @@ private AllocateIdsRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable @@ -202,7 +198,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -212,7 +207,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -224,7 +218,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -349,7 +342,6 @@ public static com.google.datastore.v1.AllocateIdsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -357,7 +349,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.AllocateIdsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -385,7 +376,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable @@ -409,7 +399,6 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -423,18 +412,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } - @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { return com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest build() { com.google.datastore.v1.AllocateIdsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -443,7 +429,6 @@ public com.google.datastore.v1.AllocateIdsRequest build() { return result; } - @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest buildPartial() { com.google.datastore.v1.AllocateIdsRequest result = new com.google.datastore.v1.AllocateIdsRequest(this); int from_bitField0_ = bitField0_; @@ -463,39 +448,32 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.AllocateIdsRequest) { return mergeFrom((com.google.datastore.v1.AllocateIdsRequest)other); @@ -542,12 +520,10 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -985,13 +961,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1013,12 +987,11 @@ public static com.google.datastore.v1.AllocateIdsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public AllocateIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsRequest(input, extensionRegistry); + return new AllocateIdsRequest(input, extensionRegistry); } }; @@ -1031,7 +1004,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 c6e30f9ce017..3844547c3756 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 @@ -33,9 +33,6 @@ private AllocateIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,6 +44,13 @@ private AllocateIdsResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { keys_ = new java.util.ArrayList(); @@ -56,13 +60,6 @@ private AllocateIdsResponse( input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,7 +80,6 @@ private AllocateIdsResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable @@ -152,7 +148,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -162,7 +157,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -289,7 +282,6 @@ public static com.google.datastore.v1.AllocateIdsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -297,7 +289,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.AllocateIdsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -325,7 +316,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable @@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (keysBuilder_ == null) { @@ -361,18 +350,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } - @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { return com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse build() { com.google.datastore.v1.AllocateIdsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -381,7 +367,6 @@ public com.google.datastore.v1.AllocateIdsResponse build() { return result; } - @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse buildPartial() { com.google.datastore.v1.AllocateIdsResponse result = new com.google.datastore.v1.AllocateIdsResponse(this); int from_bitField0_ = bitField0_; @@ -398,39 +383,32 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.AllocateIdsResponse) { return mergeFrom((com.google.datastore.v1.AllocateIdsResponse)other); @@ -473,12 +451,10 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -827,13 +803,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -855,12 +829,11 @@ public static com.google.datastore.v1.AllocateIdsResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public AllocateIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsResponse(input, extensionRegistry); + return new AllocateIdsResponse(input, extensionRegistry); } }; @@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 d2cdbd53a35a..ad0cb62648e6 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 @@ -33,9 +33,6 @@ private ArrayValue( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,6 +44,13 @@ private ArrayValue( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { values_ = new java.util.ArrayList(); @@ -56,13 +60,6 @@ private ArrayValue( input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry)); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,7 +80,6 @@ private ArrayValue( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable @@ -157,7 +153,6 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -167,7 +162,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < values_.size(); i++) { @@ -176,7 +170,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -294,7 +287,6 @@ public static com.google.datastore.v1.ArrayValue parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -302,7 +294,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ArrayValue prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -330,7 +321,6 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable @@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() { getValuesFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (valuesBuilder_ == null) { @@ -366,18 +355,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } - @java.lang.Override public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.ArrayValue build() { com.google.datastore.v1.ArrayValue result = buildPartial(); if (!result.isInitialized()) { @@ -386,7 +372,6 @@ public com.google.datastore.v1.ArrayValue build() { return result; } - @java.lang.Override public com.google.datastore.v1.ArrayValue buildPartial() { com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this); int from_bitField0_ = bitField0_; @@ -403,39 +388,32 @@ public com.google.datastore.v1.ArrayValue buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ArrayValue) { return mergeFrom((com.google.datastore.v1.ArrayValue)other); @@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -850,13 +826,11 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder( } return valuesBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -878,12 +852,11 @@ public static com.google.datastore.v1.ArrayValue getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ArrayValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ArrayValue(input, extensionRegistry); + return new ArrayValue(input, extensionRegistry); } }; @@ -896,7 +869,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ec9154096522..e977c4250e83 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 @@ -33,9 +33,6 @@ private BeginTransactionRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,6 +44,13 @@ private BeginTransactionRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 66: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +70,6 @@ private BeginTransactionRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +87,6 @@ private BeginTransactionRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable @@ -174,7 +170,6 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -184,7 +179,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getProjectIdBytes().isEmpty()) { @@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -324,7 +317,6 @@ public static com.google.datastore.v1.BeginTransactionRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -332,7 +324,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.BeginTransactionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -360,7 +351,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable @@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -397,18 +386,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } - @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { return com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest build() { com.google.datastore.v1.BeginTransactionRequest result = buildPartial(); if (!result.isInitialized()) { @@ -417,7 +403,6 @@ public com.google.datastore.v1.BeginTransactionRequest build() { return result; } - @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest buildPartial() { com.google.datastore.v1.BeginTransactionRequest result = new com.google.datastore.v1.BeginTransactionRequest(this); result.projectId_ = projectId_; @@ -430,39 +415,32 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.BeginTransactionRequest) { return mergeFrom((com.google.datastore.v1.BeginTransactionRequest)other); @@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other) return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -751,13 +727,11 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions } return transactionOptionsBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -779,12 +753,11 @@ public static com.google.datastore.v1.BeginTransactionRequest getDefaultInstance private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public BeginTransactionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionRequest(input, extensionRegistry); + return new BeginTransactionRequest(input, extensionRegistry); } }; @@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 4d4c0b69ee91..a511859f4210 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 @@ -33,9 +33,6 @@ private BeginTransactionResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,11 +44,6 @@ private BeginTransactionResponse( case 0: done = true; break; - case 10: { - - transaction_ = input.readBytes(); - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -59,6 +51,11 @@ private BeginTransactionResponse( } break; } + case 10: { + + transaction_ = input.readBytes(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -76,7 +73,6 @@ private BeginTransactionResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable @@ -98,7 +94,6 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -108,7 +103,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!transaction_.isEmpty()) { @@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -233,7 +226,6 @@ public static com.google.datastore.v1.BeginTransactionResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -241,7 +233,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.BeginTransactionResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -269,7 +260,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable @@ -292,7 +282,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); transaction_ = com.google.protobuf.ByteString.EMPTY; @@ -300,18 +289,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } - @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { return com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse build() { com.google.datastore.v1.BeginTransactionResponse result = buildPartial(); if (!result.isInitialized()) { @@ -320,7 +306,6 @@ public com.google.datastore.v1.BeginTransactionResponse build() { return result; } - @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse buildPartial() { com.google.datastore.v1.BeginTransactionResponse result = new com.google.datastore.v1.BeginTransactionResponse(this); result.transaction_ = transaction_; @@ -328,39 +313,32 @@ public com.google.datastore.v1.BeginTransactionResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.BeginTransactionResponse) { return mergeFrom((com.google.datastore.v1.BeginTransactionResponse)other); @@ -380,12 +358,10 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other) return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -444,13 +420,11 @@ public Builder clearTransaction() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -472,12 +446,11 @@ public static com.google.datastore.v1.BeginTransactionResponse getDefaultInstanc private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public BeginTransactionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionResponse(input, extensionRegistry); + return new BeginTransactionResponse(input, extensionRegistry); } }; @@ -490,7 +463,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 258082f5b6c9..3040ae1e25ab 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 @@ -35,9 +35,6 @@ private CommitRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private CommitRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { transactionSelectorCase_ = 1; transactionSelector_ = input.readBytes(); @@ -75,13 +79,6 @@ private CommitRequest( projectId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -102,7 +99,6 @@ private CommitRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable @@ -346,7 +342,6 @@ public int getModeValue() { * .google.datastore.v1.CommitRequest.Mode mode = 5; */ public com.google.datastore.v1.CommitRequest.Mode getMode() { - @SuppressWarnings("deprecation") com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; } @@ -469,7 +464,6 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -479,7 +473,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (transactionSelectorCase_ == 1) { @@ -498,7 +491,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -654,7 +646,6 @@ public static com.google.datastore.v1.CommitRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -662,7 +653,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CommitRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -690,7 +680,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable @@ -714,7 +703,6 @@ private void maybeForceBuilderInitialization() { getMutationsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -732,18 +720,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } - @java.lang.Override public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { return com.google.datastore.v1.CommitRequest.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.CommitRequest build() { com.google.datastore.v1.CommitRequest result = buildPartial(); if (!result.isInitialized()) { @@ -752,7 +737,6 @@ public com.google.datastore.v1.CommitRequest build() { return result; } - @java.lang.Override public com.google.datastore.v1.CommitRequest buildPartial() { com.google.datastore.v1.CommitRequest result = new com.google.datastore.v1.CommitRequest(this); int from_bitField0_ = bitField0_; @@ -777,39 +761,32 @@ public com.google.datastore.v1.CommitRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CommitRequest) { return mergeFrom((com.google.datastore.v1.CommitRequest)other); @@ -868,12 +845,10 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1028,7 +1003,6 @@ public Builder setModeValue(int value) { * .google.datastore.v1.CommitRequest.Mode mode = 5; */ public com.google.datastore.v1.CommitRequest.Mode getMode() { - @SuppressWarnings("deprecation") com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; } @@ -1586,13 +1560,11 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder( } return mutationsBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1614,12 +1586,11 @@ public static com.google.datastore.v1.CommitRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public CommitRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitRequest(input, extensionRegistry); + return new CommitRequest(input, extensionRegistry); } }; @@ -1632,7 +1603,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 4ddc383d87f7..ff72b2e89499 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 @@ -34,9 +34,6 @@ private CommitResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -48,6 +45,13 @@ private CommitResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 26: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { mutationResults_ = new java.util.ArrayList(); @@ -62,13 +66,6 @@ private CommitResponse( indexUpdates_ = input.readInt32(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -89,7 +86,6 @@ private CommitResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable @@ -173,7 +169,6 @@ public int getIndexUpdates() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -183,7 +178,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < mutationResults_.size(); i++) { @@ -195,7 +189,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -321,7 +314,6 @@ public static com.google.datastore.v1.CommitResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -329,7 +321,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CommitResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -357,7 +348,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable @@ -381,7 +371,6 @@ private void maybeForceBuilderInitialization() { getMutationResultsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (mutationResultsBuilder_ == null) { @@ -395,18 +384,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } - @java.lang.Override public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { return com.google.datastore.v1.CommitResponse.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.CommitResponse build() { com.google.datastore.v1.CommitResponse result = buildPartial(); if (!result.isInitialized()) { @@ -415,7 +401,6 @@ public com.google.datastore.v1.CommitResponse build() { return result; } - @java.lang.Override public com.google.datastore.v1.CommitResponse buildPartial() { com.google.datastore.v1.CommitResponse result = new com.google.datastore.v1.CommitResponse(this); int from_bitField0_ = bitField0_; @@ -435,39 +420,32 @@ public com.google.datastore.v1.CommitResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CommitResponse) { return mergeFrom((com.google.datastore.v1.CommitResponse)other); @@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -908,13 +884,11 @@ public Builder clearIndexUpdates() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -936,12 +910,11 @@ public static com.google.datastore.v1.CommitResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public CommitResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitResponse(input, extensionRegistry); + return new CommitResponse(input, extensionRegistry); } }; @@ -954,7 +927,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 6b1bd91e109f..20ab2f6c13fe 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 @@ -34,9 +34,6 @@ private CompositeFilter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -48,6 +45,13 @@ private CompositeFilter( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 8: { int rawValue = input.readEnum(); @@ -63,13 +67,6 @@ private CompositeFilter( input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry)); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +87,6 @@ private CompositeFilter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable @@ -237,7 +233,6 @@ public int getOpValue() { * .google.datastore.v1.CompositeFilter.Operator op = 1; */ public com.google.datastore.v1.CompositeFilter.Operator getOp() { - @SuppressWarnings("deprecation") com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; } @@ -303,7 +298,6 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -313,7 +307,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) { @@ -325,7 +318,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -450,7 +442,6 @@ public static com.google.datastore.v1.CompositeFilter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -458,7 +449,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CompositeFilter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -486,7 +476,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable @@ -510,7 +499,6 @@ private void maybeForceBuilderInitialization() { getFiltersFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); op_ = 0; @@ -524,18 +512,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } - @java.lang.Override public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.CompositeFilter build() { com.google.datastore.v1.CompositeFilter result = buildPartial(); if (!result.isInitialized()) { @@ -544,7 +529,6 @@ public com.google.datastore.v1.CompositeFilter build() { return result; } - @java.lang.Override public com.google.datastore.v1.CompositeFilter buildPartial() { com.google.datastore.v1.CompositeFilter result = new com.google.datastore.v1.CompositeFilter(this); int from_bitField0_ = bitField0_; @@ -564,39 +548,32 @@ public com.google.datastore.v1.CompositeFilter buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CompositeFilter) { return mergeFrom((com.google.datastore.v1.CompositeFilter)other); @@ -642,12 +619,10 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -698,7 +673,6 @@ public Builder setOpValue(int value) { * .google.datastore.v1.CompositeFilter.Operator op = 1; */ public com.google.datastore.v1.CompositeFilter.Operator getOp() { - @SuppressWarnings("deprecation") com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; } @@ -1061,13 +1035,11 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder( } return filtersBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1089,12 +1061,11 @@ public static com.google.datastore.v1.CompositeFilter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public CompositeFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CompositeFilter(input, extensionRegistry); + return new CompositeFilter(input, extensionRegistry); } }; @@ -1107,7 +1078,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 0ef9ef973d45..c4079ab19db1 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 @@ -132,7 +132,7 @@ public static void registerAllExtensions( "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" + "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " + "\003(\0132!.google.datastore.v1.EntityResult\0222" + - "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" + + "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En", "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" + "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" + "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" + @@ -142,7 +142,7 @@ public static void registerAllExtensions( ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." + "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" + "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" + - "e.datastore.v1.QueryResultBatch\022)\n\005query" + + "e.datastore.v1.QueryResultBatch\022)\n\005query", "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" + "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" + "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." + @@ -152,7 +152,7 @@ public static void registerAllExtensions( "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" + "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" + "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" + - "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" + + "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t", "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" + "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" + "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" + @@ -162,7 +162,7 @@ public static void registerAllExtensions( "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" + "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" + "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" + - "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" + + "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser", "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" + "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" + "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" + @@ -172,7 +172,7 @@ public static void registerAllExtensions( ".google.datastore.v1.EntityH\000\022*\n\006delete\030" + "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" + "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" + - "ct_detection_strategy\"c\n\016MutationResult\022" + + "ct_detection_strategy\"c\n\016MutationResult\022", "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" + "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" + "(\010\"\325\001\n\013ReadOptions\022L\n\020read_consistency\030\001" + @@ -182,7 +182,7 @@ public static void registerAllExtensions( "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" + "\n\020consistency_type\"\343\001\n\022TransactionOption" + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" + - ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" + + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre", "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" + "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" + @@ -192,7 +192,7 @@ public static void registerAllExtensions( "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" + "ery\022$.google.datastore.v1.RunQueryReques" + "t\032%.google.datastore.v1.RunQueryResponse" + - "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" + + "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ", "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" + "tastore.v1.BeginTransactionRequest\032-.goo" + "gle.datastore.v1.BeginTransactionRespons" + @@ -202,7 +202,7 @@ public static void registerAllExtensions( "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" + "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." + "google.datastore.v1.RollbackRequest\032%.go" + - "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" + + "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223", "\002\'\"\"/v1/projects/{project_id}:rollback:\001" + "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." + "AllocateIdsRequest\032(.google.datastore.v1" + @@ -212,7 +212,7 @@ public static void registerAllExtensions( "quest\032\'.google.datastore.v1.ReserveIdsRe" + "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" + "}:reserveIds:\001*B\241\001\n\027com.google.datastore" + - ".v1B\016DatastoreProtoP\001Z PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Entity parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Entity(input, extensionRegistry); + return new Entity(input, extensionRegistry); } }; @@ -1073,7 +1045,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Entity getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java index 880839ab0087..69c4968146e0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java @@ -67,7 +67,7 @@ public static void registerAllExtensions( "6\n\014partition_id\030\001 \001(\0132 .google.datastore" + ".v1.PartitionId\0222\n\004path\030\002 \003(\0132$.google.d" + "atastore.v1.Key.PathElement\032D\n\013PathEleme" + - "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003" + + "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003", " \001(\tH\000B\t\n\007id_type\"8\n\nArrayValue\022*\n\006value" + "s\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n\005" + "Value\0220\n\nnull_value\030\013 \001(\0162\032.google.proto" + @@ -77,7 +77,7 @@ public static void registerAllExtensions( "gle.protobuf.TimestampH\000\022-\n\tkey_value\030\005 " + "\001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014strin" + "g_value\030\021 \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n" + - "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat" + + "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat", "LngH\000\0223\n\014entity_value\030\006 \001(\0132\033.google.dat" + "astore.v1.EntityH\000\0226\n\013array_value\030\t \001(\0132" + "\037.google.datastore.v1.ArrayValueH\000\022\017\n\007me" + @@ -87,7 +87,7 @@ public static void registerAllExtensions( "\003 \003(\0132+.google.datastore.v1.Entity.Prope" + "rtiesEntry\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001" + "(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore.v1." + - "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E" + + "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E", "ntityProtoP\001Z PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public EntityResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EntityResult(input, extensionRegistry); + return new EntityResult(input, extensionRegistry); } }; @@ -978,7 +951,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.EntityResult getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 f6524f2efc3f..2316e9675b4b 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 @@ -32,9 +32,6 @@ private Filter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,6 +43,13 @@ private Filter( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.CompositeFilter.Builder subBuilder = null; if (filterTypeCase_ == 1) { @@ -74,13 +78,6 @@ private Filter( filterTypeCase_ = 2; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -98,7 +95,6 @@ private Filter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable @@ -221,7 +217,6 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -231,7 +226,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (filterTypeCase_ == 1) { @@ -243,7 +237,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -386,7 +379,6 @@ public static com.google.datastore.v1.Filter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -394,7 +386,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Filter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -422,7 +413,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable @@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); filterTypeCase_ = 0; @@ -453,18 +442,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } - @java.lang.Override public com.google.datastore.v1.Filter getDefaultInstanceForType() { return com.google.datastore.v1.Filter.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.Filter build() { com.google.datastore.v1.Filter result = buildPartial(); if (!result.isInitialized()) { @@ -473,7 +459,6 @@ public com.google.datastore.v1.Filter build() { return result; } - @java.lang.Override public com.google.datastore.v1.Filter buildPartial() { com.google.datastore.v1.Filter result = new com.google.datastore.v1.Filter(this); if (filterTypeCase_ == 1) { @@ -495,39 +480,32 @@ public com.google.datastore.v1.Filter buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Filter) { return mergeFrom((com.google.datastore.v1.Filter)other); @@ -557,12 +535,10 @@ public Builder mergeFrom(com.google.datastore.v1.Filter other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -939,13 +915,11 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde onChanged();; return propertyFilterBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -967,12 +941,11 @@ public static com.google.datastore.v1.Filter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Filter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Filter(input, extensionRegistry); + return new Filter(input, extensionRegistry); } }; @@ -985,7 +958,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Filter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 aa0971431bb0..4d475588075d 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 @@ -35,9 +35,6 @@ private GqlQuery( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private GqlQuery( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -82,13 +86,6 @@ private GqlQuery( namedBindings__.getKey(), namedBindings__.getValue()); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -110,7 +107,6 @@ private GqlQuery( } @SuppressWarnings({"rawtypes"}) - @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -121,7 +117,6 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable @@ -365,7 +360,6 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -375,7 +369,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getQueryStringBytes().isEmpty()) { @@ -396,7 +389,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -546,7 +538,6 @@ public static com.google.datastore.v1.GqlQuery parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -554,7 +545,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.GqlQuery prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -604,7 +594,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable @@ -628,7 +617,6 @@ private void maybeForceBuilderInitialization() { getPositionalBindingsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); queryString_ = ""; @@ -645,18 +633,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor; } - @java.lang.Override public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.GqlQuery build() { com.google.datastore.v1.GqlQuery result = buildPartial(); if (!result.isInitialized()) { @@ -665,7 +650,6 @@ public com.google.datastore.v1.GqlQuery build() { return result; } - @java.lang.Override public com.google.datastore.v1.GqlQuery buildPartial() { com.google.datastore.v1.GqlQuery result = new com.google.datastore.v1.GqlQuery(this); int from_bitField0_ = bitField0_; @@ -688,39 +672,32 @@ public com.google.datastore.v1.GqlQuery buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.GqlQuery) { return mergeFrom((com.google.datastore.v1.GqlQuery)other); @@ -772,12 +749,10 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1475,13 +1450,11 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu } return positionalBindingsBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1503,12 +1476,11 @@ public static com.google.datastore.v1.GqlQuery getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public GqlQuery parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GqlQuery(input, extensionRegistry); + return new GqlQuery(input, extensionRegistry); } }; @@ -1521,7 +1493,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 89d6e7f8728d..a5b13168e4ef 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 @@ -32,9 +32,6 @@ private GqlQueryParameter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,6 +43,13 @@ private GqlQueryParameter( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 18: { com.google.datastore.v1.Value.Builder subBuilder = null; if (parameterTypeCase_ == 2) { @@ -65,13 +69,6 @@ private GqlQueryParameter( parameterType_ = input.readBytes(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -89,7 +86,6 @@ private GqlQueryParameter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable @@ -190,7 +186,6 @@ public com.google.protobuf.ByteString getCursor() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -200,7 +195,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (parameterTypeCase_ == 2) { @@ -213,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -357,7 +350,6 @@ public static com.google.datastore.v1.GqlQueryParameter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -365,7 +357,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.GqlQueryParameter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -393,7 +384,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable @@ -416,7 +406,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parameterTypeCase_ = 0; @@ -424,18 +413,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } - @java.lang.Override public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { return com.google.datastore.v1.GqlQueryParameter.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.GqlQueryParameter build() { com.google.datastore.v1.GqlQueryParameter result = buildPartial(); if (!result.isInitialized()) { @@ -444,7 +430,6 @@ public com.google.datastore.v1.GqlQueryParameter build() { return result; } - @java.lang.Override public com.google.datastore.v1.GqlQueryParameter buildPartial() { com.google.datastore.v1.GqlQueryParameter result = new com.google.datastore.v1.GqlQueryParameter(this); if (parameterTypeCase_ == 2) { @@ -462,39 +447,32 @@ public com.google.datastore.v1.GqlQueryParameter buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.GqlQueryParameter) { return mergeFrom((com.google.datastore.v1.GqlQueryParameter)other); @@ -524,12 +502,10 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -782,13 +758,11 @@ public Builder clearCursor() { } return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -810,12 +784,11 @@ public static com.google.datastore.v1.GqlQueryParameter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public GqlQueryParameter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GqlQueryParameter(input, extensionRegistry); + return new GqlQueryParameter(input, extensionRegistry); } }; @@ -828,7 +801,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 4aa66ebd8577..23b1a3050f14 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 @@ -36,9 +36,6 @@ private Key( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -50,6 +47,13 @@ private Key( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.PartitionId.Builder subBuilder = null; if (partitionId_ != null) { @@ -72,13 +76,6 @@ private Key( input.readMessage(com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry)); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -99,7 +96,6 @@ private Key( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable @@ -204,9 +200,6 @@ private PathElement( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -218,6 +211,13 @@ private PathElement( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -235,13 +235,6 @@ private PathElement( idType_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -259,7 +252,6 @@ private PathElement( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable @@ -428,7 +420,6 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -438,7 +429,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getKindBytes().isEmpty()) { @@ -454,7 +444,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -605,7 +594,6 @@ public static com.google.datastore.v1.Key.PathElement parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -613,7 +601,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Key.PathElement prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -643,7 +630,6 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable @@ -666,7 +652,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); kind_ = ""; @@ -676,18 +661,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } - @java.lang.Override public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { return com.google.datastore.v1.Key.PathElement.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.Key.PathElement build() { com.google.datastore.v1.Key.PathElement result = buildPartial(); if (!result.isInitialized()) { @@ -696,7 +678,6 @@ public com.google.datastore.v1.Key.PathElement build() { return result; } - @java.lang.Override public com.google.datastore.v1.Key.PathElement buildPartial() { com.google.datastore.v1.Key.PathElement result = new com.google.datastore.v1.Key.PathElement(this); result.kind_ = kind_; @@ -711,39 +692,32 @@ public com.google.datastore.v1.Key.PathElement buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Key.PathElement) { return mergeFrom((com.google.datastore.v1.Key.PathElement)other); @@ -779,12 +753,10 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1084,13 +1056,11 @@ public Builder setNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1112,12 +1082,11 @@ public static com.google.datastore.v1.Key.PathElement getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public PathElement parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PathElement(input, extensionRegistry); + return new PathElement(input, extensionRegistry); } }; @@ -1130,7 +1099,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1298,7 +1266,6 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1308,7 +1275,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (partitionId_ != null) { @@ -1320,7 +1286,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1451,7 +1416,6 @@ public static com.google.datastore.v1.Key parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1459,7 +1423,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Key prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1490,7 +1453,6 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable @@ -1514,7 +1476,6 @@ private void maybeForceBuilderInitialization() { getPathFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (partitionIdBuilder_ == null) { @@ -1532,18 +1493,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } - @java.lang.Override public com.google.datastore.v1.Key getDefaultInstanceForType() { return com.google.datastore.v1.Key.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.Key build() { com.google.datastore.v1.Key result = buildPartial(); if (!result.isInitialized()) { @@ -1552,7 +1510,6 @@ public com.google.datastore.v1.Key build() { return result; } - @java.lang.Override public com.google.datastore.v1.Key buildPartial() { com.google.datastore.v1.Key result = new com.google.datastore.v1.Key(this); int from_bitField0_ = bitField0_; @@ -1576,39 +1533,32 @@ public com.google.datastore.v1.Key buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Key) { return mergeFrom((com.google.datastore.v1.Key)other); @@ -1654,12 +1604,10 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2395,13 +2343,11 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder( } return pathBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2423,12 +2369,11 @@ public static com.google.datastore.v1.Key getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Key parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Key(input, extensionRegistry); + return new Key(input, extensionRegistry); } }; @@ -2441,7 +2386,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Key getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 1b209dd97bce..aa24aa42c9fb 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 @@ -33,9 +33,6 @@ private KindExpression( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,12 +44,6 @@ private KindExpression( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +51,12 @@ private KindExpression( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +74,6 @@ private KindExpression( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable @@ -128,7 +124,6 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -138,7 +133,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -262,7 +255,6 @@ public static com.google.datastore.v1.KindExpression parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -270,7 +262,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.KindExpression prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -298,7 +289,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable @@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -329,18 +318,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } - @java.lang.Override public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { return com.google.datastore.v1.KindExpression.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.KindExpression build() { com.google.datastore.v1.KindExpression result = buildPartial(); if (!result.isInitialized()) { @@ -349,7 +335,6 @@ public com.google.datastore.v1.KindExpression build() { return result; } - @java.lang.Override public com.google.datastore.v1.KindExpression buildPartial() { com.google.datastore.v1.KindExpression result = new com.google.datastore.v1.KindExpression(this); result.name_ = name_; @@ -357,39 +342,32 @@ public com.google.datastore.v1.KindExpression buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.KindExpression) { return mergeFrom((com.google.datastore.v1.KindExpression)other); @@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.datastore.v1.KindExpression other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -522,13 +498,11 @@ public Builder setNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -550,12 +524,11 @@ public static com.google.datastore.v1.KindExpression getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public KindExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KindExpression(input, extensionRegistry); + return new KindExpression(input, extensionRegistry); } }; @@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 28bbc80dfa15..47cfa042237c 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 @@ -34,9 +34,6 @@ private LookupRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -48,6 +45,13 @@ private LookupRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.ReadOptions.Builder subBuilder = null; if (readOptions_ != null) { @@ -76,13 +80,6 @@ private LookupRequest( projectId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -103,7 +100,6 @@ private LookupRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable @@ -243,7 +239,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -253,7 +248,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (readOptions_ != null) { @@ -268,7 +262,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -406,7 +399,6 @@ public static com.google.datastore.v1.LookupRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -414,7 +406,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.LookupRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -442,7 +433,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable @@ -466,7 +456,6 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -486,18 +475,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } - @java.lang.Override public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { return com.google.datastore.v1.LookupRequest.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.LookupRequest build() { com.google.datastore.v1.LookupRequest result = buildPartial(); if (!result.isInitialized()) { @@ -506,7 +492,6 @@ public com.google.datastore.v1.LookupRequest build() { return result; } - @java.lang.Override public com.google.datastore.v1.LookupRequest buildPartial() { com.google.datastore.v1.LookupRequest result = new com.google.datastore.v1.LookupRequest(this); int from_bitField0_ = bitField0_; @@ -531,39 +516,32 @@ public com.google.datastore.v1.LookupRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.LookupRequest) { return mergeFrom((com.google.datastore.v1.LookupRequest)other); @@ -613,12 +591,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1191,13 +1167,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1219,12 +1193,11 @@ public static com.google.datastore.v1.LookupRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LookupRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LookupRequest(input, extensionRegistry); + return new LookupRequest(input, extensionRegistry); } }; @@ -1237,7 +1210,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 9e60ec806650..404d34c0fe31 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 @@ -35,9 +35,6 @@ private LookupResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private LookupResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { found_ = new java.util.ArrayList(); @@ -76,13 +80,6 @@ private LookupResponse( input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -109,7 +106,6 @@ private LookupResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable @@ -313,7 +309,6 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -323,7 +318,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < found_.size(); i++) { @@ -338,7 +332,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -476,7 +469,6 @@ public static com.google.datastore.v1.LookupResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -484,7 +476,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.LookupResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -512,7 +503,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable @@ -538,7 +528,6 @@ private void maybeForceBuilderInitialization() { getDeferredFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (foundBuilder_ == null) { @@ -562,18 +551,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } - @java.lang.Override public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { return com.google.datastore.v1.LookupResponse.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.LookupResponse build() { com.google.datastore.v1.LookupResponse result = buildPartial(); if (!result.isInitialized()) { @@ -582,7 +568,6 @@ public com.google.datastore.v1.LookupResponse build() { return result; } - @java.lang.Override public com.google.datastore.v1.LookupResponse buildPartial() { com.google.datastore.v1.LookupResponse result = new com.google.datastore.v1.LookupResponse(this); int from_bitField0_ = bitField0_; @@ -617,39 +602,32 @@ public com.google.datastore.v1.LookupResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.LookupResponse) { return mergeFrom((com.google.datastore.v1.LookupResponse)other); @@ -744,12 +722,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1812,13 +1788,11 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder( } return deferredBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1840,12 +1814,11 @@ public static com.google.datastore.v1.LookupResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LookupResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LookupResponse(input, extensionRegistry); + return new LookupResponse(input, extensionRegistry); } }; @@ -1858,7 +1831,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 964394faf80c..2d2c086ffd4a 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 @@ -32,9 +32,6 @@ private Mutation( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,6 +43,13 @@ private Mutation( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 34: { com.google.datastore.v1.Entity.Builder subBuilder = null; if (operationCase_ == 4) { @@ -107,13 +111,6 @@ private Mutation( conflictDetectionStrategy_ = input.readInt64(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -131,7 +128,6 @@ private Mutation( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable @@ -398,7 +394,6 @@ public long getBaseVersion() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -408,7 +403,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (operationCase_ == 4) { @@ -430,7 +424,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -622,7 +615,6 @@ public static com.google.datastore.v1.Mutation parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -630,7 +622,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Mutation prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -658,7 +649,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable @@ -681,7 +671,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); operationCase_ = 0; @@ -691,18 +680,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } - @java.lang.Override public com.google.datastore.v1.Mutation getDefaultInstanceForType() { return com.google.datastore.v1.Mutation.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.Mutation build() { com.google.datastore.v1.Mutation result = buildPartial(); if (!result.isInitialized()) { @@ -711,7 +697,6 @@ public com.google.datastore.v1.Mutation build() { return result; } - @java.lang.Override public com.google.datastore.v1.Mutation buildPartial() { com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this); if (operationCase_ == 4) { @@ -751,39 +736,32 @@ public com.google.datastore.v1.Mutation buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Mutation) { return mergeFrom((com.google.datastore.v1.Mutation)other); @@ -830,12 +808,10 @@ public Builder mergeFrom(com.google.datastore.v1.Mutation other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1652,13 +1628,11 @@ public Builder clearBaseVersion() { } return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1680,12 +1654,11 @@ public static com.google.datastore.v1.Mutation getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Mutation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Mutation(input, extensionRegistry); + return new Mutation(input, extensionRegistry); } }; @@ -1698,7 +1671,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Mutation getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 3a2fcf2cf9ab..dceeb36d61de 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 @@ -34,9 +34,6 @@ private MutationResult( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -48,6 +45,13 @@ private MutationResult( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 26: { com.google.datastore.v1.Key.Builder subBuilder = null; if (key_ != null) { @@ -71,13 +75,6 @@ private MutationResult( conflictDetected_ = input.readBool(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -95,7 +92,6 @@ private MutationResult( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable @@ -171,7 +167,6 @@ public boolean getConflictDetected() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -181,7 +176,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (key_ != null) { @@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -335,7 +328,6 @@ public static com.google.datastore.v1.MutationResult parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -343,7 +335,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.MutationResult prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -371,7 +362,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable @@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); if (keyBuilder_ == null) { @@ -410,18 +399,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } - @java.lang.Override public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { return com.google.datastore.v1.MutationResult.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.MutationResult build() { com.google.datastore.v1.MutationResult result = buildPartial(); if (!result.isInitialized()) { @@ -430,7 +416,6 @@ public com.google.datastore.v1.MutationResult build() { return result; } - @java.lang.Override public com.google.datastore.v1.MutationResult buildPartial() { com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this); if (keyBuilder_ == null) { @@ -444,39 +429,32 @@ public com.google.datastore.v1.MutationResult buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.MutationResult) { return mergeFrom((com.google.datastore.v1.MutationResult)other); @@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -778,13 +754,11 @@ public Builder clearConflictDetected() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -806,12 +780,11 @@ public static com.google.datastore.v1.MutationResult getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public MutationResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MutationResult(input, extensionRegistry); + return new MutationResult(input, extensionRegistry); } }; @@ -824,7 +797,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 d2865ea2798a..e9846c8dacb3 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 @@ -48,9 +48,6 @@ private PartitionId( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -62,6 +59,13 @@ private PartitionId( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 18: { java.lang.String s = input.readStringRequireUtf8(); @@ -74,13 +78,6 @@ private PartitionId( namespaceId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -98,7 +95,6 @@ private PartitionId( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable @@ -191,7 +187,6 @@ public java.lang.String getNamespaceId() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -201,7 +196,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getProjectIdBytes().isEmpty()) { @@ -213,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -335,7 +328,6 @@ public static com.google.datastore.v1.PartitionId parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -343,7 +335,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PartitionId prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -385,7 +376,6 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable @@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -418,18 +407,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } - @java.lang.Override public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { return com.google.datastore.v1.PartitionId.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.PartitionId build() { com.google.datastore.v1.PartitionId result = buildPartial(); if (!result.isInitialized()) { @@ -438,7 +424,6 @@ public com.google.datastore.v1.PartitionId build() { return result; } - @java.lang.Override public com.google.datastore.v1.PartitionId buildPartial() { com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this); result.projectId_ = projectId_; @@ -447,39 +432,32 @@ public com.google.datastore.v1.PartitionId buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PartitionId) { return mergeFrom((com.google.datastore.v1.PartitionId)other); @@ -504,12 +482,10 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -705,13 +681,11 @@ public Builder setNamespaceIdBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -733,12 +707,11 @@ public static com.google.datastore.v1.PartitionId getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public PartitionId parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PartitionId(input, extensionRegistry); + return new PartitionId(input, extensionRegistry); } }; @@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 e606620c8650..b6c3bc4324d7 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 @@ -32,9 +32,6 @@ private Projection( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,6 +43,13 @@ private Projection( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -59,13 +63,6 @@ private Projection( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,7 +80,6 @@ private Projection( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable @@ -125,7 +121,6 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -135,7 +130,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -265,7 +258,6 @@ public static com.google.datastore.v1.Projection parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -273,7 +265,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Projection prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -301,7 +292,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable @@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -336,18 +325,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } - @java.lang.Override public com.google.datastore.v1.Projection getDefaultInstanceForType() { return com.google.datastore.v1.Projection.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.Projection build() { com.google.datastore.v1.Projection result = buildPartial(); if (!result.isInitialized()) { @@ -356,7 +342,6 @@ public com.google.datastore.v1.Projection build() { return result; } - @java.lang.Override public com.google.datastore.v1.Projection buildPartial() { com.google.datastore.v1.Projection result = new com.google.datastore.v1.Projection(this); if (propertyBuilder_ == null) { @@ -368,39 +353,32 @@ public com.google.datastore.v1.Projection buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Projection) { return mergeFrom((com.google.datastore.v1.Projection)other); @@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.datastore.v1.Projection other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -596,13 +572,11 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } return propertyBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -624,12 +598,11 @@ public static com.google.datastore.v1.Projection getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Projection parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Projection(input, extensionRegistry); + return new Projection(input, extensionRegistry); } }; @@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Projection getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 9651ee87e9d1..0e541e9272a3 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 @@ -33,9 +33,6 @@ private PropertyFilter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,6 +44,13 @@ private PropertyFilter( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -79,13 +83,6 @@ private PropertyFilter( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -103,7 +100,6 @@ private PropertyFilter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable @@ -367,7 +363,6 @@ public int getOpValue() { * .google.datastore.v1.PropertyFilter.Operator op = 2; */ public com.google.datastore.v1.PropertyFilter.Operator getOp() { - @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; } @@ -406,7 +401,6 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -416,7 +410,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -431,7 +424,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -572,7 +564,6 @@ public static com.google.datastore.v1.PropertyFilter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -580,7 +571,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyFilter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -608,7 +598,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable @@ -631,7 +620,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -651,18 +639,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } - @java.lang.Override public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.PropertyFilter build() { com.google.datastore.v1.PropertyFilter result = buildPartial(); if (!result.isInitialized()) { @@ -671,7 +656,6 @@ public com.google.datastore.v1.PropertyFilter build() { return result; } - @java.lang.Override public com.google.datastore.v1.PropertyFilter buildPartial() { com.google.datastore.v1.PropertyFilter result = new com.google.datastore.v1.PropertyFilter(this); if (propertyBuilder_ == null) { @@ -689,39 +673,32 @@ public com.google.datastore.v1.PropertyFilter buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyFilter) { return mergeFrom((com.google.datastore.v1.PropertyFilter)other); @@ -747,12 +724,10 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyFilter other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -955,7 +930,6 @@ public Builder setOpValue(int value) { * .google.datastore.v1.PropertyFilter.Operator op = 2; */ public com.google.datastore.v1.PropertyFilter.Operator getOp() { - @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; } @@ -1141,13 +1115,11 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { } return valueBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1169,12 +1141,11 @@ public static com.google.datastore.v1.PropertyFilter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public PropertyFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyFilter(input, extensionRegistry); + return new PropertyFilter(input, extensionRegistry); } }; @@ -1187,7 +1158,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 f13b15baedbe..8f54ee070f50 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 @@ -33,9 +33,6 @@ private PropertyOrder( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,6 +44,13 @@ private PropertyOrder( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -66,13 +70,6 @@ private PropertyOrder( direction_ = rawValue; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +87,6 @@ private PropertyOrder( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable @@ -286,13 +282,11 @@ public int getDirectionValue() { * .google.datastore.v1.PropertyOrder.Direction direction = 2; */ public com.google.datastore.v1.PropertyOrder.Direction getDirection() { - @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -302,7 +296,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -314,7 +307,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -442,7 +434,6 @@ public static com.google.datastore.v1.PropertyOrder parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -450,7 +441,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyOrder prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -478,7 +468,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable @@ -501,7 +490,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -515,18 +503,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } - @java.lang.Override public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { return com.google.datastore.v1.PropertyOrder.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.PropertyOrder build() { com.google.datastore.v1.PropertyOrder result = buildPartial(); if (!result.isInitialized()) { @@ -535,7 +520,6 @@ public com.google.datastore.v1.PropertyOrder build() { return result; } - @java.lang.Override public com.google.datastore.v1.PropertyOrder buildPartial() { com.google.datastore.v1.PropertyOrder result = new com.google.datastore.v1.PropertyOrder(this); if (propertyBuilder_ == null) { @@ -548,39 +532,32 @@ public com.google.datastore.v1.PropertyOrder buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyOrder) { return mergeFrom((com.google.datastore.v1.PropertyOrder)other); @@ -603,12 +580,10 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyOrder other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -811,7 +786,6 @@ public Builder setDirectionValue(int value) { * .google.datastore.v1.PropertyOrder.Direction direction = 2; */ public com.google.datastore.v1.PropertyOrder.Direction getDirection() { - @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; } @@ -844,13 +818,11 @@ public Builder clearDirection() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -872,12 +844,11 @@ public static com.google.datastore.v1.PropertyOrder getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public PropertyOrder parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyOrder(input, extensionRegistry); + return new PropertyOrder(input, extensionRegistry); } }; @@ -890,7 +861,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ae6196b33b1e..42c029296258 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 @@ -33,9 +33,6 @@ private PropertyReference( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,12 +44,6 @@ private PropertyReference( case 0: done = true; break; - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +51,12 @@ private PropertyReference( } break; } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +74,6 @@ private PropertyReference( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable @@ -130,7 +126,6 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -140,7 +135,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -264,7 +257,6 @@ public static com.google.datastore.v1.PropertyReference parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -272,7 +264,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyReference prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -300,7 +291,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable @@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -331,18 +320,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } - @java.lang.Override public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { return com.google.datastore.v1.PropertyReference.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.PropertyReference build() { com.google.datastore.v1.PropertyReference result = buildPartial(); if (!result.isInitialized()) { @@ -351,7 +337,6 @@ public com.google.datastore.v1.PropertyReference build() { return result; } - @java.lang.Override public com.google.datastore.v1.PropertyReference buildPartial() { com.google.datastore.v1.PropertyReference result = new com.google.datastore.v1.PropertyReference(this); result.name_ = name_; @@ -359,39 +344,32 @@ public com.google.datastore.v1.PropertyReference buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyReference) { return mergeFrom((com.google.datastore.v1.PropertyReference)other); @@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -529,13 +505,11 @@ public Builder setNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -557,12 +531,11 @@ public static com.google.datastore.v1.PropertyReference getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public PropertyReference parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyReference(input, extensionRegistry); + return new PropertyReference(input, extensionRegistry); } }; @@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 3e5e2298562a..e111dce94ef0 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 @@ -39,9 +39,6 @@ private Query( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -53,6 +50,13 @@ private Query( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 18: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { projection_ = new java.util.ArrayList(); @@ -130,13 +134,6 @@ private Query( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -166,7 +163,6 @@ private Query( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable @@ -530,7 +526,6 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -540,7 +535,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < projection_.size(); i++) { @@ -573,7 +567,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -771,7 +764,6 @@ public static com.google.datastore.v1.Query parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -779,7 +771,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Query prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -807,7 +798,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable @@ -834,7 +824,6 @@ private void maybeForceBuilderInitialization() { getDistinctOnFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (projectionBuilder_ == null) { @@ -882,18 +871,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } - @java.lang.Override public com.google.datastore.v1.Query getDefaultInstanceForType() { return com.google.datastore.v1.Query.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.Query build() { com.google.datastore.v1.Query result = buildPartial(); if (!result.isInitialized()) { @@ -902,7 +888,6 @@ public com.google.datastore.v1.Query build() { return result; } - @java.lang.Override public com.google.datastore.v1.Query buildPartial() { com.google.datastore.v1.Query result = new com.google.datastore.v1.Query(this); int from_bitField0_ = bitField0_; @@ -961,39 +946,32 @@ public com.google.datastore.v1.Query buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Query) { return mergeFrom((com.google.datastore.v1.Query)other); @@ -1129,12 +1107,10 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2923,13 +2899,11 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { } return limitBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2951,12 +2925,11 @@ public static com.google.datastore.v1.Query getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Query parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Query(input, extensionRegistry); + return new Query(input, extensionRegistry); } }; @@ -2969,7 +2942,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Query getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 6a2c87081b1d..e44c96e8e637 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 @@ -97,7 +97,7 @@ public static void registerAllExtensions( "\n\007version\030\004 \001(\003\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResul" + "tType\022\033\n\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FU" + "LL\020\001\022\016\n\nPROJECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Q" + - "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast" + + "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast", "ore.v1.Projection\0221\n\004kind\030\003 \003(\0132#.google" + ".datastore.v1.KindExpression\022+\n\006filter\030\004" + " \001(\0132\033.google.datastore.v1.Filter\0221\n\005ord" + @@ -107,7 +107,7 @@ public static void registerAllExtensions( "r\030\007 \001(\014\022\022\n\nend_cursor\030\010 \001(\014\022\016\n\006offset\030\n " + "\001(\005\022*\n\005limit\030\014 \001(\0132\033.google.protobuf.Int" + "32Value\"\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\"" + - "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr" + + "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr", "ojection\0228\n\010property\030\001 \001(\0132&.google.data" + "store.v1.PropertyReference\"\321\001\n\rPropertyO" + "rder\0228\n\010property\030\001 \001(\0132&.google.datastor" + @@ -117,7 +117,7 @@ public static void registerAllExtensions( "IFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"\231" + "\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$.go" + "ogle.datastore.v1.CompositeFilterH\000\022>\n\017p" + - "roperty_filter\030\002 \001(\0132#.google.datastore." + + "roperty_filter\030\002 \001(\0132#.google.datastore.", "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" + "store.v1.CompositeFilter.Operator\022,\n\007fil" + @@ -127,7 +127,7 @@ public static void registerAllExtensions( "\001(\0132&.google.datastore.v1.PropertyRefere" + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" + - "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n" + + "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" + @@ -137,7 +137,7 @@ public static void registerAllExtensions( "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" + "nal_bindings\030\004 \003(\0132&.google.datastore.v1" + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" + - "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" + + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da", "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" + @@ -147,7 +147,7 @@ public static void registerAllExtensions( "e.datastore.v1.EntityResult.ResultType\0229" + "\n\016entity_results\030\002 \003(\0132!.google.datastor" + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" + - "\014more_results\030\005 \001(\01625.google.datastore.v" + + "\014more_results\030\005 \001(\01625.google.datastore.v", "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index ce62b3d62495..b1b10aa07ef9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -39,9 +39,6 @@ private QueryResultBatch( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -53,6 +50,13 @@ private QueryResultBatch( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 8: { int rawValue = input.readEnum(); @@ -94,13 +98,6 @@ private QueryResultBatch( snapshotVersion_ = input.readInt64(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -121,7 +118,6 @@ private QueryResultBatch( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable @@ -348,7 +344,6 @@ public int getEntityResultTypeValue() { * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; */ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { - @SuppressWarnings("deprecation") com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; } @@ -441,7 +436,6 @@ public int getMoreResultsValue() { * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; */ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { - @SuppressWarnings("deprecation") com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } @@ -467,7 +461,6 @@ public long getSnapshotVersion() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -477,7 +470,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) { @@ -504,7 +496,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -669,7 +660,6 @@ public static com.google.datastore.v1.QueryResultBatch parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -677,7 +667,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.QueryResultBatch prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -705,7 +694,6 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable @@ -729,7 +717,6 @@ private void maybeForceBuilderInitialization() { getEntityResultsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); skippedResults_ = 0; @@ -753,18 +740,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } - @java.lang.Override public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { return com.google.datastore.v1.QueryResultBatch.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.QueryResultBatch build() { com.google.datastore.v1.QueryResultBatch result = buildPartial(); if (!result.isInitialized()) { @@ -773,7 +757,6 @@ public com.google.datastore.v1.QueryResultBatch build() { return result; } - @java.lang.Override public com.google.datastore.v1.QueryResultBatch buildPartial() { com.google.datastore.v1.QueryResultBatch result = new com.google.datastore.v1.QueryResultBatch(this); int from_bitField0_ = bitField0_; @@ -798,39 +781,32 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.QueryResultBatch) { return mergeFrom((com.google.datastore.v1.QueryResultBatch)other); @@ -891,12 +867,10 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1029,7 +1003,6 @@ public Builder setEntityResultTypeValue(int value) { * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; */ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { - @SuppressWarnings("deprecation") com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; } @@ -1447,7 +1420,6 @@ public Builder setMoreResultsValue(int value) { * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; */ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { - @SuppressWarnings("deprecation") com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } @@ -1539,13 +1511,11 @@ public Builder clearSnapshotVersion() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1567,12 +1537,11 @@ public static com.google.datastore.v1.QueryResultBatch getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public QueryResultBatch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new QueryResultBatch(input, extensionRegistry); + return new QueryResultBatch(input, extensionRegistry); } }; @@ -1585,7 +1554,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index 636a6d7aa754..b2bcfaa948fc 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -32,9 +32,6 @@ private ReadOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,6 +43,13 @@ private ReadOptions( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 8: { int rawValue = input.readEnum(); consistencyTypeCase_ = 1; @@ -57,13 +61,6 @@ private ReadOptions( consistencyType_ = input.readBytes(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -81,7 +78,6 @@ private ReadOptions( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable @@ -287,7 +283,6 @@ public int getReadConsistencyValue() { */ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { if (consistencyTypeCase_ == 1) { - @SuppressWarnings("deprecation") com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( (java.lang.Integer) consistencyType_); return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; @@ -313,7 +308,6 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -323,7 +317,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (consistencyTypeCase_ == 1) { @@ -336,7 +329,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -480,7 +472,6 @@ public static com.google.datastore.v1.ReadOptions parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -488,7 +479,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReadOptions prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -516,7 +506,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable @@ -539,7 +528,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); consistencyTypeCase_ = 0; @@ -547,18 +535,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } - @java.lang.Override public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { return com.google.datastore.v1.ReadOptions.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.ReadOptions build() { com.google.datastore.v1.ReadOptions result = buildPartial(); if (!result.isInitialized()) { @@ -567,7 +552,6 @@ public com.google.datastore.v1.ReadOptions build() { return result; } - @java.lang.Override public com.google.datastore.v1.ReadOptions buildPartial() { com.google.datastore.v1.ReadOptions result = new com.google.datastore.v1.ReadOptions(this); if (consistencyTypeCase_ == 1) { @@ -581,39 +565,32 @@ public com.google.datastore.v1.ReadOptions buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReadOptions) { return mergeFrom((com.google.datastore.v1.ReadOptions)other); @@ -643,12 +620,10 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -720,7 +695,6 @@ public Builder setReadConsistencyValue(int value) { */ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { if (consistencyTypeCase_ == 1) { - @SuppressWarnings("deprecation") com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( (java.lang.Integer) consistencyType_); return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; @@ -811,13 +785,11 @@ public Builder clearTransaction() { } return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -839,12 +811,11 @@ public static com.google.datastore.v1.ReadOptions getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ReadOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOptions(input, extensionRegistry); + return new ReadOptions(input, extensionRegistry); } }; @@ -857,7 +828,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 2ca48d034b44..d5c5f26c5142 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 @@ -35,9 +35,6 @@ private ReserveIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private ReserveIdsRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { keys_ = new java.util.ArrayList(); @@ -70,13 +74,6 @@ private ReserveIdsRequest( databaseId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -97,7 +94,6 @@ private ReserveIdsRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable @@ -251,7 +247,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -261,7 +256,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -276,7 +270,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -408,7 +401,6 @@ public static com.google.datastore.v1.ReserveIdsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -416,7 +408,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReserveIdsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -444,7 +435,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable @@ -468,7 +458,6 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -484,18 +473,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } - @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { return com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest build() { com.google.datastore.v1.ReserveIdsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -504,7 +490,6 @@ public com.google.datastore.v1.ReserveIdsRequest build() { return result; } - @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest buildPartial() { com.google.datastore.v1.ReserveIdsRequest result = new com.google.datastore.v1.ReserveIdsRequest(this); int from_bitField0_ = bitField0_; @@ -525,39 +510,32 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReserveIdsRequest) { return mergeFrom((com.google.datastore.v1.ReserveIdsRequest)other); @@ -608,12 +586,10 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1140,13 +1116,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1168,12 +1142,11 @@ public static com.google.datastore.v1.ReserveIdsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ReserveIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsRequest(input, extensionRegistry); + return new ReserveIdsRequest(input, extensionRegistry); } }; @@ -1186,7 +1159,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 7294241714ea..d5d38f6b6f60 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 @@ -32,9 +32,6 @@ private ReserveIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -69,7 +66,6 @@ private ReserveIdsResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable @@ -78,7 +74,6 @@ private ReserveIdsResponse( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -88,13 +83,11 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -202,7 +195,6 @@ public static com.google.datastore.v1.ReserveIdsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -210,7 +202,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReserveIdsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -238,7 +229,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable @@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } - @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { return com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse build() { com.google.datastore.v1.ReserveIdsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -287,46 +273,38 @@ public com.google.datastore.v1.ReserveIdsResponse build() { return result; } - @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse buildPartial() { com.google.datastore.v1.ReserveIdsResponse result = new com.google.datastore.v1.ReserveIdsResponse(this); onBuilt(); return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReserveIdsResponse) { return mergeFrom((com.google.datastore.v1.ReserveIdsResponse)other); @@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -366,13 +342,11 @@ public Builder mergeFrom( } return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -394,12 +368,11 @@ public static com.google.datastore.v1.ReserveIdsResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ReserveIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsResponse(input, extensionRegistry); + return new ReserveIdsResponse(input, extensionRegistry); } }; @@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 8d51f0be2032..0aa141f0cea0 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 @@ -34,9 +34,6 @@ private RollbackRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -48,6 +45,13 @@ private RollbackRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { transaction_ = input.readBytes(); @@ -59,13 +63,6 @@ private RollbackRequest( projectId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,7 +80,6 @@ private RollbackRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable @@ -148,7 +144,6 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -158,7 +153,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!transaction_.isEmpty()) { @@ -170,7 +164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -293,7 +286,6 @@ public static com.google.datastore.v1.RollbackRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -301,7 +293,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RollbackRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -329,7 +320,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable @@ -352,7 +342,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -362,18 +351,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } - @java.lang.Override public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { return com.google.datastore.v1.RollbackRequest.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.RollbackRequest build() { com.google.datastore.v1.RollbackRequest result = buildPartial(); if (!result.isInitialized()) { @@ -382,7 +368,6 @@ public com.google.datastore.v1.RollbackRequest build() { return result; } - @java.lang.Override public com.google.datastore.v1.RollbackRequest buildPartial() { com.google.datastore.v1.RollbackRequest result = new com.google.datastore.v1.RollbackRequest(this); result.projectId_ = projectId_; @@ -391,39 +376,32 @@ public com.google.datastore.v1.RollbackRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RollbackRequest) { return mergeFrom((com.google.datastore.v1.RollbackRequest)other); @@ -447,12 +425,10 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -603,13 +579,11 @@ public Builder clearTransaction() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -631,12 +605,11 @@ public static com.google.datastore.v1.RollbackRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public RollbackRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackRequest(input, extensionRegistry); + return new RollbackRequest(input, extensionRegistry); } }; @@ -649,7 +622,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 0690ba911eb3..f309bbc17cf5 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 @@ -33,9 +33,6 @@ private RollbackResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -70,7 +67,6 @@ private RollbackResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable @@ -79,7 +75,6 @@ private RollbackResponse( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -89,13 +84,11 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -203,7 +196,6 @@ public static com.google.datastore.v1.RollbackResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -211,7 +203,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RollbackResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -240,7 +231,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable @@ -263,24 +253,20 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } - @java.lang.Override public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { return com.google.datastore.v1.RollbackResponse.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.RollbackResponse build() { com.google.datastore.v1.RollbackResponse result = buildPartial(); if (!result.isInitialized()) { @@ -289,46 +275,38 @@ public com.google.datastore.v1.RollbackResponse build() { return result; } - @java.lang.Override public com.google.datastore.v1.RollbackResponse buildPartial() { com.google.datastore.v1.RollbackResponse result = new com.google.datastore.v1.RollbackResponse(this); onBuilt(); return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RollbackResponse) { return mergeFrom((com.google.datastore.v1.RollbackResponse)other); @@ -345,12 +323,10 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -368,13 +344,11 @@ public Builder mergeFrom( } return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -396,12 +370,11 @@ public static com.google.datastore.v1.RollbackResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public RollbackResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackResponse(input, extensionRegistry); + return new RollbackResponse(input, extensionRegistry); } }; @@ -414,7 +387,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ba7e2974b60d..25ec2ddfa31d 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 @@ -33,9 +33,6 @@ private RunQueryRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,6 +44,13 @@ private RunQueryRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.ReadOptions.Builder subBuilder = null; if (readOptions_ != null) { @@ -107,13 +111,6 @@ private RunQueryRequest( projectId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -131,7 +128,6 @@ private RunQueryRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable @@ -371,7 +367,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -381,7 +376,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (readOptions_ != null) { @@ -402,7 +396,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -578,7 +571,6 @@ public static com.google.datastore.v1.RunQueryRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -586,7 +578,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RunQueryRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -614,7 +605,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable @@ -637,7 +627,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -659,18 +648,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } - @java.lang.Override public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { return com.google.datastore.v1.RunQueryRequest.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.RunQueryRequest build() { com.google.datastore.v1.RunQueryRequest result = buildPartial(); if (!result.isInitialized()) { @@ -679,7 +665,6 @@ public com.google.datastore.v1.RunQueryRequest build() { return result; } - @java.lang.Override public com.google.datastore.v1.RunQueryRequest buildPartial() { com.google.datastore.v1.RunQueryRequest result = new com.google.datastore.v1.RunQueryRequest(this); result.projectId_ = projectId_; @@ -712,39 +697,32 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RunQueryRequest) { return mergeFrom((com.google.datastore.v1.RunQueryRequest)other); @@ -784,12 +762,10 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1588,13 +1564,11 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { onChanged();; return gqlQueryBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1616,12 +1590,11 @@ public static com.google.datastore.v1.RunQueryRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public RunQueryRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryRequest(input, extensionRegistry); + return new RunQueryRequest(input, extensionRegistry); } }; @@ -1634,7 +1607,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 e61be763e322..cf6f8aa66101 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 @@ -32,9 +32,6 @@ private RunQueryResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,6 +43,13 @@ private RunQueryResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null; if (batch_ != null) { @@ -72,13 +76,6 @@ private RunQueryResponse( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -96,7 +93,6 @@ private RunQueryResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable @@ -171,7 +167,6 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -181,7 +176,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (batch_ != null) { @@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -327,7 +320,6 @@ public static com.google.datastore.v1.RunQueryResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -335,7 +327,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RunQueryResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -363,7 +354,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable @@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); if (batchBuilder_ == null) { @@ -404,18 +393,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } - @java.lang.Override public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { return com.google.datastore.v1.RunQueryResponse.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.RunQueryResponse build() { com.google.datastore.v1.RunQueryResponse result = buildPartial(); if (!result.isInitialized()) { @@ -424,7 +410,6 @@ public com.google.datastore.v1.RunQueryResponse build() { return result; } - @java.lang.Override public com.google.datastore.v1.RunQueryResponse buildPartial() { com.google.datastore.v1.RunQueryResponse result = new com.google.datastore.v1.RunQueryResponse(this); if (batchBuilder_ == null) { @@ -441,39 +426,32 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RunQueryResponse) { return mergeFrom((com.google.datastore.v1.RunQueryResponse)other); @@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -825,13 +801,11 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } return queryBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -853,12 +827,11 @@ public static com.google.datastore.v1.RunQueryResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public RunQueryResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryResponse(input, extensionRegistry); + return new RunQueryResponse(input, extensionRegistry); } }; @@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 2bef782cd392..4c832a372d80 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 @@ -35,9 +35,6 @@ private TransactionOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private TransactionOptions( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null; if (modeCase_ == 1) { @@ -77,13 +81,6 @@ private TransactionOptions( modeCase_ = 2; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -101,7 +98,6 @@ private TransactionOptions( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable @@ -152,9 +148,6 @@ private ReadWrite( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -166,11 +159,6 @@ private ReadWrite( case 0: done = true; break; - case 10: { - - previousTransaction_ = input.readBytes(); - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -178,6 +166,11 @@ private ReadWrite( } break; } + case 10: { + + previousTransaction_ = input.readBytes(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -195,7 +188,6 @@ private ReadWrite( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable @@ -217,7 +209,6 @@ public com.google.protobuf.ByteString getPreviousTransaction() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -227,7 +218,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!previousTransaction_.isEmpty()) { @@ -236,7 +226,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -352,7 +341,6 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -360,7 +348,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadWrite prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -388,7 +375,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable @@ -411,7 +397,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); previousTransaction_ = com.google.protobuf.ByteString.EMPTY; @@ -419,18 +404,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite build() { com.google.datastore.v1.TransactionOptions.ReadWrite result = buildPartial(); if (!result.isInitialized()) { @@ -439,7 +421,6 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite build() { return result; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() { com.google.datastore.v1.TransactionOptions.ReadWrite result = new com.google.datastore.v1.TransactionOptions.ReadWrite(this); result.previousTransaction_ = previousTransaction_; @@ -447,39 +428,32 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions.ReadWrite) { return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite)other); @@ -499,12 +473,10 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite ot return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -563,13 +535,11 @@ public Builder clearPreviousTransaction() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -591,12 +561,11 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultIns private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ReadWrite parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadWrite(input, extensionRegistry); + return new ReadWrite(input, extensionRegistry); } }; @@ -609,7 +578,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -649,9 +617,6 @@ private ReadOnly( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -686,7 +651,6 @@ private ReadOnly( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable @@ -695,7 +659,6 @@ private ReadOnly( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -705,13 +668,11 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -819,7 +780,6 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -827,7 +787,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadOnly prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -855,7 +814,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable @@ -878,24 +836,20 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly build() { com.google.datastore.v1.TransactionOptions.ReadOnly result = buildPartial(); if (!result.isInitialized()) { @@ -904,46 +858,38 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() { return result; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() { com.google.datastore.v1.TransactionOptions.ReadOnly result = new com.google.datastore.v1.TransactionOptions.ReadOnly(this); onBuilt(); return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions.ReadOnly) { return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly)other); @@ -960,12 +906,10 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly oth return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -983,13 +927,11 @@ public Builder mergeFrom( } return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1011,12 +953,11 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInst private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ReadOnly parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOnly(input, extensionRegistry); + return new ReadOnly(input, extensionRegistry); } }; @@ -1029,7 +970,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1151,7 +1091,6 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1161,7 +1100,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (modeCase_ == 1) { @@ -1173,7 +1111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1316,7 +1253,6 @@ public static com.google.datastore.v1.TransactionOptions parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1324,7 +1260,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1355,7 +1290,6 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable @@ -1378,7 +1312,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); modeCase_ = 0; @@ -1386,18 +1319,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.TransactionOptions build() { com.google.datastore.v1.TransactionOptions result = buildPartial(); if (!result.isInitialized()) { @@ -1406,7 +1336,6 @@ public com.google.datastore.v1.TransactionOptions build() { return result; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions buildPartial() { com.google.datastore.v1.TransactionOptions result = new com.google.datastore.v1.TransactionOptions(this); if (modeCase_ == 1) { @@ -1428,39 +1357,32 @@ public com.google.datastore.v1.TransactionOptions buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions) { return mergeFrom((com.google.datastore.v1.TransactionOptions)other); @@ -1490,12 +1412,10 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1872,13 +1792,11 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO onChanged();; return readOnlyBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1900,12 +1818,11 @@ public static com.google.datastore.v1.TransactionOptions getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public TransactionOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TransactionOptions(input, extensionRegistry); + return new TransactionOptions(input, extensionRegistry); } }; @@ -1918,7 +1835,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 545094844729..24a7ce3b5f03 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 @@ -35,9 +35,6 @@ private Value( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private Value( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 8: { valueTypeCase_ = 1; valueType_ = input.readBool(); @@ -161,13 +165,6 @@ private Value( excludeFromIndexes_ = input.readBool(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -185,7 +182,6 @@ private Value( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable @@ -272,7 +268,6 @@ public int getNullValueValue() { */ public com.google.protobuf.NullValue getNullValue() { if (valueTypeCase_ == 11) { - @SuppressWarnings("deprecation") com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( (java.lang.Integer) valueType_); return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; @@ -640,7 +635,6 @@ public boolean getExcludeFromIndexes() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -650,7 +644,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (valueTypeCase_ == 1) { @@ -699,7 +692,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -975,7 +967,6 @@ public static com.google.datastore.v1.Value parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -983,7 +974,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Value prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1012,7 +1002,6 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable @@ -1035,7 +1024,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); meaning_ = 0; @@ -1047,18 +1035,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } - @java.lang.Override public com.google.datastore.v1.Value getDefaultInstanceForType() { return com.google.datastore.v1.Value.getDefaultInstance(); } - @java.lang.Override public com.google.datastore.v1.Value build() { com.google.datastore.v1.Value result = buildPartial(); if (!result.isInitialized()) { @@ -1067,7 +1052,6 @@ public com.google.datastore.v1.Value build() { return result; } - @java.lang.Override public com.google.datastore.v1.Value buildPartial() { com.google.datastore.v1.Value result = new com.google.datastore.v1.Value(this); if (valueTypeCase_ == 11) { @@ -1130,39 +1114,32 @@ public com.google.datastore.v1.Value buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Value) { return mergeFrom((com.google.datastore.v1.Value)other); @@ -1236,12 +1213,10 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1310,7 +1285,6 @@ public Builder setNullValueValue(int value) { */ public com.google.protobuf.NullValue getNullValue() { if (valueTypeCase_ == 11) { - @SuppressWarnings("deprecation") com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( (java.lang.Integer) valueType_); return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; @@ -2649,13 +2623,11 @@ public Builder clearExcludeFromIndexes() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2677,12 +2649,11 @@ public static com.google.datastore.v1.Value getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Value(input, extensionRegistry); + return new Value(input, extensionRegistry); } }; @@ -2695,7 +2666,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.datastore.v1.Value getDefaultInstanceForType() { return DEFAULT_INSTANCE; } From 66112af97e7d5d861044aff8e9d5898fc0bed1fb Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 6 Sep 2018 16:26:48 -0700 Subject: [PATCH 0103/1784] Release 0.61.0/1.43.0 (#3653) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 07e25bf97e5a..9ef7c5978cb5 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.42.0 + 1.43.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.42.0' +compile 'com.google.cloud:google-cloud-datastore:1.43.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.42.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.43.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 3a06f0c51a50..d8ee70636b1e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.42.0 + 1.43.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.60.0-alpha + 0.61.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 2dbd697d1a96..0968ba17db2e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.25.0 + 0.26.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.25.0 + 0.26.0 From eac10e30c6d7004f05db409717ecb5e804cbccad Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Fri, 7 Sep 2018 10:14:04 -0700 Subject: [PATCH 0104/1784] Bump to snapshot version for development (#3656) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index d8ee70636b1e..be92fdda4a60 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.43.0 + 1.43.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.61.0-alpha + 0.61.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0968ba17db2e..e1599abb59cd 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.26.0 + 0.26.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.26.0 + 0.26.1-SNAPSHOT From 981bdf5a6643786d019eb0b80403ad678074b08a Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Wed, 12 Sep 2018 15:43:27 -0700 Subject: [PATCH 0105/1784] Regenerate proto/grpc files with protoc 3.6.0 (#3672) --- .../datastore/v1/AllocateIdsRequest.java | 44 +++++-- .../datastore/v1/AllocateIdsResponse.java | 44 +++++-- .../com/google/datastore/v1/ArrayValue.java | 44 +++++-- .../datastore/v1/BeginTransactionRequest.java | 44 +++++-- .../v1/BeginTransactionResponse.java | 40 +++++- .../google/datastore/v1/CommitRequest.java | 46 +++++-- .../google/datastore/v1/CommitResponse.java | 44 +++++-- .../google/datastore/v1/CompositeFilter.java | 46 +++++-- .../google/datastore/v1/DatastoreProto.java | 18 +-- .../java/com/google/datastore/v1/Entity.java | 45 +++++-- .../com/google/datastore/v1/EntityProto.java | 6 +- .../com/google/datastore/v1/EntityResult.java | 44 +++++-- .../java/com/google/datastore/v1/Filter.java | 44 +++++-- .../com/google/datastore/v1/GqlQuery.java | 45 +++++-- .../datastore/v1/GqlQueryParameter.java | 44 +++++-- .../java/com/google/datastore/v1/Key.java | 88 +++++++++++--- .../google/datastore/v1/KindExpression.java | 42 +++++-- .../google/datastore/v1/LookupRequest.java | 44 +++++-- .../google/datastore/v1/LookupResponse.java | 44 +++++-- .../com/google/datastore/v1/Mutation.java | 44 +++++-- .../google/datastore/v1/MutationResult.java | 44 +++++-- .../com/google/datastore/v1/PartitionId.java | 44 +++++-- .../com/google/datastore/v1/Projection.java | 44 +++++-- .../google/datastore/v1/PropertyFilter.java | 46 +++++-- .../google/datastore/v1/PropertyOrder.java | 46 +++++-- .../datastore/v1/PropertyReference.java | 42 +++++-- .../java/com/google/datastore/v1/Query.java | 44 +++++-- .../com/google/datastore/v1/QueryProto.java | 12 +- .../google/datastore/v1/QueryResultBatch.java | 48 ++++++-- .../com/google/datastore/v1/ReadOptions.java | 46 +++++-- .../datastore/v1/ReserveIdsRequest.java | 44 +++++-- .../datastore/v1/ReserveIdsResponse.java | 30 ++++- .../google/datastore/v1/RollbackRequest.java | 44 +++++-- .../google/datastore/v1/RollbackResponse.java | 30 ++++- .../google/datastore/v1/RunQueryRequest.java | 44 +++++-- .../google/datastore/v1/RunQueryResponse.java | 44 +++++-- .../datastore/v1/TransactionOptions.java | 114 +++++++++++++++--- .../java/com/google/datastore/v1/Value.java | 46 +++++-- 38 files changed, 1377 insertions(+), 295 deletions(-) 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 aebc798e7c23..9eb469011ac9 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 @@ -34,6 +34,9 @@ private AllocateIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -45,13 +48,6 @@ private AllocateIdsRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { keys_ = new java.util.ArrayList(); @@ -67,6 +63,13 @@ private AllocateIdsRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -87,6 +90,7 @@ private AllocateIdsRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable @@ -198,6 +202,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -207,6 +212,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -218,6 +224,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -342,6 +349,7 @@ public static com.google.datastore.v1.AllocateIdsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -349,6 +357,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.AllocateIdsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -376,6 +385,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable @@ -399,6 +409,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -412,15 +423,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { return com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest build() { com.google.datastore.v1.AllocateIdsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -429,6 +443,7 @@ public com.google.datastore.v1.AllocateIdsRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest buildPartial() { com.google.datastore.v1.AllocateIdsRequest result = new com.google.datastore.v1.AllocateIdsRequest(this); int from_bitField0_ = bitField0_; @@ -448,32 +463,39 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.AllocateIdsRequest) { return mergeFrom((com.google.datastore.v1.AllocateIdsRequest)other); @@ -520,10 +542,12 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -961,11 +985,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -987,11 +1013,12 @@ public static com.google.datastore.v1.AllocateIdsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public AllocateIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsRequest(input, extensionRegistry); + return new AllocateIdsRequest(input, extensionRegistry); } }; @@ -1004,6 +1031,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 3844547c3756..c6e30f9ce017 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 @@ -33,6 +33,9 @@ private AllocateIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,13 +47,6 @@ private AllocateIdsResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { keys_ = new java.util.ArrayList(); @@ -60,6 +56,13 @@ private AllocateIdsResponse( input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -80,6 +83,7 @@ private AllocateIdsResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable @@ -148,6 +152,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -157,6 +162,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -165,6 +171,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -282,6 +289,7 @@ public static com.google.datastore.v1.AllocateIdsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -289,6 +297,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.AllocateIdsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -316,6 +325,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable @@ -339,6 +349,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (keysBuilder_ == null) { @@ -350,15 +361,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { return com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse build() { com.google.datastore.v1.AllocateIdsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -367,6 +381,7 @@ public com.google.datastore.v1.AllocateIdsResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse buildPartial() { com.google.datastore.v1.AllocateIdsResponse result = new com.google.datastore.v1.AllocateIdsResponse(this); int from_bitField0_ = bitField0_; @@ -383,32 +398,39 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.AllocateIdsResponse) { return mergeFrom((com.google.datastore.v1.AllocateIdsResponse)other); @@ -451,10 +473,12 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -803,11 +827,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -829,11 +855,12 @@ public static com.google.datastore.v1.AllocateIdsResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public AllocateIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsResponse(input, extensionRegistry); + return new AllocateIdsResponse(input, extensionRegistry); } }; @@ -846,6 +873,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ad0cb62648e6..d2cdbd53a35a 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 @@ -33,6 +33,9 @@ private ArrayValue( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,13 +47,6 @@ private ArrayValue( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { values_ = new java.util.ArrayList(); @@ -60,6 +56,13 @@ private ArrayValue( input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -80,6 +83,7 @@ private ArrayValue( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable @@ -153,6 +157,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -162,6 +167,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < values_.size(); i++) { @@ -170,6 +176,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -287,6 +294,7 @@ public static com.google.datastore.v1.ArrayValue parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -294,6 +302,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ArrayValue prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -321,6 +330,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable @@ -344,6 +354,7 @@ private void maybeForceBuilderInitialization() { getValuesFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (valuesBuilder_ == null) { @@ -355,15 +366,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor; } + @java.lang.Override public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ArrayValue build() { com.google.datastore.v1.ArrayValue result = buildPartial(); if (!result.isInitialized()) { @@ -372,6 +386,7 @@ public com.google.datastore.v1.ArrayValue build() { return result; } + @java.lang.Override public com.google.datastore.v1.ArrayValue buildPartial() { com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this); int from_bitField0_ = bitField0_; @@ -388,32 +403,39 @@ public com.google.datastore.v1.ArrayValue buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ArrayValue) { return mergeFrom((com.google.datastore.v1.ArrayValue)other); @@ -456,10 +478,12 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -826,11 +850,13 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder( } return valuesBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -852,11 +878,12 @@ public static com.google.datastore.v1.ArrayValue getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ArrayValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ArrayValue(input, extensionRegistry); + return new ArrayValue(input, extensionRegistry); } }; @@ -869,6 +896,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 e977c4250e83..ec9154096522 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 @@ -33,6 +33,9 @@ private BeginTransactionRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,13 +47,6 @@ private BeginTransactionRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 66: { java.lang.String s = input.readStringRequireUtf8(); @@ -70,6 +66,13 @@ private BeginTransactionRequest( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -87,6 +90,7 @@ private BeginTransactionRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable @@ -170,6 +174,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -179,6 +184,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getProjectIdBytes().isEmpty()) { @@ -190,6 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -317,6 +324,7 @@ public static com.google.datastore.v1.BeginTransactionRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -324,6 +332,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.BeginTransactionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -351,6 +360,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable @@ -373,6 +383,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -386,15 +397,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { return com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest build() { com.google.datastore.v1.BeginTransactionRequest result = buildPartial(); if (!result.isInitialized()) { @@ -403,6 +417,7 @@ public com.google.datastore.v1.BeginTransactionRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest buildPartial() { com.google.datastore.v1.BeginTransactionRequest result = new com.google.datastore.v1.BeginTransactionRequest(this); result.projectId_ = projectId_; @@ -415,32 +430,39 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.BeginTransactionRequest) { return mergeFrom((com.google.datastore.v1.BeginTransactionRequest)other); @@ -464,10 +486,12 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other) return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -727,11 +751,13 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions } return transactionOptionsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -753,11 +779,12 @@ public static com.google.datastore.v1.BeginTransactionRequest getDefaultInstance private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public BeginTransactionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionRequest(input, extensionRegistry); + return new BeginTransactionRequest(input, extensionRegistry); } }; @@ -770,6 +797,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 a511859f4210..4d4c0b69ee91 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 @@ -33,6 +33,9 @@ private BeginTransactionResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,6 +47,11 @@ private BeginTransactionResponse( case 0: done = true; break; + case 10: { + + transaction_ = input.readBytes(); + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -51,11 +59,6 @@ private BeginTransactionResponse( } break; } - case 10: { - - transaction_ = input.readBytes(); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -73,6 +76,7 @@ private BeginTransactionResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable @@ -94,6 +98,7 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -103,6 +108,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!transaction_.isEmpty()) { @@ -111,6 +117,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -226,6 +233,7 @@ public static com.google.datastore.v1.BeginTransactionResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -233,6 +241,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.BeginTransactionResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -260,6 +269,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable @@ -282,6 +292,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); transaction_ = com.google.protobuf.ByteString.EMPTY; @@ -289,15 +300,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { return com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse build() { com.google.datastore.v1.BeginTransactionResponse result = buildPartial(); if (!result.isInitialized()) { @@ -306,6 +320,7 @@ public com.google.datastore.v1.BeginTransactionResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse buildPartial() { com.google.datastore.v1.BeginTransactionResponse result = new com.google.datastore.v1.BeginTransactionResponse(this); result.transaction_ = transaction_; @@ -313,32 +328,39 @@ public com.google.datastore.v1.BeginTransactionResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.BeginTransactionResponse) { return mergeFrom((com.google.datastore.v1.BeginTransactionResponse)other); @@ -358,10 +380,12 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other) return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -420,11 +444,13 @@ public Builder clearTransaction() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -446,11 +472,12 @@ public static com.google.datastore.v1.BeginTransactionResponse getDefaultInstanc private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public BeginTransactionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionResponse(input, extensionRegistry); + return new BeginTransactionResponse(input, extensionRegistry); } }; @@ -463,6 +490,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 3040ae1e25ab..258082f5b6c9 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 @@ -35,6 +35,9 @@ private CommitRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,13 +49,6 @@ private CommitRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { transactionSelectorCase_ = 1; transactionSelector_ = input.readBytes(); @@ -79,6 +75,13 @@ private CommitRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -99,6 +102,7 @@ private CommitRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable @@ -342,6 +346,7 @@ public int getModeValue() { * .google.datastore.v1.CommitRequest.Mode mode = 5; */ public com.google.datastore.v1.CommitRequest.Mode getMode() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; } @@ -464,6 +469,7 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -473,6 +479,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (transactionSelectorCase_ == 1) { @@ -491,6 +498,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -646,6 +654,7 @@ public static com.google.datastore.v1.CommitRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -653,6 +662,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CommitRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -680,6 +690,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable @@ -703,6 +714,7 @@ private void maybeForceBuilderInitialization() { getMutationsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -720,15 +732,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { return com.google.datastore.v1.CommitRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.CommitRequest build() { com.google.datastore.v1.CommitRequest result = buildPartial(); if (!result.isInitialized()) { @@ -737,6 +752,7 @@ public com.google.datastore.v1.CommitRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.CommitRequest buildPartial() { com.google.datastore.v1.CommitRequest result = new com.google.datastore.v1.CommitRequest(this); int from_bitField0_ = bitField0_; @@ -761,32 +777,39 @@ public com.google.datastore.v1.CommitRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CommitRequest) { return mergeFrom((com.google.datastore.v1.CommitRequest)other); @@ -845,10 +868,12 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1003,6 +1028,7 @@ public Builder setModeValue(int value) { * .google.datastore.v1.CommitRequest.Mode mode = 5; */ public com.google.datastore.v1.CommitRequest.Mode getMode() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_); return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; } @@ -1560,11 +1586,13 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder( } return mutationsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1586,11 +1614,12 @@ public static com.google.datastore.v1.CommitRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public CommitRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitRequest(input, extensionRegistry); + return new CommitRequest(input, extensionRegistry); } }; @@ -1603,6 +1632,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 ff72b2e89499..4ddc383d87f7 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 @@ -34,6 +34,9 @@ private CommitResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -45,13 +48,6 @@ private CommitResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 26: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { mutationResults_ = new java.util.ArrayList(); @@ -66,6 +62,13 @@ private CommitResponse( indexUpdates_ = input.readInt32(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -86,6 +89,7 @@ private CommitResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable @@ -169,6 +173,7 @@ public int getIndexUpdates() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -178,6 +183,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < mutationResults_.size(); i++) { @@ -189,6 +195,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -314,6 +321,7 @@ public static com.google.datastore.v1.CommitResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -321,6 +329,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CommitResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -348,6 +357,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable @@ -371,6 +381,7 @@ private void maybeForceBuilderInitialization() { getMutationResultsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (mutationResultsBuilder_ == null) { @@ -384,15 +395,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { return com.google.datastore.v1.CommitResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.CommitResponse build() { com.google.datastore.v1.CommitResponse result = buildPartial(); if (!result.isInitialized()) { @@ -401,6 +415,7 @@ public com.google.datastore.v1.CommitResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.CommitResponse buildPartial() { com.google.datastore.v1.CommitResponse result = new com.google.datastore.v1.CommitResponse(this); int from_bitField0_ = bitField0_; @@ -420,32 +435,39 @@ public com.google.datastore.v1.CommitResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CommitResponse) { return mergeFrom((com.google.datastore.v1.CommitResponse)other); @@ -491,10 +513,12 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -884,11 +908,13 @@ public Builder clearIndexUpdates() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -910,11 +936,12 @@ public static com.google.datastore.v1.CommitResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public CommitResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitResponse(input, extensionRegistry); + return new CommitResponse(input, extensionRegistry); } }; @@ -927,6 +954,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 20ab2f6c13fe..6b1bd91e109f 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 @@ -34,6 +34,9 @@ private CompositeFilter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -45,13 +48,6 @@ private CompositeFilter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); @@ -67,6 +63,13 @@ private CompositeFilter( input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -87,6 +90,7 @@ private CompositeFilter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable @@ -233,6 +237,7 @@ public int getOpValue() { * .google.datastore.v1.CompositeFilter.Operator op = 1; */ public com.google.datastore.v1.CompositeFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; } @@ -298,6 +303,7 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -307,6 +313,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) { @@ -318,6 +325,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -442,6 +450,7 @@ public static com.google.datastore.v1.CompositeFilter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -449,6 +458,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.CompositeFilter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -476,6 +486,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable @@ -499,6 +510,7 @@ private void maybeForceBuilderInitialization() { getFiltersFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); op_ = 0; @@ -512,15 +524,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor; } + @java.lang.Override public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.CompositeFilter build() { com.google.datastore.v1.CompositeFilter result = buildPartial(); if (!result.isInitialized()) { @@ -529,6 +544,7 @@ public com.google.datastore.v1.CompositeFilter build() { return result; } + @java.lang.Override public com.google.datastore.v1.CompositeFilter buildPartial() { com.google.datastore.v1.CompositeFilter result = new com.google.datastore.v1.CompositeFilter(this); int from_bitField0_ = bitField0_; @@ -548,32 +564,39 @@ public com.google.datastore.v1.CompositeFilter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.CompositeFilter) { return mergeFrom((com.google.datastore.v1.CompositeFilter)other); @@ -619,10 +642,12 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -673,6 +698,7 @@ public Builder setOpValue(int value) { * .google.datastore.v1.CompositeFilter.Operator op = 1; */ public com.google.datastore.v1.CompositeFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; } @@ -1035,11 +1061,13 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder( } return filtersBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1061,11 +1089,12 @@ public static com.google.datastore.v1.CompositeFilter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public CompositeFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CompositeFilter(input, extensionRegistry); + return new CompositeFilter(input, extensionRegistry); } }; @@ -1078,6 +1107,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 c4079ab19db1..0ef9ef973d45 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 @@ -132,7 +132,7 @@ public static void registerAllExtensions( "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" + "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " + "\003(\0132!.google.datastore.v1.EntityResult\0222" + - "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En", + "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" + "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" + "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" + "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" + @@ -142,7 +142,7 @@ public static void registerAllExtensions( ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." + "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" + "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" + - "e.datastore.v1.QueryResultBatch\022)\n\005query", + "e.datastore.v1.QueryResultBatch\022)\n\005query" + "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" + "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" + "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." + @@ -152,7 +152,7 @@ public static void registerAllExtensions( "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" + "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" + "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" + - "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t", + "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" + "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" + "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" + "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" + @@ -162,7 +162,7 @@ public static void registerAllExtensions( "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" + "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" + "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" + - "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser", + "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" + "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" + "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" + "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" + @@ -172,7 +172,7 @@ public static void registerAllExtensions( ".google.datastore.v1.EntityH\000\022*\n\006delete\030" + "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" + "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" + - "ct_detection_strategy\"c\n\016MutationResult\022", + "ct_detection_strategy\"c\n\016MutationResult\022" + "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" + "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" + "(\010\"\325\001\n\013ReadOptions\022L\n\020read_consistency\030\001" + @@ -182,7 +182,7 @@ public static void registerAllExtensions( "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" + "\n\020consistency_type\"\343\001\n\022TransactionOption" + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" + - ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre", + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" + "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" + "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" + @@ -192,7 +192,7 @@ public static void registerAllExtensions( "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" + "ery\022$.google.datastore.v1.RunQueryReques" + "t\032%.google.datastore.v1.RunQueryResponse" + - "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ", + "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" + "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" + "tastore.v1.BeginTransactionRequest\032-.goo" + "gle.datastore.v1.BeginTransactionRespons" + @@ -202,7 +202,7 @@ public static void registerAllExtensions( "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" + "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." + "google.datastore.v1.RollbackRequest\032%.go" + - "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223", + "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" + "\002\'\"\"/v1/projects/{project_id}:rollback:\001" + "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." + "AllocateIdsRequest\032(.google.datastore.v1" + @@ -212,7 +212,7 @@ public static void registerAllExtensions( "quest\032\'.google.datastore.v1.ReserveIdsRe" + "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" + "}:reserveIds:\001*B\241\001\n\027com.google.datastore" + - ".v1B\016DatastoreProtoP\001Z PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Entity parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Entity(input, extensionRegistry); + return new Entity(input, extensionRegistry); } }; @@ -1045,6 +1073,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Entity getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java index 69c4968146e0..880839ab0087 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java @@ -67,7 +67,7 @@ public static void registerAllExtensions( "6\n\014partition_id\030\001 \001(\0132 .google.datastore" + ".v1.PartitionId\0222\n\004path\030\002 \003(\0132$.google.d" + "atastore.v1.Key.PathElement\032D\n\013PathEleme" + - "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003", + "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003" + " \001(\tH\000B\t\n\007id_type\"8\n\nArrayValue\022*\n\006value" + "s\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n\005" + "Value\0220\n\nnull_value\030\013 \001(\0162\032.google.proto" + @@ -77,7 +77,7 @@ public static void registerAllExtensions( "gle.protobuf.TimestampH\000\022-\n\tkey_value\030\005 " + "\001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014strin" + "g_value\030\021 \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n" + - "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat", + "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat" + "LngH\000\0223\n\014entity_value\030\006 \001(\0132\033.google.dat" + "astore.v1.EntityH\000\0226\n\013array_value\030\t \001(\0132" + "\037.google.datastore.v1.ArrayValueH\000\022\017\n\007me" + @@ -87,7 +87,7 @@ public static void registerAllExtensions( "\003 \003(\0132+.google.datastore.v1.Entity.Prope" + "rtiesEntry\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001" + "(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore.v1." + - "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E", + "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E" + "ntityProtoP\001Z PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public EntityResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EntityResult(input, extensionRegistry); + return new EntityResult(input, extensionRegistry); } }; @@ -951,6 +978,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.EntityResult getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 2316e9675b4b..f6524f2efc3f 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 @@ -32,6 +32,9 @@ private Filter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -43,13 +46,6 @@ private Filter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.CompositeFilter.Builder subBuilder = null; if (filterTypeCase_ == 1) { @@ -78,6 +74,13 @@ private Filter( filterTypeCase_ = 2; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -95,6 +98,7 @@ private Filter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable @@ -217,6 +221,7 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -226,6 +231,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (filterTypeCase_ == 1) { @@ -237,6 +243,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -379,6 +386,7 @@ public static com.google.datastore.v1.Filter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -386,6 +394,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Filter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -413,6 +422,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable @@ -435,6 +445,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); filterTypeCase_ = 0; @@ -442,15 +453,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor; } + @java.lang.Override public com.google.datastore.v1.Filter getDefaultInstanceForType() { return com.google.datastore.v1.Filter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Filter build() { com.google.datastore.v1.Filter result = buildPartial(); if (!result.isInitialized()) { @@ -459,6 +473,7 @@ public com.google.datastore.v1.Filter build() { return result; } + @java.lang.Override public com.google.datastore.v1.Filter buildPartial() { com.google.datastore.v1.Filter result = new com.google.datastore.v1.Filter(this); if (filterTypeCase_ == 1) { @@ -480,32 +495,39 @@ public com.google.datastore.v1.Filter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Filter) { return mergeFrom((com.google.datastore.v1.Filter)other); @@ -535,10 +557,12 @@ public Builder mergeFrom(com.google.datastore.v1.Filter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -915,11 +939,13 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde onChanged();; return propertyFilterBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -941,11 +967,12 @@ public static com.google.datastore.v1.Filter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Filter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Filter(input, extensionRegistry); + return new Filter(input, extensionRegistry); } }; @@ -958,6 +985,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Filter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 4d475588075d..aa0971431bb0 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 @@ -35,6 +35,9 @@ private GqlQuery( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,13 +49,6 @@ private GqlQuery( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -86,6 +82,13 @@ private GqlQuery( namedBindings__.getKey(), namedBindings__.getValue()); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -107,6 +110,7 @@ private GqlQuery( } @SuppressWarnings({"rawtypes"}) + @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -117,6 +121,7 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable @@ -360,6 +365,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -369,6 +375,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getQueryStringBytes().isEmpty()) { @@ -389,6 +396,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -538,6 +546,7 @@ public static com.google.datastore.v1.GqlQuery parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -545,6 +554,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.GqlQuery prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -594,6 +604,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable @@ -617,6 +628,7 @@ private void maybeForceBuilderInitialization() { getPositionalBindingsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); queryString_ = ""; @@ -633,15 +645,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor; } + @java.lang.Override public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.GqlQuery build() { com.google.datastore.v1.GqlQuery result = buildPartial(); if (!result.isInitialized()) { @@ -650,6 +665,7 @@ public com.google.datastore.v1.GqlQuery build() { return result; } + @java.lang.Override public com.google.datastore.v1.GqlQuery buildPartial() { com.google.datastore.v1.GqlQuery result = new com.google.datastore.v1.GqlQuery(this); int from_bitField0_ = bitField0_; @@ -672,32 +688,39 @@ public com.google.datastore.v1.GqlQuery buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.GqlQuery) { return mergeFrom((com.google.datastore.v1.GqlQuery)other); @@ -749,10 +772,12 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1450,11 +1475,13 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu } return positionalBindingsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1476,11 +1503,12 @@ public static com.google.datastore.v1.GqlQuery getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public GqlQuery parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GqlQuery(input, extensionRegistry); + return new GqlQuery(input, extensionRegistry); } }; @@ -1493,6 +1521,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 a5b13168e4ef..89d6e7f8728d 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 @@ -32,6 +32,9 @@ private GqlQueryParameter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -43,13 +46,6 @@ private GqlQueryParameter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 18: { com.google.datastore.v1.Value.Builder subBuilder = null; if (parameterTypeCase_ == 2) { @@ -69,6 +65,13 @@ private GqlQueryParameter( parameterType_ = input.readBytes(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -86,6 +89,7 @@ private GqlQueryParameter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable @@ -186,6 +190,7 @@ public com.google.protobuf.ByteString getCursor() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -195,6 +200,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (parameterTypeCase_ == 2) { @@ -207,6 +213,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -350,6 +357,7 @@ public static com.google.datastore.v1.GqlQueryParameter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -357,6 +365,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.GqlQueryParameter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -384,6 +393,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable @@ -406,6 +416,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); parameterTypeCase_ = 0; @@ -413,15 +424,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor; } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { return com.google.datastore.v1.GqlQueryParameter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter build() { com.google.datastore.v1.GqlQueryParameter result = buildPartial(); if (!result.isInitialized()) { @@ -430,6 +444,7 @@ public com.google.datastore.v1.GqlQueryParameter build() { return result; } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter buildPartial() { com.google.datastore.v1.GqlQueryParameter result = new com.google.datastore.v1.GqlQueryParameter(this); if (parameterTypeCase_ == 2) { @@ -447,32 +462,39 @@ public com.google.datastore.v1.GqlQueryParameter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.GqlQueryParameter) { return mergeFrom((com.google.datastore.v1.GqlQueryParameter)other); @@ -502,10 +524,12 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -758,11 +782,13 @@ public Builder clearCursor() { } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -784,11 +810,12 @@ public static com.google.datastore.v1.GqlQueryParameter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public GqlQueryParameter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GqlQueryParameter(input, extensionRegistry); + return new GqlQueryParameter(input, extensionRegistry); } }; @@ -801,6 +828,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 23b1a3050f14..4aa66ebd8577 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 @@ -36,6 +36,9 @@ private Key( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,13 +50,6 @@ private Key( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PartitionId.Builder subBuilder = null; if (partitionId_ != null) { @@ -76,6 +72,13 @@ private Key( input.readMessage(com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -96,6 +99,7 @@ private Key( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable @@ -200,6 +204,9 @@ private PathElement( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -211,13 +218,6 @@ private PathElement( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -235,6 +235,13 @@ private PathElement( idType_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -252,6 +259,7 @@ private PathElement( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable @@ -420,6 +428,7 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -429,6 +438,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getKindBytes().isEmpty()) { @@ -444,6 +454,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -594,6 +605,7 @@ public static com.google.datastore.v1.Key.PathElement parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -601,6 +613,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Key.PathElement prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -630,6 +643,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable @@ -652,6 +666,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); kind_ = ""; @@ -661,15 +676,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor; } + @java.lang.Override public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { return com.google.datastore.v1.Key.PathElement.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Key.PathElement build() { com.google.datastore.v1.Key.PathElement result = buildPartial(); if (!result.isInitialized()) { @@ -678,6 +696,7 @@ public com.google.datastore.v1.Key.PathElement build() { return result; } + @java.lang.Override public com.google.datastore.v1.Key.PathElement buildPartial() { com.google.datastore.v1.Key.PathElement result = new com.google.datastore.v1.Key.PathElement(this); result.kind_ = kind_; @@ -692,32 +711,39 @@ public com.google.datastore.v1.Key.PathElement buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Key.PathElement) { return mergeFrom((com.google.datastore.v1.Key.PathElement)other); @@ -753,10 +779,12 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1056,11 +1084,13 @@ public Builder setNameBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1082,11 +1112,12 @@ public static com.google.datastore.v1.Key.PathElement getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PathElement parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PathElement(input, extensionRegistry); + return new PathElement(input, extensionRegistry); } }; @@ -1099,6 +1130,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1266,6 +1298,7 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1275,6 +1308,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (partitionId_ != null) { @@ -1286,6 +1320,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1416,6 +1451,7 @@ public static com.google.datastore.v1.Key parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1423,6 +1459,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Key prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1453,6 +1490,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable @@ -1476,6 +1514,7 @@ private void maybeForceBuilderInitialization() { getPathFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (partitionIdBuilder_ == null) { @@ -1493,15 +1532,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor; } + @java.lang.Override public com.google.datastore.v1.Key getDefaultInstanceForType() { return com.google.datastore.v1.Key.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Key build() { com.google.datastore.v1.Key result = buildPartial(); if (!result.isInitialized()) { @@ -1510,6 +1552,7 @@ public com.google.datastore.v1.Key build() { return result; } + @java.lang.Override public com.google.datastore.v1.Key buildPartial() { com.google.datastore.v1.Key result = new com.google.datastore.v1.Key(this); int from_bitField0_ = bitField0_; @@ -1533,32 +1576,39 @@ public com.google.datastore.v1.Key buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Key) { return mergeFrom((com.google.datastore.v1.Key)other); @@ -1604,10 +1654,12 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2343,11 +2395,13 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder( } return pathBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2369,11 +2423,12 @@ public static com.google.datastore.v1.Key getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Key parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Key(input, extensionRegistry); + return new Key(input, extensionRegistry); } }; @@ -2386,6 +2441,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Key getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 aa24aa42c9fb..1b209dd97bce 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 @@ -33,6 +33,9 @@ private KindExpression( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,6 +47,12 @@ private KindExpression( case 0: done = true; break; + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -51,12 +60,6 @@ private KindExpression( } break; } - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -74,6 +77,7 @@ private KindExpression( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable @@ -124,6 +128,7 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -133,6 +138,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -141,6 +147,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -255,6 +262,7 @@ public static com.google.datastore.v1.KindExpression parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -262,6 +270,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.KindExpression prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -289,6 +298,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable @@ -311,6 +321,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -318,15 +329,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor; } + @java.lang.Override public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { return com.google.datastore.v1.KindExpression.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.KindExpression build() { com.google.datastore.v1.KindExpression result = buildPartial(); if (!result.isInitialized()) { @@ -335,6 +349,7 @@ public com.google.datastore.v1.KindExpression build() { return result; } + @java.lang.Override public com.google.datastore.v1.KindExpression buildPartial() { com.google.datastore.v1.KindExpression result = new com.google.datastore.v1.KindExpression(this); result.name_ = name_; @@ -342,32 +357,39 @@ public com.google.datastore.v1.KindExpression buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.KindExpression) { return mergeFrom((com.google.datastore.v1.KindExpression)other); @@ -388,10 +410,12 @@ public Builder mergeFrom(com.google.datastore.v1.KindExpression other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -498,11 +522,13 @@ public Builder setNameBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -524,11 +550,12 @@ public static com.google.datastore.v1.KindExpression getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public KindExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KindExpression(input, extensionRegistry); + return new KindExpression(input, extensionRegistry); } }; @@ -541,6 +568,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.KindExpression getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 47cfa042237c..28bbc80dfa15 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 @@ -34,6 +34,9 @@ private LookupRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -45,13 +48,6 @@ private LookupRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.ReadOptions.Builder subBuilder = null; if (readOptions_ != null) { @@ -80,6 +76,13 @@ private LookupRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -100,6 +103,7 @@ private LookupRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable @@ -239,6 +243,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -248,6 +253,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (readOptions_ != null) { @@ -262,6 +268,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -399,6 +406,7 @@ public static com.google.datastore.v1.LookupRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -406,6 +414,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.LookupRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -433,6 +442,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable @@ -456,6 +466,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -475,15 +486,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { return com.google.datastore.v1.LookupRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.LookupRequest build() { com.google.datastore.v1.LookupRequest result = buildPartial(); if (!result.isInitialized()) { @@ -492,6 +506,7 @@ public com.google.datastore.v1.LookupRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.LookupRequest buildPartial() { com.google.datastore.v1.LookupRequest result = new com.google.datastore.v1.LookupRequest(this); int from_bitField0_ = bitField0_; @@ -516,32 +531,39 @@ public com.google.datastore.v1.LookupRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.LookupRequest) { return mergeFrom((com.google.datastore.v1.LookupRequest)other); @@ -591,10 +613,12 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1167,11 +1191,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1193,11 +1219,12 @@ public static com.google.datastore.v1.LookupRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public LookupRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LookupRequest(input, extensionRegistry); + return new LookupRequest(input, extensionRegistry); } }; @@ -1210,6 +1237,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 404d34c0fe31..9e60ec806650 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 @@ -35,6 +35,9 @@ private LookupResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,13 +49,6 @@ private LookupResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { found_ = new java.util.ArrayList(); @@ -80,6 +76,13 @@ private LookupResponse( input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -106,6 +109,7 @@ private LookupResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable @@ -309,6 +313,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -318,6 +323,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < found_.size(); i++) { @@ -332,6 +338,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -469,6 +476,7 @@ public static com.google.datastore.v1.LookupResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -476,6 +484,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.LookupResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -503,6 +512,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable @@ -528,6 +538,7 @@ private void maybeForceBuilderInitialization() { getDeferredFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (foundBuilder_ == null) { @@ -551,15 +562,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { return com.google.datastore.v1.LookupResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.LookupResponse build() { com.google.datastore.v1.LookupResponse result = buildPartial(); if (!result.isInitialized()) { @@ -568,6 +582,7 @@ public com.google.datastore.v1.LookupResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.LookupResponse buildPartial() { com.google.datastore.v1.LookupResponse result = new com.google.datastore.v1.LookupResponse(this); int from_bitField0_ = bitField0_; @@ -602,32 +617,39 @@ public com.google.datastore.v1.LookupResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.LookupResponse) { return mergeFrom((com.google.datastore.v1.LookupResponse)other); @@ -722,10 +744,12 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1788,11 +1812,13 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder( } return deferredBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1814,11 +1840,12 @@ public static com.google.datastore.v1.LookupResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public LookupResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LookupResponse(input, extensionRegistry); + return new LookupResponse(input, extensionRegistry); } }; @@ -1831,6 +1858,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 2d2c086ffd4a..964394faf80c 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 @@ -32,6 +32,9 @@ private Mutation( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -43,13 +46,6 @@ private Mutation( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 34: { com.google.datastore.v1.Entity.Builder subBuilder = null; if (operationCase_ == 4) { @@ -111,6 +107,13 @@ private Mutation( conflictDetectionStrategy_ = input.readInt64(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -128,6 +131,7 @@ private Mutation( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable @@ -394,6 +398,7 @@ public long getBaseVersion() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -403,6 +408,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (operationCase_ == 4) { @@ -424,6 +430,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -615,6 +622,7 @@ public static com.google.datastore.v1.Mutation parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -622,6 +630,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Mutation prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -649,6 +658,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable @@ -671,6 +681,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); operationCase_ = 0; @@ -680,15 +691,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor; } + @java.lang.Override public com.google.datastore.v1.Mutation getDefaultInstanceForType() { return com.google.datastore.v1.Mutation.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Mutation build() { com.google.datastore.v1.Mutation result = buildPartial(); if (!result.isInitialized()) { @@ -697,6 +711,7 @@ public com.google.datastore.v1.Mutation build() { return result; } + @java.lang.Override public com.google.datastore.v1.Mutation buildPartial() { com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this); if (operationCase_ == 4) { @@ -736,32 +751,39 @@ public com.google.datastore.v1.Mutation buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Mutation) { return mergeFrom((com.google.datastore.v1.Mutation)other); @@ -808,10 +830,12 @@ public Builder mergeFrom(com.google.datastore.v1.Mutation other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1628,11 +1652,13 @@ public Builder clearBaseVersion() { } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1654,11 +1680,12 @@ public static com.google.datastore.v1.Mutation getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Mutation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Mutation(input, extensionRegistry); + return new Mutation(input, extensionRegistry); } }; @@ -1671,6 +1698,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Mutation getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 dceeb36d61de..3a2fcf2cf9ab 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 @@ -34,6 +34,9 @@ private MutationResult( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -45,13 +48,6 @@ private MutationResult( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 26: { com.google.datastore.v1.Key.Builder subBuilder = null; if (key_ != null) { @@ -75,6 +71,13 @@ private MutationResult( conflictDetected_ = input.readBool(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -92,6 +95,7 @@ private MutationResult( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable @@ -167,6 +171,7 @@ public boolean getConflictDetected() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -176,6 +181,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (key_ != null) { @@ -190,6 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -328,6 +335,7 @@ public static com.google.datastore.v1.MutationResult parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -335,6 +343,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.MutationResult prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -362,6 +371,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable @@ -384,6 +394,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (keyBuilder_ == null) { @@ -399,15 +410,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor; } + @java.lang.Override public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { return com.google.datastore.v1.MutationResult.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.MutationResult build() { com.google.datastore.v1.MutationResult result = buildPartial(); if (!result.isInitialized()) { @@ -416,6 +430,7 @@ public com.google.datastore.v1.MutationResult build() { return result; } + @java.lang.Override public com.google.datastore.v1.MutationResult buildPartial() { com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this); if (keyBuilder_ == null) { @@ -429,32 +444,39 @@ public com.google.datastore.v1.MutationResult buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.MutationResult) { return mergeFrom((com.google.datastore.v1.MutationResult)other); @@ -480,10 +502,12 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -754,11 +778,13 @@ public Builder clearConflictDetected() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -780,11 +806,12 @@ public static com.google.datastore.v1.MutationResult getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public MutationResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MutationResult(input, extensionRegistry); + return new MutationResult(input, extensionRegistry); } }; @@ -797,6 +824,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.MutationResult getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 e9846c8dacb3..d2865ea2798a 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 @@ -48,6 +48,9 @@ private PartitionId( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -59,13 +62,6 @@ private PartitionId( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 18: { java.lang.String s = input.readStringRequireUtf8(); @@ -78,6 +74,13 @@ private PartitionId( namespaceId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -95,6 +98,7 @@ private PartitionId( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable @@ -187,6 +191,7 @@ public java.lang.String getNamespaceId() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -196,6 +201,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getProjectIdBytes().isEmpty()) { @@ -207,6 +213,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -328,6 +335,7 @@ public static com.google.datastore.v1.PartitionId parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -335,6 +343,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PartitionId prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -376,6 +385,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable @@ -398,6 +408,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -407,15 +418,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor; } + @java.lang.Override public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { return com.google.datastore.v1.PartitionId.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PartitionId build() { com.google.datastore.v1.PartitionId result = buildPartial(); if (!result.isInitialized()) { @@ -424,6 +438,7 @@ public com.google.datastore.v1.PartitionId build() { return result; } + @java.lang.Override public com.google.datastore.v1.PartitionId buildPartial() { com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this); result.projectId_ = projectId_; @@ -432,32 +447,39 @@ public com.google.datastore.v1.PartitionId buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PartitionId) { return mergeFrom((com.google.datastore.v1.PartitionId)other); @@ -482,10 +504,12 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -681,11 +705,13 @@ public Builder setNamespaceIdBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -707,11 +733,12 @@ public static com.google.datastore.v1.PartitionId getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PartitionId parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PartitionId(input, extensionRegistry); + return new PartitionId(input, extensionRegistry); } }; @@ -724,6 +751,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PartitionId getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 b6c3bc4324d7..e606620c8650 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 @@ -32,6 +32,9 @@ private Projection( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -43,13 +46,6 @@ private Projection( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -63,6 +59,13 @@ private Projection( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -80,6 +83,7 @@ private Projection( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable @@ -121,6 +125,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -130,6 +135,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -138,6 +144,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -258,6 +265,7 @@ public static com.google.datastore.v1.Projection parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -265,6 +273,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Projection prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -292,6 +301,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable @@ -314,6 +324,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -325,15 +336,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor; } + @java.lang.Override public com.google.datastore.v1.Projection getDefaultInstanceForType() { return com.google.datastore.v1.Projection.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Projection build() { com.google.datastore.v1.Projection result = buildPartial(); if (!result.isInitialized()) { @@ -342,6 +356,7 @@ public com.google.datastore.v1.Projection build() { return result; } + @java.lang.Override public com.google.datastore.v1.Projection buildPartial() { com.google.datastore.v1.Projection result = new com.google.datastore.v1.Projection(this); if (propertyBuilder_ == null) { @@ -353,32 +368,39 @@ public com.google.datastore.v1.Projection buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Projection) { return mergeFrom((com.google.datastore.v1.Projection)other); @@ -398,10 +420,12 @@ public Builder mergeFrom(com.google.datastore.v1.Projection other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -572,11 +596,13 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } return propertyBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -598,11 +624,12 @@ public static com.google.datastore.v1.Projection getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Projection parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Projection(input, extensionRegistry); + return new Projection(input, extensionRegistry); } }; @@ -615,6 +642,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Projection getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 0e541e9272a3..9651ee87e9d1 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 @@ -33,6 +33,9 @@ private PropertyFilter( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,13 +47,6 @@ private PropertyFilter( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -83,6 +79,13 @@ private PropertyFilter( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -100,6 +103,7 @@ private PropertyFilter( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable @@ -363,6 +367,7 @@ public int getOpValue() { * .google.datastore.v1.PropertyFilter.Operator op = 2; */ public com.google.datastore.v1.PropertyFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; } @@ -401,6 +406,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -410,6 +416,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -424,6 +431,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -564,6 +572,7 @@ public static com.google.datastore.v1.PropertyFilter parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -571,6 +580,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyFilter prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -598,6 +608,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable @@ -620,6 +631,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -639,15 +651,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor; } + @java.lang.Override public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PropertyFilter build() { com.google.datastore.v1.PropertyFilter result = buildPartial(); if (!result.isInitialized()) { @@ -656,6 +671,7 @@ public com.google.datastore.v1.PropertyFilter build() { return result; } + @java.lang.Override public com.google.datastore.v1.PropertyFilter buildPartial() { com.google.datastore.v1.PropertyFilter result = new com.google.datastore.v1.PropertyFilter(this); if (propertyBuilder_ == null) { @@ -673,32 +689,39 @@ public com.google.datastore.v1.PropertyFilter buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyFilter) { return mergeFrom((com.google.datastore.v1.PropertyFilter)other); @@ -724,10 +747,12 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyFilter other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -930,6 +955,7 @@ public Builder setOpValue(int value) { * .google.datastore.v1.PropertyFilter.Operator op = 2; */ public com.google.datastore.v1.PropertyFilter.Operator getOp() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_); return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; } @@ -1115,11 +1141,13 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { } return valueBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1141,11 +1169,12 @@ public static com.google.datastore.v1.PropertyFilter getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PropertyFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyFilter(input, extensionRegistry); + return new PropertyFilter(input, extensionRegistry); } }; @@ -1158,6 +1187,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 8f54ee070f50..f13b15baedbe 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 @@ -33,6 +33,9 @@ private PropertyOrder( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,13 +47,6 @@ private PropertyOrder( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.PropertyReference.Builder subBuilder = null; if (property_ != null) { @@ -70,6 +66,13 @@ private PropertyOrder( direction_ = rawValue; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -87,6 +90,7 @@ private PropertyOrder( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable @@ -282,11 +286,13 @@ public int getDirectionValue() { * .google.datastore.v1.PropertyOrder.Direction direction = 2; */ public com.google.datastore.v1.PropertyOrder.Direction getDirection() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -296,6 +302,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (property_ != null) { @@ -307,6 +314,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -434,6 +442,7 @@ public static com.google.datastore.v1.PropertyOrder parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -441,6 +450,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyOrder prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -468,6 +478,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable @@ -490,6 +501,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (propertyBuilder_ == null) { @@ -503,15 +515,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor; } + @java.lang.Override public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { return com.google.datastore.v1.PropertyOrder.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PropertyOrder build() { com.google.datastore.v1.PropertyOrder result = buildPartial(); if (!result.isInitialized()) { @@ -520,6 +535,7 @@ public com.google.datastore.v1.PropertyOrder build() { return result; } + @java.lang.Override public com.google.datastore.v1.PropertyOrder buildPartial() { com.google.datastore.v1.PropertyOrder result = new com.google.datastore.v1.PropertyOrder(this); if (propertyBuilder_ == null) { @@ -532,32 +548,39 @@ public com.google.datastore.v1.PropertyOrder buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyOrder) { return mergeFrom((com.google.datastore.v1.PropertyOrder)other); @@ -580,10 +603,12 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyOrder other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -786,6 +811,7 @@ public Builder setDirectionValue(int value) { * .google.datastore.v1.PropertyOrder.Direction direction = 2; */ public com.google.datastore.v1.PropertyOrder.Direction getDirection() { + @SuppressWarnings("deprecation") com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_); return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; } @@ -818,11 +844,13 @@ public Builder clearDirection() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -844,11 +872,12 @@ public static com.google.datastore.v1.PropertyOrder getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PropertyOrder parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyOrder(input, extensionRegistry); + return new PropertyOrder(input, extensionRegistry); } }; @@ -861,6 +890,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 42c029296258..ae6196b33b1e 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 @@ -33,6 +33,9 @@ private PropertyReference( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,6 +47,12 @@ private PropertyReference( case 0: done = true; break; + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -51,12 +60,6 @@ private PropertyReference( } break; } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -74,6 +77,7 @@ private PropertyReference( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable @@ -126,6 +130,7 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -135,6 +140,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -143,6 +149,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -257,6 +264,7 @@ public static com.google.datastore.v1.PropertyReference parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -264,6 +272,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.PropertyReference prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -291,6 +300,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable @@ -313,6 +323,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -320,15 +331,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor; } + @java.lang.Override public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { return com.google.datastore.v1.PropertyReference.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.PropertyReference build() { com.google.datastore.v1.PropertyReference result = buildPartial(); if (!result.isInitialized()) { @@ -337,6 +351,7 @@ public com.google.datastore.v1.PropertyReference build() { return result; } + @java.lang.Override public com.google.datastore.v1.PropertyReference buildPartial() { com.google.datastore.v1.PropertyReference result = new com.google.datastore.v1.PropertyReference(this); result.name_ = name_; @@ -344,32 +359,39 @@ public com.google.datastore.v1.PropertyReference buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.PropertyReference) { return mergeFrom((com.google.datastore.v1.PropertyReference)other); @@ -390,10 +412,12 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -505,11 +529,13 @@ public Builder setNameBytes( onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -531,11 +557,12 @@ public static com.google.datastore.v1.PropertyReference getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PropertyReference parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyReference(input, extensionRegistry); + return new PropertyReference(input, extensionRegistry); } }; @@ -548,6 +575,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 e111dce94ef0..3e5e2298562a 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 @@ -39,6 +39,9 @@ private Query( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -50,13 +53,6 @@ private Query( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 18: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { projection_ = new java.util.ArrayList(); @@ -134,6 +130,13 @@ private Query( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -163,6 +166,7 @@ private Query( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable @@ -526,6 +530,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -535,6 +540,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < projection_.size(); i++) { @@ -567,6 +573,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -764,6 +771,7 @@ public static com.google.datastore.v1.Query parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -771,6 +779,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Query prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -798,6 +807,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable @@ -824,6 +834,7 @@ private void maybeForceBuilderInitialization() { getDistinctOnFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (projectionBuilder_ == null) { @@ -871,15 +882,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor; } + @java.lang.Override public com.google.datastore.v1.Query getDefaultInstanceForType() { return com.google.datastore.v1.Query.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Query build() { com.google.datastore.v1.Query result = buildPartial(); if (!result.isInitialized()) { @@ -888,6 +902,7 @@ public com.google.datastore.v1.Query build() { return result; } + @java.lang.Override public com.google.datastore.v1.Query buildPartial() { com.google.datastore.v1.Query result = new com.google.datastore.v1.Query(this); int from_bitField0_ = bitField0_; @@ -946,32 +961,39 @@ public com.google.datastore.v1.Query buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Query) { return mergeFrom((com.google.datastore.v1.Query)other); @@ -1107,10 +1129,12 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2899,11 +2923,13 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { } return limitBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2925,11 +2951,12 @@ public static com.google.datastore.v1.Query getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Query parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Query(input, extensionRegistry); + return new Query(input, extensionRegistry); } }; @@ -2942,6 +2969,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Query getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 e44c96e8e637..6a2c87081b1d 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 @@ -97,7 +97,7 @@ public static void registerAllExtensions( "\n\007version\030\004 \001(\003\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResul" + "tType\022\033\n\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FU" + "LL\020\001\022\016\n\nPROJECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Q" + - "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast", + "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast" + "ore.v1.Projection\0221\n\004kind\030\003 \003(\0132#.google" + ".datastore.v1.KindExpression\022+\n\006filter\030\004" + " \001(\0132\033.google.datastore.v1.Filter\0221\n\005ord" + @@ -107,7 +107,7 @@ public static void registerAllExtensions( "r\030\007 \001(\014\022\022\n\nend_cursor\030\010 \001(\014\022\016\n\006offset\030\n " + "\001(\005\022*\n\005limit\030\014 \001(\0132\033.google.protobuf.Int" + "32Value\"\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\"" + - "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr", + "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr" + "ojection\0228\n\010property\030\001 \001(\0132&.google.data" + "store.v1.PropertyReference\"\321\001\n\rPropertyO" + "rder\0228\n\010property\030\001 \001(\0132&.google.datastor" + @@ -117,7 +117,7 @@ public static void registerAllExtensions( "IFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"\231" + "\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$.go" + "ogle.datastore.v1.CompositeFilterH\000\022>\n\017p" + - "roperty_filter\030\002 \001(\0132#.google.datastore.", + "roperty_filter\030\002 \001(\0132#.google.datastore." + "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" + "store.v1.CompositeFilter.Operator\022,\n\007fil" + @@ -127,7 +127,7 @@ public static void registerAllExtensions( "\001(\0132&.google.datastore.v1.PropertyRefere" + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" + - "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n", + "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" + @@ -137,7 +137,7 @@ public static void registerAllExtensions( "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" + "nal_bindings\030\004 \003(\0132&.google.datastore.v1" + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" + - "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da", + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" + "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" + @@ -147,7 +147,7 @@ public static void registerAllExtensions( "e.datastore.v1.EntityResult.ResultType\0229" + "\n\016entity_results\030\002 \003(\0132!.google.datastor" + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" + - "\014more_results\030\005 \001(\01625.google.datastore.v", + "\014more_results\030\005 \001(\01625.google.datastore.v" + "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index b1b10aa07ef9..ce62b3d62495 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -39,6 +39,9 @@ private QueryResultBatch( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -50,13 +53,6 @@ private QueryResultBatch( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); @@ -98,6 +94,13 @@ private QueryResultBatch( snapshotVersion_ = input.readInt64(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -118,6 +121,7 @@ private QueryResultBatch( return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable @@ -344,6 +348,7 @@ public int getEntityResultTypeValue() { * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; */ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { + @SuppressWarnings("deprecation") com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; } @@ -436,6 +441,7 @@ public int getMoreResultsValue() { * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; */ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { + @SuppressWarnings("deprecation") com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } @@ -461,6 +467,7 @@ public long getSnapshotVersion() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -470,6 +477,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) { @@ -496,6 +504,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -660,6 +669,7 @@ public static com.google.datastore.v1.QueryResultBatch parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -667,6 +677,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.QueryResultBatch prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -694,6 +705,7 @@ public static final class Builder extends return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable @@ -717,6 +729,7 @@ private void maybeForceBuilderInitialization() { getEntityResultsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); skippedResults_ = 0; @@ -740,15 +753,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor; } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { return com.google.datastore.v1.QueryResultBatch.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch build() { com.google.datastore.v1.QueryResultBatch result = buildPartial(); if (!result.isInitialized()) { @@ -757,6 +773,7 @@ public com.google.datastore.v1.QueryResultBatch build() { return result; } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch buildPartial() { com.google.datastore.v1.QueryResultBatch result = new com.google.datastore.v1.QueryResultBatch(this); int from_bitField0_ = bitField0_; @@ -781,32 +798,39 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.QueryResultBatch) { return mergeFrom((com.google.datastore.v1.QueryResultBatch)other); @@ -867,10 +891,12 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1003,6 +1029,7 @@ public Builder setEntityResultTypeValue(int value) { * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1; */ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { + @SuppressWarnings("deprecation") com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_); return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; } @@ -1420,6 +1447,7 @@ public Builder setMoreResultsValue(int value) { * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5; */ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() { + @SuppressWarnings("deprecation") com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_); return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } @@ -1511,11 +1539,13 @@ public Builder clearSnapshotVersion() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1537,11 +1567,12 @@ public static com.google.datastore.v1.QueryResultBatch getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public QueryResultBatch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new QueryResultBatch(input, extensionRegistry); + return new QueryResultBatch(input, extensionRegistry); } }; @@ -1554,6 +1585,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index b2bcfaa948fc..636a6d7aa754 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -32,6 +32,9 @@ private ReadOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -43,13 +46,6 @@ private ReadOptions( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); consistencyTypeCase_ = 1; @@ -61,6 +57,13 @@ private ReadOptions( consistencyType_ = input.readBytes(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -78,6 +81,7 @@ private ReadOptions( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable @@ -283,6 +287,7 @@ public int getReadConsistencyValue() { */ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { if (consistencyTypeCase_ == 1) { + @SuppressWarnings("deprecation") com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( (java.lang.Integer) consistencyType_); return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; @@ -308,6 +313,7 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -317,6 +323,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (consistencyTypeCase_ == 1) { @@ -329,6 +336,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -472,6 +480,7 @@ public static com.google.datastore.v1.ReadOptions parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -479,6 +488,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReadOptions prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -506,6 +516,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable @@ -528,6 +539,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); consistencyTypeCase_ = 0; @@ -535,15 +547,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor; } + @java.lang.Override public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { return com.google.datastore.v1.ReadOptions.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ReadOptions build() { com.google.datastore.v1.ReadOptions result = buildPartial(); if (!result.isInitialized()) { @@ -552,6 +567,7 @@ public com.google.datastore.v1.ReadOptions build() { return result; } + @java.lang.Override public com.google.datastore.v1.ReadOptions buildPartial() { com.google.datastore.v1.ReadOptions result = new com.google.datastore.v1.ReadOptions(this); if (consistencyTypeCase_ == 1) { @@ -565,32 +581,39 @@ public com.google.datastore.v1.ReadOptions buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReadOptions) { return mergeFrom((com.google.datastore.v1.ReadOptions)other); @@ -620,10 +643,12 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -695,6 +720,7 @@ public Builder setReadConsistencyValue(int value) { */ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() { if (consistencyTypeCase_ == 1) { + @SuppressWarnings("deprecation") com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf( (java.lang.Integer) consistencyType_); return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result; @@ -785,11 +811,13 @@ public Builder clearTransaction() { } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -811,11 +839,12 @@ public static com.google.datastore.v1.ReadOptions getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReadOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOptions(input, extensionRegistry); + return new ReadOptions(input, extensionRegistry); } }; @@ -828,6 +857,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 d5c5f26c5142..2ca48d034b44 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 @@ -35,6 +35,9 @@ private ReserveIdsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,13 +49,6 @@ private ReserveIdsRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { keys_ = new java.util.ArrayList(); @@ -74,6 +70,13 @@ private ReserveIdsRequest( databaseId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -94,6 +97,7 @@ private ReserveIdsRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable @@ -247,6 +251,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -256,6 +261,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { @@ -270,6 +276,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -401,6 +408,7 @@ public static com.google.datastore.v1.ReserveIdsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -408,6 +416,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReserveIdsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -435,6 +444,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable @@ -458,6 +468,7 @@ private void maybeForceBuilderInitialization() { getKeysFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -473,15 +484,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { return com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest build() { com.google.datastore.v1.ReserveIdsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -490,6 +504,7 @@ public com.google.datastore.v1.ReserveIdsRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest buildPartial() { com.google.datastore.v1.ReserveIdsRequest result = new com.google.datastore.v1.ReserveIdsRequest(this); int from_bitField0_ = bitField0_; @@ -510,32 +525,39 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReserveIdsRequest) { return mergeFrom((com.google.datastore.v1.ReserveIdsRequest)other); @@ -586,10 +608,12 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1116,11 +1140,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder( } return keysBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1142,11 +1168,12 @@ public static com.google.datastore.v1.ReserveIdsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReserveIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsRequest(input, extensionRegistry); + return new ReserveIdsRequest(input, extensionRegistry); } }; @@ -1159,6 +1186,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 d5d38f6b6f60..7294241714ea 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 @@ -32,6 +32,9 @@ private ReserveIdsResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -66,6 +69,7 @@ private ReserveIdsResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable @@ -74,6 +78,7 @@ private ReserveIdsResponse( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -83,11 +88,13 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -195,6 +202,7 @@ public static com.google.datastore.v1.ReserveIdsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -202,6 +210,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.ReserveIdsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -229,6 +238,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable @@ -251,20 +261,24 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { return com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse build() { com.google.datastore.v1.ReserveIdsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -273,38 +287,46 @@ public com.google.datastore.v1.ReserveIdsResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse buildPartial() { com.google.datastore.v1.ReserveIdsResponse result = new com.google.datastore.v1.ReserveIdsResponse(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.ReserveIdsResponse) { return mergeFrom((com.google.datastore.v1.ReserveIdsResponse)other); @@ -321,10 +343,12 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -342,11 +366,13 @@ public Builder mergeFrom( } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -368,11 +394,12 @@ public static com.google.datastore.v1.ReserveIdsResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReserveIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsResponse(input, extensionRegistry); + return new ReserveIdsResponse(input, extensionRegistry); } }; @@ -385,6 +412,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 0aa141f0cea0..8d51f0be2032 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 @@ -34,6 +34,9 @@ private RollbackRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -45,13 +48,6 @@ private RollbackRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { transaction_ = input.readBytes(); @@ -63,6 +59,13 @@ private RollbackRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -80,6 +83,7 @@ private RollbackRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable @@ -144,6 +148,7 @@ public com.google.protobuf.ByteString getTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -153,6 +158,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!transaction_.isEmpty()) { @@ -164,6 +170,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -286,6 +293,7 @@ public static com.google.datastore.v1.RollbackRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -293,6 +301,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RollbackRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -320,6 +329,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable @@ -342,6 +352,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -351,15 +362,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { return com.google.datastore.v1.RollbackRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RollbackRequest build() { com.google.datastore.v1.RollbackRequest result = buildPartial(); if (!result.isInitialized()) { @@ -368,6 +382,7 @@ public com.google.datastore.v1.RollbackRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.RollbackRequest buildPartial() { com.google.datastore.v1.RollbackRequest result = new com.google.datastore.v1.RollbackRequest(this); result.projectId_ = projectId_; @@ -376,32 +391,39 @@ public com.google.datastore.v1.RollbackRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RollbackRequest) { return mergeFrom((com.google.datastore.v1.RollbackRequest)other); @@ -425,10 +447,12 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -579,11 +603,13 @@ public Builder clearTransaction() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -605,11 +631,12 @@ public static com.google.datastore.v1.RollbackRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RollbackRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackRequest(input, extensionRegistry); + return new RollbackRequest(input, extensionRegistry); } }; @@ -622,6 +649,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 f309bbc17cf5..0690ba911eb3 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 @@ -33,6 +33,9 @@ private RollbackResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -67,6 +70,7 @@ private RollbackResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable @@ -75,6 +79,7 @@ private RollbackResponse( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -84,11 +89,13 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -196,6 +203,7 @@ public static com.google.datastore.v1.RollbackResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -203,6 +211,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RollbackResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -231,6 +240,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable @@ -253,20 +263,24 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { return com.google.datastore.v1.RollbackResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RollbackResponse build() { com.google.datastore.v1.RollbackResponse result = buildPartial(); if (!result.isInitialized()) { @@ -275,38 +289,46 @@ public com.google.datastore.v1.RollbackResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.RollbackResponse buildPartial() { com.google.datastore.v1.RollbackResponse result = new com.google.datastore.v1.RollbackResponse(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RollbackResponse) { return mergeFrom((com.google.datastore.v1.RollbackResponse)other); @@ -323,10 +345,12 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -344,11 +368,13 @@ public Builder mergeFrom( } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -370,11 +396,12 @@ public static com.google.datastore.v1.RollbackResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RollbackResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackResponse(input, extensionRegistry); + return new RollbackResponse(input, extensionRegistry); } }; @@ -387,6 +414,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 25ec2ddfa31d..ba7e2974b60d 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 @@ -33,6 +33,9 @@ private RunQueryRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -44,13 +47,6 @@ private RunQueryRequest( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.ReadOptions.Builder subBuilder = null; if (readOptions_ != null) { @@ -111,6 +107,13 @@ private RunQueryRequest( projectId_ = s; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -128,6 +131,7 @@ private RunQueryRequest( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable @@ -367,6 +371,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -376,6 +381,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (readOptions_ != null) { @@ -396,6 +402,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -571,6 +578,7 @@ public static com.google.datastore.v1.RunQueryRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -578,6 +586,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RunQueryRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -605,6 +614,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable @@ -627,6 +637,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); projectId_ = ""; @@ -648,15 +659,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor; } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { return com.google.datastore.v1.RunQueryRequest.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest build() { com.google.datastore.v1.RunQueryRequest result = buildPartial(); if (!result.isInitialized()) { @@ -665,6 +679,7 @@ public com.google.datastore.v1.RunQueryRequest build() { return result; } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest buildPartial() { com.google.datastore.v1.RunQueryRequest result = new com.google.datastore.v1.RunQueryRequest(this); result.projectId_ = projectId_; @@ -697,32 +712,39 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RunQueryRequest) { return mergeFrom((com.google.datastore.v1.RunQueryRequest)other); @@ -762,10 +784,12 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1564,11 +1588,13 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { onChanged();; return gqlQueryBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1590,11 +1616,12 @@ public static com.google.datastore.v1.RunQueryRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RunQueryRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryRequest(input, extensionRegistry); + return new RunQueryRequest(input, extensionRegistry); } }; @@ -1607,6 +1634,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 cf6f8aa66101..e61be763e322 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 @@ -32,6 +32,9 @@ private RunQueryResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -43,13 +46,6 @@ private RunQueryResponse( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null; if (batch_ != null) { @@ -76,6 +72,13 @@ private RunQueryResponse( break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -93,6 +96,7 @@ private RunQueryResponse( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable @@ -167,6 +171,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -176,6 +181,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (batch_ != null) { @@ -187,6 +193,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -320,6 +327,7 @@ public static com.google.datastore.v1.RunQueryResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -327,6 +335,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.RunQueryResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -354,6 +363,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable @@ -376,6 +386,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); if (batchBuilder_ == null) { @@ -393,15 +404,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor; } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { return com.google.datastore.v1.RunQueryResponse.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse build() { com.google.datastore.v1.RunQueryResponse result = buildPartial(); if (!result.isInitialized()) { @@ -410,6 +424,7 @@ public com.google.datastore.v1.RunQueryResponse build() { return result; } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse buildPartial() { com.google.datastore.v1.RunQueryResponse result = new com.google.datastore.v1.RunQueryResponse(this); if (batchBuilder_ == null) { @@ -426,32 +441,39 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.RunQueryResponse) { return mergeFrom((com.google.datastore.v1.RunQueryResponse)other); @@ -474,10 +496,12 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -801,11 +825,13 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } return queryBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -827,11 +853,12 @@ public static com.google.datastore.v1.RunQueryResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public RunQueryResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryResponse(input, extensionRegistry); + return new RunQueryResponse(input, extensionRegistry); } }; @@ -844,6 +871,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 4c832a372d80..2bef782cd392 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 @@ -35,6 +35,9 @@ private TransactionOptions( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,13 +49,6 @@ private TransactionOptions( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null; if (modeCase_ == 1) { @@ -81,6 +77,13 @@ private TransactionOptions( modeCase_ = 2; break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -98,6 +101,7 @@ private TransactionOptions( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable @@ -148,6 +152,9 @@ private ReadWrite( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -159,6 +166,11 @@ private ReadWrite( case 0: done = true; break; + case 10: { + + previousTransaction_ = input.readBytes(); + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -166,11 +178,6 @@ private ReadWrite( } break; } - case 10: { - - previousTransaction_ = input.readBytes(); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -188,6 +195,7 @@ private ReadWrite( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable @@ -209,6 +217,7 @@ public com.google.protobuf.ByteString getPreviousTransaction() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -218,6 +227,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!previousTransaction_.isEmpty()) { @@ -226,6 +236,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -341,6 +352,7 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -348,6 +360,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadWrite prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -375,6 +388,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable @@ -397,6 +411,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); previousTransaction_ = com.google.protobuf.ByteString.EMPTY; @@ -404,15 +419,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite build() { com.google.datastore.v1.TransactionOptions.ReadWrite result = buildPartial(); if (!result.isInitialized()) { @@ -421,6 +439,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite build() { return result; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() { com.google.datastore.v1.TransactionOptions.ReadWrite result = new com.google.datastore.v1.TransactionOptions.ReadWrite(this); result.previousTransaction_ = previousTransaction_; @@ -428,32 +447,39 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions.ReadWrite) { return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite)other); @@ -473,10 +499,12 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite ot return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -535,11 +563,13 @@ public Builder clearPreviousTransaction() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -561,11 +591,12 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultIns private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReadWrite parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadWrite(input, extensionRegistry); + return new ReadWrite(input, extensionRegistry); } }; @@ -578,6 +609,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -617,6 +649,9 @@ private ReadOnly( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -651,6 +686,7 @@ private ReadOnly( return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable @@ -659,6 +695,7 @@ private ReadOnly( } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -668,11 +705,13 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -780,6 +819,7 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -787,6 +827,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadOnly prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -814,6 +855,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable @@ -836,20 +878,24 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly build() { com.google.datastore.v1.TransactionOptions.ReadOnly result = buildPartial(); if (!result.isInitialized()) { @@ -858,38 +904,46 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() { return result; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() { com.google.datastore.v1.TransactionOptions.ReadOnly result = new com.google.datastore.v1.TransactionOptions.ReadOnly(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions.ReadOnly) { return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly)other); @@ -906,10 +960,12 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly oth return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -927,11 +983,13 @@ public Builder mergeFrom( } return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -953,11 +1011,12 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInst private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReadOnly parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOnly(input, extensionRegistry); + return new ReadOnly(input, extensionRegistry); } }; @@ -970,6 +1029,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1091,6 +1151,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1100,6 +1161,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (modeCase_ == 1) { @@ -1111,6 +1173,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1253,6 +1316,7 @@ public static com.google.datastore.v1.TransactionOptions parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1260,6 +1324,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.TransactionOptions prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1290,6 +1355,7 @@ public static final class Builder extends return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable @@ -1312,6 +1378,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); modeCase_ = 0; @@ -1319,15 +1386,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.TransactionOptions build() { com.google.datastore.v1.TransactionOptions result = buildPartial(); if (!result.isInitialized()) { @@ -1336,6 +1406,7 @@ public com.google.datastore.v1.TransactionOptions build() { return result; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions buildPartial() { com.google.datastore.v1.TransactionOptions result = new com.google.datastore.v1.TransactionOptions(this); if (modeCase_ == 1) { @@ -1357,32 +1428,39 @@ public com.google.datastore.v1.TransactionOptions buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.TransactionOptions) { return mergeFrom((com.google.datastore.v1.TransactionOptions)other); @@ -1412,10 +1490,12 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1792,11 +1872,13 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO onChanged();; return readOnlyBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1818,11 +1900,12 @@ public static com.google.datastore.v1.TransactionOptions getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public TransactionOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TransactionOptions(input, extensionRegistry); + return new TransactionOptions(input, extensionRegistry); } }; @@ -1835,6 +1918,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() { return DEFAULT_INSTANCE; } 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 24a7ce3b5f03..545094844729 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 @@ -35,6 +35,9 @@ private Value( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -46,13 +49,6 @@ private Value( case 0: done = true; break; - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { valueTypeCase_ = 1; valueType_ = input.readBool(); @@ -165,6 +161,13 @@ private Value( excludeFromIndexes_ = input.readBool(); break; } + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -182,6 +185,7 @@ private Value( return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable @@ -268,6 +272,7 @@ public int getNullValueValue() { */ public com.google.protobuf.NullValue getNullValue() { if (valueTypeCase_ == 11) { + @SuppressWarnings("deprecation") com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( (java.lang.Integer) valueType_); return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; @@ -635,6 +640,7 @@ public boolean getExcludeFromIndexes() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -644,6 +650,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (valueTypeCase_ == 1) { @@ -692,6 +699,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -967,6 +975,7 @@ public static com.google.datastore.v1.Value parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -974,6 +983,7 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.datastore.v1.Value prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1002,6 +1012,7 @@ public static final class Builder extends return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable @@ -1024,6 +1035,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); meaning_ = 0; @@ -1035,15 +1047,18 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor; } + @java.lang.Override public com.google.datastore.v1.Value getDefaultInstanceForType() { return com.google.datastore.v1.Value.getDefaultInstance(); } + @java.lang.Override public com.google.datastore.v1.Value build() { com.google.datastore.v1.Value result = buildPartial(); if (!result.isInitialized()) { @@ -1052,6 +1067,7 @@ public com.google.datastore.v1.Value build() { return result; } + @java.lang.Override public com.google.datastore.v1.Value buildPartial() { com.google.datastore.v1.Value result = new com.google.datastore.v1.Value(this); if (valueTypeCase_ == 11) { @@ -1114,32 +1130,39 @@ public com.google.datastore.v1.Value buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.Value) { return mergeFrom((com.google.datastore.v1.Value)other); @@ -1213,10 +1236,12 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1285,6 +1310,7 @@ public Builder setNullValueValue(int value) { */ public com.google.protobuf.NullValue getNullValue() { if (valueTypeCase_ == 11) { + @SuppressWarnings("deprecation") com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf( (java.lang.Integer) valueType_); return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result; @@ -2623,11 +2649,13 @@ public Builder clearExcludeFromIndexes() { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2649,11 +2677,12 @@ public static com.google.datastore.v1.Value getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Value(input, extensionRegistry); + return new Value(input, extensionRegistry); } }; @@ -2666,6 +2695,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public com.google.datastore.v1.Value getDefaultInstanceForType() { return DEFAULT_INSTANCE; } From a9a796f88bd7568444875fc462c1f78b94902c6f Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Thu, 13 Sep 2018 09:47:56 -0700 Subject: [PATCH 0106/1784] Release 1.44.0/0.62.0 (#3677) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 9ef7c5978cb5..70b2eae50312 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.43.0 + 1.44.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.43.0' +compile 'com.google.cloud:google-cloud-datastore:1.44.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.43.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.44.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index be92fdda4a60..b8f0a7c3e8db 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.43.1-SNAPSHOT + 1.44.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.61.1-alpha-SNAPSHOT + 0.62.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e1599abb59cd..43c9da03afb0 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.26.1-SNAPSHOT + 0.27.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.26.1-SNAPSHOT + 0.27.0 From ed68e4d40c649cb576dba645aff4eaab39f69c2c Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Thu, 13 Sep 2018 10:59:16 -0700 Subject: [PATCH 0107/1784] Bump to next snapshot versions (#3679) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index b8f0a7c3e8db..5dad8bbea5ba 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.44.0 + 1.44.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.62.0-alpha + 0.62.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 43c9da03afb0..0743f0c2637f 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.27.0 + 0.27.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.27.0 + 0.27.1-SNAPSHOT From d344e852d2c5a37f424cd64333a46e5562b61031 Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Thu, 20 Sep 2018 13:37:58 -0700 Subject: [PATCH 0108/1784] Release 1.45.0/0.63.0 (#3710) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 70b2eae50312..ac7894e6c36c 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.44.0 + 1.45.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.44.0' +compile 'com.google.cloud:google-cloud-datastore:1.45.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.44.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.45.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 5dad8bbea5ba..ce5338465072 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.44.1-SNAPSHOT + 1.45.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.62.1-alpha-SNAPSHOT + 0.63.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0743f0c2637f..a21d4e23292e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.27.1-SNAPSHOT + 0.28.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.27.1-SNAPSHOT + 0.28.0 From 23ecbc024379088dd29400fb7f4aadac08347056 Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Thu, 20 Sep 2018 17:22:25 -0700 Subject: [PATCH 0109/1784] Bump version to 0.63.1-beta-SNAPSHOT (#3714) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index ce5338465072..c7a5057b7b7d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.45.0 + 1.45.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.63.0-alpha + 0.63.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a21d4e23292e..365f2a4f4e0b 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.28.0 + 0.28.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.28.0 + 0.28.1-SNAPSHOT From 4cc85ad398f223587c3204ef8e259f2dde799c12 Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Thu, 27 Sep 2018 12:20:32 -0700 Subject: [PATCH 0110/1784] Release 1.46.0/0.64.0 (#3742) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index ac7894e6c36c..d6427b304864 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.45.0 + 1.46.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.45.0' +compile 'com.google.cloud:google-cloud-datastore:1.46.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.45.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.46.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index c7a5057b7b7d..8dfea3e22f27 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.45.1-SNAPSHOT + 1.46.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.63.1-alpha-SNAPSHOT + 0.64.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 365f2a4f4e0b..dfe14f44e86e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.28.1-SNAPSHOT + 0.29.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.28.1-SNAPSHOT + 0.29.0 From afe9c523cb68953a57f783be0ecfbf484f204a32 Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Thu, 27 Sep 2018 13:54:34 -0700 Subject: [PATCH 0111/1784] Bump to next snapshot version (#3744) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8dfea3e22f27..e83ffdce9277 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.46.0 + 1.46.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.64.0-alpha + 0.64.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index dfe14f44e86e..ba3fb3c253f6 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.29.0 + 0.29.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.29.0 + 0.29.1-SNAPSHOT From c48177a1e7db3a4791dc8595ea937a0d5fafc4a9 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 4 Oct 2018 10:46:45 -0700 Subject: [PATCH 0112/1784] Release 1.47.0/0.65.0 (#3767) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index d6427b304864..2c5573709839 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.46.0 + 1.47.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.46.0' +compile 'com.google.cloud:google-cloud-datastore:1.47.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.46.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.47.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e83ffdce9277..657d209867ec 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.46.1-SNAPSHOT + 1.47.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.64.1-alpha-SNAPSHOT + 0.65.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ba3fb3c253f6..a5acafe5fe59 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.29.1-SNAPSHOT + 0.30.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.29.1-SNAPSHOT + 0.30.0 From 8a5886d9e3111b6c2312cd47438e4418ccd977b8 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 4 Oct 2018 11:25:08 -0700 Subject: [PATCH 0113/1784] Bump to next snapshot version (#3768) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 657d209867ec..7769c20559ee 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.47.0 + 1.47.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.65.0-alpha + 0.65.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a5acafe5fe59..265e3cd24fcf 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.30.0 + 0.30.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.30.0 + 0.30.1-SNAPSHOT From 4c318c3693d63763957acb45df1640a0708afc18 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 4 Oct 2018 13:18:15 -0700 Subject: [PATCH 0114/1784] Remove CircleCI status, coveralls, and version eye badges (#3771) --- google-cloud-datastore/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 2c5573709839..d55326e26f74 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -3,11 +3,9 @@ Google Cloud Java Client for Datastore Java idiomatic client for [Google Cloud Datastore][cloud-datastore]. -[![CircleCI](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master.svg?style=shield)](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master) -[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/google-cloud-java?branch=master) +[![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/master.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/master.html) [![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg)]( https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg) [![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java) -[![Dependency Status](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772/badge.svg?style=flat)](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772) - [Product Documentation][datastore-product-docs] - [Client Library Documentation][datastore-client-lib-docs] From 393425c489c756591e9d904a8d69907963d14210 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 5 Oct 2018 11:20:33 -0700 Subject: [PATCH 0115/1784] Add synthtool scripts (#3765) * Add assets synth script * Add automl synth script * Add BigQueryDataTransfer synth * Add BigTable synth * Add BigTableAdmin synth * Add container synth * Add containeranalysis synth * Add dataproc synth * Add datastore synth * Add dialogflow synth * Add dlp synth * Add errorreporting synth * Add firestore synth * Add iot synth * Add kms synth * Add language synth * Add logging synth * Add monitoring synth * Add oslogin synth * Add pubsub synth * Add redis synth * Add spanner synth * Add speech synth * Add tasks synth * Add texttospeech synth * Add trace synth * Add videointelligence synth * Add vision synth * Add websecurityscanner synth * Add compute synth * Remove unnecessary import * Remove compute synth and remove excess logging statements --- google-cloud-datastore/synth.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 google-cloud-datastore/synth.py diff --git a/google-cloud-datastore/synth.py b/google-cloud-datastore/synth.py new file mode 100644 index 000000000000..96cd0cc53051 --- /dev/null +++ b/google-cloud-datastore/synth.py @@ -0,0 +1,32 @@ +# Copyright 2018 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. + +"""This script is used to synthesize generated parts of this library.""" + +import synthtool as s +import synthtool.gcp as gcp + +gapic = gcp.GAPICGenerator() +common_templates = gcp.CommonTemplates() + +library = gapic.java_library( + service='datastore', + version='v1', + config_path='/google/datastore/artman_datastore.yaml', + artman_output_name='') + +# Datastore only generates protos +#s.copy(library / 'gapic-google-cloud-datastore-v1/src', 'src') +#s.copy(library / 'grpc-google-cloud-datastore-v1/src', '../../google-api-grpc/grpc-google-cloud-datastore-v1/src') +s.copy(library / 'proto-google-cloud-datastore-v1/src', '../../google-api-grpc/proto-google-cloud-datastore-v1/src') From 3fb0dc5c2b0366bc090bc0cab9fd9d28289305e1 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 5 Oct 2018 18:19:23 -0700 Subject: [PATCH 0116/1784] Release google-cloud-java v0.66.0 (#3782) * Release v0.66.0 * Fix javadoc in firestore CollectionReference --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index d55326e26f74..657fa428ef58 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.47.0 + 1.48.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.47.0' +compile 'com.google.cloud:google-cloud-datastore:1.48.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.47.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.48.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 7769c20559ee..8aed254e438e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.47.1-SNAPSHOT + 1.48.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.65.1-alpha-SNAPSHOT + 0.66.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 265e3cd24fcf..a48d0c3b0f5d 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.30.1-SNAPSHOT + 0.31.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.30.1-SNAPSHOT + 0.31.0 From 9d4b53411abc00959afcc1eca8887ec9a30f6212 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Sat, 6 Oct 2018 11:45:23 -0700 Subject: [PATCH 0117/1784] Release v0.66.1-SNAPSHOT (#3784) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8aed254e438e..fd8967a4df41 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.48.0 + 1.48.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.66.0-alpha + 0.66.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a48d0c3b0f5d..8fc0a4dfe6a8 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.31.0 + 0.31.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.31.0 + 0.31.1-SNAPSHOT From 59a1f90be3b53cf92ff499654052aebe4bc9c10f Mon Sep 17 00:00:00 2001 From: elisheva-qlogic <43041115+elisheva-qlogic@users.noreply.github.com> Date: Tue, 9 Oct 2018 16:32:34 -0400 Subject: [PATCH 0118/1784] Follow these instructions link corrected (#3790) --- google-cloud-datastore/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 657fa428ef58..1b7aeb04df95 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -67,7 +67,7 @@ with the Cloud Datastore using this Client Library. Getting Started --------------- #### Prerequisites -For this tutorial, you will need a [Google Developers Console](https://console.developers.google.com/) project with the Datastore API enabled. [Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. +For this tutorial, you will need a [Google Developers Console](https://console.developers.google.com/) project with the Datastore API enabled. [Follow these instructions](https://cloud.google.com/resource-manager/docs/creating-managing-projects) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. #### Installation and setup You'll need to obtain the `google-cloud-datastore` library. See the [Quickstart](#quickstart) section to add `google-cloud-datastore` as a dependency in your code. From de73d2b1d8024af8e5d47334e919cd11c328d557 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 10 Oct 2018 12:06:24 -0700 Subject: [PATCH 0119/1784] Fix urls from GoogleCloudPlatform org to googleapis org (#3793) * Fix urls from GoogleCloudPlatform org to googleapis org * Fix typo --- google-cloud-datastore/README.md | 20 +++++++++---------- google-cloud-datastore/pom.xml | 2 +- .../google/cloud/datastore/package-info.java | 8 ++++---- .../cloud/datastore/testing/package-info.java | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 1b7aeb04df95..2af225e30988 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -34,7 +34,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.48.0" Example Applications -------------------- -- [`DatastoreExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). +- [`DatastoreExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googleapis.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf. - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service. - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site. @@ -47,7 +47,7 @@ Example Applications Authentication -------------- -See the [Authentication](https://github.com/GoogleCloudPlatform/google-cloud-java#authentication) section in the base directory's README. +See the [Authentication](https://github.com/googleapis/google-cloud-java#authentication) section in the base directory's README. About Google Cloud Datastore ---------------------------- @@ -82,7 +82,7 @@ import com.google.cloud.datastore.DatastoreOptions; Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); ``` -For other authentication options, see the [Authentication](https://github.com/GoogleCloudPlatform/google-cloud-java#authentication) page. +For other authentication options, see the [Authentication](https://github.com/googleapis/google-cloud-java#authentication) page. #### Storing data Objects in Datastore are known as entities. Entities are grouped by "kind" and have keys for easy access. In this code snippet, we will create a new entity representing a person and store that data by the person's email. First, add the following imports at the top of your file: @@ -176,7 +176,7 @@ display on your webpage. Troubleshooting --------------- -To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting). +To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting). Transport --------- @@ -206,7 +206,7 @@ Contributing Contributions to this library are always welcome and highly encouraged. -See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started. +See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/googleapis/google-cloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started. Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. @@ -216,12 +216,12 @@ License Apache 2.0 - See [LICENSE] for more information. -[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CONTRIBUTING.md -[code-of-conduct]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[LICENSE]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/LICENSE -[TESTING]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore +[CONTRIBUTING]:https://github.com/googleapis/google-cloud-java/blob/master/CONTRIBUTING.md +[code-of-conduct]:https://github.com/googleapis/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[LICENSE]: https://github.com/googleapis/google-cloud-java/blob/master/LICENSE +[TESTING]: https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore [cloud-platform]: https://cloud.google.com/ [cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate [cloud-datastore]: https://cloud.google.com/datastore/ [datastore-product-docs]: https://cloud.google.com/datastore/docs/ -[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/datastore/package-summary.html +[datastore-client-lib-docs]: https://googleapis.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/datastore/package-summary.html diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index fd8967a4df41..cf38b1bb28f9 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -5,7 +5,7 @@ 1.48.1-SNAPSHOT jar Google Cloud Datastore - https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore + https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore Java idiomatic client for Google Cloud Datastore. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java index 77b8d9d669a7..5ebe834bd854 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java @@ -20,7 +20,7 @@ * *

Here's a simple usage example for using google-cloud from App/Compute Engine. This example * shows how to create a Datastore entity. For the complete source code see - * + * * CreateEntity.java. * 

 {@code
  * Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
@@ -36,7 +36,7 @@
  * 

  * This second example shows how to get and update a Datastore entity if it exists. For the complete
  * source code see
- * 
+ * 
  * UpdateEntity.java.
  * 
 {@code
  * Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
@@ -51,9 +51,9 @@
  *   datastore.update(entity);
  * }} 

  * 
When using google-cloud from outside of App/Compute Engine, you have to specify a
+ * href="https://github.com/googleapis/google-cloud-java#specifying-a-project-id">specify a
  * project ID and
- * provide
+ * provide
  * credentials.
  *
  * @see Google Cloud Datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
index 84b3f07d8814..9eb123f34533 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
@@ -30,7 +30,7 @@
  * helper.stop();
  * }
* - * @see + * @see * Google Cloud Java tools for testing */ package com.google.cloud.datastore.testing; From 3ea6d3159cdf7cf9a9df848ef9495f1b2ece6f19 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 11 Oct 2018 09:50:15 -0700 Subject: [PATCH 0120/1784] Release v0.67.0 (#3807) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 2af225e30988..591ad474f919 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.48.0 + 1.49.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.48.0' +compile 'com.google.cloud:google-cloud-datastore:1.49.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.48.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.49.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index cf38b1bb28f9..e5da419869ae 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.48.1-SNAPSHOT + 1.49.0 jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.66.1-alpha-SNAPSHOT + 0.67.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 8fc0a4dfe6a8..78896459d3b7 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.31.1-SNAPSHOT + 0.32.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.31.1-SNAPSHOT + 0.32.0 From 03acc972610cfa47043662c81a2e9c5caf8927a7 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 11 Oct 2018 13:31:41 -0700 Subject: [PATCH 0121/1784] Bump next snapshot (#3810) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e5da419869ae..838babbaf582 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.49.0 + 1.49.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.67.0-alpha + 0.67.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 78896459d3b7..9ff695260cb3 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.32.0 + 0.32.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.32.0 + 0.32.1-SNAPSHOT From c29152a2cee04826308dd1a7ec8975583d71725a Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Thu, 25 Oct 2018 12:18:15 -0700 Subject: [PATCH 0122/1784] Release v0.68.0 (#3857) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 591ad474f919..f7b83e4279ce 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.49.0 + 1.50.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.49.0' +compile 'com.google.cloud:google-cloud-datastore:1.50.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.49.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.50.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 838babbaf582..e8a890417106 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.49.1-SNAPSHOT + 1.50.0 jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.67.1-alpha-SNAPSHOT + 0.68.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 9ff695260cb3..b0ce44dcc5de 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.32.1-SNAPSHOT + 0.33.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.32.1-SNAPSHOT + 0.33.0 From 6807574d975cd6f348956ef7d4e7beffe5a63a1d Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Thu, 25 Oct 2018 15:46:37 -0700 Subject: [PATCH 0123/1784] Bump next snapshot (#3862) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e8a890417106..498c06045818 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.50.0 + 1.50.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.68.0-alpha + 0.68.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index b0ce44dcc5de..016b732b8895 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.33.0 + 0.33.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.33.0 + 0.33.1-SNAPSHOT From 075e1a2897ebc6b4901d44bada2651aae9b374ef Mon Sep 17 00:00:00 2001 From: pmakani <44407134+pmakani@users.noreply.github.com> Date: Thu, 1 Nov 2018 03:05:08 +0530 Subject: [PATCH 0124/1784] Fix #3292 (#3875) --- .../src/main/java/com/google/cloud/datastore/Validator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 11eb0b71380d..28a07001461f 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 @@ -40,7 +40,7 @@ private Validator() { static String validateDatabase(String projectId) { checkArgument(!Strings.isNullOrEmpty(projectId), "projectId can't be empty or null"); checkArgument(PROJECT_ID_PATTERN.matcher(projectId).matches(), - "projectId must match the following pattern: " + PROJECT_ID_PATTERN.pattern()); + "projectId " + projectId + " does not match the required pattern: " + PROJECT_ID_PATTERN.pattern()); return projectId; } From 75f5363d29d3f6b114f22cc7ae0d41126fdaa92f Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 1 Nov 2018 13:47:10 -0700 Subject: [PATCH 0125/1784] Release v0.69.0 (#3890) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index f7b83e4279ce..dc0f4f6a6a60 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.50.0 + 1.51.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.50.0' +compile 'com.google.cloud:google-cloud-datastore:1.51.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.50.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.51.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 498c06045818..4f208285520f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.50.1-SNAPSHOT + 1.51.0 jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.68.1-alpha-SNAPSHOT + 0.69.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 016b732b8895..3f5e5f36d4b6 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.33.1-SNAPSHOT + 0.34.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.33.1-SNAPSHOT + 0.34.0 From bcc1512b6a1ad243c8484b6d0a795847c2adf2f2 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 1 Nov 2018 14:19:43 -0700 Subject: [PATCH 0126/1784] Bump next snapshot (#3892) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 4f208285520f..45b511b0e371 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.51.0 + 1.51.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.69.0-alpha + 0.69.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 3f5e5f36d4b6..2bcdd20a1e2c 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.34.0 + 0.34.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.34.0 + 0.34.1-SNAPSHOT From 4d02969fbebcb63bf098d463a1d5dfcff4405f58 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 7 Nov 2018 15:33:45 -0800 Subject: [PATCH 0127/1784] Release google-cloud-java v0.70.0 (#3921) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index dc0f4f6a6a60..41422c0b45b8 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.51.0 + 1.52.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.51.0' +compile 'com.google.cloud:google-cloud-datastore:1.52.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.51.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.52.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 45b511b0e371..d4b1c90852f9 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.51.1-SNAPSHOT + 1.52.0 jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.69.1-alpha-SNAPSHOT + 0.70.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 2bcdd20a1e2c..c0051a65c3bd 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.34.1-SNAPSHOT + 0.35.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.34.1-SNAPSHOT + 0.35.0 From 5559745c0c01f3aac817bbfe7f6196764f31dabb Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 7 Nov 2018 15:36:43 -0800 Subject: [PATCH 0128/1784] Bump next snapshot (#3922) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index d4b1c90852f9..0046f6fa616d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.52.0 + 1.52.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.70.0-alpha + 0.70.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index c0051a65c3bd..543519b4848e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.35.0 + 0.35.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.35.0 + 0.35.1-SNAPSHOT From 83159b99ed28757fa860e12c7c592bb5db8d75a0 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 15 Nov 2018 16:52:33 -0800 Subject: [PATCH 0129/1784] Release v0.71.0 (#3978) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 41422c0b45b8..df27808f1cee 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.52.0 + 1.53.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.52.0' +compile 'com.google.cloud:google-cloud-datastore:1.53.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.52.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.53.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 0046f6fa616d..1aff3006e1c3 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.52.1-SNAPSHOT + 1.53.0 jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.70.1-alpha-SNAPSHOT + 0.71.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 543519b4848e..ad6e22f8f687 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.35.1-SNAPSHOT + 0.36.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.35.1-SNAPSHOT + 0.36.0 From 1c1163b03d06a6dcee2fdc14185d344ce71998c7 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 16 Nov 2018 09:43:35 -0800 Subject: [PATCH 0130/1784] Bump next snapshot (#3981) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 1aff3006e1c3..af8623f8c90e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.53.0 + 1.53.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.71.0-alpha + 0.71.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ad6e22f8f687..a06f2483d1c5 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.36.0 + 0.36.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.36.0 + 0.36.1-SNAPSHOT From 3d6b57ad15044359a0443be0c1efeaf3eaa2ca90 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 20 Nov 2018 07:31:05 -0800 Subject: [PATCH 0131/1784] Add synth metadata for many clients (#4020) --- google-cloud-datastore/synth.metadata | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 google-cloud-datastore/synth.metadata diff --git a/google-cloud-datastore/synth.metadata b/google-cloud-datastore/synth.metadata new file mode 100644 index 000000000000..2bd4f07a69a5 --- /dev/null +++ b/google-cloud-datastore/synth.metadata @@ -0,0 +1,27 @@ +{ + "sources": [ + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "5a57f0c13a358b2b15452bf2d67453774a5f6d4f", + "internalRef": "221837528" + } + }, + { + "git": { + "name": "googleapis-private", + "remote": "https://github.com/googleapis/googleapis-private.git", + "sha": "6aa8e1a447bb8d0367150356a28cb4d3f2332641", + "internalRef": "221340946" + } + }, + { + "generator": { + "name": "artman", + "version": "0.16.0", + "dockerImage": "googleapis/artman@sha256:90f9d15e9bad675aeecd586725bce48f5667ffe7d5fc4d1e96d51ff34304815b" + } + } + ] +} From a5b830f3dd079690dd0c29e2af39ac08da1aa2d6 Mon Sep 17 00:00:00 2001 From: ajaaym <34161822+ajaaym@users.noreply.github.com> Date: Tue, 27 Nov 2018 13:54:19 -0500 Subject: [PATCH 0132/1784] Datastore: Add `skippedResults` in `QueryResults` (#4093) * Fix #3279 google-cloud-datastore Java library exposes too little of the information in query results * fix typo in comment --- .../com/google/cloud/datastore/QueryResults.java | 15 +++++++++++++++ .../google/cloud/datastore/QueryResultsImpl.java | 5 +++++ .../com/google/cloud/datastore/DatastoreTest.java | 7 +++++++ .../cloud/datastore/it/ITDatastoreTest.java | 7 +++++++ 4 files changed, 34 insertions(+) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java index 8e4818ddc73e..8c03bda46bcc 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java @@ -55,4 +55,19 @@ public interface QueryResults extends Iterator { * } */ Cursor getCursorAfter(); + + /** + * Returns the number of results skipped, typically because of an offset. + * + *

A simple use case to count entities: + * + * 

{@code
+   * Query query = Query.newKeyQueryBuilder().setOffset(Integer.MAX_VALUE).build();
+   * QueryResults result = datasore.datastore.run(query);
+   * if (!result.hasNext()) {
+   *  int numberOfEntities = result.getSkippedResults();
+   * }
+   * }
+ */ + int getSkippedResults(); } 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 a3156093dcc6..dde12d8a8dd8 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 @@ -114,4 +114,9 @@ public Class getResultClass() { public Cursor getCursorAfter() { return new Cursor(cursor); } + + @Override + public int getSkippedResults() { + return runQueryResponsePb.getBatch().getSkippedResults(); + } } 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 329f4e7ea7d4..931da0dc0626 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 @@ -633,6 +633,13 @@ public void testQueryPaginationWithLimit() throws DatastoreException { EasyMock.verify(rpcFactoryMock, rpcMock); } + @Test + public void testRunKeyQueryWithOffset() { + Query query = Query.newKeyQueryBuilder().setOffset(Integer.MAX_VALUE).build(); + int numberOfEntities = datastore.run(query).getSkippedResults(); + assertEquals(2, numberOfEntities); + } + private List buildResponsesForQueryPaginationWithLimit() { Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build(); Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build(); 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 dab2145f3e19..9f3bd9001019 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 @@ -851,4 +851,11 @@ public Integer run(DatastoreReaderWriter transaction) { assertEquals(3, ((DatastoreException) expected.getCause()).getCode()); } } + + @Test + public void testSkippedResults() { + Query query = Query.newKeyQueryBuilder().setOffset(Integer.MAX_VALUE).build(); + int numberOfEntities = DATASTORE.run(query).getSkippedResults(); + assertEquals(2, numberOfEntities); + } } From fe100faa476e90c14fc4865f9b55579075649882 Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Wed, 28 Nov 2018 15:25:45 -0800 Subject: [PATCH 0133/1784] Release v0.72.0 (#4113) --- google-cloud-datastore/README.md | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index df27808f1cee..1d85f2d8f25e 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.53.0 + 1.54.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.53.0' +compile 'com.google.cloud:google-cloud-datastore:1.54.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.53.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.54.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index af8623f8c90e..4e364ac42ad8 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.53.1-SNAPSHOT + 1.54.0 jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.71.1-alpha-SNAPSHOT + 0.72.0-alpha google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a06f2483d1c5..0a59821c833a 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.36.1-SNAPSHOT + 0.37.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.36.1-SNAPSHOT + 0.37.0 From 94be11ac022d6d390f81ee0090a8e454529d788f Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 29 Nov 2018 14:28:50 -0800 Subject: [PATCH 0134/1784] Bump next snapshot (#4118) --- google-cloud-datastore/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 4e364ac42ad8..290e024b13c3 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.54.0 + 1.54.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.72.0-alpha + 0.72.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0a59821c833a..1507f6c6b542 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-datastore-v1 - 0.37.0 + 0.37.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.api.grpc google-api-grpc - 0.37.0 + 0.37.1-SNAPSHOT From 2cdb258eab6dace0b78701668e38c6107a71049e Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 29 Nov 2018 16:42:00 -0800 Subject: [PATCH 0135/1784] Add lint test and format generated code (#4114) * Add lint Kokoro tests * synthtool will now run the java formatter after generating the files --- google-cloud-datastore/synth.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/google-cloud-datastore/synth.py b/google-cloud-datastore/synth.py index 96cd0cc53051..8bbcbb807878 100644 --- a/google-cloud-datastore/synth.py +++ b/google-cloud-datastore/synth.py @@ -16,17 +16,23 @@ import synthtool as s import synthtool.gcp as gcp +import synthtool.languages.java as java gapic = gcp.GAPICGenerator() -common_templates = gcp.CommonTemplates() -library = gapic.java_library( - service='datastore', - version='v1', - config_path='/google/datastore/artman_datastore.yaml', - artman_output_name='') +service = 'datastore' +versions = ['v1'] +config_pattern = '/google/datastore/artman_datastore.yaml' -# Datastore only generates protos -#s.copy(library / 'gapic-google-cloud-datastore-v1/src', 'src') -#s.copy(library / 'grpc-google-cloud-datastore-v1/src', '../../google-api-grpc/grpc-google-cloud-datastore-v1/src') -s.copy(library / 'proto-google-cloud-datastore-v1/src', '../../google-api-grpc/proto-google-cloud-datastore-v1/src') +for version in versions: + library = gapic.java_library( + service=service, + version=version, + config_path=config_pattern.format(version=version), + artman_output_name='') + + # Datastore only generates protos + s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src') + + java.format_code('./src') + java.format_code(f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src') From 8cfb312c021a4eb3df759c39a4f4c5bfbb829ac8 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 30 Nov 2018 11:29:29 -0800 Subject: [PATCH 0136/1784] Run google-java-format on all artifacts (#4121) * Run google-java-format on all artifats * Format some missed files * Add more missed files * Fix formatting issues from the merge --- .../datastore/BaseDatastoreBatchWriter.java | 15 +- .../google/cloud/datastore/BaseEntity.java | 50 +- .../com/google/cloud/datastore/BaseKey.java | 65 +- .../com/google/cloud/datastore/Batch.java | 30 +- .../com/google/cloud/datastore/BatchImpl.java | 2 - .../java/com/google/cloud/datastore/Blob.java | 32 +- .../com/google/cloud/datastore/BlobValue.java | 1 - .../google/cloud/datastore/BooleanValue.java | 1 - .../com/google/cloud/datastore/Cursor.java | 13 +- .../com/google/cloud/datastore/Datastore.java | 136 +- .../cloud/datastore/DatastoreBatchWriter.java | 33 +- .../cloud/datastore/DatastoreException.java | 19 +- .../cloud/datastore/DatastoreFactory.java | 8 +- .../cloud/datastore/DatastoreHelper.java | 9 +- .../google/cloud/datastore/DatastoreImpl.java | 83 +- .../cloud/datastore/DatastoreOptions.java | 45 +- .../cloud/datastore/DatastoreReader.java | 10 +- .../datastore/DatastoreReaderWriter.java | 8 +- .../cloud/datastore/DatastoreWriter.java | 20 +- .../google/cloud/datastore/DoubleValue.java | 1 - .../com/google/cloud/datastore/Entity.java | 11 +- .../google/cloud/datastore/EntityQuery.java | 4 +- .../google/cloud/datastore/EntityValue.java | 1 - .../google/cloud/datastore/FullEntity.java | 10 +- .../com/google/cloud/datastore/GqlQuery.java | 73 +- .../google/cloud/datastore/IncompleteKey.java | 18 +- .../java/com/google/cloud/datastore/Key.java | 44 +- .../google/cloud/datastore/KeyFactory.java | 23 +- .../com/google/cloud/datastore/KeyQuery.java | 4 +- .../com/google/cloud/datastore/KeyValue.java | 1 - .../com/google/cloud/datastore/LatLng.java | 20 +- .../google/cloud/datastore/LatLngValue.java | 1 - .../com/google/cloud/datastore/ListValue.java | 110 +- .../com/google/cloud/datastore/LongValue.java | 1 - .../com/google/cloud/datastore/NullValue.java | 4 +- .../google/cloud/datastore/PathElement.java | 27 +- .../cloud/datastore/ProjectionEntity.java | 10 +- .../datastore/ProjectionEntityQuery.java | 18 +- .../com/google/cloud/datastore/Query.java | 78 +- .../google/cloud/datastore/QueryResults.java | 18 +- .../cloud/datastore/QueryResultsImpl.java | 12 +- .../com/google/cloud/datastore/RawValue.java | 3 +- .../google/cloud/datastore/ReadOption.java | 1 - .../google/cloud/datastore/StringValue.java | 1 - .../cloud/datastore/StructuredQuery.java | 214 +-- .../cloud/datastore/TimestampValue.java | 1 - .../google/cloud/datastore/Transaction.java | 156 +-- .../TransactionExceptionHandler.java | 3 +- .../cloud/datastore/TransactionImpl.java | 6 +- .../com/google/cloud/datastore/Validator.java | 26 +- .../com/google/cloud/datastore/Value.java | 23 +- .../google/cloud/datastore/ValueBuilder.java | 8 +- .../cloud/datastore/ValueMarshaller.java | 4 +- .../com/google/cloud/datastore/ValueType.java | 60 +- .../google/cloud/datastore/package-info.java | 32 +- .../datastore/spi/DatastoreRpcFactory.java | 9 +- .../cloud/datastore/spi/v1/DatastoreRpc.java | 4 +- .../datastore/spi/v1/HttpDatastoreRpc.java | 25 +- .../testing/LocalDatastoreHelper.java | 48 +- .../testing/RemoteDatastoreHelper.java | 58 +- .../cloud/datastore/testing/package-info.java | 14 +- .../BaseDatastoreBatchWriterTest.java | 71 +- .../cloud/datastore/BaseEntityTest.java | 21 +- .../google/cloud/datastore/BaseKeyTest.java | 11 +- .../com/google/cloud/datastore/BlobTest.java | 7 +- .../cloud/datastore/BooleanValueTest.java | 1 - .../google/cloud/datastore/CursorTest.java | 1 - .../datastore/DatastoreExceptionTest.java | 4 +- .../cloud/datastore/DatastoreOptionsTest.java | 12 +- .../google/cloud/datastore/DatastoreTest.java | 315 +++-- .../google/cloud/datastore/EntityTest.java | 2 - .../cloud/datastore/KeyFactoryTest.java | 16 +- .../com/google/cloud/datastore/KeyTest.java | 5 - .../google/cloud/datastore/LatLngTest.java | 4 +- .../cloud/datastore/LatLngValueTest.java | 2 +- .../google/cloud/datastore/ListValueTest.java | 37 +- .../cloud/datastore/PathElementTest.java | 2 - .../cloud/datastore/ProjectionEntityTest.java | 22 +- .../cloud/datastore/SerializationTest.java | 106 +- .../cloud/datastore/StructuredQueryTest.java | 61 +- .../TransactionExceptionHandlerTest.java | 5 +- .../com/google/cloud/datastore/ValueTest.java | 16 +- .../cloud/datastore/it/ITDatastoreTest.java | 8 +- .../testing/LocalDatastoreHelperTest.java | 12 +- .../datastore/v1/AllocateIdsRequest.java | 426 +++--- .../v1/AllocateIdsRequestOrBuilder.java | 29 +- .../datastore/v1/AllocateIdsResponse.java | 354 ++--- .../v1/AllocateIdsResponseOrBuilder.java | 22 +- .../com/google/datastore/v1/ArrayValue.java | 345 +++-- .../datastore/v1/ArrayValueOrBuilder.java | 22 +- .../datastore/v1/BeginTransactionRequest.java | 373 +++--- .../v1/BeginTransactionRequestOrBuilder.java | 16 +- .../v1/BeginTransactionResponse.java | 243 ++-- .../v1/BeginTransactionResponseOrBuilder.java | 5 +- .../google/datastore/v1/CommitRequest.java | 608 +++++---- .../datastore/v1/CommitRequestOrBuilder.java | 35 +- .../google/datastore/v1/CommitResponse.java | 372 +++--- .../datastore/v1/CommitResponseOrBuilder.java | 23 +- .../google/datastore/v1/CompositeFilter.java | 452 ++++--- .../v1/CompositeFilterOrBuilder.java | 26 +- .../google/datastore/v1/DatastoreProto.java | 559 ++++---- .../java/com/google/datastore/v1/Entity.java | 525 ++++---- .../google/datastore/v1/EntityOrBuilder.java | 40 +- .../com/google/datastore/v1/EntityProto.java | 231 ++-- .../com/google/datastore/v1/EntityResult.java | 421 +++--- .../datastore/v1/EntityResultOrBuilder.java | 13 +- .../java/com/google/datastore/v1/Filter.java | 444 ++++--- .../google/datastore/v1/FilterOrBuilder.java | 15 +- .../com/google/datastore/v1/GqlQuery.java | 686 ++++++---- .../datastore/v1/GqlQueryOrBuilder.java | 61 +- .../datastore/v1/GqlQueryParameter.java | 407 +++--- .../v1/GqlQueryParameterOrBuilder.java | 11 +- .../java/com/google/datastore/v1/Key.java | 886 +++++++------ .../com/google/datastore/v1/KeyOrBuilder.java | 28 +- .../google/datastore/v1/KindExpression.java | 269 ++-- .../datastore/v1/KindExpressionOrBuilder.java | 10 +- .../google/datastore/v1/LookupRequest.java | 519 +++++--- .../datastore/v1/LookupRequestOrBuilder.java | 35 +- .../google/datastore/v1/LookupResponse.java | 631 +++++---- .../datastore/v1/LookupResponseOrBuilder.java | 60 +- .../com/google/datastore/v1/Mutation.java | 766 ++++++----- .../datastore/v1/MutationOrBuilder.java | 32 +- .../google/datastore/v1/MutationResult.java | 346 ++--- .../datastore/v1/MutationResultOrBuilder.java | 13 +- .../com/google/datastore/v1/PartitionId.java | 341 ++--- .../datastore/v1/PartitionIdOrBuilder.java | 17 +- .../com/google/datastore/v1/Projection.java | 299 +++-- .../datastore/v1/ProjectionOrBuilder.java | 9 +- .../google/datastore/v1/PropertyFilter.java | 514 +++++--- .../datastore/v1/PropertyFilterOrBuilder.java | 19 +- .../google/datastore/v1/PropertyOrder.java | 411 +++--- .../datastore/v1/PropertyOrderOrBuilder.java | 13 +- .../datastore/v1/PropertyReference.java | 276 ++-- .../v1/PropertyReferenceOrBuilder.java | 10 +- .../java/com/google/datastore/v1/Query.java | 1025 +++++++++------ .../google/datastore/v1/QueryOrBuilder.java | 95 +- .../com/google/datastore/v1/QueryProto.java | 405 +++--- .../google/datastore/v1/QueryResultBatch.java | 653 +++++---- .../v1/QueryResultBatchOrBuilder.java | 37 +- .../com/google/datastore/v1/ReadOptions.java | 421 +++--- .../datastore/v1/ReadOptionsOrBuilder.java | 9 +- .../datastore/v1/ReserveIdsRequest.java | 498 ++++--- .../v1/ReserveIdsRequestOrBuilder.java | 36 +- .../datastore/v1/ReserveIdsResponse.java | 207 +-- .../v1/ReserveIdsResponseOrBuilder.java | 6 +- .../google/datastore/v1/RollbackRequest.java | 305 +++-- .../v1/RollbackRequestOrBuilder.java | 12 +- .../google/datastore/v1/RollbackResponse.java | 204 +-- .../v1/RollbackResponseOrBuilder.java | 6 +- .../google/datastore/v1/RunQueryRequest.java | 733 +++++++---- .../v1/RunQueryRequestOrBuilder.java | 34 +- .../google/datastore/v1/RunQueryResponse.java | 385 +++--- .../v1/RunQueryResponseOrBuilder.java | 15 +- .../datastore/v1/TransactionOptions.java | 935 +++++++------ .../v1/TransactionOptionsOrBuilder.java | 15 +- .../java/com/google/datastore/v1/Value.java | 1167 ++++++++++------- .../google/datastore/v1/ValueOrBuilder.java | 56 +- 157 files changed, 12635 insertions(+), 9398 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java index bed06837f1b4..83e4c49d8a09 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java @@ -19,7 +19,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -30,9 +29,7 @@ import java.util.Map; import java.util.Set; -/** - * Base class for DatastoreBatchWriter. - */ +/** Base class for DatastoreBatchWriter. */ public abstract class BaseDatastoreBatchWriter implements DatastoreBatchWriter { private final String name; @@ -65,8 +62,8 @@ public final void addWithDeferredIdAllocation(FullEntity... entities) { private void addInternal(FullEntity entity) { Key key = entity.getKey(); if (toAdd.containsKey(key) || toUpdate.containsKey(key) || toPut.containsKey(key)) { - throw newInvalidRequest("Entity with the key %s was already added or updated in this %s", - entity.getKey(), name); + throw newInvalidRequest( + "Entity with the key %s was already added or updated in this %s", entity.getKey(), name); } if (toDelete.remove(key)) { toPut.put(key, entity); @@ -120,8 +117,8 @@ public final void update(Entity... entities) { for (Entity entity : entities) { Key key = entity.getKey(); if (toDelete.contains(key)) { - throw newInvalidRequest("Entity with the key %s was already deleted in this %s", - entity.getKey(), name); + throw newInvalidRequest( + "Entity with the key %s was already deleted in this %s", entity.getKey(), name); } if (toAdd.remove(key) != null || toPut.containsKey(key)) { toPut.put(key, entity); @@ -203,7 +200,6 @@ public final void delete(Key... keys) { } } - @Override public boolean isActive() { return active; @@ -271,6 +267,5 @@ protected List toMutationPbList() { return mutationsPb; } - protected abstract Datastore getDatastore(); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java index 1168ae20ce20..9a7c0d66d1fb 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java @@ -18,7 +18,6 @@ import static com.google.cloud.datastore.BlobValue.of; import static com.google.cloud.datastore.BooleanValue.of; -import static com.google.cloud.datastore.TimestampValue.of; import static com.google.cloud.datastore.DoubleValue.of; import static com.google.cloud.datastore.EntityValue.of; import static com.google.cloud.datastore.KeyValue.of; @@ -27,12 +26,12 @@ import static com.google.cloud.datastore.LongValue.of; import static com.google.cloud.datastore.NullValue.of; import static com.google.cloud.datastore.StringValue.of; +import static com.google.cloud.datastore.TimestampValue.of; import com.google.cloud.Timestamp; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; - import java.io.Serializable; import java.util.HashMap; import java.util.LinkedList; @@ -42,11 +41,10 @@ import java.util.Set; /** - * A base class for entities (key and properties). - * An entity is a Google Cloud Datastore persistent data object. - * An entity holds one or more properties, represented by a name (as {@link String}) - * and a value (as {@link com.google.cloud.datastore.Value}), and may be associated with a - * key. For a list of possible values see {@link ValueType}. + * A base class for entities (key and properties). An entity is a Google Cloud Datastore persistent + * data object. An entity holds one or more properties, represented by a name (as {@link String}) + * and a value (as {@link com.google.cloud.datastore.Value}), and may be associated with a key. For + * a list of possible values see {@link ValueType}. * * @see Google Cloud Datastore * Entities, Properties, and Keys @@ -62,8 +60,7 @@ public abstract static class Builder> properties = new HashMap<>(); - Builder() { - } + Builder() {} Builder(K key) { setKey(key); @@ -110,26 +107,19 @@ protected B setProperties(Map> properties) { return self(); } - - /** - * Sets the key for the entity. - */ + /** Sets the key for the entity. */ public B setKey(K key) { this.key = key; return self(); } - /** - * Clears all the properties. - */ + /** Clears all the properties. */ public B clear() { properties.clear(); return self(); } - /** - * Removes a property with the given {@code name}. - */ + /** Removes a property with the given {@code name}. */ public B remove(String name) { properties.remove(name); return self(); @@ -485,28 +475,20 @@ public boolean equals(Object obj) { return false; } BaseEntity other = (BaseEntity) obj; - return Objects.equals(key, other.key) - && Objects.equals(properties, other.properties); + return Objects.equals(key, other.key) && Objects.equals(properties, other.properties); } - /** - * Returns true if entity has a non-null key. - */ + /** Returns true if entity has a non-null key. */ public boolean hasKey() { return key != null; } - - /** - * Returns the associated key or null if it does not have one. - */ + /** Returns the associated key or null if it does not have one. */ public K getKey() { return key; } - /** - * Returns {@code true} if the entity contains a property with the given {@code name}. - */ + /** Returns {@code true} if the entity contains a property with the given {@code name}. */ public boolean contains(String name) { return properties.containsKey(name); } @@ -534,7 +516,6 @@ public boolean isNull(String name) { return getValue(name) instanceof NullValue; } - /** * Returns the property value as a string. * @@ -645,10 +626,7 @@ public Blob getBlob(String name) { return ((Value) getValue(name)).get(); } - - /** - * Returns the properties name. - */ + /** Returns the properties name. */ public Set getNames() { return properties.keySet(); } 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 3e0f5d2539b1..553a12bb3ba2 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 @@ -23,15 +23,12 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Objects; -/** - * Base class for keys. - */ +/** Base class for keys. */ public abstract class BaseKey implements Serializable { private static final long serialVersionUID = -5897863400209818325L; @@ -76,58 +73,40 @@ B self() { return (B) this; } - - /** - * Adds an ancestor for this key. - */ + /** Adds an ancestor for this key. */ public B addAncestor(PathElement ancestor) { Preconditions.checkState(ancestors.size() < MAX_PATH, "path can have at most 100 elements"); ancestors.add(ancestor); return self(); } - - /** - * Adds the provided ancestors to the key. - */ + /** Adds the provided ancestors to the key. */ public B addAncestors(PathElement ancestor, PathElement... other) { return addAncestors(ImmutableList.builder().add(ancestor).add(other).build()); } - - /** - * Adds the provided ancestors to the key. - */ + /** Adds the provided ancestors to the key. */ public B addAncestors(Iterable ancestors) { ImmutableList list = ImmutableList.copyOf(ancestors); - Preconditions.checkState(this.ancestors.size() + list.size() < MAX_PATH, - "path can have at most 100 elements"); + Preconditions.checkState( + this.ancestors.size() + list.size() < MAX_PATH, "path can have at most 100 elements"); this.ancestors.addAll(list); return self(); } - - /** - * Sets the kind of the key. - */ + /** Sets the kind of the key. */ public B setKind(String kind) { this.kind = validateKind(kind); return self(); } - - /** - * Sets the project ID of the key. - */ + /** Sets the project ID of the key. */ public B setProjectId(String projectId) { this.projectId = validateDatabase(projectId); return self(); } - - /** - * Sets the namespace of the key. - */ + /** Sets the namespace of the key. */ public B setNamespace(String namespace) { this.namespace = validateNamespace(namespace); return self(); @@ -143,34 +122,22 @@ public B setNamespace(String namespace) { this.path = path; } - - /** - * Returns the key's projectId. - */ + /** Returns the key's projectId. */ public String getProjectId() { return projectId; } - - /** - * Returns the key's namespace or {@code null} if not provided. - */ + /** Returns the key's namespace or {@code null} if not provided. */ public String getNamespace() { return namespace; } - - /** - * Returns an immutable list with the key's ancestors. - */ + /** Returns an immutable list with the key's ancestors. */ public List getAncestors() { return getPath().subList(0, getPath().size() - 1); } - - /** - * Returns an immutable list of the key's path (ancestors + self). - */ + /** Returns an immutable list of the key's path (ancestors + self). */ List getPath() { return path; } @@ -179,15 +146,11 @@ PathElement getLeaf() { return getPath().get(getPath().size() - 1); } - - /** - * Returns the key's kind. - */ + /** Returns the key's kind. */ public String getKind() { return getLeaf().getKind(); } - abstract BaseKey getParent(); @Override diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java index ee90aefe2955..ee1c48db2827 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java @@ -19,11 +19,10 @@ import java.util.List; /** - * An interface to represent a batch of write operations. - * Any write operation that is applied on a batch will only be sent - * to the Datastore upon {@link #submit}. - * A usage example: - * 
 {@code
+ * An interface to represent a batch of write operations. Any write operation that is applied on a
+ * batch will only be sent to the Datastore upon {@link #submit}. A usage example:
+ *
+ * 
{@code
  * Entity entity1 = datastore.get(key1);
  * Batch batch = datastore.newBatch();
  * Entity entity2 = Entity.newBuilder(key2).set("name", "John").build();
@@ -32,15 +31,13 @@
  * batch.update(entity1);
  * batch.add(entity2, entity3);
  * batch.submit();
- * } 

+ * }
*/ public interface Batch extends DatastoreBatchWriter { interface Response { - /** - * Returns a list of keys generated by a batch. - */ + /** Returns a list of keys generated by a batch. */ List getGeneratedKeys(); } @@ -48,8 +45,8 @@ interface Response { * {@inheritDoc} * *

If an entity for {@code entity.getKey()} does not exists, {@code entity} is inserted. - * Otherwise, {@link #submit()} will throw a {@link DatastoreException} with - * {@link DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. + * Otherwise, {@link #submit()} will throw a {@link DatastoreException} with {@link + * DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. */ @Override Entity add(FullEntity entity); @@ -58,9 +55,9 @@ interface Response { * {@inheritDoc} * *

If none of entities' keys exist, all entities are inserted. If any of entities' keys already - * exists, {@link #submit()} will throw a {@link DatastoreException} with - * {@link DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in - * {@code entities} whose key did not exist are inserted. + * exists, {@link #submit()} will throw a {@link DatastoreException} with {@link + * DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in {@code + * entities} whose key did not exist are inserted. */ @Override List add(FullEntity... entities); @@ -72,9 +69,6 @@ interface Response { */ Response submit(); - - /** - * Returns the batch associated {@link Datastore}. - */ + /** Returns the batch associated {@link Datastore}. */ Datastore getDatastore(); } 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 dc02db735109..5fc0bcd8a27e 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 @@ -34,7 +34,6 @@ static class ResponseImpl implements Batch.Response { this.numAutoAllocatedIds = numAutoAllocatedIds; } - @Override public List getGeneratedKeys() { Iterator results = @@ -65,7 +64,6 @@ public Batch.Response submit() { return new ResponseImpl(responsePb, toAddAutoId().size()); } - @Override public Datastore getDatastore() { return datastore; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java index 211d34ceccf9..7677573593e5 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java @@ -21,7 +21,6 @@ import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.protobuf.ByteString; - import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,11 +29,10 @@ import java.nio.ByteBuffer; /** - * A Google Cloud Datastore Blob. - * This class is immutable. + * A Google Cloud Datastore Blob. This class is immutable. * - * @see - * Google Cloud Datastore Entities, Properties, and Keys + * @see Google Cloud Datastore + * Entities, Properties, and Keys */ public final class Blob implements Serializable { @@ -69,35 +67,27 @@ public boolean equals(Object obj) { return obj == this || obj instanceof Blob && byteString.equals(((Blob) obj).byteString); } - - /** - * Returns the size of this blob. - */ + /** Returns the size of this blob. */ public int getLength() { return byteString.size(); } - /** - * Returns a copy as byte array. - */ + /** Returns a copy as byte array. */ public byte[] toByteArray() { return byteString.toByteArray(); } - /** - * Returns a read-only {@link ByteBuffer} for this blob content. - */ + /** Returns a read-only {@link ByteBuffer} for this blob content. */ public ByteBuffer asReadOnlyByteBuffer() { return byteString.asReadOnlyByteBuffer(); } - /** - * Returns an {@link InputStream} for this blob content. - */ + /** Returns an {@link InputStream} for this blob content. */ public InputStream asInputStream() { final ByteBuffer byteBuffer = asReadOnlyByteBuffer(); return new InputStream() { - @Override public int read() { + @Override + public int read() { return !byteBuffer.hasRemaining() ? -1 : byteBuffer.get() & 0xFF; } }; @@ -107,8 +97,8 @@ public InputStream asInputStream() { * Copies bytes into a ByteBuffer. * * @throws java.nio.ReadOnlyBufferException if the target is read-only - * @throws java.nio.BufferOverflowException if the target's remaining() space is not large - * enough to hold the data + * @throws java.nio.BufferOverflowException if the target's remaining() space is not large enough + * to hold the data */ public void copyTo(ByteBuffer target) { byteString.copyTo(target); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java index c3f4a53743cf..e9fb2591ff6e 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java @@ -77,7 +77,6 @@ public static BlobValue of(Blob blob) { return new BlobValue(blob); } - public static Builder newBuilder(Blob blob) { return new Builder().set(blob); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java index 9674cba913b4..69ee1dff963d 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java @@ -77,7 +77,6 @@ public static BooleanValue of(boolean value) { return new BooleanValue(value); } - public static Builder newBuilder(boolean value) { return new Builder().set(value); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java index 0dc911962eaa..959eddef38e3 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java @@ -22,12 +22,11 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.io.BaseEncoding; import com.google.protobuf.ByteString; - import java.io.Serializable; /** - * A Google Cloud Datastore cursor. - * The cursor can be used to as a starting point or an ending point for a {@link Query} + * A Google Cloud Datastore cursor. The cursor can be used to as a starting point or an ending point + * for a {@link Query} */ public final class Cursor implements Serializable { @@ -63,16 +62,12 @@ ByteString getByteString() { return byteString; } - /** - * Returns the cursor in an encoded form that can be used as part of a URL. - */ + /** Returns the cursor in an encoded form that can be used as part of a URL. */ public String toUrlSafe() { return BaseEncoding.base64Url().encode(byteString.toByteArray()); } - /** - * Create a {@code Cursor} given its URL safe encoded form. - */ + /** Create a {@code Cursor} given its URL safe encoded form. */ public static Cursor fromUrlSafe(String urlSafe) { try { return Cursor.copyFrom(BaseEncoding.base64Url().decode(urlSafe)); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java index 1917d92c5ffe..0edbadc10bf2 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java @@ -21,15 +21,14 @@ import java.util.Iterator; import java.util.List; -/** - * An interface for Google Cloud Datastore. - */ +/** An interface for Google Cloud Datastore. */ public interface Datastore extends Service, DatastoreReaderWriter { /** * Returns a new Datastore transaction. * - * @param options a transaction option indicating the mode of the transaction (read-only or read-write) + * @param options a transaction option indicating the mode of the transaction (read-only or + * read-write) * @throws DatastoreException upon failure */ Transaction newTransaction(TransactionOptions options); @@ -42,10 +41,10 @@ public interface Datastore extends Service, DatastoreReaderWri Transaction newTransaction(); /** - * A callback for running with a transactional - * {@link com.google.cloud.datastore.DatastoreReaderWriter}. - * The associated transaction will be committed after a successful return from the {@code run} - * method. Any propagated exception will cause the transaction to be rolled-back. + * A callback for running with a transactional {@link + * com.google.cloud.datastore.DatastoreReaderWriter}. The associated transaction will be committed + * after a successful return from the {@code run} method. Any propagated exception will cause the + * transaction to be rolled-back. * * @param the type of the return value */ @@ -54,14 +53,15 @@ interface TransactionCallable { } /** - * Invokes the callback's {@link Datastore.TransactionCallable#run} method with a - * {@link DatastoreReaderWriter} that is associated with a new transaction. - * The transaction will be committed upon successful invocation. - * Any thrown exception will cause the transaction to rollback and will be propagated - * as a {@link DatastoreException} with the original exception as its root cause. + * Invokes the callback's {@link Datastore.TransactionCallable#run} method with a {@link + * DatastoreReaderWriter} that is associated with a new transaction. The transaction will be + * committed upon successful invocation. Any thrown exception will cause the transaction to + * rollback and will be propagated as a {@link DatastoreException} with the original exception as + * its root cause. * *

Example of running in a transaction. - * 

 {@code
+   *
+   * 
{@code
    * String callableResult = "my_callable_result";
    * TransactionCallable callable = new TransactionCallable() {
    *   public String run(DatastoreReaderWriter readerWriter) {
@@ -77,18 +77,17 @@ interface TransactionCallable {
    */
    T runInTransaction(TransactionCallable callable);
 
-
   /**
-   * Invokes the callback's {@link Datastore.TransactionCallable#run} method with a
-   * {@link DatastoreReaderWriter} that is associated with a new transaction.
-   * The transaction will be committed upon successful invocation.
-   * Any thrown exception will cause the transaction to rollback and will be propagated
-   * as a {@link DatastoreException} with the original exception as its root cause.
-   * If {@link TransactionOptions} is set to read-write mode, previous transaction Id
-   * in the options will be automatically populated each time a transaction is retried.
+   * Invokes the callback's {@link Datastore.TransactionCallable#run} method with a {@link
+   * DatastoreReaderWriter} that is associated with a new transaction. The transaction will be
+   * committed upon successful invocation. Any thrown exception will cause the transaction to
+   * rollback and will be propagated as a {@link DatastoreException} with the original exception as
+   * its root cause. If {@link TransactionOptions} is set to read-write mode, previous transaction
+   * Id in the options will be automatically populated each time a transaction is retried.
    *
    * 
Example of running in a transaction.
-   * 
 {@code
+   *
+   * 
{@code
    * String callableResult = "my_callable_result";
    * TransactionCallable callable = new TransactionCallable() {
    *   public String run(DatastoreReaderWriter readerWriter) {
@@ -106,7 +105,8 @@ interface TransactionCallable {
    * }

    *
    * @param callable the callback to call with a newly created transactional readerWriter
-   * @param options the Transaction options indicating whether the transaction mode is Read-only or Read-Write
+   * @param options the Transaction options indicating whether the transaction mode is Read-only or
+   *     Read-Write
    * @throws DatastoreException upon failure
    */
    T runInTransaction(TransactionCallable callable, TransactionOptions options);
@@ -115,7 +115,8 @@ interface TransactionCallable {
    * Returns a new Batch for processing multiple write operations in one request.
    *
    * 
Example of starting a new batch.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name_1";
    * String keyName2 = "my_key_name_2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
@@ -127,20 +128,19 @@ interface TransactionCallable {
    * batch.add(entity2);
    * batch.submit();
    * }

-   *
    */
   Batch newBatch();
 
   /**
-   * Allocate a unique id for the given key.
-   * The returned key will have the same information (projectId, kind, namespace and ancestors)
-   * as the given key and will have a newly assigned id.
+   * Allocate a unique id for the given key. The returned key will have the same information
+   * (projectId, kind, namespace and ancestors) as the given key and will have a newly assigned id.
    *
    * 
Example of allocating an id.
-   * 
 {@code
+   *
+   * 
{@code
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
    * IncompleteKey incompleteKey = keyFactory.newKey();
-   * 
+   *
    * // let cloud datastore automatically assign an id
    * Key key = datastore.allocateId(incompleteKey);
    * }

@@ -153,11 +153,12 @@ interface TransactionCallable {
    * Returns a list of keys using the allocated ids ordered by the input.
    *
    * 
Example of allocating multiple ids in a single batch.
-   * 
 {@code
+   *
+   * 
{@code
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
    * IncompleteKey incompleteKey1 = keyFactory.newKey();
    * IncompleteKey incompleteKey2 = keyFactory.newKey();
-   * 
+   *
    * // let cloud datastore automatically assign the ids
    * List keys = datastore.allocateId(incompleteKey1, incompleteKey2);
    * }

@@ -175,7 +176,8 @@ interface TransactionCallable {
    * equal to {@code "ALREADY_EXISTS"}.
    *
    * 
Example of adding a single entity.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName = "my_key_name";
    * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
    * Entity.Builder entityBuilder = Entity.newBuilder(key);
@@ -200,25 +202,26 @@ interface TransactionCallable {
    * {@inheritDoc}
    *
    * 
If none of entities' keys exist, all entities are inserted. If any of entities' keys already
-   * exists the method throws a {@link DatastoreException} with
-   * {@link DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in
-   * {@code entities} whose key did not exist are inserted. To achieve a transactional behavior,
-   * use {@link Transaction}.
+   * exists the method throws a {@link DatastoreException} with {@link
+   * DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in {@code
+   * entities} whose key did not exist are inserted. To achieve a transactional behavior, use {@link
+   * Transaction}.
    *
    * 
Example of adding multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name1";
    * String keyName2 = "my_key_name2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
    * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "value1");
    * Entity entity1 = entityBuilder1.build();
-   * 
+   *
    * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
    * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "value2");
    * Entity entity2 = entityBuilder2.build();
-   * 
+   *
    * try {
    *   datastore.add(entity1, entity2);
    * } catch (DatastoreException ex) {
@@ -237,19 +240,20 @@ interface TransactionCallable {
    * {@inheritDoc}
    *
    * 
Example of updating multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name_1";
    * String keyName2 = "my_key_name_2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
    * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "updatedValue1");
    * Entity entity1 = entityBuilder1.build();
-   * 
+   *
    * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
    * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "updatedValue2");
    * Entity entity2 = entityBuilder2.build();
-   * 
+   *
    * datastore.update(entity1, entity2);
    * }

    *
@@ -262,7 +266,8 @@ interface TransactionCallable {
    * {@inheritDoc}
    *
    * 
Example of putting a single entity.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName = "my_key_name";
    * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
    * Entity.Builder entityBuilder = Entity.newBuilder(key);
@@ -280,19 +285,20 @@ interface TransactionCallable {
    * {@inheritDoc}
    *
    * 
Example of putting multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name1";
    * String keyName2 = "my_key_name2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
    * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "value1");
    * Entity entity1 = entityBuilder1.build();
-   * 
+   *
    * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
    * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "value2");
    * Entity entity2 = entityBuilder2.build();
-   * 
+   *
    * datastore.put(entity1, entity2);
    * }

    *
@@ -305,7 +311,8 @@ interface TransactionCallable {
    * {@inheritDoc}
    *
    * 
Example of deleting multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name1";
    * String keyName2 = "my_key_name2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
@@ -322,19 +329,20 @@ interface TransactionCallable {
    * Returns a new KeyFactory for this service
    *
    * 
Example of creating a {@code KeyFactory}.
-   * 
 {@code
+   *
+   * 
{@code
    * KeyFactory keyFactory = datastore.newKeyFactory();
    * }

-   *
    */
   KeyFactory newKeyFactory();
 
   /**
-   * Returns an {@link Entity} for the given {@link Key} or {@code null} if it doesn't exist.
-   * {@link ReadOption}s can be specified if desired.
+   * Returns an {@link Entity} for the given {@link Key} or {@code null} if it doesn't exist. {@link
+   * ReadOption}s can be specified if desired.
    *
    * 
Example of getting an entity.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName = "my_key_name";
    * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
    * Entity entity = datastore.get(key);
@@ -347,13 +355,13 @@ interface TransactionCallable {
 
   /**
    * Returns an {@link Entity} for each given {@link Key} that exists in the Datastore. The order of
-   * the result is unspecified. Results are loaded lazily, so it is possible to get a
-   * {@code DatastoreException} from the returned {@code Iterator}'s
-   * {@link Iterator#hasNext hasNext} or {@link Iterator#next next} methods. {@link ReadOption}s can
-   * be specified if desired.
+   * the result is unspecified. Results are loaded lazily, so it is possible to get a {@code
+   * DatastoreException} from the returned {@code Iterator}'s {@link Iterator#hasNext hasNext} or
+   * {@link Iterator#next next} methods. {@link ReadOption}s can be specified if desired.
    *
    * 
Example of getting multiple entity objects.
-   * 
 {@code
+   *
+   * 
{@code
    * String firstKeyName = "my_first_key_name";
    * String secondKeyName = "my_second_key_name";
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
@@ -379,7 +387,8 @@ interface TransactionCallable {
    * loading the results. {@link ReadOption}s can be specified if desired.
    *
    * 
Example of fetching a list of Entity objects.
-   * 
 {@code
+   *
+   * 
{@code
    * String firstKeyName = "my_first_key_name";
    * String secondKeyName = "my_second_key_name";
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
@@ -390,7 +399,6 @@ interface TransactionCallable {
    *   // do something with the entity
    * }
    * }

-   *
    */
   List fetch(Iterable keys, ReadOption... options);
 
@@ -399,7 +407,8 @@ interface TransactionCallable {
    * desired.
    *
    * 
Example of running a query to find all entities of one kind.
-   * 
 {@code
+   *
+   * 
{@code
    * String kind = "my_kind";
    * StructuredQuery query = Query.newEntityQueryBuilder()
    *     .setKind(kind)
@@ -414,7 +423,8 @@ interface TransactionCallable {
    * }

    *
    * 
Example of running a query to find all entities with a matching property value.
-   * 
 {@code
+   *
+   * 
{@code
    * String kind = "my_kind";
    * String property = "my_property";
    * String value = "my_value";
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
index f24d39691a41..d03d90af8253 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
@@ -36,9 +36,8 @@ public interface DatastoreBatchWriter extends DatastoreWriter {
   void addWithDeferredIdAllocation(FullEntity... entities);
 
   /**
-   * {@inheritDoc}
-   * If {@code entity} has a complete key and was already marked for deletion in this writer, the
-   * operation will be changed to {@link #put}.
+   * {@inheritDoc} If {@code entity} has a complete key and was already marked for deletion in this
+   * writer, the operation will be changed to {@link #put}.
    *
    * @throws DatastoreException if a given entity with the same complete key was already added to
    *     this writer, if writer is not active or if id allocation for an entity with an incomplete
@@ -48,9 +47,8 @@ public interface DatastoreBatchWriter extends DatastoreWriter {
   Entity add(FullEntity entity);
 
   /**
-   * {@inheritDoc}
-   * For entities with complete keys that were marked for deletion in this writer the operation
-   * will be changed to {@link #put}.
+   * {@inheritDoc} For entities with complete keys that were marked for deletion in this writer the
+   * operation will be changed to {@link #put}.
    *
    * @throws DatastoreException if a given entity with the same complete key was already added to
    *     this writer, if writer is not active or if id allocation for an entity with an incomplete
@@ -60,9 +58,8 @@ public interface DatastoreBatchWriter extends DatastoreWriter {
   List add(FullEntity... entities);
 
   /**
-   * {@inheritDoc}
-   * This operation will be converted to {@link #put} operation for entities that were already
-   * added or put in this writer.
+   * {@inheritDoc} This operation will be converted to {@link #put} operation for entities that were
+   * already added or put in this writer.
    *
    * @throws DatastoreException if an entity is marked for deletion in this writer or if not active
    */
@@ -70,9 +67,8 @@ public interface DatastoreBatchWriter extends DatastoreWriter {
   void update(Entity... entities);
 
   /**
-   * {@inheritDoc}
-   * This operation will also remove from this batch any prior writes for entities with the same
-   * keys.
+   * {@inheritDoc} This operation will also remove from this batch any prior writes for entities
+   * with the same keys.
    *
    * @throws DatastoreException if not active
    */
@@ -90,8 +86,8 @@ public interface DatastoreBatchWriter extends DatastoreWriter {
   void putWithDeferredIdAllocation(FullEntity... entities);
 
   /**
-   * {@inheritDoc}
-   * This operation will also remove from this writer any prior writes for the same entity.
+   * {@inheritDoc} This operation will also remove from this writer any prior writes for the same
+   * entity.
    *
    * @throws DatastoreException if not active or if id allocation for an entity with an incomplete
    *     key failed
@@ -100,8 +96,8 @@ public interface DatastoreBatchWriter extends DatastoreWriter {
   Entity put(FullEntity entity);
 
   /**
-   * {@inheritDoc}
-   * This operation will also remove from this writer any prior writes for the same entities.
+   * {@inheritDoc} This operation will also remove from this writer any prior writes for the same
+   * entities.
    *
    * @throws DatastoreException if not active or if id allocation for an entity with an incomplete
    *     key failed
@@ -109,9 +105,6 @@ public interface DatastoreBatchWriter extends DatastoreWriter {
   @Override
   List put(FullEntity... entities);
 
-
-  /**
-   * Returns {@code true} if still active (write operations were not sent to the Datastore).
-   */
+  /** Returns {@code true} if still active (write operations were not sent to the Datastore). */
   boolean isActive();
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
index 50392f4afece..512d0a3dc270 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
@@ -27,15 +27,16 @@
  * Datastore service exception.
  *
  * @see Google Cloud
- *      Datastore error codes
+ *     Datastore error codes
  */
 public final class DatastoreException extends BaseHttpServiceException {
 
   // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes"
-  private static final Set RETRYABLE_ERRORS = ImmutableSet.of(
-      new Error(10, "ABORTED", false),
-      new Error(4, "DEADLINE_EXCEEDED", false),
-      new Error(14, "UNAVAILABLE", true));
+  private static final Set RETRYABLE_ERRORS =
+      ImmutableSet.of(
+          new Error(10, "ABORTED", false),
+          new Error(4, "DEADLINE_EXCEEDED", false),
+          new Error(14, "UNAVAILABLE", true));
   private static final long serialVersionUID = 2663750991205874435L;
 
   public DatastoreException(int code, String message, String reason) {
@@ -46,8 +47,8 @@ public DatastoreException(int code, String message, String reason, Throwable cau
     super(code, message, reason, true, RETRYABLE_ERRORS, cause);
   }
 
-  public DatastoreException(int code, String message, String reason, boolean idempotent,
-      Throwable cause) {
+  public DatastoreException(
+      int code, String message, String reason, boolean idempotent, Throwable cause) {
     super(code, message, reason, idempotent, RETRYABLE_ERRORS, cause);
   }
 
@@ -73,8 +74,8 @@ static DatastoreException translateAndThrow(RetryHelperException ex) {
    * @throws DatastoreException every time
    */
   static DatastoreException throwInvalidRequest(String massage, Object... params) {
-    throw new DatastoreException(UNKNOWN_CODE, String.format(massage, params),
-        "FAILED_PRECONDITION");
+    throw new DatastoreException(
+        UNKNOWN_CODE, String.format(massage, params), "FAILED_PRECONDITION");
   }
 
   static DatastoreException propagateUserException(Exception ex) {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
index 98c1bcfa8e9c..1b443066d94a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
@@ -16,11 +16,7 @@
 
 package com.google.cloud.datastore;
 
-
 import com.google.cloud.ServiceFactory;
 
-/**
- * An interface for Datastore factories.
- */
-public interface DatastoreFactory extends ServiceFactory {
-}
+/** An interface for Datastore factories. */
+public interface DatastoreFactory extends ServiceFactory {}
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 3c9d29a3472f..985b76a7cb10 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
@@ -26,16 +26,15 @@
 import java.util.Map;
 
 /**
- * Provide functionality that should be added to the appropriate interfaces
- * via Java 8 default methods.
+ * Provide functionality that should be added to the appropriate interfaces via Java 8 default
+ * methods.
  */
 class DatastoreHelper {
 
-  private DatastoreHelper() {
-  }
+  private DatastoreHelper() {}
 
   static Key allocateId(Datastore service, IncompleteKey key) {
-    return service.allocateId(new IncompleteKey[]{key}).get(0);
+    return service.allocateId(new IncompleteKey[] {key}).get(0);
   }
 
   static Entity get(Transaction reader, Key key) {
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 45fa212c8839..84102c75b1f0 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
@@ -54,8 +54,8 @@ final class DatastoreImpl extends BaseService implements Datas
   DatastoreImpl(DatastoreOptions options) {
     super(options);
     this.datastoreRpc = options.getDatastoreRpcV1();
-    retrySettings = MoreObjects
-        .firstNonNull(options.getRetrySettings(), ServiceOptions.getNoRetrySettings());
+    retrySettings =
+        MoreObjects.firstNonNull(options.getRetrySettings(), ServiceOptions.getNoRetrySettings());
   }
 
   @Override
@@ -79,7 +79,8 @@ static class ReadWriteTransactionCallable implements Callable {
     private volatile TransactionOptions options;
     private volatile Transaction transaction;
 
-    ReadWriteTransactionCallable(Datastore datastore, TransactionCallable callable, TransactionOptions options) {
+    ReadWriteTransactionCallable(
+        Datastore datastore, TransactionCallable callable, TransactionOptions options) {
       this.datastore = datastore;
       this.callable = callable;
       this.options = options;
@@ -118,7 +119,8 @@ public T call() throws DatastoreException {
         if (transaction.isActive()) {
           transaction.rollback();
         }
-        if (options != null && options.getModeCase().equals(TransactionOptions.ModeCase.READ_WRITE)) {
+        if (options != null
+            && options.getModeCase().equals(TransactionOptions.ModeCase.READ_WRITE)) {
           setPrevTransactionId(transaction.getTransactionId());
         }
       }
@@ -140,14 +142,15 @@ public  T runInTransaction(final TransactionCallable callable) {
   }
 
   @Override
-  public  T runInTransaction(final TransactionCallable callable, TransactionOptions transactionOptions) {
+  public  T runInTransaction(
+      final TransactionCallable callable, TransactionOptions transactionOptions) {
     final DatastoreImpl self = this;
     try {
       return RetryHelper.runWithRetries(
-              new ReadWriteTransactionCallable(self, callable, transactionOptions),
-              retrySettings,
-              TRANSACTION_EXCEPTION_HANDLER,
-              getOptions().getClock());
+          new ReadWriteTransactionCallable(self, callable, transactionOptions),
+          retrySettings,
+          TRANSACTION_EXCEPTION_HANDLER,
+          getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
     }
@@ -173,11 +176,13 @@ com.google.datastore.v1.RunQueryResponse runQuery(
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
-            public com.google.datastore.v1.RunQueryResponse call()
-                throws DatastoreException {
+            public com.google.datastore.v1.RunQueryResponse call() throws DatastoreException {
               return datastoreRpc.runQuery(requestPb);
             }
-          }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock());
+          },
+          retrySettings,
+          EXCEPTION_HANDLER,
+          getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
     }
@@ -199,7 +204,8 @@ private boolean verifyIncompleteKeyType(IncompleteKey... keys) {
 
   @Override
   public List allocateId(IncompleteKey... keys) {
-    Preconditions.checkArgument(verifyIncompleteKeyType(keys), "keys must be IncompleteKey instances");
+    Preconditions.checkArgument(
+        verifyIncompleteKeyType(keys), "keys must be IncompleteKey instances");
     if (keys.length == 0) {
       return Collections.emptyList();
     }
@@ -222,11 +228,13 @@ private com.google.datastore.v1.AllocateIdsResponse allocateIds(
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
-            public com.google.datastore.v1.AllocateIdsResponse call()
-                throws DatastoreException {
+            public com.google.datastore.v1.AllocateIdsResponse call() throws DatastoreException {
               return datastoreRpc.allocateIds(requestPb);
             }
-          }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock());
+          },
+          retrySettings,
+          EXCEPTION_HANDLER,
+          getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
     }
@@ -265,8 +273,8 @@ public List add(FullEntity... entities) {
       } else {
         Preconditions.checkArgument(entity.hasKey(), "Entity %s is missing a key", entity);
       }
-      mutationsPb.add(com.google.datastore.v1.Mutation.newBuilder()
-          .setInsert(entity.toPb()).build());
+      mutationsPb.add(
+          com.google.datastore.v1.Mutation.newBuilder().setInsert(entity.toPb()).build());
     }
     com.google.datastore.v1.CommitResponse commitResponse = commitMutation(mutationsPb);
     Iterator mutationResults =
@@ -309,9 +317,10 @@ private static com.google.datastore.v1.ReadOptions toReadOptionsPb(ReadOption...
     com.google.datastore.v1.ReadOptions readOptionsPb = null;
     if (options != null
         && ReadOption.asImmutableMap(options).containsKey(EventualConsistency.class)) {
-      readOptionsPb = com.google.datastore.v1.ReadOptions.newBuilder()
-          .setReadConsistency(ReadConsistency.EVENTUAL)
-          .build();
+      readOptionsPb =
+          com.google.datastore.v1.ReadOptions.newBuilder()
+              .setReadConsistency(ReadConsistency.EVENTUAL)
+              .build();
     }
     return readOptionsPb;
   }
@@ -379,11 +388,13 @@ com.google.datastore.v1.LookupResponse lookup(
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
-            public com.google.datastore.v1.LookupResponse call()
-                throws DatastoreException {
+            public com.google.datastore.v1.LookupResponse call() throws DatastoreException {
               return datastoreRpc.lookup(requestPb);
             }
-          }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock());
+          },
+          retrySettings,
+          EXCEPTION_HANDLER,
+          getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
     }
@@ -486,7 +497,8 @@ public com.google.datastore.v1.CommitResponse call() throws DatastoreException {
             }
           },
           retrySettings,
-          EXCEPTION_HANDLER, getOptions().getClock());
+          EXCEPTION_HANDLER,
+          getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
     }
@@ -509,7 +521,8 @@ public com.google.datastore.v1.BeginTransactionResponse call()
             }
           },
           retrySettings,
-          EXCEPTION_HANDLER, getOptions().getClock());
+          EXCEPTION_HANDLER,
+          getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
     }
@@ -524,13 +537,17 @@ void rollbackTransaction(ByteString transaction) {
 
   void rollback(final com.google.datastore.v1.RollbackRequest requestPb) {
     try {
-      RetryHelper.runWithRetries(new Callable() {
-        @Override
-        public Void call() throws DatastoreException {
-          datastoreRpc.rollback(requestPb);
-          return null;
-        }
-      }, retrySettings, EXCEPTION_HANDLER, getOptions().getClock());
+      RetryHelper.runWithRetries(
+          new Callable() {
+            @Override
+            public Void call() throws DatastoreException {
+              datastoreRpc.rollback(requestPb);
+              return null;
+            }
+          },
+          retrySettings,
+          EXCEPTION_HANDLER,
+          getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
     }
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 8182d9833490..f754866a94c8 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,22 +18,21 @@
 
 import static com.google.cloud.datastore.Validator.validateNamespace;
 
-import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.ServiceDefaults;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.ServiceRpc;
 import com.google.cloud.TransportOptions;
-import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.cloud.datastore.spi.DatastoreRpcFactory;
+import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.cloud.datastore.spi.v1.HttpDatastoreRpc;
+import com.google.cloud.http.HttpTransportOptions;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.Set;
 
-public class DatastoreOptions
-    extends ServiceOptions {
+public class DatastoreOptions extends ServiceOptions {
 
   private static final long serialVersionUID = -1018382430058137336L;
   private static final String API_SHORT_NAME = "Datastore";
@@ -62,13 +61,11 @@ public ServiceRpc create(DatastoreOptions options) {
     }
   }
 
-  public static class Builder extends
-      ServiceOptions.Builder {
+  public static class Builder extends ServiceOptions.Builder {
 
     private String namespace;
 
-    private Builder() {
-    }
+    private Builder() {}
 
     private Builder(DatastoreOptions options) {
       super(options);
@@ -89,9 +86,7 @@ public DatastoreOptions build() {
       return new DatastoreOptions(this);
     }
 
-    /**
-     * Sets the default namespace to be used by the datastore service.
-     */
+    /** Sets the default namespace to be used by the datastore service. */
     public Builder setNamespace(String namespace) {
       this.namespace = validateNamespace(namespace);
       return this;
@@ -105,22 +100,23 @@ private DatastoreOptions(Builder builder) {
 
   @Override
   protected String getDefaultHost() {
-    String host = System.getProperty(
-        com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR,
-        System.getenv(com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR));
+    String host =
+        System.getProperty(
+            com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR,
+            System.getenv(com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR));
     return host != null ? host : com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST;
   }
 
   @Override
   protected String getDefaultProject() {
-    String projectId = System.getProperty(
-        com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR,
-        System.getenv(com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR));
+    String projectId =
+        System.getProperty(
+            com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR,
+            System.getenv(com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR));
     return projectId != null ? projectId : super.getDefaultProject();
   }
 
-  private static class DatastoreDefaults implements
-      ServiceDefaults {
+  private static class DatastoreDefaults implements ServiceDefaults {
 
     @Override
     public DatastoreFactory getDefaultServiceFactory() {
@@ -142,18 +138,12 @@ public static HttpTransportOptions getDefaultHttpTransportOptions() {
     return HttpTransportOptions.newBuilder().build();
   }
 
-
-  /**
-   * Returns the default namespace to be used by the datastore service.
-   */
+  /** Returns the default namespace to be used by the datastore service. */
   public String getNamespace() {
     return namespace;
   }
 
-
-  /**
-   * Returns a default {@code DatastoreOptions} instance.
-   */
+  /** Returns a default {@code DatastoreOptions} instance. */
   public static DatastoreOptions getDefaultInstance() {
     return newBuilder().build();
   }
@@ -199,7 +189,6 @@ public boolean equals(Object obj) {
     return baseEquals(other) && Objects.equals(namespace, other.namespace);
   }
 
-
   public static Builder newBuilder() {
     return new Builder();
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
index 93c6b5053589..3d5b7cd3e90c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
@@ -19,9 +19,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-/**
- * An interface to represent Google Cloud Datastore read operations.
- */
+/** An interface to represent Google Cloud Datastore read operations. */
 public interface DatastoreReader {
 
   /**
@@ -33,9 +31,9 @@ public interface DatastoreReader {
 
   /**
    * Returns an {@link Entity} for each given {@link Key} that exists in the Datastore. The order of
-   * the result is unspecified. Results are loaded lazily, so it is possible to get a
-   * {@code DatastoreException} from the returned {@code Iterator}'s
-   * {@link Iterator#hasNext hasNext} or {@link Iterator#next next} methods.
+   * the result is unspecified. Results are loaded lazily, so it is possible to get a {@code
+   * DatastoreException} from the returned {@code Iterator}'s {@link Iterator#hasNext hasNext} or
+   * {@link Iterator#next next} methods.
    *
    * @throws DatastoreException upon failure
    * @see #get(Key)
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
index 30ed9998dde5..a51a5aa77a9a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
@@ -16,9 +16,5 @@
 
 package com.google.cloud.datastore;
 
-
-/**
- * An interface that combines both Google Cloud Datastore read and write operations.
- */
-public interface DatastoreReaderWriter extends DatastoreReader, DatastoreWriter {
-}
+/** An interface that combines both Google Cloud Datastore read and write operations. */
+public interface DatastoreReaderWriter extends DatastoreReader, DatastoreWriter {}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
index 6d18e95908b5..6c1d6fdbc9f8 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
@@ -18,9 +18,7 @@
 
 import java.util.List;
 
-/**
- * An interface to represent Google Cloud Datastore write operations.
- */
+/** An interface to represent Google Cloud Datastore write operations. */
 public interface DatastoreWriter {
 
   /**
@@ -28,8 +26,8 @@ public interface DatastoreWriter {
    * an id if necessary.
    *
    * @param entity the entity to add
-   * @return an {@code Entity} with the same properties and a key that is either newly allocated
-   *     or the same one if key is already complete
+   * @return an {@code Entity} with the same properties and a key that is either newly allocated or
+   *     the same one if key is already complete
    * @throws DatastoreException upon failure
    * @throws IllegalArgumentException if the given entity is missing a key
    */
@@ -39,8 +37,8 @@ public interface DatastoreWriter {
    * Datastore add operation: inserts the provided entities. This method will automatically allocate
    * id for any entity with an incomplete key.
    *
-   * @return a list of {@code Entity} ordered by input with the same properties and a key that
-   *     is either newly allocated or the same one if was already complete
+   * @return a list of {@code Entity} ordered by input with the same properties and a key that is
+   *     either newly allocated or the same one if was already complete
    * @throws DatastoreException upon failure
    * @throws IllegalArgumentException if any of the given entities is missing a key
    * @see #add(FullEntity)
@@ -60,8 +58,8 @@ public interface DatastoreWriter {
    * otherwise. This method will automatically allocate an id if necessary.
    *
    * @param entity the entity to put
-   * @return an {@code Entity} with the same properties and a key that is either newly allocated
-   *     or the same one if key is already complete
+   * @return an {@code Entity} with the same properties and a key that is either newly allocated or
+   *     the same one if key is already complete
    * @throws DatastoreException upon failure
    * @throws IllegalArgumentException if the given entity is missing a key
    */
@@ -78,8 +76,6 @@ public interface DatastoreWriter {
    */
   List put(FullEntity... entities);
 
-  /**
-   * A datastore delete operation. It is OK to request the deletion of a non-existing key.
-   */
+  /** A datastore delete operation. It is OK to request the deletion of a non-existing key. */
   void delete(Key... keys);
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
index 3e049c664038..b746e848cf3d 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
@@ -77,7 +77,6 @@ public static DoubleValue of(double value) {
     return new DoubleValue(value);
   }
 
-
   public static Builder newBuilder(double value) {
     return new Builder().set(value);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
index bc9f4c70c941..599942dd8832 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
@@ -21,8 +21,8 @@
 import com.google.common.base.Preconditions;
 
 /**
- * An entity is the Google Cloud Datastore persistent data object for a specific key.
- * An entity will always have a complete {@link Key}.
+ * An entity is the Google Cloud Datastore persistent data object for a specific key. An entity will
+ * always have a complete {@link Key}.
  */
 public final class Entity extends FullEntity {
 
@@ -30,8 +30,7 @@ public final class Entity extends FullEntity {
 
   public static final class Builder extends BaseEntity.Builder {
 
-    private Builder() {
-    }
+    private Builder() {}
 
     private Builder(Key key) {
       super(checkNotNull(key));
@@ -46,7 +45,6 @@ private Builder(Key key, FullEntity entity) {
       setKey(key);
     }
 
-
     @Override
     public Builder setKey(Key key) {
       super.setKey(checkNotNull(key));
@@ -76,17 +74,14 @@ static Entity convert(FullEntity from) {
     return new Entity(from);
   }
 
-
   public static Builder newBuilder(Key key) {
     return new Builder(key);
   }
 
-
   public static Builder newBuilder(Entity copyFrom) {
     return new Builder(copyFrom);
   }
 
-
   public static Builder newBuilder(Key key, FullEntity copyFrom) {
     return new Builder(key, copyFrom);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
index 47e7cc8b9146..d20ee07415c9 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
@@ -27,9 +27,7 @@ public final class EntityQuery extends StructuredQuery {
 
   private static final long serialVersionUID = -4748310327736758820L;
 
-  /**
-   * A {@code EntityQuery} builder for queries that return {@link Entity} results.
-   */
+  /** A {@code EntityQuery} builder for queries that return {@link Entity} results. */
   public static final class Builder extends StructuredQuery.BuilderImpl {
 
     Builder(EntityQuery query) {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
index 07b00b164df3..757ffdd10c01 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
@@ -77,7 +77,6 @@ public static EntityValue of(FullEntity entity) {
     return new EntityValue(entity);
   }
 
-
   public static Builder newBuilder(FullEntity entity) {
     return new Builder().set(entity);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
index 9f0fa547aa30..f69fbc22536b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
@@ -17,8 +17,8 @@
 package com.google.cloud.datastore;
 
 /**
- * A full entity is a {@link BaseEntity} that holds all the properties associated with a
- * Datastore entity (as opposed to {@link ProjectionEntity}).
+ * A full entity is a {@link BaseEntity} that holds all the properties associated with a Datastore
+ * entity (as opposed to {@link ProjectionEntity}).
  */
 public class FullEntity extends BaseEntity {
 
@@ -26,8 +26,7 @@ public class FullEntity extends BaseEntity {
 
   public static class Builder extends BaseEntity.Builder> {
 
-    Builder() {
-    }
+    Builder() {}
 
     Builder(K key) {
       super(key);
@@ -51,17 +50,14 @@ public FullEntity build() {
     super(from);
   }
 
-
   public static Builder newBuilder() {
     return new Builder<>();
   }
 
-
   public static  Builder newBuilder(K key) {
     return new Builder<>(key);
   }
 
-
   public static  Builder newBuilder(FullEntity copyFrom) {
     return new Builder<>(copyFrom);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index c3c40a3d3e2f..f2686ec7002c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -43,7 +43,8 @@
  * 
A usage example:

  *
  * 
When the type of the results is known the preferred usage would be:
- * 
 {@code
+ *
+ * 
{@code
  * Query query =
  *     Query.newGqlQueryBuilder(Query.ResultType.ENTITY, "select * from kind").build();
  * QueryResults results = datastore.run(query);
@@ -51,10 +52,11 @@
  *   Entity entity = results.next();
  *   ...
  * }
- * } 

+ * }

  *
  * 
When the type of the results is unknown you can use this approach:
- * 
 {@code
+ *
+ * 
{@code
  * Query query = Query.newGqlQueryBuilder("select __key__ from kind").build();
  * QueryResults results = datastore.run(query);
  * if (Key.class.isAssignableFrom(results.getResultClass())) {
@@ -64,7 +66,7 @@
  *     ...
  *   }
  * }
- * } 

+ * }

  *
  * @param  the type of the result values this query will produce
  * @see GQL Reference
@@ -145,9 +147,7 @@ static Binding fromPb(com.google.datastore.v1.GqlQueryParameter argPb) {
     }
   }
 
-  /**
-   * A GQL query builder.
-   */
+  /** A GQL query builder. */
   public static final class Builder {
 
     private final ResultType resultType;
@@ -162,28 +162,21 @@ public static final class Builder {
       queryString = checkNotNull(query);
     }
 
-
-    /**
-     * Sets the GQL query.
-     */
+    /** Sets the GQL query. */
     public Builder setQuery(String query) {
       queryString = checkNotNull(query);
       return this;
     }
 
-
-    /**
-     * Sets the namespace for the GQL query.
-     */
+    /** Sets the namespace for the GQL query. */
     public Builder setNamespace(String namespace) {
       this.namespace = validateNamespace(namespace);
       return this;
     }
 
-
     /**
-     * Sets whether the query string can contain literals.  When {@code false}, the query string
-     * must not contain any literals and instead must bind all values.
+     * Sets whether the query string can contain literals. When {@code false}, the query string must
+     * not contain any literals and instead must bind all values.
      */
     public Builder setAllowLiteral(boolean allowLiteral) {
       this.allowLiteral = allowLiteral;
@@ -211,8 +204,7 @@ public Builder setBinding(String name, Cursor cursor) {
      * Sets a new named binding.
      *
      * @param name name of the binding
-     * @param value a String object or a list of String objects that binds to a
-     *     given name
+     * @param value a String object or a list of String objects that binds to a given name
      */
     public Builder setBinding(String name, String... value) {
       namedBindings.put(name, toBinding(StringValue.MARSHALLER, Arrays.asList(value)));
@@ -284,7 +276,8 @@ public Builder setBinding(String name, Key... value) {
      */
     @Deprecated
     public Builder setBinding(String name, FullEntity... value) {
-      throw new DatastoreException(Status.Code.UNIMPLEMENTED.value(), "Binding entities is not supported.", "UNIMPLEMENTED");
+      throw new DatastoreException(
+          Status.Code.UNIMPLEMENTED.value(), "Binding entities is not supported.", "UNIMPLEMENTED");
     }
 
     /**
@@ -311,8 +304,8 @@ public Builder addBinding(Cursor cursor) {
     /**
      * Sets a new positional binding.
      *
-     * @param value a String object or a list of String objects to be set as a new
-     *     positional binding
+     * @param value a String object or a list of String objects to be set as a new positional
+     *     binding
      */
     public Builder addBinding(String... value) {
       positionalBindings.add(toBinding(StringValue.MARSHALLER, Arrays.asList(value)));
@@ -380,7 +373,8 @@ public Builder addBinding(Key... value) {
      */
     @Deprecated
     public Builder addBinding(FullEntity... value) {
-      throw new DatastoreException(Status.Code.UNIMPLEMENTED.value(), "Binding entities is not supported.", "UNIMPLEMENTED");
+      throw new DatastoreException(
+          Status.Code.UNIMPLEMENTED.value(), "Binding entities is not supported.", "UNIMPLEMENTED");
     }
 
     /**
@@ -398,8 +392,8 @@ public GqlQuery build() {
       return new GqlQuery<>(this);
     }
 
-    private static  Binding toBinding(Value.BuilderFactory builderFactory,
-        List values) {
+    private static  Binding toBinding(
+        Value.BuilderFactory builderFactory, List values) {
       List> list = new ArrayList<>(values.size());
       for (Object object : values) {
         @SuppressWarnings("unchecked")
@@ -426,26 +420,20 @@ private GqlQuery(Builder builder) {
     positionalBindings = ImmutableList.copyOf(builder.positionalBindings);
   }
 
-
-  /**
-   * Returns the query string for this query.
-   */
+  /** Returns the query string for this query. */
   public String getQueryString() {
     return queryString;
   }
 
   /**
-   * Returns whether the query string can contain literals.  When {@code false}, the query string
+   * Returns whether the query string can contain literals. When {@code false}, the query string
    * must not contain any literals and instead must bind all values.
    */
   public boolean allowLiteral() {
     return allowLiteral;
   }
 
-
-  /**
-   * Returns an immutable map of named bindings.
-   */
+  /** Returns an immutable map of named bindings. */
   public Map getNamedBindings() {
     ImmutableMap.Builder builder = ImmutableSortedMap.naturalOrder();
     for (Map.Entry binding : namedBindings.entrySet()) {
@@ -454,10 +442,7 @@ public Map getNamedBindings() {
     return builder.build();
   }
 
-
-  /**
-   * Returns an immutable list of positional bindings (using original order).
-   */
+  /** Returns an immutable list of positional bindings (using original order). */
   public List getNumberArgs() {
     ImmutableList.Builder builder = ImmutableList.builder();
     for (Binding binding : positionalBindings) {
@@ -471,15 +456,15 @@ public String toString() {
     return super.toStringHelper()
         .add("queryString", queryString)
         .add("allowLiteral", allowLiteral)
-        .add("namedBindings",  namedBindings)
+        .add("namedBindings", namedBindings)
         .add("positionalBindings", positionalBindings)
         .toString();
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getNamespace(), queryString, allowLiteral, namedBindings,
-        positionalBindings);
+    return Objects.hash(
+        getNamespace(), queryString, allowLiteral, namedBindings, positionalBindings);
   }
 
   @Override
@@ -494,8 +479,8 @@ public boolean equals(Object obj) {
     return Objects.equals(getNamespace(), other.getNamespace())
         && Objects.equals(queryString, other.queryString)
         && allowLiteral == other.allowLiteral
-        && Objects.equals(namedBindings,  other.namedBindings)
-        && Objects.equals(positionalBindings,  other.positionalBindings);
+        && Objects.equals(namedBindings, other.namedBindings)
+        && Objects.equals(positionalBindings, other.positionalBindings);
   }
 
   com.google.datastore.v1.GqlQuery toPb() {
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 194a0bbe9366..afabadba251c 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
@@ -18,13 +18,9 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-
 import java.util.List;
 
-/**
- * An incomplete key (without a name or id).
- * This class is immutable.
- */
+/** An incomplete key (without a name or id). This class is immutable. */
 public class IncompleteKey extends BaseKey {
 
   private static final long serialVersionUID = 4947014765344279019L;
@@ -41,8 +37,8 @@ private Builder(IncompleteKey copyFrom) {
 
     @Override
     public IncompleteKey build() {
-      ImmutableList path = ImmutableList.builder()
-          .addAll(ancestors).add(PathElement.of(kind)).build();
+      ImmutableList path =
+          ImmutableList.builder().addAll(ancestors).add(PathElement.of(kind)).build();
       return new IncompleteKey(projectId, namespace, path);
     }
   }
@@ -73,10 +69,7 @@ static IncompleteKey fromPb(com.google.datastore.v1.Key keyPb) {
     return new IncompleteKey(projectId, namespace, path);
   }
 
-
-  /**
-   * Returns the key's parent.
-   */
+  /** Returns the key's parent. */
   @Override
   public Key getParent() {
     List ancestors = getAncestors();
@@ -97,17 +90,14 @@ public Key getParent() {
     return keyBuilder.addAncestors(ancestors.subList(0, ancestors.size() - 1)).build();
   }
 
-
   public static Builder newBuilder(String projectId, String kind) {
     return new Builder(projectId, kind);
   }
 
-
   public static Builder newBuilder(IncompleteKey copyFrom) {
     return new Builder(copyFrom);
   }
 
-
   public static Builder newBuilder(Key parent, String kind) {
     return newBuilder(parent.getProjectId(), kind)
         .setNamespace(parent.getNamespace())
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 8f43ceb84a2a..785d3592fa5b 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
@@ -21,18 +21,16 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.TextFormat;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 
 /**
- * A key that is guaranteed to be complete and could be used to reference a
- * Google Cloud Datastore {@link Entity}.
- * This class is immutable.
+ * A key that is guaranteed to be complete and could be used to reference a Google Cloud Datastore
+ * {@link Entity}. This class is immutable.
  *
  * @see Google Cloud Datastore
- *    Entities, Properties, and Keys
+ *     Entities, Properties, and Keys
  */
 public final class Key extends IncompleteKey {
 
@@ -72,20 +70,14 @@ private Builder(Key copyFrom) {
       }
     }
 
-
-    /**
-     * Sets the name of this key.
-     */
+    /** Sets the name of this key. */
     public Builder setName(String name) {
       this.name = name;
       id = null;
       return this;
     }
 
-
-    /**
-     * Sets the ID of this key.
-     */
+    /** Sets the ID of this key. */
     public Builder setId(long id) {
       this.id = id;
       name = null;
@@ -114,10 +106,7 @@ public boolean hasId() {
     return getLeaf().hasId();
   }
 
-
-  /**
-   * Returns the key's id or {@code null} if it has a name instead.
-   */
+  /** Returns the key's id or {@code null} if it has a name instead. */
   public Long getId() {
     return getLeaf().getId();
   }
@@ -126,25 +115,17 @@ public boolean hasName() {
     return getLeaf().hasName();
   }
 
-
-  /**
-   * Returns the key's name or {@code null} if it has an id instead.
-   */
+  /** Returns the key's name or {@code null} if it has an id instead. */
   public String getName() {
     return getLeaf().getName();
   }
 
-
-  /**
-   * Returns the key's ID (as {@link Long}) or name (as {@link String}). Never {@code null}.
-   */
+  /** Returns the key's ID (as {@link Long}) or name (as {@link String}). Never {@code null}. */
   public Object getNameOrId() {
     return getLeaf().getNameOrId();
   }
 
-  /**
-   * Returns the key in an encoded form that can be used as part of a URL.
-   */
+  /** Returns the key in an encoded form that can be used as part of a URL. */
   public String toUrlSafe() {
     try {
       return URLEncoder.encode(TextFormat.printToString(toPb()), UTF_8.name());
@@ -177,39 +158,32 @@ static Key fromPb(com.google.datastore.v1.Key keyPb) {
     return (Key) key;
   }
 
-
   public static Builder newBuilder(String projectId, String kind, String name) {
     return new Builder(projectId, kind, name);
   }
 
-
   public static Builder newBuilder(String projectId, String kind, long id) {
     return new Builder(projectId, kind, id);
   }
 
-
   public static Builder newBuilder(Key copyFrom) {
     return new Builder(copyFrom);
   }
 
-
   public static Builder newBuilder(IncompleteKey copyFrom, String name) {
     return new Builder(copyFrom, name);
   }
 
-
   public static Builder newBuilder(IncompleteKey copyFrom, long id) {
     return new Builder(copyFrom, id);
   }
 
-
   public static Builder newBuilder(Key parent, String kind, String name) {
     Builder builder = newBuilder(parent.getProjectId(), kind, name);
     addParentToBuilder(parent, builder);
     return builder;
   }
 
-
   public static Builder newBuilder(Key parent, String kind, long id) {
     Builder builder = newBuilder(parent.getProjectId(), kind, id);
     addParentToBuilder(parent, 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 62b79cba90e8..7c6b07347cd1 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
@@ -19,8 +19,8 @@
 import com.google.common.collect.ImmutableList;
 
 /**
- * A helper for creating keys for a specific {@link Datastore},
- * using its associated projectId and namespace.
+ * A helper for creating keys for a specific {@link Datastore}, using its associated projectId and
+ * namespace.
  */
 public final class KeyFactory extends BaseKey.Builder {
 
@@ -39,25 +39,32 @@ public KeyFactory(String projectId, String namespace) {
   }
 
   public IncompleteKey newKey() {
-    ImmutableList path = ImmutableList.builder()
-        .addAll(ancestors).add(PathElement.of(kind)).build();
+    ImmutableList path =
+        ImmutableList.builder().addAll(ancestors).add(PathElement.of(kind)).build();
     return new IncompleteKey(projectId, namespace, path);
   }
 
   public Key newKey(String name) {
-    ImmutableList path = ImmutableList.builder()
-        .addAll(ancestors).add(PathElement.of(kind, name)).build();
+    ImmutableList path =
+        ImmutableList.builder()
+            .addAll(ancestors)
+            .add(PathElement.of(kind, name))
+            .build();
     return new Key(projectId, namespace, path);
   }
 
   public Key newKey(long id) {
-    ImmutableList path = ImmutableList.builder()
-        .addAll(ancestors).add(PathElement.of(kind, id)).build();
+    ImmutableList path =
+        ImmutableList.builder()
+            .addAll(ancestors)
+            .add(PathElement.of(kind, id))
+            .build();
     return new Key(projectId, namespace, path);
   }
 
   /**
    * Resets the KeyFactory to its initial state.
+   *
    * @return {@code this} for chaining
    */
   public KeyFactory reset() {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
index d1c660ec3c81..46974acde899 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
@@ -27,9 +27,7 @@ public final class KeyQuery extends StructuredQuery {
 
   private static final long serialVersionUID = 1187064062245269457L;
 
-  /**
-   * A {@code KeyQuery} builder for queries that return {@link Key} results.
-   */
+  /** A {@code KeyQuery} builder for queries that return {@link Key} results. */
   public static final class Builder extends StructuredQuery.BuilderImpl {
 
     Builder(KeyQuery query) {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
index 94ce1e297f5d..64c411f4193a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
@@ -77,7 +77,6 @@ public static KeyValue of(Key key) {
     return new KeyValue(key);
   }
 
-
   public static Builder newBuilder(Key key) {
     return new Builder().set(key);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
index 1a198a649075..9b969dd81821 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
@@ -22,8 +22,8 @@
 import java.util.Objects;
 
 /**
- * A Google Cloud Datastore LatLng (represented by latitude and longitude in degrees).
- * This class is immutable.
+ * A Google Cloud Datastore LatLng (represented by latitude and longitude in degrees). This class is
+ * immutable.
  *
  * @see Google Cloud Datastore
  *     Entities, Properties, and Keys
@@ -45,18 +45,12 @@ public final class LatLng implements Serializable {
     this.longitude = longitude;
   }
 
-
-  /**
-   * Returns the latitude.
-   */
+  /** Returns the latitude. */
   public double getLatitude() {
     return latitude;
   }
 
-
-  /**
-   * Returns the longitude.
-   */
+  /** Returns the longitude. */
   public double getLongitude() {
     return longitude;
   }
@@ -73,8 +67,10 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj == this || (obj instanceof LatLng && this.latitude == ((LatLng) obj).latitude
-               && this.longitude == ((LatLng) obj).longitude);
+    return obj == this
+        || (obj instanceof LatLng
+            && this.latitude == ((LatLng) obj).latitude
+            && this.longitude == ((LatLng) obj).longitude);
   }
 
   public static LatLng of(double latitude, double longitude) {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
index c8096eef122d..f655f5857823 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
@@ -78,7 +78,6 @@ public static LatLngValue of(LatLng value) {
     return new LatLngValue(value);
   }
 
-
   public static Builder newBuilder(LatLng value) {
     return new Builder().set(value);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
index efe28d579466..f4402b1156bd 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
@@ -21,13 +21,10 @@
 import com.google.cloud.Timestamp;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * A Google Cloud Datastore list value. A list value is a list of {@link Value} objects.
- */
+/** A Google Cloud Datastore list value. A list value is a list of {@link Value} objects. */
 public final class ListValue extends Value>> {
 
   private static final long serialVersionUID = -5121887228607148857L;
@@ -62,13 +59,13 @@ protected void setValue(ListValue from, com.google.datastore.v1.Value.Builder to
           for (Value property : from.get()) {
             propertiesPb.add(property.toPb());
           }
-          to.setArrayValue(com.google.datastore.v1.ArrayValue.newBuilder()
-              .addAllValues(propertiesPb));
+          to.setArrayValue(
+              com.google.datastore.v1.ArrayValue.newBuilder().addAllValues(propertiesPb));
         }
       };
 
-  public static final class Builder extends
-      Value.BaseBuilder>, ListValue, Builder> {
+  public static final class Builder
+      extends Value.BaseBuilder>, ListValue, Builder> {
 
     private ImmutableList.Builder> listBuilder = ImmutableList.builder();
 
@@ -82,9 +79,7 @@ private void addValueHelper(Value value) {
       listBuilder.add(value);
     }
 
-    /**
-     * Adds the provided values to the {@code ListValue} builder.
-     */
+    /** Adds the provided values to the {@code ListValue} builder. */
     public Builder addValue(Value first, Value... other) {
       addValueHelper(first);
       for (Value value : other) {
@@ -93,9 +88,7 @@ public Builder addValue(Value first, Value... other) {
       return this;
     }
 
-    /**
-     * Adds the provided string values to the {@code ListValue} builder.
-     */
+    /** Adds the provided string values to the {@code ListValue} builder. */
     public Builder addValue(String first, String... other) {
       listBuilder.add(StringValue.of(first));
       for (String value : other) {
@@ -104,9 +97,7 @@ public Builder addValue(String first, String... other) {
       return this;
     }
 
-    /**
-     * Adds the provided long values to the {@code ListValue} builder.
-     */
+    /** Adds the provided long values to the {@code ListValue} builder. */
     public Builder addValue(long first, long... other) {
       listBuilder.add(LongValue.of(first));
       for (long value : other) {
@@ -115,9 +106,7 @@ public Builder addValue(long first, long... other) {
       return this;
     }
 
-    /**
-     * Adds the provided double values to the {@code ListValue} builder.
-     */
+    /** Adds the provided double values to the {@code ListValue} builder. */
     public Builder addValue(double first, double... other) {
       listBuilder.add(DoubleValue.of(first));
       for (double value : other) {
@@ -126,9 +115,7 @@ public Builder addValue(double first, double... other) {
       return this;
     }
 
-    /**
-     * Adds the provided boolean values to the {@code ListValue} builder.
-     */
+    /** Adds the provided boolean values to the {@code ListValue} builder. */
     public Builder addValue(boolean first, boolean... other) {
       listBuilder.add(BooleanValue.of(first));
       for (boolean value : other) {
@@ -137,9 +124,7 @@ public Builder addValue(boolean first, boolean... other) {
       return this;
     }
 
-    /**
-     * Adds the provided {@code Timestamp} values to the {@code ListValue} builder.
-     */
+    /** Adds the provided {@code Timestamp} values to the {@code ListValue} builder. */
     public Builder addValue(Timestamp first, Timestamp... other) {
       listBuilder.add(TimestampValue.of(first));
       for (Timestamp value : other) {
@@ -148,9 +133,7 @@ public Builder addValue(Timestamp first, Timestamp... other) {
       return this;
     }
 
-    /**
-     * Adds the provided {@code LatLng} values to the {@code ListValue} builder.
-     */
+    /** Adds the provided {@code LatLng} values to the {@code ListValue} builder. */
     public Builder addValue(LatLng first, LatLng... other) {
       listBuilder.add(LatLngValue.of(first));
       for (LatLng value : other) {
@@ -159,9 +142,7 @@ public Builder addValue(LatLng first, LatLng... other) {
       return this;
     }
 
-    /**
-     * Adds the provided {@code Key} values to the {@code ListValue} builder.
-     */
+    /** Adds the provided {@code Key} values to the {@code ListValue} builder. */
     public Builder addValue(Key first, Key... other) {
       listBuilder.add(KeyValue.of(first));
       for (Key value : other) {
@@ -170,9 +151,7 @@ public Builder addValue(Key first, Key... other) {
       return this;
     }
 
-    /**
-     * Adds the provided {@code FullEntity} values to the {@code ListValue} builder.
-     */
+    /** Adds the provided {@code FullEntity} values to the {@code ListValue} builder. */
     public Builder addValue(FullEntity first, FullEntity... other) {
       listBuilder.add(EntityValue.of(first));
       for (FullEntity value : other) {
@@ -181,9 +160,7 @@ public Builder addValue(FullEntity first, FullEntity... other) {
       return this;
     }
 
-    /**
-     * Adds the provided {@code Blob} values to the {@code ListValue} builder.
-     */
+    /** Adds the provided {@code Blob} values to the {@code ListValue} builder. */
     public Builder addValue(Blob first, Blob... other) {
       listBuilder.add(BlobValue.of(first));
       for (Blob value : other) {
@@ -212,9 +189,7 @@ public List> get() {
       return listBuilder.build();
     }
 
-    /**
-     * Creates a {@code ListValue} object.
-     */
+    /** Creates a {@code ListValue} object. */
     @Override
     public ListValue build() {
       return new ListValue(this);
@@ -233,95 +208,68 @@ private ListValue(Builder builder) {
     super(builder);
   }
 
-  /**
-   * Returns a builder for the list value object.
-   */
+  /** Returns a builder for the list value object. */
   @Override
   public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
-  /**
-   * Creates a {@code ListValue} object given a list of {@code Value} objects.
-   */
+  /** Creates a {@code ListValue} object given a list of {@code Value} objects. */
   public static ListValue of(List> values) {
     return new ListValue(values);
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of {@code Value} objects.
-   */
+  /** Creates a {@code ListValue} object given a number of {@code Value} objects. */
   public static ListValue of(Value first, Value... other) {
     return new ListValue(first, other);
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of string values.
-   */
+  /** Creates a {@code ListValue} object given a number of string values. */
   public static ListValue of(String first, String... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of long values.
-   */
+  /** Creates a {@code ListValue} object given a number of long values. */
   public static ListValue of(long first, long... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of double values.
-   */
+  /** Creates a {@code ListValue} object given a number of double values. */
   public static ListValue of(double first, double... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of boolean values.
-   */
+  /** Creates a {@code ListValue} object given a number of boolean values. */
   public static ListValue of(boolean first, boolean... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of {@code Timestamp} values.
-   */
+  /** Creates a {@code ListValue} object given a number of {@code Timestamp} values. */
   public static ListValue of(Timestamp first, Timestamp... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of {@code LatLng} values.
-   */
+  /** Creates a {@code ListValue} object given a number of {@code LatLng} values. */
   public static ListValue of(LatLng first, LatLng... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of {@code Key} values.
-   */
+  /** Creates a {@code ListValue} object given a number of {@code Key} values. */
   public static ListValue of(Key first, Key... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of {@code FullEntity} values.
-   */
+  /** Creates a {@code ListValue} object given a number of {@code FullEntity} values. */
   public static ListValue of(FullEntity first, FullEntity... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-  /**
-   * Creates a {@code ListValue} object given a number of {@code Blob} values.
-   */
+  /** Creates a {@code ListValue} object given a number of {@code Blob} values. */
   public static ListValue of(Blob first, Blob... other) {
     return newBuilder().addValue(first, other).build();
   }
 
-
-  /**
-   * Returns a builder for {@code ListValue} objects.
-   */
+  /** Returns a builder for {@code ListValue} objects. */
   public static Builder newBuilder() {
     return new Builder();
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
index 8f3f36f07db8..3c633537bd21 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
@@ -77,7 +77,6 @@ public static LongValue of(long value) {
     return new LongValue(value);
   }
 
-
   public static Builder newBuilder(long value) {
     return new Builder().set(value);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
index c47fe16952a9..eaa9094443aa 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
@@ -49,8 +49,7 @@ protected void setValue(NullValue from, com.google.datastore.v1.Value.Builder to
         }
       };
 
-  public static final class Builder 
-      extends Value.BaseBuilder {
+  public static final class Builder extends Value.BaseBuilder {
 
     private Builder() {
       super(ValueType.NULL);
@@ -85,7 +84,6 @@ public static NullValue of() {
     return new NullValue();
   }
 
-
   public static Builder newBuilder() {
     return new Builder();
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
index 588ec72a0238..fb72f4f06bf2 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
@@ -21,13 +21,10 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
-
 import java.io.Serializable;
 import java.util.Objects;
 
-/**
- * Represents a single element in a key's path.
- */
+/** Represents a single element in a key's path. */
 public final class PathElement implements Serializable {
 
   private static final long serialVersionUID = -777300414390493910L;
@@ -42,10 +39,7 @@ private PathElement(String kind, String name, Long id) {
     this.id = id;
   }
 
-
-  /**
-   * Returns the kind of this path element.
-   */
+  /** Returns the kind of this path element. */
   public String getKind() {
     return kind;
   }
@@ -54,10 +48,7 @@ public boolean hasId() {
     return id != null;
   }
 
-
-  /**
-   * Returns the ID of this path element.
-   */
+  /** Returns the ID of this path element. */
   public Long getId() {
     return id;
   }
@@ -66,18 +57,14 @@ public boolean hasName() {
     return name != null;
   }
 
-
-  /**
-   * Returns the name of this path element.
-   */
+  /** Returns the name of this path element. */
   public String getName() {
     return name;
   }
 
-
   /**
-   * Returns the path element's ID (as {@link Long}) or name (as {@link String}). Never
-   * {@code null}.
+   * Returns the path element's ID (as {@link Long}) or name (as {@link String}). Never {@code
+   * null}.
    */
   public Object getNameOrId() {
     return id == null ? name : id;
@@ -140,7 +127,7 @@ static PathElement of(String kind) {
   }
 
   public static PathElement of(String kind, String name) {
-    checkArgument(!Strings.isNullOrEmpty(name) , "name must not be empty or null");
+    checkArgument(!Strings.isNullOrEmpty(name), "name must not be empty or null");
     checkArgument(name.length() <= 500, "name must not exceed 500 characters");
     return new PathElement(kind, name, null);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
index a76e1ec8efd0..0b44eb37ea50 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
@@ -20,9 +20,9 @@
 import com.google.protobuf.ByteString;
 
 /**
- * A projection entity is a result of a Google Cloud Datastore projection query.
- * A projection entity holds one or more properties, represented by a name (as {@link String})
- * and a value (as {@link Value}), and may have a {@link Key}.
+ * A projection entity is a result of a Google Cloud Datastore projection query. A projection entity
+ * holds one or more properties, represented by a name (as {@link String}) and a value (as {@link
+ * Value}), and may have a {@link Key}.
  *
  * @see Google Cloud
  *     Datastore projection queries
@@ -35,8 +35,7 @@ public final class ProjectionEntity extends BaseEntity {
 
   public static final class Builder extends BaseEntity.Builder {
 
-    Builder() {
-    }
+    Builder() {}
 
     private Builder(ProjectionEntity entity) {
       super(entity);
@@ -76,7 +75,6 @@ static ProjectionEntity fromPb(com.google.datastore.v1.Entity entityPb) {
     return new Builder().fill(entityPb).build();
   }
 
-
   public static Builder newBuilder(ProjectionEntity copyFrom) {
     return new Builder(copyFrom);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
index 68684843f5a6..092d9fd5d835 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
@@ -41,16 +41,13 @@ public static final class Builder extends StructuredQuery.BuilderImplNote that queries require proper indexing. See
- * 
- * Cloud Datastore Index Configuration for help configuring indexes.
+ * 
Note that queries require proper indexing. See Cloud Datastore Index
+ * Configuration for help configuring indexes.
  *
  * @param  the type of the values returned by this query.
  * @see Datastore Queries
@@ -44,33 +43,32 @@ public abstract class Query implements Serializable {
   private final String namespace;
 
   /**
-   * This class represents the expected type of the result.
-   *   ENTITY: A full entity represented by {@link Entity}.
-   *   PROJECTION_ENTITY: A projection entity, represented by {@link ProjectionEntity}.
-   *   KEY: An entity's {@link Key}.
+   * This class represents the expected type of the result. ENTITY: A full entity represented by
+   * {@link Entity}. PROJECTION_ENTITY: A projection entity, represented by {@link
+   * ProjectionEntity}. KEY: An entity's {@link Key}.
    */
   public abstract static class ResultType implements Serializable {
 
     private static final long serialVersionUID = 2104157695425806623L;
     private static final Map>
-        PB_TO_INSTANCE = Maps.newEnumMap(
-            com.google.datastore.v1.EntityResult.ResultType.class);
+        PB_TO_INSTANCE = Maps.newEnumMap(com.google.datastore.v1.EntityResult.ResultType.class);
 
-    static final ResultType UNKNOWN = new ResultType(null, Object.class) {
+    static final ResultType UNKNOWN =
+        new ResultType(null, Object.class) {
 
-      private static final long serialVersionUID = 1602329532153860907L;
+          private static final long serialVersionUID = 1602329532153860907L;
 
-      @Override
-      Object convert(com.google.datastore.v1.Entity entityPb) {
-        if (entityPb.getPropertiesMap().isEmpty()) {
-          if (!entityPb.hasKey()) {
-            return null;
+          @Override
+          Object convert(com.google.datastore.v1.Entity entityPb) {
+            if (entityPb.getPropertiesMap().isEmpty()) {
+              if (!entityPb.hasKey()) {
+                return null;
+              }
+              return Key.fromPb(entityPb.getKey());
+            }
+            return ProjectionEntity.fromPb(entityPb);
           }
-          return Key.fromPb(entityPb.getKey());
-        }
-        return ProjectionEntity.fromPb(entityPb);
-      }
-    };
+        };
 
     public static final ResultType ENTITY =
         new ResultType(com.google.datastore.v1.EntityResult.ResultType.FULL, Entity.class) {
@@ -95,8 +93,8 @@ Key convert(com.google.datastore.v1.Entity entityPb) {
         };
 
     public static final ResultType PROJECTION_ENTITY =
-        new ResultType(com.google.datastore.v1.EntityResult.ResultType.PROJECTION,
-            ProjectionEntity.class) {
+        new ResultType(
+            com.google.datastore.v1.EntityResult.ResultType.PROJECTION, ProjectionEntity.class) {
 
           private static final long serialVersionUID = -7591409419690650246L;
 
@@ -109,8 +107,8 @@ ProjectionEntity convert(com.google.datastore.v1.Entity entityPb) {
     private final Class resultClass;
     private final com.google.datastore.v1.EntityResult.ResultType queryType;
 
-    private ResultType(com.google.datastore.v1.EntityResult.ResultType queryType,
-        Class resultClass) {
+    private ResultType(
+        com.google.datastore.v1.EntityResult.ResultType queryType, Class resultClass) {
       this.queryType = queryType;
       this.resultClass = resultClass;
       if (queryType != null) {
@@ -167,7 +165,6 @@ ResultType getType() {
     return resultType;
   }
 
-
   public String getNamespace() {
     return namespace;
   }
@@ -180,12 +177,12 @@ ToStringHelper toStringHelper() {
 
   abstract Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb);
 
-
   /**
    * Returns a new {@link GqlQuery} builder.
    *
    * 
Example of creating and running a GQL query.
-   * 
 {@code
+   *
+   * 
{@code
    * String kind = "my_kind";
    * String gqlQuery = "select * from " + kind;
    * Query query = Query.newGqlQueryBuilder(gqlQuery).build();
@@ -199,12 +196,12 @@ public static GqlQuery.Builder newGqlQueryBuilder(String gql) {
     return newGqlQueryBuilder(ResultType.UNKNOWN, gql);
   }
 
-
   /**
    * Returns a new {@link GqlQuery} builder.
    *
    * 
Example of creating and running a typed GQL query.
-   * 
 {@code
+   *
+   * 
{@code
    * String kind = "my_kind";
    * String gqlQuery = "select * from " + kind;
    * Query query = Query.newGqlQueryBuilder(Query.ResultType.ENTITY, gqlQuery).build();
@@ -218,46 +215,44 @@ public static  GqlQuery.Builder newGqlQueryBuilder(ResultType resultTyp
     return new GqlQuery.Builder<>(resultType, gql);
   }
 
-
   /**
    * Returns a new {@link StructuredQuery} builder for full (complete entities) queries.
    *
    * 
Example of creating and running an entity query.
-   * 
 {@code
+   *
+   * 
{@code
    * String kind = "my_kind";
    * Query query = Query.newEntityQueryBuilder().setKind(kind).build();
    * QueryResults results = datastore.run(query);
    * // Use results
    * }

-   *
    */
   public static EntityQuery.Builder newEntityQueryBuilder() {
     return new EntityQuery.Builder();
   }
 
-
   /**
    * Returns a new {@link StructuredQuery} builder for key only queries.
    *
    * 
Example of creating and running a key query.
-   * 
 {@code
+   *
+   * 
{@code
    * String kind = "my_kind";
    * Query query = Query.newKeyQueryBuilder().setKind(kind).build();
    * QueryResults results = datastore.run(query);
    * // Use results
    * }

-   *
    */
   public static KeyQuery.Builder newKeyQueryBuilder() {
     return new KeyQuery.Builder();
   }
 
-
   /**
    * Returns a new {@link StructuredQuery} builder for projection queries.
    *
    * 
Example of creating and running a projection entity query.
-   * 
 {@code
+   *
+   * 
{@code
    * String kind = "my_kind";
    * String property = "my_property";
    * Query query = Query.newProjectionEntityQueryBuilder()
@@ -267,7 +262,6 @@ public static KeyQuery.Builder newKeyQueryBuilder() {
    * QueryResults results = datastore.run(query);
    * // Use results
    * }

-   *
    */
   public static ProjectionEntityQuery.Builder newProjectionEntityQueryBuilder() {
     return new ProjectionEntityQuery.Builder();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
index 8c03bda46bcc..27c6f19aebf4 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
@@ -19,31 +19,27 @@
 import java.util.Iterator;
 
 /**
- * The result of a Google Cloud Datastore query submission.
- * When the result is not typed it is possible to cast it to its appropriate type according to
- * the {@link #getResultClass} value.
+ * The result of a Google Cloud Datastore query submission. When the result is not typed it is
+ * possible to cast it to its appropriate type according to the {@link #getResultClass} value.
  * Results are loaded lazily in batches, where batch size is set by Cloud Datastore. As a result, it
- * is possible to get a {@code DatastoreException} upon {@link Iterator#hasNext hasNext} or
- * {@link Iterator#next next} calls.
+ * is possible to get a {@code DatastoreException} upon {@link Iterator#hasNext hasNext} or {@link
+ * Iterator#next next} calls.
  *
  * @param  the type of the results value.
  */
 public interface QueryResults extends Iterator {
 
-
-  /**
-   * Returns the actual class of the result's values.
-   */
+  /** Returns the actual class of the result's values. */
   Class getResultClass();
 
-
   /**
    * Returns the Cursor for the point after the value returned in the last {@link #next} call. This
    * cursor can be used to issue subsequent queries (with the same constraints) that may return
    * additional results.
    *
    * 
A simple use case:
-   * 
 {@code
+   *
+   * 
{@code
    * Query query = Query.newEntityQueryBuilder()
    *     .setKind("Person")
    *     .setFilter(PropertyFilter.eq("favoriteFood", "pizza"))
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 dde12d8a8dd8..c6179686707e 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
@@ -21,7 +21,6 @@
 import com.google.common.collect.AbstractIterator;
 import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
 import com.google.protobuf.ByteString;
-
 import java.util.Iterator;
 import java.util.Objects;
 
@@ -39,14 +38,14 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
   private Iterator entityResultPbIter;
   private ByteString cursor;
 
-  QueryResultsImpl(DatastoreImpl datastore, com.google.datastore.v1.ReadOptions readOptionsPb,
-                   Query query) {
+  QueryResultsImpl(
+      DatastoreImpl datastore, com.google.datastore.v1.ReadOptions readOptionsPb, Query query) {
     this.datastore = datastore;
     this.readOptionsPb = readOptionsPb;
     this.query = query;
     queryResultType = query.getType();
     com.google.datastore.v1.PartitionId.Builder pbBuilder =
-         com.google.datastore.v1.PartitionId.newBuilder();
+        com.google.datastore.v1.PartitionId.newBuilder();
     pbBuilder.setProjectId(datastore.getOptions().getProjectId());
     if (query.getNamespace() != null) {
       pbBuilder.setNamespaceId(query.getNamespace());
@@ -82,7 +81,8 @@ private void sendRequest() {
       // projection entity can represent all type of results
       actualResultType = ResultType.PROJECTION_ENTITY;
     }
-    Preconditions.checkState(queryResultType.isAssignableFrom(actualResultType),
+    Preconditions.checkState(
+        queryResultType.isAssignableFrom(actualResultType),
         "Unexpected result type " + actualResultType + " vs " + queryResultType);
   }
 
@@ -103,13 +103,11 @@ protected T computeNext() {
     return result;
   }
 
-
   @Override
   public Class getResultClass() {
     return actualResultType.resultClass();
   }
 
-
   @Override
   public Cursor getCursorAfter() {
     return new Cursor(cursor);
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
index 2db0507e415d..a0c33776b1bc 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
@@ -36,8 +36,7 @@ public int getProtoFieldId() {
         }
 
         @Override
-        protected com.google.datastore.v1.Value getValue(
-            com.google.datastore.v1.Value from) {
+        protected com.google.datastore.v1.Value getValue(com.google.datastore.v1.Value from) {
           return from;
         }
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index 9e9fca387fdc..5e8c092fc5ae 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -17,7 +17,6 @@
 package com.google.cloud.datastore;
 
 import com.google.common.collect.ImmutableMap;
-
 import java.io.Serializable;
 import java.util.Map;
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
index a687835d5636..3bc423f250c5 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
@@ -77,7 +77,6 @@ public static StringValue of(String value) {
     return new StringValue(value);
   }
 
-
   public static Builder newBuilder(String value) {
     return new Builder().set(value);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index f0b099aeabc4..d72f3023b978 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -41,13 +41,14 @@
 import java.util.Objects;
 
 /**
- * An implementation of a Google Cloud Datastore Query that can be constructed by providing
- * all the specific query elements.
+ * An implementation of a Google Cloud Datastore Query that can be constructed by providing all the
+ * specific query elements.
  *
  * 
A usage example:

  *
  * 
A simple query that returns all entities for a specific kind
- * 
 {@code
+ *
+ * 
{@code
  * Query query = Query.newEntityQueryBuilder().setKind(kind).build();
  * QueryResults results = datastore.run(query);
  * while (results.hasNext()) {
@@ -57,15 +58,17 @@
  * }

  *
  * 
A simple key-only query of all entities for a specific kind
- * 
 {@code
+ *
+ * 
{@code
  * Query keyOnlyQuery =  Query.newKeyQueryBuilder().setKind(KIND1).build();
  * QueryResults results = datastore.run(keyOnlyQuery);
  * ...
  * }

  *
- * 
A less trivial example of a projection query that returns the first 10 results
- * of "age" and "name" properties (sorted and grouped by "age") with an age greater than 18
- * 
 {@code
+ * 
A less trivial example of a projection query that returns the first 10 results of "age" and
+ * "name" properties (sorted and grouped by "age") with an age greater than 18
+ *
+ * 
{@code
  * Query query = Query.newProjectionEntityQueryBuilder()
  *     .setKind(kind)
  *     .setProjection(Projection.property("age"), Projection.first("name"))
@@ -101,8 +104,7 @@ public abstract static class Filter implements Serializable {
 
     private static final long serialVersionUID = -6443285436239990860L;
 
-    Filter() {
-    }
+    Filter() {}
 
     abstract com.google.datastore.v1.Filter toPb();
 
@@ -118,9 +120,7 @@ static Filter fromPb(com.google.datastore.v1.Filter filterPb) {
     }
   }
 
-  /**
-   * A class representing a filter composed of a combination of other filters.
-   */
+  /** A class representing a filter composed of a combination of other filters. */
   public static final class CompositeFilter extends Filter {
 
     private static final long serialVersionUID = 3610352685739360009L;
@@ -142,9 +142,8 @@ public Operator apply(String constant) {
             }
           };
 
-      private static final StringEnumType type = new StringEnumType(
-          Operator.class,
-          CONSTRUCTOR);
+      private static final StringEnumType type =
+          new StringEnumType(Operator.class, CONSTRUCTOR);
 
       static final Operator AND = type.createAndRegister("AND");
 
@@ -164,16 +163,12 @@ static Operator valueOfStrict(String constant) {
         return type.valueOfStrict(constant);
       }
 
-      /**
-       * Get the Operator for the given String constant, and allow unrecognized values.
-       */
+      /** Get the Operator for the given String constant, and allow unrecognized values. */
       static Operator valueOf(String constant) {
         return type.valueOf(constant);
       }
 
-      /**
-       * Return the known values for Operator.
-       */
+      /** Return the known values for Operator. */
       static Operator[] values() {
         return type.values();
       }
@@ -213,8 +208,7 @@ public boolean equals(Object obj) {
         return false;
       }
       CompositeFilter other = (CompositeFilter) obj;
-      return operator.equals(other.operator)
-          && filters.equals(other.filters);
+      return operator.equals(other.operator) && filters.equals(other.filters);
     }
 
     static CompositeFilter fromPb(com.google.datastore.v1.CompositeFilter compositeFilterPb) {
@@ -246,9 +240,7 @@ com.google.datastore.v1.Filter toPb() {
     }
   }
 
-  /**
-   * A class representing a filter based on a single property or ancestor.
-   */
+  /** A class representing a filter based on a single property or ancestor. */
   public static final class PropertyFilter extends Filter {
 
     private static final long serialVersionUID = -4514695915258598597L;
@@ -272,16 +264,13 @@ public Operator apply(String constant) {
             }
           };
 
-      private static final StringEnumType type = new StringEnumType(
-          Operator.class,
-          CONSTRUCTOR);
+      private static final StringEnumType type =
+          new StringEnumType(Operator.class, CONSTRUCTOR);
 
       static final Operator LESS_THAN = type.createAndRegister("LESS_THAN");
-      static final Operator LESS_THAN_OR_EQUAL = type
-          .createAndRegister("LESS_THAN_OR_EQUAL");
+      static final Operator LESS_THAN_OR_EQUAL = type.createAndRegister("LESS_THAN_OR_EQUAL");
       static final Operator GREATER_THAN = type.createAndRegister("GREATER_THAN");
-      static final Operator GREATER_THAN_OR_EQUAL = type
-          .createAndRegister("GREATER_THAN_OR_EQUAL");
+      static final Operator GREATER_THAN_OR_EQUAL = type.createAndRegister("GREATER_THAN_OR_EQUAL");
       static final Operator EQUAL = type.createAndRegister("EQUAL");
       static final Operator HAS_ANCESTOR = type.createAndRegister("HAS_ANCESTOR");
 
@@ -301,16 +290,12 @@ static Operator valueOfStrict(String constant) {
         return type.valueOfStrict(constant);
       }
 
-      /**
-       * Get the Operator for the given String constant, and allow unrecognized values.
-       */
+      /** Get the Operator for the given String constant, and allow unrecognized values. */
       static Operator valueOf(String constant) {
         return type.valueOf(constant);
       }
 
-      /**
-       * Return the known values for Operator.
-       */
+      /** Return the known values for Operator. */
       static Operator[] values() {
         return type.values();
       }
@@ -561,9 +546,8 @@ public Direction apply(String constant) {
             }
           };
 
-      private static final StringEnumType type = new StringEnumType(
-          Direction.class,
-          CONSTRUCTOR);
+      private static final StringEnumType type =
+          new StringEnumType(Direction.class, CONSTRUCTOR);
 
       public static final Direction ASCENDING = type.createAndRegister("ASCENDING");
       public static final Direction DESCENDING = type.createAndRegister("DESCENDING");
@@ -584,16 +568,12 @@ static Direction valueOfStrict(String constant) {
         return type.valueOfStrict(constant);
       }
 
-      /**
-       * Get the Direction for the given String constant, and allow unrecognized values.
-       */
+      /** Get the Direction for the given String constant, and allow unrecognized values. */
       static Direction valueOf(String constant) {
         return type.valueOf(constant);
       }
 
-      /**
-       * Return the known values for Direction.
-       */
+      /** Return the known values for Direction. */
       static Direction[] values() {
         return type.values();
       }
@@ -618,22 +598,15 @@ public boolean equals(Object obj) {
         return false;
       }
       OrderBy other = (OrderBy) obj;
-      return property.equals(other.property)
-          && direction.equals(other.direction);
+      return property.equals(other.property) && direction.equals(other.direction);
     }
 
-
-    /**
-     * Returns the property according to which the query result should be ordered.
-     */
+    /** Returns the property according to which the query result should be ordered. */
     public String getProperty() {
       return property;
     }
 
-
-    /**
-     * Returns the order's direction.
-     */
+    /** Returns the order's direction. */
     public Direction getDirection() {
       return direction;
     }
@@ -641,8 +614,8 @@ public Direction getDirection() {
     com.google.datastore.v1.PropertyOrder toPb() {
       return com.google.datastore.v1.PropertyOrder.newBuilder()
           .setDirection(direction.toPb())
-          .setProperty(com.google.datastore.v1.PropertyReference.newBuilder()
-              .setName(property).build())
+          .setProperty(
+              com.google.datastore.v1.PropertyReference.newBuilder().setName(property).build())
           .build();
     }
 
@@ -676,59 +649,33 @@ public String toString() {
    */
   public interface Builder {
 
-
-    /**
-     * Sets the namespace for the query.
-     */
+    /** Sets the namespace for the query. */
     Builder setNamespace(String namespace);
 
-
-    /**
-     * Sets the kind for the query.
-     */
+    /** Sets the kind for the query. */
     Builder setKind(String kind);
 
-
-    /**
-     * Sets the start cursor for the query.
-     */
+    /** Sets the start cursor for the query. */
     Builder setStartCursor(Cursor startCursor);
 
-
-    /**
-     * Sets the end cursor for the query.
-     */
+    /** Sets the end cursor for the query. */
     Builder setEndCursor(Cursor endCursor);
 
-
-    /**
-     * Sets the offset for the query.
-     */
+    /** Sets the offset for the query. */
     Builder setOffset(int offset);
 
-
-    /**
-     * Sets the limit for the query.
-     */
+    /** Sets the limit for the query. */
     Builder setLimit(Integer limit);
 
-
     Builder setFilter(Filter filter);
 
-    /**
-     * Clears any previously specified order by settings.
-     */
+    /** Clears any previously specified order by settings. */
     Builder clearOrderBy();
 
-
-    /**
-     * Sets the query's order by clause (clearing any previously specified order by settings).
-     */
+    /** Sets the query's order by clause (clearing any previously specified order by settings). */
     Builder setOrderBy(OrderBy orderBy, OrderBy... others);
 
-    /**
-     * Adds settings to the existing order by clause.
-     */
+    /** Adds settings to the existing order by clause. */
     Builder addOrderBy(OrderBy orderBy, OrderBy... others);
 
     StructuredQuery build();
@@ -777,35 +724,30 @@ B self() {
       return (B) this;
     }
 
-
     @Override
     public B setNamespace(String namespace) {
       this.namespace = namespace;
       return self();
     }
 
-
     @Override
     public B setKind(String kind) {
       this.kind = kind;
       return self();
     }
 
-
     @Override
     public B setStartCursor(Cursor startCursor) {
       this.startCursor = startCursor;
       return self();
     }
 
-
     @Override
     public B setEndCursor(Cursor endCursor) {
       this.endCursor = endCursor;
       return self();
     }
 
-
     @Override
     public B setOffset(int offset) {
       Preconditions.checkArgument(offset >= 0, "offset must not be negative");
@@ -813,7 +755,6 @@ public B setOffset(int offset) {
       return self();
     }
 
-
     @Override
     public B setLimit(Integer limit) {
       Preconditions.checkArgument(limit == null || limit > 0, "limit must be positive");
@@ -821,7 +762,6 @@ public B setLimit(Integer limit) {
       return self();
     }
 
-
     @Override
     public B setFilter(Filter filter) {
       this.filter = filter;
@@ -834,7 +774,6 @@ public B clearOrderBy() {
       return self();
     }
 
-
     @Override
     public B setOrderBy(OrderBy orderBy, OrderBy... others) {
       clearOrderBy();
@@ -854,7 +793,6 @@ B clearProjection() {
       return self();
     }
 
-
     B setProjection(String projection, String... others) {
       clearProjection();
       addProjection(projection, others);
@@ -872,7 +810,6 @@ B clearDistinctOn() {
       return self();
     }
 
-
     B setDistinctOn(String property, String... others) {
       clearDistinctOn();
       addDistinctOn(property, others);
@@ -948,8 +885,17 @@ public String toString() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(getNamespace(), kind, startCursor, endCursor, offset, limit, filter,
-        orderBy, projection, distinctOn);
+    return Objects.hash(
+        getNamespace(),
+        kind,
+        startCursor,
+        endCursor,
+        offset,
+        limit,
+        filter,
+        orderBy,
+        projection,
+        distinctOn);
   }
 
   @Override
@@ -971,13 +917,9 @@ public boolean equals(Object obj) {
         && Objects.equals(orderBy, other.orderBy)
         && Objects.equals(projection, other.projection)
         && Objects.equals(distinctOn, other.distinctOn);
-
   }
 
-
-  /**
-   * Returns the kind for this query.
-   */
+  /** Returns the kind for this query. */
   public String getKind() {
     return kind;
   }
@@ -986,66 +928,42 @@ boolean isKeyOnly() {
     return projection.size() == 1 && KEY_PROPERTY_NAME.equals(projection.get(0));
   }
 
-
-  /**
-   * Returns the projection for this query.
-   */
+  /** Returns the projection for this query. */
   public List getProjection() {
     return projection;
   }
 
-
-  /**
-   * Returns the filter for this query.
-   */
+  /** Returns the filter for this query. */
   public Filter getFilter() {
     return filter;
   }
 
-
-  /**
-   * Returns the distinct on clause for this query.
-   */
+  /** Returns the distinct on clause for this query. */
   public List getDistinctOn() {
     return distinctOn;
   }
 
-
-  /**
-   * Returns the order by clause for this query.
-   */
+  /** Returns the order by clause for this query. */
   public List getOrderBy() {
     return orderBy;
   }
 
-
-  /**
-   * Returns the start cursor for this query.
-   */
+  /** Returns the start cursor for this query. */
   public Cursor getStartCursor() {
     return startCursor;
   }
 
-
-  /**
-   * Returns the end cursor for this query.
-   */
+  /** Returns the end cursor for this query. */
   public Cursor getEndCursor() {
     return endCursor;
   }
 
-
-  /**
-   * Returns the offset for this query.
-   */
+  /** Returns the offset for this query. */
   public int getOffset() {
     return offset;
   }
 
-
-  /**
-   * Returns the limit for this query.
-   */
+  /** Returns the limit for this query. */
   public Integer getLimit() {
     return limit;
   }
@@ -1096,8 +1014,8 @@ com.google.datastore.v1.Query toPb() {
       queryPb.addOrder(value.toPb());
     }
     for (String value : distinctOn) {
-      queryPb.addDistinctOn(com.google.datastore.v1.PropertyReference.newBuilder()
-          .setName(value).build());
+      queryPb.addDistinctOn(
+          com.google.datastore.v1.PropertyReference.newBuilder().setName(value).build());
     }
     for (String value : projection) {
       com.google.datastore.v1.Projection.Builder expressionPb =
@@ -1110,8 +1028,8 @@ com.google.datastore.v1.Query toPb() {
   }
 
   @SuppressWarnings("unchecked")
-  static  StructuredQuery fromPb(ResultType resultType, String namespace,
-      com.google.datastore.v1.Query queryPb) {
+  static  StructuredQuery fromPb(
+      ResultType resultType, String namespace, com.google.datastore.v1.Query queryPb) {
     BuilderImpl builder;
     if (resultType.equals(ResultType.ENTITY)) {
       builder = new EntityQuery.Builder();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
index db599ec75d99..12f3eadcc073 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
@@ -79,7 +79,6 @@ public static TimestampValue of(Timestamp timestamp) {
     return new TimestampValue(timestamp);
   }
 
-
   public static Builder newBuilder(Timestamp timestamp) {
     return new Builder().set(timestamp);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
index 035ddecaa6a8..9880b4748341 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
@@ -21,16 +21,15 @@
 import java.util.List;
 
 /**
- * A Google cloud datastore transaction.
- * Similar to {@link Batch} any write operation that is applied on a transaction will only be sent
- * to the Datastore upon {@link #commit}. A call to {@link #rollback} will invalidate
- * the transaction and discard the changes. Any read operation that is done by a transaction
- * will be part of it and therefore a {@code commit} is guaranteed to fail if an entity
- * was modified outside of the transaction after it was read. Write operation on this
- * transaction will not be reflected by read operation (as the changes are only sent to
- * the Datastore upon {@code commit}.
- * A usage example:
- * 
 {@code
+ * A Google cloud datastore transaction. Similar to {@link Batch} any write operation that is
+ * applied on a transaction will only be sent to the Datastore upon {@link #commit}. A call to
+ * {@link #rollback} will invalidate the transaction and discard the changes. Any read operation
+ * that is done by a transaction will be part of it and therefore a {@code commit} is guaranteed to
+ * fail if an entity was modified outside of the transaction after it was read. Write operation on
+ * this transaction will not be reflected by read operation (as the changes are only sent to the
+ * Datastore upon {@code commit}. A usage example:
+ *
+ * 
{@code
  * Transaction transaction = datastore.newTransaction();
  * try {
  *   Entity entity = transaction.get(key);
@@ -49,30 +48,27 @@
  *     transaction.rollback();
  *   }
  * }
- * } 

- *
- * @see 
- *   Google Cloud Datastore transactions
+ * }

  *
+ * @see Google Cloud
+ *     Datastore transactions
  */
 public interface Transaction extends DatastoreBatchWriter, DatastoreReaderWriter {
 
   interface Response {
 
-    /**
-     * Returns a list of keys generated by a transaction.
-     */
+    /** Returns a list of keys generated by a transaction. */
     List getGeneratedKeys();
   }
 
   /**
-   * {@inheritDoc}
-   * The requested entity will be part of this Datastore transaction (so a commit is guaranteed
-   * to fail if entity was changed by others after it was seen by this transaction) but any
-   * write changes in this transaction will not be reflected by the returned entity.
+   * {@inheritDoc} The requested entity will be part of this Datastore transaction (so a commit is
+   * guaranteed to fail if entity was changed by others after it was seen by this transaction) but
+   * any write changes in this transaction will not be reflected by the returned entity.
    *
    * 
Example of getting an entity for a given key.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName = "my_key_name";
    * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
    * Entity entity = transaction.get(key);
@@ -86,13 +82,14 @@ interface Response {
   Entity get(Key key);
 
   /**
-   * {@inheritDoc}
-   * The requested entities will be part of this Datastore transaction (so a commit is guaranteed
-   * to fail if any of the entities was changed by others after they were seen by this transaction)
-   * but any write changes in this transaction will not be reflected by the returned entities.
+   * {@inheritDoc} The requested entities will be part of this Datastore transaction (so a commit is
+   * guaranteed to fail if any of the entities was changed by others after they were seen by this
+   * transaction) but any write changes in this transaction will not be reflected by the returned
+   * entities.
    *
    * 
Example of getting entities for several keys.
-   * 
 {@code
+   *
+   * 
{@code
    * String firstKeyName = "my_first_key_name";
    * String secondKeyName = "my_second_key_name";
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
@@ -114,13 +111,14 @@ interface Response {
   Iterator get(Key... key);
 
   /**
-   * {@inheritDoc}
-   * The requested entities will be part of this Datastore transaction (so a commit is guaranteed
-   * to fail if any of the entities was changed by others after they were seen by this transaction)
-   * but any write changes in this transaction will not be reflected by the returned entities.
+   * {@inheritDoc} The requested entities will be part of this Datastore transaction (so a commit is
+   * guaranteed to fail if any of the entities was changed by others after they were seen by this
+   * transaction) but any write changes in this transaction will not be reflected by the returned
+   * entities.
    *
    * 
Example of fetching a list of entities for several keys.
-   * 
 {@code
+   *
+   * 
{@code
    * String firstKeyName = "my_first_key_name";
    * String secondKeyName = "my_second_key_name";
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
@@ -139,14 +137,14 @@ interface Response {
   List fetch(Key... keys);
 
   /**
-   * {@inheritDoc}
-   * The entities returned by the result of this query will be part of this Datastore transaction
-   * (so a commit is guaranteed to fail if any of the entities was changed by others after the
-   * query was performed) but any write changes in this transaction will not be reflected by
-   * the result.
+   * {@inheritDoc} The entities returned by the result of this query will be part of this Datastore
+   * transaction (so a commit is guaranteed to fail if any of the entities was changed by others
+   * after the query was performed) but any write changes in this transaction will not be reflected
+   * by the result.
    *
    * 
Example of running a query to find all entities with an ancestor.
-   * 
 {@code
+   *
+   * 
{@code
    * String parentKeyName = "my_parent_key_name";
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("ParentKind");
    * Key parentKey = keyFactory.newKey(parentKeyName);
@@ -176,17 +174,18 @@ interface Response {
    * defer any necessary id allocation to commit time.
    *
    * 
Example of adding multiple entities with deferred id allocation.
-   * 
 {@code
+   *
+   * 
{@code
    * IncompleteKey key1 = datastore.newKeyFactory().setKind("MyKind").newKey();
    * FullEntity.Builder entityBuilder1 = FullEntity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "value1");
    * FullEntity entity1 = entityBuilder1.build();
-   * 
+   *
    * IncompleteKey key2 = datastore.newKeyFactory().setKind("MyKind").newKey();
    * FullEntity.Builder entityBuilder2 = FullEntity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "value2");
    * FullEntity entity2 = entityBuilder2.build();
-   * 
+   *
    * transaction.addWithDeferredIdAllocation(entity1, entity2);
    * Response response = transaction.commit();
    * }

@@ -200,7 +199,8 @@ interface Response {
    * {@inheritDoc}
    *
    * 
Example of adding a single entity.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName = "my_key_name";
    * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
    * Entity.Builder entityBuilder = Entity.newBuilder(key);
@@ -221,19 +221,20 @@ interface Response {
    * {@inheritDoc}
    *
    * 
Example of adding multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name1";
    * String keyName2 = "my_key_name2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
    * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "value1");
    * Entity entity1 = entityBuilder1.build();
-   * 
+   *
    * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
    * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "value2");
    * Entity entity2 = entityBuilder2.build();
-   * 
+   *
    * transaction.add(entity1, entity2);
    * transaction.commit();
    * }

@@ -246,24 +247,24 @@ interface Response {
   List add(FullEntity... entities);
 
   /**
-   * {@inheritDoc}
-   * This operation will be converted to {@link #put} operation for entities that were already
-   * added or put in this writer.
+   * {@inheritDoc} This operation will be converted to {@link #put} operation for entities that were
+   * already added or put in this writer.
    *
    * 
Example of updating multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name1";
    * String keyName2 = "my_key_name2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
    * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "value3");
    * Entity entity1 = entityBuilder1.build();
-   * 
+   *
    * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
    * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "value4");
    * Entity entity2 = entityBuilder2.build();
-   * 
+   *
    * transaction.update(entity1, entity2);
    * transaction.commit();
    * }

@@ -275,12 +276,12 @@ interface Response {
   void update(Entity... entities);
 
   /**
-   * {@inheritDoc}
-   * This operation will also remove from this transaction any prior writes for entities with the
-   * same keys.
+   * {@inheritDoc} This operation will also remove from this transaction any prior writes for
+   * entities with the same keys.
    *
    * 
Example of deleting multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name1";
    * String keyName2 = "my_key_name2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
@@ -300,17 +301,18 @@ interface Response {
    * defer any necessary id allocation to commit time.
    *
    * 
Example of putting multiple entities with deferred id allocation.
-   * 
 {@code
+   *
+   * 
{@code
    * IncompleteKey key1 = datastore.newKeyFactory().setKind("MyKind").newKey();
    * FullEntity.Builder entityBuilder1 = FullEntity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "value1");
    * FullEntity entity1 = entityBuilder1.build();
-   * 
+   *
    * IncompleteKey key2 = datastore.newKeyFactory().setKind("MyKind").newKey();
    * FullEntity.Builder entityBuilder2 = FullEntity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "value2");
    * FullEntity entity2 = entityBuilder2.build();
-   * 
+   *
    * transaction.putWithDeferredIdAllocation(entity1, entity2);
    * Response response = transaction.commit();
    * }

@@ -321,11 +323,12 @@ interface Response {
   void putWithDeferredIdAllocation(FullEntity... entities);
 
   /**
-   * {@inheritDoc}
-   * This operation will also remove from this transaction any prior writes for the same entity.
+   * {@inheritDoc} This operation will also remove from this transaction any prior writes for the
+   * same entity.
    *
    * 
Example of putting a single entity.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName = "my_key_name";
    * Key key = datastore.newKeyFactory().setKind("MyKind").newKey(keyName);
    * Entity.Builder entityBuilder = Entity.newBuilder(key);
@@ -342,23 +345,24 @@ interface Response {
   Entity put(FullEntity entity);
 
   /**
-   * {@inheritDoc}
-   * This operation will also remove from this transaction any prior writes for the same entities.
+   * {@inheritDoc} This operation will also remove from this transaction any prior writes for the
+   * same entities.
    *
    * 
Example of putting multiple entities.
-   * 
 {@code
+   *
+   * 
{@code
    * String keyName1 = "my_key_name1";
    * String keyName2 = "my_key_name2";
    * Key key1 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName1);
    * Entity.Builder entityBuilder1 = Entity.newBuilder(key1);
    * entityBuilder1.set("propertyName", "value1");
    * Entity entity1 = entityBuilder1.build();
-   * 
+   *
    * Key key2 = datastore.newKeyFactory().setKind("MyKind").newKey(keyName2);
    * Entity.Builder entityBuilder2 = Entity.newBuilder(key2);
    * entityBuilder2.set("propertyName", "value2");
    * Entity entity2 = entityBuilder2.build();
-   * 
+   *
    * transaction.put(entity1, entity2);
    * transaction.commit();
    * }

@@ -373,12 +377,13 @@ interface Response {
    * Commit the transaction.
    *
    * 
Example of committing a transaction.
-   * 
 {@code
+   *
+   * 
{@code
    * // create an entity
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
    * Key key = datastore.allocateId(keyFactory.newKey());
    * Entity entity = Entity.newBuilder(key).set("description", "commit()").build();
-   * 
+   *
    * // add the entity and commit
    * try {
    *   transaction.put(entity);
@@ -396,12 +401,13 @@ interface Response {
    * Rollback the transaction.
    *
    * 
Example of rolling back a transaction.
-   * 
 {@code
+   *
+   * 
{@code
    * // create an entity
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
    * Key key = datastore.allocateId(keyFactory.newKey());
    * Entity entity = Entity.newBuilder(key).set("description", "rollback()").build();
-   * 
+   *
    * // add the entity and rollback
    * transaction.put(entity);
    * transaction.rollback();
@@ -412,12 +418,12 @@ interface Response {
    */
   void rollback();
 
-
   /**
    * Returns {@code true} if the transaction is still active (was not committed or rolledback).
    *
    * 
Example of verifying if a transaction is active.
-   * 
 {@code
+   *
+   * 
{@code
    * // create an entity
    * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
    * Key key = datastore.allocateId(keyFactory.newKey());
@@ -436,15 +442,11 @@ interface Response {
    *   }
    * }
    * }

-   *
    */
   @Override
   boolean isActive();
 
-
-  /**
-   * Returns the transaction associated {@link Datastore}.
-   */
+  /** Returns the transaction associated {@link Datastore}. */
   Datastore getDatastore();
 
   ByteString getTransactionId();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
index 0d8d9ff9723d..e39f15947c49 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
@@ -33,7 +33,8 @@ public class TransactionExceptionHandler {
         public RetryResult beforeEval(Exception exception) {
           if (exception instanceof DatastoreException) {
             DatastoreException e = getInnerException((DatastoreException) exception);
-            if (e.getCode() == ABORTED_CODE || e.getReason()!=null && e.getReason().equals("ABORTED")) {
+            if (e.getCode() == ABORTED_CODE
+                || e.getReason() != null && e.getReason().equals("ABORTED")) {
               return Interceptor.RetryResult.RETRY;
             }
           }
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 d413b76ba105..3318ec866c44 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
@@ -38,7 +38,6 @@ static class ResponseImpl implements Transaction.Response {
       this.numAutoAllocatedIds = numAutoAllocatedIds;
     }
 
-
     @Override
     public List getGeneratedKeys() {
       Iterator results =
@@ -52,14 +51,14 @@ public List getGeneratedKeys() {
   }
 
   TransactionImpl(DatastoreImpl datastore) {
-      this(datastore, null);
+    this(datastore, null);
   }
 
   TransactionImpl(DatastoreImpl datastore, TransactionOptions options) {
     super("transaction");
     this.datastore = datastore;
     com.google.datastore.v1.BeginTransactionRequest.Builder requestPb =
-            com.google.datastore.v1.BeginTransactionRequest.newBuilder();
+        com.google.datastore.v1.BeginTransactionRequest.newBuilder();
 
     if (options != null) {
       requestPb.setTransactionOptions(options);
@@ -122,7 +121,6 @@ public void rollback() {
     rolledback = true;
   }
 
-
   @Override
   public Datastore getDatastore() {
     return datastore;
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 28a07001461f..4a6d99d54d4c 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
@@ -19,16 +19,14 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.base.Strings;
-
 import java.util.regex.Pattern;
 
-/**
- * Utility to validate Datastore type/values.
- */
+/** Utility to validate Datastore type/values. */
 final class Validator {
 
-  private static final Pattern PROJECT_ID_PATTERN = Pattern.compile(
-      "([a-z\\d\\-]{1,100}~)?([a-z\\d][a-z\\d\\-\\.]{0,99}:)?([a-z\\d][a-z\\d\\-]{0,99})");
+  private static final Pattern PROJECT_ID_PATTERN =
+      Pattern.compile(
+          "([a-z\\d\\-]{1,100}~)?([a-z\\d][a-z\\d\\-\\.]{0,99}:)?([a-z\\d][a-z\\d\\-]{0,99})");
   private static final int MAX_NAMESPACE_LENGTH = 100;
   private static final Pattern NAMESPACE_PATTERN =
       Pattern.compile("[0-9A-Za-z\\._\\-]{0," + MAX_NAMESPACE_LENGTH + "}");
@@ -39,16 +37,22 @@ private Validator() {
 
   static String validateDatabase(String projectId) {
     checkArgument(!Strings.isNullOrEmpty(projectId), "projectId can't be empty or null");
-    checkArgument(PROJECT_ID_PATTERN.matcher(projectId).matches(),
-    	"projectId " + projectId + " does not match the required pattern: " + PROJECT_ID_PATTERN.pattern());
+    checkArgument(
+        PROJECT_ID_PATTERN.matcher(projectId).matches(),
+        "projectId "
+            + projectId
+            + " does not match the required pattern: "
+            + PROJECT_ID_PATTERN.pattern());
     return projectId;
   }
 
   static String validateNamespace(String namespace) {
     checkArgument(namespace != null, "Namespace cannot be null. Leave unset for default.");
-    checkArgument(namespace.length() <= MAX_NAMESPACE_LENGTH,
+    checkArgument(
+        namespace.length() <= MAX_NAMESPACE_LENGTH,
         "namespace must not contain more than 100 characters");
-    checkArgument(NAMESPACE_PATTERN.matcher(namespace).matches(),
+    checkArgument(
+        NAMESPACE_PATTERN.matcher(namespace).matches(),
         "namespace must the following pattern: " + NAMESPACE_PATTERN.pattern());
     return namespace;
   }
@@ -57,6 +61,4 @@ static String validateKind(String kind) {
     checkArgument(!Strings.isNullOrEmpty(kind), "kind must not be empty or null");
     return kind;
   }
-
-
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
index a97a072927c6..9301cfae2b67 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
@@ -21,15 +21,14 @@
 import com.google.cloud.GcpLaunchStage;
 import com.google.common.base.MoreObjects;
 import com.google.datastore.v1.Value.ValueTypeCase;
-
 import java.io.Serializable;
 import java.util.Objects;
 
 /**
- * Base class for all Google Cloud Datastore value types.
- * All values must be associated with a non-null content (except {@link NullValue}).
- * All values are immutable (including their content). To edit (a copy) use {@link #toBuilder()}.
- * Unsupported value (deprecated or unrecognized) would be represented by {@link RawValue}.
+ * Base class for all Google Cloud Datastore value types. All values must be associated with a
+ * non-null content (except {@link NullValue}). All values are immutable (including their content).
+ * To edit (a copy) use {@link #toBuilder()}. Unsupported value (deprecated or unrecognized) would
+ * be represented by {@link RawValue}.
  *
  * @param  the type of the content for this value
  */
@@ -71,8 +70,7 @@ public final com.google.datastore.v1.Value toProto(P value) {
       return builder.build();
     }
 
-    BaseMarshaller() {
-    }
+    BaseMarshaller() {}
 
     protected abstract V getValue(com.google.datastore.v1.Value from);
 
@@ -156,16 +154,12 @@ 
, B extends BaseBuilder> Value(ValueBuilder
     value = builder.get();
   }
 
-  /**
-   * Returns the type of this value.
-   */
+  /** Returns the type of this value. */
   public final ValueType getType() {
     return valueType;
   }
 
-  /**
-   * Returns whether this value should be excluded from indexes.
-   */
+  /** Returns whether this value should be excluded from indexes. */
   public final boolean excludeFromIndexes() {
     return excludeFromIndexes;
   }
@@ -220,7 +214,8 @@ com.google.datastore.v1.Value toPb() {
   static Value fromPb(com.google.datastore.v1.Value proto) {
     ValueTypeCase descriptorId = proto.getValueTypeCase();
     ValueType valueType = ValueType.getByDescriptorId(descriptorId.getNumber());
-    return valueType == null ? RawValue.MARSHALLER.fromProto(proto).build()
+    return valueType == null
+        ? RawValue.MARSHALLER.fromProto(proto).build()
         : valueType.getMarshaller().fromProto(proto).build();
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
index 39b4143e208d..3c60ef409353 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
@@ -35,15 +35,11 @@ public interface ValueBuilder, B extends ValueBuilder, B extends ValueBuilder>
     extends Serializable {
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
index 48a318c6eea2..72bacca6984e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
@@ -21,73 +21,52 @@
 /**
  * The type of a Datastore property.
  *
- * @see Google Cloud Datastore types
+ * @see Google
+ *     Cloud Datastore types
  */
 public enum ValueType {
 
-  /**
-   * Represents a {@code null} value.
-   */
+  /** Represents a {@code null} value. */
   NULL(NullValue.MARSHALLER),
 
-  /**
-   * Represents a {@code string} value.
-   */
+  /** Represents a {@code string} value. */
   STRING(StringValue.MARSHALLER),
 
-  /**
-   * Represents an entity value.
-   */
+  /** Represents an entity value. */
   ENTITY(EntityValue.MARSHALLER),
 
-  /**
-   * Represents a {@code list} of {@link Value}s.
-   */
+  /** Represents a {@code list} of {@link Value}s. */
   LIST(ListValue.MARSHALLER),
 
-  /**
-   * Represents a {@code key} as a value.
-   */
+  /** Represents a {@code key} as a value. */
   KEY(KeyValue.MARSHALLER),
 
-  /**
-   * Represents a {@code long} value.
-   */
+  /** Represents a {@code long} value. */
   LONG(LongValue.MARSHALLER),
 
-  /**
-   * Represents a {@code double} value.
-   */
+  /** Represents a {@code double} value. */
   DOUBLE(DoubleValue.MARSHALLER),
 
-  /**
-   * Represents a {@code boolean} value.
-   */
+  /** Represents a {@code boolean} value. */
   BOOLEAN(BooleanValue.MARSHALLER),
 
-  /**
-   * Represents a {@link com.google.cloud.Timestamp} value.
-   */
+  /** Represents a {@link com.google.cloud.Timestamp} value. */
   TIMESTAMP(TimestampValue.MARSHALLER),
 
-  /**
-   * Represents a {@link Blob} value.
-   */
+  /** Represents a {@link Blob} value. */
   BLOB(BlobValue.MARSHALLER),
 
-  /**
-   * Represents a raw/unparsed value.
-   */
+  /** Represents a raw/unparsed value. */
   RAW_VALUE(RawValue.MARSHALLER),
 
-  /**
-   * Represents a {@link LatLng} value.
-   */
+  /** Represents a {@link LatLng} value. */
   LAT_LNG(LatLngValue.MARSHALLER);
 
   private static final ImmutableMap DESCRIPTOR_TO_TYPE_MAP;
 
-  @SuppressWarnings("rawtypes") private final ValueMarshaller marshaller;
+  @SuppressWarnings("rawtypes")
+  private final ValueMarshaller marshaller;
 
   static {
     ImmutableMap.Builder builder = ImmutableMap.builder();
@@ -100,9 +79,8 @@ public enum ValueType {
     DESCRIPTOR_TO_TYPE_MAP = builder.build();
   }
 
-
-  , B extends ValueBuilder>
-      ValueType(ValueMarshaller marshaller) {
+  , B extends ValueBuilder> ValueType(
+      ValueMarshaller marshaller) {
     this.marshaller = marshaller;
   }
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
index 5ebe834bd854..e2c598534b13 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
@@ -15,14 +15,14 @@
  */
 
 /**
- * A client for Cloud Datastore – A highly-scalable NoSQL database for web and mobile
- * applications.
+ * A client for Cloud Datastore – A highly-scalable NoSQL database for web and mobile applications.
  *
  * 
Here's a simple usage example for using google-cloud from App/Compute Engine. This example
- * shows how to create a Datastore entity. For the complete source code see
- * 
+ * shows how to create a Datastore entity. For the complete source code see 
  * CreateEntity.java.
- * 
 {@code
+ *
+ * 
{@code
  * Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
  * KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
  * Key key = keyFactory.newKey("keyName");
@@ -32,13 +32,14 @@
  *     .set("access_time", Timestamp.now())
  *     .build();
  * datastore.put(entity);
- * } 

- * 

- * This second example shows how to get and update a Datastore entity if it exists. For the complete
- * source code see
- * 
+ * }

+ *
+ * 
This second example shows how to get and update a Datastore entity if it exists. For the
+ * complete source code see 
  * UpdateEntity.java.
- * 
 {@code
+ *
+ * 
{@code
  * Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
  * KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
  * Key key = keyFactory.newKey("keyName");
@@ -49,11 +50,12 @@
  *       .set("access_time", Timestamp.now())
  *       .build();
  *   datastore.update(entity);
- * }} 

+ * }
+ * }

+ *
  * 
When using google-cloud from outside of App/Compute Engine, you have to specify a
- * project ID and
- * provide
+ * href="https://github.com/googleapis/google-cloud-java#specifying-a-project-id">specify a project
+ * ID and provide
  * credentials.
  *
  * @see Google Cloud Datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
index d03b263b065c..0b7f9094b7f3 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
@@ -20,10 +20,7 @@
 import com.google.cloud.spi.ServiceRpcFactory;
 
 /**
- * An interface for Datastore RPC factory.
- * Implementation will be loaded via {@link java.util.ServiceLoader}.
+ * An interface for Datastore RPC factory. Implementation will be loaded via {@link
+ * java.util.ServiceLoader}.
  */
-public interface DatastoreRpcFactory extends
-    ServiceRpcFactory {
-}
-
+public interface DatastoreRpcFactory extends ServiceRpcFactory {}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
index dd6e36e2ed9a..d39f3a300ee0 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
@@ -31,9 +31,7 @@
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
 
-/**
- * Provides access to the remote Datastore service.
- */
+/** Provides access to the remote Datastore service. */
 public interface DatastoreRpc extends ServiceRpc {
 
   /**
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 f4c82137c04a..27ff8cec0e00 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
@@ -43,8 +43,8 @@ public class HttpDatastoreRpc implements DatastoreRpc {
   private final com.google.datastore.v1.client.Datastore client;
 
   public HttpDatastoreRpc(DatastoreOptions options) {
-    HttpTransportOptions httpTransportOptions = (HttpTransportOptions) options
-        .getTransportOptions();
+    HttpTransportOptions httpTransportOptions =
+        (HttpTransportOptions) options.getTransportOptions();
     HttpTransport transport = httpTransportOptions.getHttpTransportFactory().create();
     com.google.datastore.v1.client.DatastoreOptions.Builder clientBuilder =
         new com.google.datastore.v1.client.DatastoreOptions.Builder()
@@ -55,26 +55,25 @@ public HttpDatastoreRpc(DatastoreOptions options) {
     if (isLocalHost(normalizedHost)) {
       clientBuilder = clientBuilder.localHost(removeScheme(normalizedHost));
     } else if (!removeScheme(com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST)
-                    .equals(removeScheme(normalizedHost))
+            .equals(removeScheme(normalizedHost))
         && !normalizedHost.isEmpty()) {
       String fullUrl = normalizedHost;
       if (fullUrl.charAt(fullUrl.length() - 1) != '/') {
         fullUrl = fullUrl + '/';
       }
-      fullUrl = fullUrl
-          + com.google.datastore.v1.client.DatastoreFactory.VERSION
-          + "/projects/"
-          + options.getProjectId();
+      fullUrl =
+          fullUrl
+              + com.google.datastore.v1.client.DatastoreFactory.VERSION
+              + "/projects/"
+              + options.getProjectId();
       clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullUrl);
     }
-    client = com.google.datastore.v1.client.DatastoreFactory.get()
-        .create(clientBuilder.build());
+    client = com.google.datastore.v1.client.DatastoreFactory.get().create(clientBuilder.build());
   }
 
-  private HttpRequestInitializer getHttpRequestInitializer(final DatastoreOptions options,
-      HttpTransportOptions httpTransportOptions) {
-    final HttpRequestInitializer delegate = httpTransportOptions
-        .getHttpRequestInitializer(options);
+  private HttpRequestInitializer getHttpRequestInitializer(
+      final DatastoreOptions options, HttpTransportOptions httpTransportOptions) {
+    final HttpRequestInitializer delegate = httpTransportOptions.getHttpRequestInitializer(options);
     final String applicationName = options.getApplicationName();
     return new HttpRequestInitializer() {
       @Override
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 9bf22abf4101..29141cfc641e 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
@@ -79,7 +79,9 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
   }
 
   private LocalDatastoreHelper(double consistency) {
-    super("datastore", BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
+    super(
+        "datastore",
+        BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
         PROJECT_ID_PREFIX + UUID.randomUUID().toString());
     Path tmpDirectory = null;
     try {
@@ -129,7 +131,6 @@ private DatastoreOptions.Builder optionsBuilder() {
         .setRetrySettings(ServiceOptions.getNoRetrySettings());
   }
 
-
   /**
    * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
    * localhost.
@@ -139,7 +140,6 @@ public DatastoreOptions getOptions() {
     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}.
@@ -148,11 +148,7 @@ public DatastoreOptions getOptions(String namespace) {
     return optionsBuilder().setNamespace(namespace).build();
   }
 
-
-
-  /**
-   * Returns the consistency setting for the local Datastore emulator.
-   */
+  /** Returns the consistency setting for the local Datastore emulator. */
   public double getConsistency() {
     return consistency;
   }
@@ -161,10 +157,9 @@ public double getConsistency() {
    * Creates a local Datastore helper with the specified settings for project ID and consistency.
    *
    * @param consistency the fraction of Datastore writes that are immediately visible to global
-   *     queries, with 0.0 meaning no writes are immediately visible and 1.0 meaning all writes
-   *     are immediately visible. Note that setting this to 1.0 may mask incorrect assumptions
-   *     about the consistency of non-ancestor queries; non-ancestor queries are eventually
-   *     consistent.
+   *     queries, with 0.0 meaning no writes are immediately visible and 1.0 meaning all writes are
+   *     immediately visible. Note that setting this to 1.0 may mask incorrect assumptions about the
+   *     consistency of non-ancestor queries; non-ancestor queries are eventually consistent.
    */
   public static LocalDatastoreHelper create(double consistency) {
     return new LocalDatastoreHelper(consistency);
@@ -238,18 +233,21 @@ private static void deleteRecursively(Path path) throws IOException {
     if (path == null || !Files.exists(path)) {
       return;
     }
-    Files.walkFileTree(path, new SimpleFileVisitor() {
-      @Override
-      public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-        Files.delete(dir);
-        return FileVisitResult.CONTINUE;
-      }
-
-      @Override
-      public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-        Files.delete(file);
-        return FileVisitResult.CONTINUE;
-      }
-    });
+    Files.walkFileTree(
+        path,
+        new SimpleFileVisitor() {
+          @Override
+          public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+            Files.delete(dir);
+            return FileVisitResult.CONTINUE;
+          }
+
+          @Override
+          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+              throws IOException {
+            Files.delete(file);
+            return FileVisitResult.CONTINUE;
+          }
+        });
   }
 }
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 9f41a900537a..803400ea18c7 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,7 +16,6 @@
 
 package com.google.cloud.datastore.testing;
 
-import com.google.cloud.http.HttpTransportOptions;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.datastore.Datastore;
@@ -25,25 +24,23 @@
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.StructuredQuery;
-
+import com.google.cloud.http.HttpTransportOptions;
 import java.util.UUID;
 import org.threeten.bp.Duration;
 
 /**
  * Utility to create a remote datastore configuration for testing. Datastore options can be obtained
- * via the {@link #getOptions()} method. Returned options use a randomly generated namespace
- * ({@link DatastoreOptions#getNamespace()}) that can be used to run the tests. Once the tests are
- * run, all entities in the namespace can be deleted using {@link #deleteNamespace()}. Returned
- * options also have custom {@link DatastoreOptions#getRetrySettings()}:
- * {@link RetrySettings#getMaxAttempts()} is {@code 10},
- * {@link RetrySettings#getMaxRetryDelay()} is {@code 30000},
- * {@link RetrySettings#getTotalTimeout()} is {@code 120000} and
- * {@link RetrySettings#getInitialRetryDelay()} is {@code 250}.
- * {@link HttpTransportOptions#getConnectTimeout()} and
- * {@link HttpTransportOptions#getReadTimeout()} are both
- * both set to {@code 60000}.
- * 
- * Internal testing use only
+ * via the {@link #getOptions()} method. Returned options use a randomly generated namespace ({@link
+ * DatastoreOptions#getNamespace()}) that can be used to run the tests. Once the tests are run, all
+ * entities in the namespace can be deleted using {@link #deleteNamespace()}. Returned options also
+ * have custom {@link DatastoreOptions#getRetrySettings()}: {@link RetrySettings#getMaxAttempts()}
+ * is {@code 10}, {@link RetrySettings#getMaxRetryDelay()} is {@code 30000}, {@link
+ * RetrySettings#getTotalTimeout()} is {@code 120000} and {@link
+ * RetrySettings#getInitialRetryDelay()} is {@code 250}. {@link
+ * HttpTransportOptions#getConnectTimeout()} and {@link HttpTransportOptions#getReadTimeout()} are
+ * both both set to {@code 60000}.
+ *
+ * 
Internal testing use only
  */
 @InternalApi
 public class RemoteDatastoreHelper {
@@ -58,18 +55,15 @@ private RemoteDatastoreHelper(DatastoreOptions options) {
     this.namespace = options.getNamespace();
   }
 
-
   /**
-   * Returns a {@link DatastoreOptions} object to be used for testing. The options are associated
-   * to a randomly generated namespace.
+   * Returns a {@link DatastoreOptions} object to be used for testing. The options are associated to
+   * a randomly generated namespace.
    */
   public DatastoreOptions getOptions() {
     return options;
   }
 
-  /**
-   * Deletes all entities in the namespace associated with this {@link RemoteDatastoreHelper}.
-   */
+  /** Deletes all entities in the namespace associated with this {@link RemoteDatastoreHelper}. */
   public void deleteNamespace() {
     StructuredQuery query = Query.newKeyQueryBuilder().setNamespace(namespace).build();
     QueryResults keys = datastore.run(query);
@@ -78,23 +72,23 @@ public void deleteNamespace() {
     }
   }
 
-  /**
-   * Creates a {@code RemoteStorageHelper} object.
-   */
+  /** Creates a {@code RemoteStorageHelper} object. */
   public static RemoteDatastoreHelper create() {
     HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions();
-    transportOptions = transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000)
-        .build();
-    DatastoreOptions datastoreOption = DatastoreOptions.newBuilder()
-        .setNamespace(UUID.randomUUID().toString())
-        .setRetrySettings(retrySettings())
-        .setTransportOptions(transportOptions)
-        .build();
+    transportOptions =
+        transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000).build();
+    DatastoreOptions datastoreOption =
+        DatastoreOptions.newBuilder()
+            .setNamespace(UUID.randomUUID().toString())
+            .setRetrySettings(retrySettings())
+            .setTransportOptions(transportOptions)
+            .build();
     return new RemoteDatastoreHelper(datastoreOption);
   }
 
   private static RetrySettings retrySettings() {
-    return RetrySettings.newBuilder().setMaxAttempts(10)
+    return RetrySettings.newBuilder()
+        .setMaxAttempts(10)
         .setMaxRetryDelay(Duration.ofMillis(30000L))
         .setTotalTimeout(Duration.ofMillis(120000L))
         .setInitialRetryDelay(Duration.ofMillis(250L))
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
index 9eb123f34533..007bb3d998a0 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
@@ -18,19 +18,23 @@
  * A testing helper for Google Cloud Datastore.
  *
  * 
A simple usage example:
+ *
  * 
Before the test:
- * 
 {@code
+ *
+ * 
{@code
  * LocalDatastoreHelper helper = LocalDatastoreHelper.create();
  * helper.start();
  * Datastore localDatastore = helper.getOptions().getService();
- * } 

+ * }

  *
  * 
After the test:
- * 
 {@code
+ *
+ * 
{@code
  * helper.stop();
- * } 

+ * }

  *
- * @see 
+ * @see 
  *     Google Cloud Java tools for testing
  */
 package com.google.cloud.datastore.testing;
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
index 36fa11e9116b..9e3b5792fb67 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
@@ -22,15 +22,13 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.collect.ImmutableList;
-
+import java.util.LinkedList;
+import java.util.List;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.LinkedList;
-import java.util.List;
-
 public class BaseDatastoreBatchWriterTest {
 
   private static final Key KEY1 = Key.newBuilder("dataset1", "kind1", "name1").build();
@@ -60,7 +58,6 @@ protected DatastoreBatchWriter() {
       replay(datastore);
     }
 
-
     @Override
     protected Datastore getDatastore() {
       return datastore;
@@ -87,13 +84,17 @@ public void testAdd() throws Exception {
         Entity.newBuilder(ENTITY2).setKey(Key.newBuilder(KEY1).setName("name2").build()).build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build());
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setInsert(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build().toPb()).build());
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setInsert(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build().toPb()).build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setInsert(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build().toPb())
+            .build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setInsert(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build().toPb())
+            .build());
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(entity2.toPb()).build());
-    List entities = batchWriter
-        .add(ENTITY1, INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2, entity2);
+    List entities =
+        batchWriter.add(ENTITY1, INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2, entity2);
     assertEquals(pbs, batchWriter.toMutationPbList());
     assertEquals(ENTITY1, entities.get(0));
     assertEquals(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build(), entities.get(1));
@@ -137,10 +138,14 @@ public void testAddWhenNotActive() throws Exception {
   @Test
   public void testAddWithDeferredAllocation() throws Exception {
     List pbs = new LinkedList<>();
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setInsert(INCOMPLETE_ENTITY_1.toPb()).build());
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setInsert(INCOMPLETE_ENTITY_2.toPb()).build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setInsert(INCOMPLETE_ENTITY_1.toPb())
+            .build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setInsert(INCOMPLETE_ENTITY_2.toPb())
+            .build());
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build());
     batchWriter.addWithDeferredIdAllocation(ENTITY1, INCOMPLETE_ENTITY_1);
     batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_2);
@@ -224,12 +229,14 @@ public void testPut() throws Exception {
   public void testPutIncompleteKey() throws Exception {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build());
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setUpsert(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build().toPb())
-        .build());
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setUpsert(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build().toPb())
-        .build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setUpsert(Entity.newBuilder(KEY2, INCOMPLETE_ENTITY_1).build().toPb())
+            .build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setUpsert(Entity.newBuilder(KEY3, INCOMPLETE_ENTITY_2).build().toPb())
+            .build());
     Entity putEntity = batchWriter.put(ENTITY1);
     List putEntities = batchWriter.put(INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2);
     assertEquals(ENTITY1, putEntity);
@@ -241,12 +248,14 @@ public void testPutIncompleteKey() throws Exception {
   @Test
   public void testPutWithDeferredAllocation() throws Exception {
     List pbs = new LinkedList<>();
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setInsert(INCOMPLETE_ENTITY_1.toPb())
-        .build());
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setInsert(INCOMPLETE_ENTITY_2.toPb())
-        .build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setInsert(INCOMPLETE_ENTITY_1.toPb())
+            .build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setInsert(INCOMPLETE_ENTITY_2.toPb())
+            .build());
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build());
     batchWriter.put(ENTITY1);
     batchWriter.putWithDeferredIdAllocation(INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2);
@@ -317,8 +326,10 @@ public void testDelete() throws Exception {
   @Test
   public void testDeleteAfterAdd() throws Exception {
     List pbs = new LinkedList<>();
-    pbs.add(com.google.datastore.v1.Mutation.newBuilder()
-        .setInsert(INCOMPLETE_ENTITY_1.toPb()).build());
+    pbs.add(
+        com.google.datastore.v1.Mutation.newBuilder()
+            .setInsert(INCOMPLETE_ENTITY_1.toPb())
+            .build());
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build());
     batchWriter.add(ENTITY1);
     batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_1);
@@ -326,7 +337,6 @@ public void testDeleteAfterAdd() throws Exception {
     assertEquals(pbs, batchWriter.toMutationPbList());
   }
 
-
   @Test
   public void testDeleteAfterUpdate() throws Exception {
     List pbs = new LinkedList<>();
@@ -351,4 +361,3 @@ public void testDeleteWhenNotActive() throws Exception {
     batchWriter.delete(KEY1);
   }
 }
-
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
index 14e399e4b991..161688410761 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
@@ -23,18 +23,16 @@
 import com.google.cloud.Timestamp;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
 
 public class BaseEntityTest {
 
-  private static final Blob BLOB = Blob.copyFrom(new byte[]{1, 2});
+  private static final Blob BLOB = Blob.copyFrom(new byte[] {1, 2});
   private static final Timestamp TIMESTAMP = Timestamp.now();
   private static final LatLng LAT_LNG = new LatLng(37.422035, -122.084124);
   private static final Key KEY = Key.newBuilder("ds1", "k1", "n1").build();
@@ -47,7 +45,8 @@ public class BaseEntityTest {
 
   private class Builder extends BaseEntity.Builder {
 
-    @Override public BaseEntity build() {
+    @Override
+    public BaseEntity build() {
 
       return new BaseEntity(this) {};
     }
@@ -68,7 +67,10 @@ public void setUp() {
     builder.set("booleanList", true, false, true);
     builder.set("timestampList", Timestamp.now(), Timestamp.now(), Timestamp.now());
     builder.set("doubleList", 12.3, 4.56, .789);
-    builder.set("keyList", KEY, Key.newBuilder("ds2", "k2", "n2").build(),
+    builder.set(
+        "keyList",
+        KEY,
+        Key.newBuilder("ds2", "k2", "n2").build(),
         Key.newBuilder("ds3", "k3", "n3").build());
     builder.set("entityList", ENTITY, PARTIAL_ENTITY);
     builder.set("stringList", "s1", "s2", "s3");
@@ -225,14 +227,14 @@ public void testNames() throws Exception {
         ImmutableSet.builder()
             .add("string", "stringValue", "boolean", "double", "long", "list1", "list2", "list3")
             .add("entity", "partialEntity", "null", "timestamp", "blob", "key", "blobList")
-            .add("booleanList", "timestampList", "doubleList", "keyList", "entityList", "stringList")
+            .add(
+                "booleanList", "timestampList", "doubleList", "keyList", "entityList", "stringList")
             .add("longList", "latLng", "latLngList")
             .build();
     BaseEntity entity = builder.build();
     assertEquals(names, entity.getNames());
   }
 
-
   @Test
   public void testKey() throws Exception {
     builder.setKey(KEY);
@@ -240,4 +242,3 @@ public void testKey() throws Exception {
     assertEquals(KEY, entity.getKey());
   }
 }
-
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 826a397fc80f..417b5bed5fac 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
@@ -20,11 +20,9 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
-
-import org.junit.Test;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.junit.Test;
 
 public class BaseKeyTest {
 
@@ -45,7 +43,6 @@ protected BaseKey build() {
       path.add(PathElement.of(kind));
       return new BaseKey(projectId, namespace, path.build()) {
 
-
         @Override
         protected BaseKey getParent() {
           return null;
@@ -63,7 +60,6 @@ public void testProjectId() throws Exception {
     assertEquals("ds2", key.getProjectId());
   }
 
-
   @Test(expected = IllegalArgumentException.class)
   public void testBadDatasetInConstructor() throws Exception {
     new Builder(" ", "k");
@@ -75,7 +71,6 @@ public void testBadDatasetInSetter() throws Exception {
     builder.setProjectId(" ");
   }
 
-
   @Test
   public void testNamespace() throws Exception {
     Builder builder = new Builder("ds", "k");
@@ -86,7 +81,6 @@ public void testNamespace() throws Exception {
     assertEquals("ns", key.getNamespace());
   }
 
-
   @Test
   public void testKind() throws Exception {
     Builder builder = new Builder("ds", "k1");
@@ -96,7 +90,6 @@ public void testKind() throws Exception {
     assertEquals("k2", key.getKind());
   }
 
-
   @Test(expected = NullPointerException.class)
   public void testNoKind() throws Exception {
     Builder builder = new Builder("ds");
@@ -114,7 +107,6 @@ public void testBadKindInSetter() throws Exception {
     builder.setKind("");
   }
 
-
   @Test
   public void testAncestors() throws Exception {
     Builder builder = new Builder("ds", "k");
@@ -129,4 +121,3 @@ public void testAncestors() throws Exception {
     assertEquals(path, key.getAncestors());
   }
 }
-
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
index 5e6ce3fc4560..61e70685c38f 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
@@ -21,13 +21,12 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.Random;
+import org.junit.Before;
+import org.junit.Test;
 
 public class BlobTest {
 
@@ -36,7 +35,6 @@ public class BlobTest {
   private Blob blob1;
   private Blob blob2;
 
-
   @Before
   public void setUp() {
     Random rnd = new Random();
@@ -59,7 +57,6 @@ public void testLength() throws Exception {
     assertEquals(bytes2.length, blob2.getLength());
   }
 
-
   @Test
   public void testToByteArray() throws Exception {
     assertArrayEquals(bytes1, blob1.toByteArray());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
index a18bf18f02d9..1a3d97917072 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
@@ -47,4 +47,3 @@ public void testBuilder() throws Exception {
     assertTrue(value.excludeFromIndexes());
   }
 }
-
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
index a5cb43453d24..44a9b8d0aee7 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertNotEquals;
 
 import com.google.protobuf.ByteString;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
index 37b646c064d9..eec87ffa3f70 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
@@ -29,11 +29,9 @@
 
 import com.google.cloud.BaseServiceException;
 import com.google.cloud.RetryHelper;
-
-import org.junit.Test;
-
 import java.io.IOException;
 import java.net.SocketTimeoutException;
+import org.junit.Test;
 
 public class DatastoreExceptionTest {
 
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 f00cbd913dd9..f02018ecc03a 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
@@ -37,17 +37,17 @@ public class DatastoreOptionsTest {
   private DatastoreRpc datastoreRpc;
   private DatastoreOptions.Builder options;
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
+  @Rule public ExpectedException thrown = ExpectedException.none();
 
   @Before
   public void setUp() {
     datastoreRpcFactory = EasyMock.createMock(DatastoreRpcFactory.class);
     datastoreRpc = EasyMock.createMock(DatastoreRpc.class);
-    options = DatastoreOptions.newBuilder()
-        .setServiceRpcFactory(datastoreRpcFactory)
-        .setProjectId(PROJECT_ID)
-        .setHost("http://localhost:" + PORT);
+    options =
+        DatastoreOptions.newBuilder()
+            .setServiceRpcFactory(datastoreRpcFactory)
+            .setProjectId(PROJECT_ID)
+            .setHost("http://localhost:" + PORT);
     EasyMock.expect(datastoreRpcFactory.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(datastoreRpc)
         .anyTimes();
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 931da0dc0626..25d9c9d88c40 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
@@ -84,8 +84,8 @@ public class DatastoreTest {
   private static final String KIND3 = "kind3";
   private static final NullValue NULL_VALUE = NullValue.of();
   private static final StringValue STR_VALUE = StringValue.of("str");
-  private static final BooleanValue BOOL_VALUE = BooleanValue.newBuilder(false)
-      .setExcludeFromIndexes(true).build();
+  private static final BooleanValue BOOL_VALUE =
+      BooleanValue.newBuilder(false).setExcludeFromIndexes(true).build();
   private static final IncompleteKey INCOMPLETE_KEY1 =
       IncompleteKey.newBuilder(PROJECT_ID, KIND1).build();
   private static final IncompleteKey INCOMPLETE_KEY2 =
@@ -96,45 +96,61 @@ public class DatastoreTest {
   private static final Key KEY4 = Key.newBuilder(KEY2).setName("newName1").build();
   private static final Key KEY5 = Key.newBuilder(KEY2).setName("newName2").build();
   private static final KeyValue KEY_VALUE = KeyValue.of(KEY1);
-  private static final ListValue LIST_VALUE1 = ListValue.newBuilder()
-      .addValue(NULL_VALUE)
-      .addValue(STR_VALUE, BOOL_VALUE)
-      .build();
+  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(new LatLng(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();
+      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();
+      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 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 DatastoreOptions rpcMockOptions;
   private DatastoreRpcFactory rpcFactoryMock;
   private DatastoreRpc rpcMock;
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
+  @Rule public ExpectedException thrown = ExpectedException.none();
 
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
@@ -145,11 +161,12 @@ public static void beforeClass() throws IOException, InterruptedException {
   public void setUp() {
     rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
     rpcMock = EasyMock.createStrictMock(DatastoreRpc.class);
-    rpcMockOptions = options
-        .toBuilder()
-        .setRetrySettings(ServiceOptions.getDefaultRetrySettings())
-        .setServiceRpcFactory(rpcFactoryMock)
-        .build();
+    rpcMockOptions =
+        options
+            .toBuilder()
+            .setRetrySettings(ServiceOptions.getDefaultRetrySettings())
+            .setServiceRpcFactory(rpcFactoryMock)
+            .build();
     EasyMock.expect(rpcFactoryMock.create(rpcMockOptions)).andReturn(rpcMock);
     StructuredQuery query = Query.newKeyQueryBuilder().build();
     QueryResults result = datastore.run(query);
@@ -171,10 +188,7 @@ public void testGetOptions() {
   public void testNewTransactionCommit() {
     Transaction transaction = datastore.newTransaction();
     transaction.add(ENTITY3);
-    Entity entity2 = Entity.newBuilder(ENTITY2)
-        .clear()
-        .setNull("bla")
-        .build();
+    Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla").build();
     transaction.update(entity2);
     transaction.delete(KEY1);
     transaction.commit();
@@ -225,10 +239,11 @@ public void testTransactionWithRead() {
 
   @Test
   public void testTransactionWithQuery() {
-    Query query = Query.newEntityQueryBuilder()
-        .setKind(KIND2)
-        .setFilter(PropertyFilter.hasAncestor(KEY2))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND2)
+            .setFilter(PropertyFilter.hasAncestor(KEY2))
+            .build();
     Transaction transaction = datastore.newTransaction();
     QueryResults results = transaction.run(query);
     assertEquals(ENTITY2, results.next());
@@ -255,8 +270,12 @@ public void testTransactionWithQuery() {
   public void testNewTransactionRollback() {
     Transaction transaction = datastore.newTransaction();
     transaction.add(ENTITY3);
-    Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla")
-        .set("list3", StringValue.of("bla"), StringValue.newBuilder("bla").build()).build();
+    Entity entity2 =
+        Entity.newBuilder(ENTITY2)
+            .clear()
+            .setNull("bla")
+            .set("list3", StringValue.of("bla"), StringValue.newBuilder("bla").build())
+            .build();
     transaction.update(entity2);
     transaction.delete(KEY1);
     transaction.rollback();
@@ -310,7 +329,10 @@ public Integer run(DatastoreReaderWriter transaction) {
           }
         };
 
-    TransactionOptions options = TransactionOptions.newBuilder().setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()).build();
+    TransactionOptions options =
+        TransactionOptions.newBuilder()
+            .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance())
+            .build();
     Integer result = mockDatastore.runInTransaction(callable, options);
     EasyMock.verify(rpcFactoryMock, rpcMock);
     assertEquals(2, result.intValue());
@@ -381,7 +403,8 @@ public void testNewBatch() {
     assertEquals(6, entities.size());
     List generatedKeys = response.getGeneratedKeys();
     assertEquals(1, generatedKeys.size());
-    assertEquals(PARTIAL_ENTITY3.getProperties(), datastore.get(generatedKeys.get(0)).getProperties());
+    assertEquals(
+        PARTIAL_ENTITY3.getProperties(), datastore.get(generatedKeys.get(0)).getProperties());
     assertEquals(PARTIAL_ENTITY3.getKey(), IncompleteKey.newBuilder(generatedKeys.get(0)).build());
 
     try {
@@ -415,8 +438,9 @@ public void testRunGqlQueryNoCasting() {
     assertFalse(results1.hasNext());
 
     datastore.put(ENTITY3);
-    Query query2 =  Query.newGqlQueryBuilder(
-        ResultType.ENTITY, "select * from " + KIND2 + " order by __key__").build();
+    Query query2 =
+        Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND2 + " order by __key__")
+            .build();
     QueryResults results2 = datastore.run(query2);
     assertTrue(results2.hasNext());
     assertEquals(ENTITY2, results2.next());
@@ -435,8 +459,9 @@ public void testRunGqlQueryNoCasting() {
     assertEquals(KEY1, keyOnlyResults.next());
     assertFalse(keyOnlyResults.hasNext());
 
-    GqlQuery keyProjectionQuery = Query.newGqlQueryBuilder(
-        ResultType.PROJECTION_ENTITY, "select __key__ from " + KIND1).build();
+    GqlQuery keyProjectionQuery =
+        Query.newGqlQueryBuilder(ResultType.PROJECTION_ENTITY, "select __key__ from " + KIND1)
+            .build();
     QueryResults keyProjectionResult = datastore.run(keyProjectionQuery);
     assertTrue(keyProjectionResult.hasNext());
     ProjectionEntity projectionEntity = keyProjectionResult.next();
@@ -444,8 +469,9 @@ public void testRunGqlQueryNoCasting() {
     assertTrue(projectionEntity.getProperties().isEmpty());
     assertFalse(keyProjectionResult.hasNext());
 
-    GqlQuery projectionQuery = Query.newGqlQueryBuilder(
-        ResultType.PROJECTION_ENTITY, "select str, date from " + KIND1).build();
+    GqlQuery projectionQuery =
+        Query.newGqlQueryBuilder(ResultType.PROJECTION_ENTITY, "select str, date from " + KIND1)
+            .build();
 
     QueryResults projectionResult = datastore.run(projectionQuery);
     assertTrue(projectionResult.hasNext());
@@ -486,7 +512,8 @@ public void testGqlQueryPagination() throws DatastoreException {
     EasyMock.replay(rpcFactoryMock, rpcMock);
     Datastore mockDatastore = rpcMockOptions.getService();
     QueryResults results =
-        mockDatastore.run(Query.newGqlQueryBuilder(ResultType.KEY, "select __key__ from *").build());
+        mockDatastore.run(
+            Query.newGqlQueryBuilder(ResultType.KEY, "select __key__ from *").build());
     int count = 0;
     while (results.hasNext()) {
       count += 1;
@@ -505,15 +532,14 @@ public void testRunStructuredQuery() {
     assertEquals(ENTITY1, results1.next());
     assertFalse(results1.hasNext());
 
-    Query keyOnlyQuery =  Query.newKeyQueryBuilder().setKind(KIND1).build();
+    Query keyOnlyQuery = Query.newKeyQueryBuilder().setKind(KIND1).build();
     QueryResults results2 = datastore.run(keyOnlyQuery);
     assertTrue(results2.hasNext());
     assertEquals(ENTITY1.getKey(), results2.next());
     assertFalse(results2.hasNext());
 
     StructuredQuery keyOnlyProjectionQuery =
-        Query.newProjectionEntityQueryBuilder()
-        .setKind(KIND1).setProjection("__key__").build();
+        Query.newProjectionEntityQueryBuilder().setKind(KIND1).setProjection("__key__").build();
     QueryResults results3 = datastore.run(keyOnlyProjectionQuery);
     assertTrue(results3.hasNext());
     ProjectionEntity projectionEntity = results3.next();
@@ -521,14 +547,15 @@ public void testRunStructuredQuery() {
     assertTrue(projectionEntity.getNames().isEmpty());
     assertFalse(results2.hasNext());
 
-    StructuredQuery projectionQuery = Query.newProjectionEntityQueryBuilder()
-        .setKind(KIND2)
-        .setProjection("age")
-        .setFilter(PropertyFilter.gt("age", 18))
-        .setDistinctOn("age")
-        .setOrderBy(OrderBy.asc("age"))
-        .setLimit(10)
-        .build();
+    StructuredQuery projectionQuery =
+        Query.newProjectionEntityQueryBuilder()
+            .setKind(KIND2)
+            .setProjection("age")
+            .setFilter(PropertyFilter.gt("age", 18))
+            .setDistinctOn("age")
+            .setOrderBy(OrderBy.asc("age"))
+            .setLimit(10)
+            .build();
 
     QueryResults results4 = datastore.run(projectionQuery);
     assertTrue(results4.hasNext());
@@ -566,32 +593,36 @@ private List buildResponsesForQueryPagination() {
     Query query = Query.newKeyQueryBuilder().build();
     RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
     query.populatePb(requestPb);
-    QueryResultBatch queryResultBatchPb = RunQueryResponse.newBuilder()
-        .mergeFrom(((DatastoreImpl) datastore).runQuery(requestPb.build()))
-        .getBatch();
-    QueryResultBatch queryResultBatchPb1 = QueryResultBatch.newBuilder()
-        .mergeFrom(queryResultBatchPb)
-        .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
-        .clearEntityResults()
-        .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(0, 1))
-        .setEndCursor(queryResultBatchPb.getEntityResultsList().get(0).getCursor())
-        .build();
+    QueryResultBatch queryResultBatchPb =
+        RunQueryResponse.newBuilder()
+            .mergeFrom(((DatastoreImpl) datastore).runQuery(requestPb.build()))
+            .getBatch();
+    QueryResultBatch queryResultBatchPb1 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
+            .clearEntityResults()
+            .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(0, 1))
+            .setEndCursor(queryResultBatchPb.getEntityResultsList().get(0).getCursor())
+            .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb1).build());
-    QueryResultBatch queryResultBatchPb2 = QueryResultBatch.newBuilder()
-        .mergeFrom(queryResultBatchPb)
-        .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
-        .clearEntityResults()
-        .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(1, 3))
-        .setEndCursor(queryResultBatchPb.getEntityResultsList().get(2).getCursor())
-        .build();
+    QueryResultBatch queryResultBatchPb2 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
+            .clearEntityResults()
+            .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(1, 3))
+            .setEndCursor(queryResultBatchPb.getEntityResultsList().get(2).getCursor())
+            .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build());
-    QueryResultBatch queryResultBatchPb3 = QueryResultBatch.newBuilder()
-        .mergeFrom(queryResultBatchPb)
-        .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS)
-        .clearEntityResults()
-        .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(3, 5))
-        .setEndCursor(queryResultBatchPb.getEntityResultsList().get(4).getCursor())
-        .build();
+    QueryResultBatch queryResultBatchPb3 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS)
+            .clearEntityResults()
+            .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(3, 5))
+            .setEndCursor(queryResultBatchPb.getEntityResultsList().get(4).getCursor())
+            .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb3).build());
     return responses;
   }
@@ -649,41 +680,46 @@ private List buildResponsesForQueryPaginationWithLimit() {
     Query query = Query.newEntityQueryBuilder().build();
     RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
     query.populatePb(requestPb);
-    QueryResultBatch queryResultBatchPb = RunQueryResponse.newBuilder()
-        .mergeFrom(datastoreRpc.runQuery(requestPb.build()))
-        .getBatch();
-    QueryResultBatch queryResultBatchPb1 = QueryResultBatch.newBuilder()
-        .mergeFrom(queryResultBatchPb)
-        .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
-        .clearEntityResults()
-        .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(0, 1))
-        .setEndCursor(ByteString.copyFromUtf8("a"))
-        .build();
+    QueryResultBatch queryResultBatchPb =
+        RunQueryResponse.newBuilder()
+            .mergeFrom(datastoreRpc.runQuery(requestPb.build()))
+            .getBatch();
+    QueryResultBatch queryResultBatchPb1 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
+            .clearEntityResults()
+            .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(0, 1))
+            .setEndCursor(ByteString.copyFromUtf8("a"))
+            .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb1).build());
-    QueryResultBatch queryResultBatchPb2 = QueryResultBatch.newBuilder()
-        .mergeFrom(queryResultBatchPb)
-        .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
-        .clearEntityResults()
-        .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(1, 2))
-        .setEndCursor(
-            ByteString.copyFrom(new byte[] {(byte) 0x80})) // test invalid UTF-8 string
-        .build();
+    QueryResultBatch queryResultBatchPb2 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
+            .clearEntityResults()
+            .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(1, 2))
+            .setEndCursor(
+                ByteString.copyFrom(new byte[] {(byte) 0x80})) // test invalid UTF-8 string
+            .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build());
-    QueryResultBatch queryResultBatchPb3 = QueryResultBatch.newBuilder()
-        .mergeFrom(queryResultBatchPb)
-        .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
-        .clearEntityResults()
-        .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(2, 4))
-        .setEndCursor(ByteString.copyFromUtf8("b"))
-        .build();
+    QueryResultBatch queryResultBatchPb3 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
+            .clearEntityResults()
+            .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(2, 4))
+            .setEndCursor(ByteString.copyFromUtf8("b"))
+            .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb3).build());
-    QueryResultBatch queryResultBatchPb4 = QueryResultBatch.newBuilder()
-        .mergeFrom(queryResultBatchPb)
-        .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS)
-        .clearEntityResults()
-        .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(4, 5))
-        .setEndCursor(ByteString.copyFromUtf8("c"))
-        .build();
+    QueryResultBatch queryResultBatchPb4 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS)
+            .clearEntityResults()
+            .addAllEntityResults(queryResultBatchPb.getEntityResultsList().subList(4, 5))
+            .setEndCursor(ByteString.copyFromUtf8("c"))
+            .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb4).build());
     return responses;
   }
@@ -692,14 +728,13 @@ private List buildResponsesForQueryPaginationWithLimit() {
   public void testEventualConsistencyQuery() {
     ReadOptions readOption =
         ReadOptions.newBuilder().setReadConsistencyValue(ReadConsistency.EVENTUAL_VALUE).build();
-    com.google.datastore.v1.GqlQuery query = com.google.datastore.v1.GqlQuery.newBuilder()
-        .setQueryString("FROM * SELECT *")
-        .build();
-    RunQueryRequest.Builder expectedRequest = RunQueryRequest.newBuilder()
-        .setReadOptions(readOption)
-        .setGqlQuery(query)
-        .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID)
-        .build());
+    com.google.datastore.v1.GqlQuery query =
+        com.google.datastore.v1.GqlQuery.newBuilder().setQueryString("FROM * SELECT *").build();
+    RunQueryRequest.Builder expectedRequest =
+        RunQueryRequest.newBuilder()
+            .setReadOptions(readOption)
+            .setGqlQuery(query)
+            .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build());
     EasyMock.expect(rpcMock.runQuery(expectedRequest.build()))
         .andReturn(RunQueryResponse.newBuilder().build());
     EasyMock.replay(rpcFactoryMock, rpcMock);
@@ -752,8 +787,7 @@ public void testAllocateIdArray() {
     IncompleteKey incompleteKey2 =
         keyFactory.setKind(KIND2).addAncestor(PathElement.of(KIND1, 10)).newKey();
     Key key3 = keyFactory.newKey("name");
-    List result1 =
-            datastore.allocateId(incompleteKey1, incompleteKey2, incompleteKey1);
+    List result1 = datastore.allocateId(incompleteKey1, incompleteKey2, incompleteKey1);
     assertEquals(3, result1.size());
     assertEquals(Key.newBuilder(incompleteKey1, result1.get(0).getId()).build(), result1.get(0));
     assertEquals(Key.newBuilder(incompleteKey1, result1.get(2).getId()).build(), result1.get(2));
@@ -762,9 +796,8 @@ public void testAllocateIdArray() {
     try {
       datastore.allocateId(incompleteKey1, incompleteKey2, key3);
       fail("expecting a failure");
-    } catch(IllegalArgumentException expected) {
-        assertEquals(expected.getMessage(), "keys must be IncompleteKey instances");
-
+    } catch (IllegalArgumentException expected) {
+      assertEquals(expected.getMessage(), "keys must be IncompleteKey instances");
     }
   }
 
@@ -797,11 +830,15 @@ public void testGet() {
   public void testLookupEventualConsistency() {
     ReadOptions readOption =
         ReadOptions.newBuilder().setReadConsistencyValue(ReadConsistency.EVENTUAL_VALUE).build();
-    com.google.datastore.v1.Key key = com.google.datastore.v1.Key.newBuilder()
-        .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build())
-        .addPath(com.google.datastore.v1.Key.PathElement.newBuilder()
-            .setKind("kind1").setName("name").build())
-        .build();
+    com.google.datastore.v1.Key key =
+        com.google.datastore.v1.Key.newBuilder()
+            .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build())
+            .addPath(
+                com.google.datastore.v1.Key.PathElement.newBuilder()
+                    .setKind("kind1")
+                    .setName("name")
+                    .build())
+            .build();
     LookupRequest lookupRequest =
         LookupRequest.newBuilder().setReadOptions(readOption).addKeys(key).build();
     EasyMock.expect(rpcMock.lookup(lookupRequest))
@@ -1005,7 +1042,8 @@ public void testDelete() {
   public void testKeyFactory() {
     KeyFactory keyFactory = datastore.newKeyFactory().setKind(KIND1);
     assertEquals(INCOMPLETE_KEY1, keyFactory.newKey());
-    assertEquals(IncompleteKey.newBuilder(INCOMPLETE_KEY1).setKind(KIND2).build(),
+    assertEquals(
+        IncompleteKey.newBuilder(INCOMPLETE_KEY1).setKind(KIND2).build(),
         datastore.newKeyFactory().setKind(KIND2).newKey());
     assertEquals(KEY1, keyFactory.newKey("name"));
     assertEquals(Key.newBuilder(KEY1).setId(2).build(), keyFactory.newKey(2));
@@ -1014,9 +1052,10 @@ public void testKeyFactory() {
   @Test
   public void testRetryableException() throws Exception {
     LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();
-    LookupResponse responsePb = LookupResponse.newBuilder()
-        .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb()))
-        .build();
+    LookupResponse responsePb =
+        LookupResponse.newBuilder()
+            .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb()))
+            .build();
     EasyMock.expect(rpcMock.lookup(requestPb))
         .andThrow(new DatastoreException(14, "UNAVAILABLE", "UNAVAILABLE", null))
         .andReturn(responsePb);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
index 9a797586f83a..a4ffe8a2c88b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
@@ -38,7 +38,6 @@ public void testEntity() throws Exception {
     assertEquals("bar", ENTITY.getString("foo"));
   }
 
-
   @Test
   public void testCopyFrom() throws Exception {
     Entity.Builder builder = Entity.newBuilder(ENTITY);
@@ -49,7 +48,6 @@ public void testCopyFrom() throws Exception {
     assertEquals(ENTITY.getProperties(), entity.getProperties());
   }
 
-
   @Test
   public void testCopyFromIncompleteEntity() throws Exception {
     Entity.Builder builder = Entity.newBuilder(KEY2, INCOMPLETE_ENTITY);
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 bd935b4028ab..238fc4788968 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
@@ -19,11 +19,10 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Iterator;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.Iterator;
-
 public class KeyFactoryTest {
 
   private static final String PROJECT_ID = "projectid";
@@ -38,11 +37,12 @@ public void setUp() {
 
   @Test
   public void testReset() {
-    IncompleteKey key = keyFactory
-        .setProjectId("ds1")
-        .setNamespace("ns1")
-        .addAncestor(PathElement.of("p", 1))
-        .build();
+    IncompleteKey key =
+        keyFactory
+            .setProjectId("ds1")
+            .setNamespace("ns1")
+            .addAncestor(PathElement.of("p", 1))
+            .build();
     assertEquals("k", key.getKind());
     assertEquals("ds1", key.getProjectId());
     assertEquals("ns1", key.getNamespace());
@@ -87,7 +87,6 @@ public void testNewKey() throws Exception {
     verifyKey(key, "k3", "ns", p1, p2);
   }
 
-
   @Test
   public void testNewIncompleteKey() throws Exception {
     IncompleteKey key = keyFactory.newKey();
@@ -98,7 +97,6 @@ public void testNewIncompleteKey() throws Exception {
     verifyIncompleteKey(key, "ns", p1, p2);
   }
 
-
   @Test(expected = NullPointerException.class)
   public void testNewIncompleteWithNoKind() {
     new KeyFactory(PROJECT_ID).build();
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 4ad1a4fecf0e..77da9f9f0739 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
@@ -33,7 +33,6 @@ public void testHasId() throws Exception {
     assertFalse(key.hasId());
   }
 
-
   @Test
   public void testId() throws Exception {
     Key.Builder builder = Key.newBuilder("d", "k", 10);
@@ -43,7 +42,6 @@ public void testId() throws Exception {
     assertEquals(Long.valueOf(100), key.getId());
   }
 
-
   @Test
   public void testHasName() throws Exception {
     Key.Builder builder = Key.newBuilder("d", "k", "n");
@@ -53,7 +51,6 @@ public void testHasName() throws Exception {
     assertFalse(key.hasName());
   }
 
-
   @Test
   public void testName() throws Exception {
     Key.Builder builder = Key.newBuilder("d", "k", "n");
@@ -63,7 +60,6 @@ public void testName() throws Exception {
     assertEquals("o", key.getName());
   }
 
-
   @Test
   public void testNameOrId() throws Exception {
     Key.Builder builder = Key.newBuilder("d", "k", "n");
@@ -73,7 +69,6 @@ public void testNameOrId() throws Exception {
     assertEquals(Long.valueOf(1), key.getNameOrId());
   }
 
-
   @Test
   public void testToAndFromUrlSafe() throws Exception {
     Key key = Key.newBuilder("d", "k", "n").build();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
index b943bfdf4fe4..dd7e680b2324 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
@@ -25,8 +25,7 @@
 
 public class LatLngTest {
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
+  @Rule public ExpectedException thrown = ExpectedException.none();
 
   private static LatLng gp1 = new LatLng(37.422035, -122.084124);
   private static LatLng gp2 = new LatLng(0.0, 0.0);
@@ -42,7 +41,6 @@ public void testLatLng() {
     assertEquals(-122.084124, gp1.getLongitude(), 0);
   }
 
-
   @Test
   public void testEquals() {
     assertEquals(gp1, gp1);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
index eafb458f6e2a..484eb7f6db73 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
@@ -24,7 +24,7 @@
 
 public class LatLngValueTest {
 
-private static final LatLng CONTENT = new LatLng(37.4, -122.1);
+  private static final LatLng CONTENT = new LatLng(37.4, -122.1);
 
   @Test
   public void testToBuilder() throws Exception {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
index 376b83673fab..88e86af628ba 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
@@ -22,11 +22,9 @@
 
 import com.google.cloud.Timestamp;
 import com.google.common.collect.ImmutableList;
-
-import org.junit.Test;
-
 import java.util.Collections;
 import java.util.List;
+import org.junit.Test;
 
 public class ListValueTest {
 
@@ -48,8 +46,8 @@ public class ListValueTest {
   private static final Key KEY2 = Key.newBuilder("project", "kind", "name2").build();
   private static final FullEntity ENTITY1 = FullEntity.newBuilder(KEY1).build();
   private static final FullEntity ENTITY2 = FullEntity.newBuilder(KEY2).build();
-  private static final Blob BLOB1 = Blob.copyFrom(new byte[]{0xD, 0xE, 0xA, 0xD});
-  private static final Blob BLOB2 = Blob.copyFrom(new byte[]{0xB, 0x0, 0x0, 0x0});
+  private static final Blob BLOB1 = Blob.copyFrom(new byte[] {0xD, 0xE, 0xA, 0xD});
+  private static final Blob BLOB2 = Blob.copyFrom(new byte[] {0xB, 0x0, 0x0, 0x0});
 
   @Test
   public void testToBuilder() throws Exception {
@@ -80,12 +78,13 @@ public void testOf() throws Exception {
     value = ListValue.of(BOOLEAN1);
     assertEquals(ImmutableList.of(BooleanValue.of(BOOLEAN1)), value.get());
     value = ListValue.of(BOOLEAN1, BOOLEAN2);
-    assertEquals(ImmutableList.of(BooleanValue.of(BOOLEAN1), BooleanValue.of(BOOLEAN2)),
-        value.get());
+    assertEquals(
+        ImmutableList.of(BooleanValue.of(BOOLEAN1), BooleanValue.of(BOOLEAN2)), value.get());
     value = ListValue.of(TIMESTAMP1);
     assertEquals(ImmutableList.of(TimestampValue.of(TIMESTAMP1)), value.get());
     value = ListValue.of(TIMESTAMP1, TIMESTAMP2);
-    assertEquals(ImmutableList.of(TimestampValue.of(TIMESTAMP1), TimestampValue.of(TIMESTAMP2)),
+    assertEquals(
+        ImmutableList.of(TimestampValue.of(TIMESTAMP1), TimestampValue.of(TIMESTAMP2)),
         value.get());
     value = ListValue.of(LATLNG1);
     assertEquals(ImmutableList.of(LatLngValue.of(LATLNG1)), value.get());
@@ -128,8 +127,8 @@ public void testBuilder() throws Exception {
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(STRING1, STRING2);
-    assertEquals(ImmutableList.of(StringValue.of(STRING1), StringValue.of(STRING2)),
-        builder.build().get());
+    assertEquals(
+        ImmutableList.of(StringValue.of(STRING1), StringValue.of(STRING2)), builder.build().get());
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(LONG1);
@@ -145,8 +144,8 @@ public void testBuilder() throws Exception {
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(DOUBLE1, DOUBLE2);
-    assertEquals(ImmutableList.of(DoubleValue.of(DOUBLE1), DoubleValue.of(DOUBLE2)),
-        builder.build().get());
+    assertEquals(
+        ImmutableList.of(DoubleValue.of(DOUBLE1), DoubleValue.of(DOUBLE2)), builder.build().get());
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(BOOLEAN1);
@@ -154,7 +153,8 @@ public void testBuilder() throws Exception {
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(BOOLEAN1, BOOLEAN2);
-    assertEquals(ImmutableList.of(BooleanValue.of(BOOLEAN1), BooleanValue.of(BOOLEAN2)),
+    assertEquals(
+        ImmutableList.of(BooleanValue.of(BOOLEAN1), BooleanValue.of(BOOLEAN2)),
         builder.build().get());
     builder = builder.set(Collections.>emptyList());
 
@@ -163,7 +163,8 @@ public void testBuilder() throws Exception {
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(TIMESTAMP1, TIMESTAMP2);
-    assertEquals(ImmutableList.of(TimestampValue.of(TIMESTAMP1), TimestampValue.of(TIMESTAMP2)),
+    assertEquals(
+        ImmutableList.of(TimestampValue.of(TIMESTAMP1), TimestampValue.of(TIMESTAMP2)),
         builder.build().get());
     builder = builder.set(Collections.>emptyList());
 
@@ -172,8 +173,8 @@ public void testBuilder() throws Exception {
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(LATLNG1, LATLNG2);
-    assertEquals(ImmutableList.of(LatLngValue.of(LATLNG1), LatLngValue.of(LATLNG2)),
-        builder.build().get());
+    assertEquals(
+        ImmutableList.of(LatLngValue.of(LATLNG1), LatLngValue.of(LATLNG2)), builder.build().get());
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(KEY1);
@@ -189,8 +190,8 @@ public void testBuilder() throws Exception {
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(ENTITY1, ENTITY2);
-    assertEquals(ImmutableList.of(EntityValue.of(ENTITY1), EntityValue.of(ENTITY2)),
-        builder.build().get());
+    assertEquals(
+        ImmutableList.of(EntityValue.of(ENTITY1), EntityValue.of(ENTITY2)), builder.build().get());
     builder = builder.set(Collections.>emptyList());
 
     builder = builder.addValue(BLOB1);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
index 46859ec4e607..724f49785b2a 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
@@ -50,7 +50,6 @@ public void testId() throws Exception {
     assertEquals(Long.valueOf(1), PE_3.getId());
   }
 
-
   @Test
   public void testHasName() throws Exception {
     assertFalse(PE_1.hasName());
@@ -65,7 +64,6 @@ public void testName() throws Exception {
     assertNull(PE_3.getName());
   }
 
-
   @Test
   public void testNameOrId() throws Exception {
     assertNull(PE_1.getNameOrId());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
index 34defe0b2d76..4af783ce6582 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
@@ -30,19 +30,23 @@ public class ProjectionEntityTest {
   private static final Key KEY = Key.newBuilder("ds1", "k1", "n1").build();
   private static final StringValue STRING_INDEX_VALUE =
       StringValue.newBuilder("foo").setMeaning(18).build();
-  private static final BlobValue BLOB_VALUE = BlobValue.of(Blob.copyFrom(new byte[]{1}));
+  private static final BlobValue BLOB_VALUE = BlobValue.of(Blob.copyFrom(new byte[] {1}));
   private static final TimestampValue TIMESTAMP_VALUE = TimestampValue.of(Timestamp.now());
   private static final LongValue LONG_INDEX_VALUE =
-      LongValue.newBuilder(TIMESTAMP_VALUE.get().getSeconds() * 1000000
-          + TIMESTAMP_VALUE.get().getNanos() / 1000).setMeaning(18).build();
+      LongValue.newBuilder(
+              TIMESTAMP_VALUE.get().getSeconds() * 1000000
+                  + TIMESTAMP_VALUE.get().getNanos() / 1000)
+          .setMeaning(18)
+          .build();
   private static final ProjectionEntity ENTITY1 =
       new ProjectionEntity.Builder().setKey(KEY).set("a", "b").build();
-  private static final ProjectionEntity ENTITY2 = new ProjectionEntity.Builder()
-      .set("a", STRING_INDEX_VALUE)
-      .set("b", BLOB_VALUE)
-      .set("c", TIMESTAMP_VALUE)
-      .set("d", LONG_INDEX_VALUE)
-      .build();
+  private static final ProjectionEntity ENTITY2 =
+      new ProjectionEntity.Builder()
+          .set("a", STRING_INDEX_VALUE)
+          .set("b", BLOB_VALUE)
+          .set("c", TIMESTAMP_VALUE)
+          .set("d", LONG_INDEX_VALUE)
+          .build();
 
   @Test
   public void testHasKey() throws Exception {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
index acca226c92b6..105386515781 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
@@ -41,23 +41,21 @@ public class SerializationTest extends BaseSerializationTest {
   private static final Cursor CURSOR2 = Cursor.copyFrom(new byte[] {10});
   private static final Query GQL1 =
       Query.newGqlQueryBuilder("select * from kind1 where name = @name and age > @1")
-      .setBinding("name", "name1")
-      .addBinding(20)
-      .setNamespace("ns1")
-      .build();
+          .setBinding("name", "name1")
+          .addBinding(20)
+          .setNamespace("ns1")
+          .build();
   private static final Query GQL2 =
       Query.newGqlQueryBuilder(
-          Query.ResultType.ENTITY, "select * from kind1 where name = @name and age > @1")
-      .setBinding("name", "name1")
-      .addBinding(20)
-      .setNamespace("ns1")
-      .build();
+              Query.ResultType.ENTITY, "select * from kind1 where name = @name and age > @1")
+          .setBinding("name", "name1")
+          .addBinding(20)
+          .setNamespace("ns1")
+          .build();
   private static final Query QUERY1 =
       Query.newEntityQueryBuilder().setKind("kind1").build();
-  private static final Query QUERY2 = Query.newKeyQueryBuilder()
-      .setKind("k")
-      .setFilter(PropertyFilter.eq("p1", "hello"))
-      .build();
+  private static final Query QUERY2 =
+      Query.newKeyQueryBuilder().setKind("k").setFilter(PropertyFilter.eq("p1", "hello")).build();
   private static final Query QUERY3 =
       Query.newProjectionEntityQueryBuilder()
           .setKind("k")
@@ -80,18 +78,20 @@ public class SerializationTest extends BaseSerializationTest {
   private static final BooleanValue BOOLEAN_VALUE = BooleanValue.of(true);
   private static final TimestampValue TIMESTAMP_VALUE = TimestampValue.of(Timestamp.now());
   private static final BlobValue BLOB_VALUE = BlobValue.of(BLOB1);
-  private static final RawValue RAW_VALUE = 
+  private static final RawValue RAW_VALUE =
       RawValue.of(com.google.datastore.v1.Value.newBuilder().setMeaning(18).build());
   private static final LatLngValue LAT_LNG_VALUE = LatLngValue.of(LAT_LNG);
   private static final Entity ENTITY1 = Entity.newBuilder(KEY1).build();
-  private static final Entity ENTITY2 =
-      Entity.newBuilder(KEY2).set("null", NullValue.of()).build();
-  private static final Entity ENTITY3 = Entity.newBuilder(KEY2)
-      .set("p1", StringValue.newBuilder("hi1").setMeaning(10).build())
-      .set("p2", StringValue.newBuilder("hi2").setMeaning(11).setExcludeFromIndexes(true).build())
-      .set("p3", LongValue.newBuilder(100).setExcludeFromIndexes(true).setMeaning(100).build())
-      .set("blob", BLOB1)
-      .build();
+  private static final Entity ENTITY2 = Entity.newBuilder(KEY2).set("null", NullValue.of()).build();
+  private static final Entity ENTITY3 =
+      Entity.newBuilder(KEY2)
+          .set("p1", StringValue.newBuilder("hi1").setMeaning(10).build())
+          .set(
+              "p2",
+              StringValue.newBuilder("hi2").setMeaning(11).setExcludeFromIndexes(true).build())
+          .set("p3", LongValue.newBuilder(100).setExcludeFromIndexes(true).setMeaning(100).build())
+          .set("blob", BLOB1)
+          .build();
   private static final FullEntity EMBEDDED_ENTITY =
       Entity.newBuilder(INCOMPLETE_KEY1)
           .set("p1", STRING_VALUE)
@@ -100,28 +100,60 @@ public class SerializationTest extends BaseSerializationTest {
   private static final EntityValue EMBEDDED_ENTITY_VALUE1 = EntityValue.of(ENTITY1);
   private static final EntityValue EMBEDDED_ENTITY_VALUE2 = EntityValue.of(ENTITY2);
   private static final EntityValue EMBEDDED_ENTITY_VALUE3 = EntityValue.of(EMBEDDED_ENTITY);
-  private static final ListValue LIST_VALUE = ListValue.newBuilder()
-      .addValue(NULL_VALUE)
-      .addValue(STRING_VALUE)
-      .addValue(new NullValue())
-      .build();
+  private static final ListValue LIST_VALUE =
+      ListValue.newBuilder()
+          .addValue(NULL_VALUE)
+          .addValue(STRING_VALUE)
+          .addValue(new NullValue())
+          .build();
   private static final ProjectionEntity PROJECTION_ENTITY = ProjectionEntity.fromPb(ENTITY1.toPb());
   private static final DatastoreException DATASTORE_EXCEPTION =
       new DatastoreException(42, "message", "reason");
 
   @Override
   protected java.io.Serializable[] serializableObjects() {
-    DatastoreOptions options = DatastoreOptions.newBuilder()
-        .setCredentials(NoCredentials.getInstance())
-        .setProjectId("ds1")
-        .build();
+    DatastoreOptions options =
+        DatastoreOptions.newBuilder()
+            .setCredentials(NoCredentials.getInstance())
+            .setProjectId("ds1")
+            .build();
     DatastoreOptions otherOptions = options.toBuilder().setNamespace("ns1").build();
-    return new java.io.Serializable[]{KEY1, KEY2, INCOMPLETE_KEY1, INCOMPLETE_KEY2, ENTITY1,
-        ENTITY2, ENTITY3, EMBEDDED_ENTITY, PROJECTION_ENTITY, TIMESTAMP, BLOB1, CURSOR1, GQL1,
-        GQL2, QUERY1, QUERY2, QUERY3, NULL_VALUE, KEY_VALUE, STRING_VALUE, EMBEDDED_ENTITY_VALUE1,
-        EMBEDDED_ENTITY_VALUE2, EMBEDDED_ENTITY_VALUE3, LIST_VALUE, LONG_VALUE, DOUBLE_VALUE,
-        BOOLEAN_VALUE, TIMESTAMP_VALUE, BLOB_VALUE, RAW_VALUE, LAT_LNG_VALUE,
-        DATASTORE_EXCEPTION, options, otherOptions};
+    return new java.io.Serializable[] {
+      KEY1,
+      KEY2,
+      INCOMPLETE_KEY1,
+      INCOMPLETE_KEY2,
+      ENTITY1,
+      ENTITY2,
+      ENTITY3,
+      EMBEDDED_ENTITY,
+      PROJECTION_ENTITY,
+      TIMESTAMP,
+      BLOB1,
+      CURSOR1,
+      GQL1,
+      GQL2,
+      QUERY1,
+      QUERY2,
+      QUERY3,
+      NULL_VALUE,
+      KEY_VALUE,
+      STRING_VALUE,
+      EMBEDDED_ENTITY_VALUE1,
+      EMBEDDED_ENTITY_VALUE2,
+      EMBEDDED_ENTITY_VALUE3,
+      LIST_VALUE,
+      LONG_VALUE,
+      DOUBLE_VALUE,
+      BOOLEAN_VALUE,
+      TIMESTAMP_VALUE,
+      BLOB_VALUE,
+      RAW_VALUE,
+      LAT_LNG_VALUE,
+      DATASTORE_EXCEPTION,
+      options,
+      otherOptions
+    };
   }
 
   @Override
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
index 92cee6f6c4d0..b3f4b944ad39 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
@@ -26,10 +26,8 @@
 import com.google.cloud.datastore.StructuredQuery.OrderBy;
 import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.common.collect.ImmutableList;
-
-import org.junit.Test;
-
 import java.util.List;
+import org.junit.Test;
 
 public class StructuredQueryTest {
 
@@ -50,26 +48,28 @@ public class StructuredQueryTest {
   private static final String DISTINCT_ON1 = "p6";
   private static final String DISTINCT_ON2 = "p7";
   private static final List DISTINCT_ON = ImmutableList.of(DISTINCT_ON1, DISTINCT_ON2);
-  private static final EntityQuery ENTITY_QUERY = Query.newEntityQueryBuilder()
-      .setNamespace(NAMESPACE)
-      .setKind(KIND)
-      .setStartCursor(START_CURSOR)
-      .setEndCursor(END_CURSOR)
-      .setOffset(OFFSET)
-      .setLimit(LIMIT)
-      .setFilter(FILTER)
-      .setOrderBy(ORDER_BY_1, ORDER_BY_2)
-      .build();
-  private static final KeyQuery KEY_QUERY = Query.newKeyQueryBuilder()
-      .setNamespace(NAMESPACE)
-      .setKind(KIND)
-      .setStartCursor(START_CURSOR)
-      .setEndCursor(END_CURSOR)
-      .setOffset(OFFSET)
-      .setLimit(LIMIT)
-      .setFilter(FILTER)
-      .setOrderBy(ORDER_BY_1, ORDER_BY_2)
-      .build();
+  private static final EntityQuery ENTITY_QUERY =
+      Query.newEntityQueryBuilder()
+          .setNamespace(NAMESPACE)
+          .setKind(KIND)
+          .setStartCursor(START_CURSOR)
+          .setEndCursor(END_CURSOR)
+          .setOffset(OFFSET)
+          .setLimit(LIMIT)
+          .setFilter(FILTER)
+          .setOrderBy(ORDER_BY_1, ORDER_BY_2)
+          .build();
+  private static final KeyQuery KEY_QUERY =
+      Query.newKeyQueryBuilder()
+          .setNamespace(NAMESPACE)
+          .setKind(KIND)
+          .setStartCursor(START_CURSOR)
+          .setEndCursor(END_CURSOR)
+          .setOffset(OFFSET)
+          .setLimit(LIMIT)
+          .setFilter(FILTER)
+          .setOrderBy(ORDER_BY_1, ORDER_BY_2)
+          .build();
   private static final ProjectionEntityQuery PROJECTION_QUERY =
       Query.newProjectionEntityQueryBuilder()
           .setNamespace(NAMESPACE)
@@ -91,7 +91,6 @@ public void testEntityQueryBuilder() {
     assertTrue(ENTITY_QUERY.getDistinctOn().isEmpty());
   }
 
-
   @Test
   public void testKeyQueryBuilder() {
     compareBaseBuilderFields(KEY_QUERY);
@@ -99,7 +98,6 @@ public void testKeyQueryBuilder() {
     assertTrue(KEY_QUERY.getDistinctOn().isEmpty());
   }
 
-
   @Test
   public void testProjectionEntityQueryBuilder() {
     compareBaseBuilderFields(PROJECTION_QUERY);
@@ -107,7 +105,6 @@ public void testProjectionEntityQueryBuilder() {
     assertEquals(DISTINCT_ON, PROJECTION_QUERY.getDistinctOn());
   }
 
-
   private void compareBaseBuilderFields(StructuredQuery query) {
     assertEquals(NAMESPACE, query.getNamespace());
     assertEquals(KIND, query.getKind());
@@ -119,7 +116,6 @@ private void compareBaseBuilderFields(StructuredQuery query) {
     assertEquals(ORDER_BY, query.getOrderBy());
   }
 
-
   @Test
   public void mergeFrom() {
     compareMergedQuery(
@@ -146,15 +142,16 @@ private void compareMergedQuery(StructuredQuery expected, StructuredQuery
   public void testToAndFromPb() {
     assertEquals(
         ENTITY_QUERY,
-        StructuredQuery.fromPb(ResultType.ENTITY, ENTITY_QUERY.getNamespace(),
-            ENTITY_QUERY.toPb()));
+        StructuredQuery.fromPb(
+            ResultType.ENTITY, ENTITY_QUERY.getNamespace(), ENTITY_QUERY.toPb()));
     assertEquals(
-        KEY_QUERY, StructuredQuery.fromPb(ResultType.KEY, KEY_QUERY.getNamespace(),
-            KEY_QUERY.toPb()));
+        KEY_QUERY,
+        StructuredQuery.fromPb(ResultType.KEY, KEY_QUERY.getNamespace(), KEY_QUERY.toPb()));
     assertEquals(
         PROJECTION_QUERY,
         StructuredQuery.fromPb(
-            ResultType.PROJECTION_ENTITY, PROJECTION_QUERY.getNamespace(),
+            ResultType.PROJECTION_ENTITY,
+            PROJECTION_QUERY.getNamespace(),
             PROJECTION_QUERY.toPb()));
   }
 
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
index 9cfe66465caa..8353381965e1 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
@@ -63,10 +63,7 @@ public void testShouldTry() {
 
     DatastoreException nestedUserException =
         new DatastoreException(
-            BaseServiceException.UNKNOWN_CODE,
-            "",
-            null,
-            new RuntimeException(""));
+            BaseServiceException.UNKNOWN_CODE, "", null, new RuntimeException(""));
 
     assertFalse(transactionHandler.shouldRetry(nestedUserException, null));
     assertFalse(handler.shouldRetry(nestedDatastoreException, null));
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
index 74c4cfdf070b..70479bcc9ea0 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
@@ -24,19 +24,17 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.primitives.Primitives;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
 
 public class ValueTest {
 
   private static final Key KEY = Key.newBuilder("ds", "kind", 1).build();
-  private static final Blob BLOB = Blob.copyFrom(new byte[]{});
+  private static final Blob BLOB = Blob.copyFrom(new byte[] {});
   private static final Timestamp TIMESTAMP = Timestamp.now();
   private static final Entity ENTITY = Entity.newBuilder(KEY).set("FOO", "BAR").build();
   private static final NullValue NULL_VALUE = NullValue.of();
@@ -53,8 +51,9 @@ public class ValueTest {
           .put(ValueType.TIMESTAMP, new Object[] {TimestampValue.class, TIMESTAMP})
           .put(ValueType.DOUBLE, new Object[] {DoubleValue.class, 1.25D})
           .put(ValueType.ENTITY, new Object[] {EntityValue.class, ENTITY})
-          .put(ValueType.LIST, new Object[] {
-              ListValue.class, ImmutableList.of(NULL_VALUE, STRING_VALUE, RAW_VALUE)})
+          .put(
+              ValueType.LIST,
+              new Object[] {ListValue.class, ImmutableList.of(NULL_VALUE, STRING_VALUE, RAW_VALUE)})
           .put(ValueType.LONG, new Object[] {LongValue.class, 123L})
           .put(ValueType.RAW_VALUE, new Object[] {RawValue.class, RAW_VALUE.get()})
           .put(ValueType.LAT_LNG, new Object[] {LatLngValue.class, LAT_LNG_VALUE.get()})
@@ -121,7 +120,6 @@ public void testType() throws Exception {
     }
   }
 
-
   @Test
   public void testExcludeFromIndexes() throws Exception {
     for (Map.Entry> entry : typeToValue.entrySet()) {
@@ -133,7 +131,6 @@ public void testExcludeFromIndexes() throws Exception {
     assertFalse(builder.setExcludeFromIndexes(false).build().excludeFromIndexes());
   }
 
-
   @SuppressWarnings("deprecation")
   @Test
   public void testMeaning() throws Exception {
@@ -141,7 +138,6 @@ public void testMeaning() throws Exception {
     assertEquals(10, builder.setMeaning(10).build().getMeaning());
   }
 
-
   @Test
   public void testGet() throws Exception {
     for (Map.Entry> entry : typeToValue.entrySet()) {
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 9f3bd9001019..7b999802198a 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
@@ -170,9 +170,9 @@ public void tearDown() {
   }
 
   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
+      throws InterruptedException {
+    // scQuery is equivalent to query, but with an ancestor filter in it
+    // this makes scQuery strongly consistent
     QueryResults scResults = DATASTORE.run(scQuery);
     List scResultsCopy = makeResultsCopy(scResults);
     Set scResultsSet = new HashSet<>(scResultsCopy);
@@ -190,7 +190,7 @@ private  Iterator getStronglyConsistentResults(Query scQuery, Query query)
     }
 
     throw new RuntimeException(
-            "reached max number of attempts to get strongly consistent results.");
+        "reached max number of attempts to get strongly consistent results.");
   }
 
   private  List makeResultsCopy(QueryResults scResults) {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
index c46834052a10..4af7f65dba85 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
@@ -28,16 +28,14 @@
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Key;
-
-import org.threeten.bp.Duration;
+import java.io.IOException;
+import java.util.concurrent.TimeoutException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
+import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
 public class LocalDatastoreHelperTest {
@@ -46,8 +44,7 @@ public class LocalDatastoreHelperTest {
   private static final String PROJECT_ID_PREFIX = "test-project-";
   private static final String NAMESPACE = "namespace";
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
+  @Rule public ExpectedException thrown = ExpectedException.none();
 
   @Test
   public void testCreate() {
@@ -59,7 +56,6 @@ public void testCreate() {
     assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
   }
 
-
   @Test
   public void testOptions() {
     LocalDatastoreHelper helper = LocalDatastoreHelper.create();
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 9eb469011ac9..5abb4af2c7e1 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
@@ -4,31 +4,34 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
  */
-public  final class AllocateIdsRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class AllocateIdsRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsRequest)
     AllocateIdsRequestOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use AllocateIdsRequest.newBuilder() to construct.
   private AllocateIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private AllocateIdsRequest() {
     projectId_ = "";
     keys_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private AllocateIdsRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -48,35 +51,35 @@ private AllocateIdsRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              keys_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                keys_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+              break;
             }
-            keys_.add(
-                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-            break;
-          }
-          case 66: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            projectId_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              projectId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -85,23 +88,28 @@ private AllocateIdsRequest(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.AllocateIdsRequest.class, com.google.datastore.v1.AllocateIdsRequest.Builder.class);
+            com.google.datastore.v1.AllocateIdsRequest.class,
+            com.google.datastore.v1.AllocateIdsRequest.Builder.class);
   }
 
   private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -113,27 +121,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -144,6 +151,8 @@ public java.lang.String getProjectId() {
   public static final int KEYS_FIELD_NUMBER = 1;
   private java.util.List keys_;
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -155,6 +164,8 @@ public java.util.List getKeysList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -162,11 +173,12 @@ public java.util.List getKeysList() {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public java.util.List 
-      getKeysOrBuilderList() {
+  public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -178,6 +190,8 @@ public int getKeysCount() {
     return keys_.size();
   }
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -189,6 +203,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -196,12 +212,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index) {
+  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -213,8 +229,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
@@ -231,8 +246,7 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < keys_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, keys_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -245,18 +259,17 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.AllocateIdsRequest)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.AllocateIdsRequest other = (com.google.datastore.v1.AllocateIdsRequest) obj;
+    com.google.datastore.v1.AllocateIdsRequest other =
+        (com.google.datastore.v1.AllocateIdsRequest) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
-    result = result && getKeysList()
-        .equals(other.getKeysList());
+    result = result && getProjectId().equals(other.getProjectId());
+    result = result && getKeysList().equals(other.getKeysList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -279,118 +292,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.AllocateIdsRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.AllocateIdsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.AllocateIdsRequest)
       com.google.datastore.v1.AllocateIdsRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.AllocateIdsRequest.class, com.google.datastore.v1.AllocateIdsRequest.Builder.class);
+              com.google.datastore.v1.AllocateIdsRequest.class,
+              com.google.datastore.v1.AllocateIdsRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.AllocateIdsRequest.newBuilder()
@@ -398,17 +420,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getKeysFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -424,9 +446,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
     }
 
     @java.lang.Override
@@ -445,7 +467,8 @@ public com.google.datastore.v1.AllocateIdsRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
-      com.google.datastore.v1.AllocateIdsRequest result = new com.google.datastore.v1.AllocateIdsRequest(this);
+      com.google.datastore.v1.AllocateIdsRequest result =
+          new com.google.datastore.v1.AllocateIdsRequest(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.projectId_ = projectId_;
@@ -467,38 +490,39 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.AllocateIdsRequest) {
-        return mergeFrom((com.google.datastore.v1.AllocateIdsRequest)other);
+        return mergeFrom((com.google.datastore.v1.AllocateIdsRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -529,9 +553,10 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
             keysBuilder_ = null;
             keys_ = other.keys_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            keysBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getKeysFieldBuilder() : null;
+            keysBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getKeysFieldBuilder()
+                    : null;
           } else {
             keysBuilder_.addAllMessages(other.keys_);
           }
@@ -565,10 +590,13 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -578,8 +606,7 @@ public Builder mergeFrom(
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -588,19 +615,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -608,23 +635,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -632,43 +662,49 @@ public Builder setProjectId(
      * string project_id = 8;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
     }
 
-    private java.util.List keys_ =
-      java.util.Collections.emptyList();
+    private java.util.List keys_ = java.util.Collections.emptyList();
+
     private void ensureKeysIsMutable() {
       if (!((bitField0_ & 0x00000002) == 0x00000002)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000002;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        keysBuilder_;
 
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -684,6 +720,8 @@ public java.util.List getKeysList() {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -699,6 +737,8 @@ public int getKeysCount() {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -714,6 +754,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -721,8 +763,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -736,6 +777,8 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -743,8 +786,7 @@ public Builder setKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.set(index, builderForValue.build());
@@ -755,6 +797,8 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -776,6 +820,8 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -783,8 +829,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -798,6 +843,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -805,8 +852,7 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(builderForValue.build());
@@ -817,6 +863,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -824,8 +872,7 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(index, builderForValue.build());
@@ -836,6 +883,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -843,12 +892,10 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addAllKeys(
-        java.lang.Iterable values) {
+    public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, keys_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
         onChanged();
       } else {
         keysBuilder_.addAllMessages(values);
@@ -856,6 +903,8 @@ public Builder addAllKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -874,6 +923,8 @@ public Builder clearKeys() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -892,6 +943,8 @@ public Builder removeKeys(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -899,11 +952,12 @@ public Builder removeKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder getKeysBuilder(
-        int index) {
+    public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
       return getKeysFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -911,14 +965,16 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-        int index) {
+    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
       if (keysBuilder_ == null) {
-        return keys_.get(index);  } else {
+        return keys_.get(index);
+      } else {
         return keysBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -926,8 +982,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List 
-         getKeysOrBuilderList() {
+    public java.util.List getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
         return keysBuilder_.getMessageOrBuilderList();
       } else {
@@ -935,6 +990,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -943,10 +1000,11 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
      * repeated .google.datastore.v1.Key keys = 1;
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
-      return getKeysFieldBuilder().addBuilder(
-          com.google.datastore.v1.Key.getDefaultInstance());
+      return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -954,12 +1012,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder addKeysBuilder(
-        int index) {
-      return getKeysFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
+      return getKeysFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
@@ -967,16 +1026,21 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List 
-         getKeysBuilderList() {
+    public java.util.List getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getKeysFieldBuilder() {
       if (keysBuilder_ == null) {
-        keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+        keysBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(
                 keys_,
                 ((bitField0_ & 0x00000002) == 0x00000002),
                 getParentForChildren(),
@@ -985,9 +1049,9 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -997,12 +1061,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.AllocateIdsRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsRequest)
   private static final com.google.datastore.v1.AllocateIdsRequest DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.AllocateIdsRequest();
   }
@@ -1011,16 +1075,16 @@ public static com.google.datastore.v1.AllocateIdsRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public AllocateIdsRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AllocateIdsRequest(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public AllocateIdsRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new AllocateIdsRequest(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1035,6 +1099,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 34be6854f2d4..27d9f7326105 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface AllocateIdsRequestOrBuilder extends
+public interface AllocateIdsRequestOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.AllocateIdsRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -16,16 +19,19 @@ public interface AllocateIdsRequestOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -33,9 +39,10 @@ public interface AllocateIdsRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List 
-      getKeysList();
+  java.util.List getKeysList();
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -45,6 +52,8 @@ public interface AllocateIdsRequestOrBuilder extends
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -54,6 +63,8 @@ public interface AllocateIdsRequestOrBuilder extends
    */
   int getKeysCount();
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -61,9 +72,10 @@ public interface AllocateIdsRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List 
-      getKeysOrBuilderList();
+  java.util.List getKeysOrBuilderList();
   /**
+   *
+   *
    * 
    * A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
@@ -71,6 +83,5 @@ public interface AllocateIdsRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index);
+  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
 }
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 c6e30f9ce017..4bfbc3b37286 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
  */
-public  final class AllocateIdsResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class AllocateIdsResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsResponse)
     AllocateIdsResponseOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use AllocateIdsResponse.newBuilder() to construct.
   private AllocateIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private AllocateIdsResponse() {
     keys_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private AllocateIdsResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,29 +50,28 @@ private AllocateIdsResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              keys_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                keys_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+              break;
             }
-            keys_.add(
-                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -78,22 +80,27 @@ private AllocateIdsResponse(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.AllocateIdsResponse.class, com.google.datastore.v1.AllocateIdsResponse.Builder.class);
+            com.google.datastore.v1.AllocateIdsResponse.class,
+            com.google.datastore.v1.AllocateIdsResponse.Builder.class);
   }
 
   public static final int KEYS_FIELD_NUMBER = 1;
   private java.util.List keys_;
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -105,6 +112,8 @@ public java.util.List getKeysList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -112,11 +121,12 @@ public java.util.List getKeysList() {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public java.util.List 
-      getKeysOrBuilderList() {
+  public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -128,6 +138,8 @@ public int getKeysCount() {
     return keys_.size();
   }
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -139,6 +151,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -146,12 +160,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index) {
+  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -163,8 +177,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
@@ -178,8 +191,7 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < keys_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, keys_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -189,16 +201,16 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.AllocateIdsResponse)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.AllocateIdsResponse other = (com.google.datastore.v1.AllocateIdsResponse) obj;
+    com.google.datastore.v1.AllocateIdsResponse other =
+        (com.google.datastore.v1.AllocateIdsResponse) obj;
 
     boolean result = true;
-    result = result && getKeysList()
-        .equals(other.getKeysList());
+    result = result && getKeysList().equals(other.getKeysList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -219,118 +231,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.AllocateIdsResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.AllocateIdsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.AllocateIdsResponse)
       com.google.datastore.v1.AllocateIdsResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.AllocateIdsResponse.class, com.google.datastore.v1.AllocateIdsResponse.Builder.class);
+              com.google.datastore.v1.AllocateIdsResponse.class,
+              com.google.datastore.v1.AllocateIdsResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.AllocateIdsResponse.newBuilder()
@@ -338,17 +359,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getKeysFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -362,9 +383,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
     }
 
     @java.lang.Override
@@ -383,7 +404,8 @@ public com.google.datastore.v1.AllocateIdsResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
-      com.google.datastore.v1.AllocateIdsResponse result = new com.google.datastore.v1.AllocateIdsResponse(this);
+      com.google.datastore.v1.AllocateIdsResponse result =
+          new com.google.datastore.v1.AllocateIdsResponse(this);
       int from_bitField0_ = bitField0_;
       if (keysBuilder_ == null) {
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -402,38 +424,39 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.AllocateIdsResponse) {
-        return mergeFrom((com.google.datastore.v1.AllocateIdsResponse)other);
+        return mergeFrom((com.google.datastore.v1.AllocateIdsResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -460,9 +483,10 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) {
             keysBuilder_ = null;
             keys_ = other.keys_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            keysBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getKeysFieldBuilder() : null;
+            keysBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getKeysFieldBuilder()
+                    : null;
           } else {
             keysBuilder_.addAllMessages(other.keys_);
           }
@@ -496,21 +520,27 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
-    private java.util.List keys_ =
-      java.util.Collections.emptyList();
+    private java.util.List keys_ = java.util.Collections.emptyList();
+
     private void ensureKeysIsMutable() {
       if (!((bitField0_ & 0x00000001) == 0x00000001)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000001;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        keysBuilder_;
 
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -526,6 +556,8 @@ public java.util.List getKeysList() {
       }
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -541,6 +573,8 @@ public int getKeysCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -556,6 +590,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -563,8 +599,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -578,6 +613,8 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -585,8 +622,7 @@ public Builder setKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.set(index, builderForValue.build());
@@ -597,6 +633,8 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -618,6 +656,8 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -625,8 +665,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -640,6 +679,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -647,8 +688,7 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(builderForValue.build());
@@ -659,6 +699,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -666,8 +708,7 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(index, builderForValue.build());
@@ -678,6 +719,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -685,12 +728,10 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addAllKeys(
-        java.lang.Iterable values) {
+    public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, keys_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
         onChanged();
       } else {
         keysBuilder_.addAllMessages(values);
@@ -698,6 +739,8 @@ public Builder addAllKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -716,6 +759,8 @@ public Builder clearKeys() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -734,6 +779,8 @@ public Builder removeKeys(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -741,11 +788,12 @@ public Builder removeKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder getKeysBuilder(
-        int index) {
+    public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
       return getKeysFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -753,14 +801,16 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-        int index) {
+    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
       if (keysBuilder_ == null) {
-        return keys_.get(index);  } else {
+        return keys_.get(index);
+      } else {
         return keysBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -768,8 +818,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List 
-         getKeysOrBuilderList() {
+    public java.util.List getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
         return keysBuilder_.getMessageOrBuilderList();
       } else {
@@ -777,6 +826,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -785,10 +836,11 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
      * repeated .google.datastore.v1.Key keys = 1;
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
-      return getKeysFieldBuilder().addBuilder(
-          com.google.datastore.v1.Key.getDefaultInstance());
+      return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -796,12 +848,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder addKeysBuilder(
-        int index) {
-      return getKeysFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
+      return getKeysFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -809,16 +862,21 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List 
-         getKeysBuilderList() {
+    public java.util.List getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getKeysFieldBuilder() {
       if (keysBuilder_ == null) {
-        keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+        keysBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(
                 keys_,
                 ((bitField0_ & 0x00000001) == 0x00000001),
                 getParentForChildren(),
@@ -827,9 +885,9 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -839,12 +897,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.AllocateIdsResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsResponse)
   private static final com.google.datastore.v1.AllocateIdsResponse DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.AllocateIdsResponse();
   }
@@ -853,16 +911,16 @@ public static com.google.datastore.v1.AllocateIdsResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public AllocateIdsResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AllocateIdsResponse(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public AllocateIdsResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new AllocateIdsResponse(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -877,6 +935,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index aaa99648538e..6b641552786d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface AllocateIdsResponseOrBuilder extends
+public interface AllocateIdsResponseOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.AllocateIdsResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -15,9 +18,10 @@ public interface AllocateIdsResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List 
-      getKeysList();
+  java.util.List getKeysList();
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -27,6 +31,8 @@ public interface AllocateIdsResponseOrBuilder extends
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -36,6 +42,8 @@ public interface AllocateIdsResponseOrBuilder extends
    */
   int getKeysCount();
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -43,9 +51,10 @@ public interface AllocateIdsResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List 
-      getKeysOrBuilderList();
+  java.util.List getKeysOrBuilderList();
   /**
+   *
+   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -53,6 +62,5 @@ public interface AllocateIdsResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index);
+  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
 }
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 d2cdbd53a35a..c340be35f518 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * An array value.
  * 

  *
  * Protobuf type {@code google.datastore.v1.ArrayValue}
  */
-public  final class ArrayValue extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class ArrayValue extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ArrayValue)
     ArrayValueOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use ArrayValue.newBuilder() to construct.
   private ArrayValue(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private ArrayValue() {
     values_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private ArrayValue(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,29 +50,29 @@ private ArrayValue(
           case 0:
             done = true;
             break;
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              values_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                values_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              values_.add(
+                  input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry));
+              break;
             }
-            values_.add(
-                input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry));
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         values_ = java.util.Collections.unmodifiableList(values_);
@@ -78,22 +81,27 @@ private ArrayValue(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_ArrayValue_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ArrayValue.class, com.google.datastore.v1.ArrayValue.Builder.class);
+            com.google.datastore.v1.ArrayValue.class,
+            com.google.datastore.v1.ArrayValue.Builder.class);
   }
 
   public static final int VALUES_FIELD_NUMBER = 1;
   private java.util.List values_;
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -106,6 +114,8 @@ public java.util.List getValuesList() {
     return values_;
   }
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -114,11 +124,12 @@ public java.util.List getValuesList() {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  public java.util.List 
-      getValuesOrBuilderList() {
+  public java.util.List getValuesOrBuilderList() {
     return values_;
   }
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -131,6 +142,8 @@ public int getValuesCount() {
     return values_.size();
   }
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -143,6 +156,8 @@ public com.google.datastore.v1.Value getValues(int index) {
     return values_.get(index);
   }
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -151,12 +166,12 @@ public com.google.datastore.v1.Value getValues(int index) {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
-      int index) {
+  public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
     return values_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -168,8 +183,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < values_.size(); i++) {
       output.writeMessage(1, values_.get(i));
     }
@@ -183,8 +197,7 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < values_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, values_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, values_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -194,7 +207,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ArrayValue)) {
       return super.equals(obj);
@@ -202,8 +215,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.ArrayValue other = (com.google.datastore.v1.ArrayValue) obj;
 
     boolean result = true;
-    result = result && getValuesList()
-        .equals(other.getValuesList());
+    result = result && getValuesList().equals(other.getValuesList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -224,118 +236,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ArrayValue parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ArrayValue parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.ArrayValue parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.ArrayValue parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ArrayValue parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ArrayValue parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ArrayValue parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.ArrayValue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * An array value.
    * 

    *
    * Protobuf type {@code google.datastore.v1.ArrayValue}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ArrayValue)
       com.google.datastore.v1.ArrayValueOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_ArrayValue_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ArrayValue.class, com.google.datastore.v1.ArrayValue.Builder.class);
+              com.google.datastore.v1.ArrayValue.class,
+              com.google.datastore.v1.ArrayValue.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ArrayValue.newBuilder()
@@ -343,17 +363,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getValuesFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -367,9 +387,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_ArrayValue_descriptor;
     }
 
     @java.lang.Override
@@ -407,38 +427,39 @@ public com.google.datastore.v1.ArrayValue buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ArrayValue) {
-        return mergeFrom((com.google.datastore.v1.ArrayValue)other);
+        return mergeFrom((com.google.datastore.v1.ArrayValue) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -465,9 +486,10 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) {
             valuesBuilder_ = null;
             values_ = other.values_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            valuesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getValuesFieldBuilder() : null;
+            valuesBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getValuesFieldBuilder()
+                    : null;
           } else {
             valuesBuilder_.addAllMessages(other.values_);
           }
@@ -501,21 +523,28 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.util.List values_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureValuesIsMutable() {
       if (!((bitField0_ & 0x00000001) == 0x00000001)) {
         values_ = new java.util.ArrayList(values_);
         bitField0_ |= 0x00000001;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valuesBuilder_;
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        valuesBuilder_;
 
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -532,6 +561,8 @@ public java.util.List getValuesList() {
       }
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -548,6 +579,8 @@ public int getValuesCount() {
       }
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -564,6 +597,8 @@ public com.google.datastore.v1.Value getValues(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -572,8 +607,7 @@ public com.google.datastore.v1.Value getValues(int index) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder setValues(
-        int index, com.google.datastore.v1.Value value) {
+    public Builder setValues(int index, com.google.datastore.v1.Value value) {
       if (valuesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -587,6 +621,8 @@ public Builder setValues(
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -595,8 +631,7 @@ public Builder setValues(
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder setValues(
-        int index, com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder setValues(int index, com.google.datastore.v1.Value.Builder builderForValue) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         values_.set(index, builderForValue.build());
@@ -607,6 +642,8 @@ public Builder setValues(
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -629,6 +666,8 @@ public Builder addValues(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -637,8 +676,7 @@ public Builder addValues(com.google.datastore.v1.Value value) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder addValues(
-        int index, com.google.datastore.v1.Value value) {
+    public Builder addValues(int index, com.google.datastore.v1.Value value) {
       if (valuesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -652,6 +690,8 @@ public Builder addValues(
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -660,8 +700,7 @@ public Builder addValues(
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder addValues(
-        com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder addValues(com.google.datastore.v1.Value.Builder builderForValue) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         values_.add(builderForValue.build());
@@ -672,6 +711,8 @@ public Builder addValues(
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -680,8 +721,7 @@ public Builder addValues(
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder addValues(
-        int index, com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder addValues(int index, com.google.datastore.v1.Value.Builder builderForValue) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         values_.add(index, builderForValue.build());
@@ -692,6 +732,8 @@ public Builder addValues(
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -704,8 +746,7 @@ public Builder addAllValues(
         java.lang.Iterable values) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, values_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, values_);
         onChanged();
       } else {
         valuesBuilder_.addAllMessages(values);
@@ -713,6 +754,8 @@ public Builder addAllValues(
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -732,6 +775,8 @@ public Builder clearValues() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -751,6 +796,8 @@ public Builder removeValues(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -759,11 +806,12 @@ public Builder removeValues(int index) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public com.google.datastore.v1.Value.Builder getValuesBuilder(
-        int index) {
+    public com.google.datastore.v1.Value.Builder getValuesBuilder(int index) {
       return getValuesFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -772,14 +820,16 @@ public com.google.datastore.v1.Value.Builder getValuesBuilder(
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
-        int index) {
+    public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
       if (valuesBuilder_ == null) {
-        return values_.get(index);  } else {
+        return values_.get(index);
+      } else {
         return valuesBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -788,8 +838,8 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public java.util.List 
-         getValuesOrBuilderList() {
+    public java.util.List
+        getValuesOrBuilderList() {
       if (valuesBuilder_ != null) {
         return valuesBuilder_.getMessageOrBuilderList();
       } else {
@@ -797,6 +847,8 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -806,10 +858,11 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
      * repeated .google.datastore.v1.Value values = 1;
      */
     public com.google.datastore.v1.Value.Builder addValuesBuilder() {
-      return getValuesFieldBuilder().addBuilder(
-          com.google.datastore.v1.Value.getDefaultInstance());
+      return getValuesFieldBuilder().addBuilder(com.google.datastore.v1.Value.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -818,12 +871,13 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder() {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public com.google.datastore.v1.Value.Builder addValuesBuilder(
-        int index) {
-      return getValuesFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Value.getDefaultInstance());
+    public com.google.datastore.v1.Value.Builder addValuesBuilder(int index) {
+      return getValuesFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Values in the array.
      * The order of this array may not be preserved if it contains a mix of
@@ -832,16 +886,21 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder(
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public java.util.List 
-         getValuesBuilderList() {
+    public java.util.List getValuesBuilderList() {
       return getValuesFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> 
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
         getValuesFieldBuilder() {
       if (valuesBuilder_ == null) {
-        valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>(
+        valuesBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
                 values_,
                 ((bitField0_ & 0x00000001) == 0x00000001),
                 getParentForChildren(),
@@ -850,9 +909,9 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder(
       }
       return valuesBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -862,12 +921,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ArrayValue)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ArrayValue)
   private static final com.google.datastore.v1.ArrayValue DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ArrayValue();
   }
@@ -876,16 +935,16 @@ public static com.google.datastore.v1.ArrayValue getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public ArrayValue parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ArrayValue(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ArrayValue parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ArrayValue(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -900,6 +959,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index b6feeca1382a..8ce531d1b4e2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface ArrayValueOrBuilder extends
+public interface ArrayValueOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ArrayValue)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -16,9 +19,10 @@ public interface ArrayValueOrBuilder extends
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  java.util.List 
-      getValuesList();
+  java.util.List getValuesList();
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -29,6 +33,8 @@ public interface ArrayValueOrBuilder extends
    */
   com.google.datastore.v1.Value getValues(int index);
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -39,6 +45,8 @@ public interface ArrayValueOrBuilder extends
    */
   int getValuesCount();
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -47,9 +55,10 @@ public interface ArrayValueOrBuilder extends
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  java.util.List 
-      getValuesOrBuilderList();
+  java.util.List getValuesOrBuilderList();
   /**
+   *
+   *
    * 
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
@@ -58,6 +67,5 @@ public interface ArrayValueOrBuilder extends
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
-      int index);
+  com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index);
 }
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 ec9154096522..ea01da83ccf0 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
  */
-public  final class BeginTransactionRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class BeginTransactionRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionRequest)
     BeginTransactionRequestOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use BeginTransactionRequest.newBuilder() to construct.
   private BeginTransactionRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private BeginTransactionRequest() {
     projectId_ = "";
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private BeginTransactionRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,60 +50,68 @@ private BeginTransactionRequest(
           case 0:
             done = true;
             break;
-          case 66: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            projectId_ = s;
-            break;
-          }
-          case 82: {
-            com.google.datastore.v1.TransactionOptions.Builder subBuilder = null;
-            if (transactionOptions_ != null) {
-              subBuilder = transactionOptions_.toBuilder();
+              projectId_ = s;
+              break;
             }
-            transactionOptions_ = input.readMessage(com.google.datastore.v1.TransactionOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(transactionOptions_);
-              transactionOptions_ = subBuilder.buildPartial();
+          case 82:
+            {
+              com.google.datastore.v1.TransactionOptions.Builder subBuilder = null;
+              if (transactionOptions_ != null) {
+                subBuilder = transactionOptions_.toBuilder();
+              }
+              transactionOptions_ =
+                  input.readMessage(
+                      com.google.datastore.v1.TransactionOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(transactionOptions_);
+                transactionOptions_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.BeginTransactionRequest.class, com.google.datastore.v1.BeginTransactionRequest.Builder.class);
+            com.google.datastore.v1.BeginTransactionRequest.class,
+            com.google.datastore.v1.BeginTransactionRequest.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -112,27 +123,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -143,6 +153,8 @@ public java.lang.String getProjectId() {
   public static final int TRANSACTION_OPTIONS_FIELD_NUMBER = 10;
   private com.google.datastore.v1.TransactionOptions transactionOptions_;
   /**
+   *
+   *
    * 
    * Options for a new transaction.
    * 

@@ -153,6 +165,8 @@ public boolean hasTransactionOptions() {
     return transactionOptions_ != null;
   }
   /**
+   *
+   *
    * 
    * Options for a new transaction.
    * 

@@ -160,9 +174,13 @@ public boolean hasTransactionOptions() {
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
    */
   public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
-    return transactionOptions_ == null ? com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_;
+    return transactionOptions_ == null
+        ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
+        : transactionOptions_;
   }
   /**
+   *
+   *
    * 
    * Options for a new transaction.
    * 

@@ -174,6 +192,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -185,8 +204,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
@@ -206,8 +224,7 @@ public int getSerializedSize() {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     if (transactionOptions_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(10, getTransactionOptions());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getTransactionOptions());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -217,20 +234,19 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.BeginTransactionRequest)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.BeginTransactionRequest other = (com.google.datastore.v1.BeginTransactionRequest) obj;
+    com.google.datastore.v1.BeginTransactionRequest other =
+        (com.google.datastore.v1.BeginTransactionRequest) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
+    result = result && getProjectId().equals(other.getProjectId());
     result = result && (hasTransactionOptions() == other.hasTransactionOptions());
     if (hasTransactionOptions()) {
-      result = result && getTransactionOptions()
-          .equals(other.getTransactionOptions());
+      result = result && getTransactionOptions().equals(other.getTransactionOptions());
     }
     result = result && unknownFields.equals(other.unknownFields);
     return result;
@@ -254,118 +270,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.BeginTransactionRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.BeginTransactionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.BeginTransactionRequest)
       com.google.datastore.v1.BeginTransactionRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.BeginTransactionRequest.class, com.google.datastore.v1.BeginTransactionRequest.Builder.class);
+              com.google.datastore.v1.BeginTransactionRequest.class,
+              com.google.datastore.v1.BeginTransactionRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.BeginTransactionRequest.newBuilder()
@@ -373,16 +398,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -398,9 +422,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
     }
 
     @java.lang.Override
@@ -419,7 +443,8 @@ public com.google.datastore.v1.BeginTransactionRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
-      com.google.datastore.v1.BeginTransactionRequest result = new com.google.datastore.v1.BeginTransactionRequest(this);
+      com.google.datastore.v1.BeginTransactionRequest result =
+          new com.google.datastore.v1.BeginTransactionRequest(this);
       result.projectId_ = projectId_;
       if (transactionOptionsBuilder_ == null) {
         result.transactionOptions_ = transactionOptions_;
@@ -434,38 +459,39 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.BeginTransactionRequest) {
-        return mergeFrom((com.google.datastore.v1.BeginTransactionRequest)other);
+        return mergeFrom((com.google.datastore.v1.BeginTransactionRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -473,7 +499,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     }
 
     public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other) {
-      if (other == com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance()) return this;
+      if (other == com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance())
+        return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
         onChanged();
@@ -512,6 +539,8 @@ public Builder mergeFrom(
 
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -521,8 +550,7 @@ public Builder mergeFrom(
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -531,19 +559,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -551,23 +579,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -575,25 +606,26 @@ public Builder setProjectId(
      * string project_id = 8;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
@@ -601,8 +633,13 @@ public Builder setProjectIdBytes(
 
     private com.google.datastore.v1.TransactionOptions transactionOptions_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> transactionOptionsBuilder_;
+            com.google.datastore.v1.TransactionOptions,
+            com.google.datastore.v1.TransactionOptions.Builder,
+            com.google.datastore.v1.TransactionOptionsOrBuilder>
+        transactionOptionsBuilder_;
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -613,6 +650,8 @@ public boolean hasTransactionOptions() {
       return transactionOptionsBuilder_ != null || transactionOptions_ != null;
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -621,12 +660,16 @@ public boolean hasTransactionOptions() {
      */
     public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
       if (transactionOptionsBuilder_ == null) {
-        return transactionOptions_ == null ? com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_;
+        return transactionOptions_ == null
+            ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
+            : transactionOptions_;
       } else {
         return transactionOptionsBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -647,6 +690,8 @@ public Builder setTransactionOptions(com.google.datastore.v1.TransactionOptions
       return this;
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -665,6 +710,8 @@ public Builder setTransactionOptions(
       return this;
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -675,7 +722,9 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption
       if (transactionOptionsBuilder_ == null) {
         if (transactionOptions_ != null) {
           transactionOptions_ =
-            com.google.datastore.v1.TransactionOptions.newBuilder(transactionOptions_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.TransactionOptions.newBuilder(transactionOptions_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           transactionOptions_ = value;
         }
@@ -687,6 +736,8 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption
       return this;
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -705,6 +756,8 @@ public Builder clearTransactionOptions() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -712,11 +765,13 @@ public Builder clearTransactionOptions() {
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
      */
     public com.google.datastore.v1.TransactionOptions.Builder getTransactionOptionsBuilder() {
-      
+
       onChanged();
       return getTransactionOptionsFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -727,11 +782,14 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
       if (transactionOptionsBuilder_ != null) {
         return transactionOptionsBuilder_.getMessageOrBuilder();
       } else {
-        return transactionOptions_ == null ?
-            com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_;
+        return transactionOptions_ == null
+            ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
+            : transactionOptions_;
       }
     }
     /**
+     *
+     *
      * 
      * Options for a new transaction.
      * 

@@ -739,21 +797,24 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> 
+            com.google.datastore.v1.TransactionOptions,
+            com.google.datastore.v1.TransactionOptions.Builder,
+            com.google.datastore.v1.TransactionOptionsOrBuilder>
         getTransactionOptionsFieldBuilder() {
       if (transactionOptionsBuilder_ == null) {
-        transactionOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder>(
-                getTransactionOptions(),
-                getParentForChildren(),
-                isClean());
+        transactionOptionsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.TransactionOptions,
+                com.google.datastore.v1.TransactionOptions.Builder,
+                com.google.datastore.v1.TransactionOptionsOrBuilder>(
+                getTransactionOptions(), getParentForChildren(), isClean());
         transactionOptions_ = null;
       }
       return transactionOptionsBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -763,12 +824,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.BeginTransactionRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionRequest)
   private static final com.google.datastore.v1.BeginTransactionRequest DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.BeginTransactionRequest();
   }
@@ -777,16 +838,16 @@ public static com.google.datastore.v1.BeginTransactionRequest getDefaultInstance
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public BeginTransactionRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionRequest(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public BeginTransactionRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new BeginTransactionRequest(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -801,6 +862,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 9fc80e2500b3..f37d9655aea8 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface BeginTransactionRequestOrBuilder extends
+public interface BeginTransactionRequestOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.BeginTransactionRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -16,16 +19,19 @@ public interface BeginTransactionRequestOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * Options for a new transaction.
    * 

@@ -34,6 +40,8 @@ public interface BeginTransactionRequestOrBuilder extends
    */
   boolean hasTransactionOptions();
   /**
+   *
+   *
    * 
    * Options for a new transaction.
    * 

@@ -42,6 +50,8 @@ public interface BeginTransactionRequestOrBuilder extends
    */
   com.google.datastore.v1.TransactionOptions getTransactionOptions();
   /**
+   *
+   *
    * 
    * Options for a new transaction.
    * 

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 4d4c0b69ee91..f475d0bf4d31 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
  */
-public  final class BeginTransactionResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class BeginTransactionResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionResponse)
     BeginTransactionResponseOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use BeginTransactionResponse.newBuilder() to construct.
   private BeginTransactionResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private BeginTransactionResponse() {
     transaction_ = com.google.protobuf.ByteString.EMPTY;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private BeginTransactionResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,46 +50,50 @@ private BeginTransactionResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            transaction_ = input.readBytes();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 10:
+            {
+              transaction_ = input.readBytes();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.BeginTransactionResponse.class, com.google.datastore.v1.BeginTransactionResponse.Builder.class);
+            com.google.datastore.v1.BeginTransactionResponse.class,
+            com.google.datastore.v1.BeginTransactionResponse.Builder.class);
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   private com.google.protobuf.ByteString transaction_;
   /**
+   *
+   *
    * 
    * The transaction identifier (always present).
    * 

@@ -98,6 +105,7 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -109,8 +117,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!transaction_.isEmpty()) {
       output.writeBytes(1, transaction_);
     }
@@ -124,8 +131,7 @@ public int getSerializedSize() {
 
     size = 0;
     if (!transaction_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(1, transaction_);
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -135,16 +141,16 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.BeginTransactionResponse)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.BeginTransactionResponse other = (com.google.datastore.v1.BeginTransactionResponse) obj;
+    com.google.datastore.v1.BeginTransactionResponse other =
+        (com.google.datastore.v1.BeginTransactionResponse) obj;
 
     boolean result = true;
-    result = result && getTransaction()
-        .equals(other.getTransaction());
+    result = result && getTransaction().equals(other.getTransaction());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -163,118 +169,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.BeginTransactionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.BeginTransactionResponse)
       com.google.datastore.v1.BeginTransactionResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.BeginTransactionResponse.class, com.google.datastore.v1.BeginTransactionResponse.Builder.class);
+              com.google.datastore.v1.BeginTransactionResponse.class,
+              com.google.datastore.v1.BeginTransactionResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.BeginTransactionResponse.newBuilder()
@@ -282,16 +297,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -301,9 +315,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
     }
 
     @java.lang.Override
@@ -322,7 +336,8 @@ public com.google.datastore.v1.BeginTransactionResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
-      com.google.datastore.v1.BeginTransactionResponse result = new com.google.datastore.v1.BeginTransactionResponse(this);
+      com.google.datastore.v1.BeginTransactionResponse result =
+          new com.google.datastore.v1.BeginTransactionResponse(this);
       result.transaction_ = transaction_;
       onBuilt();
       return result;
@@ -332,38 +347,39 @@ public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.BeginTransactionResponse) {
-        return mergeFrom((com.google.datastore.v1.BeginTransactionResponse)other);
+        return mergeFrom((com.google.datastore.v1.BeginTransactionResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -371,7 +387,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     }
 
     public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other) {
-      if (other == com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance()) return this;
+      if (other == com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance())
+        return this;
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
@@ -406,6 +423,8 @@ public Builder mergeFrom(
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
     /**
+     *
+     *
      * 
      * The transaction identifier (always present).
      * 

@@ -416,6 +435,8 @@ public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
     /**
+     *
+     *
      * 
      * The transaction identifier (always present).
      * 

@@ -424,14 +445,16 @@ public com.google.protobuf.ByteString getTransaction() {
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       transaction_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction identifier (always present).
      * 

@@ -439,14 +462,14 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * bytes transaction = 1;
      */
     public Builder clearTransaction() {
-      
+
       transaction_ = getDefaultInstance().getTransaction();
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -456,12 +479,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.BeginTransactionResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionResponse)
   private static final com.google.datastore.v1.BeginTransactionResponse DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.BeginTransactionResponse();
   }
@@ -470,16 +493,16 @@ public static com.google.datastore.v1.BeginTransactionResponse getDefaultInstanc
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public BeginTransactionResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionResponse(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public BeginTransactionResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new BeginTransactionResponse(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -494,6 +517,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index e623e74cba09..7defec39f313 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface BeginTransactionResponseOrBuilder extends
+public interface BeginTransactionResponseOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.BeginTransactionResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The transaction identifier (always present).
    * 

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 258082f5b6c9..18edeafa4942 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
@@ -4,21 +4,24 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
  * 

  *
  * Protobuf type {@code google.datastore.v1.CommitRequest}
  */
-public  final class CommitRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class CommitRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitRequest)
     CommitRequestOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use CommitRequest.newBuilder() to construct.
   private CommitRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private CommitRequest() {
     projectId_ = "";
     mode_ = 0;
@@ -26,10 +29,10 @@ private CommitRequest() {
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private CommitRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -49,46 +52,49 @@ private CommitRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            transactionSelectorCase_ = 1;
-            transactionSelector_ = input.readBytes();
-            break;
-          }
-          case 40: {
-            int rawValue = input.readEnum();
+          case 10:
+            {
+              transactionSelectorCase_ = 1;
+              transactionSelector_ = input.readBytes();
+              break;
+            }
+          case 40:
+            {
+              int rawValue = input.readEnum();
 
-            mode_ = rawValue;
-            break;
-          }
-          case 50: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              mutations_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000008;
+              mode_ = rawValue;
+              break;
             }
-            mutations_.add(
-                input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry));
-            break;
-          }
-          case 66: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 50:
+            {
+              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+                mutations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              mutations_.add(
+                  input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry));
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            projectId_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              projectId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
         mutations_ = java.util.Collections.unmodifiableList(mutations_);
@@ -97,29 +103,35 @@ private CommitRequest(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_CommitRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.CommitRequest.class, com.google.datastore.v1.CommitRequest.Builder.class);
+            com.google.datastore.v1.CommitRequest.class,
+            com.google.datastore.v1.CommitRequest.Builder.class);
   }
 
   /**
+   *
+   *
    * 
    * The modes available for commits.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.CommitRequest.Mode}
    */
-  public enum Mode
-      implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -128,6 +140,8 @@ public enum Mode
      */
     MODE_UNSPECIFIED(0),
     /**
+     *
+     *
      * 
      * Transactional: The mutations are either all applied, or none are applied.
      * Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions).
@@ -137,6 +151,8 @@ public enum Mode
      */
     TRANSACTIONAL(1),
     /**
+     *
+     *
      * 
      * Non-transactional: The mutations may not apply as all or none.
      * 

@@ -148,6 +164,8 @@ public enum Mode
     ;
 
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -156,6 +174,8 @@ public enum Mode
      */
     public static final int MODE_UNSPECIFIED_VALUE = 0;
     /**
+     *
+     *
      * 
      * Transactional: The mutations are either all applied, or none are applied.
      * Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions).
@@ -165,6 +185,8 @@ public enum Mode
      */
     public static final int TRANSACTIONAL_VALUE = 1;
     /**
+     *
+     *
      * 
      * Non-transactional: The mutations may not apply as all or none.
      * 

@@ -173,7 +195,6 @@ public enum Mode
      */
     public static final int NON_TRANSACTIONAL_VALUE = 2;
 
-
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -182,9 +203,7 @@ public final int getNumber() {
       return value;
     }
 
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static Mode valueOf(int value) {
       return forNumber(value);
@@ -192,45 +211,45 @@ public static Mode valueOf(int value) {
 
     public static Mode forNumber(int value) {
       switch (value) {
-        case 0: return MODE_UNSPECIFIED;
-        case 1: return TRANSACTIONAL;
-        case 2: return NON_TRANSACTIONAL;
-        default: return null;
+        case 0:
+          return MODE_UNSPECIFIED;
+        case 1:
+          return TRANSACTIONAL;
+        case 2:
+          return NON_TRANSACTIONAL;
+        default:
+          return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
       return internalValueMap;
     }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Mode> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public Mode findValueByNumber(int number) {
-              return Mode.forNumber(number);
-            }
-          };
 
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public Mode findValueByNumber(int number) {
+            return Mode.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
       return com.google.datastore.v1.CommitRequest.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Mode[] VALUES = values();
 
-    public static Mode valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Mode valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -250,17 +269,16 @@ private Mode(int value) {
   private int bitField0_;
   private int transactionSelectorCase_ = 0;
   private java.lang.Object transactionSelector_;
-  public enum TransactionSelectorCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum TransactionSelectorCase implements com.google.protobuf.Internal.EnumLite {
     TRANSACTION(1),
     TRANSACTIONSELECTOR_NOT_SET(0);
     private final int value;
+
     private TransactionSelectorCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static TransactionSelectorCase valueOf(int value) {
       return forNumber(value);
@@ -268,25 +286,29 @@ public static TransactionSelectorCase valueOf(int value) {
 
     public static TransactionSelectorCase forNumber(int value) {
       switch (value) {
-        case 1: return TRANSACTION;
-        case 0: return TRANSACTIONSELECTOR_NOT_SET;
-        default: return null;
+        case 1:
+          return TRANSACTION;
+        case 0:
+          return TRANSACTIONSELECTOR_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public TransactionSelectorCase
-  getTransactionSelectorCase() {
-    return TransactionSelectorCase.forNumber(
-        transactionSelectorCase_);
+  public TransactionSelectorCase getTransactionSelectorCase() {
+    return TransactionSelectorCase.forNumber(transactionSelectorCase_);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -298,27 +320,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -329,6 +350,8 @@ public java.lang.String getProjectId() {
   public static final int MODE_FIELD_NUMBER = 5;
   private int mode_;
   /**
+   *
+   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

@@ -339,6 +362,8 @@ public int getModeValue() {
     return mode_;
   }
   /**
+   *
+   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

@@ -347,12 +372,15 @@ public int getModeValue() {
    */
   public com.google.datastore.v1.CommitRequest.Mode getMode() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
+    com.google.datastore.v1.CommitRequest.Mode result =
+        com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
     return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   /**
+   *
+   *
    * 
    * The identifier of the transaction associated with the commit. A
    * transaction identifier is returned by a call to
@@ -371,6 +399,8 @@ public com.google.protobuf.ByteString getTransaction() {
   public static final int MUTATIONS_FIELD_NUMBER = 6;
   private java.util.List mutations_;
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -390,6 +420,8 @@ public java.util.List getMutationsList() {
     return mutations_;
   }
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -405,11 +437,13 @@ public java.util.List getMutationsList() {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  public java.util.List 
+  public java.util.List
       getMutationsOrBuilderList() {
     return mutations_;
   }
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -429,6 +463,8 @@ public int getMutationsCount() {
     return mutations_.size();
   }
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -448,6 +484,8 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
     return mutations_.get(index);
   }
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -463,12 +501,12 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
-      int index) {
+  public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index) {
     return mutations_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -480,11 +518,9 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (transactionSelectorCase_ == 1) {
-      output.writeBytes(
-          1, (com.google.protobuf.ByteString) transactionSelector_);
+      output.writeBytes(1, (com.google.protobuf.ByteString) transactionSelector_);
     }
     if (mode_ != com.google.datastore.v1.CommitRequest.Mode.MODE_UNSPECIFIED.getNumber()) {
       output.writeEnum(5, mode_);
@@ -505,17 +541,15 @@ public int getSerializedSize() {
 
     size = 0;
     if (transactionSelectorCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(
-            1, (com.google.protobuf.ByteString) transactionSelector_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeBytesSize(
+              1, (com.google.protobuf.ByteString) transactionSelector_);
     }
     if (mode_ != com.google.datastore.v1.CommitRequest.Mode.MODE_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(5, mode_);
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, mode_);
     }
     for (int i = 0; i < mutations_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, mutations_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, mutations_.get(i));
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -528,7 +562,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.CommitRequest)) {
       return super.equals(obj);
@@ -536,18 +570,14 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.CommitRequest other = (com.google.datastore.v1.CommitRequest) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
+    result = result && getProjectId().equals(other.getProjectId());
     result = result && mode_ == other.mode_;
-    result = result && getMutationsList()
-        .equals(other.getMutationsList());
-    result = result && getTransactionSelectorCase().equals(
-        other.getTransactionSelectorCase());
+    result = result && getMutationsList().equals(other.getMutationsList());
+    result = result && getTransactionSelectorCase().equals(other.getTransactionSelectorCase());
     if (!result) return false;
     switch (transactionSelectorCase_) {
       case 1:
-        result = result && getTransaction()
-            .equals(other.getTransaction());
+        result = result && getTransaction().equals(other.getTransaction());
         break;
       case 0:
       default:
@@ -584,118 +614,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.CommitRequest parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.CommitRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.CommitRequest parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.CommitRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CommitRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CommitRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.CommitRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
    * 

    *
    * Protobuf type {@code google.datastore.v1.CommitRequest}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.CommitRequest)
       com.google.datastore.v1.CommitRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_CommitRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.CommitRequest.class, com.google.datastore.v1.CommitRequest.Builder.class);
+              com.google.datastore.v1.CommitRequest.class,
+              com.google.datastore.v1.CommitRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.CommitRequest.newBuilder()
@@ -703,17 +741,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getMutationsFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -733,9 +771,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_CommitRequest_descriptor;
     }
 
     @java.lang.Override
@@ -754,7 +792,8 @@ public com.google.datastore.v1.CommitRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.CommitRequest buildPartial() {
-      com.google.datastore.v1.CommitRequest result = new com.google.datastore.v1.CommitRequest(this);
+      com.google.datastore.v1.CommitRequest result =
+          new com.google.datastore.v1.CommitRequest(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.projectId_ = projectId_;
@@ -781,38 +820,39 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CommitRequest) {
-        return mergeFrom((com.google.datastore.v1.CommitRequest)other);
+        return mergeFrom((com.google.datastore.v1.CommitRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -846,22 +886,25 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
             mutationsBuilder_ = null;
             mutations_ = other.mutations_;
             bitField0_ = (bitField0_ & ~0x00000008);
-            mutationsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getMutationsFieldBuilder() : null;
+            mutationsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getMutationsFieldBuilder()
+                    : null;
           } else {
             mutationsBuilder_.addAllMessages(other.mutations_);
           }
         }
       }
       switch (other.getTransactionSelectorCase()) {
-        case TRANSACTION: {
-          setTransaction(other.getTransaction());
-          break;
-        }
-        case TRANSACTIONSELECTOR_NOT_SET: {
-          break;
-        }
+        case TRANSACTION:
+          {
+            setTransaction(other.getTransaction());
+            break;
+          }
+        case TRANSACTIONSELECTOR_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -891,12 +934,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int transactionSelectorCase_ = 0;
     private java.lang.Object transactionSelector_;
-    public TransactionSelectorCase
-        getTransactionSelectorCase() {
-      return TransactionSelectorCase.forNumber(
-          transactionSelectorCase_);
+
+    public TransactionSelectorCase getTransactionSelectorCase() {
+      return TransactionSelectorCase.forNumber(transactionSelectorCase_);
     }
 
     public Builder clearTransactionSelector() {
@@ -910,6 +953,8 @@ public Builder clearTransactionSelector() {
 
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -919,8 +964,7 @@ public Builder clearTransactionSelector() {
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -929,19 +973,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -949,23 +993,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -973,25 +1020,26 @@ public Builder setProjectId(
      * string project_id = 8;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
@@ -999,6 +1047,8 @@ public Builder setProjectIdBytes(
 
     private int mode_ = 0;
     /**
+     *
+     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

@@ -1009,6 +1059,8 @@ public int getModeValue() {
       return mode_;
     }
     /**
+     *
+     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

@@ -1021,6 +1073,8 @@ public Builder setModeValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

@@ -1029,10 +1083,13 @@ public Builder setModeValue(int value) {
      */
     public com.google.datastore.v1.CommitRequest.Mode getMode() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
+      com.google.datastore.v1.CommitRequest.Mode result =
+          com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
       return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
     }
     /**
+     *
+     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

@@ -1043,12 +1100,14 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      
+
       mode_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

@@ -1056,13 +1115,15 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
      */
     public Builder clearMode() {
-      
+
       mode_ = 0;
       onChanged();
       return this;
     }
 
     /**
+     *
+     *
      * 
      * The identifier of the transaction associated with the commit. A
      * transaction identifier is returned by a call to
@@ -1078,6 +1139,8 @@ public com.google.protobuf.ByteString getTransaction() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
+     *
+     *
      * 
      * The identifier of the transaction associated with the commit. A
      * transaction identifier is returned by a call to
@@ -1088,14 +1151,16 @@ public com.google.protobuf.ByteString getTransaction() {
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  transactionSelectorCase_ = 1;
+        throw new NullPointerException();
+      }
+      transactionSelectorCase_ = 1;
       transactionSelector_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The identifier of the transaction associated with the commit. A
      * transaction identifier is returned by a call to
@@ -1114,18 +1179,24 @@ public Builder clearTransaction() {
     }
 
     private java.util.List mutations_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureMutationsIsMutable() {
       if (!((bitField0_ & 0x00000008) == 0x00000008)) {
         mutations_ = new java.util.ArrayList(mutations_);
         bitField0_ |= 0x00000008;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder> mutationsBuilder_;
+            com.google.datastore.v1.Mutation,
+            com.google.datastore.v1.Mutation.Builder,
+            com.google.datastore.v1.MutationOrBuilder>
+        mutationsBuilder_;
 
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1149,6 +1220,8 @@ public java.util.List getMutationsList() {
       }
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1172,6 +1245,8 @@ public int getMutationsCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1195,6 +1270,8 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1210,8 +1287,7 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public Builder setMutations(
-        int index, com.google.datastore.v1.Mutation value) {
+    public Builder setMutations(int index, com.google.datastore.v1.Mutation value) {
       if (mutationsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1225,6 +1301,8 @@ public Builder setMutations(
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1252,6 +1330,8 @@ public Builder setMutations(
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1281,6 +1361,8 @@ public Builder addMutations(com.google.datastore.v1.Mutation value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1296,8 +1378,7 @@ public Builder addMutations(com.google.datastore.v1.Mutation value) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public Builder addMutations(
-        int index, com.google.datastore.v1.Mutation value) {
+    public Builder addMutations(int index, com.google.datastore.v1.Mutation value) {
       if (mutationsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1311,6 +1392,8 @@ public Builder addMutations(
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1326,8 +1409,7 @@ public Builder addMutations(
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public Builder addMutations(
-        com.google.datastore.v1.Mutation.Builder builderForValue) {
+    public Builder addMutations(com.google.datastore.v1.Mutation.Builder builderForValue) {
       if (mutationsBuilder_ == null) {
         ensureMutationsIsMutable();
         mutations_.add(builderForValue.build());
@@ -1338,6 +1420,8 @@ public Builder addMutations(
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1365,6 +1449,8 @@ public Builder addMutations(
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1384,8 +1470,7 @@ public Builder addAllMutations(
         java.lang.Iterable values) {
       if (mutationsBuilder_ == null) {
         ensureMutationsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, mutations_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, mutations_);
         onChanged();
       } else {
         mutationsBuilder_.addAllMessages(values);
@@ -1393,6 +1478,8 @@ public Builder addAllMutations(
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1419,6 +1506,8 @@ public Builder clearMutations() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1445,6 +1534,8 @@ public Builder removeMutations(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1460,11 +1551,12 @@ public Builder removeMutations(int index) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(
-        int index) {
+    public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(int index) {
       return getMutationsFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1480,14 +1572,16 @@ public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
-        int index) {
+    public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index) {
       if (mutationsBuilder_ == null) {
-        return mutations_.get(index);  } else {
+        return mutations_.get(index);
+      } else {
         return mutationsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1503,8 +1597,8 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public java.util.List 
-         getMutationsOrBuilderList() {
+    public java.util.List
+        getMutationsOrBuilderList() {
       if (mutationsBuilder_ != null) {
         return mutationsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1512,6 +1606,8 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1528,10 +1624,12 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
     public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() {
-      return getMutationsFieldBuilder().addBuilder(
-          com.google.datastore.v1.Mutation.getDefaultInstance());
+      return getMutationsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.Mutation.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1547,12 +1645,13 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(
-        int index) {
-      return getMutationsFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Mutation.getDefaultInstance());
+    public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(int index) {
+      return getMutationsFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Mutation.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1568,16 +1667,21 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public java.util.List 
-         getMutationsBuilderList() {
+    public java.util.List getMutationsBuilderList() {
       return getMutationsFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder> 
+            com.google.datastore.v1.Mutation,
+            com.google.datastore.v1.Mutation.Builder,
+            com.google.datastore.v1.MutationOrBuilder>
         getMutationsFieldBuilder() {
       if (mutationsBuilder_ == null) {
-        mutationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder>(
+        mutationsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Mutation,
+                com.google.datastore.v1.Mutation.Builder,
+                com.google.datastore.v1.MutationOrBuilder>(
                 mutations_,
                 ((bitField0_ & 0x00000008) == 0x00000008),
                 getParentForChildren(),
@@ -1586,9 +1690,9 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(
       }
       return mutationsBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1598,12 +1702,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.CommitRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.CommitRequest)
   private static final com.google.datastore.v1.CommitRequest DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.CommitRequest();
   }
@@ -1612,16 +1716,16 @@ public static com.google.datastore.v1.CommitRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public CommitRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitRequest(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public CommitRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new CommitRequest(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1636,6 +1740,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 ff941068c372..4e6bf89cd325 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface CommitRequestOrBuilder extends
+public interface CommitRequestOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.CommitRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -16,16 +19,19 @@ public interface CommitRequestOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

@@ -34,6 +40,8 @@ public interface CommitRequestOrBuilder extends
    */
   int getModeValue();
   /**
+   *
+   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

@@ -43,6 +51,8 @@ public interface CommitRequestOrBuilder extends
   com.google.datastore.v1.CommitRequest.Mode getMode();
 
   /**
+   *
+   *
    * 
    * The identifier of the transaction associated with the commit. A
    * transaction identifier is returned by a call to
@@ -54,6 +64,8 @@ public interface CommitRequestOrBuilder extends
   com.google.protobuf.ByteString getTransaction();
 
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -69,9 +81,10 @@ public interface CommitRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  java.util.List 
-      getMutationsList();
+  java.util.List getMutationsList();
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -89,6 +102,8 @@ public interface CommitRequestOrBuilder extends
    */
   com.google.datastore.v1.Mutation getMutations(int index);
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -106,6 +121,8 @@ public interface CommitRequestOrBuilder extends
    */
   int getMutationsCount();
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -121,9 +138,10 @@ public interface CommitRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  java.util.List 
-      getMutationsOrBuilderList();
+  java.util.List getMutationsOrBuilderList();
   /**
+   *
+   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -139,8 +157,7 @@ public interface CommitRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
-      int index);
+  com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index);
 
   public 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 4ddc383d87f7..192e1a8357b6 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
@@ -4,31 +4,34 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
  * 

  *
  * Protobuf type {@code google.datastore.v1.CommitResponse}
  */
-public  final class CommitResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class CommitResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitResponse)
     CommitResponseOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use CommitResponse.newBuilder() to construct.
   private CommitResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private CommitResponse() {
     mutationResults_ = java.util.Collections.emptyList();
     indexUpdates_ = 0;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private CommitResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -48,34 +51,36 @@ private CommitResponse(
           case 0:
             done = true;
             break;
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              mutationResults_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                mutationResults_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              mutationResults_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.MutationResult.parser(), extensionRegistry));
+              break;
             }
-            mutationResults_.add(
-                input.readMessage(com.google.datastore.v1.MutationResult.parser(), extensionRegistry));
-            break;
-          }
-          case 32: {
-
-            indexUpdates_ = input.readInt32();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 32:
+            {
+              indexUpdates_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_);
@@ -84,23 +89,28 @@ private CommitResponse(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_CommitResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.CommitResponse.class, com.google.datastore.v1.CommitResponse.Builder.class);
+            com.google.datastore.v1.CommitResponse.class,
+            com.google.datastore.v1.CommitResponse.Builder.class);
   }
 
   private int bitField0_;
   public static final int MUTATION_RESULTS_FIELD_NUMBER = 3;
   private java.util.List mutationResults_;
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -112,6 +122,8 @@ public java.util.List getMutationResults
     return mutationResults_;
   }
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -119,11 +131,13 @@ public java.util.List getMutationResults
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  public java.util.List 
+  public java.util.List
       getMutationResultsOrBuilderList() {
     return mutationResults_;
   }
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -135,6 +149,8 @@ public int getMutationResultsCount() {
     return mutationResults_.size();
   }
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -146,6 +162,8 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
     return mutationResults_.get(index);
   }
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -153,14 +171,15 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(
-      int index) {
+  public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(int index) {
     return mutationResults_.get(index);
   }
 
   public static final int INDEX_UPDATES_FIELD_NUMBER = 4;
   private int indexUpdates_;
   /**
+   *
+   *
    * 
    * The number of index entries updated during the commit, or zero if none were
    * updated.
@@ -173,6 +192,7 @@ public int getIndexUpdates() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -184,8 +204,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < mutationResults_.size(); i++) {
       output.writeMessage(3, mutationResults_.get(i));
     }
@@ -202,12 +221,10 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < mutationResults_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, mutationResults_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, mutationResults_.get(i));
     }
     if (indexUpdates_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(4, indexUpdates_);
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, indexUpdates_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -217,7 +234,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.CommitResponse)) {
       return super.equals(obj);
@@ -225,10 +242,8 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.CommitResponse other = (com.google.datastore.v1.CommitResponse) obj;
 
     boolean result = true;
-    result = result && getMutationResultsList()
-        .equals(other.getMutationResultsList());
-    result = result && (getIndexUpdates()
-        == other.getIndexUpdates());
+    result = result && getMutationResultsList().equals(other.getMutationResultsList());
+    result = result && (getIndexUpdates() == other.getIndexUpdates());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -251,118 +266,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.CommitResponse parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.CommitResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CommitResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CommitResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.CommitResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
    * 

    *
    * Protobuf type {@code google.datastore.v1.CommitResponse}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.CommitResponse)
       com.google.datastore.v1.CommitResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_CommitResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.CommitResponse.class, com.google.datastore.v1.CommitResponse.Builder.class);
+              com.google.datastore.v1.CommitResponse.class,
+              com.google.datastore.v1.CommitResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.CommitResponse.newBuilder()
@@ -370,17 +394,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getMutationResultsFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -396,9 +420,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_CommitResponse_descriptor;
     }
 
     @java.lang.Override
@@ -417,7 +441,8 @@ public com.google.datastore.v1.CommitResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.CommitResponse buildPartial() {
-      com.google.datastore.v1.CommitResponse result = new com.google.datastore.v1.CommitResponse(this);
+      com.google.datastore.v1.CommitResponse result =
+          new com.google.datastore.v1.CommitResponse(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (mutationResultsBuilder_ == null) {
@@ -439,38 +464,39 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CommitResponse) {
-        return mergeFrom((com.google.datastore.v1.CommitResponse)other);
+        return mergeFrom((com.google.datastore.v1.CommitResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -497,9 +523,10 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) {
             mutationResultsBuilder_ = null;
             mutationResults_ = other.mutationResults_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            mutationResultsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getMutationResultsFieldBuilder() : null;
+            mutationResultsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getMutationResultsFieldBuilder()
+                    : null;
           } else {
             mutationResultsBuilder_.addAllMessages(other.mutationResults_);
           }
@@ -536,21 +563,29 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.util.List mutationResults_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureMutationResultsIsMutable() {
       if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        mutationResults_ = new java.util.ArrayList(mutationResults_);
+        mutationResults_ =
+            new java.util.ArrayList(mutationResults_);
         bitField0_ |= 0x00000001;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder> mutationResultsBuilder_;
+            com.google.datastore.v1.MutationResult,
+            com.google.datastore.v1.MutationResult.Builder,
+            com.google.datastore.v1.MutationResultOrBuilder>
+        mutationResultsBuilder_;
 
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -566,6 +601,8 @@ public java.util.List getMutationResults
       }
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -581,6 +618,8 @@ public int getMutationResultsCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -596,6 +635,8 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -603,8 +644,7 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public Builder setMutationResults(
-        int index, com.google.datastore.v1.MutationResult value) {
+    public Builder setMutationResults(int index, com.google.datastore.v1.MutationResult value) {
       if (mutationResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -618,6 +658,8 @@ public Builder setMutationResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -637,6 +679,8 @@ public Builder setMutationResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -658,6 +702,8 @@ public Builder addMutationResults(com.google.datastore.v1.MutationResult value)
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -665,8 +711,7 @@ public Builder addMutationResults(com.google.datastore.v1.MutationResult value)
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public Builder addMutationResults(
-        int index, com.google.datastore.v1.MutationResult value) {
+    public Builder addMutationResults(int index, com.google.datastore.v1.MutationResult value) {
       if (mutationResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -680,6 +725,8 @@ public Builder addMutationResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -699,6 +746,8 @@ public Builder addMutationResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -718,6 +767,8 @@ public Builder addMutationResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -729,8 +780,7 @@ public Builder addAllMutationResults(
         java.lang.Iterable values) {
       if (mutationResultsBuilder_ == null) {
         ensureMutationResultsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, mutationResults_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, mutationResults_);
         onChanged();
       } else {
         mutationResultsBuilder_.addAllMessages(values);
@@ -738,6 +788,8 @@ public Builder addAllMutationResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -756,6 +808,8 @@ public Builder clearMutationResults() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -774,6 +828,8 @@ public Builder removeMutationResults(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -781,11 +837,12 @@ public Builder removeMutationResults(int index) {
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(
-        int index) {
+    public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(int index) {
       return getMutationResultsFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -793,14 +850,16 @@ public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(
-        int index) {
+    public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(int index) {
       if (mutationResultsBuilder_ == null) {
-        return mutationResults_.get(index);  } else {
+        return mutationResults_.get(index);
+      } else {
         return mutationResultsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -808,8 +867,8 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public java.util.List 
-         getMutationResultsOrBuilderList() {
+    public java.util.List
+        getMutationResultsOrBuilderList() {
       if (mutationResultsBuilder_ != null) {
         return mutationResultsBuilder_.getMessageOrBuilderList();
       } else {
@@ -817,6 +876,8 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
       }
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -825,10 +886,12 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
     public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder() {
-      return getMutationResultsFieldBuilder().addBuilder(
-          com.google.datastore.v1.MutationResult.getDefaultInstance());
+      return getMutationResultsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.MutationResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -836,12 +899,13 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
-        int index) {
-      return getMutationResultsFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.MutationResult.getDefaultInstance());
+    public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(int index) {
+      return getMutationResultsFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.MutationResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -849,16 +913,22 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public java.util.List 
-         getMutationResultsBuilderList() {
+    public java.util.List
+        getMutationResultsBuilderList() {
       return getMutationResultsFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder> 
+            com.google.datastore.v1.MutationResult,
+            com.google.datastore.v1.MutationResult.Builder,
+            com.google.datastore.v1.MutationResultOrBuilder>
         getMutationResultsFieldBuilder() {
       if (mutationResultsBuilder_ == null) {
-        mutationResultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder>(
+        mutationResultsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.MutationResult,
+                com.google.datastore.v1.MutationResult.Builder,
+                com.google.datastore.v1.MutationResultOrBuilder>(
                 mutationResults_,
                 ((bitField0_ & 0x00000001) == 0x00000001),
                 getParentForChildren(),
@@ -868,8 +938,10 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
       return mutationResultsBuilder_;
     }
 
-    private int indexUpdates_ ;
+    private int indexUpdates_;
     /**
+     *
+     *
      * 
      * The number of index entries updated during the commit, or zero if none were
      * updated.
@@ -881,6 +953,8 @@ public int getIndexUpdates() {
       return indexUpdates_;
     }
     /**
+     *
+     *
      * 
      * The number of index entries updated during the commit, or zero if none were
      * updated.
@@ -889,12 +963,14 @@ public int getIndexUpdates() {
      * int32 index_updates = 4;
      */
     public Builder setIndexUpdates(int value) {
-      
+
       indexUpdates_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The number of index entries updated during the commit, or zero if none were
      * updated.
@@ -903,14 +979,14 @@ public Builder setIndexUpdates(int value) {
      * int32 index_updates = 4;
      */
     public Builder clearIndexUpdates() {
-      
+
       indexUpdates_ = 0;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -920,12 +996,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.CommitResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.CommitResponse)
   private static final com.google.datastore.v1.CommitResponse DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.CommitResponse();
   }
@@ -934,16 +1010,16 @@ public static com.google.datastore.v1.CommitResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public CommitResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitResponse(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public CommitResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new CommitResponse(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -958,6 +1034,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 014a598a4823..3a4a5e37c826 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface CommitResponseOrBuilder extends
+public interface CommitResponseOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.CommitResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -15,9 +18,10 @@ public interface CommitResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  java.util.List 
-      getMutationResultsList();
+  java.util.List getMutationResultsList();
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -27,6 +31,8 @@ public interface CommitResponseOrBuilder extends
    */
   com.google.datastore.v1.MutationResult getMutationResults(int index);
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -36,6 +42,8 @@ public interface CommitResponseOrBuilder extends
    */
   int getMutationResultsCount();
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -43,9 +51,11 @@ public interface CommitResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  java.util.List 
+  java.util.List
       getMutationResultsOrBuilderList();
   /**
+   *
+   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -53,10 +63,11 @@ public interface CommitResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(
-      int index);
+  com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(int index);
 
   /**
+   *
+   *
    * 
    * The number of index entries updated during the commit, or zero if none were
    * updated.
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 6b1bd91e109f..54b712d3a9cc 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
@@ -4,31 +4,34 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A filter that merges multiple other filters using the given operator.
  * 

  *
  * Protobuf type {@code google.datastore.v1.CompositeFilter}
  */
-public  final class CompositeFilter extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class CompositeFilter extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CompositeFilter)
     CompositeFilterOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use CompositeFilter.newBuilder() to construct.
   private CompositeFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private CompositeFilter() {
     op_ = 0;
     filters_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private CompositeFilter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -48,35 +51,36 @@ private CompositeFilter(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
+          case 8:
+            {
+              int rawValue = input.readEnum();
 
-            op_ = rawValue;
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              filters_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
+              op_ = rawValue;
+              break;
             }
-            filters_.add(
-                input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry));
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                filters_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              filters_.add(
+                  input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
         filters_ = java.util.Collections.unmodifiableList(filters_);
@@ -85,29 +89,35 @@ private CompositeFilter(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_CompositeFilter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.CompositeFilter.class, com.google.datastore.v1.CompositeFilter.Builder.class);
+            com.google.datastore.v1.CompositeFilter.class,
+            com.google.datastore.v1.CompositeFilter.Builder.class);
   }
 
   /**
+   *
+   *
    * 
    * A composite filter operator.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.CompositeFilter.Operator}
    */
-  public enum Operator
-      implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -116,6 +126,8 @@ public enum Operator
      */
     OPERATOR_UNSPECIFIED(0),
     /**
+     *
+     *
      * 
      * The results are required to satisfy each of the combined filters.
      * 

@@ -127,6 +139,8 @@ public enum Operator
     ;
 
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -135,6 +149,8 @@ public enum Operator
      */
     public static final int OPERATOR_UNSPECIFIED_VALUE = 0;
     /**
+     *
+     *
      * 
      * The results are required to satisfy each of the combined filters.
      * 

@@ -143,7 +159,6 @@ public enum Operator
      */
     public static final int AND_VALUE = 1;
 
-
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -152,9 +167,7 @@ public final int getNumber() {
       return value;
     }
 
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static Operator valueOf(int value) {
       return forNumber(value);
@@ -162,44 +175,43 @@ public static Operator valueOf(int value) {
 
     public static Operator forNumber(int value) {
       switch (value) {
-        case 0: return OPERATOR_UNSPECIFIED;
-        case 1: return AND;
-        default: return null;
+        case 0:
+          return OPERATOR_UNSPECIFIED;
+        case 1:
+          return AND;
+        default:
+          return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
       return internalValueMap;
     }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Operator> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public Operator findValueByNumber(int number) {
-              return Operator.forNumber(number);
-            }
-          };
 
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public Operator findValueByNumber(int number) {
+            return Operator.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
       return com.google.datastore.v1.CompositeFilter.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Operator[] VALUES = values();
 
-    public static Operator valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Operator valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -220,6 +232,8 @@ private Operator(int value) {
   public static final int OP_FIELD_NUMBER = 1;
   private int op_;
   /**
+   *
+   *
    * 
    * The operator for combining multiple filters.
    * 

@@ -230,6 +244,8 @@ public int getOpValue() {
     return op_;
   }
   /**
+   *
+   *
    * 
    * The operator for combining multiple filters.
    * 

@@ -238,13 +254,16 @@ public int getOpValue() {
    */
   public com.google.datastore.v1.CompositeFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
+    com.google.datastore.v1.CompositeFilter.Operator result =
+        com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
     return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result;
   }
 
   public static final int FILTERS_FIELD_NUMBER = 2;
   private java.util.List filters_;
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -256,6 +275,8 @@ public java.util.List getFiltersList() {
     return filters_;
   }
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -263,11 +284,13 @@ public java.util.List getFiltersList() {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  public java.util.List 
+  public java.util.List
       getFiltersOrBuilderList() {
     return filters_;
   }
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -279,6 +302,8 @@ public int getFiltersCount() {
     return filters_.size();
   }
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -290,6 +315,8 @@ public com.google.datastore.v1.Filter getFilters(int index) {
     return filters_.get(index);
   }
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -297,12 +324,12 @@ public com.google.datastore.v1.Filter getFilters(int index) {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
-      int index) {
+  public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
     return filters_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -314,8 +341,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, op_);
     }
@@ -332,12 +358,10 @@ public int getSerializedSize() {
 
     size = 0;
     if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, op_);
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, op_);
     }
     for (int i = 0; i < filters_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, filters_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, filters_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -347,7 +371,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.CompositeFilter)) {
       return super.equals(obj);
@@ -356,8 +380,7 @@ public boolean equals(final java.lang.Object obj) {
 
     boolean result = true;
     result = result && op_ == other.op_;
-    result = result && getFiltersList()
-        .equals(other.getFiltersList());
+    result = result && getFiltersList().equals(other.getFiltersList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -380,118 +403,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.CompositeFilter parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.CompositeFilter parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.CompositeFilter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.CompositeFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A filter that merges multiple other filters using the given operator.
    * 

    *
    * Protobuf type {@code google.datastore.v1.CompositeFilter}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.CompositeFilter)
       com.google.datastore.v1.CompositeFilterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_CompositeFilter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.CompositeFilter.class, com.google.datastore.v1.CompositeFilter.Builder.class);
+              com.google.datastore.v1.CompositeFilter.class,
+              com.google.datastore.v1.CompositeFilter.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.CompositeFilter.newBuilder()
@@ -499,17 +531,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getFiltersFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -525,9 +557,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_CompositeFilter_descriptor;
     }
 
     @java.lang.Override
@@ -546,7 +578,8 @@ public com.google.datastore.v1.CompositeFilter build() {
 
     @java.lang.Override
     public com.google.datastore.v1.CompositeFilter buildPartial() {
-      com.google.datastore.v1.CompositeFilter result = new com.google.datastore.v1.CompositeFilter(this);
+      com.google.datastore.v1.CompositeFilter result =
+          new com.google.datastore.v1.CompositeFilter(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.op_ = op_;
@@ -568,38 +601,39 @@ public com.google.datastore.v1.CompositeFilter buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CompositeFilter) {
-        return mergeFrom((com.google.datastore.v1.CompositeFilter)other);
+        return mergeFrom((com.google.datastore.v1.CompositeFilter) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -629,9 +663,10 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
             filtersBuilder_ = null;
             filters_ = other.filters_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            filtersBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getFiltersFieldBuilder() : null;
+            filtersBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getFiltersFieldBuilder()
+                    : null;
           } else {
             filtersBuilder_.addAllMessages(other.filters_);
           }
@@ -665,10 +700,13 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private int op_ = 0;
     /**
+     *
+     *
      * 
      * The operator for combining multiple filters.
      * 

@@ -679,6 +717,8 @@ public int getOpValue() {
       return op_;
     }
     /**
+     *
+     *
      * 
      * The operator for combining multiple filters.
      * 

@@ -691,6 +731,8 @@ public Builder setOpValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The operator for combining multiple filters.
      * 

@@ -699,10 +741,15 @@ public Builder setOpValue(int value) {
      */
     public com.google.datastore.v1.CompositeFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
-      return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result;
+      com.google.datastore.v1.CompositeFilter.Operator result =
+          com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
+      return result == null
+          ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED
+          : result;
     }
     /**
+     *
+     *
      * 
      * The operator for combining multiple filters.
      * 

@@ -713,12 +760,14 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      
+
       op_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The operator for combining multiple filters.
      * 

@@ -726,25 +775,31 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
      */
     public Builder clearOp() {
-      
+
       op_ = 0;
       onChanged();
       return this;
     }
 
     private java.util.List filters_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureFiltersIsMutable() {
       if (!((bitField0_ & 0x00000002) == 0x00000002)) {
         filters_ = new java.util.ArrayList(filters_);
         bitField0_ |= 0x00000002;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> filtersBuilder_;
+            com.google.datastore.v1.Filter,
+            com.google.datastore.v1.Filter.Builder,
+            com.google.datastore.v1.FilterOrBuilder>
+        filtersBuilder_;
 
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -760,6 +815,8 @@ public java.util.List getFiltersList() {
       }
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -775,6 +832,8 @@ public int getFiltersCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -790,6 +849,8 @@ public com.google.datastore.v1.Filter getFilters(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -797,8 +858,7 @@ public com.google.datastore.v1.Filter getFilters(int index) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder setFilters(
-        int index, com.google.datastore.v1.Filter value) {
+    public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
       if (filtersBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -812,6 +872,8 @@ public Builder setFilters(
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -819,8 +881,7 @@ public Builder setFilters(
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder setFilters(
-        int index, com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
         filters_.set(index, builderForValue.build());
@@ -831,6 +892,8 @@ public Builder setFilters(
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -852,6 +915,8 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -859,8 +924,7 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder addFilters(
-        int index, com.google.datastore.v1.Filter value) {
+    public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
       if (filtersBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -874,6 +938,8 @@ public Builder addFilters(
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -881,8 +947,7 @@ public Builder addFilters(
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder addFilters(
-        com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
         filters_.add(builderForValue.build());
@@ -893,6 +958,8 @@ public Builder addFilters(
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -900,8 +967,7 @@ public Builder addFilters(
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder addFilters(
-        int index, com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
         filters_.add(index, builderForValue.build());
@@ -912,6 +978,8 @@ public Builder addFilters(
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -923,8 +991,7 @@ public Builder addAllFilters(
         java.lang.Iterable values) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, filters_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, filters_);
         onChanged();
       } else {
         filtersBuilder_.addAllMessages(values);
@@ -932,6 +999,8 @@ public Builder addAllFilters(
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -950,6 +1019,8 @@ public Builder clearFilters() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -968,6 +1039,8 @@ public Builder removeFilters(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -975,11 +1048,12 @@ public Builder removeFilters(int index) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public com.google.datastore.v1.Filter.Builder getFiltersBuilder(
-        int index) {
+    public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) {
       return getFiltersFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -987,14 +1061,16 @@ public com.google.datastore.v1.Filter.Builder getFiltersBuilder(
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
-        int index) {
+    public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
       if (filtersBuilder_ == null) {
-        return filters_.get(index);  } else {
+        return filters_.get(index);
+      } else {
         return filtersBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1002,8 +1078,8 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public java.util.List 
-         getFiltersOrBuilderList() {
+    public java.util.List
+        getFiltersOrBuilderList() {
       if (filtersBuilder_ != null) {
         return filtersBuilder_.getMessageOrBuilderList();
       } else {
@@ -1011,6 +1087,8 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1019,10 +1097,12 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
      * repeated .google.datastore.v1.Filter filters = 2;
      */
     public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
-      return getFiltersFieldBuilder().addBuilder(
-          com.google.datastore.v1.Filter.getDefaultInstance());
+      return getFiltersFieldBuilder()
+          .addBuilder(com.google.datastore.v1.Filter.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1030,12 +1110,13 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public com.google.datastore.v1.Filter.Builder addFiltersBuilder(
-        int index) {
-      return getFiltersFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Filter.getDefaultInstance());
+    public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) {
+      return getFiltersFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Filter.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1043,16 +1124,21 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public java.util.List 
-         getFiltersBuilderList() {
+    public java.util.List getFiltersBuilderList() {
       return getFiltersFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> 
+            com.google.datastore.v1.Filter,
+            com.google.datastore.v1.Filter.Builder,
+            com.google.datastore.v1.FilterOrBuilder>
         getFiltersFieldBuilder() {
       if (filtersBuilder_ == null) {
-        filtersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder>(
+        filtersBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Filter,
+                com.google.datastore.v1.Filter.Builder,
+                com.google.datastore.v1.FilterOrBuilder>(
                 filters_,
                 ((bitField0_ & 0x00000002) == 0x00000002),
                 getParentForChildren(),
@@ -1061,9 +1147,9 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(
       }
       return filtersBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1073,12 +1159,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.CompositeFilter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.CompositeFilter)
   private static final com.google.datastore.v1.CompositeFilter DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.CompositeFilter();
   }
@@ -1087,16 +1173,16 @@ public static com.google.datastore.v1.CompositeFilter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public CompositeFilter parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CompositeFilter(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public CompositeFilter parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new CompositeFilter(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1111,6 +1197,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 d3642bcdb223..5b348d6f78c6 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface CompositeFilterOrBuilder extends
+public interface CompositeFilterOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.CompositeFilter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The operator for combining multiple filters.
    * 

@@ -16,6 +19,8 @@ public interface CompositeFilterOrBuilder extends
    */
   int getOpValue();
   /**
+   *
+   *
    * 
    * The operator for combining multiple filters.
    * 

@@ -25,6 +30,8 @@ public interface CompositeFilterOrBuilder extends
   com.google.datastore.v1.CompositeFilter.Operator getOp();
 
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -32,9 +39,10 @@ public interface CompositeFilterOrBuilder extends
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  java.util.List 
-      getFiltersList();
+  java.util.List getFiltersList();
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -44,6 +52,8 @@ public interface CompositeFilterOrBuilder extends
    */
   com.google.datastore.v1.Filter getFilters(int index);
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -53,6 +63,8 @@ public interface CompositeFilterOrBuilder extends
    */
   int getFiltersCount();
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -60,9 +72,10 @@ public interface CompositeFilterOrBuilder extends
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  java.util.List 
-      getFiltersOrBuilderList();
+  java.util.List getFiltersOrBuilderList();
   /**
+   *
+   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -70,6 +83,5 @@ public interface CompositeFilterOrBuilder extends
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
-      int index);
+  com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index);
 }
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 0ef9ef973d45..89c02a5e2224 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
@@ -5,358 +5,377 @@
 
 public final class DatastoreProto {
   private DatastoreProto() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
 
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
   }
+
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_LookupRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_LookupRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_LookupResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_LookupResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_RunQueryRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_RunQueryResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_RollbackRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_RollbackRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_RollbackResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_RollbackResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_CommitRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_CommitRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_CommitResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_CommitResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Mutation_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Mutation_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Mutation_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_MutationResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_MutationResult_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_MutationResult_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_ReadOptions_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ReadOptions_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_TransactionOptions_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_TransactionOptions_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
   }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
   static {
     java.lang.String[] descriptorData = {
-      "\n#google/datastore/v1/datastore.proto\022\023g" +
-      "oogle.datastore.v1\032\034google/api/annotatio" +
-      "ns.proto\032 google/datastore/v1/entity.pro" +
-      "to\032\037google/datastore/v1/query.proto\"\203\001\n\r" +
-      "LookupRequest\022\022\n\nproject_id\030\010 \001(\t\0226\n\014rea" +
-      "d_options\030\001 \001(\0132 .google.datastore.v1.Re" +
-      "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" +
-      "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " +
-      "\003(\0132!.google.datastore.v1.EntityResult\0222" +
-      "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" +
-      "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" +
-      "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" +
-      "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" +
-      "oogle.datastore.v1.PartitionId\0226\n\014read_o" +
-      "ptions\030\001 \001(\0132 .google.datastore.v1.ReadO" +
-      "ptions\022+\n\005query\030\003 \001(\0132\032.google.datastore" +
-      ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." +
-      "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" +
-      "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" +
-      "e.datastore.v1.QueryResultBatch\022)\n\005query" +
-      "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" +
-      "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" +
-      "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." +
-      "datastore.v1.TransactionOptions\"/\n\030Begin" +
-      "TransactionResponse\022\023\n\013transaction\030\001 \001(\014" +
-      "\":\n\017RollbackRequest\022\022\n\nproject_id\030\010 \001(\t\022" +
-      "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" +
-      "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" +
-      "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" +
-      "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" +
-      "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" +
-      "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" +
-      "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" +
-      "\n\024transaction_selector\"f\n\016CommitResponse" +
-      "\022=\n\020mutation_results\030\003 \003(\0132#.google.data" +
-      "store.v1.MutationResult\022\025\n\rindex_updates" +
-      "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" +
-      "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" +
-      "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" +
-      "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" +
-      "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" +
-      "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" +
-      "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" +
-      "Mutation\022-\n\006insert\030\004 \001(\0132\033.google.datast" +
-      "ore.v1.EntityH\000\022-\n\006update\030\005 \001(\0132\033.google" +
-      ".datastore.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033" +
-      ".google.datastore.v1.EntityH\000\022*\n\006delete\030" +
-      "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" +
-      "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" +
-      "ct_detection_strategy\"c\n\016MutationResult\022" +
-      "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" +
-      "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" +
-      "(\010\"\325\001\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\"" +
-      "M\n\017ReadConsistency\022 \n\034READ_CONSISTENCY_U" +
-      "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" +
-      "\n\020consistency_type\"\343\001\n\022TransactionOption" +
-      "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" +
-      ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" +
-      "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" +
-      "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" +
-      "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" +
-      "B\006\n\004mode2\354\007\n\tDatastore\022~\n\006Lookup\022\".googl" +
-      "e.datastore.v1.LookupRequest\032#.google.da" +
-      "tastore.v1.LookupResponse\"+\202\323\344\223\002%\" /v1/p" +
-      "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" +
-      "ery\022$.google.datastore.v1.RunQueryReques" +
-      "t\032%.google.datastore.v1.RunQueryResponse" +
-      "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" +
-      "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" +
-      "tastore.v1.BeginTransactionRequest\032-.goo" +
-      "gle.datastore.v1.BeginTransactionRespons" +
-      "e\"5\202\323\344\223\002/\"*/v1/projects/{project_id}:beg" +
-      "inTransaction:\001*\022~\n\006Commit\022\".google.data" +
-      "store.v1.CommitRequest\032#.google.datastor" +
-      "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" +
-      "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." +
-      "google.datastore.v1.RollbackRequest\032%.go" +
-      "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" +
-      "\002\'\"\"/v1/projects/{project_id}:rollback:\001" +
-      "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." +
-      "AllocateIdsRequest\032(.google.datastore.v1" +
-      ".AllocateIdsResponse\"0\202\323\344\223\002*\"%/v1/projec" +
-      "ts/{project_id}:allocateIds:\001*\022\216\001\n\nReser" +
-      "veIds\022&.google.datastore.v1.ReserveIdsRe" +
-      "quest\032\'.google.datastore.v1.ReserveIdsRe" +
-      "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" +
-      "}:reserveIds:\001*B\241\001\n\027com.google.datastore" +
-      ".v1B\016DatastoreProtoP\001Z
  * A Datastore data object.
  * An entity is limited to 1 megabyte when stored. That _roughly_
@@ -13,23 +15,23 @@
  *
  * Protobuf type {@code google.datastore.v1.Entity}
  */
-public  final class Entity extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class Entity extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Entity)
     EntityOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use Entity.newBuilder() to construct.
   private Entity(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private Entity() {
-  }
+
+  private Entity() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private Entity(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -49,72 +51,76 @@ private Entity(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.Key.Builder subBuilder = null;
-            if (key_ != null) {
-              subBuilder = key_.toBuilder();
-            }
-            key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(key_);
-              key_ = subBuilder.buildPartial();
-            }
+          case 10:
+            {
+              com.google.datastore.v1.Key.Builder subBuilder = null;
+              if (key_ != null) {
+                subBuilder = key_.toBuilder();
+              }
+              key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(key_);
+                key_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              properties_ = com.google.protobuf.MapField.newMapField(
-                  PropertiesDefaultEntryHolder.defaultEntry);
-              mutable_bitField0_ |= 0x00000002;
+              break;
             }
-            com.google.protobuf.MapEntry
-            properties__ = input.readMessage(
-                PropertiesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-            properties_.getMutableMap().put(
-                properties__.getKey(), properties__.getValue());
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                properties_ =
+                    com.google.protobuf.MapField.newMapField(
+                        PropertiesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry
+                  properties__ =
+                      input.readMessage(
+                          PropertiesDefaultEntryHolder.defaultEntry.getParserForType(),
+                          extensionRegistry);
+              properties_.getMutableMap().put(properties__.getKey(), properties__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_Entity_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 3:
         return internalGetProperties();
       default:
-        throw new RuntimeException(
-            "Invalid map field number: " + number);
+        throw new RuntimeException("Invalid map field number: " + number);
     }
   }
+
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_Entity_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class);
   }
@@ -123,6 +129,8 @@ protected com.google.protobuf.MapField internalGetMapField(
   public static final int KEY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Key key_;
   /**
+   *
+   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -137,6 +145,8 @@ public boolean hasKey() {
     return key_ != null;
   }
   /**
+   *
+   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -151,6 +161,8 @@ public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
   /**
+   *
+   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -166,24 +178,26 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
   }
 
   public static final int PROPERTIES_FIELD_NUMBER = 3;
+
   private static final class PropertiesDefaultEntryHolder {
-    static final com.google.protobuf.MapEntry<
-        java.lang.String, com.google.datastore.v1.Value> defaultEntry =
+    static final com.google.protobuf.MapEntry
+        defaultEntry =
             com.google.protobuf.MapEntry
-            .newDefaultInstance(
-                com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor, 
-                com.google.protobuf.WireFormat.FieldType.STRING,
-                "",
-                com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                com.google.datastore.v1.Value.getDefaultInstance());
+                .newDefaultInstance(
+                    com.google.datastore.v1.EntityProto
+                        .internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor,
+                    com.google.protobuf.WireFormat.FieldType.STRING,
+                    "",
+                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                    com.google.datastore.v1.Value.getDefaultInstance());
   }
-  private com.google.protobuf.MapField<
-      java.lang.String, com.google.datastore.v1.Value> properties_;
+
+  private com.google.protobuf.MapField properties_;
+
   private com.google.protobuf.MapField
-  internalGetProperties() {
+      internalGetProperties() {
     if (properties_ == null) {
-      return com.google.protobuf.MapField.emptyMapField(
-          PropertiesDefaultEntryHolder.defaultEntry);
+      return com.google.protobuf.MapField.emptyMapField(PropertiesDefaultEntryHolder.defaultEntry);
     }
     return properties_;
   }
@@ -192,6 +206,8 @@ public int getPropertiesCount() {
     return internalGetProperties().getMap().size();
   }
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -203,20 +219,20 @@ public int getPropertiesCount() {
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-
-  public boolean containsProperties(
-      java.lang.String key) {
-    if (key == null) { throw new java.lang.NullPointerException(); }
+  public boolean containsProperties(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
     return internalGetProperties().getMap().containsKey(key);
   }
-  /**
-   * Use {@link #getPropertiesMap()} instead.
-   */
+  /** Use {@link #getPropertiesMap()} instead. */
   @java.lang.Deprecated
   public java.util.Map getProperties() {
     return getPropertiesMap();
   }
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -228,11 +244,12 @@ public java.util.Map getPropert
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-
   public java.util.Map getPropertiesMap() {
     return internalGetProperties().getMap();
   }
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -244,16 +261,18 @@ public java.util.Map getPropert
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-
   public com.google.datastore.v1.Value getPropertiesOrDefault(
-      java.lang.String key,
-      com.google.datastore.v1.Value defaultValue) {
-    if (key == null) { throw new java.lang.NullPointerException(); }
+      java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
     java.util.Map map =
         internalGetProperties().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -265,10 +284,10 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-
-  public com.google.datastore.v1.Value getPropertiesOrThrow(
-      java.lang.String key) {
-    if (key == null) { throw new java.lang.NullPointerException(); }
+  public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
     java.util.Map map =
         internalGetProperties().getMap();
     if (!map.containsKey(key)) {
@@ -278,6 +297,7 @@ public com.google.datastore.v1.Value getPropertiesOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -289,17 +309,12 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (key_ != null) {
       output.writeMessage(1, getKey());
     }
-    com.google.protobuf.GeneratedMessageV3
-      .serializeStringMapTo(
-        output,
-        internalGetProperties(),
-        PropertiesDefaultEntryHolder.defaultEntry,
-        3);
+    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+        output, internalGetProperties(), PropertiesDefaultEntryHolder.defaultEntry, 3);
     unknownFields.writeTo(output);
   }
 
@@ -310,18 +325,17 @@ public int getSerializedSize() {
 
     size = 0;
     if (key_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getKey());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getKey());
     }
-    for (java.util.Map.Entry entry
-         : internalGetProperties().getMap().entrySet()) {
-      com.google.protobuf.MapEntry
-      properties__ = PropertiesDefaultEntryHolder.defaultEntry.newBuilderForType()
-          .setKey(entry.getKey())
-          .setValue(entry.getValue())
-          .build();
-      size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, properties__);
+    for (java.util.Map.Entry entry :
+        internalGetProperties().getMap().entrySet()) {
+      com.google.protobuf.MapEntry properties__ =
+          PropertiesDefaultEntryHolder.defaultEntry
+              .newBuilderForType()
+              .setKey(entry.getKey())
+              .setValue(entry.getValue())
+              .build();
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, properties__);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -331,7 +345,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Entity)) {
       return super.equals(obj);
@@ -341,11 +355,9 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasKey() == other.hasKey());
     if (hasKey()) {
-      result = result && getKey()
-          .equals(other.getKey());
+      result = result && getKey().equals(other.getKey());
     }
-    result = result && internalGetProperties().equals(
-        other.internalGetProperties());
+    result = result && internalGetProperties().equals(other.internalGetProperties());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -370,97 +382,103 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Entity parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Entity parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Entity parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.Entity parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.Entity parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Entity parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Entity parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Entity parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Entity parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Entity parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Entity parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Entity parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.Entity parseFrom(
-      com.google.protobuf.CodedInputStream input)
+
+  public static com.google.datastore.v1.Entity parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Entity parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.Entity prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A Datastore data object.
    * An entity is limited to 1 megabyte when stored. That _roughly_
@@ -470,41 +488,40 @@ protected Builder newBuilderForType(
    *
    * Protobuf type {@code google.datastore.v1.Entity}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Entity)
       com.google.datastore.v1.EntityOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Entity_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 3:
           return internalGetProperties();
         default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
+          throw new RuntimeException("Invalid map field number: " + number);
       }
     }
+
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 3:
           return internalGetMutableProperties();
         default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
+          throw new RuntimeException("Invalid map field number: " + number);
       }
     }
+
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Entity_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class);
     }
@@ -514,16 +531,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -538,9 +554,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Entity_descriptor;
     }
 
     @java.lang.Override
@@ -578,38 +594,39 @@ public com.google.datastore.v1.Entity buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Entity) {
-        return mergeFrom((com.google.datastore.v1.Entity)other);
+        return mergeFrom((com.google.datastore.v1.Entity) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -621,8 +638,7 @@ public Builder mergeFrom(com.google.datastore.v1.Entity other) {
       if (other.hasKey()) {
         mergeKey(other.getKey());
       }
-      internalGetMutableProperties().mergeFrom(
-          other.internalGetProperties());
+      internalGetMutableProperties().mergeFrom(other.internalGetProperties());
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -651,12 +667,18 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private com.google.datastore.v1.Key key_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        keyBuilder_;
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -671,6 +693,8 @@ public boolean hasKey() {
       return keyBuilder_ != null || key_ != null;
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -689,6 +713,8 @@ public com.google.datastore.v1.Key getKey() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -713,6 +739,8 @@ public Builder setKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -723,8 +751,7 @@ public Builder setKey(com.google.datastore.v1.Key value) {
      *
      * .google.datastore.v1.Key key = 1;
      */
-    public Builder setKey(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyBuilder_ == null) {
         key_ = builderForValue.build();
         onChanged();
@@ -735,6 +762,8 @@ public Builder setKey(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -748,8 +777,7 @@ public Builder setKey(
     public Builder mergeKey(com.google.datastore.v1.Key value) {
       if (keyBuilder_ == null) {
         if (key_ != null) {
-          key_ =
-            com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
+          key_ = com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
         } else {
           key_ = value;
         }
@@ -761,6 +789,8 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -783,6 +813,8 @@ public Builder clearKey() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -794,11 +826,13 @@ public Builder clearKey() {
      * .google.datastore.v1.Key key = 1;
      */
     public com.google.datastore.v1.Key.Builder getKeyBuilder() {
-      
+
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -813,11 +847,12 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
       if (keyBuilder_ != null) {
         return keyBuilder_.getMessageOrBuilder();
       } else {
-        return key_ == null ?
-            com.google.datastore.v1.Key.getDefaultInstance() : key_;
+        return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
       }
     }
     /**
+     *
+     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -829,35 +864,40 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
      * .google.datastore.v1.Key key = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getKeyFieldBuilder() {
       if (keyBuilder_ == null) {
-        keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
-                getKey(),
-                getParentForChildren(),
-                isClean());
+        keyBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(getKey(), getParentForChildren(), isClean());
         key_ = null;
       }
       return keyBuilder_;
     }
 
-    private com.google.protobuf.MapField<
-        java.lang.String, com.google.datastore.v1.Value> properties_;
     private com.google.protobuf.MapField
-    internalGetProperties() {
+        properties_;
+
+    private com.google.protobuf.MapField
+        internalGetProperties() {
       if (properties_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             PropertiesDefaultEntryHolder.defaultEntry);
       }
       return properties_;
     }
+
     private com.google.protobuf.MapField
-    internalGetMutableProperties() {
-      onChanged();;
+        internalGetMutableProperties() {
+      onChanged();
+      ;
       if (properties_ == null) {
-        properties_ = com.google.protobuf.MapField.newMapField(
-            PropertiesDefaultEntryHolder.defaultEntry);
+        properties_ =
+            com.google.protobuf.MapField.newMapField(PropertiesDefaultEntryHolder.defaultEntry);
       }
       if (!properties_.isMutable()) {
         properties_ = properties_.copy();
@@ -869,6 +909,8 @@ public int getPropertiesCount() {
       return internalGetProperties().getMap().size();
     }
     /**
+     *
+     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -880,20 +922,20 @@ public int getPropertiesCount() {
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-
-    public boolean containsProperties(
-        java.lang.String key) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
+    public boolean containsProperties(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
       return internalGetProperties().getMap().containsKey(key);
     }
-    /**
-     * Use {@link #getPropertiesMap()} instead.
-     */
+    /** Use {@link #getPropertiesMap()} instead. */
     @java.lang.Deprecated
     public java.util.Map getProperties() {
       return getPropertiesMap();
     }
     /**
+     *
+     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -905,11 +947,12 @@ public java.util.Map getPropert
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-
     public java.util.Map getPropertiesMap() {
       return internalGetProperties().getMap();
     }
     /**
+     *
+     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -921,16 +964,18 @@ public java.util.Map getPropert
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-
     public com.google.datastore.v1.Value getPropertiesOrDefault(
-        java.lang.String key,
-        com.google.datastore.v1.Value defaultValue) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
+        java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
       java.util.Map map =
           internalGetProperties().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
+     *
+     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -942,10 +987,10 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-
-    public com.google.datastore.v1.Value getPropertiesOrThrow(
-        java.lang.String key) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
+    public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
       java.util.Map map =
           internalGetProperties().getMap();
       if (!map.containsKey(key)) {
@@ -955,11 +1000,12 @@ public com.google.datastore.v1.Value getPropertiesOrThrow(
     }
 
     public Builder clearProperties() {
-      internalGetMutableProperties().getMutableMap()
-          .clear();
+      internalGetMutableProperties().getMutableMap().clear();
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -971,23 +1017,21 @@ public Builder clearProperties() {
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-
-    public Builder removeProperties(
-        java.lang.String key) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
-      internalGetMutableProperties().getMutableMap()
-          .remove(key);
+    public Builder removeProperties(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableProperties().getMutableMap().remove(key);
       return this;
     }
-    /**
-     * Use alternate mutation accessors instead.
-     */
+    /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
-    public java.util.Map
-    getMutableProperties() {
+    public java.util.Map getMutableProperties() {
       return internalGetMutableProperties().getMutableMap();
     }
     /**
+     *
+     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -999,16 +1043,19 @@ public Builder removeProperties(
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-    public Builder putProperties(
-        java.lang.String key,
-        com.google.datastore.v1.Value value) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
-      if (value == null) { throw new java.lang.NullPointerException(); }
-      internalGetMutableProperties().getMutableMap()
-          .put(key, value);
+    public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value value) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      if (value == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableProperties().getMutableMap().put(key, value);
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -1020,16 +1067,14 @@ public Builder putProperties(
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-
     public Builder putAllProperties(
         java.util.Map values) {
-      internalGetMutableProperties().getMutableMap()
-          .putAll(values);
+      internalGetMutableProperties().getMutableMap().putAll(values);
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1039,12 +1084,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Entity)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Entity)
   private static final com.google.datastore.v1.Entity DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Entity();
   }
@@ -1053,16 +1098,16 @@ public static com.google.datastore.v1.Entity getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public Entity parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Entity parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Entity(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1077,6 +1122,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 131d3e01f815..731826b603fc 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface EntityOrBuilder extends
+public interface EntityOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Entity)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -20,6 +23,8 @@ public interface EntityOrBuilder extends
    */
   boolean hasKey();
   /**
+   *
+   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -32,6 +37,8 @@ public interface EntityOrBuilder extends
    */
   com.google.datastore.v1.Key getKey();
   /**
+   *
+   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -45,6 +52,8 @@ public interface EntityOrBuilder extends
   com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder();
 
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -58,6 +67,8 @@ public interface EntityOrBuilder extends
    */
   int getPropertiesCount();
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -69,15 +80,13 @@ public interface EntityOrBuilder extends
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-  boolean containsProperties(
-      java.lang.String key);
-  /**
-   * Use {@link #getPropertiesMap()} instead.
-   */
+  boolean containsProperties(java.lang.String key);
+  /** Use {@link #getPropertiesMap()} instead. */
   @java.lang.Deprecated
-  java.util.Map
-  getProperties();
+  java.util.Map getProperties();
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -89,9 +98,10 @@ boolean containsProperties(
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-  java.util.Map
-  getPropertiesMap();
+  java.util.Map getPropertiesMap();
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -103,11 +113,11 @@ boolean containsProperties(
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-
   com.google.datastore.v1.Value getPropertiesOrDefault(
-      java.lang.String key,
-      com.google.datastore.v1.Value defaultValue);
+      java.lang.String key, com.google.datastore.v1.Value defaultValue);
   /**
+   *
+   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -119,7 +129,5 @@ com.google.datastore.v1.Value getPropertiesOrDefault(
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-
-  com.google.datastore.v1.Value getPropertiesOrThrow(
-      java.lang.String key);
+  com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 880839ab0087..d2cf275e0d13 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -5,152 +5,169 @@
 
 public final class EntityProto {
   private EntityProto() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
 
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
   }
+
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_PartitionId_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_PartitionId_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PartitionId_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Key_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Key_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Key_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Key_PathElement_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Key_PathElement_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_ArrayValue_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ArrayValue_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Value_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Value_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Value_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Entity_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Entity_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Entity_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Entity_PropertiesEntry_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
   }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
   static {
     java.lang.String[] descriptorData = {
-      "\n google/datastore/v1/entity.proto\022\023goog" +
-      "le.datastore.v1\032\034google/api/annotations." +
-      "proto\032\034google/protobuf/struct.proto\032\037goo" +
-      "gle/protobuf/timestamp.proto\032\030google/typ" +
-      "e/latlng.proto\"7\n\013PartitionId\022\022\n\nproject" +
-      "_id\030\002 \001(\t\022\024\n\014namespace_id\030\004 \001(\t\"\267\001\n\003Key\022" +
-      "6\n\014partition_id\030\001 \001(\0132 .google.datastore" +
-      ".v1.PartitionId\0222\n\004path\030\002 \003(\0132$.google.d" +
-      "atastore.v1.Key.PathElement\032D\n\013PathEleme" +
-      "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003" +
-      " \001(\tH\000B\t\n\007id_type\"8\n\nArrayValue\022*\n\006value" +
-      "s\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n\005" +
-      "Value\0220\n\nnull_value\030\013 \001(\0162\032.google.proto" +
-      "buf.NullValueH\000\022\027\n\rboolean_value\030\001 \001(\010H\000" +
-      "\022\027\n\rinteger_value\030\002 \001(\003H\000\022\026\n\014double_valu" +
-      "e\030\003 \001(\001H\000\0225\n\017timestamp_value\030\n \001(\0132\032.goo" +
-      "gle.protobuf.TimestampH\000\022-\n\tkey_value\030\005 " +
-      "\001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014strin" +
-      "g_value\030\021 \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n" +
-      "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat" +
-      "LngH\000\0223\n\014entity_value\030\006 \001(\0132\033.google.dat" +
-      "astore.v1.EntityH\000\0226\n\013array_value\030\t \001(\0132" +
-      "\037.google.datastore.v1.ArrayValueH\000\022\017\n\007me" +
-      "aning\030\016 \001(\005\022\034\n\024exclude_from_indexes\030\023 \001(" +
-      "\010B\014\n\nvalue_type\"\277\001\n\006Entity\022%\n\003key\030\001 \001(\0132" +
-      "\030.google.datastore.v1.Key\022?\n\nproperties\030" +
-      "\003 \003(\0132+.google.datastore.v1.Entity.Prope" +
-      "rtiesEntry\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001" +
-      "(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore.v1." +
-      "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E" +
-      "ntityProtoP\001Z
  * The result of fetching an entity from Datastore.
  * 

  *
  * Protobuf type {@code google.datastore.v1.EntityResult}
  */
-public  final class EntityResult extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class EntityResult extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.EntityResult)
     EntityResultOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use EntityResult.newBuilder() to construct.
   private EntityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private EntityResult() {
     version_ = 0L;
     cursor_ = com.google.protobuf.ByteString.EMPTY;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private EntityResult(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -48,62 +51,68 @@ private EntityResult(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.Entity.Builder subBuilder = null;
-            if (entity_ != null) {
-              subBuilder = entity_.toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.Entity.Builder subBuilder = null;
+              if (entity_ != null) {
+                subBuilder = entity_.toBuilder();
+              }
+              entity_ =
+                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(entity_);
+                entity_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            entity_ = input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(entity_);
-              entity_ = subBuilder.buildPartial();
+          case 26:
+            {
+              cursor_ = input.readBytes();
+              break;
             }
-
-            break;
-          }
-          case 26: {
-
-            cursor_ = input.readBytes();
-            break;
-          }
-          case 32: {
-
-            version_ = input.readInt64();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 32:
+            {
+              version_ = input.readInt64();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_EntityResult_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.EntityResult.class, com.google.datastore.v1.EntityResult.Builder.class);
+            com.google.datastore.v1.EntityResult.class,
+            com.google.datastore.v1.EntityResult.Builder.class);
   }
 
   /**
+   *
+   *
    * 
    * Specifies what data the 'entity' field contains.
    * A `ResultType` is either implied (for example, in `LookupResponse.missing`
@@ -114,9 +123,10 @@ private EntityResult(
    *
    * Protobuf enum {@code google.datastore.v1.EntityResult.ResultType}
    */
-  public enum ResultType
-      implements com.google.protobuf.ProtocolMessageEnum {
+  public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
     /**
+     *
+     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -125,6 +135,8 @@ public enum ResultType
      */
     RESULT_TYPE_UNSPECIFIED(0),
     /**
+     *
+     *
      * 
      * The key and properties.
      * 

@@ -133,6 +145,8 @@ public enum ResultType
      */
     FULL(1),
     /**
+     *
+     *
      * 
      * A projected subset of properties. The entity may have no key.
      * 

@@ -141,6 +155,8 @@ public enum ResultType
      */
     PROJECTION(2),
     /**
+     *
+     *
      * 
      * Only the key.
      * 

@@ -152,6 +168,8 @@ public enum ResultType
     ;
 
     /**
+     *
+     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -160,6 +178,8 @@ public enum ResultType
      */
     public static final int RESULT_TYPE_UNSPECIFIED_VALUE = 0;
     /**
+     *
+     *
      * 
      * The key and properties.
      * 

@@ -168,6 +188,8 @@ public enum ResultType
      */
     public static final int FULL_VALUE = 1;
     /**
+     *
+     *
      * 
      * A projected subset of properties. The entity may have no key.
      * 

@@ -176,6 +198,8 @@ public enum ResultType
      */
     public static final int PROJECTION_VALUE = 2;
     /**
+     *
+     *
      * 
      * Only the key.
      * 

@@ -184,7 +208,6 @@ public enum ResultType
      */
     public static final int KEY_ONLY_VALUE = 3;
 
-
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -193,9 +216,7 @@ public final int getNumber() {
       return value;
     }
 
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static ResultType valueOf(int value) {
       return forNumber(value);
@@ -203,46 +224,47 @@ public static ResultType valueOf(int value) {
 
     public static ResultType forNumber(int value) {
       switch (value) {
-        case 0: return RESULT_TYPE_UNSPECIFIED;
-        case 1: return FULL;
-        case 2: return PROJECTION;
-        case 3: return KEY_ONLY;
-        default: return null;
+        case 0:
+          return RESULT_TYPE_UNSPECIFIED;
+        case 1:
+          return FULL;
+        case 2:
+          return PROJECTION;
+        case 3:
+          return KEY_ONLY;
+        default:
+          return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
       return internalValueMap;
     }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        ResultType> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public ResultType findValueByNumber(int number) {
-              return ResultType.forNumber(number);
-            }
-          };
 
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public ResultType findValueByNumber(int number) {
+            return ResultType.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
       return com.google.datastore.v1.EntityResult.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final ResultType[] VALUES = values();
 
-    public static ResultType valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static ResultType valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -262,6 +284,8 @@ private ResultType(int value) {
   public static final int ENTITY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Entity entity_;
   /**
+   *
+   *
    * 
    * The resulting entity.
    * 

@@ -272,6 +296,8 @@ public boolean hasEntity() {
     return entity_ != null;
   }
   /**
+   *
+   *
    * 
    * The resulting entity.
    * 

@@ -282,6 +308,8 @@ public com.google.datastore.v1.Entity getEntity() {
     return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
   }
   /**
+   *
+   *
    * 
    * The resulting entity.
    * 

@@ -295,6 +323,8 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
   public static final int VERSION_FIELD_NUMBER = 4;
   private long version_;
   /**
+   *
+   *
    * 
    * The version of the entity, a strictly positive number that monotonically
    * increases with changes to the entity.
@@ -314,6 +344,8 @@ public long getVersion() {
   public static final int CURSOR_FIELD_NUMBER = 3;
   private com.google.protobuf.ByteString cursor_;
   /**
+   *
+   *
    * 
    * A cursor that points to the position after the result entity.
    * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
@@ -326,6 +358,7 @@ public com.google.protobuf.ByteString getCursor() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -337,8 +370,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (entity_ != null) {
       output.writeMessage(1, getEntity());
     }
@@ -358,16 +390,13 @@ public int getSerializedSize() {
 
     size = 0;
     if (entity_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getEntity());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getEntity());
     }
     if (!cursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(3, cursor_);
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(3, cursor_);
     }
     if (version_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(4, version_);
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, version_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -377,7 +406,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.EntityResult)) {
       return super.equals(obj);
@@ -387,13 +416,10 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasEntity() == other.hasEntity());
     if (hasEntity()) {
-      result = result && getEntity()
-          .equals(other.getEntity());
+      result = result && getEntity().equals(other.getEntity());
     }
-    result = result && (getVersion()
-        == other.getVersion());
-    result = result && getCursor()
-        .equals(other.getCursor());
+    result = result && (getVersion() == other.getVersion());
+    result = result && getCursor().equals(other.getCursor());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -410,8 +436,7 @@ public int hashCode() {
       hash = (53 * hash) + getEntity().hashCode();
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getVersion());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
     hash = (37 * hash) + CURSOR_FIELD_NUMBER;
     hash = (53 * hash) + getCursor().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -419,118 +444,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.EntityResult parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.EntityResult parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.EntityResult parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.EntityResult parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.EntityResult parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.EntityResult parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.EntityResult parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.EntityResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The result of fetching an entity from Datastore.
    * 

    *
    * Protobuf type {@code google.datastore.v1.EntityResult}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.EntityResult)
       com.google.datastore.v1.EntityResultOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_EntityResult_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.EntityResult.class, com.google.datastore.v1.EntityResult.Builder.class);
+              com.google.datastore.v1.EntityResult.class,
+              com.google.datastore.v1.EntityResult.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.EntityResult.newBuilder()
@@ -538,16 +571,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -565,9 +597,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_EntityResult_descriptor;
     }
 
     @java.lang.Override
@@ -602,38 +634,39 @@ public com.google.datastore.v1.EntityResult buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.EntityResult) {
-        return mergeFrom((com.google.datastore.v1.EntityResult)other);
+        return mergeFrom((com.google.datastore.v1.EntityResult) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -682,8 +715,13 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.Entity entity_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityBuilder_;
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
+        entityBuilder_;
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -694,6 +732,8 @@ public boolean hasEntity() {
       return entityBuilder_ != null || entity_ != null;
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -708,6 +748,8 @@ public com.google.datastore.v1.Entity getEntity() {
       }
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -728,14 +770,15 @@ public Builder setEntity(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

      *
      * .google.datastore.v1.Entity entity = 1;
      */
-    public Builder setEntity(
-        com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setEntity(com.google.datastore.v1.Entity.Builder builderForValue) {
       if (entityBuilder_ == null) {
         entity_ = builderForValue.build();
         onChanged();
@@ -746,6 +789,8 @@ public Builder setEntity(
       return this;
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -756,7 +801,7 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) {
       if (entityBuilder_ == null) {
         if (entity_ != null) {
           entity_ =
-            com.google.datastore.v1.Entity.newBuilder(entity_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.Entity.newBuilder(entity_).mergeFrom(value).buildPartial();
         } else {
           entity_ = value;
         }
@@ -768,6 +813,8 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -786,6 +833,8 @@ public Builder clearEntity() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -793,11 +842,13 @@ public Builder clearEntity() {
      * .google.datastore.v1.Entity entity = 1;
      */
     public com.google.datastore.v1.Entity.Builder getEntityBuilder() {
-      
+
       onChanged();
       return getEntityFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -808,11 +859,12 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
       if (entityBuilder_ != null) {
         return entityBuilder_.getMessageOrBuilder();
       } else {
-        return entity_ == null ?
-            com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
+        return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
       }
     }
     /**
+     *
+     *
      * 
      * The resulting entity.
      * 

@@ -820,21 +872,26 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
      * .google.datastore.v1.Entity entity = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
         getEntityFieldBuilder() {
       if (entityBuilder_ == null) {
-        entityBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
-                getEntity(),
-                getParentForChildren(),
-                isClean());
+        entityBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Entity,
+                com.google.datastore.v1.Entity.Builder,
+                com.google.datastore.v1.EntityOrBuilder>(
+                getEntity(), getParentForChildren(), isClean());
         entity_ = null;
       }
       return entityBuilder_;
     }
 
-    private long version_ ;
+    private long version_;
     /**
+     *
+     *
      * 
      * The version of the entity, a strictly positive number that monotonically
      * increases with changes to the entity.
@@ -851,6 +908,8 @@ public long getVersion() {
       return version_;
     }
     /**
+     *
+     *
      * 
      * The version of the entity, a strictly positive number that monotonically
      * increases with changes to the entity.
@@ -864,12 +923,14 @@ public long getVersion() {
      * int64 version = 4;
      */
     public Builder setVersion(long value) {
-      
+
       version_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The version of the entity, a strictly positive number that monotonically
      * increases with changes to the entity.
@@ -883,7 +944,7 @@ public Builder setVersion(long value) {
      * int64 version = 4;
      */
     public Builder clearVersion() {
-      
+
       version_ = 0L;
       onChanged();
       return this;
@@ -891,6 +952,8 @@ public Builder clearVersion() {
 
     private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the result entity.
      * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
@@ -902,6 +965,8 @@ public com.google.protobuf.ByteString getCursor() {
       return cursor_;
     }
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the result entity.
      * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
@@ -911,14 +976,16 @@ public com.google.protobuf.ByteString getCursor() {
      */
     public Builder setCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       cursor_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the result entity.
      * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
@@ -927,14 +994,14 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
      * bytes cursor = 3;
      */
     public Builder clearCursor() {
-      
+
       cursor_ = getDefaultInstance().getCursor();
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -944,12 +1011,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.EntityResult)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.EntityResult)
   private static final com.google.datastore.v1.EntityResult DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.EntityResult();
   }
@@ -958,16 +1025,16 @@ public static com.google.datastore.v1.EntityResult getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public EntityResult parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityResult(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public EntityResult parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new EntityResult(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -982,6 +1049,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.EntityResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 2bb2b1ff6b04..c6d14a06c123 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface EntityResultOrBuilder extends
+public interface EntityResultOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.EntityResult)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The resulting entity.
    * 

@@ -16,6 +19,8 @@ public interface EntityResultOrBuilder extends
    */
   boolean hasEntity();
   /**
+   *
+   *
    * 
    * The resulting entity.
    * 

@@ -24,6 +29,8 @@ public interface EntityResultOrBuilder extends
    */
   com.google.datastore.v1.Entity getEntity();
   /**
+   *
+   *
    * 
    * The resulting entity.
    * 

@@ -33,6 +40,8 @@ public interface EntityResultOrBuilder extends
   com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder();
 
   /**
+   *
+   *
    * 
    * The version of the entity, a strictly positive number that monotonically
    * increases with changes to the entity.
@@ -48,6 +57,8 @@ public interface EntityResultOrBuilder extends
   long getVersion();
 
   /**
+   *
+   *
    * 
    * A cursor that points to the position after the result entity.
    * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
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 f6524f2efc3f..70d65bee4ae1 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
@@ -4,29 +4,31 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A holder for any type of filter.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Filter}
  */
-public  final class Filter extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class Filter extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Filter)
     FilterOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use Filter.newBuilder() to construct.
   private Filter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private Filter() {
-  }
+
+  private Filter() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private Filter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -46,80 +48,83 @@ private Filter(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.CompositeFilter.Builder subBuilder = null;
-            if (filterTypeCase_ == 1) {
-              subBuilder = ((com.google.datastore.v1.CompositeFilter) filterType_).toBuilder();
-            }
-            filterType_ =
-                input.readMessage(com.google.datastore.v1.CompositeFilter.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.CompositeFilter) filterType_);
-              filterType_ = subBuilder.buildPartial();
-            }
-            filterTypeCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.datastore.v1.PropertyFilter.Builder subBuilder = null;
-            if (filterTypeCase_ == 2) {
-              subBuilder = ((com.google.datastore.v1.PropertyFilter) filterType_).toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.CompositeFilter.Builder subBuilder = null;
+              if (filterTypeCase_ == 1) {
+                subBuilder = ((com.google.datastore.v1.CompositeFilter) filterType_).toBuilder();
+              }
+              filterType_ =
+                  input.readMessage(
+                      com.google.datastore.v1.CompositeFilter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.CompositeFilter) filterType_);
+                filterType_ = subBuilder.buildPartial();
+              }
+              filterTypeCase_ = 1;
+              break;
             }
-            filterType_ =
-                input.readMessage(com.google.datastore.v1.PropertyFilter.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.PropertyFilter) filterType_);
-              filterType_ = subBuilder.buildPartial();
+          case 18:
+            {
+              com.google.datastore.v1.PropertyFilter.Builder subBuilder = null;
+              if (filterTypeCase_ == 2) {
+                subBuilder = ((com.google.datastore.v1.PropertyFilter) filterType_).toBuilder();
+              }
+              filterType_ =
+                  input.readMessage(
+                      com.google.datastore.v1.PropertyFilter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.PropertyFilter) filterType_);
+                filterType_ = subBuilder.buildPartial();
+              }
+              filterTypeCase_ = 2;
+              break;
             }
-            filterTypeCase_ = 2;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_Filter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Filter.class, com.google.datastore.v1.Filter.Builder.class);
   }
 
   private int filterTypeCase_ = 0;
   private java.lang.Object filterType_;
-  public enum FilterTypeCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum FilterTypeCase implements com.google.protobuf.Internal.EnumLite {
     COMPOSITE_FILTER(1),
     PROPERTY_FILTER(2),
     FILTERTYPE_NOT_SET(0);
     private final int value;
+
     private FilterTypeCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static FilterTypeCase valueOf(int value) {
       return forNumber(value);
@@ -127,25 +132,30 @@ public static FilterTypeCase valueOf(int value) {
 
     public static FilterTypeCase forNumber(int value) {
       switch (value) {
-        case 1: return COMPOSITE_FILTER;
-        case 2: return PROPERTY_FILTER;
-        case 0: return FILTERTYPE_NOT_SET;
-        default: return null;
+        case 1:
+          return COMPOSITE_FILTER;
+        case 2:
+          return PROPERTY_FILTER;
+        case 0:
+          return FILTERTYPE_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public FilterTypeCase
-  getFilterTypeCase() {
-    return FilterTypeCase.forNumber(
-        filterTypeCase_);
+  public FilterTypeCase getFilterTypeCase() {
+    return FilterTypeCase.forNumber(filterTypeCase_);
   }
 
   public static final int COMPOSITE_FILTER_FIELD_NUMBER = 1;
   /**
+   *
+   *
    * 
    * A composite filter.
    * 

@@ -156,6 +166,8 @@ public boolean hasCompositeFilter() {
     return filterTypeCase_ == 1;
   }
   /**
+   *
+   *
    * 
    * A composite filter.
    * 

@@ -164,11 +176,13 @@ public boolean hasCompositeFilter() {
    */
   public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
     if (filterTypeCase_ == 1) {
-       return (com.google.datastore.v1.CompositeFilter) filterType_;
+      return (com.google.datastore.v1.CompositeFilter) filterType_;
     }
     return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * A composite filter.
    * 

@@ -177,13 +191,15 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
    */
   public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder() {
     if (filterTypeCase_ == 1) {
-       return (com.google.datastore.v1.CompositeFilter) filterType_;
+      return (com.google.datastore.v1.CompositeFilter) filterType_;
     }
     return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
   }
 
   public static final int PROPERTY_FILTER_FIELD_NUMBER = 2;
   /**
+   *
+   *
    * 
    * A filter on a property.
    * 

@@ -194,6 +210,8 @@ public boolean hasPropertyFilter() {
     return filterTypeCase_ == 2;
   }
   /**
+   *
+   *
    * 
    * A filter on a property.
    * 

@@ -202,11 +220,13 @@ public boolean hasPropertyFilter() {
    */
   public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
     if (filterTypeCase_ == 2) {
-       return (com.google.datastore.v1.PropertyFilter) filterType_;
+      return (com.google.datastore.v1.PropertyFilter) filterType_;
     }
     return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * A filter on a property.
    * 

@@ -215,12 +235,13 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
    */
   public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder() {
     if (filterTypeCase_ == 2) {
-       return (com.google.datastore.v1.PropertyFilter) filterType_;
+      return (com.google.datastore.v1.PropertyFilter) filterType_;
     }
     return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -232,8 +253,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (filterTypeCase_ == 1) {
       output.writeMessage(1, (com.google.datastore.v1.CompositeFilter) filterType_);
     }
@@ -250,12 +270,14 @@ public int getSerializedSize() {
 
     size = 0;
     if (filterTypeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.datastore.v1.CompositeFilter) filterType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              1, (com.google.datastore.v1.CompositeFilter) filterType_);
     }
     if (filterTypeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.datastore.v1.PropertyFilter) filterType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              2, (com.google.datastore.v1.PropertyFilter) filterType_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -265,7 +287,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Filter)) {
       return super.equals(obj);
@@ -273,17 +295,14 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.Filter other = (com.google.datastore.v1.Filter) obj;
 
     boolean result = true;
-    result = result && getFilterTypeCase().equals(
-        other.getFilterTypeCase());
+    result = result && getFilterTypeCase().equals(other.getFilterTypeCase());
     if (!result) return false;
     switch (filterTypeCase_) {
       case 1:
-        result = result && getCompositeFilter()
-            .equals(other.getCompositeFilter());
+        result = result && getCompositeFilter().equals(other.getCompositeFilter());
         break;
       case 2:
-        result = result && getPropertyFilter()
-            .equals(other.getPropertyFilter());
+        result = result && getPropertyFilter().equals(other.getPropertyFilter());
         break;
       case 0:
       default:
@@ -316,116 +335,123 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Filter parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Filter parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Filter parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.Filter parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.Filter parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Filter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Filter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Filter parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Filter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Filter parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Filter parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Filter parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.Filter parseFrom(
-      com.google.protobuf.CodedInputStream input)
+
+  public static com.google.datastore.v1.Filter parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Filter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.Filter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A holder for any type of filter.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Filter}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Filter)
       com.google.datastore.v1.FilterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Filter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Filter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Filter.class, com.google.datastore.v1.Filter.Builder.class);
     }
@@ -435,16 +461,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -454,9 +479,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Filter_descriptor;
     }
 
     @java.lang.Override
@@ -499,38 +524,39 @@ public com.google.datastore.v1.Filter buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Filter) {
-        return mergeFrom((com.google.datastore.v1.Filter)other);
+        return mergeFrom((com.google.datastore.v1.Filter) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -540,17 +566,20 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.Filter other) {
       if (other == com.google.datastore.v1.Filter.getDefaultInstance()) return this;
       switch (other.getFilterTypeCase()) {
-        case COMPOSITE_FILTER: {
-          mergeCompositeFilter(other.getCompositeFilter());
-          break;
-        }
-        case PROPERTY_FILTER: {
-          mergePropertyFilter(other.getPropertyFilter());
-          break;
-        }
-        case FILTERTYPE_NOT_SET: {
-          break;
-        }
+        case COMPOSITE_FILTER:
+          {
+            mergeCompositeFilter(other.getCompositeFilter());
+            break;
+          }
+        case PROPERTY_FILTER:
+          {
+            mergePropertyFilter(other.getPropertyFilter());
+            break;
+          }
+        case FILTERTYPE_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -580,12 +609,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int filterTypeCase_ = 0;
     private java.lang.Object filterType_;
-    public FilterTypeCase
-        getFilterTypeCase() {
-      return FilterTypeCase.forNumber(
-          filterTypeCase_);
+
+    public FilterTypeCase getFilterTypeCase() {
+      return FilterTypeCase.forNumber(filterTypeCase_);
     }
 
     public Builder clearFilterType() {
@@ -595,10 +624,14 @@ public Builder clearFilterType() {
       return this;
     }
 
-
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder> compositeFilterBuilder_;
+            com.google.datastore.v1.CompositeFilter,
+            com.google.datastore.v1.CompositeFilter.Builder,
+            com.google.datastore.v1.CompositeFilterOrBuilder>
+        compositeFilterBuilder_;
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -609,6 +642,8 @@ public boolean hasCompositeFilter() {
       return filterTypeCase_ == 1;
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -629,6 +664,8 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
       }
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -649,6 +686,8 @@ public Builder setCompositeFilter(com.google.datastore.v1.CompositeFilter value)
       return this;
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -667,6 +706,8 @@ public Builder setCompositeFilter(
       return this;
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -675,10 +716,13 @@ public Builder setCompositeFilter(
      */
     public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter value) {
       if (compositeFilterBuilder_ == null) {
-        if (filterTypeCase_ == 1 &&
-            filterType_ != com.google.datastore.v1.CompositeFilter.getDefaultInstance()) {
-          filterType_ = com.google.datastore.v1.CompositeFilter.newBuilder((com.google.datastore.v1.CompositeFilter) filterType_)
-              .mergeFrom(value).buildPartial();
+        if (filterTypeCase_ == 1
+            && filterType_ != com.google.datastore.v1.CompositeFilter.getDefaultInstance()) {
+          filterType_ =
+              com.google.datastore.v1.CompositeFilter.newBuilder(
+                      (com.google.datastore.v1.CompositeFilter) filterType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           filterType_ = value;
         }
@@ -693,6 +737,8 @@ public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter valu
       return this;
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -716,6 +762,8 @@ public Builder clearCompositeFilter() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -726,6 +774,8 @@ public com.google.datastore.v1.CompositeFilter.Builder getCompositeFilterBuilder
       return getCompositeFilterFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -743,6 +793,8 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
       }
     }
     /**
+     *
+     *
      * 
      * A composite filter.
      * 

@@ -750,27 +802,38 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
      * .google.datastore.v1.CompositeFilter composite_filter = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder> 
+            com.google.datastore.v1.CompositeFilter,
+            com.google.datastore.v1.CompositeFilter.Builder,
+            com.google.datastore.v1.CompositeFilterOrBuilder>
         getCompositeFilterFieldBuilder() {
       if (compositeFilterBuilder_ == null) {
         if (!(filterTypeCase_ == 1)) {
           filterType_ = com.google.datastore.v1.CompositeFilter.getDefaultInstance();
         }
-        compositeFilterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder>(
+        compositeFilterBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.CompositeFilter,
+                com.google.datastore.v1.CompositeFilter.Builder,
+                com.google.datastore.v1.CompositeFilterOrBuilder>(
                 (com.google.datastore.v1.CompositeFilter) filterType_,
                 getParentForChildren(),
                 isClean());
         filterType_ = null;
       }
       filterTypeCase_ = 1;
-      onChanged();;
+      onChanged();
+      ;
       return compositeFilterBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder> propertyFilterBuilder_;
+            com.google.datastore.v1.PropertyFilter,
+            com.google.datastore.v1.PropertyFilter.Builder,
+            com.google.datastore.v1.PropertyFilterOrBuilder>
+        propertyFilterBuilder_;
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -781,6 +844,8 @@ public boolean hasPropertyFilter() {
       return filterTypeCase_ == 2;
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -801,6 +866,8 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
       }
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -821,6 +888,8 @@ public Builder setPropertyFilter(com.google.datastore.v1.PropertyFilter value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -839,6 +908,8 @@ public Builder setPropertyFilter(
       return this;
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -847,10 +918,13 @@ public Builder setPropertyFilter(
      */
     public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value) {
       if (propertyFilterBuilder_ == null) {
-        if (filterTypeCase_ == 2 &&
-            filterType_ != com.google.datastore.v1.PropertyFilter.getDefaultInstance()) {
-          filterType_ = com.google.datastore.v1.PropertyFilter.newBuilder((com.google.datastore.v1.PropertyFilter) filterType_)
-              .mergeFrom(value).buildPartial();
+        if (filterTypeCase_ == 2
+            && filterType_ != com.google.datastore.v1.PropertyFilter.getDefaultInstance()) {
+          filterType_ =
+              com.google.datastore.v1.PropertyFilter.newBuilder(
+                      (com.google.datastore.v1.PropertyFilter) filterType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           filterType_ = value;
         }
@@ -865,6 +939,8 @@ public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value)
       return this;
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -888,6 +964,8 @@ public Builder clearPropertyFilter() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -898,6 +976,8 @@ public com.google.datastore.v1.PropertyFilter.Builder getPropertyFilterBuilder()
       return getPropertyFilterFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -915,6 +995,8 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
       }
     }
     /**
+     *
+     *
      * 
      * A filter on a property.
      * 

@@ -922,26 +1004,32 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
      * .google.datastore.v1.PropertyFilter property_filter = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder> 
+            com.google.datastore.v1.PropertyFilter,
+            com.google.datastore.v1.PropertyFilter.Builder,
+            com.google.datastore.v1.PropertyFilterOrBuilder>
         getPropertyFilterFieldBuilder() {
       if (propertyFilterBuilder_ == null) {
         if (!(filterTypeCase_ == 2)) {
           filterType_ = com.google.datastore.v1.PropertyFilter.getDefaultInstance();
         }
-        propertyFilterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder>(
+        propertyFilterBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyFilter,
+                com.google.datastore.v1.PropertyFilter.Builder,
+                com.google.datastore.v1.PropertyFilterOrBuilder>(
                 (com.google.datastore.v1.PropertyFilter) filterType_,
                 getParentForChildren(),
                 isClean());
         filterType_ = null;
       }
       filterTypeCase_ = 2;
-      onChanged();;
+      onChanged();
+      ;
       return propertyFilterBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -951,12 +1039,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Filter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Filter)
   private static final com.google.datastore.v1.Filter DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Filter();
   }
@@ -965,16 +1053,16 @@ public static com.google.datastore.v1.Filter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public Filter parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Filter(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Filter parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Filter(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -989,6 +1077,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Filter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 514085ad201e..bc709c719f82 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface FilterOrBuilder extends
+public interface FilterOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Filter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * A composite filter.
    * 

@@ -16,6 +19,8 @@ public interface FilterOrBuilder extends
    */
   boolean hasCompositeFilter();
   /**
+   *
+   *
    * 
    * A composite filter.
    * 

@@ -24,6 +29,8 @@ public interface FilterOrBuilder extends
    */
   com.google.datastore.v1.CompositeFilter getCompositeFilter();
   /**
+   *
+   *
    * 
    * A composite filter.
    * 

@@ -33,6 +40,8 @@ public interface FilterOrBuilder extends
   com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder();
 
   /**
+   *
+   *
    * 
    * A filter on a property.
    * 

@@ -41,6 +50,8 @@ public interface FilterOrBuilder extends
    */
   boolean hasPropertyFilter();
   /**
+   *
+   *
    * 
    * A filter on a property.
    * 

@@ -49,6 +60,8 @@ public interface FilterOrBuilder extends
    */
   com.google.datastore.v1.PropertyFilter getPropertyFilter();
   /**
+   *
+   *
    * 
    * A filter on a property.
    * 

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 aa0971431bb0..cf63ef014d1c 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
@@ -4,21 +4,24 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
  * 

  *
  * Protobuf type {@code google.datastore.v1.GqlQuery}
  */
-public  final class GqlQuery extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class GqlQuery extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQuery)
     GqlQueryOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use GqlQuery.newBuilder() to construct.
   private GqlQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private GqlQuery() {
     queryString_ = "";
     allowLiterals_ = false;
@@ -26,10 +29,10 @@ private GqlQuery() {
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private GqlQuery(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -49,53 +52,62 @@ private GqlQuery(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            queryString_ = s;
-            break;
-          }
-          case 16: {
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            allowLiterals_ = input.readBool();
-            break;
-          }
-          case 34: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              positionalBindings_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000008;
+              queryString_ = s;
+              break;
             }
-            positionalBindings_.add(
-                input.readMessage(com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry));
-            break;
-          }
-          case 42: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              namedBindings_ = com.google.protobuf.MapField.newMapField(
-                  NamedBindingsDefaultEntryHolder.defaultEntry);
-              mutable_bitField0_ |= 0x00000004;
+          case 16:
+            {
+              allowLiterals_ = input.readBool();
+              break;
             }
-            com.google.protobuf.MapEntry
-            namedBindings__ = input.readMessage(
-                NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-            namedBindings_.getMutableMap().put(
-                namedBindings__.getKey(), namedBindings__.getValue());
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+                positionalBindings_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              positionalBindings_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry));
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+                namedBindings_ =
+                    com.google.protobuf.MapField.newMapField(
+                        NamedBindingsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000004;
+              }
+              com.google.protobuf.MapEntry<
+                      java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+                  namedBindings__ =
+                      input.readMessage(
+                          NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(),
+                          extensionRegistry);
+              namedBindings_
+                  .getMutableMap()
+                  .put(namedBindings__.getKey(), namedBindings__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
         positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
@@ -104,27 +116,28 @@ private GqlQuery(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_GqlQuery_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
         return internalGetNamedBindings();
       default:
-        throw new RuntimeException(
-            "Invalid map field number: " + number);
+        throw new RuntimeException("Invalid map field number: " + number);
     }
   }
+
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.GqlQuery.class, com.google.datastore.v1.GqlQuery.Builder.class);
   }
@@ -133,6 +146,8 @@ protected com.google.protobuf.MapField internalGetMapField(
   public static final int QUERY_STRING_FIELD_NUMBER = 1;
   private volatile java.lang.Object queryString_;
   /**
+   *
+   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -145,14 +160,15 @@ public java.lang.String getQueryString() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       queryString_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -160,13 +176,11 @@ public java.lang.String getQueryString() {
    *
    * string query_string = 1;
    */
-  public com.google.protobuf.ByteString
-      getQueryStringBytes() {
+  public com.google.protobuf.ByteString getQueryStringBytes() {
     java.lang.Object ref = queryString_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       queryString_ = b;
       return b;
     } else {
@@ -177,6 +191,8 @@ public java.lang.String getQueryString() {
   public static final int ALLOW_LITERALS_FIELD_NUMBER = 2;
   private boolean allowLiterals_;
   /**
+   *
+   *
    * 
    * When false, the query string must not contain any literals and instead must
    * bind all values. For example,
@@ -191,21 +207,26 @@ public boolean getAllowLiterals() {
   }
 
   public static final int NAMED_BINDINGS_FIELD_NUMBER = 5;
+
   private static final class NamedBindingsDefaultEntryHolder {
     static final com.google.protobuf.MapEntry<
-        java.lang.String, com.google.datastore.v1.GqlQueryParameter> defaultEntry =
+            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+        defaultEntry =
             com.google.protobuf.MapEntry
-            .newDefaultInstance(
-                com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor, 
-                com.google.protobuf.WireFormat.FieldType.STRING,
-                "",
-                com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
+                .newDefaultInstance(
+                    com.google.datastore.v1.QueryProto
+                        .internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor,
+                    com.google.protobuf.WireFormat.FieldType.STRING,
+                    "",
+                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                    com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
   }
-  private com.google.protobuf.MapField<
-      java.lang.String, com.google.datastore.v1.GqlQueryParameter> namedBindings_;
+
   private com.google.protobuf.MapField
-  internalGetNamedBindings() {
+      namedBindings_;
+
+  private com.google.protobuf.MapField
+      internalGetNamedBindings() {
     if (namedBindings_ == null) {
       return com.google.protobuf.MapField.emptyMapField(
           NamedBindingsDefaultEntryHolder.defaultEntry);
@@ -217,6 +238,8 @@ public int getNamedBindingsCount() {
     return internalGetNamedBindings().getMap().size();
   }
   /**
+   *
+   *
    * 
    * 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.
@@ -226,20 +249,21 @@ public int getNamedBindingsCount() {
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-
-  public boolean containsNamedBindings(
-      java.lang.String key) {
-    if (key == null) { throw new java.lang.NullPointerException(); }
+  public boolean containsNamedBindings(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
     return internalGetNamedBindings().getMap().containsKey(key);
   }
-  /**
-   * Use {@link #getNamedBindingsMap()} instead.
-   */
+  /** Use {@link #getNamedBindingsMap()} instead. */
   @java.lang.Deprecated
-  public java.util.Map getNamedBindings() {
+  public java.util.Map
+      getNamedBindings() {
     return getNamedBindingsMap();
   }
   /**
+   *
+   *
    * 
    * 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.
@@ -249,11 +273,13 @@ public java.util.Mapmap<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-
-  public java.util.Map getNamedBindingsMap() {
+  public java.util.Map
+      getNamedBindingsMap() {
     return internalGetNamedBindings().getMap();
   }
   /**
+   *
+   *
    * 
    * 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.
@@ -263,16 +289,18 @@ public java.util.Mapmap<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-
   public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-      java.lang.String key,
-      com.google.datastore.v1.GqlQueryParameter defaultValue) {
-    if (key == null) { throw new java.lang.NullPointerException(); }
+      java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
     java.util.Map map =
         internalGetNamedBindings().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
+   *
+   *
    * 
    * 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.
@@ -282,10 +310,10 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-
-  public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
-      java.lang.String key) {
-    if (key == null) { throw new java.lang.NullPointerException(); }
+  public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
     java.util.Map map =
         internalGetNamedBindings().getMap();
     if (!map.containsKey(key)) {
@@ -297,6 +325,8 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
   public static final int POSITIONAL_BINDINGS_FIELD_NUMBER = 4;
   private java.util.List positionalBindings_;
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -310,6 +340,8 @@ public java.util.List getPositionalBi
     return positionalBindings_;
   }
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -319,11 +351,13 @@ public java.util.List getPositionalBi
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  public java.util.List 
+  public java.util.List
       getPositionalBindingsOrBuilderList() {
     return positionalBindings_;
   }
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -337,6 +371,8 @@ public int getPositionalBindingsCount() {
     return positionalBindings_.size();
   }
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -350,6 +386,8 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index
     return positionalBindings_.get(index);
   }
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -365,6 +403,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -376,8 +415,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getQueryStringBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, queryString_);
     }
@@ -387,12 +425,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     for (int i = 0; i < positionalBindings_.size(); i++) {
       output.writeMessage(4, positionalBindings_.get(i));
     }
-    com.google.protobuf.GeneratedMessageV3
-      .serializeStringMapTo(
-        output,
-        internalGetNamedBindings(),
-        NamedBindingsDefaultEntryHolder.defaultEntry,
-        5);
+    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+        output, internalGetNamedBindings(), NamedBindingsDefaultEntryHolder.defaultEntry, 5);
     unknownFields.writeTo(output);
   }
 
@@ -406,22 +440,22 @@ public int getSerializedSize() {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, queryString_);
     }
     if (allowLiterals_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(2, allowLiterals_);
+      size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, allowLiterals_);
     }
     for (int i = 0; i < positionalBindings_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, positionalBindings_.get(i));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(4, positionalBindings_.get(i));
     }
-    for (java.util.Map.Entry entry
-         : internalGetNamedBindings().getMap().entrySet()) {
+    for (java.util.Map.Entry entry :
+        internalGetNamedBindings().getMap().entrySet()) {
       com.google.protobuf.MapEntry
-      namedBindings__ = NamedBindingsDefaultEntryHolder.defaultEntry.newBuilderForType()
-          .setKey(entry.getKey())
-          .setValue(entry.getValue())
-          .build();
-      size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, namedBindings__);
+          namedBindings__ =
+              NamedBindingsDefaultEntryHolder.defaultEntry
+                  .newBuilderForType()
+                  .setKey(entry.getKey())
+                  .setValue(entry.getValue())
+                  .build();
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, namedBindings__);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -431,7 +465,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.GqlQuery)) {
       return super.equals(obj);
@@ -439,14 +473,10 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.GqlQuery other = (com.google.datastore.v1.GqlQuery) obj;
 
     boolean result = true;
-    result = result && getQueryString()
-        .equals(other.getQueryString());
-    result = result && (getAllowLiterals()
-        == other.getAllowLiterals());
-    result = result && internalGetNamedBindings().equals(
-        other.internalGetNamedBindings());
-    result = result && getPositionalBindingsList()
-        .equals(other.getPositionalBindingsList());
+    result = result && getQueryString().equals(other.getQueryString());
+    result = result && (getAllowLiterals() == other.getAllowLiterals());
+    result = result && internalGetNamedBindings().equals(other.internalGetNamedBindings());
+    result = result && getPositionalBindingsList().equals(other.getPositionalBindingsList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -461,8 +491,7 @@ public int hashCode() {
     hash = (37 * hash) + QUERY_STRING_FIELD_NUMBER;
     hash = (53 * hash) + getQueryString().hashCode();
     hash = (37 * hash) + ALLOW_LITERALS_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getAllowLiterals());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAllowLiterals());
     if (!internalGetNamedBindings().getMap().isEmpty()) {
       hash = (37 * hash) + NAMED_BINDINGS_FIELD_NUMBER;
       hash = (53 * hash) + internalGetNamedBindings().hashCode();
@@ -476,140 +505,146 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.GqlQuery parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.GqlQuery parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.GqlQuery parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.GqlQuery parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQuery parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.GqlQuery parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.GqlQuery parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.GqlQuery prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
    * 

    *
    * Protobuf type {@code google.datastore.v1.GqlQuery}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.GqlQuery)
       com.google.datastore.v1.GqlQueryOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_GqlQuery_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 5:
           return internalGetNamedBindings();
         default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
+          throw new RuntimeException("Invalid map field number: " + number);
       }
     }
+
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 5:
           return internalGetMutableNamedBindings();
         default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
+          throw new RuntimeException("Invalid map field number: " + number);
       }
     }
+
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.GqlQuery.class, com.google.datastore.v1.GqlQuery.Builder.class);
+              com.google.datastore.v1.GqlQuery.class,
+              com.google.datastore.v1.GqlQuery.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.GqlQuery.newBuilder()
@@ -617,17 +652,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getPositionalBindingsFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -646,9 +681,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_GqlQuery_descriptor;
     }
 
     @java.lang.Override
@@ -692,38 +727,39 @@ public com.google.datastore.v1.GqlQuery buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.GqlQuery) {
-        return mergeFrom((com.google.datastore.v1.GqlQuery)other);
+        return mergeFrom((com.google.datastore.v1.GqlQuery) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -739,8 +775,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
       if (other.getAllowLiterals() != false) {
         setAllowLiterals(other.getAllowLiterals());
       }
-      internalGetMutableNamedBindings().mergeFrom(
-          other.internalGetNamedBindings());
+      internalGetMutableNamedBindings().mergeFrom(other.internalGetNamedBindings());
       if (positionalBindingsBuilder_ == null) {
         if (!other.positionalBindings_.isEmpty()) {
           if (positionalBindings_.isEmpty()) {
@@ -759,9 +794,10 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
             positionalBindingsBuilder_ = null;
             positionalBindings_ = other.positionalBindings_;
             bitField0_ = (bitField0_ & ~0x00000008);
-            positionalBindingsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getPositionalBindingsFieldBuilder() : null;
+            positionalBindingsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getPositionalBindingsFieldBuilder()
+                    : null;
           } else {
             positionalBindingsBuilder_.addAllMessages(other.positionalBindings_);
           }
@@ -795,10 +831,13 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.lang.Object queryString_ = "";
     /**
+     *
+     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -809,8 +848,7 @@ public Builder mergeFrom(
     public java.lang.String getQueryString() {
       java.lang.Object ref = queryString_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         queryString_ = s;
         return s;
@@ -819,6 +857,8 @@ public java.lang.String getQueryString() {
       }
     }
     /**
+     *
+     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -826,13 +866,11 @@ public java.lang.String getQueryString() {
      *
      * string query_string = 1;
      */
-    public com.google.protobuf.ByteString
-        getQueryStringBytes() {
+    public com.google.protobuf.ByteString getQueryStringBytes() {
       java.lang.Object ref = queryString_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         queryString_ = b;
         return b;
       } else {
@@ -840,6 +878,8 @@ public java.lang.String getQueryString() {
       }
     }
     /**
+     *
+     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -847,17 +887,18 @@ public java.lang.String getQueryString() {
      *
      * string query_string = 1;
      */
-    public Builder setQueryString(
-        java.lang.String value) {
+    public Builder setQueryString(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       queryString_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -866,12 +907,14 @@ public Builder setQueryString(
      * string query_string = 1;
      */
     public Builder clearQueryString() {
-      
+
       queryString_ = getDefaultInstance().getQueryString();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -879,20 +922,21 @@ public Builder clearQueryString() {
      *
      * string query_string = 1;
      */
-    public Builder setQueryStringBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       queryString_ = value;
       onChanged();
       return this;
     }
 
-    private boolean allowLiterals_ ;
+    private boolean allowLiterals_;
     /**
+     *
+     *
      * 
      * When false, the query string must not contain any literals and instead must
      * bind all values. For example,
@@ -906,6 +950,8 @@ public boolean getAllowLiterals() {
       return allowLiterals_;
     }
     /**
+     *
+     *
      * 
      * When false, the query string must not contain any literals and instead must
      * bind all values. For example,
@@ -916,12 +962,14 @@ public boolean getAllowLiterals() {
      * bool allow_literals = 2;
      */
     public Builder setAllowLiterals(boolean value) {
-      
+
       allowLiterals_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * When false, the query string must not contain any literals and instead must
      * bind all values. For example,
@@ -932,28 +980,34 @@ public Builder setAllowLiterals(boolean value) {
      * bool allow_literals = 2;
      */
     public Builder clearAllowLiterals() {
-      
+
       allowLiterals_ = false;
       onChanged();
       return this;
     }
 
     private com.google.protobuf.MapField<
-        java.lang.String, com.google.datastore.v1.GqlQueryParameter> namedBindings_;
-    private com.google.protobuf.MapField
-    internalGetNamedBindings() {
+            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+        namedBindings_;
+
+    private com.google.protobuf.MapField<
+            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+        internalGetNamedBindings() {
       if (namedBindings_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             NamedBindingsDefaultEntryHolder.defaultEntry);
       }
       return namedBindings_;
     }
-    private com.google.protobuf.MapField
-    internalGetMutableNamedBindings() {
-      onChanged();;
+
+    private com.google.protobuf.MapField<
+            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+        internalGetMutableNamedBindings() {
+      onChanged();
+      ;
       if (namedBindings_ == null) {
-        namedBindings_ = com.google.protobuf.MapField.newMapField(
-            NamedBindingsDefaultEntryHolder.defaultEntry);
+        namedBindings_ =
+            com.google.protobuf.MapField.newMapField(NamedBindingsDefaultEntryHolder.defaultEntry);
       }
       if (!namedBindings_.isMutable()) {
         namedBindings_ = namedBindings_.copy();
@@ -965,6 +1019,8 @@ public int getNamedBindingsCount() {
       return internalGetNamedBindings().getMap().size();
     }
     /**
+     *
+     *
      * 
      * 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.
@@ -974,20 +1030,21 @@ public int getNamedBindingsCount() {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-
-    public boolean containsNamedBindings(
-        java.lang.String key) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
+    public boolean containsNamedBindings(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
       return internalGetNamedBindings().getMap().containsKey(key);
     }
-    /**
-     * Use {@link #getNamedBindingsMap()} instead.
-     */
+    /** Use {@link #getNamedBindingsMap()} instead. */
     @java.lang.Deprecated
-    public java.util.Map getNamedBindings() {
+    public java.util.Map
+        getNamedBindings() {
       return getNamedBindingsMap();
     }
     /**
+     *
+     *
      * 
      * 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.
@@ -997,11 +1054,13 @@ public java.util.Mapmap<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-
-    public java.util.Map getNamedBindingsMap() {
+    public java.util.Map
+        getNamedBindingsMap() {
       return internalGetNamedBindings().getMap();
     }
     /**
+     *
+     *
      * 
      * 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.
@@ -1011,16 +1070,18 @@ public java.util.Mapmap<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-
     public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-        java.lang.String key,
-        com.google.datastore.v1.GqlQueryParameter defaultValue) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
+        java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
       java.util.Map map =
           internalGetNamedBindings().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
+     *
+     *
      * 
      * 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.
@@ -1030,10 +1091,10 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-
-    public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
-        java.lang.String key) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
+    public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
       java.util.Map map =
           internalGetNamedBindings().getMap();
       if (!map.containsKey(key)) {
@@ -1043,11 +1104,12 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
     }
 
     public Builder clearNamedBindings() {
-      internalGetMutableNamedBindings().getMutableMap()
-          .clear();
+      internalGetMutableNamedBindings().getMutableMap().clear();
       return this;
     }
     /**
+     *
+     *
      * 
      * 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.
@@ -1057,23 +1119,22 @@ public Builder clearNamedBindings() {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-
-    public Builder removeNamedBindings(
-        java.lang.String key) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
-      internalGetMutableNamedBindings().getMutableMap()
-          .remove(key);
+    public Builder removeNamedBindings(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableNamedBindings().getMutableMap().remove(key);
       return this;
     }
-    /**
-     * Use alternate mutation accessors instead.
-     */
+    /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map
-    getMutableNamedBindings() {
+        getMutableNamedBindings() {
       return internalGetMutableNamedBindings().getMutableMap();
     }
     /**
+     *
+     *
      * 
      * 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.
@@ -1084,15 +1145,19 @@ public Builder removeNamedBindings(
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
     public Builder putNamedBindings(
-        java.lang.String key,
-        com.google.datastore.v1.GqlQueryParameter value) {
-      if (key == null) { throw new java.lang.NullPointerException(); }
-      if (value == null) { throw new java.lang.NullPointerException(); }
-      internalGetMutableNamedBindings().getMutableMap()
-          .put(key, value);
+        java.lang.String key, com.google.datastore.v1.GqlQueryParameter value) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      if (value == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableNamedBindings().getMutableMap().put(key, value);
       return this;
     }
     /**
+     *
+     *
      * 
      * 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.
@@ -1102,27 +1167,32 @@ public Builder putNamedBindings(
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-
     public Builder putAllNamedBindings(
         java.util.Map values) {
-      internalGetMutableNamedBindings().getMutableMap()
-          .putAll(values);
+      internalGetMutableNamedBindings().getMutableMap().putAll(values);
       return this;
     }
 
     private java.util.List positionalBindings_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensurePositionalBindingsIsMutable() {
       if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-        positionalBindings_ = new java.util.ArrayList(positionalBindings_);
+        positionalBindings_ =
+            new java.util.ArrayList(positionalBindings_);
         bitField0_ |= 0x00000008;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder> positionalBindingsBuilder_;
+            com.google.datastore.v1.GqlQueryParameter,
+            com.google.datastore.v1.GqlQueryParameter.Builder,
+            com.google.datastore.v1.GqlQueryParameterOrBuilder>
+        positionalBindingsBuilder_;
 
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1140,6 +1210,8 @@ public java.util.List getPositionalBi
       }
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1157,6 +1229,8 @@ public int getPositionalBindingsCount() {
       }
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1174,6 +1248,8 @@ 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.
@@ -1198,6 +1274,8 @@ public Builder setPositionalBindings(
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1219,6 +1297,8 @@ public Builder setPositionalBindings(
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1242,6 +1322,8 @@ public Builder addPositionalBindings(com.google.datastore.v1.GqlQueryParameter v
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1266,6 +1348,8 @@ public Builder addPositionalBindings(
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1287,6 +1371,8 @@ public Builder addPositionalBindings(
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1308,6 +1394,8 @@ public Builder addPositionalBindings(
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1321,8 +1409,7 @@ public Builder addAllPositionalBindings(
         java.lang.Iterable values) {
       if (positionalBindingsBuilder_ == null) {
         ensurePositionalBindingsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, positionalBindings_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, positionalBindings_);
         onChanged();
       } else {
         positionalBindingsBuilder_.addAllMessages(values);
@@ -1330,6 +1417,8 @@ public Builder addAllPositionalBindings(
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1350,6 +1439,8 @@ public Builder clearPositionalBindings() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1370,6 +1461,8 @@ public Builder removePositionalBindings(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1384,6 +1477,8 @@ public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBu
       return getPositionalBindingsFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1396,11 +1491,14 @@ public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBu
     public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder(
         int index) {
       if (positionalBindingsBuilder_ == null) {
-        return positionalBindings_.get(index);  } else {
+        return positionalBindings_.get(index);
+      } else {
         return positionalBindingsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1410,8 +1508,8 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
      *
      * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
      */
-    public java.util.List 
-         getPositionalBindingsOrBuilderList() {
+    public java.util.List
+        getPositionalBindingsOrBuilderList() {
       if (positionalBindingsBuilder_ != null) {
         return positionalBindingsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1419,6 +1517,8 @@ 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.
@@ -1429,10 +1529,12 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
      * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
      */
     public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBuilder() {
-      return getPositionalBindingsFieldBuilder().addBuilder(
-          com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
+      return getPositionalBindingsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1444,10 +1546,12 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
      */
     public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBuilder(
         int index) {
-      return getPositionalBindingsFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
+      return getPositionalBindingsFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1457,16 +1561,22 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
      *
      * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
      */
-    public java.util.List 
-         getPositionalBindingsBuilderList() {
+    public java.util.List
+        getPositionalBindingsBuilderList() {
       return getPositionalBindingsFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder> 
+            com.google.datastore.v1.GqlQueryParameter,
+            com.google.datastore.v1.GqlQueryParameter.Builder,
+            com.google.datastore.v1.GqlQueryParameterOrBuilder>
         getPositionalBindingsFieldBuilder() {
       if (positionalBindingsBuilder_ == null) {
-        positionalBindingsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder>(
+        positionalBindingsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.GqlQueryParameter,
+                com.google.datastore.v1.GqlQueryParameter.Builder,
+                com.google.datastore.v1.GqlQueryParameterOrBuilder>(
                 positionalBindings_,
                 ((bitField0_ & 0x00000008) == 0x00000008),
                 getParentForChildren(),
@@ -1475,9 +1585,9 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
       }
       return positionalBindingsBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1487,12 +1597,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.GqlQuery)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQuery)
   private static final com.google.datastore.v1.GqlQuery DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.GqlQuery();
   }
@@ -1501,16 +1611,16 @@ public static com.google.datastore.v1.GqlQuery getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public GqlQuery parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GqlQuery(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public GqlQuery parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new GqlQuery(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1525,6 +1635,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 8953cf34380b..db2d10a3c197 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface GqlQueryOrBuilder extends
+public interface GqlQueryOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.GqlQuery)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -17,6 +20,8 @@ public interface GqlQueryOrBuilder extends
    */
   java.lang.String getQueryString();
   /**
+   *
+   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -24,10 +29,11 @@ public interface GqlQueryOrBuilder extends
    *
    * string query_string = 1;
    */
-  com.google.protobuf.ByteString
-      getQueryStringBytes();
+  com.google.protobuf.ByteString getQueryStringBytes();
 
   /**
+   *
+   *
    * 
    * When false, the query string must not contain any literals and instead must
    * bind all values. For example,
@@ -40,6 +46,8 @@ public interface GqlQueryOrBuilder extends
   boolean getAllowLiterals();
 
   /**
+   *
+   *
    * 
    * 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.
@@ -51,6 +59,8 @@ public interface GqlQueryOrBuilder extends
    */
   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.
@@ -60,15 +70,13 @@ public interface GqlQueryOrBuilder extends
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  boolean containsNamedBindings(
-      java.lang.String key);
-  /**
-   * Use {@link #getNamedBindingsMap()} instead.
-   */
+  boolean containsNamedBindings(java.lang.String key);
+  /** Use {@link #getNamedBindingsMap()} instead. */
   @java.lang.Deprecated
-  java.util.Map
-  getNamedBindings();
+  java.util.Map getNamedBindings();
   /**
+   *
+   *
    * 
    * 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.
@@ -78,9 +86,10 @@ boolean containsNamedBindings(
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  java.util.Map
-  getNamedBindingsMap();
+  java.util.Map getNamedBindingsMap();
   /**
+   *
+   *
    * 
    * 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.
@@ -90,11 +99,11 @@ boolean containsNamedBindings(
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-
   com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-      java.lang.String key,
-      com.google.datastore.v1.GqlQueryParameter defaultValue);
+      java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue);
   /**
+   *
+   *
    * 
    * 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.
@@ -104,11 +113,11 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-
-  com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
-      java.lang.String key);
+  com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key);
 
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -118,9 +127,10 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  java.util.List 
-      getPositionalBindingsList();
+  java.util.List getPositionalBindingsList();
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -132,6 +142,8 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
    */
   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.
@@ -143,6 +155,8 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
    */
   int getPositionalBindingsCount();
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -152,9 +166,11 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  java.util.List 
+  java.util.List
       getPositionalBindingsOrBuilderList();
   /**
+   *
+   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -164,6 +180,5 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder(
-      int index);
+  com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder(int index);
 }
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 89d6e7f8728d..96c20a5d110c 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
@@ -4,29 +4,31 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A binding parameter for a GQL query.
  * 

  *
  * Protobuf type {@code google.datastore.v1.GqlQueryParameter}
  */
-public  final class GqlQueryParameter extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class GqlQueryParameter extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQueryParameter)
     GqlQueryParameterOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use GqlQueryParameter.newBuilder() to construct.
   private GqlQueryParameter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private GqlQueryParameter() {
-  }
+
+  private GqlQueryParameter() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private GqlQueryParameter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -46,71 +48,74 @@ private GqlQueryParameter(
           case 0:
             done = true;
             break;
-          case 18: {
-            com.google.datastore.v1.Value.Builder subBuilder = null;
-            if (parameterTypeCase_ == 2) {
-              subBuilder = ((com.google.datastore.v1.Value) parameterType_).toBuilder();
+          case 18:
+            {
+              com.google.datastore.v1.Value.Builder subBuilder = null;
+              if (parameterTypeCase_ == 2) {
+                subBuilder = ((com.google.datastore.v1.Value) parameterType_).toBuilder();
+              }
+              parameterType_ =
+                  input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Value) parameterType_);
+                parameterType_ = subBuilder.buildPartial();
+              }
+              parameterTypeCase_ = 2;
+              break;
             }
-            parameterType_ =
-                input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Value) parameterType_);
-              parameterType_ = subBuilder.buildPartial();
+          case 26:
+            {
+              parameterTypeCase_ = 3;
+              parameterType_ = input.readBytes();
+              break;
             }
-            parameterTypeCase_ = 2;
-            break;
-          }
-          case 26: {
-            parameterTypeCase_ = 3;
-            parameterType_ = input.readBytes();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.GqlQueryParameter.class, com.google.datastore.v1.GqlQueryParameter.Builder.class);
+            com.google.datastore.v1.GqlQueryParameter.class,
+            com.google.datastore.v1.GqlQueryParameter.Builder.class);
   }
 
   private int parameterTypeCase_ = 0;
   private java.lang.Object parameterType_;
-  public enum ParameterTypeCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum ParameterTypeCase implements com.google.protobuf.Internal.EnumLite {
     VALUE(2),
     CURSOR(3),
     PARAMETERTYPE_NOT_SET(0);
     private final int value;
+
     private ParameterTypeCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static ParameterTypeCase valueOf(int value) {
       return forNumber(value);
@@ -118,25 +123,30 @@ public static ParameterTypeCase valueOf(int value) {
 
     public static ParameterTypeCase forNumber(int value) {
       switch (value) {
-        case 2: return VALUE;
-        case 3: return CURSOR;
-        case 0: return PARAMETERTYPE_NOT_SET;
-        default: return null;
+        case 2:
+          return VALUE;
+        case 3:
+          return CURSOR;
+        case 0:
+          return PARAMETERTYPE_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ParameterTypeCase
-  getParameterTypeCase() {
-    return ParameterTypeCase.forNumber(
-        parameterTypeCase_);
+  public ParameterTypeCase getParameterTypeCase() {
+    return ParameterTypeCase.forNumber(parameterTypeCase_);
   }
 
   public static final int VALUE_FIELD_NUMBER = 2;
   /**
+   *
+   *
    * 
    * A value parameter.
    * 

@@ -147,6 +157,8 @@ public boolean hasValue() {
     return parameterTypeCase_ == 2;
   }
   /**
+   *
+   *
    * 
    * A value parameter.
    * 

@@ -155,11 +167,13 @@ public boolean hasValue() {
    */
   public com.google.datastore.v1.Value getValue() {
     if (parameterTypeCase_ == 2) {
-       return (com.google.datastore.v1.Value) parameterType_;
+      return (com.google.datastore.v1.Value) parameterType_;
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * A value parameter.
    * 

@@ -168,13 +182,15 @@ public com.google.datastore.v1.Value getValue() {
    */
   public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
     if (parameterTypeCase_ == 2) {
-       return (com.google.datastore.v1.Value) parameterType_;
+      return (com.google.datastore.v1.Value) parameterType_;
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
 
   public static final int CURSOR_FIELD_NUMBER = 3;
   /**
+   *
+   *
    * 
    * A query cursor. Query cursors are returned in query
    * result batches.
@@ -190,6 +206,7 @@ public com.google.protobuf.ByteString getCursor() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -201,14 +218,12 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (parameterTypeCase_ == 2) {
       output.writeMessage(2, (com.google.datastore.v1.Value) parameterType_);
     }
     if (parameterTypeCase_ == 3) {
-      output.writeBytes(
-          3, (com.google.protobuf.ByteString) parameterType_);
+      output.writeBytes(3, (com.google.protobuf.ByteString) parameterType_);
     }
     unknownFields.writeTo(output);
   }
@@ -220,13 +235,14 @@ public int getSerializedSize() {
 
     size = 0;
     if (parameterTypeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.datastore.v1.Value) parameterType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              2, (com.google.datastore.v1.Value) parameterType_);
     }
     if (parameterTypeCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(
-            3, (com.google.protobuf.ByteString) parameterType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeBytesSize(
+              3, (com.google.protobuf.ByteString) parameterType_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -236,25 +252,23 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.GqlQueryParameter)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.GqlQueryParameter other = (com.google.datastore.v1.GqlQueryParameter) obj;
+    com.google.datastore.v1.GqlQueryParameter other =
+        (com.google.datastore.v1.GqlQueryParameter) obj;
 
     boolean result = true;
-    result = result && getParameterTypeCase().equals(
-        other.getParameterTypeCase());
+    result = result && getParameterTypeCase().equals(other.getParameterTypeCase());
     if (!result) return false;
     switch (parameterTypeCase_) {
       case 2:
-        result = result && getValue()
-            .equals(other.getValue());
+        result = result && getValue().equals(other.getValue());
         break;
       case 3:
-        result = result && getCursor()
-            .equals(other.getCursor());
+        result = result && getCursor().equals(other.getCursor());
         break;
       case 0:
       default:
@@ -287,118 +301,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.GqlQueryParameter parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.GqlQueryParameter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A binding parameter for a GQL query.
    * 

    *
    * Protobuf type {@code google.datastore.v1.GqlQueryParameter}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.GqlQueryParameter)
       com.google.datastore.v1.GqlQueryParameterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.GqlQueryParameter.class, com.google.datastore.v1.GqlQueryParameter.Builder.class);
+              com.google.datastore.v1.GqlQueryParameter.class,
+              com.google.datastore.v1.GqlQueryParameter.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.GqlQueryParameter.newBuilder()
@@ -406,16 +429,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -425,9 +447,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
     }
 
     @java.lang.Override
@@ -446,7 +468,8 @@ public com.google.datastore.v1.GqlQueryParameter build() {
 
     @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter buildPartial() {
-      com.google.datastore.v1.GqlQueryParameter result = new com.google.datastore.v1.GqlQueryParameter(this);
+      com.google.datastore.v1.GqlQueryParameter result =
+          new com.google.datastore.v1.GqlQueryParameter(this);
       if (parameterTypeCase_ == 2) {
         if (valueBuilder_ == null) {
           result.parameterType_ = parameterType_;
@@ -466,38 +489,39 @@ public com.google.datastore.v1.GqlQueryParameter buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.GqlQueryParameter) {
-        return mergeFrom((com.google.datastore.v1.GqlQueryParameter)other);
+        return mergeFrom((com.google.datastore.v1.GqlQueryParameter) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -507,17 +531,20 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) {
       if (other == com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()) return this;
       switch (other.getParameterTypeCase()) {
-        case VALUE: {
-          mergeValue(other.getValue());
-          break;
-        }
-        case CURSOR: {
-          setCursor(other.getCursor());
-          break;
-        }
-        case PARAMETERTYPE_NOT_SET: {
-          break;
-        }
+        case VALUE:
+          {
+            mergeValue(other.getValue());
+            break;
+          }
+        case CURSOR:
+          {
+            setCursor(other.getCursor());
+            break;
+          }
+        case PARAMETERTYPE_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -547,12 +574,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int parameterTypeCase_ = 0;
     private java.lang.Object parameterType_;
-    public ParameterTypeCase
-        getParameterTypeCase() {
-      return ParameterTypeCase.forNumber(
-          parameterTypeCase_);
+
+    public ParameterTypeCase getParameterTypeCase() {
+      return ParameterTypeCase.forNumber(parameterTypeCase_);
     }
 
     public Builder clearParameterType() {
@@ -562,10 +589,14 @@ public Builder clearParameterType() {
       return this;
     }
 
-
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_;
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        valueBuilder_;
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -576,6 +607,8 @@ public boolean hasValue() {
       return parameterTypeCase_ == 2;
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -596,6 +629,8 @@ public com.google.datastore.v1.Value getValue() {
       }
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -616,14 +651,15 @@ public Builder setValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

      *
      * .google.datastore.v1.Value value = 2;
      */
-    public Builder setValue(
-        com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
       if (valueBuilder_ == null) {
         parameterType_ = builderForValue.build();
         onChanged();
@@ -634,6 +670,8 @@ public Builder setValue(
       return this;
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -642,10 +680,13 @@ public Builder setValue(
      */
     public Builder mergeValue(com.google.datastore.v1.Value value) {
       if (valueBuilder_ == null) {
-        if (parameterTypeCase_ == 2 &&
-            parameterType_ != com.google.datastore.v1.Value.getDefaultInstance()) {
-          parameterType_ = com.google.datastore.v1.Value.newBuilder((com.google.datastore.v1.Value) parameterType_)
-              .mergeFrom(value).buildPartial();
+        if (parameterTypeCase_ == 2
+            && parameterType_ != com.google.datastore.v1.Value.getDefaultInstance()) {
+          parameterType_ =
+              com.google.datastore.v1.Value.newBuilder(
+                      (com.google.datastore.v1.Value) parameterType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           parameterType_ = value;
         }
@@ -660,6 +701,8 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -683,6 +726,8 @@ public Builder clearValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -693,6 +738,8 @@ public com.google.datastore.v1.Value.Builder getValueBuilder() {
       return getValueFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -710,6 +757,8 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * A value parameter.
      * 

@@ -717,25 +766,31 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
      * .google.datastore.v1.Value value = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> 
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
         getValueFieldBuilder() {
       if (valueBuilder_ == null) {
         if (!(parameterTypeCase_ == 2)) {
           parameterType_ = com.google.datastore.v1.Value.getDefaultInstance();
         }
-        valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>(
-                (com.google.datastore.v1.Value) parameterType_,
-                getParentForChildren(),
-                isClean());
+        valueBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
+                (com.google.datastore.v1.Value) parameterType_, getParentForChildren(), isClean());
         parameterType_ = null;
       }
       parameterTypeCase_ = 2;
-      onChanged();;
+      onChanged();
+      ;
       return valueBuilder_;
     }
 
     /**
+     *
+     *
      * 
      * A query cursor. Query cursors are returned in query
      * result batches.
@@ -750,6 +805,8 @@ public com.google.protobuf.ByteString getCursor() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
+     *
+     *
      * 
      * A query cursor. Query cursors are returned in query
      * result batches.
@@ -759,14 +816,16 @@ public com.google.protobuf.ByteString getCursor() {
      */
     public Builder setCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  parameterTypeCase_ = 3;
+        throw new NullPointerException();
+      }
+      parameterTypeCase_ = 3;
       parameterType_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A query cursor. Query cursors are returned in query
      * result batches.
@@ -782,9 +841,9 @@ public Builder clearCursor() {
       }
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -794,12 +853,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.GqlQueryParameter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQueryParameter)
   private static final com.google.datastore.v1.GqlQueryParameter DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.GqlQueryParameter();
   }
@@ -808,16 +867,16 @@ public static com.google.datastore.v1.GqlQueryParameter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public GqlQueryParameter parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GqlQueryParameter(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public GqlQueryParameter parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new GqlQueryParameter(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -832,6 +891,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 d764a7260567..d5b266f1a7e1 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface GqlQueryParameterOrBuilder extends
+public interface GqlQueryParameterOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.GqlQueryParameter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * A value parameter.
    * 

@@ -16,6 +19,8 @@ public interface GqlQueryParameterOrBuilder extends
    */
   boolean hasValue();
   /**
+   *
+   *
    * 
    * A value parameter.
    * 

@@ -24,6 +29,8 @@ public interface GqlQueryParameterOrBuilder extends
    */
   com.google.datastore.v1.Value getValue();
   /**
+   *
+   *
    * 
    * A value parameter.
    * 

@@ -33,6 +40,8 @@ public interface GqlQueryParameterOrBuilder extends
   com.google.datastore.v1.ValueOrBuilder getValueOrBuilder();
 
   /**
+   *
+   *
    * 
    * A query cursor. Query cursors are returned in query
    * result batches.
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 4aa66ebd8577..ab50a91bfb98 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
@@ -4,6 +4,8 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A unique identifier for an entity.
  * If a key's partition ID or any of its path kinds or names are
@@ -13,24 +15,25 @@
  *
  * Protobuf type {@code google.datastore.v1.Key}
  */
-public  final class Key extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class Key extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Key)
     KeyOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use Key.newBuilder() to construct.
   private Key(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private Key() {
     path_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private Key(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -50,42 +53,46 @@ private Key(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.PartitionId.Builder subBuilder = null;
-            if (partitionId_ != null) {
-              subBuilder = partitionId_.toBuilder();
-            }
-            partitionId_ = input.readMessage(com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(partitionId_);
-              partitionId_ = subBuilder.buildPartial();
-            }
+          case 10:
+            {
+              com.google.datastore.v1.PartitionId.Builder subBuilder = null;
+              if (partitionId_ != null) {
+                subBuilder = partitionId_.toBuilder();
+              }
+              partitionId_ =
+                  input.readMessage(
+                      com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(partitionId_);
+                partitionId_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              path_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
+              break;
             }
-            path_.add(
-                input.readMessage(com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry));
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                path_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              path_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
         path_ = java.util.Collections.unmodifiableList(path_);
@@ -94,24 +101,27 @@ private Key(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class);
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_Key_fieldAccessorTable.ensureFieldAccessorsInitialized(
+        com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class);
   }
 
-  public interface PathElementOrBuilder extends
+  public interface PathElementOrBuilder
+      extends
       // @@protoc_insertion_point(interface_extends:google.datastore.v1.Key.PathElement)
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     *
+     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -123,6 +133,8 @@ public interface PathElementOrBuilder extends
      */
     java.lang.String getKind();
     /**
+     *
+     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -132,10 +144,11 @@ public interface PathElementOrBuilder extends
      *
      * string kind = 1;
      */
-    com.google.protobuf.ByteString
-        getKindBytes();
+    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
@@ -147,6 +160,8 @@ public interface PathElementOrBuilder extends
     long getId();
 
     /**
+     *
+     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -158,6 +173,8 @@ public interface PathElementOrBuilder extends
      */
     java.lang.String getName();
     /**
+     *
+     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -167,12 +184,13 @@ public interface PathElementOrBuilder extends
      *
      * string name = 3;
      */
-    com.google.protobuf.ByteString
-        getNameBytes();
+    com.google.protobuf.ByteString getNameBytes();
 
     public 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.
@@ -181,24 +199,25 @@ public interface PathElementOrBuilder extends
    *
    * Protobuf type {@code google.datastore.v1.Key.PathElement}
    */
-  public  static final class PathElement extends
-      com.google.protobuf.GeneratedMessageV3 implements
+  public static final class PathElement extends com.google.protobuf.GeneratedMessageV3
+      implements
       // @@protoc_insertion_point(message_implements:google.datastore.v1.Key.PathElement)
       PathElementOrBuilder {
-  private static final long serialVersionUID = 0L;
+    private static final long serialVersionUID = 0L;
     // Use PathElement.newBuilder() to construct.
     private PathElement(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
+
     private PathElement() {
       kind_ = "";
     }
 
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
+
     private PathElement(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -218,69 +237,73 @@ private PathElement(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
 
-              kind_ = s;
-              break;
-            }
-            case 16: {
-              idTypeCase_ = 2;
-              idType_ = input.readInt64();
-              break;
-            }
-            case 26: {
-              java.lang.String s = input.readStringRequireUtf8();
-              idTypeCase_ = 3;
-              idType_ = s;
-              break;
-            }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
+                kind_ = s;
+                break;
+              }
+            case 16:
+              {
+                idTypeCase_ = 2;
+                idType_ = input.readInt64();
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                idTypeCase_ = 3;
+                idType_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
               }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
+
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Key_PathElement_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.Key.PathElement.class, com.google.datastore.v1.Key.PathElement.Builder.class);
+              com.google.datastore.v1.Key.PathElement.class,
+              com.google.datastore.v1.Key.PathElement.Builder.class);
     }
 
     private int idTypeCase_ = 0;
     private java.lang.Object idType_;
-    public enum IdTypeCase
-        implements com.google.protobuf.Internal.EnumLite {
+
+    public enum IdTypeCase implements com.google.protobuf.Internal.EnumLite {
       ID(2),
       NAME(3),
       IDTYPE_NOT_SET(0);
       private final int value;
+
       private IdTypeCase(int value) {
         this.value = value;
       }
-      /**
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
+      /** @deprecated Use {@link #forNumber(int)} instead. */
       @java.lang.Deprecated
       public static IdTypeCase valueOf(int value) {
         return forNumber(value);
@@ -288,26 +311,31 @@ public static IdTypeCase valueOf(int value) {
 
       public static IdTypeCase forNumber(int value) {
         switch (value) {
-          case 2: return ID;
-          case 3: return NAME;
-          case 0: return IDTYPE_NOT_SET;
-          default: return null;
+          case 2:
+            return ID;
+          case 3:
+            return NAME;
+          case 0:
+            return IDTYPE_NOT_SET;
+          default:
+            return null;
         }
       }
+
       public int getNumber() {
         return this.value;
       }
     };
 
-    public IdTypeCase
-    getIdTypeCase() {
-      return IdTypeCase.forNumber(
-          idTypeCase_);
+    public IdTypeCase getIdTypeCase() {
+      return IdTypeCase.forNumber(idTypeCase_);
     }
 
     public static final int KIND_FIELD_NUMBER = 1;
     private volatile java.lang.Object kind_;
     /**
+     *
+     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -322,14 +350,15 @@ public java.lang.String getKind() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         kind_ = s;
         return s;
       }
     }
     /**
+     *
+     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -339,13 +368,11 @@ public java.lang.String getKind() {
      *
      * string kind = 1;
      */
-    public com.google.protobuf.ByteString
-        getKindBytes() {
+    public com.google.protobuf.ByteString getKindBytes() {
       java.lang.Object ref = kind_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         kind_ = b;
         return b;
       } else {
@@ -355,6 +382,8 @@ public java.lang.String getKind() {
 
     public static final int ID_FIELD_NUMBER = 2;
     /**
+     *
+     *
      * 
      * The auto-allocated ID of the entity.
      * Never equal to zero. Values less than zero are discouraged and may not
@@ -372,6 +401,8 @@ public long getId() {
 
     public static final int NAME_FIELD_NUMBER = 3;
     /**
+     *
+     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -389,8 +420,7 @@ public java.lang.String getName() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (idTypeCase_ == 3) {
           idType_ = s;
@@ -399,6 +429,8 @@ public java.lang.String getName() {
       }
     }
     /**
+     *
+     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -408,16 +440,14 @@ public java.lang.String getName() {
      *
      * string name = 3;
      */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
+    public com.google.protobuf.ByteString getNameBytes() {
       java.lang.Object ref = "";
       if (idTypeCase_ == 3) {
         ref = idType_;
       }
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         if (idTypeCase_ == 3) {
           idType_ = b;
         }
@@ -428,6 +458,7 @@ public java.lang.String getName() {
     }
 
     private byte memoizedIsInitialized = -1;
+
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -439,14 +470,12 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getKindBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kind_);
       }
       if (idTypeCase_ == 2) {
-        output.writeInt64(
-            2, (long)((java.lang.Long) idType_));
+        output.writeInt64(2, (long) ((java.lang.Long) idType_));
       }
       if (idTypeCase_ == 3) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, idType_);
@@ -464,9 +493,9 @@ public int getSerializedSize() {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kind_);
       }
       if (idTypeCase_ == 2) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(
-              2, (long)((java.lang.Long) idType_));
+        size +=
+            com.google.protobuf.CodedOutputStream.computeInt64Size(
+                2, (long) ((java.lang.Long) idType_));
       }
       if (idTypeCase_ == 3) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, idType_);
@@ -479,7 +508,7 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-       return true;
+        return true;
       }
       if (!(obj instanceof com.google.datastore.v1.Key.PathElement)) {
         return super.equals(obj);
@@ -487,19 +516,15 @@ public boolean equals(final java.lang.Object obj) {
       com.google.datastore.v1.Key.PathElement other = (com.google.datastore.v1.Key.PathElement) obj;
 
       boolean result = true;
-      result = result && getKind()
-          .equals(other.getKind());
-      result = result && getIdTypeCase().equals(
-          other.getIdTypeCase());
+      result = result && getKind().equals(other.getKind());
+      result = result && getIdTypeCase().equals(other.getIdTypeCase());
       if (!result) return false;
       switch (idTypeCase_) {
         case 2:
-          result = result && (getId()
-              == other.getId());
+          result = result && (getId() == other.getId());
           break;
         case 3:
-          result = result && getName()
-              .equals(other.getName());
+          result = result && getName().equals(other.getName());
           break;
         case 0:
         default:
@@ -520,8 +545,7 @@ public int hashCode() {
       switch (idTypeCase_) {
         case 2:
           hash = (37 * hash) + ID_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-              getId());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getId());
           break;
         case 3:
           hash = (37 * hash) + NAME_FIELD_NUMBER;
@@ -535,88 +559,94 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.datastore.v1.Key.PathElement parseFrom(
-        java.nio.ByteBuffer data)
+    public static com.google.datastore.v1.Key.PathElement parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
     }
-    public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
+
+    public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.Key.PathElement parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
+
     public static Builder newBuilder(com.google.datastore.v1.Key.PathElement prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -626,6 +656,8 @@ protected Builder newBuilderForType(
       return builder;
     }
     /**
+     *
+     *
      * 
      * A (kind, ID/name) pair used to construct a key path.
      * If either name or ID is set, the element is complete.
@@ -634,21 +666,24 @@ protected Builder newBuilderForType(
      *
      * Protobuf type {@code google.datastore.v1.Key.PathElement}
      */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
         // @@protoc_insertion_point(builder_implements:google.datastore.v1.Key.PathElement)
         com.google.datastore.v1.Key.PathElementOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.datastore.v1.EntityProto
+            .internal_static_google_datastore_v1_Key_PathElement_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
+        return com.google.datastore.v1.EntityProto
+            .internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.google.datastore.v1.Key.PathElement.class, com.google.datastore.v1.Key.PathElement.Builder.class);
+                com.google.datastore.v1.Key.PathElement.class,
+                com.google.datastore.v1.Key.PathElement.Builder.class);
       }
 
       // Construct using com.google.datastore.v1.Key.PathElement.newBuilder()
@@ -656,16 +691,15 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
+
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
+
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -677,9 +711,9 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.v1.EntityProto
+            .internal_static_google_datastore_v1_Key_PathElement_descriptor;
       }
 
       @java.lang.Override
@@ -698,7 +732,8 @@ public com.google.datastore.v1.Key.PathElement build() {
 
       @java.lang.Override
       public com.google.datastore.v1.Key.PathElement buildPartial() {
-        com.google.datastore.v1.Key.PathElement result = new com.google.datastore.v1.Key.PathElement(this);
+        com.google.datastore.v1.Key.PathElement result =
+            new com.google.datastore.v1.Key.PathElement(this);
         result.kind_ = kind_;
         if (idTypeCase_ == 2) {
           result.idType_ = idType_;
@@ -715,38 +750,41 @@ public com.google.datastore.v1.Key.PathElement buildPartial() {
       public Builder clone() {
         return (Builder) super.clone();
       }
+
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+
       @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+
       @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
+          int index,
+          java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.Key.PathElement) {
-          return mergeFrom((com.google.datastore.v1.Key.PathElement)other);
+          return mergeFrom((com.google.datastore.v1.Key.PathElement) other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -760,19 +798,22 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) {
           onChanged();
         }
         switch (other.getIdTypeCase()) {
-          case ID: {
-            setId(other.getId());
-            break;
-          }
-          case NAME: {
-            idTypeCase_ = 3;
-            idType_ = other.idType_;
-            onChanged();
-            break;
-          }
-          case IDTYPE_NOT_SET: {
-            break;
-          }
+          case ID:
+            {
+              setId(other.getId());
+              break;
+            }
+          case NAME:
+            {
+              idTypeCase_ = 3;
+              idType_ = other.idType_;
+              onChanged();
+              break;
+            }
+          case IDTYPE_NOT_SET:
+            {
+              break;
+            }
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -802,12 +843,12 @@ public Builder mergeFrom(
         }
         return this;
       }
+
       private int idTypeCase_ = 0;
       private java.lang.Object idType_;
-      public IdTypeCase
-          getIdTypeCase() {
-        return IdTypeCase.forNumber(
-            idTypeCase_);
+
+      public IdTypeCase getIdTypeCase() {
+        return IdTypeCase.forNumber(idTypeCase_);
       }
 
       public Builder clearIdType() {
@@ -817,9 +858,10 @@ public Builder clearIdType() {
         return this;
       }
 
-
       private java.lang.Object kind_ = "";
       /**
+       *
+       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -832,8 +874,7 @@ public Builder clearIdType() {
       public java.lang.String getKind() {
         java.lang.Object ref = kind_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           kind_ = s;
           return s;
@@ -842,6 +883,8 @@ public java.lang.String getKind() {
         }
       }
       /**
+       *
+       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -851,13 +894,11 @@ public java.lang.String getKind() {
        *
        * string kind = 1;
        */
-      public com.google.protobuf.ByteString
-          getKindBytes() {
+      public com.google.protobuf.ByteString getKindBytes() {
         java.lang.Object ref = kind_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           kind_ = b;
           return b;
         } else {
@@ -865,6 +906,8 @@ public java.lang.String getKind() {
         }
       }
       /**
+       *
+       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -874,17 +917,18 @@ public java.lang.String getKind() {
        *
        * string kind = 1;
        */
-      public Builder setKind(
-          java.lang.String value) {
+      public Builder setKind(java.lang.String value) {
         if (value == null) {
-    throw new NullPointerException();
-  }
-  
+          throw new NullPointerException();
+        }
+
         kind_ = value;
         onChanged();
         return this;
       }
       /**
+       *
+       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -895,12 +939,14 @@ public Builder setKind(
        * string kind = 1;
        */
       public Builder clearKind() {
-        
+
         kind_ = getDefaultInstance().getKind();
         onChanged();
         return this;
       }
       /**
+       *
+       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -910,19 +956,20 @@ public Builder clearKind() {
        *
        * string kind = 1;
        */
-      public Builder setKindBytes(
-          com.google.protobuf.ByteString value) {
+      public Builder setKindBytes(com.google.protobuf.ByteString value) {
         if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
+          throw new NullPointerException();
+        }
+        checkByteStringIsUtf8(value);
+
         kind_ = value;
         onChanged();
         return this;
       }
 
       /**
+       *
+       *
        * 
        * The auto-allocated ID of the entity.
        * Never equal to zero. Values less than zero are discouraged and may not
@@ -938,6 +985,8 @@ public long getId() {
         return 0L;
       }
       /**
+       *
+       *
        * 
        * The auto-allocated ID of the entity.
        * Never equal to zero. Values less than zero are discouraged and may not
@@ -953,6 +1002,8 @@ public Builder setId(long value) {
         return this;
       }
       /**
+       *
+       *
        * 
        * The auto-allocated ID of the entity.
        * Never equal to zero. Values less than zero are discouraged and may not
@@ -971,6 +1022,8 @@ public Builder clearId() {
       }
 
       /**
+       *
+       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -986,8 +1039,7 @@ public java.lang.String getName() {
           ref = idType_;
         }
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (idTypeCase_ == 3) {
             idType_ = s;
@@ -998,6 +1050,8 @@ public java.lang.String getName() {
         }
       }
       /**
+       *
+       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1007,16 +1061,14 @@ public java.lang.String getName() {
        *
        * string name = 3;
        */
-      public com.google.protobuf.ByteString
-          getNameBytes() {
+      public com.google.protobuf.ByteString getNameBytes() {
         java.lang.Object ref = "";
         if (idTypeCase_ == 3) {
           ref = idType_;
         }
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           if (idTypeCase_ == 3) {
             idType_ = b;
           }
@@ -1026,6 +1078,8 @@ public java.lang.String getName() {
         }
       }
       /**
+       *
+       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1035,17 +1089,18 @@ public java.lang.String getName() {
        *
        * string name = 3;
        */
-      public Builder setName(
-          java.lang.String value) {
+      public Builder setName(java.lang.String value) {
         if (value == null) {
-    throw new NullPointerException();
-  }
-  idTypeCase_ = 3;
+          throw new NullPointerException();
+        }
+        idTypeCase_ = 3;
         idType_ = value;
         onChanged();
         return this;
       }
       /**
+       *
+       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1064,6 +1119,8 @@ public Builder clearName() {
         return this;
       }
       /**
+       *
+       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1073,17 +1130,17 @@ public Builder clearName() {
        *
        * string name = 3;
        */
-      public Builder setNameBytes(
-          com.google.protobuf.ByteString value) {
+      public Builder setNameBytes(com.google.protobuf.ByteString value) {
         if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
+          throw new NullPointerException();
+        }
+        checkByteStringIsUtf8(value);
         idTypeCase_ = 3;
         idType_ = value;
         onChanged();
         return this;
       }
+
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1096,12 +1153,12 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
-
       // @@protoc_insertion_point(builder_scope:google.datastore.v1.Key.PathElement)
     }
 
     // @@protoc_insertion_point(class_scope:google.datastore.v1.Key.PathElement)
     private static final com.google.datastore.v1.Key.PathElement DEFAULT_INSTANCE;
+
     static {
       DEFAULT_INSTANCE = new com.google.datastore.v1.Key.PathElement();
     }
@@ -1110,16 +1167,16 @@ public static com.google.datastore.v1.Key.PathElement getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public PathElement parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PathElement(input, extensionRegistry);
-      }
-    };
+    private static final com.google.protobuf.Parser PARSER =
+        new com.google.protobuf.AbstractParser() {
+          @java.lang.Override
+          public PathElement parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            return new PathElement(input, extensionRegistry);
+          }
+        };
 
     public static com.google.protobuf.Parser parser() {
       return PARSER;
@@ -1134,13 +1191,14 @@ public com.google.protobuf.Parser getParserForType() {
     public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
-
   }
 
   private int bitField0_;
   public static final int PARTITION_ID_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PartitionId partitionId_;
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -1153,6 +1211,8 @@ public boolean hasPartitionId() {
     return partitionId_ != null;
   }
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -1162,9 +1222,13 @@ public boolean hasPartitionId() {
    * .google.datastore.v1.PartitionId partition_id = 1;
    */
   public com.google.datastore.v1.PartitionId getPartitionId() {
-    return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
+    return partitionId_ == null
+        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+        : partitionId_;
   }
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -1180,6 +1244,8 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
   public static final int PATH_FIELD_NUMBER = 2;
   private java.util.List path_;
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1203,6 +1269,8 @@ public java.util.List getPathList() {
     return path_;
   }
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1222,11 +1290,13 @@ public java.util.List getPathList() {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  public java.util.List 
+  public java.util.List
       getPathOrBuilderList() {
     return path_;
   }
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1250,6 +1320,8 @@ public int getPathCount() {
     return path_.size();
   }
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1273,6 +1345,8 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
     return path_.get(index);
   }
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1292,12 +1366,12 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
-      int index) {
+  public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int index) {
     return path_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -1309,8 +1383,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (partitionId_ != null) {
       output.writeMessage(1, getPartitionId());
     }
@@ -1327,12 +1400,10 @@ public int getSerializedSize() {
 
     size = 0;
     if (partitionId_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getPartitionId());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPartitionId());
     }
     for (int i = 0; i < path_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, path_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, path_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -1342,7 +1413,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Key)) {
       return super.equals(obj);
@@ -1352,11 +1423,9 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasPartitionId() == other.hasPartitionId());
     if (hasPartitionId()) {
-      result = result && getPartitionId()
-          .equals(other.getPartitionId());
+      result = result && getPartitionId().equals(other.getPartitionId());
     }
-    result = result && getPathList()
-        .equals(other.getPathList());
+    result = result && getPathList().equals(other.getPathList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -1381,97 +1450,103 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Key parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Key parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Key parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.Key parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.Key parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Key parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Key parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Key parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Key parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Key parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Key parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Key parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.Key parseFrom(
-      com.google.protobuf.CodedInputStream input)
+
+  public static com.google.datastore.v1.Key parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Key parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.Key prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A unique identifier for an entity.
    * If a key's partition ID or any of its path kinds or names are
@@ -1481,19 +1556,19 @@ protected Builder newBuilderForType(
    *
    * Protobuf type {@code google.datastore.v1.Key}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Key)
       com.google.datastore.v1.KeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Key_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class);
     }
@@ -1503,17 +1578,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getPathFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -1533,8 +1608,7 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
     }
 
@@ -1580,38 +1654,39 @@ public com.google.datastore.v1.Key buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Key) {
-        return mergeFrom((com.google.datastore.v1.Key)other);
+        return mergeFrom((com.google.datastore.v1.Key) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1641,9 +1716,10 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
             pathBuilder_ = null;
             path_ = other.path_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            pathBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getPathFieldBuilder() : null;
+            pathBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getPathFieldBuilder()
+                    : null;
           } else {
             pathBuilder_.addAllMessages(other.path_);
           }
@@ -1677,12 +1753,18 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private com.google.datastore.v1.PartitionId partitionId_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_;
+            com.google.datastore.v1.PartitionId,
+            com.google.datastore.v1.PartitionId.Builder,
+            com.google.datastore.v1.PartitionIdOrBuilder>
+        partitionIdBuilder_;
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1695,6 +1777,8 @@ public boolean hasPartitionId() {
       return partitionIdBuilder_ != null || partitionId_ != null;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1705,12 +1789,16 @@ public boolean hasPartitionId() {
      */
     public com.google.datastore.v1.PartitionId getPartitionId() {
       if (partitionIdBuilder_ == null) {
-        return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
+        return partitionId_ == null
+            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+            : partitionId_;
       } else {
         return partitionIdBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1733,6 +1821,8 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1741,8 +1831,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
      *
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
-    public Builder setPartitionId(
-        com.google.datastore.v1.PartitionId.Builder builderForValue) {
+    public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
       if (partitionIdBuilder_ == null) {
         partitionId_ = builderForValue.build();
         onChanged();
@@ -1753,6 +1842,8 @@ public Builder setPartitionId(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1765,7 +1856,9 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       if (partitionIdBuilder_ == null) {
         if (partitionId_ != null) {
           partitionId_ =
-            com.google.datastore.v1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           partitionId_ = value;
         }
@@ -1777,6 +1870,8 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1797,6 +1892,8 @@ public Builder clearPartitionId() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1806,11 +1903,13 @@ public Builder clearPartitionId() {
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
     public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
-      
+
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1823,11 +1922,14 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
       if (partitionIdBuilder_ != null) {
         return partitionIdBuilder_.getMessageOrBuilder();
       } else {
-        return partitionId_ == null ?
-            com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
+        return partitionId_ == null
+            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+            : partitionId_;
       }
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1837,32 +1939,41 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> 
+            com.google.datastore.v1.PartitionId,
+            com.google.datastore.v1.PartitionId.Builder,
+            com.google.datastore.v1.PartitionIdOrBuilder>
         getPartitionIdFieldBuilder() {
       if (partitionIdBuilder_ == null) {
-        partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder>(
-                getPartitionId(),
-                getParentForChildren(),
-                isClean());
+        partitionIdBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PartitionId,
+                com.google.datastore.v1.PartitionId.Builder,
+                com.google.datastore.v1.PartitionIdOrBuilder>(
+                getPartitionId(), getParentForChildren(), isClean());
         partitionId_ = null;
       }
       return partitionIdBuilder_;
     }
 
     private java.util.List path_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensurePathIsMutable() {
       if (!((bitField0_ & 0x00000002) == 0x00000002)) {
         path_ = new java.util.ArrayList(path_);
         bitField0_ |= 0x00000002;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder> pathBuilder_;
+            com.google.datastore.v1.Key.PathElement,
+            com.google.datastore.v1.Key.PathElement.Builder,
+            com.google.datastore.v1.Key.PathElementOrBuilder>
+        pathBuilder_;
 
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -1890,6 +2001,8 @@ public java.util.List getPathList() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -1917,6 +2030,8 @@ public int getPathCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -1944,6 +2059,8 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -1963,8 +2080,7 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public Builder setPath(
-        int index, com.google.datastore.v1.Key.PathElement value) {
+    public Builder setPath(int index, com.google.datastore.v1.Key.PathElement value) {
       if (pathBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1978,6 +2094,8 @@ public Builder setPath(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2009,6 +2127,8 @@ public Builder setPath(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2042,6 +2162,8 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2061,8 +2183,7 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement value) {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public Builder addPath(
-        int index, com.google.datastore.v1.Key.PathElement value) {
+    public Builder addPath(int index, com.google.datastore.v1.Key.PathElement value) {
       if (pathBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2076,6 +2197,8 @@ public Builder addPath(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2095,8 +2218,7 @@ public Builder addPath(
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public Builder addPath(
-        com.google.datastore.v1.Key.PathElement.Builder builderForValue) {
+    public Builder addPath(com.google.datastore.v1.Key.PathElement.Builder builderForValue) {
       if (pathBuilder_ == null) {
         ensurePathIsMutable();
         path_.add(builderForValue.build());
@@ -2107,6 +2229,8 @@ public Builder addPath(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2138,6 +2262,8 @@ public Builder addPath(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2161,8 +2287,7 @@ public Builder addAllPath(
         java.lang.Iterable values) {
       if (pathBuilder_ == null) {
         ensurePathIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, path_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, path_);
         onChanged();
       } else {
         pathBuilder_.addAllMessages(values);
@@ -2170,6 +2295,8 @@ public Builder addAllPath(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2200,6 +2327,8 @@ public Builder clearPath() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2230,6 +2359,8 @@ public Builder removePath(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2249,11 +2380,12 @@ public Builder removePath(int index) {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(
-        int index) {
+    public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(int index) {
       return getPathFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2273,14 +2405,16 @@ public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
-        int index) {
+    public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int index) {
       if (pathBuilder_ == null) {
-        return path_.get(index);  } else {
+        return path_.get(index);
+      } else {
         return pathBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2300,8 +2434,8 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public java.util.List 
-         getPathOrBuilderList() {
+    public java.util.List
+        getPathOrBuilderList() {
       if (pathBuilder_ != null) {
         return pathBuilder_.getMessageOrBuilderList();
       } else {
@@ -2309,6 +2443,8 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2329,10 +2465,12 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
     public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() {
-      return getPathFieldBuilder().addBuilder(
-          com.google.datastore.v1.Key.PathElement.getDefaultInstance());
+      return getPathFieldBuilder()
+          .addBuilder(com.google.datastore.v1.Key.PathElement.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2352,12 +2490,13 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(
-        int index) {
-      return getPathFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Key.PathElement.getDefaultInstance());
+    public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(int index) {
+      return getPathFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Key.PathElement.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2377,16 +2516,21 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public java.util.List 
-         getPathBuilderList() {
+    public java.util.List getPathBuilderList() {
       return getPathFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder> 
+            com.google.datastore.v1.Key.PathElement,
+            com.google.datastore.v1.Key.PathElement.Builder,
+            com.google.datastore.v1.Key.PathElementOrBuilder>
         getPathFieldBuilder() {
       if (pathBuilder_ == null) {
-        pathBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder>(
+        pathBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Key.PathElement,
+                com.google.datastore.v1.Key.PathElement.Builder,
+                com.google.datastore.v1.Key.PathElementOrBuilder>(
                 path_,
                 ((bitField0_ & 0x00000002) == 0x00000002),
                 getParentForChildren(),
@@ -2395,9 +2539,9 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(
       }
       return pathBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -2407,12 +2551,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Key)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Key)
   private static final com.google.datastore.v1.Key DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Key();
   }
@@ -2421,16 +2565,16 @@ public static com.google.datastore.v1.Key getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public Key parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Key(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Key parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Key(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -2445,6 +2589,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Key getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 c50a8f56d715..b725938e5c7a 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface KeyOrBuilder extends
+public interface KeyOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Key)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -18,6 +21,8 @@ public interface KeyOrBuilder extends
    */
   boolean hasPartitionId();
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -28,6 +33,8 @@ public interface KeyOrBuilder extends
    */
   com.google.datastore.v1.PartitionId getPartitionId();
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -39,6 +46,8 @@ public interface KeyOrBuilder extends
   com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder();
 
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -58,9 +67,10 @@ public interface KeyOrBuilder extends
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  java.util.List 
-      getPathList();
+  java.util.List getPathList();
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -82,6 +92,8 @@ public interface KeyOrBuilder extends
    */
   com.google.datastore.v1.Key.PathElement getPath(int index);
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -103,6 +115,8 @@ public interface KeyOrBuilder extends
    */
   int getPathCount();
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -122,9 +136,10 @@ public interface KeyOrBuilder extends
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  java.util.List 
-      getPathOrBuilderList();
+  java.util.List getPathOrBuilderList();
   /**
+   *
+   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -144,6 +159,5 @@ public interface KeyOrBuilder extends
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
-      int index);
+  com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int index);
 }
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 1b209dd97bce..3193475cfd47 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A representation of a kind.
  * 

  *
  * Protobuf type {@code google.datastore.v1.KindExpression}
  */
-public  final class KindExpression extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class KindExpression extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.KindExpression)
     KindExpressionOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use KindExpression.newBuilder() to construct.
   private KindExpression(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private KindExpression() {
     name_ = "";
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private KindExpression(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,47 +50,52 @@ private KindExpression(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            name_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_KindExpression_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.KindExpression.class, com.google.datastore.v1.KindExpression.Builder.class);
+            com.google.datastore.v1.KindExpression.class,
+            com.google.datastore.v1.KindExpression.Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
   private volatile java.lang.Object name_;
   /**
+   *
+   *
    * 
    * The name of the kind.
    * 

@@ -99,27 +107,26 @@ public java.lang.String getName() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The name of the kind.
    * 

    *
    * string name = 1;
    */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
+  public com.google.protobuf.ByteString getNameBytes() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       name_ = b;
       return b;
     } else {
@@ -128,6 +135,7 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -139,8 +147,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
@@ -164,7 +171,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.KindExpression)) {
       return super.equals(obj);
@@ -172,8 +179,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.KindExpression other = (com.google.datastore.v1.KindExpression) obj;
 
     boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
+    result = result && getName().equals(other.getName());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -192,118 +198,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.KindExpression parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.KindExpression parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.KindExpression parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.KindExpression parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.KindExpression parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.KindExpression prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A representation of a kind.
    * 

    *
    * Protobuf type {@code google.datastore.v1.KindExpression}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.KindExpression)
       com.google.datastore.v1.KindExpressionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_KindExpression_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.KindExpression.class, com.google.datastore.v1.KindExpression.Builder.class);
+              com.google.datastore.v1.KindExpression.class,
+              com.google.datastore.v1.KindExpression.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.KindExpression.newBuilder()
@@ -311,16 +326,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -330,9 +344,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_KindExpression_descriptor;
     }
 
     @java.lang.Override
@@ -351,7 +365,8 @@ public com.google.datastore.v1.KindExpression build() {
 
     @java.lang.Override
     public com.google.datastore.v1.KindExpression buildPartial() {
-      com.google.datastore.v1.KindExpression result = new com.google.datastore.v1.KindExpression(this);
+      com.google.datastore.v1.KindExpression result =
+          new com.google.datastore.v1.KindExpression(this);
       result.name_ = name_;
       onBuilt();
       return result;
@@ -361,38 +376,39 @@ public com.google.datastore.v1.KindExpression buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.KindExpression) {
-        return mergeFrom((com.google.datastore.v1.KindExpression)other);
+        return mergeFrom((com.google.datastore.v1.KindExpression) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -436,6 +452,8 @@ public Builder mergeFrom(
 
     private java.lang.Object name_ = "";
     /**
+     *
+     *
      * 
      * The name of the kind.
      * 

@@ -445,8 +463,7 @@ public Builder mergeFrom(
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
@@ -455,19 +472,19 @@ public java.lang.String getName() {
       }
     }
     /**
+     *
+     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
      */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
+    public com.google.protobuf.ByteString getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -475,23 +492,26 @@ public java.lang.String getName() {
       }
     }
     /**
+     *
+     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
      */
-    public Builder setName(
-        java.lang.String value) {
+    public Builder setName(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       name_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The name of the kind.
      * 

@@ -499,32 +519,33 @@ public Builder setName(
      * string name = 1;
      */
     public Builder clearName() {
-      
+
       name_ = getDefaultInstance().getName();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
      */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setNameBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       name_ = value;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -534,12 +555,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.KindExpression)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.KindExpression)
   private static final com.google.datastore.v1.KindExpression DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.KindExpression();
   }
@@ -548,16 +569,16 @@ public static com.google.datastore.v1.KindExpression getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public KindExpression parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KindExpression(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public KindExpression parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new KindExpression(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -572,6 +593,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.KindExpression getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 8b79326a297d..10b9dbc0727d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface KindExpressionOrBuilder extends
+public interface KindExpressionOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.KindExpression)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The name of the kind.
    * 

@@ -16,12 +19,13 @@ public interface KindExpressionOrBuilder extends
    */
   java.lang.String getName();
   /**
+   *
+   *
    * 
    * The name of the kind.
    * 

    *
    * string name = 1;
    */
-  com.google.protobuf.ByteString
-      getNameBytes();
+  com.google.protobuf.ByteString getNameBytes();
 }
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 28bbc80dfa15..1ad0004e1d4e 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
@@ -4,31 +4,34 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
  * 

  *
  * Protobuf type {@code google.datastore.v1.LookupRequest}
  */
-public  final class LookupRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class LookupRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupRequest)
     LookupRequestOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use LookupRequest.newBuilder() to construct.
   private LookupRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private LookupRequest() {
     projectId_ = "";
     keys_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private LookupRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -48,48 +51,51 @@ private LookupRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
-            if (readOptions_ != null) {
-              subBuilder = readOptions_.toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
+              if (readOptions_ != null) {
+                subBuilder = readOptions_.toBuilder();
+              }
+              readOptions_ =
+                  input.readMessage(
+                      com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(readOptions_);
+                readOptions_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            readOptions_ = input.readMessage(com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(readOptions_);
-              readOptions_ = subBuilder.buildPartial();
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+                keys_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+              break;
             }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              keys_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
+              projectId_ = s;
+              break;
             }
-            keys_.add(
-                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-            break;
-          }
-          case 66: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            projectId_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -98,23 +104,28 @@ private LookupRequest(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_LookupRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.LookupRequest.class, com.google.datastore.v1.LookupRequest.Builder.class);
+            com.google.datastore.v1.LookupRequest.class,
+            com.google.datastore.v1.LookupRequest.Builder.class);
   }
 
   private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -126,27 +137,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -157,6 +167,8 @@ public java.lang.String getProjectId() {
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
   /**
+   *
+   *
    * 
    * The options for this lookup request.
    * 

@@ -167,6 +179,8 @@ public boolean hasReadOptions() {
     return readOptions_ != null;
   }
   /**
+   *
+   *
    * 
    * The options for this lookup request.
    * 

@@ -174,9 +188,13 @@ public boolean hasReadOptions() {
    * .google.datastore.v1.ReadOptions read_options = 1;
    */
   public com.google.datastore.v1.ReadOptions getReadOptions() {
-    return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
+    return readOptions_ == null
+        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+        : readOptions_;
   }
   /**
+   *
+   *
    * 
    * The options for this lookup request.
    * 

@@ -190,6 +208,8 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
   public static final int KEYS_FIELD_NUMBER = 3;
   private java.util.List keys_;
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

@@ -200,17 +220,20 @@ public java.util.List getKeysList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

    *
    * repeated .google.datastore.v1.Key keys = 3;
    */
-  public java.util.List 
-      getKeysOrBuilderList() {
+  public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

@@ -221,6 +244,8 @@ public int getKeysCount() {
     return keys_.size();
   }
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

@@ -231,18 +256,20 @@ public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

    *
    * repeated .google.datastore.v1.Key keys = 3;
    */
-  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index) {
+  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -254,8 +281,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (readOptions_ != null) {
       output.writeMessage(1, getReadOptions());
     }
@@ -275,12 +301,10 @@ public int getSerializedSize() {
 
     size = 0;
     if (readOptions_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getReadOptions());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
     }
     for (int i = 0; i < keys_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, keys_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, keys_.get(i));
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -293,7 +317,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.LookupRequest)) {
       return super.equals(obj);
@@ -301,15 +325,12 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.LookupRequest other = (com.google.datastore.v1.LookupRequest) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
+    result = result && getProjectId().equals(other.getProjectId());
     result = result && (hasReadOptions() == other.hasReadOptions());
     if (hasReadOptions()) {
-      result = result && getReadOptions()
-          .equals(other.getReadOptions());
+      result = result && getReadOptions().equals(other.getReadOptions());
     }
-    result = result && getKeysList()
-        .equals(other.getKeysList());
+    result = result && getKeysList().equals(other.getKeysList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -336,118 +357,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.LookupRequest parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.LookupRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.LookupRequest parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.LookupRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.LookupRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.LookupRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.LookupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
    * 

    *
    * Protobuf type {@code google.datastore.v1.LookupRequest}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.LookupRequest)
       com.google.datastore.v1.LookupRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_LookupRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.LookupRequest.class, com.google.datastore.v1.LookupRequest.Builder.class);
+              com.google.datastore.v1.LookupRequest.class,
+              com.google.datastore.v1.LookupRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.LookupRequest.newBuilder()
@@ -455,17 +484,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getKeysFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -487,9 +516,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_LookupRequest_descriptor;
     }
 
     @java.lang.Override
@@ -508,7 +537,8 @@ public com.google.datastore.v1.LookupRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.LookupRequest buildPartial() {
-      com.google.datastore.v1.LookupRequest result = new com.google.datastore.v1.LookupRequest(this);
+      com.google.datastore.v1.LookupRequest result =
+          new com.google.datastore.v1.LookupRequest(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.projectId_ = projectId_;
@@ -535,38 +565,39 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.LookupRequest) {
-        return mergeFrom((com.google.datastore.v1.LookupRequest)other);
+        return mergeFrom((com.google.datastore.v1.LookupRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -600,9 +631,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
             keysBuilder_ = null;
             keys_ = other.keys_;
             bitField0_ = (bitField0_ & ~0x00000004);
-            keysBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getKeysFieldBuilder() : null;
+            keysBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getKeysFieldBuilder()
+                    : null;
           } else {
             keysBuilder_.addAllMessages(other.keys_);
           }
@@ -636,10 +668,13 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -649,8 +684,7 @@ public Builder mergeFrom(
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -659,19 +693,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -679,23 +713,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -703,25 +740,26 @@ public Builder setProjectId(
      * string project_id = 8;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
@@ -729,8 +767,13 @@ public Builder setProjectIdBytes(
 
     private com.google.datastore.v1.ReadOptions readOptions_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_;
+            com.google.datastore.v1.ReadOptions,
+            com.google.datastore.v1.ReadOptions.Builder,
+            com.google.datastore.v1.ReadOptionsOrBuilder>
+        readOptionsBuilder_;
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -741,6 +784,8 @@ public boolean hasReadOptions() {
       return readOptionsBuilder_ != null || readOptions_ != null;
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -749,12 +794,16 @@ public boolean hasReadOptions() {
      */
     public com.google.datastore.v1.ReadOptions getReadOptions() {
       if (readOptionsBuilder_ == null) {
-        return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
+        return readOptions_ == null
+            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+            : readOptions_;
       } else {
         return readOptionsBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -775,14 +824,15 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
-    public Builder setReadOptions(
-        com.google.datastore.v1.ReadOptions.Builder builderForValue) {
+    public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
       if (readOptionsBuilder_ == null) {
         readOptions_ = builderForValue.build();
         onChanged();
@@ -793,6 +843,8 @@ public Builder setReadOptions(
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -803,7 +855,9 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       if (readOptionsBuilder_ == null) {
         if (readOptions_ != null) {
           readOptions_ =
-            com.google.datastore.v1.ReadOptions.newBuilder(readOptions_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           readOptions_ = value;
         }
@@ -815,6 +869,8 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -833,6 +889,8 @@ public Builder clearReadOptions() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -840,11 +898,13 @@ public Builder clearReadOptions() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
-      
+
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -855,11 +915,14 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
       if (readOptionsBuilder_ != null) {
         return readOptionsBuilder_.getMessageOrBuilder();
       } else {
-        return readOptions_ == null ?
-            com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
+        return readOptions_ == null
+            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+            : readOptions_;
       }
     }
     /**
+     *
+     *
      * 
      * The options for this lookup request.
      * 

@@ -867,32 +930,40 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> 
+            com.google.datastore.v1.ReadOptions,
+            com.google.datastore.v1.ReadOptions.Builder,
+            com.google.datastore.v1.ReadOptionsOrBuilder>
         getReadOptionsFieldBuilder() {
       if (readOptionsBuilder_ == null) {
-        readOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder>(
-                getReadOptions(),
-                getParentForChildren(),
-                isClean());
+        readOptionsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ReadOptions,
+                com.google.datastore.v1.ReadOptions.Builder,
+                com.google.datastore.v1.ReadOptionsOrBuilder>(
+                getReadOptions(), getParentForChildren(), isClean());
         readOptions_ = null;
       }
       return readOptionsBuilder_;
     }
 
-    private java.util.List keys_ =
-      java.util.Collections.emptyList();
+    private java.util.List keys_ = java.util.Collections.emptyList();
+
     private void ensureKeysIsMutable() {
       if (!((bitField0_ & 0x00000004) == 0x00000004)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000004;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        keysBuilder_;
 
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

@@ -907,6 +978,8 @@ public java.util.List getKeysList() {
       }
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

@@ -921,6 +994,8 @@ public int getKeysCount() {
       }
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

@@ -935,14 +1010,15 @@ public com.google.datastore.v1.Key getKeys(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -956,14 +1032,15 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.set(index, builderForValue.build());
@@ -974,6 +1051,8 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

@@ -994,14 +1073,15 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1015,14 +1095,15 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public Builder addKeys(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(builderForValue.build());
@@ -1033,14 +1114,15 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(index, builderForValue.build());
@@ -1051,18 +1133,18 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public Builder addAllKeys(
-        java.lang.Iterable values) {
+    public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, keys_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
         onChanged();
       } else {
         keysBuilder_.addAllMessages(values);
@@ -1070,6 +1152,8 @@ public Builder addAllKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

@@ -1087,6 +1171,8 @@ public Builder clearKeys() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

@@ -1104,39 +1190,43 @@ public Builder removeKeys(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public com.google.datastore.v1.Key.Builder getKeysBuilder(
-        int index) {
+    public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
       return getKeysFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-        int index) {
+    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
       if (keysBuilder_ == null) {
-        return keys_.get(index);  } else {
+        return keys_.get(index);
+      } else {
         return keysBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public java.util.List 
-         getKeysOrBuilderList() {
+    public java.util.List getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
         return keysBuilder_.getMessageOrBuilderList();
       } else {
@@ -1144,6 +1234,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

@@ -1151,38 +1243,45 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
      * repeated .google.datastore.v1.Key keys = 3;
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
-      return getKeysFieldBuilder().addBuilder(
-          com.google.datastore.v1.Key.getDefaultInstance());
+      return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public com.google.datastore.v1.Key.Builder addKeysBuilder(
-        int index) {
-      return getKeysFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
+      return getKeysFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Keys of entities to look up.
      * 

      *
      * repeated .google.datastore.v1.Key keys = 3;
      */
-    public java.util.List 
-         getKeysBuilderList() {
+    public java.util.List getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getKeysFieldBuilder() {
       if (keysBuilder_ == null) {
-        keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+        keysBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(
                 keys_,
                 ((bitField0_ & 0x00000004) == 0x00000004),
                 getParentForChildren(),
@@ -1191,9 +1290,9 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1203,12 +1302,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.LookupRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.LookupRequest)
   private static final com.google.datastore.v1.LookupRequest DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.LookupRequest();
   }
@@ -1217,16 +1316,16 @@ public static com.google.datastore.v1.LookupRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public LookupRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LookupRequest(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public LookupRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new LookupRequest(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1241,6 +1340,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 935d543e91d1..e188717f7c58 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface LookupRequestOrBuilder extends
+public interface LookupRequestOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.LookupRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -16,16 +19,19 @@ public interface LookupRequestOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * The options for this lookup request.
    * 

@@ -34,6 +40,8 @@ public interface LookupRequestOrBuilder extends
    */
   boolean hasReadOptions();
   /**
+   *
+   *
    * 
    * The options for this lookup request.
    * 

@@ -42,6 +50,8 @@ public interface LookupRequestOrBuilder extends
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
   /**
+   *
+   *
    * 
    * The options for this lookup request.
    * 

@@ -51,15 +61,18 @@ public interface LookupRequestOrBuilder extends
   com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder();
 
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

    *
    * repeated .google.datastore.v1.Key keys = 3;
    */
-  java.util.List 
-      getKeysList();
+  java.util.List getKeysList();
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

@@ -68,6 +81,8 @@ public interface LookupRequestOrBuilder extends
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

@@ -76,21 +91,23 @@ public interface LookupRequestOrBuilder extends
    */
   int getKeysCount();
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

    *
    * repeated .google.datastore.v1.Key keys = 3;
    */
-  java.util.List 
-      getKeysOrBuilderList();
+  java.util.List getKeysOrBuilderList();
   /**
+   *
+   *
    * 
    * Keys of entities to look up.
    * 

    *
    * repeated .google.datastore.v1.Key keys = 3;
    */
-  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index);
+  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
 }
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 9e60ec806650..585dd5b47739 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
@@ -4,21 +4,24 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
  * 

  *
  * Protobuf type {@code google.datastore.v1.LookupResponse}
  */
-public  final class LookupResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class LookupResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupResponse)
     LookupResponseOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use LookupResponse.newBuilder() to construct.
   private LookupResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private LookupResponse() {
     found_ = java.util.Collections.emptyList();
     missing_ = java.util.Collections.emptyList();
@@ -26,10 +29,10 @@ private LookupResponse() {
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private LookupResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -49,47 +52,51 @@ private LookupResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              found_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                found_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              found_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
+              break;
             }
-            found_.add(
-                input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              missing_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                missing_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              missing_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
+              break;
             }
-            missing_.add(
-                input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              deferred_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+                deferred_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              deferred_.add(
+                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+              break;
             }
-            deferred_.add(
-                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         found_ = java.util.Collections.unmodifiableList(found_);
@@ -104,22 +111,27 @@ private LookupResponse(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_LookupResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.LookupResponse.class, com.google.datastore.v1.LookupResponse.Builder.class);
+            com.google.datastore.v1.LookupResponse.class,
+            com.google.datastore.v1.LookupResponse.Builder.class);
   }
 
   public static final int FOUND_FIELD_NUMBER = 1;
   private java.util.List found_;
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -132,6 +144,8 @@ public java.util.List getFoundList() {
     return found_;
   }
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -140,11 +154,13 @@ public java.util.List getFoundList() {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  public java.util.List 
+  public java.util.List
       getFoundOrBuilderList() {
     return found_;
   }
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -157,6 +173,8 @@ public int getFoundCount() {
     return found_.size();
   }
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -169,6 +187,8 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
     return found_.get(index);
   }
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -177,14 +197,15 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
-      int index) {
+  public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index) {
     return found_.get(index);
   }
 
   public static final int MISSING_FIELD_NUMBER = 2;
   private java.util.List missing_;
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -197,6 +218,8 @@ public java.util.List getMissingList() {
     return missing_;
   }
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -205,11 +228,13 @@ public java.util.List getMissingList() {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  public java.util.List 
+  public java.util.List
       getMissingOrBuilderList() {
     return missing_;
   }
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -222,6 +247,8 @@ public int getMissingCount() {
     return missing_.size();
   }
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -234,6 +261,8 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
     return missing_.get(index);
   }
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -242,14 +271,15 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
-      int index) {
+  public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int index) {
     return missing_.get(index);
   }
 
   public static final int DEFERRED_FIELD_NUMBER = 3;
   private java.util.List deferred_;
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -262,6 +292,8 @@ public java.util.List getDeferredList() {
     return deferred_;
   }
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -270,11 +302,12 @@ public java.util.List getDeferredList() {
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  public java.util.List 
-      getDeferredOrBuilderList() {
+  public java.util.List getDeferredOrBuilderList() {
     return deferred_;
   }
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -287,6 +320,8 @@ public int getDeferredCount() {
     return deferred_.size();
   }
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -299,6 +334,8 @@ public com.google.datastore.v1.Key getDeferred(int index) {
     return deferred_.get(index);
   }
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -307,12 +344,12 @@ public com.google.datastore.v1.Key getDeferred(int index) {
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
-      int index) {
+  public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
     return deferred_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -324,8 +361,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < found_.size(); i++) {
       output.writeMessage(1, found_.get(i));
     }
@@ -345,16 +381,13 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < found_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, found_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, found_.get(i));
     }
     for (int i = 0; i < missing_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, missing_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, missing_.get(i));
     }
     for (int i = 0; i < deferred_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, deferred_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, deferred_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -364,7 +397,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.LookupResponse)) {
       return super.equals(obj);
@@ -372,12 +405,9 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.LookupResponse other = (com.google.datastore.v1.LookupResponse) obj;
 
     boolean result = true;
-    result = result && getFoundList()
-        .equals(other.getFoundList());
-    result = result && getMissingList()
-        .equals(other.getMissingList());
-    result = result && getDeferredList()
-        .equals(other.getDeferredList());
+    result = result && getFoundList().equals(other.getFoundList());
+    result = result && getMissingList().equals(other.getMissingList());
+    result = result && getDeferredList().equals(other.getDeferredList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -406,118 +436,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.LookupResponse parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.LookupResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.LookupResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.LookupResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.LookupResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
    * 

    *
    * Protobuf type {@code google.datastore.v1.LookupResponse}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.LookupResponse)
       com.google.datastore.v1.LookupResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_LookupResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.LookupResponse.class, com.google.datastore.v1.LookupResponse.Builder.class);
+              com.google.datastore.v1.LookupResponse.class,
+              com.google.datastore.v1.LookupResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.LookupResponse.newBuilder()
@@ -525,19 +564,19 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getFoundFieldBuilder();
         getMissingFieldBuilder();
         getDeferredFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -563,9 +602,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_LookupResponse_descriptor;
     }
 
     @java.lang.Override
@@ -584,7 +623,8 @@ public com.google.datastore.v1.LookupResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.LookupResponse buildPartial() {
-      com.google.datastore.v1.LookupResponse result = new com.google.datastore.v1.LookupResponse(this);
+      com.google.datastore.v1.LookupResponse result =
+          new com.google.datastore.v1.LookupResponse(this);
       int from_bitField0_ = bitField0_;
       if (foundBuilder_ == null) {
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -621,38 +661,39 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.LookupResponse) {
-        return mergeFrom((com.google.datastore.v1.LookupResponse)other);
+        return mergeFrom((com.google.datastore.v1.LookupResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -679,9 +720,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
             foundBuilder_ = null;
             found_ = other.found_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            foundBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getFoundFieldBuilder() : null;
+            foundBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getFoundFieldBuilder()
+                    : null;
           } else {
             foundBuilder_.addAllMessages(other.found_);
           }
@@ -705,9 +747,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
             missingBuilder_ = null;
             missing_ = other.missing_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            missingBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getMissingFieldBuilder() : null;
+            missingBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getMissingFieldBuilder()
+                    : null;
           } else {
             missingBuilder_.addAllMessages(other.missing_);
           }
@@ -731,9 +774,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
             deferredBuilder_ = null;
             deferred_ = other.deferred_;
             bitField0_ = (bitField0_ & ~0x00000004);
-            deferredBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getDeferredFieldBuilder() : null;
+            deferredBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getDeferredFieldBuilder()
+                    : null;
           } else {
             deferredBuilder_.addAllMessages(other.deferred_);
           }
@@ -767,21 +811,28 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.util.List found_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureFoundIsMutable() {
       if (!((bitField0_ & 0x00000001) == 0x00000001)) {
         found_ = new java.util.ArrayList(found_);
         bitField0_ |= 0x00000001;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> foundBuilder_;
+            com.google.datastore.v1.EntityResult,
+            com.google.datastore.v1.EntityResult.Builder,
+            com.google.datastore.v1.EntityResultOrBuilder>
+        foundBuilder_;
 
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -798,6 +849,8 @@ public java.util.List getFoundList() {
       }
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -814,6 +867,8 @@ public int getFoundCount() {
       }
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -830,6 +885,8 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -838,8 +895,7 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public Builder setFound(
-        int index, com.google.datastore.v1.EntityResult value) {
+    public Builder setFound(int index, com.google.datastore.v1.EntityResult value) {
       if (foundBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -853,6 +909,8 @@ public Builder setFound(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -873,6 +931,8 @@ public Builder setFound(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -895,6 +955,8 @@ public Builder addFound(com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -903,8 +965,7 @@ public Builder addFound(com.google.datastore.v1.EntityResult value) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public Builder addFound(
-        int index, com.google.datastore.v1.EntityResult value) {
+    public Builder addFound(int index, com.google.datastore.v1.EntityResult value) {
       if (foundBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -918,6 +979,8 @@ public Builder addFound(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -926,8 +989,7 @@ public Builder addFound(
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public Builder addFound(
-        com.google.datastore.v1.EntityResult.Builder builderForValue) {
+    public Builder addFound(com.google.datastore.v1.EntityResult.Builder builderForValue) {
       if (foundBuilder_ == null) {
         ensureFoundIsMutable();
         found_.add(builderForValue.build());
@@ -938,6 +1000,8 @@ public Builder addFound(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -958,6 +1022,8 @@ public Builder addFound(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -970,8 +1036,7 @@ public Builder addAllFound(
         java.lang.Iterable values) {
       if (foundBuilder_ == null) {
         ensureFoundIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, found_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, found_);
         onChanged();
       } else {
         foundBuilder_.addAllMessages(values);
@@ -979,6 +1044,8 @@ public Builder addAllFound(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -998,6 +1065,8 @@ public Builder clearFound() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1017,6 +1086,8 @@ public Builder removeFound(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1025,11 +1096,12 @@ public Builder removeFound(int index) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(
-        int index) {
+    public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(int index) {
       return getFoundFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1038,14 +1110,16 @@ public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
-        int index) {
+    public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index) {
       if (foundBuilder_ == null) {
-        return found_.get(index);  } else {
+        return found_.get(index);
+      } else {
         return foundBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1054,8 +1128,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public java.util.List 
-         getFoundOrBuilderList() {
+    public java.util.List
+        getFoundOrBuilderList() {
       if (foundBuilder_ != null) {
         return foundBuilder_.getMessageOrBuilderList();
       } else {
@@ -1063,6 +1137,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1072,10 +1148,12 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
     public com.google.datastore.v1.EntityResult.Builder addFoundBuilder() {
-      return getFoundFieldBuilder().addBuilder(
-          com.google.datastore.v1.EntityResult.getDefaultInstance());
+      return getFoundFieldBuilder()
+          .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1084,12 +1162,13 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder() {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(
-        int index) {
-      return getFoundFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.EntityResult.getDefaultInstance());
+    public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(int index) {
+      return getFoundFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1098,16 +1177,21 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public java.util.List 
-         getFoundBuilderList() {
+    public java.util.List getFoundBuilderList() {
       return getFoundFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> 
+            com.google.datastore.v1.EntityResult,
+            com.google.datastore.v1.EntityResult.Builder,
+            com.google.datastore.v1.EntityResultOrBuilder>
         getFoundFieldBuilder() {
       if (foundBuilder_ == null) {
-        foundBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>(
+        foundBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.EntityResult,
+                com.google.datastore.v1.EntityResult.Builder,
+                com.google.datastore.v1.EntityResultOrBuilder>(
                 found_,
                 ((bitField0_ & 0x00000001) == 0x00000001),
                 getParentForChildren(),
@@ -1118,18 +1202,24 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(
     }
 
     private java.util.List missing_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureMissingIsMutable() {
       if (!((bitField0_ & 0x00000002) == 0x00000002)) {
         missing_ = new java.util.ArrayList(missing_);
         bitField0_ |= 0x00000002;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> missingBuilder_;
+            com.google.datastore.v1.EntityResult,
+            com.google.datastore.v1.EntityResult.Builder,
+            com.google.datastore.v1.EntityResultOrBuilder>
+        missingBuilder_;
 
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1146,6 +1236,8 @@ public java.util.List getMissingList() {
       }
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1162,6 +1254,8 @@ public int getMissingCount() {
       }
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1178,6 +1272,8 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1186,8 +1282,7 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public Builder setMissing(
-        int index, com.google.datastore.v1.EntityResult value) {
+    public Builder setMissing(int index, com.google.datastore.v1.EntityResult value) {
       if (missingBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1201,6 +1296,8 @@ public Builder setMissing(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1221,6 +1318,8 @@ public Builder setMissing(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1243,6 +1342,8 @@ public Builder addMissing(com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1251,8 +1352,7 @@ public Builder addMissing(com.google.datastore.v1.EntityResult value) {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public Builder addMissing(
-        int index, com.google.datastore.v1.EntityResult value) {
+    public Builder addMissing(int index, com.google.datastore.v1.EntityResult value) {
       if (missingBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1266,6 +1366,8 @@ public Builder addMissing(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1274,8 +1376,7 @@ public Builder addMissing(
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public Builder addMissing(
-        com.google.datastore.v1.EntityResult.Builder builderForValue) {
+    public Builder addMissing(com.google.datastore.v1.EntityResult.Builder builderForValue) {
       if (missingBuilder_ == null) {
         ensureMissingIsMutable();
         missing_.add(builderForValue.build());
@@ -1286,6 +1387,8 @@ public Builder addMissing(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1306,6 +1409,8 @@ public Builder addMissing(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1318,8 +1423,7 @@ public Builder addAllMissing(
         java.lang.Iterable values) {
       if (missingBuilder_ == null) {
         ensureMissingIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, missing_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, missing_);
         onChanged();
       } else {
         missingBuilder_.addAllMessages(values);
@@ -1327,6 +1431,8 @@ public Builder addAllMissing(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1346,6 +1452,8 @@ public Builder clearMissing() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1365,6 +1473,8 @@ public Builder removeMissing(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1373,11 +1483,12 @@ public Builder removeMissing(int index) {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(
-        int index) {
+    public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(int index) {
       return getMissingFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1386,14 +1497,16 @@ public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
-        int index) {
+    public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int index) {
       if (missingBuilder_ == null) {
-        return missing_.get(index);  } else {
+        return missing_.get(index);
+      } else {
         return missingBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1402,8 +1515,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public java.util.List 
-         getMissingOrBuilderList() {
+    public java.util.List
+        getMissingOrBuilderList() {
       if (missingBuilder_ != null) {
         return missingBuilder_.getMessageOrBuilderList();
       } else {
@@ -1411,6 +1524,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1420,10 +1535,12 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
     public com.google.datastore.v1.EntityResult.Builder addMissingBuilder() {
-      return getMissingFieldBuilder().addBuilder(
-          com.google.datastore.v1.EntityResult.getDefaultInstance());
+      return getMissingFieldBuilder()
+          .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1432,12 +1549,13 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder() {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(
-        int index) {
-      return getMissingFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.EntityResult.getDefaultInstance());
+    public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(int index) {
+      return getMissingFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1446,16 +1564,21 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public java.util.List 
-         getMissingBuilderList() {
+    public java.util.List getMissingBuilderList() {
       return getMissingFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> 
+            com.google.datastore.v1.EntityResult,
+            com.google.datastore.v1.EntityResult.Builder,
+            com.google.datastore.v1.EntityResultOrBuilder>
         getMissingFieldBuilder() {
       if (missingBuilder_ == null) {
-        missingBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>(
+        missingBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.EntityResult,
+                com.google.datastore.v1.EntityResult.Builder,
+                com.google.datastore.v1.EntityResultOrBuilder>(
                 missing_,
                 ((bitField0_ & 0x00000002) == 0x00000002),
                 getParentForChildren(),
@@ -1466,18 +1589,24 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(
     }
 
     private java.util.List deferred_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureDeferredIsMutable() {
       if (!((bitField0_ & 0x00000004) == 0x00000004)) {
         deferred_ = new java.util.ArrayList(deferred_);
         bitField0_ |= 0x00000004;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> deferredBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        deferredBuilder_;
 
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1494,6 +1623,8 @@ public java.util.List getDeferredList() {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1510,6 +1641,8 @@ public int getDeferredCount() {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1526,6 +1659,8 @@ public com.google.datastore.v1.Key getDeferred(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1534,8 +1669,7 @@ public com.google.datastore.v1.Key getDeferred(int index) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder setDeferred(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder setDeferred(int index, com.google.datastore.v1.Key value) {
       if (deferredBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1549,6 +1683,8 @@ public Builder setDeferred(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1557,8 +1693,7 @@ public Builder setDeferred(
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder setDeferred(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setDeferred(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
         deferred_.set(index, builderForValue.build());
@@ -1569,6 +1704,8 @@ public Builder setDeferred(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1591,6 +1728,8 @@ public Builder addDeferred(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1599,8 +1738,7 @@ public Builder addDeferred(com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder addDeferred(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder addDeferred(int index, com.google.datastore.v1.Key value) {
       if (deferredBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1614,6 +1752,8 @@ public Builder addDeferred(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1622,8 +1762,7 @@ public Builder addDeferred(
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder addDeferred(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addDeferred(com.google.datastore.v1.Key.Builder builderForValue) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
         deferred_.add(builderForValue.build());
@@ -1634,6 +1773,8 @@ public Builder addDeferred(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1642,8 +1783,7 @@ public Builder addDeferred(
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder addDeferred(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addDeferred(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
         deferred_.add(index, builderForValue.build());
@@ -1654,6 +1794,8 @@ public Builder addDeferred(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1666,8 +1808,7 @@ public Builder addAllDeferred(
         java.lang.Iterable values) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, deferred_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, deferred_);
         onChanged();
       } else {
         deferredBuilder_.addAllMessages(values);
@@ -1675,6 +1816,8 @@ public Builder addAllDeferred(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1694,6 +1837,8 @@ public Builder clearDeferred() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1713,6 +1858,8 @@ public Builder removeDeferred(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1721,11 +1868,12 @@ public Builder removeDeferred(int index) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public com.google.datastore.v1.Key.Builder getDeferredBuilder(
-        int index) {
+    public com.google.datastore.v1.Key.Builder getDeferredBuilder(int index) {
       return getDeferredFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1734,14 +1882,16 @@ public com.google.datastore.v1.Key.Builder getDeferredBuilder(
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
-        int index) {
+    public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
       if (deferredBuilder_ == null) {
-        return deferred_.get(index);  } else {
+        return deferred_.get(index);
+      } else {
         return deferredBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1750,8 +1900,8 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public java.util.List 
-         getDeferredOrBuilderList() {
+    public java.util.List
+        getDeferredOrBuilderList() {
       if (deferredBuilder_ != null) {
         return deferredBuilder_.getMessageOrBuilderList();
       } else {
@@ -1759,6 +1909,8 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1768,10 +1920,11 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
      * repeated .google.datastore.v1.Key deferred = 3;
      */
     public com.google.datastore.v1.Key.Builder addDeferredBuilder() {
-      return getDeferredFieldBuilder().addBuilder(
-          com.google.datastore.v1.Key.getDefaultInstance());
+      return getDeferredFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1780,12 +1933,13 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder() {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public com.google.datastore.v1.Key.Builder addDeferredBuilder(
-        int index) {
-      return getDeferredFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addDeferredBuilder(int index) {
+      return getDeferredFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1794,16 +1948,21 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder(
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public java.util.List 
-         getDeferredBuilderList() {
+    public java.util.List getDeferredBuilderList() {
       return getDeferredFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getDeferredFieldBuilder() {
       if (deferredBuilder_ == null) {
-        deferredBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+        deferredBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(
                 deferred_,
                 ((bitField0_ & 0x00000004) == 0x00000004),
                 getParentForChildren(),
@@ -1812,9 +1971,9 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder(
       }
       return deferredBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1824,12 +1983,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.LookupResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.LookupResponse)
   private static final com.google.datastore.v1.LookupResponse DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.LookupResponse();
   }
@@ -1838,16 +1997,16 @@ public static com.google.datastore.v1.LookupResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public LookupResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LookupResponse(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public LookupResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new LookupResponse(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1862,6 +2021,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 7bef708cc4b9..564f88cf5107 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface LookupResponseOrBuilder extends
+public interface LookupResponseOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.LookupResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -16,9 +19,10 @@ public interface LookupResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  java.util.List 
-      getFoundList();
+  java.util.List getFoundList();
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -29,6 +33,8 @@ public interface LookupResponseOrBuilder extends
    */
   com.google.datastore.v1.EntityResult getFound(int index);
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -39,6 +45,8 @@ public interface LookupResponseOrBuilder extends
    */
   int getFoundCount();
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -47,9 +55,10 @@ public interface LookupResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  java.util.List 
-      getFoundOrBuilderList();
+  java.util.List getFoundOrBuilderList();
   /**
+   *
+   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -58,10 +67,11 @@ public interface LookupResponseOrBuilder extends
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
-      int index);
+  com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index);
 
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -70,9 +80,10 @@ com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  java.util.List 
-      getMissingList();
+  java.util.List getMissingList();
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -83,6 +94,8 @@ com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
    */
   com.google.datastore.v1.EntityResult getMissing(int index);
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -93,6 +106,8 @@ com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
    */
   int getMissingCount();
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -101,9 +116,10 @@ com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  java.util.List 
-      getMissingOrBuilderList();
+  java.util.List getMissingOrBuilderList();
   /**
+   *
+   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -112,10 +128,11 @@ com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
-      int index);
+  com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int index);
 
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -124,9 +141,10 @@ com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  java.util.List 
-      getDeferredList();
+  java.util.List getDeferredList();
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -137,6 +155,8 @@ com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
    */
   com.google.datastore.v1.Key getDeferred(int index);
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -147,6 +167,8 @@ com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
    */
   int getDeferredCount();
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -155,9 +177,10 @@ com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  java.util.List 
-      getDeferredOrBuilderList();
+  java.util.List getDeferredOrBuilderList();
   /**
+   *
+   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -166,6 +189,5 @@ com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
-      int index);
+  com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index);
 }
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 964394faf80c..239c8cab5dbb 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
@@ -4,29 +4,31 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A mutation to apply to an entity.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Mutation}
  */
-public  final class Mutation extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class Mutation extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Mutation)
     MutationOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use Mutation.newBuilder() to construct.
   private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private Mutation() {
-  }
+
+  private Mutation() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private Mutation(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -46,115 +48,120 @@ private Mutation(
           case 0:
             done = true;
             break;
-          case 34: {
-            com.google.datastore.v1.Entity.Builder subBuilder = null;
-            if (operationCase_ == 4) {
-              subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
-            }
-            operation_ =
-                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-              operation_ = subBuilder.buildPartial();
-            }
-            operationCase_ = 4;
-            break;
-          }
-          case 42: {
-            com.google.datastore.v1.Entity.Builder subBuilder = null;
-            if (operationCase_ == 5) {
-              subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
+          case 34:
+            {
+              com.google.datastore.v1.Entity.Builder subBuilder = null;
+              if (operationCase_ == 4) {
+                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
+              }
+              operation_ =
+                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
+                operation_ = subBuilder.buildPartial();
+              }
+              operationCase_ = 4;
+              break;
             }
-            operation_ =
-                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-              operation_ = subBuilder.buildPartial();
+          case 42:
+            {
+              com.google.datastore.v1.Entity.Builder subBuilder = null;
+              if (operationCase_ == 5) {
+                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
+              }
+              operation_ =
+                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
+                operation_ = subBuilder.buildPartial();
+              }
+              operationCase_ = 5;
+              break;
             }
-            operationCase_ = 5;
-            break;
-          }
-          case 50: {
-            com.google.datastore.v1.Entity.Builder subBuilder = null;
-            if (operationCase_ == 6) {
-              subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
+          case 50:
+            {
+              com.google.datastore.v1.Entity.Builder subBuilder = null;
+              if (operationCase_ == 6) {
+                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
+              }
+              operation_ =
+                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
+                operation_ = subBuilder.buildPartial();
+              }
+              operationCase_ = 6;
+              break;
             }
-            operation_ =
-                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-              operation_ = subBuilder.buildPartial();
+          case 58:
+            {
+              com.google.datastore.v1.Key.Builder subBuilder = null;
+              if (operationCase_ == 7) {
+                subBuilder = ((com.google.datastore.v1.Key) operation_).toBuilder();
+              }
+              operation_ =
+                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Key) operation_);
+                operation_ = subBuilder.buildPartial();
+              }
+              operationCase_ = 7;
+              break;
             }
-            operationCase_ = 6;
-            break;
-          }
-          case 58: {
-            com.google.datastore.v1.Key.Builder subBuilder = null;
-            if (operationCase_ == 7) {
-              subBuilder = ((com.google.datastore.v1.Key) operation_).toBuilder();
+          case 64:
+            {
+              conflictDetectionStrategyCase_ = 8;
+              conflictDetectionStrategy_ = input.readInt64();
+              break;
             }
-            operation_ =
-                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Key) operation_);
-              operation_ = subBuilder.buildPartial();
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            operationCase_ = 7;
-            break;
-          }
-          case 64: {
-            conflictDetectionStrategyCase_ = 8;
-            conflictDetectionStrategy_ = input.readInt64();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_Mutation_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_Mutation_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class);
   }
 
   private int operationCase_ = 0;
   private java.lang.Object operation_;
-  public enum OperationCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum OperationCase implements com.google.protobuf.Internal.EnumLite {
     INSERT(4),
     UPDATE(5),
     UPSERT(6),
     DELETE(7),
     OPERATION_NOT_SET(0);
     private final int value;
+
     private OperationCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static OperationCase valueOf(int value) {
       return forNumber(value);
@@ -162,38 +169,42 @@ public static OperationCase valueOf(int value) {
 
     public static OperationCase forNumber(int value) {
       switch (value) {
-        case 4: return INSERT;
-        case 5: return UPDATE;
-        case 6: return UPSERT;
-        case 7: return DELETE;
-        case 0: return OPERATION_NOT_SET;
-        default: return null;
+        case 4:
+          return INSERT;
+        case 5:
+          return UPDATE;
+        case 6:
+          return UPSERT;
+        case 7:
+          return DELETE;
+        case 0:
+          return OPERATION_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public OperationCase
-  getOperationCase() {
-    return OperationCase.forNumber(
-        operationCase_);
+  public OperationCase getOperationCase() {
+    return OperationCase.forNumber(operationCase_);
   }
 
   private int conflictDetectionStrategyCase_ = 0;
   private java.lang.Object conflictDetectionStrategy_;
-  public enum ConflictDetectionStrategyCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum ConflictDetectionStrategyCase implements com.google.protobuf.Internal.EnumLite {
     BASE_VERSION(8),
     CONFLICTDETECTIONSTRATEGY_NOT_SET(0);
     private final int value;
+
     private ConflictDetectionStrategyCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static ConflictDetectionStrategyCase valueOf(int value) {
       return forNumber(value);
@@ -201,24 +212,28 @@ public static ConflictDetectionStrategyCase valueOf(int value) {
 
     public static ConflictDetectionStrategyCase forNumber(int value) {
       switch (value) {
-        case 8: return BASE_VERSION;
-        case 0: return CONFLICTDETECTIONSTRATEGY_NOT_SET;
-        default: return null;
+        case 8:
+          return BASE_VERSION;
+        case 0:
+          return CONFLICTDETECTIONSTRATEGY_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ConflictDetectionStrategyCase
-  getConflictDetectionStrategyCase() {
-    return ConflictDetectionStrategyCase.forNumber(
-        conflictDetectionStrategyCase_);
+  public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
+    return ConflictDetectionStrategyCase.forNumber(conflictDetectionStrategyCase_);
   }
 
   public static final int INSERT_FIELD_NUMBER = 4;
   /**
+   *
+   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -230,6 +245,8 @@ public boolean hasInsert() {
     return operationCase_ == 4;
   }
   /**
+   *
+   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -239,11 +256,13 @@ public boolean hasInsert() {
    */
   public com.google.datastore.v1.Entity getInsert() {
     if (operationCase_ == 4) {
-       return (com.google.datastore.v1.Entity) operation_;
+      return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -253,13 +272,15 @@ public com.google.datastore.v1.Entity getInsert() {
    */
   public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
     if (operationCase_ == 4) {
-       return (com.google.datastore.v1.Entity) operation_;
+      return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int UPDATE_FIELD_NUMBER = 5;
   /**
+   *
+   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -271,6 +292,8 @@ public boolean hasUpdate() {
     return operationCase_ == 5;
   }
   /**
+   *
+   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -280,11 +303,13 @@ public boolean hasUpdate() {
    */
   public com.google.datastore.v1.Entity getUpdate() {
     if (operationCase_ == 5) {
-       return (com.google.datastore.v1.Entity) operation_;
+      return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -294,13 +319,15 @@ public com.google.datastore.v1.Entity getUpdate() {
    */
   public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
     if (operationCase_ == 5) {
-       return (com.google.datastore.v1.Entity) operation_;
+      return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int UPSERT_FIELD_NUMBER = 6;
   /**
+   *
+   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -312,6 +339,8 @@ public boolean hasUpsert() {
     return operationCase_ == 6;
   }
   /**
+   *
+   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -321,11 +350,13 @@ public boolean hasUpsert() {
    */
   public com.google.datastore.v1.Entity getUpsert() {
     if (operationCase_ == 6) {
-       return (com.google.datastore.v1.Entity) operation_;
+      return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -335,13 +366,15 @@ public com.google.datastore.v1.Entity getUpsert() {
    */
   public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
     if (operationCase_ == 6) {
-       return (com.google.datastore.v1.Entity) operation_;
+      return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int DELETE_FIELD_NUMBER = 7;
   /**
+   *
+   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -353,6 +386,8 @@ public boolean hasDelete() {
     return operationCase_ == 7;
   }
   /**
+   *
+   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -362,11 +397,13 @@ public boolean hasDelete() {
    */
   public com.google.datastore.v1.Key getDelete() {
     if (operationCase_ == 7) {
-       return (com.google.datastore.v1.Key) operation_;
+      return (com.google.datastore.v1.Key) operation_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -376,13 +413,15 @@ public com.google.datastore.v1.Key getDelete() {
    */
   public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
     if (operationCase_ == 7) {
-       return (com.google.datastore.v1.Key) operation_;
+      return (com.google.datastore.v1.Key) operation_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
 
   public static final int BASE_VERSION_FIELD_NUMBER = 8;
   /**
+   *
+   *
    * 
    * The version of the entity that this mutation is being applied to. If this
    * does not match the current version on the server, the mutation conflicts.
@@ -398,6 +437,7 @@ public long getBaseVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -409,8 +449,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (operationCase_ == 4) {
       output.writeMessage(4, (com.google.datastore.v1.Entity) operation_);
     }
@@ -424,8 +463,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       output.writeMessage(7, (com.google.datastore.v1.Key) operation_);
     }
     if (conflictDetectionStrategyCase_ == 8) {
-      output.writeInt64(
-          8, (long)((java.lang.Long) conflictDetectionStrategy_));
+      output.writeInt64(8, (long) ((java.lang.Long) conflictDetectionStrategy_));
     }
     unknownFields.writeTo(output);
   }
@@ -437,25 +475,29 @@ public int getSerializedSize() {
 
     size = 0;
     if (operationCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, (com.google.datastore.v1.Entity) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              4, (com.google.datastore.v1.Entity) operation_);
     }
     if (operationCase_ == 5) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, (com.google.datastore.v1.Entity) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              5, (com.google.datastore.v1.Entity) operation_);
     }
     if (operationCase_ == 6) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, (com.google.datastore.v1.Entity) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              6, (com.google.datastore.v1.Entity) operation_);
     }
     if (operationCase_ == 7) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(7, (com.google.datastore.v1.Key) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              7, (com.google.datastore.v1.Key) operation_);
     }
     if (conflictDetectionStrategyCase_ == 8) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(
-            8, (long)((java.lang.Long) conflictDetectionStrategy_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeInt64Size(
+              8, (long) ((java.lang.Long) conflictDetectionStrategy_));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -465,7 +507,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Mutation)) {
       return super.equals(obj);
@@ -473,36 +515,31 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj;
 
     boolean result = true;
-    result = result && getOperationCase().equals(
-        other.getOperationCase());
+    result = result && getOperationCase().equals(other.getOperationCase());
     if (!result) return false;
     switch (operationCase_) {
       case 4:
-        result = result && getInsert()
-            .equals(other.getInsert());
+        result = result && getInsert().equals(other.getInsert());
         break;
       case 5:
-        result = result && getUpdate()
-            .equals(other.getUpdate());
+        result = result && getUpdate().equals(other.getUpdate());
         break;
       case 6:
-        result = result && getUpsert()
-            .equals(other.getUpsert());
+        result = result && getUpsert().equals(other.getUpsert());
         break;
       case 7:
-        result = result && getDelete()
-            .equals(other.getDelete());
+        result = result && getDelete().equals(other.getDelete());
         break;
       case 0:
       default:
     }
-    result = result && getConflictDetectionStrategyCase().equals(
-        other.getConflictDetectionStrategyCase());
+    result =
+        result
+            && getConflictDetectionStrategyCase().equals(other.getConflictDetectionStrategyCase());
     if (!result) return false;
     switch (conflictDetectionStrategyCase_) {
       case 8:
-        result = result && (getBaseVersion()
-            == other.getBaseVersion());
+        result = result && (getBaseVersion() == other.getBaseVersion());
         break;
       case 0:
       default:
@@ -541,8 +578,7 @@ public int hashCode() {
     switch (conflictDetectionStrategyCase_) {
       case 8:
         hash = (37 * hash) + BASE_VERSION_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getBaseVersion());
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getBaseVersion());
         break;
       case 0:
       default:
@@ -552,118 +588,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Mutation parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Mutation parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.Mutation parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.Mutation parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Mutation parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Mutation parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Mutation parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.Mutation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A mutation to apply to an entity.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Mutation}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Mutation)
       com.google.datastore.v1.MutationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_Mutation_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_Mutation_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class);
+              com.google.datastore.v1.Mutation.class,
+              com.google.datastore.v1.Mutation.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.Mutation.newBuilder()
@@ -671,16 +715,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -692,9 +735,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_Mutation_descriptor;
     }
 
     @java.lang.Override
@@ -755,38 +798,39 @@ public com.google.datastore.v1.Mutation buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Mutation) {
-        return mergeFrom((com.google.datastore.v1.Mutation)other);
+        return mergeFrom((com.google.datastore.v1.Mutation) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -796,34 +840,41 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.Mutation other) {
       if (other == com.google.datastore.v1.Mutation.getDefaultInstance()) return this;
       switch (other.getOperationCase()) {
-        case INSERT: {
-          mergeInsert(other.getInsert());
-          break;
-        }
-        case UPDATE: {
-          mergeUpdate(other.getUpdate());
-          break;
-        }
-        case UPSERT: {
-          mergeUpsert(other.getUpsert());
-          break;
-        }
-        case DELETE: {
-          mergeDelete(other.getDelete());
-          break;
-        }
-        case OPERATION_NOT_SET: {
-          break;
-        }
+        case INSERT:
+          {
+            mergeInsert(other.getInsert());
+            break;
+          }
+        case UPDATE:
+          {
+            mergeUpdate(other.getUpdate());
+            break;
+          }
+        case UPSERT:
+          {
+            mergeUpsert(other.getUpsert());
+            break;
+          }
+        case DELETE:
+          {
+            mergeDelete(other.getDelete());
+            break;
+          }
+        case OPERATION_NOT_SET:
+          {
+            break;
+          }
       }
       switch (other.getConflictDetectionStrategyCase()) {
-        case BASE_VERSION: {
-          setBaseVersion(other.getBaseVersion());
-          break;
-        }
-        case CONFLICTDETECTIONSTRATEGY_NOT_SET: {
-          break;
-        }
+        case BASE_VERSION:
+          {
+            setBaseVersion(other.getBaseVersion());
+            break;
+          }
+        case CONFLICTDETECTIONSTRATEGY_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -853,12 +904,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int operationCase_ = 0;
     private java.lang.Object operation_;
-    public OperationCase
-        getOperationCase() {
-      return OperationCase.forNumber(
-          operationCase_);
+
+    public OperationCase getOperationCase() {
+      return OperationCase.forNumber(operationCase_);
     }
 
     public Builder clearOperation() {
@@ -870,10 +921,9 @@ public Builder clearOperation() {
 
     private int conflictDetectionStrategyCase_ = 0;
     private java.lang.Object conflictDetectionStrategy_;
-    public ConflictDetectionStrategyCase
-        getConflictDetectionStrategyCase() {
-      return ConflictDetectionStrategyCase.forNumber(
-          conflictDetectionStrategyCase_);
+
+    public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
+      return ConflictDetectionStrategyCase.forNumber(conflictDetectionStrategyCase_);
     }
 
     public Builder clearConflictDetectionStrategy() {
@@ -883,10 +933,14 @@ public Builder clearConflictDetectionStrategy() {
       return this;
     }
 
-
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> insertBuilder_;
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
+        insertBuilder_;
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -898,6 +952,8 @@ public boolean hasInsert() {
       return operationCase_ == 4;
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -919,6 +975,8 @@ public com.google.datastore.v1.Entity getInsert() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -940,6 +998,8 @@ public Builder setInsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -947,8 +1007,7 @@ public Builder setInsert(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity insert = 4;
      */
-    public Builder setInsert(
-        com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setInsert(com.google.datastore.v1.Entity.Builder builderForValue) {
       if (insertBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -959,6 +1018,8 @@ public Builder setInsert(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -968,10 +1029,12 @@ public Builder setInsert(
      */
     public Builder mergeInsert(com.google.datastore.v1.Entity value) {
       if (insertBuilder_ == null) {
-        if (operationCase_ == 4 &&
-            operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
-              .mergeFrom(value).buildPartial();
+        if (operationCase_ == 4
+            && operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          operation_ =
+              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -986,6 +1049,8 @@ public Builder mergeInsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1010,6 +1075,8 @@ public Builder clearInsert() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1021,6 +1088,8 @@ public com.google.datastore.v1.Entity.Builder getInsertBuilder() {
       return getInsertFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1039,6 +1108,8 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1047,27 +1118,36 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
      * .google.datastore.v1.Entity insert = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
         getInsertFieldBuilder() {
       if (insertBuilder_ == null) {
         if (!(operationCase_ == 4)) {
           operation_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        insertBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) operation_,
-                getParentForChildren(),
-                isClean());
+        insertBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Entity,
+                com.google.datastore.v1.Entity.Builder,
+                com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 4;
-      onChanged();;
+      onChanged();
+      ;
       return insertBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> updateBuilder_;
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
+        updateBuilder_;
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1079,6 +1159,8 @@ public boolean hasUpdate() {
       return operationCase_ == 5;
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1100,6 +1182,8 @@ public com.google.datastore.v1.Entity getUpdate() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1121,6 +1205,8 @@ public Builder setUpdate(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1128,8 +1214,7 @@ public Builder setUpdate(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity update = 5;
      */
-    public Builder setUpdate(
-        com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setUpdate(com.google.datastore.v1.Entity.Builder builderForValue) {
       if (updateBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -1140,6 +1225,8 @@ public Builder setUpdate(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1149,10 +1236,12 @@ public Builder setUpdate(
      */
     public Builder mergeUpdate(com.google.datastore.v1.Entity value) {
       if (updateBuilder_ == null) {
-        if (operationCase_ == 5 &&
-            operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
-              .mergeFrom(value).buildPartial();
+        if (operationCase_ == 5
+            && operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          operation_ =
+              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -1167,6 +1256,8 @@ public Builder mergeUpdate(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1191,6 +1282,8 @@ public Builder clearUpdate() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1202,6 +1295,8 @@ public com.google.datastore.v1.Entity.Builder getUpdateBuilder() {
       return getUpdateFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1220,6 +1315,8 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1228,27 +1325,36 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
      * .google.datastore.v1.Entity update = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
         getUpdateFieldBuilder() {
       if (updateBuilder_ == null) {
         if (!(operationCase_ == 5)) {
           operation_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        updateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) operation_,
-                getParentForChildren(),
-                isClean());
+        updateBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Entity,
+                com.google.datastore.v1.Entity.Builder,
+                com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 5;
-      onChanged();;
+      onChanged();
+      ;
       return updateBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> upsertBuilder_;
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
+        upsertBuilder_;
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1260,6 +1366,8 @@ public boolean hasUpsert() {
       return operationCase_ == 6;
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1281,6 +1389,8 @@ public com.google.datastore.v1.Entity getUpsert() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1302,6 +1412,8 @@ public Builder setUpsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1309,8 +1421,7 @@ public Builder setUpsert(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity upsert = 6;
      */
-    public Builder setUpsert(
-        com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setUpsert(com.google.datastore.v1.Entity.Builder builderForValue) {
       if (upsertBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -1321,6 +1432,8 @@ public Builder setUpsert(
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1330,10 +1443,12 @@ public Builder setUpsert(
      */
     public Builder mergeUpsert(com.google.datastore.v1.Entity value) {
       if (upsertBuilder_ == null) {
-        if (operationCase_ == 6 &&
-            operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
-              .mergeFrom(value).buildPartial();
+        if (operationCase_ == 6
+            && operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          operation_ =
+              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -1348,6 +1463,8 @@ public Builder mergeUpsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1372,6 +1489,8 @@ public Builder clearUpsert() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1383,6 +1502,8 @@ public com.google.datastore.v1.Entity.Builder getUpsertBuilder() {
       return getUpsertFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1401,6 +1522,8 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1409,27 +1532,36 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
      * .google.datastore.v1.Entity upsert = 6;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
         getUpsertFieldBuilder() {
       if (upsertBuilder_ == null) {
         if (!(operationCase_ == 6)) {
           operation_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        upsertBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) operation_,
-                getParentForChildren(),
-                isClean());
+        upsertBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Entity,
+                com.google.datastore.v1.Entity.Builder,
+                com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 6;
-      onChanged();;
+      onChanged();
+      ;
       return upsertBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> deleteBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        deleteBuilder_;
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1441,6 +1573,8 @@ public boolean hasDelete() {
       return operationCase_ == 7;
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1462,6 +1596,8 @@ public com.google.datastore.v1.Key getDelete() {
       }
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1483,6 +1619,8 @@ public Builder setDelete(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1490,8 +1628,7 @@ public Builder setDelete(com.google.datastore.v1.Key value) {
      *
      * .google.datastore.v1.Key delete = 7;
      */
-    public Builder setDelete(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setDelete(com.google.datastore.v1.Key.Builder builderForValue) {
       if (deleteBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -1502,6 +1639,8 @@ public Builder setDelete(
       return this;
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1511,10 +1650,11 @@ public Builder setDelete(
      */
     public Builder mergeDelete(com.google.datastore.v1.Key value) {
       if (deleteBuilder_ == null) {
-        if (operationCase_ == 7 &&
-            operation_ != com.google.datastore.v1.Key.getDefaultInstance()) {
-          operation_ = com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) operation_)
-              .mergeFrom(value).buildPartial();
+        if (operationCase_ == 7 && operation_ != com.google.datastore.v1.Key.getDefaultInstance()) {
+          operation_ =
+              com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -1529,6 +1669,8 @@ public Builder mergeDelete(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1553,6 +1695,8 @@ public Builder clearDelete() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1564,6 +1708,8 @@ public com.google.datastore.v1.Key.Builder getDeleteBuilder() {
       return getDeleteFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1582,6 +1728,8 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1590,25 +1738,31 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
      * .google.datastore.v1.Key delete = 7;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getDeleteFieldBuilder() {
       if (deleteBuilder_ == null) {
         if (!(operationCase_ == 7)) {
           operation_ = com.google.datastore.v1.Key.getDefaultInstance();
         }
-        deleteBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
-                (com.google.datastore.v1.Key) operation_,
-                getParentForChildren(),
-                isClean());
+        deleteBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(
+                (com.google.datastore.v1.Key) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 7;
-      onChanged();;
+      onChanged();
+      ;
       return deleteBuilder_;
     }
 
     /**
+     *
+     *
      * 
      * The version of the entity that this mutation is being applied to. If this
      * does not match the current version on the server, the mutation conflicts.
@@ -1623,6 +1777,8 @@ public long getBaseVersion() {
       return 0L;
     }
     /**
+     *
+     *
      * 
      * The version of the entity that this mutation is being applied to. If this
      * does not match the current version on the server, the mutation conflicts.
@@ -1637,6 +1793,8 @@ public Builder setBaseVersion(long value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The version of the entity that this mutation is being applied to. If this
      * does not match the current version on the server, the mutation conflicts.
@@ -1652,9 +1810,9 @@ public Builder clearBaseVersion() {
       }
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1664,12 +1822,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Mutation)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Mutation)
   private static final com.google.datastore.v1.Mutation DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Mutation();
   }
@@ -1678,16 +1836,16 @@ public static com.google.datastore.v1.Mutation getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public Mutation parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Mutation(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Mutation parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Mutation(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1702,6 +1860,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Mutation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 d55fd0937112..406cf2fbd165 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface MutationOrBuilder extends
+public interface MutationOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Mutation)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -17,6 +20,8 @@ public interface MutationOrBuilder extends
    */
   boolean hasInsert();
   /**
+   *
+   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -26,6 +31,8 @@ public interface MutationOrBuilder extends
    */
   com.google.datastore.v1.Entity getInsert();
   /**
+   *
+   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -36,6 +43,8 @@ public interface MutationOrBuilder extends
   com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder();
 
   /**
+   *
+   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -45,6 +54,8 @@ public interface MutationOrBuilder extends
    */
   boolean hasUpdate();
   /**
+   *
+   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -54,6 +65,8 @@ public interface MutationOrBuilder extends
    */
   com.google.datastore.v1.Entity getUpdate();
   /**
+   *
+   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -64,6 +77,8 @@ public interface MutationOrBuilder extends
   com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder();
 
   /**
+   *
+   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -73,6 +88,8 @@ public interface MutationOrBuilder extends
    */
   boolean hasUpsert();
   /**
+   *
+   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -82,6 +99,8 @@ public interface MutationOrBuilder extends
    */
   com.google.datastore.v1.Entity getUpsert();
   /**
+   *
+   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -92,6 +111,8 @@ public interface MutationOrBuilder extends
   com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder();
 
   /**
+   *
+   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -101,6 +122,8 @@ public interface MutationOrBuilder extends
    */
   boolean hasDelete();
   /**
+   *
+   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -110,6 +133,8 @@ public interface MutationOrBuilder extends
    */
   com.google.datastore.v1.Key getDelete();
   /**
+   *
+   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -120,6 +145,8 @@ public interface MutationOrBuilder extends
   com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder();
 
   /**
+   *
+   *
    * 
    * The version of the entity that this mutation is being applied to. If this
    * does not match the current version on the server, the mutation conflicts.
@@ -131,5 +158,6 @@ public interface MutationOrBuilder extends
 
   public com.google.datastore.v1.Mutation.OperationCase getOperationCase();
 
-  public com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase getConflictDetectionStrategyCase();
+  public 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 3a2fcf2cf9ab..0d900b6a048d 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
@@ -4,31 +4,34 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The result of applying a mutation.
  * 

  *
  * Protobuf type {@code google.datastore.v1.MutationResult}
  */
-public  final class MutationResult extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class MutationResult extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.MutationResult)
     MutationResultOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use MutationResult.newBuilder() to construct.
   private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private MutationResult() {
     version_ = 0L;
     conflictDetected_ = false;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private MutationResult(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -48,64 +51,69 @@ private MutationResult(
           case 0:
             done = true;
             break;
-          case 26: {
-            com.google.datastore.v1.Key.Builder subBuilder = null;
-            if (key_ != null) {
-              subBuilder = key_.toBuilder();
+          case 26:
+            {
+              com.google.datastore.v1.Key.Builder subBuilder = null;
+              if (key_ != null) {
+                subBuilder = key_.toBuilder();
+              }
+              key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(key_);
+                key_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(key_);
-              key_ = subBuilder.buildPartial();
+          case 32:
+            {
+              version_ = input.readInt64();
+              break;
             }
-
-            break;
-          }
-          case 32: {
-
-            version_ = input.readInt64();
-            break;
-          }
-          case 40: {
-
-            conflictDetected_ = input.readBool();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 40:
+            {
+              conflictDetected_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_MutationResult_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.MutationResult.class, com.google.datastore.v1.MutationResult.Builder.class);
+            com.google.datastore.v1.MutationResult.class,
+            com.google.datastore.v1.MutationResult.Builder.class);
   }
 
   public static final int KEY_FIELD_NUMBER = 3;
   private com.google.datastore.v1.Key key_;
   /**
+   *
+   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -117,6 +125,8 @@ public boolean hasKey() {
     return key_ != null;
   }
   /**
+   *
+   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -128,6 +138,8 @@ public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
   /**
+   *
+   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -142,6 +154,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
   public static final int VERSION_FIELD_NUMBER = 4;
   private long version_;
   /**
+   *
+   *
    * 
    * The version of the entity on the server after processing the mutation. If
    * the mutation doesn't change anything on the server, then the version will
@@ -159,6 +173,8 @@ public long getVersion() {
   public static final int CONFLICT_DETECTED_FIELD_NUMBER = 5;
   private boolean conflictDetected_;
   /**
+   *
+   *
    * 
    * Whether a conflict was detected for this mutation. Always false when a
    * conflict detection strategy field is not set in the mutation.
@@ -171,6 +187,7 @@ public boolean getConflictDetected() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -182,8 +199,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (key_ != null) {
       output.writeMessage(3, getKey());
     }
@@ -203,16 +219,13 @@ public int getSerializedSize() {
 
     size = 0;
     if (key_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getKey());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getKey());
     }
     if (version_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(4, version_);
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, version_);
     }
     if (conflictDetected_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(5, conflictDetected_);
+      size += com.google.protobuf.CodedOutputStream.computeBoolSize(5, conflictDetected_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -222,7 +235,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.MutationResult)) {
       return super.equals(obj);
@@ -232,13 +245,10 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasKey() == other.hasKey());
     if (hasKey()) {
-      result = result && getKey()
-          .equals(other.getKey());
+      result = result && getKey().equals(other.getKey());
     }
-    result = result && (getVersion()
-        == other.getVersion());
-    result = result && (getConflictDetected()
-        == other.getConflictDetected());
+    result = result && (getVersion() == other.getVersion());
+    result = result && (getConflictDetected() == other.getConflictDetected());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -255,128 +265,135 @@ public int hashCode() {
       hash = (53 * hash) + getKey().hashCode();
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getVersion());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
     hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getConflictDetected());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConflictDetected());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.datastore.v1.MutationResult parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.MutationResult parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.MutationResult parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.MutationResult parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.MutationResult parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.MutationResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The result of applying a mutation.
    * 

    *
    * Protobuf type {@code google.datastore.v1.MutationResult}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.MutationResult)
       com.google.datastore.v1.MutationResultOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_MutationResult_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.MutationResult.class, com.google.datastore.v1.MutationResult.Builder.class);
+              com.google.datastore.v1.MutationResult.class,
+              com.google.datastore.v1.MutationResult.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.MutationResult.newBuilder()
@@ -384,16 +401,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -411,9 +427,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_MutationResult_descriptor;
     }
 
     @java.lang.Override
@@ -432,7 +448,8 @@ public com.google.datastore.v1.MutationResult build() {
 
     @java.lang.Override
     public com.google.datastore.v1.MutationResult buildPartial() {
-      com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this);
+      com.google.datastore.v1.MutationResult result =
+          new com.google.datastore.v1.MutationResult(this);
       if (keyBuilder_ == null) {
         result.key_ = key_;
       } else {
@@ -448,38 +465,39 @@ public com.google.datastore.v1.MutationResult buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.MutationResult) {
-        return mergeFrom((com.google.datastore.v1.MutationResult)other);
+        return mergeFrom((com.google.datastore.v1.MutationResult) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -528,8 +546,13 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.Key key_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        keyBuilder_;
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -541,6 +564,8 @@ public boolean hasKey() {
       return keyBuilder_ != null || key_ != null;
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -556,6 +581,8 @@ public com.google.datastore.v1.Key getKey() {
       }
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -577,6 +604,8 @@ public Builder setKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -584,8 +613,7 @@ public Builder setKey(com.google.datastore.v1.Key value) {
      *
      * .google.datastore.v1.Key key = 3;
      */
-    public Builder setKey(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyBuilder_ == null) {
         key_ = builderForValue.build();
         onChanged();
@@ -596,6 +624,8 @@ public Builder setKey(
       return this;
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -606,8 +636,7 @@ public Builder setKey(
     public Builder mergeKey(com.google.datastore.v1.Key value) {
       if (keyBuilder_ == null) {
         if (key_ != null) {
-          key_ =
-            com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
+          key_ = com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
         } else {
           key_ = value;
         }
@@ -619,6 +648,8 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -638,6 +669,8 @@ public Builder clearKey() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -646,11 +679,13 @@ public Builder clearKey() {
      * .google.datastore.v1.Key key = 3;
      */
     public com.google.datastore.v1.Key.Builder getKeyBuilder() {
-      
+
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -662,11 +697,12 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
       if (keyBuilder_ != null) {
         return keyBuilder_.getMessageOrBuilder();
       } else {
-        return key_ == null ?
-            com.google.datastore.v1.Key.getDefaultInstance() : key_;
+        return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
       }
     }
     /**
+     *
+     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -675,21 +711,25 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
      * .google.datastore.v1.Key key = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getKeyFieldBuilder() {
       if (keyBuilder_ == null) {
-        keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
-                getKey(),
-                getParentForChildren(),
-                isClean());
+        keyBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(getKey(), getParentForChildren(), isClean());
         key_ = null;
       }
       return keyBuilder_;
     }
 
-    private long version_ ;
+    private long version_;
     /**
+     *
+     *
      * 
      * The version of the entity on the server after processing the mutation. If
      * the mutation doesn't change anything on the server, then the version will
@@ -704,6 +744,8 @@ public long getVersion() {
       return version_;
     }
     /**
+     *
+     *
      * 
      * The version of the entity on the server after processing the mutation. If
      * the mutation doesn't change anything on the server, then the version will
@@ -715,12 +757,14 @@ public long getVersion() {
      * int64 version = 4;
      */
     public Builder setVersion(long value) {
-      
+
       version_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The version of the entity on the server after processing the mutation. If
      * the mutation doesn't change anything on the server, then the version will
@@ -732,14 +776,16 @@ public Builder setVersion(long value) {
      * int64 version = 4;
      */
     public Builder clearVersion() {
-      
+
       version_ = 0L;
       onChanged();
       return this;
     }
 
-    private boolean conflictDetected_ ;
+    private boolean conflictDetected_;
     /**
+     *
+     *
      * 
      * Whether a conflict was detected for this mutation. Always false when a
      * conflict detection strategy field is not set in the mutation.
@@ -751,6 +797,8 @@ public boolean getConflictDetected() {
       return conflictDetected_;
     }
     /**
+     *
+     *
      * 
      * Whether a conflict was detected for this mutation. Always false when a
      * conflict detection strategy field is not set in the mutation.
@@ -759,12 +807,14 @@ public boolean getConflictDetected() {
      * bool conflict_detected = 5;
      */
     public Builder setConflictDetected(boolean value) {
-      
+
       conflictDetected_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * Whether a conflict was detected for this mutation. Always false when a
      * conflict detection strategy field is not set in the mutation.
@@ -773,14 +823,14 @@ public Builder setConflictDetected(boolean value) {
      * bool conflict_detected = 5;
      */
     public Builder clearConflictDetected() {
-      
+
       conflictDetected_ = false;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -790,12 +840,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.MutationResult)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.MutationResult)
   private static final com.google.datastore.v1.MutationResult DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.MutationResult();
   }
@@ -804,16 +854,16 @@ public static com.google.datastore.v1.MutationResult getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public MutationResult parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutationResult(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public MutationResult parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new MutationResult(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -828,6 +878,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.MutationResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index fd19d2fa265e..681ae0217256 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface MutationResultOrBuilder extends
+public interface MutationResultOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.MutationResult)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -17,6 +20,8 @@ public interface MutationResultOrBuilder extends
    */
   boolean hasKey();
   /**
+   *
+   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -26,6 +31,8 @@ public interface MutationResultOrBuilder extends
    */
   com.google.datastore.v1.Key getKey();
   /**
+   *
+   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -36,6 +43,8 @@ public interface MutationResultOrBuilder extends
   com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder();
 
   /**
+   *
+   *
    * 
    * The version of the entity on the server after processing the mutation. If
    * the mutation doesn't change anything on the server, then the version will
@@ -49,6 +58,8 @@ public interface MutationResultOrBuilder extends
   long getVersion();
 
   /**
+   *
+   *
    * 
    * Whether a conflict was detected for this mutation. Always false when a
    * conflict detection strategy field is not set in the mutation.
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 d2865ea2798a..9ce64553ebe3 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
@@ -4,6 +4,8 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A partition ID identifies a grouping of entities. The grouping is always
  * by project and namespace, however the namespace ID may be empty.
@@ -24,25 +26,26 @@
  *
  * Protobuf type {@code google.datastore.v1.PartitionId}
  */
-public  final class PartitionId extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class PartitionId extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PartitionId)
     PartitionIdOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use PartitionId.newBuilder() to construct.
   private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private PartitionId() {
     projectId_ = "";
     namespaceId_ = "";
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private PartitionId(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -62,53 +65,59 @@ private PartitionId(
           case 0:
             done = true;
             break;
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            projectId_ = s;
-            break;
-          }
-          case 34: {
-            java.lang.String s = input.readStringRequireUtf8();
+              projectId_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            namespaceId_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              namespaceId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_PartitionId_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PartitionId.class, com.google.datastore.v1.PartitionId.Builder.class);
+            com.google.datastore.v1.PartitionId.class,
+            com.google.datastore.v1.PartitionId.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 2;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project to which the entities belong.
    * 

@@ -120,27 +129,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project to which the entities belong.
    * 

    *
    * string project_id = 2;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -151,6 +159,8 @@ public java.lang.String getProjectId() {
   public static final int NAMESPACE_ID_FIELD_NUMBER = 4;
   private volatile java.lang.Object namespaceId_;
   /**
+   *
+   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

@@ -162,27 +172,26 @@ public java.lang.String getNamespaceId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       namespaceId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

    *
    * string namespace_id = 4;
    */
-  public com.google.protobuf.ByteString
-      getNamespaceIdBytes() {
+  public com.google.protobuf.ByteString getNamespaceIdBytes() {
     java.lang.Object ref = namespaceId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       namespaceId_ = b;
       return b;
     } else {
@@ -191,6 +200,7 @@ public java.lang.String getNamespaceId() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -202,8 +212,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectId_);
     }
@@ -233,7 +242,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PartitionId)) {
       return super.equals(obj);
@@ -241,10 +250,8 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.PartitionId other = (com.google.datastore.v1.PartitionId) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
-    result = result && getNamespaceId()
-        .equals(other.getNamespaceId());
+    result = result && getProjectId().equals(other.getProjectId());
+    result = result && getNamespaceId().equals(other.getNamespaceId());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -265,97 +272,103 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PartitionId parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PartitionId parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.PartitionId parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.PartitionId parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PartitionId parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PartitionId parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PartitionId parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.PartitionId prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A partition ID identifies a grouping of entities. The grouping is always
    * by project and namespace, however the namespace ID may be empty.
@@ -376,21 +389,23 @@ protected Builder newBuilderForType(
    *
    * Protobuf type {@code google.datastore.v1.PartitionId}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PartitionId)
       com.google.datastore.v1.PartitionIdOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_PartitionId_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PartitionId.class, com.google.datastore.v1.PartitionId.Builder.class);
+              com.google.datastore.v1.PartitionId.class,
+              com.google.datastore.v1.PartitionId.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PartitionId.newBuilder()
@@ -398,16 +413,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -419,9 +433,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_PartitionId_descriptor;
     }
 
     @java.lang.Override
@@ -451,38 +465,39 @@ public com.google.datastore.v1.PartitionId buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PartitionId) {
-        return mergeFrom((com.google.datastore.v1.PartitionId)other);
+        return mergeFrom((com.google.datastore.v1.PartitionId) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -530,6 +545,8 @@ public Builder mergeFrom(
 
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project to which the entities belong.
      * 

@@ -539,8 +556,7 @@ public Builder mergeFrom(
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -549,19 +565,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -569,23 +585,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project to which the entities belong.
      * 

@@ -593,25 +612,26 @@ public Builder setProjectId(
      * string project_id = 2;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
@@ -619,6 +639,8 @@ public Builder setProjectIdBytes(
 
     private java.lang.Object namespaceId_ = "";
     /**
+     *
+     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

@@ -628,8 +650,7 @@ public Builder setProjectIdBytes(
     public java.lang.String getNamespaceId() {
       java.lang.Object ref = namespaceId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         namespaceId_ = s;
         return s;
@@ -638,19 +659,19 @@ public java.lang.String getNamespaceId() {
       }
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
      */
-    public com.google.protobuf.ByteString
-        getNamespaceIdBytes() {
+    public com.google.protobuf.ByteString getNamespaceIdBytes() {
       java.lang.Object ref = namespaceId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         namespaceId_ = b;
         return b;
       } else {
@@ -658,23 +679,26 @@ public java.lang.String getNamespaceId() {
       }
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
      */
-    public Builder setNamespaceId(
-        java.lang.String value) {
+    public Builder setNamespaceId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       namespaceId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

@@ -682,32 +706,33 @@ public Builder setNamespaceId(
      * string namespace_id = 4;
      */
     public Builder clearNamespaceId() {
-      
+
       namespaceId_ = getDefaultInstance().getNamespaceId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
      */
-    public Builder setNamespaceIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setNamespaceIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       namespaceId_ = value;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -717,12 +742,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PartitionId)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PartitionId)
   private static final com.google.datastore.v1.PartitionId DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PartitionId();
   }
@@ -731,16 +756,16 @@ public static com.google.datastore.v1.PartitionId getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public PartitionId parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionId(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public PartitionId parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new PartitionId(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -755,6 +780,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PartitionId getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 1c378fd56d71..ea246dd1a2cb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface PartitionIdOrBuilder extends
+public interface PartitionIdOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PartitionId)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project to which the entities belong.
    * 

@@ -16,16 +19,19 @@ public interface PartitionIdOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project to which the entities belong.
    * 

    *
    * string project_id = 2;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

@@ -34,12 +40,13 @@ public interface PartitionIdOrBuilder extends
    */
   java.lang.String getNamespaceId();
   /**
+   *
+   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

    *
    * string namespace_id = 4;
    */
-  com.google.protobuf.ByteString
-      getNamespaceIdBytes();
+  com.google.protobuf.ByteString getNamespaceIdBytes();
 }
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 e606620c8650..a0bfd00f6b5b 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
@@ -4,29 +4,31 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A representation of a property in a projection.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Projection}
  */
-public  final class Projection extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class Projection extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Projection)
     ProjectionOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use Projection.newBuilder() to construct.
   private Projection(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private Projection() {
-  }
+
+  private Projection() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private Projection(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -46,54 +48,61 @@ private Projection(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-            if (property_ != null) {
-              subBuilder = property_.toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
+              if (property_ != null) {
+                subBuilder = property_.toBuilder();
+              }
+              property_ =
+                  input.readMessage(
+                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(property_);
+                property_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(property_);
-              property_ = subBuilder.buildPartial();
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_Projection_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_Projection_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.Projection.class, com.google.datastore.v1.Projection.Builder.class);
+            com.google.datastore.v1.Projection.class,
+            com.google.datastore.v1.Projection.Builder.class);
   }
 
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
+   *
+   *
    * 
    * The property to project.
    * 

@@ -104,6 +113,8 @@ public boolean hasProperty() {
     return property_ != null;
   }
   /**
+   *
+   *
    * 
    * The property to project.
    * 

@@ -111,9 +122,13 @@ public boolean hasProperty() {
    * .google.datastore.v1.PropertyReference property = 1;
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
-    return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+    return property_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : property_;
   }
   /**
+   *
+   *
    * 
    * The property to project.
    * 

@@ -125,6 +140,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -136,8 +152,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (property_ != null) {
       output.writeMessage(1, getProperty());
     }
@@ -151,8 +166,7 @@ public int getSerializedSize() {
 
     size = 0;
     if (property_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getProperty());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -162,7 +176,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Projection)) {
       return super.equals(obj);
@@ -172,8 +186,7 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasProperty() == other.hasProperty());
     if (hasProperty()) {
-      result = result && getProperty()
-          .equals(other.getProperty());
+      result = result && getProperty().equals(other.getProperty());
     }
     result = result && unknownFields.equals(other.unknownFields);
     return result;
@@ -195,118 +208,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Projection parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Projection parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.Projection parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.Projection parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Projection parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Projection parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Projection parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.Projection prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A representation of a property in a projection.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Projection}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Projection)
       com.google.datastore.v1.ProjectionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Projection_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Projection_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.Projection.class, com.google.datastore.v1.Projection.Builder.class);
+              com.google.datastore.v1.Projection.class,
+              com.google.datastore.v1.Projection.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.Projection.newBuilder()
@@ -314,16 +335,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -337,9 +357,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Projection_descriptor;
     }
 
     @java.lang.Override
@@ -372,38 +392,39 @@ public com.google.datastore.v1.Projection buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Projection) {
-        return mergeFrom((com.google.datastore.v1.Projection)other);
+        return mergeFrom((com.google.datastore.v1.Projection) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -446,8 +467,13 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.PropertyReference property_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_;
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        propertyBuilder_;
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -458,6 +484,8 @@ public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -466,12 +494,16 @@ public boolean hasProperty() {
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
-        return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
       } else {
         return propertyBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -492,14 +524,15 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
      */
-    public Builder setProperty(
-        com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+    public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
         onChanged();
@@ -510,6 +543,8 @@ public Builder setProperty(
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -520,7 +555,9 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
         if (property_ != null) {
           property_ =
-            com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.PropertyReference.newBuilder(property_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           property_ = value;
         }
@@ -532,6 +569,8 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -550,6 +589,8 @@ public Builder clearProperty() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -557,11 +598,13 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-      
+
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -572,11 +615,14 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
       if (propertyBuilder_ != null) {
         return propertyBuilder_.getMessageOrBuilder();
       } else {
-        return property_ == null ?
-            com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
       }
     }
     /**
+     *
+     *
      * 
      * The property to project.
      * 

@@ -584,21 +630,24 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * .google.datastore.v1.PropertyReference property = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
         getPropertyFieldBuilder() {
       if (propertyBuilder_ == null) {
-        propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                getProperty(),
-                getParentForChildren(),
-                isClean());
+        propertyBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                getProperty(), getParentForChildren(), isClean());
         property_ = null;
       }
       return propertyBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -608,12 +657,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Projection)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Projection)
   private static final com.google.datastore.v1.Projection DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Projection();
   }
@@ -622,16 +671,16 @@ public static com.google.datastore.v1.Projection getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public Projection parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Projection(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Projection parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Projection(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -646,6 +695,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Projection getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 648a76a8b9a1..46f7c370d39f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface ProjectionOrBuilder extends
+public interface ProjectionOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Projection)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The property to project.
    * 

@@ -16,6 +19,8 @@ public interface ProjectionOrBuilder extends
    */
   boolean hasProperty();
   /**
+   *
+   *
    * 
    * The property to project.
    * 

@@ -24,6 +29,8 @@ public interface ProjectionOrBuilder extends
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
+   *
+   *
    * 
    * The property to project.
    * 

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 9651ee87e9d1..157fec2847df 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A filter on a specific property.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PropertyFilter}
  */
-public  final class PropertyFilter extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class PropertyFilter extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyFilter)
     PropertyFilterOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use PropertyFilter.newBuilder() to construct.
   private PropertyFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private PropertyFilter() {
     op_ = 0;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private PropertyFilter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,80 +50,90 @@ private PropertyFilter(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-            if (property_ != null) {
-              subBuilder = property_.toBuilder();
-            }
-            property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(property_);
-              property_ = subBuilder.buildPartial();
+          case 10:
+            {
+              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
+              if (property_ != null) {
+                subBuilder = property_.toBuilder();
+              }
+              property_ =
+                  input.readMessage(
+                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(property_);
+                property_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
+          case 16:
+            {
+              int rawValue = input.readEnum();
 
-            break;
-          }
-          case 16: {
-            int rawValue = input.readEnum();
-
-            op_ = rawValue;
-            break;
-          }
-          case 26: {
-            com.google.datastore.v1.Value.Builder subBuilder = null;
-            if (value_ != null) {
-              subBuilder = value_.toBuilder();
+              op_ = rawValue;
+              break;
             }
-            value_ = input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(value_);
-              value_ = subBuilder.buildPartial();
+          case 26:
+            {
+              com.google.datastore.v1.Value.Builder subBuilder = null;
+              if (value_ != null) {
+                subBuilder = value_.toBuilder();
+              }
+              value_ = input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(value_);
+                value_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_PropertyFilter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PropertyFilter.class, com.google.datastore.v1.PropertyFilter.Builder.class);
+            com.google.datastore.v1.PropertyFilter.class,
+            com.google.datastore.v1.PropertyFilter.Builder.class);
   }
 
   /**
+   *
+   *
    * 
    * A property filter operator.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.PropertyFilter.Operator}
    */
-  public enum Operator
-      implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -129,6 +142,8 @@ public enum Operator
      */
     OPERATOR_UNSPECIFIED(0),
     /**
+     *
+     *
      * 
      * Less than.
      * 

@@ -137,6 +152,8 @@ public enum Operator
      */
     LESS_THAN(1),
     /**
+     *
+     *
      * 
      * Less than or equal.
      * 

@@ -145,6 +162,8 @@ public enum Operator
      */
     LESS_THAN_OR_EQUAL(2),
     /**
+     *
+     *
      * 
      * Greater than.
      * 

@@ -153,6 +172,8 @@ public enum Operator
      */
     GREATER_THAN(3),
     /**
+     *
+     *
      * 
      * Greater than or equal.
      * 

@@ -161,6 +182,8 @@ public enum Operator
      */
     GREATER_THAN_OR_EQUAL(4),
     /**
+     *
+     *
      * 
      * Equal.
      * 

@@ -169,6 +192,8 @@ public enum Operator
      */
     EQUAL(5),
     /**
+     *
+     *
      * 
      * Has ancestor.
      * 

@@ -180,6 +205,8 @@ public enum Operator
     ;
 
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -188,6 +215,8 @@ public enum Operator
      */
     public static final int OPERATOR_UNSPECIFIED_VALUE = 0;
     /**
+     *
+     *
      * 
      * Less than.
      * 

@@ -196,6 +225,8 @@ public enum Operator
      */
     public static final int LESS_THAN_VALUE = 1;
     /**
+     *
+     *
      * 
      * Less than or equal.
      * 

@@ -204,6 +235,8 @@ public enum Operator
      */
     public static final int LESS_THAN_OR_EQUAL_VALUE = 2;
     /**
+     *
+     *
      * 
      * Greater than.
      * 

@@ -212,6 +245,8 @@ public enum Operator
      */
     public static final int GREATER_THAN_VALUE = 3;
     /**
+     *
+     *
      * 
      * Greater than or equal.
      * 

@@ -220,6 +255,8 @@ public enum Operator
      */
     public static final int GREATER_THAN_OR_EQUAL_VALUE = 4;
     /**
+     *
+     *
      * 
      * Equal.
      * 

@@ -228,6 +265,8 @@ public enum Operator
      */
     public static final int EQUAL_VALUE = 5;
     /**
+     *
+     *
      * 
      * Has ancestor.
      * 

@@ -236,7 +275,6 @@ public enum Operator
      */
     public static final int HAS_ANCESTOR_VALUE = 11;
 
-
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -245,9 +283,7 @@ public final int getNumber() {
       return value;
     }
 
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static Operator valueOf(int value) {
       return forNumber(value);
@@ -255,49 +291,53 @@ public static Operator valueOf(int value) {
 
     public static Operator forNumber(int value) {
       switch (value) {
-        case 0: return OPERATOR_UNSPECIFIED;
-        case 1: return LESS_THAN;
-        case 2: return LESS_THAN_OR_EQUAL;
-        case 3: return GREATER_THAN;
-        case 4: return GREATER_THAN_OR_EQUAL;
-        case 5: return EQUAL;
-        case 11: return HAS_ANCESTOR;
-        default: return null;
+        case 0:
+          return OPERATOR_UNSPECIFIED;
+        case 1:
+          return LESS_THAN;
+        case 2:
+          return LESS_THAN_OR_EQUAL;
+        case 3:
+          return GREATER_THAN;
+        case 4:
+          return GREATER_THAN_OR_EQUAL;
+        case 5:
+          return EQUAL;
+        case 11:
+          return HAS_ANCESTOR;
+        default:
+          return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
       return internalValueMap;
     }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Operator> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public Operator findValueByNumber(int number) {
-              return Operator.forNumber(number);
-            }
-          };
 
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public Operator findValueByNumber(int number) {
+            return Operator.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
       return com.google.datastore.v1.PropertyFilter.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Operator[] VALUES = values();
 
-    public static Operator valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Operator valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -317,6 +357,8 @@ private Operator(int value) {
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
+   *
+   *
    * 
    * The property to filter by.
    * 

@@ -327,6 +369,8 @@ public boolean hasProperty() {
     return property_ != null;
   }
   /**
+   *
+   *
    * 
    * The property to filter by.
    * 

@@ -334,9 +378,13 @@ public boolean hasProperty() {
    * .google.datastore.v1.PropertyReference property = 1;
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
-    return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+    return property_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : property_;
   }
   /**
+   *
+   *
    * 
    * The property to filter by.
    * 

@@ -350,6 +398,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   public static final int OP_FIELD_NUMBER = 2;
   private int op_;
   /**
+   *
+   *
    * 
    * The operator to filter by.
    * 

@@ -360,6 +410,8 @@ public int getOpValue() {
     return op_;
   }
   /**
+   *
+   *
    * 
    * The operator to filter by.
    * 

@@ -368,13 +420,16 @@ public int getOpValue() {
    */
   public com.google.datastore.v1.PropertyFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
+    com.google.datastore.v1.PropertyFilter.Operator result =
+        com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
     return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
   }
 
   public static final int VALUE_FIELD_NUMBER = 3;
   private com.google.datastore.v1.Value value_;
   /**
+   *
+   *
    * 
    * The value to compare the property to.
    * 

@@ -385,6 +440,8 @@ public boolean hasValue() {
     return value_ != null;
   }
   /**
+   *
+   *
    * 
    * The value to compare the property to.
    * 

@@ -395,6 +452,8 @@ public com.google.datastore.v1.Value getValue() {
     return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
   }
   /**
+   *
+   *
    * 
    * The value to compare the property to.
    * 

@@ -406,6 +465,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -417,8 +477,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (property_ != null) {
       output.writeMessage(1, getProperty());
     }
@@ -438,16 +497,13 @@ public int getSerializedSize() {
 
     size = 0;
     if (property_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getProperty());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
     }
     if (op_ != com.google.datastore.v1.PropertyFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(2, op_);
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, op_);
     }
     if (value_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getValue());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getValue());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -457,7 +513,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PropertyFilter)) {
       return super.equals(obj);
@@ -467,14 +523,12 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasProperty() == other.hasProperty());
     if (hasProperty()) {
-      result = result && getProperty()
-          .equals(other.getProperty());
+      result = result && getProperty().equals(other.getProperty());
     }
     result = result && op_ == other.op_;
     result = result && (hasValue() == other.hasValue());
     if (hasValue()) {
-      result = result && getValue()
-          .equals(other.getValue());
+      result = result && getValue().equals(other.getValue());
     }
     result = result && unknownFields.equals(other.unknownFields);
     return result;
@@ -502,118 +556,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PropertyFilter parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PropertyFilter parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyFilter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.PropertyFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A filter on a specific property.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PropertyFilter}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyFilter)
       com.google.datastore.v1.PropertyFilterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyFilter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PropertyFilter.class, com.google.datastore.v1.PropertyFilter.Builder.class);
+              com.google.datastore.v1.PropertyFilter.class,
+              com.google.datastore.v1.PropertyFilter.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PropertyFilter.newBuilder()
@@ -621,16 +684,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -652,9 +714,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyFilter_descriptor;
     }
 
     @java.lang.Override
@@ -673,7 +735,8 @@ public com.google.datastore.v1.PropertyFilter build() {
 
     @java.lang.Override
     public com.google.datastore.v1.PropertyFilter buildPartial() {
-      com.google.datastore.v1.PropertyFilter result = new com.google.datastore.v1.PropertyFilter(this);
+      com.google.datastore.v1.PropertyFilter result =
+          new com.google.datastore.v1.PropertyFilter(this);
       if (propertyBuilder_ == null) {
         result.property_ = property_;
       } else {
@@ -693,38 +756,39 @@ public com.google.datastore.v1.PropertyFilter buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyFilter) {
-        return mergeFrom((com.google.datastore.v1.PropertyFilter)other);
+        return mergeFrom((com.google.datastore.v1.PropertyFilter) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -773,8 +837,13 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.PropertyReference property_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_;
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        propertyBuilder_;
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -785,6 +854,8 @@ public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -793,12 +864,16 @@ public boolean hasProperty() {
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
-        return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
       } else {
         return propertyBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -819,14 +894,15 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
      */
-    public Builder setProperty(
-        com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+    public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
         onChanged();
@@ -837,6 +913,8 @@ public Builder setProperty(
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -847,7 +925,9 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
         if (property_ != null) {
           property_ =
-            com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.PropertyReference.newBuilder(property_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           property_ = value;
         }
@@ -859,6 +939,8 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -877,6 +959,8 @@ public Builder clearProperty() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -884,11 +968,13 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-      
+
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -899,11 +985,14 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
       if (propertyBuilder_ != null) {
         return propertyBuilder_.getMessageOrBuilder();
       } else {
-        return property_ == null ?
-            com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
       }
     }
     /**
+     *
+     *
      * 
      * The property to filter by.
      * 

@@ -911,14 +1000,17 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * .google.datastore.v1.PropertyReference property = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
         getPropertyFieldBuilder() {
       if (propertyBuilder_ == null) {
-        propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                getProperty(),
-                getParentForChildren(),
-                isClean());
+        propertyBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                getProperty(), getParentForChildren(), isClean());
         property_ = null;
       }
       return propertyBuilder_;
@@ -926,6 +1018,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
 
     private int op_ = 0;
     /**
+     *
+     *
      * 
      * The operator to filter by.
      * 

@@ -936,6 +1030,8 @@ public int getOpValue() {
       return op_;
     }
     /**
+     *
+     *
      * 
      * The operator to filter by.
      * 

@@ -948,6 +1044,8 @@ public Builder setOpValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The operator to filter by.
      * 

@@ -956,10 +1054,13 @@ public Builder setOpValue(int value) {
      */
     public com.google.datastore.v1.PropertyFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
+      com.google.datastore.v1.PropertyFilter.Operator result =
+          com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
       return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
     }
     /**
+     *
+     *
      * 
      * The operator to filter by.
      * 

@@ -970,12 +1071,14 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      
+
       op_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The operator to filter by.
      * 

@@ -983,7 +1086,7 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
      */
     public Builder clearOp() {
-      
+
       op_ = 0;
       onChanged();
       return this;
@@ -991,8 +1094,13 @@ public Builder clearOp() {
 
     private com.google.datastore.v1.Value value_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_;
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        valueBuilder_;
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1003,6 +1111,8 @@ public boolean hasValue() {
       return valueBuilder_ != null || value_ != null;
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1017,6 +1127,8 @@ public com.google.datastore.v1.Value getValue() {
       }
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1037,14 +1149,15 @@ public Builder setValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

      *
      * .google.datastore.v1.Value value = 3;
      */
-    public Builder setValue(
-        com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
       if (valueBuilder_ == null) {
         value_ = builderForValue.build();
         onChanged();
@@ -1055,6 +1168,8 @@ public Builder setValue(
       return this;
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1064,8 +1179,7 @@ public Builder setValue(
     public Builder mergeValue(com.google.datastore.v1.Value value) {
       if (valueBuilder_ == null) {
         if (value_ != null) {
-          value_ =
-            com.google.datastore.v1.Value.newBuilder(value_).mergeFrom(value).buildPartial();
+          value_ = com.google.datastore.v1.Value.newBuilder(value_).mergeFrom(value).buildPartial();
         } else {
           value_ = value;
         }
@@ -1077,6 +1191,8 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1095,6 +1211,8 @@ public Builder clearValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1102,11 +1220,13 @@ public Builder clearValue() {
      * .google.datastore.v1.Value value = 3;
      */
     public com.google.datastore.v1.Value.Builder getValueBuilder() {
-      
+
       onChanged();
       return getValueFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1117,11 +1237,12 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       if (valueBuilder_ != null) {
         return valueBuilder_.getMessageOrBuilder();
       } else {
-        return value_ == null ?
-            com.google.datastore.v1.Value.getDefaultInstance() : value_;
+        return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
       }
     }
     /**
+     *
+     *
      * 
      * The value to compare the property to.
      * 

@@ -1129,21 +1250,24 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
      * .google.datastore.v1.Value value = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> 
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
         getValueFieldBuilder() {
       if (valueBuilder_ == null) {
-        valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>(
-                getValue(),
-                getParentForChildren(),
-                isClean());
+        valueBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
+                getValue(), getParentForChildren(), isClean());
         value_ = null;
       }
       return valueBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1153,12 +1277,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyFilter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyFilter)
   private static final com.google.datastore.v1.PropertyFilter DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyFilter();
   }
@@ -1167,16 +1291,16 @@ public static com.google.datastore.v1.PropertyFilter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public PropertyFilter parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PropertyFilter(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public PropertyFilter parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new PropertyFilter(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1191,6 +1315,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index bea00389b63c..426eb1eb4b31 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface PropertyFilterOrBuilder extends
+public interface PropertyFilterOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyFilter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The property to filter by.
    * 

@@ -16,6 +19,8 @@ public interface PropertyFilterOrBuilder extends
    */
   boolean hasProperty();
   /**
+   *
+   *
    * 
    * The property to filter by.
    * 

@@ -24,6 +29,8 @@ public interface PropertyFilterOrBuilder extends
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
+   *
+   *
    * 
    * The property to filter by.
    * 

@@ -33,6 +40,8 @@ public interface PropertyFilterOrBuilder extends
   com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
 
   /**
+   *
+   *
    * 
    * The operator to filter by.
    * 

@@ -41,6 +50,8 @@ public interface PropertyFilterOrBuilder extends
    */
   int getOpValue();
   /**
+   *
+   *
    * 
    * The operator to filter by.
    * 

@@ -50,6 +61,8 @@ public interface PropertyFilterOrBuilder extends
   com.google.datastore.v1.PropertyFilter.Operator getOp();
 
   /**
+   *
+   *
    * 
    * The value to compare the property to.
    * 

@@ -58,6 +71,8 @@ public interface PropertyFilterOrBuilder extends
    */
   boolean hasValue();
   /**
+   *
+   *
    * 
    * The value to compare the property to.
    * 

@@ -66,6 +81,8 @@ public interface PropertyFilterOrBuilder extends
    */
   com.google.datastore.v1.Value getValue();
   /**
+   *
+   *
    * 
    * The value to compare the property to.
    * 

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 f13b15baedbe..ad1396a9317e 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The desired order for a specific property.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PropertyOrder}
  */
-public  final class PropertyOrder extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class PropertyOrder extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyOrder)
     PropertyOrderOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use PropertyOrder.newBuilder() to construct.
   private PropertyOrder(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private PropertyOrder() {
     direction_ = 0;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private PropertyOrder(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,67 +50,76 @@ private PropertyOrder(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-            if (property_ != null) {
-              subBuilder = property_.toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
+              if (property_ != null) {
+                subBuilder = property_.toBuilder();
+              }
+              property_ =
+                  input.readMessage(
+                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(property_);
+                property_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(property_);
-              property_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 16: {
-            int rawValue = input.readEnum();
+          case 16:
+            {
+              int rawValue = input.readEnum();
 
-            direction_ = rawValue;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              direction_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_PropertyOrder_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PropertyOrder.class, com.google.datastore.v1.PropertyOrder.Builder.class);
+            com.google.datastore.v1.PropertyOrder.class,
+            com.google.datastore.v1.PropertyOrder.Builder.class);
   }
 
   /**
+   *
+   *
    * 
    * The sort direction.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.PropertyOrder.Direction}
    */
-  public enum Direction
-      implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -116,6 +128,8 @@ public enum Direction
      */
     DIRECTION_UNSPECIFIED(0),
     /**
+     *
+     *
      * 
      * Ascending.
      * 

@@ -124,6 +138,8 @@ public enum Direction
      */
     ASCENDING(1),
     /**
+     *
+     *
      * 
      * Descending.
      * 

@@ -135,6 +151,8 @@ public enum Direction
     ;
 
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -143,6 +161,8 @@ public enum Direction
      */
     public static final int DIRECTION_UNSPECIFIED_VALUE = 0;
     /**
+     *
+     *
      * 
      * Ascending.
      * 

@@ -151,6 +171,8 @@ public enum Direction
      */
     public static final int ASCENDING_VALUE = 1;
     /**
+     *
+     *
      * 
      * Descending.
      * 

@@ -159,7 +181,6 @@ public enum Direction
      */
     public static final int DESCENDING_VALUE = 2;
 
-
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -168,9 +189,7 @@ public final int getNumber() {
       return value;
     }
 
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static Direction valueOf(int value) {
       return forNumber(value);
@@ -178,45 +197,45 @@ public static Direction valueOf(int value) {
 
     public static Direction forNumber(int value) {
       switch (value) {
-        case 0: return DIRECTION_UNSPECIFIED;
-        case 1: return ASCENDING;
-        case 2: return DESCENDING;
-        default: return null;
+        case 0:
+          return DIRECTION_UNSPECIFIED;
+        case 1:
+          return ASCENDING;
+        case 2:
+          return DESCENDING;
+        default:
+          return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
       return internalValueMap;
     }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Direction> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public Direction findValueByNumber(int number) {
-              return Direction.forNumber(number);
-            }
-          };
 
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public Direction findValueByNumber(int number) {
+            return Direction.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
       return com.google.datastore.v1.PropertyOrder.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Direction[] VALUES = values();
 
-    public static Direction valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Direction valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -236,6 +255,8 @@ private Direction(int value) {
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
+   *
+   *
    * 
    * The property to order by.
    * 

@@ -246,6 +267,8 @@ public boolean hasProperty() {
     return property_ != null;
   }
   /**
+   *
+   *
    * 
    * The property to order by.
    * 

@@ -253,9 +276,13 @@ public boolean hasProperty() {
    * .google.datastore.v1.PropertyReference property = 1;
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
-    return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+    return property_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : property_;
   }
   /**
+   *
+   *
    * 
    * The property to order by.
    * 

@@ -269,6 +296,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   public static final int DIRECTION_FIELD_NUMBER = 2;
   private int direction_;
   /**
+   *
+   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

@@ -279,6 +308,8 @@ public int getDirectionValue() {
     return direction_;
   }
   /**
+   *
+   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

@@ -287,11 +318,13 @@ public int getDirectionValue() {
    */
   public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
+    com.google.datastore.v1.PropertyOrder.Direction result =
+        com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
     return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -303,12 +336,12 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (property_ != null) {
       output.writeMessage(1, getProperty());
     }
-    if (direction_ != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
+    if (direction_
+        != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, direction_);
     }
     unknownFields.writeTo(output);
@@ -321,12 +354,11 @@ public int getSerializedSize() {
 
     size = 0;
     if (property_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getProperty());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
     }
-    if (direction_ != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(2, direction_);
+    if (direction_
+        != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -336,7 +368,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PropertyOrder)) {
       return super.equals(obj);
@@ -346,8 +378,7 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasProperty() == other.hasProperty());
     if (hasProperty()) {
-      result = result && getProperty()
-          .equals(other.getProperty());
+      result = result && getProperty().equals(other.getProperty());
     }
     result = result && direction_ == other.direction_;
     result = result && unknownFields.equals(other.unknownFields);
@@ -372,118 +403,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PropertyOrder parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PropertyOrder parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.PropertyOrder parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.PropertyOrder parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyOrder parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.PropertyOrder prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The desired order for a specific property.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PropertyOrder}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyOrder)
       com.google.datastore.v1.PropertyOrderOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyOrder_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PropertyOrder.class, com.google.datastore.v1.PropertyOrder.Builder.class);
+              com.google.datastore.v1.PropertyOrder.class,
+              com.google.datastore.v1.PropertyOrder.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PropertyOrder.newBuilder()
@@ -491,16 +530,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -516,9 +554,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyOrder_descriptor;
     }
 
     @java.lang.Override
@@ -537,7 +575,8 @@ public com.google.datastore.v1.PropertyOrder build() {
 
     @java.lang.Override
     public com.google.datastore.v1.PropertyOrder buildPartial() {
-      com.google.datastore.v1.PropertyOrder result = new com.google.datastore.v1.PropertyOrder(this);
+      com.google.datastore.v1.PropertyOrder result =
+          new com.google.datastore.v1.PropertyOrder(this);
       if (propertyBuilder_ == null) {
         result.property_ = property_;
       } else {
@@ -552,38 +591,39 @@ public com.google.datastore.v1.PropertyOrder buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyOrder) {
-        return mergeFrom((com.google.datastore.v1.PropertyOrder)other);
+        return mergeFrom((com.google.datastore.v1.PropertyOrder) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -629,8 +669,13 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.PropertyReference property_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_;
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        propertyBuilder_;
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -641,6 +686,8 @@ public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -649,12 +696,16 @@ public boolean hasProperty() {
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
-        return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
       } else {
         return propertyBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -675,14 +726,15 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
      */
-    public Builder setProperty(
-        com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+    public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
         onChanged();
@@ -693,6 +745,8 @@ public Builder setProperty(
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -703,7 +757,9 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
         if (property_ != null) {
           property_ =
-            com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.PropertyReference.newBuilder(property_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           property_ = value;
         }
@@ -715,6 +771,8 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -733,6 +791,8 @@ public Builder clearProperty() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -740,11 +800,13 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-      
+
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -755,11 +817,14 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
       if (propertyBuilder_ != null) {
         return propertyBuilder_.getMessageOrBuilder();
       } else {
-        return property_ == null ?
-            com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
       }
     }
     /**
+     *
+     *
      * 
      * The property to order by.
      * 

@@ -767,14 +832,17 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * .google.datastore.v1.PropertyReference property = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
         getPropertyFieldBuilder() {
       if (propertyBuilder_ == null) {
-        propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                getProperty(),
-                getParentForChildren(),
-                isClean());
+        propertyBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                getProperty(), getParentForChildren(), isClean());
         property_ = null;
       }
       return propertyBuilder_;
@@ -782,6 +850,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
 
     private int direction_ = 0;
     /**
+     *
+     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

@@ -792,6 +862,8 @@ public int getDirectionValue() {
       return direction_;
     }
     /**
+     *
+     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

@@ -804,6 +876,8 @@ public Builder setDirectionValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

@@ -812,10 +886,13 @@ public Builder setDirectionValue(int value) {
      */
     public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
+      com.google.datastore.v1.PropertyOrder.Direction result =
+          com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
       return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
     }
     /**
+     *
+     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

@@ -826,12 +903,14 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu
       if (value == null) {
         throw new NullPointerException();
       }
-      
+
       direction_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

@@ -839,14 +918,14 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
      */
     public Builder clearDirection() {
-      
+
       direction_ = 0;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -856,12 +935,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyOrder)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyOrder)
   private static final com.google.datastore.v1.PropertyOrder DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyOrder();
   }
@@ -870,16 +949,16 @@ public static com.google.datastore.v1.PropertyOrder getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public PropertyOrder parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PropertyOrder(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public PropertyOrder parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new PropertyOrder(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -894,6 +973,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index 6b4f9e536093..5b61547c8001 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface PropertyOrderOrBuilder extends
+public interface PropertyOrderOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyOrder)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The property to order by.
    * 

@@ -16,6 +19,8 @@ public interface PropertyOrderOrBuilder extends
    */
   boolean hasProperty();
   /**
+   *
+   *
    * 
    * The property to order by.
    * 

@@ -24,6 +29,8 @@ public interface PropertyOrderOrBuilder extends
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
+   *
+   *
    * 
    * The property to order by.
    * 

@@ -33,6 +40,8 @@ public interface PropertyOrderOrBuilder extends
   com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
 
   /**
+   *
+   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

@@ -41,6 +50,8 @@ public interface PropertyOrderOrBuilder extends
    */
   int getDirectionValue();
   /**
+   *
+   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

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 ae6196b33b1e..a540741a0dcc 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A reference to a property relative to the kind expressions.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PropertyReference}
  */
-public  final class PropertyReference extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class PropertyReference extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyReference)
     PropertyReferenceOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use PropertyReference.newBuilder() to construct.
   private PropertyReference(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private PropertyReference() {
     name_ = "";
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private PropertyReference(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,47 +50,52 @@ private PropertyReference(
           case 0:
             done = true;
             break;
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            name_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_PropertyReference_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PropertyReference.class, com.google.datastore.v1.PropertyReference.Builder.class);
+            com.google.datastore.v1.PropertyReference.class,
+            com.google.datastore.v1.PropertyReference.Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 2;
   private volatile java.lang.Object name_;
   /**
+   *
+   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
@@ -100,14 +108,15 @@ public java.lang.String getName() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
@@ -115,13 +124,11 @@ public java.lang.String getName() {
    *
    * string name = 2;
    */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
+  public com.google.protobuf.ByteString getNameBytes() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       name_ = b;
       return b;
     } else {
@@ -130,6 +137,7 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -141,8 +149,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
     }
@@ -166,16 +173,16 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PropertyReference)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.PropertyReference other = (com.google.datastore.v1.PropertyReference) obj;
+    com.google.datastore.v1.PropertyReference other =
+        (com.google.datastore.v1.PropertyReference) obj;
 
     boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
+    result = result && getName().equals(other.getName());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -194,118 +201,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PropertyReference parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PropertyReference parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.PropertyReference parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.PropertyReference parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyReference parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.PropertyReference parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.PropertyReference prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A reference to a property relative to the kind expressions.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PropertyReference}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyReference)
       com.google.datastore.v1.PropertyReferenceOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyReference_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PropertyReference.class, com.google.datastore.v1.PropertyReference.Builder.class);
+              com.google.datastore.v1.PropertyReference.class,
+              com.google.datastore.v1.PropertyReference.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PropertyReference.newBuilder()
@@ -313,16 +329,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -332,9 +347,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_PropertyReference_descriptor;
     }
 
     @java.lang.Override
@@ -353,7 +368,8 @@ public com.google.datastore.v1.PropertyReference build() {
 
     @java.lang.Override
     public com.google.datastore.v1.PropertyReference buildPartial() {
-      com.google.datastore.v1.PropertyReference result = new com.google.datastore.v1.PropertyReference(this);
+      com.google.datastore.v1.PropertyReference result =
+          new com.google.datastore.v1.PropertyReference(this);
       result.name_ = name_;
       onBuilt();
       return result;
@@ -363,38 +379,39 @@ public com.google.datastore.v1.PropertyReference buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyReference) {
-        return mergeFrom((com.google.datastore.v1.PropertyReference)other);
+        return mergeFrom((com.google.datastore.v1.PropertyReference) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -438,6 +455,8 @@ public Builder mergeFrom(
 
     private java.lang.Object name_ = "";
     /**
+     *
+     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
@@ -448,8 +467,7 @@ public Builder mergeFrom(
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
@@ -458,6 +476,8 @@ public java.lang.String getName() {
       }
     }
     /**
+     *
+     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
@@ -465,13 +485,11 @@ public java.lang.String getName() {
      *
      * string name = 2;
      */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
+    public com.google.protobuf.ByteString getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -479,6 +497,8 @@ public java.lang.String getName() {
       }
     }
     /**
+     *
+     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
@@ -486,17 +506,18 @@ public java.lang.String getName() {
      *
      * string name = 2;
      */
-    public Builder setName(
-        java.lang.String value) {
+    public Builder setName(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       name_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
@@ -505,12 +526,14 @@ public Builder setName(
      * string name = 2;
      */
     public Builder clearName() {
-      
+
       name_ = getDefaultInstance().getName();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
@@ -518,20 +541,19 @@ public Builder clearName() {
      *
      * string name = 2;
      */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setNameBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       name_ = value;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -541,12 +563,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyReference)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyReference)
   private static final com.google.datastore.v1.PropertyReference DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyReference();
   }
@@ -555,16 +577,16 @@ public static com.google.datastore.v1.PropertyReference getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public PropertyReference parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PropertyReference(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public PropertyReference parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new PropertyReference(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -579,6 +601,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index c8dc42d72b3c..39fde12b99be 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface PropertyReferenceOrBuilder extends
+public interface PropertyReferenceOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyReference)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
@@ -17,6 +20,8 @@ public interface PropertyReferenceOrBuilder extends
    */
   java.lang.String getName();
   /**
+   *
+   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
@@ -24,6 +29,5 @@ public interface PropertyReferenceOrBuilder extends
    *
    * string name = 2;
    */
-  com.google.protobuf.ByteString
-      getNameBytes();
+  com.google.protobuf.ByteString getNameBytes();
 }
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 3e5e2298562a..ecd8c13d5973 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
@@ -4,21 +4,24 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A query for entities.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Query}
  */
-public  final class Query extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class Query extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Query)
     QueryOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use Query.newBuilder() to construct.
   private Query(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private Query() {
     projection_ = java.util.Collections.emptyList();
     kind_ = java.util.Collections.emptyList();
@@ -30,10 +33,10 @@ private Query() {
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private Query(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -53,97 +56,108 @@ private Query(
           case 0:
             done = true;
             break;
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              projection_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                projection_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              projection_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.Projection.parser(), extensionRegistry));
+              break;
             }
-            projection_.add(
-                input.readMessage(com.google.datastore.v1.Projection.parser(), extensionRegistry));
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              kind_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                kind_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              kind_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.KindExpression.parser(), extensionRegistry));
+              break;
             }
-            kind_.add(
-                input.readMessage(com.google.datastore.v1.KindExpression.parser(), extensionRegistry));
-            break;
-          }
-          case 34: {
-            com.google.datastore.v1.Filter.Builder subBuilder = null;
-            if (filter_ != null) {
-              subBuilder = filter_.toBuilder();
+          case 34:
+            {
+              com.google.datastore.v1.Filter.Builder subBuilder = null;
+              if (filter_ != null) {
+                subBuilder = filter_.toBuilder();
+              }
+              filter_ =
+                  input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(filter_);
+                filter_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            filter_ = input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(filter_);
-              filter_ = subBuilder.buildPartial();
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+                order_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              order_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry));
+              break;
             }
-
-            break;
-          }
-          case 42: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              order_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000008;
+          case 50:
+            {
+              if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+                distinctOn_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              distinctOn_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry));
+              break;
             }
-            order_.add(
-                input.readMessage(com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry));
-            break;
-          }
-          case 50: {
-            if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-              distinctOn_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000010;
+          case 58:
+            {
+              startCursor_ = input.readBytes();
+              break;
             }
-            distinctOn_.add(
-                input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry));
-            break;
-          }
-          case 58: {
-
-            startCursor_ = input.readBytes();
-            break;
-          }
-          case 66: {
-
-            endCursor_ = input.readBytes();
-            break;
-          }
-          case 80: {
-
-            offset_ = input.readInt32();
-            break;
-          }
-          case 98: {
-            com.google.protobuf.Int32Value.Builder subBuilder = null;
-            if (limit_ != null) {
-              subBuilder = limit_.toBuilder();
+          case 66:
+            {
+              endCursor_ = input.readBytes();
+              break;
             }
-            limit_ = input.readMessage(com.google.protobuf.Int32Value.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(limit_);
-              limit_ = subBuilder.buildPartial();
+          case 80:
+            {
+              offset_ = input.readInt32();
+              break;
             }
-
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 98:
+            {
+              com.google.protobuf.Int32Value.Builder subBuilder = null;
+              if (limit_ != null) {
+                subBuilder = limit_.toBuilder();
+              }
+              limit_ =
+                  input.readMessage(com.google.protobuf.Int32Value.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(limit_);
+                limit_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         projection_ = java.util.Collections.unmodifiableList(projection_);
@@ -161,15 +175,16 @@ private Query(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_Query_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class);
   }
@@ -178,6 +193,8 @@ private Query(
   public static final int PROJECTION_FIELD_NUMBER = 2;
   private java.util.List projection_;
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -188,17 +205,21 @@ public java.util.List getProjectionList() {
     return projection_;
   }
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  public java.util.List 
+  public java.util.List
       getProjectionOrBuilderList() {
     return projection_;
   }
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -209,6 +230,8 @@ public int getProjectionCount() {
     return projection_.size();
   }
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -219,20 +242,23 @@ public com.google.datastore.v1.Projection getProjection(int index) {
     return projection_.get(index);
   }
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
-      int index) {
+  public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int index) {
     return projection_.get(index);
   }
 
   public static final int KIND_FIELD_NUMBER = 3;
   private java.util.List kind_;
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -244,6 +270,8 @@ public java.util.List getKindList() {
     return kind_;
   }
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -251,11 +279,13 @@ public java.util.List getKindList() {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  public java.util.List 
+  public java.util.List
       getKindOrBuilderList() {
     return kind_;
   }
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -267,6 +297,8 @@ public int getKindCount() {
     return kind_.size();
   }
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -278,6 +310,8 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
     return kind_.get(index);
   }
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -285,14 +319,15 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
-      int index) {
+  public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int index) {
     return kind_.get(index);
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
   private com.google.datastore.v1.Filter filter_;
   /**
+   *
+   *
    * 
    * The filter to apply.
    * 

@@ -303,6 +338,8 @@ public boolean hasFilter() {
     return filter_ != null;
   }
   /**
+   *
+   *
    * 
    * The filter to apply.
    * 

@@ -313,6 +350,8 @@ public com.google.datastore.v1.Filter getFilter() {
     return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
   }
   /**
+   *
+   *
    * 
    * The filter to apply.
    * 

@@ -326,6 +365,8 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
   public static final int ORDER_FIELD_NUMBER = 5;
   private java.util.List order_;
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -336,17 +377,21 @@ public java.util.List getOrderList() {
     return order_;
   }
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  public java.util.List 
+  public java.util.List
       getOrderOrBuilderList() {
     return order_;
   }
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -357,6 +402,8 @@ public int getOrderCount() {
     return order_.size();
   }
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -367,20 +414,23 @@ public com.google.datastore.v1.PropertyOrder getOrder(int index) {
     return order_.get(index);
   }
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
-      int index) {
+  public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int index) {
     return order_.get(index);
   }
 
   public static final int DISTINCT_ON_FIELD_NUMBER = 6;
   private java.util.List distinctOn_;
   /**
+   *
+   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -393,6 +443,8 @@ public java.util.List getDistinctOnLi
     return distinctOn_;
   }
   /**
+   *
+   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -401,11 +453,13 @@ public java.util.List getDistinctOnLi
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  public java.util.List 
+  public java.util.List
       getDistinctOnOrBuilderList() {
     return distinctOn_;
   }
   /**
+   *
+   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -418,6 +472,8 @@ public int getDistinctOnCount() {
     return distinctOn_.size();
   }
   /**
+   *
+   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -430,6 +486,8 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
     return distinctOn_.get(index);
   }
   /**
+   *
+   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -438,14 +496,15 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
-      int index) {
+  public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(int index) {
     return distinctOn_.get(index);
   }
 
   public static final int START_CURSOR_FIELD_NUMBER = 7;
   private com.google.protobuf.ByteString startCursor_;
   /**
+   *
+   *
    * 
    * A starting point for the query results. Query cursors are
    * returned in query result batches and
@@ -461,6 +520,8 @@ public com.google.protobuf.ByteString getStartCursor() {
   public static final int END_CURSOR_FIELD_NUMBER = 8;
   private com.google.protobuf.ByteString endCursor_;
   /**
+   *
+   *
    * 
    * An ending point for the query results. Query cursors are
    * returned in query result batches and
@@ -476,6 +537,8 @@ public com.google.protobuf.ByteString getEndCursor() {
   public static final int OFFSET_FIELD_NUMBER = 10;
   private int offset_;
   /**
+   *
+   *
    * 
    * The number of results to skip. Applies before limit, but after all other
    * constraints. Optional. Must be >= 0 if specified.
@@ -490,6 +553,8 @@ public int getOffset() {
   public static final int LIMIT_FIELD_NUMBER = 12;
   private com.google.protobuf.Int32Value limit_;
   /**
+   *
+   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -503,6 +568,8 @@ public boolean hasLimit() {
     return limit_ != null;
   }
   /**
+   *
+   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -516,6 +583,8 @@ public com.google.protobuf.Int32Value getLimit() {
     return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
   }
   /**
+   *
+   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -530,6 +599,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -541,8 +611,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < projection_.size(); i++) {
       output.writeMessage(2, projection_.get(i));
     }
@@ -580,40 +649,31 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < projection_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, projection_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, projection_.get(i));
     }
     for (int i = 0; i < kind_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, kind_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, kind_.get(i));
     }
     if (filter_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, getFilter());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getFilter());
     }
     for (int i = 0; i < order_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, order_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, order_.get(i));
     }
     for (int i = 0; i < distinctOn_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, distinctOn_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, distinctOn_.get(i));
     }
     if (!startCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(7, startCursor_);
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(7, startCursor_);
     }
     if (!endCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(8, endCursor_);
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(8, endCursor_);
     }
     if (offset_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(10, offset_);
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(10, offset_);
     }
     if (limit_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(12, getLimit());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getLimit());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -623,7 +683,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Query)) {
       return super.equals(obj);
@@ -631,29 +691,20 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.Query other = (com.google.datastore.v1.Query) obj;
 
     boolean result = true;
-    result = result && getProjectionList()
-        .equals(other.getProjectionList());
-    result = result && getKindList()
-        .equals(other.getKindList());
+    result = result && getProjectionList().equals(other.getProjectionList());
+    result = result && getKindList().equals(other.getKindList());
     result = result && (hasFilter() == other.hasFilter());
     if (hasFilter()) {
-      result = result && getFilter()
-          .equals(other.getFilter());
-    }
-    result = result && getOrderList()
-        .equals(other.getOrderList());
-    result = result && getDistinctOnList()
-        .equals(other.getDistinctOnList());
-    result = result && getStartCursor()
-        .equals(other.getStartCursor());
-    result = result && getEndCursor()
-        .equals(other.getEndCursor());
-    result = result && (getOffset()
-        == other.getOffset());
+      result = result && getFilter().equals(other.getFilter());
+    }
+    result = result && getOrderList().equals(other.getOrderList());
+    result = result && getDistinctOnList().equals(other.getDistinctOnList());
+    result = result && getStartCursor().equals(other.getStartCursor());
+    result = result && getEndCursor().equals(other.getEndCursor());
+    result = result && (getOffset() == other.getOffset());
     result = result && (hasLimit() == other.hasLimit());
     if (hasLimit()) {
-      result = result && getLimit()
-          .equals(other.getLimit());
+      result = result && getLimit().equals(other.getLimit());
     }
     result = result && unknownFields.equals(other.unknownFields);
     return result;
@@ -701,116 +752,123 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Query parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Query parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Query parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.Query parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.Query parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Query parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Query parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Query parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Query parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Query parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Query parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Query parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.Query parseFrom(
-      com.google.protobuf.CodedInputStream input)
+
+  public static com.google.datastore.v1.Query parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Query parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.Query prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A query for entities.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Query}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Query)
       com.google.datastore.v1.QueryOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Query_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Query_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class);
     }
@@ -820,20 +878,20 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getProjectionFieldBuilder();
         getKindFieldBuilder();
         getOrderFieldBuilder();
         getDistinctOnFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -883,9 +941,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_Query_descriptor;
     }
 
     @java.lang.Override
@@ -965,38 +1023,39 @@ public com.google.datastore.v1.Query buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Query) {
-        return mergeFrom((com.google.datastore.v1.Query)other);
+        return mergeFrom((com.google.datastore.v1.Query) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1023,9 +1082,10 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             projectionBuilder_ = null;
             projection_ = other.projection_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            projectionBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getProjectionFieldBuilder() : null;
+            projectionBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getProjectionFieldBuilder()
+                    : null;
           } else {
             projectionBuilder_.addAllMessages(other.projection_);
           }
@@ -1049,9 +1109,10 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             kindBuilder_ = null;
             kind_ = other.kind_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            kindBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getKindFieldBuilder() : null;
+            kindBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getKindFieldBuilder()
+                    : null;
           } else {
             kindBuilder_.addAllMessages(other.kind_);
           }
@@ -1078,9 +1139,10 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             orderBuilder_ = null;
             order_ = other.order_;
             bitField0_ = (bitField0_ & ~0x00000008);
-            orderBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getOrderFieldBuilder() : null;
+            orderBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getOrderFieldBuilder()
+                    : null;
           } else {
             orderBuilder_.addAllMessages(other.order_);
           }
@@ -1104,9 +1166,10 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             distinctOnBuilder_ = null;
             distinctOn_ = other.distinctOn_;
             bitField0_ = (bitField0_ & ~0x00000010);
-            distinctOnBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getDistinctOnFieldBuilder() : null;
+            distinctOnBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getDistinctOnFieldBuilder()
+                    : null;
           } else {
             distinctOnBuilder_.addAllMessages(other.distinctOn_);
           }
@@ -1152,21 +1215,28 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.util.List projection_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureProjectionIsMutable() {
       if (!((bitField0_ & 0x00000001) == 0x00000001)) {
         projection_ = new java.util.ArrayList(projection_);
         bitField0_ |= 0x00000001;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder> projectionBuilder_;
+            com.google.datastore.v1.Projection,
+            com.google.datastore.v1.Projection.Builder,
+            com.google.datastore.v1.ProjectionOrBuilder>
+        projectionBuilder_;
 
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1181,6 +1251,8 @@ public java.util.List getProjectionList() {
       }
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1195,6 +1267,8 @@ public int getProjectionCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1209,14 +1283,15 @@ public com.google.datastore.v1.Projection getProjection(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public Builder setProjection(
-        int index, com.google.datastore.v1.Projection value) {
+    public Builder setProjection(int index, com.google.datastore.v1.Projection value) {
       if (projectionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1230,6 +1305,8 @@ public Builder setProjection(
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1248,6 +1325,8 @@ public Builder setProjection(
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1268,14 +1347,15 @@ public Builder addProjection(com.google.datastore.v1.Projection value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public Builder addProjection(
-        int index, com.google.datastore.v1.Projection value) {
+    public Builder addProjection(int index, com.google.datastore.v1.Projection value) {
       if (projectionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1289,14 +1369,15 @@ public Builder addProjection(
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public Builder addProjection(
-        com.google.datastore.v1.Projection.Builder builderForValue) {
+    public Builder addProjection(com.google.datastore.v1.Projection.Builder builderForValue) {
       if (projectionBuilder_ == null) {
         ensureProjectionIsMutable();
         projection_.add(builderForValue.build());
@@ -1307,6 +1388,8 @@ public Builder addProjection(
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1325,6 +1408,8 @@ public Builder addProjection(
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1335,8 +1420,7 @@ public Builder addAllProjection(
         java.lang.Iterable values) {
       if (projectionBuilder_ == null) {
         ensureProjectionIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, projection_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, projection_);
         onChanged();
       } else {
         projectionBuilder_.addAllMessages(values);
@@ -1344,6 +1428,8 @@ public Builder addAllProjection(
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1361,6 +1447,8 @@ public Builder clearProjection() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1378,39 +1466,44 @@ public Builder removeProjection(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public com.google.datastore.v1.Projection.Builder getProjectionBuilder(
-        int index) {
+    public com.google.datastore.v1.Projection.Builder getProjectionBuilder(int index) {
       return getProjectionFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
-        int index) {
+    public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int index) {
       if (projectionBuilder_ == null) {
-        return projection_.get(index);  } else {
+        return projection_.get(index);
+      } else {
         return projectionBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public java.util.List 
-         getProjectionOrBuilderList() {
+    public java.util.List
+        getProjectionOrBuilderList() {
       if (projectionBuilder_ != null) {
         return projectionBuilder_.getMessageOrBuilderList();
       } else {
@@ -1418,6 +1511,8 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1425,38 +1520,46 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
      * repeated .google.datastore.v1.Projection projection = 2;
      */
     public com.google.datastore.v1.Projection.Builder addProjectionBuilder() {
-      return getProjectionFieldBuilder().addBuilder(
-          com.google.datastore.v1.Projection.getDefaultInstance());
+      return getProjectionFieldBuilder()
+          .addBuilder(com.google.datastore.v1.Projection.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public com.google.datastore.v1.Projection.Builder addProjectionBuilder(
-        int index) {
-      return getProjectionFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Projection.getDefaultInstance());
+    public com.google.datastore.v1.Projection.Builder addProjectionBuilder(int index) {
+      return getProjectionFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Projection.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public java.util.List 
-         getProjectionBuilderList() {
+    public java.util.List getProjectionBuilderList() {
       return getProjectionFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder> 
+            com.google.datastore.v1.Projection,
+            com.google.datastore.v1.Projection.Builder,
+            com.google.datastore.v1.ProjectionOrBuilder>
         getProjectionFieldBuilder() {
       if (projectionBuilder_ == null) {
-        projectionBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder>(
+        projectionBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Projection,
+                com.google.datastore.v1.Projection.Builder,
+                com.google.datastore.v1.ProjectionOrBuilder>(
                 projection_,
                 ((bitField0_ & 0x00000001) == 0x00000001),
                 getParentForChildren(),
@@ -1467,18 +1570,24 @@ public com.google.datastore.v1.Projection.Builder addProjectionBuilder(
     }
 
     private java.util.List kind_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureKindIsMutable() {
       if (!((bitField0_ & 0x00000002) == 0x00000002)) {
         kind_ = new java.util.ArrayList(kind_);
         bitField0_ |= 0x00000002;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder> kindBuilder_;
+            com.google.datastore.v1.KindExpression,
+            com.google.datastore.v1.KindExpression.Builder,
+            com.google.datastore.v1.KindExpressionOrBuilder>
+        kindBuilder_;
 
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1494,6 +1603,8 @@ public java.util.List getKindList() {
       }
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1509,6 +1620,8 @@ public int getKindCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1524,6 +1637,8 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1531,8 +1646,7 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public Builder setKind(
-        int index, com.google.datastore.v1.KindExpression value) {
+    public Builder setKind(int index, com.google.datastore.v1.KindExpression value) {
       if (kindBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1546,6 +1660,8 @@ public Builder setKind(
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1565,6 +1681,8 @@ public Builder setKind(
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1586,6 +1704,8 @@ public Builder addKind(com.google.datastore.v1.KindExpression value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1593,8 +1713,7 @@ public Builder addKind(com.google.datastore.v1.KindExpression value) {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public Builder addKind(
-        int index, com.google.datastore.v1.KindExpression value) {
+    public Builder addKind(int index, com.google.datastore.v1.KindExpression value) {
       if (kindBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1608,6 +1727,8 @@ public Builder addKind(
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1615,8 +1736,7 @@ public Builder addKind(
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public Builder addKind(
-        com.google.datastore.v1.KindExpression.Builder builderForValue) {
+    public Builder addKind(com.google.datastore.v1.KindExpression.Builder builderForValue) {
       if (kindBuilder_ == null) {
         ensureKindIsMutable();
         kind_.add(builderForValue.build());
@@ -1627,6 +1747,8 @@ public Builder addKind(
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1646,6 +1768,8 @@ public Builder addKind(
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1657,8 +1781,7 @@ public Builder addAllKind(
         java.lang.Iterable values) {
       if (kindBuilder_ == null) {
         ensureKindIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, kind_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, kind_);
         onChanged();
       } else {
         kindBuilder_.addAllMessages(values);
@@ -1666,6 +1789,8 @@ public Builder addAllKind(
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1684,6 +1809,8 @@ public Builder clearKind() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1702,6 +1829,8 @@ public Builder removeKind(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1709,11 +1838,12 @@ public Builder removeKind(int index) {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public com.google.datastore.v1.KindExpression.Builder getKindBuilder(
-        int index) {
+    public com.google.datastore.v1.KindExpression.Builder getKindBuilder(int index) {
       return getKindFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1721,14 +1851,16 @@ public com.google.datastore.v1.KindExpression.Builder getKindBuilder(
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
-        int index) {
+    public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int index) {
       if (kindBuilder_ == null) {
-        return kind_.get(index);  } else {
+        return kind_.get(index);
+      } else {
         return kindBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1736,8 +1868,8 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public java.util.List 
-         getKindOrBuilderList() {
+    public java.util.List
+        getKindOrBuilderList() {
       if (kindBuilder_ != null) {
         return kindBuilder_.getMessageOrBuilderList();
       } else {
@@ -1745,6 +1877,8 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1753,10 +1887,12 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
     public com.google.datastore.v1.KindExpression.Builder addKindBuilder() {
-      return getKindFieldBuilder().addBuilder(
-          com.google.datastore.v1.KindExpression.getDefaultInstance());
+      return getKindFieldBuilder()
+          .addBuilder(com.google.datastore.v1.KindExpression.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1764,12 +1900,13 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder() {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public com.google.datastore.v1.KindExpression.Builder addKindBuilder(
-        int index) {
-      return getKindFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.KindExpression.getDefaultInstance());
+    public com.google.datastore.v1.KindExpression.Builder addKindBuilder(int index) {
+      return getKindFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.KindExpression.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1777,16 +1914,21 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder(
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public java.util.List 
-         getKindBuilderList() {
+    public java.util.List getKindBuilderList() {
       return getKindFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder> 
+            com.google.datastore.v1.KindExpression,
+            com.google.datastore.v1.KindExpression.Builder,
+            com.google.datastore.v1.KindExpressionOrBuilder>
         getKindFieldBuilder() {
       if (kindBuilder_ == null) {
-        kindBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder>(
+        kindBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.KindExpression,
+                com.google.datastore.v1.KindExpression.Builder,
+                com.google.datastore.v1.KindExpressionOrBuilder>(
                 kind_,
                 ((bitField0_ & 0x00000002) == 0x00000002),
                 getParentForChildren(),
@@ -1798,8 +1940,13 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder(
 
     private com.google.datastore.v1.Filter filter_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> filterBuilder_;
+            com.google.datastore.v1.Filter,
+            com.google.datastore.v1.Filter.Builder,
+            com.google.datastore.v1.FilterOrBuilder>
+        filterBuilder_;
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1810,6 +1957,8 @@ public boolean hasFilter() {
       return filterBuilder_ != null || filter_ != null;
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1824,6 +1973,8 @@ public com.google.datastore.v1.Filter getFilter() {
       }
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1844,14 +1995,15 @@ public Builder setFilter(com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

      *
      * .google.datastore.v1.Filter filter = 4;
      */
-    public Builder setFilter(
-        com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder setFilter(com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filterBuilder_ == null) {
         filter_ = builderForValue.build();
         onChanged();
@@ -1862,6 +2014,8 @@ public Builder setFilter(
       return this;
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1872,7 +2026,7 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) {
       if (filterBuilder_ == null) {
         if (filter_ != null) {
           filter_ =
-            com.google.datastore.v1.Filter.newBuilder(filter_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.Filter.newBuilder(filter_).mergeFrom(value).buildPartial();
         } else {
           filter_ = value;
         }
@@ -1884,6 +2038,8 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1902,6 +2058,8 @@ public Builder clearFilter() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1909,11 +2067,13 @@ public Builder clearFilter() {
      * .google.datastore.v1.Filter filter = 4;
      */
     public com.google.datastore.v1.Filter.Builder getFilterBuilder() {
-      
+
       onChanged();
       return getFilterFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1924,11 +2084,12 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
       if (filterBuilder_ != null) {
         return filterBuilder_.getMessageOrBuilder();
       } else {
-        return filter_ == null ?
-            com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
+        return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
       }
     }
     /**
+     *
+     *
      * 
      * The filter to apply.
      * 

@@ -1936,32 +2097,41 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
      * .google.datastore.v1.Filter filter = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> 
+            com.google.datastore.v1.Filter,
+            com.google.datastore.v1.Filter.Builder,
+            com.google.datastore.v1.FilterOrBuilder>
         getFilterFieldBuilder() {
       if (filterBuilder_ == null) {
-        filterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder>(
-                getFilter(),
-                getParentForChildren(),
-                isClean());
+        filterBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Filter,
+                com.google.datastore.v1.Filter.Builder,
+                com.google.datastore.v1.FilterOrBuilder>(
+                getFilter(), getParentForChildren(), isClean());
         filter_ = null;
       }
       return filterBuilder_;
     }
 
     private java.util.List order_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureOrderIsMutable() {
       if (!((bitField0_ & 0x00000008) == 0x00000008)) {
         order_ = new java.util.ArrayList(order_);
         bitField0_ |= 0x00000008;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder> orderBuilder_;
+            com.google.datastore.v1.PropertyOrder,
+            com.google.datastore.v1.PropertyOrder.Builder,
+            com.google.datastore.v1.PropertyOrderOrBuilder>
+        orderBuilder_;
 
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -1976,6 +2146,8 @@ public java.util.List getOrderList() {
       }
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -1990,6 +2162,8 @@ public int getOrderCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2004,14 +2178,15 @@ public com.google.datastore.v1.PropertyOrder getOrder(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public Builder setOrder(
-        int index, com.google.datastore.v1.PropertyOrder value) {
+    public Builder setOrder(int index, com.google.datastore.v1.PropertyOrder value) {
       if (orderBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2025,6 +2200,8 @@ public Builder setOrder(
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2043,6 +2220,8 @@ public Builder setOrder(
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2063,14 +2242,15 @@ public Builder addOrder(com.google.datastore.v1.PropertyOrder value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public Builder addOrder(
-        int index, com.google.datastore.v1.PropertyOrder value) {
+    public Builder addOrder(int index, com.google.datastore.v1.PropertyOrder value) {
       if (orderBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2084,14 +2264,15 @@ public Builder addOrder(
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public Builder addOrder(
-        com.google.datastore.v1.PropertyOrder.Builder builderForValue) {
+    public Builder addOrder(com.google.datastore.v1.PropertyOrder.Builder builderForValue) {
       if (orderBuilder_ == null) {
         ensureOrderIsMutable();
         order_.add(builderForValue.build());
@@ -2102,6 +2283,8 @@ public Builder addOrder(
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2120,6 +2303,8 @@ public Builder addOrder(
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2130,8 +2315,7 @@ public Builder addAllOrder(
         java.lang.Iterable values) {
       if (orderBuilder_ == null) {
         ensureOrderIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, order_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, order_);
         onChanged();
       } else {
         orderBuilder_.addAllMessages(values);
@@ -2139,6 +2323,8 @@ public Builder addAllOrder(
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2156,6 +2342,8 @@ public Builder clearOrder() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2173,39 +2361,44 @@ public Builder removeOrder(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public com.google.datastore.v1.PropertyOrder.Builder getOrderBuilder(
-        int index) {
+    public com.google.datastore.v1.PropertyOrder.Builder getOrderBuilder(int index) {
       return getOrderFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
-        int index) {
+    public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int index) {
       if (orderBuilder_ == null) {
-        return order_.get(index);  } else {
+        return order_.get(index);
+      } else {
         return orderBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public java.util.List 
-         getOrderOrBuilderList() {
+    public java.util.List
+        getOrderOrBuilderList() {
       if (orderBuilder_ != null) {
         return orderBuilder_.getMessageOrBuilderList();
       } else {
@@ -2213,6 +2406,8 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2220,38 +2415,46 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
     public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder() {
-      return getOrderFieldBuilder().addBuilder(
-          com.google.datastore.v1.PropertyOrder.getDefaultInstance());
+      return getOrderFieldBuilder()
+          .addBuilder(com.google.datastore.v1.PropertyOrder.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder(
-        int index) {
-      return getOrderFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.PropertyOrder.getDefaultInstance());
+    public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder(int index) {
+      return getOrderFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.PropertyOrder.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public java.util.List 
-         getOrderBuilderList() {
+    public java.util.List getOrderBuilderList() {
       return getOrderFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder> 
+            com.google.datastore.v1.PropertyOrder,
+            com.google.datastore.v1.PropertyOrder.Builder,
+            com.google.datastore.v1.PropertyOrderOrBuilder>
         getOrderFieldBuilder() {
       if (orderBuilder_ == null) {
-        orderBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder>(
+        orderBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.PropertyOrder,
+                com.google.datastore.v1.PropertyOrder.Builder,
+                com.google.datastore.v1.PropertyOrderOrBuilder>(
                 order_,
                 ((bitField0_ & 0x00000008) == 0x00000008),
                 getParentForChildren(),
@@ -2262,18 +2465,25 @@ public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder(
     }
 
     private java.util.List distinctOn_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureDistinctOnIsMutable() {
       if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-        distinctOn_ = new java.util.ArrayList(distinctOn_);
+        distinctOn_ =
+            new java.util.ArrayList(distinctOn_);
         bitField0_ |= 0x00000010;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> distinctOnBuilder_;
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        distinctOnBuilder_;
 
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2290,6 +2500,8 @@ 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
@@ -2306,6 +2518,8 @@ 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
@@ -2322,6 +2536,8 @@ 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
@@ -2330,8 +2546,7 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public Builder setDistinctOn(
-        int index, com.google.datastore.v1.PropertyReference value) {
+    public Builder setDistinctOn(int index, com.google.datastore.v1.PropertyReference value) {
       if (distinctOnBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2345,6 +2560,8 @@ public Builder setDistinctOn(
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2365,6 +2582,8 @@ public Builder setDistinctOn(
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2387,6 +2606,8 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2395,8 +2616,7 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) {
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public Builder addDistinctOn(
-        int index, com.google.datastore.v1.PropertyReference value) {
+    public Builder addDistinctOn(int index, com.google.datastore.v1.PropertyReference value) {
       if (distinctOnBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2410,6 +2630,8 @@ public Builder addDistinctOn(
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2430,6 +2652,8 @@ public Builder addDistinctOn(
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2450,6 +2674,8 @@ public Builder addDistinctOn(
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2462,8 +2688,7 @@ public Builder addAllDistinctOn(
         java.lang.Iterable values) {
       if (distinctOnBuilder_ == null) {
         ensureDistinctOnIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, distinctOn_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, distinctOn_);
         onChanged();
       } else {
         distinctOnBuilder_.addAllMessages(values);
@@ -2471,6 +2696,8 @@ public Builder addAllDistinctOn(
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2490,6 +2717,8 @@ public Builder clearDistinctOn() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2509,6 +2738,8 @@ public Builder removeDistinctOn(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2517,11 +2748,12 @@ public Builder removeDistinctOn(int index) {
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(
-        int index) {
+    public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(int index) {
       return getDistinctOnFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2530,14 +2762,16 @@ public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
-        int index) {
+    public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(int index) {
       if (distinctOnBuilder_ == null) {
-        return distinctOn_.get(index);  } else {
+        return distinctOn_.get(index);
+      } else {
         return distinctOnBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2546,8 +2780,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public java.util.List 
-         getDistinctOnOrBuilderList() {
+    public java.util.List
+        getDistinctOnOrBuilderList() {
       if (distinctOnBuilder_ != null) {
         return distinctOnBuilder_.getMessageOrBuilderList();
       } else {
@@ -2555,6 +2789,8 @@ 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
@@ -2564,10 +2800,12 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
     public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder() {
-      return getDistinctOnFieldBuilder().addBuilder(
-          com.google.datastore.v1.PropertyReference.getDefaultInstance());
+      return getDistinctOnFieldBuilder()
+          .addBuilder(com.google.datastore.v1.PropertyReference.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2576,12 +2814,13 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder()
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(
-        int index) {
-      return getDistinctOnFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.PropertyReference.getDefaultInstance());
+    public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(int index) {
+      return getDistinctOnFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.PropertyReference.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2590,16 +2829,22 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public java.util.List 
-         getDistinctOnBuilderList() {
+    public java.util.List
+        getDistinctOnBuilderList() {
       return getDistinctOnFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
         getDistinctOnFieldBuilder() {
       if (distinctOnBuilder_ == null) {
-        distinctOnBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
+        distinctOnBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>(
                 distinctOn_,
                 ((bitField0_ & 0x00000010) == 0x00000010),
                 getParentForChildren(),
@@ -2611,6 +2856,8 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(
 
     private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
+     *
+     *
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
@@ -2623,6 +2870,8 @@ public com.google.protobuf.ByteString getStartCursor() {
       return startCursor_;
     }
     /**
+     *
+     *
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
@@ -2633,14 +2882,16 @@ public com.google.protobuf.ByteString getStartCursor() {
      */
     public Builder setStartCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       startCursor_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
@@ -2650,7 +2901,7 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) {
      * bytes start_cursor = 7;
      */
     public Builder clearStartCursor() {
-      
+
       startCursor_ = getDefaultInstance().getStartCursor();
       onChanged();
       return this;
@@ -2658,6 +2909,8 @@ public Builder clearStartCursor() {
 
     private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
+     *
+     *
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
@@ -2670,6 +2923,8 @@ public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
     /**
+     *
+     *
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
@@ -2680,14 +2935,16 @@ public com.google.protobuf.ByteString getEndCursor() {
      */
     public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       endCursor_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
@@ -2697,14 +2954,16 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * bytes end_cursor = 8;
      */
     public Builder clearEndCursor() {
-      
+
       endCursor_ = getDefaultInstance().getEndCursor();
       onChanged();
       return this;
     }
 
-    private int offset_ ;
+    private int offset_;
     /**
+     *
+     *
      * 
      * The number of results to skip. Applies before limit, but after all other
      * constraints. Optional. Must be >= 0 if specified.
@@ -2716,6 +2975,8 @@ public int getOffset() {
       return offset_;
     }
     /**
+     *
+     *
      * 
      * The number of results to skip. Applies before limit, but after all other
      * constraints. Optional. Must be >= 0 if specified.
@@ -2724,12 +2985,14 @@ public int getOffset() {
      * int32 offset = 10;
      */
     public Builder setOffset(int value) {
-      
+
       offset_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The number of results to skip. Applies before limit, but after all other
      * constraints. Optional. Must be >= 0 if specified.
@@ -2738,7 +3001,7 @@ public Builder setOffset(int value) {
      * int32 offset = 10;
      */
     public Builder clearOffset() {
-      
+
       offset_ = 0;
       onChanged();
       return this;
@@ -2746,8 +3009,13 @@ public Builder clearOffset() {
 
     private com.google.protobuf.Int32Value limit_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> limitBuilder_;
+            com.google.protobuf.Int32Value,
+            com.google.protobuf.Int32Value.Builder,
+            com.google.protobuf.Int32ValueOrBuilder>
+        limitBuilder_;
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2761,6 +3029,8 @@ public boolean hasLimit() {
       return limitBuilder_ != null || limit_ != null;
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2778,6 +3048,8 @@ public com.google.protobuf.Int32Value getLimit() {
       }
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2801,6 +3073,8 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2810,8 +3084,7 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
      *
      * .google.protobuf.Int32Value limit = 12;
      */
-    public Builder setLimit(
-        com.google.protobuf.Int32Value.Builder builderForValue) {
+    public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue) {
       if (limitBuilder_ == null) {
         limit_ = builderForValue.build();
         onChanged();
@@ -2822,6 +3095,8 @@ public Builder setLimit(
       return this;
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2835,7 +3110,7 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       if (limitBuilder_ == null) {
         if (limit_ != null) {
           limit_ =
-            com.google.protobuf.Int32Value.newBuilder(limit_).mergeFrom(value).buildPartial();
+              com.google.protobuf.Int32Value.newBuilder(limit_).mergeFrom(value).buildPartial();
         } else {
           limit_ = value;
         }
@@ -2847,6 +3122,8 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2868,6 +3145,8 @@ public Builder clearLimit() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2878,11 +3157,13 @@ public Builder clearLimit() {
      * .google.protobuf.Int32Value limit = 12;
      */
     public com.google.protobuf.Int32Value.Builder getLimitBuilder() {
-      
+
       onChanged();
       return getLimitFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2896,11 +3177,12 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
       if (limitBuilder_ != null) {
         return limitBuilder_.getMessageOrBuilder();
       } else {
-        return limit_ == null ?
-            com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
+        return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
       }
     }
     /**
+     *
+     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -2911,21 +3193,24 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
      * .google.protobuf.Int32Value limit = 12;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> 
+            com.google.protobuf.Int32Value,
+            com.google.protobuf.Int32Value.Builder,
+            com.google.protobuf.Int32ValueOrBuilder>
         getLimitFieldBuilder() {
       if (limitBuilder_ == null) {
-        limitBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder>(
-                getLimit(),
-                getParentForChildren(),
-                isClean());
+        limitBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Int32Value,
+                com.google.protobuf.Int32Value.Builder,
+                com.google.protobuf.Int32ValueOrBuilder>(
+                getLimit(), getParentForChildren(), isClean());
         limit_ = null;
       }
       return limitBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -2935,12 +3220,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Query)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Query)
   private static final com.google.datastore.v1.Query DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Query();
   }
@@ -2949,16 +3234,16 @@ public static com.google.datastore.v1.Query getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public Query parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Query(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Query parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Query(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -2973,6 +3258,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Query getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 086f3ff46405..95192344a70a 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
@@ -3,20 +3,24 @@
 
 package com.google.datastore.v1;
 
-public interface QueryOrBuilder extends
+public interface QueryOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Query)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  java.util.List 
-      getProjectionList();
+  java.util.List getProjectionList();
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -25,6 +29,8 @@ public interface QueryOrBuilder extends
    */
   com.google.datastore.v1.Projection getProjection(int index);
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -33,25 +39,30 @@ public interface QueryOrBuilder extends
    */
   int getProjectionCount();
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  java.util.List 
+  java.util.List
       getProjectionOrBuilderList();
   /**
+   *
+   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
-      int index);
+  com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int index);
 
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -59,9 +70,10 @@ com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  java.util.List 
-      getKindList();
+  java.util.List getKindList();
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -71,6 +83,8 @@ com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
    */
   com.google.datastore.v1.KindExpression getKind(int index);
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -80,6 +94,8 @@ com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
    */
   int getKindCount();
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -87,9 +103,10 @@ com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  java.util.List 
-      getKindOrBuilderList();
+  java.util.List getKindOrBuilderList();
   /**
+   *
+   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -97,10 +114,11 @@ com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
-      int index);
+  com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int index);
 
   /**
+   *
+   *
    * 
    * The filter to apply.
    * 

@@ -109,6 +127,8 @@ com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
    */
   boolean hasFilter();
   /**
+   *
+   *
    * 
    * The filter to apply.
    * 

@@ -117,6 +137,8 @@ com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
    */
   com.google.datastore.v1.Filter getFilter();
   /**
+   *
+   *
    * 
    * The filter to apply.
    * 

@@ -126,15 +148,18 @@ com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
   com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder();
 
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  java.util.List 
-      getOrderList();
+  java.util.List getOrderList();
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -143,6 +168,8 @@ com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
    */
   com.google.datastore.v1.PropertyOrder getOrder(int index);
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -151,25 +178,29 @@ com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
    */
   int getOrderCount();
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  java.util.List 
-      getOrderOrBuilderList();
+  java.util.List getOrderOrBuilderList();
   /**
+   *
+   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
-      int index);
+  com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(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
@@ -178,9 +209,10 @@ com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  java.util.List 
-      getDistinctOnList();
+  java.util.List getDistinctOnList();
   /**
+   *
+   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -191,6 +223,8 @@ com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
    */
   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
@@ -201,6 +235,8 @@ com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
    */
   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
@@ -209,9 +245,11 @@ com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  java.util.List 
+  java.util.List
       getDistinctOnOrBuilderList();
   /**
+   *
+   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -220,10 +258,11 @@ com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
-      int index);
+  com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(int index);
 
   /**
+   *
+   *
    * 
    * A starting point for the query results. Query cursors are
    * returned in query result batches and
@@ -235,6 +274,8 @@ com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
   com.google.protobuf.ByteString getStartCursor();
 
   /**
+   *
+   *
    * 
    * An ending point for the query results. Query cursors are
    * returned in query result batches and
@@ -246,6 +287,8 @@ com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
   com.google.protobuf.ByteString getEndCursor();
 
   /**
+   *
+   *
    * 
    * The number of results to skip. Applies before limit, but after all other
    * constraints. Optional. Must be >= 0 if specified.
@@ -256,6 +299,8 @@ com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
   int getOffset();
 
   /**
+   *
+   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -267,6 +312,8 @@ com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
    */
   boolean hasLimit();
   /**
+   *
+   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -278,6 +325,8 @@ com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
    */
   com.google.protobuf.Int32Value getLimit();
   /**
+   *
+   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
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 6a2c87081b1d..062e08d0ec9d 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
@@ -5,254 +5,279 @@
 
 public final class QueryProto {
   private QueryProto() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
 
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
   }
+
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_EntityResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_EntityResult_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_EntityResult_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Query_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Query_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Query_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_KindExpression_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_KindExpression_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_KindExpression_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_PropertyReference_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_PropertyReference_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Projection_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Projection_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Projection_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_PropertyOrder_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_PropertyOrder_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_Filter_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_Filter_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Filter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_CompositeFilter_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_CompositeFilter_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_PropertyFilter_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_PropertyFilter_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_GqlQuery_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_GqlQuery_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_datastore_v1_QueryResultBatch_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
   }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
   static {
     java.lang.String[] descriptorData = {
-      "\n\037google/datastore/v1/query.proto\022\023googl" +
-      "e.datastore.v1\032\034google/api/annotations.p" +
-      "roto\032 google/datastore/v1/entity.proto\032\036" +
-      "google/protobuf/wrappers.proto\032\030google/t" +
-      "ype/latlng.proto\"\257\001\n\014EntityResult\022+\n\006ent" +
-      "ity\030\001 \001(\0132\033.google.datastore.v1.Entity\022\017" +
-      "\n\007version\030\004 \001(\003\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResul" +
-      "tType\022\033\n\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FU" +
-      "LL\020\001\022\016\n\nPROJECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Q" +
-      "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast" +
-      "ore.v1.Projection\0221\n\004kind\030\003 \003(\0132#.google" +
-      ".datastore.v1.KindExpression\022+\n\006filter\030\004" +
-      " \001(\0132\033.google.datastore.v1.Filter\0221\n\005ord" +
-      "er\030\005 \003(\0132\".google.datastore.v1.PropertyO" +
-      "rder\022;\n\013distinct_on\030\006 \003(\0132&.google.datas" +
-      "tore.v1.PropertyReference\022\024\n\014start_curso" +
-      "r\030\007 \001(\014\022\022\n\nend_cursor\030\010 \001(\014\022\016\n\006offset\030\n " +
-      "\001(\005\022*\n\005limit\030\014 \001(\0132\033.google.protobuf.Int" +
-      "32Value\"\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\"" +
-      "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr" +
-      "ojection\0228\n\010property\030\001 \001(\0132&.google.data" +
-      "store.v1.PropertyReference\"\321\001\n\rPropertyO" +
-      "rder\0228\n\010property\030\001 \001(\0132&.google.datastor" +
-      "e.v1.PropertyReference\022?\n\tdirection\030\002 \001(" +
-      "\0162,.google.datastore.v1.PropertyOrder.Di" +
-      "rection\"E\n\tDirection\022\031\n\025DIRECTION_UNSPEC" +
-      "IFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"\231" +
-      "\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$.go" +
-      "ogle.datastore.v1.CompositeFilterH\000\022>\n\017p" +
-      "roperty_filter\030\002 \001(\0132#.google.datastore." +
-      "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" +
-      "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" +
-      "store.v1.CompositeFilter.Operator\022,\n\007fil" +
-      "ters\030\002 \003(\0132\033.google.datastore.v1.Filter\"" +
-      "-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\007\n" +
-      "\003AND\020\001\"\307\002\n\016PropertyFilter\0228\n\010property\030\001 " +
-      "\001(\0132&.google.datastore.v1.PropertyRefere" +
-      "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" +
-      "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" +
-      "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" +
-      "\n\014HAS_ANCESTOR\020\013\"\245\002\n\010GqlQuery\022\024\n\014query_s" +
-      "tring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016n" +
-      "amed_bindings\030\005 \003(\01320.google.datastore.v" +
-      "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" +
-      "nal_bindings\030\004 \003(\0132&.google.datastore.v1" +
-      ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" +
-      "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" +
-      "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" +
-      "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" +
-      "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" +
-      "parameter_type\"\336\003\n\020QueryResultBatch\022\027\n\017s" +
-      "kipped_results\030\006 \001(\005\022\026\n\016skipped_cursor\030\003" +
-      " \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,.googl" +
-      "e.datastore.v1.EntityResult.ResultType\0229" +
-      "\n\016entity_results\030\002 \003(\0132!.google.datastor" +
-      "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" +
-      "\014more_results\030\005 \001(\01625.google.datastore.v" +
-      "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" +
-      "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" +
-      "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" +
-      "OT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTER_LIMI" +
-      "T\020\002\022\035\n\031MORE_RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO" +
-      "_MORE_RESULTS\020\003B\235\001\n\027com.google.datastore" +
-      ".v1B\nQueryProtoP\001Z\n\017p"
+          + "roperty_filter\030\002 \001(\0132#.google.datastore."
+          + "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C"
+          + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data"
+          + "store.v1.CompositeFilter.Operator\022,\n\007fil"
+          + "ters\030\002 \003(\0132\033.google.datastore.v1.Filter\""
+          + "-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\007\n"
+          + "\003AND\020\001\"\307\002\n\016PropertyFilter\0228\n\010property\030\001 "
+          + "\001(\0132&.google.datastore.v1.PropertyRefere"
+          + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr"
+          + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g"
+          + "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020"
+          + "\n\014HAS_ANCESTOR\020\013\"\245\002\n\010GqlQuery\022\024\n\014query_s"
+          + "tring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016n"
+          + "amed_bindings\030\005 \003(\01320.google.datastore.v"
+          + "1.GqlQuery.NamedBindingsEntry\022C\n\023positio"
+          + "nal_bindings\030\004 \003(\0132&.google.datastore.v1"
+          + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry"
+          + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da"
+          + "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ"
+          + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da"
+          + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016"
+          + "parameter_type\"\336\003\n\020QueryResultBatch\022\027\n\017s"
+          + "kipped_results\030\006 \001(\005\022\026\n\016skipped_cursor\030\003"
+          + " \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,.googl"
+          + "e.datastore.v1.EntityResult.ResultType\0229"
+          + "\n\016entity_results\030\002 \003(\0132!.google.datastor"
+          + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n"
+          + "\014more_results\030\005 \001(\01625.google.datastore.v"
+          + "1.QueryResultBatch.MoreResultsType\022\030\n\020sn"
+          + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType"
+          + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N"
+          + "OT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTER_LIMI"
+          + "T\020\002\022\035\n\031MORE_RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO"
+          + "_MORE_RESULTS\020\003B\235\001\n\027com.google.datastore"
+          + ".v1B\nQueryProtoP\001Z
  * A batch of results produced by a query.
  * 

  *
  * Protobuf type {@code google.datastore.v1.QueryResultBatch}
  */
-public  final class QueryResultBatch extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class QueryResultBatch extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.QueryResultBatch)
     QueryResultBatchOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use QueryResultBatch.newBuilder() to construct.
   private QueryResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private QueryResultBatch() {
     skippedResults_ = 0;
     skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
@@ -30,10 +33,10 @@ private QueryResultBatch() {
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private QueryResultBatch(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -53,61 +56,64 @@ private QueryResultBatch(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
+          case 8:
+            {
+              int rawValue = input.readEnum();
 
-            entityResultType_ = rawValue;
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              entityResults_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000008;
+              entityResultType_ = rawValue;
+              break;
             }
-            entityResults_.add(
-                input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-            break;
-          }
-          case 26: {
-
-            skippedCursor_ = input.readBytes();
-            break;
-          }
-          case 34: {
-
-            endCursor_ = input.readBytes();
-            break;
-          }
-          case 40: {
-            int rawValue = input.readEnum();
-
-            moreResults_ = rawValue;
-            break;
-          }
-          case 48: {
-
-            skippedResults_ = input.readInt32();
-            break;
-          }
-          case 56: {
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+                entityResults_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              entityResults_.add(
+                  input.readMessage(
+                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
+              break;
+            }
+          case 26:
+            {
+              skippedCursor_ = input.readBytes();
+              break;
+            }
+          case 34:
+            {
+              endCursor_ = input.readBytes();
+              break;
+            }
+          case 40:
+            {
+              int rawValue = input.readEnum();
 
-            snapshotVersion_ = input.readInt64();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              moreResults_ = rawValue;
+              break;
+            }
+          case 48:
+            {
+              skippedResults_ = input.readInt32();
+              break;
+            }
+          case 56:
+            {
+              snapshotVersion_ = input.readInt64();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
         entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
@@ -116,29 +122,35 @@ private QueryResultBatch(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_QueryResultBatch_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.QueryResultBatch.class, com.google.datastore.v1.QueryResultBatch.Builder.class);
+            com.google.datastore.v1.QueryResultBatch.class,
+            com.google.datastore.v1.QueryResultBatch.Builder.class);
   }
 
   /**
+   *
+   *
    * 
    * The possible values for the `more_results` field.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.QueryResultBatch.MoreResultsType}
    */
-  public enum MoreResultsType
-      implements com.google.protobuf.ProtocolMessageEnum {
+  public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
     /**
+     *
+     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -147,6 +159,8 @@ public enum MoreResultsType
      */
     MORE_RESULTS_TYPE_UNSPECIFIED(0),
     /**
+     *
+     *
      * 
      * There may be additional batches to fetch from this query.
      * 

@@ -155,6 +169,8 @@ public enum MoreResultsType
      */
     NOT_FINISHED(1),
     /**
+     *
+     *
      * 
      * The query is finished, but there may be more results after the limit.
      * 

@@ -163,6 +179,8 @@ public enum MoreResultsType
      */
     MORE_RESULTS_AFTER_LIMIT(2),
     /**
+     *
+     *
      * 
      * The query is finished, but there may be more results after the end
      * cursor.
@@ -172,6 +190,8 @@ public enum MoreResultsType
      */
     MORE_RESULTS_AFTER_CURSOR(4),
     /**
+     *
+     *
      * 
      * The query is finished, and there are no more results.
      * 

@@ -183,6 +203,8 @@ public enum MoreResultsType
     ;
 
     /**
+     *
+     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -191,6 +213,8 @@ public enum MoreResultsType
      */
     public static final int MORE_RESULTS_TYPE_UNSPECIFIED_VALUE = 0;
     /**
+     *
+     *
      * 
      * There may be additional batches to fetch from this query.
      * 

@@ -199,6 +223,8 @@ public enum MoreResultsType
      */
     public static final int NOT_FINISHED_VALUE = 1;
     /**
+     *
+     *
      * 
      * The query is finished, but there may be more results after the limit.
      * 

@@ -207,6 +233,8 @@ public enum MoreResultsType
      */
     public static final int MORE_RESULTS_AFTER_LIMIT_VALUE = 2;
     /**
+     *
+     *
      * 
      * The query is finished, but there may be more results after the end
      * cursor.
@@ -216,6 +244,8 @@ public enum MoreResultsType
      */
     public static final int MORE_RESULTS_AFTER_CURSOR_VALUE = 4;
     /**
+     *
+     *
      * 
      * The query is finished, and there are no more results.
      * 

@@ -224,7 +254,6 @@ public enum MoreResultsType
      */
     public static final int NO_MORE_RESULTS_VALUE = 3;
 
-
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -233,9 +262,7 @@ public final int getNumber() {
       return value;
     }
 
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static MoreResultsType valueOf(int value) {
       return forNumber(value);
@@ -243,37 +270,42 @@ public static MoreResultsType valueOf(int value) {
 
     public static MoreResultsType forNumber(int value) {
       switch (value) {
-        case 0: return MORE_RESULTS_TYPE_UNSPECIFIED;
-        case 1: return NOT_FINISHED;
-        case 2: return MORE_RESULTS_AFTER_LIMIT;
-        case 4: return MORE_RESULTS_AFTER_CURSOR;
-        case 3: return NO_MORE_RESULTS;
-        default: return null;
+        case 0:
+          return MORE_RESULTS_TYPE_UNSPECIFIED;
+        case 1:
+          return NOT_FINISHED;
+        case 2:
+          return MORE_RESULTS_AFTER_LIMIT;
+        case 4:
+          return MORE_RESULTS_AFTER_CURSOR;
+        case 3:
+          return NO_MORE_RESULTS;
+        default:
+          return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
       return internalValueMap;
     }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        MoreResultsType> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public MoreResultsType findValueByNumber(int number) {
-              return MoreResultsType.forNumber(number);
-            }
-          };
 
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
+    private static final com.google.protobuf.Internal.EnumLiteMap
+        internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public MoreResultsType findValueByNumber(int number) {
+                return MoreResultsType.forNumber(number);
+              }
+            };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
       return com.google.datastore.v1.QueryResultBatch.getDescriptor().getEnumTypes().get(0);
     }
 
@@ -282,8 +314,7 @@ public MoreResultsType findValueByNumber(int number) {
     public static MoreResultsType valueOf(
         com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -304,6 +335,8 @@ private MoreResultsType(int value) {
   public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6;
   private int skippedResults_;
   /**
+   *
+   *
    * 
    * The number of results skipped, typically because of an offset.
    * 

@@ -317,6 +350,8 @@ public int getSkippedResults() {
   public static final int SKIPPED_CURSOR_FIELD_NUMBER = 3;
   private com.google.protobuf.ByteString skippedCursor_;
   /**
+   *
+   *
    * 
    * A cursor that points to the position after the last skipped result.
    * Will be set when `skipped_results` != 0.
@@ -331,6 +366,8 @@ public com.google.protobuf.ByteString getSkippedCursor() {
   public static final int ENTITY_RESULT_TYPE_FIELD_NUMBER = 1;
   private int entityResultType_;
   /**
+   *
+   *
    * 
    * The result type for every entity in `entity_results`.
    * 

@@ -341,6 +378,8 @@ public int getEntityResultTypeValue() {
     return entityResultType_;
   }
   /**
+   *
+   *
    * 
    * The result type for every entity in `entity_results`.
    * 

@@ -349,13 +388,16 @@ public int getEntityResultTypeValue() {
    */
   public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
+    com.google.datastore.v1.EntityResult.ResultType result =
+        com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
     return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
   }
 
   public static final int ENTITY_RESULTS_FIELD_NUMBER = 2;
   private java.util.List entityResults_;
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

@@ -366,17 +408,21 @@ public java.util.List getEntityResultsList
     return entityResults_;
   }
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  public java.util.List 
+  public java.util.List
       getEntityResultsOrBuilderList() {
     return entityResults_;
   }
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

@@ -387,6 +433,8 @@ public int getEntityResultsCount() {
     return entityResults_.size();
   }
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

@@ -397,20 +445,23 @@ public com.google.datastore.v1.EntityResult getEntityResults(int index) {
     return entityResults_.get(index);
   }
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
-      int index) {
+  public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(int index) {
     return entityResults_.get(index);
   }
 
   public static final int END_CURSOR_FIELD_NUMBER = 4;
   private com.google.protobuf.ByteString endCursor_;
   /**
+   *
+   *
    * 
    * A cursor that points to the position after the last result in the batch.
    * 

@@ -424,6 +475,8 @@ public com.google.protobuf.ByteString getEndCursor() {
   public static final int MORE_RESULTS_FIELD_NUMBER = 5;
   private int moreResults_;
   /**
+   *
+   *
    * 
    * The state of the query after the current batch.
    * 

@@ -434,6 +487,8 @@ public int getMoreResultsValue() {
     return moreResults_;
   }
   /**
+   *
+   *
    * 
    * The state of the query after the current batch.
    * 

@@ -442,13 +497,18 @@ public int getMoreResultsValue() {
    */
   public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
-    return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result;
+    com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
+        com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+    return result == null
+        ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
+        : result;
   }
 
   public static final int SNAPSHOT_VERSION_FIELD_NUMBER = 7;
   private long snapshotVersion_;
   /**
+   *
+   *
    * 
    * The version number of the snapshot this batch was returned from.
    * This applies to the range of results from the query's `start_cursor` (or
@@ -467,6 +527,7 @@ public long getSnapshotVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -478,9 +539,9 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (entityResultType_
+        != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, entityResultType_);
     }
     for (int i = 0; i < entityResults_.size(); i++) {
@@ -492,7 +553,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!endCursor_.isEmpty()) {
       output.writeBytes(4, endCursor_);
     }
-    if (moreResults_ != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED.getNumber()) {
+    if (moreResults_
+        != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED
+            .getNumber()) {
       output.writeEnum(5, moreResults_);
     }
     if (skippedResults_ != 0) {
@@ -510,33 +573,29 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, entityResultType_);
+    if (entityResultType_
+        != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, entityResultType_);
     }
     for (int i = 0; i < entityResults_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, entityResults_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, entityResults_.get(i));
     }
     if (!skippedCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(3, skippedCursor_);
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(3, skippedCursor_);
     }
     if (!endCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(4, endCursor_);
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(4, endCursor_);
     }
-    if (moreResults_ != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(5, moreResults_);
+    if (moreResults_
+        != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED
+            .getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, moreResults_);
     }
     if (skippedResults_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(6, skippedResults_);
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(6, skippedResults_);
     }
     if (snapshotVersion_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(7, snapshotVersion_);
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(7, snapshotVersion_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -546,7 +605,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.QueryResultBatch)) {
       return super.equals(obj);
@@ -554,18 +613,13 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.QueryResultBatch other = (com.google.datastore.v1.QueryResultBatch) obj;
 
     boolean result = true;
-    result = result && (getSkippedResults()
-        == other.getSkippedResults());
-    result = result && getSkippedCursor()
-        .equals(other.getSkippedCursor());
+    result = result && (getSkippedResults() == other.getSkippedResults());
+    result = result && getSkippedCursor().equals(other.getSkippedCursor());
     result = result && entityResultType_ == other.entityResultType_;
-    result = result && getEntityResultsList()
-        .equals(other.getEntityResultsList());
-    result = result && getEndCursor()
-        .equals(other.getEndCursor());
+    result = result && getEntityResultsList().equals(other.getEntityResultsList());
+    result = result && getEndCursor().equals(other.getEndCursor());
     result = result && moreResults_ == other.moreResults_;
-    result = result && (getSnapshotVersion()
-        == other.getSnapshotVersion());
+    result = result && (getSnapshotVersion() == other.getSnapshotVersion());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -592,125 +646,133 @@ public int hashCode() {
     hash = (37 * hash) + MORE_RESULTS_FIELD_NUMBER;
     hash = (53 * hash) + moreResults_;
     hash = (37 * hash) + SNAPSHOT_VERSION_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getSnapshotVersion());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getSnapshotVersion());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.QueryResultBatch parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.QueryResultBatch prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A batch of results produced by a query.
    * 

    *
    * Protobuf type {@code google.datastore.v1.QueryResultBatch}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.QueryResultBatch)
       com.google.datastore.v1.QueryResultBatchOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_QueryResultBatch_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.QueryResultBatch.class, com.google.datastore.v1.QueryResultBatch.Builder.class);
+              com.google.datastore.v1.QueryResultBatch.class,
+              com.google.datastore.v1.QueryResultBatch.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.QueryResultBatch.newBuilder()
@@ -718,17 +780,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getEntityResultsFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -754,9 +816,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_QueryResultBatch_descriptor;
     }
 
     @java.lang.Override
@@ -775,7 +837,8 @@ public com.google.datastore.v1.QueryResultBatch build() {
 
     @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch buildPartial() {
-      com.google.datastore.v1.QueryResultBatch result = new com.google.datastore.v1.QueryResultBatch(this);
+      com.google.datastore.v1.QueryResultBatch result =
+          new com.google.datastore.v1.QueryResultBatch(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.skippedResults_ = skippedResults_;
@@ -802,38 +865,39 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.QueryResultBatch) {
-        return mergeFrom((com.google.datastore.v1.QueryResultBatch)other);
+        return mergeFrom((com.google.datastore.v1.QueryResultBatch) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -869,9 +933,10 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
             entityResultsBuilder_ = null;
             entityResults_ = other.entityResults_;
             bitField0_ = (bitField0_ & ~0x00000008);
-            entityResultsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getEntityResultsFieldBuilder() : null;
+            entityResultsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getEntityResultsFieldBuilder()
+                    : null;
           } else {
             entityResultsBuilder_.addAllMessages(other.entityResults_);
           }
@@ -914,10 +979,13 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
-    private int skippedResults_ ;
+    private int skippedResults_;
     /**
+     *
+     *
      * 
      * The number of results skipped, typically because of an offset.
      * 

@@ -928,6 +996,8 @@ public int getSkippedResults() {
       return skippedResults_;
     }
     /**
+     *
+     *
      * 
      * The number of results skipped, typically because of an offset.
      * 

@@ -935,12 +1005,14 @@ public int getSkippedResults() {
      * int32 skipped_results = 6;
      */
     public Builder setSkippedResults(int value) {
-      
+
       skippedResults_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The number of results skipped, typically because of an offset.
      * 

@@ -948,7 +1020,7 @@ public Builder setSkippedResults(int value) {
      * int32 skipped_results = 6;
      */
     public Builder clearSkippedResults() {
-      
+
       skippedResults_ = 0;
       onChanged();
       return this;
@@ -956,6 +1028,8 @@ public Builder clearSkippedResults() {
 
     private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the last skipped result.
      * Will be set when `skipped_results` != 0.
@@ -967,6 +1041,8 @@ public com.google.protobuf.ByteString getSkippedCursor() {
       return skippedCursor_;
     }
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the last skipped result.
      * Will be set when `skipped_results` != 0.
@@ -976,14 +1052,16 @@ public com.google.protobuf.ByteString getSkippedCursor() {
      */
     public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       skippedCursor_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the last skipped result.
      * Will be set when `skipped_results` != 0.
@@ -992,7 +1070,7 @@ public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
      * bytes skipped_cursor = 3;
      */
     public Builder clearSkippedCursor() {
-      
+
       skippedCursor_ = getDefaultInstance().getSkippedCursor();
       onChanged();
       return this;
@@ -1000,6 +1078,8 @@ public Builder clearSkippedCursor() {
 
     private int entityResultType_ = 0;
     /**
+     *
+     *
      * 
      * The result type for every entity in `entity_results`.
      * 

@@ -1010,6 +1090,8 @@ public int getEntityResultTypeValue() {
       return entityResultType_;
     }
     /**
+     *
+     *
      * 
      * The result type for every entity in `entity_results`.
      * 

@@ -1022,6 +1104,8 @@ public Builder setEntityResultTypeValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The result type for every entity in `entity_results`.
      * 

@@ -1030,10 +1114,13 @@ public Builder setEntityResultTypeValue(int value) {
      */
     public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
+      com.google.datastore.v1.EntityResult.ResultType result =
+          com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
       return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
     }
     /**
+     *
+     *
      * 
      * The result type for every entity in `entity_results`.
      * 

@@ -1044,12 +1131,14 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy
       if (value == null) {
         throw new NullPointerException();
       }
-      
+
       entityResultType_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The result type for every entity in `entity_results`.
      * 

@@ -1057,25 +1146,32 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
      */
     public Builder clearEntityResultType() {
-      
+
       entityResultType_ = 0;
       onChanged();
       return this;
     }
 
     private java.util.List entityResults_ =
-      java.util.Collections.emptyList();
+        java.util.Collections.emptyList();
+
     private void ensureEntityResultsIsMutable() {
       if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-        entityResults_ = new java.util.ArrayList(entityResults_);
+        entityResults_ =
+            new java.util.ArrayList(entityResults_);
         bitField0_ |= 0x00000008;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> entityResultsBuilder_;
+            com.google.datastore.v1.EntityResult,
+            com.google.datastore.v1.EntityResult.Builder,
+            com.google.datastore.v1.EntityResultOrBuilder>
+        entityResultsBuilder_;
 
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1090,6 +1186,8 @@ public java.util.List getEntityResultsList
       }
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1104,6 +1202,8 @@ public int getEntityResultsCount() {
       }
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1118,14 +1218,15 @@ public com.google.datastore.v1.EntityResult getEntityResults(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public Builder setEntityResults(
-        int index, com.google.datastore.v1.EntityResult value) {
+    public Builder setEntityResults(int index, com.google.datastore.v1.EntityResult value) {
       if (entityResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1139,6 +1240,8 @@ public Builder setEntityResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1157,6 +1260,8 @@ public Builder setEntityResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1177,14 +1282,15 @@ public Builder addEntityResults(com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public Builder addEntityResults(
-        int index, com.google.datastore.v1.EntityResult value) {
+    public Builder addEntityResults(int index, com.google.datastore.v1.EntityResult value) {
       if (entityResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1198,14 +1304,15 @@ public Builder addEntityResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public Builder addEntityResults(
-        com.google.datastore.v1.EntityResult.Builder builderForValue) {
+    public Builder addEntityResults(com.google.datastore.v1.EntityResult.Builder builderForValue) {
       if (entityResultsBuilder_ == null) {
         ensureEntityResultsIsMutable();
         entityResults_.add(builderForValue.build());
@@ -1216,6 +1323,8 @@ public Builder addEntityResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1234,6 +1343,8 @@ public Builder addEntityResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1244,8 +1355,7 @@ public Builder addAllEntityResults(
         java.lang.Iterable values) {
       if (entityResultsBuilder_ == null) {
         ensureEntityResultsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, entityResults_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, entityResults_);
         onChanged();
       } else {
         entityResultsBuilder_.addAllMessages(values);
@@ -1253,6 +1363,8 @@ public Builder addAllEntityResults(
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1270,6 +1382,8 @@ public Builder clearEntityResults() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1287,39 +1401,44 @@ public Builder removeEntityResults(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder getEntityResultsBuilder(
-        int index) {
+    public com.google.datastore.v1.EntityResult.Builder getEntityResultsBuilder(int index) {
       return getEntityResultsFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
-        int index) {
+    public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(int index) {
       if (entityResultsBuilder_ == null) {
-        return entityResults_.get(index);  } else {
+        return entityResults_.get(index);
+      } else {
         return entityResultsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public java.util.List 
-         getEntityResultsOrBuilderList() {
+    public java.util.List
+        getEntityResultsOrBuilderList() {
       if (entityResultsBuilder_ != null) {
         return entityResultsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1327,6 +1446,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

@@ -1334,38 +1455,47 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
     public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder() {
-      return getEntityResultsFieldBuilder().addBuilder(
-          com.google.datastore.v1.EntityResult.getDefaultInstance());
+      return getEntityResultsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(
-        int index) {
-      return getEntityResultsFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.EntityResult.getDefaultInstance());
+    public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int index) {
+      return getEntityResultsFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public java.util.List 
-         getEntityResultsBuilderList() {
+    public java.util.List
+        getEntityResultsBuilderList() {
       return getEntityResultsFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> 
+            com.google.datastore.v1.EntityResult,
+            com.google.datastore.v1.EntityResult.Builder,
+            com.google.datastore.v1.EntityResultOrBuilder>
         getEntityResultsFieldBuilder() {
       if (entityResultsBuilder_ == null) {
-        entityResultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>(
+        entityResultsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.EntityResult,
+                com.google.datastore.v1.EntityResult.Builder,
+                com.google.datastore.v1.EntityResultOrBuilder>(
                 entityResults_,
                 ((bitField0_ & 0x00000008) == 0x00000008),
                 getParentForChildren(),
@@ -1377,6 +1507,8 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(
 
     private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the last result in the batch.
      * 

@@ -1387,6 +1519,8 @@ public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the last result in the batch.
      * 

@@ -1395,14 +1529,16 @@ public com.google.protobuf.ByteString getEndCursor() {
      */
     public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       endCursor_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A cursor that points to the position after the last result in the batch.
      * 

@@ -1410,7 +1546,7 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * bytes end_cursor = 4;
      */
     public Builder clearEndCursor() {
-      
+
       endCursor_ = getDefaultInstance().getEndCursor();
       onChanged();
       return this;
@@ -1418,6 +1554,8 @@ public Builder clearEndCursor() {
 
     private int moreResults_ = 0;
     /**
+     *
+     *
      * 
      * The state of the query after the current batch.
      * 

@@ -1428,6 +1566,8 @@ public int getMoreResultsValue() {
       return moreResults_;
     }
     /**
+     *
+     *
      * 
      * The state of the query after the current batch.
      * 

@@ -1440,6 +1580,8 @@ public Builder setMoreResultsValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The state of the query after the current batch.
      * 

@@ -1448,10 +1590,15 @@ public Builder setMoreResultsValue(int value) {
      */
     public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
-      return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result;
+      com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
+          com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+      return result == null
+          ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
+          : result;
     }
     /**
+     *
+     *
      * 
      * The state of the query after the current batch.
      * 

@@ -1462,12 +1609,14 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
       if (value == null) {
         throw new NullPointerException();
       }
-      
+
       moreResults_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The state of the query after the current batch.
      * 

@@ -1475,14 +1624,16 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
      */
     public Builder clearMoreResults() {
-      
+
       moreResults_ = 0;
       onChanged();
       return this;
     }
 
-    private long snapshotVersion_ ;
+    private long snapshotVersion_;
     /**
+     *
+     *
      * 
      * The version number of the snapshot this batch was returned from.
      * This applies to the range of results from the query's `start_cursor` (or
@@ -1500,6 +1651,8 @@ public long getSnapshotVersion() {
       return snapshotVersion_;
     }
     /**
+     *
+     *
      * 
      * The version number of the snapshot this batch was returned from.
      * This applies to the range of results from the query's `start_cursor` (or
@@ -1514,12 +1667,14 @@ public long getSnapshotVersion() {
      * int64 snapshot_version = 7;
      */
     public Builder setSnapshotVersion(long value) {
-      
+
       snapshotVersion_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The version number of the snapshot this batch was returned from.
      * This applies to the range of results from the query's `start_cursor` (or
@@ -1534,14 +1689,14 @@ public Builder setSnapshotVersion(long value) {
      * int64 snapshot_version = 7;
      */
     public Builder clearSnapshotVersion() {
-      
+
       snapshotVersion_ = 0L;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1551,12 +1706,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.QueryResultBatch)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.QueryResultBatch)
   private static final com.google.datastore.v1.QueryResultBatch DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.QueryResultBatch();
   }
@@ -1565,16 +1720,16 @@ public static com.google.datastore.v1.QueryResultBatch getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public QueryResultBatch parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryResultBatch(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public QueryResultBatch parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new QueryResultBatch(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1589,6 +1744,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index 1b0adcc496ae..b08403dbbc2b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface QueryResultBatchOrBuilder extends
+public interface QueryResultBatchOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.QueryResultBatch)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The number of results skipped, typically because of an offset.
    * 

@@ -17,6 +20,8 @@ public interface QueryResultBatchOrBuilder extends
   int getSkippedResults();
 
   /**
+   *
+   *
    * 
    * A cursor that points to the position after the last skipped result.
    * Will be set when `skipped_results` != 0.
@@ -27,6 +32,8 @@ public interface QueryResultBatchOrBuilder extends
   com.google.protobuf.ByteString getSkippedCursor();
 
   /**
+   *
+   *
    * 
    * The result type for every entity in `entity_results`.
    * 

@@ -35,6 +42,8 @@ public interface QueryResultBatchOrBuilder extends
    */
   int getEntityResultTypeValue();
   /**
+   *
+   *
    * 
    * The result type for every entity in `entity_results`.
    * 

@@ -44,15 +53,18 @@ public interface QueryResultBatchOrBuilder extends
   com.google.datastore.v1.EntityResult.ResultType getEntityResultType();
 
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  java.util.List 
-      getEntityResultsList();
+  java.util.List getEntityResultsList();
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

@@ -61,6 +73,8 @@ public interface QueryResultBatchOrBuilder extends
    */
   com.google.datastore.v1.EntityResult getEntityResults(int index);
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

@@ -69,25 +83,30 @@ public interface QueryResultBatchOrBuilder extends
    */
   int getEntityResultsCount();
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  java.util.List 
+  java.util.List
       getEntityResultsOrBuilderList();
   /**
+   *
+   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
-      int index);
+  com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(int index);
 
   /**
+   *
+   *
    * 
    * A cursor that points to the position after the last result in the batch.
    * 

@@ -97,6 +116,8 @@ com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
   com.google.protobuf.ByteString getEndCursor();
 
   /**
+   *
+   *
    * 
    * The state of the query after the current batch.
    * 

@@ -105,6 +126,8 @@ com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
    */
   int getMoreResultsValue();
   /**
+   *
+   *
    * 
    * The state of the query after the current batch.
    * 

@@ -114,6 +137,8 @@ com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
   com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults();
 
   /**
+   *
+   *
    * 
    * The version number of the snapshot this batch was returned from.
    * This applies to the range of results from the query's `start_cursor` (or
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 636a6d7aa754..d5718235fd67 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -4,29 +4,31 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The options shared by read requests.
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReadOptions}
  */
-public  final class ReadOptions extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class ReadOptions extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReadOptions)
     ReadOptionsOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use ReadOptions.newBuilder() to construct.
   private ReadOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private ReadOptions() {
-  }
+
+  private ReadOptions() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private ReadOptions(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -46,59 +48,66 @@ private ReadOptions(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-            consistencyTypeCase_ = 1;
-            consistencyType_ = rawValue;
-            break;
-          }
-          case 18: {
-            consistencyTypeCase_ = 2;
-            consistencyType_ = input.readBytes();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+              consistencyTypeCase_ = 1;
+              consistencyType_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              consistencyTypeCase_ = 2;
+              consistencyType_ = input.readBytes();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_ReadOptions_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ReadOptions.class, com.google.datastore.v1.ReadOptions.Builder.class);
+            com.google.datastore.v1.ReadOptions.class,
+            com.google.datastore.v1.ReadOptions.Builder.class);
   }
 
   /**
+   *
+   *
    * 
    * The possible values for read consistencies.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.ReadOptions.ReadConsistency}
    */
-  public enum ReadConsistency
-      implements com.google.protobuf.ProtocolMessageEnum {
+  public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -107,6 +116,8 @@ public enum ReadConsistency
      */
     READ_CONSISTENCY_UNSPECIFIED(0),
     /**
+     *
+     *
      * 
      * Strong consistency.
      * 

@@ -115,6 +126,8 @@ public enum ReadConsistency
      */
     STRONG(1),
     /**
+     *
+     *
      * 
      * Eventual consistency.
      * 

@@ -126,6 +139,8 @@ public enum ReadConsistency
     ;
 
     /**
+     *
+     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -134,6 +149,8 @@ public enum ReadConsistency
      */
     public static final int READ_CONSISTENCY_UNSPECIFIED_VALUE = 0;
     /**
+     *
+     *
      * 
      * Strong consistency.
      * 

@@ -142,6 +159,8 @@ public enum ReadConsistency
      */
     public static final int STRONG_VALUE = 1;
     /**
+     *
+     *
      * 
      * Eventual consistency.
      * 

@@ -150,7 +169,6 @@ public enum ReadConsistency
      */
     public static final int EVENTUAL_VALUE = 2;
 
-
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -159,9 +177,7 @@ public final int getNumber() {
       return value;
     }
 
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static ReadConsistency valueOf(int value) {
       return forNumber(value);
@@ -169,35 +185,38 @@ public static ReadConsistency valueOf(int value) {
 
     public static ReadConsistency forNumber(int value) {
       switch (value) {
-        case 0: return READ_CONSISTENCY_UNSPECIFIED;
-        case 1: return STRONG;
-        case 2: return EVENTUAL;
-        default: return null;
+        case 0:
+          return READ_CONSISTENCY_UNSPECIFIED;
+        case 1:
+          return STRONG;
+        case 2:
+          return EVENTUAL;
+        default:
+          return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
       return internalValueMap;
     }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        ReadConsistency> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public ReadConsistency findValueByNumber(int number) {
-              return ReadConsistency.forNumber(number);
-            }
-          };
 
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
+    private static final com.google.protobuf.Internal.EnumLiteMap
+        internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public ReadConsistency findValueByNumber(int number) {
+                return ReadConsistency.forNumber(number);
+              }
+            };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
       return com.google.datastore.v1.ReadOptions.getDescriptor().getEnumTypes().get(0);
     }
 
@@ -206,8 +225,7 @@ public ReadConsistency findValueByNumber(int number) {
     public static ReadConsistency valueOf(
         com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -226,18 +244,17 @@ private ReadConsistency(int value) {
 
   private int consistencyTypeCase_ = 0;
   private java.lang.Object consistencyType_;
-  public enum ConsistencyTypeCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum ConsistencyTypeCase implements com.google.protobuf.Internal.EnumLite {
     READ_CONSISTENCY(1),
     TRANSACTION(2),
     CONSISTENCYTYPE_NOT_SET(0);
     private final int value;
+
     private ConsistencyTypeCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static ConsistencyTypeCase valueOf(int value) {
       return forNumber(value);
@@ -245,25 +262,30 @@ public static ConsistencyTypeCase valueOf(int value) {
 
     public static ConsistencyTypeCase forNumber(int value) {
       switch (value) {
-        case 1: return READ_CONSISTENCY;
-        case 2: return TRANSACTION;
-        case 0: return CONSISTENCYTYPE_NOT_SET;
-        default: return null;
+        case 1:
+          return READ_CONSISTENCY;
+        case 2:
+          return TRANSACTION;
+        case 0:
+          return CONSISTENCYTYPE_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ConsistencyTypeCase
-  getConsistencyTypeCase() {
-    return ConsistencyTypeCase.forNumber(
-        consistencyTypeCase_);
+  public ConsistencyTypeCase getConsistencyTypeCase() {
+    return ConsistencyTypeCase.forNumber(consistencyTypeCase_);
   }
 
   public static final int READ_CONSISTENCY_FIELD_NUMBER = 1;
   /**
+   *
+   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
@@ -278,6 +300,8 @@ public int getReadConsistencyValue() {
     return 0;
   }
   /**
+   *
+   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
@@ -288,15 +312,20 @@ public int getReadConsistencyValue() {
   public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
     if (consistencyTypeCase_ == 1) {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
-          (java.lang.Integer) consistencyType_);
-      return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result;
+      com.google.datastore.v1.ReadOptions.ReadConsistency result =
+          com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
+              (java.lang.Integer) consistencyType_);
+      return result == null
+          ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED
+          : result;
     }
     return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED;
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
   /**
+   *
+   *
    * 
    * The identifier of the transaction in which to read. A
    * transaction identifier is returned by a call to
@@ -313,6 +342,7 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -324,14 +354,12 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (consistencyTypeCase_ == 1) {
       output.writeEnum(1, ((java.lang.Integer) consistencyType_));
     }
     if (consistencyTypeCase_ == 2) {
-      output.writeBytes(
-          2, (com.google.protobuf.ByteString) consistencyType_);
+      output.writeBytes(2, (com.google.protobuf.ByteString) consistencyType_);
     }
     unknownFields.writeTo(output);
   }
@@ -343,13 +371,14 @@ public int getSerializedSize() {
 
     size = 0;
     if (consistencyTypeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, ((java.lang.Integer) consistencyType_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeEnumSize(
+              1, ((java.lang.Integer) consistencyType_));
     }
     if (consistencyTypeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(
-            2, (com.google.protobuf.ByteString) consistencyType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeBytesSize(
+              2, (com.google.protobuf.ByteString) consistencyType_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -359,7 +388,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ReadOptions)) {
       return super.equals(obj);
@@ -367,17 +396,14 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.ReadOptions other = (com.google.datastore.v1.ReadOptions) obj;
 
     boolean result = true;
-    result = result && getConsistencyTypeCase().equals(
-        other.getConsistencyTypeCase());
+    result = result && getConsistencyTypeCase().equals(other.getConsistencyTypeCase());
     if (!result) return false;
     switch (consistencyTypeCase_) {
       case 1:
-        result = result && getReadConsistencyValue()
-            == other.getReadConsistencyValue();
+        result = result && getReadConsistencyValue() == other.getReadConsistencyValue();
         break;
       case 2:
-        result = result && getTransaction()
-            .equals(other.getTransaction());
+        result = result && getTransaction().equals(other.getTransaction());
         break;
       case 0:
       default:
@@ -410,118 +436,126 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ReadOptions parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ReadOptions parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.ReadOptions parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.ReadOptions parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReadOptions parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReadOptions parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReadOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.ReadOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The options shared by read requests.
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReadOptions}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReadOptions)
       com.google.datastore.v1.ReadOptionsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReadOptions_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ReadOptions.class, com.google.datastore.v1.ReadOptions.Builder.class);
+              com.google.datastore.v1.ReadOptions.class,
+              com.google.datastore.v1.ReadOptions.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ReadOptions.newBuilder()
@@ -529,16 +563,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -548,9 +581,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReadOptions_descriptor;
     }
 
     @java.lang.Override
@@ -585,38 +618,39 @@ public com.google.datastore.v1.ReadOptions buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReadOptions) {
-        return mergeFrom((com.google.datastore.v1.ReadOptions)other);
+        return mergeFrom((com.google.datastore.v1.ReadOptions) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -626,17 +660,20 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) {
       if (other == com.google.datastore.v1.ReadOptions.getDefaultInstance()) return this;
       switch (other.getConsistencyTypeCase()) {
-        case READ_CONSISTENCY: {
-          setReadConsistencyValue(other.getReadConsistencyValue());
-          break;
-        }
-        case TRANSACTION: {
-          setTransaction(other.getTransaction());
-          break;
-        }
-        case CONSISTENCYTYPE_NOT_SET: {
-          break;
-        }
+        case READ_CONSISTENCY:
+          {
+            setReadConsistencyValue(other.getReadConsistencyValue());
+            break;
+          }
+        case TRANSACTION:
+          {
+            setTransaction(other.getTransaction());
+            break;
+          }
+        case CONSISTENCYTYPE_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -666,12 +703,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int consistencyTypeCase_ = 0;
     private java.lang.Object consistencyType_;
-    public ConsistencyTypeCase
-        getConsistencyTypeCase() {
-      return ConsistencyTypeCase.forNumber(
-          consistencyTypeCase_);
+
+    public ConsistencyTypeCase getConsistencyTypeCase() {
+      return ConsistencyTypeCase.forNumber(consistencyTypeCase_);
     }
 
     public Builder clearConsistencyType() {
@@ -681,8 +718,9 @@ public Builder clearConsistencyType() {
       return this;
     }
 
-
     /**
+     *
+     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
@@ -697,6 +735,8 @@ public int getReadConsistencyValue() {
       return 0;
     }
     /**
+     *
+     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
@@ -711,6 +751,8 @@ public Builder setReadConsistencyValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
@@ -721,13 +763,18 @@ public Builder setReadConsistencyValue(int value) {
     public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
       if (consistencyTypeCase_ == 1) {
         @SuppressWarnings("deprecation")
-        com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
-            (java.lang.Integer) consistencyType_);
-        return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result;
+        com.google.datastore.v1.ReadOptions.ReadConsistency result =
+            com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
+                (java.lang.Integer) consistencyType_);
+        return result == null
+            ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED
+            : result;
       }
       return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED;
     }
     /**
+     *
+     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
@@ -745,6 +792,8 @@ public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsis
       return this;
     }
     /**
+     *
+     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
@@ -762,6 +811,8 @@ public Builder clearReadConsistency() {
     }
 
     /**
+     *
+     *
      * 
      * The identifier of the transaction in which to read. A
      * transaction identifier is returned by a call to
@@ -777,6 +828,8 @@ public com.google.protobuf.ByteString getTransaction() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
+     *
+     *
      * 
      * The identifier of the transaction in which to read. A
      * transaction identifier is returned by a call to
@@ -787,14 +840,16 @@ public com.google.protobuf.ByteString getTransaction() {
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  consistencyTypeCase_ = 2;
+        throw new NullPointerException();
+      }
+      consistencyTypeCase_ = 2;
       consistencyType_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The identifier of the transaction in which to read. A
      * transaction identifier is returned by a call to
@@ -811,9 +866,9 @@ public Builder clearTransaction() {
       }
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -823,12 +878,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReadOptions)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ReadOptions)
   private static final com.google.datastore.v1.ReadOptions DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ReadOptions();
   }
@@ -837,16 +892,16 @@ public static com.google.datastore.v1.ReadOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public ReadOptions parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadOptions(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ReadOptions parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ReadOptions(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -861,6 +916,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 332bccda4a34..b26b70ae5541 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface ReadOptionsOrBuilder extends
+public interface ReadOptionsOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReadOptions)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
@@ -17,6 +20,8 @@ public interface ReadOptionsOrBuilder extends
    */
   int getReadConsistencyValue();
   /**
+   *
+   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
@@ -27,6 +32,8 @@ public interface ReadOptionsOrBuilder extends
   com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency();
 
   /**
+   *
+   *
    * 
    * The identifier of the transaction in which to read. A
    * transaction identifier is returned by a call to
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 2ca48d034b44..323b55e8fdf0 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
@@ -4,21 +4,24 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
  */
-public  final class ReserveIdsRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class ReserveIdsRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsRequest)
     ReserveIdsRequestOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use ReserveIdsRequest.newBuilder() to construct.
   private ReserveIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private ReserveIdsRequest() {
     projectId_ = "";
     databaseId_ = "";
@@ -26,10 +29,10 @@ private ReserveIdsRequest() {
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private ReserveIdsRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -49,41 +52,42 @@ private ReserveIdsRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              keys_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+                keys_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+              break;
             }
-            keys_.add(
-                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-            break;
-          }
-          case 66: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            projectId_ = s;
-            break;
-          }
-          case 74: {
-            java.lang.String s = input.readStringRequireUtf8();
+              projectId_ = s;
+              break;
+            }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            databaseId_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              databaseId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -92,23 +96,28 @@ private ReserveIdsRequest(
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ReserveIdsRequest.class, com.google.datastore.v1.ReserveIdsRequest.Builder.class);
+            com.google.datastore.v1.ReserveIdsRequest.class,
+            com.google.datastore.v1.ReserveIdsRequest.Builder.class);
   }
 
   private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -120,27 +129,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -151,6 +159,8 @@ public java.lang.String getProjectId() {
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
   private volatile java.lang.Object databaseId_;
   /**
+   *
+   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

@@ -162,27 +172,26 @@ public java.lang.String getDatabaseId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       databaseId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

    *
    * string database_id = 9;
    */
-  public com.google.protobuf.ByteString
-      getDatabaseIdBytes() {
+  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);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       databaseId_ = b;
       return b;
     } else {
@@ -193,6 +202,8 @@ public java.lang.String getDatabaseId() {
   public static final int KEYS_FIELD_NUMBER = 1;
   private java.util.List keys_;
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -204,6 +215,8 @@ public java.util.List getKeysList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -211,11 +224,12 @@ public java.util.List getKeysList() {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public java.util.List 
-      getKeysOrBuilderList() {
+  public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -227,6 +241,8 @@ public int getKeysCount() {
     return keys_.size();
   }
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -238,6 +254,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -245,12 +263,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index) {
+  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -262,8 +280,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
@@ -283,8 +300,7 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < keys_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, keys_.get(i));
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -300,20 +316,18 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ReserveIdsRequest)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.ReserveIdsRequest other = (com.google.datastore.v1.ReserveIdsRequest) obj;
+    com.google.datastore.v1.ReserveIdsRequest other =
+        (com.google.datastore.v1.ReserveIdsRequest) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
-    result = result && getDatabaseId()
-        .equals(other.getDatabaseId());
-    result = result && getKeysList()
-        .equals(other.getKeysList());
+    result = result && getProjectId().equals(other.getProjectId());
+    result = result && getDatabaseId().equals(other.getDatabaseId());
+    result = result && getKeysList().equals(other.getKeysList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -338,118 +352,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ReserveIdsRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.ReserveIdsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReserveIdsRequest)
       com.google.datastore.v1.ReserveIdsRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ReserveIdsRequest.class, com.google.datastore.v1.ReserveIdsRequest.Builder.class);
+              com.google.datastore.v1.ReserveIdsRequest.class,
+              com.google.datastore.v1.ReserveIdsRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ReserveIdsRequest.newBuilder()
@@ -457,17 +480,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getKeysFieldBuilder();
       }
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -485,9 +508,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
     }
 
     @java.lang.Override
@@ -506,7 +529,8 @@ public com.google.datastore.v1.ReserveIdsRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
-      com.google.datastore.v1.ReserveIdsRequest result = new com.google.datastore.v1.ReserveIdsRequest(this);
+      com.google.datastore.v1.ReserveIdsRequest result =
+          new com.google.datastore.v1.ReserveIdsRequest(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.projectId_ = projectId_;
@@ -529,38 +553,39 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReserveIdsRequest) {
-        return mergeFrom((com.google.datastore.v1.ReserveIdsRequest)other);
+        return mergeFrom((com.google.datastore.v1.ReserveIdsRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -595,9 +620,10 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
             keysBuilder_ = null;
             keys_ = other.keys_;
             bitField0_ = (bitField0_ & ~0x00000004);
-            keysBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getKeysFieldBuilder() : null;
+            keysBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getKeysFieldBuilder()
+                    : null;
           } else {
             keysBuilder_.addAllMessages(other.keys_);
           }
@@ -631,10 +657,13 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -644,8 +673,7 @@ public Builder mergeFrom(
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -654,19 +682,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -674,23 +702,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -698,25 +729,26 @@ public Builder setProjectId(
      * string project_id = 8;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
@@ -724,6 +756,8 @@ public Builder setProjectIdBytes(
 
     private java.lang.Object databaseId_ = "";
     /**
+     *
+     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

@@ -733,8 +767,7 @@ public Builder setProjectIdBytes(
     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;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         databaseId_ = s;
         return s;
@@ -743,19 +776,19 @@ public java.lang.String getDatabaseId() {
       }
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
      */
-    public com.google.protobuf.ByteString
-        getDatabaseIdBytes() {
+    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);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         databaseId_ = b;
         return b;
       } else {
@@ -763,23 +796,26 @@ public java.lang.String getDatabaseId() {
       }
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
      */
-    public Builder setDatabaseId(
-        java.lang.String value) {
+    public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       databaseId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

@@ -787,43 +823,49 @@ public Builder setDatabaseId(
      * string database_id = 9;
      */
     public Builder clearDatabaseId() {
-      
+
       databaseId_ = getDefaultInstance().getDatabaseId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
      */
-    public Builder setDatabaseIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       databaseId_ = value;
       onChanged();
       return this;
     }
 
-    private java.util.List keys_ =
-      java.util.Collections.emptyList();
+    private java.util.List keys_ = java.util.Collections.emptyList();
+
     private void ensureKeysIsMutable() {
       if (!((bitField0_ & 0x00000004) == 0x00000004)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000004;
-       }
+      }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        keysBuilder_;
 
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -839,6 +881,8 @@ public java.util.List getKeysList() {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -854,6 +898,8 @@ public int getKeysCount() {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -869,6 +915,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -876,8 +924,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -891,6 +938,8 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -898,8 +947,7 @@ public Builder setKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.set(index, builderForValue.build());
@@ -910,6 +958,8 @@ public Builder setKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -931,6 +981,8 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -938,8 +990,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key value) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -953,6 +1004,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -960,8 +1013,7 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(builderForValue.build());
@@ -972,6 +1024,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -979,8 +1033,7 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(
-        int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(index, builderForValue.build());
@@ -991,6 +1044,8 @@ public Builder addKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -998,12 +1053,10 @@ public Builder addKeys(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addAllKeys(
-        java.lang.Iterable values) {
+    public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, keys_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
         onChanged();
       } else {
         keysBuilder_.addAllMessages(values);
@@ -1011,6 +1064,8 @@ public Builder addAllKeys(
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1029,6 +1084,8 @@ public Builder clearKeys() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1047,6 +1104,8 @@ public Builder removeKeys(int index) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1054,11 +1113,12 @@ public Builder removeKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder getKeysBuilder(
-        int index) {
+    public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
       return getKeysFieldBuilder().getBuilder(index);
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1066,14 +1126,16 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-        int index) {
+    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
       if (keysBuilder_ == null) {
-        return keys_.get(index);  } else {
+        return keys_.get(index);
+      } else {
         return keysBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1081,8 +1143,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List 
-         getKeysOrBuilderList() {
+    public java.util.List getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
         return keysBuilder_.getMessageOrBuilderList();
       } else {
@@ -1090,6 +1151,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
       }
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1098,10 +1161,11 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
      * repeated .google.datastore.v1.Key keys = 1;
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
-      return getKeysFieldBuilder().addBuilder(
-          com.google.datastore.v1.Key.getDefaultInstance());
+      return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1109,12 +1173,13 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder addKeysBuilder(
-        int index) {
-      return getKeysFieldBuilder().addBuilder(
-          index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
+      return getKeysFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
+     *
+     *
      * 
      * A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
@@ -1122,16 +1187,21 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List 
-         getKeysBuilderList() {
+    public java.util.List getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
     }
+
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getKeysFieldBuilder() {
       if (keysBuilder_ == null) {
-        keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+        keysBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(
                 keys_,
                 ((bitField0_ & 0x00000004) == 0x00000004),
                 getParentForChildren(),
@@ -1140,9 +1210,9 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1152,12 +1222,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReserveIdsRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ReserveIdsRequest)
   private static final com.google.datastore.v1.ReserveIdsRequest DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ReserveIdsRequest();
   }
@@ -1166,16 +1236,16 @@ public static com.google.datastore.v1.ReserveIdsRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public ReserveIdsRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReserveIdsRequest(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ReserveIdsRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ReserveIdsRequest(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1190,6 +1260,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 008c521ac809..91c1c28db685 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface ReserveIdsRequestOrBuilder extends
+public interface ReserveIdsRequestOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReserveIdsRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -16,16 +19,19 @@ public interface ReserveIdsRequestOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

@@ -34,16 +40,19 @@ public interface ReserveIdsRequestOrBuilder extends
    */
   java.lang.String getDatabaseId();
   /**
+   *
+   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

    *
    * string database_id = 9;
    */
-  com.google.protobuf.ByteString
-      getDatabaseIdBytes();
+  com.google.protobuf.ByteString getDatabaseIdBytes();
 
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -51,9 +60,10 @@ public interface ReserveIdsRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List 
-      getKeysList();
+  java.util.List getKeysList();
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -63,6 +73,8 @@ public interface ReserveIdsRequestOrBuilder extends
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -72,6 +84,8 @@ public interface ReserveIdsRequestOrBuilder extends
    */
   int getKeysCount();
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -79,9 +93,10 @@ public interface ReserveIdsRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List 
-      getKeysOrBuilderList();
+  java.util.List getKeysOrBuilderList();
   /**
+   *
+   *
    * 
    * A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
@@ -89,6 +104,5 @@ public interface ReserveIdsRequestOrBuilder extends
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
-      int index);
+  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
 }
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 7294241714ea..20cf629e517c 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
@@ -4,29 +4,31 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
  */
-public  final class ReserveIdsResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class ReserveIdsResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsResponse)
     ReserveIdsResponseOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use ReserveIdsResponse.newBuilder() to construct.
   private ReserveIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private ReserveIdsResponse() {
-  }
+
+  private ReserveIdsResponse() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private ReserveIdsResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -45,39 +47,42 @@ private ReserveIdsResponse(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ReserveIdsResponse.class, com.google.datastore.v1.ReserveIdsResponse.Builder.class);
+            com.google.datastore.v1.ReserveIdsResponse.class,
+            com.google.datastore.v1.ReserveIdsResponse.Builder.class);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -89,8 +94,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
@@ -108,12 +112,13 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ReserveIdsResponse)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.ReserveIdsResponse other = (com.google.datastore.v1.ReserveIdsResponse) obj;
+    com.google.datastore.v1.ReserveIdsResponse other =
+        (com.google.datastore.v1.ReserveIdsResponse) obj;
 
     boolean result = true;
     result = result && unknownFields.equals(other.unknownFields);
@@ -132,118 +137,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ReserveIdsResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.ReserveIdsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReserveIdsResponse)
       com.google.datastore.v1.ReserveIdsResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ReserveIdsResponse.class, com.google.datastore.v1.ReserveIdsResponse.Builder.class);
+              com.google.datastore.v1.ReserveIdsResponse.class,
+              com.google.datastore.v1.ReserveIdsResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ReserveIdsResponse.newBuilder()
@@ -251,16 +265,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -268,9 +281,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
     }
 
     @java.lang.Override
@@ -289,7 +302,8 @@ public com.google.datastore.v1.ReserveIdsResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.ReserveIdsResponse buildPartial() {
-      com.google.datastore.v1.ReserveIdsResponse result = new com.google.datastore.v1.ReserveIdsResponse(this);
+      com.google.datastore.v1.ReserveIdsResponse result =
+          new com.google.datastore.v1.ReserveIdsResponse(this);
       onBuilt();
       return result;
     }
@@ -298,38 +312,39 @@ public com.google.datastore.v1.ReserveIdsResponse buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReserveIdsResponse) {
-        return mergeFrom((com.google.datastore.v1.ReserveIdsResponse)other);
+        return mergeFrom((com.google.datastore.v1.ReserveIdsResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -366,9 +381,9 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -378,12 +393,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReserveIdsResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ReserveIdsResponse)
   private static final com.google.datastore.v1.ReserveIdsResponse DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ReserveIdsResponse();
   }
@@ -392,16 +407,16 @@ public static com.google.datastore.v1.ReserveIdsResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public ReserveIdsResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReserveIdsResponse(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ReserveIdsResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ReserveIdsResponse(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -416,6 +431,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 3a99406d3d5b..4ffdc1c498ef 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -3,7 +3,7 @@
 
 package com.google.datastore.v1;
 
-public interface ReserveIdsResponseOrBuilder extends
+public interface ReserveIdsResponseOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReserveIdsResponse)
-    com.google.protobuf.MessageOrBuilder {
-}
+    com.google.protobuf.MessageOrBuilder {}
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 8d51f0be2032..172d323a0ac5 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
@@ -4,31 +4,34 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RollbackRequest}
  */
-public  final class RollbackRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class RollbackRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackRequest)
     RollbackRequestOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use RollbackRequest.newBuilder() to construct.
   private RollbackRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private RollbackRequest() {
     projectId_ = "";
     transaction_ = com.google.protobuf.ByteString.EMPTY;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private RollbackRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -48,52 +51,57 @@ private RollbackRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            transaction_ = input.readBytes();
-            break;
-          }
-          case 66: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 10:
+            {
+              transaction_ = input.readBytes();
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            projectId_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+              projectId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RollbackRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RollbackRequest.class, com.google.datastore.v1.RollbackRequest.Builder.class);
+            com.google.datastore.v1.RollbackRequest.class,
+            com.google.datastore.v1.RollbackRequest.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -105,27 +113,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -136,6 +143,8 @@ public java.lang.String getProjectId() {
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   private com.google.protobuf.ByteString transaction_;
   /**
+   *
+   *
    * 
    * The transaction identifier, returned by a call to
    * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
@@ -148,6 +157,7 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -159,8 +169,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!transaction_.isEmpty()) {
       output.writeBytes(1, transaction_);
     }
@@ -177,8 +186,7 @@ public int getSerializedSize() {
 
     size = 0;
     if (!transaction_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(1, transaction_);
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_);
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -191,7 +199,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RollbackRequest)) {
       return super.equals(obj);
@@ -199,10 +207,8 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.RollbackRequest other = (com.google.datastore.v1.RollbackRequest) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
-    result = result && getTransaction()
-        .equals(other.getTransaction());
+    result = result && getProjectId().equals(other.getProjectId());
+    result = result && getTransaction().equals(other.getTransaction());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -223,118 +229,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RollbackRequest parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RollbackRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RollbackRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.RollbackRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RollbackRequest}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RollbackRequest)
       com.google.datastore.v1.RollbackRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RollbackRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RollbackRequest.class, com.google.datastore.v1.RollbackRequest.Builder.class);
+              com.google.datastore.v1.RollbackRequest.class,
+              com.google.datastore.v1.RollbackRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RollbackRequest.newBuilder()
@@ -342,16 +357,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -363,9 +377,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RollbackRequest_descriptor;
     }
 
     @java.lang.Override
@@ -384,7 +398,8 @@ public com.google.datastore.v1.RollbackRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RollbackRequest buildPartial() {
-      com.google.datastore.v1.RollbackRequest result = new com.google.datastore.v1.RollbackRequest(this);
+      com.google.datastore.v1.RollbackRequest result =
+          new com.google.datastore.v1.RollbackRequest(this);
       result.projectId_ = projectId_;
       result.transaction_ = transaction_;
       onBuilt();
@@ -395,38 +410,39 @@ public com.google.datastore.v1.RollbackRequest buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RollbackRequest) {
-        return mergeFrom((com.google.datastore.v1.RollbackRequest)other);
+        return mergeFrom((com.google.datastore.v1.RollbackRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -473,6 +489,8 @@ public Builder mergeFrom(
 
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -482,8 +500,7 @@ public Builder mergeFrom(
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -492,19 +509,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -512,23 +529,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -536,25 +556,26 @@ public Builder setProjectId(
      * string project_id = 8;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
@@ -562,6 +583,8 @@ public Builder setProjectIdBytes(
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
     /**
+     *
+     *
      * 
      * The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
@@ -573,6 +596,8 @@ public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
     /**
+     *
+     *
      * 
      * The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
@@ -582,14 +607,16 @@ public com.google.protobuf.ByteString getTransaction() {
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       transaction_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
@@ -598,14 +625,14 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * bytes transaction = 1;
      */
     public Builder clearTransaction() {
-      
+
       transaction_ = getDefaultInstance().getTransaction();
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -615,12 +642,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RollbackRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackRequest)
   private static final com.google.datastore.v1.RollbackRequest DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RollbackRequest();
   }
@@ -629,16 +656,16 @@ public static com.google.datastore.v1.RollbackRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public RollbackRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackRequest(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public RollbackRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new RollbackRequest(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -653,6 +680,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 271bd5d430a9..cddd3ea723cd 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface RollbackRequestOrBuilder extends
+public interface RollbackRequestOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RollbackRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -16,16 +19,19 @@ public interface RollbackRequestOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * The transaction identifier, returned by a call to
    * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
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 0690ba911eb3..61ff9b088371 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
@@ -4,6 +4,8 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
  * (an empty message).
@@ -11,23 +13,23 @@
  *
  * Protobuf type {@code google.datastore.v1.RollbackResponse}
  */
-public  final class RollbackResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class RollbackResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackResponse)
     RollbackResponseOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use RollbackResponse.newBuilder() to construct.
   private RollbackResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private RollbackResponse() {
-  }
+
+  private RollbackResponse() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private RollbackResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -46,39 +48,42 @@ private RollbackResponse(
           case 0:
             done = true;
             break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RollbackResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RollbackResponse.class, com.google.datastore.v1.RollbackResponse.Builder.class);
+            com.google.datastore.v1.RollbackResponse.class,
+            com.google.datastore.v1.RollbackResponse.Builder.class);
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -90,8 +95,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
@@ -109,7 +113,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RollbackResponse)) {
       return super.equals(obj);
@@ -133,97 +137,104 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RollbackResponse parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RollbackResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RollbackResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.RollbackResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
    * (an empty message).
@@ -231,21 +242,23 @@ protected Builder newBuilderForType(
    *
    * Protobuf type {@code google.datastore.v1.RollbackResponse}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RollbackResponse)
       com.google.datastore.v1.RollbackResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RollbackResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RollbackResponse.class, com.google.datastore.v1.RollbackResponse.Builder.class);
+              com.google.datastore.v1.RollbackResponse.class,
+              com.google.datastore.v1.RollbackResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RollbackResponse.newBuilder()
@@ -253,16 +266,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -270,9 +282,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RollbackResponse_descriptor;
     }
 
     @java.lang.Override
@@ -291,7 +303,8 @@ public com.google.datastore.v1.RollbackResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RollbackResponse buildPartial() {
-      com.google.datastore.v1.RollbackResponse result = new com.google.datastore.v1.RollbackResponse(this);
+      com.google.datastore.v1.RollbackResponse result =
+          new com.google.datastore.v1.RollbackResponse(this);
       onBuilt();
       return result;
     }
@@ -300,38 +313,39 @@ public com.google.datastore.v1.RollbackResponse buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RollbackResponse) {
-        return mergeFrom((com.google.datastore.v1.RollbackResponse)other);
+        return mergeFrom((com.google.datastore.v1.RollbackResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -368,9 +382,9 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -380,12 +394,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RollbackResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackResponse)
   private static final com.google.datastore.v1.RollbackResponse DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RollbackResponse();
   }
@@ -394,16 +408,16 @@ public static com.google.datastore.v1.RollbackResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public RollbackResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackResponse(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public RollbackResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new RollbackResponse(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -418,6 +432,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index 5259ab5a88df..6e1ceb784d10 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -3,7 +3,7 @@
 
 package com.google.datastore.v1;
 
-public interface RollbackResponseOrBuilder extends
+public interface RollbackResponseOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RollbackResponse)
-    com.google.protobuf.MessageOrBuilder {
-}
+    com.google.protobuf.MessageOrBuilder {}
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 ba7e2974b60d..38b7e01e1105 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
@@ -4,30 +4,33 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RunQueryRequest}
  */
-public  final class RunQueryRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class RunQueryRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryRequest)
     RunQueryRequestOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use RunQueryRequest.newBuilder() to construct.
   private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private RunQueryRequest() {
     projectId_ = "";
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private RunQueryRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -47,112 +50,122 @@ private RunQueryRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
-            if (readOptions_ != null) {
-              subBuilder = readOptions_.toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
+              if (readOptions_ != null) {
+                subBuilder = readOptions_.toBuilder();
+              }
+              readOptions_ =
+                  input.readMessage(
+                      com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(readOptions_);
+                readOptions_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            readOptions_ = input.readMessage(com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(readOptions_);
-              readOptions_ = subBuilder.buildPartial();
+          case 18:
+            {
+              com.google.datastore.v1.PartitionId.Builder subBuilder = null;
+              if (partitionId_ != null) {
+                subBuilder = partitionId_.toBuilder();
+              }
+              partitionId_ =
+                  input.readMessage(
+                      com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(partitionId_);
+                partitionId_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
-          case 18: {
-            com.google.datastore.v1.PartitionId.Builder subBuilder = null;
-            if (partitionId_ != null) {
-              subBuilder = partitionId_.toBuilder();
+          case 26:
+            {
+              com.google.datastore.v1.Query.Builder subBuilder = null;
+              if (queryTypeCase_ == 3) {
+                subBuilder = ((com.google.datastore.v1.Query) queryType_).toBuilder();
+              }
+              queryType_ =
+                  input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Query) queryType_);
+                queryType_ = subBuilder.buildPartial();
+              }
+              queryTypeCase_ = 3;
+              break;
             }
-            partitionId_ = input.readMessage(com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(partitionId_);
-              partitionId_ = subBuilder.buildPartial();
+          case 58:
+            {
+              com.google.datastore.v1.GqlQuery.Builder subBuilder = null;
+              if (queryTypeCase_ == 7) {
+                subBuilder = ((com.google.datastore.v1.GqlQuery) queryType_).toBuilder();
+              }
+              queryType_ =
+                  input.readMessage(com.google.datastore.v1.GqlQuery.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.GqlQuery) queryType_);
+                queryType_ = subBuilder.buildPartial();
+              }
+              queryTypeCase_ = 7;
+              break;
             }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            break;
-          }
-          case 26: {
-            com.google.datastore.v1.Query.Builder subBuilder = null;
-            if (queryTypeCase_ == 3) {
-              subBuilder = ((com.google.datastore.v1.Query) queryType_).toBuilder();
-            }
-            queryType_ =
-                input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Query) queryType_);
-              queryType_ = subBuilder.buildPartial();
-            }
-            queryTypeCase_ = 3;
-            break;
-          }
-          case 58: {
-            com.google.datastore.v1.GqlQuery.Builder subBuilder = null;
-            if (queryTypeCase_ == 7) {
-              subBuilder = ((com.google.datastore.v1.GqlQuery) queryType_).toBuilder();
+              projectId_ = s;
+              break;
             }
-            queryType_ =
-                input.readMessage(com.google.datastore.v1.GqlQuery.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.GqlQuery) queryType_);
-              queryType_ = subBuilder.buildPartial();
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            queryTypeCase_ = 7;
-            break;
-          }
-          case 66: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            projectId_ = s;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RunQueryRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RunQueryRequest.class, com.google.datastore.v1.RunQueryRequest.Builder.class);
+            com.google.datastore.v1.RunQueryRequest.class,
+            com.google.datastore.v1.RunQueryRequest.Builder.class);
   }
 
   private int queryTypeCase_ = 0;
   private java.lang.Object queryType_;
-  public enum QueryTypeCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum QueryTypeCase implements com.google.protobuf.Internal.EnumLite {
     QUERY(3),
     GQL_QUERY(7),
     QUERYTYPE_NOT_SET(0);
     private final int value;
+
     private QueryTypeCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static QueryTypeCase valueOf(int value) {
       return forNumber(value);
@@ -160,26 +173,31 @@ public static QueryTypeCase valueOf(int value) {
 
     public static QueryTypeCase forNumber(int value) {
       switch (value) {
-        case 3: return QUERY;
-        case 7: return GQL_QUERY;
-        case 0: return QUERYTYPE_NOT_SET;
-        default: return null;
+        case 3:
+          return QUERY;
+        case 7:
+          return GQL_QUERY;
+        case 0:
+          return QUERYTYPE_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public QueryTypeCase
-  getQueryTypeCase() {
-    return QueryTypeCase.forNumber(
-        queryTypeCase_);
+  public QueryTypeCase getQueryTypeCase() {
+    return QueryTypeCase.forNumber(queryTypeCase_);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -191,27 +209,26 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
+  public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -222,6 +239,8 @@ public java.lang.String getProjectId() {
   public static final int PARTITION_ID_FIELD_NUMBER = 2;
   private com.google.datastore.v1.PartitionId partitionId_;
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -235,6 +254,8 @@ public boolean hasPartitionId() {
     return partitionId_ != null;
   }
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -245,9 +266,13 @@ public boolean hasPartitionId() {
    * .google.datastore.v1.PartitionId partition_id = 2;
    */
   public com.google.datastore.v1.PartitionId getPartitionId() {
-    return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
+    return partitionId_ == null
+        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+        : partitionId_;
   }
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -264,6 +289,8 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
   /**
+   *
+   *
    * 
    * The options for this query.
    * 

@@ -274,6 +301,8 @@ public boolean hasReadOptions() {
     return readOptions_ != null;
   }
   /**
+   *
+   *
    * 
    * The options for this query.
    * 

@@ -281,9 +310,13 @@ public boolean hasReadOptions() {
    * .google.datastore.v1.ReadOptions read_options = 1;
    */
   public com.google.datastore.v1.ReadOptions getReadOptions() {
-    return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
+    return readOptions_ == null
+        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+        : readOptions_;
   }
   /**
+   *
+   *
    * 
    * The options for this query.
    * 

@@ -296,6 +329,8 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
 
   public static final int QUERY_FIELD_NUMBER = 3;
   /**
+   *
+   *
    * 
    * The query to run.
    * 

@@ -306,6 +341,8 @@ public boolean hasQuery() {
     return queryTypeCase_ == 3;
   }
   /**
+   *
+   *
    * 
    * The query to run.
    * 

@@ -314,11 +351,13 @@ public boolean hasQuery() {
    */
   public com.google.datastore.v1.Query getQuery() {
     if (queryTypeCase_ == 3) {
-       return (com.google.datastore.v1.Query) queryType_;
+      return (com.google.datastore.v1.Query) queryType_;
     }
     return com.google.datastore.v1.Query.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The query to run.
    * 

@@ -327,13 +366,15 @@ public com.google.datastore.v1.Query getQuery() {
    */
   public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
     if (queryTypeCase_ == 3) {
-       return (com.google.datastore.v1.Query) queryType_;
+      return (com.google.datastore.v1.Query) queryType_;
     }
     return com.google.datastore.v1.Query.getDefaultInstance();
   }
 
   public static final int GQL_QUERY_FIELD_NUMBER = 7;
   /**
+   *
+   *
    * 
    * The GQL query to run.
    * 

@@ -344,6 +385,8 @@ public boolean hasGqlQuery() {
     return queryTypeCase_ == 7;
   }
   /**
+   *
+   *
    * 
    * The GQL query to run.
    * 

@@ -352,11 +395,13 @@ public boolean hasGqlQuery() {
    */
   public com.google.datastore.v1.GqlQuery getGqlQuery() {
     if (queryTypeCase_ == 7) {
-       return (com.google.datastore.v1.GqlQuery) queryType_;
+      return (com.google.datastore.v1.GqlQuery) queryType_;
     }
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The GQL query to run.
    * 

@@ -365,12 +410,13 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
    */
   public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     if (queryTypeCase_ == 7) {
-       return (com.google.datastore.v1.GqlQuery) queryType_;
+      return (com.google.datastore.v1.GqlQuery) queryType_;
     }
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -382,8 +428,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (readOptions_ != null) {
       output.writeMessage(1, getReadOptions());
     }
@@ -409,20 +454,20 @@ public int getSerializedSize() {
 
     size = 0;
     if (readOptions_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getReadOptions());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
     }
     if (partitionId_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getPartitionId());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId());
     }
     if (queryTypeCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, (com.google.datastore.v1.Query) queryType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              3, (com.google.datastore.v1.Query) queryType_);
     }
     if (queryTypeCase_ == 7) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(7, (com.google.datastore.v1.GqlQuery) queryType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              7, (com.google.datastore.v1.GqlQuery) queryType_);
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -435,7 +480,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RunQueryRequest)) {
       return super.equals(obj);
@@ -443,29 +488,23 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.RunQueryRequest other = (com.google.datastore.v1.RunQueryRequest) obj;
 
     boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
+    result = result && getProjectId().equals(other.getProjectId());
     result = result && (hasPartitionId() == other.hasPartitionId());
     if (hasPartitionId()) {
-      result = result && getPartitionId()
-          .equals(other.getPartitionId());
+      result = result && getPartitionId().equals(other.getPartitionId());
     }
     result = result && (hasReadOptions() == other.hasReadOptions());
     if (hasReadOptions()) {
-      result = result && getReadOptions()
-          .equals(other.getReadOptions());
+      result = result && getReadOptions().equals(other.getReadOptions());
     }
-    result = result && getQueryTypeCase().equals(
-        other.getQueryTypeCase());
+    result = result && getQueryTypeCase().equals(other.getQueryTypeCase());
     if (!result) return false;
     switch (queryTypeCase_) {
       case 3:
-        result = result && getQuery()
-            .equals(other.getQuery());
+        result = result && getQuery().equals(other.getQuery());
         break;
       case 7:
-        result = result && getGqlQuery()
-            .equals(other.getGqlQuery());
+        result = result && getGqlQuery().equals(other.getGqlQuery());
         break;
       case 0:
       default:
@@ -508,118 +547,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RunQueryRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.RunQueryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RunQueryRequest}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunQueryRequest)
       com.google.datastore.v1.RunQueryRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunQueryRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RunQueryRequest.class, com.google.datastore.v1.RunQueryRequest.Builder.class);
+              com.google.datastore.v1.RunQueryRequest.class,
+              com.google.datastore.v1.RunQueryRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RunQueryRequest.newBuilder()
@@ -627,16 +675,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -660,9 +707,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunQueryRequest_descriptor;
     }
 
     @java.lang.Override
@@ -681,7 +728,8 @@ public com.google.datastore.v1.RunQueryRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RunQueryRequest buildPartial() {
-      com.google.datastore.v1.RunQueryRequest result = new com.google.datastore.v1.RunQueryRequest(this);
+      com.google.datastore.v1.RunQueryRequest result =
+          new com.google.datastore.v1.RunQueryRequest(this);
       result.projectId_ = projectId_;
       if (partitionIdBuilder_ == null) {
         result.partitionId_ = partitionId_;
@@ -716,38 +764,39 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RunQueryRequest) {
-        return mergeFrom((com.google.datastore.v1.RunQueryRequest)other);
+        return mergeFrom((com.google.datastore.v1.RunQueryRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -767,17 +816,20 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
         mergeReadOptions(other.getReadOptions());
       }
       switch (other.getQueryTypeCase()) {
-        case QUERY: {
-          mergeQuery(other.getQuery());
-          break;
-        }
-        case GQL_QUERY: {
-          mergeGqlQuery(other.getGqlQuery());
-          break;
-        }
-        case QUERYTYPE_NOT_SET: {
-          break;
-        }
+        case QUERY:
+          {
+            mergeQuery(other.getQuery());
+            break;
+          }
+        case GQL_QUERY:
+          {
+            mergeGqlQuery(other.getGqlQuery());
+            break;
+          }
+        case QUERYTYPE_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -807,12 +859,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int queryTypeCase_ = 0;
     private java.lang.Object queryType_;
-    public QueryTypeCase
-        getQueryTypeCase() {
-      return QueryTypeCase.forNumber(
-          queryTypeCase_);
+
+    public QueryTypeCase getQueryTypeCase() {
+      return QueryTypeCase.forNumber(queryTypeCase_);
     }
 
     public Builder clearQueryType() {
@@ -822,9 +874,10 @@ public Builder clearQueryType() {
       return this;
     }
 
-
     private java.lang.Object projectId_ = "";
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -834,8 +887,7 @@ public Builder clearQueryType() {
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -844,19 +896,19 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
+    public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -864,23 +916,26 @@ public java.lang.String getProjectId() {
       }
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectId(
-        java.lang.String value) {
+    public Builder setProjectId(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  
+        throw new NullPointerException();
+      }
+
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

@@ -888,25 +943,26 @@ public Builder setProjectId(
      * string project_id = 8;
      */
     public Builder clearProjectId() {
-      
+
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8;
      */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
       projectId_ = value;
       onChanged();
       return this;
@@ -914,8 +970,13 @@ public Builder setProjectIdBytes(
 
     private com.google.datastore.v1.PartitionId partitionId_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_;
+            com.google.datastore.v1.PartitionId,
+            com.google.datastore.v1.PartitionId.Builder,
+            com.google.datastore.v1.PartitionIdOrBuilder>
+        partitionIdBuilder_;
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -929,6 +990,8 @@ public boolean hasPartitionId() {
       return partitionIdBuilder_ != null || partitionId_ != null;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -940,12 +1003,16 @@ public boolean hasPartitionId() {
      */
     public com.google.datastore.v1.PartitionId getPartitionId() {
       if (partitionIdBuilder_ == null) {
-        return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
+        return partitionId_ == null
+            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+            : partitionId_;
       } else {
         return partitionIdBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -969,6 +1036,8 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -978,8 +1047,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
      *
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
-    public Builder setPartitionId(
-        com.google.datastore.v1.PartitionId.Builder builderForValue) {
+    public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
       if (partitionIdBuilder_ == null) {
         partitionId_ = builderForValue.build();
         onChanged();
@@ -990,6 +1058,8 @@ public Builder setPartitionId(
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1003,7 +1073,9 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       if (partitionIdBuilder_ == null) {
         if (partitionId_ != null) {
           partitionId_ =
-            com.google.datastore.v1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           partitionId_ = value;
         }
@@ -1015,6 +1087,8 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1036,6 +1110,8 @@ public Builder clearPartitionId() {
       return this;
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1046,11 +1122,13 @@ public Builder clearPartitionId() {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
-      
+
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1064,11 +1142,14 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
       if (partitionIdBuilder_ != null) {
         return partitionIdBuilder_.getMessageOrBuilder();
       } else {
-        return partitionId_ == null ?
-            com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
+        return partitionId_ == null
+            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+            : partitionId_;
       }
     }
     /**
+     *
+     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1079,14 +1160,17 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> 
+            com.google.datastore.v1.PartitionId,
+            com.google.datastore.v1.PartitionId.Builder,
+            com.google.datastore.v1.PartitionIdOrBuilder>
         getPartitionIdFieldBuilder() {
       if (partitionIdBuilder_ == null) {
-        partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder>(
-                getPartitionId(),
-                getParentForChildren(),
-                isClean());
+        partitionIdBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PartitionId,
+                com.google.datastore.v1.PartitionId.Builder,
+                com.google.datastore.v1.PartitionIdOrBuilder>(
+                getPartitionId(), getParentForChildren(), isClean());
         partitionId_ = null;
       }
       return partitionIdBuilder_;
@@ -1094,8 +1178,13 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
 
     private com.google.datastore.v1.ReadOptions readOptions_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_;
+            com.google.datastore.v1.ReadOptions,
+            com.google.datastore.v1.ReadOptions.Builder,
+            com.google.datastore.v1.ReadOptionsOrBuilder>
+        readOptionsBuilder_;
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1106,6 +1195,8 @@ public boolean hasReadOptions() {
       return readOptionsBuilder_ != null || readOptions_ != null;
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1114,12 +1205,16 @@ public boolean hasReadOptions() {
      */
     public com.google.datastore.v1.ReadOptions getReadOptions() {
       if (readOptionsBuilder_ == null) {
-        return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
+        return readOptions_ == null
+            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+            : readOptions_;
       } else {
         return readOptionsBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1140,14 +1235,15 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
-    public Builder setReadOptions(
-        com.google.datastore.v1.ReadOptions.Builder builderForValue) {
+    public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
       if (readOptionsBuilder_ == null) {
         readOptions_ = builderForValue.build();
         onChanged();
@@ -1158,6 +1254,8 @@ public Builder setReadOptions(
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1168,7 +1266,9 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       if (readOptionsBuilder_ == null) {
         if (readOptions_ != null) {
           readOptions_ =
-            com.google.datastore.v1.ReadOptions.newBuilder(readOptions_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           readOptions_ = value;
         }
@@ -1180,6 +1280,8 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1198,6 +1300,8 @@ public Builder clearReadOptions() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1205,11 +1309,13 @@ public Builder clearReadOptions() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
-      
+
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1220,11 +1326,14 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
       if (readOptionsBuilder_ != null) {
         return readOptionsBuilder_.getMessageOrBuilder();
       } else {
-        return readOptions_ == null ?
-            com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
+        return readOptions_ == null
+            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+            : readOptions_;
       }
     }
     /**
+     *
+     *
      * 
      * The options for this query.
      * 

@@ -1232,22 +1341,30 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> 
+            com.google.datastore.v1.ReadOptions,
+            com.google.datastore.v1.ReadOptions.Builder,
+            com.google.datastore.v1.ReadOptionsOrBuilder>
         getReadOptionsFieldBuilder() {
       if (readOptionsBuilder_ == null) {
-        readOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder>(
-                getReadOptions(),
-                getParentForChildren(),
-                isClean());
+        readOptionsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ReadOptions,
+                com.google.datastore.v1.ReadOptions.Builder,
+                com.google.datastore.v1.ReadOptionsOrBuilder>(
+                getReadOptions(), getParentForChildren(), isClean());
         readOptions_ = null;
       }
       return readOptionsBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_;
+            com.google.datastore.v1.Query,
+            com.google.datastore.v1.Query.Builder,
+            com.google.datastore.v1.QueryOrBuilder>
+        queryBuilder_;
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1258,6 +1375,8 @@ public boolean hasQuery() {
       return queryTypeCase_ == 3;
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1278,6 +1397,8 @@ public com.google.datastore.v1.Query getQuery() {
       }
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1298,14 +1419,15 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

      *
      * .google.datastore.v1.Query query = 3;
      */
-    public Builder setQuery(
-        com.google.datastore.v1.Query.Builder builderForValue) {
+    public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
       if (queryBuilder_ == null) {
         queryType_ = builderForValue.build();
         onChanged();
@@ -1316,6 +1438,8 @@ public Builder setQuery(
       return this;
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1324,10 +1448,12 @@ public Builder setQuery(
      */
     public Builder mergeQuery(com.google.datastore.v1.Query value) {
       if (queryBuilder_ == null) {
-        if (queryTypeCase_ == 3 &&
-            queryType_ != com.google.datastore.v1.Query.getDefaultInstance()) {
-          queryType_ = com.google.datastore.v1.Query.newBuilder((com.google.datastore.v1.Query) queryType_)
-              .mergeFrom(value).buildPartial();
+        if (queryTypeCase_ == 3
+            && queryType_ != com.google.datastore.v1.Query.getDefaultInstance()) {
+          queryType_ =
+              com.google.datastore.v1.Query.newBuilder((com.google.datastore.v1.Query) queryType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           queryType_ = value;
         }
@@ -1342,6 +1468,8 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1365,6 +1493,8 @@ public Builder clearQuery() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1375,6 +1505,8 @@ public com.google.datastore.v1.Query.Builder getQueryBuilder() {
       return getQueryFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1392,6 +1524,8 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * The query to run.
      * 

@@ -1399,27 +1533,36 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
      * .google.datastore.v1.Query query = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> 
+            com.google.datastore.v1.Query,
+            com.google.datastore.v1.Query.Builder,
+            com.google.datastore.v1.QueryOrBuilder>
         getQueryFieldBuilder() {
       if (queryBuilder_ == null) {
         if (!(queryTypeCase_ == 3)) {
           queryType_ = com.google.datastore.v1.Query.getDefaultInstance();
         }
-        queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder>(
-                (com.google.datastore.v1.Query) queryType_,
-                getParentForChildren(),
-                isClean());
+        queryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Query,
+                com.google.datastore.v1.Query.Builder,
+                com.google.datastore.v1.QueryOrBuilder>(
+                (com.google.datastore.v1.Query) queryType_, getParentForChildren(), isClean());
         queryType_ = null;
       }
       queryTypeCase_ = 3;
-      onChanged();;
+      onChanged();
+      ;
       return queryBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> gqlQueryBuilder_;
+            com.google.datastore.v1.GqlQuery,
+            com.google.datastore.v1.GqlQuery.Builder,
+            com.google.datastore.v1.GqlQueryOrBuilder>
+        gqlQueryBuilder_;
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1430,6 +1573,8 @@ public boolean hasGqlQuery() {
       return queryTypeCase_ == 7;
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1450,6 +1595,8 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
       }
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1470,14 +1617,15 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

      *
      * .google.datastore.v1.GqlQuery gql_query = 7;
      */
-    public Builder setGqlQuery(
-        com.google.datastore.v1.GqlQuery.Builder builderForValue) {
+    public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForValue) {
       if (gqlQueryBuilder_ == null) {
         queryType_ = builderForValue.build();
         onChanged();
@@ -1488,6 +1636,8 @@ public Builder setGqlQuery(
       return this;
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1496,10 +1646,13 @@ public Builder setGqlQuery(
      */
     public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
       if (gqlQueryBuilder_ == null) {
-        if (queryTypeCase_ == 7 &&
-            queryType_ != com.google.datastore.v1.GqlQuery.getDefaultInstance()) {
-          queryType_ = com.google.datastore.v1.GqlQuery.newBuilder((com.google.datastore.v1.GqlQuery) queryType_)
-              .mergeFrom(value).buildPartial();
+        if (queryTypeCase_ == 7
+            && queryType_ != com.google.datastore.v1.GqlQuery.getDefaultInstance()) {
+          queryType_ =
+              com.google.datastore.v1.GqlQuery.newBuilder(
+                      (com.google.datastore.v1.GqlQuery) queryType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           queryType_ = value;
         }
@@ -1514,6 +1667,8 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1537,6 +1692,8 @@ public Builder clearGqlQuery() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1547,6 +1704,8 @@ public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
       return getGqlQueryFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1564,6 +1723,8 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * The GQL query to run.
      * 

@@ -1571,26 +1732,30 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
      * .google.datastore.v1.GqlQuery gql_query = 7;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> 
+            com.google.datastore.v1.GqlQuery,
+            com.google.datastore.v1.GqlQuery.Builder,
+            com.google.datastore.v1.GqlQueryOrBuilder>
         getGqlQueryFieldBuilder() {
       if (gqlQueryBuilder_ == null) {
         if (!(queryTypeCase_ == 7)) {
           queryType_ = com.google.datastore.v1.GqlQuery.getDefaultInstance();
         }
-        gqlQueryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder>(
-                (com.google.datastore.v1.GqlQuery) queryType_,
-                getParentForChildren(),
-                isClean());
+        gqlQueryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.GqlQuery,
+                com.google.datastore.v1.GqlQuery.Builder,
+                com.google.datastore.v1.GqlQueryOrBuilder>(
+                (com.google.datastore.v1.GqlQuery) queryType_, getParentForChildren(), isClean());
         queryType_ = null;
       }
       queryTypeCase_ = 7;
-      onChanged();;
+      onChanged();
+      ;
       return gqlQueryBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1600,12 +1765,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunQueryRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryRequest)
   private static final com.google.datastore.v1.RunQueryRequest DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RunQueryRequest();
   }
@@ -1614,16 +1779,16 @@ public static com.google.datastore.v1.RunQueryRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public RunQueryRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryRequest(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public RunQueryRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new RunQueryRequest(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1638,6 +1803,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 11b904153d1e..354a320ac8b7 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface RunQueryRequestOrBuilder extends
+public interface RunQueryRequestOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunQueryRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

@@ -16,16 +19,19 @@ public interface RunQueryRequestOrBuilder extends
    */
   java.lang.String getProjectId();
   /**
+   *
+   *
    * 
    * The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8;
    */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
+  com.google.protobuf.ByteString getProjectIdBytes();
 
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -37,6 +43,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   boolean hasPartitionId();
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -48,6 +56,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   com.google.datastore.v1.PartitionId getPartitionId();
   /**
+   *
+   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -60,6 +70,8 @@ public interface RunQueryRequestOrBuilder extends
   com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder();
 
   /**
+   *
+   *
    * 
    * The options for this query.
    * 

@@ -68,6 +80,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   boolean hasReadOptions();
   /**
+   *
+   *
    * 
    * The options for this query.
    * 

@@ -76,6 +90,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
   /**
+   *
+   *
    * 
    * The options for this query.
    * 

@@ -85,6 +101,8 @@ public interface RunQueryRequestOrBuilder extends
   com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder();
 
   /**
+   *
+   *
    * 
    * The query to run.
    * 

@@ -93,6 +111,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   boolean hasQuery();
   /**
+   *
+   *
    * 
    * The query to run.
    * 

@@ -101,6 +121,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   com.google.datastore.v1.Query getQuery();
   /**
+   *
+   *
    * 
    * The query to run.
    * 

@@ -110,6 +132,8 @@ public interface RunQueryRequestOrBuilder extends
   com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder();
 
   /**
+   *
+   *
    * 
    * The GQL query to run.
    * 

@@ -118,6 +142,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   boolean hasGqlQuery();
   /**
+   *
+   *
    * 
    * The GQL query to run.
    * 

@@ -126,6 +152,8 @@ public interface RunQueryRequestOrBuilder extends
    */
   com.google.datastore.v1.GqlQuery getGqlQuery();
   /**
+   *
+   *
    * 
    * The GQL query to run.
    * 

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 e61be763e322..4cc3706d3f0b 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
@@ -4,29 +4,31 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RunQueryResponse}
  */
-public  final class RunQueryResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class RunQueryResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryResponse)
     RunQueryResponseOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use RunQueryResponse.newBuilder() to construct.
   private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private RunQueryResponse() {
-  }
+
+  private RunQueryResponse() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private RunQueryResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -46,67 +48,75 @@ private RunQueryResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null;
-            if (batch_ != null) {
-              subBuilder = batch_.toBuilder();
-            }
-            batch_ = input.readMessage(com.google.datastore.v1.QueryResultBatch.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(batch_);
-              batch_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.datastore.v1.Query.Builder subBuilder = null;
-            if (query_ != null) {
-              subBuilder = query_.toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null;
+              if (batch_ != null) {
+                subBuilder = batch_.toBuilder();
+              }
+              batch_ =
+                  input.readMessage(
+                      com.google.datastore.v1.QueryResultBatch.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(batch_);
+                batch_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            query_ = input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(query_);
-              query_ = subBuilder.buildPartial();
+          case 18:
+            {
+              com.google.datastore.v1.Query.Builder subBuilder = null;
+              if (query_ != null) {
+                subBuilder = query_.toBuilder();
+              }
+              query_ = input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(query_);
+                query_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RunQueryResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RunQueryResponse.class, com.google.datastore.v1.RunQueryResponse.Builder.class);
+            com.google.datastore.v1.RunQueryResponse.class,
+            com.google.datastore.v1.RunQueryResponse.Builder.class);
   }
 
   public static final int BATCH_FIELD_NUMBER = 1;
   private com.google.datastore.v1.QueryResultBatch batch_;
   /**
+   *
+   *
    * 
    * A batch of query results (always present).
    * 

@@ -117,6 +127,8 @@ public boolean hasBatch() {
     return batch_ != null;
   }
   /**
+   *
+   *
    * 
    * A batch of query results (always present).
    * 

@@ -127,6 +139,8 @@ public com.google.datastore.v1.QueryResultBatch getBatch() {
     return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
   }
   /**
+   *
+   *
    * 
    * A batch of query results (always present).
    * 

@@ -140,6 +154,8 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
   public static final int QUERY_FIELD_NUMBER = 2;
   private com.google.datastore.v1.Query query_;
   /**
+   *
+   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

@@ -150,6 +166,8 @@ public boolean hasQuery() {
     return query_ != null;
   }
   /**
+   *
+   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

@@ -160,6 +178,8 @@ public com.google.datastore.v1.Query getQuery() {
     return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
   }
   /**
+   *
+   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

@@ -171,6 +191,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -182,8 +203,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (batch_ != null) {
       output.writeMessage(1, getBatch());
     }
@@ -200,12 +220,10 @@ public int getSerializedSize() {
 
     size = 0;
     if (batch_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getBatch());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch());
     }
     if (query_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getQuery());
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -215,7 +233,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RunQueryResponse)) {
       return super.equals(obj);
@@ -225,13 +243,11 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && (hasBatch() == other.hasBatch());
     if (hasBatch()) {
-      result = result && getBatch()
-          .equals(other.getBatch());
+      result = result && getBatch().equals(other.getBatch());
     }
     result = result && (hasQuery() == other.hasQuery());
     if (hasQuery()) {
-      result = result && getQuery()
-          .equals(other.getQuery());
+      result = result && getQuery().equals(other.getQuery());
     }
     result = result && unknownFields.equals(other.unknownFields);
     return result;
@@ -257,118 +273,127 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RunQueryResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.RunQueryResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RunQueryResponse}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunQueryResponse)
       com.google.datastore.v1.RunQueryResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunQueryResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RunQueryResponse.class, com.google.datastore.v1.RunQueryResponse.Builder.class);
+              com.google.datastore.v1.RunQueryResponse.class,
+              com.google.datastore.v1.RunQueryResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RunQueryResponse.newBuilder()
@@ -376,16 +401,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -405,9 +429,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunQueryResponse_descriptor;
     }
 
     @java.lang.Override
@@ -426,7 +450,8 @@ public com.google.datastore.v1.RunQueryResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RunQueryResponse buildPartial() {
-      com.google.datastore.v1.RunQueryResponse result = new com.google.datastore.v1.RunQueryResponse(this);
+      com.google.datastore.v1.RunQueryResponse result =
+          new com.google.datastore.v1.RunQueryResponse(this);
       if (batchBuilder_ == null) {
         result.batch_ = batch_;
       } else {
@@ -445,38 +470,39 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RunQueryResponse) {
-        return mergeFrom((com.google.datastore.v1.RunQueryResponse)other);
+        return mergeFrom((com.google.datastore.v1.RunQueryResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -522,8 +548,13 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.QueryResultBatch batch_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder> batchBuilder_;
+            com.google.datastore.v1.QueryResultBatch,
+            com.google.datastore.v1.QueryResultBatch.Builder,
+            com.google.datastore.v1.QueryResultBatchOrBuilder>
+        batchBuilder_;
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -534,6 +565,8 @@ public boolean hasBatch() {
       return batchBuilder_ != null || batch_ != null;
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -542,12 +575,16 @@ public boolean hasBatch() {
      */
     public com.google.datastore.v1.QueryResultBatch getBatch() {
       if (batchBuilder_ == null) {
-        return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
+        return batch_ == null
+            ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance()
+            : batch_;
       } else {
         return batchBuilder_.getMessage();
       }
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -568,14 +605,15 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

      *
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
-    public Builder setBatch(
-        com.google.datastore.v1.QueryResultBatch.Builder builderForValue) {
+    public Builder setBatch(com.google.datastore.v1.QueryResultBatch.Builder builderForValue) {
       if (batchBuilder_ == null) {
         batch_ = builderForValue.build();
         onChanged();
@@ -586,6 +624,8 @@ public Builder setBatch(
       return this;
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -596,7 +636,9 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
       if (batchBuilder_ == null) {
         if (batch_ != null) {
           batch_ =
-            com.google.datastore.v1.QueryResultBatch.newBuilder(batch_).mergeFrom(value).buildPartial();
+              com.google.datastore.v1.QueryResultBatch.newBuilder(batch_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           batch_ = value;
         }
@@ -608,6 +650,8 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -626,6 +670,8 @@ public Builder clearBatch() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -633,11 +679,13 @@ public Builder clearBatch() {
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
     public com.google.datastore.v1.QueryResultBatch.Builder getBatchBuilder() {
-      
+
       onChanged();
       return getBatchFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -648,11 +696,14 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
       if (batchBuilder_ != null) {
         return batchBuilder_.getMessageOrBuilder();
       } else {
-        return batch_ == null ?
-            com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
+        return batch_ == null
+            ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance()
+            : batch_;
       }
     }
     /**
+     *
+     *
      * 
      * A batch of query results (always present).
      * 

@@ -660,14 +711,17 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder> 
+            com.google.datastore.v1.QueryResultBatch,
+            com.google.datastore.v1.QueryResultBatch.Builder,
+            com.google.datastore.v1.QueryResultBatchOrBuilder>
         getBatchFieldBuilder() {
       if (batchBuilder_ == null) {
-        batchBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder>(
-                getBatch(),
-                getParentForChildren(),
-                isClean());
+        batchBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.QueryResultBatch,
+                com.google.datastore.v1.QueryResultBatch.Builder,
+                com.google.datastore.v1.QueryResultBatchOrBuilder>(
+                getBatch(), getParentForChildren(), isClean());
         batch_ = null;
       }
       return batchBuilder_;
@@ -675,8 +729,13 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
 
     private com.google.datastore.v1.Query query_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_;
+            com.google.datastore.v1.Query,
+            com.google.datastore.v1.Query.Builder,
+            com.google.datastore.v1.QueryOrBuilder>
+        queryBuilder_;
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -687,6 +746,8 @@ public boolean hasQuery() {
       return queryBuilder_ != null || query_ != null;
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -701,6 +762,8 @@ public com.google.datastore.v1.Query getQuery() {
       }
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -721,14 +784,15 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

      *
      * .google.datastore.v1.Query query = 2;
      */
-    public Builder setQuery(
-        com.google.datastore.v1.Query.Builder builderForValue) {
+    public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
       if (queryBuilder_ == null) {
         query_ = builderForValue.build();
         onChanged();
@@ -739,6 +803,8 @@ public Builder setQuery(
       return this;
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -748,8 +814,7 @@ public Builder setQuery(
     public Builder mergeQuery(com.google.datastore.v1.Query value) {
       if (queryBuilder_ == null) {
         if (query_ != null) {
-          query_ =
-            com.google.datastore.v1.Query.newBuilder(query_).mergeFrom(value).buildPartial();
+          query_ = com.google.datastore.v1.Query.newBuilder(query_).mergeFrom(value).buildPartial();
         } else {
           query_ = value;
         }
@@ -761,6 +826,8 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -779,6 +846,8 @@ public Builder clearQuery() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -786,11 +855,13 @@ public Builder clearQuery() {
      * .google.datastore.v1.Query query = 2;
      */
     public com.google.datastore.v1.Query.Builder getQueryBuilder() {
-      
+
       onChanged();
       return getQueryFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -801,11 +872,12 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       if (queryBuilder_ != null) {
         return queryBuilder_.getMessageOrBuilder();
       } else {
-        return query_ == null ?
-            com.google.datastore.v1.Query.getDefaultInstance() : query_;
+        return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
       }
     }
     /**
+     *
+     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -813,21 +885,24 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
      * .google.datastore.v1.Query query = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> 
+            com.google.datastore.v1.Query,
+            com.google.datastore.v1.Query.Builder,
+            com.google.datastore.v1.QueryOrBuilder>
         getQueryFieldBuilder() {
       if (queryBuilder_ == null) {
-        queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder>(
-                getQuery(),
-                getParentForChildren(),
-                isClean());
+        queryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Query,
+                com.google.datastore.v1.Query.Builder,
+                com.google.datastore.v1.QueryOrBuilder>(
+                getQuery(), getParentForChildren(), isClean());
         query_ = null;
       }
       return queryBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -837,12 +912,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunQueryResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryResponse)
   private static final com.google.datastore.v1.RunQueryResponse DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RunQueryResponse();
   }
@@ -851,16 +926,16 @@ public static com.google.datastore.v1.RunQueryResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public RunQueryResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryResponse(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public RunQueryResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new RunQueryResponse(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -875,6 +950,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 8045ff9d606f..b1771f2b222a 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface RunQueryResponseOrBuilder extends
+public interface RunQueryResponseOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunQueryResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * A batch of query results (always present).
    * 

@@ -16,6 +19,8 @@ public interface RunQueryResponseOrBuilder extends
    */
   boolean hasBatch();
   /**
+   *
+   *
    * 
    * A batch of query results (always present).
    * 

@@ -24,6 +29,8 @@ public interface RunQueryResponseOrBuilder extends
    */
   com.google.datastore.v1.QueryResultBatch getBatch();
   /**
+   *
+   *
    * 
    * A batch of query results (always present).
    * 

@@ -33,6 +40,8 @@ public interface RunQueryResponseOrBuilder extends
   com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder();
 
   /**
+   *
+   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

@@ -41,6 +50,8 @@ public interface RunQueryResponseOrBuilder extends
    */
   boolean hasQuery();
   /**
+   *
+   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

@@ -49,6 +60,8 @@ public interface RunQueryResponseOrBuilder extends
    */
   com.google.datastore.v1.Query getQuery();
   /**
+   *
+   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

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 2bef782cd392..486309161268 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
@@ -4,6 +4,8 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * Options for beginning a new transaction.
  * Transactions can be created explicitly with calls to
@@ -13,23 +15,23 @@
  *
  * Protobuf type {@code google.datastore.v1.TransactionOptions}
  */
-public  final class TransactionOptions extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class TransactionOptions extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions)
     TransactionOptionsOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use TransactionOptions.newBuilder() to construct.
   private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private TransactionOptions() {
-  }
+
+  private TransactionOptions() {}
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private TransactionOptions(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -49,71 +51,84 @@ private TransactionOptions(
           case 0:
             done = true;
             break;
-          case 10: {
-            com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
-            if (modeCase_ == 1) {
-              subBuilder = ((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_).toBuilder();
-            }
-            mode_ =
-                input.readMessage(com.google.datastore.v1.TransactionOptions.ReadWrite.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
-              mode_ = subBuilder.buildPartial();
-            }
-            modeCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.datastore.v1.TransactionOptions.ReadOnly.Builder subBuilder = null;
-            if (modeCase_ == 2) {
-              subBuilder = ((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_).toBuilder();
+          case 10:
+            {
+              com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
+              if (modeCase_ == 1) {
+                subBuilder =
+                    ((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_).toBuilder();
+              }
+              mode_ =
+                  input.readMessage(
+                      com.google.datastore.v1.TransactionOptions.ReadWrite.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
+                mode_ = subBuilder.buildPartial();
+              }
+              modeCase_ = 1;
+              break;
             }
-            mode_ =
-                input.readMessage(com.google.datastore.v1.TransactionOptions.ReadOnly.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
-              mode_ = subBuilder.buildPartial();
+          case 18:
+            {
+              com.google.datastore.v1.TransactionOptions.ReadOnly.Builder subBuilder = null;
+              if (modeCase_ == 2) {
+                subBuilder =
+                    ((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_).toBuilder();
+              }
+              mode_ =
+                  input.readMessage(
+                      com.google.datastore.v1.TransactionOptions.ReadOnly.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
+                mode_ = subBuilder.buildPartial();
+              }
+              modeCase_ = 2;
+              break;
             }
-            modeCase_ = 2;
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_TransactionOptions_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.TransactionOptions.class, com.google.datastore.v1.TransactionOptions.Builder.class);
+            com.google.datastore.v1.TransactionOptions.class,
+            com.google.datastore.v1.TransactionOptions.Builder.class);
   }
 
-  public interface ReadWriteOrBuilder extends
+  public interface ReadWriteOrBuilder
+      extends
       // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions.ReadWrite)
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     *
+     *
      * 
      * The transaction identifier of the transaction being retried.
      * 

@@ -123,30 +138,33 @@ public interface ReadWriteOrBuilder extends
     com.google.protobuf.ByteString getPreviousTransaction();
   }
   /**
+   *
+   *
    * 
    * Options specific to read / write transactions.
    * 

    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadWrite}
    */
-  public  static final class ReadWrite extends
-      com.google.protobuf.GeneratedMessageV3 implements
+  public static final class ReadWrite extends com.google.protobuf.GeneratedMessageV3
+      implements
       // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadWrite)
       ReadWriteOrBuilder {
-  private static final long serialVersionUID = 0L;
+    private static final long serialVersionUID = 0L;
     // Use ReadWrite.newBuilder() to construct.
     private ReadWrite(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
+
     private ReadWrite() {
       previousTransaction_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
+
     private ReadWrite(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -166,46 +184,50 @@ private ReadWrite(
             case 0:
               done = true;
               break;
-            case 10: {
-
-              previousTransaction_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
+            case 10:
+              {
+                previousTransaction_ = input.readBytes();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
               }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.TransactionOptions.ReadWrite.class, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
+              com.google.datastore.v1.TransactionOptions.ReadWrite.class,
+              com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
     }
 
     public static final int PREVIOUS_TRANSACTION_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString previousTransaction_;
     /**
+     *
+     *
      * 
      * The transaction identifier of the transaction being retried.
      * 

@@ -217,6 +239,7 @@ public com.google.protobuf.ByteString getPreviousTransaction() {
     }
 
     private byte memoizedIsInitialized = -1;
+
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -228,8 +251,7 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!previousTransaction_.isEmpty()) {
         output.writeBytes(1, previousTransaction_);
       }
@@ -243,8 +265,7 @@ public int getSerializedSize() {
 
       size = 0;
       if (!previousTransaction_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, previousTransaction_);
+        size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, previousTransaction_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,16 +275,16 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-       return true;
+        return true;
       }
       if (!(obj instanceof com.google.datastore.v1.TransactionOptions.ReadWrite)) {
         return super.equals(obj);
       }
-      com.google.datastore.v1.TransactionOptions.ReadWrite other = (com.google.datastore.v1.TransactionOptions.ReadWrite) obj;
+      com.google.datastore.v1.TransactionOptions.ReadWrite other =
+          (com.google.datastore.v1.TransactionOptions.ReadWrite) obj;
 
       boolean result = true;
-      result = result && getPreviousTransaction()
-          .equals(other.getPreviousTransaction());
+      result = result && getPreviousTransaction().equals(other.getPreviousTransaction());
       result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
@@ -283,87 +304,94 @@ public int hashCode() {
     }
 
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+
+    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
     }
-    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
+
+    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadWrite prototype) {
+
+    public static Builder newBuilder(
+        com.google.datastore.v1.TransactionOptions.ReadWrite prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -373,27 +401,32 @@ protected Builder newBuilderForType(
       return builder;
     }
     /**
+     *
+     *
      * 
      * Options specific to read / write transactions.
      * 

      *
      * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadWrite}
      */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
         // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions.ReadWrite)
         com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.datastore.v1.DatastoreProto
+            .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
+        return com.google.datastore.v1.DatastoreProto
+            .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.google.datastore.v1.TransactionOptions.ReadWrite.class, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
+                com.google.datastore.v1.TransactionOptions.ReadWrite.class,
+                com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
       }
 
       // Construct using com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder()
@@ -401,16 +434,15 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
+
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
+
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -420,9 +452,9 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.v1.DatastoreProto
+            .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
       @java.lang.Override
@@ -441,7 +473,8 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite build() {
 
       @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
-        com.google.datastore.v1.TransactionOptions.ReadWrite result = new com.google.datastore.v1.TransactionOptions.ReadWrite(this);
+        com.google.datastore.v1.TransactionOptions.ReadWrite result =
+            new com.google.datastore.v1.TransactionOptions.ReadWrite(this);
         result.previousTransaction_ = previousTransaction_;
         onBuilt();
         return result;
@@ -451,38 +484,41 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
       public Builder clone() {
         return (Builder) super.clone();
       }
+
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+
       @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+
       @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
+          int index,
+          java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.TransactionOptions.ReadWrite) {
-          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite)other);
+          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -490,7 +526,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       }
 
       public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite other) {
-        if (other == com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) return this;
+        if (other == com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance())
+          return this;
         if (other.getPreviousTransaction() != com.google.protobuf.ByteString.EMPTY) {
           setPreviousTransaction(other.getPreviousTransaction());
         }
@@ -513,7 +550,8 @@ public Builder mergeFrom(
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.datastore.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage();
+          parsedMessage =
+              (com.google.datastore.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -523,8 +561,11 @@ public Builder mergeFrom(
         return this;
       }
 
-      private com.google.protobuf.ByteString previousTransaction_ = com.google.protobuf.ByteString.EMPTY;
+      private com.google.protobuf.ByteString previousTransaction_ =
+          com.google.protobuf.ByteString.EMPTY;
       /**
+       *
+       *
        * 
        * The transaction identifier of the transaction being retried.
        * 

@@ -535,6 +576,8 @@ public com.google.protobuf.ByteString getPreviousTransaction() {
         return previousTransaction_;
       }
       /**
+       *
+       *
        * 
        * The transaction identifier of the transaction being retried.
        * 

@@ -543,14 +586,16 @@ public com.google.protobuf.ByteString getPreviousTransaction() {
        */
       public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
         if (value == null) {
-    throw new NullPointerException();
-  }
-  
+          throw new NullPointerException();
+        }
+
         previousTransaction_ = value;
         onChanged();
         return this;
       }
       /**
+       *
+       *
        * 
        * The transaction identifier of the transaction being retried.
        * 

@@ -558,11 +603,12 @@ public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
        * bytes previous_transaction = 1;
        */
       public Builder clearPreviousTransaction() {
-        
+
         previousTransaction_ = getDefaultInstance().getPreviousTransaction();
         onChanged();
         return this;
       }
+
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -575,12 +621,12 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
-
       // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions.ReadWrite)
     }
 
     // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions.ReadWrite)
     private static final com.google.datastore.v1.TransactionOptions.ReadWrite DEFAULT_INSTANCE;
+
     static {
       DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions.ReadWrite();
     }
@@ -589,16 +635,16 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultIns
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public ReadWrite parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadWrite(input, extensionRegistry);
-      }
-    };
+    private static final com.google.protobuf.Parser PARSER =
+        new com.google.protobuf.AbstractParser() {
+          @java.lang.Override
+          public ReadWrite parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            return new ReadWrite(input, extensionRegistry);
+          }
+        };
 
     public static com.google.protobuf.Parser parser() {
       return PARSER;
@@ -613,37 +659,38 @@ public com.google.protobuf.Parser getParserForType() {
     public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
-
   }
 
-  public interface ReadOnlyOrBuilder extends
+  public interface ReadOnlyOrBuilder
+      extends
       // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions.ReadOnly)
-      com.google.protobuf.MessageOrBuilder {
-  }
+      com.google.protobuf.MessageOrBuilder {}
   /**
+   *
+   *
    * 
    * Options specific to read-only transactions.
    * 

    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadOnly}
    */
-  public  static final class ReadOnly extends
-      com.google.protobuf.GeneratedMessageV3 implements
+  public static final class ReadOnly extends com.google.protobuf.GeneratedMessageV3
+      implements
       // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadOnly)
       ReadOnlyOrBuilder {
-  private static final long serialVersionUID = 0L;
+    private static final long serialVersionUID = 0L;
     // Use ReadOnly.newBuilder() to construct.
     private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private ReadOnly() {
-    }
+
+    private ReadOnly() {}
 
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
+
     private ReadOnly(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -662,39 +709,42 @@ private ReadOnly(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
+            default:
+              {
+                if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
               }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.TransactionOptions.ReadOnly.class, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
+              com.google.datastore.v1.TransactionOptions.ReadOnly.class,
+              com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
+
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -706,8 +756,7 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
@@ -725,12 +774,13 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-       return true;
+        return true;
       }
       if (!(obj instanceof com.google.datastore.v1.TransactionOptions.ReadOnly)) {
         return super.equals(obj);
       }
-      com.google.datastore.v1.TransactionOptions.ReadOnly other = (com.google.datastore.v1.TransactionOptions.ReadOnly) obj;
+      com.google.datastore.v1.TransactionOptions.ReadOnly other =
+          (com.google.datastore.v1.TransactionOptions.ReadOnly) obj;
 
       boolean result = true;
       result = result && unknownFields.equals(other.unknownFields);
@@ -750,87 +800,94 @@ public int hashCode() {
     }
 
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+
+    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
     }
-    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
+
+    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
+
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadOnly prototype) {
+
+    public static Builder newBuilder(
+        com.google.datastore.v1.TransactionOptions.ReadOnly prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -840,27 +897,32 @@ protected Builder newBuilderForType(
       return builder;
     }
     /**
+     *
+     *
      * 
      * Options specific to read-only transactions.
      * 

      *
      * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadOnly}
      */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
         // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions.ReadOnly)
         com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.datastore.v1.DatastoreProto
+            .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
+        return com.google.datastore.v1.DatastoreProto
+            .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.google.datastore.v1.TransactionOptions.ReadOnly.class, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
+                com.google.datastore.v1.TransactionOptions.ReadOnly.class,
+                com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
       }
 
       // Construct using com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder()
@@ -868,16 +930,15 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
+
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
+
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -885,9 +946,9 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.v1.DatastoreProto
+            .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
       @java.lang.Override
@@ -906,7 +967,8 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() {
 
       @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
-        com.google.datastore.v1.TransactionOptions.ReadOnly result = new com.google.datastore.v1.TransactionOptions.ReadOnly(this);
+        com.google.datastore.v1.TransactionOptions.ReadOnly result =
+            new com.google.datastore.v1.TransactionOptions.ReadOnly(this);
         onBuilt();
         return result;
       }
@@ -915,38 +977,41 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
       public Builder clone() {
         return (Builder) super.clone();
       }
+
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+
       @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+
       @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
+          int index,
+          java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.TransactionOptions.ReadOnly) {
-          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly)other);
+          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -954,7 +1019,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       }
 
       public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly other) {
-        if (other == com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) return this;
+        if (other == com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance())
+          return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -974,7 +1040,8 @@ public Builder mergeFrom(
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.datastore.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage();
+          parsedMessage =
+              (com.google.datastore.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -983,6 +1050,7 @@ public Builder mergeFrom(
         }
         return this;
       }
+
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -995,12 +1063,12 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
-
       // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions.ReadOnly)
     }
 
     // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions.ReadOnly)
     private static final com.google.datastore.v1.TransactionOptions.ReadOnly DEFAULT_INSTANCE;
+
     static {
       DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions.ReadOnly();
     }
@@ -1009,16 +1077,16 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInst
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
-      public ReadOnly parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadOnly(input, extensionRegistry);
-      }
-    };
+    private static final com.google.protobuf.Parser PARSER =
+        new com.google.protobuf.AbstractParser() {
+          @java.lang.Override
+          public ReadOnly parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            return new ReadOnly(input, extensionRegistry);
+          }
+        };
 
     public static com.google.protobuf.Parser parser() {
       return PARSER;
@@ -1033,23 +1101,21 @@ public com.google.protobuf.Parser getParserForType() {
     public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
-
   }
 
   private int modeCase_ = 0;
   private java.lang.Object mode_;
-  public enum ModeCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum ModeCase implements com.google.protobuf.Internal.EnumLite {
     READ_WRITE(1),
     READ_ONLY(2),
     MODE_NOT_SET(0);
     private final int value;
+
     private ModeCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static ModeCase valueOf(int value) {
       return forNumber(value);
@@ -1057,25 +1123,30 @@ public static ModeCase valueOf(int value) {
 
     public static ModeCase forNumber(int value) {
       switch (value) {
-        case 1: return READ_WRITE;
-        case 2: return READ_ONLY;
-        case 0: return MODE_NOT_SET;
-        default: return null;
+        case 1:
+          return READ_WRITE;
+        case 2:
+          return READ_ONLY;
+        case 0:
+          return MODE_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ModeCase
-  getModeCase() {
-    return ModeCase.forNumber(
-        modeCase_);
+  public ModeCase getModeCase() {
+    return ModeCase.forNumber(modeCase_);
   }
 
   public static final int READ_WRITE_FIELD_NUMBER = 1;
   /**
+   *
+   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -1086,6 +1157,8 @@ public boolean hasReadWrite() {
     return modeCase_ == 1;
   }
   /**
+   *
+   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -1094,11 +1167,13 @@ public boolean hasReadWrite() {
    */
   public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
     if (modeCase_ == 1) {
-       return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
+      return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -1107,13 +1182,15 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
    */
   public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
     if (modeCase_ == 1) {
-       return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
+      return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
   }
 
   public static final int READ_ONLY_FIELD_NUMBER = 2;
   /**
+   *
+   *
    * 
    * The transaction should only allow reads.
    * 

@@ -1124,6 +1201,8 @@ public boolean hasReadOnly() {
     return modeCase_ == 2;
   }
   /**
+   *
+   *
    * 
    * The transaction should only allow reads.
    * 

@@ -1132,11 +1211,13 @@ public boolean hasReadOnly() {
    */
   public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
     if (modeCase_ == 2) {
-       return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
+      return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * The transaction should only allow reads.
    * 

@@ -1145,12 +1226,13 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
    */
   public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
     if (modeCase_ == 2) {
-       return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
+      return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -1162,8 +1244,7 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (modeCase_ == 1) {
       output.writeMessage(1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
     }
@@ -1180,12 +1261,14 @@ public int getSerializedSize() {
 
     size = 0;
     if (modeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
     }
     if (modeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -1195,25 +1278,23 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.TransactionOptions)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.TransactionOptions other = (com.google.datastore.v1.TransactionOptions) obj;
+    com.google.datastore.v1.TransactionOptions other =
+        (com.google.datastore.v1.TransactionOptions) obj;
 
     boolean result = true;
-    result = result && getModeCase().equals(
-        other.getModeCase());
+    result = result && getModeCase().equals(other.getModeCase());
     if (!result) return false;
     switch (modeCase_) {
       case 1:
-        result = result && getReadWrite()
-            .equals(other.getReadWrite());
+        result = result && getReadWrite().equals(other.getReadWrite());
         break;
       case 2:
-        result = result && getReadOnly()
-            .equals(other.getReadOnly());
+        result = result && getReadOnly().equals(other.getReadOnly());
         break;
       case 0:
       default:
@@ -1246,97 +1327,104 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.TransactionOptions parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.TransactionOptions parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+
+  public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.TransactionOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.TransactionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * Options for beginning a new transaction.
    * Transactions can be created explicitly with calls to
@@ -1346,21 +1434,23 @@ protected Builder newBuilderForType(
    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions)
       com.google.datastore.v1.TransactionOptionsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_TransactionOptions_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.TransactionOptions.class, com.google.datastore.v1.TransactionOptions.Builder.class);
+              com.google.datastore.v1.TransactionOptions.class,
+              com.google.datastore.v1.TransactionOptions.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.TransactionOptions.newBuilder()
@@ -1368,16 +1458,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -1387,9 +1476,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_TransactionOptions_descriptor;
     }
 
     @java.lang.Override
@@ -1408,7 +1497,8 @@ public com.google.datastore.v1.TransactionOptions build() {
 
     @java.lang.Override
     public com.google.datastore.v1.TransactionOptions buildPartial() {
-      com.google.datastore.v1.TransactionOptions result = new com.google.datastore.v1.TransactionOptions(this);
+      com.google.datastore.v1.TransactionOptions result =
+          new com.google.datastore.v1.TransactionOptions(this);
       if (modeCase_ == 1) {
         if (readWriteBuilder_ == null) {
           result.mode_ = mode_;
@@ -1432,38 +1522,39 @@ public com.google.datastore.v1.TransactionOptions buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.TransactionOptions) {
-        return mergeFrom((com.google.datastore.v1.TransactionOptions)other);
+        return mergeFrom((com.google.datastore.v1.TransactionOptions) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1473,17 +1564,20 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) {
       if (other == com.google.datastore.v1.TransactionOptions.getDefaultInstance()) return this;
       switch (other.getModeCase()) {
-        case READ_WRITE: {
-          mergeReadWrite(other.getReadWrite());
-          break;
-        }
-        case READ_ONLY: {
-          mergeReadOnly(other.getReadOnly());
-          break;
-        }
-        case MODE_NOT_SET: {
-          break;
-        }
+        case READ_WRITE:
+          {
+            mergeReadWrite(other.getReadWrite());
+            break;
+          }
+        case READ_ONLY:
+          {
+            mergeReadOnly(other.getReadOnly());
+            break;
+          }
+        case MODE_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -1513,12 +1607,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int modeCase_ = 0;
     private java.lang.Object mode_;
-    public ModeCase
-        getModeCase() {
-      return ModeCase.forNumber(
-          modeCase_);
+
+    public ModeCase getModeCase() {
+      return ModeCase.forNumber(modeCase_);
     }
 
     public Builder clearMode() {
@@ -1528,10 +1622,14 @@ public Builder clearMode() {
       return this;
     }
 
-
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder> readWriteBuilder_;
+            com.google.datastore.v1.TransactionOptions.ReadWrite,
+            com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
+            com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>
+        readWriteBuilder_;
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1542,6 +1640,8 @@ public boolean hasReadWrite() {
       return modeCase_ == 1;
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1562,6 +1662,8 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
       }
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1582,6 +1684,8 @@ public Builder setReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1600,6 +1704,8 @@ public Builder setReadWrite(
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1608,10 +1714,13 @@ public Builder setReadWrite(
      */
     public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite value) {
       if (readWriteBuilder_ == null) {
-        if (modeCase_ == 1 &&
-            mode_ != com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) {
-          mode_ = com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_)
-              .mergeFrom(value).buildPartial();
+        if (modeCase_ == 1
+            && mode_ != com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) {
+          mode_ =
+              com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder(
+                      (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           mode_ = value;
         }
@@ -1626,6 +1735,8 @@ public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWri
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1649,6 +1760,8 @@ public Builder clearReadWrite() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1659,6 +1772,8 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite.Builder getReadWrite
       return getReadWriteFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1676,6 +1791,8 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
       }
     }
     /**
+     *
+     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1683,27 +1800,38 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
      * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder> 
+            com.google.datastore.v1.TransactionOptions.ReadWrite,
+            com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
+            com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>
         getReadWriteFieldBuilder() {
       if (readWriteBuilder_ == null) {
         if (!(modeCase_ == 1)) {
           mode_ = com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
         }
-        readWriteBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>(
+        readWriteBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.TransactionOptions.ReadWrite,
+                com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
+                com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>(
                 (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_,
                 getParentForChildren(),
                 isClean());
         mode_ = null;
       }
       modeCase_ = 1;
-      onChanged();;
+      onChanged();
+      ;
       return readWriteBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder> readOnlyBuilder_;
+            com.google.datastore.v1.TransactionOptions.ReadOnly,
+            com.google.datastore.v1.TransactionOptions.ReadOnly.Builder,
+            com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>
+        readOnlyBuilder_;
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1714,6 +1842,8 @@ public boolean hasReadOnly() {
       return modeCase_ == 2;
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1734,6 +1864,8 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
       }
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1754,6 +1886,8 @@ public Builder setReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly v
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1772,6 +1906,8 @@ public Builder setReadOnly(
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1780,10 +1916,13 @@ public Builder setReadOnly(
      */
     public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly value) {
       if (readOnlyBuilder_ == null) {
-        if (modeCase_ == 2 &&
-            mode_ != com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) {
-          mode_ = com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_)
-              .mergeFrom(value).buildPartial();
+        if (modeCase_ == 2
+            && mode_ != com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) {
+          mode_ =
+              com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder(
+                      (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           mode_ = value;
         }
@@ -1798,6 +1937,8 @@ public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1821,6 +1962,8 @@ public Builder clearReadOnly() {
       return this;
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1831,6 +1974,8 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBu
       return getReadOnlyFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1848,6 +1993,8 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
       }
     }
     /**
+     *
+     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1855,26 +2002,32 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
      * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder> 
+            com.google.datastore.v1.TransactionOptions.ReadOnly,
+            com.google.datastore.v1.TransactionOptions.ReadOnly.Builder,
+            com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>
         getReadOnlyFieldBuilder() {
       if (readOnlyBuilder_ == null) {
         if (!(modeCase_ == 2)) {
           mode_ = com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
         }
-        readOnlyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>(
+        readOnlyBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.TransactionOptions.ReadOnly,
+                com.google.datastore.v1.TransactionOptions.ReadOnly.Builder,
+                com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>(
                 (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_,
                 getParentForChildren(),
                 isClean());
         mode_ = null;
       }
       modeCase_ = 2;
-      onChanged();;
+      onChanged();
+      ;
       return readOnlyBuilder_;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -1884,12 +2037,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions)
   private static final com.google.datastore.v1.TransactionOptions DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions();
   }
@@ -1898,16 +2051,16 @@ public static com.google.datastore.v1.TransactionOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public TransactionOptions parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionOptions(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public TransactionOptions parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new TransactionOptions(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1922,6 +2075,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 031fc620ccc1..f923c070fbf1 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface TransactionOptionsOrBuilder extends
+public interface TransactionOptionsOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -16,6 +19,8 @@ public interface TransactionOptionsOrBuilder extends
    */
   boolean hasReadWrite();
   /**
+   *
+   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -24,6 +29,8 @@ public interface TransactionOptionsOrBuilder extends
    */
   com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite();
   /**
+   *
+   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -33,6 +40,8 @@ public interface TransactionOptionsOrBuilder extends
   com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder();
 
   /**
+   *
+   *
    * 
    * The transaction should only allow reads.
    * 

@@ -41,6 +50,8 @@ public interface TransactionOptionsOrBuilder extends
    */
   boolean hasReadOnly();
   /**
+   *
+   *
    * 
    * The transaction should only allow reads.
    * 

@@ -49,6 +60,8 @@ public interface TransactionOptionsOrBuilder extends
    */
   com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly();
   /**
+   *
+   *
    * 
    * The transaction should only allow reads.
    * 

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 545094844729..c75eddabe6fd 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
@@ -4,6 +4,8 @@
 package com.google.datastore.v1;
 
 /**
+ *
+ *
  * 
  * A message that can hold any of the supported value types and associated
  * metadata.
@@ -11,25 +13,26 @@
  *
  * Protobuf type {@code google.datastore.v1.Value}
  */
-public  final class Value extends
-    com.google.protobuf.GeneratedMessageV3 implements
+public final class Value extends com.google.protobuf.GeneratedMessageV3
+    implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Value)
     ValueOrBuilder {
-private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
   // Use Value.newBuilder() to construct.
   private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
+
   private Value() {
     meaning_ = 0;
     excludeFromIndexes_ = false;
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
+
   private Value(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -49,154 +52,164 @@ private Value(
           case 0:
             done = true;
             break;
-          case 8: {
-            valueTypeCase_ = 1;
-            valueType_ = input.readBool();
-            break;
-          }
-          case 16: {
-            valueTypeCase_ = 2;
-            valueType_ = input.readInt64();
-            break;
-          }
-          case 25: {
-            valueTypeCase_ = 3;
-            valueType_ = input.readDouble();
-            break;
-          }
-          case 42: {
-            com.google.datastore.v1.Key.Builder subBuilder = null;
-            if (valueTypeCase_ == 5) {
-              subBuilder = ((com.google.datastore.v1.Key) valueType_).toBuilder();
+          case 8:
+            {
+              valueTypeCase_ = 1;
+              valueType_ = input.readBool();
+              break;
             }
-            valueType_ =
-                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Key) valueType_);
-              valueType_ = subBuilder.buildPartial();
+          case 16:
+            {
+              valueTypeCase_ = 2;
+              valueType_ = input.readInt64();
+              break;
             }
-            valueTypeCase_ = 5;
-            break;
-          }
-          case 50: {
-            com.google.datastore.v1.Entity.Builder subBuilder = null;
-            if (valueTypeCase_ == 6) {
-              subBuilder = ((com.google.datastore.v1.Entity) valueType_).toBuilder();
+          case 25:
+            {
+              valueTypeCase_ = 3;
+              valueType_ = input.readDouble();
+              break;
             }
-            valueType_ =
-                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.Entity) valueType_);
-              valueType_ = subBuilder.buildPartial();
+          case 42:
+            {
+              com.google.datastore.v1.Key.Builder subBuilder = null;
+              if (valueTypeCase_ == 5) {
+                subBuilder = ((com.google.datastore.v1.Key) valueType_).toBuilder();
+              }
+              valueType_ =
+                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Key) valueType_);
+                valueType_ = subBuilder.buildPartial();
+              }
+              valueTypeCase_ = 5;
+              break;
             }
-            valueTypeCase_ = 6;
-            break;
-          }
-          case 66: {
-            com.google.type.LatLng.Builder subBuilder = null;
-            if (valueTypeCase_ == 8) {
-              subBuilder = ((com.google.type.LatLng) valueType_).toBuilder();
+          case 50:
+            {
+              com.google.datastore.v1.Entity.Builder subBuilder = null;
+              if (valueTypeCase_ == 6) {
+                subBuilder = ((com.google.datastore.v1.Entity) valueType_).toBuilder();
+              }
+              valueType_ =
+                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.Entity) valueType_);
+                valueType_ = subBuilder.buildPartial();
+              }
+              valueTypeCase_ = 6;
+              break;
             }
-            valueType_ =
-                input.readMessage(com.google.type.LatLng.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.type.LatLng) valueType_);
-              valueType_ = subBuilder.buildPartial();
+          case 66:
+            {
+              com.google.type.LatLng.Builder subBuilder = null;
+              if (valueTypeCase_ == 8) {
+                subBuilder = ((com.google.type.LatLng) valueType_).toBuilder();
+              }
+              valueType_ = input.readMessage(com.google.type.LatLng.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.type.LatLng) valueType_);
+                valueType_ = subBuilder.buildPartial();
+              }
+              valueTypeCase_ = 8;
+              break;
             }
-            valueTypeCase_ = 8;
-            break;
-          }
-          case 74: {
-            com.google.datastore.v1.ArrayValue.Builder subBuilder = null;
-            if (valueTypeCase_ == 9) {
-              subBuilder = ((com.google.datastore.v1.ArrayValue) valueType_).toBuilder();
+          case 74:
+            {
+              com.google.datastore.v1.ArrayValue.Builder subBuilder = null;
+              if (valueTypeCase_ == 9) {
+                subBuilder = ((com.google.datastore.v1.ArrayValue) valueType_).toBuilder();
+              }
+              valueType_ =
+                  input.readMessage(com.google.datastore.v1.ArrayValue.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.datastore.v1.ArrayValue) valueType_);
+                valueType_ = subBuilder.buildPartial();
+              }
+              valueTypeCase_ = 9;
+              break;
             }
-            valueType_ =
-                input.readMessage(com.google.datastore.v1.ArrayValue.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.datastore.v1.ArrayValue) valueType_);
-              valueType_ = subBuilder.buildPartial();
+          case 82:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (valueTypeCase_ == 10) {
+                subBuilder = ((com.google.protobuf.Timestamp) valueType_).toBuilder();
+              }
+              valueType_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.protobuf.Timestamp) valueType_);
+                valueType_ = subBuilder.buildPartial();
+              }
+              valueTypeCase_ = 10;
+              break;
             }
-            valueTypeCase_ = 9;
-            break;
-          }
-          case 82: {
-            com.google.protobuf.Timestamp.Builder subBuilder = null;
-            if (valueTypeCase_ == 10) {
-              subBuilder = ((com.google.protobuf.Timestamp) valueType_).toBuilder();
+          case 88:
+            {
+              int rawValue = input.readEnum();
+              valueTypeCase_ = 11;
+              valueType_ = rawValue;
+              break;
             }
-            valueType_ =
-                input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.protobuf.Timestamp) valueType_);
-              valueType_ = subBuilder.buildPartial();
+          case 112:
+            {
+              meaning_ = input.readInt32();
+              break;
             }
-            valueTypeCase_ = 10;
-            break;
-          }
-          case 88: {
-            int rawValue = input.readEnum();
-            valueTypeCase_ = 11;
-            valueType_ = rawValue;
-            break;
-          }
-          case 112: {
-
-            meaning_ = input.readInt32();
-            break;
-          }
-          case 138: {
-            java.lang.String s = input.readStringRequireUtf8();
-            valueTypeCase_ = 17;
-            valueType_ = s;
-            break;
-          }
-          case 146: {
-            valueTypeCase_ = 18;
-            valueType_ = input.readBytes();
-            break;
-          }
-          case 152: {
-
-            excludeFromIndexes_ = input.readBool();
-            break;
-          }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+          case 138:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              valueTypeCase_ = 17;
+              valueType_ = s;
+              break;
+            }
+          case 146:
+            {
+              valueTypeCase_ = 18;
+              valueType_ = input.readBytes();
+              break;
+            }
+          case 152:
+            {
+              excludeFromIndexes_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto
+        .internal_static_google_datastore_v1_Value_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Value.class, com.google.datastore.v1.Value.Builder.class);
   }
 
   private int valueTypeCase_ = 0;
   private java.lang.Object valueType_;
-  public enum ValueTypeCase
-      implements com.google.protobuf.Internal.EnumLite {
+
+  public enum ValueTypeCase implements com.google.protobuf.Internal.EnumLite {
     NULL_VALUE(11),
     BOOLEAN_VALUE(1),
     INTEGER_VALUE(2),
@@ -210,12 +223,11 @@ public enum ValueTypeCase
     ARRAY_VALUE(9),
     VALUETYPE_NOT_SET(0);
     private final int value;
+
     private ValueTypeCase(int value) {
       this.value = value;
     }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
+    /** @deprecated Use {@link #forNumber(int)} instead. */
     @java.lang.Deprecated
     public static ValueTypeCase valueOf(int value) {
       return forNumber(value);
@@ -223,34 +235,48 @@ public static ValueTypeCase valueOf(int value) {
 
     public static ValueTypeCase forNumber(int value) {
       switch (value) {
-        case 11: return NULL_VALUE;
-        case 1: return BOOLEAN_VALUE;
-        case 2: return INTEGER_VALUE;
-        case 3: return DOUBLE_VALUE;
-        case 10: return TIMESTAMP_VALUE;
-        case 5: return KEY_VALUE;
-        case 17: return STRING_VALUE;
-        case 18: return BLOB_VALUE;
-        case 8: return GEO_POINT_VALUE;
-        case 6: return ENTITY_VALUE;
-        case 9: return ARRAY_VALUE;
-        case 0: return VALUETYPE_NOT_SET;
-        default: return null;
+        case 11:
+          return NULL_VALUE;
+        case 1:
+          return BOOLEAN_VALUE;
+        case 2:
+          return INTEGER_VALUE;
+        case 3:
+          return DOUBLE_VALUE;
+        case 10:
+          return TIMESTAMP_VALUE;
+        case 5:
+          return KEY_VALUE;
+        case 17:
+          return STRING_VALUE;
+        case 18:
+          return BLOB_VALUE;
+        case 8:
+          return GEO_POINT_VALUE;
+        case 6:
+          return ENTITY_VALUE;
+        case 9:
+          return ARRAY_VALUE;
+        case 0:
+          return VALUETYPE_NOT_SET;
+        default:
+          return null;
       }
     }
+
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ValueTypeCase
-  getValueTypeCase() {
-    return ValueTypeCase.forNumber(
-        valueTypeCase_);
+  public ValueTypeCase getValueTypeCase() {
+    return ValueTypeCase.forNumber(valueTypeCase_);
   }
 
   public static final int NULL_VALUE_FIELD_NUMBER = 11;
   /**
+   *
+   *
    * 
    * A null value.
    * 

@@ -264,6 +290,8 @@ public int getNullValueValue() {
     return 0;
   }
   /**
+   *
+   *
    * 
    * A null value.
    * 

@@ -273,8 +301,8 @@ public int getNullValueValue() {
   public com.google.protobuf.NullValue getNullValue() {
     if (valueTypeCase_ == 11) {
       @SuppressWarnings("deprecation")
-      com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
-          (java.lang.Integer) valueType_);
+      com.google.protobuf.NullValue result =
+          com.google.protobuf.NullValue.valueOf((java.lang.Integer) valueType_);
       return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
     }
     return com.google.protobuf.NullValue.NULL_VALUE;
@@ -282,6 +310,8 @@ public com.google.protobuf.NullValue getNullValue() {
 
   public static final int BOOLEAN_VALUE_FIELD_NUMBER = 1;
   /**
+   *
+   *
    * 
    * A boolean value.
    * 

@@ -297,6 +327,8 @@ public boolean getBooleanValue() {
 
   public static final int INTEGER_VALUE_FIELD_NUMBER = 2;
   /**
+   *
+   *
    * 
    * An integer value.
    * 

@@ -312,6 +344,8 @@ public long getIntegerValue() {
 
   public static final int DOUBLE_VALUE_FIELD_NUMBER = 3;
   /**
+   *
+   *
    * 
    * A double value.
    * 

@@ -327,6 +361,8 @@ public double getDoubleValue() {
 
   public static final int TIMESTAMP_VALUE_FIELD_NUMBER = 10;
   /**
+   *
+   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -339,6 +375,8 @@ public boolean hasTimestampValue() {
     return valueTypeCase_ == 10;
   }
   /**
+   *
+   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -349,11 +387,13 @@ public boolean hasTimestampValue() {
    */
   public com.google.protobuf.Timestamp getTimestampValue() {
     if (valueTypeCase_ == 10) {
-       return (com.google.protobuf.Timestamp) valueType_;
+      return (com.google.protobuf.Timestamp) valueType_;
     }
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -364,13 +404,15 @@ public com.google.protobuf.Timestamp getTimestampValue() {
    */
   public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
     if (valueTypeCase_ == 10) {
-       return (com.google.protobuf.Timestamp) valueType_;
+      return (com.google.protobuf.Timestamp) valueType_;
     }
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
 
   public static final int KEY_VALUE_FIELD_NUMBER = 5;
   /**
+   *
+   *
    * 
    * A key value.
    * 

@@ -381,6 +423,8 @@ public boolean hasKeyValue() {
     return valueTypeCase_ == 5;
   }
   /**
+   *
+   *
    * 
    * A key value.
    * 

@@ -389,11 +433,13 @@ public boolean hasKeyValue() {
    */
   public com.google.datastore.v1.Key getKeyValue() {
     if (valueTypeCase_ == 5) {
-       return (com.google.datastore.v1.Key) valueType_;
+      return (com.google.datastore.v1.Key) valueType_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * A key value.
    * 

@@ -402,13 +448,15 @@ public com.google.datastore.v1.Key getKeyValue() {
    */
   public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
     if (valueTypeCase_ == 5) {
-       return (com.google.datastore.v1.Key) valueType_;
+      return (com.google.datastore.v1.Key) valueType_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
 
   public static final int STRING_VALUE_FIELD_NUMBER = 17;
   /**
+   *
+   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -425,8 +473,7 @@ public java.lang.String getStringValue() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       if (valueTypeCase_ == 17) {
         valueType_ = s;
@@ -435,6 +482,8 @@ public java.lang.String getStringValue() {
     }
   }
   /**
+   *
+   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -443,16 +492,14 @@ public java.lang.String getStringValue() {
    *
    * string string_value = 17;
    */
-  public com.google.protobuf.ByteString
-      getStringValueBytes() {
+  public com.google.protobuf.ByteString getStringValueBytes() {
     java.lang.Object ref = "";
     if (valueTypeCase_ == 17) {
       ref = valueType_;
     }
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       if (valueTypeCase_ == 17) {
         valueType_ = b;
       }
@@ -464,6 +511,8 @@ public java.lang.String getStringValue() {
 
   public static final int BLOB_VALUE_FIELD_NUMBER = 18;
   /**
+   *
+   *
    * 
    * A blob value.
    * May have at most 1,000,000 bytes.
@@ -482,6 +531,8 @@ public com.google.protobuf.ByteString getBlobValue() {
 
   public static final int GEO_POINT_VALUE_FIELD_NUMBER = 8;
   /**
+   *
+   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -492,6 +543,8 @@ public boolean hasGeoPointValue() {
     return valueTypeCase_ == 8;
   }
   /**
+   *
+   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -500,11 +553,13 @@ public boolean hasGeoPointValue() {
    */
   public com.google.type.LatLng getGeoPointValue() {
     if (valueTypeCase_ == 8) {
-       return (com.google.type.LatLng) valueType_;
+      return (com.google.type.LatLng) valueType_;
     }
     return com.google.type.LatLng.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -513,13 +568,15 @@ public com.google.type.LatLng getGeoPointValue() {
    */
   public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
     if (valueTypeCase_ == 8) {
-       return (com.google.type.LatLng) valueType_;
+      return (com.google.type.LatLng) valueType_;
     }
     return com.google.type.LatLng.getDefaultInstance();
   }
 
   public static final int ENTITY_VALUE_FIELD_NUMBER = 6;
   /**
+   *
+   *
    * 
    * An entity value.
    * - May have no key.
@@ -533,6 +590,8 @@ public boolean hasEntityValue() {
     return valueTypeCase_ == 6;
   }
   /**
+   *
+   *
    * 
    * An entity value.
    * - May have no key.
@@ -544,11 +603,13 @@ public boolean hasEntityValue() {
    */
   public com.google.datastore.v1.Entity getEntityValue() {
     if (valueTypeCase_ == 6) {
-       return (com.google.datastore.v1.Entity) valueType_;
+      return (com.google.datastore.v1.Entity) valueType_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * An entity value.
    * - May have no key.
@@ -560,13 +621,15 @@ public com.google.datastore.v1.Entity getEntityValue() {
    */
   public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
     if (valueTypeCase_ == 6) {
-       return (com.google.datastore.v1.Entity) valueType_;
+      return (com.google.datastore.v1.Entity) valueType_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int ARRAY_VALUE_FIELD_NUMBER = 9;
   /**
+   *
+   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -580,6 +643,8 @@ public boolean hasArrayValue() {
     return valueTypeCase_ == 9;
   }
   /**
+   *
+   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -591,11 +656,13 @@ public boolean hasArrayValue() {
    */
   public com.google.datastore.v1.ArrayValue getArrayValue() {
     if (valueTypeCase_ == 9) {
-       return (com.google.datastore.v1.ArrayValue) valueType_;
+      return (com.google.datastore.v1.ArrayValue) valueType_;
     }
     return com.google.datastore.v1.ArrayValue.getDefaultInstance();
   }
   /**
+   *
+   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -607,7 +674,7 @@ public com.google.datastore.v1.ArrayValue getArrayValue() {
    */
   public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
     if (valueTypeCase_ == 9) {
-       return (com.google.datastore.v1.ArrayValue) valueType_;
+      return (com.google.datastore.v1.ArrayValue) valueType_;
     }
     return com.google.datastore.v1.ArrayValue.getDefaultInstance();
   }
@@ -615,6 +682,8 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
   public static final int MEANING_FIELD_NUMBER = 14;
   private int meaning_;
   /**
+   *
+   *
    * 
    * The `meaning` field should only be populated for backwards compatibility.
    * 

@@ -628,6 +697,8 @@ public int getMeaning() {
   public static final int EXCLUDE_FROM_INDEXES_FIELD_NUMBER = 19;
   private boolean excludeFromIndexes_;
   /**
+   *
+   *
    * 
    * If the value should be excluded from all indexes including those defined
    * explicitly.
@@ -640,6 +711,7 @@ public boolean getExcludeFromIndexes() {
   }
 
   private byte memoizedIsInitialized = -1;
+
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -651,19 +723,15 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (valueTypeCase_ == 1) {
-      output.writeBool(
-          1, (boolean)((java.lang.Boolean) valueType_));
+      output.writeBool(1, (boolean) ((java.lang.Boolean) valueType_));
     }
     if (valueTypeCase_ == 2) {
-      output.writeInt64(
-          2, (long)((java.lang.Long) valueType_));
+      output.writeInt64(2, (long) ((java.lang.Long) valueType_));
     }
     if (valueTypeCase_ == 3) {
-      output.writeDouble(
-          3, (double)((java.lang.Double) valueType_));
+      output.writeDouble(3, (double) ((java.lang.Double) valueType_));
     }
     if (valueTypeCase_ == 5) {
       output.writeMessage(5, (com.google.datastore.v1.Key) valueType_);
@@ -690,8 +758,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       com.google.protobuf.GeneratedMessageV3.writeString(output, 17, valueType_);
     }
     if (valueTypeCase_ == 18) {
-      output.writeBytes(
-          18, (com.google.protobuf.ByteString) valueType_);
+      output.writeBytes(18, (com.google.protobuf.ByteString) valueType_);
     }
     if (excludeFromIndexes_ != false) {
       output.writeBool(19, excludeFromIndexes_);
@@ -706,59 +773,63 @@ public int getSerializedSize() {
 
     size = 0;
     if (valueTypeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(
-            1, (boolean)((java.lang.Boolean) valueType_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeBoolSize(
+              1, (boolean) ((java.lang.Boolean) valueType_));
     }
     if (valueTypeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(
-            2, (long)((java.lang.Long) valueType_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeInt64Size(
+              2, (long) ((java.lang.Long) valueType_));
     }
     if (valueTypeCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeDoubleSize(
-            3, (double)((java.lang.Double) valueType_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeDoubleSize(
+              3, (double) ((java.lang.Double) valueType_));
     }
     if (valueTypeCase_ == 5) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, (com.google.datastore.v1.Key) valueType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              5, (com.google.datastore.v1.Key) valueType_);
     }
     if (valueTypeCase_ == 6) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, (com.google.datastore.v1.Entity) valueType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              6, (com.google.datastore.v1.Entity) valueType_);
     }
     if (valueTypeCase_ == 8) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(8, (com.google.type.LatLng) valueType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              8, (com.google.type.LatLng) valueType_);
     }
     if (valueTypeCase_ == 9) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(9, (com.google.datastore.v1.ArrayValue) valueType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              9, (com.google.datastore.v1.ArrayValue) valueType_);
     }
     if (valueTypeCase_ == 10) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(10, (com.google.protobuf.Timestamp) valueType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              10, (com.google.protobuf.Timestamp) valueType_);
     }
     if (valueTypeCase_ == 11) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(11, ((java.lang.Integer) valueType_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeEnumSize(
+              11, ((java.lang.Integer) valueType_));
     }
     if (meaning_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(14, meaning_);
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(14, meaning_);
     }
     if (valueTypeCase_ == 17) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, valueType_);
     }
     if (valueTypeCase_ == 18) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(
-            18, (com.google.protobuf.ByteString) valueType_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeBytesSize(
+              18, (com.google.protobuf.ByteString) valueType_);
     }
     if (excludeFromIndexes_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(19, excludeFromIndexes_);
+      size += com.google.protobuf.CodedOutputStream.computeBoolSize(19, excludeFromIndexes_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -768,7 +839,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-     return true;
+      return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Value)) {
       return super.equals(obj);
@@ -776,59 +847,46 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.Value other = (com.google.datastore.v1.Value) obj;
 
     boolean result = true;
-    result = result && (getMeaning()
-        == other.getMeaning());
-    result = result && (getExcludeFromIndexes()
-        == other.getExcludeFromIndexes());
-    result = result && getValueTypeCase().equals(
-        other.getValueTypeCase());
+    result = result && (getMeaning() == other.getMeaning());
+    result = result && (getExcludeFromIndexes() == other.getExcludeFromIndexes());
+    result = result && getValueTypeCase().equals(other.getValueTypeCase());
     if (!result) return false;
     switch (valueTypeCase_) {
       case 11:
-        result = result && getNullValueValue()
-            == other.getNullValueValue();
+        result = result && getNullValueValue() == other.getNullValueValue();
         break;
       case 1:
-        result = result && (getBooleanValue()
-            == other.getBooleanValue());
+        result = result && (getBooleanValue() == other.getBooleanValue());
         break;
       case 2:
-        result = result && (getIntegerValue()
-            == other.getIntegerValue());
+        result = result && (getIntegerValue() == other.getIntegerValue());
         break;
       case 3:
-        result = result && (
-            java.lang.Double.doubleToLongBits(getDoubleValue())
-            == java.lang.Double.doubleToLongBits(
-                other.getDoubleValue()));
+        result =
+            result
+                && (java.lang.Double.doubleToLongBits(getDoubleValue())
+                    == java.lang.Double.doubleToLongBits(other.getDoubleValue()));
         break;
       case 10:
-        result = result && getTimestampValue()
-            .equals(other.getTimestampValue());
+        result = result && getTimestampValue().equals(other.getTimestampValue());
         break;
       case 5:
-        result = result && getKeyValue()
-            .equals(other.getKeyValue());
+        result = result && getKeyValue().equals(other.getKeyValue());
         break;
       case 17:
-        result = result && getStringValue()
-            .equals(other.getStringValue());
+        result = result && getStringValue().equals(other.getStringValue());
         break;
       case 18:
-        result = result && getBlobValue()
-            .equals(other.getBlobValue());
+        result = result && getBlobValue().equals(other.getBlobValue());
         break;
       case 8:
-        result = result && getGeoPointValue()
-            .equals(other.getGeoPointValue());
+        result = result && getGeoPointValue().equals(other.getGeoPointValue());
         break;
       case 6:
-        result = result && getEntityValue()
-            .equals(other.getEntityValue());
+        result = result && getEntityValue().equals(other.getEntityValue());
         break;
       case 9:
-        result = result && getArrayValue()
-            .equals(other.getArrayValue());
+        result = result && getArrayValue().equals(other.getArrayValue());
         break;
       case 0:
       default:
@@ -847,8 +905,7 @@ public int hashCode() {
     hash = (37 * hash) + MEANING_FIELD_NUMBER;
     hash = (53 * hash) + getMeaning();
     hash = (37 * hash) + EXCLUDE_FROM_INDEXES_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getExcludeFromIndexes());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getExcludeFromIndexes());
     switch (valueTypeCase_) {
       case 11:
         hash = (37 * hash) + NULL_VALUE_FIELD_NUMBER;
@@ -856,18 +913,18 @@ public int hashCode() {
         break;
       case 1:
         hash = (37 * hash) + BOOLEAN_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getBooleanValue());
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getBooleanValue());
         break;
       case 2:
         hash = (37 * hash) + INTEGER_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getIntegerValue());
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getIntegerValue());
         break;
       case 3:
         hash = (37 * hash) + DOUBLE_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            java.lang.Double.doubleToLongBits(getDoubleValue()));
+        hash =
+            (53 * hash)
+                + com.google.protobuf.Internal.hashLong(
+                    java.lang.Double.doubleToLongBits(getDoubleValue()));
         break;
       case 10:
         hash = (37 * hash) + TIMESTAMP_VALUE_FIELD_NUMBER;
@@ -905,97 +962,103 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Value parseFrom(
-      java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Value parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Value parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.datastore.v1.Value parseFrom(
-      com.google.protobuf.ByteString data)
+
+  public static com.google.datastore.v1.Value parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Value parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Value parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
+
   public static com.google.datastore.v1.Value parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Value parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Value parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
+
   public static com.google.datastore.v1.Value parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Value parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
   }
-  public static com.google.datastore.v1.Value parseFrom(
-      com.google.protobuf.CodedInputStream input)
+
+  public static com.google.datastore.v1.Value parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
+
   public static com.google.datastore.v1.Value parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
+
   public static Builder newBuilder(com.google.datastore.v1.Value prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
+   *
+   *
    * 
    * A message that can hold any of the supported value types and associated
    * metadata.
@@ -1003,19 +1066,20 @@ protected Builder newBuilderForType(
    *
    * Protobuf type {@code google.datastore.v1.Value}
    */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Value)
       com.google.datastore.v1.ValueOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Value_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Value_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Value.class, com.google.datastore.v1.Value.Builder.class);
     }
@@ -1025,16 +1089,15 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
+
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
+
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -1048,9 +1111,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto
+          .internal_static_google_datastore_v1_Value_descriptor;
     }
 
     @java.lang.Override
@@ -1134,38 +1197,39 @@ public com.google.datastore.v1.Value buildPartial() {
     public Builder clone() {
       return (Builder) super.clone();
     }
+
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
+
     @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
+
     @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
+
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
+
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Value) {
-        return mergeFrom((com.google.datastore.v1.Value)other);
+        return mergeFrom((com.google.datastore.v1.Value) other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1181,55 +1245,67 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) {
         setExcludeFromIndexes(other.getExcludeFromIndexes());
       }
       switch (other.getValueTypeCase()) {
-        case NULL_VALUE: {
-          setNullValueValue(other.getNullValueValue());
-          break;
-        }
-        case BOOLEAN_VALUE: {
-          setBooleanValue(other.getBooleanValue());
-          break;
-        }
-        case INTEGER_VALUE: {
-          setIntegerValue(other.getIntegerValue());
-          break;
-        }
-        case DOUBLE_VALUE: {
-          setDoubleValue(other.getDoubleValue());
-          break;
-        }
-        case TIMESTAMP_VALUE: {
-          mergeTimestampValue(other.getTimestampValue());
-          break;
-        }
-        case KEY_VALUE: {
-          mergeKeyValue(other.getKeyValue());
-          break;
-        }
-        case STRING_VALUE: {
-          valueTypeCase_ = 17;
-          valueType_ = other.valueType_;
-          onChanged();
-          break;
-        }
-        case BLOB_VALUE: {
-          setBlobValue(other.getBlobValue());
-          break;
-        }
-        case GEO_POINT_VALUE: {
-          mergeGeoPointValue(other.getGeoPointValue());
-          break;
-        }
-        case ENTITY_VALUE: {
-          mergeEntityValue(other.getEntityValue());
-          break;
-        }
-        case ARRAY_VALUE: {
-          mergeArrayValue(other.getArrayValue());
-          break;
-        }
-        case VALUETYPE_NOT_SET: {
-          break;
-        }
+        case NULL_VALUE:
+          {
+            setNullValueValue(other.getNullValueValue());
+            break;
+          }
+        case BOOLEAN_VALUE:
+          {
+            setBooleanValue(other.getBooleanValue());
+            break;
+          }
+        case INTEGER_VALUE:
+          {
+            setIntegerValue(other.getIntegerValue());
+            break;
+          }
+        case DOUBLE_VALUE:
+          {
+            setDoubleValue(other.getDoubleValue());
+            break;
+          }
+        case TIMESTAMP_VALUE:
+          {
+            mergeTimestampValue(other.getTimestampValue());
+            break;
+          }
+        case KEY_VALUE:
+          {
+            mergeKeyValue(other.getKeyValue());
+            break;
+          }
+        case STRING_VALUE:
+          {
+            valueTypeCase_ = 17;
+            valueType_ = other.valueType_;
+            onChanged();
+            break;
+          }
+        case BLOB_VALUE:
+          {
+            setBlobValue(other.getBlobValue());
+            break;
+          }
+        case GEO_POINT_VALUE:
+          {
+            mergeGeoPointValue(other.getGeoPointValue());
+            break;
+          }
+        case ENTITY_VALUE:
+          {
+            mergeEntityValue(other.getEntityValue());
+            break;
+          }
+        case ARRAY_VALUE:
+          {
+            mergeArrayValue(other.getArrayValue());
+            break;
+          }
+        case VALUETYPE_NOT_SET:
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -1259,12 +1335,12 @@ public Builder mergeFrom(
       }
       return this;
     }
+
     private int valueTypeCase_ = 0;
     private java.lang.Object valueType_;
-    public ValueTypeCase
-        getValueTypeCase() {
-      return ValueTypeCase.forNumber(
-          valueTypeCase_);
+
+    public ValueTypeCase getValueTypeCase() {
+      return ValueTypeCase.forNumber(valueTypeCase_);
     }
 
     public Builder clearValueType() {
@@ -1274,8 +1350,9 @@ public Builder clearValueType() {
       return this;
     }
 
-
     /**
+     *
+     *
      * 
      * A null value.
      * 

@@ -1289,6 +1366,8 @@ public int getNullValueValue() {
       return 0;
     }
     /**
+     *
+     *
      * 
      * A null value.
      * 

@@ -1302,6 +1381,8 @@ public Builder setNullValueValue(int value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A null value.
      * 

@@ -1311,13 +1392,15 @@ public Builder setNullValueValue(int value) {
     public com.google.protobuf.NullValue getNullValue() {
       if (valueTypeCase_ == 11) {
         @SuppressWarnings("deprecation")
-        com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
-            (java.lang.Integer) valueType_);
+        com.google.protobuf.NullValue result =
+            com.google.protobuf.NullValue.valueOf((java.lang.Integer) valueType_);
         return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
       }
       return com.google.protobuf.NullValue.NULL_VALUE;
     }
     /**
+     *
+     *
      * 
      * A null value.
      * 

@@ -1334,6 +1417,8 @@ public Builder setNullValue(com.google.protobuf.NullValue value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A null value.
      * 

@@ -1350,6 +1435,8 @@ public Builder clearNullValue() {
     }
 
     /**
+     *
+     *
      * 
      * A boolean value.
      * 

@@ -1363,6 +1450,8 @@ public boolean getBooleanValue() {
       return false;
     }
     /**
+     *
+     *
      * 
      * A boolean value.
      * 

@@ -1376,6 +1465,8 @@ public Builder setBooleanValue(boolean value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A boolean value.
      * 

@@ -1392,6 +1483,8 @@ public Builder clearBooleanValue() {
     }
 
     /**
+     *
+     *
      * 
      * An integer value.
      * 

@@ -1405,6 +1498,8 @@ public long getIntegerValue() {
       return 0L;
     }
     /**
+     *
+     *
      * 
      * An integer value.
      * 

@@ -1418,6 +1513,8 @@ public Builder setIntegerValue(long value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * An integer value.
      * 

@@ -1434,6 +1531,8 @@ public Builder clearIntegerValue() {
     }
 
     /**
+     *
+     *
      * 
      * A double value.
      * 

@@ -1447,6 +1546,8 @@ public double getDoubleValue() {
       return 0D;
     }
     /**
+     *
+     *
      * 
      * A double value.
      * 

@@ -1460,6 +1561,8 @@ public Builder setDoubleValue(double value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A double value.
      * 

@@ -1476,8 +1579,13 @@ public Builder clearDoubleValue() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> timestampValueBuilder_;
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        timestampValueBuilder_;
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1490,6 +1598,8 @@ public boolean hasTimestampValue() {
       return valueTypeCase_ == 10;
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1512,6 +1622,8 @@ public com.google.protobuf.Timestamp getTimestampValue() {
       }
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1534,6 +1646,8 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1542,8 +1656,7 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp value) {
      *
      * .google.protobuf.Timestamp timestamp_value = 10;
      */
-    public Builder setTimestampValue(
-        com.google.protobuf.Timestamp.Builder builderForValue) {
+    public Builder setTimestampValue(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (timestampValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -1554,6 +1667,8 @@ public Builder setTimestampValue(
       return this;
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1564,10 +1679,12 @@ public Builder setTimestampValue(
      */
     public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) {
       if (timestampValueBuilder_ == null) {
-        if (valueTypeCase_ == 10 &&
-            valueType_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          valueType_ = com.google.protobuf.Timestamp.newBuilder((com.google.protobuf.Timestamp) valueType_)
-              .mergeFrom(value).buildPartial();
+        if (valueTypeCase_ == 10
+            && valueType_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          valueType_ =
+              com.google.protobuf.Timestamp.newBuilder((com.google.protobuf.Timestamp) valueType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           valueType_ = value;
         }
@@ -1582,6 +1699,8 @@ public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1607,6 +1726,8 @@ public Builder clearTimestampValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1619,6 +1740,8 @@ public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() {
       return getTimestampValueFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1638,6 +1761,8 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1647,27 +1772,36 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
      * .google.protobuf.Timestamp timestamp_value = 10;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
         getTimestampValueFieldBuilder() {
       if (timestampValueBuilder_ == null) {
         if (!(valueTypeCase_ == 10)) {
           valueType_ = com.google.protobuf.Timestamp.getDefaultInstance();
         }
-        timestampValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
-                (com.google.protobuf.Timestamp) valueType_,
-                getParentForChildren(),
-                isClean());
+        timestampValueBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                (com.google.protobuf.Timestamp) valueType_, getParentForChildren(), isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 10;
-      onChanged();;
+      onChanged();
+      ;
       return timestampValueBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyValueBuilder_;
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
+        keyValueBuilder_;
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1678,6 +1812,8 @@ public boolean hasKeyValue() {
       return valueTypeCase_ == 5;
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1698,6 +1834,8 @@ public com.google.datastore.v1.Key getKeyValue() {
       }
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1718,14 +1856,15 @@ public Builder setKeyValue(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

      *
      * .google.datastore.v1.Key key_value = 5;
      */
-    public Builder setKeyValue(
-        com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeyValue(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -1736,6 +1875,8 @@ public Builder setKeyValue(
       return this;
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1744,10 +1885,11 @@ public Builder setKeyValue(
      */
     public Builder mergeKeyValue(com.google.datastore.v1.Key value) {
       if (keyValueBuilder_ == null) {
-        if (valueTypeCase_ == 5 &&
-            valueType_ != com.google.datastore.v1.Key.getDefaultInstance()) {
-          valueType_ = com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) valueType_)
-              .mergeFrom(value).buildPartial();
+        if (valueTypeCase_ == 5 && valueType_ != com.google.datastore.v1.Key.getDefaultInstance()) {
+          valueType_ =
+              com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) valueType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           valueType_ = value;
         }
@@ -1762,6 +1904,8 @@ public Builder mergeKeyValue(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1785,6 +1929,8 @@ public Builder clearKeyValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1795,6 +1941,8 @@ public com.google.datastore.v1.Key.Builder getKeyValueBuilder() {
       return getKeyValueFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1812,6 +1960,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * A key value.
      * 

@@ -1819,25 +1969,31 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      * .google.datastore.v1.Key key_value = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
+            com.google.datastore.v1.Key,
+            com.google.datastore.v1.Key.Builder,
+            com.google.datastore.v1.KeyOrBuilder>
         getKeyValueFieldBuilder() {
       if (keyValueBuilder_ == null) {
         if (!(valueTypeCase_ == 5)) {
           valueType_ = com.google.datastore.v1.Key.getDefaultInstance();
         }
-        keyValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
-                (com.google.datastore.v1.Key) valueType_,
-                getParentForChildren(),
-                isClean());
+        keyValueBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Key,
+                com.google.datastore.v1.Key.Builder,
+                com.google.datastore.v1.KeyOrBuilder>(
+                (com.google.datastore.v1.Key) valueType_, getParentForChildren(), isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 5;
-      onChanged();;
+      onChanged();
+      ;
       return keyValueBuilder_;
     }
 
     /**
+     *
+     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -1852,8 +2008,7 @@ public java.lang.String getStringValue() {
         ref = valueType_;
       }
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (valueTypeCase_ == 17) {
           valueType_ = s;
@@ -1864,6 +2019,8 @@ public java.lang.String getStringValue() {
       }
     }
     /**
+     *
+     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -1872,16 +2029,14 @@ public java.lang.String getStringValue() {
      *
      * string string_value = 17;
      */
-    public com.google.protobuf.ByteString
-        getStringValueBytes() {
+    public com.google.protobuf.ByteString getStringValueBytes() {
       java.lang.Object ref = "";
       if (valueTypeCase_ == 17) {
         ref = valueType_;
       }
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         if (valueTypeCase_ == 17) {
           valueType_ = b;
         }
@@ -1891,6 +2046,8 @@ public java.lang.String getStringValue() {
       }
     }
     /**
+     *
+     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -1899,17 +2056,18 @@ public java.lang.String getStringValue() {
      *
      * string string_value = 17;
      */
-    public Builder setStringValue(
-        java.lang.String value) {
+    public Builder setStringValue(java.lang.String value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  valueTypeCase_ = 17;
+        throw new NullPointerException();
+      }
+      valueTypeCase_ = 17;
       valueType_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -1927,6 +2085,8 @@ public Builder clearStringValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -1935,12 +2095,11 @@ public Builder clearStringValue() {
      *
      * string string_value = 17;
      */
-    public Builder setStringValueBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
       valueTypeCase_ = 17;
       valueType_ = value;
       onChanged();
@@ -1948,6 +2107,8 @@ public Builder setStringValueBytes(
     }
 
     /**
+     *
+     *
      * 
      * A blob value.
      * May have at most 1,000,000 bytes.
@@ -1964,6 +2125,8 @@ public com.google.protobuf.ByteString getBlobValue() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
+     *
+     *
      * 
      * A blob value.
      * May have at most 1,000,000 bytes.
@@ -1975,14 +2138,16 @@ public com.google.protobuf.ByteString getBlobValue() {
      */
     public Builder setBlobValue(com.google.protobuf.ByteString value) {
       if (value == null) {
-    throw new NullPointerException();
-  }
-  valueTypeCase_ = 18;
+        throw new NullPointerException();
+      }
+      valueTypeCase_ = 18;
       valueType_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * A blob value.
      * May have at most 1,000,000 bytes.
@@ -2002,8 +2167,11 @@ public Builder clearBlobValue() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> geoPointValueBuilder_;
+            com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>
+        geoPointValueBuilder_;
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2014,6 +2182,8 @@ public boolean hasGeoPointValue() {
       return valueTypeCase_ == 8;
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2034,6 +2204,8 @@ public com.google.type.LatLng getGeoPointValue() {
       }
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2054,14 +2226,15 @@ public Builder setGeoPointValue(com.google.type.LatLng value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

      *
      * .google.type.LatLng geo_point_value = 8;
      */
-    public Builder setGeoPointValue(
-        com.google.type.LatLng.Builder builderForValue) {
+    public Builder setGeoPointValue(com.google.type.LatLng.Builder builderForValue) {
       if (geoPointValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -2072,6 +2245,8 @@ public Builder setGeoPointValue(
       return this;
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2080,10 +2255,11 @@ public Builder setGeoPointValue(
      */
     public Builder mergeGeoPointValue(com.google.type.LatLng value) {
       if (geoPointValueBuilder_ == null) {
-        if (valueTypeCase_ == 8 &&
-            valueType_ != com.google.type.LatLng.getDefaultInstance()) {
-          valueType_ = com.google.type.LatLng.newBuilder((com.google.type.LatLng) valueType_)
-              .mergeFrom(value).buildPartial();
+        if (valueTypeCase_ == 8 && valueType_ != com.google.type.LatLng.getDefaultInstance()) {
+          valueType_ =
+              com.google.type.LatLng.newBuilder((com.google.type.LatLng) valueType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           valueType_ = value;
         }
@@ -2098,6 +2274,8 @@ public Builder mergeGeoPointValue(com.google.type.LatLng value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2121,6 +2299,8 @@ public Builder clearGeoPointValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2131,6 +2311,8 @@ public com.google.type.LatLng.Builder getGeoPointValueBuilder() {
       return getGeoPointValueFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2148,6 +2330,8 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2155,27 +2339,34 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
      * .google.type.LatLng geo_point_value = 8;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> 
+            com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>
         getGeoPointValueFieldBuilder() {
       if (geoPointValueBuilder_ == null) {
         if (!(valueTypeCase_ == 8)) {
           valueType_ = com.google.type.LatLng.getDefaultInstance();
         }
-        geoPointValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>(
-                (com.google.type.LatLng) valueType_,
-                getParentForChildren(),
-                isClean());
+        geoPointValueBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.type.LatLng,
+                com.google.type.LatLng.Builder,
+                com.google.type.LatLngOrBuilder>(
+                (com.google.type.LatLng) valueType_, getParentForChildren(), isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 8;
-      onChanged();;
+      onChanged();
+      ;
       return geoPointValueBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityValueBuilder_;
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
+        entityValueBuilder_;
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2189,6 +2380,8 @@ public boolean hasEntityValue() {
       return valueTypeCase_ == 6;
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2212,6 +2405,8 @@ public com.google.datastore.v1.Entity getEntityValue() {
       }
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2235,6 +2430,8 @@ public Builder setEntityValue(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2244,8 +2441,7 @@ public Builder setEntityValue(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity entity_value = 6;
      */
-    public Builder setEntityValue(
-        com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setEntityValue(com.google.datastore.v1.Entity.Builder builderForValue) {
       if (entityValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -2256,6 +2452,8 @@ public Builder setEntityValue(
       return this;
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2267,10 +2465,12 @@ public Builder setEntityValue(
      */
     public Builder mergeEntityValue(com.google.datastore.v1.Entity value) {
       if (entityValueBuilder_ == null) {
-        if (valueTypeCase_ == 6 &&
-            valueType_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          valueType_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) valueType_)
-              .mergeFrom(value).buildPartial();
+        if (valueTypeCase_ == 6
+            && valueType_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          valueType_ =
+              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) valueType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           valueType_ = value;
         }
@@ -2285,6 +2485,8 @@ public Builder mergeEntityValue(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2311,6 +2513,8 @@ public Builder clearEntityValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2324,6 +2528,8 @@ public com.google.datastore.v1.Entity.Builder getEntityValueBuilder() {
       return getEntityValueFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2344,6 +2550,8 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * An entity value.
      * - May have no key.
@@ -2354,27 +2562,36 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
      * .google.datastore.v1.Entity entity_value = 6;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
+            com.google.datastore.v1.Entity,
+            com.google.datastore.v1.Entity.Builder,
+            com.google.datastore.v1.EntityOrBuilder>
         getEntityValueFieldBuilder() {
       if (entityValueBuilder_ == null) {
         if (!(valueTypeCase_ == 6)) {
           valueType_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        entityValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) valueType_,
-                getParentForChildren(),
-                isClean());
+        entityValueBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Entity,
+                com.google.datastore.v1.Entity.Builder,
+                com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) valueType_, getParentForChildren(), isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 6;
-      onChanged();;
+      onChanged();
+      ;
       return entityValueBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> arrayValueBuilder_;
+            com.google.datastore.v1.ArrayValue,
+            com.google.datastore.v1.ArrayValue.Builder,
+            com.google.datastore.v1.ArrayValueOrBuilder>
+        arrayValueBuilder_;
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2388,6 +2605,8 @@ public boolean hasArrayValue() {
       return valueTypeCase_ == 9;
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2411,6 +2630,8 @@ public com.google.datastore.v1.ArrayValue getArrayValue() {
       }
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2434,6 +2655,8 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2443,8 +2666,7 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue value) {
      *
      * .google.datastore.v1.ArrayValue array_value = 9;
      */
-    public Builder setArrayValue(
-        com.google.datastore.v1.ArrayValue.Builder builderForValue) {
+    public Builder setArrayValue(com.google.datastore.v1.ArrayValue.Builder builderForValue) {
       if (arrayValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -2455,6 +2677,8 @@ public Builder setArrayValue(
       return this;
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2466,10 +2690,13 @@ public Builder setArrayValue(
      */
     public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) {
       if (arrayValueBuilder_ == null) {
-        if (valueTypeCase_ == 9 &&
-            valueType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) {
-          valueType_ = com.google.datastore.v1.ArrayValue.newBuilder((com.google.datastore.v1.ArrayValue) valueType_)
-              .mergeFrom(value).buildPartial();
+        if (valueTypeCase_ == 9
+            && valueType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) {
+          valueType_ =
+              com.google.datastore.v1.ArrayValue.newBuilder(
+                      (com.google.datastore.v1.ArrayValue) valueType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           valueType_ = value;
         }
@@ -2484,6 +2711,8 @@ public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) {
       return this;
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2510,6 +2739,8 @@ public Builder clearArrayValue() {
       return this;
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2523,6 +2754,8 @@ public com.google.datastore.v1.ArrayValue.Builder getArrayValueBuilder() {
       return getArrayValueFieldBuilder().getBuilder();
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2543,6 +2776,8 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
       }
     }
     /**
+     *
+     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2553,26 +2788,32 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
      * .google.datastore.v1.ArrayValue array_value = 9;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> 
+            com.google.datastore.v1.ArrayValue,
+            com.google.datastore.v1.ArrayValue.Builder,
+            com.google.datastore.v1.ArrayValueOrBuilder>
         getArrayValueFieldBuilder() {
       if (arrayValueBuilder_ == null) {
         if (!(valueTypeCase_ == 9)) {
           valueType_ = com.google.datastore.v1.ArrayValue.getDefaultInstance();
         }
-        arrayValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder>(
-                (com.google.datastore.v1.ArrayValue) valueType_,
-                getParentForChildren(),
-                isClean());
+        arrayValueBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ArrayValue,
+                com.google.datastore.v1.ArrayValue.Builder,
+                com.google.datastore.v1.ArrayValueOrBuilder>(
+                (com.google.datastore.v1.ArrayValue) valueType_, getParentForChildren(), isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 9;
-      onChanged();;
+      onChanged();
+      ;
       return arrayValueBuilder_;
     }
 
-    private int meaning_ ;
+    private int meaning_;
     /**
+     *
+     *
      * 
      * The `meaning` field should only be populated for backwards compatibility.
      * 

@@ -2583,6 +2824,8 @@ public int getMeaning() {
       return meaning_;
     }
     /**
+     *
+     *
      * 
      * The `meaning` field should only be populated for backwards compatibility.
      * 

@@ -2590,12 +2833,14 @@ public int getMeaning() {
      * int32 meaning = 14;
      */
     public Builder setMeaning(int value) {
-      
+
       meaning_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * The `meaning` field should only be populated for backwards compatibility.
      * 

@@ -2603,14 +2848,16 @@ public Builder setMeaning(int value) {
      * int32 meaning = 14;
      */
     public Builder clearMeaning() {
-      
+
       meaning_ = 0;
       onChanged();
       return this;
     }
 
-    private boolean excludeFromIndexes_ ;
+    private boolean excludeFromIndexes_;
     /**
+     *
+     *
      * 
      * If the value should be excluded from all indexes including those defined
      * explicitly.
@@ -2622,6 +2869,8 @@ public boolean getExcludeFromIndexes() {
       return excludeFromIndexes_;
     }
     /**
+     *
+     *
      * 
      * If the value should be excluded from all indexes including those defined
      * explicitly.
@@ -2630,12 +2879,14 @@ public boolean getExcludeFromIndexes() {
      * bool exclude_from_indexes = 19;
      */
     public Builder setExcludeFromIndexes(boolean value) {
-      
+
       excludeFromIndexes_ = value;
       onChanged();
       return this;
     }
     /**
+     *
+     *
      * 
      * If the value should be excluded from all indexes including those defined
      * explicitly.
@@ -2644,14 +2895,14 @@ public Builder setExcludeFromIndexes(boolean value) {
      * bool exclude_from_indexes = 19;
      */
     public Builder clearExcludeFromIndexes() {
-      
+
       excludeFromIndexes_ = false;
       onChanged();
       return this;
     }
+
     @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
@@ -2661,12 +2912,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
-
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Value)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Value)
   private static final com.google.datastore.v1.Value DEFAULT_INSTANCE;
+
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Value();
   }
@@ -2675,16 +2926,16 @@ public static com.google.datastore.v1.Value getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
-    public Value parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
-    }
-  };
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Value parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Value(input, extensionRegistry);
+        }
+      };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -2699,6 +2950,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Value getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-
 }
-
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 6915eae21f52..d65ab5382436 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
@@ -3,11 +3,14 @@
 
 package com.google.datastore.v1;
 
-public interface ValueOrBuilder extends
+public interface ValueOrBuilder
+    extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Value)
     com.google.protobuf.MessageOrBuilder {
 
   /**
+   *
+   *
    * 
    * A null value.
    * 

@@ -16,6 +19,8 @@ public interface ValueOrBuilder extends
    */
   int getNullValueValue();
   /**
+   *
+   *
    * 
    * A null value.
    * 

@@ -25,6 +30,8 @@ public interface ValueOrBuilder extends
   com.google.protobuf.NullValue getNullValue();
 
   /**
+   *
+   *
    * 
    * A boolean value.
    * 

@@ -34,6 +41,8 @@ public interface ValueOrBuilder extends
   boolean getBooleanValue();
 
   /**
+   *
+   *
    * 
    * An integer value.
    * 

@@ -43,6 +52,8 @@ public interface ValueOrBuilder extends
   long getIntegerValue();
 
   /**
+   *
+   *
    * 
    * A double value.
    * 

@@ -52,6 +63,8 @@ public interface ValueOrBuilder extends
   double getDoubleValue();
 
   /**
+   *
+   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -62,6 +75,8 @@ public interface ValueOrBuilder extends
    */
   boolean hasTimestampValue();
   /**
+   *
+   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -72,6 +87,8 @@ public interface ValueOrBuilder extends
    */
   com.google.protobuf.Timestamp getTimestampValue();
   /**
+   *
+   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -83,6 +100,8 @@ public interface ValueOrBuilder extends
   com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder();
 
   /**
+   *
+   *
    * 
    * A key value.
    * 

@@ -91,6 +110,8 @@ public interface ValueOrBuilder extends
    */
   boolean hasKeyValue();
   /**
+   *
+   *
    * 
    * A key value.
    * 

@@ -99,6 +120,8 @@ public interface ValueOrBuilder extends
    */
   com.google.datastore.v1.Key getKeyValue();
   /**
+   *
+   *
    * 
    * A key value.
    * 

@@ -108,6 +131,8 @@ public interface ValueOrBuilder extends
   com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder();
 
   /**
+   *
+   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -118,6 +143,8 @@ public interface ValueOrBuilder extends
    */
   java.lang.String getStringValue();
   /**
+   *
+   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -126,10 +153,11 @@ public interface ValueOrBuilder extends
    *
    * string string_value = 17;
    */
-  com.google.protobuf.ByteString
-      getStringValueBytes();
+  com.google.protobuf.ByteString getStringValueBytes();
 
   /**
+   *
+   *
    * 
    * A blob value.
    * May have at most 1,000,000 bytes.
@@ -142,6 +170,8 @@ public interface ValueOrBuilder extends
   com.google.protobuf.ByteString getBlobValue();
 
   /**
+   *
+   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -150,6 +180,8 @@ public interface ValueOrBuilder extends
    */
   boolean hasGeoPointValue();
   /**
+   *
+   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -158,6 +190,8 @@ public interface ValueOrBuilder extends
    */
   com.google.type.LatLng getGeoPointValue();
   /**
+   *
+   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -167,6 +201,8 @@ public interface ValueOrBuilder extends
   com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder();
 
   /**
+   *
+   *
    * 
    * An entity value.
    * - May have no key.
@@ -178,6 +214,8 @@ public interface ValueOrBuilder extends
    */
   boolean hasEntityValue();
   /**
+   *
+   *
    * 
    * An entity value.
    * - May have no key.
@@ -189,6 +227,8 @@ public interface ValueOrBuilder extends
    */
   com.google.datastore.v1.Entity getEntityValue();
   /**
+   *
+   *
    * 
    * An entity value.
    * - May have no key.
@@ -201,6 +241,8 @@ public interface ValueOrBuilder extends
   com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder();
 
   /**
+   *
+   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -212,6 +254,8 @@ public interface ValueOrBuilder extends
    */
   boolean hasArrayValue();
   /**
+   *
+   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -223,6 +267,8 @@ public interface ValueOrBuilder extends
    */
   com.google.datastore.v1.ArrayValue getArrayValue();
   /**
+   *
+   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -235,6 +281,8 @@ public interface ValueOrBuilder extends
   com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder();
 
   /**
+   *
+   *
    * 
    * The `meaning` field should only be populated for backwards compatibility.
    * 

@@ -244,6 +292,8 @@ public interface ValueOrBuilder extends
   int getMeaning();
 
   /**
+   *
+   *
    * 
    * If the value should be excluded from all indexes including those defined
    * explicitly.

From f5a2fd53ed11d7b1879fa63ae75092f8e3e5bdfa Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Tue, 4 Dec 2018 14:58:41 -0800
Subject: [PATCH 0137/1784] Remove exclusions for guava-jdk5 and
 google-api-client (#4177)

We've updated the apiary clients to versions that no longer need these
exclusions.
---
 google-cloud-datastore/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 290e024b13c3..c48264e58b1a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -33,12 +33,6 @@
     
       com.google.cloud.datastore
       datastore-v1-proto-client
-      
-        
-          com.google.guava
-          guava-jdk5
-        
-      
     
     
       io.grpc

From 5d178c0fa2446ae8dd9b7537ec7e1085b72616fd Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 5 Dec 2018 14:09:06 -0800
Subject: [PATCH 0138/1784] Document purpose of test-jar and testlib
 dependencies (#4164)

---
 google-cloud-datastore/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c48264e58b1a..9f0ea6662064 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -38,6 +38,8 @@
       io.grpc
       grpc-core
     
+
+    
     
       ${project.groupId}
       google-cloud-core

From fe53a833bca31f3b018b1ccd05ff9c2b1f1eb242 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 6 Dec 2018 16:31:48 -0800
Subject: [PATCH 0139/1784] Release google-cloud-java v0.73.0 (#4191)

* Release v0.73.0

* Fix version replacements

* Move Spanner to GA section

* Fix doclint option

* Fix pom issues for Bigtable emulator
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 1d85f2d8f25e..7ccc230e1b5f 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.54.0
+  1.55.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.54.0'
+compile 'com.google.cloud:google-cloud-datastore:1.55.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.54.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.55.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9f0ea6662064..26167a6cfa01 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.54.1-SNAPSHOT
+  1.55.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.72.1-alpha-SNAPSHOT
+    0.73.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1507f6c6b542..3a1e4661268e 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.37.1-SNAPSHOT
+  0.38.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.37.1-SNAPSHOT
+    0.38.0
   
   
     

From 24f88d5b2c488f0d72484fb0ea129e03ffa40fe2 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 6 Dec 2018 16:38:05 -0800
Subject: [PATCH 0140/1784] Bump next snapshot (#4192)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 26167a6cfa01..98f61bcb62d7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.55.0
+  1.55.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.73.0-alpha
+    0.73.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3a1e4661268e..377803cb357d 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.38.0
+  0.38.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.38.0
+    0.38.1-SNAPSHOT
   
   
     

From e05e70db7f6e33f5dbc6ce9436f82cc489b2ebe3 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 13 Dec 2018 15:10:31 -0800
Subject: [PATCH 0141/1784] Release v0.74.0 (#4222)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 7ccc230e1b5f..d9a7e545fcb4 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.55.0
+  1.56.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.55.0'
+compile 'com.google.cloud:google-cloud-datastore:1.56.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.55.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.56.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 98f61bcb62d7..0827c99b6a28 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.55.1-SNAPSHOT
+  1.56.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.73.1-alpha-SNAPSHOT
+    0.74.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 377803cb357d..9759f956fecc 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.38.1-SNAPSHOT
+  0.39.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.38.1-SNAPSHOT
+    0.39.0
   
   
     

From f5b5062fef69ad44194c34e0107b9d5846206729 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 13 Dec 2018 16:26:54 -0800
Subject: [PATCH 0142/1784] Bump next snapshot (#4224)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0827c99b6a28..b7eb888a8b36 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.56.0
+  1.56.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.74.0-alpha
+    0.74.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9759f956fecc..9e1ad468556f 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.39.0
+  0.39.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.39.0
+    0.39.1-SNAPSHOT
   
   
     

From af7b2425bc3450d455c844b75e9507c0310d2aed Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 3 Jan 2019 17:15:46 -0500
Subject: [PATCH 0143/1784] Release v0.75.0 (#4282)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index d9a7e545fcb4..fb5504b1dbef 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.56.0
+  1.57.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.56.0'
+compile 'com.google.cloud:google-cloud-datastore:1.57.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.56.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.57.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b7eb888a8b36..cee85037634b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.56.1-SNAPSHOT
+  1.57.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.74.1-alpha-SNAPSHOT
+    0.75.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9e1ad468556f..1f860083b668 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.39.1-SNAPSHOT
+  0.40.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.39.1-SNAPSHOT
+    0.40.0
   
   
     

From 737910d0336a8272ed67a692b0530666fa174623 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 3 Jan 2019 17:46:17 -0500
Subject: [PATCH 0144/1784] Bump next snapshot (#4286)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cee85037634b..f468a418f87d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.57.0
+  1.57.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.75.0-alpha
+    0.75.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1f860083b668..7a806a79377a 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.40.0
+  0.40.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.40.0
+    0.40.1-SNAPSHOT
   
   
     

From 3e3ed699300fa9087e4d80d4a4cbebc88e9c3970 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Mon, 7 Jan 2019 16:22:41 -0800
Subject: [PATCH 0145/1784] Release v0.76.0 (#4298)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index fb5504b1dbef..e8c9a1aede29 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.57.0
+  1.58.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.57.0'
+compile 'com.google.cloud:google-cloud-datastore:1.58.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.57.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.58.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f468a418f87d..01658e6e3e87 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.57.1-SNAPSHOT
+  1.58.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.75.1-alpha-SNAPSHOT
+    0.76.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7a806a79377a..2f33d58eeee6 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.40.1-SNAPSHOT
+  0.41.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.40.1-SNAPSHOT
+    0.41.0
   
   
     

From 275693e6cdba5dac2a6bbd2ecec0665bb28b745a Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Tue, 8 Jan 2019 08:50:39 -0800
Subject: [PATCH 0146/1784] Bump next snapshot (#4300)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 01658e6e3e87..c7ba606a01a9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.58.0
+  1.58.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.76.0-alpha
+    0.76.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2f33d58eeee6..acd95c27df47 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.41.0
+  0.41.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.41.0
+    0.41.1-SNAPSHOT
   
   
     

From 132c2483dfcde927cd69fb1088680a0103a0b16c Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 10 Jan 2019 16:03:52 -0500
Subject: [PATCH 0147/1784] Release v0.77.0 (#4324)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index e8c9a1aede29..3edf9caa2ff3 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.58.0
+  1.59.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.58.0'
+compile 'com.google.cloud:google-cloud-datastore:1.59.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.58.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.59.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c7ba606a01a9..6626fbc39625 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.58.1-SNAPSHOT
+  1.59.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.76.1-alpha-SNAPSHOT
+    0.77.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index acd95c27df47..0912dc0bd99b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.41.1-SNAPSHOT
+  0.42.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.41.1-SNAPSHOT
+    0.42.0
   
   
     

From 5cbee2cafd62fc20059d80a2fe4c9ca00f787677 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 10 Jan 2019 20:31:39 -0500
Subject: [PATCH 0148/1784] Bump next snapshot (#4325)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6626fbc39625..d22ad4397db7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.59.0
+  1.59.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.77.0-alpha
+    0.77.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0912dc0bd99b..8e1c339e3e97 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.42.0
+  0.42.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.42.0
+    0.42.1-SNAPSHOT
   
   
     

From 2eb9a502f6542501464324fd81b218f353835761 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Thu, 17 Jan 2019 13:26:07 -0800
Subject: [PATCH 0149/1784] Release google-cloud-java v0.78.0 (#4386)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 3edf9caa2ff3..c1f1bd3a9c87 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.59.0
+  1.60.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.59.0'
+compile 'com.google.cloud:google-cloud-datastore:1.60.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.59.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.60.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d22ad4397db7..17d854b3ea57 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.59.1-SNAPSHOT
+  1.60.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.77.1-alpha-SNAPSHOT
+    0.78.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8e1c339e3e97..03902d34ce03 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.42.1-SNAPSHOT
+  0.43.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.42.1-SNAPSHOT
+    0.43.0
   
   
     

From 9740017a5185fb7e0f23834cd9f00b9e962ae198 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Fri, 18 Jan 2019 10:02:52 -0800
Subject: [PATCH 0150/1784] Bump next snapshot (#4391)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 17d854b3ea57..4c7a5edd2fef 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.60.0
+  1.60.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.78.0-alpha
+    0.78.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 03902d34ce03..0e32f62cc4f6 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.43.0
+  0.43.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.43.0
+    0.43.1-SNAPSHOT
   
   
     

From bf094a444588414683aac2e2034862617559dfae Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 23 Jan 2019 15:28:46 -0500
Subject: [PATCH 0151/1784] Release v0.79.0 (#4402)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index c1f1bd3a9c87..d2cf2e86cbbf 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.60.0
+  1.61.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.60.0'
+compile 'com.google.cloud:google-cloud-datastore:1.61.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.60.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.61.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4c7a5edd2fef..07ba373f0c98 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.60.1-SNAPSHOT
+  1.61.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.78.1-alpha-SNAPSHOT
+    0.79.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0e32f62cc4f6..308d1849bfeb 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.43.1-SNAPSHOT
+  0.44.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.43.1-SNAPSHOT
+    0.44.0
   
   
     

From 74c08d881950fb4767beca7df0b976510994fe2a Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 24 Jan 2019 13:40:36 -0500
Subject: [PATCH 0152/1784] Bump next snapshot (#4405)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 07ba373f0c98..414601407664 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.61.0
+  1.61.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.79.0-alpha
+    0.79.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 308d1849bfeb..6b9fdf9bf7ad 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.44.0
+  0.44.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.44.0
+    0.44.1-SNAPSHOT
   
   
     

From 193c992ce3af5b0c9f41ebfdf532e8b3ef9fc9e3 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 4 Feb 2019 12:12:03 -0500
Subject: [PATCH 0153/1784] Fix code formatting (#4437)

---
 .../src/main/java/com/google/datastore/v1/Key.java           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 ab50a91bfb98..d66a8d787863 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
@@ -110,8 +110,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_Key_fieldAccessorTable.ensureFieldAccessorsInitialized(
-        com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class);
+        .internal_static_google_datastore_v1_Key_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class);
   }
 
   public interface PathElementOrBuilder

From ba20337d4fa58ec2126a741bfd0fde164266a8a1 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Mon, 4 Feb 2019 13:26:05 -0500
Subject: [PATCH 0154/1784] Add `ReadOnly` `TransactionOptions` to Datastore
 snippet (#1321)

---
 .../java/com/google/datastore/snippets/ConceptsTest.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 0ae608bdc6f7..abb1ba5e860e 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -36,7 +36,6 @@
 import com.google.cloud.datastore.PathElement;
 import com.google.cloud.datastore.ProjectionEntity;
 import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.Query.ResultType;
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.ReadOption;
 import com.google.cloud.datastore.StringValue;
@@ -50,6 +49,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterators;
+import com.google.datastore.v1.TransactionOptions;
+import com.google.datastore.v1.TransactionOptions.ReadOnly;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -826,7 +827,11 @@ public void testTransactionalSingleEntityGroupReadOnly() {
     // [START datastore_transactional_single_entity_group_read_only]
     Entity taskList;
     QueryResults tasks;
-    Transaction txn = datastore.newTransaction();
+    Transaction txn = datastore.newTransaction(
+        TransactionOptions.newBuilder()
+            .setReadOnly(ReadOnly.newBuilder().build())
+            .build()
+    );
     try {
       taskList = txn.get(taskListKey);
       Query query = Query.newEntityQueryBuilder()

From 1b0f338e77a7229b8fc5b1bddb90412f7a8a4127 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 7 Feb 2019 15:05:30 -0500
Subject: [PATCH 0155/1784] Release v0.80.0 (#4465)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index d2cf2e86cbbf..973c5ca111c2 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.61.0
+  1.62.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.61.0'
+compile 'com.google.cloud:google-cloud-datastore:1.62.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.61.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.62.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 414601407664..e24873f02c37 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.61.1-SNAPSHOT
+  1.62.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.79.1-alpha-SNAPSHOT
+    0.80.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6b9fdf9bf7ad..7761687693c9 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.44.1-SNAPSHOT
+  0.45.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.44.1-SNAPSHOT
+    0.45.0
   
   
     

From ece36025cc41de77375ad2b3a43878a6aaeb5be4 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 7 Feb 2019 18:53:34 -0500
Subject: [PATCH 0156/1784] Bump next snapshot (#4467)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e24873f02c37..3355d230b44c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.62.0
+  1.62.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.80.0-alpha
+    0.80.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7761687693c9..03671f64b1e5 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.45.0
+  0.45.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.45.0
+    0.45.1-SNAPSHOT
   
   
     

From b5dcd39ad2401f34261aa1dfca4aedde6904d8f4 Mon Sep 17 00:00:00 2001
From: Praful Makani 
Date: Thu, 21 Feb 2019 21:09:57 +0530
Subject: [PATCH 0157/1784] Datastore: Fix `more_results` value to query
 results (#4516)

* add moreResults

* added getter

* updated code

* modified code and added test case
---
 .../google/cloud/datastore/QueryResults.java  |  4 ++++
 .../cloud/datastore/QueryResultsImpl.java     |  9 ++++++++-
 .../google/cloud/datastore/DatastoreTest.java | 20 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
index 27c6f19aebf4..3f73824dcdbc 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.datastore.v1.QueryResultBatch;
 import java.util.Iterator;
 
 /**
@@ -66,4 +67,7 @@ public interface QueryResults extends Iterator {
    * }

    */
   int getSkippedResults();
+
+  /** Returns MoreResults state of the query after the current batch. */
+  QueryResultBatch.MoreResultsType getMoreResults();
 }
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 c6179686707e..3c8bba10a089 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
@@ -37,6 +37,7 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
   private boolean lastBatch;
   private Iterator entityResultPbIter;
   private ByteString cursor;
+  private MoreResultsType moreResults;
 
   QueryResultsImpl(
       DatastoreImpl datastore, com.google.datastore.v1.ReadOptions readOptionsPb, Query query) {
@@ -74,7 +75,8 @@ private void sendRequest() {
     if (mostRecentQueryPb == null) {
       mostRecentQueryPb = requestPb.getQuery();
     }
-    lastBatch = runQueryResponsePb.getBatch().getMoreResults() != MoreResultsType.NOT_FINISHED;
+    moreResults = runQueryResponsePb.getBatch().getMoreResults();
+    lastBatch = moreResults != MoreResultsType.NOT_FINISHED;
     entityResultPbIter = runQueryResponsePb.getBatch().getEntityResultsList().iterator();
     actualResultType = ResultType.fromPb(runQueryResponsePb.getBatch().getEntityResultType());
     if (Objects.equals(queryResultType, ResultType.PROJECTION_ENTITY)) {
@@ -117,4 +119,9 @@ public Cursor getCursorAfter() {
   public int getSkippedResults() {
     return runQueryResponsePb.getBatch().getSkippedResults();
   }
+
+  @Override
+  public MoreResultsType getMoreResults() {
+    return moreResults;
+  }
 }
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 25d9c9d88c40..2183a4983efd 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
@@ -585,6 +585,26 @@ public void testStructuredQueryPagination() throws DatastoreException {
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
+  @Test
+  public void testStructuredQueryPaginationWithMoreResults() throws DatastoreException {
+    List responses = buildResponsesForQueryPagination();
+    for (int i = 0; i < responses.size(); i++) {
+      EasyMock.expect(rpcMock.runQuery(EasyMock.anyObject(RunQueryRequest.class)))
+          .andReturn(responses.get(i));
+    }
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    Datastore datastore = rpcMockOptions.getService();
+    QueryResults results = datastore.run(Query.newKeyQueryBuilder().build());
+    int count = 0;
+    while (results.hasNext()) {
+      count += 1;
+      results.next();
+    }
+    assertEquals(count, 5);
+    assertEquals(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS, results.getMoreResults());
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
   private List buildResponsesForQueryPagination() {
     Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build();
     Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build();

From 9de757956240d13475e3298d55d9f809cfb61cc1 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Thu, 21 Feb 2019 13:49:42 -0800
Subject: [PATCH 0158/1784] Release google-cloud-java v0.81.0 (#4536)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 973c5ca111c2..dc8611097043 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.62.0
+  1.63.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.62.0'
+compile 'com.google.cloud:google-cloud-datastore:1.63.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.62.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.63.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3355d230b44c..29490d5501db 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.62.1-SNAPSHOT
+  1.63.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.80.1-alpha-SNAPSHOT
+    0.81.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 03671f64b1e5..5d087f84c1c1 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.45.1-SNAPSHOT
+  0.46.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.45.1-SNAPSHOT
+    0.46.0
   
   
     

From caae7ca9bd6e449b29f3a55fc68fc4ef20792649 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Fri, 22 Feb 2019 11:43:45 -0800
Subject: [PATCH 0159/1784] bump next snapshot (#4547)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 29490d5501db..5dc20f300ffb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.63.0
+  1.63.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.81.0-alpha
+    0.81.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 5d087f84c1c1..1e4d8630d6f3 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.46.0
+  0.46.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.46.0
+    0.46.1-SNAPSHOT
   
   
     

From 46b9938ee66da168ac3df7221254f6f2ed151f70 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot
 <44816363+yoshi-automation@users.noreply.github.com>
Date: Tue, 26 Feb 2019 08:14:35 -0800
Subject: [PATCH 0160/1784] Regenerate datastore client (#4566)

---
 google-cloud-datastore/synth.metadata         | 35 +++++++------
 .../datastore/v1/AllocateIdsRequest.java      |  6 ++-
 .../datastore/v1/AllocateIdsResponse.java     |  6 ++-
 .../datastore/v1/BeginTransactionRequest.java |  6 ++-
 .../v1/BeginTransactionResponse.java          |  6 ++-
 .../google/datastore/v1/CommitRequest.java    |  6 ++-
 .../com/google/datastore/v1/EntityResult.java | 40 +++++++--------
 .../datastore/v1/EntityResultOrBuilder.java   | 10 ++--
 .../com/google/datastore/v1/GqlQuery.java     |  6 ++-
 .../com/google/datastore/v1/PartitionId.java  |  6 ++-
 .../java/com/google/datastore/v1/Query.java   | 24 ++++++---
 .../google/datastore/v1/QueryOrBuilder.java   |  6 ++-
 .../datastore/v1/ReserveIdsRequest.java       |  6 ++-
 .../datastore/v1/ReserveIdsResponse.java      |  6 ++-
 .../google/datastore/v1/RollbackResponse.java | 10 ++--
 .../google/datastore/v1/RunQueryResponse.java |  6 ++-
 .../datastore/v1/TransactionOptions.java      | 12 +++--
 .../java/com/google/datastore/v1/Value.java   | 28 +++++-----
 .../google/datastore/v1/ValueOrBuilder.java   |  8 +--
 .../proto/google/datastore/v1/datastore.proto | 51 ++++++++++---------
 .../proto/google/datastore/v1/entity.proto    |  8 +--
 .../proto/google/datastore/v1/query.proto     | 20 ++++----
 22 files changed, 180 insertions(+), 132 deletions(-)

diff --git a/google-cloud-datastore/synth.metadata b/google-cloud-datastore/synth.metadata
index 2bd4f07a69a5..a13b8f3a5a89 100644
--- a/google-cloud-datastore/synth.metadata
+++ b/google-cloud-datastore/synth.metadata
@@ -1,27 +1,32 @@
 {
+  "updateTime": "2019-02-26T08:39:53.042326Z",
   "sources": [
     {
-      "git": {
-        "name": "googleapis",
-        "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "5a57f0c13a358b2b15452bf2d67453774a5f6d4f",
-        "internalRef": "221837528"
+      "generator": {
+        "name": "artman",
+        "version": "0.16.14",
+        "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7"
       }
     },
     {
       "git": {
-        "name": "googleapis-private",
-        "remote": "https://github.com/googleapis/googleapis-private.git",
-        "sha": "6aa8e1a447bb8d0367150356a28cb4d3f2332641",
-        "internalRef": "221340946"
+        "name": "googleapis",
+        "remote": "https://github.com/googleapis/googleapis.git",
+        "sha": "29f098cb03a9983cc9cb15993de5da64419046f2",
+        "internalRef": "235621085"
       }
-    },
+    }
+  ],
+  "destinations": [
     {
-      "generator": {
-        "name": "artman",
-        "version": "0.16.0",
-        "dockerImage": "googleapis/artman@sha256:90f9d15e9bad675aeecd586725bce48f5667ffe7d5fc4d1e96d51ff34304815b"
+      "client": {
+        "source": "googleapis",
+        "apiName": "datastore",
+        "apiVersion": "v1",
+        "language": "java",
+        "generator": "gapic",
+        "config": "google/datastore/artman_datastore.yaml"
       }
     }
   ]
-}
+}
\ No newline at end of file
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 5abb4af2c7e1..6ba0b49a3da2 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ * The request for
+ * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
@@ -391,7 +392,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   * The request for
+   * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
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 4bfbc3b37286..933c3ac6c127 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ * The response for
+ * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
@@ -330,7 +331,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   * The response for
+   * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
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 ea01da83ccf0..d596b451c744 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ * The request for
+ * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
@@ -369,7 +370,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * The request for
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
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 f475d0bf4d31..02d816a3a1f4 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ * The response for
+ * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
@@ -268,7 +269,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * The response for
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
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 18edeafa4942..6dddb62a0048 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
@@ -144,7 +144,8 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * Transactional: The mutations are either all applied, or none are applied.
-     * Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions).
+     * Learn about transactions
+     * [here](https://cloud.google.com/datastore/docs/concepts/transactions).
      * 

      *
      * TRANSACTIONAL = 1;
@@ -178,7 +179,8 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * Transactional: The mutations are either all applied, or none are applied.
-     * Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions).
+     * Learn about transactions
+     * [here](https://cloud.google.com/datastore/docs/concepts/transactions).
      * 

      *
      * TRANSACTIONAL = 1;
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 c74e1d24c8a9..de1e2b9658ea 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
@@ -328,11 +328,11 @@ 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.
+   * 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.
    * 

    *
    * int64 version = 4;
@@ -895,11 +895,11 @@ 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.
+     * 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.
      * 

      *
      * int64 version = 4;
@@ -913,11 +913,11 @@ 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.
+     * 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.
      * 

      *
      * int64 version = 4;
@@ -934,11 +934,11 @@ 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.
+     * 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.
      * 

      *
      * int64 version = 4;
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 c6d14a06c123..accfd1d51118 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
@@ -45,11 +45,11 @@ 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.
+   * 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.
    * 

    *
    * int64 version = 4;
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 cf63ef014d1c..22d4a2239b34 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+ * A [GQL
+ * query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
  * 

  *
  * Protobuf type {@code google.datastore.v1.GqlQuery}
@@ -603,7 +604,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+   * A [GQL
+   * query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
    * 

    *
    * Protobuf type {@code google.datastore.v1.GqlQuery}
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 9ce64553ebe3..0c24f36cd56d 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
@@ -21,7 +21,8 @@
  * 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 an active state.
+ * Reads and writes of foreign partition IDs may fail if the project is not in
+ * an active state.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PartitionId}
@@ -384,7 +385,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 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 an active state.
+   * Reads and writes of foreign partition IDs may fail if the project is not in
+   * an active state.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PartitionId}
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 ecd8c13d5973..356909095014 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
@@ -508,7 +508,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
    * 
    * A starting point for the query results. Query cursors are
    * returned in query result batches and
-   * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   * [can only be used to continue the same
+   * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
    * 

    *
    * bytes start_cursor = 7;
@@ -525,7 +526,8 @@ public com.google.protobuf.ByteString getStartCursor() {
    * 
    * An ending point for the query results. Query cursors are
    * returned in query result batches and
-   * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   * [can only be used to limit the same
+   * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
    * 

    *
    * bytes end_cursor = 8;
@@ -2861,7 +2863,8 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
-     * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     * [can only be used to continue the same
+     * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
      * 

      *
      * bytes start_cursor = 7;
@@ -2875,7 +2878,8 @@ public com.google.protobuf.ByteString getStartCursor() {
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
-     * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     * [can only be used to continue the same
+     * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
      * 

      *
      * bytes start_cursor = 7;
@@ -2895,7 +2899,8 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) {
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
-     * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     * [can only be used to continue the same
+     * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
      * 

      *
      * bytes start_cursor = 7;
@@ -2914,7 +2919,8 @@ public Builder clearStartCursor() {
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
-     * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     * [can only be used to limit the same
+     * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
      * 

      *
      * bytes end_cursor = 8;
@@ -2928,7 +2934,8 @@ public com.google.protobuf.ByteString getEndCursor() {
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
-     * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     * [can only be used to limit the same
+     * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
      * 

      *
      * bytes end_cursor = 8;
@@ -2948,7 +2955,8 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
-     * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+     * [can only be used to limit the same
+     * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
      * 

      *
      * bytes end_cursor = 8;
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 95192344a70a..383f534837c7 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
@@ -266,7 +266,8 @@ public interface QueryOrBuilder
    * 
    * A starting point for the query results. Query cursors are
    * returned in query result batches and
-   * [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   * [can only be used to continue the same
+   * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
    * 

    *
    * bytes start_cursor = 7;
@@ -279,7 +280,8 @@ public interface QueryOrBuilder
    * 
    * An ending point for the query results. Query cursors are
    * returned in query result batches and
-   * [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+   * [can only be used to limit the same
+   * query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
    * 

    *
    * bytes end_cursor = 8;
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 323b55e8fdf0..a0a3a4ab6499 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ * The request for
+ * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
@@ -451,7 +452,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   * The request for
+   * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
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 20cf629e517c..1cde2d6e7b87 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ * The response for
+ * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
@@ -236,7 +237,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   * The response for
+   * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
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 61ff9b088371..8f1884d4765c 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
@@ -7,8 +7,9 @@
  *
  *
  * 
- * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
- * (an empty message).
+ * The response for
+ * [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
+ * message).
  * 

  *
  * Protobuf type {@code google.datastore.v1.RollbackResponse}
@@ -236,8 +237,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
-   * (an empty message).
+   * The response for
+   * [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
+   * message).
    * 

    *
    * Protobuf type {@code google.datastore.v1.RollbackResponse}
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 4cc3706d3f0b..72b3c109bbe1 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
@@ -7,7 +7,8 @@
  *
  *
  * 
- * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+ * The response for
+ * [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RunQueryResponse}
@@ -372,7 +373,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+   * The response for
+   * [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RunQueryResponse}
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 486309161268..cf9b3f1b02f5 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
@@ -9,8 +9,10 @@
  * 
  * 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
- * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+ * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
+ * or implicitly by setting
+ * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+ * in read requests.
  * 

  *
  * Protobuf type {@code google.datastore.v1.TransactionOptions}
@@ -1428,8 +1430,10 @@ 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
-   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
+   * or implicitly by setting
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * in read requests.
    * 

    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions}
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 c75eddabe6fd..d6a96292bc73 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
@@ -459,8 +459,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -486,8 +486,8 @@ public java.lang.String getStringValue() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -1996,8 +1996,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2023,8 +2023,8 @@ public java.lang.String getStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2050,8 +2050,8 @@ public com.google.protobuf.ByteString getStringValueBytes() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2070,8 +2070,8 @@ public Builder setStringValue(java.lang.String value) {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2089,8 +2089,8 @@ public Builder clearStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
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 d65ab5382436..bb8fa78e8205 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
@@ -135,8 +135,8 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -147,8 +147,8 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
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 2a29a58cec72..51d69acb9db8 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
@@ -27,7 +27,6 @@ option java_outer_classname = "DatastoreProto";
 option java_package = "com.google.datastore.v1";
 option php_namespace = "Google\\Cloud\\Datastore\\V1";
 
-
 // Each RPC normalizes the partition IDs of the keys in its input entities,
 // and always returns entities with keys with normalized partition IDs.
 // This applies to all keys and entities, including those in values, except keys
@@ -53,7 +52,8 @@ service Datastore {
   }
 
   // Begins a new transaction.
-  rpc BeginTransaction(BeginTransactionRequest) returns (BeginTransactionResponse) {
+  rpc BeginTransaction(BeginTransactionRequest)
+      returns (BeginTransactionResponse) {
     option (google.api.http) = {
       post: "/v1/projects/{project_id}:beginTransaction"
       body: "*"
@@ -150,7 +150,8 @@ message RunQueryRequest {
   }
 }
 
-// The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+// The response for
+// [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
 message RunQueryResponse {
   // A batch of query results (always present).
   QueryResultBatch batch = 1;
@@ -159,7 +160,8 @@ message RunQueryResponse {
   Query query = 2;
 }
 
-// The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+// The request for
+// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 message BeginTransactionRequest {
   // The ID of the project against which to make the request.
   string project_id = 8;
@@ -168,7 +170,8 @@ message BeginTransactionRequest {
   TransactionOptions transaction_options = 10;
 }
 
-// The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+// The response for
+// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 message BeginTransactionResponse {
   // The transaction identifier (always present).
   bytes transaction = 1;
@@ -184,11 +187,10 @@ message RollbackRequest {
   bytes transaction = 1;
 }
 
-// The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
-// (an empty message).
-message RollbackResponse {
-
-}
+// The response for
+// [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
+// message).
+message RollbackResponse {}
 
 // The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
 message CommitRequest {
@@ -198,7 +200,8 @@ message CommitRequest {
     MODE_UNSPECIFIED = 0;
 
     // Transactional: The mutations are either all applied, or none are applied.
-    // Learn about transactions [here](https://cloud.google.com/datastore/docs/concepts/transactions).
+    // Learn about transactions
+    // [here](https://cloud.google.com/datastore/docs/concepts/transactions).
     TRANSACTIONAL = 1;
 
     // Non-transactional: The mutations may not apply as all or none.
@@ -246,7 +249,8 @@ message CommitResponse {
   int32 index_updates = 4;
 }
 
-// The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+// The request for
+// [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
 message AllocateIdsRequest {
   // The ID of the project against which to make the request.
   string project_id = 8;
@@ -256,14 +260,16 @@ message AllocateIdsRequest {
   repeated Key keys = 1;
 }
 
-// The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+// The response for
+// [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
 message AllocateIdsResponse {
   // The keys specified in the request (in the same order), each with
   // its key path completed with a newly allocated ID.
   repeated Key keys = 1;
 }
 
-// The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+// The request for
+// [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
 message ReserveIdsRequest {
   // The ID of the project against which to make the request.
   string project_id = 8;
@@ -276,10 +282,9 @@ message ReserveIdsRequest {
   repeated Key keys = 1;
 }
 
-// The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
-message ReserveIdsResponse {
-
-}
+// The response for
+// [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+message ReserveIdsResponse {}
 
 // A mutation to apply to an entity.
 message Mutation {
@@ -369,8 +374,10 @@ message ReadOptions {
 // 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
-// [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
+// or implicitly by setting
+// [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+// in read requests.
 message TransactionOptions {
   // Options specific to read / write transactions.
   message ReadWrite {
@@ -379,9 +386,7 @@ message TransactionOptions {
   }
 
   // Options specific to read-only transactions.
-  message ReadOnly {
-
-  }
+  message ReadOnly {}
 
   // The `mode` of the transaction, indicating whether write operations are
   // supported.
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 bab7953d62e2..9decd2b53802 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
@@ -28,7 +28,6 @@ option java_outer_classname = "EntityProto";
 option java_package = "com.google.datastore.v1";
 option php_namespace = "Google\\Cloud\\Datastore\\V1";
 
-
 // A partition ID identifies a grouping of entities. The grouping is always
 // by project and namespace, however the namespace ID may be empty.
 //
@@ -47,7 +46,8 @@ option php_namespace = "Google\\Cloud\\Datastore\\V1";
 //
 // 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 an active state.
+// Reads and writes of foreign partition IDs may fail if the project is not in
+// an active state.
 message PartitionId {
   // The ID of the project to which the entities belong.
   string project_id = 2;
@@ -145,8 +145,8 @@ message Value {
     Key key_value = 5;
 
     // A UTF-8 encoded string value.
-    // When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-    // Otherwise, may be set to at least 1,000,000 bytes.
+    // When `exclude_from_indexes` is false (it is indexed) , may have at most
+    // 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
     string string_value = 17;
 
     // A blob value.
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 2efed915a74e..872612c5dd24 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
@@ -28,7 +28,6 @@ option java_outer_classname = "QueryProto";
 option java_package = "com.google.datastore.v1";
 option php_namespace = "Google\\Cloud\\Datastore\\V1";
 
-
 // The result of fetching an entity from Datastore.
 message EntityResult {
   // Specifies what data the 'entity' field contains.
@@ -56,12 +55,12 @@ message EntityResult {
   // 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.
+  // 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.
+  // 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.
   int64 version = 4;
 
   // A cursor that points to the position after the result entity.
@@ -91,12 +90,14 @@ message Query {
 
   // A starting point for the query results. Query cursors are
   // returned in query result batches and
-  // [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+  // [can only be used to continue the same
+  // query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
   bytes start_cursor = 7;
 
   // An ending point for the query results. Query cursors are
   // returned in query result batches and
-  // [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
+  // [can only be used to limit the same
+  // query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
   bytes end_cursor = 8;
 
   // The number of results to skip. Applies before limit, but after all other
@@ -217,7 +218,8 @@ message PropertyFilter {
   Value value = 3;
 }
 
-// A [GQL query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
+// A [GQL
+// query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
 message GqlQuery {
   // A string of the format described
   // [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).

From 7e8e72c1a5cfe2ca7155a0853299a4e7f418e8fe Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 4 Mar 2019 12:45:50 -0700
Subject: [PATCH 0161/1784] Release google-cloud-java v0.82.0 (#4621)

* Release v0.82.0

* Change KMS versions to 1.0.0.
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index dc8611097043..4cd7ebab12f2 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.63.0
+  1.64.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.63.0'
+compile 'com.google.cloud:google-cloud-datastore:1.64.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.63.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.64.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5dc20f300ffb..8e97d1cf4e68 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.63.1-SNAPSHOT
+  1.64.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.81.1-alpha-SNAPSHOT
+    0.82.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1e4d8630d6f3..cce2c1437134 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.46.1-SNAPSHOT
+  0.47.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.46.1-SNAPSHOT
+    0.47.0
   
   
     

From b40aa629dd6290044020f6594bab0d0b46e56887 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 4 Mar 2019 15:54:54 -0700
Subject: [PATCH 0162/1784] Bump next snapshot (#4623)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8e97d1cf4e68..457e2270266f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.64.0
+  1.64.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.82.0-alpha
+    0.82.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cce2c1437134..6365d442a0ba 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.47.0
+  0.47.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.47.0
+    0.47.1-SNAPSHOT
   
   
     

From d04e52d4bf8cd7195c9d3d288491e5f82f2c47de Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Mon, 11 Mar 2019 12:15:31 -0700
Subject: [PATCH 0163/1784] Release google-cloud-java v0.83.0 (#4665)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 4cd7ebab12f2..6b4768878faf 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.64.0
+  1.65.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.64.0'
+compile 'com.google.cloud:google-cloud-datastore:1.65.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.64.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.65.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 457e2270266f..b24d20caf3a9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.64.1-SNAPSHOT
+  1.65.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.82.1-alpha-SNAPSHOT
+    0.83.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6365d442a0ba..8e241c5b882d 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.47.1-SNAPSHOT
+  0.48.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.47.1-SNAPSHOT
+    0.48.0
   
   
     

From da514caac7a6c3202d034167abf46543a3ad92b4 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Tue, 12 Mar 2019 07:09:18 -0700
Subject: [PATCH 0164/1784] Bump next snapshot (#4666)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b24d20caf3a9..01784c766afc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.65.0
+  1.65.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.83.0-alpha
+    0.83.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8e241c5b882d..3fc45d306546 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.48.0
+  0.48.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.48.0
+    0.48.1-SNAPSHOT
   
   
     

From 13dc9b632c91cb0ad28b70511553ba8aa62fe65b Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 21 Mar 2019 12:59:23 -0400
Subject: [PATCH 0165/1784] Release v0.84.0 (#4713)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 6b4768878faf..acdb60178399 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.65.0
+  1.66.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.65.0'
+compile 'com.google.cloud:google-cloud-datastore:1.66.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.65.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.66.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 01784c766afc..6302770437a3 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.65.1-SNAPSHOT
+  1.66.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.83.1-alpha-SNAPSHOT
+    0.84.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3fc45d306546..2fd1d573c10d 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.48.1-SNAPSHOT
+  0.49.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.48.1-SNAPSHOT
+    0.49.0
   
   
     

From f87d0c461c9aaf10e9473359d655f4eca8beb30b Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 21 Mar 2019 22:00:42 -0400
Subject: [PATCH 0166/1784] Bump next snapshot (#4715)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6302770437a3..e90a7d96ffa9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.66.0
+  1.66.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.84.0-alpha
+    0.84.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2fd1d573c10d..6534e382f85f 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.49.0
+  0.49.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.49.0
+    0.49.1-SNAPSHOT
   
   
     

From 603e2efdce31ac7b41155fb657281c048e40454c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot
 <44816363+yoshi-automation@users.noreply.github.com>
Date: Fri, 29 Mar 2019 01:03:50 -0700
Subject: [PATCH 0167/1784] Regenerate datastore client (#4794)

---
 google-cloud-datastore/synth.metadata         |  10 +-
 .../datastore/v1/AllocateIdsRequest.java      |  38 +++----
 .../datastore/v1/AllocateIdsResponse.java     |  36 +++----
 .../com/google/datastore/v1/ArrayValue.java   |  36 +++----
 .../datastore/v1/BeginTransactionRequest.java |  29 +++--
 .../v1/BeginTransactionResponse.java          |  23 ++--
 .../google/datastore/v1/CommitRequest.java    |  45 ++++----
 .../google/datastore/v1/CommitResponse.java   |  36 +++----
 .../google/datastore/v1/CompositeFilter.java  |  38 +++----
 .../java/com/google/datastore/v1/Entity.java  |  31 +++---
 .../com/google/datastore/v1/EntityResult.java |  32 +++---
 .../java/com/google/datastore/v1/Filter.java  |  28 +++--
 .../com/google/datastore/v1/GqlQuery.java     |  42 ++++----
 .../datastore/v1/GqlQueryParameter.java       |  28 +++--
 .../java/com/google/datastore/v1/Key.java     |  72 ++++++-------
 .../google/datastore/v1/KindExpression.java   |  23 ++--
 .../google/datastore/v1/LookupRequest.java    |  44 ++++----
 .../google/datastore/v1/LookupResponse.java   |  66 +++++-------
 .../com/google/datastore/v1/Mutation.java     |  40 ++++---
 .../google/datastore/v1/MutationResult.java   |  36 +++----
 .../com/google/datastore/v1/PartitionId.java  |  25 +++--
 .../com/google/datastore/v1/Projection.java   |  27 +++--
 .../google/datastore/v1/PropertyFilter.java   |  35 +++---
 .../google/datastore/v1/PropertyOrder.java    |  29 +++--
 .../datastore/v1/PropertyReference.java       |  23 ++--
 .../java/com/google/datastore/v1/Query.java   | 102 ++++++++----------
 .../google/datastore/v1/QueryResultBatch.java |  47 ++++----
 .../com/google/datastore/v1/ReadOptions.java  |  28 +++--
 .../datastore/v1/ReserveIdsRequest.java       |  40 ++++---
 .../datastore/v1/ReserveIdsResponse.java      |  21 ++--
 .../google/datastore/v1/RollbackRequest.java  |  25 +++--
 .../google/datastore/v1/RollbackResponse.java |  21 ++--
 .../google/datastore/v1/RunQueryRequest.java  |  42 ++++----
 .../google/datastore/v1/RunQueryResponse.java |  33 +++---
 .../datastore/v1/TransactionOptions.java      |  72 ++++++-------
 .../java/com/google/datastore/v1/Value.java   |  59 +++++-----
 36 files changed, 627 insertions(+), 735 deletions(-)

diff --git a/google-cloud-datastore/synth.metadata b/google-cloud-datastore/synth.metadata
index a13b8f3a5a89..3cbb7394ce32 100644
--- a/google-cloud-datastore/synth.metadata
+++ b/google-cloud-datastore/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-02-26T08:39:53.042326Z",
+  "updateTime": "2019-03-29T07:41:19.868162Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.16.14",
-        "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7"
+        "version": "0.16.21",
+        "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "29f098cb03a9983cc9cb15993de5da64419046f2",
-        "internalRef": "235621085"
+        "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45",
+        "internalRef": "240841842"
       }
     }
   ],
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 6ba0b49a3da2..537b64476310 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
@@ -54,7 +54,7 @@ private AllocateIdsRequest(
             break;
           case 10:
             {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 keys_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
@@ -70,7 +70,7 @@ private AllocateIdsRequest(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -82,7 +82,7 @@ private AllocateIdsRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
       }
       this.unknownFields = unknownFields.build();
@@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.AllocateIdsRequest other =
         (com.google.datastore.v1.AllocateIdsRequest) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && getKeysList().equals(other.getKeysList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getKeysList().equals(other.getKeysList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -475,7 +474,7 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
       int to_bitField0_ = 0;
       result.projectId_ = projectId_;
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
           bitField0_ = (bitField0_ & ~0x00000002);
         }
@@ -490,35 +489,35 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -692,7 +691,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000002;
       }
@@ -1043,10 +1042,7 @@ public java.util.List getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
+                keys_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
@@ -1054,7 +1050,7 @@ public java.util.List getKeysBuilderList()
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 933c3ac6c127..d9bda56be312 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
@@ -53,7 +53,7 @@ private AllocateIdsResponse(
             break;
           case 10:
             {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 keys_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
@@ -62,7 +62,7 @@ private AllocateIdsResponse(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -74,7 +74,7 @@ private AllocateIdsResponse(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
       }
       this.unknownFields = unknownFields.build();
@@ -210,10 +210,9 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.AllocateIdsResponse other =
         (com.google.datastore.v1.AllocateIdsResponse) obj;
 
-    boolean result = true;
-    result = result && getKeysList().equals(other.getKeysList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getKeysList().equals(other.getKeysList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -410,7 +409,7 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
           new com.google.datastore.v1.AllocateIdsResponse(this);
       int from_bitField0_ = bitField0_;
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
@@ -424,35 +423,35 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -528,7 +527,7 @@ public Builder mergeFrom(
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000001;
       }
@@ -879,10 +878,7 @@ public java.util.List getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
+                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
@@ -890,7 +886,7 @@ public java.util.List getKeysBuilderList()
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 c340be35f518..f70566489e53 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
@@ -52,7 +52,7 @@ private ArrayValue(
             break;
           case 10:
             {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 values_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
@@ -62,7 +62,7 @@ private ArrayValue(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -74,7 +74,7 @@ private ArrayValue(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         values_ = java.util.Collections.unmodifiableList(values_);
       }
       this.unknownFields = unknownFields.build();
@@ -214,10 +214,9 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.ArrayValue other = (com.google.datastore.v1.ArrayValue) obj;
 
-    boolean result = true;
-    result = result && getValuesList().equals(other.getValuesList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getValuesList().equals(other.getValuesList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -411,7 +410,7 @@ public com.google.datastore.v1.ArrayValue buildPartial() {
       com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this);
       int from_bitField0_ = bitField0_;
       if (valuesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           values_ = java.util.Collections.unmodifiableList(values_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
@@ -425,35 +424,35 @@ public com.google.datastore.v1.ArrayValue buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -530,7 +529,7 @@ public Builder mergeFrom(
         java.util.Collections.emptyList();
 
     private void ensureValuesIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         values_ = new java.util.ArrayList(values_);
         bitField0_ |= 0x00000001;
       }
@@ -901,10 +900,7 @@ public java.util.List getValuesBuilderLis
                 com.google.datastore.v1.Value,
                 com.google.datastore.v1.Value.Builder,
                 com.google.datastore.v1.ValueOrBuilder>(
-                values_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
+                values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         values_ = null;
       }
       return valuesBuilder_;
@@ -912,7 +908,7 @@ public java.util.List getValuesBuilderLis
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 d596b451c744..35427a4396af 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
@@ -76,7 +76,7 @@ private BeginTransactionRequest(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -243,14 +243,13 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.BeginTransactionRequest other =
         (com.google.datastore.v1.BeginTransactionRequest) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && (hasTransactionOptions() == other.hasTransactionOptions());
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (hasTransactionOptions() != other.hasTransactionOptions()) return false;
     if (hasTransactionOptions()) {
-      result = result && getTransactionOptions().equals(other.getTransactionOptions());
+      if (!getTransactionOptions().equals(other.getTransactionOptions())) return false;
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -459,35 +458,35 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -633,7 +632,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.datastore.v1.TransactionOptions transactionOptions_ = null;
+    private com.google.datastore.v1.TransactionOptions transactionOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.TransactionOptions,
             com.google.datastore.v1.TransactionOptions.Builder,
@@ -817,7 +816,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 02d816a3a1f4..f9492f917447 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
@@ -58,7 +58,7 @@ private BeginTransactionResponse(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -150,10 +150,9 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.BeginTransactionResponse other =
         (com.google.datastore.v1.BeginTransactionResponse) obj;
 
-    boolean result = true;
-    result = result && getTransaction().equals(other.getTransaction());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getTransaction().equals(other.getTransaction())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -347,35 +346,35 @@ public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -472,7 +471,7 @@ public Builder clearTransaction() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 6dddb62a0048..dbaa7e77d9e5 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
@@ -67,7 +67,7 @@ private CommitRequest(
             }
           case 50:
             {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 mutations_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
@@ -84,7 +84,7 @@ private CommitRequest(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -96,7 +96,7 @@ private CommitRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
         mutations_ = java.util.Collections.unmodifiableList(mutations_);
       }
       this.unknownFields = unknownFields.build();
@@ -571,21 +571,19 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.CommitRequest other = (com.google.datastore.v1.CommitRequest) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && mode_ == other.mode_;
-    result = result && getMutationsList().equals(other.getMutationsList());
-    result = result && getTransactionSelectorCase().equals(other.getTransactionSelectorCase());
-    if (!result) return false;
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (mode_ != other.mode_) return false;
+    if (!getMutationsList().equals(other.getMutationsList())) return false;
+    if (!getTransactionSelectorCase().equals(other.getTransactionSelectorCase())) return false;
     switch (transactionSelectorCase_) {
       case 1:
-        result = result && getTransaction().equals(other.getTransaction());
+        if (!getTransaction().equals(other.getTransaction())) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -804,7 +802,7 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
         result.transactionSelector_ = transactionSelector_;
       }
       if (mutationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           mutations_ = java.util.Collections.unmodifiableList(mutations_);
           bitField0_ = (bitField0_ & ~0x00000008);
         }
@@ -820,35 +818,35 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -1184,7 +1182,7 @@ public Builder clearTransaction() {
         java.util.Collections.emptyList();
 
     private void ensureMutationsIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         mutations_ = new java.util.ArrayList(mutations_);
         bitField0_ |= 0x00000008;
       }
@@ -1684,10 +1682,7 @@ public java.util.List getMutationsBuil
                 com.google.datastore.v1.Mutation,
                 com.google.datastore.v1.Mutation.Builder,
                 com.google.datastore.v1.MutationOrBuilder>(
-                mutations_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
-                getParentForChildren(),
-                isClean());
+                mutations_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         mutations_ = null;
       }
       return mutationsBuilder_;
@@ -1695,7 +1690,7 @@ public java.util.List getMutationsBuil
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 192e1a8357b6..bf4d10f0e43a 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
@@ -24,7 +24,6 @@ private CommitResponse(com.google.protobuf.GeneratedMessageV3.Builder builder
 
   private CommitResponse() {
     mutationResults_ = java.util.Collections.emptyList();
-    indexUpdates_ = 0;
   }
 
   @java.lang.Override
@@ -53,7 +52,7 @@ private CommitResponse(
             break;
           case 26:
             {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mutationResults_ =
                     new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
@@ -70,7 +69,7 @@ private CommitResponse(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -82,7 +81,7 @@ private CommitResponse(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_);
       }
       this.unknownFields = unknownFields.build();
@@ -241,11 +240,10 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.CommitResponse other = (com.google.datastore.v1.CommitResponse) obj;
 
-    boolean result = true;
-    result = result && getMutationResultsList().equals(other.getMutationResultsList());
-    result = result && (getIndexUpdates() == other.getIndexUpdates());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getMutationResultsList().equals(other.getMutationResultsList())) return false;
+    if (getIndexUpdates() != other.getIndexUpdates()) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -446,7 +444,7 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (mutationResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
@@ -462,35 +460,35 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -570,7 +568,7 @@ public Builder mergeFrom(
         java.util.Collections.emptyList();
 
     private void ensureMutationResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         mutationResults_ =
             new java.util.ArrayList(mutationResults_);
         bitField0_ |= 0x00000001;
@@ -930,7 +928,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
                 com.google.datastore.v1.MutationResult.Builder,
                 com.google.datastore.v1.MutationResultOrBuilder>(
                 mutationResults_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         mutationResults_ = null;
@@ -987,7 +985,7 @@ public Builder clearIndexUpdates() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 54b712d3a9cc..cb5cbb5c486d 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
@@ -60,7 +60,7 @@ private CompositeFilter(
             }
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 filters_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
@@ -70,7 +70,7 @@ private CompositeFilter(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -82,7 +82,7 @@ private CompositeFilter(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
         filters_ = java.util.Collections.unmodifiableList(filters_);
       }
       this.unknownFields = unknownFields.build();
@@ -378,11 +378,10 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.CompositeFilter other = (com.google.datastore.v1.CompositeFilter) obj;
 
-    boolean result = true;
-    result = result && op_ == other.op_;
-    result = result && getFiltersList().equals(other.getFiltersList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (op_ != other.op_) return false;
+    if (!getFiltersList().equals(other.getFiltersList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -584,7 +583,7 @@ public com.google.datastore.v1.CompositeFilter buildPartial() {
       int to_bitField0_ = 0;
       result.op_ = op_;
       if (filtersBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           filters_ = java.util.Collections.unmodifiableList(filters_);
           bitField0_ = (bitField0_ & ~0x00000002);
         }
@@ -599,35 +598,35 @@ public com.google.datastore.v1.CompositeFilter buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -785,7 +784,7 @@ public Builder clearOp() {
         java.util.Collections.emptyList();
 
     private void ensureFiltersIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         filters_ = new java.util.ArrayList(filters_);
         bitField0_ |= 0x00000002;
       }
@@ -1139,10 +1138,7 @@ public java.util.List getFiltersBuilderL
                 com.google.datastore.v1.Filter,
                 com.google.datastore.v1.Filter.Builder,
                 com.google.datastore.v1.FilterOrBuilder>(
-                filters_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
+                filters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         filters_ = null;
       }
       return filtersBuilder_;
@@ -1150,7 +1146,7 @@ public java.util.List getFiltersBuilderL
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index ae2de46a40af..9a7e70368e7b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -67,7 +67,7 @@ private Entity(
             }
           case 26:
             {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 properties_ =
                     com.google.protobuf.MapField.newMapField(
                         PropertiesDefaultEntryHolder.defaultEntry);
@@ -83,7 +83,7 @@ private Entity(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -352,14 +352,13 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Entity other = (com.google.datastore.v1.Entity) obj;
 
-    boolean result = true;
-    result = result && (hasKey() == other.hasKey());
+    if (hasKey() != other.hasKey()) return false;
     if (hasKey()) {
-      result = result && getKey().equals(other.getKey());
+      if (!getKey().equals(other.getKey())) return false;
     }
-    result = result && internalGetProperties().equals(other.internalGetProperties());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!internalGetProperties().equals(other.internalGetProperties())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -592,35 +591,35 @@ public com.google.datastore.v1.Entity buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -670,7 +669,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.datastore.v1.Key key_ = null;
+    private com.google.datastore.v1.Key key_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Key,
             com.google.datastore.v1.Key.Builder,
@@ -1075,7 +1074,7 @@ public Builder putAllProperties(
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 de1e2b9658ea..3f31c2999c48 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
@@ -23,7 +23,6 @@ private EntityResult(com.google.protobuf.GeneratedMessageV3.Builder builder)
   }
 
   private EntityResult() {
-    version_ = 0L;
     cursor_ = com.google.protobuf.ByteString.EMPTY;
   }
 
@@ -78,7 +77,7 @@ private EntityResult(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -413,15 +412,14 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.EntityResult other = (com.google.datastore.v1.EntityResult) obj;
 
-    boolean result = true;
-    result = result && (hasEntity() == other.hasEntity());
+    if (hasEntity() != other.hasEntity()) return false;
     if (hasEntity()) {
-      result = result && getEntity().equals(other.getEntity());
+      if (!getEntity().equals(other.getEntity())) return false;
     }
-    result = result && (getVersion() == other.getVersion());
-    result = result && getCursor().equals(other.getCursor());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (getVersion() != other.getVersion()) return false;
+    if (!getCursor().equals(other.getCursor())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -632,35 +630,35 @@ public com.google.datastore.v1.EntityResult buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -713,7 +711,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private com.google.datastore.v1.Entity entity_ = null;
+    private com.google.datastore.v1.Entity entity_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Entity,
             com.google.datastore.v1.Entity.Builder,
@@ -1002,7 +1000,7 @@ public Builder clearCursor() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 70d65bee4ae1..cab7dd71f4b3 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
@@ -82,7 +82,7 @@ private Filter(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -294,21 +294,19 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Filter other = (com.google.datastore.v1.Filter) obj;
 
-    boolean result = true;
-    result = result && getFilterTypeCase().equals(other.getFilterTypeCase());
-    if (!result) return false;
+    if (!getFilterTypeCase().equals(other.getFilterTypeCase())) return false;
     switch (filterTypeCase_) {
       case 1:
-        result = result && getCompositeFilter().equals(other.getCompositeFilter());
+        if (!getCompositeFilter().equals(other.getCompositeFilter())) return false;
         break;
       case 2:
-        result = result && getPropertyFilter().equals(other.getPropertyFilter());
+        if (!getPropertyFilter().equals(other.getPropertyFilter())) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -522,35 +520,35 @@ public com.google.datastore.v1.Filter buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -1030,7 +1028,7 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 22d4a2239b34..37a884fbe53a 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
@@ -25,7 +25,6 @@ private GqlQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private GqlQuery() {
     queryString_ = "";
-    allowLiterals_ = false;
     positionalBindings_ = java.util.Collections.emptyList();
   }
 
@@ -67,7 +66,7 @@ private GqlQuery(
             }
           case 34:
             {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 positionalBindings_ =
                     new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
@@ -79,7 +78,7 @@ private GqlQuery(
             }
           case 42:
             {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 namedBindings_ =
                     com.google.protobuf.MapField.newMapField(
                         NamedBindingsDefaultEntryHolder.defaultEntry);
@@ -98,7 +97,7 @@ private GqlQuery(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -110,7 +109,7 @@ private GqlQuery(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
         positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
       }
       this.unknownFields = unknownFields.build();
@@ -473,13 +472,12 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.GqlQuery other = (com.google.datastore.v1.GqlQuery) obj;
 
-    boolean result = true;
-    result = result && getQueryString().equals(other.getQueryString());
-    result = result && (getAllowLiterals() == other.getAllowLiterals());
-    result = result && internalGetNamedBindings().equals(other.internalGetNamedBindings());
-    result = result && getPositionalBindingsList().equals(other.getPositionalBindingsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getQueryString().equals(other.getQueryString())) return false;
+    if (getAllowLiterals() != other.getAllowLiterals()) return false;
+    if (!internalGetNamedBindings().equals(other.internalGetNamedBindings())) return false;
+    if (!getPositionalBindingsList().equals(other.getPositionalBindingsList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -712,7 +710,7 @@ public com.google.datastore.v1.GqlQuery buildPartial() {
       result.namedBindings_ = internalGetNamedBindings();
       result.namedBindings_.makeImmutable();
       if (positionalBindingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
           bitField0_ = (bitField0_ & ~0x00000008);
         }
@@ -727,35 +725,35 @@ public com.google.datastore.v1.GqlQuery buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -1179,7 +1177,7 @@ public Builder putAllNamedBindings(
         java.util.Collections.emptyList();
 
     private void ensurePositionalBindingsIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         positionalBindings_ =
             new java.util.ArrayList(positionalBindings_);
         bitField0_ |= 0x00000008;
@@ -1580,7 +1578,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
                 com.google.datastore.v1.GqlQueryParameter.Builder,
                 com.google.datastore.v1.GqlQueryParameterOrBuilder>(
                 positionalBindings_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
+                ((bitField0_ & 0x00000008) != 0),
                 getParentForChildren(),
                 isClean());
         positionalBindings_ = null;
@@ -1590,7 +1588,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 96c20a5d110c..7710d8bce569 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
@@ -71,7 +71,7 @@ private GqlQueryParameter(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -260,21 +260,19 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.GqlQueryParameter other =
         (com.google.datastore.v1.GqlQueryParameter) obj;
 
-    boolean result = true;
-    result = result && getParameterTypeCase().equals(other.getParameterTypeCase());
-    if (!result) return false;
+    if (!getParameterTypeCase().equals(other.getParameterTypeCase())) return false;
     switch (parameterTypeCase_) {
       case 2:
-        result = result && getValue().equals(other.getValue());
+        if (!getValue().equals(other.getValue())) return false;
         break;
       case 3:
-        result = result && getCursor().equals(other.getCursor());
+        if (!getCursor().equals(other.getCursor())) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -487,35 +485,35 @@ public com.google.datastore.v1.GqlQueryParameter buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -844,7 +842,7 @@ public Builder clearCursor() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 d66a8d787863..1584e7406b8d 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
@@ -71,7 +71,7 @@ private Key(
             }
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 path_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
@@ -82,7 +82,7 @@ private Key(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -94,7 +94,7 @@ private Key(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
         path_ = java.util.Collections.unmodifiableList(path_);
       }
       this.unknownFields = unknownFields.build();
@@ -260,7 +260,7 @@ private PathElement(
               }
             default:
               {
-                if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -516,22 +516,20 @@ public boolean equals(final java.lang.Object obj) {
       }
       com.google.datastore.v1.Key.PathElement other = (com.google.datastore.v1.Key.PathElement) obj;
 
-      boolean result = true;
-      result = result && getKind().equals(other.getKind());
-      result = result && getIdTypeCase().equals(other.getIdTypeCase());
-      if (!result) return false;
+      if (!getKind().equals(other.getKind())) return false;
+      if (!getIdTypeCase().equals(other.getIdTypeCase())) return false;
       switch (idTypeCase_) {
         case 2:
-          result = result && (getId() == other.getId());
+          if (getId() != other.getId()) return false;
           break;
         case 3:
-          result = result && getName().equals(other.getName());
+          if (!getName().equals(other.getName())) return false;
           break;
         case 0:
         default:
       }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
     }
 
     @java.lang.Override
@@ -749,23 +747,23 @@ public com.google.datastore.v1.Key.PathElement buildPartial() {
 
       @java.lang.Override
       public Builder clone() {
-        return (Builder) super.clone();
+        return super.clone();
       }
 
       @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return (Builder) super.setField(field, value);
+        return super.setField(field, value);
       }
 
       @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
+        return super.clearField(field);
       }
 
       @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
+        return super.clearOneof(oneof);
       }
 
       @java.lang.Override
@@ -773,13 +771,13 @@ public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
+        return super.setRepeatedField(field, index, value);
       }
 
       @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
+        return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
@@ -1145,7 +1143,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
+        return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
@@ -1421,14 +1419,13 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Key other = (com.google.datastore.v1.Key) obj;
 
-    boolean result = true;
-    result = result && (hasPartitionId() == other.hasPartitionId());
+    if (hasPartitionId() != other.hasPartitionId()) return false;
     if (hasPartitionId()) {
-      result = result && getPartitionId().equals(other.getPartitionId());
+      if (!getPartitionId().equals(other.getPartitionId())) return false;
     }
-    result = result && getPathList().equals(other.getPathList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getPathList().equals(other.getPathList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -1638,7 +1635,7 @@ public com.google.datastore.v1.Key buildPartial() {
         result.partitionId_ = partitionIdBuilder_.build();
       }
       if (pathBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           path_ = java.util.Collections.unmodifiableList(path_);
           bitField0_ = (bitField0_ & ~0x00000002);
         }
@@ -1653,35 +1650,35 @@ public com.google.datastore.v1.Key buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -1757,7 +1754,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.datastore.v1.PartitionId partitionId_ = null;
+    private com.google.datastore.v1.PartitionId partitionId_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PartitionId,
             com.google.datastore.v1.PartitionId.Builder,
@@ -1960,7 +1957,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensurePathIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         path_ = new java.util.ArrayList(path_);
         bitField0_ |= 0x00000002;
       }
@@ -2532,10 +2529,7 @@ public java.util.List getPathBu
                 com.google.datastore.v1.Key.PathElement,
                 com.google.datastore.v1.Key.PathElement.Builder,
                 com.google.datastore.v1.Key.PathElementOrBuilder>(
-                path_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
+                path_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         path_ = null;
       }
       return pathBuilder_;
@@ -2543,7 +2537,7 @@ public java.util.List getPathBu
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 3193475cfd47..24859abde128 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
@@ -59,7 +59,7 @@ private KindExpression(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -178,10 +178,9 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.KindExpression other = (com.google.datastore.v1.KindExpression) obj;
 
-    boolean result = true;
-    result = result && getName().equals(other.getName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getName().equals(other.getName())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -374,35 +373,35 @@ public com.google.datastore.v1.KindExpression buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -546,7 +545,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 1ad0004e1d4e..a69b954098fc 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
@@ -69,7 +69,7 @@ private LookupRequest(
             }
           case 26:
             {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 keys_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
@@ -85,7 +85,7 @@ private LookupRequest(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -97,7 +97,7 @@ private LookupRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
       }
       this.unknownFields = unknownFields.build();
@@ -324,15 +324,14 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.LookupRequest other = (com.google.datastore.v1.LookupRequest) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && (hasReadOptions() == other.hasReadOptions());
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (hasReadOptions() != other.hasReadOptions()) return false;
     if (hasReadOptions()) {
-      result = result && getReadOptions().equals(other.getReadOptions());
+      if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
-    result = result && getKeysList().equals(other.getKeysList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getKeysList().equals(other.getKeysList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -548,7 +547,7 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
         result.readOptions_ = readOptionsBuilder_.build();
       }
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
           bitField0_ = (bitField0_ & ~0x00000004);
         }
@@ -563,35 +562,35 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -765,7 +764,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.datastore.v1.ReadOptions readOptions_ = null;
+    private com.google.datastore.v1.ReadOptions readOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.ReadOptions,
             com.google.datastore.v1.ReadOptions.Builder,
@@ -949,7 +948,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000004;
       }
@@ -1282,10 +1281,7 @@ public java.util.List getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
+                keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
@@ -1293,7 +1289,7 @@ public java.util.List getKeysBuilderList()
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 585dd5b47739..56e920334ed7 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
@@ -54,7 +54,7 @@ private LookupResponse(
             break;
           case 10:
             {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 found_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
@@ -65,7 +65,7 @@ private LookupResponse(
             }
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 missing_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
@@ -76,7 +76,7 @@ private LookupResponse(
             }
           case 26:
             {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 deferred_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
@@ -86,7 +86,7 @@ private LookupResponse(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -98,13 +98,13 @@ private LookupResponse(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         found_ = java.util.Collections.unmodifiableList(found_);
       }
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
         missing_ = java.util.Collections.unmodifiableList(missing_);
       }
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
         deferred_ = java.util.Collections.unmodifiableList(deferred_);
       }
       this.unknownFields = unknownFields.build();
@@ -404,12 +404,11 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.LookupResponse other = (com.google.datastore.v1.LookupResponse) obj;
 
-    boolean result = true;
-    result = result && getFoundList().equals(other.getFoundList());
-    result = result && getMissingList().equals(other.getMissingList());
-    result = result && getDeferredList().equals(other.getDeferredList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getFoundList().equals(other.getFoundList())) return false;
+    if (!getMissingList().equals(other.getMissingList())) return false;
+    if (!getDeferredList().equals(other.getDeferredList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -627,7 +626,7 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
           new com.google.datastore.v1.LookupResponse(this);
       int from_bitField0_ = bitField0_;
       if (foundBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           found_ = java.util.Collections.unmodifiableList(found_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
@@ -636,7 +635,7 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
         result.found_ = foundBuilder_.build();
       }
       if (missingBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           missing_ = java.util.Collections.unmodifiableList(missing_);
           bitField0_ = (bitField0_ & ~0x00000002);
         }
@@ -645,7 +644,7 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
         result.missing_ = missingBuilder_.build();
       }
       if (deferredBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           deferred_ = java.util.Collections.unmodifiableList(deferred_);
           bitField0_ = (bitField0_ & ~0x00000004);
         }
@@ -659,35 +658,35 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -818,7 +817,7 @@ public Builder mergeFrom(
         java.util.Collections.emptyList();
 
     private void ensureFoundIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         found_ = new java.util.ArrayList(found_);
         bitField0_ |= 0x00000001;
       }
@@ -1192,10 +1191,7 @@ public java.util.List getFoundBuil
                 com.google.datastore.v1.EntityResult,
                 com.google.datastore.v1.EntityResult.Builder,
                 com.google.datastore.v1.EntityResultOrBuilder>(
-                found_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
+                found_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         found_ = null;
       }
       return foundBuilder_;
@@ -1205,7 +1201,7 @@ public java.util.List getFoundBuil
         java.util.Collections.emptyList();
 
     private void ensureMissingIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         missing_ = new java.util.ArrayList(missing_);
         bitField0_ |= 0x00000002;
       }
@@ -1579,10 +1575,7 @@ public java.util.List getMissingBu
                 com.google.datastore.v1.EntityResult,
                 com.google.datastore.v1.EntityResult.Builder,
                 com.google.datastore.v1.EntityResultOrBuilder>(
-                missing_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
+                missing_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         missing_ = null;
       }
       return missingBuilder_;
@@ -1592,7 +1585,7 @@ public java.util.List getMissingBu
         java.util.Collections.emptyList();
 
     private void ensureDeferredIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         deferred_ = new java.util.ArrayList(deferred_);
         bitField0_ |= 0x00000004;
       }
@@ -1963,10 +1956,7 @@ public java.util.List getDeferredBuilderLis
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                deferred_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
+                deferred_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         deferred_ = null;
       }
       return deferredBuilder_;
@@ -1974,7 +1964,7 @@ public java.util.List getDeferredBuilderLis
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 239c8cab5dbb..0554dd144194 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
@@ -116,7 +116,7 @@ private Mutation(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -514,38 +514,34 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj;
 
-    boolean result = true;
-    result = result && getOperationCase().equals(other.getOperationCase());
-    if (!result) return false;
+    if (!getOperationCase().equals(other.getOperationCase())) return false;
     switch (operationCase_) {
       case 4:
-        result = result && getInsert().equals(other.getInsert());
+        if (!getInsert().equals(other.getInsert())) return false;
         break;
       case 5:
-        result = result && getUpdate().equals(other.getUpdate());
+        if (!getUpdate().equals(other.getUpdate())) return false;
         break;
       case 6:
-        result = result && getUpsert().equals(other.getUpsert());
+        if (!getUpsert().equals(other.getUpsert())) return false;
         break;
       case 7:
-        result = result && getDelete().equals(other.getDelete());
+        if (!getDelete().equals(other.getDelete())) return false;
         break;
       case 0:
       default:
     }
-    result =
-        result
-            && getConflictDetectionStrategyCase().equals(other.getConflictDetectionStrategyCase());
-    if (!result) return false;
+    if (!getConflictDetectionStrategyCase().equals(other.getConflictDetectionStrategyCase()))
+      return false;
     switch (conflictDetectionStrategyCase_) {
       case 8:
-        result = result && (getBaseVersion() == other.getBaseVersion());
+        if (getBaseVersion() != other.getBaseVersion()) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -796,35 +792,35 @@ public com.google.datastore.v1.Mutation buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -1813,7 +1809,7 @@ public Builder clearBaseVersion() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 0d900b6a048d..1a3e65baa640 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
@@ -22,10 +22,7 @@ private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder
     super(builder);
   }
 
-  private MutationResult() {
-    version_ = 0L;
-    conflictDetected_ = false;
-  }
+  private MutationResult() {}
 
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
@@ -77,7 +74,7 @@ private MutationResult(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -242,15 +239,14 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.MutationResult other = (com.google.datastore.v1.MutationResult) obj;
 
-    boolean result = true;
-    result = result && (hasKey() == other.hasKey());
+    if (hasKey() != other.hasKey()) return false;
     if (hasKey()) {
-      result = result && getKey().equals(other.getKey());
+      if (!getKey().equals(other.getKey())) return false;
     }
-    result = result && (getVersion() == other.getVersion());
-    result = result && (getConflictDetected() == other.getConflictDetected());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (getVersion() != other.getVersion()) return false;
+    if (getConflictDetected() != other.getConflictDetected()) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -463,35 +459,35 @@ public com.google.datastore.v1.MutationResult buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -544,7 +540,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private com.google.datastore.v1.Key key_ = null;
+    private com.google.datastore.v1.Key key_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Key,
             com.google.datastore.v1.Key.Builder,
@@ -831,7 +827,7 @@ public Builder clearConflictDetected() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 0c24f36cd56d..e9fbee3dfac2 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
@@ -82,7 +82,7 @@ private PartitionId(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -250,11 +250,10 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.PartitionId other = (com.google.datastore.v1.PartitionId) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && getNamespaceId().equals(other.getNamespaceId());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getNamespaceId().equals(other.getNamespaceId())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -465,35 +464,35 @@ public com.google.datastore.v1.PartitionId buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -735,7 +734,7 @@ public Builder setNamespaceIdBytes(com.google.protobuf.ByteString value) {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 a0bfd00f6b5b..ff328cc37406 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
@@ -66,7 +66,7 @@ private Projection(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -183,13 +183,12 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Projection other = (com.google.datastore.v1.Projection) obj;
 
-    boolean result = true;
-    result = result && (hasProperty() == other.hasProperty());
+    if (hasProperty() != other.hasProperty()) return false;
     if (hasProperty()) {
-      result = result && getProperty().equals(other.getProperty());
+      if (!getProperty().equals(other.getProperty())) return false;
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -390,35 +389,35 @@ public com.google.datastore.v1.Projection buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -465,7 +464,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private com.google.datastore.v1.PropertyReference property_ = null;
+    private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PropertyReference,
             com.google.datastore.v1.PropertyReference.Builder,
@@ -648,7 +647,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 157fec2847df..72ddb0a88f21 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
@@ -89,7 +89,7 @@ private PropertyFilter(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -520,18 +520,17 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.PropertyFilter other = (com.google.datastore.v1.PropertyFilter) obj;
 
-    boolean result = true;
-    result = result && (hasProperty() == other.hasProperty());
+    if (hasProperty() != other.hasProperty()) return false;
     if (hasProperty()) {
-      result = result && getProperty().equals(other.getProperty());
+      if (!getProperty().equals(other.getProperty())) return false;
     }
-    result = result && op_ == other.op_;
-    result = result && (hasValue() == other.hasValue());
+    if (op_ != other.op_) return false;
+    if (hasValue() != other.hasValue()) return false;
     if (hasValue()) {
-      result = result && getValue().equals(other.getValue());
+      if (!getValue().equals(other.getValue())) return false;
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -754,35 +753,35 @@ public com.google.datastore.v1.PropertyFilter buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -835,7 +834,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private com.google.datastore.v1.PropertyReference property_ = null;
+    private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PropertyReference,
             com.google.datastore.v1.PropertyReference.Builder,
@@ -1092,7 +1091,7 @@ public Builder clearOp() {
       return this;
     }
 
-    private com.google.datastore.v1.Value value_ = null;
+    private com.google.datastore.v1.Value value_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Value,
             com.google.datastore.v1.Value.Builder,
@@ -1268,7 +1267,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 ad1396a9317e..57a048443a5e 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
@@ -75,7 +75,7 @@ private PropertyOrder(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -375,14 +375,13 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.PropertyOrder other = (com.google.datastore.v1.PropertyOrder) obj;
 
-    boolean result = true;
-    result = result && (hasProperty() == other.hasProperty());
+    if (hasProperty() != other.hasProperty()) return false;
     if (hasProperty()) {
-      result = result && getProperty().equals(other.getProperty());
+      if (!getProperty().equals(other.getProperty())) return false;
     }
-    result = result && direction_ == other.direction_;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (direction_ != other.direction_) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -589,35 +588,35 @@ public com.google.datastore.v1.PropertyOrder buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -667,7 +666,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private com.google.datastore.v1.PropertyReference property_ = null;
+    private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PropertyReference,
             com.google.datastore.v1.PropertyReference.Builder,
@@ -926,7 +925,7 @@ public Builder clearDirection() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 a540741a0dcc..5bcb1ca552f7 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
@@ -59,7 +59,7 @@ private PropertyReference(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.PropertyReference other =
         (com.google.datastore.v1.PropertyReference) obj;
 
-    boolean result = true;
-    result = result && getName().equals(other.getName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getName().equals(other.getName())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -377,35 +376,35 @@ public com.google.datastore.v1.PropertyReference buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -554,7 +553,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 356909095014..49177c094c77 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
@@ -29,7 +29,6 @@ private Query() {
     distinctOn_ = java.util.Collections.emptyList();
     startCursor_ = com.google.protobuf.ByteString.EMPTY;
     endCursor_ = com.google.protobuf.ByteString.EMPTY;
-    offset_ = 0;
   }
 
   @java.lang.Override
@@ -58,7 +57,7 @@ private Query(
             break;
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 projection_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
@@ -69,7 +68,7 @@ private Query(
             }
           case 26:
             {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 kind_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
@@ -95,7 +94,7 @@ private Query(
             }
           case 42:
             {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 order_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
@@ -106,7 +105,7 @@ private Query(
             }
           case 50:
             {
-              if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
                 distinctOn_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
@@ -147,7 +146,7 @@ private Query(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -159,16 +158,16 @@ private Query(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         projection_ = java.util.Collections.unmodifiableList(projection_);
       }
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
         kind_ = java.util.Collections.unmodifiableList(kind_);
       }
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
         order_ = java.util.Collections.unmodifiableList(order_);
       }
-      if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+      if (((mutable_bitField0_ & 0x00000010) != 0)) {
         distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_);
       }
       this.unknownFields = unknownFields.build();
@@ -692,24 +691,23 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Query other = (com.google.datastore.v1.Query) obj;
 
-    boolean result = true;
-    result = result && getProjectionList().equals(other.getProjectionList());
-    result = result && getKindList().equals(other.getKindList());
-    result = result && (hasFilter() == other.hasFilter());
+    if (!getProjectionList().equals(other.getProjectionList())) return false;
+    if (!getKindList().equals(other.getKindList())) return false;
+    if (hasFilter() != other.hasFilter()) return false;
     if (hasFilter()) {
-      result = result && getFilter().equals(other.getFilter());
-    }
-    result = result && getOrderList().equals(other.getOrderList());
-    result = result && getDistinctOnList().equals(other.getDistinctOnList());
-    result = result && getStartCursor().equals(other.getStartCursor());
-    result = result && getEndCursor().equals(other.getEndCursor());
-    result = result && (getOffset() == other.getOffset());
-    result = result && (hasLimit() == other.hasLimit());
+      if (!getFilter().equals(other.getFilter())) return false;
+    }
+    if (!getOrderList().equals(other.getOrderList())) return false;
+    if (!getDistinctOnList().equals(other.getDistinctOnList())) return false;
+    if (!getStartCursor().equals(other.getStartCursor())) return false;
+    if (!getEndCursor().equals(other.getEndCursor())) return false;
+    if (getOffset() != other.getOffset()) return false;
+    if (hasLimit() != other.hasLimit()) return false;
     if (hasLimit()) {
-      result = result && getLimit().equals(other.getLimit());
+      if (!getLimit().equals(other.getLimit())) return false;
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -968,7 +966,7 @@ public com.google.datastore.v1.Query buildPartial() {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (projectionBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           projection_ = java.util.Collections.unmodifiableList(projection_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
@@ -977,7 +975,7 @@ public com.google.datastore.v1.Query buildPartial() {
         result.projection_ = projectionBuilder_.build();
       }
       if (kindBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           kind_ = java.util.Collections.unmodifiableList(kind_);
           bitField0_ = (bitField0_ & ~0x00000002);
         }
@@ -991,7 +989,7 @@ public com.google.datastore.v1.Query buildPartial() {
         result.filter_ = filterBuilder_.build();
       }
       if (orderBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           order_ = java.util.Collections.unmodifiableList(order_);
           bitField0_ = (bitField0_ & ~0x00000008);
         }
@@ -1000,7 +998,7 @@ public com.google.datastore.v1.Query buildPartial() {
         result.order_ = orderBuilder_.build();
       }
       if (distinctOnBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_);
           bitField0_ = (bitField0_ & ~0x00000010);
         }
@@ -1023,35 +1021,35 @@ public com.google.datastore.v1.Query buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -1224,7 +1222,7 @@ public Builder mergeFrom(
         java.util.Collections.emptyList();
 
     private void ensureProjectionIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         projection_ = new java.util.ArrayList(projection_);
         bitField0_ |= 0x00000001;
       }
@@ -1562,10 +1560,7 @@ public java.util.List getProjectionB
                 com.google.datastore.v1.Projection,
                 com.google.datastore.v1.Projection.Builder,
                 com.google.datastore.v1.ProjectionOrBuilder>(
-                projection_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
+                projection_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         projection_ = null;
       }
       return projectionBuilder_;
@@ -1575,7 +1570,7 @@ public java.util.List getProjectionB
         java.util.Collections.emptyList();
 
     private void ensureKindIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         kind_ = new java.util.ArrayList(kind_);
         bitField0_ |= 0x00000002;
       }
@@ -1931,16 +1926,13 @@ public java.util.List getKindBui
                 com.google.datastore.v1.KindExpression,
                 com.google.datastore.v1.KindExpression.Builder,
                 com.google.datastore.v1.KindExpressionOrBuilder>(
-                kind_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
+                kind_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         kind_ = null;
       }
       return kindBuilder_;
     }
 
-    private com.google.datastore.v1.Filter filter_ = null;
+    private com.google.datastore.v1.Filter filter_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Filter,
             com.google.datastore.v1.Filter.Builder,
@@ -2119,7 +2111,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureOrderIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         order_ = new java.util.ArrayList(order_);
         bitField0_ |= 0x00000008;
       }
@@ -2457,10 +2449,7 @@ public java.util.List getOrderBui
                 com.google.datastore.v1.PropertyOrder,
                 com.google.datastore.v1.PropertyOrder.Builder,
                 com.google.datastore.v1.PropertyOrderOrBuilder>(
-                order_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
-                getParentForChildren(),
-                isClean());
+                order_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         order_ = null;
       }
       return orderBuilder_;
@@ -2470,7 +2459,7 @@ public java.util.List getOrderBui
         java.util.Collections.emptyList();
 
     private void ensureDistinctOnIsMutable() {
-      if (!((bitField0_ & 0x00000010) == 0x00000010)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         distinctOn_ =
             new java.util.ArrayList(distinctOn_);
         bitField0_ |= 0x00000010;
@@ -2847,10 +2836,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
                 com.google.datastore.v1.PropertyReference,
                 com.google.datastore.v1.PropertyReference.Builder,
                 com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                distinctOn_,
-                ((bitField0_ & 0x00000010) == 0x00000010),
-                getParentForChildren(),
-                isClean());
+                distinctOn_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         distinctOn_ = null;
       }
       return distinctOnBuilder_;
@@ -3015,7 +3001,7 @@ public Builder clearOffset() {
       return this;
     }
 
-    private com.google.protobuf.Int32Value limit_ = null;
+    private com.google.protobuf.Int32Value limit_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Int32Value,
             com.google.protobuf.Int32Value.Builder,
@@ -3219,7 +3205,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 86a4d26ce810..f137a55af9fd 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -23,13 +23,11 @@ private QueryResultBatch(com.google.protobuf.GeneratedMessageV3.Builder build
   }
 
   private QueryResultBatch() {
-    skippedResults_ = 0;
     skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
     entityResultType_ = 0;
     entityResults_ = java.util.Collections.emptyList();
     endCursor_ = com.google.protobuf.ByteString.EMPTY;
     moreResults_ = 0;
-    snapshotVersion_ = 0L;
   }
 
   @java.lang.Override
@@ -65,7 +63,7 @@ private QueryResultBatch(
             }
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 entityResults_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
@@ -103,7 +101,7 @@ private QueryResultBatch(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -115,7 +113,7 @@ private QueryResultBatch(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
         entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
       }
       this.unknownFields = unknownFields.build();
@@ -612,16 +610,15 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.QueryResultBatch other = (com.google.datastore.v1.QueryResultBatch) obj;
 
-    boolean result = true;
-    result = result && (getSkippedResults() == other.getSkippedResults());
-    result = result && getSkippedCursor().equals(other.getSkippedCursor());
-    result = result && entityResultType_ == other.entityResultType_;
-    result = result && getEntityResultsList().equals(other.getEntityResultsList());
-    result = result && getEndCursor().equals(other.getEndCursor());
-    result = result && moreResults_ == other.moreResults_;
-    result = result && (getSnapshotVersion() == other.getSnapshotVersion());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (getSkippedResults() != other.getSkippedResults()) return false;
+    if (!getSkippedCursor().equals(other.getSkippedCursor())) return false;
+    if (entityResultType_ != other.entityResultType_) return false;
+    if (!getEntityResultsList().equals(other.getEntityResultsList())) return false;
+    if (!getEndCursor().equals(other.getEndCursor())) return false;
+    if (moreResults_ != other.moreResults_) return false;
+    if (getSnapshotVersion() != other.getSnapshotVersion()) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -845,7 +842,7 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
       result.skippedCursor_ = skippedCursor_;
       result.entityResultType_ = entityResultType_;
       if (entityResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
           bitField0_ = (bitField0_ & ~0x00000008);
         }
@@ -863,35 +860,35 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -1156,7 +1153,7 @@ public Builder clearEntityResultType() {
         java.util.Collections.emptyList();
 
     private void ensureEntityResultsIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         entityResults_ =
             new java.util.ArrayList(entityResults_);
         bitField0_ |= 0x00000008;
@@ -1497,7 +1494,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
                 com.google.datastore.v1.EntityResult.Builder,
                 com.google.datastore.v1.EntityResultOrBuilder>(
                 entityResults_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
+                ((bitField0_ & 0x00000008) != 0),
                 getParentForChildren(),
                 isClean());
         entityResults_ = null;
@@ -1697,7 +1694,7 @@ public Builder clearSnapshotVersion() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index d5718235fd67..87131e76ae0f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -63,7 +63,7 @@ private ReadOptions(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -395,21 +395,19 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.ReadOptions other = (com.google.datastore.v1.ReadOptions) obj;
 
-    boolean result = true;
-    result = result && getConsistencyTypeCase().equals(other.getConsistencyTypeCase());
-    if (!result) return false;
+    if (!getConsistencyTypeCase().equals(other.getConsistencyTypeCase())) return false;
     switch (consistencyTypeCase_) {
       case 1:
-        result = result && getReadConsistencyValue() == other.getReadConsistencyValue();
+        if (getReadConsistencyValue() != other.getReadConsistencyValue()) return false;
         break;
       case 2:
-        result = result && getTransaction().equals(other.getTransaction());
+        if (!getTransaction().equals(other.getTransaction())) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -616,35 +614,35 @@ public com.google.datastore.v1.ReadOptions buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -869,7 +867,7 @@ public Builder clearTransaction() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 a0a3a4ab6499..9b46c602fd0b 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
@@ -55,7 +55,7 @@ private ReserveIdsRequest(
             break;
           case 10:
             {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 keys_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
@@ -78,7 +78,7 @@ private ReserveIdsRequest(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -90,7 +90,7 @@ private ReserveIdsRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
       }
       this.unknownFields = unknownFields.build();
@@ -325,12 +325,11 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.ReserveIdsRequest other =
         (com.google.datastore.v1.ReserveIdsRequest) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && getDatabaseId().equals(other.getDatabaseId());
-    result = result && getKeysList().equals(other.getKeysList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getDatabaseId().equals(other.getDatabaseId())) return false;
+    if (!getKeysList().equals(other.getKeysList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -538,7 +537,7 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
       result.projectId_ = projectId_;
       result.databaseId_ = databaseId_;
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
           bitField0_ = (bitField0_ & ~0x00000004);
         }
@@ -553,35 +552,35 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -853,7 +852,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000004;
       }
@@ -1204,10 +1203,7 @@ public java.util.List getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
+                keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
@@ -1215,7 +1211,7 @@ public java.util.List getKeysBuilderList()
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 1cde2d6e7b87..9536829023f0 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
@@ -50,7 +50,7 @@ private ReserveIdsResponse(
             break;
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.ReserveIdsResponse other =
         (com.google.datastore.v1.ReserveIdsResponse) obj;
 
-    boolean result = true;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -312,35 +311,35 @@ public com.google.datastore.v1.ReserveIdsResponse buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -386,7 +385,7 @@ public Builder mergeFrom(
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 172d323a0ac5..23aaf3e34630 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
@@ -65,7 +65,7 @@ private RollbackRequest(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -206,11 +206,10 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.RollbackRequest other = (com.google.datastore.v1.RollbackRequest) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && getTransaction().equals(other.getTransaction());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getTransaction().equals(other.getTransaction())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -408,35 +407,35 @@ public com.google.datastore.v1.RollbackRequest buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -633,7 +632,7 @@ public Builder clearTransaction() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 8f1884d4765c..f478f7be062f 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
@@ -51,7 +51,7 @@ private RollbackResponse(
             break;
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.RollbackResponse other = (com.google.datastore.v1.RollbackResponse) obj;
 
-    boolean result = true;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -313,35 +312,35 @@ public com.google.datastore.v1.RollbackResponse buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -387,7 +386,7 @@ public Builder mergeFrom(
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 38b7e01e1105..9320a551ebb4 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
@@ -121,7 +121,7 @@ private RunQueryRequest(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -487,30 +487,28 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.RunQueryRequest other = (com.google.datastore.v1.RunQueryRequest) obj;
 
-    boolean result = true;
-    result = result && getProjectId().equals(other.getProjectId());
-    result = result && (hasPartitionId() == other.hasPartitionId());
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (hasPartitionId() != other.hasPartitionId()) return false;
     if (hasPartitionId()) {
-      result = result && getPartitionId().equals(other.getPartitionId());
+      if (!getPartitionId().equals(other.getPartitionId())) return false;
     }
-    result = result && (hasReadOptions() == other.hasReadOptions());
+    if (hasReadOptions() != other.hasReadOptions()) return false;
     if (hasReadOptions()) {
-      result = result && getReadOptions().equals(other.getReadOptions());
+      if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
-    result = result && getQueryTypeCase().equals(other.getQueryTypeCase());
-    if (!result) return false;
+    if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
-        result = result && getQuery().equals(other.getQuery());
+        if (!getQuery().equals(other.getQuery())) return false;
         break;
       case 7:
-        result = result && getGqlQuery().equals(other.getGqlQuery());
+        if (!getGqlQuery().equals(other.getGqlQuery())) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -762,35 +760,35 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -968,7 +966,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.datastore.v1.PartitionId partitionId_ = null;
+    private com.google.datastore.v1.PartitionId partitionId_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PartitionId,
             com.google.datastore.v1.PartitionId.Builder,
@@ -1176,7 +1174,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
       return partitionIdBuilder_;
     }
 
-    private com.google.datastore.v1.ReadOptions readOptions_ = null;
+    private com.google.datastore.v1.ReadOptions readOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.ReadOptions,
             com.google.datastore.v1.ReadOptions.Builder,
@@ -1756,7 +1754,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 72b3c109bbe1..824f1f04bc2e 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
@@ -81,7 +81,7 @@ private RunQueryResponse(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -241,17 +241,16 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.RunQueryResponse other = (com.google.datastore.v1.RunQueryResponse) obj;
 
-    boolean result = true;
-    result = result && (hasBatch() == other.hasBatch());
+    if (hasBatch() != other.hasBatch()) return false;
     if (hasBatch()) {
-      result = result && getBatch().equals(other.getBatch());
+      if (!getBatch().equals(other.getBatch())) return false;
     }
-    result = result && (hasQuery() == other.hasQuery());
+    if (hasQuery() != other.hasQuery()) return false;
     if (hasQuery()) {
-      result = result && getQuery().equals(other.getQuery());
+      if (!getQuery().equals(other.getQuery())) return false;
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -470,35 +469,35 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -548,7 +547,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private com.google.datastore.v1.QueryResultBatch batch_ = null;
+    private com.google.datastore.v1.QueryResultBatch batch_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.QueryResultBatch,
             com.google.datastore.v1.QueryResultBatch.Builder,
@@ -729,7 +728,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
       return batchBuilder_;
     }
 
-    private com.google.datastore.v1.Query query_ = null;
+    private com.google.datastore.v1.Query query_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Query,
             com.google.datastore.v1.Query.Builder,
@@ -905,7 +904,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 cf9b3f1b02f5..a941739a2bde 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
@@ -91,7 +91,7 @@ private TransactionOptions(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -193,7 +193,7 @@ private ReadWrite(
               }
             default:
               {
-                if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -285,10 +285,9 @@ public boolean equals(final java.lang.Object obj) {
       com.google.datastore.v1.TransactionOptions.ReadWrite other =
           (com.google.datastore.v1.TransactionOptions.ReadWrite) obj;
 
-      boolean result = true;
-      result = result && getPreviousTransaction().equals(other.getPreviousTransaction());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
+      if (!getPreviousTransaction().equals(other.getPreviousTransaction())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
     }
 
     @java.lang.Override
@@ -484,23 +483,23 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
 
       @java.lang.Override
       public Builder clone() {
-        return (Builder) super.clone();
+        return super.clone();
       }
 
       @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return (Builder) super.setField(field, value);
+        return super.setField(field, value);
       }
 
       @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
+        return super.clearField(field);
       }
 
       @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
+        return super.clearOneof(oneof);
       }
 
       @java.lang.Override
@@ -508,13 +507,13 @@ public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
+        return super.setRepeatedField(field, index, value);
       }
 
       @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
+        return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
@@ -614,7 +613,7 @@ public Builder clearPreviousTransaction() {
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
+        return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
@@ -713,7 +712,7 @@ private ReadOnly(
               break;
             default:
               {
-                if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -784,9 +783,8 @@ public boolean equals(final java.lang.Object obj) {
       com.google.datastore.v1.TransactionOptions.ReadOnly other =
           (com.google.datastore.v1.TransactionOptions.ReadOnly) obj;
 
-      boolean result = true;
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
     }
 
     @java.lang.Override
@@ -977,23 +975,23 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
 
       @java.lang.Override
       public Builder clone() {
-        return (Builder) super.clone();
+        return super.clone();
       }
 
       @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return (Builder) super.setField(field, value);
+        return super.setField(field, value);
       }
 
       @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
+        return super.clearField(field);
       }
 
       @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
+        return super.clearOneof(oneof);
       }
 
       @java.lang.Override
@@ -1001,13 +999,13 @@ public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
+        return super.setRepeatedField(field, index, value);
       }
 
       @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
+        return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
@@ -1056,7 +1054,7 @@ public Builder mergeFrom(
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
+        return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
@@ -1288,21 +1286,19 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.TransactionOptions other =
         (com.google.datastore.v1.TransactionOptions) obj;
 
-    boolean result = true;
-    result = result && getModeCase().equals(other.getModeCase());
-    if (!result) return false;
+    if (!getModeCase().equals(other.getModeCase())) return false;
     switch (modeCase_) {
       case 1:
-        result = result && getReadWrite().equals(other.getReadWrite());
+        if (!getReadWrite().equals(other.getReadWrite())) return false;
         break;
       case 2:
-        result = result && getReadOnly().equals(other.getReadOnly());
+        if (!getReadOnly().equals(other.getReadOnly())) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -1524,35 +1520,35 @@ public com.google.datastore.v1.TransactionOptions buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -2032,7 +2028,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override
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 d6a96292bc73..e1daeb5dc5cb 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
@@ -23,10 +23,7 @@ private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
 
-  private Value() {
-    meaning_ = 0;
-    excludeFromIndexes_ = false;
-  }
+  private Value() {}
 
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
@@ -176,7 +173,7 @@ private Value(
             }
           default:
             {
-              if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -846,53 +843,49 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Value other = (com.google.datastore.v1.Value) obj;
 
-    boolean result = true;
-    result = result && (getMeaning() == other.getMeaning());
-    result = result && (getExcludeFromIndexes() == other.getExcludeFromIndexes());
-    result = result && getValueTypeCase().equals(other.getValueTypeCase());
-    if (!result) return false;
+    if (getMeaning() != other.getMeaning()) return false;
+    if (getExcludeFromIndexes() != other.getExcludeFromIndexes()) return false;
+    if (!getValueTypeCase().equals(other.getValueTypeCase())) return false;
     switch (valueTypeCase_) {
       case 11:
-        result = result && getNullValueValue() == other.getNullValueValue();
+        if (getNullValueValue() != other.getNullValueValue()) return false;
         break;
       case 1:
-        result = result && (getBooleanValue() == other.getBooleanValue());
+        if (getBooleanValue() != other.getBooleanValue()) return false;
         break;
       case 2:
-        result = result && (getIntegerValue() == other.getIntegerValue());
+        if (getIntegerValue() != other.getIntegerValue()) return false;
         break;
       case 3:
-        result =
-            result
-                && (java.lang.Double.doubleToLongBits(getDoubleValue())
-                    == java.lang.Double.doubleToLongBits(other.getDoubleValue()));
+        if (java.lang.Double.doubleToLongBits(getDoubleValue())
+            != java.lang.Double.doubleToLongBits(other.getDoubleValue())) return false;
         break;
       case 10:
-        result = result && getTimestampValue().equals(other.getTimestampValue());
+        if (!getTimestampValue().equals(other.getTimestampValue())) return false;
         break;
       case 5:
-        result = result && getKeyValue().equals(other.getKeyValue());
+        if (!getKeyValue().equals(other.getKeyValue())) return false;
         break;
       case 17:
-        result = result && getStringValue().equals(other.getStringValue());
+        if (!getStringValue().equals(other.getStringValue())) return false;
         break;
       case 18:
-        result = result && getBlobValue().equals(other.getBlobValue());
+        if (!getBlobValue().equals(other.getBlobValue())) return false;
         break;
       case 8:
-        result = result && getGeoPointValue().equals(other.getGeoPointValue());
+        if (!getGeoPointValue().equals(other.getGeoPointValue())) return false;
         break;
       case 6:
-        result = result && getEntityValue().equals(other.getEntityValue());
+        if (!getEntityValue().equals(other.getEntityValue())) return false;
         break;
       case 9:
-        result = result && getArrayValue().equals(other.getArrayValue());
+        if (!getArrayValue().equals(other.getArrayValue())) return false;
         break;
       case 0:
       default:
     }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
   @java.lang.Override
@@ -1195,35 +1188,35 @@ public com.google.datastore.v1.Value buildPartial() {
 
     @java.lang.Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
 
     @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
 
     @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
 
     @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
 
     @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
 
     @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
 
     @java.lang.Override
@@ -2903,7 +2896,7 @@ public Builder clearExcludeFromIndexes() {
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return super.setUnknownFields(unknownFields);
     }
 
     @java.lang.Override

From 9273395f4e97f41e841963d3647a3b9cf436a161 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Fri, 29 Mar 2019 12:22:45 -0700
Subject: [PATCH 0168/1784] Release google-cloud-java v0.85.0 (#4820)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index acdb60178399..ea12c0b082f5 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.66.0
+  1.67.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.66.0'
+compile 'com.google.cloud:google-cloud-datastore:1.67.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.66.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.67.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e90a7d96ffa9..71e7444482f6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.66.1-SNAPSHOT
+  1.67.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.84.1-alpha-SNAPSHOT
+    0.85.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6534e382f85f..af68a77b471b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.49.1-SNAPSHOT
+  0.50.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.49.1-SNAPSHOT
+    0.50.0
   
   
     

From 2006c2b34de18d384bd04835e9e40063fc3b6bd5 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Fri, 29 Mar 2019 15:59:26 -0700
Subject: [PATCH 0169/1784] Bump snapshot (#4821)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 71e7444482f6..1464fe856d35 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.67.0
+  1.67.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.85.0-alpha
+    0.85.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index af68a77b471b..96caad69afc5 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.50.0
+  0.50.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.50.0
+    0.50.1-SNAPSHOT
   
   
     

From d9c83a72d58c3c53c3eefcaf20d4f2f55ab17f99 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 3 Apr 2019 14:23:54 -0400
Subject: [PATCH 0170/1784] Release v0.86.0 (#4899)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index ea12c0b082f5..bcc7b080eaeb 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.67.0
+  1.68.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.67.0'
+compile 'com.google.cloud:google-cloud-datastore:1.68.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.67.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.68.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1464fe856d35..820a9ec051ba 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.67.1-SNAPSHOT
+  1.68.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.85.1-alpha-SNAPSHOT
+    0.86.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 96caad69afc5..7157b7cc4556 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.50.1-SNAPSHOT
+  0.51.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.50.1-SNAPSHOT
+    0.51.0
   
   
     

From a3f5262c62a4aba9269deaaa75525fa783ed76b1 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 3 Apr 2019 17:25:41 -0400
Subject: [PATCH 0171/1784] Bump next snapshot (#4900)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 820a9ec051ba..15662c4c0034 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.68.0
+  1.68.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.86.0-alpha
+    0.86.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7157b7cc4556..d3dec060486e 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.51.0
+  0.51.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.51.0
+    0.51.1-SNAPSHOT
   
   
     

From ee5007b6dbc9a355d9e055f3781fa02e1014e47a Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Thu, 4 Apr 2019 13:37:59 -0700
Subject: [PATCH 0172/1784] Release v0.87.0 (#4907)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index bcc7b080eaeb..021640031e1d 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.68.0
+  1.69.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.68.0'
+compile 'com.google.cloud:google-cloud-datastore:1.69.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.68.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.69.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 15662c4c0034..1c655b02f1c2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.68.1-SNAPSHOT
+  1.69.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.86.1-alpha-SNAPSHOT
+    0.87.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d3dec060486e..5ec8bb037c78 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.51.1-SNAPSHOT
+  0.52.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.51.1-SNAPSHOT
+    0.52.0
   
   
     

From 283b1cbf76b7aa3081952a67f2f16e047c1b7cae Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Thu, 4 Apr 2019 16:07:17 -0700
Subject: [PATCH 0173/1784] Bump next snapshot (#4908)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1c655b02f1c2..55e548f5e468 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.69.0
+  1.69.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.87.0-alpha
+    0.87.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 5ec8bb037c78..783bee1da5d8 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.52.0
+  0.52.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.52.0
+    0.52.1-SNAPSHOT
   
   
     

From a58180e5a2fbe0506449b12116c13656094aa95f Mon Sep 17 00:00:00 2001
From: Lucas Soares 
Date: Thu, 11 Apr 2019 17:16:32 -0300
Subject: [PATCH 0174/1784] Adding support to custom ports on
 LocalDatastoreHelper (#4933) (#4935)

---
 .../testing/LocalDatastoreHelper.java         | 31 +++++++++++++++++--
 .../testing/LocalDatastoreHelperTest.java     | 18 +++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

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 29141cfc641e..2792b494c5ce 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
@@ -78,10 +78,10 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
     }
   }
 
-  private LocalDatastoreHelper(double consistency) {
+  private LocalDatastoreHelper(double consistency, int port) {
     super(
         "datastore",
-        BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
+        port > 0 ? port : BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
         PROJECT_ID_PREFIX + UUID.randomUUID().toString());
     Path tmpDirectory = null;
     try {
@@ -162,7 +162,32 @@ public double getConsistency() {
    *     consistency of non-ancestor queries; non-ancestor queries are eventually consistent.
    */
   public static LocalDatastoreHelper create(double consistency) {
-    return new LocalDatastoreHelper(consistency);
+    return create(consistency, 0);
+  }
+
+  /**
+   * Creates a local Datastore helper with the specified settings for project ID and consistency.
+   *
+   * @param consistency the fraction of Datastore writes that are immediately visible to global
+   *     queries, with 0.0 meaning no writes are immediately visible and 1.0 meaning all writes are
+   *     immediately visible. Note that setting this to 1.0 may mask incorrect assumptions about the
+   *     consistency of non-ancestor queries; non-ancestor queries are eventually consistent.
+   * @param port the port to be used to start the emulator service. Note that setting this to 0 the
+   *     emulator will search for a free random port.
+   */
+  public static LocalDatastoreHelper create(double consistency, int port) {
+    return new LocalDatastoreHelper(consistency, port);
+  }
+
+  /**
+   * Creates a local Datastore helper with a placeholder project ID and the default consistency
+   * setting of 0.9.
+   *
+   * @param port the port to be used to start the emulator service. Note that setting this to 0 the
+   *     emulator will search for a free random port.
+   */
+  public static LocalDatastoreHelper create(int port) {
+    return new LocalDatastoreHelper(DEFAULT_CONSISTENCY, port);
   }
 
   /**
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
index 4af7f65dba85..44c2854ac3d1 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
@@ -17,6 +17,7 @@
 package com.google.cloud.datastore.testing;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -56,6 +57,23 @@ public void testCreate() {
     assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
   }
 
+  @Test
+  public void testCreatePort() {
+    LocalDatastoreHelper helper = LocalDatastoreHelper.create(0.75, 8888);
+    DatastoreOptions options = helper.getOptions(NAMESPACE);
+    assertTrue(options.getHost().endsWith("8888"));
+    assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE);
+    helper = LocalDatastoreHelper.create();
+    options = helper.getOptions(NAMESPACE);
+    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);
+    assertTrue(Math.abs(0.9 - helper.getConsistency()) < TOLERANCE);
+    assertTrue(options.getHost().endsWith("9999"));
+  }
+
   @Test
   public void testOptions() {
     LocalDatastoreHelper helper = LocalDatastoreHelper.create();

From 89c396c37d3f6ffa3b674cf5f853fc490edd292e Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 17 Apr 2019 15:06:34 -0400
Subject: [PATCH 0175/1784] Release google-cloud-java v0.88.0 (#4971)

* Release v0.88.0

* Change version numbers to 1.0.0 for Speech and Firestore.
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 021640031e1d..7d3206554fd3 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.69.0
+  1.70.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.69.0'
+compile 'com.google.cloud:google-cloud-datastore:1.70.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.69.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.70.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 55e548f5e468..b099ef0da591 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.69.1-SNAPSHOT
+  1.70.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.87.1-alpha-SNAPSHOT
+    0.88.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 783bee1da5d8..2c8524d2a390 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.52.1-SNAPSHOT
+  0.53.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.52.1-SNAPSHOT
+    0.53.0
   
   
     

From cb184ea7ca56301e7142f45773deb5cc09193ea6 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 17 Apr 2019 20:57:30 -0400
Subject: [PATCH 0176/1784] Bump next snapshot (#4973)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b099ef0da591..f098ba631635 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.70.0
+  1.70.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.88.0-alpha
+    0.88.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2c8524d2a390..3792d9cdc522 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.53.0
+  0.53.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.53.0
+    0.53.1-SNAPSHOT
   
   
     

From cf93e783562523582fa8372baff8856e4c0c2006 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 24 Apr 2019 13:34:10 -0700
Subject: [PATCH 0177/1784] Release v0.89.0 (#5009)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 7d3206554fd3..d78a8141b9e2 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.70.0
+  1.71.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.70.0'
+compile 'com.google.cloud:google-cloud-datastore:1.71.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.70.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.71.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f098ba631635..d960cb23c050 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.70.1-SNAPSHOT
+  1.71.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.88.1-alpha-SNAPSHOT
+    0.89.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3792d9cdc522..6f4e28a8f000 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.53.1-SNAPSHOT
+  0.54.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.53.1-SNAPSHOT
+    0.54.0
   
   
     

From 1131f770c7969eabaf6b9ad37fb772d34b9b404f Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 24 Apr 2019 15:46:47 -0700
Subject: [PATCH 0178/1784] Bump next snapshot (#5011)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d960cb23c050..45e724bcce59 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.71.0
+  1.71.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.89.0-alpha
+    0.89.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6f4e28a8f000..1e2a3927bb81 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.54.0
+  0.54.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.54.0
+    0.54.1-SNAPSHOT
   
   
     

From 0e738a63916016e6507051b7c19b71f46ef09b6d Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Wed, 1 May 2019 15:44:24 -0700
Subject: [PATCH 0179/1784] Release v0.90.0 (#5047)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index d78a8141b9e2..d45e86ed9ed3 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.71.0
+  1.72.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.71.0'
+compile 'com.google.cloud:google-cloud-datastore:1.72.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.71.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.72.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 45e724bcce59..ab691c431010 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.71.1-SNAPSHOT
+  1.72.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.89.1-alpha-SNAPSHOT
+    0.90.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1e2a3927bb81..e3c7e9c45aa0 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.54.1-SNAPSHOT
+  0.55.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.54.1-SNAPSHOT
+    0.55.0
   
   
     

From 86f316bab5439b764cf0e0a96e2ad6f45cb3a393 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Thu, 2 May 2019 08:02:53 -0700
Subject: [PATCH 0180/1784] Bump next snapshot (#5048)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ab691c431010..0262a2a651b0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.72.0
+  1.72.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.90.0-alpha
+    0.90.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e3c7e9c45aa0..28cd6939acad 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.55.0
+  0.55.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.55.0
+    0.55.1-SNAPSHOT
   
   
     

From 82b8388d4d9bda72129603fe334b56aadc4488b2 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 7 May 2019 14:16:26 -0400
Subject: [PATCH 0181/1784] Release google-cloud-java v0.91.0 (#5080)

* Release v0.91.0

* Tasks GA
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index d45e86ed9ed3..1bd019c63aef 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.72.0
+  1.73.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.72.0'
+compile 'com.google.cloud:google-cloud-datastore:1.73.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.72.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.73.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0262a2a651b0..369973279979 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.72.1-SNAPSHOT
+  1.73.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.90.1-alpha-SNAPSHOT
+    0.91.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 28cd6939acad..a63c34b9bc0e 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.55.1-SNAPSHOT
+  0.56.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.55.1-SNAPSHOT
+    0.56.0
   
   
     

From db67bcd9336e4bc88bf3b840a6c0e54eec7b64a9 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 7 May 2019 16:53:13 -0400
Subject: [PATCH 0182/1784] Bump next snapshot (#5081)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 369973279979..bf6f528fb440 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.73.0
+  1.73.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.91.0-alpha
+    0.91.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a63c34b9bc0e..e556c554d316 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.56.0
+  0.56.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.56.0
+    0.56.1-SNAPSHOT
   
   
     

From da90f8ffe3597603f794d26510ce719c08e7f6b3 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Wed, 8 May 2019 16:40:01 -0400
Subject: [PATCH 0183/1784] docs(samples): Update datastore_basic_entity sample
 to include `taskKey` definition (#1350)

---
 .../test/java/com/google/datastore/snippets/ConceptsTest.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index abb1ba5e860e..ce6b59d8fd2f 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -233,6 +233,9 @@ public void testArrayValue() {
   @Test
   public void testBasicEntity() {
     // [START datastore_basic_entity]
+    Key taskKey = datastore.newKeyFactory()
+        .setKind("Task")
+        .newKey("sampleTask");
     Entity task = Entity.newBuilder(taskKey)
         .set("category", "Personal")
         .set("done", false)

From aae6b00bca1a71058a229260fdaa3ec283fb90d8 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 15 May 2019 13:49:40 -0700
Subject: [PATCH 0184/1784] Release v0.92.0 (#5189)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 1bd019c63aef..b89e2f10dc52 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.73.0
+  1.74.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.73.0'
+compile 'com.google.cloud:google-cloud-datastore:1.74.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.73.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.74.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index bf6f528fb440..113f5986df25 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.73.1-SNAPSHOT
+  1.74.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.91.1-alpha-SNAPSHOT
+    0.92.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e556c554d316..3496da6cc74e 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.56.1-SNAPSHOT
+  0.57.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.56.1-SNAPSHOT
+    0.57.0
   
   
     

From 4bf3147e4d5638069be2241a10cce701d271dd27 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 15 May 2019 19:41:53 -0700
Subject: [PATCH 0185/1784] Bump next snapshot (#5192)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 113f5986df25..52eef3332d6c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.74.0
+  1.74.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.92.0-alpha
+    0.92.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3496da6cc74e..da0e0a7d673b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.57.0
+  0.57.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.57.0
+    0.57.1-SNAPSHOT
   
   
     

From 9b5d6a57e657eedcd4df3c662760d69005cf5178 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 22 May 2019 16:10:33 -0700
Subject: [PATCH 0186/1784] Release v0.93.0 (#5211)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index b89e2f10dc52..c3930a821d1a 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.74.0
+  1.75.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.74.0'
+compile 'com.google.cloud:google-cloud-datastore:1.75.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.74.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.75.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 52eef3332d6c..3fb04cdee862 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.74.1-SNAPSHOT
+  1.75.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.92.1-alpha-SNAPSHOT
+    0.93.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index da0e0a7d673b..061249e15283 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.57.1-SNAPSHOT
+  0.58.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.57.1-SNAPSHOT
+    0.58.0
   
   
     

From f75ca88b48b401488f10763f38b86cd9ff17f1e7 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 23 May 2019 09:54:41 -0700
Subject: [PATCH 0187/1784] Bump next snapshot (#5212)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3fb04cdee862..9ae15664b3fb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.75.0
+  1.75.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.93.0-alpha
+    0.93.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 061249e15283..1f23b93531a9 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.58.0
+  0.58.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.58.0
+    0.58.1-SNAPSHOT
   
   
     

From 6b47fc69a660f07268499f54b3a3028a642fba75 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 29 May 2019 15:05:40 -0400
Subject: [PATCH 0188/1784] Release v0.94.0 (#5238)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index c3930a821d1a..99f5e265d611 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.75.0
+  1.76.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.75.0'
+compile 'com.google.cloud:google-cloud-datastore:1.76.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.75.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.76.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9ae15664b3fb..a9ec098e8c53 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.75.1-SNAPSHOT
+  1.76.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.93.1-alpha-SNAPSHOT
+    0.94.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1f23b93531a9..9a46438751b8 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.58.1-SNAPSHOT
+  0.59.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.58.1-SNAPSHOT
+    0.59.0
   
   
     

From 37c96a1bb861b67787ed0bda963f30267e84ecde Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 29 May 2019 17:43:39 -0400
Subject: [PATCH 0189/1784] Bump next snapshot (#5239)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a9ec098e8c53..e7f8b858f3ae 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.76.0
+  1.76.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.94.0-alpha
+    0.94.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9a46438751b8..682bbd7293ac 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.59.0
+  0.59.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.59.0
+    0.59.1-SNAPSHOT
   
   
     

From 2109862522d0066da096913a6d34d189d6329bbf Mon Sep 17 00:00:00 2001
From: abhinav-qlogic <48669998+abhinav-qlogic@users.noreply.github.com>
Date: Wed, 5 Jun 2019 18:40:51 +0530
Subject: [PATCH 0190/1784] deprecated warnings removed (#5406)

---
 .../src/main/java/com/google/cloud/datastore/Blob.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
index 7677573593e5..edcbc92154e8 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
@@ -110,7 +110,7 @@ public void copyTo(ByteBuffer target) {
    * @throws IndexOutOfBoundsException if an offset or size is negative or too large
    */
   public void copyTo(byte[] target) {
-    byteString.copyTo(target, 0, 0, getLength());
+    byteString.copyTo(target, 0);
   }
 
   ByteString getByteString() {

From 52b71d584f199d133213b6c0710a23f005b9abd4 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 6 Jun 2019 14:00:07 -0700
Subject: [PATCH 0191/1784] Release google-cloud-java v0.95.0 (#5438)

* Release v0.95.0

* Add missing files

* Fix region replace tag for securitycenter in bom

* Notification tests need to run from contrib folder now
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 99f5e265d611..8a21414393db 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.76.0
+  1.77.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.76.0'
+compile 'com.google.cloud:google-cloud-datastore:1.77.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.76.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.77.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e7f8b858f3ae..80de18c69c2b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.76.1-SNAPSHOT
+  1.77.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.94.1-alpha-SNAPSHOT
+    0.95.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 682bbd7293ac..7daebfb82b68 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.59.1-SNAPSHOT
+  0.60.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.59.1-SNAPSHOT
+    0.60.0
   
   
     

From 59f4db977299e7c0ac73dbf208238c2f401b1bfd Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 6 Jun 2019 15:03:53 -0700
Subject: [PATCH 0192/1784] Bump snapshot (#5441)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 80de18c69c2b..775fb3e3a75c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.77.0
+  1.77.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.95.0-alpha
+    0.95.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7daebfb82b68..605d0ba10410 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.60.0
+  0.60.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.60.0
+    0.60.1-SNAPSHOT
   
   
     

From 34f1360294ef13c091cb8c16bfd0147d31ebde23 Mon Sep 17 00:00:00 2001
From: Omri Hazan 
Date: Thu, 13 Jun 2019 07:56:26 -0700
Subject: [PATCH 0193/1784] Make getProperties method public in BaseEntity
 (#5452)

* Make getProperties method public in BaseEntity

* Using Map in getProperties
---
 .../src/main/java/com/google/cloud/datastore/BaseEntity.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
index 9a7c0d66d1fb..608dc7187610 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
@@ -631,7 +631,8 @@ public Set getNames() {
     return properties.keySet();
   }
 
-  ImmutableSortedMap> getProperties() {
+  /** Returns the properties. */
+  public Map> getProperties() {
     return properties;
   }
 

From de9415ab054d29b4dd8a7017aaf7e584b995a53e Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 13 Jun 2019 14:06:30 -0700
Subject: [PATCH 0194/1784] Release v0.96.0 (#5474)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 8a21414393db..da543a6ba699 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.77.0
+  1.78.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.77.0'
+compile 'com.google.cloud:google-cloud-datastore:1.78.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.77.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.78.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 775fb3e3a75c..410f54356487 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.77.1-SNAPSHOT
+  1.78.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.95.1-alpha-SNAPSHOT
+    0.96.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 605d0ba10410..620e44ec40b2 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.60.1-SNAPSHOT
+  0.61.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.60.1-SNAPSHOT
+    0.61.0
   
   
     

From e91ad0475ec07ae9e4619fbd6b4accdb8d9f6f8e Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Fri, 14 Jun 2019 12:08:55 -0700
Subject: [PATCH 0195/1784] Bump next snapshot (#5496)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 410f54356487..ab5d43216fe5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.78.0
+  1.78.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.96.0-alpha
+    0.96.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 620e44ec40b2..087e658029fe 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.61.0
+  0.61.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.61.0
+    0.61.1-SNAPSHOT
   
   
     

From 39bb07f438e7eef0a2bad062f2bcb3ebba131ba1 Mon Sep 17 00:00:00 2001
From: Solomon Duskis 
Date: Tue, 18 Jun 2019 13:03:04 -0400
Subject: [PATCH 0196/1784] Preparing Easymock for a future upgrade. (#5510)

* Upgrading Easymock.

* Reverting the upgrade of easymock, but keeping code changes.
---
 .../java/com/google/cloud/datastore/DatastoreOptionsTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 f02018ecc03a..1bce29807d5d 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
@@ -89,6 +89,7 @@ public void testToBuilder() throws Exception {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    DatastoreOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    DatastoreOptions.newBuilder()
+        .setTransportOptions(EasyMock.createMock(TransportOptions.class));
   }
 }

From 88d9eb5efbfb2e8afee1f23333bd3c9ea5ec6e29 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 20 Jun 2019 17:41:03 -0400
Subject: [PATCH 0197/1784] Release v0.97.0 (#5528)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index da543a6ba699..386faaf141db 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.78.0
+  1.79.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.78.0'
+compile 'com.google.cloud:google-cloud-datastore:1.79.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.78.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.79.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ab5d43216fe5..ead84235c5f2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.78.1-SNAPSHOT
+  1.79.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.96.1-alpha-SNAPSHOT
+    0.97.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 087e658029fe..f05325300ebb 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.61.1-SNAPSHOT
+  0.62.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.61.1-SNAPSHOT
+    0.62.0
   
   
     

From 9673218e765aab155f35e7bfd97be9257dfe989a Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Fri, 21 Jun 2019 09:08:35 -0700
Subject: [PATCH 0198/1784] Bump next snapshot (#5530)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ead84235c5f2..c31597fb6606 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.79.0
+  1.79.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.97.0-alpha
+    0.97.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f05325300ebb..b2d9263b0a0a 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.62.0
+  0.62.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.62.0
+    0.62.1-SNAPSHOT
   
   
     

From c6807f78a0a6087deab0b5ae9df79dbc4dc32ab0 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Wed, 26 Jun 2019 11:35:36 -0400
Subject: [PATCH 0199/1784] Add explicit ListValue to datastore_array_value
 (#1486)

---
 .../test/java/com/google/datastore/snippets/ConceptsTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index ce6b59d8fd2f..92500ddf9219 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -33,6 +33,7 @@
 import com.google.cloud.datastore.IncompleteKey;
 import com.google.cloud.datastore.Key;
 import com.google.cloud.datastore.KeyFactory;
+import com.google.cloud.datastore.ListValue;
 import com.google.cloud.datastore.PathElement;
 import com.google.cloud.datastore.ProjectionEntity;
 import com.google.cloud.datastore.Query;
@@ -224,7 +225,7 @@ public void testArrayValue() {
     // [START datastore_array_value]
     Entity task = Entity.newBuilder(taskKey)
         .set("tags", "fun", "programming")
-        .set("collaborators", "alice", "bob")
+        .set("collaborators", ListValue.of("alice", "bob"))
         .build();
     // [END datastore_array_value]
     assertValidEntity(task);

From 1966dd90d148ea93ffb82ef3539faec246831fe8 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Wed, 26 Jun 2019 15:13:35 -0700
Subject: [PATCH 0200/1784] Release v0.98.0 (#5572)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 386faaf141db..0d110c30b624 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.79.0
+  1.80.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.79.0'
+compile 'com.google.cloud:google-cloud-datastore:1.80.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.79.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.80.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c31597fb6606..13562aa592ae 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.79.1-SNAPSHOT
+  1.80.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.97.1-alpha-SNAPSHOT
+    0.98.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b2d9263b0a0a..360d55a286ac 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.62.1-SNAPSHOT
+  0.63.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.62.1-SNAPSHOT
+    0.63.0
   
   
     

From b4abbf0c99b054be4bf7431b3d73825c77a6f668 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Thu, 27 Jun 2019 12:10:33 -0700
Subject: [PATCH 0201/1784] Bump next snapshot (#5579)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 13562aa592ae..dea718286b82 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.80.0
+  1.80.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.98.0-alpha
+    0.98.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 360d55a286ac..081ea813e4b5 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.63.0
+  0.63.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.63.0
+    0.63.1-SNAPSHOT
   
   
     

From 34faf9eccbf4ea12524f17232c4c0c9d8d1474bd Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 3 Jul 2019 09:12:34 -0700
Subject: [PATCH 0202/1784] Release v0.99.0 (#5657)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 0d110c30b624..e19d29f2fd38 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.80.0
+  1.81.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.80.0'
+compile 'com.google.cloud:google-cloud-datastore:1.81.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.80.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.81.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index dea718286b82..77af3bfd0257 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.80.1-SNAPSHOT
+  1.81.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.98.1-alpha-SNAPSHOT
+    0.99.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 081ea813e4b5..71d29494a8a0 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.63.1-SNAPSHOT
+  0.64.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.63.1-SNAPSHOT
+    0.64.0
   
   
     

From 7f94430903ba7c8b1c9d06d363ce60fec65b94ea Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Mon, 8 Jul 2019 11:16:23 -0700
Subject: [PATCH 0203/1784] Bump next snapshot (#5702)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 77af3bfd0257..444e4e18f3c9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.81.0
+  1.81.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.99.0-alpha
+    0.99.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 71d29494a8a0..ee2e56424f95 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.64.0
+  0.64.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.64.0
+    0.64.1-SNAPSHOT
   
   
     

From 34fc773972fa197809fbe490e8dc46d957e14eb6 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 10 Jul 2019 14:28:03 -0400
Subject: [PATCH 0204/1784] Release v0.100.0 (#5716)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index e19d29f2fd38..fe0aca32f174 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.81.0
+  1.82.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.81.0'
+compile 'com.google.cloud:google-cloud-datastore:1.82.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.81.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.82.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 444e4e18f3c9..f4481fe940d4 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.81.1-SNAPSHOT
+  1.82.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.99.1-alpha-SNAPSHOT
+    0.100.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ee2e56424f95..07917c71f47d 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.64.1-SNAPSHOT
+  0.65.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.64.1-SNAPSHOT
+    0.65.0
   
   
     

From 0eff399fcc3241cebaee6c114305af0a7655915e Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 10 Jul 2019 17:01:45 -0400
Subject: [PATCH 0205/1784] Bump next snapshot (#5720)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f4481fe940d4..6deaf9a03936 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.82.0
+  1.82.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.100.0-alpha
+    0.100.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 07917c71f47d..77dc66f759f6 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.65.0
+  0.65.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.65.0
+    0.65.1-SNAPSHOT
   
   
     

From d78c5cf05609983c14eec91c527904ba8d15fd35 Mon Sep 17 00:00:00 2001
From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com>
Date: Thu, 18 Jul 2019 09:33:51 -0700
Subject: [PATCH 0206/1784] Release v0.101.0 (#5761)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index fe0aca32f174..b30ff6a8d142 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.82.0
+  1.83.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.82.0'
+compile 'com.google.cloud:google-cloud-datastore:1.83.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.82.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.83.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6deaf9a03936..12df80a71e68 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.82.1-SNAPSHOT
+  1.83.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.100.1-alpha-SNAPSHOT
+    0.101.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 77dc66f759f6..d9f19d096677 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.65.1-SNAPSHOT
+  0.66.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.65.1-SNAPSHOT
+    0.66.0
   
   
     

From 871495f182f0f21982238b2768d4281f1458cb66 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 23 Jul 2019 16:28:01 -0400
Subject: [PATCH 0207/1784] Bump next snapshot (#5812)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 12df80a71e68..8a9a36bedfaa 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.83.0
+  1.83.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.101.0-alpha
+    0.101.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d9f19d096677..48a70e499481 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.66.0
+  0.66.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.66.0
+    0.66.1-SNAPSHOT
   
   
     

From 0efa63f10662c92796a10252c20ec1cab71132f4 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 24 Jul 2019 14:46:17 -0700
Subject: [PATCH 0208/1784] Release v0.102.0 (#5852)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index b30ff6a8d142..8cd8bec0c81f 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.83.0
+  1.84.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.83.0'
+compile 'com.google.cloud:google-cloud-datastore:1.84.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.83.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.84.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8a9a36bedfaa..d095ed8a6ea0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.83.1-SNAPSHOT
+  1.84.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.101.1-alpha-SNAPSHOT
+    0.102.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 48a70e499481..a527afc60ed9 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.66.1-SNAPSHOT
+  0.67.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.66.1-SNAPSHOT
+    0.67.0
   
   
     

From 552c398bc6358d5f91dd685412c0e210c3d7d1fa Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 25 Jul 2019 07:11:16 -0700
Subject: [PATCH 0209/1784] Bump next snapshot (#5858)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d095ed8a6ea0..682935612e35 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.84.0
+  1.84.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.102.0-alpha
+    0.102.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a527afc60ed9..8e0c51479a5d 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.67.0
+  0.67.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.67.0
+    0.67.1-SNAPSHOT
   
   
     

From e80e1f82989c550394a3f5fd45852dc5ceeae3b8 Mon Sep 17 00:00:00 2001
From: Seiichi Uchida 
Date: Wed, 31 Jul 2019 00:58:43 +0900
Subject: [PATCH 0210/1784] Datastore: expose Entity::fromPb,
 FullEntity::fromPb and Value::fromPb (#5759)

---
 .../src/main/java/com/google/cloud/datastore/Entity.java        | 2 +-
 .../src/main/java/com/google/cloud/datastore/FullEntity.java    | 2 +-
 .../src/main/java/com/google/cloud/datastore/Value.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
index 599942dd8832..69d230179b5a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
@@ -86,7 +86,7 @@ public static Builder newBuilder(Key key, FullEntity copyFrom) {
     return new Builder(key, copyFrom);
   }
 
-  static Entity fromPb(com.google.datastore.v1.Entity entityPb) {
+  public static Entity fromPb(com.google.datastore.v1.Entity entityPb) {
     return new Builder().fill(entityPb).build();
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
index f69fbc22536b..ee342073afab 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
@@ -62,7 +62,7 @@ public static  Builder newBuilder(FullEntity copy
     return new Builder<>(copyFrom);
   }
 
-  static FullEntity fromPb(com.google.datastore.v1.Entity entityPb) {
+  public static FullEntity fromPb(com.google.datastore.v1.Entity entityPb) {
     return new Builder<>().fill(entityPb).build();
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
index 9301cfae2b67..4bd0a5133163 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
@@ -211,7 +211,7 @@ com.google.datastore.v1.Value toPb() {
     return getType().getMarshaller().toProto(this);
   }
 
-  static Value fromPb(com.google.datastore.v1.Value proto) {
+  public static Value fromPb(com.google.datastore.v1.Value proto) {
     ValueTypeCase descriptorId = proto.getValueTypeCase();
     ValueType valueType = ValueType.getByDescriptorId(descriptorId.getNumber());
     return valueType == null

From 016c3fb29dd32e5a11bb09255cc16ef5d052ac85 Mon Sep 17 00:00:00 2001
From: athakor <49403056+athakor@users.noreply.github.com>
Date: Wed, 31 Jul 2019 03:44:28 +0530
Subject: [PATCH 0211/1784] Datastore: remove unused dependencies (#5687)

---
 google-cloud-datastore/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 682935612e35..9866cdf80393 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -18,10 +18,6 @@
     google-cloud-datastore
   
   
-    
-      ${project.groupId}
-      google-cloud-core
-    
     
       ${project.groupId}
       google-cloud-core-http

From 59808cd51399483b01cb128ae14c1582fc6becef Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 31 Jul 2019 15:09:09 -0400
Subject: [PATCH 0212/1784] Release v0.103.0 (#5950)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 8cd8bec0c81f..d7358875f43d 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.84.0
+  1.85.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.84.0'
+compile 'com.google.cloud:google-cloud-datastore:1.85.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.84.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.85.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9866cdf80393..a568342bfb32 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.84.1-SNAPSHOT
+  1.85.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.102.1-alpha-SNAPSHOT
+    0.103.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8e0c51479a5d..adb63593f400 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.67.1-SNAPSHOT
+  0.68.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.67.1-SNAPSHOT
+    0.68.0
   
   
     

From 7d7bc7c3ecfcbce9d4264ddd4708b6e31a349152 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 1 Aug 2019 13:21:29 -0400
Subject: [PATCH 0213/1784] Bump next snapshot (#5958)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a568342bfb32..13da208d7af8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.85.0
+  1.85.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.103.0-alpha
+    0.103.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index adb63593f400..d3889679570c 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.68.0
+  0.68.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.68.0
+    0.68.1-SNAPSHOT
   
   
     

From edf7ee60361034d5fbcee53f248574e83fa28559 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 7 Aug 2019 10:00:27 -0700
Subject: [PATCH 0214/1784] Release v0.104.0 (#6048)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index d7358875f43d..777838bde9b1 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.85.0
+  1.86.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.85.0'
+compile 'com.google.cloud:google-cloud-datastore:1.86.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.85.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.86.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 13da208d7af8..aba223832376 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.85.1-SNAPSHOT
+  1.86.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.103.1-alpha-SNAPSHOT
+    0.104.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d3889679570c..94bbbd9ae2d9 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.68.1-SNAPSHOT
+  0.69.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.68.1-SNAPSHOT
+    0.69.0
   
   
     

From 4001f0706f633a4575d8c7b72b7160e91d51c2f8 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 8 Aug 2019 12:07:43 -0700
Subject: [PATCH 0215/1784] Bump next snapshot (#6055)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index aba223832376..2fd9f763191e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.86.0
+  1.86.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.104.0-alpha
+    0.104.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 94bbbd9ae2d9..65a7fa98a4e3 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.69.0
+  0.69.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.69.0
+    0.69.1-SNAPSHOT
   
   
     

From e2d17452544c6c9eeeee040da39a7ddc0a72c94f Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 14 Aug 2019 10:05:25 -0700
Subject: [PATCH 0216/1784] Fix links to googleapis.dev from GitHub pages
 (#6070)

---
 google-cloud-datastore/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 777838bde9b1..39a90e35e7b9 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -34,7 +34,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.86.0"
 
 Example Applications
 --------------------
-- [`DatastoreExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore.  Read more about using the application on the [`DatastoreExample` docs page](https://googleapis.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html).
+- [`DatastoreExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore.
 - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
   - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
 - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
@@ -224,4 +224,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate
 [cloud-datastore]: https://cloud.google.com/datastore/
 [datastore-product-docs]: https://cloud.google.com/datastore/docs/
-[datastore-client-lib-docs]: https://googleapis.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/datastore/package-summary.html
+[datastore-client-lib-docs]: https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/datastore/package-summary.html

From 77d2626f5e0fb3d999aad0f4cf960a16c67243c3 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 14 Aug 2019 15:10:32 -0400
Subject: [PATCH 0217/1784] Release v0.105.0 (#6077)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 39a90e35e7b9..95210d0a1ef6 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.86.0
+  1.87.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.86.0'
+compile 'com.google.cloud:google-cloud-datastore:1.87.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.86.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.87.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2fd9f763191e..ab9f20b29611 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.86.1-SNAPSHOT
+  1.87.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.104.1-alpha-SNAPSHOT
+    0.105.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 65a7fa98a4e3..df58331dea65 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.69.1-SNAPSHOT
+  0.70.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.69.1-SNAPSHOT
+    0.70.0
   
   
     

From bf38284e88f00e3a124886584144649579a973ed Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 14 Aug 2019 20:03:16 -0400
Subject: [PATCH 0218/1784] Bump next snapshot (#6079)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ab9f20b29611..08040e9f72fa 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.87.0
+  1.87.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.105.0-alpha
+    0.105.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index df58331dea65..ef0bda1d5e4b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.70.0
+  0.70.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.70.0
+    0.70.1-SNAPSHOT
   
   
     

From fa63b51bca9d44bcf6d0243f903d16da4fb43248 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 22 Aug 2019 13:14:03 -0700
Subject: [PATCH 0219/1784] Release v0.106.0 (#6140)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 95210d0a1ef6..2ff51e0d9bdd 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.87.0
+  1.88.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.87.0'
+compile 'com.google.cloud:google-cloud-datastore:1.88.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.87.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.88.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 08040e9f72fa..9c29e3758fdc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.87.1-SNAPSHOT
+  1.88.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.105.1-alpha-SNAPSHOT
+    0.106.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ef0bda1d5e4b..efbd49bd2d96 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.70.1-SNAPSHOT
+  0.71.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.70.1-SNAPSHOT
+    0.71.0
   
   
     

From e41bb881bc57324ba9e24a60b4b6892a0bb031f9 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 26 Aug 2019 12:50:31 -0400
Subject: [PATCH 0220/1784] Bump next snapshot (#6162)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9c29e3758fdc..c7b6588d3ce4 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.88.0
+  1.88.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.106.0-alpha
+    0.106.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index efbd49bd2d96..dc2782a12d10 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.71.0
+  0.71.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.71.0
+    0.71.1-SNAPSHOT
   
   
     

From 2e5f96f947ff07339faeed5b1199ae853eff6ecf Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 28 Aug 2019 19:39:57 -0400
Subject: [PATCH 0221/1784] Release v0.107.0 (#6188)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 2ff51e0d9bdd..a6d0afddc647 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.88.0
+  1.89.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.88.0'
+compile 'com.google.cloud:google-cloud-datastore:1.89.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.88.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.89.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c7b6588d3ce4..9555317fe89c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.88.1-SNAPSHOT
+  1.89.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.106.1-alpha-SNAPSHOT
+    0.107.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index dc2782a12d10..59b6e6d254fb 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.71.1-SNAPSHOT
+  0.72.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.71.1-SNAPSHOT
+    0.72.0
   
   
     

From fe9679c9b4dd628a57d09a974e617c764d1a0a78 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 29 Aug 2019 13:46:14 -0400
Subject: [PATCH 0222/1784] Bump next snapshot (#6194)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9555317fe89c..20f68909cd31 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.89.0
+  1.89.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.107.0-alpha
+    0.107.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 59b6e6d254fb..1a0796260170 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.72.0
+  0.72.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.72.0
+    0.72.1-SNAPSHOT
   
   
     

From be20ee1e930c4903e8c6edfa83aff0fe9952a114 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 5 Sep 2019 11:11:12 -0700
Subject: [PATCH 0223/1784] Release google-cloud-java v0.108.0 (#6223)

* Release v0.108.0

* Spanner JDBC to 1.0.0
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index a6d0afddc647..e12668bf3a56 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.89.0
+  1.90.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.89.0'
+compile 'com.google.cloud:google-cloud-datastore:1.90.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.89.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.90.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 20f68909cd31..e88a4842e00c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.89.1-SNAPSHOT
+  1.90.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.107.1-alpha-SNAPSHOT
+    0.108.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1a0796260170..f5c43d34784b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.72.1-SNAPSHOT
+  0.73.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.72.1-SNAPSHOT
+    0.73.0
   
   
     

From 6d3493435bd6fb61cb207d869f278614db6d36f3 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Fri, 6 Sep 2019 08:52:12 -0700
Subject: [PATCH 0224/1784] Bump next snapshot (#6231)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e88a4842e00c..8e8ee3dc7e11 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.90.0
+  1.90.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.108.0-alpha
+    0.108.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f5c43d34784b..c13278b994b9 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.73.0
+  0.73.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.73.0
+    0.73.1-SNAPSHOT
   
   
     

From fc4e87f5ea7021885c9d5e4d977438c32b784cbc Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 11 Sep 2019 15:02:51 -0400
Subject: [PATCH 0225/1784] Release v0.109.0 (#6252)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index e12668bf3a56..070a255cf6ea 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.90.0
+  1.91.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.90.0'
+compile 'com.google.cloud:google-cloud-datastore:1.91.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.90.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.91.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8e8ee3dc7e11..e92ec6ca1f59 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.90.1-SNAPSHOT
+  1.91.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.108.1-alpha-SNAPSHOT
+    0.109.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c13278b994b9..049306854595 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.73.1-SNAPSHOT
+  0.74.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.73.1-SNAPSHOT
+    0.74.0
   
   
     

From 2cbc2787b13357c621fa1b04fd05a63accf35e3a Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 11 Sep 2019 18:44:09 -0400
Subject: [PATCH 0226/1784] Bump next snapshot (#6256)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e92ec6ca1f59..cfdbd855934c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.91.0
+  1.91.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.109.0-alpha
+    0.109.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 049306854595..194c4902f100 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.74.0
+  0.74.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.74.0
+    0.74.1-SNAPSHOT
   
   
     

From 8fd58e4081a7e0f4a44c2293553de5b949cb41d1 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 11 Sep 2019 15:44:25 -0700
Subject: [PATCH 0227/1784] Add repo metadata files for all the existing
 clients (#6255)

* Add repo metadata files for all the existing clients

* remove extra repo-metadata file
---
 google-cloud-datastore/.repo-metadata.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 google-cloud-datastore/.repo-metadata.json

diff --git a/google-cloud-datastore/.repo-metadata.json b/google-cloud-datastore/.repo-metadata.json
new file mode 100644
index 000000000000..64fc91ebc74f
--- /dev/null
+++ b/google-cloud-datastore/.repo-metadata.json
@@ -0,0 +1,13 @@
+{
+  "name": "datastore",
+  "name_pretty": "Google Cloud Datastore",
+  "product_documentation": "https://cloud.google.com/datastore",
+  "client_documentation": "https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/asset/v1beta1/package-summary.html",
+  "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
+  "release_level": "ga",
+  "language": "java",
+  "repo": "googleapis/google-cloud-java",
+  "repo_short": "google-cloud-java",
+  "distribution_name": "com.google.cloud:google-cloud-datastore",
+  "api_id": "datastore.googleapis.com"
+}
\ No newline at end of file

From 62e6268c8c197ba25ea348ce5b267606225bb99b Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 18 Sep 2019 15:28:29 -0700
Subject: [PATCH 0228/1784] Release google-cloud-java v0.110.0 (#6294)

* Release v0.110.0

* fix TranlateIT. use numbers for translation

* fix TranlateIT. use numbers for translation
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 070a255cf6ea..f80cba2b3b26 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.91.0
+  1.92.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.91.0'
+compile 'com.google.cloud:google-cloud-datastore:1.92.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.91.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.92.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cfdbd855934c..bfe6b749207b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.91.1-SNAPSHOT
+  1.92.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.109.1-alpha-SNAPSHOT
+    0.110.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 194c4902f100..e4bb8be8b2b9 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.74.1-SNAPSHOT
+  0.75.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.74.1-SNAPSHOT
+    0.75.0
   
   
     

From 4bb25a42d86e20c93868e60e4cdefe95aa5acc3a Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 19 Sep 2019 08:16:44 -0700
Subject: [PATCH 0229/1784] Bump next snapshot (#6305)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index bfe6b749207b..5e3af9ba7bc1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.92.0
+  1.92.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.110.0-alpha
+    0.110.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e4bb8be8b2b9..4f893cb292cd 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.75.0
+  0.75.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.75.0
+    0.75.1-SNAPSHOT
   
   
     

From af849cdd607fdbb0bbe554ce02f02dc9f7840a21 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Wed, 25 Sep 2019 20:29:44 +0530
Subject: [PATCH 0230/1784] Datastore: Fix StructuredQuery.Builder - Allow
 limit of 0 (#6292)

* fix query limit of datastore

* fix review changes
---
 .../cloud/datastore/StructuredQuery.java      |  2 +-
 .../google/cloud/datastore/DatastoreTest.java | 22 +++++++++++++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   | 13 +++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index d72f3023b978..63318a090612 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -757,7 +757,7 @@ public B setOffset(int offset) {
 
     @Override
     public B setLimit(Integer limit) {
-      Preconditions.checkArgument(limit == null || limit > 0, "limit must be positive");
+      Preconditions.checkArgument(limit == null || limit >= 0, "limit must not be negative");
       this.limit = limit;
       return self();
     }
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 2183a4983efd..ca7d7219dc03 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
@@ -691,6 +691,28 @@ public void testRunKeyQueryWithOffset() {
     assertEquals(2, numberOfEntities);
   }
 
+  @Test
+  public void testRunKeyQueryWithLimit() {
+    datastore.put(ENTITY1, ENTITY2);
+    Query keyQuery = Query.newKeyQueryBuilder().setLimit(2).build();
+    QueryResults queryResults = datastore.run(keyQuery);
+    int resultCount = 0;
+    while (queryResults.hasNext()) {
+      queryResults.next();
+      resultCount++;
+    }
+    assertEquals(2, resultCount);
+
+    Query query = Query.newKeyQueryBuilder().setLimit(0).build();
+    QueryResults results = datastore.run(query);
+    int count = 0;
+    while (results.hasNext()) {
+      results.next();
+      count++;
+    }
+    assertEquals(0, count);
+  }
+
   private List buildResponsesForQueryPaginationWithLimit() {
     Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build();
     Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build();
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 7b999802198a..c2d6b954b7d1 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
@@ -858,4 +858,17 @@ public void testSkippedResults() {
     int numberOfEntities = DATASTORE.run(query).getSkippedResults();
     assertEquals(2, numberOfEntities);
   }
+
+  @Test
+  public void testSetLimit() {
+    DATASTORE.put(ENTITY1);
+    Query keyQuery = Query.newKeyQueryBuilder().setLimit(1).build();
+    QueryResults queryResults = DATASTORE.run(keyQuery);
+    assertTrue(queryResults.hasNext());
+    assertEquals(KEY1, queryResults.next());
+
+    Query query = Query.newEntityQueryBuilder().setLimit(0).build();
+    QueryResults results = DATASTORE.run(query);
+    assertFalse(results.hasNext());
+  }
 }

From cc759a2aaf8b8f8c64bd93aec19e290b7c77bb40 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 25 Sep 2019 13:14:57 -0400
Subject: [PATCH 0231/1784] Release google-cloud-java v0.111.0 (#6347)

* Release v0.111.0

* Change Bigtable version to 1.0.0.
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index f80cba2b3b26..1573863ae76f 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.92.0
+  1.93.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.92.0'
+compile 'com.google.cloud:google-cloud-datastore:1.93.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.92.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.93.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5e3af9ba7bc1..7fa09622b9d6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.92.1-SNAPSHOT
+  1.93.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.110.1-alpha-SNAPSHOT
+    0.111.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4f893cb292cd..09cbf0371004 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.75.1-SNAPSHOT
+  0.76.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.75.1-SNAPSHOT
+    0.76.0
   
   
     

From 64c57366638749cf13a80762da9d6c99a905b276 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 26 Sep 2019 13:29:08 -0400
Subject: [PATCH 0232/1784] Bump next snapshot (#6353)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7fa09622b9d6..9d52330e13fc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.93.0
+  1.93.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.111.0-alpha
+    0.111.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 09cbf0371004..12491e01865e 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.76.0
+  0.76.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.76.0
+    0.76.1-SNAPSHOT
   
   
     

From 701f32ac92889beea9ea79eb0ed61ad6ee281ab4 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 2 Oct 2019 15:32:18 -0700
Subject: [PATCH 0233/1784] Release google-cloud-java v0.112.0 (#6420)

* Release v0.112.0

* Fix translate pom
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 1573863ae76f..d47f9e60de91 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.93.0
+  1.96.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.93.0'
+compile 'com.google.cloud:google-cloud-datastore:1.96.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.93.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.96.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9d52330e13fc..4535bcf1afa4 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.93.1-SNAPSHOT
+  1.96.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.111.1-alpha-SNAPSHOT
+    0.114.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 12491e01865e..760446f1ab2b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.76.1-SNAPSHOT
+  0.79.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.76.1-SNAPSHOT
+    0.79.0
   
   
     

From 8ada272477d1f475bf07e17df32e0b5b89dafa7a Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Thu, 3 Oct 2019 11:09:49 -0400
Subject: [PATCH 0234/1784] Datastore : add GqlQuery#setNullBinding method
 (#6360)

---
 .../com/google/cloud/datastore/GqlQuery.java  | 10 ++++++++
 .../google/cloud/datastore/DatastoreTest.java | 24 +++++++++++++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   | 13 ++++++++++
 3 files changed, 47 insertions(+)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index f2686ec7002c..df198f1f073c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -291,6 +291,16 @@ public Builder setBinding(String name, Blob... value) {
       return this;
     }
 
+    /**
+     * Sets a new named binding with null value.
+     *
+     * @param name of the binding
+     */
+    public Builder setNullBinding(String name) {
+      namedBindings.put(name, toBinding(NullValue.MARSHALLER, new ArrayList()));
+      return this;
+    }
+
     /**
      * Sets a new positional binding.
      *
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 ca7d7219dc03..10fc32a9306f 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
@@ -1135,4 +1135,28 @@ public void testRuntimeException() throws Exception {
     datastore.get(KEY1);
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
+
+  @Test
+  public void testGqlQueryWithNullBinding() {
+    Query query =
+        Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND1)
+            .setNullBinding("name")
+            .build();
+    Iterator results = datastore.run(query);
+    assertTrue(results.hasNext());
+    assertEquals(ENTITY1, results.next());
+    assertFalse(results.hasNext());
+
+    Query gqlQuery =
+        Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND1)
+            .setNullBinding("name")
+            .build();
+    Iterator queryResults = datastore.run(gqlQuery);
+    int count = 0;
+    while (queryResults.hasNext()) {
+      queryResults.next();
+      count++;
+    }
+    assertEquals(1, count);
+  }
 }
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 c2d6b954b7d1..baea35f1321c 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
@@ -871,4 +871,17 @@ public void testSetLimit() {
     QueryResults results = DATASTORE.run(query);
     assertFalse(results.hasNext());
   }
+
+  @Test
+  public void testGqlQueryWithNullBinding() {
+    Query query =
+        Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND1)
+            .setNamespace(NAMESPACE)
+            .setNullBinding("name")
+            .build();
+    Iterator results = DATASTORE.run(query);
+    assertTrue(results.hasNext());
+    assertEquals(ENTITY1, results.next());
+    assertFalse(results.hasNext());
+  }
 }

From 8e2c550466ce78ffd64b1acb1e2f3b5ee58eecb7 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 3 Oct 2019 12:05:30 -0700
Subject: [PATCH 0235/1784] Bump next snapshot (#6434)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4535bcf1afa4..8a3c254d4087 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.96.0
+  1.96.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.114.0-alpha
+    0.114.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 760446f1ab2b..4e06eb62e544 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.79.0
+  0.79.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.79.0
+    0.79.1-SNAPSHOT
   
   
     

From 1b98672e31b81efde114952391142bd5d440575d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Tue, 8 Oct 2019 13:21:35 -0400
Subject: [PATCH 0236/1784] fix a couple of warnings (#6458)

---
 .../com/google/cloud/datastore/it/ITDatastoreTest.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 baea35f1321c..e65e99d6b399 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
@@ -255,7 +255,7 @@ public void testTransactionWithRead() {
   }
 
   @Test
-  public void testTransactionWithQuery() throws InterruptedException {
+  public void testTransactionWithQuery() {
     Query query =
         Query.newEntityQueryBuilder()
             .setKind(KIND2)
@@ -863,12 +863,12 @@ public void testSkippedResults() {
   public void testSetLimit() {
     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);
+    Query query = Query.newEntityQueryBuilder().setLimit(0).build();
+    QueryResults results = DATASTORE.run(query);
     assertFalse(results.hasNext());
   }
 

From 54c75163bf9f6d577afa3898456db7a6e69063a0 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 10 Oct 2019 12:37:13 -0700
Subject: [PATCH 0237/1784] Release google-cloud-java v0.115.0 (#6476)

* Release v0.115.0

* fix bigtable-it config
---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index d47f9e60de91..2f74b4999d6d 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.96.0
+  1.97.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.96.0'
+compile 'com.google.cloud:google-cloud-datastore:1.97.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.96.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.97.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8a3c254d4087..de8f1b9d939f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.96.1-SNAPSHOT
+  1.97.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.114.1-alpha-SNAPSHOT
+    0.115.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4e06eb62e544..81502d838393 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.79.1-SNAPSHOT
+  0.80.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.79.1-SNAPSHOT
+    0.80.0
   
   
     

From abe4ac81019679d154a517f1cc26588728929abb Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 10 Oct 2019 13:48:03 -0700
Subject: [PATCH 0238/1784] Bump next snapshot (#6485)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index de8f1b9d939f..717e173fad44 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.97.0
+  1.97.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.115.0-alpha
+    0.115.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 81502d838393..65272980807b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.80.0
+  0.80.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.80.0
+    0.80.1-SNAPSHOT
   
   
     

From 258decf9a5cef3aacbf1706ce8e114cc03ad15cb Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 17 Oct 2019 07:37:39 -0700
Subject: [PATCH 0239/1784] Release v0.116.0 (#6518)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 2f74b4999d6d..62e963738d91 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.97.0
+  1.98.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.97.0'
+compile 'com.google.cloud:google-cloud-datastore:1.98.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.97.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.98.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 717e173fad44..cc4e8831244f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.97.1-SNAPSHOT
+  1.98.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.115.1-alpha-SNAPSHOT
+    0.116.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 65272980807b..77bfd7049326 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.80.1-SNAPSHOT
+  0.81.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.80.1-SNAPSHOT
+    0.81.0
   
   
     

From 2216b3ccbef930e24140e21840d5c1c33bfe8e1d Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 17 Oct 2019 16:36:54 -0400
Subject: [PATCH 0240/1784] Bump next snapshot (#6525)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cc4e8831244f..ce999f3c1a8f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.98.0
+  1.98.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.116.0-alpha
+    0.116.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 77bfd7049326..30d25e44156b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.81.0
+  0.81.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.81.0
+    0.81.1-SNAPSHOT
   
   
     

From 3f6b85f5588bf4ded57ac59fa41684b2b5bcde35 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Tue, 29 Oct 2019 06:40:25 -0400
Subject: [PATCH 0241/1784] update to jackson2

---
 .../java/com/google/datastore/v1/client/DatastoreHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 79132cce767b..1b187f1c82f5 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
@@ -22,7 +22,7 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson.JacksonFactory;
+import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.datastore.v1.ArrayValue;
 import com.google.datastore.v1.CompositeFilter;
 import com.google.datastore.v1.Entity;

From 058ca50bb82d654a7cd508b947322e53b6d8ef37 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Tue, 29 Oct 2019 06:52:46 -0400
Subject: [PATCH 0242/1784] fix assorted warnings

---
 .../java/com/google/datastore/v1/client/DatastoreFactory.java | 3 +--
 .../java/com/google/datastore/v1/client/DatastoreOptions.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
index acbea4f16c80..bece878d5ab4 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
@@ -36,7 +36,6 @@
  * Client factory for {@link Datastore}.
  */
 public class DatastoreFactory {
-  private static final Logger logger = Logger.getLogger(DatastoreFactory.class.getName());
 
   // Lazy load this because we might be running inside App Engine and this
   // class isn't on the whitelist.
@@ -61,7 +60,7 @@ public static DatastoreFactory get() {
    *
    * @throws IllegalArgumentException if the server or credentials weren't provided.
    */
-  public Datastore create(DatastoreOptions options) throws IllegalArgumentException {
+  public Datastore create(DatastoreOptions options) {
     return new Datastore(newRemoteRpc(options));
   }
 
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 4ccde164ffc9..d70d3c00c97d 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
@@ -135,10 +135,10 @@ public Builder localHost(String localHost) {
     }
 
     /**
-     * @deprecated Use {@link #projectId} and/or {@link #host}/{@link #localHost} instead.
-     *
      * Sets the project endpoint used to access Cloud Datastore. Prefer using {@link #projectId}
      * and/or {@link #host}/{@link #localHost} when possible.
+     * 
+     * @deprecated Use {@link #projectId} and/or {@link #host}/{@link #localHost} instead.
      */
     @Deprecated
     public Builder projectEndpoint(String projectEndpoint) {

From 694349d16c6d5c1865e937405b127205b3d706f8 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 30 Oct 2019 09:14:19 -0700
Subject: [PATCH 0243/1784] Import split-repo boms into google-cloud-bom
 (#6554)

* import google-cloud-core-bom

* import google-cloud-datalabeling-bom

* import google-cloud-automl-bom

* fix datalabeling version

* manage threeten version

* fix ordering of dependency imports

* import datacatalog bom

* import translate bom

* Update bigtable versions

* Fix bigtable-emulator version

* import asset bom

* import dlp bom

* import tasks bom

* import speech bom

* try moving grpc version up to fix linkage monitor

* import texttospeech bom

* import trace bom

* import websecurityscanner bom

* import talent bom

* import iamcredentials bom

* fix speech version

* fix speech version

* try dependency managing firestore's grpc

* try version manage grpc-core in firestore

* update automl for grpc version

* try excluding datastore's google-oauth-client transitive dependency

* add message to remove dependency exclusion

* restore import order

* import vision bom

* import iot bom

* fix websecurityscanner bom

* import gameservices bom

* import phishingprotection bom

* fix gameservices import

* fix automl import
---
 google-cloud-datastore/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ce999f3c1a8f..7ab62b023891 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -29,6 +29,17 @@
     
       com.google.cloud.datastore
       datastore-v1-proto-client
+      
+        
+        
+          com.google.oauth-client
+          google-oauth-client
+        
+      
+    
+    
+      com.google.oauth-client
+      google-oauth-client
     
     
       io.grpc

From 92d2b52df180f20ab524bfd17e4d8be09102f0f0 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 31 Oct 2019 08:34:14 -0700
Subject: [PATCH 0244/1784] Release v0.117.0 (#6664)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 62e963738d91..5292584a7784 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.98.0
+  1.99.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.98.0'
+compile 'com.google.cloud:google-cloud-datastore:1.99.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.98.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.99.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7ab62b023891..a600fc5ef96d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.98.1-SNAPSHOT
+  1.99.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.116.1-alpha-SNAPSHOT
+    0.117.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 30d25e44156b..2c84711d447b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.81.1-SNAPSHOT
+  0.82.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.81.1-SNAPSHOT
+    0.82.0
   
   
     

From f2aa3ddc349a8cd9688d0f770a0f08ae1b17e5c3 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 1 Nov 2019 12:14:33 -0400
Subject: [PATCH 0245/1784] update http client (#239)

* update http client
* update .gitignore
* remove no longer needed gzip hack
* remove redundant tests
---
 .gitignore                                    |  1 +
 .../google/datastore/v1/client/RemoteRpc.java | 96 +------------------
 .../datastore/v1/client/RemoteRpcTest.java    | 58 ++---------
 3 files changed, 12 insertions(+), 143 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b83d22266ac8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
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 3576c02e0b53..1c422844df5c 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
@@ -23,21 +23,16 @@
 import com.google.api.client.http.HttpStatusCodes;
 import com.google.api.client.http.protobuf.ProtoHttpContent;
 import com.google.api.client.util.IOUtils;
-import com.google.common.base.Preconditions;
 import com.google.protobuf.MessageLite;
 import com.google.rpc.Code;
 import com.google.rpc.Status;
 import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Field;
 import java.net.SocketTimeoutException;
 import java.nio.charset.Charset;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.zip.GZIPInputStream;
 
 /**
  * An RPC transport that sends protocol buffers over HTTP.
@@ -47,91 +42,6 @@
 class RemoteRpc {
   private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName());
 
-  /**
-   * An input stream that wraps a {@link GZIPInputStream} and forces it to fully consume its
-   * underlying {@link InputStream} before calling close() on it.
-   *
-   * @see href="https://github.com/google/google-http-java-client/issues/367"
-   */
-  static class GzipFixingInputStream extends InputStream {
-
-    // How many extra read() calls we have made on the underlying stream.
-    int callsToRead = 0;
-
-    // Experimentally, it is only necessary to consume 1 extra byte. Consuming a bit more than that
-    // should not affect performance, but we set an upper bound for safety.
-    private static final int MAX_BYTES_TO_CONSUME = 100;
-
-    private static final Field gzipUnderlyingInputStreamField = getGzipUnderlyingInputStreamField();
-
-    private static Field getGzipUnderlyingInputStreamField() {
-      try {
-        // FilterInputStream is a superclass of GZIPInputStream and stores the underlying
-        // InputStream.
-        Field gzipInputStreamIsField = FilterInputStream.class.getDeclaredField("in");
-        gzipInputStreamIsField.setAccessible(true);
-        return gzipInputStreamIsField;
-      } catch (Exception e) {
-        logger.log(
-            Level.INFO,
-            "Failed to find field \"in\" in FilterInputStream. This"
-                + " may prevent keep-alive from working correctly.",
-            e);
-        return null;
-      }
-    }
-
-    public static InputStream maybeWrap(InputStream inputStream) {
-      if (gzipUnderlyingInputStreamField != null && inputStream instanceof GZIPInputStream) {
-        return new GzipFixingInputStream((GZIPInputStream) inputStream);
-      }
-      return inputStream;
-    }
-
-    private final GZIPInputStream gzipInputStream;
-
-    private GzipFixingInputStream(GZIPInputStream gzipInputStream) {
-      Preconditions.checkNotNull(gzipUnderlyingInputStreamField);
-      this.gzipInputStream = gzipInputStream;
-    }
-
-    @Override
-    public int read() throws IOException {
-      return gzipInputStream.read();
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-      return gzipInputStream.read(b, off, len);
-    }
-
-    @Override
-    public void close() throws IOException {
-      // If possible, finish consuming the underlying InputStream before closing it.
-      if (gzipUnderlyingInputStreamField != null) {
-        try {
-          InputStream underlyingInputStream =
-              (InputStream) gzipUnderlyingInputStreamField.get(gzipInputStream);
-          boolean reachedEndOfStream = false;
-          while (!reachedEndOfStream && callsToRead < MAX_BYTES_TO_CONSUME) {
-            callsToRead++;
-            if (underlyingInputStream.read() == -1) {
-              reachedEndOfStream = true;
-            }
-          }
-          if (!reachedEndOfStream) {
-            logger.log(Level.FINER, "Gave up consuming underlying InputStream");
-          }
-        } catch (Exception e) {
-          // If this fails for any reason, log and move on.
-          logger.log(
-              Level.FINER, "Failed to consume underlying InputStream from GZIPInputStream", e);
-        }
-      }
-      gzipInputStream.close();
-    }
-  }
-
   private static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version";
   private static final String API_FORMAT_VERSION = "2";
 
@@ -182,13 +92,13 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
         }
         httpResponse = httpRequest.execute();
         if (!httpResponse.isSuccessStatusCode()) {
-          try (InputStream content = GzipFixingInputStream.maybeWrap(httpResponse.getContent())) {
+          try (InputStream content = httpResponse.getContent()) {
             throw makeException(url, methodName, content,
                 httpResponse.getContentType(), httpResponse.getContentCharset(), null,
                 httpResponse.getStatusCode());
           }
         }
-        return GzipFixingInputStream.maybeWrap(httpResponse.getContent());
+        return httpResponse.getContent();
       } catch (SocketTimeoutException e) {
         throw makeException(url, methodName, Code.DEADLINE_EXCEEDED, "Deadline exceeded", e);
       } catch (IOException e) {
@@ -253,7 +163,7 @@ static DatastoreException makeException(String url, String methodName, InputStre
           e);
     }
 
-    Code code = Code.valueOf(rpcStatus.getCode());
+    Code code = Code.forNumber(rpcStatus.getCode());
     if (code == null) {
       return makeException(url, methodName, Code.INTERNAL,
           String.format(
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 66b26c6e5a69..86f2559f4c64 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
@@ -16,16 +16,12 @@
 package com.google.datastore.v1.client;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
 
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.util.Charsets;
 import com.google.datastore.v1.BeginTransactionResponse;
-import com.google.datastore.v1.client.RemoteRpc.GzipFixingInputStream;
 import com.google.protobuf.ByteString;
 import com.google.rpc.Code;
 import com.google.rpc.Status;
@@ -121,60 +117,22 @@ public void testPlainTextException() {
   }
 
   @Test
-  public void testGzipHack_NonGzip() throws Exception {
-    BeginTransactionResponse resp = newBeginTransactionResp();
+  public void testGzip() throws IOException, DatastoreException {
+    BeginTransactionResponse response = newBeginTransactionResponse();
     InjectedTestValues injectedTestValues =
-        new InjectedTestValues(resp.toByteArray(), new byte[0], false);
+        new InjectedTestValues(gzip(response), new byte[1], true);
     RemoteRpc rpc = newRemoteRpc(injectedTestValues);
 
     InputStream is = rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance());
-    BeginTransactionResponse parsedResp = BeginTransactionResponse.parseFrom(is);
+    BeginTransactionResponse parsedResponse = BeginTransactionResponse.parseFrom(is);
     is.close();
 
-    assertEquals(resp, parsedResp);
-    assertFalse(is instanceof GzipFixingInputStream);
-  }
-
-  @Test
-  public void testGzipHack_Gzip() throws Exception {
-    BeginTransactionResponse resp = newBeginTransactionResp();
-    InjectedTestValues injectedTestValues = new InjectedTestValues(gzip(resp), new byte[1], true);
-    RemoteRpc rpc = newRemoteRpc(injectedTestValues);
-
-    InputStream is = rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance());
-    BeginTransactionResponse parsedResp = BeginTransactionResponse.parseFrom(is);
-    is.close();
-
-    assertEquals(resp, parsedResp);
-    assertTrue(is instanceof GzipFixingInputStream);
-    assertEquals(1, ((GzipFixingInputStream) is).callsToRead);
+    assertEquals(response, parsedResponse);
     // Check that the underlying stream is exhausted.
     assertEquals(-1, injectedTestValues.inputStream.read());
   }
 
-  @Test
-  public void testGzipHack_GzipTooManyExtraBytes() throws Exception {
-    BeginTransactionResponse resp = newBeginTransactionResp();
-    // NOTE(eddavisson): We might expect 101 extra bytes to be enough that the underlying input
-    // stream is not exhausted, but this is not the case (likely due to a buffer somewhere). 1000
-    // extra bytes seems to be enough. We check the value of callsToRead directly to make sure
-    // we eventually stopped trying to consume the underlying stream.
-    InjectedTestValues injectedTestValues =
-        new InjectedTestValues(gzip(resp), new byte[1000], true);
-    RemoteRpc rpc = newRemoteRpc(injectedTestValues);
-
-    InputStream is = rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance());
-    BeginTransactionResponse parsedResp = BeginTransactionResponse.parseFrom(is);
-    is.close();
-
-    assertEquals(resp, parsedResp);
-    assertTrue(is instanceof GzipFixingInputStream);
-    assertEquals(100, ((GzipFixingInputStream) is).callsToRead);
-    // Check that the underlying stream is _not_ exhausted.
-    assertNotEquals(-1, injectedTestValues.inputStream.read());
-  }
-
-  private static BeginTransactionResponse newBeginTransactionResp() {
+  private static BeginTransactionResponse newBeginTransactionResponse() {
     return BeginTransactionResponse.newBuilder()
         .setTransaction(ByteString.copyFromUtf8("blah-blah-blah"))
         .build();
@@ -187,10 +145,10 @@ private static RemoteRpc newRemoteRpc(InjectedTestValues injectedTestValues) {
         "https://www.example.com/v1/projects/p");
   }
 
-  private byte[] gzip(BeginTransactionResponse resp) throws IOException {
+  private byte[] gzip(BeginTransactionResponse response) throws IOException {
     ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
     try (GZIPOutputStream gzipOut = new GZIPOutputStream(bytesOut)) {
-      resp.writeTo(gzipOut);
+      response.writeTo(gzipOut);
     }
     return bytesOut.toByteArray();
   }

From 2c2800c8345fa6f28eef065041aced2d11bc76f8 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Mon, 4 Nov 2019 11:39:14 -0800
Subject: [PATCH 0246/1784] Bump next snapshot (#6674)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a600fc5ef96d..8f0c93b4794c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.99.0
+  1.99.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.117.0-alpha
+    0.117.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2c84711d447b..7f85e07965c1 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.82.0
+  0.82.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.82.0
+    0.82.1-SNAPSHOT
   
   
     

From 60cf37ff404327b0173ac14d0c275677bdff0823 Mon Sep 17 00:00:00 2001
From: Cody Oss <6331106+codyoss@users.noreply.github.com>
Date: Wed, 6 Nov 2019 14:11:27 -0700
Subject: [PATCH 0247/1784] Release v0.118.0 (#6704)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 5292584a7784..508c7e87a501 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.99.0
+  1.100.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.99.0'
+compile 'com.google.cloud:google-cloud-datastore:1.100.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.99.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.100.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8f0c93b4794c..a82706a89408 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.99.1-SNAPSHOT
+  1.100.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.117.1-alpha-SNAPSHOT
+    0.118.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7f85e07965c1..c0cd05a38af0 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.82.1-SNAPSHOT
+  0.83.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.82.1-SNAPSHOT
+    0.83.0
   
   
     

From 00e0e0c02678423ee1e1adf46ee1c055ae6dda1c Mon Sep 17 00:00:00 2001
From: Cody Oss <6331106+codyoss@users.noreply.github.com>
Date: Fri, 8 Nov 2019 13:21:26 -0700
Subject: [PATCH 0248/1784] Bump next snapshot (#6712)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a82706a89408..8e1601b95c44 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.100.0
+  1.100.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.118.0-alpha
+    0.118.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c0cd05a38af0..dae3da415859 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.83.0
+  0.83.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.83.0
+    0.83.1-SNAPSHOT
   
   
     

From 7dd223b39336ad7e727bf88ed20ffd85ee1213b2 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Mon, 11 Nov 2019 05:18:11 -0500
Subject: [PATCH 0249/1784] Datastore : Reference libraries-bom in docs (#6715)

* Reference libraries-bom in docs

* Fix doc message
---
 google-cloud-datastore/README.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 508c7e87a501..ea34fadc21da 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -12,9 +12,27 @@ Java idiomatic client for [Google Cloud Datastore][cloud-datastore].
 
 Quickstart
 ----------
+If you are using Maven with a BOM, add this to your pom.xml file.
+```xml
+
+ 
+  
+    com.google.cloud
+    libraries-bom
+    2.8.0
+    pom
+    import
+   
+ 
+
 
+
+  com.google.cloud
+  google-cloud-datastore
+
+```
 [//]: # ({x-version-update-start:google-cloud-datastore:released})
-If you are using Maven, add this to your pom.xml file
+If you are using Maven without a BOM, add this to your dependencies.
 ```xml
 
   com.google.cloud

From 4153827267ab89e50218dfcc1f127c07708e222b Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 13 Nov 2019 17:48:04 -0600
Subject: [PATCH 0250/1784] Release v0.119.0 (#6772)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index ea34fadc21da..39461210c9d6 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.100.0
+  1.101.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.100.0'
+compile 'com.google.cloud:google-cloud-datastore:1.101.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.100.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.101.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8e1601b95c44..a5e3ec1f747a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.100.1-SNAPSHOT
+  1.101.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.118.1-alpha-SNAPSHOT
+    0.119.0-alpha
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index dae3da415859..08385cf6373c 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.83.1-SNAPSHOT
+  0.84.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.83.1-SNAPSHOT
+    0.84.0
   
   
     

From f02ba9dca2bc49f5bb46542a0ba3739e7333ca93 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Fri, 15 Nov 2019 09:36:23 -0600
Subject: [PATCH 0251/1784] Bump next snapshot (#6790)

---
 google-cloud-datastore/pom.xml          | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a5e3ec1f747a..96e200530202 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.101.0
+  1.101.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.119.0-alpha
+    0.119.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 08385cf6373c..9f3dee4c063f 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.84.0
+  0.84.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.84.0
+    0.84.1-SNAPSHOT
   
   
     

From 0fa2de167536e8096b69ab4a427159f8ff830546 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Thu, 21 Nov 2019 08:48:11 -0500
Subject: [PATCH 0252/1784] update libraries-bom (#6799)

---
 google-cloud-datastore/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 39461210c9d6..5c204effb0fa 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,7 +19,7 @@ If you are using Maven with a BOM, add this to your pom.xml file.
   
     com.google.cloud
     libraries-bom
-    2.8.0
+    2.9.0
     pom
     import
    

From b758d911c6ba63ca92cab52c4cecb0e4343a97e4 Mon Sep 17 00:00:00 2001
From: Suraj Dhamecha <48670070+suraj-qlogic@users.noreply.github.com>
Date: Tue, 26 Nov 2019 04:37:31 +0530
Subject: [PATCH 0253/1784] Datastore: expose serializedSize for Entity.
 (#6842)

* determine entity size using api

* organize individual import

* updated code

* update code for testcase

* fix review changes

* fix review changes

* fix review changes
---
 .../main/java/com/google/cloud/datastore/Entity.java   | 10 ++++++++++
 .../java/com/google/cloud/datastore/EntityTest.java    |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
index 69d230179b5a..9d3a0c84510e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
@@ -89,4 +89,14 @@ public static Builder newBuilder(Key key, FullEntity copyFrom) {
   public static Entity fromPb(com.google.datastore.v1.Entity entityPb) {
     return new Builder().fill(entityPb).build();
   }
+
+  /**
+   * Returns the size in bytes of the protobuf form of the provided entity.
+   *
+   * @param entity object whose size is measured.
+   */
+  public static int calculateSerializedSize(BaseEntity entity) {
+    checkNotNull(entity);
+    return entity.toPb().getSerializedSize();
+  }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
index a4ffe8a2c88b..31baa87fe379 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
@@ -55,4 +55,9 @@ public void testCopyFromIncompleteEntity() throws Exception {
     assertNotEquals(INCOMPLETE_ENTITY, entity);
     assertEquals(INCOMPLETE_ENTITY.getProperties(), entity.getProperties());
   }
+
+  @Test
+  public void testEntitySize() {
+    assertEquals(ENTITY.toPb().getSerializedSize(), Entity.calculateSerializedSize(ENTITY));
+  }
 }

From 5fa7d694d6ad40a32631f32f1e8779bcf4f8f630 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Tue, 26 Nov 2019 12:18:18 -0600
Subject: [PATCH 0254/1784] deps: google-cloud-clients should not import
 google-cloud-bom (#6903)

* deps: google-cloud-clients should not import google-cloud-bom

* manage storage http client in google-cloud-storage

* google-cloud-examples should let the google-cloud-bom handle versions

update the securitycenter versions in the bom
---
 google-cloud-datastore/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 96e200530202..cf0e09f34c14 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -19,21 +19,22 @@
   
   
     
-      ${project.groupId}
+      com.google.cloud
       google-cloud-core-http
     
     
       com.google.api.grpc
       proto-google-cloud-datastore-v1
+      0.84.1-SNAPSHOT
     
     
       com.google.cloud.datastore
       datastore-v1-proto-client
+      1.6.3
       
-        
         
-          com.google.oauth-client
-          google-oauth-client
+          com.google.api.grpc
+          proto-google-cloud-datastore-v1
         
       
     

From 181cb7aa3273e4b2a6d4cb06979362dcd061cb79 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 2 Dec 2019 15:31:57 -0500
Subject: [PATCH 0255/1784] BOM 3.0.0 (#6964)

---
 google-cloud-datastore/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 5c204effb0fa..76ceecc58e81 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -19,7 +19,7 @@ If you are using Maven with a BOM, add this to your pom.xml file.
   
     com.google.cloud
     libraries-bom
-    2.9.0
+    3.0.0
     pom
     import
    

From 1fa38b00541ca59b68090f871d4f24cb44228a23 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 5 Dec 2019 11:05:16 -0500
Subject: [PATCH 0256/1784] Release v0.120.0 (#6988)

---
 google-cloud-datastore/README.md        | 6 +++---
 google-cloud-datastore/pom.xml          | 6 +++---
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
index 76ceecc58e81..e687f1253633 100644
--- a/google-cloud-datastore/README.md
+++ b/google-cloud-datastore/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.101.0
+  1.102.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.101.0'
+compile 'com.google.cloud:google-cloud-datastore:1.102.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.101.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cf0e09f34c14..f4b83941737b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.101.1-SNAPSHOT
+  1.102.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.119.1-alpha-SNAPSHOT
+    0.120.0-alpha
   
   
     google-cloud-datastore
@@ -25,7 +25,7 @@
     
       com.google.api.grpc
       proto-google-cloud-datastore-v1
-      0.84.1-SNAPSHOT
+      0.85.0
     
     
       com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9f3dee4c063f..3d08f0bf1c41 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.84.1-SNAPSHOT
+  0.85.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.84.1-SNAPSHOT
+    0.85.0
   
   
     

From 9a94b2fa8b31107910ecc0634a167c420e219408 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 5 Dec 2019 13:36:03 -0500
Subject: [PATCH 0257/1784] Bump next snapshot (#6989)

---
 google-cloud-datastore/pom.xml          | 6 +++---
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f4b83941737b..d6b4a3078354 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.0
+  1.102.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.120.0-alpha
+    0.120.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
@@ -25,7 +25,7 @@
     
       com.google.api.grpc
       proto-google-cloud-datastore-v1
-      0.85.0
+      0.85.1-SNAPSHOT
     
     
       com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3d08f0bf1c41..cc685866c7fc 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.85.0
+  0.85.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.85.0
+    0.85.1-SNAPSHOT
   
   
     

From 93181de7441a0ac071fdc82944b4678bb6bfa0ef Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Thu, 19 Dec 2019 14:42:01 -0500
Subject: [PATCH 0258/1784] chore: add .gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..79dd1e39e0b1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+target/
+.idea/
+*.iml
+__pycache__/
+

From 00cb45e969c7585bcb99cad8d0ff05715200b087 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Thu, 19 Dec 2019 15:09:52 -0500
Subject: [PATCH 0259/1784] chore: update synth config

---
 .../.repo-metadata.json => .repo-metadata.json      |  6 +++---
 google-cloud-datastore/README.md => README.md       |  0
 .../synth.metadata => synth.metadata                |  0
 google-cloud-datastore/synth.py => synth.py         | 13 ++++++++++---
 4 files changed, 13 insertions(+), 6 deletions(-)
 rename google-cloud-datastore/.repo-metadata.json => .repo-metadata.json (86%)
 rename google-cloud-datastore/README.md => README.md (100%)
 rename google-cloud-datastore/synth.metadata => synth.metadata (100%)
 rename google-cloud-datastore/synth.py => synth.py (78%)

diff --git a/google-cloud-datastore/.repo-metadata.json b/.repo-metadata.json
similarity index 86%
rename from google-cloud-datastore/.repo-metadata.json
rename to .repo-metadata.json
index 64fc91ebc74f..a345d30bfd66 100644
--- a/google-cloud-datastore/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -6,8 +6,8 @@
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
   "release_level": "ga",
   "language": "java",
-  "repo": "googleapis/google-cloud-java",
-  "repo_short": "google-cloud-java",
+  "repo": "googleapis/java-datastore",
+  "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
   "api_id": "datastore.googleapis.com"
-}
\ No newline at end of file
+}
diff --git a/google-cloud-datastore/README.md b/README.md
similarity index 100%
rename from google-cloud-datastore/README.md
rename to README.md
diff --git a/google-cloud-datastore/synth.metadata b/synth.metadata
similarity index 100%
rename from google-cloud-datastore/synth.metadata
rename to synth.metadata
diff --git a/google-cloud-datastore/synth.py b/synth.py
similarity index 78%
rename from google-cloud-datastore/synth.py
rename to synth.py
index 8bbcbb807878..f43f65350fe3 100644
--- a/google-cloud-datastore/synth.py
+++ b/synth.py
@@ -32,7 +32,14 @@
       artman_output_name='')
 
   # Datastore only generates protos
-  s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')
+  s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')
 
-  java.format_code('./src')
-  java.format_code(f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')
+  java.format_code('google-cloud-datastore/src')
+  java.format_code(f'proto-google-cloud-{service}-{version}/src')
+
+common_templates = gcp.CommonTemplates()
+templates = common_templates.java_library()
+s.copy(templates, excludes=[
+    '.gitignore',
+    'README.md',
+])

From 5575e7e4fe313223cb4d8e780550b3fe00bc26e7 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Thu, 19 Dec 2019 15:12:47 -0500
Subject: [PATCH 0260/1784] chore: generate common config files

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 51 +++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 21 +++++
 .github/ISSUE_TEMPLATE/support_request.md |  7 ++
 .github/PULL_REQUEST_TEMPLATE.md          |  1 +
 .github/release-please.yml                |  2 +
 .kokoro/build.bat                         |  3 +
 .kokoro/build.sh                          | 66 ++++++++++++++++
 .kokoro/coerce_logs.sh                    | 38 +++++++++
 .kokoro/common.cfg                        | 13 ++++
 .kokoro/continuous/common.cfg             | 25 ++++++
 .kokoro/continuous/dependencies.cfg       | 12 +++
 .kokoro/continuous/integration.cfg        |  7 ++
 .kokoro/continuous/java11.cfg             |  7 ++
 .kokoro/continuous/java7.cfg              |  7 ++
 .kokoro/continuous/java8-osx.cfg          |  3 +
 .kokoro/continuous/java8-win.cfg          |  3 +
 .kokoro/continuous/java8.cfg              |  7 ++
 .kokoro/continuous/lint.cfg               | 13 ++++
 .kokoro/continuous/propose_release.cfg    | 53 +++++++++++++
 .kokoro/continuous/propose_release.sh     | 29 +++++++
 .kokoro/dependencies.sh                   | 31 ++++++++
 .kokoro/linkage-monitor.sh                | 33 ++++++++
 .kokoro/nightly/common.cfg                | 25 ++++++
 .kokoro/nightly/dependencies.cfg          | 12 +++
 .kokoro/nightly/integration.cfg           |  7 ++
 .kokoro/nightly/java11.cfg                |  7 ++
 .kokoro/nightly/java7.cfg                 |  7 ++
 .kokoro/nightly/java8-osx.cfg             |  3 +
 .kokoro/nightly/java8-win.cfg             |  3 +
 .kokoro/nightly/java8.cfg                 |  7 ++
 .kokoro/nightly/lint.cfg                  | 13 ++++
 .kokoro/presubmit/clirr.cfg               | 13 ++++
 .kokoro/presubmit/common.cfg              | 34 +++++++++
 .kokoro/presubmit/dependencies.cfg        | 12 +++
 .kokoro/presubmit/integration.cfg         | 31 ++++++++
 .kokoro/presubmit/java11.cfg              |  7 ++
 .kokoro/presubmit/java7.cfg               |  7 ++
 .kokoro/presubmit/java8-osx.cfg           |  3 +
 .kokoro/presubmit/java8-win.cfg           |  3 +
 .kokoro/presubmit/java8.cfg               |  7 ++
 .kokoro/presubmit/linkage-monitor.cfg     | 12 +++
 .kokoro/presubmit/lint.cfg                | 13 ++++
 .kokoro/release/bump_snapshot.cfg         | 53 +++++++++++++
 .kokoro/release/bump_snapshot.sh          | 30 ++++++++
 .kokoro/release/common.cfg                | 49 ++++++++++++
 .kokoro/release/common.sh                 | 50 ++++++++++++
 .kokoro/release/drop.cfg                  |  6 ++
 .kokoro/release/drop.sh                   | 32 ++++++++
 .kokoro/release/promote.cfg               |  6 ++
 .kokoro/release/promote.sh                | 34 +++++++++
 .kokoro/release/publish_javadoc.cfg       | 19 +++++
 .kokoro/release/publish_javadoc.sh        | 55 ++++++++++++++
 .kokoro/release/snapshot.cfg              |  6 ++
 .kokoro/release/snapshot.sh               | 33 ++++++++
 .kokoro/release/stage.cfg                 | 44 +++++++++++
 .kokoro/release/stage.sh                  | 42 ++++++++++
 .kokoro/trampoline.sh                     | 24 ++++++
 CODE_OF_CONDUCT.md                        | 93 +++++++++++++++++++++++
 CONTRIBUTING.md                           | 28 +++++++
 LICENSE                                   |  5 +-
 codecov.yaml                              |  4 +
 java.header                               | 15 ++++
 license-checks.xml                        | 10 +++
 renovate.json                             | 27 +++++++
 synth.metadata                            | 17 +++--
 65 files changed, 1333 insertions(+), 7 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/support_request.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/release-please.yml
 create mode 100644 .kokoro/build.bat
 create mode 100755 .kokoro/build.sh
 create mode 100755 .kokoro/coerce_logs.sh
 create mode 100644 .kokoro/common.cfg
 create mode 100644 .kokoro/continuous/common.cfg
 create mode 100644 .kokoro/continuous/dependencies.cfg
 create mode 100644 .kokoro/continuous/integration.cfg
 create mode 100644 .kokoro/continuous/java11.cfg
 create mode 100644 .kokoro/continuous/java7.cfg
 create mode 100644 .kokoro/continuous/java8-osx.cfg
 create mode 100644 .kokoro/continuous/java8-win.cfg
 create mode 100644 .kokoro/continuous/java8.cfg
 create mode 100644 .kokoro/continuous/lint.cfg
 create mode 100644 .kokoro/continuous/propose_release.cfg
 create mode 100755 .kokoro/continuous/propose_release.sh
 create mode 100755 .kokoro/dependencies.sh
 create mode 100755 .kokoro/linkage-monitor.sh
 create mode 100644 .kokoro/nightly/common.cfg
 create mode 100644 .kokoro/nightly/dependencies.cfg
 create mode 100644 .kokoro/nightly/integration.cfg
 create mode 100644 .kokoro/nightly/java11.cfg
 create mode 100644 .kokoro/nightly/java7.cfg
 create mode 100644 .kokoro/nightly/java8-osx.cfg
 create mode 100644 .kokoro/nightly/java8-win.cfg
 create mode 100644 .kokoro/nightly/java8.cfg
 create mode 100644 .kokoro/nightly/lint.cfg
 create mode 100644 .kokoro/presubmit/clirr.cfg
 create mode 100644 .kokoro/presubmit/common.cfg
 create mode 100644 .kokoro/presubmit/dependencies.cfg
 create mode 100644 .kokoro/presubmit/integration.cfg
 create mode 100644 .kokoro/presubmit/java11.cfg
 create mode 100644 .kokoro/presubmit/java7.cfg
 create mode 100644 .kokoro/presubmit/java8-osx.cfg
 create mode 100644 .kokoro/presubmit/java8-win.cfg
 create mode 100644 .kokoro/presubmit/java8.cfg
 create mode 100644 .kokoro/presubmit/linkage-monitor.cfg
 create mode 100644 .kokoro/presubmit/lint.cfg
 create mode 100644 .kokoro/release/bump_snapshot.cfg
 create mode 100755 .kokoro/release/bump_snapshot.sh
 create mode 100644 .kokoro/release/common.cfg
 create mode 100755 .kokoro/release/common.sh
 create mode 100644 .kokoro/release/drop.cfg
 create mode 100755 .kokoro/release/drop.sh
 create mode 100644 .kokoro/release/promote.cfg
 create mode 100755 .kokoro/release/promote.sh
 create mode 100644 .kokoro/release/publish_javadoc.cfg
 create mode 100755 .kokoro/release/publish_javadoc.sh
 create mode 100644 .kokoro/release/snapshot.cfg
 create mode 100755 .kokoro/release/snapshot.sh
 create mode 100644 .kokoro/release/stage.cfg
 create mode 100755 .kokoro/release/stage.sh
 create mode 100644 .kokoro/trampoline.sh
 create mode 100644 CODE_OF_CONDUCT.md
 create mode 100644 CONTRIBUTING.md
 create mode 100644 codecov.yaml
 create mode 100644 java.header
 create mode 100644 license-checks.xml
 create mode 100644 renovate.json

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000000..11763abd4668
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,51 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+Please run down the following list and make sure you've tried the usual "quick fixes":
+
+  - Search the issues already opened: https://github.com/googleapis/java-datastore/issues
+  - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform
+
+If you are still having issues, please include as much information as possible:
+
+#### Environment details
+
+1. Specify the API at the beginning of the title. For example, "BigQuery: ...").
+   General, Core, and Other are also allowed as types
+2. OS type and version:
+3. Java version:
+4. datastore version(s):
+
+#### Steps to reproduce
+
+  1. ?
+  2. ?
+
+#### Code example
+
+```java
+// example
+```
+
+#### Stack trace
+```
+Any relevant stacktrace here.
+```
+
+#### External references such as API reference guides
+
+- ?
+
+#### Any additional information below
+
+
+Following these steps guarantees the quickest resolution possible.
+
+Thanks!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000000..754e30c68a00
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this library
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+**Is your feature request related to a problem? Please describe.**
+What the problem is. Example: I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+What you want to happen.
+
+**Describe alternatives you've considered**
+Any alternative solutions or features you've considered.
+
+**Additional context**
+Any other context or screenshots about the feature request.
diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md
new file mode 100644
index 000000000000..995869032125
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support_request.md
@@ -0,0 +1,7 @@
+---
+name: Support request
+about: If you have a support contract with Google, please create an issue in the Google Cloud Support console.
+
+---
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000000..0bd0ee0620f9
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1 @@
+Fixes # (it's a good idea to open an issue first for context and/or discussion)
\ No newline at end of file
diff --git a/.github/release-please.yml b/.github/release-please.yml
new file mode 100644
index 000000000000..dce2c8450921
--- /dev/null
+++ b/.github/release-please.yml
@@ -0,0 +1,2 @@
+releaseType: java-yoshi
+bumpMinorPreMajor: true
\ No newline at end of file
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
new file mode 100644
index 000000000000..96f027f411a4
--- /dev/null
+++ b/.kokoro/build.bat
@@ -0,0 +1,3 @@
+:: See documentation in type-shell-output.bat
+
+"C:\Program Files\Git\bin\bash.exe" github/java-datastore/.kokoro/build.sh
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
new file mode 100755
index 000000000000..dc2936ef76a8
--- /dev/null
+++ b/.kokoro/build.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+# Copyright 2019 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.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# Print out Java version
+java -version
+echo ${JOB_TYPE}
+
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true \
+  -Denforcer.skip=true \
+  -Dmaven.javadoc.skip=true \
+  -Dgcloud.download.skip=true \
+  -T 1C
+
+# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
+if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
+    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
+fi
+
+case ${JOB_TYPE} in
+test)
+    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+    bash ${KOKORO_GFILE_DIR}/codecov.sh
+    bash .kokoro/coerce_logs.sh
+    ;;
+lint)
+    mvn com.coveo:fmt-maven-plugin:check
+    ;;
+javadoc)
+    mvn javadoc:javadoc javadoc:test-javadoc
+    ;;
+integration)
+    mvn -B ${INTEGRATION_TEST_ARGS} \
+      -DtrimStackTrace=false \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -fae \
+      verify
+    bash .kokoro/coerce_logs.sh
+    ;;
+clirr)
+    mvn -B -Denforcer.skip=true clirr:check
+    ;;
+*)
+    ;;
+esac
diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
new file mode 100755
index 000000000000..5cf7ba49e6bb
--- /dev/null
+++ b/.kokoro/coerce_logs.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Copyright 2019 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.
+
+# This script finds and moves sponge logs so that they can be found by placer
+# and are not flagged as flaky by sponge.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+job=$(basename ${KOKORO_JOB_NAME})
+
+echo "coercing sponge logs..."
+for xml in `find . -name *-sponge_log.xml`
+do
+  echo "processing ${xml}"
+  class=$(basename ${xml} | cut -d- -f2)
+  dir=$(dirname ${xml})/${job}/${class}
+  text=$(dirname ${xml})/${class}-sponge_log.txt
+  mkdir -p ${dir}
+  mv ${xml} ${dir}/sponge_log.xml
+  mv ${text} ${dir}/sponge_log.txt
+done
diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
new file mode 100644
index 000000000000..6be8cb555662
--- /dev/null
+++ b/.kokoro/common.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# All builds use the trampoline script to run in docker.
+build_file: "java-datastore/.kokoro/trampoline.sh"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/build.sh"
+}
diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg
new file mode 100644
index 000000000000..937eb5bf2738
--- /dev/null
+++ b/.kokoro/continuous/common.cfg
@@ -0,0 +1,25 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-datastore/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
diff --git a/.kokoro/continuous/dependencies.cfg b/.kokoro/continuous/dependencies.cfg
new file mode 100644
index 000000000000..8908efe02d46
--- /dev/null
+++ b/.kokoro/continuous/dependencies.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/dependencies.sh"
+}
diff --git a/.kokoro/continuous/integration.cfg b/.kokoro/continuous/integration.cfg
new file mode 100644
index 000000000000..3b017fc80f04
--- /dev/null
+++ b/.kokoro/continuous/integration.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
diff --git a/.kokoro/continuous/java11.cfg b/.kokoro/continuous/java11.cfg
new file mode 100644
index 000000000000..709f2b4c73db
--- /dev/null
+++ b/.kokoro/continuous/java11.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg
new file mode 100644
index 000000000000..cb24f44eea3b
--- /dev/null
+++ b/.kokoro/continuous/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/.kokoro/continuous/java8-osx.cfg b/.kokoro/continuous/java8-osx.cfg
new file mode 100644
index 000000000000..3ba7de0b1e16
--- /dev/null
+++ b/.kokoro/continuous/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-datastore/.kokoro/build.sh"
diff --git a/.kokoro/continuous/java8-win.cfg b/.kokoro/continuous/java8-win.cfg
new file mode 100644
index 000000000000..85494f810009
--- /dev/null
+++ b/.kokoro/continuous/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-datastore/.kokoro/build.bat"
diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg
new file mode 100644
index 000000000000..3b017fc80f04
--- /dev/null
+++ b/.kokoro/continuous/java8.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
diff --git a/.kokoro/continuous/lint.cfg b/.kokoro/continuous/lint.cfg
new file mode 100644
index 000000000000..6d323c8ae768
--- /dev/null
+++ b/.kokoro/continuous/lint.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "lint"
+}
\ No newline at end of file
diff --git a/.kokoro/continuous/propose_release.cfg b/.kokoro/continuous/propose_release.cfg
new file mode 100644
index 000000000000..8ca7ae7f718a
--- /dev/null
+++ b/.kokoro/continuous/propose_release.cfg
@@ -0,0 +1,53 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-datastore/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/continuous/propose_release.sh"
+}
+
+# tokens used by release-please to keep an up-to-date release PR.
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-key-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-token-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-url-release-please"
+    }
+  }
+}
diff --git a/.kokoro/continuous/propose_release.sh b/.kokoro/continuous/propose_release.sh
new file mode 100755
index 000000000000..c1c2c4ae41b8
--- /dev/null
+++ b/.kokoro/continuous/propose_release.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Copyright 2019 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
+#
+#     https://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.
+
+set -eo pipefail
+
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
+if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
+  # Groom the release PR as new commits are merged.
+  npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
+    --repo-url=googleapis/java-datastore \
+    --package-name="datastore" \
+    --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
+    --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
+    --release-type=java-yoshi
+fi
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
new file mode 100755
index 000000000000..eea23ac6acd5
--- /dev/null
+++ b/.kokoro/dependencies.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright 2019 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.
+
+set -eo pipefail
+
+cd github/java-datastore/
+
+# Print out Java
+java -version
+echo $JOB_TYPE
+
+export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+
+# this should run maven enforcer
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true
+
+mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
new file mode 100755
index 000000000000..1e6f41a515b9
--- /dev/null
+++ b/.kokoro/linkage-monitor.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2019 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.
+
+set -eo pipefail
+# Display commands being run.
+set -x
+
+cd github/java-datastore/
+
+# Print out Java version
+java -version
+echo ${JOB_TYPE}
+
+mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V
+
+# Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
+JAR=linkage-monitor-latest-all-deps.jar
+curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}"
+
+# Fails if there's new linkage errors compared with baseline
+java -jar ${JAR} com.google.cloud:libraries-bom
diff --git a/.kokoro/nightly/common.cfg b/.kokoro/nightly/common.cfg
new file mode 100644
index 000000000000..937eb5bf2738
--- /dev/null
+++ b/.kokoro/nightly/common.cfg
@@ -0,0 +1,25 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-datastore/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
diff --git a/.kokoro/nightly/dependencies.cfg b/.kokoro/nightly/dependencies.cfg
new file mode 100644
index 000000000000..8908efe02d46
--- /dev/null
+++ b/.kokoro/nightly/dependencies.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/dependencies.sh"
+}
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
new file mode 100644
index 000000000000..3b017fc80f04
--- /dev/null
+++ b/.kokoro/nightly/integration.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
diff --git a/.kokoro/nightly/java11.cfg b/.kokoro/nightly/java11.cfg
new file mode 100644
index 000000000000..709f2b4c73db
--- /dev/null
+++ b/.kokoro/nightly/java11.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
diff --git a/.kokoro/nightly/java7.cfg b/.kokoro/nightly/java7.cfg
new file mode 100644
index 000000000000..cb24f44eea3b
--- /dev/null
+++ b/.kokoro/nightly/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/.kokoro/nightly/java8-osx.cfg b/.kokoro/nightly/java8-osx.cfg
new file mode 100644
index 000000000000..3ba7de0b1e16
--- /dev/null
+++ b/.kokoro/nightly/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-datastore/.kokoro/build.sh"
diff --git a/.kokoro/nightly/java8-win.cfg b/.kokoro/nightly/java8-win.cfg
new file mode 100644
index 000000000000..85494f810009
--- /dev/null
+++ b/.kokoro/nightly/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-datastore/.kokoro/build.bat"
diff --git a/.kokoro/nightly/java8.cfg b/.kokoro/nightly/java8.cfg
new file mode 100644
index 000000000000..3b017fc80f04
--- /dev/null
+++ b/.kokoro/nightly/java8.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
diff --git a/.kokoro/nightly/lint.cfg b/.kokoro/nightly/lint.cfg
new file mode 100644
index 000000000000..6d323c8ae768
--- /dev/null
+++ b/.kokoro/nightly/lint.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "lint"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/clirr.cfg b/.kokoro/presubmit/clirr.cfg
new file mode 100644
index 000000000000..ec572442e2e7
--- /dev/null
+++ b/.kokoro/presubmit/clirr.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "clirr"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg
new file mode 100644
index 000000000000..9cd0764c3c93
--- /dev/null
+++ b/.kokoro/presubmit/common.cfg
@@ -0,0 +1,34 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-datastore/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "dpebot_codecov_token"
+    }
+  }
+}
diff --git a/.kokoro/presubmit/dependencies.cfg b/.kokoro/presubmit/dependencies.cfg
new file mode 100644
index 000000000000..8908efe02d46
--- /dev/null
+++ b/.kokoro/presubmit/dependencies.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/dependencies.sh"
+}
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
new file mode 100644
index 000000000000..141f90c13c56
--- /dev/null
+++ b/.kokoro/presubmit/integration.cfg
@@ -0,0 +1,31 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+
+env_vars: {
+    key: "GCLOUD_PROJECT"
+    value: "gcloud-devel"
+}
+
+env_vars: {
+    key: "GOOGLE_APPLICATION_CREDENTIALS"
+    value: "keystore/73713_java_it_service_account"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "java_it_service_account"
+    }
+  }
+}
diff --git a/.kokoro/presubmit/java11.cfg b/.kokoro/presubmit/java11.cfg
new file mode 100644
index 000000000000..709f2b4c73db
--- /dev/null
+++ b/.kokoro/presubmit/java11.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg
new file mode 100644
index 000000000000..cb24f44eea3b
--- /dev/null
+++ b/.kokoro/presubmit/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/.kokoro/presubmit/java8-osx.cfg b/.kokoro/presubmit/java8-osx.cfg
new file mode 100644
index 000000000000..3ba7de0b1e16
--- /dev/null
+++ b/.kokoro/presubmit/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-datastore/.kokoro/build.sh"
diff --git a/.kokoro/presubmit/java8-win.cfg b/.kokoro/presubmit/java8-win.cfg
new file mode 100644
index 000000000000..85494f810009
--- /dev/null
+++ b/.kokoro/presubmit/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "java-datastore/.kokoro/build.bat"
diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg
new file mode 100644
index 000000000000..3b017fc80f04
--- /dev/null
+++ b/.kokoro/presubmit/java8.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
diff --git a/.kokoro/presubmit/linkage-monitor.cfg b/.kokoro/presubmit/linkage-monitor.cfg
new file mode 100644
index 000000000000..505dbd1a9548
--- /dev/null
+++ b/.kokoro/presubmit/linkage-monitor.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/linkage-monitor.sh"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/lint.cfg b/.kokoro/presubmit/lint.cfg
new file mode 100644
index 000000000000..6d323c8ae768
--- /dev/null
+++ b/.kokoro/presubmit/lint.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "lint"
+}
\ No newline at end of file
diff --git a/.kokoro/release/bump_snapshot.cfg b/.kokoro/release/bump_snapshot.cfg
new file mode 100644
index 000000000000..028a07acd0ce
--- /dev/null
+++ b/.kokoro/release/bump_snapshot.cfg
@@ -0,0 +1,53 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-datastore/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/release/bump_snapshot.sh"
+}
+
+# tokens used by release-please to keep an up-to-date release PR.
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-key-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-token-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-url-release-please"
+    }
+  }
+}
diff --git a/.kokoro/release/bump_snapshot.sh b/.kokoro/release/bump_snapshot.sh
new file mode 100755
index 000000000000..4ec44ddfa107
--- /dev/null
+++ b/.kokoro/release/bump_snapshot.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright 2019 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
+#
+#     https://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.
+
+set -eo pipefail
+
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
+if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
+  # Groom the snapshot release PR immediately after publishing a release
+  npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
+    --repo-url=googleapis/java-datastore \
+    --package-name="datastore" \
+    --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
+    --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
+    --snapshot \
+    --release-type=java-auth-yoshi
+fi
diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
new file mode 100644
index 000000000000..49654be53c67
--- /dev/null
+++ b/.kokoro/release/common.cfg
@@ -0,0 +1,49 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-datastore/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-keyring"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-passphrase"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-pubkeyring"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "sonatype-credentials"
+    }
+  }
+}
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
new file mode 100755
index 000000000000..6e3f65999b3d
--- /dev/null
+++ b/.kokoro/release/common.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Copyright 2018 Google Inc.
+#
+# 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.
+
+set -eo pipefail
+
+# Get secrets from keystore and set and environment variables
+setup_environment_secrets() {
+  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
+  export GPG_TTY=$(tty)
+  export GPG_HOMEDIR=/gpg
+  mkdir $GPG_HOMEDIR
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg
+  export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|')
+  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|')
+}
+
+create_settings_xml_file() {
+  echo "
+  
+    
+      ossrh
+      ${SONATYPE_USERNAME}
+      ${SONATYPE_PASSWORD}
+    
+    
+      sonatype-nexus-staging
+      ${SONATYPE_USERNAME}
+      ${SONATYPE_PASSWORD}
+    
+    
+      sonatype-nexus-snapshots
+      ${SONATYPE_USERNAME}
+      ${SONATYPE_PASSWORD}
+    
+  
+" > $1
+}
\ No newline at end of file
diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg
new file mode 100644
index 000000000000..2ad503f7711c
--- /dev/null
+++ b/.kokoro/release/drop.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/release/drop.sh"
+}
diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
new file mode 100755
index 000000000000..5c4551efa2c0
--- /dev/null
+++ b/.kokoro/release/drop.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright 2018 Google Inc.
+#
+# 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.
+
+set -eo pipefail
+
+# STAGING_REPOSITORY_ID must be set
+if [ -z "${STAGING_REPOSITORY_ID}" ]; then
+  echo "Missing STAGING_REPOSITORY_ID environment variable"
+  exit 1
+fi
+
+source $(dirname "$0")/common.sh
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn nexus-staging:drop -B \
+  --settings=settings.xml \
+  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg
new file mode 100644
index 000000000000..fd61153c9256
--- /dev/null
+++ b/.kokoro/release/promote.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/release/promote.sh"
+}
diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
new file mode 100755
index 000000000000..1fa95fa537a3
--- /dev/null
+++ b/.kokoro/release/promote.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Copyright 2018 Google Inc.
+#
+# 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.
+
+set -eo pipefail
+
+# STAGING_REPOSITORY_ID must be set
+if [ -z "${STAGING_REPOSITORY_ID}" ]; then
+  echo "Missing STAGING_REPOSITORY_ID environment variable"
+  exit 1
+fi
+
+source $(dirname "$0")/common.sh
+
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn nexus-staging:release -B \
+  -DperformRelease=true \
+  --settings=settings.xml \
+  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
new file mode 100644
index 000000000000..f321c5f609a6
--- /dev/null
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -0,0 +1,19 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+env_vars: {
+  key: "STAGING_BUCKET"
+  value: "docs-staging"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/release/publish_javadoc.sh"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "docuploader_service_account"
+    }
+  }
+}
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
new file mode 100755
index 000000000000..3dd8fe4a9ab1
--- /dev/null
+++ b/.kokoro/release/publish_javadoc.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+# Copyright 2019 Google Inc.
+#
+# 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.
+
+set -eo pipefail
+
+if [[ -z "${CREDENTIALS}" ]]; then
+  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
+fi
+
+if [[ -z "${STAGING_BUCKET}" ]]; then
+  echo "Need to set STAGING_BUCKET environment variable"
+  exit 1
+fi
+
+# work from the git root directory
+pushd $(dirname "$0")/../../
+
+# install docuploader package
+python3 -m pip install gcp-docuploader
+
+# compile all packages
+mvn clean install -B -DskipTests=true
+
+NAME=google-cloud-datastore
+VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+
+# build the docs
+mvn site -B
+
+pushd target/site/apidocs
+
+# create metadata
+python3 -m docuploader create-metadata \
+  --name ${NAME} \
+  --version ${VERSION} \
+  --language java
+
+# upload docs
+python3 -m docuploader upload . \
+  --credentials ${CREDENTIALS} \
+  --staging-bucket ${STAGING_BUCKET}
+
+popd
diff --git a/.kokoro/release/snapshot.cfg b/.kokoro/release/snapshot.cfg
new file mode 100644
index 000000000000..18722d391b8b
--- /dev/null
+++ b/.kokoro/release/snapshot.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/release/snapshot.sh"
+}
\ No newline at end of file
diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
new file mode 100755
index 000000000000..098168a7373c
--- /dev/null
+++ b/.kokoro/release/snapshot.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2019 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.
+
+set -eo pipefail
+
+source $(dirname "$0")/common.sh
+MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
+pushd $(dirname "$0")/../../
+
+# ensure we're trying to push a snapshot (no-result returns non-zero exit code)
+grep SNAPSHOT versions.txt
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn clean install deploy -B \
+  --settings ${MAVEN_SETTINGS_FILE} \
+  -DperformRelease=true \
+  -Dgpg.executable=gpg \
+  -Dgpg.passphrase=${GPG_PASSPHRASE} \
+  -Dgpg.homedir=${GPG_HOMEDIR}
diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg
new file mode 100644
index 000000000000..c6ff500b2524
--- /dev/null
+++ b/.kokoro/release/stage.cfg
@@ -0,0 +1,44 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/release/stage.sh"
+}
+
+# Need to save the properties file
+action {
+  define_artifacts {
+    regex: "github/java-datastore/target/nexus-staging/staging/*.properties"
+    strip_prefix: "github/java-datastore"
+  }
+}
+
+# Fetch the token needed for reporting release status to GitHub
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "yoshi-automation-github-key"
+    }
+  }
+}
+
+# Fetch magictoken to use with Magic Github Proxy
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "releasetool-magictoken"
+    }
+  }
+}
+
+# Fetch api key to use with Magic Github Proxy
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "magic-github-proxy-api-key"
+    }
+  }
+}
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
new file mode 100755
index 000000000000..3c482cbc55f1
--- /dev/null
+++ b/.kokoro/release/stage.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# Copyright 2018 Google Inc.
+#
+# 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.
+
+set -eo pipefail
+
+# Start the releasetool reporter
+python3 -m pip install gcp-releasetool
+python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
+
+source $(dirname "$0")/common.sh
+MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn clean install deploy -B \
+  --settings ${MAVEN_SETTINGS_FILE} \
+  -DskipTests=true \
+  -DperformRelease=true \
+  -Dgpg.executable=gpg \
+  -Dgpg.passphrase=${GPG_PASSPHRASE} \
+  -Dgpg.homedir=${GPG_HOMEDIR}
+
+if [[ -n "${AUTORELEASE_PR}" ]]
+then
+  mvn nexus-staging:release -B \
+    -DperformRelease=true \
+    --settings=settings.xml
+fi
\ No newline at end of file
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
new file mode 100644
index 000000000000..ba17ce01466b
--- /dev/null
+++ b/.kokoro/trampoline.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Copyright 2018 Google Inc.
+#
+# 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.
+set -eo pipefail
+# Always run the cleanup script, regardless of the success of bouncing into
+# the container.
+function cleanup() {
+    chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
+    ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
+    echo "cleanup";
+}
+trap cleanup EXIT
+python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000000..6b2238bb75e0
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,93 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of
+experience, education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+*   Using welcoming and inclusive language
+*   Being respectful of differing viewpoints and experiences
+*   Gracefully accepting constructive criticism
+*   Focusing on what is best for the community
+*   Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+*   The use of sexualized language or imagery and unwelcome sexual attention or
+    advances
+*   Trolling, insulting/derogatory comments, and personal or political attacks
+*   Public or private harassment
+*   Publishing others' private information, such as a physical or electronic
+    address, without explicit permission
+*   Other conduct which could reasonably be considered inappropriate in a
+    professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening,
+offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+This Code of Conduct also applies outside the project spaces when the Project
+Steward has a reasonable belief that an individual's behavior may have a
+negative impact on the project or its community.
+
+## Conflict Resolution
+
+We do not believe that all conflict is bad; healthy debate and disagreement
+often yield positive results. However, it is never okay to be disrespectful or
+to engage in behavior that violates the project’s code of conduct.
+
+If you see someone violating the code of conduct, you are encouraged to address
+the behavior directly with those involved. Many issues can be resolved quickly
+and easily, and this gives people more control over the outcome of their
+dispute. If you are unable to resolve the matter for any reason, or if the
+behavior is threatening or harassing, report it. We are dedicated to providing
+an environment where participants feel welcome and safe.
+
+Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the
+Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to
+receive and address reported violations of the code of conduct. They will then
+work with a committee consisting of representatives from the Open Source
+Programs Office and the Google Open Source Strategy team. If for any reason you
+are uncomfortable reaching out the Project Steward, please email
+opensource@google.com.
+
+We will investigate every complaint, but you may not receive a direct response.
+We will use our discretion in determining when and how to follow up on reported
+incidents, which may range from not taking action to permanent expulsion from
+the project and project-sponsored spaces. We will notify the accused of the
+report and provide them an opportunity to discuss it before any action is taken.
+The identity of the reporter will be omitted from the details of the report
+supplied to the accused. In potentially harmful situations, such as ongoing
+harassment or threats to anyone's safety, we may take action without notice.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
+available at
+https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000000..ebbb59e5310f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution;
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to  to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
+
+## Community Guidelines
+
+This project follows
+[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 4eedc0116add..d64569567334 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Apache License
+
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,7 +179,7 @@ Apache License
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
diff --git a/codecov.yaml b/codecov.yaml
new file mode 100644
index 000000000000..5724ea9478d7
--- /dev/null
+++ b/codecov.yaml
@@ -0,0 +1,4 @@
+---
+codecov:
+  ci:
+    - source.cloud.google.com
diff --git a/java.header b/java.header
new file mode 100644
index 000000000000..3a9b503aa24f
--- /dev/null
+++ b/java.header
@@ -0,0 +1,15 @@
+^/\*$
+^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$
+^ \*$
+^ \* 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$
+^ \*$
+^ \*[ ]+https?://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\.$
+^ \*/$
diff --git a/license-checks.xml b/license-checks.xml
new file mode 100644
index 000000000000..6597fced808e
--- /dev/null
+++ b/license-checks.xml
@@ -0,0 +1,10 @@
+
+
+
+  
+    
+    
+  
+
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 000000000000..99810470034c
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,27 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "ignoreDeps": [],
+  "packageRules": [
+    {
+      "managers": ["maven"],
+      "packageNames": ["com.google.guava:guava*"],
+      "versionScheme": "docker"
+    },
+    {
+      "packagePatterns": ["^io.grpc:grpc-"],
+      "groupName": "gRPC packages"
+    },
+    {
+      "packagePatterns": ["^com.google.protobuf:protobuf-"],
+      "groupName": "Protobuf packages"
+    },
+    {
+      "packagePatterns": ["^io.opencensus:opencensus-"],
+      "groupName": "OpenCensus packages"
+    }
+  ],
+  "semanticCommits": true,
+  "semanticCommitType": "deps"
+}
diff --git a/synth.metadata b/synth.metadata
index 3cbb7394ce32..d1ae4ff02d10 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,19 +1,26 @@
 {
-  "updateTime": "2019-03-29T07:41:19.868162Z",
+  "updateTime": "2019-12-19T20:10:13.544680Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.16.21",
-        "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78"
+        "version": "0.42.3",
+        "dockerImage": "googleapis/artman@sha256:feed210b5723c6f524b52ef6d7740a030f2d1a8f7c29a71c5e5b4481ceaad7f5"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45",
-        "internalRef": "240841842"
+        "sha": "ade4803e8a1a9e3efd249c8c86895d2f12eb2aaa",
+        "internalRef": "286418383"
+      }
+    },
+    {
+      "template": {
+        "name": "java_library",
+        "origin": "synthtool.gcp",
+        "version": "2019.10.17"
       }
     }
   ],

From 8375bbe3744a192620203a03d10a5c2dbc1f02d1 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Thu, 19 Dec 2019 16:53:19 -0500
Subject: [PATCH 0261/1784] build: update pom configuration

* Create new parent pom
* Create new bom module
* Add all undeclared dependencies
* Remove all declared unused dependencies
* Exclude animal-sniffer from grpc-api dependency due to version diamond
* Bump google.core.version to 1.92.0
* Bump grpc.version to 1.26.0
* Bump gax.version to 1.52.0
* Create versions.txt
---
 google-cloud-datastore-bom/pom.xml      |  87 ++++++++
 google-cloud-datastore/pom.xml          |  57 +++--
 pom.xml                                 | 281 ++++++++++++++++++++++++
 proto-google-cloud-datastore-v1/pom.xml |  28 ++-
 versions.txt                            |   8 +
 5 files changed, 437 insertions(+), 24 deletions(-)
 create mode 100644 google-cloud-datastore-bom/pom.xml
 create mode 100644 pom.xml
 create mode 100644 versions.txt

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
new file mode 100644
index 000000000000..ac72bc1eb44e
--- /dev/null
+++ b/google-cloud-datastore-bom/pom.xml
@@ -0,0 +1,87 @@
+
+
+  4.0.0
+  com.google.cloud
+  google-cloud-datastore-bom
+  1.32.1-SNAPSHOT
+  pom
+  
+    com.google.cloud
+    google-cloud-shared-config
+    0.3.0
+  
+
+  Google Cloud datastore BOM
+  https://github.com/googleapis/java-datastore
+  
+    BOM for Google Cloud datastore
+  
+
+  
+    Google LLC
+  
+
+  
+    
+      chingor13
+      Jeff Ching
+      chingor@google.com
+      Google LLC
+      
+        Developer
+      
+    
+  
+
+  
+    scm:git:https://github.com/googleapis/java-datastore.git
+    scm:git:git@github.com:googleapis/java-datastore.git
+    https://github.com/googleapis/java-datastore
+  
+
+  
+    
+      sonatype-nexus-snapshots
+      https://oss.sonatype.org/content/repositories/snapshots
+    
+    
+      sonatype-nexus-staging
+      https://oss.sonatype.org/service/local/staging/deploy/maven2/
+    
+  
+
+  
+    
+      The Apache Software License, Version 2.0
+      http://www.apache.org/licenses/LICENSE-2.0.txt
+      repo
+    
+  
+
+  
+    
+      
+        com.google.api.grpc
+        proto-google-cloud-datastore-v1
+        0.85.1-SNAPSHOT
+      
+      
+        com.google.cloud
+        google-cloud-datastore
+        1.102.1-SNAPSHOT
+      
+    
+  
+
+  
+    
+      
+        org.apache.maven.plugins
+        maven-checkstyle-plugin
+        
+          true
+        
+      
+    
+  
+
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d6b4a3078354..28f10ddf8a01 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-clients
-    0.120.1-alpha-SNAPSHOT
+    google-cloud-datastore-parent
+    1.102.1-SNAPSHOT
   
   
     google-cloud-datastore
@@ -25,26 +25,58 @@
     
       com.google.api.grpc
       proto-google-cloud-datastore-v1
-      0.85.1-SNAPSHOT
     
     
       com.google.cloud.datastore
       datastore-v1-proto-client
-      1.6.3
+    
+    
+      io.grpc
+      grpc-api
       
+        
+        
         
-          com.google.api.grpc
-          proto-google-cloud-datastore-v1
+          org.codehaus.mojo
+          animal-sniffer-annotations
         
       
     
     
-      com.google.oauth-client
-      google-oauth-client
+      com.google.api
+      api-common
     
     
-      io.grpc
-      grpc-core
+      org.threeten
+      threetenbp
+    
+    
+      com.google.protobuf
+      protobuf-java
+    
+    
+      com.google.api
+      gax
+    
+    
+      com.google.guava
+      guava
+    
+    
+      com.google.cloud
+      google-cloud-core
+    
+    
+      com.google.api.grpc
+      proto-google-common-protos
+    
+    
+      com.google.http-client
+      google-http-client
+    
+    
+      com.google.auth
+      google-auth-library-oauth2-http
     
 
     
@@ -64,10 +96,5 @@
       easymock
       test
     
-    
-      org.objenesis
-      objenesis
-      test
-    
   
 
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000000..3f24c1494b59
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,281 @@
+
+
+  4.0.0
+  com.google.cloud
+  google-cloud-datastore-parent
+  pom
+  1.102.1-SNAPSHOT
+  Google Cloud Firestore Parent
+  https://github.com/googleapis/java-datastore
+  
+    Java idiomatic client for Google Cloud Platform services.
+  
+
+  
+    com.google.cloud
+    google-cloud-shared-config
+    0.3.0
+  
+
+  
+    
+      garrettjonesgoogle
+      Garrett Jones
+      garrettjones@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      pongad
+      Michael Darakananda
+      pongad@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      shinfan
+      Shin Fan
+      shinfan@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      michaelbausor
+      Micheal Bausor
+      michaelbausor@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      vam-google
+      Vadym Matsishevskyi
+      vam@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      tswast
+      Tim Swast
+      tswast@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      neozwu
+      Neo Wu
+      neowu@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      lesv
+      Les Vogel
+      lesv@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      schmidt_sebastian
+      Sebastian Schmidt
+      mrschmidt@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      andreamlin
+      Andrea Lin
+      andrealin@google.com
+      
+        Developer
+      
+    
+    
+      hzyi-google
+      Hanzhen Yi
+      hzyi@google.com
+      
+        Developer
+      
+    
+  
+  
+    Google LLC
+  
+  
+    scm:git:git@github.com:googleapis/java-datastore.git
+    scm:git:git@github.com:googleapis/java-datastore.git
+    https://github.com/googleapis/java-datastore
+    HEAD
+  
+  
+    https://github.com/googleapis/java-datastore/issues
+    GitHub Issues
+  
+  
+    
+      sonatype-nexus-snapshots
+      https://oss.sonatype.org/content/repositories/snapshots
+    
+    
+      sonatype-nexus-staging
+      https://oss.sonatype.org/service/local/staging/deploy/maven2/
+    
+  
+  
+    
+      Apache-2.0
+      https://www.apache.org/licenses/LICENSE-2.0.txt
+    
+  
+
+  
+    UTF-8
+    UTF-8
+    github
+    google-cloud-datastore-parent
+    https://googleapis.dev/java/google-api-grpc/latest
+    1.92.0
+    1.8.1
+    1.17.0
+    1.52.0
+    1.26.0
+    3.11.1
+    4.12
+    28.1-android
+    1.4.0
+    0.24.0
+    1.10.19
+    1.3.2
+    1.0
+  
+
+  
+    
+      
+        com.google.api.grpc
+        proto-google-cloud-datastore-v1
+        0.85.1-SNAPSHOT
+      
+
+      
+        io.grpc
+        grpc-bom
+        ${grpc.version}
+        pom
+        import
+      
+      
+        com.google.api
+        gax-bom
+        ${gax.version}
+        pom
+        import
+      
+      
+        com.google.guava
+        guava-bom
+        ${guava.version}
+        pom
+        import
+      
+
+      
+        com.google.cloud
+        google-cloud-core-http
+        ${google.core.version}
+      
+      
+        com.google.cloud.datastore
+        datastore-v1-proto-client
+        1.6.3
+        
+          
+            com.google.api.grpc
+            proto-google-cloud-datastore-v1
+          
+        
+      
+      
+        com.google.protobuf
+        protobuf-java
+        ${protobuf.version}
+      
+      
+        com.google.api
+        api-common
+        ${google.api-common.version}
+      
+      
+        com.google.api.grpc
+        proto-google-common-protos
+        ${google.common-protos.version}
+      
+      
+        com.google.cloud
+        google-cloud-core
+        ${google.core.version}
+      
+      
+        com.google.auth
+        google-auth-library-oauth2-http
+        0.19.0
+      
+      
+        com.google.http-client
+        google-http-client
+        1.34.0
+      
+
+      
+        org.threeten
+        threetenbp
+        ${threeten.version}
+      
+
+
+      
+        junit
+        junit
+        ${junit.version}
+        test
+      
+      
+        org.easymock
+        easymock
+        4.0.2
+        test
+      
+      
+        com.google.cloud
+        google-cloud-core
+        test-jar
+        test
+        ${google.core.version}
+      
+    
+  
+
+  
+    proto-google-cloud-datastore-v1
+    google-cloud-datastore
+    google-cloud-datastore-bom
+  
+
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cc685866c7fc..2249b1a20473 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -2,14 +2,15 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
+  com.google.api.grpc
   proto-google-cloud-datastore-v1
   0.85.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
-    com.google.api.grpc
-    google-api-grpc
-    0.85.1-SNAPSHOT
+    com.google.cloud
+    google-cloud-datastore-parent
+    1.102.1-SNAPSHOT
   
   
     
@@ -17,15 +18,24 @@
       protobuf-java
       compile
     
-    
-      com.google.api
-      api-common
-      compile
-    
     
       com.google.api.grpc
       proto-google-common-protos
       compile
     
   
-
\ No newline at end of file
+  
+    
+      java9
+      
+        [9,)
+      
+      
+        
+          javax.annotation
+          javax.annotation-api
+        
+      
+    
+  
+
diff --git a/versions.txt b/versions.txt
new file mode 100644
index 000000000000..cc5b34e95d41
--- /dev/null
+++ b/versions.txt
@@ -0,0 +1,8 @@
+# Format:
+# module:released-version:current-version
+
+google-cloud-datastore:1.102.0:1.102.1-SNAPSHOT
+google-cloud-datastore-bom:1.102.0:1.102.1-SNAPSHOT
+google-cloud-datastore-parent:1.102.0:1.102.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.85.0:0.85.1-SNAPSHOT
+

From ef578f92875eb40b846d7a955065c85175ffc89b Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Thu, 19 Dec 2019 16:59:03 -0500
Subject: [PATCH 0262/1784] chore: update synth config to add copyright header
 to generated files

* regenerate protos with new synth config to add copyright headers
---
 .../datastore/v1/AllocateIdsRequest.java      | 213 ++++++++++------
 .../v1/AllocateIdsRequestOrBuilder.java       |  52 +++-
 .../datastore/v1/AllocateIdsResponse.java     |  27 +-
 .../v1/AllocateIdsResponseOrBuilder.java      |  15 ++
 .../com/google/datastore/v1/ArrayValue.java   | 113 +++++----
 .../datastore/v1/ArrayValueOrBuilder.java     |  35 ++-
 .../datastore/v1/BeginTransactionRequest.java |  80 ++++--
 .../v1/BeginTransactionRequestOrBuilder.java  |  31 ++-
 .../v1/BeginTransactionResponse.java          |  37 ++-
 .../v1/BeginTransactionResponseOrBuilder.java |  17 ++
 .../google/datastore/v1/CommitRequest.java    | 138 +++++++---
 .../datastore/v1/CommitRequestOrBuilder.java  |  33 ++-
 .../google/datastore/v1/CommitResponse.java   |  33 ++-
 .../datastore/v1/CommitResponseOrBuilder.java |  17 ++
 .../google/datastore/v1/CompositeFilter.java  |  74 ++++--
 .../v1/CompositeFilterOrBuilder.java          |  19 ++
 .../google/datastore/v1/DatastoreProto.java   | 239 ++++++++++--------
 .../java/com/google/datastore/v1/Entity.java  |  36 ++-
 .../google/datastore/v1/EntityOrBuilder.java  |  19 ++
 .../com/google/datastore/v1/EntityProto.java  |  41 +--
 .../com/google/datastore/v1/EntityResult.java |  98 +++++--
 .../datastore/v1/EntityResultOrBuilder.java   |  33 ++-
 .../java/com/google/datastore/v1/Filter.java  |  49 +++-
 .../google/datastore/v1/FilterOrBuilder.java  |  23 ++
 .../com/google/datastore/v1/GqlQuery.java     |  77 ++++--
 .../datastore/v1/GqlQueryOrBuilder.java       |  21 ++
 .../datastore/v1/GqlQueryParameter.java       |  50 +++-
 .../v1/GqlQueryParameterOrBuilder.java        |  21 ++
 .../java/com/google/datastore/v1/Key.java     | 125 +++++++--
 .../com/google/datastore/v1/KeyOrBuilder.java |  19 ++
 .../google/datastore/v1/KindExpression.java   |  38 ++-
 .../datastore/v1/KindExpressionOrBuilder.java |  19 ++
 .../google/datastore/v1/LookupRequest.java    | 215 ++++++++++------
 .../datastore/v1/LookupRequestOrBuilder.java  |  56 +++-
 .../google/datastore/v1/LookupResponse.java   |  21 ++
 .../datastore/v1/LookupResponseOrBuilder.java |  15 ++
 .../com/google/datastore/v1/Mutation.java     |  85 ++++++-
 .../datastore/v1/MutationOrBuilder.java       |  33 +++
 .../google/datastore/v1/MutationResult.java   |  48 +++-
 .../datastore/v1/MutationResultOrBuilder.java |  23 ++
 .../com/google/datastore/v1/PartitionId.java  |  54 +++-
 .../datastore/v1/PartitionIdOrBuilder.java    |  23 ++
 .../com/google/datastore/v1/Projection.java   |  30 ++-
 .../datastore/v1/ProjectionOrBuilder.java     |  19 ++
 .../google/datastore/v1/PropertyFilter.java   |  64 ++++-
 .../datastore/v1/PropertyFilterOrBuilder.java |  27 ++
 .../google/datastore/v1/PropertyOrder.java    |  56 +++-
 .../datastore/v1/PropertyOrderOrBuilder.java  |  23 ++
 .../datastore/v1/PropertyReference.java       |  38 ++-
 .../v1/PropertyReferenceOrBuilder.java        |  19 ++
 .../java/com/google/datastore/v1/Query.java   | 115 +++++++--
 .../google/datastore/v1/QueryOrBuilder.java   |  29 +++
 .../com/google/datastore/v1/QueryProto.java   |  41 +--
 .../google/datastore/v1/QueryResultBatch.java | 126 +++++++--
 .../v1/QueryResultBatchOrBuilder.java         |  31 +++
 .../com/google/datastore/v1/ReadOptions.java  |  68 ++++-
 .../datastore/v1/ReadOptionsOrBuilder.java    |  21 ++
 .../datastore/v1/ReserveIdsRequest.java       | 229 +++++++++++------
 .../v1/ReserveIdsRequestOrBuilder.java        |  56 +++-
 .../datastore/v1/ReserveIdsResponse.java      |  27 +-
 .../v1/ReserveIdsResponseOrBuilder.java       |  15 ++
 .../google/datastore/v1/RollbackRequest.java  |  91 +++++--
 .../v1/RollbackRequestOrBuilder.java          |  33 ++-
 .../google/datastore/v1/RollbackResponse.java |  31 ++-
 .../v1/RollbackResponseOrBuilder.java         |  15 ++
 .../google/datastore/v1/RunQueryRequest.java  | 109 ++++++--
 .../v1/RunQueryRequestOrBuilder.java          |  43 +++-
 .../google/datastore/v1/RunQueryResponse.java |  44 +++-
 .../v1/RunQueryResponseOrBuilder.java         |  23 ++
 .../datastore/v1/TransactionOptions.java      |  85 ++++++-
 .../v1/TransactionOptionsOrBuilder.java       |  23 ++
 .../java/com/google/datastore/v1/Value.java   | 187 ++++++++++++--
 .../google/datastore/v1/ValueOrBuilder.java   |  63 ++++-
 .../proto/google/datastore/v1/datastore.proto | 107 ++++----
 .../proto/google/datastore/v1/entity.proto    |  10 +-
 .../proto/google/datastore/v1/query.proto     |  12 +-
 synth.metadata                                |   6 +-
 synth.py                                      |  25 ++
 78 files changed, 3502 insertions(+), 854 deletions(-)

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 537b64476310..1e5c2b4fff44 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
@@ -28,6 +42,12 @@ private AllocateIdsRequest() {
     keys_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new AllocateIdsRequest();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -54,9 +74,9 @@ private AllocateIdsRequest(
             break;
           case 10:
             {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
               break;
@@ -82,7 +102,7 @@ private AllocateIdsRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
       }
       this.unknownFields = unknownFields.build();
@@ -105,17 +125,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.AllocateIdsRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -132,10 +153,12 @@ public java.lang.String getProjectId() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -155,11 +178,12 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public java.util.List getKeysList() {
     return keys_;
@@ -168,11 +192,12 @@ public java.util.List getKeysList() {
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public java.util.List getKeysOrBuilderList() {
     return keys_;
@@ -181,11 +206,12 @@ public java.util.List getKeysOrB
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public int getKeysCount() {
     return keys_.size();
@@ -194,11 +220,12 @@ public int getKeysCount() {
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
@@ -207,11 +234,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
@@ -391,8 +419,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
@@ -439,7 +466,7 @@ public Builder clear() {
 
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
         keysBuilder_.clear();
       }
@@ -471,18 +498,16 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
       com.google.datastore.v1.AllocateIdsRequest result =
           new com.google.datastore.v1.AllocateIdsRequest(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       result.projectId_ = projectId_;
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.keys_ = keys_;
       } else {
         result.keys_ = keysBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -540,7 +565,7 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureKeysIsMutable();
             keys_.addAll(other.keys_);
@@ -553,7 +578,7 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
             keysBuilder_.dispose();
             keysBuilder_ = null;
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             keysBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getKeysFieldBuilder()
@@ -599,10 +624,12 @@ public Builder mergeFrom(
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -619,10 +646,12 @@ public java.lang.String getProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -639,10 +668,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -657,10 +689,12 @@ public Builder setProjectId(java.lang.String value) {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -672,10 +706,13 @@ public Builder clearProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -691,9 +728,9 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -707,11 +744,12 @@ private void ensureKeysIsMutable() {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysList() {
       if (keysBuilder_ == null) {
@@ -724,11 +762,12 @@ public java.util.List getKeysList() {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public int getKeysCount() {
       if (keysBuilder_ == null) {
@@ -741,11 +780,12 @@ public int getKeysCount() {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key getKeys(int index) {
       if (keysBuilder_ == null) {
@@ -758,11 +798,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -781,11 +822,12 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -801,11 +843,12 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -824,11 +867,12 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -847,11 +891,12 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -867,11 +912,12 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -887,11 +933,12 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
@@ -907,16 +954,17 @@ public Builder addAllKeys(java.lang.Iterable
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder clearKeys() {
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         keysBuilder_.clear();
@@ -927,11 +975,12 @@ public Builder clearKeys() {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder removeKeys(int index) {
       if (keysBuilder_ == null) {
@@ -947,11 +996,12 @@ public Builder removeKeys(int index) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
       return getKeysFieldBuilder().getBuilder(index);
@@ -960,11 +1010,12 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
       if (keysBuilder_ == null) {
@@ -977,11 +1028,12 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
@@ -994,11 +1046,12 @@ public java.util.List getKeysOrB
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
       return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
@@ -1007,11 +1060,12 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
       return getKeysFieldBuilder()
@@ -1021,11 +1075,12 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
      *
      *
      * 
-     * A list of keys with incomplete key paths for which to allocate IDs.
+     * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
@@ -1042,7 +1097,7 @@ public java.util.List getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
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 27d9f7326105..34e9db57bf1b 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -12,20 +27,24 @@ public interface AllocateIdsRequestOrBuilder
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -33,55 +52,60 @@ public interface AllocateIdsRequestOrBuilder
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   java.util.List getKeysList();
   /**
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   int getKeysCount();
   /**
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   java.util.List getKeysOrBuilderList();
   /**
    *
    *
    * 
-   * A list of keys with incomplete key paths for which to allocate IDs.
+   * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
 }
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 d9bda56be312..7040cbbfa039 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,8 +22,7 @@
  *
  *
  * 
- * The response for
- * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
@@ -27,6 +41,12 @@ private AllocateIdsResponse() {
     keys_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new AllocateIdsResponse();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -330,8 +350,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for
-   * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 6b641552786d..1ba60a1b4b1a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
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 f70566489e53..2de3e68b32a3 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -26,6 +41,12 @@ private ArrayValue() {
     values_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ArrayValue();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -104,8 +125,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -118,8 +139,8 @@ public java.util.List getValuesList() {
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -132,8 +153,8 @@ public java.util.List getValue
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -146,8 +167,8 @@ public int getValuesCount() {
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -160,8 +181,8 @@ public com.google.datastore.v1.Value getValues(int index) {
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -546,8 +567,8 @@ private void ensureValuesIsMutable() {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -564,8 +585,8 @@ public java.util.List getValuesList() {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -582,8 +603,8 @@ public int getValuesCount() {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -600,8 +621,8 @@ public com.google.datastore.v1.Value getValues(int index) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -624,8 +645,8 @@ public Builder setValues(int index, com.google.datastore.v1.Value value) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -645,8 +666,8 @@ public Builder setValues(int index, com.google.datastore.v1.Value.Builder builde
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -669,8 +690,8 @@ public Builder addValues(com.google.datastore.v1.Value value) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -693,8 +714,8 @@ public Builder addValues(int index, com.google.datastore.v1.Value value) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -714,8 +735,8 @@ public Builder addValues(com.google.datastore.v1.Value.Builder builderForValue)
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -735,8 +756,8 @@ public Builder addValues(int index, com.google.datastore.v1.Value.Builder builde
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -757,8 +778,8 @@ public Builder addAllValues(
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -778,8 +799,8 @@ public Builder clearValues() {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -799,8 +820,8 @@ public Builder removeValues(int index) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -813,8 +834,8 @@ public com.google.datastore.v1.Value.Builder getValuesBuilder(int index) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -831,8 +852,8 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -850,8 +871,8 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -864,8 +885,8 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder() {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
@@ -879,8 +900,8 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder(int index) {
      *
      * 
      * Values in the array.
-     * The order of this array may not be preserved if it contains a mix of
-     * indexed and unindexed values.
+     * The order of values in an array is preserved as long as all values have
+     * identical settings for 'exclude_from_indexes'.
      * 

      *
      * repeated .google.datastore.v1.Value values = 1;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index 8ce531d1b4e2..d0b1fdef5167 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -13,8 +28,8 @@ public interface ArrayValueOrBuilder
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -25,8 +40,8 @@ public interface ArrayValueOrBuilder
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -37,8 +52,8 @@ public interface ArrayValueOrBuilder
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -49,8 +64,8 @@ public interface ArrayValueOrBuilder
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
@@ -61,8 +76,8 @@ public interface ArrayValueOrBuilder
    *
    * 
    * Values in the array.
-   * The order of this array may not be preserved if it contains a mix of
-   * indexed and unindexed values.
+   * The order of values in an array is preserved as long as all values have
+   * identical settings for 'exclude_from_indexes'.
    * 

    *
    * repeated .google.datastore.v1.Value values = 1;
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 35427a4396af..4eeca6e24364 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
@@ -27,6 +41,12 @@ private BeginTransactionRequest() {
     projectId_ = "";
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new BeginTransactionRequest();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -40,7 +60,6 @@ private BeginTransactionRequest(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -114,10 +133,12 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -134,10 +155,12 @@ public java.lang.String getProjectId() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -161,6 +184,8 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
+   *
+   * @return Whether the transactionOptions field is set.
    */
   public boolean hasTransactionOptions() {
     return transactionOptions_ != null;
@@ -173,6 +198,8 @@ public boolean hasTransactionOptions() {
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
+   *
+   * @return The transactionOptions.
    */
   public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
     return transactionOptions_ == null
@@ -369,8 +396,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
@@ -543,10 +569,12 @@ public Builder mergeFrom(
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -563,10 +591,12 @@ public java.lang.String getProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -583,10 +613,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -601,10 +634,12 @@ public Builder setProjectId(java.lang.String value) {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -616,10 +651,13 @@ public Builder clearProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -646,6 +684,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
+     *
+     * @return Whether the transactionOptions field is set.
      */
     public boolean hasTransactionOptions() {
       return transactionOptionsBuilder_ != null || transactionOptions_ != null;
@@ -658,6 +698,8 @@ public boolean hasTransactionOptions() {
      * 

      *
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
+     *
+     * @return The transactionOptions.
      */
     public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
       if (transactionOptionsBuilder_ == null) {
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 f37d9655aea8..50ba8a2ff79a 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -12,20 +27,24 @@ public interface BeginTransactionRequestOrBuilder
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -37,6 +56,8 @@ public interface BeginTransactionRequestOrBuilder
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
+   *
+   * @return Whether the transactionOptions field is set.
    */
   boolean hasTransactionOptions();
   /**
@@ -47,6 +68,8 @@ public interface BeginTransactionRequestOrBuilder
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
+   *
+   * @return The transactionOptions.
    */
   com.google.datastore.v1.TransactionOptions getTransactionOptions();
   /**
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 f9492f917447..b1809c176eb1 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,8 +22,7 @@
  *
  *
  * 
- * The response for
- * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
@@ -27,6 +41,12 @@ private BeginTransactionResponse() {
     transaction_ = com.google.protobuf.ByteString.EMPTY;
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new BeginTransactionResponse();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -40,7 +60,6 @@ private BeginTransactionResponse(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -100,6 +119,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 

    *
    * bytes transaction = 1;
+   *
+   * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
@@ -268,8 +289,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for
-   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
@@ -431,6 +451,8 @@ public Builder mergeFrom(
      * 

      *
      * bytes transaction = 1;
+     *
+     * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
@@ -443,6 +465,9 @@ public com.google.protobuf.ByteString getTransaction() {
      * 

      *
      * bytes transaction = 1;
+     *
+     * @param value The transaction to set.
+     * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -461,6 +486,8 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes transaction = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearTransaction() {
 
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index 7defec39f313..dcd155818e44 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -16,6 +31,8 @@ public interface BeginTransactionResponseOrBuilder
    * 

    *
    * bytes transaction = 1;
+   *
+   * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
 }
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 dbaa7e77d9e5..8f4f7abae48c 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -28,6 +43,12 @@ private CommitRequest() {
     mutations_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new CommitRequest();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -67,9 +88,9 @@ private CommitRequest(
             }
           case 50:
             {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mutations_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000001;
               }
               mutations_.add(
                   input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry));
@@ -96,7 +117,7 @@ private CommitRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         mutations_ = java.util.Collections.unmodifiableList(mutations_);
       }
       this.unknownFields = unknownFields.build();
@@ -205,12 +226,20 @@ public final int getNumber() {
       return value;
     }
 
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static Mode valueOf(int value) {
       return forNumber(value);
     }
 
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
     public static Mode forNumber(int value) {
       switch (value) {
         case 0:
@@ -268,11 +297,13 @@ private Mode(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.v1.CommitRequest.Mode)
   }
 
-  private int bitField0_;
   private int transactionSelectorCase_ = 0;
   private java.lang.Object transactionSelector_;
 
-  public enum TransactionSelectorCase implements com.google.protobuf.Internal.EnumLite {
+  public enum TransactionSelectorCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     TRANSACTION(1),
     TRANSACTIONSELECTOR_NOT_SET(0);
     private final int value;
@@ -280,7 +311,11 @@ public enum TransactionSelectorCase implements com.google.protobuf.Internal.Enum
     private TransactionSelectorCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static TransactionSelectorCase valueOf(int value) {
       return forNumber(value);
@@ -312,10 +347,12 @@ public TransactionSelectorCase getTransactionSelectorCase() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -332,10 +369,12 @@ public java.lang.String getProjectId() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -359,6 +398,8 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
+   *
+   * @return The enum numeric value on the wire for mode.
    */
   public int getModeValue() {
     return mode_;
@@ -371,6 +412,8 @@ public int getModeValue() {
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
+   *
+   * @return The mode.
    */
   public com.google.datastore.v1.CommitRequest.Mode getMode() {
     @SuppressWarnings("deprecation")
@@ -390,6 +433,8 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
    * 

    *
    * bytes transaction = 1;
+   *
+   * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
     if (transactionSelectorCase_ == 1) {
@@ -761,7 +806,7 @@ public Builder clear() {
 
       if (mutationsBuilder_ == null) {
         mutations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
         mutationsBuilder_.clear();
       }
@@ -795,22 +840,20 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
       com.google.datastore.v1.CommitRequest result =
           new com.google.datastore.v1.CommitRequest(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       result.projectId_ = projectId_;
       result.mode_ = mode_;
       if (transactionSelectorCase_ == 1) {
         result.transactionSelector_ = transactionSelector_;
       }
       if (mutationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           mutations_ = java.util.Collections.unmodifiableList(mutations_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.mutations_ = mutations_;
       } else {
         result.mutations_ = mutationsBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       result.transactionSelectorCase_ = transactionSelectorCase_;
       onBuilt();
       return result;
@@ -872,7 +915,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
         if (!other.mutations_.isEmpty()) {
           if (mutations_.isEmpty()) {
             mutations_ = other.mutations_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureMutationsIsMutable();
             mutations_.addAll(other.mutations_);
@@ -885,7 +928,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
             mutationsBuilder_.dispose();
             mutationsBuilder_ = null;
             mutations_ = other.mutations_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
             mutationsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMutationsFieldBuilder()
@@ -956,10 +999,12 @@ public Builder clearTransactionSelector() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -976,10 +1021,12 @@ public java.lang.String getProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -996,10 +1043,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -1014,10 +1064,12 @@ public Builder setProjectId(java.lang.String value) {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -1029,10 +1081,13 @@ public Builder clearProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -1054,6 +1109,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
+     *
+     * @return The enum numeric value on the wire for mode.
      */
     public int getModeValue() {
       return mode_;
@@ -1066,6 +1123,9 @@ public int getModeValue() {
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
+     *
+     * @param value The enum numeric value on the wire for mode to set.
+     * @return This builder for chaining.
      */
     public Builder setModeValue(int value) {
       mode_ = value;
@@ -1080,6 +1140,8 @@ public Builder setModeValue(int value) {
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
+     *
+     * @return The mode.
      */
     public com.google.datastore.v1.CommitRequest.Mode getMode() {
       @SuppressWarnings("deprecation")
@@ -1095,6 +1157,9 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
+     *
+     * @param value The mode to set.
+     * @return This builder for chaining.
      */
     public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
       if (value == null) {
@@ -1113,6 +1178,8 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearMode() {
 
@@ -1131,6 +1198,8 @@ public Builder clearMode() {
      * 

      *
      * bytes transaction = 1;
+     *
+     * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
       if (transactionSelectorCase_ == 1) {
@@ -1148,6 +1217,9 @@ public com.google.protobuf.ByteString getTransaction() {
      * 

      *
      * bytes transaction = 1;
+     *
+     * @param value The transaction to set.
+     * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -1168,6 +1240,8 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes transaction = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearTransaction() {
       if (transactionSelectorCase_ == 1) {
@@ -1182,9 +1256,9 @@ public Builder clearTransaction() {
         java.util.Collections.emptyList();
 
     private void ensureMutationsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         mutations_ = new java.util.ArrayList(mutations_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1498,7 +1572,7 @@ public Builder addAllMutations(
     public Builder clearMutations() {
       if (mutationsBuilder_ == null) {
         mutations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         mutationsBuilder_.clear();
@@ -1682,7 +1756,7 @@ public java.util.List getMutationsBuil
                 com.google.datastore.v1.Mutation,
                 com.google.datastore.v1.Mutation.Builder,
                 com.google.datastore.v1.MutationOrBuilder>(
-                mutations_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                mutations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         mutations_ = null;
       }
       return mutationsBuilder_;
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 4e6bf89cd325..8f7d768451c2 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -12,20 +27,24 @@ public interface CommitRequestOrBuilder
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -37,6 +56,8 @@ public interface CommitRequestOrBuilder
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
+   *
+   * @return The enum numeric value on the wire for mode.
    */
   int getModeValue();
   /**
@@ -47,6 +68,8 @@ public interface CommitRequestOrBuilder
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
+   *
+   * @return The mode.
    */
   com.google.datastore.v1.CommitRequest.Mode getMode();
 
@@ -60,6 +83,8 @@ public interface CommitRequestOrBuilder
    * 

    *
    * bytes transaction = 1;
+   *
+   * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
 
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 bf4d10f0e43a..d7af5d5fc5e7 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -26,6 +41,12 @@ private CommitResponse() {
     mutationResults_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new CommitResponse();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -104,7 +125,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.CommitResponse.Builder.class);
   }
 
-  private int bitField0_;
   public static final int MUTATION_RESULTS_FIELD_NUMBER = 3;
   private java.util.List mutationResults_;
   /**
@@ -185,6 +205,8 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
    * 

    *
    * int32 index_updates = 4;
+   *
+   * @return The indexUpdates.
    */
   public int getIndexUpdates() {
     return indexUpdates_;
@@ -442,7 +464,6 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
       com.google.datastore.v1.CommitResponse result =
           new com.google.datastore.v1.CommitResponse(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       if (mutationResultsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_);
@@ -453,7 +474,6 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
         result.mutationResults_ = mutationResultsBuilder_.build();
       }
       result.indexUpdates_ = indexUpdates_;
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -946,6 +966,8 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
      * 

      *
      * int32 index_updates = 4;
+     *
+     * @return The indexUpdates.
      */
     public int getIndexUpdates() {
       return indexUpdates_;
@@ -959,6 +981,9 @@ public int getIndexUpdates() {
      * 

      *
      * int32 index_updates = 4;
+     *
+     * @param value The indexUpdates to set.
+     * @return This builder for chaining.
      */
     public Builder setIndexUpdates(int value) {
 
@@ -975,6 +1000,8 @@ public Builder setIndexUpdates(int value) {
      * 

      *
      * int32 index_updates = 4;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearIndexUpdates() {
 
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 3a4a5e37c826..7394bb2d0e70 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -74,6 +89,8 @@ public interface CommitResponseOrBuilder
    * 

    *
    * int32 index_updates = 4;
+   *
+   * @return The indexUpdates.
    */
   int getIndexUpdates();
 }
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 cb5cbb5c486d..90dc8bc51849 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -27,6 +42,12 @@ private CompositeFilter() {
     filters_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new CompositeFilter();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -60,9 +81,9 @@ private CompositeFilter(
             }
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 filters_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               filters_.add(
                   input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry));
@@ -82,7 +103,7 @@ private CompositeFilter(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         filters_ = java.util.Collections.unmodifiableList(filters_);
       }
       this.unknownFields = unknownFields.build();
@@ -167,12 +188,20 @@ public final int getNumber() {
       return value;
     }
 
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static Operator valueOf(int value) {
       return forNumber(value);
     }
 
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
     public static Operator forNumber(int value) {
       switch (value) {
         case 0:
@@ -228,7 +257,6 @@ private Operator(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.v1.CompositeFilter.Operator)
   }
 
-  private int bitField0_;
   public static final int OP_FIELD_NUMBER = 1;
   private int op_;
   /**
@@ -239,6 +267,8 @@ private Operator(int value) {
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
+   *
+   * @return The enum numeric value on the wire for op.
    */
   public int getOpValue() {
     return op_;
@@ -251,6 +281,8 @@ public int getOpValue() {
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
+   *
+   * @return The op.
    */
   public com.google.datastore.v1.CompositeFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
@@ -548,7 +580,7 @@ public Builder clear() {
 
       if (filtersBuilder_ == null) {
         filters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
         filtersBuilder_.clear();
       }
@@ -580,18 +612,16 @@ public com.google.datastore.v1.CompositeFilter buildPartial() {
       com.google.datastore.v1.CompositeFilter result =
           new com.google.datastore.v1.CompositeFilter(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       result.op_ = op_;
       if (filtersBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           filters_ = java.util.Collections.unmodifiableList(filters_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.filters_ = filters_;
       } else {
         result.filters_ = filtersBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -648,7 +678,7 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
         if (!other.filters_.isEmpty()) {
           if (filters_.isEmpty()) {
             filters_ = other.filters_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureFiltersIsMutable();
             filters_.addAll(other.filters_);
@@ -661,7 +691,7 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
             filtersBuilder_.dispose();
             filtersBuilder_ = null;
             filters_ = other.filters_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             filtersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFiltersFieldBuilder()
@@ -711,6 +741,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
+     *
+     * @return The enum numeric value on the wire for op.
      */
     public int getOpValue() {
       return op_;
@@ -723,6 +755,9 @@ public int getOpValue() {
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
+     *
+     * @param value The enum numeric value on the wire for op to set.
+     * @return This builder for chaining.
      */
     public Builder setOpValue(int value) {
       op_ = value;
@@ -737,6 +772,8 @@ public Builder setOpValue(int value) {
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
+     *
+     * @return The op.
      */
     public com.google.datastore.v1.CompositeFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
@@ -754,6 +791,9 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
+     *
+     * @param value The op to set.
+     * @return This builder for chaining.
      */
     public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
       if (value == null) {
@@ -772,6 +812,8 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearOp() {
 
@@ -784,9 +826,9 @@ public Builder clearOp() {
         java.util.Collections.emptyList();
 
     private void ensureFiltersIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         filters_ = new java.util.ArrayList(filters_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1010,7 +1052,7 @@ public Builder addAllFilters(
     public Builder clearFilters() {
       if (filtersBuilder_ == null) {
         filters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         filtersBuilder_.clear();
@@ -1138,7 +1180,7 @@ public java.util.List getFiltersBuilderL
                 com.google.datastore.v1.Filter,
                 com.google.datastore.v1.Filter.Builder,
                 com.google.datastore.v1.FilterOrBuilder>(
-                filters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                filters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         filters_ = null;
       }
       return filtersBuilder_;
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 5b348d6f78c6..aed9664e821e 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface CompositeFilterOrBuilder
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
+   *
+   * @return The enum numeric value on the wire for op.
    */
   int getOpValue();
   /**
@@ -26,6 +43,8 @@ public interface CompositeFilterOrBuilder
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
+   *
+   * @return The op.
    */
   com.google.datastore.v1.CompositeFilter.Operator getOp();
 
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 89c02a5e2224..dc4d63dccc4d 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -103,114 +118,118 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n#google/datastore/v1/datastore.proto\022\023g"
           + "oogle.datastore.v1\032\034google/api/annotatio"
-          + "ns.proto\032 google/datastore/v1/entity.pro"
-          + "to\032\037google/datastore/v1/query.proto\"\203\001\n\r"
-          + "LookupRequest\022\022\n\nproject_id\030\010 \001(\t\0226\n\014rea"
-          + "d_options\030\001 \001(\0132 .google.datastore.v1.Re"
-          + "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto"
-          + "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 "
-          + "\003(\0132!.google.datastore.v1.EntityResult\0222"
-          + "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En"
-          + "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da"
-          + "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr"
-          + "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g"
-          + "oogle.datastore.v1.PartitionId\0226\n\014read_o"
-          + "ptions\030\001 \001(\0132 .google.datastore.v1.ReadO"
-          + "ptions\022+\n\005query\030\003 \001(\0132\032.google.datastore"
-          + ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google."
-          + "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n"
-          + "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl"
-          + "e.datastore.v1.QueryResultBatch\022)\n\005query"
-          + "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be"
-          + "ginTransactionRequest\022\022\n\nproject_id\030\010 \001("
-          + "\t\022D\n\023transaction_options\030\n \001(\0132\'.google."
-          + "datastore.v1.TransactionOptions\"/\n\030Begin"
-          + "TransactionResponse\022\023\n\013transaction\030\001 \001(\014"
-          + "\":\n\017RollbackRequest\022\022\n\nproject_id\030\010 \001(\t\022"
-          + "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse"
-          + "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225"
-          + "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi"
-          + "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t"
-          + "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu"
-          + "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r"
-          + "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026"
-          + "\n\024transaction_selector\"f\n\016CommitResponse"
-          + "\022=\n\020mutation_results\030\003 \003(\0132#.google.data"
-          + "store.v1.MutationResult\022\025\n\rindex_updates"
-          + "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_"
-          + "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor"
-          + "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030"
-          + "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser"
-          + "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data"
-          + "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat"
-          + "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010"
-          + "Mutation\022-\n\006insert\030\004 \001(\0132\033.google.datast"
-          + "ore.v1.EntityH\000\022-\n\006update\030\005 \001(\0132\033.google"
-          + ".datastore.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033"
-          + ".google.datastore.v1.EntityH\000\022*\n\006delete\030"
-          + "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas"
-          + "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli"
-          + "ct_detection_strategy\"c\n\016MutationResult\022"
-          + "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017"
-          + "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001"
-          + "(\010\"\325\001\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\""
-          + "M\n\017ReadConsistency\022 \n\034READ_CONSISTENCY_U"
-          + "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022"
-          + "\n\020consistency_type\"\343\001\n\022TransactionOption"
-          + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore"
-          + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre"
-          + "ad_only\030\002 \001(\01320.google.datastore.v1.Tran"
-          + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034"
-          + "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly"
-          + "B\006\n\004mode2\354\007\n\tDatastore\022~\n\006Lookup\022\".googl"
-          + "e.datastore.v1.LookupRequest\032#.google.da"
-          + "tastore.v1.LookupResponse\"+\202\323\344\223\002%\" /v1/p"
-          + "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu"
-          + "ery\022$.google.datastore.v1.RunQueryReques"
-          + "t\032%.google.datastore.v1.RunQueryResponse"
-          + "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ"
-          + "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da"
-          + "tastore.v1.BeginTransactionRequest\032-.goo"
-          + "gle.datastore.v1.BeginTransactionRespons"
-          + "e\"5\202\323\344\223\002/\"*/v1/projects/{project_id}:beg"
-          + "inTransaction:\001*\022~\n\006Commit\022\".google.data"
-          + "store.v1.CommitRequest\032#.google.datastor"
-          + "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project"
-          + "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$."
-          + "google.datastore.v1.RollbackRequest\032%.go"
-          + "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223"
-          + "\002\'\"\"/v1/projects/{project_id}:rollback:\001"
-          + "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1."
-          + "AllocateIdsRequest\032(.google.datastore.v1"
-          + ".AllocateIdsResponse\"0\202\323\344\223\002*\"%/v1/projec"
-          + "ts/{project_id}:allocateIds:\001*\022\216\001\n\nReser"
-          + "veIds\022&.google.datastore.v1.ReserveIdsRe"
-          + "quest\032\'.google.datastore.v1.ReserveIdsRe"
-          + "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id"
-          + "}:reserveIds:\001*B\241\001\n\027com.google.datastore"
-          + ".v1B\016DatastoreProtoP\001Z builder) {
 
   private Entity() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Entity();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -67,11 +88,11 @@ private Entity(
             }
           case 26:
             {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 properties_ =
                     com.google.protobuf.MapField.newMapField(
                         PropertiesDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry
                   properties__ =
@@ -125,7 +146,6 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
             com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class);
   }
 
-  private int bitField0_;
   public static final int KEY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Key key_;
   /**
@@ -140,6 +160,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    * 

    *
    * .google.datastore.v1.Key key = 1;
+   *
+   * @return Whether the key field is set.
    */
   public boolean hasKey() {
     return key_ != null;
@@ -156,6 +178,8 @@ public boolean hasKey() {
    * 

    *
    * .google.datastore.v1.Key key = 1;
+   *
+   * @return The key.
    */
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
@@ -576,7 +600,6 @@ public com.google.datastore.v1.Entity build() {
     public com.google.datastore.v1.Entity buildPartial() {
       com.google.datastore.v1.Entity result = new com.google.datastore.v1.Entity(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       if (keyBuilder_ == null) {
         result.key_ = key_;
       } else {
@@ -584,7 +607,6 @@ public com.google.datastore.v1.Entity buildPartial() {
       }
       result.properties_ = internalGetProperties();
       result.properties_.makeImmutable();
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -687,6 +709,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.Key key = 1;
+     *
+     * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return keyBuilder_ != null || key_ != null;
@@ -703,6 +727,8 @@ public boolean hasKey() {
      * 

      *
      * .google.datastore.v1.Key key = 1;
+     *
+     * @return The key.
      */
     public com.google.datastore.v1.Key getKey() {
       if (keyBuilder_ == null) {
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 731826b603fc..745700b13d2d 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -20,6 +35,8 @@ public interface EntityOrBuilder
    * 

    *
    * .google.datastore.v1.Key key = 1;
+   *
+   * @return Whether the key field is set.
    */
   boolean hasKey();
   /**
@@ -34,6 +51,8 @@ public interface EntityOrBuilder
    * 

    *
    * .google.datastore.v1.Key key = 1;
+   *
+   * @return The key.
    */
   com.google.datastore.v1.Key getKey();
   /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index d2cf275e0d13..392a6aa24611 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -84,23 +99,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "gle.Cloud.Datastore.V1\312\002\031Google\\Cloud\\Da"
           + "tastore\\V1b\006proto3"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-        descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          com.google.api.AnnotationsProto.getDescriptor(),
-          com.google.protobuf.StructProto.getDescriptor(),
-          com.google.protobuf.TimestampProto.getDescriptor(),
-          com.google.type.LatLngProto.getDescriptor(),
-        },
-        assigner);
+    descriptor =
+        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
+            descriptorData,
+            new com.google.protobuf.Descriptors.FileDescriptor[] {
+              com.google.api.AnnotationsProto.getDescriptor(),
+              com.google.protobuf.StructProto.getDescriptor(),
+              com.google.protobuf.TimestampProto.getDescriptor(),
+              com.google.type.LatLngProto.getDescriptor(),
+            });
     internal_static_google_datastore_v1_PartitionId_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_google_datastore_v1_PartitionId_fieldAccessorTable =
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 3f31c2999c48..10653417a0f7 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -26,6 +41,12 @@ private EntityResult() {
     cursor_ = com.google.protobuf.ByteString.EMPTY;
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new EntityResult();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -39,7 +60,6 @@ private EntityResult(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -215,12 +235,20 @@ public final int getNumber() {
       return value;
     }
 
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static ResultType valueOf(int value) {
       return forNumber(value);
     }
 
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
     public static ResultType forNumber(int value) {
       switch (value) {
         case 0:
@@ -290,6 +318,8 @@ private ResultType(int value) {
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
+   *
+   * @return Whether the entity field is set.
    */
   public boolean hasEntity() {
     return entity_ != null;
@@ -302,6 +332,8 @@ public boolean hasEntity() {
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
+   *
+   * @return The entity.
    */
   public com.google.datastore.v1.Entity getEntity() {
     return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
@@ -327,14 +359,16 @@ 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.
+   * 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.
    * 

    *
    * int64 version = 4;
+   *
+   * @return The version.
    */
   public long getVersion() {
     return version_;
@@ -351,6 +385,8 @@ public long getVersion() {
    * 

    *
    * bytes cursor = 3;
+   *
+   * @return The cursor.
    */
   public com.google.protobuf.ByteString getCursor() {
     return cursor_;
@@ -725,6 +761,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.Entity entity = 1;
+     *
+     * @return Whether the entity field is set.
      */
     public boolean hasEntity() {
       return entityBuilder_ != null || entity_ != null;
@@ -737,6 +775,8 @@ public boolean hasEntity() {
      * 

      *
      * .google.datastore.v1.Entity entity = 1;
+     *
+     * @return The entity.
      */
     public com.google.datastore.v1.Entity getEntity() {
       if (entityBuilder_ == null) {
@@ -893,14 +933,16 @@ 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.
+     * 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.
      * 

      *
      * int64 version = 4;
+     *
+     * @return The version.
      */
     public long getVersion() {
       return version_;
@@ -911,14 +953,17 @@ 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.
+     * 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.
      * 

      *
      * int64 version = 4;
+     *
+     * @param value The version to set.
+     * @return This builder for chaining.
      */
     public Builder setVersion(long value) {
 
@@ -932,14 +977,16 @@ 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.
+     * 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.
      * 

      *
      * int64 version = 4;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearVersion() {
 
@@ -958,6 +1005,8 @@ public Builder clearVersion() {
      * 

      *
      * bytes cursor = 3;
+     *
+     * @return The cursor.
      */
     public com.google.protobuf.ByteString getCursor() {
       return cursor_;
@@ -971,6 +1020,9 @@ public com.google.protobuf.ByteString getCursor() {
      * 

      *
      * bytes cursor = 3;
+     *
+     * @param value The cursor to set.
+     * @return This builder for chaining.
      */
     public Builder setCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -990,6 +1042,8 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes cursor = 3;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearCursor() {
 
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 accfd1d51118..4274984ce7a3 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface EntityResultOrBuilder
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
+   *
+   * @return Whether the entity field is set.
    */
   boolean hasEntity();
   /**
@@ -26,6 +43,8 @@ public interface EntityResultOrBuilder
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
+   *
+   * @return The entity.
    */
   com.google.datastore.v1.Entity getEntity();
   /**
@@ -45,14 +64,16 @@ 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.
+   * 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.
    * 

    *
    * int64 version = 4;
+   *
+   * @return The version.
    */
   long getVersion();
 
@@ -65,6 +86,8 @@ public interface EntityResultOrBuilder
    * 

    *
    * bytes cursor = 3;
+   *
+   * @return The cursor.
    */
   com.google.protobuf.ByteString getCursor();
 }
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 cab7dd71f4b3..4fbff2da52a5 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -24,6 +39,12 @@ private Filter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private Filter() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Filter();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -37,7 +58,6 @@ private Filter(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -115,7 +135,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int filterTypeCase_ = 0;
   private java.lang.Object filterType_;
 
-  public enum FilterTypeCase implements com.google.protobuf.Internal.EnumLite {
+  public enum FilterTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     COMPOSITE_FILTER(1),
     PROPERTY_FILTER(2),
     FILTERTYPE_NOT_SET(0);
@@ -124,7 +147,11 @@ public enum FilterTypeCase implements com.google.protobuf.Internal.EnumLite {
     private FilterTypeCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static FilterTypeCase valueOf(int value) {
       return forNumber(value);
@@ -161,6 +188,8 @@ public FilterTypeCase getFilterTypeCase() {
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
+   *
+   * @return Whether the compositeFilter field is set.
    */
   public boolean hasCompositeFilter() {
     return filterTypeCase_ == 1;
@@ -173,6 +202,8 @@ public boolean hasCompositeFilter() {
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
+   *
+   * @return The compositeFilter.
    */
   public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
     if (filterTypeCase_ == 1) {
@@ -205,6 +236,8 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
+   *
+   * @return Whether the propertyFilter field is set.
    */
   public boolean hasPropertyFilter() {
     return filterTypeCase_ == 2;
@@ -217,6 +250,8 @@ public boolean hasPropertyFilter() {
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
+   *
+   * @return The propertyFilter.
    */
   public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
     if (filterTypeCase_ == 2) {
@@ -635,6 +670,8 @@ public Builder clearFilterType() {
      * 

      *
      * .google.datastore.v1.CompositeFilter composite_filter = 1;
+     *
+     * @return Whether the compositeFilter field is set.
      */
     public boolean hasCompositeFilter() {
       return filterTypeCase_ == 1;
@@ -647,6 +684,8 @@ public boolean hasCompositeFilter() {
      * 

      *
      * .google.datastore.v1.CompositeFilter composite_filter = 1;
+     *
+     * @return The compositeFilter.
      */
     public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
       if (compositeFilterBuilder_ == null) {
@@ -837,6 +876,8 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
      * 

      *
      * .google.datastore.v1.PropertyFilter property_filter = 2;
+     *
+     * @return Whether the propertyFilter field is set.
      */
     public boolean hasPropertyFilter() {
       return filterTypeCase_ == 2;
@@ -849,6 +890,8 @@ public boolean hasPropertyFilter() {
      * 

      *
      * .google.datastore.v1.PropertyFilter property_filter = 2;
+     *
+     * @return The propertyFilter.
      */
     public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
       if (propertyFilterBuilder_ == null) {
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 bc709c719f82..1ad0f8086ea5 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface FilterOrBuilder
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
+   *
+   * @return Whether the compositeFilter field is set.
    */
   boolean hasCompositeFilter();
   /**
@@ -26,6 +43,8 @@ public interface FilterOrBuilder
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
+   *
+   * @return The compositeFilter.
    */
   com.google.datastore.v1.CompositeFilter getCompositeFilter();
   /**
@@ -47,6 +66,8 @@ public interface FilterOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
+   *
+   * @return Whether the propertyFilter field is set.
    */
   boolean hasPropertyFilter();
   /**
@@ -57,6 +78,8 @@ public interface FilterOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
+   *
+   * @return The propertyFilter.
    */
   com.google.datastore.v1.PropertyFilter getPropertyFilter();
   /**
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 37a884fbe53a..758f999728e5 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -28,6 +43,12 @@ private GqlQuery() {
     positionalBindings_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new GqlQuery();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -66,10 +87,10 @@ private GqlQuery(
             }
           case 34:
             {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 positionalBindings_ =
                     new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000002;
               }
               positionalBindings_.add(
                   input.readMessage(
@@ -78,11 +99,11 @@ private GqlQuery(
             }
           case 42:
             {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 namedBindings_ =
                     com.google.protobuf.MapField.newMapField(
                         NamedBindingsDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<
                       java.lang.String, com.google.datastore.v1.GqlQueryParameter>
@@ -109,7 +130,7 @@ private GqlQuery(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
         positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
       }
       this.unknownFields = unknownFields.build();
@@ -142,7 +163,6 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
             com.google.datastore.v1.GqlQuery.class, com.google.datastore.v1.GqlQuery.Builder.class);
   }
 
-  private int bitField0_;
   public static final int QUERY_STRING_FIELD_NUMBER = 1;
   private volatile java.lang.Object queryString_;
   /**
@@ -154,6 +174,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    * 

    *
    * string query_string = 1;
+   *
+   * @return The queryString.
    */
   public java.lang.String getQueryString() {
     java.lang.Object ref = queryString_;
@@ -175,6 +197,8 @@ public java.lang.String getQueryString() {
    * 

    *
    * string query_string = 1;
+   *
+   * @return The bytes for queryString.
    */
   public com.google.protobuf.ByteString getQueryStringBytes() {
     java.lang.Object ref = queryString_;
@@ -201,6 +225,8 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
    * 

    *
    * bool allow_literals = 2;
+   *
+   * @return The allowLiterals.
    */
   public boolean getAllowLiterals() {
     return allowLiterals_;
@@ -673,7 +699,7 @@ public Builder clear() {
       internalGetMutableNamedBindings().clear();
       if (positionalBindingsBuilder_ == null) {
         positionalBindings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
         positionalBindingsBuilder_.clear();
       }
@@ -704,21 +730,19 @@ public com.google.datastore.v1.GqlQuery build() {
     public com.google.datastore.v1.GqlQuery buildPartial() {
       com.google.datastore.v1.GqlQuery result = new com.google.datastore.v1.GqlQuery(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       result.queryString_ = queryString_;
       result.allowLiterals_ = allowLiterals_;
       result.namedBindings_ = internalGetNamedBindings();
       result.namedBindings_.makeImmutable();
       if (positionalBindingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.positionalBindings_ = positionalBindings_;
       } else {
         result.positionalBindings_ = positionalBindingsBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -780,7 +804,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
         if (!other.positionalBindings_.isEmpty()) {
           if (positionalBindings_.isEmpty()) {
             positionalBindings_ = other.positionalBindings_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensurePositionalBindingsIsMutable();
             positionalBindings_.addAll(other.positionalBindings_);
@@ -793,7 +817,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
             positionalBindingsBuilder_.dispose();
             positionalBindingsBuilder_ = null;
             positionalBindings_ = other.positionalBindings_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
             positionalBindingsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPositionalBindingsFieldBuilder()
@@ -844,6 +868,8 @@ public Builder mergeFrom(
      * 

      *
      * string query_string = 1;
+     *
+     * @return The queryString.
      */
     public java.lang.String getQueryString() {
       java.lang.Object ref = queryString_;
@@ -865,6 +891,8 @@ public java.lang.String getQueryString() {
      * 

      *
      * string query_string = 1;
+     *
+     * @return The bytes for queryString.
      */
     public com.google.protobuf.ByteString getQueryStringBytes() {
       java.lang.Object ref = queryString_;
@@ -886,6 +914,9 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
      * 

      *
      * string query_string = 1;
+     *
+     * @param value The queryString to set.
+     * @return This builder for chaining.
      */
     public Builder setQueryString(java.lang.String value) {
       if (value == null) {
@@ -905,6 +936,8 @@ public Builder setQueryString(java.lang.String value) {
      * 

      *
      * string query_string = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearQueryString() {
 
@@ -921,6 +954,9 @@ public Builder clearQueryString() {
      * 

      *
      * string query_string = 1;
+     *
+     * @param value The bytes for queryString to set.
+     * @return This builder for chaining.
      */
     public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -945,6 +981,8 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * bool allow_literals = 2;
+     *
+     * @return The allowLiterals.
      */
     public boolean getAllowLiterals() {
       return allowLiterals_;
@@ -960,6 +998,9 @@ public boolean getAllowLiterals() {
      * 

      *
      * bool allow_literals = 2;
+     *
+     * @param value The allowLiterals to set.
+     * @return This builder for chaining.
      */
     public Builder setAllowLiterals(boolean value) {
 
@@ -978,6 +1019,8 @@ public Builder setAllowLiterals(boolean value) {
      * 

      *
      * bool allow_literals = 2;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearAllowLiterals() {
 
@@ -1177,10 +1220,10 @@ public Builder putAllNamedBindings(
         java.util.Collections.emptyList();
 
     private void ensurePositionalBindingsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         positionalBindings_ =
             new java.util.ArrayList(positionalBindings_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1431,7 +1474,7 @@ public Builder addAllPositionalBindings(
     public Builder clearPositionalBindings() {
       if (positionalBindingsBuilder_ == null) {
         positionalBindings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         positionalBindingsBuilder_.clear();
@@ -1578,7 +1621,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
                 com.google.datastore.v1.GqlQueryParameter.Builder,
                 com.google.datastore.v1.GqlQueryParameterOrBuilder>(
                 positionalBindings_,
-                ((bitField0_ & 0x00000008) != 0),
+                ((bitField0_ & 0x00000002) != 0),
                 getParentForChildren(),
                 isClean());
         positionalBindings_ = null;
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 db2d10a3c197..15ede8cc4a86 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -17,6 +32,8 @@ public interface GqlQueryOrBuilder
    * 

    *
    * string query_string = 1;
+   *
+   * @return The queryString.
    */
   java.lang.String getQueryString();
   /**
@@ -28,6 +45,8 @@ public interface GqlQueryOrBuilder
    * 

    *
    * string query_string = 1;
+   *
+   * @return The bytes for queryString.
    */
   com.google.protobuf.ByteString getQueryStringBytes();
 
@@ -42,6 +61,8 @@ public interface GqlQueryOrBuilder
    * 

    *
    * bool allow_literals = 2;
+   *
+   * @return The allowLiterals.
    */
   boolean getAllowLiterals();
 
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 7710d8bce569..38c132e6ca58 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -24,6 +39,12 @@ private GqlQueryParameter(com.google.protobuf.GeneratedMessageV3.Builder buil
 
   private GqlQueryParameter() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new GqlQueryParameter();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -37,7 +58,6 @@ private GqlQueryParameter(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -106,7 +126,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int parameterTypeCase_ = 0;
   private java.lang.Object parameterType_;
 
-  public enum ParameterTypeCase implements com.google.protobuf.Internal.EnumLite {
+  public enum ParameterTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     VALUE(2),
     CURSOR(3),
     PARAMETERTYPE_NOT_SET(0);
@@ -115,7 +138,11 @@ public enum ParameterTypeCase implements com.google.protobuf.Internal.EnumLite {
     private ParameterTypeCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static ParameterTypeCase valueOf(int value) {
       return forNumber(value);
@@ -152,6 +179,8 @@ public ParameterTypeCase getParameterTypeCase() {
    * 

    *
    * .google.datastore.v1.Value value = 2;
+   *
+   * @return Whether the value field is set.
    */
   public boolean hasValue() {
     return parameterTypeCase_ == 2;
@@ -164,6 +193,8 @@ public boolean hasValue() {
    * 

    *
    * .google.datastore.v1.Value value = 2;
+   *
+   * @return The value.
    */
   public com.google.datastore.v1.Value getValue() {
     if (parameterTypeCase_ == 2) {
@@ -197,6 +228,8 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
    * 

    *
    * bytes cursor = 3;
+   *
+   * @return The cursor.
    */
   public com.google.protobuf.ByteString getCursor() {
     if (parameterTypeCase_ == 3) {
@@ -600,6 +633,8 @@ public Builder clearParameterType() {
      * 

      *
      * .google.datastore.v1.Value value = 2;
+     *
+     * @return Whether the value field is set.
      */
     public boolean hasValue() {
       return parameterTypeCase_ == 2;
@@ -612,6 +647,8 @@ public boolean hasValue() {
      * 

      *
      * .google.datastore.v1.Value value = 2;
+     *
+     * @return The value.
      */
     public com.google.datastore.v1.Value getValue() {
       if (valueBuilder_ == null) {
@@ -795,6 +832,8 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
      * 

      *
      * bytes cursor = 3;
+     *
+     * @return The cursor.
      */
     public com.google.protobuf.ByteString getCursor() {
       if (parameterTypeCase_ == 3) {
@@ -811,6 +850,9 @@ public com.google.protobuf.ByteString getCursor() {
      * 

      *
      * bytes cursor = 3;
+     *
+     * @param value The cursor to set.
+     * @return This builder for chaining.
      */
     public Builder setCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -830,6 +872,8 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes cursor = 3;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearCursor() {
       if (parameterTypeCase_ == 3) {
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 d5b266f1a7e1..88d62712fc17 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface GqlQueryParameterOrBuilder
    * 

    *
    * .google.datastore.v1.Value value = 2;
+   *
+   * @return Whether the value field is set.
    */
   boolean hasValue();
   /**
@@ -26,6 +43,8 @@ public interface GqlQueryParameterOrBuilder
    * 

    *
    * .google.datastore.v1.Value value = 2;
+   *
+   * @return The value.
    */
   com.google.datastore.v1.Value getValue();
   /**
@@ -48,6 +67,8 @@ public interface GqlQueryParameterOrBuilder
    * 

    *
    * bytes cursor = 3;
+   *
+   * @return The cursor.
    */
   com.google.protobuf.ByteString getCursor();
 
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 1584e7406b8d..3b418fb698ab 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -29,6 +44,12 @@ private Key() {
     path_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Key();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -71,9 +92,9 @@ private Key(
             }
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 path_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               path_.add(
                   input.readMessage(
@@ -94,7 +115,7 @@ private Key(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         path_ = java.util.Collections.unmodifiableList(path_);
       }
       this.unknownFields = unknownFields.build();
@@ -131,6 +152,8 @@ public interface PathElementOrBuilder
      * 

      *
      * string kind = 1;
+     *
+     * @return The kind.
      */
     java.lang.String getKind();
     /**
@@ -144,6 +167,8 @@ public interface PathElementOrBuilder
      * 

      *
      * string kind = 1;
+     *
+     * @return The bytes for kind.
      */
     com.google.protobuf.ByteString getKindBytes();
 
@@ -157,6 +182,8 @@ public interface PathElementOrBuilder
      * 

      *
      * int64 id = 2;
+     *
+     * @return The id.
      */
     long getId();
 
@@ -171,6 +198,8 @@ public interface PathElementOrBuilder
      * 

      *
      * string name = 3;
+     *
+     * @return The name.
      */
     java.lang.String getName();
     /**
@@ -184,6 +213,8 @@ public interface PathElementOrBuilder
      * 

      *
      * string name = 3;
+     *
+     * @return The bytes for name.
      */
     com.google.protobuf.ByteString getNameBytes();
 
@@ -214,6 +245,12 @@ private PathElement() {
       kind_ = "";
     }
 
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new PathElement();
+    }
+
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
@@ -227,7 +264,6 @@ private PathElement(
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -295,7 +331,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     private int idTypeCase_ = 0;
     private java.lang.Object idType_;
 
-    public enum IdTypeCase implements com.google.protobuf.Internal.EnumLite {
+    public enum IdTypeCase
+        implements
+            com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       ID(2),
       NAME(3),
       IDTYPE_NOT_SET(0);
@@ -304,7 +343,11 @@ public enum IdTypeCase implements com.google.protobuf.Internal.EnumLite {
       private IdTypeCase(int value) {
         this.value = value;
       }
-      /** @deprecated Use {@link #forNumber(int)} instead. */
+      /**
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
       @java.lang.Deprecated
       public static IdTypeCase valueOf(int value) {
         return forNumber(value);
@@ -345,6 +388,8 @@ public IdTypeCase getIdTypeCase() {
      * 

      *
      * string kind = 1;
+     *
+     * @return The kind.
      */
     public java.lang.String getKind() {
       java.lang.Object ref = kind_;
@@ -368,6 +413,8 @@ public java.lang.String getKind() {
      * 

      *
      * string kind = 1;
+     *
+     * @return The bytes for kind.
      */
     public com.google.protobuf.ByteString getKindBytes() {
       java.lang.Object ref = kind_;
@@ -392,6 +439,8 @@ public com.google.protobuf.ByteString getKindBytes() {
      * 

      *
      * int64 id = 2;
+     *
+     * @return The id.
      */
     public long getId() {
       if (idTypeCase_ == 2) {
@@ -412,6 +461,8 @@ public long getId() {
      * 

      *
      * string name = 3;
+     *
+     * @return The name.
      */
     public java.lang.String getName() {
       java.lang.Object ref = "";
@@ -440,6 +491,8 @@ public java.lang.String getName() {
      * 

      *
      * string name = 3;
+     *
+     * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
       java.lang.Object ref = "";
@@ -869,6 +922,8 @@ public Builder clearIdType() {
        * 

        *
        * string kind = 1;
+       *
+       * @return The kind.
        */
       public java.lang.String getKind() {
         java.lang.Object ref = kind_;
@@ -892,6 +947,8 @@ public java.lang.String getKind() {
        * 

        *
        * string kind = 1;
+       *
+       * @return The bytes for kind.
        */
       public com.google.protobuf.ByteString getKindBytes() {
         java.lang.Object ref = kind_;
@@ -915,6 +972,9 @@ public com.google.protobuf.ByteString getKindBytes() {
        * 

        *
        * string kind = 1;
+       *
+       * @param value The kind to set.
+       * @return This builder for chaining.
        */
       public Builder setKind(java.lang.String value) {
         if (value == null) {
@@ -936,6 +996,8 @@ public Builder setKind(java.lang.String value) {
        * 

        *
        * string kind = 1;
+       *
+       * @return This builder for chaining.
        */
       public Builder clearKind() {
 
@@ -954,6 +1016,9 @@ public Builder clearKind() {
        * 

        *
        * string kind = 1;
+       *
+       * @param value The bytes for kind to set.
+       * @return This builder for chaining.
        */
       public Builder setKindBytes(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -976,6 +1041,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
        * 

        *
        * int64 id = 2;
+       *
+       * @return The id.
        */
       public long getId() {
         if (idTypeCase_ == 2) {
@@ -993,6 +1060,9 @@ public long getId() {
        * 

        *
        * int64 id = 2;
+       *
+       * @param value The id to set.
+       * @return This builder for chaining.
        */
       public Builder setId(long value) {
         idTypeCase_ = 2;
@@ -1010,6 +1080,8 @@ public Builder setId(long value) {
        * 

        *
        * int64 id = 2;
+       *
+       * @return This builder for chaining.
        */
       public Builder clearId() {
         if (idTypeCase_ == 2) {
@@ -1031,6 +1103,8 @@ public Builder clearId() {
        * 

        *
        * string name = 3;
+       *
+       * @return The name.
        */
       public java.lang.String getName() {
         java.lang.Object ref = "";
@@ -1059,6 +1133,8 @@ public java.lang.String getName() {
        * 

        *
        * string name = 3;
+       *
+       * @return The bytes for name.
        */
       public com.google.protobuf.ByteString getNameBytes() {
         java.lang.Object ref = "";
@@ -1087,6 +1163,9 @@ public com.google.protobuf.ByteString getNameBytes() {
        * 

        *
        * string name = 3;
+       *
+       * @param value The name to set.
+       * @return This builder for chaining.
        */
       public Builder setName(java.lang.String value) {
         if (value == null) {
@@ -1108,6 +1187,8 @@ public Builder setName(java.lang.String value) {
        * 

        *
        * string name = 3;
+       *
+       * @return This builder for chaining.
        */
       public Builder clearName() {
         if (idTypeCase_ == 3) {
@@ -1128,6 +1209,9 @@ public Builder clearName() {
        * 

        *
        * string name = 3;
+       *
+       * @param value The bytes for name to set.
+       * @return This builder for chaining.
        */
       public Builder setNameBytes(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -1192,7 +1276,6 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
     }
   }
 
-  private int bitField0_;
   public static final int PARTITION_ID_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PartitionId partitionId_;
   /**
@@ -1205,6 +1288,8 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
+   *
+   * @return Whether the partitionId field is set.
    */
   public boolean hasPartitionId() {
     return partitionId_ != null;
@@ -1219,6 +1304,8 @@ public boolean hasPartitionId() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
+   *
+   * @return The partitionId.
    */
   public com.google.datastore.v1.PartitionId getPartitionId() {
     return partitionId_ == null
@@ -1598,7 +1685,7 @@ public Builder clear() {
       }
       if (pathBuilder_ == null) {
         path_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
         pathBuilder_.clear();
       }
@@ -1628,22 +1715,20 @@ public com.google.datastore.v1.Key build() {
     public com.google.datastore.v1.Key buildPartial() {
       com.google.datastore.v1.Key result = new com.google.datastore.v1.Key(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       if (partitionIdBuilder_ == null) {
         result.partitionId_ = partitionId_;
       } else {
         result.partitionId_ = partitionIdBuilder_.build();
       }
       if (pathBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           path_ = java.util.Collections.unmodifiableList(path_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.path_ = path_;
       } else {
         result.path_ = pathBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -1700,7 +1785,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
         if (!other.path_.isEmpty()) {
           if (path_.isEmpty()) {
             path_ = other.path_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensurePathIsMutable();
             path_.addAll(other.path_);
@@ -1713,7 +1798,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
             pathBuilder_.dispose();
             pathBuilder_ = null;
             path_ = other.path_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             pathBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPathFieldBuilder()
@@ -1770,6 +1855,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 1;
+     *
+     * @return Whether the partitionId field is set.
      */
     public boolean hasPartitionId() {
       return partitionIdBuilder_ != null || partitionId_ != null;
@@ -1784,6 +1871,8 @@ public boolean hasPartitionId() {
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 1;
+     *
+     * @return The partitionId.
      */
     public com.google.datastore.v1.PartitionId getPartitionId() {
       if (partitionIdBuilder_ == null) {
@@ -1957,9 +2046,9 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensurePathIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         path_ = new java.util.ArrayList(path_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -2317,7 +2406,7 @@ public Builder addAllPath(
     public Builder clearPath() {
       if (pathBuilder_ == null) {
         path_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         pathBuilder_.clear();
@@ -2529,7 +2618,7 @@ public java.util.List getPathBu
                 com.google.datastore.v1.Key.PathElement,
                 com.google.datastore.v1.Key.PathElement.Builder,
                 com.google.datastore.v1.Key.PathElementOrBuilder>(
-                path_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                path_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         path_ = null;
       }
       return pathBuilder_;
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 b725938e5c7a..d18a916e6476 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -18,6 +33,8 @@ public interface KeyOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
+   *
+   * @return Whether the partitionId field is set.
    */
   boolean hasPartitionId();
   /**
@@ -30,6 +47,8 @@ public interface KeyOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
+   *
+   * @return The partitionId.
    */
   com.google.datastore.v1.PartitionId getPartitionId();
   /**
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 24859abde128..c1398f4885ca 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -26,6 +41,12 @@ private KindExpression() {
     name_ = "";
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new KindExpression();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -39,7 +60,6 @@ private KindExpression(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -101,6 +121,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 

    *
    * string name = 1;
+   *
+   * @return The name.
    */
   public java.lang.String getName() {
     java.lang.Object ref = name_;
@@ -121,6 +143,8 @@ public java.lang.String getName() {
    * 

    *
    * string name = 1;
+   *
+   * @return The bytes for name.
    */
   public com.google.protobuf.ByteString getNameBytes() {
     java.lang.Object ref = name_;
@@ -458,6 +482,8 @@ public Builder mergeFrom(
      * 

      *
      * string name = 1;
+     *
+     * @return The name.
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -478,6 +504,8 @@ public java.lang.String getName() {
      * 

      *
      * string name = 1;
+     *
+     * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
       java.lang.Object ref = name_;
@@ -498,6 +526,9 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 

      *
      * string name = 1;
+     *
+     * @param value The name to set.
+     * @return This builder for chaining.
      */
     public Builder setName(java.lang.String value) {
       if (value == null) {
@@ -516,6 +547,8 @@ public Builder setName(java.lang.String value) {
      * 

      *
      * string name = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearName() {
 
@@ -531,6 +564,9 @@ public Builder clearName() {
      * 

      *
      * string name = 1;
+     *
+     * @param value The bytes for name to set.
+     * @return This builder for chaining.
      */
     public Builder setNameBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 10b9dbc0727d..fed52258e5b8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface KindExpressionOrBuilder
    * 

    *
    * string name = 1;
+   *
+   * @return The name.
    */
   java.lang.String getName();
   /**
@@ -26,6 +43,8 @@ public interface KindExpressionOrBuilder
    * 

    *
    * string name = 1;
+   *
+   * @return The bytes for name.
    */
   com.google.protobuf.ByteString getNameBytes();
 }
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 a69b954098fc..ae647700093b 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -27,6 +42,12 @@ private LookupRequest() {
     keys_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new LookupRequest();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -69,9 +90,9 @@ private LookupRequest(
             }
           case 26:
             {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
               break;
@@ -97,7 +118,7 @@ private LookupRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
       }
       this.unknownFields = unknownFields.build();
@@ -120,17 +141,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.LookupRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -147,10 +169,12 @@ public java.lang.String getProjectId() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -174,6 +198,8 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return Whether the readOptions field is set.
    */
   public boolean hasReadOptions() {
     return readOptions_ != null;
@@ -186,6 +212,8 @@ public boolean hasReadOptions() {
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return The readOptions.
    */
   public com.google.datastore.v1.ReadOptions getReadOptions() {
     return readOptions_ == null
@@ -211,10 +239,11 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public java.util.List getKeysList() {
     return keys_;
@@ -223,10 +252,11 @@ public java.util.List getKeysList() {
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public java.util.List getKeysOrBuilderList() {
     return keys_;
@@ -235,10 +265,11 @@ public java.util.List getKeysOrB
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public int getKeysCount() {
     return keys_.size();
@@ -247,10 +278,11 @@ public int getKeysCount() {
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
@@ -259,10 +291,11 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
@@ -507,7 +540,7 @@ public Builder clear() {
       }
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
         keysBuilder_.clear();
       }
@@ -539,7 +572,6 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
       com.google.datastore.v1.LookupRequest result =
           new com.google.datastore.v1.LookupRequest(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       result.projectId_ = projectId_;
       if (readOptionsBuilder_ == null) {
         result.readOptions_ = readOptions_;
@@ -547,15 +579,14 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
         result.readOptions_ = readOptionsBuilder_.build();
       }
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.keys_ = keys_;
       } else {
         result.keys_ = keysBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -616,7 +647,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureKeysIsMutable();
             keys_.addAll(other.keys_);
@@ -629,7 +660,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
             keysBuilder_.dispose();
             keysBuilder_ = null;
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
             keysBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getKeysFieldBuilder()
@@ -675,10 +706,12 @@ public Builder mergeFrom(
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -695,10 +728,12 @@ public java.lang.String getProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -715,10 +750,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -733,10 +771,12 @@ public Builder setProjectId(java.lang.String value) {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -748,10 +788,13 @@ public Builder clearProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -778,6 +821,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
+     *
+     * @return Whether the readOptions field is set.
      */
     public boolean hasReadOptions() {
       return readOptionsBuilder_ != null || readOptions_ != null;
@@ -790,6 +835,8 @@ public boolean hasReadOptions() {
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
+     *
+     * @return The readOptions.
      */
     public com.google.datastore.v1.ReadOptions getReadOptions() {
       if (readOptionsBuilder_ == null) {
@@ -948,9 +995,9 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -964,10 +1011,11 @@ private void ensureKeysIsMutable() {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysList() {
       if (keysBuilder_ == null) {
@@ -980,10 +1028,11 @@ public java.util.List getKeysList() {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public int getKeysCount() {
       if (keysBuilder_ == null) {
@@ -996,10 +1045,11 @@ public int getKeysCount() {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key getKeys(int index) {
       if (keysBuilder_ == null) {
@@ -1012,10 +1062,11 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -1034,10 +1085,11 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -1053,10 +1105,11 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -1075,10 +1128,11 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -1097,10 +1151,11 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -1116,10 +1171,11 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -1135,10 +1191,11 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
@@ -1154,15 +1211,16 @@ public Builder addAllKeys(java.lang.Iterable
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder clearKeys() {
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         keysBuilder_.clear();
@@ -1173,10 +1231,11 @@ public Builder clearKeys() {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder removeKeys(int index) {
       if (keysBuilder_ == null) {
@@ -1192,10 +1251,11 @@ public Builder removeKeys(int index) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
       return getKeysFieldBuilder().getBuilder(index);
@@ -1204,10 +1264,11 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
       if (keysBuilder_ == null) {
@@ -1220,10 +1281,11 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
@@ -1236,10 +1298,11 @@ public java.util.List getKeysOrB
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
       return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
@@ -1248,10 +1311,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
       return getKeysFieldBuilder()
@@ -1261,10 +1325,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
      *
      *
      * 
-     * Keys of entities to look up.
+     * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3;
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
@@ -1281,7 +1346,7 @@ public java.util.List getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
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 e188717f7c58..887d95c0e643 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -12,20 +27,24 @@ public interface LookupRequestOrBuilder
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -37,6 +56,8 @@ public interface LookupRequestOrBuilder
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return Whether the readOptions field is set.
    */
   boolean hasReadOptions();
   /**
@@ -47,6 +68,8 @@ public interface LookupRequestOrBuilder
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return The readOptions.
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
   /**
@@ -64,50 +87,55 @@ public interface LookupRequestOrBuilder
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   java.util.List getKeysList();
   /**
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   int getKeysCount();
   /**
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   java.util.List getKeysOrBuilderList();
   /**
    *
    *
    * 
-   * Keys of entities to look up.
+   * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3;
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
 }
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 56e920334ed7..7bf96d1cda55 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -28,6 +43,12 @@ private LookupResponse() {
     deferred_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new LookupResponse();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
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 564f88cf5107..94adc480e597 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
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 0554dd144194..b92d928b8914 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -24,6 +39,12 @@ private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private Mutation() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Mutation();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -37,7 +58,6 @@ private Mutation(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -150,7 +170,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int operationCase_ = 0;
   private java.lang.Object operation_;
 
-  public enum OperationCase implements com.google.protobuf.Internal.EnumLite {
+  public enum OperationCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     INSERT(4),
     UPDATE(5),
     UPSERT(6),
@@ -161,7 +184,11 @@ public enum OperationCase implements com.google.protobuf.Internal.EnumLite {
     private OperationCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static OperationCase valueOf(int value) {
       return forNumber(value);
@@ -196,7 +223,10 @@ public OperationCase getOperationCase() {
   private int conflictDetectionStrategyCase_ = 0;
   private java.lang.Object conflictDetectionStrategy_;
 
-  public enum ConflictDetectionStrategyCase implements com.google.protobuf.Internal.EnumLite {
+  public enum ConflictDetectionStrategyCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     BASE_VERSION(8),
     CONFLICTDETECTIONSTRATEGY_NOT_SET(0);
     private final int value;
@@ -204,7 +234,11 @@ public enum ConflictDetectionStrategyCase implements com.google.protobuf.Interna
     private ConflictDetectionStrategyCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static ConflictDetectionStrategyCase valueOf(int value) {
       return forNumber(value);
@@ -240,6 +274,8 @@ public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
+   *
+   * @return Whether the insert field is set.
    */
   public boolean hasInsert() {
     return operationCase_ == 4;
@@ -253,6 +289,8 @@ public boolean hasInsert() {
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
+   *
+   * @return The insert.
    */
   public com.google.datastore.v1.Entity getInsert() {
     if (operationCase_ == 4) {
@@ -287,6 +325,8 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
    * 

    *
    * .google.datastore.v1.Entity update = 5;
+   *
+   * @return Whether the update field is set.
    */
   public boolean hasUpdate() {
     return operationCase_ == 5;
@@ -300,6 +340,8 @@ public boolean hasUpdate() {
    * 

    *
    * .google.datastore.v1.Entity update = 5;
+   *
+   * @return The update.
    */
   public com.google.datastore.v1.Entity getUpdate() {
     if (operationCase_ == 5) {
@@ -334,6 +376,8 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
+   *
+   * @return Whether the upsert field is set.
    */
   public boolean hasUpsert() {
     return operationCase_ == 6;
@@ -347,6 +391,8 @@ public boolean hasUpsert() {
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
+   *
+   * @return The upsert.
    */
   public com.google.datastore.v1.Entity getUpsert() {
     if (operationCase_ == 6) {
@@ -381,6 +427,8 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
    * 

    *
    * .google.datastore.v1.Key delete = 7;
+   *
+   * @return Whether the delete field is set.
    */
   public boolean hasDelete() {
     return operationCase_ == 7;
@@ -394,6 +442,8 @@ public boolean hasDelete() {
    * 

    *
    * .google.datastore.v1.Key delete = 7;
+   *
+   * @return The delete.
    */
   public com.google.datastore.v1.Key getDelete() {
     if (operationCase_ == 7) {
@@ -428,6 +478,8 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
    * 

    *
    * int64 base_version = 8;
+   *
+   * @return The baseVersion.
    */
   public long getBaseVersion() {
     if (conflictDetectionStrategyCase_ == 8) {
@@ -943,6 +995,8 @@ public Builder clearConflictDetectionStrategy() {
      * 

      *
      * .google.datastore.v1.Entity insert = 4;
+     *
+     * @return Whether the insert field is set.
      */
     public boolean hasInsert() {
       return operationCase_ == 4;
@@ -956,6 +1010,8 @@ public boolean hasInsert() {
      * 

      *
      * .google.datastore.v1.Entity insert = 4;
+     *
+     * @return The insert.
      */
     public com.google.datastore.v1.Entity getInsert() {
       if (insertBuilder_ == null) {
@@ -1150,6 +1206,8 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
      * 

      *
      * .google.datastore.v1.Entity update = 5;
+     *
+     * @return Whether the update field is set.
      */
     public boolean hasUpdate() {
       return operationCase_ == 5;
@@ -1163,6 +1221,8 @@ public boolean hasUpdate() {
      * 

      *
      * .google.datastore.v1.Entity update = 5;
+     *
+     * @return The update.
      */
     public com.google.datastore.v1.Entity getUpdate() {
       if (updateBuilder_ == null) {
@@ -1357,6 +1417,8 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
      * 

      *
      * .google.datastore.v1.Entity upsert = 6;
+     *
+     * @return Whether the upsert field is set.
      */
     public boolean hasUpsert() {
       return operationCase_ == 6;
@@ -1370,6 +1432,8 @@ public boolean hasUpsert() {
      * 

      *
      * .google.datastore.v1.Entity upsert = 6;
+     *
+     * @return The upsert.
      */
     public com.google.datastore.v1.Entity getUpsert() {
       if (upsertBuilder_ == null) {
@@ -1564,6 +1628,8 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
      * 

      *
      * .google.datastore.v1.Key delete = 7;
+     *
+     * @return Whether the delete field is set.
      */
     public boolean hasDelete() {
       return operationCase_ == 7;
@@ -1577,6 +1643,8 @@ public boolean hasDelete() {
      * 

      *
      * .google.datastore.v1.Key delete = 7;
+     *
+     * @return The delete.
      */
     public com.google.datastore.v1.Key getDelete() {
       if (deleteBuilder_ == null) {
@@ -1765,6 +1833,8 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
      * 

      *
      * int64 base_version = 8;
+     *
+     * @return The baseVersion.
      */
     public long getBaseVersion() {
       if (conflictDetectionStrategyCase_ == 8) {
@@ -1781,6 +1851,9 @@ public long getBaseVersion() {
      * 

      *
      * int64 base_version = 8;
+     *
+     * @param value The baseVersion to set.
+     * @return This builder for chaining.
      */
     public Builder setBaseVersion(long value) {
       conflictDetectionStrategyCase_ = 8;
@@ -1797,6 +1870,8 @@ public Builder setBaseVersion(long value) {
      * 

      *
      * int64 base_version = 8;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearBaseVersion() {
       if (conflictDetectionStrategyCase_ == 8) {
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 406cf2fbd165..2957934aed5c 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -17,6 +32,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
+   *
+   * @return Whether the insert field is set.
    */
   boolean hasInsert();
   /**
@@ -28,6 +45,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
+   *
+   * @return The insert.
    */
   com.google.datastore.v1.Entity getInsert();
   /**
@@ -51,6 +70,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Entity update = 5;
+   *
+   * @return Whether the update field is set.
    */
   boolean hasUpdate();
   /**
@@ -62,6 +83,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Entity update = 5;
+   *
+   * @return The update.
    */
   com.google.datastore.v1.Entity getUpdate();
   /**
@@ -85,6 +108,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
+   *
+   * @return Whether the upsert field is set.
    */
   boolean hasUpsert();
   /**
@@ -96,6 +121,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
+   *
+   * @return The upsert.
    */
   com.google.datastore.v1.Entity getUpsert();
   /**
@@ -119,6 +146,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Key delete = 7;
+   *
+   * @return Whether the delete field is set.
    */
   boolean hasDelete();
   /**
@@ -130,6 +159,8 @@ public interface MutationOrBuilder
    * 

    *
    * .google.datastore.v1.Key delete = 7;
+   *
+   * @return The delete.
    */
   com.google.datastore.v1.Key getDelete();
   /**
@@ -153,6 +184,8 @@ public interface MutationOrBuilder
    * 

    *
    * int64 base_version = 8;
+   *
+   * @return The baseVersion.
    */
   long getBaseVersion();
 
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 1a3e65baa640..0617675943b6 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -24,6 +39,12 @@ private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder
 
   private MutationResult() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new MutationResult();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -37,7 +58,6 @@ private MutationResult(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -117,6 +137,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 

    *
    * .google.datastore.v1.Key key = 3;
+   *
+   * @return Whether the key field is set.
    */
   public boolean hasKey() {
     return key_ != null;
@@ -130,6 +152,8 @@ public boolean hasKey() {
    * 

    *
    * .google.datastore.v1.Key key = 3;
+   *
+   * @return The key.
    */
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
@@ -162,6 +186,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
    * 

    *
    * int64 version = 4;
+   *
+   * @return The version.
    */
   public long getVersion() {
     return version_;
@@ -178,6 +204,8 @@ public long getVersion() {
    * 

    *
    * bool conflict_detected = 5;
+   *
+   * @return The conflictDetected.
    */
   public boolean getConflictDetected() {
     return conflictDetected_;
@@ -555,6 +583,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.Key key = 3;
+     *
+     * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return keyBuilder_ != null || key_ != null;
@@ -568,6 +598,8 @@ public boolean hasKey() {
      * 

      *
      * .google.datastore.v1.Key key = 3;
+     *
+     * @return The key.
      */
     public com.google.datastore.v1.Key getKey() {
       if (keyBuilder_ == null) {
@@ -735,6 +767,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
      * 

      *
      * int64 version = 4;
+     *
+     * @return The version.
      */
     public long getVersion() {
       return version_;
@@ -751,6 +785,9 @@ public long getVersion() {
      * 

      *
      * int64 version = 4;
+     *
+     * @param value The version to set.
+     * @return This builder for chaining.
      */
     public Builder setVersion(long value) {
 
@@ -770,6 +807,8 @@ public Builder setVersion(long value) {
      * 

      *
      * int64 version = 4;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearVersion() {
 
@@ -788,6 +827,8 @@ public Builder clearVersion() {
      * 

      *
      * bool conflict_detected = 5;
+     *
+     * @return The conflictDetected.
      */
     public boolean getConflictDetected() {
       return conflictDetected_;
@@ -801,6 +842,9 @@ public boolean getConflictDetected() {
      * 

      *
      * bool conflict_detected = 5;
+     *
+     * @param value The conflictDetected to set.
+     * @return This builder for chaining.
      */
     public Builder setConflictDetected(boolean value) {
 
@@ -817,6 +861,8 @@ public Builder setConflictDetected(boolean value) {
      * 

      *
      * bool conflict_detected = 5;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearConflictDetected() {
 
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 681ae0217256..9d330b494def 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -17,6 +32,8 @@ public interface MutationResultOrBuilder
    * 

    *
    * .google.datastore.v1.Key key = 3;
+   *
+   * @return Whether the key field is set.
    */
   boolean hasKey();
   /**
@@ -28,6 +45,8 @@ public interface MutationResultOrBuilder
    * 

    *
    * .google.datastore.v1.Key key = 3;
+   *
+   * @return The key.
    */
   com.google.datastore.v1.Key getKey();
   /**
@@ -54,6 +73,8 @@ public interface MutationResultOrBuilder
    * 

    *
    * int64 version = 4;
+   *
+   * @return The version.
    */
   long getVersion();
 
@@ -66,6 +87,8 @@ public interface MutationResultOrBuilder
    * 

    *
    * bool conflict_detected = 5;
+   *
+   * @return The conflictDetected.
    */
   boolean getConflictDetected();
 }
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 e9fbee3dfac2..8dd325642284 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -42,6 +57,12 @@ private PartitionId() {
     namespaceId_ = "";
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new PartitionId();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -55,7 +76,6 @@ private PartitionId(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -124,6 +144,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 

    *
    * string project_id = 2;
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -144,6 +166,8 @@ public java.lang.String getProjectId() {
    * 

    *
    * string project_id = 2;
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -167,6 +191,8 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * 

    *
    * string namespace_id = 4;
+   *
+   * @return The namespaceId.
    */
   public java.lang.String getNamespaceId() {
     java.lang.Object ref = namespaceId_;
@@ -187,6 +213,8 @@ public java.lang.String getNamespaceId() {
    * 

    *
    * string namespace_id = 4;
+   *
+   * @return The bytes for namespaceId.
    */
   public com.google.protobuf.ByteString getNamespaceIdBytes() {
     java.lang.Object ref = namespaceId_;
@@ -553,6 +581,8 @@ public Builder mergeFrom(
      * 

      *
      * string project_id = 2;
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -573,6 +603,8 @@ public java.lang.String getProjectId() {
      * 

      *
      * string project_id = 2;
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -593,6 +625,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      * 

      *
      * string project_id = 2;
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -611,6 +646,8 @@ public Builder setProjectId(java.lang.String value) {
      * 

      *
      * string project_id = 2;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -626,6 +663,9 @@ public Builder clearProjectId() {
      * 

      *
      * string project_id = 2;
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -647,6 +687,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * string namespace_id = 4;
+     *
+     * @return The namespaceId.
      */
     public java.lang.String getNamespaceId() {
       java.lang.Object ref = namespaceId_;
@@ -667,6 +709,8 @@ public java.lang.String getNamespaceId() {
      * 

      *
      * string namespace_id = 4;
+     *
+     * @return The bytes for namespaceId.
      */
     public com.google.protobuf.ByteString getNamespaceIdBytes() {
       java.lang.Object ref = namespaceId_;
@@ -687,6 +731,9 @@ public com.google.protobuf.ByteString getNamespaceIdBytes() {
      * 

      *
      * string namespace_id = 4;
+     *
+     * @param value The namespaceId to set.
+     * @return This builder for chaining.
      */
     public Builder setNamespaceId(java.lang.String value) {
       if (value == null) {
@@ -705,6 +752,8 @@ public Builder setNamespaceId(java.lang.String value) {
      * 

      *
      * string namespace_id = 4;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearNamespaceId() {
 
@@ -720,6 +769,9 @@ public Builder clearNamespaceId() {
      * 

      *
      * string namespace_id = 4;
+     *
+     * @param value The bytes for namespaceId to set.
+     * @return This builder for chaining.
      */
     public Builder setNamespaceIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index ea246dd1a2cb..f05a034a6861 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -16,6 +31,8 @@ public interface PartitionIdOrBuilder
    * 

    *
    * string project_id = 2;
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
@@ -26,6 +43,8 @@ public interface PartitionIdOrBuilder
    * 

    *
    * string project_id = 2;
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -37,6 +56,8 @@ public interface PartitionIdOrBuilder
    * 

    *
    * string namespace_id = 4;
+   *
+   * @return The namespaceId.
    */
   java.lang.String getNamespaceId();
   /**
@@ -47,6 +68,8 @@ public interface PartitionIdOrBuilder
    * 

    *
    * string namespace_id = 4;
+   *
+   * @return The bytes for namespaceId.
    */
   com.google.protobuf.ByteString getNamespaceIdBytes();
 }
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 ff328cc37406..7babf6056d17 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -24,6 +39,12 @@ private Projection(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private Projection() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Projection();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -37,7 +58,6 @@ private Projection(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -108,6 +128,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return Whether the property field is set.
    */
   public boolean hasProperty() {
     return property_ != null;
@@ -120,6 +142,8 @@ public boolean hasProperty() {
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return The property.
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
     return property_ == null
@@ -478,6 +502,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
+     *
+     * @return Whether the property field is set.
      */
     public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
@@ -490,6 +516,8 @@ public boolean hasProperty() {
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
+     *
+     * @return The property.
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 46f7c370d39f..dc4b14a5db5d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface ProjectionOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return Whether the property field is set.
    */
   boolean hasProperty();
   /**
@@ -26,6 +43,8 @@ public interface ProjectionOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
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 72ddb0a88f21..44db5e21111a 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -26,6 +41,12 @@ private PropertyFilter() {
     op_ = 0;
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new PropertyFilter();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -39,7 +60,6 @@ private PropertyFilter(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -283,12 +303,20 @@ public final int getNumber() {
       return value;
     }
 
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static Operator valueOf(int value) {
       return forNumber(value);
     }
 
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
     public static Operator forNumber(int value) {
       switch (value) {
         case 0:
@@ -364,6 +392,8 @@ private Operator(int value) {
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return Whether the property field is set.
    */
   public boolean hasProperty() {
     return property_ != null;
@@ -376,6 +406,8 @@ public boolean hasProperty() {
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return The property.
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
     return property_ == null
@@ -405,6 +437,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
+   *
+   * @return The enum numeric value on the wire for op.
    */
   public int getOpValue() {
     return op_;
@@ -417,6 +451,8 @@ public int getOpValue() {
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
+   *
+   * @return The op.
    */
   public com.google.datastore.v1.PropertyFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
@@ -435,6 +471,8 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() {
    * 

    *
    * .google.datastore.v1.Value value = 3;
+   *
+   * @return Whether the value field is set.
    */
   public boolean hasValue() {
     return value_ != null;
@@ -447,6 +485,8 @@ public boolean hasValue() {
    * 

    *
    * .google.datastore.v1.Value value = 3;
+   *
+   * @return The value.
    */
   public com.google.datastore.v1.Value getValue() {
     return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
@@ -848,6 +888,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
+     *
+     * @return Whether the property field is set.
      */
     public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
@@ -860,6 +902,8 @@ public boolean hasProperty() {
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
+     *
+     * @return The property.
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
@@ -1024,6 +1068,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
+     *
+     * @return The enum numeric value on the wire for op.
      */
     public int getOpValue() {
       return op_;
@@ -1036,6 +1082,9 @@ public int getOpValue() {
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
+     *
+     * @param value The enum numeric value on the wire for op to set.
+     * @return This builder for chaining.
      */
     public Builder setOpValue(int value) {
       op_ = value;
@@ -1050,6 +1099,8 @@ public Builder setOpValue(int value) {
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
+     *
+     * @return The op.
      */
     public com.google.datastore.v1.PropertyFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
@@ -1065,6 +1116,9 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() {
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
+     *
+     * @param value The op to set.
+     * @return This builder for chaining.
      */
     public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
       if (value == null) {
@@ -1083,6 +1137,8 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearOp() {
 
@@ -1105,6 +1161,8 @@ public Builder clearOp() {
      * 

      *
      * .google.datastore.v1.Value value = 3;
+     *
+     * @return Whether the value field is set.
      */
     public boolean hasValue() {
       return valueBuilder_ != null || value_ != null;
@@ -1117,6 +1175,8 @@ public boolean hasValue() {
      * 

      *
      * .google.datastore.v1.Value value = 3;
+     *
+     * @return The value.
      */
     public com.google.datastore.v1.Value getValue() {
       if (valueBuilder_ == null) {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index 426eb1eb4b31..311c260a6dee 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface PropertyFilterOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return Whether the property field is set.
    */
   boolean hasProperty();
   /**
@@ -26,6 +43,8 @@ public interface PropertyFilterOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
@@ -47,6 +66,8 @@ public interface PropertyFilterOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
+   *
+   * @return The enum numeric value on the wire for op.
    */
   int getOpValue();
   /**
@@ -57,6 +78,8 @@ public interface PropertyFilterOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
+   *
+   * @return The op.
    */
   com.google.datastore.v1.PropertyFilter.Operator getOp();
 
@@ -68,6 +91,8 @@ public interface PropertyFilterOrBuilder
    * 

    *
    * .google.datastore.v1.Value value = 3;
+   *
+   * @return Whether the value field is set.
    */
   boolean hasValue();
   /**
@@ -78,6 +103,8 @@ public interface PropertyFilterOrBuilder
    * 

    *
    * .google.datastore.v1.Value value = 3;
+   *
+   * @return The value.
    */
   com.google.datastore.v1.Value getValue();
   /**
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 57a048443a5e..4876eefb5c0f 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -26,6 +41,12 @@ private PropertyOrder() {
     direction_ = 0;
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new PropertyOrder();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -39,7 +60,6 @@ private PropertyOrder(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -189,12 +209,20 @@ public final int getNumber() {
       return value;
     }
 
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static Direction valueOf(int value) {
       return forNumber(value);
     }
 
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
     public static Direction forNumber(int value) {
       switch (value) {
         case 0:
@@ -262,6 +290,8 @@ private Direction(int value) {
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return Whether the property field is set.
    */
   public boolean hasProperty() {
     return property_ != null;
@@ -274,6 +304,8 @@ public boolean hasProperty() {
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return The property.
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
     return property_ == null
@@ -303,6 +335,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+   *
+   * @return The enum numeric value on the wire for direction.
    */
   public int getDirectionValue() {
     return direction_;
@@ -315,6 +349,8 @@ public int getDirectionValue() {
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+   *
+   * @return The direction.
    */
   public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
     @SuppressWarnings("deprecation")
@@ -680,6 +716,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
+     *
+     * @return Whether the property field is set.
      */
     public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
@@ -692,6 +730,8 @@ public boolean hasProperty() {
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
+     *
+     * @return The property.
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
@@ -856,6 +896,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+     *
+     * @return The enum numeric value on the wire for direction.
      */
     public int getDirectionValue() {
       return direction_;
@@ -868,6 +910,9 @@ public int getDirectionValue() {
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+     *
+     * @param value The enum numeric value on the wire for direction to set.
+     * @return This builder for chaining.
      */
     public Builder setDirectionValue(int value) {
       direction_ = value;
@@ -882,6 +927,8 @@ public Builder setDirectionValue(int value) {
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+     *
+     * @return The direction.
      */
     public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
       @SuppressWarnings("deprecation")
@@ -897,6 +944,9 @@ public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+     *
+     * @param value The direction to set.
+     * @return This builder for chaining.
      */
     public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction value) {
       if (value == null) {
@@ -915,6 +965,8 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearDirection() {
 
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index 5b61547c8001..bb9417a94936 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface PropertyOrderOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return Whether the property field is set.
    */
   boolean hasProperty();
   /**
@@ -26,6 +43,8 @@ public interface PropertyOrderOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
+   *
+   * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
@@ -47,6 +66,8 @@ public interface PropertyOrderOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+   *
+   * @return The enum numeric value on the wire for direction.
    */
   int getDirectionValue();
   /**
@@ -57,6 +78,8 @@ public interface PropertyOrderOrBuilder
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
+   *
+   * @return The direction.
    */
   com.google.datastore.v1.PropertyOrder.Direction getDirection();
 }
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 5bcb1ca552f7..33d3a347ce2c 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -26,6 +41,12 @@ private PropertyReference() {
     name_ = "";
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new PropertyReference();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -39,7 +60,6 @@ private PropertyReference(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -102,6 +122,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 

    *
    * string name = 2;
+   *
+   * @return The name.
    */
   public java.lang.String getName() {
     java.lang.Object ref = name_;
@@ -123,6 +145,8 @@ public java.lang.String getName() {
    * 

    *
    * string name = 2;
+   *
+   * @return The bytes for name.
    */
   public com.google.protobuf.ByteString getNameBytes() {
     java.lang.Object ref = name_;
@@ -462,6 +486,8 @@ public Builder mergeFrom(
      * 

      *
      * string name = 2;
+     *
+     * @return The name.
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -483,6 +509,8 @@ public java.lang.String getName() {
      * 

      *
      * string name = 2;
+     *
+     * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
       java.lang.Object ref = name_;
@@ -504,6 +532,9 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 

      *
      * string name = 2;
+     *
+     * @param value The name to set.
+     * @return This builder for chaining.
      */
     public Builder setName(java.lang.String value) {
       if (value == null) {
@@ -523,6 +554,8 @@ public Builder setName(java.lang.String value) {
      * 

      *
      * string name = 2;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearName() {
 
@@ -539,6 +572,9 @@ public Builder clearName() {
      * 

      *
      * string name = 2;
+     *
+     * @param value The bytes for name to set.
+     * @return This builder for chaining.
      */
     public Builder setNameBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 39fde12b99be..45f2069d7dbc 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -17,6 +32,8 @@ public interface PropertyReferenceOrBuilder
    * 

    *
    * string name = 2;
+   *
+   * @return The name.
    */
   java.lang.String getName();
   /**
@@ -28,6 +45,8 @@ public interface PropertyReferenceOrBuilder
    * 

    *
    * string name = 2;
+   *
+   * @return The bytes for name.
    */
   com.google.protobuf.ByteString getNameBytes();
 }
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 49177c094c77..56390c2ac1bd 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -31,6 +46,12 @@ private Query() {
     endCursor_ = com.google.protobuf.ByteString.EMPTY;
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Query();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -94,9 +115,9 @@ private Query(
             }
           case 42:
             {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 order_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000004;
               }
               order_.add(
                   input.readMessage(
@@ -105,9 +126,9 @@ private Query(
             }
           case 50:
             {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 distinctOn_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000010;
+                mutable_bitField0_ |= 0x00000008;
               }
               distinctOn_.add(
                   input.readMessage(
@@ -164,10 +185,10 @@ private Query(
       if (((mutable_bitField0_ & 0x00000002) != 0)) {
         kind_ = java.util.Collections.unmodifiableList(kind_);
       }
-      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
         order_ = java.util.Collections.unmodifiableList(order_);
       }
-      if (((mutable_bitField0_ & 0x00000010) != 0)) {
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
         distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_);
       }
       this.unknownFields = unknownFields.build();
@@ -188,7 +209,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PROJECTION_FIELD_NUMBER = 2;
   private java.util.List projection_;
   /**
@@ -332,6 +352,8 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
+   *
+   * @return Whether the filter field is set.
    */
   public boolean hasFilter() {
     return filter_ != null;
@@ -344,6 +366,8 @@ public boolean hasFilter() {
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
+   *
+   * @return The filter.
    */
   public com.google.datastore.v1.Filter getFilter() {
     return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
@@ -512,6 +536,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
    * 

    *
    * bytes start_cursor = 7;
+   *
+   * @return The startCursor.
    */
   public com.google.protobuf.ByteString getStartCursor() {
     return startCursor_;
@@ -530,6 +556,8 @@ public com.google.protobuf.ByteString getStartCursor() {
    * 

    *
    * bytes end_cursor = 8;
+   *
+   * @return The endCursor.
    */
   public com.google.protobuf.ByteString getEndCursor() {
     return endCursor_;
@@ -546,6 +574,8 @@ public com.google.protobuf.ByteString getEndCursor() {
    * 

    *
    * int32 offset = 10;
+   *
+   * @return The offset.
    */
   public int getOffset() {
     return offset_;
@@ -564,6 +594,8 @@ public int getOffset() {
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
+   *
+   * @return Whether the limit field is set.
    */
   public boolean hasLimit() {
     return limit_ != null;
@@ -579,6 +611,8 @@ public boolean hasLimit() {
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
+   *
+   * @return The limit.
    */
   public com.google.protobuf.Int32Value getLimit() {
     return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
@@ -915,13 +949,13 @@ public Builder clear() {
       }
       if (orderBuilder_ == null) {
         order_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000004);
       } else {
         orderBuilder_.clear();
       }
       if (distinctOnBuilder_ == null) {
         distinctOn_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000008);
       } else {
         distinctOnBuilder_.clear();
       }
@@ -964,7 +998,6 @@ public com.google.datastore.v1.Query build() {
     public com.google.datastore.v1.Query buildPartial() {
       com.google.datastore.v1.Query result = new com.google.datastore.v1.Query(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       if (projectionBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           projection_ = java.util.Collections.unmodifiableList(projection_);
@@ -989,18 +1022,18 @@ public com.google.datastore.v1.Query buildPartial() {
         result.filter_ = filterBuilder_.build();
       }
       if (orderBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           order_ = java.util.Collections.unmodifiableList(order_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.order_ = order_;
       } else {
         result.order_ = orderBuilder_.build();
       }
       if (distinctOnBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.distinctOn_ = distinctOn_;
       } else {
@@ -1014,7 +1047,6 @@ public com.google.datastore.v1.Query buildPartial() {
       } else {
         result.limit_ = limitBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -1125,7 +1157,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
         if (!other.order_.isEmpty()) {
           if (order_.isEmpty()) {
             order_ = other.order_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureOrderIsMutable();
             order_.addAll(other.order_);
@@ -1138,7 +1170,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             orderBuilder_.dispose();
             orderBuilder_ = null;
             order_ = other.order_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000004);
             orderBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOrderFieldBuilder()
@@ -1152,7 +1184,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
         if (!other.distinctOn_.isEmpty()) {
           if (distinctOn_.isEmpty()) {
             distinctOn_ = other.distinctOn_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureDistinctOnIsMutable();
             distinctOn_.addAll(other.distinctOn_);
@@ -1165,7 +1197,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             distinctOnBuilder_.dispose();
             distinctOnBuilder_ = null;
             distinctOn_ = other.distinctOn_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000008);
             distinctOnBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getDistinctOnFieldBuilder()
@@ -1946,6 +1978,8 @@ public java.util.List getKindBui
      * 

      *
      * .google.datastore.v1.Filter filter = 4;
+     *
+     * @return Whether the filter field is set.
      */
     public boolean hasFilter() {
       return filterBuilder_ != null || filter_ != null;
@@ -1958,6 +1992,8 @@ public boolean hasFilter() {
      * 

      *
      * .google.datastore.v1.Filter filter = 4;
+     *
+     * @return The filter.
      */
     public com.google.datastore.v1.Filter getFilter() {
       if (filterBuilder_ == null) {
@@ -2111,9 +2147,9 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureOrderIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         order_ = new java.util.ArrayList(order_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -2328,7 +2364,7 @@ public Builder addAllOrder(
     public Builder clearOrder() {
       if (orderBuilder_ == null) {
         order_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         orderBuilder_.clear();
@@ -2449,7 +2485,7 @@ public java.util.List getOrderBui
                 com.google.datastore.v1.PropertyOrder,
                 com.google.datastore.v1.PropertyOrder.Builder,
                 com.google.datastore.v1.PropertyOrderOrBuilder>(
-                order_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                order_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         order_ = null;
       }
       return orderBuilder_;
@@ -2459,10 +2495,10 @@ public java.util.List getOrderBui
         java.util.Collections.emptyList();
 
     private void ensureDistinctOnIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         distinctOn_ =
             new java.util.ArrayList(distinctOn_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -2700,7 +2736,7 @@ public Builder addAllDistinctOn(
     public Builder clearDistinctOn() {
       if (distinctOnBuilder_ == null) {
         distinctOn_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         distinctOnBuilder_.clear();
@@ -2836,7 +2872,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
                 com.google.datastore.v1.PropertyReference,
                 com.google.datastore.v1.PropertyReference.Builder,
                 com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                distinctOn_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
+                distinctOn_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         distinctOn_ = null;
       }
       return distinctOnBuilder_;
@@ -2854,6 +2890,8 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
      * 

      *
      * bytes start_cursor = 7;
+     *
+     * @return The startCursor.
      */
     public com.google.protobuf.ByteString getStartCursor() {
       return startCursor_;
@@ -2869,6 +2907,9 @@ public com.google.protobuf.ByteString getStartCursor() {
      * 

      *
      * bytes start_cursor = 7;
+     *
+     * @param value The startCursor to set.
+     * @return This builder for chaining.
      */
     public Builder setStartCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -2890,6 +2931,8 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes start_cursor = 7;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearStartCursor() {
 
@@ -2910,6 +2953,8 @@ public Builder clearStartCursor() {
      * 

      *
      * bytes end_cursor = 8;
+     *
+     * @return The endCursor.
      */
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
@@ -2925,6 +2970,9 @@ public com.google.protobuf.ByteString getEndCursor() {
      * 

      *
      * bytes end_cursor = 8;
+     *
+     * @param value The endCursor to set.
+     * @return This builder for chaining.
      */
     public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -2946,6 +2994,8 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes end_cursor = 8;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearEndCursor() {
 
@@ -2964,6 +3014,8 @@ public Builder clearEndCursor() {
      * 

      *
      * int32 offset = 10;
+     *
+     * @return The offset.
      */
     public int getOffset() {
       return offset_;
@@ -2977,6 +3029,9 @@ public int getOffset() {
      * 

      *
      * int32 offset = 10;
+     *
+     * @param value The offset to set.
+     * @return This builder for chaining.
      */
     public Builder setOffset(int value) {
 
@@ -2993,6 +3048,8 @@ public Builder setOffset(int value) {
      * 

      *
      * int32 offset = 10;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearOffset() {
 
@@ -3018,6 +3075,8 @@ public Builder clearOffset() {
      * 

      *
      * .google.protobuf.Int32Value limit = 12;
+     *
+     * @return Whether the limit field is set.
      */
     public boolean hasLimit() {
       return limitBuilder_ != null || limit_ != null;
@@ -3033,6 +3092,8 @@ public boolean hasLimit() {
      * 

      *
      * .google.protobuf.Int32Value limit = 12;
+     *
+     * @return The limit.
      */
     public com.google.protobuf.Int32Value getLimit() {
       if (limitBuilder_ == null) {
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 383f534837c7..56d8980c3297 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -124,6 +139,8 @@ public interface QueryOrBuilder
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
+   *
+   * @return Whether the filter field is set.
    */
   boolean hasFilter();
   /**
@@ -134,6 +151,8 @@ public interface QueryOrBuilder
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
+   *
+   * @return The filter.
    */
   com.google.datastore.v1.Filter getFilter();
   /**
@@ -271,6 +290,8 @@ public interface QueryOrBuilder
    * 

    *
    * bytes start_cursor = 7;
+   *
+   * @return The startCursor.
    */
   com.google.protobuf.ByteString getStartCursor();
 
@@ -285,6 +306,8 @@ public interface QueryOrBuilder
    * 

    *
    * bytes end_cursor = 8;
+   *
+   * @return The endCursor.
    */
   com.google.protobuf.ByteString getEndCursor();
 
@@ -297,6 +320,8 @@ public interface QueryOrBuilder
    * 

    *
    * int32 offset = 10;
+   *
+   * @return The offset.
    */
   int getOffset();
 
@@ -311,6 +336,8 @@ public interface QueryOrBuilder
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
+   *
+   * @return Whether the limit field is set.
    */
   boolean hasLimit();
   /**
@@ -324,6 +351,8 @@ public interface QueryOrBuilder
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
+   *
+   * @return The limit.
    */
   com.google.protobuf.Int32Value getLimit();
   /**
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 062e08d0ec9d..114735acb793 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -144,23 +159,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\002\031Google.Cloud.Datastore.V1\312\002\031Google\\Clo"
           + "ud\\Datastore\\V1b\006proto3"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-        descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          com.google.api.AnnotationsProto.getDescriptor(),
-          com.google.datastore.v1.EntityProto.getDescriptor(),
-          com.google.protobuf.WrappersProto.getDescriptor(),
-          com.google.type.LatLngProto.getDescriptor(),
-        },
-        assigner);
+    descriptor =
+        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
+            descriptorData,
+            new com.google.protobuf.Descriptors.FileDescriptor[] {
+              com.google.api.AnnotationsProto.getDescriptor(),
+              com.google.datastore.v1.EntityProto.getDescriptor(),
+              com.google.protobuf.WrappersProto.getDescriptor(),
+              com.google.type.LatLngProto.getDescriptor(),
+            });
     internal_static_google_datastore_v1_EntityResult_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_google_datastore_v1_EntityResult_fieldAccessorTable =
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index f137a55af9fd..832ad31c777f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -30,6 +45,12 @@ private QueryResultBatch() {
     moreResults_ = 0;
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new QueryResultBatch();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -63,9 +84,9 @@ private QueryResultBatch(
             }
           case 18:
             {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityResults_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000001;
               }
               entityResults_.add(
                   input.readMessage(
@@ -113,7 +134,7 @@ private QueryResultBatch(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
       }
       this.unknownFields = unknownFields.build();
@@ -260,12 +281,20 @@ public final int getNumber() {
       return value;
     }
 
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static MoreResultsType valueOf(int value) {
       return forNumber(value);
     }
 
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
     public static MoreResultsType forNumber(int value) {
       switch (value) {
         case 0:
@@ -329,7 +358,6 @@ private MoreResultsType(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.v1.QueryResultBatch.MoreResultsType)
   }
 
-  private int bitField0_;
   public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6;
   private int skippedResults_;
   /**
@@ -340,6 +368,8 @@ private MoreResultsType(int value) {
    * 

    *
    * int32 skipped_results = 6;
+   *
+   * @return The skippedResults.
    */
   public int getSkippedResults() {
     return skippedResults_;
@@ -356,6 +386,8 @@ public int getSkippedResults() {
    * 

    *
    * bytes skipped_cursor = 3;
+   *
+   * @return The skippedCursor.
    */
   public com.google.protobuf.ByteString getSkippedCursor() {
     return skippedCursor_;
@@ -371,6 +403,8 @@ public com.google.protobuf.ByteString getSkippedCursor() {
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+   *
+   * @return The enum numeric value on the wire for entityResultType.
    */
   public int getEntityResultTypeValue() {
     return entityResultType_;
@@ -383,6 +417,8 @@ public int getEntityResultTypeValue() {
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+   *
+   * @return The entityResultType.
    */
   public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
     @SuppressWarnings("deprecation")
@@ -465,6 +501,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
    * 

    *
    * bytes end_cursor = 4;
+   *
+   * @return The endCursor.
    */
   public com.google.protobuf.ByteString getEndCursor() {
     return endCursor_;
@@ -480,6 +518,8 @@ public com.google.protobuf.ByteString getEndCursor() {
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+   *
+   * @return The enum numeric value on the wire for moreResults.
    */
   public int getMoreResultsValue() {
     return moreResults_;
@@ -492,6 +532,8 @@ public int getMoreResultsValue() {
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+   *
+   * @return The moreResults.
    */
   public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
     @SuppressWarnings("deprecation")
@@ -519,6 +561,8 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
    * 

    *
    * int64 snapshot_version = 7;
+   *
+   * @return The snapshotVersion.
    */
   public long getSnapshotVersion() {
     return snapshotVersion_;
@@ -799,7 +843,7 @@ public Builder clear() {
 
       if (entityResultsBuilder_ == null) {
         entityResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
         entityResultsBuilder_.clear();
       }
@@ -837,14 +881,13 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
       com.google.datastore.v1.QueryResultBatch result =
           new com.google.datastore.v1.QueryResultBatch(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       result.skippedResults_ = skippedResults_;
       result.skippedCursor_ = skippedCursor_;
       result.entityResultType_ = entityResultType_;
       if (entityResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.entityResults_ = entityResults_;
       } else {
@@ -853,7 +896,6 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
       result.endCursor_ = endCursor_;
       result.moreResults_ = moreResults_;
       result.snapshotVersion_ = snapshotVersion_;
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -916,7 +958,7 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
         if (!other.entityResults_.isEmpty()) {
           if (entityResults_.isEmpty()) {
             entityResults_ = other.entityResults_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureEntityResultsIsMutable();
             entityResults_.addAll(other.entityResults_);
@@ -929,7 +971,7 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
             entityResultsBuilder_.dispose();
             entityResultsBuilder_ = null;
             entityResults_ = other.entityResults_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
             entityResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntityResultsFieldBuilder()
@@ -988,6 +1030,8 @@ public Builder mergeFrom(
      * 

      *
      * int32 skipped_results = 6;
+     *
+     * @return The skippedResults.
      */
     public int getSkippedResults() {
       return skippedResults_;
@@ -1000,6 +1044,9 @@ public int getSkippedResults() {
      * 

      *
      * int32 skipped_results = 6;
+     *
+     * @param value The skippedResults to set.
+     * @return This builder for chaining.
      */
     public Builder setSkippedResults(int value) {
 
@@ -1015,6 +1062,8 @@ public Builder setSkippedResults(int value) {
      * 

      *
      * int32 skipped_results = 6;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearSkippedResults() {
 
@@ -1033,6 +1082,8 @@ public Builder clearSkippedResults() {
      * 

      *
      * bytes skipped_cursor = 3;
+     *
+     * @return The skippedCursor.
      */
     public com.google.protobuf.ByteString getSkippedCursor() {
       return skippedCursor_;
@@ -1046,6 +1097,9 @@ public com.google.protobuf.ByteString getSkippedCursor() {
      * 

      *
      * bytes skipped_cursor = 3;
+     *
+     * @param value The skippedCursor to set.
+     * @return This builder for chaining.
      */
     public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -1065,6 +1119,8 @@ public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes skipped_cursor = 3;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearSkippedCursor() {
 
@@ -1082,6 +1138,8 @@ public Builder clearSkippedCursor() {
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+     *
+     * @return The enum numeric value on the wire for entityResultType.
      */
     public int getEntityResultTypeValue() {
       return entityResultType_;
@@ -1094,6 +1152,9 @@ public int getEntityResultTypeValue() {
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+     *
+     * @param value The enum numeric value on the wire for entityResultType to set.
+     * @return This builder for chaining.
      */
     public Builder setEntityResultTypeValue(int value) {
       entityResultType_ = value;
@@ -1108,6 +1169,8 @@ public Builder setEntityResultTypeValue(int value) {
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+     *
+     * @return The entityResultType.
      */
     public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
       @SuppressWarnings("deprecation")
@@ -1123,6 +1186,9 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+     *
+     * @param value The entityResultType to set.
+     * @return This builder for chaining.
      */
     public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultType value) {
       if (value == null) {
@@ -1141,6 +1207,8 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearEntityResultType() {
 
@@ -1153,10 +1221,10 @@ public Builder clearEntityResultType() {
         java.util.Collections.emptyList();
 
     private void ensureEntityResultsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         entityResults_ =
             new java.util.ArrayList(entityResults_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1371,7 +1439,7 @@ public Builder addAllEntityResults(
     public Builder clearEntityResults() {
       if (entityResultsBuilder_ == null) {
         entityResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         entityResultsBuilder_.clear();
@@ -1494,7 +1562,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
                 com.google.datastore.v1.EntityResult.Builder,
                 com.google.datastore.v1.EntityResultOrBuilder>(
                 entityResults_,
-                ((bitField0_ & 0x00000008) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         entityResults_ = null;
@@ -1511,6 +1579,8 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
      * 

      *
      * bytes end_cursor = 4;
+     *
+     * @return The endCursor.
      */
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
@@ -1523,6 +1593,9 @@ public com.google.protobuf.ByteString getEndCursor() {
      * 

      *
      * bytes end_cursor = 4;
+     *
+     * @param value The endCursor to set.
+     * @return This builder for chaining.
      */
     public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -1541,6 +1614,8 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes end_cursor = 4;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearEndCursor() {
 
@@ -1558,6 +1633,8 @@ public Builder clearEndCursor() {
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+     *
+     * @return The enum numeric value on the wire for moreResults.
      */
     public int getMoreResultsValue() {
       return moreResults_;
@@ -1570,6 +1647,9 @@ public int getMoreResultsValue() {
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+     *
+     * @param value The enum numeric value on the wire for moreResults to set.
+     * @return This builder for chaining.
      */
     public Builder setMoreResultsValue(int value) {
       moreResults_ = value;
@@ -1584,6 +1664,8 @@ public Builder setMoreResultsValue(int value) {
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+     *
+     * @return The moreResults.
      */
     public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
       @SuppressWarnings("deprecation")
@@ -1601,6 +1683,9 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+     *
+     * @param value The moreResults to set.
+     * @return This builder for chaining.
      */
     public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResultsType value) {
       if (value == null) {
@@ -1619,6 +1704,8 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearMoreResults() {
 
@@ -1643,6 +1730,8 @@ public Builder clearMoreResults() {
      * 

      *
      * int64 snapshot_version = 7;
+     *
+     * @return The snapshotVersion.
      */
     public long getSnapshotVersion() {
       return snapshotVersion_;
@@ -1662,6 +1751,9 @@ public long getSnapshotVersion() {
      * 

      *
      * int64 snapshot_version = 7;
+     *
+     * @param value The snapshotVersion to set.
+     * @return This builder for chaining.
      */
     public Builder setSnapshotVersion(long value) {
 
@@ -1684,6 +1776,8 @@ public Builder setSnapshotVersion(long value) {
      * 

      *
      * int64 snapshot_version = 7;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearSnapshotVersion() {
 
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index b08403dbbc2b..1345bd9ad994 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
@@ -16,6 +31,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * int32 skipped_results = 6;
+   *
+   * @return The skippedResults.
    */
   int getSkippedResults();
 
@@ -28,6 +45,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * bytes skipped_cursor = 3;
+   *
+   * @return The skippedCursor.
    */
   com.google.protobuf.ByteString getSkippedCursor();
 
@@ -39,6 +58,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+   *
+   * @return The enum numeric value on the wire for entityResultType.
    */
   int getEntityResultTypeValue();
   /**
@@ -49,6 +70,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
+   *
+   * @return The entityResultType.
    */
   com.google.datastore.v1.EntityResult.ResultType getEntityResultType();
 
@@ -112,6 +135,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * bytes end_cursor = 4;
+   *
+   * @return The endCursor.
    */
   com.google.protobuf.ByteString getEndCursor();
 
@@ -123,6 +148,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+   *
+   * @return The enum numeric value on the wire for moreResults.
    */
   int getMoreResultsValue();
   /**
@@ -133,6 +160,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
+   *
+   * @return The moreResults.
    */
   com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults();
 
@@ -151,6 +180,8 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * int64 snapshot_version = 7;
+   *
+   * @return The snapshotVersion.
    */
   long getSnapshotVersion();
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 87131e76ae0f..92816e64e7d1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -24,6 +39,12 @@ private ReadOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private ReadOptions() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ReadOptions();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -37,7 +58,6 @@ private ReadOptions(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -177,12 +197,20 @@ public final int getNumber() {
       return value;
     }
 
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static ReadConsistency valueOf(int value) {
       return forNumber(value);
     }
 
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
     public static ReadConsistency forNumber(int value) {
       switch (value) {
         case 0:
@@ -245,7 +273,10 @@ private ReadConsistency(int value) {
   private int consistencyTypeCase_ = 0;
   private java.lang.Object consistencyType_;
 
-  public enum ConsistencyTypeCase implements com.google.protobuf.Internal.EnumLite {
+  public enum ConsistencyTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     READ_CONSISTENCY(1),
     TRANSACTION(2),
     CONSISTENCYTYPE_NOT_SET(0);
@@ -254,7 +285,11 @@ public enum ConsistencyTypeCase implements com.google.protobuf.Internal.EnumLite
     private ConsistencyTypeCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static ConsistencyTypeCase valueOf(int value) {
       return forNumber(value);
@@ -292,6 +327,8 @@ public ConsistencyTypeCase getConsistencyTypeCase() {
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+   *
+   * @return The enum numeric value on the wire for readConsistency.
    */
   public int getReadConsistencyValue() {
     if (consistencyTypeCase_ == 1) {
@@ -308,6 +345,8 @@ public int getReadConsistencyValue() {
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+   *
+   * @return The readConsistency.
    */
   public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
     if (consistencyTypeCase_ == 1) {
@@ -333,6 +372,8 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
    * 

    *
    * bytes transaction = 2;
+   *
+   * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
     if (consistencyTypeCase_ == 2) {
@@ -725,6 +766,8 @@ public Builder clearConsistencyType() {
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+     *
+     * @return The enum numeric value on the wire for readConsistency.
      */
     public int getReadConsistencyValue() {
       if (consistencyTypeCase_ == 1) {
@@ -741,6 +784,9 @@ public int getReadConsistencyValue() {
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+     *
+     * @param value The enum numeric value on the wire for readConsistency to set.
+     * @return This builder for chaining.
      */
     public Builder setReadConsistencyValue(int value) {
       consistencyTypeCase_ = 1;
@@ -757,6 +803,8 @@ public Builder setReadConsistencyValue(int value) {
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+     *
+     * @return The readConsistency.
      */
     public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
       if (consistencyTypeCase_ == 1) {
@@ -779,6 +827,9 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+     *
+     * @param value The readConsistency to set.
+     * @return This builder for chaining.
      */
     public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsistency value) {
       if (value == null) {
@@ -798,6 +849,8 @@ public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsis
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearReadConsistency() {
       if (consistencyTypeCase_ == 1) {
@@ -818,6 +871,8 @@ public Builder clearReadConsistency() {
      * 

      *
      * bytes transaction = 2;
+     *
+     * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
       if (consistencyTypeCase_ == 2) {
@@ -835,6 +890,9 @@ public com.google.protobuf.ByteString getTransaction() {
      * 

      *
      * bytes transaction = 2;
+     *
+     * @param value The transaction to set.
+     * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -855,6 +913,8 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes transaction = 2;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearTransaction() {
       if (consistencyTypeCase_ == 2) {
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 b26b70ae5541..182cde5d9b38 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -17,6 +32,8 @@ public interface ReadOptionsOrBuilder
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+   *
+   * @return The enum numeric value on the wire for readConsistency.
    */
   int getReadConsistencyValue();
   /**
@@ -28,6 +45,8 @@ public interface ReadOptionsOrBuilder
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+   *
+   * @return The readConsistency.
    */
   com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency();
 
@@ -41,6 +60,8 @@ public interface ReadOptionsOrBuilder
    * 

    *
    * bytes transaction = 2;
+   *
+   * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
 
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 9b46c602fd0b..da2f1ed94550 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
@@ -29,6 +43,12 @@ private ReserveIdsRequest() {
     keys_ = java.util.Collections.emptyList();
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ReserveIdsRequest();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -55,9 +75,9 @@ private ReserveIdsRequest(
             break;
           case 10:
             {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
               break;
@@ -90,7 +110,7 @@ private ReserveIdsRequest(
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
       }
       this.unknownFields = unknownFields.build();
@@ -113,17 +133,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.ReserveIdsRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -140,10 +161,12 @@ public java.lang.String getProjectId() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -167,6 +190,8 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * 

    *
    * string database_id = 9;
+   *
+   * @return The databaseId.
    */
   public java.lang.String getDatabaseId() {
     java.lang.Object ref = databaseId_;
@@ -187,6 +212,8 @@ public java.lang.String getDatabaseId() {
    * 

    *
    * string database_id = 9;
+   *
+   * @return The bytes for databaseId.
    */
   public com.google.protobuf.ByteString getDatabaseIdBytes() {
     java.lang.Object ref = databaseId_;
@@ -206,11 +233,12 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public java.util.List getKeysList() {
     return keys_;
@@ -219,11 +247,12 @@ public java.util.List getKeysList() {
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public java.util.List getKeysOrBuilderList() {
     return keys_;
@@ -232,11 +261,12 @@ public java.util.List getKeysOrB
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public int getKeysCount() {
     return keys_.size();
@@ -245,11 +275,12 @@ public int getKeysCount() {
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
@@ -258,11 +289,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
@@ -451,8 +483,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
@@ -501,7 +532,7 @@ public Builder clear() {
 
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
         keysBuilder_.clear();
       }
@@ -533,19 +564,17 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
       com.google.datastore.v1.ReserveIdsRequest result =
           new com.google.datastore.v1.ReserveIdsRequest(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       result.projectId_ = projectId_;
       result.databaseId_ = databaseId_;
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.keys_ = keys_;
       } else {
         result.keys_ = keysBuilder_.build();
       }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -607,7 +636,7 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureKeysIsMutable();
             keys_.addAll(other.keys_);
@@ -620,7 +649,7 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
             keysBuilder_.dispose();
             keysBuilder_ = null;
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
             keysBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getKeysFieldBuilder()
@@ -666,10 +695,12 @@ public Builder mergeFrom(
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -686,10 +717,12 @@ public java.lang.String getProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -706,10 +739,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -724,10 +760,12 @@ public Builder setProjectId(java.lang.String value) {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -739,10 +777,13 @@ public Builder clearProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -764,6 +805,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * string database_id = 9;
+     *
+     * @return The databaseId.
      */
     public java.lang.String getDatabaseId() {
       java.lang.Object ref = databaseId_;
@@ -784,6 +827,8 @@ public java.lang.String getDatabaseId() {
      * 

      *
      * string database_id = 9;
+     *
+     * @return The bytes for databaseId.
      */
     public com.google.protobuf.ByteString getDatabaseIdBytes() {
       java.lang.Object ref = databaseId_;
@@ -804,6 +849,9 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
      * 

      *
      * 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) {
@@ -822,6 +870,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * 

      *
      * string database_id = 9;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
 
@@ -837,6 +887,9 @@ public Builder clearDatabaseId() {
      * 

      *
      * 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) {
@@ -852,9 +905,9 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -868,11 +921,12 @@ private void ensureKeysIsMutable() {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysList() {
       if (keysBuilder_ == null) {
@@ -885,11 +939,12 @@ public java.util.List getKeysList() {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public int getKeysCount() {
       if (keysBuilder_ == null) {
@@ -902,11 +957,12 @@ public int getKeysCount() {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key getKeys(int index) {
       if (keysBuilder_ == null) {
@@ -919,11 +975,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -942,11 +999,12 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -962,11 +1020,12 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -985,11 +1044,12 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -1008,11 +1068,12 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -1028,11 +1089,12 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
@@ -1048,11 +1110,12 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
@@ -1068,16 +1131,17 @@ public Builder addAllKeys(java.lang.Iterable
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder clearKeys() {
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         keysBuilder_.clear();
@@ -1088,11 +1152,12 @@ public Builder clearKeys() {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public Builder removeKeys(int index) {
       if (keysBuilder_ == null) {
@@ -1108,11 +1173,12 @@ public Builder removeKeys(int index) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
       return getKeysFieldBuilder().getBuilder(index);
@@ -1121,11 +1187,12 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
       if (keysBuilder_ == null) {
@@ -1138,11 +1205,12 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
@@ -1155,11 +1223,12 @@ public java.util.List getKeysOrB
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
       return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
@@ -1168,11 +1237,12 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
       return getKeysFieldBuilder()
@@ -1182,11 +1252,12 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
      *
      *
      * 
-     * A list of keys with complete key paths whose numeric IDs should not be
+     * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1;
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
      */
     public java.util.List getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
@@ -1203,7 +1274,7 @@ public java.util.List getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
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 91c1c28db685..5f226316ae04 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -12,20 +27,24 @@ public interface ReserveIdsRequestOrBuilder
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -37,6 +56,8 @@ public interface ReserveIdsRequestOrBuilder
    * 

    *
    * string database_id = 9;
+   *
+   * @return The databaseId.
    */
   java.lang.String getDatabaseId();
   /**
@@ -47,6 +68,8 @@ public interface ReserveIdsRequestOrBuilder
    * 

    *
    * string database_id = 9;
+   *
+   * @return The bytes for databaseId.
    */
   com.google.protobuf.ByteString getDatabaseIdBytes();
 
@@ -54,55 +77,60 @@ public interface ReserveIdsRequestOrBuilder
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   java.util.List getKeysList();
   /**
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   int getKeysCount();
   /**
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   java.util.List getKeysOrBuilderList();
   /**
    *
    *
    * 
-   * A list of keys with complete key paths whose numeric IDs should not be
+   * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1;
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
    */
   com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
 }
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 9536829023f0..7952b8ed650c 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,8 +22,7 @@
  *
  *
  * 
- * The response for
- * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
@@ -25,6 +39,12 @@ private ReserveIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder bui
 
   private ReserveIdsResponse() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ReserveIdsResponse();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -236,8 +256,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for
-   * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 4ffdc1c498ef..97be709a2fc0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
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 23aaf3e34630..8737207deaaa 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -27,6 +42,12 @@ private RollbackRequest() {
     transaction_ = com.google.protobuf.ByteString.EMPTY;
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new RollbackRequest();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -40,7 +61,6 @@ private RollbackRequest(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -103,10 +123,12 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -123,10 +145,12 @@ public java.lang.String getProjectId() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -146,11 +170,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    *
    * 
-   * The transaction identifier, returned by a call to
+   * Required. The transaction identifier, returned by a call to
    * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
-   * bytes transaction = 1;
+   * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
@@ -491,10 +517,12 @@ public Builder mergeFrom(
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -511,10 +539,12 @@ public java.lang.String getProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -531,10 +561,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -549,10 +582,12 @@ public Builder setProjectId(java.lang.String value) {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -564,10 +599,13 @@ public Builder clearProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -585,11 +623,13 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * The transaction identifier, returned by a call to
+     * Required. The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
      * 

      *
-     * bytes transaction = 1;
+     * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
@@ -598,11 +638,14 @@ public com.google.protobuf.ByteString getTransaction() {
      *
      *
      * 
-     * The transaction identifier, returned by a call to
+     * Required. The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
      * 

      *
-     * bytes transaction = 1;
+     * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The transaction to set.
+     * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -617,11 +660,13 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * The transaction identifier, returned by a call to
+     * Required. The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
      * 

      *
-     * bytes transaction = 1;
+     * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearTransaction() {
 
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 cddd3ea723cd..f79f60fab3b4 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -12,20 +27,24 @@ public interface RollbackRequestOrBuilder
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -33,11 +52,13 @@ public interface RollbackRequestOrBuilder
    *
    *
    * 
-   * The transaction identifier, returned by a call to
+   * Required. The transaction identifier, returned by a call to
    * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
-   * bytes transaction = 1;
+   * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
 }
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 f478f7be062f..aaad534c1ed9 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,9 +22,8 @@
  *
  *
  * 
- * The response for
- * [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
- * message).
+ * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
+ * (an empty message).
  * 

  *
  * Protobuf type {@code google.datastore.v1.RollbackResponse}
@@ -26,6 +40,12 @@ private RollbackResponse(com.google.protobuf.GeneratedMessageV3.Builder build
 
   private RollbackResponse() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new RollbackResponse();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -236,9 +256,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for
-   * [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
-   * message).
+   * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
+   * (an empty message).
    * 

    *
    * Protobuf type {@code google.datastore.v1.RollbackResponse}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index 6e1ceb784d10..9adc811de2a6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
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 9320a551ebb4..a40f591056ea 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -26,6 +41,12 @@ private RunQueryRequest() {
     projectId_ = "";
   }
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new RunQueryRequest();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -39,7 +60,6 @@ private RunQueryRequest(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -156,7 +176,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int queryTypeCase_ = 0;
   private java.lang.Object queryType_;
 
-  public enum QueryTypeCase implements com.google.protobuf.Internal.EnumLite {
+  public enum QueryTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     QUERY(3),
     GQL_QUERY(7),
     QUERYTYPE_NOT_SET(0);
@@ -165,7 +188,11 @@ public enum QueryTypeCase implements com.google.protobuf.Internal.EnumLite {
     private QueryTypeCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static QueryTypeCase valueOf(int value) {
       return forNumber(value);
@@ -199,10 +226,12 @@ public QueryTypeCase getQueryTypeCase() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
@@ -219,10 +248,12 @@ public java.lang.String getProjectId() {
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
@@ -249,6 +280,8 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return Whether the partitionId field is set.
    */
   public boolean hasPartitionId() {
     return partitionId_ != null;
@@ -264,6 +297,8 @@ public boolean hasPartitionId() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return The partitionId.
    */
   public com.google.datastore.v1.PartitionId getPartitionId() {
     return partitionId_ == null
@@ -296,6 +331,8 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return Whether the readOptions field is set.
    */
   public boolean hasReadOptions() {
     return readOptions_ != null;
@@ -308,6 +345,8 @@ public boolean hasReadOptions() {
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return The readOptions.
    */
   public com.google.datastore.v1.ReadOptions getReadOptions() {
     return readOptions_ == null
@@ -336,6 +375,8 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
    * 

    *
    * .google.datastore.v1.Query query = 3;
+   *
+   * @return Whether the query field is set.
    */
   public boolean hasQuery() {
     return queryTypeCase_ == 3;
@@ -348,6 +389,8 @@ public boolean hasQuery() {
    * 

    *
    * .google.datastore.v1.Query query = 3;
+   *
+   * @return The query.
    */
   public com.google.datastore.v1.Query getQuery() {
     if (queryTypeCase_ == 3) {
@@ -380,6 +423,8 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return Whether the gqlQuery field is set.
    */
   public boolean hasGqlQuery() {
     return queryTypeCase_ == 7;
@@ -392,6 +437,8 @@ public boolean hasGqlQuery() {
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return The gqlQuery.
    */
   public com.google.datastore.v1.GqlQuery getGqlQuery() {
     if (queryTypeCase_ == 7) {
@@ -877,10 +924,12 @@ public Builder clearQueryType() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
@@ -897,10 +946,12 @@ public java.lang.String getProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
      */
     public com.google.protobuf.ByteString getProjectIdBytes() {
       java.lang.Object ref = projectId_;
@@ -917,10 +968,13 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectId(java.lang.String value) {
       if (value == null) {
@@ -935,10 +989,12 @@ public Builder setProjectId(java.lang.String value) {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
      */
     public Builder clearProjectId() {
 
@@ -950,10 +1006,13 @@ public Builder clearProjectId() {
      *
      *
      * 
-     * The ID of the project against which to make the request.
+     * Required. The ID of the project against which to make the request.
      * 

      *
-     * string project_id = 8;
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
      */
     public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -983,6 +1042,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 2;
+     *
+     * @return Whether the partitionId field is set.
      */
     public boolean hasPartitionId() {
       return partitionIdBuilder_ != null || partitionId_ != null;
@@ -998,6 +1059,8 @@ public boolean hasPartitionId() {
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 2;
+     *
+     * @return The partitionId.
      */
     public com.google.datastore.v1.PartitionId getPartitionId() {
       if (partitionIdBuilder_ == null) {
@@ -1188,6 +1251,8 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
+     *
+     * @return Whether the readOptions field is set.
      */
     public boolean hasReadOptions() {
       return readOptionsBuilder_ != null || readOptions_ != null;
@@ -1200,6 +1265,8 @@ public boolean hasReadOptions() {
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
+     *
+     * @return The readOptions.
      */
     public com.google.datastore.v1.ReadOptions getReadOptions() {
       if (readOptionsBuilder_ == null) {
@@ -1368,6 +1435,8 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
      * 

      *
      * .google.datastore.v1.Query query = 3;
+     *
+     * @return Whether the query field is set.
      */
     public boolean hasQuery() {
       return queryTypeCase_ == 3;
@@ -1380,6 +1449,8 @@ public boolean hasQuery() {
      * 

      *
      * .google.datastore.v1.Query query = 3;
+     *
+     * @return The query.
      */
     public com.google.datastore.v1.Query getQuery() {
       if (queryBuilder_ == null) {
@@ -1566,6 +1637,8 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
      * 

      *
      * .google.datastore.v1.GqlQuery gql_query = 7;
+     *
+     * @return Whether the gqlQuery field is set.
      */
     public boolean hasGqlQuery() {
       return queryTypeCase_ == 7;
@@ -1578,6 +1651,8 @@ public boolean hasGqlQuery() {
      * 

      *
      * .google.datastore.v1.GqlQuery gql_query = 7;
+     *
+     * @return The gqlQuery.
      */
     public com.google.datastore.v1.GqlQuery getGqlQuery() {
       if (gqlQueryBuilder_ == null) {
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 354a320ac8b7..6fb3cad45d96 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -12,20 +27,24 @@ public interface RunQueryRequestOrBuilder
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
    *
    *
    * 
-   * The ID of the project against which to make the request.
+   * Required. The ID of the project against which to make the request.
    * 

    *
-   * string project_id = 8;
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
@@ -40,6 +59,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return Whether the partitionId field is set.
    */
   boolean hasPartitionId();
   /**
@@ -53,6 +74,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return The partitionId.
    */
   com.google.datastore.v1.PartitionId getPartitionId();
   /**
@@ -77,6 +100,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return Whether the readOptions field is set.
    */
   boolean hasReadOptions();
   /**
@@ -87,6 +112,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return The readOptions.
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
   /**
@@ -108,6 +135,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.Query query = 3;
+   *
+   * @return Whether the query field is set.
    */
   boolean hasQuery();
   /**
@@ -118,6 +147,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.Query query = 3;
+   *
+   * @return The query.
    */
   com.google.datastore.v1.Query getQuery();
   /**
@@ -139,6 +170,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return Whether the gqlQuery field is set.
    */
   boolean hasGqlQuery();
   /**
@@ -149,6 +182,8 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return The gqlQuery.
    */
   com.google.datastore.v1.GqlQuery getGqlQuery();
   /**
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 824f1f04bc2e..7be8c3891fa1 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -7,8 +22,7 @@
  *
  *
  * 
- * The response for
- * [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+ * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RunQueryResponse}
@@ -25,6 +39,12 @@ private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder build
 
   private RunQueryResponse() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new RunQueryResponse();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -38,7 +58,6 @@ private RunQueryResponse(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -123,6 +142,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
+   *
+   * @return Whether the batch field is set.
    */
   public boolean hasBatch() {
     return batch_ != null;
@@ -135,6 +156,8 @@ public boolean hasBatch() {
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
+   *
+   * @return The batch.
    */
   public com.google.datastore.v1.QueryResultBatch getBatch() {
     return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
@@ -162,6 +185,8 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
    * 

    *
    * .google.datastore.v1.Query query = 2;
+   *
+   * @return Whether the query field is set.
    */
   public boolean hasQuery() {
     return query_ != null;
@@ -174,6 +199,8 @@ public boolean hasQuery() {
    * 

    *
    * .google.datastore.v1.Query query = 2;
+   *
+   * @return The query.
    */
   public com.google.datastore.v1.Query getQuery() {
     return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
@@ -372,8 +399,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for
-   * [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+   * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RunQueryResponse}
@@ -561,6 +587,8 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.QueryResultBatch batch = 1;
+     *
+     * @return Whether the batch field is set.
      */
     public boolean hasBatch() {
       return batchBuilder_ != null || batch_ != null;
@@ -573,6 +601,8 @@ public boolean hasBatch() {
      * 

      *
      * .google.datastore.v1.QueryResultBatch batch = 1;
+     *
+     * @return The batch.
      */
     public com.google.datastore.v1.QueryResultBatch getBatch() {
       if (batchBuilder_ == null) {
@@ -742,6 +772,8 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
      * 

      *
      * .google.datastore.v1.Query query = 2;
+     *
+     * @return Whether the query field is set.
      */
     public boolean hasQuery() {
       return queryBuilder_ != null || query_ != null;
@@ -754,6 +786,8 @@ public boolean hasQuery() {
      * 

      *
      * .google.datastore.v1.Query query = 2;
+     *
+     * @return The query.
      */
     public com.google.datastore.v1.Query getQuery() {
       if (queryBuilder_ == null) {
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 b1771f2b222a..b36474c3c2d1 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -16,6 +31,8 @@ public interface RunQueryResponseOrBuilder
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
+   *
+   * @return Whether the batch field is set.
    */
   boolean hasBatch();
   /**
@@ -26,6 +43,8 @@ public interface RunQueryResponseOrBuilder
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
+   *
+   * @return The batch.
    */
   com.google.datastore.v1.QueryResultBatch getBatch();
   /**
@@ -47,6 +66,8 @@ public interface RunQueryResponseOrBuilder
    * 

    *
    * .google.datastore.v1.Query query = 2;
+   *
+   * @return Whether the query field is set.
    */
   boolean hasQuery();
   /**
@@ -57,6 +78,8 @@ public interface RunQueryResponseOrBuilder
    * 

    *
    * .google.datastore.v1.Query query = 2;
+   *
+   * @return The query.
    */
   com.google.datastore.v1.Query getQuery();
   /**
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 a941739a2bde..76094d9b74ee 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -9,10 +24,8 @@
  * 
  * 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
- * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
- * in read requests.
+ * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction] or implicitly by setting
+ * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
  * 

  *
  * Protobuf type {@code google.datastore.v1.TransactionOptions}
@@ -29,6 +42,12 @@ private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder bui
 
   private TransactionOptions() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new TransactionOptions();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -42,7 +61,6 @@ private TransactionOptions(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -136,6 +154,8 @@ public interface ReadWriteOrBuilder
      * 

      *
      * bytes previous_transaction = 1;
+     *
+     * @return The previousTransaction.
      */
     com.google.protobuf.ByteString getPreviousTransaction();
   }
@@ -162,6 +182,12 @@ private ReadWrite() {
       previousTransaction_ = com.google.protobuf.ByteString.EMPTY;
     }
 
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new ReadWrite();
+    }
+
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
@@ -175,7 +201,6 @@ private ReadWrite(
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -235,6 +260,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      * 

      *
      * bytes previous_transaction = 1;
+     *
+     * @return The previousTransaction.
      */
     public com.google.protobuf.ByteString getPreviousTransaction() {
       return previousTransaction_;
@@ -572,6 +599,8 @@ public Builder mergeFrom(
        * 

        *
        * bytes previous_transaction = 1;
+       *
+       * @return The previousTransaction.
        */
       public com.google.protobuf.ByteString getPreviousTransaction() {
         return previousTransaction_;
@@ -584,6 +613,9 @@ public com.google.protobuf.ByteString getPreviousTransaction() {
        * 

        *
        * bytes previous_transaction = 1;
+       *
+       * @param value The previousTransaction to set.
+       * @return This builder for chaining.
        */
       public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -602,6 +634,8 @@ public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
        * 

        *
        * bytes previous_transaction = 1;
+       *
+       * @return This builder for chaining.
        */
       public Builder clearPreviousTransaction() {
 
@@ -687,6 +721,12 @@ private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
     private ReadOnly() {}
 
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new ReadOnly();
+    }
+
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
@@ -1106,7 +1146,10 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceFor
   private int modeCase_ = 0;
   private java.lang.Object mode_;
 
-  public enum ModeCase implements com.google.protobuf.Internal.EnumLite {
+  public enum ModeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     READ_WRITE(1),
     READ_ONLY(2),
     MODE_NOT_SET(0);
@@ -1115,7 +1158,11 @@ public enum ModeCase implements com.google.protobuf.Internal.EnumLite {
     private ModeCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static ModeCase valueOf(int value) {
       return forNumber(value);
@@ -1152,6 +1199,8 @@ public ModeCase getModeCase() {
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
+   *
+   * @return Whether the readWrite field is set.
    */
   public boolean hasReadWrite() {
     return modeCase_ == 1;
@@ -1164,6 +1213,8 @@ public boolean hasReadWrite() {
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
+   *
+   * @return The readWrite.
    */
   public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
     if (modeCase_ == 1) {
@@ -1196,6 +1247,8 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
+   *
+   * @return Whether the readOnly field is set.
    */
   public boolean hasReadOnly() {
     return modeCase_ == 2;
@@ -1208,6 +1261,8 @@ public boolean hasReadOnly() {
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
+   *
+   * @return The readOnly.
    */
   public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
     if (modeCase_ == 2) {
@@ -1426,10 +1481,8 @@ 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
-   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
-   * in read requests.
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction] or implicitly by setting
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
    * 

    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions}
@@ -1635,6 +1688,8 @@ public Builder clearMode() {
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
+     *
+     * @return Whether the readWrite field is set.
      */
     public boolean hasReadWrite() {
       return modeCase_ == 1;
@@ -1647,6 +1702,8 @@ public boolean hasReadWrite() {
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
+     *
+     * @return The readWrite.
      */
     public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
       if (readWriteBuilder_ == null) {
@@ -1837,6 +1894,8 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
+     *
+     * @return Whether the readOnly field is set.
      */
     public boolean hasReadOnly() {
       return modeCase_ == 2;
@@ -1849,6 +1908,8 @@ public boolean hasReadOnly() {
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
+     *
+     * @return The readOnly.
      */
     public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
       if (readOnlyBuilder_ == null) {
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 f923c070fbf1..94f0b1644ae5 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
@@ -16,6 +31,8 @@ public interface TransactionOptionsOrBuilder
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
+   *
+   * @return Whether the readWrite field is set.
    */
   boolean hasReadWrite();
   /**
@@ -26,6 +43,8 @@ public interface TransactionOptionsOrBuilder
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
+   *
+   * @return The readWrite.
    */
   com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite();
   /**
@@ -47,6 +66,8 @@ public interface TransactionOptionsOrBuilder
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
+   *
+   * @return Whether the readOnly field is set.
    */
   boolean hasReadOnly();
   /**
@@ -57,6 +78,8 @@ public interface TransactionOptionsOrBuilder
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
+   *
+   * @return The readOnly.
    */
   com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly();
   /**
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 e1daeb5dc5cb..69928d03df65 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -25,6 +40,12 @@ private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private Value() {}
 
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Value();
+  }
+
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
@@ -38,7 +59,6 @@ private Value(
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
-    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -206,7 +226,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int valueTypeCase_ = 0;
   private java.lang.Object valueType_;
 
-  public enum ValueTypeCase implements com.google.protobuf.Internal.EnumLite {
+  public enum ValueTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     NULL_VALUE(11),
     BOOLEAN_VALUE(1),
     INTEGER_VALUE(2),
@@ -224,7 +247,11 @@ public enum ValueTypeCase implements com.google.protobuf.Internal.EnumLite {
     private ValueTypeCase(int value) {
       this.value = value;
     }
-    /** @deprecated Use {@link #forNumber(int)} instead. */
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
     @java.lang.Deprecated
     public static ValueTypeCase valueOf(int value) {
       return forNumber(value);
@@ -279,6 +306,8 @@ public ValueTypeCase getValueTypeCase() {
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
+   *
+   * @return The enum numeric value on the wire for nullValue.
    */
   public int getNullValueValue() {
     if (valueTypeCase_ == 11) {
@@ -294,6 +323,8 @@ public int getNullValueValue() {
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
+   *
+   * @return The nullValue.
    */
   public com.google.protobuf.NullValue getNullValue() {
     if (valueTypeCase_ == 11) {
@@ -314,6 +345,8 @@ public com.google.protobuf.NullValue getNullValue() {
    * 

    *
    * bool boolean_value = 1;
+   *
+   * @return The booleanValue.
    */
   public boolean getBooleanValue() {
     if (valueTypeCase_ == 1) {
@@ -331,6 +364,8 @@ public boolean getBooleanValue() {
    * 

    *
    * int64 integer_value = 2;
+   *
+   * @return The integerValue.
    */
   public long getIntegerValue() {
     if (valueTypeCase_ == 2) {
@@ -348,6 +383,8 @@ public long getIntegerValue() {
    * 

    *
    * double double_value = 3;
+   *
+   * @return The doubleValue.
    */
   public double getDoubleValue() {
     if (valueTypeCase_ == 3) {
@@ -367,6 +404,8 @@ public double getDoubleValue() {
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
+   *
+   * @return Whether the timestampValue field is set.
    */
   public boolean hasTimestampValue() {
     return valueTypeCase_ == 10;
@@ -381,6 +420,8 @@ public boolean hasTimestampValue() {
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
+   *
+   * @return The timestampValue.
    */
   public com.google.protobuf.Timestamp getTimestampValue() {
     if (valueTypeCase_ == 10) {
@@ -415,6 +456,8 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
+   *
+   * @return Whether the keyValue field is set.
    */
   public boolean hasKeyValue() {
     return valueTypeCase_ == 5;
@@ -427,6 +470,8 @@ public boolean hasKeyValue() {
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
+   *
+   * @return The keyValue.
    */
   public com.google.datastore.v1.Key getKeyValue() {
     if (valueTypeCase_ == 5) {
@@ -456,11 +501,13 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most
-   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
+   *
+   * @return The stringValue.
    */
   public java.lang.String getStringValue() {
     java.lang.Object ref = "";
@@ -483,11 +530,13 @@ public java.lang.String getStringValue() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most
-   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
+   *
+   * @return The bytes for stringValue.
    */
   public com.google.protobuf.ByteString getStringValueBytes() {
     java.lang.Object ref = "";
@@ -518,6 +567,8 @@ public com.google.protobuf.ByteString getStringValueBytes() {
    * 

    *
    * bytes blob_value = 18;
+   *
+   * @return The blobValue.
    */
   public com.google.protobuf.ByteString getBlobValue() {
     if (valueTypeCase_ == 18) {
@@ -535,6 +586,8 @@ public com.google.protobuf.ByteString getBlobValue() {
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
+   *
+   * @return Whether the geoPointValue field is set.
    */
   public boolean hasGeoPointValue() {
     return valueTypeCase_ == 8;
@@ -547,6 +600,8 @@ public boolean hasGeoPointValue() {
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
+   *
+   * @return The geoPointValue.
    */
   public com.google.type.LatLng getGeoPointValue() {
     if (valueTypeCase_ == 8) {
@@ -582,6 +637,8 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
+   *
+   * @return Whether the entityValue field is set.
    */
   public boolean hasEntityValue() {
     return valueTypeCase_ == 6;
@@ -597,6 +654,8 @@ public boolean hasEntityValue() {
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
+   *
+   * @return The entityValue.
    */
   public com.google.datastore.v1.Entity getEntityValue() {
     if (valueTypeCase_ == 6) {
@@ -635,6 +694,8 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
+   *
+   * @return Whether the arrayValue field is set.
    */
   public boolean hasArrayValue() {
     return valueTypeCase_ == 9;
@@ -650,6 +711,8 @@ public boolean hasArrayValue() {
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
+   *
+   * @return The arrayValue.
    */
   public com.google.datastore.v1.ArrayValue getArrayValue() {
     if (valueTypeCase_ == 9) {
@@ -686,6 +749,8 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
    * 

    *
    * int32 meaning = 14;
+   *
+   * @return The meaning.
    */
   public int getMeaning() {
     return meaning_;
@@ -702,6 +767,8 @@ public int getMeaning() {
    * 

    *
    * bool exclude_from_indexes = 19;
+   *
+   * @return The excludeFromIndexes.
    */
   public boolean getExcludeFromIndexes() {
     return excludeFromIndexes_;
@@ -1351,6 +1418,8 @@ public Builder clearValueType() {
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
+     *
+     * @return The enum numeric value on the wire for nullValue.
      */
     public int getNullValueValue() {
       if (valueTypeCase_ == 11) {
@@ -1366,6 +1435,9 @@ public int getNullValueValue() {
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
+     *
+     * @param value The enum numeric value on the wire for nullValue to set.
+     * @return This builder for chaining.
      */
     public Builder setNullValueValue(int value) {
       valueTypeCase_ = 11;
@@ -1381,6 +1453,8 @@ public Builder setNullValueValue(int value) {
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
+     *
+     * @return The nullValue.
      */
     public com.google.protobuf.NullValue getNullValue() {
       if (valueTypeCase_ == 11) {
@@ -1399,6 +1473,9 @@ public com.google.protobuf.NullValue getNullValue() {
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
+     *
+     * @param value The nullValue to set.
+     * @return This builder for chaining.
      */
     public Builder setNullValue(com.google.protobuf.NullValue value) {
       if (value == null) {
@@ -1417,6 +1494,8 @@ public Builder setNullValue(com.google.protobuf.NullValue value) {
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearNullValue() {
       if (valueTypeCase_ == 11) {
@@ -1435,6 +1514,8 @@ public Builder clearNullValue() {
      * 

      *
      * bool boolean_value = 1;
+     *
+     * @return The booleanValue.
      */
     public boolean getBooleanValue() {
       if (valueTypeCase_ == 1) {
@@ -1450,6 +1531,9 @@ public boolean getBooleanValue() {
      * 

      *
      * bool boolean_value = 1;
+     *
+     * @param value The booleanValue to set.
+     * @return This builder for chaining.
      */
     public Builder setBooleanValue(boolean value) {
       valueTypeCase_ = 1;
@@ -1465,6 +1549,8 @@ public Builder setBooleanValue(boolean value) {
      * 

      *
      * bool boolean_value = 1;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearBooleanValue() {
       if (valueTypeCase_ == 1) {
@@ -1483,6 +1569,8 @@ public Builder clearBooleanValue() {
      * 

      *
      * int64 integer_value = 2;
+     *
+     * @return The integerValue.
      */
     public long getIntegerValue() {
       if (valueTypeCase_ == 2) {
@@ -1498,6 +1586,9 @@ public long getIntegerValue() {
      * 

      *
      * int64 integer_value = 2;
+     *
+     * @param value The integerValue to set.
+     * @return This builder for chaining.
      */
     public Builder setIntegerValue(long value) {
       valueTypeCase_ = 2;
@@ -1513,6 +1604,8 @@ public Builder setIntegerValue(long value) {
      * 

      *
      * int64 integer_value = 2;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearIntegerValue() {
       if (valueTypeCase_ == 2) {
@@ -1531,6 +1624,8 @@ public Builder clearIntegerValue() {
      * 

      *
      * double double_value = 3;
+     *
+     * @return The doubleValue.
      */
     public double getDoubleValue() {
       if (valueTypeCase_ == 3) {
@@ -1546,6 +1641,9 @@ public double getDoubleValue() {
      * 

      *
      * double double_value = 3;
+     *
+     * @param value The doubleValue to set.
+     * @return This builder for chaining.
      */
     public Builder setDoubleValue(double value) {
       valueTypeCase_ = 3;
@@ -1561,6 +1659,8 @@ public Builder setDoubleValue(double value) {
      * 

      *
      * double double_value = 3;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearDoubleValue() {
       if (valueTypeCase_ == 3) {
@@ -1586,6 +1686,8 @@ public Builder clearDoubleValue() {
      * 

      *
      * .google.protobuf.Timestamp timestamp_value = 10;
+     *
+     * @return Whether the timestampValue field is set.
      */
     public boolean hasTimestampValue() {
       return valueTypeCase_ == 10;
@@ -1600,6 +1702,8 @@ public boolean hasTimestampValue() {
      * 

      *
      * .google.protobuf.Timestamp timestamp_value = 10;
+     *
+     * @return The timestampValue.
      */
     public com.google.protobuf.Timestamp getTimestampValue() {
       if (timestampValueBuilder_ == null) {
@@ -1800,6 +1904,8 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
      * 

      *
      * .google.datastore.v1.Key key_value = 5;
+     *
+     * @return Whether the keyValue field is set.
      */
     public boolean hasKeyValue() {
       return valueTypeCase_ == 5;
@@ -1812,6 +1918,8 @@ public boolean hasKeyValue() {
      * 

      *
      * .google.datastore.v1.Key key_value = 5;
+     *
+     * @return The keyValue.
      */
     public com.google.datastore.v1.Key getKeyValue() {
       if (keyValueBuilder_ == null) {
@@ -1989,11 +2097,13 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most
-     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
+     *
+     * @return The stringValue.
      */
     public java.lang.String getStringValue() {
       java.lang.Object ref = "";
@@ -2016,11 +2126,13 @@ public java.lang.String getStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most
-     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
+     *
+     * @return The bytes for stringValue.
      */
     public com.google.protobuf.ByteString getStringValueBytes() {
       java.lang.Object ref = "";
@@ -2043,11 +2155,14 @@ public com.google.protobuf.ByteString getStringValueBytes() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most
-     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
+     *
+     * @param value The stringValue to set.
+     * @return This builder for chaining.
      */
     public Builder setStringValue(java.lang.String value) {
       if (value == null) {
@@ -2063,11 +2178,13 @@ public Builder setStringValue(java.lang.String value) {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most
-     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearStringValue() {
       if (valueTypeCase_ == 17) {
@@ -2082,11 +2199,14 @@ public Builder clearStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most
-     * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at least 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
+     *
+     * @param value The bytes for stringValue to set.
+     * @return This builder for chaining.
      */
     public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -2110,6 +2230,8 @@ public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes blob_value = 18;
+     *
+     * @return The blobValue.
      */
     public com.google.protobuf.ByteString getBlobValue() {
       if (valueTypeCase_ == 18) {
@@ -2128,6 +2250,9 @@ public com.google.protobuf.ByteString getBlobValue() {
      * 

      *
      * bytes blob_value = 18;
+     *
+     * @param value The blobValue to set.
+     * @return This builder for chaining.
      */
     public Builder setBlobValue(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -2149,6 +2274,8 @@ public Builder setBlobValue(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes blob_value = 18;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearBlobValue() {
       if (valueTypeCase_ == 18) {
@@ -2170,6 +2297,8 @@ public Builder clearBlobValue() {
      * 

      *
      * .google.type.LatLng geo_point_value = 8;
+     *
+     * @return Whether the geoPointValue field is set.
      */
     public boolean hasGeoPointValue() {
       return valueTypeCase_ == 8;
@@ -2182,6 +2311,8 @@ public boolean hasGeoPointValue() {
      * 

      *
      * .google.type.LatLng geo_point_value = 8;
+     *
+     * @return The geoPointValue.
      */
     public com.google.type.LatLng getGeoPointValue() {
       if (geoPointValueBuilder_ == null) {
@@ -2368,6 +2499,8 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
      * 

      *
      * .google.datastore.v1.Entity entity_value = 6;
+     *
+     * @return Whether the entityValue field is set.
      */
     public boolean hasEntityValue() {
       return valueTypeCase_ == 6;
@@ -2383,6 +2516,8 @@ public boolean hasEntityValue() {
      * 

      *
      * .google.datastore.v1.Entity entity_value = 6;
+     *
+     * @return The entityValue.
      */
     public com.google.datastore.v1.Entity getEntityValue() {
       if (entityValueBuilder_ == null) {
@@ -2593,6 +2728,8 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
      * 

      *
      * .google.datastore.v1.ArrayValue array_value = 9;
+     *
+     * @return Whether the arrayValue field is set.
      */
     public boolean hasArrayValue() {
       return valueTypeCase_ == 9;
@@ -2608,6 +2745,8 @@ public boolean hasArrayValue() {
      * 

      *
      * .google.datastore.v1.ArrayValue array_value = 9;
+     *
+     * @return The arrayValue.
      */
     public com.google.datastore.v1.ArrayValue getArrayValue() {
       if (arrayValueBuilder_ == null) {
@@ -2812,6 +2951,8 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
      * 

      *
      * int32 meaning = 14;
+     *
+     * @return The meaning.
      */
     public int getMeaning() {
       return meaning_;
@@ -2824,6 +2965,9 @@ public int getMeaning() {
      * 

      *
      * int32 meaning = 14;
+     *
+     * @param value The meaning to set.
+     * @return This builder for chaining.
      */
     public Builder setMeaning(int value) {
 
@@ -2839,6 +2983,8 @@ public Builder setMeaning(int value) {
      * 

      *
      * int32 meaning = 14;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearMeaning() {
 
@@ -2857,6 +3003,8 @@ public Builder clearMeaning() {
      * 

      *
      * bool exclude_from_indexes = 19;
+     *
+     * @return The excludeFromIndexes.
      */
     public boolean getExcludeFromIndexes() {
       return excludeFromIndexes_;
@@ -2870,6 +3018,9 @@ public boolean getExcludeFromIndexes() {
      * 

      *
      * bool exclude_from_indexes = 19;
+     *
+     * @param value The excludeFromIndexes to set.
+     * @return This builder for chaining.
      */
     public Builder setExcludeFromIndexes(boolean value) {
 
@@ -2886,6 +3037,8 @@ public Builder setExcludeFromIndexes(boolean value) {
      * 

      *
      * bool exclude_from_indexes = 19;
+     *
+     * @return This builder for chaining.
      */
     public Builder clearExcludeFromIndexes() {
 
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 bb8fa78e8205..3f61abd94ac6 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
@@ -16,6 +31,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
+   *
+   * @return The enum numeric value on the wire for nullValue.
    */
   int getNullValueValue();
   /**
@@ -26,6 +43,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
+   *
+   * @return The nullValue.
    */
   com.google.protobuf.NullValue getNullValue();
 
@@ -37,6 +56,8 @@ public interface ValueOrBuilder
    * 

    *
    * bool boolean_value = 1;
+   *
+   * @return The booleanValue.
    */
   boolean getBooleanValue();
 
@@ -48,6 +69,8 @@ public interface ValueOrBuilder
    * 

    *
    * int64 integer_value = 2;
+   *
+   * @return The integerValue.
    */
   long getIntegerValue();
 
@@ -59,6 +82,8 @@ public interface ValueOrBuilder
    * 

    *
    * double double_value = 3;
+   *
+   * @return The doubleValue.
    */
   double getDoubleValue();
 
@@ -72,6 +97,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
+   *
+   * @return Whether the timestampValue field is set.
    */
   boolean hasTimestampValue();
   /**
@@ -84,6 +111,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
+   *
+   * @return The timestampValue.
    */
   com.google.protobuf.Timestamp getTimestampValue();
   /**
@@ -107,6 +136,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
+   *
+   * @return Whether the keyValue field is set.
    */
   boolean hasKeyValue();
   /**
@@ -117,6 +148,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
+   *
+   * @return The keyValue.
    */
   com.google.datastore.v1.Key getKeyValue();
   /**
@@ -135,11 +168,13 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most
-   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
+   *
+   * @return The stringValue.
    */
   java.lang.String getStringValue();
   /**
@@ -147,11 +182,13 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most
-   * 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at least 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
+   *
+   * @return The bytes for stringValue.
    */
   com.google.protobuf.ByteString getStringValueBytes();
 
@@ -166,6 +203,8 @@ public interface ValueOrBuilder
    * 

    *
    * bytes blob_value = 18;
+   *
+   * @return The blobValue.
    */
   com.google.protobuf.ByteString getBlobValue();
 
@@ -177,6 +216,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
+   *
+   * @return Whether the geoPointValue field is set.
    */
   boolean hasGeoPointValue();
   /**
@@ -187,6 +228,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
+   *
+   * @return The geoPointValue.
    */
   com.google.type.LatLng getGeoPointValue();
   /**
@@ -211,6 +254,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
+   *
+   * @return Whether the entityValue field is set.
    */
   boolean hasEntityValue();
   /**
@@ -224,6 +269,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
+   *
+   * @return The entityValue.
    */
   com.google.datastore.v1.Entity getEntityValue();
   /**
@@ -251,6 +298,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
+   *
+   * @return Whether the arrayValue field is set.
    */
   boolean hasArrayValue();
   /**
@@ -264,6 +313,8 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
+   *
+   * @return The arrayValue.
    */
   com.google.datastore.v1.ArrayValue getArrayValue();
   /**
@@ -288,6 +339,8 @@ public interface ValueOrBuilder
    * 

    *
    * int32 meaning = 14;
+   *
+   * @return The meaning.
    */
   int getMeaning();
 
@@ -300,6 +353,8 @@ public interface ValueOrBuilder
    * 

    *
    * bool exclude_from_indexes = 19;
+   *
+   * @return The excludeFromIndexes.
    */
   boolean getExcludeFromIndexes();
 
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 51d69acb9db8..0df65c4473c3 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
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2019 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@ syntax = "proto3";
 package google.datastore.v1;
 
 import "google/api/annotations.proto";
+import "google/api/client.proto";
+import "google/api/field_behavior.proto";
 import "google/datastore/v1/entity.proto";
 import "google/datastore/v1/query.proto";
 
@@ -35,12 +37,18 @@ option php_namespace = "Google\\Cloud\\Datastore\\V1";
 // the request.
 //
 service Datastore {
+  option (google.api.default_host) = "datastore.googleapis.com";
+  option (google.api.oauth_scopes) =
+      "https://www.googleapis.com/auth/cloud-platform,"
+      "https://www.googleapis.com/auth/datastore";
+
   // Looks up entities by key.
   rpc Lookup(LookupRequest) returns (LookupResponse) {
     option (google.api.http) = {
       post: "/v1/projects/{project_id}:lookup"
       body: "*"
     };
+    option (google.api.method_signature) = "project_id,read_options,keys";
   }
 
   // Queries for entities.
@@ -52,12 +60,12 @@ service Datastore {
   }
 
   // Begins a new transaction.
-  rpc BeginTransaction(BeginTransactionRequest)
-      returns (BeginTransactionResponse) {
+  rpc BeginTransaction(BeginTransactionRequest) returns (BeginTransactionResponse) {
     option (google.api.http) = {
       post: "/v1/projects/{project_id}:beginTransaction"
       body: "*"
     };
+    option (google.api.method_signature) = "project_id";
   }
 
   // Commits a transaction, optionally creating, deleting or modifying some
@@ -67,6 +75,8 @@ service Datastore {
       post: "/v1/projects/{project_id}:commit"
       body: "*"
     };
+    option (google.api.method_signature) = "project_id,mode,transaction,mutations";
+    option (google.api.method_signature) = "project_id,mode,mutations";
   }
 
   // Rolls back a transaction.
@@ -75,6 +85,7 @@ service Datastore {
       post: "/v1/projects/{project_id}:rollback"
       body: "*"
     };
+    option (google.api.method_signature) = "project_id,transaction";
   }
 
   // Allocates IDs for the given keys, which is useful for referencing an entity
@@ -84,6 +95,7 @@ service Datastore {
       post: "/v1/projects/{project_id}:allocateIds"
       body: "*"
     };
+    option (google.api.method_signature) = "project_id,keys";
   }
 
   // Prevents the supplied keys' IDs from being auto-allocated by Cloud
@@ -93,19 +105,20 @@ service Datastore {
       post: "/v1/projects/{project_id}:reserveIds"
       body: "*"
     };
+    option (google.api.method_signature) = "project_id,keys";
   }
 }
 
 // The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
 message LookupRequest {
-  // The ID of the project against which to make the request.
-  string project_id = 8;
+  // Required. The ID of the project against which to make the request.
+  string project_id = 8 [(google.api.field_behavior) = REQUIRED];
 
   // The options for this lookup request.
   ReadOptions read_options = 1;
 
-  // Keys of entities to look up.
-  repeated Key keys = 3;
+  // Required. Keys of entities to look up.
+  repeated Key keys = 3 [(google.api.field_behavior) = REQUIRED];
 }
 
 // The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
@@ -128,8 +141,8 @@ message LookupResponse {
 
 // The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
 message RunQueryRequest {
-  // The ID of the project against which to make the request.
-  string project_id = 8;
+  // Required. The ID of the project against which to make the request.
+  string project_id = 8 [(google.api.field_behavior) = REQUIRED];
 
   // Entities are partitioned into subsets, identified by a partition ID.
   // Queries are scoped to a single partition.
@@ -150,8 +163,7 @@ message RunQueryRequest {
   }
 }
 
-// The response for
-// [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+// The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
 message RunQueryResponse {
   // A batch of query results (always present).
   QueryResultBatch batch = 1;
@@ -160,18 +172,16 @@ message RunQueryResponse {
   Query query = 2;
 }
 
-// The request for
-// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+// The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 message BeginTransactionRequest {
-  // The ID of the project against which to make the request.
-  string project_id = 8;
+  // Required. The ID of the project against which to make the request.
+  string project_id = 8 [(google.api.field_behavior) = REQUIRED];
 
   // Options for a new transaction.
   TransactionOptions transaction_options = 10;
 }
 
-// The response for
-// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+// The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 message BeginTransactionResponse {
   // The transaction identifier (always present).
   bytes transaction = 1;
@@ -179,18 +189,19 @@ message BeginTransactionResponse {
 
 // The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
 message RollbackRequest {
-  // The ID of the project against which to make the request.
-  string project_id = 8;
+  // Required. The ID of the project against which to make the request.
+  string project_id = 8 [(google.api.field_behavior) = REQUIRED];
 
-  // The transaction identifier, returned by a call to
+  // Required. The transaction identifier, returned by a call to
   // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
-  bytes transaction = 1;
+  bytes transaction = 1 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The response for
-// [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
-// message).
-message RollbackResponse {}
+// The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
+// (an empty message).
+message RollbackResponse {
+
+}
 
 // The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
 message CommitRequest {
@@ -208,8 +219,8 @@ message CommitRequest {
     NON_TRANSACTIONAL = 2;
   }
 
-  // The ID of the project against which to make the request.
-  string project_id = 8;
+  // Required. The ID of the project against which to make the request.
+  string project_id = 8 [(google.api.field_behavior) = REQUIRED];
 
   // The type of commit to perform. Defaults to `TRANSACTIONAL`.
   Mode mode = 5;
@@ -249,42 +260,40 @@ message CommitResponse {
   int32 index_updates = 4;
 }
 
-// The request for
-// [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+// The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
 message AllocateIdsRequest {
-  // The ID of the project against which to make the request.
-  string project_id = 8;
+  // Required. The ID of the project against which to make the request.
+  string project_id = 8 [(google.api.field_behavior) = REQUIRED];
 
-  // A list of keys with incomplete key paths for which to allocate IDs.
+  // 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;
+  repeated Key keys = 1 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The response for
-// [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+// The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
 message AllocateIdsResponse {
   // The keys specified in the request (in the same order), each with
   // its key path completed with a newly allocated ID.
   repeated Key keys = 1;
 }
 
-// The request for
-// [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+// The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
 message ReserveIdsRequest {
-  // The ID of the project against which to make the request.
-  string project_id = 8;
+  // 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.
   string database_id = 9;
 
-  // A list of keys with complete key paths whose numeric IDs should not be
+  // Required. A list of keys with complete key paths whose numeric IDs should not be
   // auto-allocated.
-  repeated Key keys = 1;
+  repeated Key keys = 1 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The response for
-// [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
-message ReserveIdsResponse {}
+// The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+message ReserveIdsResponse {
+
+}
 
 // A mutation to apply to an entity.
 message Mutation {
@@ -374,10 +383,8 @@ message ReadOptions {
 // 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
-// [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
-// in read requests.
+// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction] or implicitly by setting
+// [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
 message TransactionOptions {
   // Options specific to read / write transactions.
   message ReadWrite {
@@ -386,7 +393,9 @@ message TransactionOptions {
   }
 
   // Options specific to read-only transactions.
-  message ReadOnly {}
+  message ReadOnly {
+
+  }
 
   // The `mode` of the transaction, indicating whether write operations are
   // supported.
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 9decd2b53802..96d13ecccc14 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
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2019 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -114,8 +114,8 @@ message Key {
 // An array value.
 message ArrayValue {
   // Values in the array.
-  // The order of this array may not be preserved if it contains a mix of
-  // indexed and unindexed values.
+  // The order of values in an array is preserved as long as all values have
+  // identical settings for 'exclude_from_indexes'.
   repeated Value values = 1;
 }
 
@@ -145,8 +145,8 @@ message Value {
     Key key_value = 5;
 
     // A UTF-8 encoded string value.
-    // When `exclude_from_indexes` is false (it is indexed) , may have at most
-    // 1500 bytes. Otherwise, may be set to at least 1,000,000 bytes.
+    // When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+    // Otherwise, may be set to at least 1,000,000 bytes.
     string string_value = 17;
 
     // A blob value.
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 872612c5dd24..ef9f1c658c11 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
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2019 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -55,12 +55,12 @@ message EntityResult {
   // 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.
+  // 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.
+  // 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.
   int64 version = 4;
 
   // A cursor that points to the position after the result entity.
diff --git a/synth.metadata b/synth.metadata
index d1ae4ff02d10..07b506c21867 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,5 +1,5 @@
 {
-  "updateTime": "2019-12-19T20:10:13.544680Z",
+  "updateTime": "2019-12-19T21:54:58.736595Z",
   "sources": [
     {
       "generator": {
@@ -12,8 +12,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "ade4803e8a1a9e3efd249c8c86895d2f12eb2aaa",
-        "internalRef": "286418383"
+        "sha": "0ca305403dcc50e31ad9477c9b6241ddfd2056af",
+        "internalRef": "286439553"
       }
     },
     {
diff --git a/synth.py b/synth.py
index f43f65350fe3..73e9e0a7746e 100644
--- a/synth.py
+++ b/synth.py
@@ -20,6 +20,25 @@
 
 gapic = gcp.GAPICGenerator()
 
+protobuf_header = "// Generated by the protocol buffer compiler.  DO NOT EDIT!"
+# License header
+license_header = """/*
+ * Copyright 2019 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
+ *
+ *     https://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.
+ */
+"""
+
 service = 'datastore'
 versions = ['v1']
 config_pattern = '/google/datastore/artman_datastore.yaml'
@@ -31,6 +50,12 @@
       config_path=config_pattern.format(version=version),
       artman_output_name='')
 
+  s.replace(
+      library / f'proto-google-cloud-{service}-{version}/src/**/*.java',
+      protobuf_header,
+      f'{license_header}{protobuf_header}'
+  )
+
   # Datastore only generates protos
   s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')
 

From ed9bc9178e4af1dc97a358b0c042424146657330 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Fri, 20 Dec 2019 13:30:42 -0500
Subject: [PATCH 0263/1784] build: set easymock version to 3.6 which is
 compatible with java 7 (#7)

* build: set easymock version to 3.6 which is compatible with java 7
* build: add javax.annotation-api version
* chore: fix typo in parent pom name
---
 pom.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3f24c1494b59..c818f081f8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   google-cloud-datastore-parent
   pom
   1.102.1-SNAPSHOT
-  Google Cloud Firestore Parent
+  Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
     Java idiomatic client for Google Cloud Platform services.
@@ -249,7 +249,11 @@
         threetenbp
         ${threeten.version}
       
-
+      
+        javax.annotation
+        javax.annotation-api
+        ${javax.annotations.version}
+      
 
       
         junit
@@ -260,7 +264,7 @@
       
         org.easymock
         easymock
-        4.0.2
+        3.6
         test
       
       

From 4db50246a2984655ccf44f65e091b6f3e66f557f Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 26 Dec 2019 12:57:31 -0600
Subject: [PATCH 0264/1784] chore(deps): group core dependencies

---
 renovate.json | 47 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/renovate.json b/renovate.json
index 99810470034c..02757c63ad2c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,27 +1,50 @@
 {
   "extends": [
-    "config:base"
+    ":separateMajorReleases",
+    ":combinePatchMinorReleases",
+    ":ignoreUnstable",
+    ":prImmediately",
+    ":updateNotScheduled",
+    ":automergeDisabled",
+    ":ignoreModulesAndTests",
+    ":maintainLockFilesDisabled",
+    ":autodetectPinVersions"
   ],
-  "ignoreDeps": [],
   "packageRules": [
     {
-      "managers": ["maven"],
-      "packageNames": ["com.google.guava:guava*"],
+      "packagePatterns": [
+        "^com.google.guava:"
+      ],
       "versionScheme": "docker"
     },
     {
-      "packagePatterns": ["^io.grpc:grpc-"],
-      "groupName": "gRPC packages"
+      "packagePatterns": [
+        "^com.google.api:gax",
+        "^com.google.auth:",
+        "^com.google.cloud:google-cloud-core",
+        "^io.grpc:"
+      ],
+      "groupName": "core dependencies"
     },
     {
-      "packagePatterns": ["^com.google.protobuf:protobuf-"],
-      "groupName": "Protobuf packages"
+      "packagePatterns": [
+        "*"
+      ],
+      "semanticCommitType": "deps",
+      "semanticCommitScope": null
     },
     {
-      "packagePatterns": ["^io.opencensus:opencensus-"],
-      "groupName": "OpenCensus packages"
+      "packagePatterns": [
+        "^org.apache.maven",
+        "^org.jacoco:",
+        "^org.codehaus.mojo:",
+        "^org.sonatype.plugins:",
+        "^com.coveo:",
+        "^com.google.cloud:google-cloud-shared-config"
+      ],
+      "semanticCommitType": "build",
+      "semanticCommitScope": "deps"
     }
   ],
-  "semanticCommits": true,
-  "semanticCommitType": "deps"
+  "semanticCommits": true
 }

From 067289f131936956e8319e39c9942746dcff1275 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 26 Dec 2019 17:41:58 -0600
Subject: [PATCH 0265/1784] chore: group core transport dependencies

---
 renovate.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/renovate.json b/renovate.json
index 02757c63ad2c..d014232c57bf 100644
--- a/renovate.json
+++ b/renovate.json
@@ -26,6 +26,14 @@
       ],
       "groupName": "core dependencies"
     },
+    {
+      "packagePatterns": [
+        "^com.google.http-client:",
+        "^com.google.oauth-client:",
+        "^com.google.api-client:"
+      ],
+      "groupName": "core transport dependencies"
+    },
     {
       "packagePatterns": [
         "*"

From 041d02dd636ccbee4b1819852c31de7155864a33 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Tue, 7 Jan 2020 15:16:11 -0800
Subject: [PATCH 0266/1784] chore: allow unstable updates (#17)

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index d014232c57bf..f3a70c9703f1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -52,6 +52,12 @@
       ],
       "semanticCommitType": "build",
       "semanticCommitScope": "deps"
+    },
+    {
+      "packagePatterns": [
+        "^com.google.cloud:google-cloud-"
+      ],
+      "ignoreUnstable": false
     }
   ],
   "semanticCommits": true

From 174158bac4fad21563fdd209b39e377c48bd8efe Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 8 Jan 2020 01:17:30 +0200
Subject: [PATCH 0267/1784] deps: update dependency junit:junit to v4.13 (#13)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c818f081f8d3..0738eb709905 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
     1.52.0
     1.26.0
     3.11.1
-    4.12
+    4.13
     28.1-android
     1.4.0
     0.24.0

From 7bbe181f6fbc8d4bce24d854af49c0d31690bfd6 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 8 Jan 2020 01:18:32 +0200
Subject: [PATCH 0268/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.3.1 (#15)

---
 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 ac72bc1eb44e..49be0a7fc204 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
-    0.3.0
+    0.3.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 0738eb709905..09c4a5e5bcfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.3.0
+    0.3.1
   
 
   

From 657c69bab7296c57575c24e96b208427e6791d1f Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 8 Jan 2020 22:38:34 +0100
Subject: [PATCH 0269/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-config to v0.4.0 (#25)

---
 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 49be0a7fc204..d6a8761189cf 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
-    0.3.1
+    0.4.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 09c4a5e5bcfe..c9d80a6785f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.3.1
+    0.4.0
   
 
   

From 8c2302ce1d573bc0f65f5f69c8cb52c7ce952012 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Wed, 8 Jan 2020 18:21:19 -0500
Subject: [PATCH 0270/1784] chore(test): rename DatastoreTest to
 ITDatastoreTest (#8)

Integration tests are not ran on OS X CI builds, moving DatastoreTest &
LocalDatastoreHelperTest to work around the fact that the emulator is
accessible on kokoro nodes.
---
 .../datastore/{DatastoreTest.java => ITDatastoreTest.java}      | 2 +-
 ...DatastoreHelperTest.java => ITLocalDatastoreHelperTest.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename google-cloud-datastore/src/test/java/com/google/cloud/datastore/{DatastoreTest.java => ITDatastoreTest.java} (99%)
 rename google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/{LocalDatastoreHelperTest.java => ITLocalDatastoreHelperTest.java} (99%)

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/ITDatastoreTest.java
similarity index 99%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
index 10fc32a9306f..c4f76bd2f466 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/ITDatastoreTest.java
@@ -73,7 +73,7 @@
 import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
-public class DatastoreTest {
+public class ITDatastoreTest {
 
   private static LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0);
   private static final DatastoreOptions options = helper.getOptions();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
similarity index 99%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
index 44c2854ac3d1..a05c99a18f50 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
@@ -39,7 +39,7 @@
 import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
-public class LocalDatastoreHelperTest {
+public class ITLocalDatastoreHelperTest {
 
   private static final double TOLERANCE = 0.00001;
   private static final String PROJECT_ID_PREFIX = "test-project-";

From f53ea412795e12ecff4ba7c81c2c938f1234ab4c Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Thu, 9 Jan 2020 23:15:35 +0530
Subject: [PATCH 0271/1784] chore: remove usage of deprecated ExpectedException
 JUnit rule (#27)

---
 .../cloud/datastore/DatastoreOptionsTest.java | 16 +++---
 .../cloud/datastore/ITDatastoreTest.java      | 33 +++++++------
 .../google/cloud/datastore/LatLngTest.java    | 49 +++++++++++--------
 .../TransactionExceptionHandlerTest.java      |  4 --
 .../testing/ITLocalDatastoreHelperTest.java   | 31 ++++++------
 5 files changed, 72 insertions(+), 61 deletions(-)

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 1bce29807d5d..79cb716e1555 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.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -24,10 +25,9 @@
 import com.google.cloud.datastore.spi.DatastoreRpcFactory;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class DatastoreOptionsTest {
 
@@ -37,8 +37,6 @@ public class DatastoreOptionsTest {
   private DatastoreRpc datastoreRpc;
   private DatastoreOptions.Builder options;
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   @Before
   public void setUp() {
     datastoreRpcFactory = EasyMock.createMock(DatastoreRpcFactory.class);
@@ -88,8 +86,12 @@ public void testToBuilder() throws Exception {
 
   @Test
   public void testInvalidTransport() {
-    thrown.expect(IllegalArgumentException.class);
-    DatastoreOptions.newBuilder()
-        .setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    try {
+      DatastoreOptions.newBuilder()
+          .setTransportOptions(EasyMock.createMock(TransportOptions.class));
+      Assert.fail();
+    } catch (IllegalArgumentException ex) {
+      assertNotNull(ex.getMessage());
+    }
   }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
index c4f76bd2f466..cf343aa7bc59 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
@@ -63,11 +63,10 @@
 import java.util.concurrent.TimeoutException;
 import org.easymock.EasyMock;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.threeten.bp.Duration;
@@ -150,8 +149,6 @@ public class ITDatastoreTest {
   private DatastoreRpcFactory rpcFactoryMock;
   private DatastoreRpc rpcMock;
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
     helper.start();
@@ -1109,18 +1106,21 @@ public void testRetryableException() throws Exception {
   }
 
   @Test
-  public void testNonRetryableException() throws Exception {
+  public void testNonRetryableException() {
     LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();
     EasyMock.expect(rpcMock.lookup(requestPb))
         .andThrow(
             new DatastoreException(DatastoreException.UNKNOWN_CODE, "denied", "PERMISSION_DENIED"))
         .times(1);
     EasyMock.replay(rpcFactoryMock, rpcMock);
-    Datastore datastore = rpcMockOptions.getService();
-    thrown.expect(DatastoreException.class);
-    thrown.expectMessage("denied");
-    datastore.get(KEY1);
-    EasyMock.verify(rpcFactoryMock, rpcMock);
+    try {
+      Datastore datastore = rpcMockOptions.getService();
+      datastore.get(KEY1);
+      Assert.fail();
+      EasyMock.verify(rpcFactoryMock, rpcMock);
+    } catch (DatastoreException ex) {
+      assertEquals("denied", ex.getMessage());
+    }
   }
 
   @Test
@@ -1129,11 +1129,14 @@ public void testRuntimeException() throws Exception {
     String exceptionMessage = "Artificial runtime exception";
     EasyMock.expect(rpcMock.lookup(requestPb)).andThrow(new RuntimeException(exceptionMessage));
     EasyMock.replay(rpcFactoryMock, rpcMock);
-    Datastore datastore = rpcMockOptions.getService();
-    thrown.expect(DatastoreException.class);
-    thrown.expectMessage(exceptionMessage);
-    datastore.get(KEY1);
-    EasyMock.verify(rpcFactoryMock, rpcMock);
+    try {
+      Datastore datastore = rpcMockOptions.getService();
+      datastore.get(KEY1);
+      Assert.fail();
+      EasyMock.verify(rpcFactoryMock, rpcMock);
+    } catch (DatastoreException ex) {
+      assertEquals(exceptionMessage, ex.getCause().getMessage());
+    }
   }
 
   @Test
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
index dd7e680b2324..e8076eba0d01 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
@@ -19,14 +19,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class LatLngTest {
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   private static LatLng gp1 = new LatLng(37.422035, -122.084124);
   private static LatLng gp2 = new LatLng(0.0, 0.0);
 
@@ -49,33 +46,45 @@ public void testEquals() {
 
   @Test
   public void testUpperLatRange() {
-    new LatLng(90, 0);
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(INVALID_LAT_MESSAGE);
-    new LatLng(91, 0);
+    try {
+      new LatLng(90, 0);
+      new LatLng(91, 0);
+      Assert.fail();
+    } catch (IllegalArgumentException ex) {
+      assertEquals(INVALID_LAT_MESSAGE, ex.getMessage());
+    }
   }
 
   @Test
   public void testLowerLatRange() {
-    new LatLng(-90, 0);
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(INVALID_LAT_MESSAGE);
-    new LatLng(-91, 0);
+    try {
+      new LatLng(-90, 0);
+      new LatLng(-91, 0);
+      Assert.fail();
+    } catch (IllegalArgumentException ex) {
+      assertEquals(INVALID_LAT_MESSAGE, ex.getMessage());
+    }
   }
 
   @Test
   public void testUpperLngRange() {
-    new LatLng(0, 180);
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(INVALID_LNG_MESSAGE);
-    new LatLng(0, 181);
+    try {
+      new LatLng(0, 180);
+      new LatLng(0, 181);
+      Assert.fail();
+    } catch (IllegalArgumentException ex) {
+      assertEquals(INVALID_LNG_MESSAGE, ex.getMessage());
+    }
   }
 
   @Test
   public void testLowerLngRange() {
-    new LatLng(0, 180);
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(INVALID_LNG_MESSAGE);
-    new LatLng(0, -181);
+    try {
+      new LatLng(0, 180);
+      new LatLng(0, -181);
+      Assert.fail();
+    } catch (IllegalArgumentException ex) {
+      assertEquals(INVALID_LNG_MESSAGE, ex.getMessage());
+    }
   }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
index 8353381965e1..d531456e0651 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
@@ -21,15 +21,11 @@
 
 import com.google.cloud.BaseServiceException;
 import com.google.cloud.ExceptionHandler;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 /** Tests for {@link TransactionExceptionHandler}. */
 public class TransactionExceptionHandlerTest {
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   @Test
   public void testShouldTry() {
     ExceptionHandler handler =
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 a05c99a18f50..9da207a4a6d4 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
@@ -31,9 +31,8 @@
 import com.google.cloud.datastore.Key;
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.threeten.bp.Duration;
@@ -45,8 +44,6 @@ public class ITLocalDatastoreHelperTest {
   private static final String PROJECT_ID_PREFIX = "test-project-";
   private static final String NAMESPACE = "namespace";
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   @Test
   public void testCreate() {
     LocalDatastoreHelper helper = LocalDatastoreHelper.create(0.75);
@@ -90,16 +87,20 @@ public void testOptions() {
 
   @Test
   public void testStartStopReset() throws IOException, InterruptedException, TimeoutException {
-    LocalDatastoreHelper helper = LocalDatastoreHelper.create();
-    helper.start();
-    Datastore datastore = helper.getOptions().getService();
-    Key key = datastore.newKeyFactory().setKind("kind").newKey("name");
-    datastore.put(Entity.newBuilder(key).build());
-    assertNotNull(datastore.get(key));
-    helper.reset();
-    assertNull(datastore.get(key));
-    helper.stop(Duration.ofMinutes(1));
-    thrown.expect(DatastoreException.class);
-    datastore.get(key);
+    try {
+      LocalDatastoreHelper helper = LocalDatastoreHelper.create();
+      helper.start();
+      Datastore datastore = helper.getOptions().getService();
+      Key key = datastore.newKeyFactory().setKind("kind").newKey("name");
+      datastore.put(Entity.newBuilder(key).build());
+      assertNotNull(datastore.get(key));
+      helper.reset();
+      assertNull(datastore.get(key));
+      helper.stop(Duration.ofMinutes(1));
+      datastore.get(key);
+      Assert.fail();
+    } catch (DatastoreException ex) {
+      assertNotNull(ex.getMessage());
+    }
   }
 }

From 6391955614854fb41e1455a43ddafd75b400e3d6 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Thu, 9 Jan 2020 23:17:14 +0530
Subject: [PATCH 0272/1784] chore: remove unused throws from test methods (#26)

---
 .../BaseDatastoreBatchWriterTest.java         | 54 +++++++++----------
 .../cloud/datastore/BaseEntityTest.java       | 32 +++++------
 .../google/cloud/datastore/BaseKeyTest.java   | 10 ++--
 .../com/google/cloud/datastore/BlobTest.java  | 10 ++--
 .../google/cloud/datastore/BlobValueTest.java |  6 +--
 .../cloud/datastore/BooleanValueTest.java     |  6 +--
 .../google/cloud/datastore/CursorTest.java    |  6 +--
 .../datastore/DatastoreExceptionTest.java     |  6 +--
 .../cloud/datastore/DatastoreHelperTest.java  |  2 +-
 .../cloud/datastore/DatastoreOptionsTest.java | 10 ++--
 .../cloud/datastore/DoubleValueTest.java      |  6 +--
 .../google/cloud/datastore/EntityTest.java    |  6 +--
 .../cloud/datastore/EntityValueTest.java      |  6 +--
 .../cloud/datastore/FullEntityTest.java       |  6 +--
 .../cloud/datastore/ITDatastoreTest.java      |  4 +-
 .../cloud/datastore/IncompleteKeyTest.java    |  2 +-
 .../cloud/datastore/KeyFactoryTest.java       |  4 +-
 .../com/google/cloud/datastore/KeyTest.java   | 12 ++---
 .../google/cloud/datastore/KeyValueTest.java  |  6 +--
 .../cloud/datastore/LatLngValueTest.java      |  6 +--
 .../google/cloud/datastore/ListValueTest.java |  6 +--
 .../google/cloud/datastore/LongValueTest.java |  6 +--
 .../google/cloud/datastore/NullValueTest.java |  6 +--
 .../cloud/datastore/PathElementTest.java      | 12 ++---
 .../cloud/datastore/ProjectionEntityTest.java |  8 +--
 .../google/cloud/datastore/RawValueTest.java  |  6 +--
 .../cloud/datastore/StringValueTest.java      |  6 +--
 .../cloud/datastore/TimestampValueTest.java   |  6 +--
 .../com/google/cloud/datastore/ValueTest.java | 10 ++--
 29 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
index 9e3b5792fb67..6c8d7c057b0b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
@@ -79,7 +79,7 @@ public void tearDown() {
   }
 
   @Test
-  public void testAdd() throws Exception {
+  public void testAdd() {
     Entity entity2 =
         Entity.newBuilder(ENTITY2).setKey(Key.newBuilder(KEY1).setName("name2").build()).build();
     List pbs = new LinkedList<>();
@@ -103,7 +103,7 @@ public void testAdd() throws Exception {
   }
 
   @Test
-  public void testAddAfterDelete() throws Exception {
+  public void testAddAfterDelete() {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build());
     batchWriter.delete(KEY1);
@@ -112,31 +112,31 @@ public void testAddAfterDelete() throws Exception {
   }
 
   @Test(expected = DatastoreException.class)
-  public void testAddDuplicate() throws Exception {
+  public void testAddDuplicate() {
     batchWriter.add(ENTITY1);
     batchWriter.add(ENTITY1);
   }
 
   @Test(expected = DatastoreException.class)
-  public void testAddAfterPut() throws Exception {
+  public void testAddAfterPut() {
     batchWriter.put(ENTITY1);
     batchWriter.add(ENTITY1);
   }
 
   @Test(expected = DatastoreException.class)
-  public void testAddAfterUpdate() throws Exception {
+  public void testAddAfterUpdate() {
     batchWriter.update(ENTITY1);
     batchWriter.add(ENTITY1);
   }
 
   @Test(expected = DatastoreException.class)
-  public void testAddWhenNotActive() throws Exception {
+  public void testAddWhenNotActive() {
     batchWriter.deactivate();
     batchWriter.add(ENTITY1);
   }
 
   @Test
-  public void testAddWithDeferredAllocation() throws Exception {
+  public void testAddWithDeferredAllocation() {
     List pbs = new LinkedList<>();
     pbs.add(
         com.google.datastore.v1.Mutation.newBuilder()
@@ -153,13 +153,13 @@ public void testAddWithDeferredAllocation() throws Exception {
   }
 
   @Test(expected = DatastoreException.class)
-  public void testAddWithDeferredAllocationWhenNotActive() throws Exception {
+  public void testAddWithDeferredAllocationWhenNotActive() {
     batchWriter.deactivate();
     batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_1);
   }
 
   @Test
-  public void testUpdate() throws Exception {
+  public void testUpdate() {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY1.toPb()).build());
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY2.toPb()).build());
@@ -170,7 +170,7 @@ public void testUpdate() throws Exception {
   }
 
   @Test
-  public void testUpdateAfterUpdate() throws Exception {
+  public void testUpdateAfterUpdate() {
     Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build());
@@ -180,7 +180,7 @@ public void testUpdateAfterUpdate() throws Exception {
   }
 
   @Test
-  public void testUpdateAfterAdd() throws Exception {
+  public void testUpdateAfterAdd() {
     Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
@@ -190,7 +190,7 @@ public void testUpdateAfterAdd() throws Exception {
   }
 
   @Test
-  public void testUpdateAfterPut() throws Exception {
+  public void testUpdateAfterPut() {
     Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
@@ -200,19 +200,19 @@ public void testUpdateAfterPut() throws Exception {
   }
 
   @Test(expected = DatastoreException.class)
-  public void testUpdateAfterDelete() throws Exception {
+  public void testUpdateAfterDelete() {
     batchWriter.delete(KEY1);
     batchWriter.update(ENTITY1, ENTITY2);
   }
 
   @Test(expected = DatastoreException.class)
-  public void testUpdateWhenNotActive() throws Exception {
+  public void testUpdateWhenNotActive() {
     batchWriter.deactivate();
     batchWriter.update(ENTITY1);
   }
 
   @Test
-  public void testPut() throws Exception {
+  public void testPut() {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build());
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY2.toPb()).build());
@@ -226,7 +226,7 @@ public void testPut() throws Exception {
   }
 
   @Test
-  public void testPutIncompleteKey() throws Exception {
+  public void testPutIncompleteKey() {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build());
     pbs.add(
@@ -246,7 +246,7 @@ public void testPutIncompleteKey() throws Exception {
   }
 
   @Test
-  public void testPutWithDeferredAllocation() throws Exception {
+  public void testPutWithDeferredAllocation() {
     List pbs = new LinkedList<>();
     pbs.add(
         com.google.datastore.v1.Mutation.newBuilder()
@@ -263,7 +263,7 @@ public void testPutWithDeferredAllocation() throws Exception {
   }
 
   @Test
-  public void testPutAfterPut() throws Exception {
+  public void testPutAfterPut() {
     Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
@@ -275,7 +275,7 @@ public void testPutAfterPut() throws Exception {
   }
 
   @Test
-  public void testPutAfterAdd() throws Exception {
+  public void testPutAfterAdd() {
     Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
@@ -285,7 +285,7 @@ public void testPutAfterAdd() throws Exception {
   }
 
   @Test
-  public void testPutAfterUpdate() throws Exception {
+  public void testPutAfterUpdate() {
     Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
@@ -296,7 +296,7 @@ public void testPutAfterUpdate() throws Exception {
   }
 
   @Test
-  public void testPutAfterDelete() throws Exception {
+  public void testPutAfterDelete() {
     Entity entity = Entity.newBuilder(ENTITY1).set("foo", "bar").build();
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
@@ -307,13 +307,13 @@ public void testPutAfterDelete() throws Exception {
   }
 
   @Test(expected = DatastoreException.class)
-  public void testPutWhenNotActive() throws Exception {
+  public void testPutWhenNotActive() {
     batchWriter.deactivate();
     batchWriter.put(ENTITY1);
   }
 
   @Test
-  public void testDelete() throws Exception {
+  public void testDelete() {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build());
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY2.toPb()).build());
@@ -324,7 +324,7 @@ public void testDelete() throws Exception {
   }
 
   @Test
-  public void testDeleteAfterAdd() throws Exception {
+  public void testDeleteAfterAdd() {
     List pbs = new LinkedList<>();
     pbs.add(
         com.google.datastore.v1.Mutation.newBuilder()
@@ -338,7 +338,7 @@ public void testDeleteAfterAdd() throws Exception {
   }
 
   @Test
-  public void testDeleteAfterUpdate() throws Exception {
+  public void testDeleteAfterUpdate() {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build());
     batchWriter.update(ENTITY1);
@@ -347,7 +347,7 @@ public void testDeleteAfterUpdate() throws Exception {
   }
 
   @Test
-  public void testDeleteAfterPut() throws Exception {
+  public void testDeleteAfterPut() {
     List pbs = new LinkedList<>();
     pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build());
     batchWriter.put(ENTITY1);
@@ -356,7 +356,7 @@ public void testDeleteAfterPut() throws Exception {
   }
 
   @Test(expected = DatastoreException.class)
-  public void testDeleteWhenNotActive() throws Exception {
+  public void testDeleteWhenNotActive() {
     batchWriter.deactivate();
     batchWriter.delete(KEY1);
   }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
index 161688410761..1b5380ab9bcf 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
@@ -79,7 +79,7 @@ public void setUp() {
   }
 
   @Test
-  public void testContains() throws Exception {
+  public void testContains() {
     BaseEntity entity = builder.build();
     assertTrue(entity.contains("list1"));
     assertFalse(entity.contains("bla"));
@@ -88,19 +88,19 @@ public void testContains() throws Exception {
   }
 
   @Test
-  public void testGetValue() throws Exception {
+  public void testGetValue() {
     BaseEntity entity = builder.build();
     assertEquals(BlobValue.of(BLOB), entity.getValue("blob"));
   }
 
   @Test(expected = DatastoreException.class)
-  public void testGetValueNotFound() throws Exception {
+  public void testGetValueNotFound() {
     BaseEntity entity = builder.clear().build();
     entity.getValue("blob");
   }
 
   @Test
-  public void testIsNull() throws Exception {
+  public void testIsNull() {
     BaseEntity entity = builder.build();
     assertTrue(entity.isNull("null"));
     assertFalse(entity.isNull("blob"));
@@ -109,13 +109,13 @@ public void testIsNull() throws Exception {
   }
 
   @Test(expected = DatastoreException.class)
-  public void testIsNullNotFound() throws Exception {
+  public void testIsNullNotFound() {
     BaseEntity entity = builder.clear().build();
     entity.isNull("null");
   }
 
   @Test
-  public void testGetString() throws Exception {
+  public void testGetString() {
     BaseEntity entity = builder.build();
     assertEquals("hello world", entity.getString("string"));
     assertEquals("bla", entity.getString("stringValue"));
@@ -124,7 +124,7 @@ public void testGetString() throws Exception {
   }
 
   @Test
-  public void testGetLong() throws Exception {
+  public void testGetLong() {
     BaseEntity entity = builder.build();
     assertEquals(125, entity.getLong("long"));
     entity = builder.set("long", LongValue.of(10)).build();
@@ -132,7 +132,7 @@ public void testGetLong() throws Exception {
   }
 
   @Test
-  public void testGetDouble() throws Exception {
+  public void testGetDouble() {
     BaseEntity entity = builder.build();
     assertEquals(1.25, entity.getDouble("double"), 0);
     entity = builder.set("double", DoubleValue.of(10)).build();
@@ -148,7 +148,7 @@ public void testGetBoolean() throws Exception {
   }
 
   @Test
-  public void testGetTimestamp() throws Exception {
+  public void testGetTimestamp() {
     BaseEntity entity = builder.build();
     assertEquals(TIMESTAMP, entity.getTimestamp("timestamp"));
     Calendar cal = Calendar.getInstance();
@@ -159,13 +159,13 @@ public void testGetTimestamp() throws Exception {
   }
 
   @Test
-  public void testGetLatLng() throws Exception {
+  public void testGetLatLng() {
     BaseEntity entity = builder.build();
     assertEquals(LAT_LNG, entity.getLatLng("latLng"));
   }
 
   @Test
-  public void testGetKey() throws Exception {
+  public void testGetKey() {
     BaseEntity entity = builder.build();
     assertEquals(KEY, entity.getKey("key"));
     Key key = Key.newBuilder(KEY).setName("BLA").build();
@@ -174,7 +174,7 @@ public void testGetKey() throws Exception {
   }
 
   @Test
-  public void testGetEntity() throws Exception {
+  public void testGetEntity() {
     BaseEntity entity = builder.build();
     assertEquals(ENTITY, entity.getEntity("entity"));
     assertEquals(PARTIAL_ENTITY, entity.getEntity("partialEntity"));
@@ -183,7 +183,7 @@ public void testGetEntity() throws Exception {
   }
 
   @Test
-  public void testGetList() throws Exception {
+  public void testGetList() {
     BaseEntity entity = builder.build();
     List> list = entity.getList("list1");
     assertEquals(3, list.size());
@@ -213,7 +213,7 @@ public void testGetList() throws Exception {
   }
 
   @Test
-  public void testGetBlob() throws Exception {
+  public void testGetBlob() {
     BaseEntity entity = builder.build();
     assertEquals(BLOB, entity.getBlob("blob"));
     Blob blob = Blob.copyFrom(new byte[] {});
@@ -222,7 +222,7 @@ public void testGetBlob() throws Exception {
   }
 
   @Test
-  public void testNames() throws Exception {
+  public void testNames() {
     Set names =
         ImmutableSet.builder()
             .add("string", "stringValue", "boolean", "double", "long", "list1", "list2", "list3")
@@ -236,7 +236,7 @@ public void testNames() throws Exception {
   }
 
   @Test
-  public void testKey() throws Exception {
+  public void testKey() {
     builder.setKey(KEY);
     BaseEntity entity = builder.build();
     assertEquals(KEY, entity.getKey());
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 417b5bed5fac..ffa54970da87 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
@@ -52,7 +52,7 @@ protected BaseKey getParent() {
   }
 
   @Test
-  public void testProjectId() throws Exception {
+  public void testProjectId() {
     Builder builder = new Builder("ds1", "k");
     BaseKey key = builder.build();
     assertEquals("ds1", key.getProjectId());
@@ -61,18 +61,18 @@ public void testProjectId() throws Exception {
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testBadDatasetInConstructor() throws Exception {
+  public void testBadDatasetInConstructor() {
     new Builder(" ", "k");
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testBadDatasetInSetter() throws Exception {
+  public void testBadDatasetInSetter() {
     Builder builder = new Builder("d", "k");
     builder.setProjectId(" ");
   }
 
   @Test
-  public void testNamespace() throws Exception {
+  public void testNamespace() {
     Builder builder = new Builder("ds", "k");
     BaseKey key = builder.build();
     assertTrue(key.getNamespace() != null);
@@ -82,7 +82,7 @@ public void testNamespace() throws Exception {
   }
 
   @Test
-  public void testKind() throws Exception {
+  public void testKind() {
     Builder builder = new Builder("ds", "k1");
     BaseKey key = builder.build();
     assertEquals("k1", key.getKind());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
index 61e70685c38f..55d5f0319c47 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
@@ -45,26 +45,26 @@ public void setUp() {
   }
 
   @Test
-  public void testEquals() throws Exception {
+  public void testEquals() {
     assertEquals(blob1, blob1);
     assertEquals(blob1, Blob.copyFrom(bytes1));
     assertNotEquals(blob1, blob2);
   }
 
   @Test
-  public void testLength() throws Exception {
+  public void testLength() {
     assertEquals(bytes1.length, blob1.getLength());
     assertEquals(bytes2.length, blob2.getLength());
   }
 
   @Test
-  public void testToByteArray() throws Exception {
+  public void testToByteArray() {
     assertArrayEquals(bytes1, blob1.toByteArray());
     assertArrayEquals(bytes2, blob2.toByteArray());
   }
 
   @Test
-  public void testAsReadOnlyByteBuffer() throws Exception {
+  public void testAsReadOnlyByteBuffer() {
     ByteBuffer buffer = blob1.asReadOnlyByteBuffer();
     byte[] bytes = new byte[bytes1.length];
     buffer.get(bytes);
@@ -82,7 +82,7 @@ public void testAsInputStream() throws Exception {
   }
 
   @Test
-  public void testCopyTo() throws Exception {
+  public void testCopyTo() {
     byte[] bytes = new byte[bytes1.length];
     blob1.copyTo(bytes);
     assertArrayEquals(bytes1, bytes);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
index 6df282950288..7bad94293c34 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
@@ -27,13 +27,13 @@ public class BlobValueTest {
   private static final Blob CONTENT = Blob.copyFrom(new byte[] {1, 2});
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     BlobValue value = BlobValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     BlobValue value = BlobValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -41,7 +41,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     BlobValue.Builder builder = BlobValue.newBuilder(CONTENT);
     BlobValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
index 1a3d97917072..579c1774878f 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
@@ -25,13 +25,13 @@
 public class BooleanValueTest {
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     BooleanValue value = BooleanValue.of(true);
     assertEquals(value, value.toBuilder().build());
   }
 
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     BooleanValue value = BooleanValue.of(false);
     assertFalse(value.get());
     assertFalse(value.excludeFromIndexes());
@@ -39,7 +39,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     BooleanValue.Builder builder = BooleanValue.newBuilder(true);
     BooleanValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertTrue(value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
index 44a9b8d0aee7..4a3c3542d8ad 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
@@ -31,19 +31,19 @@ public class CursorTest {
   private Cursor cursor2;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     cursor1 = new Cursor(ByteString.copyFrom(bytes1));
     cursor2 = new Cursor(ByteString.copyFrom(bytes2));
   }
 
   @Test
-  public void testToFromUrlSafe() throws Exception {
+  public void testToFromUrlSafe() {
     String urlSafe = cursor1.toUrlSafe();
     assertEquals(cursor1, Cursor.fromUrlSafe(urlSafe));
   }
 
   @Test
-  public void testCopyFrom() throws Exception {
+  public void testCopyFrom() {
     Cursor cursor = Cursor.copyFrom(bytes2);
     assertEquals(cursor2, cursor);
     assertNotEquals(cursor1, cursor);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
index eec87ffa3f70..12b99c966309 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
@@ -36,7 +36,7 @@
 public class DatastoreExceptionTest {
 
   @Test
-  public void testDatastoreException() throws Exception {
+  public void testDatastoreException() {
     DatastoreException exception = new DatastoreException(10, "message", "ABORTED");
     assertEquals(10, exception.getCode());
     assertEquals("ABORTED", exception.getReason());
@@ -79,7 +79,7 @@ public void testDatastoreException() throws Exception {
   }
 
   @Test
-  public void testTranslateAndThrow() throws Exception {
+  public void testTranslateAndThrow() {
     Exception cause = new DatastoreException(14, "message", "UNAVAILABLE");
     RetryHelper.RetryHelperException exceptionMock =
         createMock(RetryHelper.RetryHelperException.class);
@@ -112,7 +112,7 @@ public void testTranslateAndThrow() throws Exception {
   }
 
   @Test
-  public void testThrowInvalidRequest() throws Exception {
+  public void testThrowInvalidRequest() {
     try {
       DatastoreException.throwInvalidRequest("message %s %d", "a", 1);
       fail("Exception expected");
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 94121cf78f10..576ad74cddf0 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
@@ -48,7 +48,7 @@ public void testNewKeyFactory() {
   }
 
   @Test
-  public void testAllocateId() throws Exception {
+  public void testAllocateId() {
     Datastore datastore = createStrictMock(Datastore.class);
     IncompleteKey pKey1 = IncompleteKey.newBuilder("ds", "k").build();
     Key key1 = Key.newBuilder(pKey1, 1).build();
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 79cb716e1555..aabdc7af329c 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
@@ -53,28 +53,28 @@ public void setUp() {
   }
 
   @Test
-  public void testProjectId() throws Exception {
+  public void testProjectId() {
     assertEquals(PROJECT_ID, options.build().getProjectId());
   }
 
   @Test
-  public void testHost() throws Exception {
+  public void testHost() {
     assertEquals("http://localhost:" + PORT, options.build().getHost());
   }
 
   @Test
-  public void testNamespace() throws Exception {
+  public void testNamespace() {
     assertTrue(options.build().getNamespace().isEmpty());
     assertEquals("ns1", options.setNamespace("ns1").build().getNamespace());
   }
 
   @Test
-  public void testDatastore() throws Exception {
+  public void testDatastore() {
     assertSame(datastoreRpc, options.build().getRpc());
   }
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     DatastoreOptions original = options.setNamespace("ns1").build();
     DatastoreOptions copy = original.toBuilder().build();
     assertEquals(original.getProjectId(), copy.getProjectId());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
index 4ec8839451db..257d5e829612 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
@@ -27,14 +27,14 @@ public class DoubleValueTest {
   private static final Double CONTENT = 1.25;
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     DoubleValue value = DoubleValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     DoubleValue value = DoubleValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -42,7 +42,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     DoubleValue.Builder builder = DoubleValue.newBuilder(CONTENT);
     DoubleValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
index 31baa87fe379..64517de66c79 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
@@ -32,14 +32,14 @@ public class EntityTest {
       Entity.newBuilder(INCOMPLETE_KEY).set("a", "b").build();
 
   @Test
-  public void testEntity() throws Exception {
+  public void testEntity() {
     assertTrue(ENTITY.hasKey());
     assertEquals(KEY1, ENTITY.getKey());
     assertEquals("bar", ENTITY.getString("foo"));
   }
 
   @Test
-  public void testCopyFrom() throws Exception {
+  public void testCopyFrom() {
     Entity.Builder builder = Entity.newBuilder(ENTITY);
     assertEquals(ENTITY, builder.build());
     Entity entity = builder.setKey(KEY2).build();
@@ -49,7 +49,7 @@ public void testCopyFrom() throws Exception {
   }
 
   @Test
-  public void testCopyFromIncompleteEntity() throws Exception {
+  public void testCopyFromIncompleteEntity() {
     Entity.Builder builder = Entity.newBuilder(KEY2, INCOMPLETE_ENTITY);
     Entity entity = builder.build();
     assertNotEquals(INCOMPLETE_ENTITY, entity);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
index dd15dc054e50..7a060ed804be 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
@@ -28,14 +28,14 @@ public class EntityValueTest {
   private static final Entity CONTENT = Entity.newBuilder(KEY).set("FOO", "BAR").build();
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     EntityValue value = EntityValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     EntityValue value = EntityValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -43,7 +43,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     EntityValue.Builder builder = EntityValue.newBuilder(CONTENT);
     EntityValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
index dc98f2e032e8..5bad1e30d964 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
@@ -36,7 +36,7 @@ public class FullEntityTest {
       Entity.newBuilder(INCOMPLETE_KEY).set("a", "b").build();
 
   @Test
-  public void testFullEntity() throws Exception {
+  public void testFullEntity() {
     assertTrue(COMPLETE_ENTITY1.hasKey());
     assertEquals(KEY1, COMPLETE_ENTITY1.getKey());
     assertEquals("bar", COMPLETE_ENTITY1.getString("foo"));
@@ -47,7 +47,7 @@ public void testFullEntity() throws Exception {
   }
 
   @Test
-  public void testNoKey() throws Exception {
+  public void testNoKey() {
     FullEntity entity = FullEntity.newBuilder().set("foo", "bar").build();
     assertFalse(entity.hasKey());
     assertNull(entity.getKey());
@@ -59,7 +59,7 @@ public void testNoKey() throws Exception {
   }
 
   @Test
-  public void testCopyFrom() throws Exception {
+  public void testCopyFrom() {
     FullEntity.Builder builder1 = FullEntity.newBuilder(ENTITY);
     assertEquals(ENTITY, builder1.build());
 
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
index cf343aa7bc59..bef15e4091b6 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
@@ -1089,7 +1089,7 @@ public void testKeyFactory() {
   }
 
   @Test
-  public void testRetryableException() throws Exception {
+  public void testRetryableException() {
     LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();
     LookupResponse responsePb =
         LookupResponse.newBuilder()
@@ -1124,7 +1124,7 @@ public void testNonRetryableException() {
   }
 
   @Test
-  public void testRuntimeException() throws Exception {
+  public void testRuntimeException() {
     LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();
     String exceptionMessage = "Artificial runtime exception";
     EasyMock.expect(rpcMock.lookup(requestPb)).andThrow(new RuntimeException(exceptionMessage));
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 b7aa2f5058e2..c3396a286749 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
@@ -37,7 +37,7 @@ public void setUp() {
   }
 
   @Test
-  public void testBuilders() throws Exception {
+  public void testBuilders() {
     assertEquals("ds", pk1.getProjectId());
     assertEquals("kind1", pk1.getKind());
     assertTrue(pk1.getAncestors().isEmpty());
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 238fc4788968..26c922e5a6e4 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
@@ -76,7 +76,7 @@ public void testReset() {
   }
 
   @Test
-  public void testNewKey() throws Exception {
+  public void testNewKey() {
     Key key = keyFactory.newKey(1);
     verifyKey(key, 1L, "");
     key = keyFactory.newKey("n");
@@ -88,7 +88,7 @@ public void testNewKey() throws Exception {
   }
 
   @Test
-  public void testNewIncompleteKey() throws Exception {
+  public void testNewIncompleteKey() {
     IncompleteKey key = keyFactory.newKey();
     verifyIncompleteKey(key, "");
     PathElement p1 = PathElement.of("k1", "n");
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 77da9f9f0739..d6e3b4d8f08c 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
@@ -25,7 +25,7 @@
 public class KeyTest {
 
   @Test
-  public void testHasId() throws Exception {
+  public void testHasId() {
     Key.Builder builder = Key.newBuilder("d", "k", 10);
     Key key = builder.build();
     assertTrue(key.hasId());
@@ -34,7 +34,7 @@ public void testHasId() throws Exception {
   }
 
   @Test
-  public void testId() throws Exception {
+  public void testId() {
     Key.Builder builder = Key.newBuilder("d", "k", 10);
     Key key = builder.build();
     assertEquals(Long.valueOf(10), key.getId());
@@ -43,7 +43,7 @@ public void testId() throws Exception {
   }
 
   @Test
-  public void testHasName() throws Exception {
+  public void testHasName() {
     Key.Builder builder = Key.newBuilder("d", "k", "n");
     Key key = builder.build();
     assertTrue(key.hasName());
@@ -52,7 +52,7 @@ public void testHasName() throws Exception {
   }
 
   @Test
-  public void testName() throws Exception {
+  public void testName() {
     Key.Builder builder = Key.newBuilder("d", "k", "n");
     Key key = builder.build();
     assertEquals("n", key.getName());
@@ -61,7 +61,7 @@ public void testName() throws Exception {
   }
 
   @Test
-  public void testNameOrId() throws Exception {
+  public void testNameOrId() {
     Key.Builder builder = Key.newBuilder("d", "k", "n");
     Key key = builder.build();
     assertEquals("n", key.getNameOrId());
@@ -70,7 +70,7 @@ public void testNameOrId() throws Exception {
   }
 
   @Test
-  public void testToAndFromUrlSafe() throws Exception {
+  public void testToAndFromUrlSafe() {
     Key key = Key.newBuilder("d", "k", "n").build();
     String urlSafe = key.toUrlSafe();
     Key copy = Key.fromUrlSafe(urlSafe);
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
index 81feb8938220..e589f7d314f4 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
@@ -27,14 +27,14 @@ public class KeyValueTest {
   private static final Key CONTENT = Key.newBuilder("ds", "kind", 1).build();
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     KeyValue value = KeyValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     KeyValue value = KeyValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -42,7 +42,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     KeyValue.Builder builder = KeyValue.newBuilder(CONTENT);
     KeyValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
index 484eb7f6db73..6ae6b5c2caac 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
@@ -27,14 +27,14 @@ public class LatLngValueTest {
   private static final LatLng CONTENT = new LatLng(37.4, -122.1);
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     LatLngValue value = LatLngValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     LatLngValue value = LatLngValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -42,7 +42,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     LatLngValue.Builder builder = LatLngValue.newBuilder(CONTENT);
     LatLngValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
index 88e86af628ba..44ea74a648df 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
@@ -50,13 +50,13 @@ public class ListValueTest {
   private static final Blob BLOB2 = Blob.copyFrom(new byte[] {0xB, 0x0, 0x0, 0x0});
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     ListValue value = ListValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     ListValue value = ListValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -106,7 +106,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     ListValue.Builder builder = ListValue.newBuilder().set(CONTENT);
     ListValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
index 07d9191c227c..9f355fd024af 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
@@ -27,14 +27,14 @@ public class LongValueTest {
   private static final Long CONTENT = 125L;
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     LongValue value = LongValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     LongValue value = LongValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -42,7 +42,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     LongValue.Builder builder = LongValue.newBuilder(CONTENT);
     LongValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
index d19635c4933e..3bd5002196bb 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
@@ -26,13 +26,13 @@
 public class NullValueTest {
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     NullValue value = NullValue.of();
     assertEquals(value, value.toBuilder().build());
   }
 
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     NullValue value = NullValue.of();
     assertNull(value.get());
     assertFalse(value.excludeFromIndexes());
@@ -40,7 +40,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     NullValue.Builder builder = NullValue.newBuilder();
     NullValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertNull(value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
index 724f49785b2a..efeb8efa773b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
@@ -30,42 +30,42 @@ public class PathElementTest {
   private static final PathElement PE_3 = PathElement.of("k3", 1);
 
   @Test
-  public void testKind() throws Exception {
+  public void testKind() {
     assertEquals("k1", PE_1.getKind());
     assertEquals("k2", PE_2.getKind());
     assertEquals("k3", PE_3.getKind());
   }
 
   @Test
-  public void testHasId() throws Exception {
+  public void testHasId() {
     assertFalse(PE_1.hasId());
     assertFalse(PE_2.hasId());
     assertTrue(PE_3.hasId());
   }
 
   @Test
-  public void testId() throws Exception {
+  public void testId() {
     assertNull(PE_1.getId());
     assertNull(PE_2.getId());
     assertEquals(Long.valueOf(1), PE_3.getId());
   }
 
   @Test
-  public void testHasName() throws Exception {
+  public void testHasName() {
     assertFalse(PE_1.hasName());
     assertTrue(PE_2.hasName());
     assertFalse(PE_3.hasName());
   }
 
   @Test
-  public void testName() throws Exception {
+  public void testName() {
     assertNull(PE_1.getName());
     assertEquals("n", PE_2.getName());
     assertNull(PE_3.getName());
   }
 
   @Test
-  public void testNameOrId() throws Exception {
+  public void testNameOrId() {
     assertNull(PE_1.getNameOrId());
     assertEquals("n", PE_2.getNameOrId());
     assertEquals(Long.valueOf(1), PE_3.getNameOrId());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
index 4af783ce6582..14a73564462f 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
@@ -49,25 +49,25 @@ public class ProjectionEntityTest {
           .build();
 
   @Test
-  public void testHasKey() throws Exception {
+  public void testHasKey() {
     assertTrue(ENTITY1.hasKey());
     assertFalse(ENTITY2.hasKey());
   }
 
   @Test
-  public void testKey() throws Exception {
+  public void testKey() {
     assertEquals(KEY, ENTITY1.getKey());
     assertNull(ENTITY2.getKey());
   }
 
   @Test
-  public void testGetBlob() throws Exception {
+  public void testGetBlob() {
     assertArrayEquals(STRING_INDEX_VALUE.get().getBytes(), ENTITY2.getBlob("a").toByteArray());
     assertEquals(BLOB_VALUE.get(), ENTITY2.getBlob("b"));
   }
 
   @Test
-  public void testGetTimestamp() throws Exception {
+  public void testGetTimestamp() {
     assertEquals(TIMESTAMP_VALUE.get(), ENTITY2.getTimestamp("c"));
     assertEquals(TIMESTAMP_VALUE.get(), ENTITY2.getTimestamp("d"));
   }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
index 7718672effe5..8d10a9f9f71d 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
@@ -27,13 +27,13 @@ public class RawValueTest {
   private static final com.google.datastore.v1.Value CONTENT = StringValue.of("hello").toPb();
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     RawValue value = RawValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     RawValue value = RawValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -41,7 +41,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     RawValue.Builder builder = RawValue.newBuilder(CONTENT);
     RawValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
index 4c3dbaef0a8d..88aa841d36a2 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
@@ -27,13 +27,13 @@ public class StringValueTest {
   private static final String CONTENT = "hello world";
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     StringValue value = StringValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     StringValue value = StringValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -41,7 +41,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     StringValue.Builder builder = StringValue.newBuilder(CONTENT);
     StringValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
index 138a7f329ead..10dbaf8c782d 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
@@ -28,13 +28,13 @@ public class TimestampValueTest {
   private static final Timestamp CONTENT = Timestamp.now();
 
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     TimestampValue value = TimestampValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @Test
-  public void testOf() throws Exception {
+  public void testOf() {
     TimestampValue value = TimestampValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
@@ -42,7 +42,7 @@ public void testOf() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testBuilder() throws Exception {
+  public void testBuilder() {
     TimestampValue.Builder builder = TimestampValue.newBuilder(CONTENT);
     TimestampValue value = builder.setMeaning(1).setExcludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
index 70479bcc9ea0..365fcae72253 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
@@ -114,14 +114,14 @@ public void setUp() throws Exception {
   }
 
   @Test
-  public void testType() throws Exception {
+  public void testType() {
     for (Map.Entry> entry : typeToValue.entrySet()) {
       assertEquals(entry.getKey(), entry.getValue().getType());
     }
   }
 
   @Test
-  public void testExcludeFromIndexes() throws Exception {
+  public void testExcludeFromIndexes() {
     for (Map.Entry> entry : typeToValue.entrySet()) {
       assertFalse(entry.getValue().excludeFromIndexes());
     }
@@ -133,13 +133,13 @@ public void testExcludeFromIndexes() throws Exception {
 
   @SuppressWarnings("deprecation")
   @Test
-  public void testMeaning() throws Exception {
+  public void testMeaning() {
     TestBuilder builder = new TestBuilder();
     assertEquals(10, builder.setMeaning(10).build().getMeaning());
   }
 
   @Test
-  public void testGet() throws Exception {
+  public void testGet() {
     for (Map.Entry> entry : typeToValue.entrySet()) {
       ValueType valueType = entry.getKey();
       Value value = entry.getValue();
@@ -153,7 +153,7 @@ public void testGet() throws Exception {
 
   @SuppressWarnings({"unchecked", "deprecation"})
   @Test
-  public void testToBuilder() throws Exception {
+  public void testToBuilder() {
     Set content = Collections.singleton("bla");
     @SuppressWarnings("rawtypes")
     ValueBuilder builder = new TestBuilder();

From fde0a9fcf38c74143b896a6e6b282047d7dadb6f Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 10 Jan 2020 02:06:48 +0530
Subject: [PATCH 0273/1784] fix: remove temporary added
 animal-sniffer-annotations exclusion rule from pom (#16)

| Package | Update | Change |
|---|---|---|
| com.google.guava:guava-bom | minor | `28.1-android` -> `28.2-android` |

The new version of Guava no longer has a dependency on `org.codehaus.mojo:animal-sniffer-annotations`
Fixes #3
---
 google-cloud-datastore/pom.xml | 8 ++++----
 pom.xml                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 28f10ddf8a01..a71a4faadb81 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -34,11 +34,11 @@
       io.grpc
       grpc-api
       
-        
-        
+        
+        
         
-          org.codehaus.mojo
-          animal-sniffer-annotations
+          com.google.errorprone
+          error_prone_annotations
         
       
     
diff --git a/pom.xml b/pom.xml
index c9d80a6785f6..d4aecb852cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
     1.26.0
     3.11.1
     4.13
-    28.1-android
+    28.2-android
     1.4.0
     0.24.0
     1.10.19

From d6d74a19e735e55ccf84dc5f0961f44cd71fc183 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 13 Jan 2020 21:41:23 +0100
Subject: [PATCH 0274/1784] deps: update dependency org.threeten:threetenbp to
 v1.4.1 (#28)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d4aecb852cee..5d1aa5269e7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
     3.11.1
     4.13
     28.2-android
-    1.4.0
+    1.4.1
     0.24.0
     1.10.19
     1.3.2

From 4481c27e941b6ba17b69bc84ab4ae700d57ac92f Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Tue, 4 Feb 2020 05:29:18 +0530
Subject: [PATCH 0275/1784] deps: update core dependencies

* deps: update core dependencies

* build: fix dependencies and linkage monitor

* build: fix ignore unused declared dependency
---
 google-cloud-datastore/pom.xml |  8 ++++++++
 pom.xml                        | 37 +++++++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a71a4faadb81..ddb51304ab3e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -74,6 +74,14 @@
       com.google.http-client
       google-http-client
     
+    
+      com.google.http-client
+      google-http-client-jackson2
+    
+    
+      com.google.oauth-client
+      google-oauth-client
+    
     
       com.google.auth
       google-auth-library-oauth2-http
diff --git a/pom.xml b/pom.xml
index 5d1aa5269e7d..9fd0f123b04a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,11 +152,11 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.92.0
+    1.92.4
     1.8.1
     1.17.0
-    1.52.0
-    1.26.0
+    1.53.1
+    1.27.0
     3.11.1
     4.13
     28.2-android
@@ -236,12 +236,22 @@
       
         com.google.auth
         google-auth-library-oauth2-http
-        0.19.0
+        0.20.0
       
       
         com.google.http-client
         google-http-client
-        1.34.0
+        1.34.1
+      
+      
+        com.google.http-client
+        google-http-client-jackson2
+        1.34.1
+      
+      
+        com.google.oauth-client
+        google-oauth-client
+        1.30.5
       
 
       
@@ -277,6 +287,23 @@
     
   
 
+  
+    
+      
+        
+          org.apache.maven.plugins
+          maven-dependency-plugin
+          
+            
+              com.google.http-client:google-http-client-jackson2
+              com.google.oauth-client:google-oauth-client
+            
+          
+        
+      
+    
+  
+
   
     proto-google-cloud-datastore-v1
     google-cloud-datastore

From 6b3a930e0ed9c389ce5bedbf33dcd7a0a40227d3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 5 Feb 2020 20:59:27 +0100
Subject: [PATCH 0276/1784] deps: update dependency
 com.google.protobuf:protobuf-java to v3.11.3 (#32)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9fd0f123b04a..6ec921f2c28f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
     1.17.0
     1.53.1
     1.27.0
-    3.11.1
+    3.11.3
     4.13
     28.2-android
     1.4.1

From b659cfa6992f6327b4b0d9f0414d51c4a70d8557 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Thu, 6 Feb 2020 01:41:31 +0530
Subject: [PATCH 0277/1784] fix: remove error_prone_annotations exclusion rules
 from poms (#31)

---
 google-cloud-datastore/pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ddb51304ab3e..9462542a0ea1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -33,14 +33,6 @@
     
       io.grpc
       grpc-api
-      
-        
-        
-        
-          com.google.errorprone
-          error_prone_annotations
-        
-      
     
     
       com.google.api

From 97b37edf5592524ea85955a3fbca421c5ff77b5f Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Tue, 11 Feb 2020 11:49:38 -0800
Subject: [PATCH 0278/1784] chore: only allow renovate-bot for
 trusted-contribution auto-labeling

---
 .github/trusted-contribution.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/trusted-contribution.yml

diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
new file mode 100644
index 000000000000..f247d5c78934
--- /dev/null
+++ b/.github/trusted-contribution.yml
@@ -0,0 +1,2 @@
+trustedContributors:
+- renovate-bot
\ No newline at end of file

From 028b6690ba4b75aa0691f7b999792f333fea1d8d Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 11 Feb 2020 21:29:25 +0100
Subject: [PATCH 0279/1784] deps: update core dependencies to v1.92.5 (#36)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6ec921f2c28f..a840caea54fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.92.4
+    1.92.5
     1.8.1
     1.17.0
     1.53.1

From 71ee04236f71e55335f9edb44265b303e60579ff Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2020 15:53:42 -0500
Subject: [PATCH 0280/1784] chore: release 1.101.1 (#23)

---
 CHANGELOG.md                            | 19 +++++++++++++++++++
 README.md                               |  6 +++---
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000000..3a88efa97c1f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,19 @@
+# Changelog
+
+### [1.101.1](https://www.github.com/googleapis/java-datastore/compare/1.101.0...v1.101.1) (2020-02-11)
+
+
+### Bug Fixes
+
+* remove error_prone_annotations exclusion rules from poms ([#31](https://www.github.com/googleapis/java-datastore/issues/31)) ([b659cfa](https://www.github.com/googleapis/java-datastore/commit/b659cfa6992f6327b4b0d9f0414d51c4a70d8557))
+* remove temporary added animal-sniffer-annotations exclusion rule from pom ([#16](https://www.github.com/googleapis/java-datastore/issues/16)) ([fde0a9f](https://www.github.com/googleapis/java-datastore/commit/fde0a9fcf38c74143b896a6e6b282047d7dadb6f)), closes [#3](https://www.github.com/googleapis/java-datastore/issues/3)
+
+
+### Dependencies
+
+* update core dependencies ([4481c27](https://www.github.com/googleapis/java-datastore/commit/4481c27e941b6ba17b69bc84ab4ae700d57ac92f))
+* update core dependencies to v1.92.5 ([#36](https://www.github.com/googleapis/java-datastore/issues/36)) ([028b669](https://www.github.com/googleapis/java-datastore/commit/028b6690ba4b75aa0691f7b999792f333fea1d8d))
+* update dependency com.google.cloud:google-cloud-shared-config to v0.4.0 ([#25](https://www.github.com/googleapis/java-datastore/issues/25)) ([657c69b](https://www.github.com/googleapis/java-datastore/commit/657c69bab7296c57575c24e96b208427e6791d1f))
+* update dependency com.google.protobuf:protobuf-java to v3.11.3 ([#32](https://www.github.com/googleapis/java-datastore/issues/32)) ([6b3a930](https://www.github.com/googleapis/java-datastore/commit/6b3a930e0ed9c389ce5bedbf33dcd7a0a40227d3))
+* update dependency junit:junit to v4.13 ([#13](https://www.github.com/googleapis/java-datastore/issues/13)) ([174158b](https://www.github.com/googleapis/java-datastore/commit/174158bac4fad21563fdd209b39e377c48bd8efe))
+* update dependency org.threeten:threetenbp to v1.4.1 ([#28](https://www.github.com/googleapis/java-datastore/issues/28)) ([d6d74a1](https://www.github.com/googleapis/java-datastore/commit/d6d74a19e735e55ccf84dc5f0961f44cd71fc183))
diff --git a/README.md b/README.md
index e687f1253633..a2be7310fac5 100644
--- a/README.md
+++ b/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.102.0
+  1.102.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.102.0'
+compile 'com.google.cloud:google-cloud-datastore:1.102.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.1"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d6a8761189cf..e50ddd8aa539 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
-  1.32.1-SNAPSHOT
+  1.102.1
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.1-SNAPSHOT
+        0.85.1
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.1-SNAPSHOT
+        0.85.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9462542a0ea1..6eca150831bc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.1-SNAPSHOT
+  1.102.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.1-SNAPSHOT
+    1.102.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index a840caea54fe..d136503ccd69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.1-SNAPSHOT
+  1.102.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.1-SNAPSHOT
+        0.85.1
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2249b1a20473..83d95409af96 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.85.1-SNAPSHOT
+  0.85.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.1-SNAPSHOT
+    1.102.1
   
   
     
diff --git a/versions.txt b/versions.txt
index cc5b34e95d41..d1d9c8356ac5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.0:1.102.1-SNAPSHOT
-google-cloud-datastore-bom:1.102.0:1.102.1-SNAPSHOT
-google-cloud-datastore-parent:1.102.0:1.102.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.85.0:0.85.1-SNAPSHOT
+google-cloud-datastore:1.102.1:1.102.1
+google-cloud-datastore-bom:1.102.1:1.102.1
+google-cloud-datastore-parent:1.102.1:1.102.1
+proto-google-cloud-datastore-v1:0.85.1:0.85.1
 

From cb2499c645fc9f5f96bb339b48eded53811c4dc6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2020 17:25:45 -0500
Subject: [PATCH 0281/1784] chore: release 1.101.2-SNAPSHOT (#39)

---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e50ddd8aa539..08c0545f37e0 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
-  1.102.1
+  1.102.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.1
+        0.85.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        0.85.1
+        0.85.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6eca150831bc..7aa77d3d1621 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.1
+  1.102.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.1
+    1.102.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index d136503ccd69..1342928d633f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.1
+  1.102.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.1
+        0.85.2-SNAPSHOT
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 83d95409af96..a800e11c0343 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.85.1
+  0.85.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.1
+    1.102.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index d1d9c8356ac5..e572e5a1045b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.1:1.102.1
-google-cloud-datastore-bom:1.102.1:1.102.1
-google-cloud-datastore-parent:1.102.1:1.102.1
-proto-google-cloud-datastore-v1:0.85.1:0.85.1
+google-cloud-datastore:1.102.1:1.102.2-SNAPSHOT
+google-cloud-datastore-bom:1.102.1:1.102.2-SNAPSHOT
+google-cloud-datastore-parent:1.102.1:1.102.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.85.1:0.85.2-SNAPSHOT
 

From a84672396fe91cc455d734c9420b332c3d544635 Mon Sep 17 00:00:00 2001
From: David Supplee 
Date: Wed, 12 Feb 2020 14:26:31 -0800
Subject: [PATCH 0282/1784] chore: update github url (#40)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7aa77d3d1621..a980541bb8be 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -5,7 +5,7 @@
   1.102.2-SNAPSHOT
   jar
   Google Cloud Datastore
-  https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore
+  https://github.com/googleapis/java-datastore
   
     Java idiomatic client for Google Cloud Datastore.
   

From 6af084face9afa7ee1fa8dec2a96419e7f4db706 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Thu, 13 Feb 2020 13:43:23 -0500
Subject: [PATCH 0283/1784] fix: bom version tag miss configured (#42)

The bom had been miss configured to change the version of google-cloud-datastore to be the version for proto-google-cloud-datastore-v1 this change fixes the marker and the version.
---
 google-cloud-datastore-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 08c0545f37e0..9691a1c65ea6 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -68,7 +68,7 @@
       
         com.google.cloud
         google-cloud-datastore
-        0.85.2-SNAPSHOT
+        1.102.2-SNAPSHOT
       
     
   

From 6c77c81a31c739fe599941b8bd9053c71b478fe5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 13 Feb 2020 10:46:22 -0800
Subject: [PATCH 0284/1784] chore: generate common config files (#41)

---
 .kokoro/build.sh               |  15 ++++-
 .kokoro/continuous/samples.cfg |  31 ++++++++++
 .kokoro/linkage-monitor.sh     |   7 ++-
 .kokoro/nightly/samples.cfg    |  31 ++++++++++
 .kokoro/presubmit/samples.cfg  |  31 ++++++++++
 CONTRIBUTING.md                | 104 ++++++++++++++++++++++++++++++++-
 renovate.json                  |   9 ++-
 synth.metadata                 |  27 +++++++--
 8 files changed, 245 insertions(+), 10 deletions(-)
 create mode 100644 .kokoro/continuous/samples.cfg
 create mode 100644 .kokoro/nightly/samples.cfg
 create mode 100644 .kokoro/presubmit/samples.cfg

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index dc2936ef76a8..f1ae58408da5 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -44,13 +44,26 @@ test)
     bash .kokoro/coerce_logs.sh
     ;;
 lint)
-    mvn com.coveo:fmt-maven-plugin:check
+    mvn \
+      -Penable-samples \
+      com.coveo:fmt-maven-plugin:check
     ;;
 javadoc)
     mvn javadoc:javadoc javadoc:test-javadoc
     ;;
 integration)
     mvn -B ${INTEGRATION_TEST_ARGS} \
+      -Penable-integration-tests \
+      -DtrimStackTrace=false \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -fae \
+      verify
+    bash .kokoro/coerce_logs.sh
+    ;;
+samples)
+    mvn -B \
+      -Penable-samples \
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
       -Denforcer.skip=true \
diff --git a/.kokoro/continuous/samples.cfg b/.kokoro/continuous/samples.cfg
new file mode 100644
index 000000000000..fa7b493d0b5c
--- /dev/null
+++ b/.kokoro/continuous/samples.cfg
@@ -0,0 +1,31 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "samples"
+}
+
+env_vars: {
+    key: "GCLOUD_PROJECT"
+    value: "gcloud-devel"
+}
+
+env_vars: {
+    key: "GOOGLE_APPLICATION_CREDENTIALS"
+    value: "keystore/73713_java_it_service_account"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "java_it_service_account"
+    }
+  }
+}
diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
index 1e6f41a515b9..9236dbd2263a 100755
--- a/.kokoro/linkage-monitor.sh
+++ b/.kokoro/linkage-monitor.sh
@@ -23,7 +23,12 @@ cd github/java-datastore/
 java -version
 echo ${JOB_TYPE}
 
-mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true \
+  -Denforcer.skip=true \
+  -Dmaven.javadoc.skip=true \
+  -Dgcloud.download.skip=true
 
 # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
 JAR=linkage-monitor-latest-all-deps.jar
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
new file mode 100644
index 000000000000..9a9102490d54
--- /dev/null
+++ b/.kokoro/nightly/samples.cfg
@@ -0,0 +1,31 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+    key: "JOB_TYPE"
+    value: "samples"
+}
+
+env_vars: {
+    key: "GCLOUD_PROJECT"
+    value: "gcloud-devel"
+}
+
+env_vars: {
+    key: "GOOGLE_APPLICATION_CREDENTIALS"
+    value: "keystore/73713_java_it_service_account"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "java_it_service_account"
+    }
+  }
+}
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
new file mode 100644
index 000000000000..fa7b493d0b5c
--- /dev/null
+++ b/.kokoro/presubmit/samples.cfg
@@ -0,0 +1,31 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "samples"
+}
+
+env_vars: {
+    key: "GCLOUD_PROJECT"
+    value: "gcloud-devel"
+}
+
+env_vars: {
+    key: "GOOGLE_APPLICATION_CREDENTIALS"
+    value: "keystore/73713_java_it_service_account"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "java_it_service_account"
+    }
+  }
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ebbb59e5310f..085021ddec26 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,4 +25,106 @@ information on using pull requests.
 ## Community Guidelines
 
 This project follows
-[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
\ No newline at end of file
+[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
+
+## Building the project
+
+To build, package, and run all unit tests run the command
+
+```
+mvn clean verify
+```
+
+### Running Integration tests
+
+To include integration tests when building the project, you need access to
+a GCP Project with a valid service account. 
+
+For instructions on how to generate a service account and corresponding
+credentials JSON see: [Creating a Service Account][1].
+
+Then run the following to build, package, run all unit tests and run all
+integration tests.
+
+```bash
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
+mvn -Penable-integration-tests clean verify
+```
+
+## Code Samples
+
+Code Samples must be bundled in separate Maven modules, and guarded by a
+Maven profile with the name `enable-samples`.
+
+The samples must be separate from the primary project for a few reasons:
+1. Primary projects have a minimum Java version of Java 7 whereas samples have
+   a minimum Java version of Java 8. Due to this we need the ability to
+   selectively exclude samples from a build run.
+2. Many code samples depend on external GCP services and need
+   credentials to access the service.
+3. Code samples are not released as Maven artifacts and must be excluded from 
+   release builds.
+   
+### Building
+
+```bash
+mvn -Penable-samples clean verify
+```
+
+Some samples require access to GCP services and require a service account:
+
+```bash
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
+mvn -Penable-samples clean verify
+```
+
+### Profile Config
+
+1. To add samples in a profile to your Maven project, add the following to your
+`pom.xml`
+
+    ```xml
+    
+      [...]
+      
+        
+          enable-samples
+          
+            sample
+          
+        
+      
+      [...]
+    
+    ```
+
+2. [Activate](#profile-activation) the profile.
+3. Define your samples in a normal Maven project in the `samples/` directory
+
+### Profile Activation
+
+To include code samples when building and testing the project, enable the 
+`enable-samples` Maven profile.
+
+#### Command line
+
+To activate the Maven profile on the command line add `-Penable-samples` to your
+Maven command.
+
+#### Maven `settings.xml`
+
+To activate the Maven profile in your `~/.m2/settings.xml` add an entry of
+`enable-samples` following the instructions in [Active Profiles][2].
+
+This method has the benefit of applying to all projects you build (and is
+respected by IntelliJ IDEA) and is recommended if you are going to be
+contributing samples to several projects.
+
+#### IntelliJ IDEA
+
+To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in
+[Activate Maven profiles][3] to activate `enable-samples`.
+
+[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account
+[2]: https://maven.apache.org/settings.html#Active_Profiles
+[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles
diff --git a/renovate.json b/renovate.json
index f3a70c9703f1..268a4669abfd 100644
--- a/renovate.json
+++ b/renovate.json
@@ -22,7 +22,8 @@
         "^com.google.api:gax",
         "^com.google.auth:",
         "^com.google.cloud:google-cloud-core",
-        "^io.grpc:"
+        "^io.grpc:",
+        "^com.google.guava:"
       ],
       "groupName": "core dependencies"
     },
@@ -58,6 +59,12 @@
         "^com.google.cloud:google-cloud-"
       ],
       "ignoreUnstable": false
+    },
+    {
+      "packagePatterns": [
+        "^com.fasterxml.jackson.core"
+      ],
+      "groupName": "jackson dependencies"
     }
   ],
   "semanticCommits": true
diff --git a/synth.metadata b/synth.metadata
index 07b506c21867..e16c71809601 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,26 +1,41 @@
 {
-  "updateTime": "2019-12-19T21:54:58.736595Z",
+  "updateTime": "2020-02-12T22:45:55.754728Z",
   "sources": [
+    {
+      "git": {
+        "name": ".",
+        "remote": "https://github.com/googleapis/java-datastore.git",
+        "sha": "a84672396fe91cc455d734c9420b332c3d544635"
+      }
+    },
+    {
+      "git": {
+        "name": "synthtool",
+        "remote": "rpc://devrel/cloud/libraries/tools/autosynth",
+        "sha": "dd7cd93888cbeb1d4c56a1ca814491c7813160e8"
+      }
+    },
     {
       "generator": {
         "name": "artman",
-        "version": "0.42.3",
-        "dockerImage": "googleapis/artman@sha256:feed210b5723c6f524b52ef6d7740a030f2d1a8f7c29a71c5e5b4481ceaad7f5"
+        "version": "0.45.0",
+        "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "0ca305403dcc50e31ad9477c9b6241ddfd2056af",
-        "internalRef": "286439553"
+        "sha": "2c17ac33b226194041155bb5340c3f34733f1b3a",
+        "internalRef": "294734008",
+        "log": "2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\ne7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\nb5cbe4a4ba64ab19e6627573ff52057a1657773d\nSecurityCenter v1p1beta1: move file-level option on top to workaround protobuf.js bug.\n\nPiperOrigin-RevId: 292647187\n\nb224b317bf20c6a4fbc5030b4a969c3147f27ad3\nAdds API definitions for bigqueryreservation v1beta1.\n\nPiperOrigin-RevId: 292634722\n\nc1468702f9b17e20dd59007c0804a089b83197d2\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 292626173\n\nffdfa4f55ab2f0afc11d0eb68f125ccbd5e404bd\nvision: v1p3beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605599\n\n78f61482cd028fc1d9892aa5d89d768666a954cd\nvision: v1p1beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605125\n\n60bb5a294a604fd1778c7ec87b265d13a7106171\nvision: v1p2beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604980\n\n3bcf7aa79d45eb9ec29ab9036e9359ea325a7fc3\nvision: v1p4beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604656\n\n2717b8a1c762b26911b45ecc2e4ee01d98401b28\nFix dataproc artman client library generation.\n\nPiperOrigin-RevId: 292555664\n\n7ac66d9be8a7d7de4f13566d8663978c9ee9dcd7\nAdd Dataproc Autoscaling API to V1.\n\nPiperOrigin-RevId: 292450564\n\n5d932b2c1be3a6ef487d094e3cf5c0673d0241dd\n- Improve documentation\n- Add a client_id field to StreamingPullRequest\n\nPiperOrigin-RevId: 292434036\n\neaff9fa8edec3e914995ce832b087039c5417ea7\nmonitoring: v3 publish annotations and client retry config\n\nPiperOrigin-RevId: 292425288\n\n70958bab8c5353870d31a23fb2c40305b050d3fe\nBigQuery Storage Read API v1 clients.\n\nPiperOrigin-RevId: 292407644\n\n7a15e7fe78ff4b6d5c9606a3264559e5bde341d1\nUpdate backend proto for Google Cloud Endpoints\n\nPiperOrigin-RevId: 292391607\n\n3ca2c014e24eb5111c8e7248b1e1eb833977c83d\nbazel: Add --flaky_test_attempts=3 argument to prevent CI failures caused by flaky tests\n\nPiperOrigin-RevId: 292382559\n\n9933347c1f677e81e19a844c2ef95bfceaf694fe\nbazel:Integrate latest protoc-java-resource-names-plugin changes (fix for PyYAML dependency in bazel rules)\n\nPiperOrigin-RevId: 292376626\n\nb835ab9d2f62c88561392aa26074c0b849fb0bd3\nasset: v1p2beta1 add client config annotations\n\n* remove unintentionally exposed RPCs\n* remove messages relevant to removed RPCs\n\nPiperOrigin-RevId: 292369593\n\nc1246a29e22b0f98e800a536b5b0da2d933a55f2\nUpdating v1 protos with the latest inline documentation (in comments) and config options. Also adding a per-service .yaml file.\n\nPiperOrigin-RevId: 292310790\n\nb491d07cadaae7cde5608321f913e5ca1459b32d\nRevert accidental local_repository change\n\nPiperOrigin-RevId: 292245373\n\naf3400a8cb6110025198b59a0f7d018ae3cda700\nUpdate gapic-generator dependency (prebuilt PHP binary support).\n\nPiperOrigin-RevId: 292243997\n\n341fd5690fae36f36cf626ef048fbcf4bbe7cee6\ngrafeas: v1 add resource_definition for the grafeas.io/Project and change references for Project.\n\nPiperOrigin-RevId: 292221998\n\n42e915ec2ece1cd37a590fbcd10aa2c0fb0e5b06\nUpdate the gapic-generator, protoc-java-resource-name-plugin and protoc-docs-plugin to the latest commit.\n\nPiperOrigin-RevId: 292182368\n\nf035f47250675d31492a09f4a7586cfa395520a7\nFix grafeas build and update build.sh script to include gerafeas.\n\nPiperOrigin-RevId: 292168753\n\n26ccb214b7bc4a716032a6266bcb0a9ca55d6dbb\nasset: v1p1beta1 add client config annotations and retry config\n\nPiperOrigin-RevId: 292154210\n\n974ee5c0b5d03e81a50dafcedf41e0efebb5b749\nasset: v1beta1 add client config annotations\n\nPiperOrigin-RevId: 292152573\n\ncf3b61102ed5f36b827bc82ec39be09525f018c8\n  Fix to protos for v1p1beta1 release of Cloud Security Command Center\n\nPiperOrigin-RevId: 292034635\n\n4e1cfaa7c0fede9e65d64213ca3da1b1255816c0\nUpdate the public proto to support UTF-8 encoded id for CatalogService API, increase the ListCatalogItems deadline to 300s and some minor documentation change\n\nPiperOrigin-RevId: 292030970\n\n9c483584f8fd5a1b862ae07973f4cc7bb3e46648\nasset: add annotations to v1p1beta1\n\nPiperOrigin-RevId: 292009868\n\ne19209fac29731d0baf6d9ac23da1164f7bdca24\nAdd the google.rpc.context.AttributeContext message to the open source\ndirectories.\n\nPiperOrigin-RevId: 291999930\n\nae5662960573f279502bf98a108a35ba1175e782\noslogin API: move file level option on top of the file to avoid protobuf.js bug.\n\nPiperOrigin-RevId: 291990506\n\neba3897fff7c49ed85d3c47fc96fe96e47f6f684\nAdd cc_proto_library and cc_grpc_library targets for Spanner and IAM protos.\n\nPiperOrigin-RevId: 291988651\n\n8e981acfd9b97ea2f312f11bbaa7b6c16e412dea\nBeta launch for PersonDetection and FaceDetection features.\n\nPiperOrigin-RevId: 291821782\n\n994e067fae3b21e195f7da932b08fff806d70b5d\nasset: add annotations to v1p2beta1\n\nPiperOrigin-RevId: 291815259\n\n244e1d2c89346ca2e0701b39e65552330d68545a\nAdd Playable Locations service\n\nPiperOrigin-RevId: 291806349\n\n909f8f67963daf45dd88d020877fb9029b76788d\nasset: add annotations to v1beta2\n\nPiperOrigin-RevId: 291805301\n\n3c39a1d6e23c1ef63c7fba4019c25e76c40dfe19\nKMS: add file-level message for CryptoKeyPath, it is defined in gapic yaml but not\nin proto files.\n\nPiperOrigin-RevId: 291420695\n\nc6f3f350b8387f8d1b85ed4506f30187ebaaddc3\ncontaineranalysis: update v1beta1 and bazel build with annotations\n\nPiperOrigin-RevId: 291401900\n\n92887d74b44e4e636252b7b8477d0d2570cd82db\nfix: fix the location of grpc config file.\n\nPiperOrigin-RevId: 291396015\n\ne26cab8afd19d396b929039dac5d874cf0b5336c\nexpr: add default_host and method_signature annotations to CelService\n\nPiperOrigin-RevId: 291240093\n\n06093ae3952441c34ec176d1f7431b8765cec0be\nirm: fix v1alpha2 bazel build by adding missing proto imports\n\nPiperOrigin-RevId: 291227940\n\na8a2514af326e4673063f9a3c9d0ef1091c87e6c\nAdd proto annotation for cloud/irm API\n\nPiperOrigin-RevId: 291217859\n\n8d16f76de065f530d395a4c7eabbf766d6a120fd\nGenerate Memcache v1beta2 API protos and gRPC ServiceConfig files\n\nPiperOrigin-RevId: 291008516\n\n3af1dabd93df9a9f17bf3624d3b875c11235360b\ngrafeas: Add containeranalysis default_host to Grafeas service\n\nPiperOrigin-RevId: 290965849\n\nbe2663fa95e31cba67d0cd62611a6674db9f74b7\nfix(google/maps/roads): add missing opening bracket\n\nPiperOrigin-RevId: 290964086\n\nfacc26550a0af0696e0534bc9cae9df14275aa7c\nUpdating v2 protos with the latest inline documentation (in comments) and adding a per-service .yaml file.\n\nPiperOrigin-RevId: 290952261\n\ncda99c1f7dc5e4ca9b1caeae1dc330838cbc1461\nChange api_name to 'asset' for v1p1beta1\n\nPiperOrigin-RevId: 290800639\n\n94e9e90c303a820ce40643d9129e7f0d2054e8a1\nAdds Google Maps Road service\n\nPiperOrigin-RevId: 290795667\n\na3b23dcb2eaecce98c600c7d009451bdec52dbda\nrpc: new message ErrorInfo, other comment updates\n\nPiperOrigin-RevId: 290781668\n\n26420ef4e46c37f193c0fbe53d6ebac481de460e\nAdd proto definition for Org Policy v1.\n\nPiperOrigin-RevId: 290771923\n\n7f0dab8177cf371ae019a082e2512de7ac102888\nPublish Routes Preferred API v1 service definitions.\n\nPiperOrigin-RevId: 290326986\n\nad6e508d0728e1d1bca6e3f328cd562718cb772d\nFix: Qualify resource type references with \"jobs.googleapis.com/\"\n\nPiperOrigin-RevId: 290285762\n\n58e770d568a2b78168ddc19a874178fee8265a9d\ncts client library\n\nPiperOrigin-RevId: 290146169\n\naf9daa4c3b4c4a8b7133b81588dd9ffd37270af2\nAdd more programming language options to public proto\n\nPiperOrigin-RevId: 290144091\n\nd9f2bbf2df301ef84641d4cec7c828736a0bd907\ntalent: add missing resource.proto dep to Bazel build target\n\nPiperOrigin-RevId: 290143164\n\n3b3968237451d027b42471cd28884a5a1faed6c7\nAnnotate Talent API.\nAdd gRPC service config for retry.\nUpdate bazel file with google.api.resource dependency.\n\nPiperOrigin-RevId: 290125172\n\n0735b4b096872960568d1f366bfa75b7b0e1f1a3\nWeekly library update.\n\nPiperOrigin-RevId: 289939042\n\n8760d3d9a4543d7f9c0d1c7870aca08b116e4095\nWeekly library update.\n\nPiperOrigin-RevId: 289939020\n\n8607df842f782a901805187e02fff598145b0b0e\nChange Talent API timeout to 30s.\n\nPiperOrigin-RevId: 289912621\n\n908155991fe32570653bcb72ecfdcfc896642f41\nAdd Recommendations AI V1Beta1\n\nPiperOrigin-RevId: 289901914\n\n5c9a8c2bebd8b71aa66d1cc473edfaac837a2c78\nAdding no-arg method signatures for ListBillingAccounts and ListServices\n\nPiperOrigin-RevId: 289891136\n\n50b0e8286ac988b0593bd890eb31fef6ea2f5767\nlongrunning: add grpc service config and default_host annotation to operations.proto\n\nPiperOrigin-RevId: 289876944\n\n6cac27dabe51c54807b0401698c32d34998948a9\n  Updating default deadline for Cloud Security Command Center's v1 APIs.\n\nPiperOrigin-RevId: 289875412\n\nd99df0d67057a233c711187e0689baa4f8e6333d\nFix: Correct spelling in C# namespace option\n\nPiperOrigin-RevId: 289709813\n\n2fa8d48165cc48e35b0c62e6f7bdade12229326c\nfeat: Publish Recommender v1 to GitHub.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289619243\n\n9118db63d1ab493a2e44a3b4973fde810a835c49\nfirestore: don't retry reads that fail with Aborted\n\nFor transaction reads that fail with ABORTED, we need to rollback and start a new transaction. Our current configuration makes it so that GAPIC retries ABORTED reads multiple times without making any progress. Instead, we should retry at the transaction level.\n\nPiperOrigin-RevId: 289532382\n\n1dbfd3fe4330790b1e99c0bb20beb692f1e20b8a\nFix bazel build\nAdd other langauges (Java was already there) for bigquery/storage/v1alpha2 api.\n\nPiperOrigin-RevId: 289519766\n\nc06599cdd7d11f8d3fd25f8d3249e5bb1a3d5d73\nInitial commit of google.cloud.policytroubleshooter API, The API helps in troubleshooting GCP policies. Refer https://cloud.google.com/iam/docs/troubleshooting-access for more information\n\nPiperOrigin-RevId: 289491444\n\nfce7d80fa16ea241e87f7bc33d68595422e94ecd\nDo not pass samples option for Artman config of recommender v1 API.\n\nPiperOrigin-RevId: 289477403\n\nef179e8c61436297e6bb124352e47e45c8c80cb1\nfix: Address missing Bazel dependency.\n\nBazel builds stopped working in 06ec6d5 because\nthe google/longrunning/operations.proto file took\nan import from google/api/client.proto, but that\nimport was not added to BUILD.bazel.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289446074\n\n8841655b242c84fd691d77d7bcf21b61044f01ff\nMigrate Data Labeling v1beta1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289446026\n\n06ec6d5d053fff299eaa6eaa38afdd36c5e2fc68\nAdd annotations to google.longrunning.v1\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289413169\n\n0480cf40be1d3cc231f4268a2fdb36a8dd60e641\nMigrate IAM Admin v1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289411084\n\n1017173e9adeb858587639af61889ad970c728b1\nSpecify a C# namespace for BigQuery Connection v1beta1\n\nPiperOrigin-RevId: 289396763\n\nb08714b378e8e5b0c4ecdde73f92c36d6303b4b6\nfix: Integrate latest proto-docs-plugin fix.\nFixes dialogflow v2\n\nPiperOrigin-RevId: 289189004\n\n51217a67e79255ee1f2e70a6a3919df082513327\nCreate BUILD file for recommender v1\n\nPiperOrigin-RevId: 289183234\n\nacacd87263c0a60e458561b8b8ce9f67c760552a\nGenerate recommender v1 API protos and gRPC ServiceConfig files\n\nPiperOrigin-RevId: 289177510\n\n9d2f7133b97720b1fa3601f6dcd30760ba6d8a1e\nFix kokoro build script\n\nPiperOrigin-RevId: 289166315\n\nc43a67530d2a47a0220cad20ca8de39b3fbaf2c5\ncloudtasks: replace missing RPC timeout config for v2beta2 and v2beta3\n\nPiperOrigin-RevId: 289162391\n\n4cefc229a9197236fc0adf02d69b71c0c5cf59de\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 289158456\n\n56f263fe959c50786dab42e3c61402d32d1417bd\nCatalog API: Adding config necessary to build client libraries\n\nPiperOrigin-RevId: 289149879\n\n4543762b23a57fc3c53d409efc3a9affd47b6ab3\nFix Bazel build\nbilling/v1 and dialogflow/v2 remain broken (not bazel-related issues).\nBilling has wrong configuration, dialogflow failure is caused by a bug in documentation plugin.\n\nPiperOrigin-RevId: 289140194\n\nc9dce519127b97e866ca133a01157f4ce27dcceb\nUpdate Bigtable docs\n\nPiperOrigin-RevId: 289114419\n\n802c5c5f2bf94c3facb011267d04e71942e0d09f\nMigrate DLP to proto annotations (but not GAPIC v2).\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289102579\n\n6357f30f2ec3cff1d8239d18b707ff9d438ea5da\nRemove gRPC configuration file that was in the wrong place.\n\nPiperOrigin-RevId: 289096111\n\n360a8792ed62f944109d7e22d613a04a010665b4\n  Protos for v1p1beta1 release of Cloud Security Command Center\n\nPiperOrigin-RevId: 289011995\n\na79211c20c4f2807eec524d00123bf7c06ad3d6e\nRoll back containeranalysis v1 to GAPIC v1.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288999068\n\n9e60345ba603e03484a8aaa33ce5ffa19c1c652b\nPublish Routes Preferred API v1 proto definitions.\n\nPiperOrigin-RevId: 288941399\n\nd52885b642ad2aa1f42b132ee62dbf49a73e1e24\nMigrate the service management API to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288909426\n\n6ace586805c08896fef43e28a261337fcf3f022b\ncloudtasks: replace missing RPC timeout config\n\nPiperOrigin-RevId: 288783603\n\n51d906cabee4876b12497054b15b05d4a50ad027\nImport of Grafeas from Github.\n\nUpdate BUILD.bazel accordingly.\n\nPiperOrigin-RevId: 288783426\n\n5ef42bcd363ba0440f0ee65b3c80b499e9067ede\nMigrate Recommender v1beta1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288713066\n\n94f986afd365b7d7e132315ddcd43d7af0e652fb\nMigrate Container Analysis v1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288708382\n\n7a751a279184970d3b6ba90e4dd4d22a382a0747\nRemove Container Analysis v1alpha1 (nobody publishes it).\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288707473\n\n3c0d9c71242e70474b2b640e15bb0a435fd06ff0\nRemove specious annotation from BigQuery Data Transfer before\nanyone accidentally does anything that uses it.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288701604\n\n1af307a4764bd415ef942ac5187fa1def043006f\nMigrate BigQuery Connection to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288698681\n\n08b488e0660c59842a7dee0e3e2b65d9e3a514a9\nExposing cloud_catalog.proto (This API is already available through REST)\n\nPiperOrigin-RevId: 288625007\n\na613482977e11ac09fa47687a5d1b5a01efcf794\nUpdate the OS Login v1beta API description to render better in the UI.\n\nPiperOrigin-RevId: 288547940\n\n5e182b8d9943f1b17008d69d4c7e865dc83641a7\nUpdate the OS Login API description to render better in the UI.\n\nPiperOrigin-RevId: 288546443\n\ncb79155f596e0396dd900da93872be7066f6340d\nFix: Add a resource annotation for Agent\nFix: Correct the service name in annotations for Intent and SessionEntityType\n\nPiperOrigin-RevId: 288441307\n\nf7f6e9daec3315fd47cb638789bd8415bf4a27cc\nAdded cloud asset api v1p1beta1\n\nPiperOrigin-RevId: 288427239\n\nf2880f5b342c6345f3dcaad24fcb3c6ca9483654\nBilling account API: Adding config necessary to build client libraries\n\nPiperOrigin-RevId: 288351810\n\ndc250ffe071729f8f8bef9d6fd0fbbeb0254c666\nFix: Remove incorrect resource annotations in requests\n\nPiperOrigin-RevId: 288321208\n\n91ef2d9dd69807b0b79555f22566fb2d81e49ff9\nAdd GAPIC annotations to Cloud KMS (but do not migrate the GAPIC config yet).\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 287999179\n\n4d45a6399e9444fbddaeb1c86aabfde210723714\nRefreshing Cloud Billing API protos.\n\nThis exposes the following API methods:\n- UpdateBillingAccount\n- CreateBillingAccount\n- GetIamPolicy\n- SetIamPolicy\n- TestIamPermissions\n\nThere are also some new fields to support the management of sub-accounts.\n\nPiperOrigin-RevId: 287908369\n\nec285d3d230810147ebbf8d5b691ee90320c6d2d\nHide not yet implemented update_transforms message\n\nPiperOrigin-RevId: 287608953\n\na202fb3b91cd0e4231be878b0348afd17067cbe2\nBigQuery Storage Write API v1alpha2 clients. The service is enabled by whitelist only.\n\nPiperOrigin-RevId: 287379998\n\n650d7f1f8adb0cfaf37b3ce2241c3168f24efd4d\nUpdate Readme.md to match latest Bazel updates\n090d98aea20270e3be4b64240775588f7ce50ff8\ndocs(bigtable): Fix library release level listed in generated documentation\n\nPiperOrigin-RevId: 287308849\n\n2c28f646ca77b1d57550368be22aa388adde2e66\nfirestore: retry reads that fail with contention\n\nPiperOrigin-RevId: 287250665\n\nfd3091fbe9b2083cabc53dc50c78035658bfc4eb\nSync timeout in grpc config back to 10s for tasks API with github googelapis gapic config.\n\nPiperOrigin-RevId: 287207067\n\n49dd7d856a6f77c0cf7e5cb3334423e5089a9e8a\nbazel: Integrate bazel-2.0.0 compatibility fixes\n\nPiperOrigin-RevId: 287205644\n\n46e52fd64973e815cae61e78b14608fe7aa7b1df\nbazel: Integrate bazel build file generator\n\nTo generate/update BUILD.bazel files for any particular client or a batch of clients:\n```\nbazel run //:build_gen -- --src=google/example/library\n```\n\nPiperOrigin-RevId: 286958627\n\n1a380ea21dea9b6ac6ad28c60ad96d9d73574e19\nBigQuery Storage Read API v1beta2 clients.\n\nPiperOrigin-RevId: 286616241\n\n5f3f1d0f1c06b6475a17d995e4f7a436ca67ec9e\nAdd Artman config for secretmanager.\n\nPiperOrigin-RevId: 286598440\n\n50af0530730348f1e3697bf3c70261f7daaf2981\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 286491002\n\n91818800384f4ed26961aea268910b1a2ec58cc8\nFor Data Catalog API,\n1. Add support for marking a tag template field as required when creating a new tag template.\n2. Add support for updating a tag template field from required to optional.\n\nPiperOrigin-RevId: 286490262\n\nff4a2047b3d66f38c9b22197c370ed0d02fc0238\nWeekly library update.\n\nPiperOrigin-RevId: 286484215\n\n192c14029861752a911ed434fd6ee5b850517cd9\nWeekly library update.\n\nPiperOrigin-RevId: 286484165\n\nd9e328eaf790d4e4346fbbf32858160f497a03e0\nFix bazel build (versions 1.x)\n\nBump gapic-generator and resource names plugins to the latest version.\n\nPiperOrigin-RevId: 286469287\n\n"
       }
     },
     {
       "template": {
         "name": "java_library",
         "origin": "synthtool.gcp",
-        "version": "2019.10.17"
+        "version": "2020.2.4"
       }
     }
   ],

From 8b9299843688e92f4266775c81e076d698504832 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2020 14:00:59 -0500
Subject: [PATCH 0285/1784] chore: release 1.101.2 (#43)

---
 CHANGELOG.md                            | 7 +++++++
 README.md                               | 6 +++---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a88efa97c1f..563cf22a7987 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.101.2](https://www.github.com/googleapis/java-datastore/compare/v1.101.1...v1.101.2) (2020-02-13)
+
+
+### Bug Fixes
+
+* bom version tag miss configured ([#42](https://www.github.com/googleapis/java-datastore/issues/42)) ([6af084f](https://www.github.com/googleapis/java-datastore/commit/6af084face9afa7ee1fa8dec2a96419e7f4db706))
+
 ### [1.101.1](https://www.github.com/googleapis/java-datastore/compare/1.101.0...v1.101.1) (2020-02-11)
 
 
diff --git a/README.md b/README.md
index a2be7310fac5..b4720be4a986 100644
--- a/README.md
+++ b/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.102.1
+  1.102.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.102.1'
+compile 'com.google.cloud:google-cloud-datastore:1.102.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.2"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 9691a1c65ea6..5c758b63e254 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
-  1.102.2-SNAPSHOT
+  1.102.2
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.2-SNAPSHOT
+        0.85.2
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.2-SNAPSHOT
+        1.102.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a980541bb8be..72a38fad1a2a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.2-SNAPSHOT
+  1.102.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.2-SNAPSHOT
+    1.102.2
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 1342928d633f..933685c783e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.2-SNAPSHOT
+  1.102.2
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.2-SNAPSHOT
+        0.85.2
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a800e11c0343..b48bf5f2a9d1 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.85.2-SNAPSHOT
+  0.85.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.2-SNAPSHOT
+    1.102.2
   
   
     
diff --git a/versions.txt b/versions.txt
index e572e5a1045b..6e77bc51756e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.1:1.102.2-SNAPSHOT
-google-cloud-datastore-bom:1.102.1:1.102.2-SNAPSHOT
-google-cloud-datastore-parent:1.102.1:1.102.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.85.1:0.85.2-SNAPSHOT
+google-cloud-datastore:1.102.2:1.102.2
+google-cloud-datastore-bom:1.102.2:1.102.2
+google-cloud-datastore-parent:1.102.2:1.102.2
+proto-google-cloud-datastore-v1:0.85.2:0.85.2
 

From 3035ef2b6bf659bc847c4cf0a963a1f3badd68c7 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 14 Feb 2020 23:11:21 +0530
Subject: [PATCH 0286/1784] fix: flakey ITDatastoreTest#testSkippedResults
 (#46)

Fixes #18
---
 .../java/com/google/cloud/datastore/it/ITDatastoreTest.java    | 3 +++
 1 file changed, 3 insertions(+)

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 e65e99d6b399..af1848ad1377 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
@@ -462,6 +462,7 @@ public void testRunGqlQueryNoCasting() throws InterruptedException {
     assertEquals(KEY1, projectionEntity.getKey());
     assertTrue(projectionEntity.getNames().isEmpty());
     assertFalse(keyProjectionResult.hasNext());
+    DATASTORE.delete(ENTITY3.getKey());
   }
 
   @Test
@@ -663,6 +664,7 @@ public void testGetArrayNoDeferredResults() {
       // expected - no such property
     }
     assertFalse(result.hasNext());
+    DATASTORE.delete(ENTITY3.getKey());
   }
 
   @Test
@@ -712,6 +714,7 @@ public void testUpdate() {
     assertNotEquals(ENTITY3, entity3);
     DATASTORE.update(entity3);
     assertEquals(entity3, DATASTORE.get(ENTITY3.getKey()));
+    DATASTORE.delete(ENTITY3.getKey());
   }
 
   @Test

From 42e7e6349ac9a6ae9134f2bd1149a50f498a917e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 14 Feb 2020 18:46:26 +0100
Subject: [PATCH 0287/1784] deps: update core transport dependencies to v1.34.2
 (#44)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 933685c783e9..b3df5dc7cac9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,12 +241,12 @@
       
         com.google.http-client
         google-http-client
-        1.34.1
+        1.34.2
       
       
         com.google.http-client
         google-http-client-jackson2
-        1.34.1
+        1.34.2
       
       
         com.google.oauth-client

From ef6ca5bb0dc7311253980d5bbef2d88a510d85cc Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 14 Feb 2020 18:46:55 +0100
Subject: [PATCH 0288/1784] deps: update dependency io.grpc:grpc-bom to v1.27.1
 (#45)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b3df5dc7cac9..e0bf77a179a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
     1.8.1
     1.17.0
     1.53.1
-    1.27.0
+    1.27.1
     3.11.3
     4.13
     28.2-android

From f78d0bda15cce4e9639c582beab45a58d19d2a38 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 18 Feb 2020 20:37:03 +0100
Subject: [PATCH 0289/1784] deps: update dependency
 com.google.protobuf:protobuf-java to v3.11.4 (#48)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e0bf77a179a6..37d30add02ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
     1.17.0
     1.53.1
     1.27.1
-    3.11.3
+    3.11.4
     4.13
     28.2-android
     1.4.1

From 2096777ce8ff19da16c40d77c8c5e87d64c4f898 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 18 Feb 2020 14:57:43 -0500
Subject: [PATCH 0290/1784] chore: release 1.101.3-SNAPSHOT (#47)

---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5c758b63e254..d0d726e7e1e9 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
-  1.102.2
+  1.102.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.2
+        0.85.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.2
+        1.102.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 72a38fad1a2a..6e3f56d492c1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.2
+  1.102.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.2
+    1.102.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 37d30add02ea..db8e0d97895d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.2
+  1.102.3-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.2
+        0.85.3-SNAPSHOT
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b48bf5f2a9d1..16fdbfddefa3 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.85.2
+  0.85.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.2
+    1.102.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 6e77bc51756e..be22dd927718 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.2:1.102.2
-google-cloud-datastore-bom:1.102.2:1.102.2
-google-cloud-datastore-parent:1.102.2:1.102.2
-proto-google-cloud-datastore-v1:0.85.2:0.85.2
+google-cloud-datastore:1.102.2:1.102.3-SNAPSHOT
+google-cloud-datastore-bom:1.102.2:1.102.3-SNAPSHOT
+google-cloud-datastore-parent:1.102.2:1.102.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.85.2:0.85.3-SNAPSHOT
 

From bb0b279d58625e3d5f1a0dd55af7e2c31ed8e4e3 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 21 Feb 2020 15:40:02 -0800
Subject: [PATCH 0291/1784] chore: update common templates

---
 .kokoro/build.sh | 23 +++++++++++++++--------
 renovate.json    |  7 +++++++
 synth.metadata   | 34 +++++++++++++++++-----------------
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index f1ae58408da5..d11958c5a67e 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -62,14 +62,21 @@ integration)
     bash .kokoro/coerce_logs.sh
     ;;
 samples)
-    mvn -B \
-      -Penable-samples \
-      -DtrimStackTrace=false \
-      -Dclirr.skip=true \
-      -Denforcer.skip=true \
-      -fae \
-      verify
-    bash .kokoro/coerce_logs.sh
+    if [[ -f samples/pom.xml ]]
+    then
+        pushd samples
+        mvn -B \
+          -Penable-samples \
+          -DtrimStackTrace=false \
+          -Dclirr.skip=true \
+          -Denforcer.skip=true \
+          -fae \
+          verify
+        bash .kokoro/coerce_logs.sh
+        popd
+    else
+        echo "no sample pom.xml found - skipping sample tests"
+    fi
     ;;
 clirr)
     mvn -B -Denforcer.skip=true clirr:check
diff --git a/renovate.json b/renovate.json
index 268a4669abfd..fc6412701ada 100644
--- a/renovate.json
+++ b/renovate.json
@@ -54,6 +54,13 @@
       "semanticCommitType": "build",
       "semanticCommitScope": "deps"
     },
+    {
+      "packagePatterns": [
+        "^com.google.cloud:libraries-bom"
+      ],
+      "semanticCommitType": "chore",
+      "semanticCommitScope": "deps"
+    },
     {
       "packagePatterns": [
         "^com.google.cloud:google-cloud-"
diff --git a/synth.metadata b/synth.metadata
index e16c71809601..456d76695932 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,34 +1,34 @@
 {
-  "updateTime": "2020-02-12T22:45:55.754728Z",
+  "updateTime": "2020-02-21T22:46:51.888826Z",
   "sources": [
     {
-      "git": {
-        "name": ".",
-        "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a84672396fe91cc455d734c9420b332c3d544635"
+      "generator": {
+        "name": "artman",
+        "version": "0.45.0",
+        "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b"
       }
     },
     {
       "git": {
-        "name": "synthtool",
-        "remote": "rpc://devrel/cloud/libraries/tools/autosynth",
-        "sha": "dd7cd93888cbeb1d4c56a1ca814491c7813160e8"
+        "name": ".",
+        "remote": "https://github.com/googleapis/java-datastore.git",
+        "sha": "2096777ce8ff19da16c40d77c8c5e87d64c4f898"
       }
     },
     {
-      "generator": {
-        "name": "artman",
-        "version": "0.45.0",
-        "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b"
+      "git": {
+        "name": "googleapis",
+        "remote": "https://github.com/googleapis/googleapis.git",
+        "sha": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2",
+        "internalRef": "296451205",
+        "log": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\nUpdate Dataproc v1beta2 client.\n\nPiperOrigin-RevId: 296451205\n\nde287524405a3dce124d301634731584fc0432d7\nFix: Reinstate method signatures that had been missed off some RPCs\nFix: Correct resource types for two fields\n\nPiperOrigin-RevId: 296435091\n\ne5bc9566ae057fb4c92f8b7e047f1c8958235b53\nDeprecate the endpoint_uris field, as it is unused.\n\nPiperOrigin-RevId: 296357191\n\n8c12e2b4dca94e12bff9f538bdac29524ff7ef7a\nUpdate Dataproc v1 client.\n\nPiperOrigin-RevId: 296336662\n\n17567c4a1ef0a9b50faa87024d66f8acbb561089\nRemoving erroneous comment, a la https://github.com/googleapis/java-speech/pull/103\n\nPiperOrigin-RevId: 296332968\n\n3eaaaf8626ce5b0c0bc7eee05e143beffa373b01\nAdd BUILD.bazel for v1 secretmanager.googleapis.com\n\nPiperOrigin-RevId: 296274723\n\ne76149c3d992337f85eeb45643106aacae7ede82\nMove securitycenter v1 to use generate from annotations.\n\nPiperOrigin-RevId: 296266862\n\n203740c78ac69ee07c3bf6be7408048751f618f8\nAdd StackdriverLoggingConfig field to Cloud Tasks v2 API.\n\nPiperOrigin-RevId: 296256388\n\ne4117d5e9ed8bbca28da4a60a94947ca51cb2083\nCreate a Bazel BUILD file for the google.actions.type export.\n\nPiperOrigin-RevId: 296212567\n\na9639a0a9854fd6e1be08bba1ac3897f4f16cb2f\nAdd secretmanager.googleapis.com v1 protos\n\nPiperOrigin-RevId: 295983266\n\nce4f4c21d9dd2bfab18873a80449b9d9851efde8\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295861722\n\ncb61d6c2d070b589980c779b68ffca617f789116\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295855449\n\nab2685d8d3a0e191dc8aef83df36773c07cb3d06\nfix: Dataproc v1 - AutoscalingPolicy annotation\n\nThis adds the second resource name pattern to the\nAutoscalingPolicy resource.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 295738415\n\n8a1020bf6828f6e3c84c3014f2c51cb62b739140\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295286165\n\n5cfa105206e77670369e4b2225597386aba32985\nAdd service control related proto build rule.\n\nPiperOrigin-RevId: 295262088\n\nee4dddf805072004ab19ac94df2ce669046eec26\nmonitoring v3: Add prefix \"https://cloud.google.com/\" into the link for global access\ncl 295167522, get ride of synth.py hacks\n\nPiperOrigin-RevId: 295238095\n\nd9835e922ea79eed8497db270d2f9f85099a519c\nUpdate some minor docs changes about user event proto\n\nPiperOrigin-RevId: 295185610\n\n5f311e416e69c170243de722023b22f3df89ec1c\nfix: use correct PHP package name in gapic configuration\n\nPiperOrigin-RevId: 295161330\n\n6cdd74dcdb071694da6a6b5a206e3a320b62dd11\npubsub: v1 add client config annotations and retry config\n\nPiperOrigin-RevId: 295158776\n\n5169f46d9f792e2934d9fa25c36d0515b4fd0024\nAdded cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295026522\n\n56b55aa8818cd0a532a7d779f6ef337ba809ccbd\nFix: Resource annotations for CreateTimeSeriesRequest and ListTimeSeriesRequest should refer to valid resources. TimeSeries is not a named resource.\n\nPiperOrigin-RevId: 294931650\n\n0646bc775203077226c2c34d3e4d50cc4ec53660\nRemove unnecessary languages from bigquery-related artman configuration files.\n\nPiperOrigin-RevId: 294809380\n\n8b78aa04382e3d4147112ad6d344666771bb1909\nUpdate backend.proto for schemes and protocol\n\nPiperOrigin-RevId: 294788800\n\n80b8f8b3de2359831295e24e5238641a38d8488f\nAdds artman config files for bigquerystorage endpoints v1beta2, v1alpha2, v1\n\nPiperOrigin-RevId: 294763931\n\n"
       }
     },
     {
       "git": {
-        "name": "googleapis",
-        "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "2c17ac33b226194041155bb5340c3f34733f1b3a",
-        "internalRef": "294734008",
-        "log": "2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\ne7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\nb5cbe4a4ba64ab19e6627573ff52057a1657773d\nSecurityCenter v1p1beta1: move file-level option on top to workaround protobuf.js bug.\n\nPiperOrigin-RevId: 292647187\n\nb224b317bf20c6a4fbc5030b4a969c3147f27ad3\nAdds API definitions for bigqueryreservation v1beta1.\n\nPiperOrigin-RevId: 292634722\n\nc1468702f9b17e20dd59007c0804a089b83197d2\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 292626173\n\nffdfa4f55ab2f0afc11d0eb68f125ccbd5e404bd\nvision: v1p3beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605599\n\n78f61482cd028fc1d9892aa5d89d768666a954cd\nvision: v1p1beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605125\n\n60bb5a294a604fd1778c7ec87b265d13a7106171\nvision: v1p2beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604980\n\n3bcf7aa79d45eb9ec29ab9036e9359ea325a7fc3\nvision: v1p4beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604656\n\n2717b8a1c762b26911b45ecc2e4ee01d98401b28\nFix dataproc artman client library generation.\n\nPiperOrigin-RevId: 292555664\n\n7ac66d9be8a7d7de4f13566d8663978c9ee9dcd7\nAdd Dataproc Autoscaling API to V1.\n\nPiperOrigin-RevId: 292450564\n\n5d932b2c1be3a6ef487d094e3cf5c0673d0241dd\n- Improve documentation\n- Add a client_id field to StreamingPullRequest\n\nPiperOrigin-RevId: 292434036\n\neaff9fa8edec3e914995ce832b087039c5417ea7\nmonitoring: v3 publish annotations and client retry config\n\nPiperOrigin-RevId: 292425288\n\n70958bab8c5353870d31a23fb2c40305b050d3fe\nBigQuery Storage Read API v1 clients.\n\nPiperOrigin-RevId: 292407644\n\n7a15e7fe78ff4b6d5c9606a3264559e5bde341d1\nUpdate backend proto for Google Cloud Endpoints\n\nPiperOrigin-RevId: 292391607\n\n3ca2c014e24eb5111c8e7248b1e1eb833977c83d\nbazel: Add --flaky_test_attempts=3 argument to prevent CI failures caused by flaky tests\n\nPiperOrigin-RevId: 292382559\n\n9933347c1f677e81e19a844c2ef95bfceaf694fe\nbazel:Integrate latest protoc-java-resource-names-plugin changes (fix for PyYAML dependency in bazel rules)\n\nPiperOrigin-RevId: 292376626\n\nb835ab9d2f62c88561392aa26074c0b849fb0bd3\nasset: v1p2beta1 add client config annotations\n\n* remove unintentionally exposed RPCs\n* remove messages relevant to removed RPCs\n\nPiperOrigin-RevId: 292369593\n\nc1246a29e22b0f98e800a536b5b0da2d933a55f2\nUpdating v1 protos with the latest inline documentation (in comments) and config options. Also adding a per-service .yaml file.\n\nPiperOrigin-RevId: 292310790\n\nb491d07cadaae7cde5608321f913e5ca1459b32d\nRevert accidental local_repository change\n\nPiperOrigin-RevId: 292245373\n\naf3400a8cb6110025198b59a0f7d018ae3cda700\nUpdate gapic-generator dependency (prebuilt PHP binary support).\n\nPiperOrigin-RevId: 292243997\n\n341fd5690fae36f36cf626ef048fbcf4bbe7cee6\ngrafeas: v1 add resource_definition for the grafeas.io/Project and change references for Project.\n\nPiperOrigin-RevId: 292221998\n\n42e915ec2ece1cd37a590fbcd10aa2c0fb0e5b06\nUpdate the gapic-generator, protoc-java-resource-name-plugin and protoc-docs-plugin to the latest commit.\n\nPiperOrigin-RevId: 292182368\n\nf035f47250675d31492a09f4a7586cfa395520a7\nFix grafeas build and update build.sh script to include gerafeas.\n\nPiperOrigin-RevId: 292168753\n\n26ccb214b7bc4a716032a6266bcb0a9ca55d6dbb\nasset: v1p1beta1 add client config annotations and retry config\n\nPiperOrigin-RevId: 292154210\n\n974ee5c0b5d03e81a50dafcedf41e0efebb5b749\nasset: v1beta1 add client config annotations\n\nPiperOrigin-RevId: 292152573\n\ncf3b61102ed5f36b827bc82ec39be09525f018c8\n  Fix to protos for v1p1beta1 release of Cloud Security Command Center\n\nPiperOrigin-RevId: 292034635\n\n4e1cfaa7c0fede9e65d64213ca3da1b1255816c0\nUpdate the public proto to support UTF-8 encoded id for CatalogService API, increase the ListCatalogItems deadline to 300s and some minor documentation change\n\nPiperOrigin-RevId: 292030970\n\n9c483584f8fd5a1b862ae07973f4cc7bb3e46648\nasset: add annotations to v1p1beta1\n\nPiperOrigin-RevId: 292009868\n\ne19209fac29731d0baf6d9ac23da1164f7bdca24\nAdd the google.rpc.context.AttributeContext message to the open source\ndirectories.\n\nPiperOrigin-RevId: 291999930\n\nae5662960573f279502bf98a108a35ba1175e782\noslogin API: move file level option on top of the file to avoid protobuf.js bug.\n\nPiperOrigin-RevId: 291990506\n\neba3897fff7c49ed85d3c47fc96fe96e47f6f684\nAdd cc_proto_library and cc_grpc_library targets for Spanner and IAM protos.\n\nPiperOrigin-RevId: 291988651\n\n8e981acfd9b97ea2f312f11bbaa7b6c16e412dea\nBeta launch for PersonDetection and FaceDetection features.\n\nPiperOrigin-RevId: 291821782\n\n994e067fae3b21e195f7da932b08fff806d70b5d\nasset: add annotations to v1p2beta1\n\nPiperOrigin-RevId: 291815259\n\n244e1d2c89346ca2e0701b39e65552330d68545a\nAdd Playable Locations service\n\nPiperOrigin-RevId: 291806349\n\n909f8f67963daf45dd88d020877fb9029b76788d\nasset: add annotations to v1beta2\n\nPiperOrigin-RevId: 291805301\n\n3c39a1d6e23c1ef63c7fba4019c25e76c40dfe19\nKMS: add file-level message for CryptoKeyPath, it is defined in gapic yaml but not\nin proto files.\n\nPiperOrigin-RevId: 291420695\n\nc6f3f350b8387f8d1b85ed4506f30187ebaaddc3\ncontaineranalysis: update v1beta1 and bazel build with annotations\n\nPiperOrigin-RevId: 291401900\n\n92887d74b44e4e636252b7b8477d0d2570cd82db\nfix: fix the location of grpc config file.\n\nPiperOrigin-RevId: 291396015\n\ne26cab8afd19d396b929039dac5d874cf0b5336c\nexpr: add default_host and method_signature annotations to CelService\n\nPiperOrigin-RevId: 291240093\n\n06093ae3952441c34ec176d1f7431b8765cec0be\nirm: fix v1alpha2 bazel build by adding missing proto imports\n\nPiperOrigin-RevId: 291227940\n\na8a2514af326e4673063f9a3c9d0ef1091c87e6c\nAdd proto annotation for cloud/irm API\n\nPiperOrigin-RevId: 291217859\n\n8d16f76de065f530d395a4c7eabbf766d6a120fd\nGenerate Memcache v1beta2 API protos and gRPC ServiceConfig files\n\nPiperOrigin-RevId: 291008516\n\n3af1dabd93df9a9f17bf3624d3b875c11235360b\ngrafeas: Add containeranalysis default_host to Grafeas service\n\nPiperOrigin-RevId: 290965849\n\nbe2663fa95e31cba67d0cd62611a6674db9f74b7\nfix(google/maps/roads): add missing opening bracket\n\nPiperOrigin-RevId: 290964086\n\nfacc26550a0af0696e0534bc9cae9df14275aa7c\nUpdating v2 protos with the latest inline documentation (in comments) and adding a per-service .yaml file.\n\nPiperOrigin-RevId: 290952261\n\ncda99c1f7dc5e4ca9b1caeae1dc330838cbc1461\nChange api_name to 'asset' for v1p1beta1\n\nPiperOrigin-RevId: 290800639\n\n94e9e90c303a820ce40643d9129e7f0d2054e8a1\nAdds Google Maps Road service\n\nPiperOrigin-RevId: 290795667\n\na3b23dcb2eaecce98c600c7d009451bdec52dbda\nrpc: new message ErrorInfo, other comment updates\n\nPiperOrigin-RevId: 290781668\n\n26420ef4e46c37f193c0fbe53d6ebac481de460e\nAdd proto definition for Org Policy v1.\n\nPiperOrigin-RevId: 290771923\n\n7f0dab8177cf371ae019a082e2512de7ac102888\nPublish Routes Preferred API v1 service definitions.\n\nPiperOrigin-RevId: 290326986\n\nad6e508d0728e1d1bca6e3f328cd562718cb772d\nFix: Qualify resource type references with \"jobs.googleapis.com/\"\n\nPiperOrigin-RevId: 290285762\n\n58e770d568a2b78168ddc19a874178fee8265a9d\ncts client library\n\nPiperOrigin-RevId: 290146169\n\naf9daa4c3b4c4a8b7133b81588dd9ffd37270af2\nAdd more programming language options to public proto\n\nPiperOrigin-RevId: 290144091\n\nd9f2bbf2df301ef84641d4cec7c828736a0bd907\ntalent: add missing resource.proto dep to Bazel build target\n\nPiperOrigin-RevId: 290143164\n\n3b3968237451d027b42471cd28884a5a1faed6c7\nAnnotate Talent API.\nAdd gRPC service config for retry.\nUpdate bazel file with google.api.resource dependency.\n\nPiperOrigin-RevId: 290125172\n\n0735b4b096872960568d1f366bfa75b7b0e1f1a3\nWeekly library update.\n\nPiperOrigin-RevId: 289939042\n\n8760d3d9a4543d7f9c0d1c7870aca08b116e4095\nWeekly library update.\n\nPiperOrigin-RevId: 289939020\n\n8607df842f782a901805187e02fff598145b0b0e\nChange Talent API timeout to 30s.\n\nPiperOrigin-RevId: 289912621\n\n908155991fe32570653bcb72ecfdcfc896642f41\nAdd Recommendations AI V1Beta1\n\nPiperOrigin-RevId: 289901914\n\n5c9a8c2bebd8b71aa66d1cc473edfaac837a2c78\nAdding no-arg method signatures for ListBillingAccounts and ListServices\n\nPiperOrigin-RevId: 289891136\n\n50b0e8286ac988b0593bd890eb31fef6ea2f5767\nlongrunning: add grpc service config and default_host annotation to operations.proto\n\nPiperOrigin-RevId: 289876944\n\n6cac27dabe51c54807b0401698c32d34998948a9\n  Updating default deadline for Cloud Security Command Center's v1 APIs.\n\nPiperOrigin-RevId: 289875412\n\nd99df0d67057a233c711187e0689baa4f8e6333d\nFix: Correct spelling in C# namespace option\n\nPiperOrigin-RevId: 289709813\n\n2fa8d48165cc48e35b0c62e6f7bdade12229326c\nfeat: Publish Recommender v1 to GitHub.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289619243\n\n9118db63d1ab493a2e44a3b4973fde810a835c49\nfirestore: don't retry reads that fail with Aborted\n\nFor transaction reads that fail with ABORTED, we need to rollback and start a new transaction. Our current configuration makes it so that GAPIC retries ABORTED reads multiple times without making any progress. Instead, we should retry at the transaction level.\n\nPiperOrigin-RevId: 289532382\n\n1dbfd3fe4330790b1e99c0bb20beb692f1e20b8a\nFix bazel build\nAdd other langauges (Java was already there) for bigquery/storage/v1alpha2 api.\n\nPiperOrigin-RevId: 289519766\n\nc06599cdd7d11f8d3fd25f8d3249e5bb1a3d5d73\nInitial commit of google.cloud.policytroubleshooter API, The API helps in troubleshooting GCP policies. Refer https://cloud.google.com/iam/docs/troubleshooting-access for more information\n\nPiperOrigin-RevId: 289491444\n\nfce7d80fa16ea241e87f7bc33d68595422e94ecd\nDo not pass samples option for Artman config of recommender v1 API.\n\nPiperOrigin-RevId: 289477403\n\nef179e8c61436297e6bb124352e47e45c8c80cb1\nfix: Address missing Bazel dependency.\n\nBazel builds stopped working in 06ec6d5 because\nthe google/longrunning/operations.proto file took\nan import from google/api/client.proto, but that\nimport was not added to BUILD.bazel.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289446074\n\n8841655b242c84fd691d77d7bcf21b61044f01ff\nMigrate Data Labeling v1beta1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289446026\n\n06ec6d5d053fff299eaa6eaa38afdd36c5e2fc68\nAdd annotations to google.longrunning.v1\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289413169\n\n0480cf40be1d3cc231f4268a2fdb36a8dd60e641\nMigrate IAM Admin v1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289411084\n\n1017173e9adeb858587639af61889ad970c728b1\nSpecify a C# namespace for BigQuery Connection v1beta1\n\nPiperOrigin-RevId: 289396763\n\nb08714b378e8e5b0c4ecdde73f92c36d6303b4b6\nfix: Integrate latest proto-docs-plugin fix.\nFixes dialogflow v2\n\nPiperOrigin-RevId: 289189004\n\n51217a67e79255ee1f2e70a6a3919df082513327\nCreate BUILD file for recommender v1\n\nPiperOrigin-RevId: 289183234\n\nacacd87263c0a60e458561b8b8ce9f67c760552a\nGenerate recommender v1 API protos and gRPC ServiceConfig files\n\nPiperOrigin-RevId: 289177510\n\n9d2f7133b97720b1fa3601f6dcd30760ba6d8a1e\nFix kokoro build script\n\nPiperOrigin-RevId: 289166315\n\nc43a67530d2a47a0220cad20ca8de39b3fbaf2c5\ncloudtasks: replace missing RPC timeout config for v2beta2 and v2beta3\n\nPiperOrigin-RevId: 289162391\n\n4cefc229a9197236fc0adf02d69b71c0c5cf59de\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 289158456\n\n56f263fe959c50786dab42e3c61402d32d1417bd\nCatalog API: Adding config necessary to build client libraries\n\nPiperOrigin-RevId: 289149879\n\n4543762b23a57fc3c53d409efc3a9affd47b6ab3\nFix Bazel build\nbilling/v1 and dialogflow/v2 remain broken (not bazel-related issues).\nBilling has wrong configuration, dialogflow failure is caused by a bug in documentation plugin.\n\nPiperOrigin-RevId: 289140194\n\nc9dce519127b97e866ca133a01157f4ce27dcceb\nUpdate Bigtable docs\n\nPiperOrigin-RevId: 289114419\n\n802c5c5f2bf94c3facb011267d04e71942e0d09f\nMigrate DLP to proto annotations (but not GAPIC v2).\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 289102579\n\n6357f30f2ec3cff1d8239d18b707ff9d438ea5da\nRemove gRPC configuration file that was in the wrong place.\n\nPiperOrigin-RevId: 289096111\n\n360a8792ed62f944109d7e22d613a04a010665b4\n  Protos for v1p1beta1 release of Cloud Security Command Center\n\nPiperOrigin-RevId: 289011995\n\na79211c20c4f2807eec524d00123bf7c06ad3d6e\nRoll back containeranalysis v1 to GAPIC v1.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288999068\n\n9e60345ba603e03484a8aaa33ce5ffa19c1c652b\nPublish Routes Preferred API v1 proto definitions.\n\nPiperOrigin-RevId: 288941399\n\nd52885b642ad2aa1f42b132ee62dbf49a73e1e24\nMigrate the service management API to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288909426\n\n6ace586805c08896fef43e28a261337fcf3f022b\ncloudtasks: replace missing RPC timeout config\n\nPiperOrigin-RevId: 288783603\n\n51d906cabee4876b12497054b15b05d4a50ad027\nImport of Grafeas from Github.\n\nUpdate BUILD.bazel accordingly.\n\nPiperOrigin-RevId: 288783426\n\n5ef42bcd363ba0440f0ee65b3c80b499e9067ede\nMigrate Recommender v1beta1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288713066\n\n94f986afd365b7d7e132315ddcd43d7af0e652fb\nMigrate Container Analysis v1 to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288708382\n\n7a751a279184970d3b6ba90e4dd4d22a382a0747\nRemove Container Analysis v1alpha1 (nobody publishes it).\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288707473\n\n3c0d9c71242e70474b2b640e15bb0a435fd06ff0\nRemove specious annotation from BigQuery Data Transfer before\nanyone accidentally does anything that uses it.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288701604\n\n1af307a4764bd415ef942ac5187fa1def043006f\nMigrate BigQuery Connection to GAPIC v2.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 288698681\n\n08b488e0660c59842a7dee0e3e2b65d9e3a514a9\nExposing cloud_catalog.proto (This API is already available through REST)\n\nPiperOrigin-RevId: 288625007\n\na613482977e11ac09fa47687a5d1b5a01efcf794\nUpdate the OS Login v1beta API description to render better in the UI.\n\nPiperOrigin-RevId: 288547940\n\n5e182b8d9943f1b17008d69d4c7e865dc83641a7\nUpdate the OS Login API description to render better in the UI.\n\nPiperOrigin-RevId: 288546443\n\ncb79155f596e0396dd900da93872be7066f6340d\nFix: Add a resource annotation for Agent\nFix: Correct the service name in annotations for Intent and SessionEntityType\n\nPiperOrigin-RevId: 288441307\n\nf7f6e9daec3315fd47cb638789bd8415bf4a27cc\nAdded cloud asset api v1p1beta1\n\nPiperOrigin-RevId: 288427239\n\nf2880f5b342c6345f3dcaad24fcb3c6ca9483654\nBilling account API: Adding config necessary to build client libraries\n\nPiperOrigin-RevId: 288351810\n\ndc250ffe071729f8f8bef9d6fd0fbbeb0254c666\nFix: Remove incorrect resource annotations in requests\n\nPiperOrigin-RevId: 288321208\n\n91ef2d9dd69807b0b79555f22566fb2d81e49ff9\nAdd GAPIC annotations to Cloud KMS (but do not migrate the GAPIC config yet).\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 287999179\n\n4d45a6399e9444fbddaeb1c86aabfde210723714\nRefreshing Cloud Billing API protos.\n\nThis exposes the following API methods:\n- UpdateBillingAccount\n- CreateBillingAccount\n- GetIamPolicy\n- SetIamPolicy\n- TestIamPermissions\n\nThere are also some new fields to support the management of sub-accounts.\n\nPiperOrigin-RevId: 287908369\n\nec285d3d230810147ebbf8d5b691ee90320c6d2d\nHide not yet implemented update_transforms message\n\nPiperOrigin-RevId: 287608953\n\na202fb3b91cd0e4231be878b0348afd17067cbe2\nBigQuery Storage Write API v1alpha2 clients. The service is enabled by whitelist only.\n\nPiperOrigin-RevId: 287379998\n\n650d7f1f8adb0cfaf37b3ce2241c3168f24efd4d\nUpdate Readme.md to match latest Bazel updates\n090d98aea20270e3be4b64240775588f7ce50ff8\ndocs(bigtable): Fix library release level listed in generated documentation\n\nPiperOrigin-RevId: 287308849\n\n2c28f646ca77b1d57550368be22aa388adde2e66\nfirestore: retry reads that fail with contention\n\nPiperOrigin-RevId: 287250665\n\nfd3091fbe9b2083cabc53dc50c78035658bfc4eb\nSync timeout in grpc config back to 10s for tasks API with github googelapis gapic config.\n\nPiperOrigin-RevId: 287207067\n\n49dd7d856a6f77c0cf7e5cb3334423e5089a9e8a\nbazel: Integrate bazel-2.0.0 compatibility fixes\n\nPiperOrigin-RevId: 287205644\n\n46e52fd64973e815cae61e78b14608fe7aa7b1df\nbazel: Integrate bazel build file generator\n\nTo generate/update BUILD.bazel files for any particular client or a batch of clients:\n```\nbazel run //:build_gen -- --src=google/example/library\n```\n\nPiperOrigin-RevId: 286958627\n\n1a380ea21dea9b6ac6ad28c60ad96d9d73574e19\nBigQuery Storage Read API v1beta2 clients.\n\nPiperOrigin-RevId: 286616241\n\n5f3f1d0f1c06b6475a17d995e4f7a436ca67ec9e\nAdd Artman config for secretmanager.\n\nPiperOrigin-RevId: 286598440\n\n50af0530730348f1e3697bf3c70261f7daaf2981\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 286491002\n\n91818800384f4ed26961aea268910b1a2ec58cc8\nFor Data Catalog API,\n1. Add support for marking a tag template field as required when creating a new tag template.\n2. Add support for updating a tag template field from required to optional.\n\nPiperOrigin-RevId: 286490262\n\nff4a2047b3d66f38c9b22197c370ed0d02fc0238\nWeekly library update.\n\nPiperOrigin-RevId: 286484215\n\n192c14029861752a911ed434fd6ee5b850517cd9\nWeekly library update.\n\nPiperOrigin-RevId: 286484165\n\nd9e328eaf790d4e4346fbbf32858160f497a03e0\nFix bazel build (versions 1.x)\n\nBump gapic-generator and resource names plugins to the latest version.\n\nPiperOrigin-RevId: 286469287\n\n"
+        "name": "synthtool",
+        "remote": "rpc://devrel/cloud/libraries/tools/autosynth",
+        "sha": "706a38c26db42299845396cdae55db635c38794a"
       }
     },
     {

From 69860c82d1582c7fb359b74f3f8bbea1aaf727df Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 24 Feb 2020 08:54:04 -0800
Subject: [PATCH 0292/1784] chore: update common templates (#52)

---
 .kokoro/build.sh | 24 +++++++++++++++++++++---
 synth.metadata   | 11 +++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index d11958c5a67e..891bc62319fe 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -37,19 +37,24 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
     export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 
+RETURN_CODE=0
+set +e
+
 case ${JOB_TYPE} in
 test)
     mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+    RETURN_CODE=$?
     bash ${KOKORO_GFILE_DIR}/codecov.sh
-    bash .kokoro/coerce_logs.sh
     ;;
 lint)
     mvn \
       -Penable-samples \
       com.coveo:fmt-maven-plugin:check
+    RETURN_CODE=$?
     ;;
 javadoc)
     mvn javadoc:javadoc javadoc:test-javadoc
+    RETURN_CODE=$?
     ;;
 integration)
     mvn -B ${INTEGRATION_TEST_ARGS} \
@@ -59,7 +64,7 @@ integration)
       -Denforcer.skip=true \
       -fae \
       verify
-    bash .kokoro/coerce_logs.sh
+    RETURN_CODE=$?
     ;;
 samples)
     if [[ -f samples/pom.xml ]]
@@ -72,7 +77,7 @@ samples)
           -Denforcer.skip=true \
           -fae \
           verify
-        bash .kokoro/coerce_logs.sh
+        RETURN_CODE=$?
         popd
     else
         echo "no sample pom.xml found - skipping sample tests"
@@ -80,7 +85,20 @@ samples)
     ;;
 clirr)
     mvn -B -Denforcer.skip=true clirr:check
+    RETURN_CODE=$?
     ;;
 *)
     ;;
 esac
+
+# fix output location of logs
+bash .kokoro/coerce_logs.sh
+
+if [[ "${ENABLE_BUILD_COP}" == "true" ]]
+then
+    chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop
+    ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-datastore
+fi
+
+echo "exiting with ${RETURN_CODE}"
+exit ${RETURN_CODE}
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index 456d76695932..20518ba1b5be 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,18 +1,18 @@
 {
-  "updateTime": "2020-02-21T22:46:51.888826Z",
+  "updateTime": "2020-02-22T09:49:37.787178Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.45.0",
-        "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b"
+        "version": "0.45.1",
+        "dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738"
       }
     },
     {
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "2096777ce8ff19da16c40d77c8c5e87d64c4f898"
+        "sha": "bb0b279d58625e3d5f1a0dd55af7e2c31ed8e4e3"
       }
     },
     {
@@ -20,8 +20,7 @@
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
         "sha": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2",
-        "internalRef": "296451205",
-        "log": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\nUpdate Dataproc v1beta2 client.\n\nPiperOrigin-RevId: 296451205\n\nde287524405a3dce124d301634731584fc0432d7\nFix: Reinstate method signatures that had been missed off some RPCs\nFix: Correct resource types for two fields\n\nPiperOrigin-RevId: 296435091\n\ne5bc9566ae057fb4c92f8b7e047f1c8958235b53\nDeprecate the endpoint_uris field, as it is unused.\n\nPiperOrigin-RevId: 296357191\n\n8c12e2b4dca94e12bff9f538bdac29524ff7ef7a\nUpdate Dataproc v1 client.\n\nPiperOrigin-RevId: 296336662\n\n17567c4a1ef0a9b50faa87024d66f8acbb561089\nRemoving erroneous comment, a la https://github.com/googleapis/java-speech/pull/103\n\nPiperOrigin-RevId: 296332968\n\n3eaaaf8626ce5b0c0bc7eee05e143beffa373b01\nAdd BUILD.bazel for v1 secretmanager.googleapis.com\n\nPiperOrigin-RevId: 296274723\n\ne76149c3d992337f85eeb45643106aacae7ede82\nMove securitycenter v1 to use generate from annotations.\n\nPiperOrigin-RevId: 296266862\n\n203740c78ac69ee07c3bf6be7408048751f618f8\nAdd StackdriverLoggingConfig field to Cloud Tasks v2 API.\n\nPiperOrigin-RevId: 296256388\n\ne4117d5e9ed8bbca28da4a60a94947ca51cb2083\nCreate a Bazel BUILD file for the google.actions.type export.\n\nPiperOrigin-RevId: 296212567\n\na9639a0a9854fd6e1be08bba1ac3897f4f16cb2f\nAdd secretmanager.googleapis.com v1 protos\n\nPiperOrigin-RevId: 295983266\n\nce4f4c21d9dd2bfab18873a80449b9d9851efde8\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295861722\n\ncb61d6c2d070b589980c779b68ffca617f789116\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295855449\n\nab2685d8d3a0e191dc8aef83df36773c07cb3d06\nfix: Dataproc v1 - AutoscalingPolicy annotation\n\nThis adds the second resource name pattern to the\nAutoscalingPolicy resource.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 295738415\n\n8a1020bf6828f6e3c84c3014f2c51cb62b739140\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295286165\n\n5cfa105206e77670369e4b2225597386aba32985\nAdd service control related proto build rule.\n\nPiperOrigin-RevId: 295262088\n\nee4dddf805072004ab19ac94df2ce669046eec26\nmonitoring v3: Add prefix \"https://cloud.google.com/\" into the link for global access\ncl 295167522, get ride of synth.py hacks\n\nPiperOrigin-RevId: 295238095\n\nd9835e922ea79eed8497db270d2f9f85099a519c\nUpdate some minor docs changes about user event proto\n\nPiperOrigin-RevId: 295185610\n\n5f311e416e69c170243de722023b22f3df89ec1c\nfix: use correct PHP package name in gapic configuration\n\nPiperOrigin-RevId: 295161330\n\n6cdd74dcdb071694da6a6b5a206e3a320b62dd11\npubsub: v1 add client config annotations and retry config\n\nPiperOrigin-RevId: 295158776\n\n5169f46d9f792e2934d9fa25c36d0515b4fd0024\nAdded cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295026522\n\n56b55aa8818cd0a532a7d779f6ef337ba809ccbd\nFix: Resource annotations for CreateTimeSeriesRequest and ListTimeSeriesRequest should refer to valid resources. TimeSeries is not a named resource.\n\nPiperOrigin-RevId: 294931650\n\n0646bc775203077226c2c34d3e4d50cc4ec53660\nRemove unnecessary languages from bigquery-related artman configuration files.\n\nPiperOrigin-RevId: 294809380\n\n8b78aa04382e3d4147112ad6d344666771bb1909\nUpdate backend.proto for schemes and protocol\n\nPiperOrigin-RevId: 294788800\n\n80b8f8b3de2359831295e24e5238641a38d8488f\nAdds artman config files for bigquerystorage endpoints v1beta2, v1alpha2, v1\n\nPiperOrigin-RevId: 294763931\n\n"
+        "internalRef": "296451205"
       }
     },
     {

From 675953389720e8ddc8e6ae556a875323a384e429 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 25 Feb 2020 09:44:44 -0800
Subject: [PATCH 0293/1784] chore: update common templates

---
 .kokoro/build.sh                |  8 ++++++--
 .kokoro/continuous/java8.cfg    |  5 +++++
 .kokoro/nightly/integration.cfg | 14 ++++++++++++++
 .kokoro/nightly/java8.cfg       |  5 +++++
 .kokoro/nightly/samples.cfg     | 21 +++++++++++++--------
 .kokoro/presubmit/java8.cfg     |  5 +++++
 synth.metadata                  | 21 ++++-----------------
 7 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 891bc62319fe..c2b602e57eab 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -44,7 +44,6 @@ case ${JOB_TYPE} in
 test)
     mvn test -B -Dclirr.skip=true -Denforcer.skip=true
     RETURN_CODE=$?
-    bash ${KOKORO_GFILE_DIR}/codecov.sh
     ;;
 lint)
     mvn \
@@ -91,6 +90,11 @@ clirr)
     ;;
 esac
 
+if [ "${REPORT_COVERAGE}" == "true" ]
+then
+  bash ${KOKORO_GFILE_DIR}/codecov.sh
+fi
+
 # fix output location of logs
 bash .kokoro/coerce_logs.sh
 
@@ -101,4 +105,4 @@ then
 fi
 
 echo "exiting with ${RETURN_CODE}"
-exit ${RETURN_CODE}
\ No newline at end of file
+exit ${RETURN_CODE}
diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg
index 3b017fc80f04..495cc7bacd63 100644
--- a/.kokoro/continuous/java8.cfg
+++ b/.kokoro/continuous/java8.cfg
@@ -5,3 +5,8 @@ env_vars: {
   key: "TRAMPOLINE_IMAGE"
   value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 3b017fc80f04..8bf59c02edd6 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -5,3 +5,17 @@ env_vars: {
   key: "TRAMPOLINE_IMAGE"
   value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
+
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "java_it_service_account"
+    }
+  }
+}
diff --git a/.kokoro/nightly/java8.cfg b/.kokoro/nightly/java8.cfg
index 3b017fc80f04..495cc7bacd63 100644
--- a/.kokoro/nightly/java8.cfg
+++ b/.kokoro/nightly/java8.cfg
@@ -5,3 +5,8 @@ env_vars: {
   key: "TRAMPOLINE_IMAGE"
   value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
index 9a9102490d54..b4b051cd016f 100644
--- a/.kokoro/nightly/samples.cfg
+++ b/.kokoro/nightly/samples.cfg
@@ -2,23 +2,28 @@
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
-    key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
 
 env_vars: {
-    key: "JOB_TYPE"
-    value: "samples"
+  key: "JOB_TYPE"
+  value: "samples"
 }
 
 env_vars: {
-    key: "GCLOUD_PROJECT"
-    value: "gcloud-devel"
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
+}
+
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
 }
 
 before_action {
diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg
index 3b017fc80f04..495cc7bacd63 100644
--- a/.kokoro/presubmit/java8.cfg
+++ b/.kokoro/presubmit/java8.cfg
@@ -5,3 +5,8 @@ env_vars: {
   key: "TRAMPOLINE_IMAGE"
   value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/synth.metadata b/synth.metadata
index 20518ba1b5be..49a4f3a54ee8 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,5 +1,5 @@
 {
-  "updateTime": "2020-02-22T09:49:37.787178Z",
+  "updateTime": "2020-02-24T22:49:25.146164Z",
   "sources": [
     {
       "generator": {
@@ -8,26 +8,13 @@
         "dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738"
       }
     },
-    {
-      "git": {
-        "name": ".",
-        "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "bb0b279d58625e3d5f1a0dd55af7e2c31ed8e4e3"
-      }
-    },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2",
-        "internalRef": "296451205"
-      }
-    },
-    {
-      "git": {
-        "name": "synthtool",
-        "remote": "rpc://devrel/cloud/libraries/tools/autosynth",
-        "sha": "706a38c26db42299845396cdae55db635c38794a"
+        "sha": "1e47e676cddbbd8d93f19ba0665af15b5532417e",
+        "internalRef": "296901854",
+        "log": "1e47e676cddbbd8d93f19ba0665af15b5532417e\nFix: Restore a method signature for UpdateCluster\n\nPiperOrigin-RevId: 296901854\n\n"
       }
     },
     {

From dea7ec20c603be9890f06a78fa17396299232a20 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 26 Feb 2020 20:36:07 +0100
Subject: [PATCH 0294/1784] deps: update dependency io.grpc:grpc-bom to v1.27.2
 (#55)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index db8e0d97895d..8a142e288600 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
     1.8.1
     1.17.0
     1.53.1
-    1.27.1
+    1.27.2
     3.11.4
     4.13
     28.2-android

From 34e94b15c670aea011503e8b6835301959ac0152 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 27 Feb 2020 23:40:49 +0100
Subject: [PATCH 0295/1784] deps: update core dependencies (#57)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a142e288600..5bd6a1bc0dcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,10 +152,10 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.92.5
+    1.93.0
     1.8.1
     1.17.0
-    1.53.1
+    1.54.0
     1.27.2
     3.11.4
     4.13

From 2af29c5c5fb13921f79e6b8b68fff0c82be29402 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 28 Feb 2020 12:48:37 -0500
Subject: [PATCH 0296/1784] deps: update truth 1.0 -> 1.0.1 (#58)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5bd6a1bc0dcb..793b3e8a2ab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
     0.24.0
     1.10.19
     1.3.2
-    1.0
+    1.0.1
   
 
   

From c7f795b4f67eaa51ba18d5f668c6aefde4fde8e5 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Tue, 3 Mar 2020 01:42:47 +0530
Subject: [PATCH 0297/1784] feat: expose reserveIds API (#56)

---
 .../clirr-ignored-differences.xml             | 14 ++++++++
 .../com/google/cloud/datastore/Datastore.java | 17 +++++++++
 .../google/cloud/datastore/DatastoreImpl.java | 35 +++++++++++++++++++
 .../cloud/datastore/spi/v1/DatastoreRpc.java  |  9 +++++
 .../datastore/spi/v1/HttpDatastoreRpc.java    | 11 ++++++
 .../cloud/datastore/ITDatastoreTest.java      | 30 ++++++++++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   |  9 +++++
 7 files changed, 125 insertions(+)
 create mode 100644 google-cloud-datastore/clirr-ignored-differences.xml

diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
new file mode 100644
index 000000000000..110f22f737f0
--- /dev/null
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -0,0 +1,14 @@
+
+
+
+    
+        com/google/cloud/datastore/Datastore
+        java.util.List reserveIds(com.google.cloud.datastore.Key[])
+        7012
+    
+    
+        com/google/cloud/datastore/spi/v1/DatastoreRpc
+        com.google.datastore.v1.ReserveIdsResponse reserveIds(com.google.datastore.v1.ReserveIdsRequest)
+        7012
+    
+
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index 0edbadc10bf2..bb115995e384 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -168,6 +168,23 @@ interface TransactionCallable {
    */
   List allocateId(IncompleteKey... keys);
 
+  /**
+   * Reserve one or more keys, preventing them from being automatically allocated by Datastore.
+   *
+   * 
Example of reserving multiple ids in a single batch.
+   *
+   * 
{@code
+   * KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+   * Key key1 = keyFactory.newKey(10);
+   * Key key2 = keyFactory.newKey("name");
+   * List keys = datastore.reserveIds(key1, key2);
+   *
+   * }

+   *
+   * @throws DatastoreException upon failure
+   */
+  List reserveIds(Key... keys);
+
   /**
    * {@inheritDoc}
    *
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 84102c75b1f0..be31594e7696 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
@@ -31,6 +31,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.datastore.v1.ReadOptions.ReadConsistency;
+import com.google.datastore.v1.ReserveIdsRequest;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.protobuf.ByteString;
 import java.util.ArrayList;
@@ -400,6 +401,40 @@ public com.google.datastore.v1.LookupResponse call() throws DatastoreException {
     }
   }
 
+  @Override
+  public List reserveIds(Key... keys) {
+    ReserveIdsRequest.Builder requestPb = ReserveIdsRequest.newBuilder();
+    for (Key key : keys) {
+      requestPb.addKeys(key.toPb());
+    }
+    com.google.datastore.v1.ReserveIdsResponse responsePb = reserveIds(requestPb.build());
+    ImmutableList.Builder keyList = ImmutableList.builder();
+    if (responsePb.isInitialized()) {
+      for (Key key : keys) {
+        keyList.add(key);
+      }
+    }
+    return keyList.build();
+  }
+
+  com.google.datastore.v1.ReserveIdsResponse reserveIds(
+      final com.google.datastore.v1.ReserveIdsRequest requestPb) {
+    try {
+      return RetryHelper.runWithRetries(
+          new Callable() {
+            @Override
+            public com.google.datastore.v1.ReserveIdsResponse call() throws DatastoreException {
+              return datastoreRpc.reserveIds(requestPb);
+            }
+          },
+          retrySettings,
+          EXCEPTION_HANDLER,
+          getOptions().getClock());
+    } catch (RetryHelperException e) {
+      throw DatastoreException.translateAndThrow(e);
+    }
+  }
+
   @Override
   public void update(Entity... entities) {
     if (entities.length > 0) {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
index d39f3a300ee0..5e64c92552ed 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
@@ -26,6 +26,8 @@
 import com.google.datastore.v1.CommitResponse;
 import com.google.datastore.v1.LookupRequest;
 import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
 import com.google.datastore.v1.RunQueryRequest;
@@ -63,6 +65,13 @@ BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
    */
   LookupResponse lookup(LookupRequest request);
 
+  /**
+   * Sends a reserveIds request.
+   *
+   * @throws DatastoreException upon failure
+   */
+  ReserveIdsResponse reserveIds(ReserveIdsRequest request);
+
   /**
    * Sends a rollback request.
    *
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 27ff8cec0e00..7d3434108c67 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
@@ -30,6 +30,8 @@
 import com.google.datastore.v1.CommitResponse;
 import com.google.datastore.v1.LookupRequest;
 import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
 import com.google.datastore.v1.RunQueryRequest;
@@ -164,6 +166,15 @@ public LookupResponse lookup(LookupRequest request) {
     }
   }
 
+  @Override
+  public ReserveIdsResponse reserveIds(ReserveIdsRequest request) {
+    try {
+      return client.reserveIds(request);
+    } catch (com.google.datastore.v1.client.DatastoreException ex) {
+      throw translate(ex);
+    }
+  }
+
   @Override
   public RollbackResponse rollback(RollbackRequest request) {
     try {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
index bef15e4091b6..8049e0957c43 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
@@ -16,6 +16,9 @@
 
 package com.google.cloud.datastore;
 
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -47,6 +50,8 @@
 import com.google.datastore.v1.QueryResultBatch;
 import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.ReadOptions.ReadConsistency;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
 import com.google.datastore.v1.RunQueryRequest;
@@ -55,6 +60,7 @@
 import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -840,6 +846,30 @@ public void testAllocateIdArray() {
     }
   }
 
+  @Test
+  public void testReserveIds() {
+    ReserveIdsRequest reserveIdsRequest =
+        ReserveIdsRequest.newBuilder().addKeys(KEY1.toPb()).build();
+    EasyMock.expect(rpcMock.reserveIds(reserveIdsRequest))
+        .andReturn(ReserveIdsResponse.newBuilder().build())
+        .times(1);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    Datastore datastore = rpcMockOptions.getService();
+    datastore.reserveIds(KEY1);
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
+  @Test
+  public void testReserveIdsWithKeys() {
+    Datastore datastore = createStrictMock(Datastore.class);
+    EasyMock.expect(datastore.reserveIds(KEY1, KEY2)).andReturn(Arrays.asList(KEY1, KEY2));
+    replay(datastore);
+    List result = datastore.reserveIds(KEY1, KEY2);
+    assertEquals(KEY1, result.get(0));
+    assertEquals(KEY2, result.get(1));
+    verify(datastore);
+  }
+
   @Test
   public void testGet() {
     Entity entity = datastore.get(KEY3);
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 af1848ad1377..798b37e0a7a2 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
@@ -597,6 +597,15 @@ public void testAllocateId() {
     assertEquals(Key.newBuilder(pk1, key2.getId()).build(), key2);
   }
 
+  @Test
+  public void testReserveIds() {
+    KeyFactory keyFactory = DATASTORE.newKeyFactory().setKind("MyKind");
+    Key key1 = keyFactory.newKey(10);
+    Key key2 = keyFactory.newKey("name");
+    List keyList = DATASTORE.reserveIds(key1, key2);
+    assertEquals(2, keyList.size());
+  }
+
   @Test
   public void testAllocateIdArray() {
     KeyFactory keyFactory = DATASTORE.newKeyFactory().setKind(KIND1);

From 832d8605ce2f3f0b959a34e6df953e831796f39e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 3 Mar 2020 23:52:12 +0100
Subject: [PATCH 0298/1784] deps: update core dependencies to v1.93.1 (#59)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-core](https://togithub.com/googleapis/java-core) | patch | `1.93.0` -> `1.93.1` |
| [com.google.cloud:google-cloud-core-http](https://togithub.com/googleapis/java-core) | patch | `1.93.0` -> `1.93.1` |

---

### Release Notes



googleapis/java-core

### [`v1.93.1`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1931httpswwwgithubcomgoogleapisjava-corecomparev1930v1931-2020-02-28)

[Compare Source](https://togithub.com/googleapis/java-core/compare/v1.93.0...v1.93.1)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 793b3e8a2ab7..45c1c34841cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.93.0
+    1.93.1
     1.8.1
     1.17.0
     1.54.0

From 1fedc02d638645dede1dc0cd7f05472817f21bd7 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Thu, 5 Mar 2020 15:16:57 -0500
Subject: [PATCH 0299/1784] chore: release 1.101.3 (#49)

---
 CHANGELOG.md                            | 17 +++++++++++++++++
 README.md                               |  6 +++---
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 563cf22a7987..865df6c35507 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+### [1.101.3](https://www.github.com/googleapis/java-datastore/compare/v1.101.2...v1.101.3) (2020-02-28)
+
+
+### Bug Fixes
+
+* flakey ITDatastoreTest#testSkippedResults ([#46](https://www.github.com/googleapis/java-datastore/issues/46)) ([3035ef2](https://www.github.com/googleapis/java-datastore/commit/3035ef2b6bf659bc847c4cf0a963a1f3badd68c7)), closes [#18](https://www.github.com/googleapis/java-datastore/issues/18)
+
+
+### Dependencies
+
+* update core dependencies ([#57](https://www.github.com/googleapis/java-datastore/issues/57)) ([34e94b1](https://www.github.com/googleapis/java-datastore/commit/34e94b15c670aea011503e8b6835301959ac0152))
+* update core transport dependencies to v1.34.2 ([#44](https://www.github.com/googleapis/java-datastore/issues/44)) ([42e7e63](https://www.github.com/googleapis/java-datastore/commit/42e7e6349ac9a6ae9134f2bd1149a50f498a917e))
+* update dependency com.google.protobuf:protobuf-java to v3.11.4 ([#48](https://www.github.com/googleapis/java-datastore/issues/48)) ([f78d0bd](https://www.github.com/googleapis/java-datastore/commit/f78d0bda15cce4e9639c582beab45a58d19d2a38))
+* update dependency io.grpc:grpc-bom to v1.27.1 ([#45](https://www.github.com/googleapis/java-datastore/issues/45)) ([ef6ca5b](https://www.github.com/googleapis/java-datastore/commit/ef6ca5bb0dc7311253980d5bbef2d88a510d85cc))
+* update dependency io.grpc:grpc-bom to v1.27.2 ([#55](https://www.github.com/googleapis/java-datastore/issues/55)) ([dea7ec2](https://www.github.com/googleapis/java-datastore/commit/dea7ec20c603be9890f06a78fa17396299232a20))
+* update truth 1.0 -> 1.0.1 ([#58](https://www.github.com/googleapis/java-datastore/issues/58)) ([2af29c5](https://www.github.com/googleapis/java-datastore/commit/2af29c5c5fb13921f79e6b8b68fff0c82be29402))
+
 ### [1.101.2](https://www.github.com/googleapis/java-datastore/compare/v1.101.1...v1.101.2) (2020-02-13)
 
 
diff --git a/README.md b/README.md
index b4720be4a986..5432e0da23ec 100644
--- a/README.md
+++ b/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.102.2
+  1.102.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.102.2'
+compile 'com.google.cloud:google-cloud-datastore:1.102.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.3"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d0d726e7e1e9..238f61a272ad 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
-  1.102.3-SNAPSHOT
+  1.102.3
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.3-SNAPSHOT
+        0.85.3
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.3-SNAPSHOT
+        1.102.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6e3f56d492c1..0f3873c8b7aa 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.3-SNAPSHOT
+  1.102.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.3-SNAPSHOT
+    1.102.3
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 45c1c34841cd..953a04c24bc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.3-SNAPSHOT
+  1.102.3
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.3-SNAPSHOT
+        0.85.3
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 16fdbfddefa3..cb93fc72dc59 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.85.3-SNAPSHOT
+  0.85.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.3-SNAPSHOT
+    1.102.3
   
   
     
diff --git a/versions.txt b/versions.txt
index be22dd927718..a5e446db796c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.2:1.102.3-SNAPSHOT
-google-cloud-datastore-bom:1.102.2:1.102.3-SNAPSHOT
-google-cloud-datastore-parent:1.102.2:1.102.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.85.2:0.85.3-SNAPSHOT
+google-cloud-datastore:1.102.3:1.102.3
+google-cloud-datastore-bom:1.102.3:1.102.3
+google-cloud-datastore-parent:1.102.3:1.102.3
+proto-google-cloud-datastore-v1:0.85.3:0.85.3
 

From e355d0f8ac86601099d8d3570f786d5a3880b968 Mon Sep 17 00:00:00 2001
From: "gcf-merge-on-green[bot]"
 <60162190+gcf-merge-on-green[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2020 21:50:07 +0000
Subject: [PATCH 0300/1784] deps: update dependency
 com.google.oauth-client:google-oauth-client to v1.30.6 (#60)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| com.google.oauth-client:google-oauth-client | patch | `1.30.5` -> `1.30.6` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 953a04c24bc1..b9da9137c168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,7 +251,7 @@
       
         com.google.oauth-client
         google-oauth-client
-        1.30.5
+        1.30.6
       
 
       

From 9854f34158bee78ccb46e126c38b3487ba293d42 Mon Sep 17 00:00:00 2001
From: "gcf-merge-on-green[bot]"
 <60162190+gcf-merge-on-green[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2020 21:54:04 +0000
Subject: [PATCH 0301/1784] chore: release 1.101.4-SNAPSHOT (#61)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 238f61a272ad..34d06178fda9 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
-  1.102.3
+  1.102.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.3
+        0.85.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.3
+        1.102.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0f3873c8b7aa..5ad7dabdcb63 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.3
+  1.102.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.3
+    1.102.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index b9da9137c168..f5ddec92636e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.3
+  1.102.4-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.3
+        0.85.4-SNAPSHOT
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cb93fc72dc59..a14fb4d7661f 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.85.3
+  0.85.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.3
+    1.102.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index a5e446db796c..be55ef014553 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.3:1.102.3
-google-cloud-datastore-bom:1.102.3:1.102.3
-google-cloud-datastore-parent:1.102.3:1.102.3
-proto-google-cloud-datastore-v1:0.85.3:0.85.3
+google-cloud-datastore:1.102.3:1.102.4-SNAPSHOT
+google-cloud-datastore-bom:1.102.3:1.102.4-SNAPSHOT
+google-cloud-datastore-parent:1.102.3:1.102.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.85.3:0.85.4-SNAPSHOT
 

From ce0fd116dbc5de69ae4526d95cd8014eaf2da1a0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 11 Mar 2020 17:38:02 +0100
Subject: [PATCH 0302/1784] deps: update core dependencies (#64)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [io.grpc:grpc-bom](https://togithub.com/grpc/grpc-java) | minor | `1.27.2` -> `1.28.0` |
| [com.google.cloud:google-cloud-core](https://togithub.com/googleapis/java-core) | patch | `1.93.1` -> `1.93.2` |

---

### Release Notes



grpc/grpc-java

### [`v1.28.0`](https://togithub.com/grpc/grpc-java/releases/v1.28.0)

[Compare Source](https://togithub.com/grpc/grpc-java/compare/v1.27.2...v1.28.0)

#### gRPC Java 1.28.0 Release Notes

#### API Changes

-   core: service config parsing now validates the final config object via `LoadBalancerProvider#parseLoadBalancingPolicyConfig`. LoadBalancer developers should use parsed config(`loadBalancingPolicyConfig`) in `ResolvedAddresses` instead of deprecated attribute `io.grpc.LoadBalancer.ATTR_LOAD_BALANCING_CONFIG`.
-   core: remove stickiness from round robin ([#​6698](https://togithub.com/grpc/grpc-java/issues/6698))

#### Behavioral Changes

-   core, grpclb: change policy selection strategy for Grpclb policy (take one: eliminate special logic for deciding grpclb policy in core) ([#​6637](https://togithub.com/grpc/grpc-java/issues/6637))
    -   gRPCLB policy selection is being stabilized according to [this gRFC](https://togithub.com/grpc/proposal/blob/master/A26-grpclb-selection.md). gRPCLB policy will not be automatically selected even if there are SRV addresses resolved. You need to explicitly specify the selection by service config (in TXT records, or via `ManagedChannelBuilder#defaultServiceConfig` or `ManagedChannelBuilder#defaultLoadBalancingPolicy`).

#### New Features

-   This release adds an experimental client side implementation of [xDSv2](https://www.envoyproxy.io/docs/envoy/latest/api-v2/api) APIs. This allows a gRPC client written in Java to receive configuration from an xDSv2 API compatible server and use that configuration to load balance RPCs. In this release, only the virtual host matching and cluster route action is supported. More features will be added in future.

#### Bug Fixes

-   netty: fix a deadlock on start gRPC server ([#​6601](https://togithub.com/grpc/grpc-java/issues/6601))
-   netty: negotiated application level protocol is now checked against the correct ALPN list in the SslContext settings
-   okhttp: fix incorrect connection-level flow control handling at beginning of connection.
-   alts: Fix using the wrong way of checking if Conscrypt is available ([#​6672](https://togithub.com/grpc/grpc-java/issues/6672))
-   grpclb: grpclb can handle empty address from LoadBalancer instead of throwing exception
-   alts: do not exclude opencensus-api from google-oauth2's transitive dependencies ([#​6607](https://togithub.com/grpc/grpc-java/issues/6607))
    -   grpc-alts was broken since 1.27.0 release for missing opencensus-api used in google-oauth2. This was due to opencensus-api dependency was eliminated from grpc-core. Now it should be included.

#### Documentation

-   stub,examples: Clarify CallStreamObserver's Javadoc ([#​6561](https://togithub.com/grpc/grpc-java/issues/6561))

#### Dependencies

-   Bump Netty to 4.1.45.Final and tcnative to 2.0.28.Final
-   Bump okhttp to 2.7.4
-   Bump google-auth-library-credentials and google-auth-library-oauth2-http to 0.20.0

#### Acknowledgements

[@​chrisschek](https://togithub.com/chrisschek)
[@​cushon](https://togithub.com/cushon) Liam Miller-Cushon
[@​elharo](https://togithub.com/elharo) Elliotte Rusty Harold
[@​gfelbing](https://togithub.com/gfelbing) Georg Welzel
[@​hatahet](https://togithub.com/hatahet) Ziad Hatahet
[@​leventov](https://togithub.com/leventov) Roman Leventov
[@​sourabhsparkala](https://togithub.com/sourabhsparkala) Sourabh Sarvotham Parkala
[@​ZhenLian](https://togithub.com/ZhenLian) Zhen Lian






googleapis/java-core

### [`v1.93.2`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1932httpswwwgithubcomgoogleapisjava-corecomparev1931v1932-2020-03-10)

[Compare Source](https://togithub.com/googleapis/java-core/compare/v1.93.1...v1.93.2)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:ghost: **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/config-help/issues) if that's undesired.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f5ddec92636e..e63d7518b7bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,11 +152,11 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.93.1
+    1.93.2
     1.8.1
     1.17.0
     1.54.0
-    1.27.2
+    1.28.0
     3.11.4
     4.13
     28.2-android

From 89e1fbd8f1563161d6e605aa03847ac5e4e5b984 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 12 Mar 2020 10:52:16 -0700
Subject: [PATCH 0303/1784] chore: update name_pretty (#65)

---
 .repo-metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index a345d30bfd66..d1f6e9e2398b 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "datastore",
-  "name_pretty": "Google Cloud Datastore",
+  "name_pretty": "Cloud Datastore",
   "product_documentation": "https://cloud.google.com/datastore",
   "client_documentation": "https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/asset/v1beta1/package-summary.html",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",

From d2d6fc67dc1db270e7c805d0b10760a6112171a5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 13 Mar 2020 15:56:32 -0700
Subject: [PATCH 0304/1784] chore: update PR template (#66)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-03-13 14:51:31,026 synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py.
2020-03-13 14:51:31,088 synthtool > Ensuring dependencies.
2020-03-13 14:51:31,095 synthtool > Pulling artman image.
latest: Pulling from googleapis/artman
Digest: sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9
Status: Image is up to date for googleapis/artman:latest
2020-03-13 14:51:32,069 synthtool > Cloning googleapis.
2020-03-13 14:51:32,720 synthtool > Running generator for google/datastore/artman_datastore.yaml.
2020-03-13 14:51:42,816 synthtool > Generated code into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java.
2020-03-13 14:51:42,819 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java.
2020-03-13 14:51:42,820 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java.
2020-03-13 14:51:42,820 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java.
2020-03-13 14:51:42,820 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java.
2020-03-13 14:51:42,820 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java.
2020-03-13 14:51:42,821 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java.
2020-03-13 14:51:42,821 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java.
2020-03-13 14:51:42,821 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java.
2020-03-13 14:51:42,821 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java.
2020-03-13 14:51:42,821 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java.
2020-03-13 14:51:42,821 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java.
2020-03-13 14:51:42,822 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java.
2020-03-13 14:51:42,822 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java.
2020-03-13 14:51:42,822 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java.
2020-03-13 14:51:42,822 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java.
2020-03-13 14:51:42,822 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java.
2020-03-13 14:51:42,823 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java.
2020-03-13 14:51:42,823 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java.
2020-03-13 14:51:42,823 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java.
2020-03-13 14:51:42,823 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java.
2020-03-13 14:51:42,823 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java.
2020-03-13 14:51:42,824 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java.
2020-03-13 14:51:42,824 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java.
2020-03-13 14:51:42,824 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java.
2020-03-13 14:51:42,824 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java.
2020-03-13 14:51:42,824 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java.
2020-03-13 14:51:42,825 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java.
2020-03-13 14:51:42,825 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java.
2020-03-13 14:51:42,825 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java.
2020-03-13 14:51:42,825 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java.
2020-03-13 14:51:42,825 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java.
2020-03-13 14:51:42,826 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java.
2020-03-13 14:51:42,826 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java.
2020-03-13 14:51:42,826 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java.
2020-03-13 14:51:42,826 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java.
2020-03-13 14:51:42,826 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java.
2020-03-13 14:51:42,827 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java.
2020-03-13 14:51:42,827 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java.
2020-03-13 14:51:42,827 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java.
2020-03-13 14:51:42,827 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java.
2020-03-13 14:51:42,827 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java.
2020-03-13 14:51:42,828 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java.
2020-03-13 14:51:42,828 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java.
2020-03-13 14:51:42,828 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java.
2020-03-13 14:51:42,828 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java.
2020-03-13 14:51:42,828 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java.
2020-03-13 14:51:42,829 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java.
2020-03-13 14:51:42,829 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java.
2020-03-13 14:51:42,829 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java.
2020-03-13 14:51:42,829 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java.
2020-03-13 14:51:42,829 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java.
2020-03-13 14:51:42,830 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java.
2020-03-13 14:51:42,830 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java.
2020-03-13 14:51:42,830 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java.
2020-03-13 14:51:42,830 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java.
2020-03-13 14:51:42,830 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java.
2020-03-13 14:51:42,831 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java.
2020-03-13 14:51:42,831 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java.
2020-03-13 14:51:42,831 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java.
2020-03-13 14:51:42,831 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java.
2020-03-13 14:51:42,832 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java.
2020-03-13 14:51:42,832 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java.
2020-03-13 14:51:42,832 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java.
2020-03-13 14:51:42,832 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java.
2020-03-13 14:51:42,832 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java.
2020-03-13 14:51:42,833 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java.
2020-03-13 14:51:42,833 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java.
2020-03-13 14:51:42,833 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java.
2020-03-13 14:51:42,833 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java.
2020-03-13 14:51:42,834 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java.
2020-03-13 14:51:42,834 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java.
2020-03-13 14:51:42,834 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java.
2020-03-13 14:51:42,834 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java.
2020-03-13 14:51:42,857 synthtool > Running java formatter on 96 files
2020-03-13 14:51:48,013 synthtool > Running java formatter on 73 files
.github/ISSUE_TEMPLATE/bug_report.md
.github/ISSUE_TEMPLATE/feature_request.md
.github/ISSUE_TEMPLATE/support_request.md
.github/PULL_REQUEST_TEMPLATE.md
.github/release-please.yml
.github/trusted-contribution.yml
.kokoro/build.bat
.kokoro/build.sh
.kokoro/coerce_logs.sh
.kokoro/common.cfg
.kokoro/continuous/common.cfg
.kokoro/continuous/dependencies.cfg
.kokoro/continuous/integration.cfg
.kokoro/continuous/java11.cfg
.kokoro/continuous/java7.cfg
.kokoro/continuous/java8-osx.cfg
.kokoro/continuous/java8-win.cfg
.kokoro/continuous/java8.cfg
.kokoro/continuous/lint.cfg
.kokoro/continuous/propose_release.cfg
.kokoro/continuous/samples.cfg
.kokoro/dependencies.sh
.kokoro/linkage-monitor.sh
.kokoro/nightly/common.cfg
.kokoro/nightly/dependencies.cfg
.kokoro/nightly/integration.cfg
.kokoro/nightly/java11.cfg
.kokoro/nightly/java7.cfg
.kokoro/nightly/java8-osx.cfg
.kokoro/nightly/java8-win.cfg
.kokoro/nightly/java8.cfg
.kokoro/nightly/lint.cfg
.kokoro/nightly/samples.cfg
.kokoro/presubmit/clirr.cfg
.kokoro/presubmit/common.cfg
.kokoro/presubmit/dependencies.cfg
.kokoro/presubmit/integration.cfg
.kokoro/presubmit/java11.cfg
.kokoro/presubmit/java7.cfg
.kokoro/presubmit/java8-osx.cfg
.kokoro/presubmit/java8-win.cfg
.kokoro/presubmit/java8.cfg
.kokoro/presubmit/linkage-monitor.cfg
.kokoro/presubmit/lint.cfg
.kokoro/presubmit/samples.cfg
.kokoro/release/bump_snapshot.cfg
.kokoro/release/common.cfg
.kokoro/release/common.sh
.kokoro/release/drop.cfg
.kokoro/release/drop.sh
.kokoro/release/promote.cfg
.kokoro/release/promote.sh
.kokoro/release/publish_javadoc.cfg
.kokoro/release/publish_javadoc.sh
.kokoro/release/snapshot.cfg
.kokoro/release/snapshot.sh
.kokoro/release/stage.cfg
.kokoro/release/stage.sh
.kokoro/trampoline.sh
CODE_OF_CONDUCT.md
CONTRIBUTING.md
LICENSE
README.md
codecov.yaml
java.header
license-checks.xml
renovate.json
2020-03-13 14:51:57,090 synthtool > Wrote metadata to synth.metadata.

```


---
 .github/PULL_REQUEST_TEMPLATE.md |  8 +++++++-
 synth.metadata                   | 12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0bd0ee0620f9..df85b451ceb4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1 +1,7 @@
-Fixes # (it's a good idea to open an issue first for context and/or discussion)
\ No newline at end of file
+Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
+- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
+- [ ] Ensure the tests and linter pass
+- [ ] Code coverage does not decrease (if any source code was changed)
+- [ ] Appropriate docs were updated (if necessary)
+
+Fixes # ☕️
diff --git a/synth.metadata b/synth.metadata
index 49a4f3a54ee8..3d46b88a1fe9 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,20 +1,20 @@
 {
-  "updateTime": "2020-02-24T22:49:25.146164Z",
+  "updateTime": "2020-03-13T21:51:57.089055Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.45.1",
-        "dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738"
+        "version": "1.1.0",
+        "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "1e47e676cddbbd8d93f19ba0665af15b5532417e",
-        "internalRef": "296901854",
-        "log": "1e47e676cddbbd8d93f19ba0665af15b5532417e\nFix: Restore a method signature for UpdateCluster\n\nPiperOrigin-RevId: 296901854\n\n"
+        "sha": "b2e2bc62fab90e6829e62d3d189906d9b79899e4",
+        "internalRef": "300817706",
+        "log": "b2e2bc62fab90e6829e62d3d189906d9b79899e4\nUpdates to GCS gRPC API spec:\n\n1. Changed GetIamPolicy and TestBucketIamPermissions to use wrapper messages around google.iam.v1 IAM requests messages, and added CommonRequestParams. This lets us support RequesterPays buckets.\n2. Added a metadata field to GetObjectMediaResponse, to support resuming an object media read safely (by extracting the generation of the object being read, and using it in the resumed read request).\n\nPiperOrigin-RevId: 300817706\n\n7fd916ce12335cc9e784bb9452a8602d00b2516c\nAdd deprecated_collections field for backward-compatiblity in PHP and monolith-generated Python and Ruby clients.\n\nGenerate TopicName class in Java which covers the functionality of both ProjectTopicName and DeletedTopicName. Introduce breaking changes to be fixed by synth.py.\n\nDelete default retry parameters.\n\nRetry codes defs can be deleted once # https://github.com/googleapis/gapic-generator/issues/3137 is fixed.\n\nPiperOrigin-RevId: 300813135\n\n047d3a8ac7f75383855df0166144f891d7af08d9\nfix!: google/rpc refactor ErrorInfo.type to ErrorInfo.reason and comment updates.\n\nPiperOrigin-RevId: 300773211\n\nfae4bb6d5aac52aabe5f0bb4396466c2304ea6f6\nAdding RetryPolicy to pubsub.proto\n\nPiperOrigin-RevId: 300769420\n\n7d569be2928dbd72b4e261bf9e468f23afd2b950\nAdding additional protocol buffer annotations to v3.\n\nPiperOrigin-RevId: 300718800\n\n13942d1a85a337515040a03c5108993087dc0e4f\nAdd logging protos for Recommender v1.\n\nPiperOrigin-RevId: 300689896\n\na1a573c3eecfe2c404892bfa61a32dd0c9fb22b6\nfix: change go package to use cloud.google.com/go/maps\n\nPiperOrigin-RevId: 300661825\n\nc6fbac11afa0c7ab2972d9df181493875c566f77\nfeat: publish documentai/v1beta2 protos\n\nPiperOrigin-RevId: 300656808\n\n5202a9e0d9903f49e900f20fe5c7f4e42dd6588f\nProtos for v1beta1 release of Cloud Security Center Settings API\n\nPiperOrigin-RevId: 300580858\n\n83518e18655d9d4ac044acbda063cc6ecdb63ef8\nAdds gapic.yaml file and BUILD.bazel file.\n\nPiperOrigin-RevId: 300554200\n\n836c196dc8ef8354bbfb5f30696bd3477e8db5e2\nRegenerate recommender v1beta1 gRPC ServiceConfig file for Insights methods.\n\nPiperOrigin-RevId: 300549302\n\n34a5450c591b6be3d6566f25ac31caa5211b2f3f\nIncreases the default timeout from 20s to 30s for MetricService\n\nPiperOrigin-RevId: 300474272\n\n5d8bffe87cd01ba390c32f1714230e5a95d5991d\nfeat: use the latest gapic-generator in WORKSPACE for bazel build.\n\nPiperOrigin-RevId: 300461878\n\nd631c651e3bcfac5d371e8560c27648f7b3e2364\nUpdated the GAPIC configs to include parameters for Backups APIs.\n\nPiperOrigin-RevId: 300443402\n\n678afc7055c1adea9b7b54519f3bdb228013f918\nAdding Game Servers v1beta API.\n\nPiperOrigin-RevId: 300433218\n\n80d2bd2c652a5e213302041b0620aff423132589\nEnable proto annotation and gapic v2 for talent API.\n\nPiperOrigin-RevId: 300393997\n\n85e454be7a353f7fe1bf2b0affb753305785b872\ndocs(google/maps/roads): remove mention of nonexported api\n\nPiperOrigin-RevId: 300367734\n\nbf839ae632e0f263a729569e44be4b38b1c85f9c\nAdding protocol buffer annotations and updated config info for v1 and v2.\n\nPiperOrigin-RevId: 300276913\n\n309b899ca18a4c604bce63882a161d44854da549\nPublish `Backup` APIs and protos.\n\nPiperOrigin-RevId: 300246038\n\neced64c3f122421350b4aca68a28e89121d20db8\nadd PHP client libraries\n\nPiperOrigin-RevId: 300193634\n\n7727af0e39df1ae9ad715895c8576d7b65cf6c6d\nfeat: use the latest gapic-generator and protoc-java-resource-name-plugin in googleapis/WORKSPACE.\n\nPiperOrigin-RevId: 300188410\n\n2a25aa351dd5b5fe14895266aff5824d90ce757b\nBreaking change: remove the ProjectOrTenant resource and its references.\n\nPiperOrigin-RevId: 300182152\n\na499dbb28546379415f51803505cfb6123477e71\nUpdate web risk v1 gapic config and BUILD file.\n\nPiperOrigin-RevId: 300152177\n\n52701da10fec2a5f9796e8d12518c0fe574488fe\nFix: apply appropriate namespace/package options for C#, PHP and Ruby.\n\nPiperOrigin-RevId: 300123508\n\n365c029b8cdb63f7751b92ab490f1976e616105c\nAdd CC targets to the kms protos.\n\nThese are needed by go/tink.\n\nPiperOrigin-RevId: 300038469\n\n4ba9aa8a4a1413b88dca5a8fa931824ee9c284e6\nExpose logo recognition API proto for GA.\n\nPiperOrigin-RevId: 299971671\n\n1c9fc2c9e03dadf15f16b1c4f570955bdcebe00e\nAdding ruby_package option to accessapproval.proto for the Ruby client libraries generation.\n\nPiperOrigin-RevId: 299955924\n\n1cc6f0a7bfb147e6f2ede911d9b01e7a9923b719\nbuild(google/maps/routes): generate api clients\n\nPiperOrigin-RevId: 299955905\n\n29a47c965aac79e3fe8e3314482ca0b5967680f0\nIncrease timeout to 1hr for method `dropRange` in bigtable/admin/v2, which is\nsynced with the timeout setting in gapic_yaml.\n\nPiperOrigin-RevId: 299917154\n\n8f631c4c70a60a9c7da3749511ee4ad432b62898\nbuild(google/maps/roads/v1op): move go to monorepo pattern\n\nPiperOrigin-RevId: 299885195\n\nd66816518844ebbf63504c9e8dfc7133921dd2cd\nbuild(google/maps/roads/v1op): Add bazel build files to generate clients.\n\nPiperOrigin-RevId: 299851148\n\naf7dff701fabe029672168649c62356cf1bb43d0\nAdd LogPlayerReports and LogImpressions to Playable Locations service\n\nPiperOrigin-RevId: 299724050\n\nb6927fca808f38df32a642c560082f5bf6538ced\nUpdate BigQuery Connection API v1beta1 proto: added credential to CloudSqlProperties.\n\nPiperOrigin-RevId: 299503150\n\n91e1fb5ef9829c0c7a64bfa5bde330e6ed594378\nchore: update protobuf (protoc) version to 3.11.2\n\nPiperOrigin-RevId: 299404145\n\n30e36b4bee6749c4799f4fc1a51cc8f058ba167d\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 299399890\n\nffbb493674099f265693872ae250711b2238090c\nfeat: cloudbuild/v1 add new fields and annotate OUTPUT_OUT fields.\n\nPiperOrigin-RevId: 299397780\n\nbc973a15818e00c19e121959832676e9b7607456\nbazel: Fix broken common  dependency\n\nPiperOrigin-RevId: 299397431\n\n71094a343e3b962e744aa49eb9338219537474e4\nchore: bigtable/admin/v2 publish retry config\n\nPiperOrigin-RevId: 299391875\n\n8f488efd7bda33885cb674ddd023b3678c40bd82\nfeat: Migrate logging to GAPIC v2; release new features.\n\nIMPORTANT: This is a breaking change for client libraries\nin all languages.\n\nCommitter: @lukesneeringer, @jskeet\nPiperOrigin-RevId: 299370279\n\n007605bf9ad3a1fd775014ebefbf7f1e6b31ee71\nUpdate API for bigqueryreservation v1beta1.\n- Adds flex capacity commitment plan to CapacityCommitment.\n- Adds methods for getting and updating BiReservations.\n- Adds methods for updating/splitting/merging CapacityCommitments.\n\nPiperOrigin-RevId: 299368059\n\nf0b581b5bdf803e45201ecdb3688b60e381628a8\nfix: recommendationengine/v1beta1 update some comments\n\nPiperOrigin-RevId: 299181282\n\n10e9a0a833dc85ff8f05b2c67ebe5ac785fe04ff\nbuild: add generated BUILD file for Routes Preferred API\n\nPiperOrigin-RevId: 299164808\n\n86738c956a8238d7c77f729be78b0ed887a6c913\npublish v1p1beta1: update with absolute address in comments\n\nPiperOrigin-RevId: 299152383\n\n73d9f2ad4591de45c2e1f352bc99d70cbd2a6d95\npublish v1: update with absolute address in comments\n\nPiperOrigin-RevId: 299147194\n\nd2158f24cb77b0b0ccfe68af784c6a628705e3c6\npublish v1beta2: update with absolute address in comments\n\nPiperOrigin-RevId: 299147086\n\n7fca61292c11b4cd5b352cee1a50bf88819dd63b\npublish v1p2beta1: update with absolute address in comments\n\nPiperOrigin-RevId: 299146903\n\n583b7321624736e2c490e328f4b1957335779295\npublish v1p3beta1: update with absolute address in comments\n\nPiperOrigin-RevId: 299146674\n\n638253bf86d1ce1c314108a089b7351440c2f0bf\nfix: add java_multiple_files option for automl text_sentiment.proto\n\nPiperOrigin-RevId: 298971070\n\n373d655703bf914fb8b0b1cc4071d772bac0e0d1\nUpdate Recs AI Beta public bazel file\n\nPiperOrigin-RevId: 298961623\n\ndcc5d00fc8a8d8b56f16194d7c682027b2c66a3b\nfix: add java_multiple_files option for automl classification.proto\n\nPiperOrigin-RevId: 298953301\n\na3f791827266f3496a6a5201d58adc4bb265c2a3\nchore: automl/v1 publish annotations and retry config\n\nPiperOrigin-RevId: 298942178\n\n01c681586d8d6dbd60155289b587aee678530bd9\nMark return_immediately in PullRequest deprecated.\n\nPiperOrigin-RevId: 298893281\n\nc9f5e9c4bfed54bbd09227e990e7bded5f90f31c\nRemove out of date documentation for predicate support on the Storage API\n\nPiperOrigin-RevId: 298883309\n\nfd5b3b8238d783b04692a113ffe07c0363f5de0f\ngenerate webrisk v1 proto\n\nPiperOrigin-RevId: 298847934\n\n541b1ded4abadcc38e8178680b0677f65594ea6f\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 298686266\n\nc0d171acecb4f5b0bfd2c4ca34fc54716574e300\n  Updated to include the Notification v1 API.\n\nPiperOrigin-RevId: 298652775\n\n2346a9186c0bff2c9cc439f2459d558068637e05\nAdd Service Directory v1beta1 protos and configs\n\nPiperOrigin-RevId: 298625638\n\na78ed801b82a5c6d9c5368e24b1412212e541bb7\nPublishing v3 protos and configs.\n\nPiperOrigin-RevId: 298607357\n\n4a180bfff8a21645b3a935c2756e8d6ab18a74e0\nautoml/v1beta1 publish proto updates\n\nPiperOrigin-RevId: 298484782\n\n6de6e938b7df1cd62396563a067334abeedb9676\nchore: use the latest gapic-generator and protoc-java-resource-name-plugin in Bazel workspace.\n\nPiperOrigin-RevId: 298474513\n\n244ab2b83a82076a1fa7be63b7e0671af73f5c02\nAdds service config definition for bigqueryreservation v1\n\nPiperOrigin-RevId: 298455048\n\n83c6f84035ee0f80eaa44d8b688a010461cc4080\nUpdate google/api/auth.proto to make AuthProvider to have JwtLocation\n\nPiperOrigin-RevId: 297918498\n\ne9e90a787703ec5d388902e2cb796aaed3a385b4\nDialogflow weekly v2/v2beta1 library update:\n  - adding get validation result\n  - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297671458\n\n1a2b05cc3541a5f7714529c665aecc3ea042c646\nAdding .yaml and .json config files.\n\nPiperOrigin-RevId: 297570622\n\ndfe1cf7be44dee31d78f78e485d8c95430981d6e\nPublish `QueryOptions` proto.\n\nIntroduced a `query_options` input in `ExecuteSqlRequest`.\n\nPiperOrigin-RevId: 297497710\n\ndafc905f71e5d46f500b41ed715aad585be062c3\npubsub: revert pull init_rpc_timeout & max_rpc_timeout back to 25 seconds and reset multiplier to 1.0\n\nPiperOrigin-RevId: 297486523\n\nf077632ba7fee588922d9e8717ee272039be126d\nfirestore: add update_transform\n\nPiperOrigin-RevId: 297405063\n\n0aba1900ffef672ec5f0da677cf590ee5686e13b\ncluster: use square brace for cross-reference\n\nPiperOrigin-RevId: 297204568\n\n5dac2da18f6325cbaed54603c43f0667ecd50247\nRestore retry params in gapic config because securitycenter has non-standard default retry params.\nRestore a few retry codes for some idempotent methods.\n\nPiperOrigin-RevId: 297196720\n\n1eb61455530252bba8b2c8d4bc9832960e5a56f6\npubsub: v1 replace IAM HTTP rules\n\nPiperOrigin-RevId: 297188590\n\n80b2d25f8d43d9d47024ff06ead7f7166548a7ba\nDialogflow weekly v2/v2beta1 library update:\n  - updates to mega agent api\n  - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297187629\n\n0b1876b35e98f560f9c9ca9797955f020238a092\nUse an older version of protoc-docs-plugin that is compatible with the specified gapic-generator and protobuf versions.\n\nprotoc-docs-plugin >=0.4.0 (see commit https://github.com/googleapis/protoc-docs-plugin/commit/979f03ede6678c487337f3d7e88bae58df5207af) is incompatible with protobuf 3.9.1.\n\nPiperOrigin-RevId: 296986742\n\n"
       }
     },
     {

From 3286a38b3f4176f0b83a9a4230fba2c431c86047 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 16 Mar 2020 20:28:24 +0100
Subject: [PATCH 0305/1784] deps: update core dependencies to v1.93.3 (#67)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-core](https://togithub.com/googleapis/java-core) | patch | `1.93.2` -> `1.93.3` |
| [com.google.cloud:google-cloud-core-http](https://togithub.com/googleapis/java-core) | patch | `1.93.2` -> `1.93.3` |

---

### Release Notes



googleapis/java-core

### [`v1.93.3`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1933httpswwwgithubcomgoogleapisjava-corecomparev1932v1933-2020-03-16)

[Compare Source](https://togithub.com/googleapis/java-core/compare/v1.93.2...v1.93.3)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e63d7518b7bc..e4ddd10b4c96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.93.2
+    1.93.3
     1.8.1
     1.17.0
     1.54.0

From 53c7da74ffdf05e3c4c687fb9f622af98016d392 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 18 Mar 2020 10:45:26 -0700
Subject: [PATCH 0306/1784] chore: use java helper for templates (#70)

---
 synth.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/synth.py b/synth.py
index 73e9e0a7746e..166b6d50509b 100644
--- a/synth.py
+++ b/synth.py
@@ -62,9 +62,6 @@
   java.format_code('google-cloud-datastore/src')
   java.format_code(f'proto-google-cloud-{service}-{version}/src')
 
-common_templates = gcp.CommonTemplates()
-templates = common_templates.java_library()
-s.copy(templates, excludes=[
-    '.gitignore',
+java.common_templates(excludes=[
     'README.md',
 ])

From d850168dbbacb0b709a040c5080700488ee0d028 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 19 Mar 2020 07:44:08 -0700
Subject: [PATCH 0307/1784] samples: add scaffold (#72)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-03-19 02:10:53,736 synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py.
2020-03-19 02:10:53,791 synthtool > Ensuring dependencies.
2020-03-19 02:10:53,796 synthtool > Pulling artman image.
latest: Pulling from googleapis/artman
Digest: sha256:5ef340c8d9334719bc5c6981d95f4a5d2737b0a6a24f2b9a0d430e96fff85c5b
Status: Image is up to date for googleapis/artman:latest
2020-03-19 02:10:54,795 synthtool > Cloning googleapis.
2020-03-19 02:10:55,116 synthtool > Running generator for google/datastore/artman_datastore.yaml.
2020-03-19 02:11:04,415 synthtool > Generated code into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java.
2020-03-19 02:11:04,419 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java.
2020-03-19 02:11:04,420 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java.
2020-03-19 02:11:04,420 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java.
2020-03-19 02:11:04,420 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java.
2020-03-19 02:11:04,421 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java.
2020-03-19 02:11:04,421 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java.
2020-03-19 02:11:04,421 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java.
2020-03-19 02:11:04,421 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java.
2020-03-19 02:11:04,422 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java.
2020-03-19 02:11:04,422 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java.
2020-03-19 02:11:04,422 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java.
2020-03-19 02:11:04,422 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java.
2020-03-19 02:11:04,422 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java.
2020-03-19 02:11:04,422 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java.
2020-03-19 02:11:04,423 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java.
2020-03-19 02:11:04,423 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java.
2020-03-19 02:11:04,423 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java.
2020-03-19 02:11:04,423 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java.
2020-03-19 02:11:04,423 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java.
2020-03-19 02:11:04,424 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java.
2020-03-19 02:11:04,424 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java.
2020-03-19 02:11:04,424 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java.
2020-03-19 02:11:04,424 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java.
2020-03-19 02:11:04,424 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java.
2020-03-19 02:11:04,424 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java.
2020-03-19 02:11:04,425 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java.
2020-03-19 02:11:04,425 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java.
2020-03-19 02:11:04,425 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java.
2020-03-19 02:11:04,425 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java.
2020-03-19 02:11:04,425 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java.
2020-03-19 02:11:04,426 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java.
2020-03-19 02:11:04,426 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java.
2020-03-19 02:11:04,426 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java.
2020-03-19 02:11:04,426 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java.
2020-03-19 02:11:04,426 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java.
2020-03-19 02:11:04,427 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java.
2020-03-19 02:11:04,427 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java.
2020-03-19 02:11:04,427 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java.
2020-03-19 02:11:04,427 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java.
2020-03-19 02:11:04,427 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java.
2020-03-19 02:11:04,427 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java.
2020-03-19 02:11:04,428 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java.
2020-03-19 02:11:04,428 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java.
2020-03-19 02:11:04,428 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java.
2020-03-19 02:11:04,428 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java.
2020-03-19 02:11:04,428 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java.
2020-03-19 02:11:04,429 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java.
2020-03-19 02:11:04,429 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java.
2020-03-19 02:11:04,429 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java.
2020-03-19 02:11:04,429 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java.
2020-03-19 02:11:04,429 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java.
2020-03-19 02:11:04,429 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java.
2020-03-19 02:11:04,430 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java.
2020-03-19 02:11:04,430 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java.
2020-03-19 02:11:04,430 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java.
2020-03-19 02:11:04,430 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java.
2020-03-19 02:11:04,431 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java.
2020-03-19 02:11:04,431 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java.
2020-03-19 02:11:04,431 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java.
2020-03-19 02:11:04,431 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java.
2020-03-19 02:11:04,431 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java.
2020-03-19 02:11:04,431 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java.
2020-03-19 02:11:04,432 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java.
2020-03-19 02:11:04,432 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java.
2020-03-19 02:11:04,432 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java.
2020-03-19 02:11:04,432 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java.
2020-03-19 02:11:04,432 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java.
2020-03-19 02:11:04,432 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java.
2020-03-19 02:11:04,433 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java.
2020-03-19 02:11:04,433 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java.
2020-03-19 02:11:04,433 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java.
2020-03-19 02:11:04,433 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java.
2020-03-19 02:11:04,433 synthtool > Replaced '// Generated by the protocol buffer compiler.  DO NOT EDIT!' in /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/java/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java.
2020-03-19 02:11:04,453 synthtool > Running java formatter on 96 files
2020-03-19 02:11:09,186 synthtool > Running java formatter on 73 files
.github/ISSUE_TEMPLATE/bug_report.md
.github/ISSUE_TEMPLATE/feature_request.md
.github/ISSUE_TEMPLATE/support_request.md
.github/PULL_REQUEST_TEMPLATE.md
.github/release-please.yml
.github/trusted-contribution.yml
.kokoro/build.bat
.kokoro/build.sh
.kokoro/coerce_logs.sh
.kokoro/common.cfg
.kokoro/continuous/common.cfg
.kokoro/continuous/dependencies.cfg
.kokoro/continuous/integration.cfg
.kokoro/continuous/java11.cfg
.kokoro/continuous/java7.cfg
.kokoro/continuous/java8-osx.cfg
.kokoro/continuous/java8-win.cfg
.kokoro/continuous/java8.cfg
.kokoro/continuous/lint.cfg
.kokoro/continuous/propose_release.cfg
.kokoro/continuous/samples.cfg
.kokoro/dependencies.sh
.kokoro/linkage-monitor.sh
.kokoro/nightly/common.cfg
.kokoro/nightly/dependencies.cfg
.kokoro/nightly/integration.cfg
.kokoro/nightly/java11.cfg
.kokoro/nightly/java7.cfg
.kokoro/nightly/java8-osx.cfg
.kokoro/nightly/java8-win.cfg
.kokoro/nightly/java8.cfg
.kokoro/nightly/lint.cfg
.kokoro/nightly/samples.cfg
.kokoro/presubmit/clirr.cfg
.kokoro/presubmit/common.cfg
.kokoro/presubmit/dependencies.cfg
.kokoro/presubmit/integration.cfg
.kokoro/presubmit/java11.cfg
.kokoro/presubmit/java7.cfg
.kokoro/presubmit/java8-osx.cfg
.kokoro/presubmit/java8-win.cfg
.kokoro/presubmit/java8.cfg
.kokoro/presubmit/linkage-monitor.cfg
.kokoro/presubmit/lint.cfg
.kokoro/presubmit/samples.cfg
.kokoro/release/bump_snapshot.cfg
.kokoro/release/common.cfg
.kokoro/release/common.sh
.kokoro/release/drop.cfg
.kokoro/release/drop.sh
.kokoro/release/promote.cfg
.kokoro/release/promote.sh
.kokoro/release/publish_javadoc.cfg
.kokoro/release/publish_javadoc.sh
.kokoro/release/snapshot.cfg
.kokoro/release/snapshot.sh
.kokoro/release/stage.cfg
.kokoro/release/stage.sh
.kokoro/trampoline.sh
CODE_OF_CONDUCT.md
CONTRIBUTING.md
LICENSE
README.md
codecov.yaml
java.header
license-checks.xml
renovate.json
samples/install-without-bom/pom.xml
samples/pom.xml
samples/snapshot/pom.xml
samples/snippets/pom.xml
2020-03-19 02:11:18,385 synthtool > merge: codecov.yaml
2020-03-19 02:11:18,386 synthtool > merge: CODE_OF_CONDUCT.md
2020-03-19 02:11:18,387 synthtool > merge: java.header
2020-03-19 02:11:18,387 synthtool > merge: CONTRIBUTING.md
2020-03-19 02:11:18,387 synthtool > merge: LICENSE
2020-03-19 02:11:18,388 synthtool > merge: license-checks.xml
2020-03-19 02:11:18,389 synthtool > merge: renovate.json
2020-03-19 02:11:18,389 synthtool > merge: .kokoro/build.bat
2020-03-19 02:11:18,389 synthtool > merge: .kokoro/dependencies.sh
2020-03-19 02:11:18,390 synthtool > merge: .kokoro/trampoline.sh
2020-03-19 02:11:18,390 synthtool > merge: .kokoro/coerce_logs.sh
2020-03-19 02:11:18,391 synthtool > merge: .kokoro/common.cfg
2020-03-19 02:11:18,391 synthtool > merge: .kokoro/linkage-monitor.sh
2020-03-19 02:11:18,391 synthtool > merge: .kokoro/build.sh
2020-03-19 02:11:18,392 synthtool > merge: .kokoro/presubmit/samples.cfg
2020-03-19 02:11:18,392 synthtool > merge: .kokoro/presubmit/integration.cfg
2020-03-19 02:11:18,393 synthtool > merge: .kokoro/presubmit/java11.cfg
2020-03-19 02:11:18,393 synthtool > merge: .kokoro/presubmit/java8-win.cfg
2020-03-19 02:11:18,393 synthtool > merge: .kokoro/presubmit/dependencies.cfg
2020-03-19 02:11:18,394 synthtool > merge: .kokoro/presubmit/java8.cfg
2020-03-19 02:11:18,394 synthtool > merge: .kokoro/presubmit/clirr.cfg
2020-03-19 02:11:18,395 synthtool > merge: .kokoro/presubmit/java7.cfg
2020-03-19 02:11:18,395 synthtool > merge: .kokoro/presubmit/common.cfg
2020-03-19 02:11:18,395 synthtool > merge: .kokoro/presubmit/lint.cfg
2020-03-19 02:11:18,396 synthtool > merge: .kokoro/presubmit/java8-osx.cfg
2020-03-19 02:11:18,396 synthtool > merge: .kokoro/presubmit/linkage-monitor.cfg
2020-03-19 02:11:18,397 synthtool > merge: .kokoro/continuous/samples.cfg
2020-03-19 02:11:18,397 synthtool > merge: .kokoro/continuous/integration.cfg
2020-03-19 02:11:18,397 synthtool > merge: .kokoro/continuous/java11.cfg
2020-03-19 02:11:18,398 synthtool > merge: .kokoro/continuous/java8-win.cfg
2020-03-19 02:11:18,398 synthtool > merge: .kokoro/continuous/dependencies.cfg
2020-03-19 02:11:18,398 synthtool > merge: .kokoro/continuous/java8.cfg
2020-03-19 02:11:18,399 synthtool > merge: .kokoro/continuous/java7.cfg
2020-03-19 02:11:18,399 synthtool > merge: .kokoro/continuous/common.cfg
2020-03-19 02:11:18,400 synthtool > merge: .kokoro/continuous/propose_release.cfg
2020-03-19 02:11:18,400 synthtool > merge: .kokoro/continuous/lint.cfg
2020-03-19 02:11:18,400 synthtool > merge: .kokoro/continuous/java8-osx.cfg
2020-03-19 02:11:18,401 synthtool > merge: .kokoro/nightly/samples.cfg
2020-03-19 02:11:18,401 synthtool > merge: .kokoro/nightly/integration.cfg
2020-03-19 02:11:18,402 synthtool > merge: .kokoro/nightly/java11.cfg
2020-03-19 02:11:18,402 synthtool > merge: .kokoro/nightly/java8-win.cfg
2020-03-19 02:11:18,402 synthtool > merge: .kokoro/nightly/dependencies.cfg
2020-03-19 02:11:18,403 synthtool > merge: .kokoro/nightly/java8.cfg
2020-03-19 02:11:18,403 synthtool > merge: .kokoro/nightly/java7.cfg
2020-03-19 02:11:18,404 synthtool > merge: .kokoro/nightly/common.cfg
2020-03-19 02:11:18,404 synthtool > merge: .kokoro/nightly/lint.cfg
2020-03-19 02:11:18,404 synthtool > merge: .kokoro/nightly/java8-osx.cfg
2020-03-19 02:11:18,405 synthtool > merge: .kokoro/release/common.sh
2020-03-19 02:11:18,405 synthtool > merge: .kokoro/release/drop.sh
2020-03-19 02:11:18,406 synthtool > merge: .kokoro/release/publish_javadoc.cfg
2020-03-19 02:11:18,406 synthtool > merge: .kokoro/release/bump_snapshot.cfg
2020-03-19 02:11:18,407 synthtool > merge: .kokoro/release/publish_javadoc.sh
2020-03-19 02:11:18,407 synthtool > merge: .kokoro/release/stage.sh
2020-03-19 02:11:18,407 synthtool > merge: .kokoro/release/common.cfg
2020-03-19 02:11:18,408 synthtool > merge: .kokoro/release/drop.cfg
2020-03-19 02:11:18,408 synthtool > merge: .kokoro/release/snapshot.sh
2020-03-19 02:11:18,408 synthtool > merge: .kokoro/release/stage.cfg
2020-03-19 02:11:18,409 synthtool > merge: .kokoro/release/promote.cfg
2020-03-19 02:11:18,409 synthtool > merge: .kokoro/release/promote.sh
2020-03-19 02:11:18,410 synthtool > merge: .kokoro/release/snapshot.cfg
2020-03-19 02:11:18,410 synthtool > merge: .github/PULL_REQUEST_TEMPLATE.md
2020-03-19 02:11:18,410 synthtool > merge: .github/trusted-contribution.yml
2020-03-19 02:11:18,411 synthtool > merge: .github/release-please.yml
2020-03-19 02:11:18,411 synthtool > merge: .github/ISSUE_TEMPLATE/feature_request.md
2020-03-19 02:11:18,412 synthtool > merge: .github/ISSUE_TEMPLATE/support_request.md
2020-03-19 02:11:18,412 synthtool > merge: .github/ISSUE_TEMPLATE/bug_report.md
2020-03-19 02:11:18,420 synthtool > Wrote metadata to synth.metadata.

```


---
 samples/install-without-bom/pom.xml | 84 +++++++++++++++++++++++++++++
 samples/pom.xml                     | 56 +++++++++++++++++++
 samples/snapshot/pom.xml            | 83 ++++++++++++++++++++++++++++
 samples/snippets/pom.xml            | 60 +++++++++++++++++++++
 synth.metadata                      | 20 +++----
 5 files changed, 293 insertions(+), 10 deletions(-)
 create mode 100644 samples/install-without-bom/pom.xml
 create mode 100644 samples/pom.xml
 create mode 100644 samples/snapshot/pom.xml
 create mode 100644 samples/snippets/pom.xml

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
new file mode 100644
index 000000000000..c5a2e1c6b0b7
--- /dev/null
+++ b/samples/install-without-bom/pom.xml
@@ -0,0 +1,84 @@
+
+
+  4.0.0
+  com.google.cloud
+  datastore-install-without-bom
+  jar
+  Google Cloud Datastore Install Without Bom
+  https://github.com/googleapis/java-datastore
+
+  
+  
+    com.google.cloud.samples
+    shared-configuration
+    1.0.12
+  
+
+  
+    1.8
+    1.8
+    UTF-8
+  
+
+
+  
+    
+    
+      com.google.cloud
+      google-cloud-datastore
+      1.102.3
+    
+    
+
+    
+      junit
+      junit
+      4.13
+      test
+    
+    
+      com.google.truth
+      truth
+      1.0.1
+      test
+    
+  
+
+  
+  
+    
+      
+        org.codehaus.mojo
+        build-helper-maven-plugin
+        3.1.0
+        
+          
+            add-snippets-source
+            
+              add-source
+            
+            
+              
+                ../snippets/src/main/java
+              
+            
+          
+          
+            add-snippets-tests
+            
+              add-test-source
+            
+            
+              
+                ../snippets/src/test/java
+              
+            
+          
+        
+      
+    
+  
+
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644
index 000000000000..b9cd72060164
--- /dev/null
+++ b/samples/pom.xml
@@ -0,0 +1,56 @@
+
+
+  4.0.0
+  com.google.cloud
+  google-cloud-datastore-samples
+  0.0.1-SNAPSHOT
+  pom
+  Google Cloud Datastore Samples Parent
+  https://github.com/googleapis/java-datastore
+  
+    Java idiomatic client for Google Cloud Platform services.
+  
+
+  
+  
+    com.google.cloud.samples
+    shared-configuration
+    1.0.12
+  
+
+  
+    1.8
+    1.8
+    UTF-8
+  
+
+  
+    install-without-bom
+    snapshot
+    snippets
+  
+
+  
+    
+      
+        org.apache.maven.plugins
+        maven-deploy-plugin
+        2.8.2
+        
+          true
+        
+      
+      
+        org.sonatype.plugins
+        nexus-staging-maven-plugin
+        1.6.8
+        
+          true
+        
+      
+    
+  
+ 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
new file mode 100644
index 000000000000..79035e8763ae
--- /dev/null
+++ b/samples/snapshot/pom.xml
@@ -0,0 +1,83 @@
+
+
+  4.0.0
+  com.google.cloud
+  datastore-snapshot
+  jar
+  Google Cloud Datastore Snapshot Samples
+  https://github.com/googleapis/java-datastore
+
+  
+  
+    com.google.cloud.samples
+    shared-configuration
+    1.0.12
+  
+
+  
+    1.8
+    1.8
+    UTF-8
+  
+
+  
+  
+    
+      com.google.cloud
+      google-cloud-datastore
+      1.102.3
+    
+
+    
+      junit
+      junit
+      4.13
+      test
+    
+    
+      com.google.truth
+      truth
+      1.0.1
+      test
+    
+  
+  
+
+  
+  
+    
+      
+        org.codehaus.mojo
+        build-helper-maven-plugin
+        3.1.0
+        
+          
+            add-snippets-source
+            
+              add-source
+            
+            
+              
+                ../snippets/src/main/java
+              
+            
+          
+          
+            add-snippets-tests
+            
+              add-test-source
+            
+            
+              
+                ../snippets/src/test/java
+              
+            
+          
+        
+      
+    
+  
+
\ No newline at end of file
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
new file mode 100644
index 000000000000..cac635632f83
--- /dev/null
+++ b/samples/snippets/pom.xml
@@ -0,0 +1,60 @@
+
+
+  4.0.0
+  com.google.cloud
+  datastore-snippets
+  jar
+  Google Cloud Datastore Snippets
+  https://github.com/googleapis/java-datastore
+
+  
+  
+    com.google.cloud.samples
+    shared-configuration
+    1.0.12
+  
+
+  
+    1.8
+    1.8
+    UTF-8
+  
+
+
+  
+  
+    
+      
+        com.google.cloud
+        libraries-bom
+        4.2.0
+        pom
+        import
+      
+    
+  
+
+  
+    
+      com.google.cloud
+      google-cloud-datastore
+    
+    
+
+    
+      junit
+      junit
+      4.13
+      test
+    
+    
+      com.google.truth
+      truth
+      1.0.1
+      test
+    
+  
+
diff --git a/synth.metadata b/synth.metadata
index 3d46b88a1fe9..bbdd6d48c0c0 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,27 +1,27 @@
 {
-  "updateTime": "2020-03-13T21:51:57.089055Z",
+  "updateTime": "2020-03-19T09:11:18.419522Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "1.1.0",
-        "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9"
+        "version": "1.1.1",
+        "dockerImage": "googleapis/artman@sha256:5ef340c8d9334719bc5c6981d95f4a5d2737b0a6a24f2b9a0d430e96fff85c5b"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "b2e2bc62fab90e6829e62d3d189906d9b79899e4",
-        "internalRef": "300817706",
-        "log": "b2e2bc62fab90e6829e62d3d189906d9b79899e4\nUpdates to GCS gRPC API spec:\n\n1. Changed GetIamPolicy and TestBucketIamPermissions to use wrapper messages around google.iam.v1 IAM requests messages, and added CommonRequestParams. This lets us support RequesterPays buckets.\n2. Added a metadata field to GetObjectMediaResponse, to support resuming an object media read safely (by extracting the generation of the object being read, and using it in the resumed read request).\n\nPiperOrigin-RevId: 300817706\n\n7fd916ce12335cc9e784bb9452a8602d00b2516c\nAdd deprecated_collections field for backward-compatiblity in PHP and monolith-generated Python and Ruby clients.\n\nGenerate TopicName class in Java which covers the functionality of both ProjectTopicName and DeletedTopicName. Introduce breaking changes to be fixed by synth.py.\n\nDelete default retry parameters.\n\nRetry codes defs can be deleted once # https://github.com/googleapis/gapic-generator/issues/3137 is fixed.\n\nPiperOrigin-RevId: 300813135\n\n047d3a8ac7f75383855df0166144f891d7af08d9\nfix!: google/rpc refactor ErrorInfo.type to ErrorInfo.reason and comment updates.\n\nPiperOrigin-RevId: 300773211\n\nfae4bb6d5aac52aabe5f0bb4396466c2304ea6f6\nAdding RetryPolicy to pubsub.proto\n\nPiperOrigin-RevId: 300769420\n\n7d569be2928dbd72b4e261bf9e468f23afd2b950\nAdding additional protocol buffer annotations to v3.\n\nPiperOrigin-RevId: 300718800\n\n13942d1a85a337515040a03c5108993087dc0e4f\nAdd logging protos for Recommender v1.\n\nPiperOrigin-RevId: 300689896\n\na1a573c3eecfe2c404892bfa61a32dd0c9fb22b6\nfix: change go package to use cloud.google.com/go/maps\n\nPiperOrigin-RevId: 300661825\n\nc6fbac11afa0c7ab2972d9df181493875c566f77\nfeat: publish documentai/v1beta2 protos\n\nPiperOrigin-RevId: 300656808\n\n5202a9e0d9903f49e900f20fe5c7f4e42dd6588f\nProtos for v1beta1 release of Cloud Security Center Settings API\n\nPiperOrigin-RevId: 300580858\n\n83518e18655d9d4ac044acbda063cc6ecdb63ef8\nAdds gapic.yaml file and BUILD.bazel file.\n\nPiperOrigin-RevId: 300554200\n\n836c196dc8ef8354bbfb5f30696bd3477e8db5e2\nRegenerate recommender v1beta1 gRPC ServiceConfig file for Insights methods.\n\nPiperOrigin-RevId: 300549302\n\n34a5450c591b6be3d6566f25ac31caa5211b2f3f\nIncreases the default timeout from 20s to 30s for MetricService\n\nPiperOrigin-RevId: 300474272\n\n5d8bffe87cd01ba390c32f1714230e5a95d5991d\nfeat: use the latest gapic-generator in WORKSPACE for bazel build.\n\nPiperOrigin-RevId: 300461878\n\nd631c651e3bcfac5d371e8560c27648f7b3e2364\nUpdated the GAPIC configs to include parameters for Backups APIs.\n\nPiperOrigin-RevId: 300443402\n\n678afc7055c1adea9b7b54519f3bdb228013f918\nAdding Game Servers v1beta API.\n\nPiperOrigin-RevId: 300433218\n\n80d2bd2c652a5e213302041b0620aff423132589\nEnable proto annotation and gapic v2 for talent API.\n\nPiperOrigin-RevId: 300393997\n\n85e454be7a353f7fe1bf2b0affb753305785b872\ndocs(google/maps/roads): remove mention of nonexported api\n\nPiperOrigin-RevId: 300367734\n\nbf839ae632e0f263a729569e44be4b38b1c85f9c\nAdding protocol buffer annotations and updated config info for v1 and v2.\n\nPiperOrigin-RevId: 300276913\n\n309b899ca18a4c604bce63882a161d44854da549\nPublish `Backup` APIs and protos.\n\nPiperOrigin-RevId: 300246038\n\neced64c3f122421350b4aca68a28e89121d20db8\nadd PHP client libraries\n\nPiperOrigin-RevId: 300193634\n\n7727af0e39df1ae9ad715895c8576d7b65cf6c6d\nfeat: use the latest gapic-generator and protoc-java-resource-name-plugin in googleapis/WORKSPACE.\n\nPiperOrigin-RevId: 300188410\n\n2a25aa351dd5b5fe14895266aff5824d90ce757b\nBreaking change: remove the ProjectOrTenant resource and its references.\n\nPiperOrigin-RevId: 300182152\n\na499dbb28546379415f51803505cfb6123477e71\nUpdate web risk v1 gapic config and BUILD file.\n\nPiperOrigin-RevId: 300152177\n\n52701da10fec2a5f9796e8d12518c0fe574488fe\nFix: apply appropriate namespace/package options for C#, PHP and Ruby.\n\nPiperOrigin-RevId: 300123508\n\n365c029b8cdb63f7751b92ab490f1976e616105c\nAdd CC targets to the kms protos.\n\nThese are needed by go/tink.\n\nPiperOrigin-RevId: 300038469\n\n4ba9aa8a4a1413b88dca5a8fa931824ee9c284e6\nExpose logo recognition API proto for GA.\n\nPiperOrigin-RevId: 299971671\n\n1c9fc2c9e03dadf15f16b1c4f570955bdcebe00e\nAdding ruby_package option to accessapproval.proto for the Ruby client libraries generation.\n\nPiperOrigin-RevId: 299955924\n\n1cc6f0a7bfb147e6f2ede911d9b01e7a9923b719\nbuild(google/maps/routes): generate api clients\n\nPiperOrigin-RevId: 299955905\n\n29a47c965aac79e3fe8e3314482ca0b5967680f0\nIncrease timeout to 1hr for method `dropRange` in bigtable/admin/v2, which is\nsynced with the timeout setting in gapic_yaml.\n\nPiperOrigin-RevId: 299917154\n\n8f631c4c70a60a9c7da3749511ee4ad432b62898\nbuild(google/maps/roads/v1op): move go to monorepo pattern\n\nPiperOrigin-RevId: 299885195\n\nd66816518844ebbf63504c9e8dfc7133921dd2cd\nbuild(google/maps/roads/v1op): Add bazel build files to generate clients.\n\nPiperOrigin-RevId: 299851148\n\naf7dff701fabe029672168649c62356cf1bb43d0\nAdd LogPlayerReports and LogImpressions to Playable Locations service\n\nPiperOrigin-RevId: 299724050\n\nb6927fca808f38df32a642c560082f5bf6538ced\nUpdate BigQuery Connection API v1beta1 proto: added credential to CloudSqlProperties.\n\nPiperOrigin-RevId: 299503150\n\n91e1fb5ef9829c0c7a64bfa5bde330e6ed594378\nchore: update protobuf (protoc) version to 3.11.2\n\nPiperOrigin-RevId: 299404145\n\n30e36b4bee6749c4799f4fc1a51cc8f058ba167d\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 299399890\n\nffbb493674099f265693872ae250711b2238090c\nfeat: cloudbuild/v1 add new fields and annotate OUTPUT_OUT fields.\n\nPiperOrigin-RevId: 299397780\n\nbc973a15818e00c19e121959832676e9b7607456\nbazel: Fix broken common  dependency\n\nPiperOrigin-RevId: 299397431\n\n71094a343e3b962e744aa49eb9338219537474e4\nchore: bigtable/admin/v2 publish retry config\n\nPiperOrigin-RevId: 299391875\n\n8f488efd7bda33885cb674ddd023b3678c40bd82\nfeat: Migrate logging to GAPIC v2; release new features.\n\nIMPORTANT: This is a breaking change for client libraries\nin all languages.\n\nCommitter: @lukesneeringer, @jskeet\nPiperOrigin-RevId: 299370279\n\n007605bf9ad3a1fd775014ebefbf7f1e6b31ee71\nUpdate API for bigqueryreservation v1beta1.\n- Adds flex capacity commitment plan to CapacityCommitment.\n- Adds methods for getting and updating BiReservations.\n- Adds methods for updating/splitting/merging CapacityCommitments.\n\nPiperOrigin-RevId: 299368059\n\nf0b581b5bdf803e45201ecdb3688b60e381628a8\nfix: recommendationengine/v1beta1 update some comments\n\nPiperOrigin-RevId: 299181282\n\n10e9a0a833dc85ff8f05b2c67ebe5ac785fe04ff\nbuild: add generated BUILD file for Routes Preferred API\n\nPiperOrigin-RevId: 299164808\n\n86738c956a8238d7c77f729be78b0ed887a6c913\npublish v1p1beta1: update with absolute address in comments\n\nPiperOrigin-RevId: 299152383\n\n73d9f2ad4591de45c2e1f352bc99d70cbd2a6d95\npublish v1: update with absolute address in comments\n\nPiperOrigin-RevId: 299147194\n\nd2158f24cb77b0b0ccfe68af784c6a628705e3c6\npublish v1beta2: update with absolute address in comments\n\nPiperOrigin-RevId: 299147086\n\n7fca61292c11b4cd5b352cee1a50bf88819dd63b\npublish v1p2beta1: update with absolute address in comments\n\nPiperOrigin-RevId: 299146903\n\n583b7321624736e2c490e328f4b1957335779295\npublish v1p3beta1: update with absolute address in comments\n\nPiperOrigin-RevId: 299146674\n\n638253bf86d1ce1c314108a089b7351440c2f0bf\nfix: add java_multiple_files option for automl text_sentiment.proto\n\nPiperOrigin-RevId: 298971070\n\n373d655703bf914fb8b0b1cc4071d772bac0e0d1\nUpdate Recs AI Beta public bazel file\n\nPiperOrigin-RevId: 298961623\n\ndcc5d00fc8a8d8b56f16194d7c682027b2c66a3b\nfix: add java_multiple_files option for automl classification.proto\n\nPiperOrigin-RevId: 298953301\n\na3f791827266f3496a6a5201d58adc4bb265c2a3\nchore: automl/v1 publish annotations and retry config\n\nPiperOrigin-RevId: 298942178\n\n01c681586d8d6dbd60155289b587aee678530bd9\nMark return_immediately in PullRequest deprecated.\n\nPiperOrigin-RevId: 298893281\n\nc9f5e9c4bfed54bbd09227e990e7bded5f90f31c\nRemove out of date documentation for predicate support on the Storage API\n\nPiperOrigin-RevId: 298883309\n\nfd5b3b8238d783b04692a113ffe07c0363f5de0f\ngenerate webrisk v1 proto\n\nPiperOrigin-RevId: 298847934\n\n541b1ded4abadcc38e8178680b0677f65594ea6f\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 298686266\n\nc0d171acecb4f5b0bfd2c4ca34fc54716574e300\n  Updated to include the Notification v1 API.\n\nPiperOrigin-RevId: 298652775\n\n2346a9186c0bff2c9cc439f2459d558068637e05\nAdd Service Directory v1beta1 protos and configs\n\nPiperOrigin-RevId: 298625638\n\na78ed801b82a5c6d9c5368e24b1412212e541bb7\nPublishing v3 protos and configs.\n\nPiperOrigin-RevId: 298607357\n\n4a180bfff8a21645b3a935c2756e8d6ab18a74e0\nautoml/v1beta1 publish proto updates\n\nPiperOrigin-RevId: 298484782\n\n6de6e938b7df1cd62396563a067334abeedb9676\nchore: use the latest gapic-generator and protoc-java-resource-name-plugin in Bazel workspace.\n\nPiperOrigin-RevId: 298474513\n\n244ab2b83a82076a1fa7be63b7e0671af73f5c02\nAdds service config definition for bigqueryreservation v1\n\nPiperOrigin-RevId: 298455048\n\n83c6f84035ee0f80eaa44d8b688a010461cc4080\nUpdate google/api/auth.proto to make AuthProvider to have JwtLocation\n\nPiperOrigin-RevId: 297918498\n\ne9e90a787703ec5d388902e2cb796aaed3a385b4\nDialogflow weekly v2/v2beta1 library update:\n  - adding get validation result\n  - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297671458\n\n1a2b05cc3541a5f7714529c665aecc3ea042c646\nAdding .yaml and .json config files.\n\nPiperOrigin-RevId: 297570622\n\ndfe1cf7be44dee31d78f78e485d8c95430981d6e\nPublish `QueryOptions` proto.\n\nIntroduced a `query_options` input in `ExecuteSqlRequest`.\n\nPiperOrigin-RevId: 297497710\n\ndafc905f71e5d46f500b41ed715aad585be062c3\npubsub: revert pull init_rpc_timeout & max_rpc_timeout back to 25 seconds and reset multiplier to 1.0\n\nPiperOrigin-RevId: 297486523\n\nf077632ba7fee588922d9e8717ee272039be126d\nfirestore: add update_transform\n\nPiperOrigin-RevId: 297405063\n\n0aba1900ffef672ec5f0da677cf590ee5686e13b\ncluster: use square brace for cross-reference\n\nPiperOrigin-RevId: 297204568\n\n5dac2da18f6325cbaed54603c43f0667ecd50247\nRestore retry params in gapic config because securitycenter has non-standard default retry params.\nRestore a few retry codes for some idempotent methods.\n\nPiperOrigin-RevId: 297196720\n\n1eb61455530252bba8b2c8d4bc9832960e5a56f6\npubsub: v1 replace IAM HTTP rules\n\nPiperOrigin-RevId: 297188590\n\n80b2d25f8d43d9d47024ff06ead7f7166548a7ba\nDialogflow weekly v2/v2beta1 library update:\n  - updates to mega agent api\n  - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297187629\n\n0b1876b35e98f560f9c9ca9797955f020238a092\nUse an older version of protoc-docs-plugin that is compatible with the specified gapic-generator and protobuf versions.\n\nprotoc-docs-plugin >=0.4.0 (see commit https://github.com/googleapis/protoc-docs-plugin/commit/979f03ede6678c487337f3d7e88bae58df5207af) is incompatible with protobuf 3.9.1.\n\nPiperOrigin-RevId: 296986742\n\n"
+        "sha": "275fbcce2c900278d487c33293a3c7e1fbcd3a34",
+        "internalRef": "301661567",
+        "log": "275fbcce2c900278d487c33293a3c7e1fbcd3a34\nfeat: pubsub/v1 add an experimental filter field to Subscription\n\nPiperOrigin-RevId: 301661567\n\nf2b18cec51d27c999ad30011dba17f3965677e9c\nFix: UpdateBackupRequest.backup is a resource, not a resource reference - remove annotation.\n\nPiperOrigin-RevId: 301636171\n\n800384063ac93a0cac3a510d41726fa4b2cd4a83\nCloud Billing Budget API v1beta1\nModified api documentation to include warnings about the new filter field.\n\nPiperOrigin-RevId: 301634389\n\n0cc6c146b660db21f04056c3d58a4b752ee445e3\nCloud Billing Budget API v1alpha1\nModified api documentation to include warnings about the new filter field.\n\nPiperOrigin-RevId: 301630018\n\nff2ea00f69065585c3ac0993c8b582af3b6fc215\nFix: Add resource definition for a parent of InspectTemplate which was otherwise missing.\n\nPiperOrigin-RevId: 301623052\n\n55fa441c9daf03173910760191646399338f2b7c\nAdd proto definition for AccessLevel, AccessPolicy, and ServicePerimeter.\n\nPiperOrigin-RevId: 301620844\n\ne7b10591c5408a67cf14ffafa267556f3290e262\nCloud Bigtable Managed Backup service and message proto files.\n\nPiperOrigin-RevId: 301585144\n\nd8e226f702f8ddf92915128c9f4693b63fb8685d\nfeat: Add time-to-live in a queue for builds\n\nPiperOrigin-RevId: 301579876\n\n430375af011f8c7a5174884f0d0e539c6ffa7675\ndocs: add missing closing backtick\n\nPiperOrigin-RevId: 301538851\n\n0e9f1f60ded9ad1c2e725e37719112f5b487ab65\nbazel: Use latest release of gax_java\n\nPiperOrigin-RevId: 301480457\n\n5058c1c96d0ece7f5301a154cf5a07b2ad03a571\nUpdate GAPIC v2 with batching parameters for Logging API\n\nPiperOrigin-RevId: 301443847\n\n64ab9744073de81fec1b3a6a931befc8a90edf90\nFix: Introduce location-based organization/folder/billing-account resources\nChore: Update copyright years\n\nPiperOrigin-RevId: 301373760\n\n23d5f09e670ebb0c1b36214acf78704e2ecfc2ac\nUpdate field_behavior annotations in V1 and V2.\n\nPiperOrigin-RevId: 301337970\n\nb2cf37e7fd62383a811aa4d54d013ecae638851d\nData Catalog V1 API\n\nPiperOrigin-RevId: 301282503\n\n1976b9981e2900c8172b7d34b4220bdb18c5db42\nCloud DLP api update. Adds missing fields to Finding and adds support for hybrid jobs.\n\nPiperOrigin-RevId: 301205325\n\nae78682c05e864d71223ce22532219813b0245ac\nfix: several sample code blocks in comments are now properly indented for markdown\n\nPiperOrigin-RevId: 301185150\n\ndcd171d04bda5b67db13049320f97eca3ace3731\nPublish Media Translation API V1Beta1\n\nPiperOrigin-RevId: 301180096\n\nff1713453b0fbc5a7544a1ef6828c26ad21a370e\nAdd protos and BUILD rules for v1 API.\n\nPiperOrigin-RevId: 301179394\n\n8386761d09819b665b6a6e1e6d6ff884bc8ff781\nfeat: chromeos/modlab publish protos and config for Chrome OS Moblab API.\n\nPiperOrigin-RevId: 300843960\n\n"
       }
     },
     {
-      "template": {
-        "name": "java_library",
-        "origin": "synthtool.gcp",
-        "version": "2020.2.4"
+      "git": {
+        "name": "synthtool",
+        "remote": "https://github.com/googleapis/synthtool.git",
+        "sha": "bcad3e01b69851ad682a87f8202003a1683ad73a"
       }
     }
   ],

From 13c867a4135ae024d0eb6af602ee50daf8ad30ff Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 20 Mar 2020 19:40:11 +0100
Subject: [PATCH 0308/1784] deps: update dependency org.threeten:threetenbp to
 v1.4.2 (#73)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [org.threeten:threetenbp](https://www.threeten.org/threetenbp) ([source](https://togithub.com/ThreeTen/threetenbp)) | patch | `1.4.1` -> `1.4.2` |

---

### Release Notes



ThreeTen/threetenbp

### [`v1.4.2`](https://togithub.com/ThreeTen/threetenbp/releases/v1.4.2)

[Compare Source](https://togithub.com/ThreeTen/threetenbp/compare/v1.4.1...v1.4.2)

See the [change notes](https://www.threeten.org/threetenbp/changes-report.html) for more information.




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e4ddd10b4c96..71dd0f93f871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
     3.11.4
     4.13
     28.2-android
-    1.4.1
+    1.4.2
     0.24.0
     1.10.19
     1.3.2

From 9a7cb9903ad53dfacf445029a133f6e8c76b635e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 23 Mar 2020 18:22:24 +0100
Subject: [PATCH 0309/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v4.3.0 (#74)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `4.2.0` -> `4.3.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index cac635632f83..c02a962f3dac 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        4.2.0
+        4.3.0
         pom
         import
       

From a370d5194315f98c04839e44cd89ce085577364b Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Mon, 23 Mar 2020 19:32:45 -0700
Subject: [PATCH 0310/1784] chore: enable context aware commits (#75)

---
 synth.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/synth.py b/synth.py
index 166b6d50509b..f010e546d8b1 100644
--- a/synth.py
+++ b/synth.py
@@ -18,6 +18,8 @@
 import synthtool.gcp as gcp
 import synthtool.languages.java as java
 
+AUTOSYNTH_MULTIPLE_COMMITS = True
+
 gapic = gcp.GAPICGenerator()
 
 protobuf_header = "// Generated by the protocol buffer compiler.  DO NOT EDIT!"

From 1ecf942228f963b947732381e44b0a25a4d24d6b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 24 Mar 2020 22:04:10 +0100
Subject: [PATCH 0311/1784] deps: update dependency
 com.google.cloud.samples:shared-configuration to v1.0.13 (#76)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | patch | `1.0.12` -> `1.0.13` |

---

### Release Notes



GoogleCloudPlatform/java-repo-tools

### [`v1.0.13`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/releases/v1.0.13)

[Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.12...v1.0.13)

Fix some issues w/ Checkstyle configuration.  We left the option to turn it off out.




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index c5a2e1c6b0b7..4760ce2dcebe 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.12
+    1.0.13
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index b9cd72060164..9cc9c3459f3b 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.12
+    1.0.13
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 79035e8763ae..87b9ba5e4e8a 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.12
+    1.0.13
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c02a962f3dac..073a0b29d045 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.12
+    1.0.13
   
 
   

From 44066288e15683dae04efc395b4987e51efdc2aa Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 25 Mar 2020 08:56:39 -0700
Subject: [PATCH 0312/1784] chore: update common templates (#78)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/01397865-3755-4aac-90a2-8834d828363b/targets
---
 .kokoro/build.sh           | 19 ++++++++++------
 .kokoro/common.sh          | 44 ++++++++++++++++++++++++++++++++++++++
 .kokoro/dependencies.sh    | 15 +++++++++----
 .kokoro/linkage-monitor.sh | 22 +++++++++++++------
 renovate.json              |  3 ++-
 synth.metadata             | 11 +++++-----
 6 files changed, 90 insertions(+), 24 deletions(-)
 create mode 100644 .kokoro/common.sh

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index c2b602e57eab..cc3cd547dc8c 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -20,17 +20,22 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 ## cd to the parent directory, i.e. the root of the git repo
 cd ${scriptDir}/..
 
+# include common functions
+source ${scriptDir}/common.sh
+
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true \
-  -Denforcer.skip=true \
-  -Dmaven.javadoc.skip=true \
-  -Dgcloud.download.skip=true \
-  -T 1C
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true \
+    -T 1C
 
 # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
 if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
new file mode 100644
index 000000000000..a3bbc5f67963
--- /dev/null
+++ b/.kokoro/common.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright 2020 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.
+
+# set -eo pipefail
+
+function retry_with_backoff {
+    attempts_left=$1
+    sleep_seconds=$2
+    shift 2
+    command=$@
+
+    echo "${command}"
+    ${command}
+    exit_code=$?
+
+    if [[ $exit_code == 0 ]]
+    then
+        return 0
+    fi
+
+    # failure
+    if [[ ${attempts_left} > 0 ]]
+    then
+        echo "failure (${exit_code}), sleeping ${sleep_seconds}..."
+        sleep ${sleep_seconds}
+        new_attempts=$((${attempts_left} - 1))
+        new_sleep=$((${sleep_seconds} * 2))
+        retry_with_backoff ${new_attempts} ${new_sleep} ${command}
+    fi
+
+    return $exit_code
+}
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index eea23ac6acd5..0aade871ce10 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -15,7 +15,13 @@
 
 set -eo pipefail
 
-cd github/java-datastore/
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
 
 # Print out Java
 java -version
@@ -24,8 +30,9 @@ echo $JOB_TYPE
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
index 9236dbd2263a..759ab4e2c220 100755
--- a/.kokoro/linkage-monitor.sh
+++ b/.kokoro/linkage-monitor.sh
@@ -17,18 +17,26 @@ set -eo pipefail
 # Display commands being run.
 set -x
 
-cd github/java-datastore/
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
 
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true \
-  -Denforcer.skip=true \
-  -Dmaven.javadoc.skip=true \
-  -Dgcloud.download.skip=true
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true
 
 # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
 JAR=linkage-monitor-latest-all-deps.jar
diff --git a/renovate.json b/renovate.json
index fc6412701ada..f79f3caafe76 100644
--- a/renovate.json
+++ b/renovate.json
@@ -56,6 +56,7 @@
     },
     {
       "packagePatterns": [
+        "^com.google.cloud:google-cloud-datastore",
         "^com.google.cloud:libraries-bom"
       ],
       "semanticCommitType": "chore",
@@ -75,4 +76,4 @@
     }
   ],
   "semanticCommits": true
-}
+}
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index bbdd6d48c0c0..25ba04e1ad95 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,5 +1,5 @@
 {
-  "updateTime": "2020-03-19T09:11:18.419522Z",
+  "updateTime": "2020-03-25T09:33:33.169965Z",
   "sources": [
     {
       "generator": {
@@ -12,16 +12,17 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "275fbcce2c900278d487c33293a3c7e1fbcd3a34",
-        "internalRef": "301661567",
-        "log": "275fbcce2c900278d487c33293a3c7e1fbcd3a34\nfeat: pubsub/v1 add an experimental filter field to Subscription\n\nPiperOrigin-RevId: 301661567\n\nf2b18cec51d27c999ad30011dba17f3965677e9c\nFix: UpdateBackupRequest.backup is a resource, not a resource reference - remove annotation.\n\nPiperOrigin-RevId: 301636171\n\n800384063ac93a0cac3a510d41726fa4b2cd4a83\nCloud Billing Budget API v1beta1\nModified api documentation to include warnings about the new filter field.\n\nPiperOrigin-RevId: 301634389\n\n0cc6c146b660db21f04056c3d58a4b752ee445e3\nCloud Billing Budget API v1alpha1\nModified api documentation to include warnings about the new filter field.\n\nPiperOrigin-RevId: 301630018\n\nff2ea00f69065585c3ac0993c8b582af3b6fc215\nFix: Add resource definition for a parent of InspectTemplate which was otherwise missing.\n\nPiperOrigin-RevId: 301623052\n\n55fa441c9daf03173910760191646399338f2b7c\nAdd proto definition for AccessLevel, AccessPolicy, and ServicePerimeter.\n\nPiperOrigin-RevId: 301620844\n\ne7b10591c5408a67cf14ffafa267556f3290e262\nCloud Bigtable Managed Backup service and message proto files.\n\nPiperOrigin-RevId: 301585144\n\nd8e226f702f8ddf92915128c9f4693b63fb8685d\nfeat: Add time-to-live in a queue for builds\n\nPiperOrigin-RevId: 301579876\n\n430375af011f8c7a5174884f0d0e539c6ffa7675\ndocs: add missing closing backtick\n\nPiperOrigin-RevId: 301538851\n\n0e9f1f60ded9ad1c2e725e37719112f5b487ab65\nbazel: Use latest release of gax_java\n\nPiperOrigin-RevId: 301480457\n\n5058c1c96d0ece7f5301a154cf5a07b2ad03a571\nUpdate GAPIC v2 with batching parameters for Logging API\n\nPiperOrigin-RevId: 301443847\n\n64ab9744073de81fec1b3a6a931befc8a90edf90\nFix: Introduce location-based organization/folder/billing-account resources\nChore: Update copyright years\n\nPiperOrigin-RevId: 301373760\n\n23d5f09e670ebb0c1b36214acf78704e2ecfc2ac\nUpdate field_behavior annotations in V1 and V2.\n\nPiperOrigin-RevId: 301337970\n\nb2cf37e7fd62383a811aa4d54d013ecae638851d\nData Catalog V1 API\n\nPiperOrigin-RevId: 301282503\n\n1976b9981e2900c8172b7d34b4220bdb18c5db42\nCloud DLP api update. Adds missing fields to Finding and adds support for hybrid jobs.\n\nPiperOrigin-RevId: 301205325\n\nae78682c05e864d71223ce22532219813b0245ac\nfix: several sample code blocks in comments are now properly indented for markdown\n\nPiperOrigin-RevId: 301185150\n\ndcd171d04bda5b67db13049320f97eca3ace3731\nPublish Media Translation API V1Beta1\n\nPiperOrigin-RevId: 301180096\n\nff1713453b0fbc5a7544a1ef6828c26ad21a370e\nAdd protos and BUILD rules for v1 API.\n\nPiperOrigin-RevId: 301179394\n\n8386761d09819b665b6a6e1e6d6ff884bc8ff781\nfeat: chromeos/modlab publish protos and config for Chrome OS Moblab API.\n\nPiperOrigin-RevId: 300843960\n\n"
+        "sha": "551cf1e6e3addcc63740427c4f9b40dedd3dac27",
+        "internalRef": "302792195",
+        "log": "551cf1e6e3addcc63740427c4f9b40dedd3dac27\nfeat: Add OS Config AgentEndpointService v1 PatchJobs and Tasks APIs.\n\nPiperOrigin-RevId: 302792195\n\n1df117114c73299b614dfd3ba3632bf246669336\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 302753982\n\n71d6c56a14bb433beb1237dccb48dabcd9597924\nRefresh monitoring client libraries.\nRename to Cloud Monitoring API.\nAdded support for TimeSeriesQueryLanguageCondition condition type in alert policies.\n\nPiperOrigin-RevId: 302735422\n\n25a1781c096974df99d556cc5888fefa82bc6425\nbazel: migrate all go_gapic_library targets to microgenerator implementation\n\n* update rules_go and gazelle bazel dependencies\n* update gapic-generator bazel dependency (with build file generator changes)\n\nPiperOrigin-RevId: 302730217\n\n36c0febd0fa7267ab66d14408eec2afd1b6bec4e\nUpdate GAPIC configurations to v2 .yaml.\n\nPiperOrigin-RevId: 302639621\n\n078f222366ed344509a48f2f084944ef61476613\nFix containeranalysis v1beta1 assembly target name\n\nPiperOrigin-RevId: 302529186\n\n0be7105dc52590fa9a24e784052298ae37ce53aa\nAdd BUILD.bazel file to asset/v1p1beta1\n\nPiperOrigin-RevId: 302154871\n\n6c248fd13e8543f8d22cbf118d978301a9fbe2a8\nAdd missing resource annotations and additional_bindings to dialogflow v2 API.\n\nPiperOrigin-RevId: 302063117\n\n9a3a7f33be9eeacf7b3e98435816b7022d206bd7\nChange the service name from \"chromeos-moblab.googleapis.com\" to \"chromeosmoblab.googleapis.com\"\n\nPiperOrigin-RevId: 302060989\n\n98a339237577e3de26cb4921f75fb5c57cc7a19f\nfeat: devtools/build/v1 publish client library config annotations\n\n* add details field to some of the BuildEvents\n* add final_invocation_id and build_tool_exit_code fields to BuildStatus\n\nPiperOrigin-RevId: 302044087\n\ncfabc98c6bbbb22d1aeaf7612179c0be193b3a13\nfeat: home/graph/v1 publish client library config annotations & comment updates\n\nThis change includes adding the client library configuration annotations, updated proto comments, and some client library configuration files.\n\nPiperOrigin-RevId: 302042647\n\nc8c8c0bd15d082db9546253dbaad1087c7a9782c\nchore: use latest gapic-generator in bazel WORKSPACE.\nincluding the following commits from gapic-generator:\n- feat: take source protos in all sub-packages (#3144)\n\nPiperOrigin-RevId: 301843591\n\ne4daf5202ea31cb2cb6916fdbfa9d6bd771aeb4c\nAdd bazel file for v1 client lib generation\n\nPiperOrigin-RevId: 301802926\n\n"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "bcad3e01b69851ad682a87f8202003a1683ad73a"
+        "sha": "ee4330a0e5f4b93978e8683fbda8e6d4148326b7",
+        "log": "ee4330a0e5f4b93978e8683fbda8e6d4148326b7\nchore(java_templates): mark version bumps of current library as a chore (#452)\n\nWith the samples/install-without-bom/pom.xml referencing the latest released library, we want to mark updates of this version as a chore for renovate bot.\na0d3133a5d45544a66345059eebf76933265c099\nfix(java): run mvn install with retry (#453)\n\n* fix(java): run mvn install with retry\n\n* fix invocation of command\n6a17abc7652e2fe563e1288c6e8c23fc260dda97\ndocs: document the release schedule we follow (#454)\n\n\n7e98e1609c91082f4eeb63b530c6468aefd18cfd\nbuild: use checkout@v2, not v1, as this allows manual re-running of tests (#451)\n\nhttps://github.com/actions/checkout/issues/23\n"
       }
     }
   ],

From 515b512431d0f15bbb379c3312b3bee5d5d4c2f0 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 25 Mar 2020 10:26:04 -0700
Subject: [PATCH 0313/1784] chore: update renovate config for shared samples
 parent (#79)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8dc67c4c-b602-45d4-bcb1-8c58b15f5c34/targets
---
 renovate.json  |  3 ++-
 synth.metadata | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/renovate.json b/renovate.json
index f79f3caafe76..83457deb1094 100644
--- a/renovate.json
+++ b/renovate.json
@@ -57,7 +57,8 @@
     {
       "packagePatterns": [
         "^com.google.cloud:google-cloud-datastore",
-        "^com.google.cloud:libraries-bom"
+        "^com.google.cloud:libraries-bom",
+        "^com.google.cloud.samples:shared-configuration"
       ],
       "semanticCommitType": "chore",
       "semanticCommitScope": "deps"
diff --git a/synth.metadata b/synth.metadata
index 25ba04e1ad95..8901007cde89 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,5 +1,5 @@
 {
-  "updateTime": "2020-03-25T09:33:33.169965Z",
+  "updateTime": "2020-03-25T17:14:59.964817Z",
   "sources": [
     {
       "generator": {
@@ -12,17 +12,17 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551cf1e6e3addcc63740427c4f9b40dedd3dac27",
-        "internalRef": "302792195",
-        "log": "551cf1e6e3addcc63740427c4f9b40dedd3dac27\nfeat: Add OS Config AgentEndpointService v1 PatchJobs and Tasks APIs.\n\nPiperOrigin-RevId: 302792195\n\n1df117114c73299b614dfd3ba3632bf246669336\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 302753982\n\n71d6c56a14bb433beb1237dccb48dabcd9597924\nRefresh monitoring client libraries.\nRename to Cloud Monitoring API.\nAdded support for TimeSeriesQueryLanguageCondition condition type in alert policies.\n\nPiperOrigin-RevId: 302735422\n\n25a1781c096974df99d556cc5888fefa82bc6425\nbazel: migrate all go_gapic_library targets to microgenerator implementation\n\n* update rules_go and gazelle bazel dependencies\n* update gapic-generator bazel dependency (with build file generator changes)\n\nPiperOrigin-RevId: 302730217\n\n36c0febd0fa7267ab66d14408eec2afd1b6bec4e\nUpdate GAPIC configurations to v2 .yaml.\n\nPiperOrigin-RevId: 302639621\n\n078f222366ed344509a48f2f084944ef61476613\nFix containeranalysis v1beta1 assembly target name\n\nPiperOrigin-RevId: 302529186\n\n0be7105dc52590fa9a24e784052298ae37ce53aa\nAdd BUILD.bazel file to asset/v1p1beta1\n\nPiperOrigin-RevId: 302154871\n\n6c248fd13e8543f8d22cbf118d978301a9fbe2a8\nAdd missing resource annotations and additional_bindings to dialogflow v2 API.\n\nPiperOrigin-RevId: 302063117\n\n9a3a7f33be9eeacf7b3e98435816b7022d206bd7\nChange the service name from \"chromeos-moblab.googleapis.com\" to \"chromeosmoblab.googleapis.com\"\n\nPiperOrigin-RevId: 302060989\n\n98a339237577e3de26cb4921f75fb5c57cc7a19f\nfeat: devtools/build/v1 publish client library config annotations\n\n* add details field to some of the BuildEvents\n* add final_invocation_id and build_tool_exit_code fields to BuildStatus\n\nPiperOrigin-RevId: 302044087\n\ncfabc98c6bbbb22d1aeaf7612179c0be193b3a13\nfeat: home/graph/v1 publish client library config annotations & comment updates\n\nThis change includes adding the client library configuration annotations, updated proto comments, and some client library configuration files.\n\nPiperOrigin-RevId: 302042647\n\nc8c8c0bd15d082db9546253dbaad1087c7a9782c\nchore: use latest gapic-generator in bazel WORKSPACE.\nincluding the following commits from gapic-generator:\n- feat: take source protos in all sub-packages (#3144)\n\nPiperOrigin-RevId: 301843591\n\ne4daf5202ea31cb2cb6916fdbfa9d6bd771aeb4c\nAdd bazel file for v1 client lib generation\n\nPiperOrigin-RevId: 301802926\n\n"
+        "sha": "fd83ab212176a1042e8d45ea90766b3bf59ac679",
+        "internalRef": "302913609",
+        "log": "fd83ab212176a1042e8d45ea90766b3bf59ac679\nfix: migrate osconfig/agentendpoint/v1 go_gapic_library target to microgen impl\n\nPiperOrigin-RevId: 302913609\n\n0e07113e776bdd8fcc0783372e08bb6e76cb1b5b\ndocs: Update documentation with links to smart home developer guides and reference pages. Remove outdated authorization instructions.\n\nPiperOrigin-RevId: 302892245\n\n"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "ee4330a0e5f4b93978e8683fbda8e6d4148326b7",
-        "log": "ee4330a0e5f4b93978e8683fbda8e6d4148326b7\nchore(java_templates): mark version bumps of current library as a chore (#452)\n\nWith the samples/install-without-bom/pom.xml referencing the latest released library, we want to mark updates of this version as a chore for renovate bot.\na0d3133a5d45544a66345059eebf76933265c099\nfix(java): run mvn install with retry (#453)\n\n* fix(java): run mvn install with retry\n\n* fix invocation of command\n6a17abc7652e2fe563e1288c6e8c23fc260dda97\ndocs: document the release schedule we follow (#454)\n\n\n7e98e1609c91082f4eeb63b530c6468aefd18cfd\nbuild: use checkout@v2, not v1, as this allows manual re-running of tests (#451)\n\nhttps://github.com/actions/checkout/issues/23\n"
+        "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8",
+        "log": "e36822bfa0acb355502dab391b8ef9c4f30208d8\nchore(java): treat samples shared configuration dependency update as chore (#457)\n\n\n1b4cc80a7aaf164f6241937dd87f3bd1f4149e0c\nfix: do not run node 8 CI (#456)\n\n\n"
       }
     }
   ],

From ce0726ba9ded67f48c4c11403f4f59b0dc30a5b7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 26 Mar 2020 00:20:42 +0100
Subject: [PATCH 0314/1784] deps: update dependency com.google.api:api-common
 to v1.9.0 (#80)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.api:api-common](https://togithub.com/googleapis/api-common-java) | minor | `1.8.1` -> `1.9.0` |

---

### Release Notes



googleapis/api-common-java

### [`v1.9.0`](https://togithub.com/googleapis/api-common-java/releases/v1.9.0)

[Compare Source](https://togithub.com/googleapis/api-common-java/compare/v1.8.1...v1.9.0)

03-25-2020 14:09 PST

#### New Features

-   Add `@BetaApi` `ApiFutres.catchingAsync()` ([#​117](https://togithub.com/googleapis/api-common-java/pull/117))

##### Dependencies

-   Update guava to v28.2-android ([#​110](https://togithub.com/googleapis/api-common-java/pull/110))
-   Update error_prone_annotations to v2.2.3 ([#​111](https://togithub.com/googleapis/api-common-java/pull/111))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 71dd0f93f871..8d6b203cafa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
     1.93.3
-    1.8.1
+    1.9.0
     1.17.0
     1.54.0
     1.28.0

From 89300eccf18f1c5afc5b61f09e7151a9b0620f6f Mon Sep 17 00:00:00 2001
From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Date: Fri, 27 Mar 2020 11:36:02 -0700
Subject: [PATCH 0315/1784] chore: migrate datastore synth.py to bazel (#82)

---
 synth.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/synth.py b/synth.py
index f010e546d8b1..d04690762ea1 100644
--- a/synth.py
+++ b/synth.py
@@ -20,7 +20,7 @@
 
 AUTOSYNTH_MULTIPLE_COMMITS = True
 
-gapic = gcp.GAPICGenerator()
+gapic = gcp.GAPICBazel()
 
 protobuf_header = "// Generated by the protocol buffer compiler.  DO NOT EDIT!"
 # License header
@@ -43,23 +43,25 @@
 
 service = 'datastore'
 versions = ['v1']
-config_pattern = '/google/datastore/artman_datastore.yaml'
 
 for version in versions:
   library = gapic.java_library(
       service=service,
       version=version,
-      config_path=config_pattern.format(version=version),
-      artman_output_name='')
+      bazel_target=f'//google/{service}/{version}:google-cloud-{service}-{version}-java',
+      proto_path=f'google/{service}/{version}',
+  )
+
+  library = library / f'google-cloud-{service}-{version}-java'
 
   s.replace(
-      library / f'proto-google-cloud-{service}-{version}/src/**/*.java',
+      library / f'proto-google-cloud-{service}-{version}-java/src/**/*.java',
       protobuf_header,
       f'{license_header}{protobuf_header}'
   )
 
   # Datastore only generates protos
-  s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')
+  s.copy(library / f'proto-google-cloud-{service}-{version}-java/src', f'proto-google-cloud-{service}-{version}/src')
 
   java.format_code('google-cloud-datastore/src')
   java.format_code(f'proto-google-cloud-{service}-{version}/src')

From b67b962d0883433ae9aea909886aa5b5d988e78c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 30 Mar 2020 18:58:37 +0200
Subject: [PATCH 0316/1784] deps: update dependency com.google.api:gax-bom to
 v1.55.0 (#83)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8d6b203cafa9..b44578196fa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@
     1.93.3
     1.9.0
     1.17.0
-    1.54.0
+    1.55.0
     1.28.0
     3.11.4
     4.13

From 46326840fada744a8d1abab05992ed6b75e00956 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 30 Mar 2020 19:56:34 +0200
Subject: [PATCH 0317/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.14 (#84)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | patch | `1.0.13` -> `1.0.14` |

---

### Release Notes



GoogleCloudPlatform/java-repo-tools

### [`v1.0.14`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/releases/v1.0.14)

[Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.13...v1.0.14)

-   Update CheckStyle to 8.31
-   Add SpotBugs




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4760ce2dcebe..bd080036a7d9 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.13
+    1.0.14
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index 9cc9c3459f3b..c2c1d555e39e 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.13
+    1.0.14
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 87b9ba5e4e8a..d6a3d68a2760 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.13
+    1.0.14
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 073a0b29d045..8baa296c9f26 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.13
+    1.0.14
   
 
   

From d5aca20e65e24938b1409d29af07baf693982f58 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 1 Apr 2020 21:34:24 +0200
Subject: [PATCH 0318/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v4.4.0 (#85)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `4.3.0` -> `4.4.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 8baa296c9f26..5b67aab8f8ad 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        4.3.0
+        4.4.0
         pom
         import
       

From 6ecc58918508570d6cbc136422b5d7c251514b20 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 6 Apr 2020 17:48:36 +0200
Subject: [PATCH 0319/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.15 (#87)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | patch | `1.0.14` -> `1.0.15` |

---

### Release Notes



GoogleCloudPlatform/java-repo-tools

### [`v1.0.15`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/releases/v1.0.15)

[Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.14...v1.0.15)

-   Move some stuff around (in prep for a change to release process) pom.xml's
-   Add an exclude filter for SpotBugs. (disable the Java 11 surprise)
-   Don't fail on SpotBugs issues for now
-   add PMD reporting
-   Don't fail on PMD issues for now.




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index bd080036a7d9..a83c42ed2411 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.14
+    1.0.15
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index c2c1d555e39e..7dcc9cc87c60 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.14
+    1.0.15
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d6a3d68a2760..235b449de9df 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.14
+    1.0.15
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 5b67aab8f8ad..febe2e489814 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.14
+    1.0.15
   
 
   

From 75a7254a65e1d97a7bc8fae0f812ffebea060b60 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 6 Apr 2020 18:34:27 +0200
Subject: [PATCH 0320/1784] deps: update dependency org.threeten:threetenbp to
 v1.4.3 (#88)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [org.threeten:threetenbp](https://www.threeten.org/threetenbp) ([source](https://togithub.com/ThreeTen/threetenbp)) | patch | `1.4.2` -> `1.4.3` |

---

### Release Notes



ThreeTen/threetenbp

### [`v1.4.3`](https://togithub.com/ThreeTen/threetenbp/releases/v1.4.3)

[Compare Source](https://togithub.com/ThreeTen/threetenbp/compare/v1.4.2...v1.4.3)

See the [change notes](https://www.threeten.org/threetenbp/changes-report.html) for more information.




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b44578196fa4..50e59a96baf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
     3.11.4
     4.13
     28.2-android
-    1.4.2
+    1.4.3
     0.24.0
     1.10.19
     1.3.2

From 05a097bcc9cdba6d0a60e97e16e0535911f99f1f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 6 Apr 2020 21:44:12 +0200
Subject: [PATCH 0321/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v4.4.1 (#89)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | patch | `4.4.0` -> `4.4.1` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index febe2e489814..9c1e939b41fd 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        4.4.0
+        4.4.1
         pom
         import
       

From 83945955b6bc6f915d321d190a2b6349fa52b597 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 7 Apr 2020 00:54:47 +0200
Subject: [PATCH 0322/1784] deps: update core dependencies (#86)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [io.grpc:grpc-bom](https://togithub.com/grpc/grpc-java) | patch | `1.28.0` -> `1.28.1` |
| [com.google.api:gax-bom](https://togithub.com/googleapis/gax-java) | minor | `1.55.0` -> `1.56.0` |

---

### Release Notes



grpc/grpc-java

### [`v1.28.1`](https://togithub.com/grpc/grpc-java/releases/v1.28.1)

[Compare Source](https://togithub.com/grpc/grpc-java/compare/v1.28.0...v1.28.1)

#### Bug Fixes

-   xds: implement more clear specifications for locality filtering (allow localities with 0 endpoint, ignore localities with 0 weight, check for locality priority continuity). ([#​6875](https://togithub.com/grpc/grpc-java/issues/6875))






googleapis/gax-java

### [`v1.56.0`](https://togithub.com/googleapis/gax-java/releases/v1.56.0)

[Compare Source](https://togithub.com/googleapis/gax-java/compare/v1.55.0...v1.56.0)

04-06-2020 10:29 PDT

##### New Features

-   Add ability to partially update retry settings ([#​993](https://togithub.com/googleapis/gax-java/pull/993))

##### Dependencies

-   Update grpc to 1.28.1 ([#​1013](https://togithub.com/googleapis/gax-java/pull/1013))
-   Update com.google.api:api-common to 1.9.0 ([#​992](https://togithub.com/googleapis/gax-java/pull/992))
-   Add javax.annotations dependency in bazel build to gax-grpc ([#​1000](https://togithub.com/googleapis/gax-java/pull/1000))

##### Internal / Testing Changes

-   test: make it easier to debug failures in SettingsTest ([#​994](https://togithub.com/googleapis/gax-java/pull/994))
-   build: update dependency gradle.plugin.com.dorongold.plugins:task-tree to v1.5 ([#​995](https://togithub.com/googleapis/gax-java/pull/995))
-   test: update dependency com.google.api.grpc:grpc-google-cloud-pubsub-v1 to v1.86.0 ([#​1008](https://togithub.com/googleapis/gax-java/pull/1008))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:ghost: **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/config-help/issues) if that's undesired.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 50e59a96baf0..325482a14d79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,8 +155,8 @@
     1.93.3
     1.9.0
     1.17.0
-    1.55.0
-    1.28.0
+    1.56.0
+    1.28.1
     3.11.4
     4.13
     28.2-android

From 9707cd41ac0b43bee048bb2386ab2484ced0e57b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 7 Apr 2020 01:08:21 +0200
Subject: [PATCH 0323/1784] deps: update core dependencies to v1.93.4 (#90)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-core](https://togithub.com/googleapis/java-core) | patch | `1.93.3` -> `1.93.4` |
| [com.google.cloud:google-cloud-core-http](https://togithub.com/googleapis/java-core) | patch | `1.93.3` -> `1.93.4` |

---

### Release Notes



googleapis/java-core

### [`v1.93.4`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1934-httpswwwgithubcomgoogleapisjava-corecomparev1933v1934-2020-04-06)

[Compare Source](https://togithub.com/googleapis/java-core/compare/v1.93.3...v1.93.4)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 325482a14d79..6117888e6bfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.93.3
+    1.93.4
     1.9.0
     1.17.0
     1.56.0

From e718301f7218f855f164a5c08117f515376dea9a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 8 Apr 2020 06:46:41 +0200
Subject: [PATCH 0324/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.5.0 (#91)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | minor | `0.4.0` -> `0.5.0` |

---

### Release Notes



googleapis/java-shared-config

### [`v0.5.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​050-httpswwwgithubcomgoogleapisjava-shared-configcomparev040v050-2020-04-07)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.4.0...v0.5.0)

##### Features

-   add ban duplicate classes rule ([#​126](https://www.github.com/googleapis/java-shared-config/issues/126)) ([e38a7cc](https://www.github.com/googleapis/java-shared-config/commit/e38a7cc949396f8f5696e62cd060e0c076047b8d))
-   add devsite javadoc profile ([#​121](https://www.github.com/googleapis/java-shared-config/issues/121)) ([7f452fb](https://www.github.com/googleapis/java-shared-config/commit/7f452fb6c5704f6ce0f731085479a28fb99ebcb9))
-   add maven flatten plugin ([#​127](https://www.github.com/googleapis/java-shared-config/issues/127)) ([fb00799](https://www.github.com/googleapis/java-shared-config/commit/fb00799c416d324d68da5b660a26f7ef595c26d9))

##### Bug Fixes

-   declare com.coveo:fmt-maven-plugin version/configuration ([#​90](https://www.github.com/googleapis/java-shared-config/issues/90)) ([5cf71a6](https://www.github.com/googleapis/java-shared-config/commit/5cf71a6ed699907082756e70c2fdee6ad3632f38))

##### Dependencies

-   update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#​118](https://www.github.com/googleapis/java-shared-config/issues/118)) ([58ae69e](https://www.github.com/googleapis/java-shared-config/commit/58ae69eb5ba037963cdaed0c2b0e30663bc873eb))
-   update dependency com.puppycrawl.tools:checkstyle to v8.29 ([f62292d](https://www.github.com/googleapis/java-shared-config/commit/f62292dab75699a75f8a7d499fe2ccfb7ee93783))
-   update dependency org.apache.maven.plugins:maven-antrun-plugin to v1.8 ([#​124](https://www.github.com/googleapis/java-shared-config/issues/124)) ([a681536](https://www.github.com/googleapis/java-shared-config/commit/a68153643400c3f3b5c5959cda4dc3b552336427))
-   update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.1.2 ([#​107](https://www.github.com/googleapis/java-shared-config/issues/107)) ([c9b096b](https://www.github.com/googleapis/java-shared-config/commit/c9b096b81b1f4f8dc2d1302f259f0321722e1ca5))
-   update dependency org.apache.maven.plugins:maven-site-plugin to v3.9.0 ([#​103](https://www.github.com/googleapis/java-shared-config/issues/103)) ([abe7140](https://www.github.com/googleapis/java-shared-config/commit/abe714060e858c70a83888fb34438c45d97b1168))
-   update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.1.0 ([#​101](https://www.github.com/googleapis/java-shared-config/issues/101)) ([ac69572](https://www.github.com/googleapis/java-shared-config/commit/ac69572be76e4462fdf65fa6e7f0935c3d51d827))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 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 34d06178fda9..b6f9088b112d 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
-    0.4.0
+    0.5.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 6117888e6bfb..865c75a86c6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.4.0
+    0.5.0
   
 
   

From b73e70b40a06963e3cebc3713d8cd6f3afd50190 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2020 22:16:05 +0000
Subject: [PATCH 0325/1784] chore: release 1.101.4 (#81)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.101.4](https://www.github.com/googleapis/java-datastore/compare/v1.101.3...v1.101.4) (2020-04-08)


### Dependencies

* update core dependencies ([#64](https://www.github.com/googleapis/java-datastore/issues/64)) ([ce0fd11](https://www.github.com/googleapis/java-datastore/commit/ce0fd116dbc5de69ae4526d95cd8014eaf2da1a0))
* update core dependencies ([#86](https://www.github.com/googleapis/java-datastore/issues/86)) ([8394595](https://www.github.com/googleapis/java-datastore/commit/83945955b6bc6f915d321d190a2b6349fa52b597))
* update core dependencies to v1.93.3 ([#67](https://www.github.com/googleapis/java-datastore/issues/67)) ([3286a38](https://www.github.com/googleapis/java-datastore/commit/3286a38b3f4176f0b83a9a4230fba2c431c86047))
* update core dependencies to v1.93.4 ([#90](https://www.github.com/googleapis/java-datastore/issues/90)) ([9707cd4](https://www.github.com/googleapis/java-datastore/commit/9707cd41ac0b43bee048bb2386ab2484ced0e57b))
* update dependency com.google.api:api-common to v1.9.0 ([#80](https://www.github.com/googleapis/java-datastore/issues/80)) ([ce0726b](https://www.github.com/googleapis/java-datastore/commit/ce0726ba9ded67f48c4c11403f4f59b0dc30a5b7))
* update dependency com.google.api:gax-bom to v1.55.0 ([#83](https://www.github.com/googleapis/java-datastore/issues/83)) ([b67b962](https://www.github.com/googleapis/java-datastore/commit/b67b962d0883433ae9aea909886aa5b5d988e78c))
* update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#76](https://www.github.com/googleapis/java-datastore/issues/76)) ([1ecf942](https://www.github.com/googleapis/java-datastore/commit/1ecf942228f963b947732381e44b0a25a4d24d6b))
* update dependency com.google.oauth-client:google-oauth-client to v1.30.6 ([#60](https://www.github.com/googleapis/java-datastore/issues/60)) ([e355d0f](https://www.github.com/googleapis/java-datastore/commit/e355d0f8ac86601099d8d3570f786d5a3880b968))
* update dependency org.threeten:threetenbp to v1.4.2 ([#73](https://www.github.com/googleapis/java-datastore/issues/73)) ([13c867a](https://www.github.com/googleapis/java-datastore/commit/13c867a4135ae024d0eb6af602ee50daf8ad30ff))
* update dependency org.threeten:threetenbp to v1.4.3 ([#88](https://www.github.com/googleapis/java-datastore/issues/88)) ([75a7254](https://www.github.com/googleapis/java-datastore/commit/75a7254a65e1d97a7bc8fae0f812ffebea060b60))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 16 ++++++++++++++++
 README.md                               |  6 +++---
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 865df6c35507..f841b3c3e1c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+### [1.101.4](https://www.github.com/googleapis/java-datastore/compare/v1.101.3...v1.101.4) (2020-04-08)
+
+
+### Dependencies
+
+* update core dependencies ([#64](https://www.github.com/googleapis/java-datastore/issues/64)) ([ce0fd11](https://www.github.com/googleapis/java-datastore/commit/ce0fd116dbc5de69ae4526d95cd8014eaf2da1a0))
+* update core dependencies ([#86](https://www.github.com/googleapis/java-datastore/issues/86)) ([8394595](https://www.github.com/googleapis/java-datastore/commit/83945955b6bc6f915d321d190a2b6349fa52b597))
+* update core dependencies to v1.93.3 ([#67](https://www.github.com/googleapis/java-datastore/issues/67)) ([3286a38](https://www.github.com/googleapis/java-datastore/commit/3286a38b3f4176f0b83a9a4230fba2c431c86047))
+* update core dependencies to v1.93.4 ([#90](https://www.github.com/googleapis/java-datastore/issues/90)) ([9707cd4](https://www.github.com/googleapis/java-datastore/commit/9707cd41ac0b43bee048bb2386ab2484ced0e57b))
+* update dependency com.google.api:api-common to v1.9.0 ([#80](https://www.github.com/googleapis/java-datastore/issues/80)) ([ce0726b](https://www.github.com/googleapis/java-datastore/commit/ce0726ba9ded67f48c4c11403f4f59b0dc30a5b7))
+* update dependency com.google.api:gax-bom to v1.55.0 ([#83](https://www.github.com/googleapis/java-datastore/issues/83)) ([b67b962](https://www.github.com/googleapis/java-datastore/commit/b67b962d0883433ae9aea909886aa5b5d988e78c))
+* update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#76](https://www.github.com/googleapis/java-datastore/issues/76)) ([1ecf942](https://www.github.com/googleapis/java-datastore/commit/1ecf942228f963b947732381e44b0a25a4d24d6b))
+* update dependency com.google.oauth-client:google-oauth-client to v1.30.6 ([#60](https://www.github.com/googleapis/java-datastore/issues/60)) ([e355d0f](https://www.github.com/googleapis/java-datastore/commit/e355d0f8ac86601099d8d3570f786d5a3880b968))
+* update dependency org.threeten:threetenbp to v1.4.2 ([#73](https://www.github.com/googleapis/java-datastore/issues/73)) ([13c867a](https://www.github.com/googleapis/java-datastore/commit/13c867a4135ae024d0eb6af602ee50daf8ad30ff))
+* update dependency org.threeten:threetenbp to v1.4.3 ([#88](https://www.github.com/googleapis/java-datastore/issues/88)) ([75a7254](https://www.github.com/googleapis/java-datastore/commit/75a7254a65e1d97a7bc8fae0f812ffebea060b60))
+
 ### [1.101.3](https://www.github.com/googleapis/java-datastore/compare/v1.101.2...v1.101.3) (2020-02-28)
 
 
diff --git a/README.md b/README.md
index 5432e0da23ec..ec6912af2496 100644
--- a/README.md
+++ b/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.102.3
+  1.102.4
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.102.3'
+compile 'com.google.cloud:google-cloud-datastore:1.102.4'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.4"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b6f9088b112d..92fa21583a59 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
-  1.102.4-SNAPSHOT
+  1.102.4
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.4-SNAPSHOT
+        0.85.4
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.4-SNAPSHOT
+        1.102.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5ad7dabdcb63..fc4efd845fea 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.4-SNAPSHOT
+  1.102.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.4-SNAPSHOT
+    1.102.4
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 865c75a86c6b..947554d400c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.4-SNAPSHOT
+  1.102.4
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.4-SNAPSHOT
+        0.85.4
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a14fb4d7661f..690407179d02 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.85.4-SNAPSHOT
+  0.85.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.4-SNAPSHOT
+    1.102.4
   
   
     
diff --git a/versions.txt b/versions.txt
index be55ef014553..20c0856b6c04 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.3:1.102.4-SNAPSHOT
-google-cloud-datastore-bom:1.102.3:1.102.4-SNAPSHOT
-google-cloud-datastore-parent:1.102.3:1.102.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.85.3:0.85.4-SNAPSHOT
+google-cloud-datastore:1.102.4:1.102.4
+google-cloud-datastore-bom:1.102.4:1.102.4
+google-cloud-datastore-parent:1.102.4:1.102.4
+proto-google-cloud-datastore-v1:0.85.4:0.85.4
 

From 592d4b21f2637ed2f6b60a984ec215239ad2f923 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2020 22:40:05 +0000
Subject: [PATCH 0326/1784] chore: release 1.101.5-SNAPSHOT (#92)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 92fa21583a59..68132188c99a 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
-  1.102.4
+  1.102.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.4
+        0.85.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.4
+        1.102.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index fc4efd845fea..17d8745a8182 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.4
+  1.102.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.4
+    1.102.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 947554d400c6..3b21a4122513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.4
+  1.102.5-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -172,7 +172,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.4
+        0.85.5-SNAPSHOT
       
 
       
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 690407179d02..1a7d2cebf8f7 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.85.4
+  0.85.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.4
+    1.102.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 20c0856b6c04..2351fb5626d4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.4:1.102.4
-google-cloud-datastore-bom:1.102.4:1.102.4
-google-cloud-datastore-parent:1.102.4:1.102.4
-proto-google-cloud-datastore-v1:0.85.4:0.85.4
+google-cloud-datastore:1.102.4:1.102.5-SNAPSHOT
+google-cloud-datastore-bom:1.102.4:1.102.5-SNAPSHOT
+google-cloud-datastore-parent:1.102.4:1.102.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.85.4:0.85.5-SNAPSHOT
 

From dd22056e8b3b462fe4d9698f5445a56546ce9377 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 8 Apr 2020 20:54:16 -0700
Subject: [PATCH 0327/1784] chore: update common templates (#94)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/39c06e45-efe9-45a2-98fc-54de7a19f352/targets
---
 .kokoro/common.sh               | 14 ++++++++++++--
 .kokoro/nightly/integration.cfg | 15 +++++++++++++++
 synth.metadata                  | 23 +++++++++++------------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index a3bbc5f67963..8f09de5d3d10 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -13,18 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# set -eo pipefail
-
 function retry_with_backoff {
     attempts_left=$1
     sleep_seconds=$2
     shift 2
     command=$@
 
+
+    # store current flag state
+    flags=$-
+    
+    # allow a failures to continue
+    set +e
     echo "${command}"
     ${command}
     exit_code=$?
 
+    # restore "e" flag
+    if [[ ${flags} =~ e ]]
+    then set -e
+    else set +e
+    fi
+
     if [[ $exit_code == 0 ]]
     then
         return 0
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 8bf59c02edd6..ca027480092f 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -6,11 +6,26 @@ env_vars: {
   value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
 
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
 env_vars: {
   key: "ENABLE_BUILD_COP"
   value: "true"
 }
 
+env_vars: {
+    key: "GOOGLE_APPLICATION_CREDENTIALS"
+    value: "keystore/73713_java_it_service_account"
+}
+
 before_action {
   fetch_keystore {
     keystore_resource {
diff --git a/synth.metadata b/synth.metadata
index 8901007cde89..4f4ab0fd5782 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,28 +1,28 @@
 {
-  "updateTime": "2020-03-25T17:14:59.964817Z",
+  "updateTime": "2020-04-09T00:14:55.498118Z",
   "sources": [
     {
-      "generator": {
-        "name": "artman",
-        "version": "1.1.1",
-        "dockerImage": "googleapis/artman@sha256:5ef340c8d9334719bc5c6981d95f4a5d2737b0a6a24f2b9a0d430e96fff85c5b"
+      "git": {
+        "name": ".",
+        "remote": "https://github.com/googleapis/java-datastore.git",
+        "sha": "592d4b21f2637ed2f6b60a984ec215239ad2f923"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "fd83ab212176a1042e8d45ea90766b3bf59ac679",
-        "internalRef": "302913609",
-        "log": "fd83ab212176a1042e8d45ea90766b3bf59ac679\nfix: migrate osconfig/agentendpoint/v1 go_gapic_library target to microgen impl\n\nPiperOrigin-RevId: 302913609\n\n0e07113e776bdd8fcc0783372e08bb6e76cb1b5b\ndocs: Update documentation with links to smart home developer guides and reference pages. Remove outdated authorization instructions.\n\nPiperOrigin-RevId: 302892245\n\n"
+        "sha": "d741cd976975c745d0199987aff0e908b8352992",
+        "internalRef": "305561906",
+        "log": "d741cd976975c745d0199987aff0e908b8352992\nchore: enable gapicv2 for firestore/v1 API\n\nNote that this contains breaking Java changes:\n  com.google.cloud.firestore.v1.FirestoreClient: Method 'public void deleteDocument(com.google.firestore.v1.AnyPathName)' has been removed\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305561906\n\n0d69cddaa23b556e7299f84ad55a02ec1cad55a9\nchore: enable gapicv2 for firestore/admin/v1 API\n\nCommitter: @miraleung\n\nThere are the following breaking changes due to the collection_id discrepancy between [1] and [2]\n\n1. https://github.com/googleapis/googleapis/blob/6f8350c0df231d7e742fa10dbf929f33047715c9/google/firestore/admin/v1/firestore_gapic.yaml#L24-L29\n2. https://github.com/googleapis/googleapis/blob/6f8350c0df231d7e742fa10dbf929f33047715c9/google/firestore/admin/v1/field.proto#L39\n```\ncom.google.firestore.admin.v1.FieldName: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.FieldName: Method 'public java.lang.String getFieldId()' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public java.lang.String getFieldId()' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public com.google.firestore.admin.v1.FieldName$Builder setCollectionId(java.lang.String)' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public com.google.firestore.admin.v1.FieldName$Builder setFieldId(java.lang.String)' has been removed\ncom.google.firestore.admin.v1.IndexName: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.IndexName: Method 'public java.lang.String getIndexId()' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public java.lang.String getIndexId()' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public com.google.firestore.admin.v1.IndexName$Builder setCollectionId(java.lang.String)' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public com.google.firestore.admin.v1.IndexName$Builder setIndexId(java.lang.String)' has been removed\n```\n\nPiperOrigin-RevId: 305561114\n\n6f8350c0df231d7e742fa10dbf929f33047715c9\nchore: enable gapicv2 for firestore/v1beta1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305537104\n\nd398d687aad9eab4c6ceee9cd5e012fa61f7e28c\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 305496764\n\n5520cb891a72ab0b0cbe3facaca7b012785f5b49\nchore: update gapic-generator to cd3c9ee7\n\nChanges include:\n* update generated nox file\n* fix generated license text alignment\n\nPiperOrigin-RevId: 305484038\n\nb20965f260d70e57b7dcd312cd356d6a81f31f8e\nUpdating retry configuration settings.\n\nPiperOrigin-RevId: 305431885\n\n83d7f20c06182cb6ada9a3b47daf17b2fd22b020\nMigrate dialogflow from gapic v1 to gapic v2.\nIncluding breaking changes (resource pattern change) introduced in cl/304043500.\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 305358314\n\nf8a97692250a6c781d87528995a5c72d41ca7762\nchore: enable gapic v2 and proto annotation for Grafeas API.\n\ncommitter: @noahdietz\nPiperOrigin-RevId: 305354660\n\nb1a5ca68468eb1587168972c9d15928e98ba92b0\nEnable gapicv2 for v1/osconfig\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305351235\n\nc803327f9b1dd2583b070645b5b86e5e7ead3161\nEnable gapicv2 for osconfig/agentendpoint/v1beta\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305350472\n\n99dddf1de598f95a71d3536f5c170d84f0c0ef87\nchore: enable gapicv2 for build/v1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305349884\n\nbf85ee3ed64951c14b19ef8577689f43ee6f0f41\nchore: enable gapicv2 for cloudbuild/v1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305349873\n\nf497c7aa912df121e11772767e667fdbc10a63d9\nchore: enable gapic v2 and proto annotation for Web Security Scanner v1alpha API.\n\ncommitter: @noahdietz\nPiperOrigin-RevId: 305349342\n\n0669a37c66d76bd413343da69420bb75c49062e7\nchore: rename unused GAPIC v1 configs for IAM to legacy\n\ncommitter: @noahdietz\nPiperOrigin-RevId: 305340308\n\naf7da29c24814a1c873c22f477e9dd8dd5a17b0b\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 305330079\n\n3f767aa32b4b3313027d05b503aaba63e0c432a3\ndocs: Update an out-of-date external link.\n\nPiperOrigin-RevId: 305329485\n\n9ede34d093b9d786a974448fc7a3a17948c203e2\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 305327985\n\n27daba50281357b676e1ba882422ebeab4ce4f92\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 305327500\n\n82de0f6f04649651958b96fbc5b0b39dd4dbbd01\nFix: Add missing resource name definition (from the Compute API).\n\nPiperOrigin-RevId: 305324763\n\n744591190e828440f72745aef217f883afd1fd71\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 305323909\n\n1247c135ceaedfe04261d27a64aaecf78ffbae74\nchore: enable gapicv2 for videointelligence/v1beta2 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305321976\n\n633c8b13227b9e3810749964d580e5be504db488\nchore: enable gapicv2 for videointelligence/v1p1beta1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305320877\n\n29aac60f121dc43382b37ff92f2dbb692d94143a\ndocs: fix broken link to policy reference documentation.\n\nPiperOrigin-RevId: 305319540\n\n54ddbbf14c489b8a2f0731aa39408c016f5a8387\nbazel: update gapic-generator-go to v0.13.0\n\nChanges include:\n* add clientHook feature\n\nPiperOrigin-RevId: 305289945\n\n823facb4ca6a4b36b817ce955a790dcb40cf808f\nchore: enable gapicv2 for videointelligence/v1p3beta1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305155214\n\n6b9c969d42bcb0f8206675bd868ed7d1ddcdaef9\nAdd API for bigqueryreservation v1.\n\nPiperOrigin-RevId: 305151484\n\n514f7d27811832a9f58b83d6f6305d894b097cf6\nchore: enable gapicv2 for phishingprotection/v1beta1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305126983\n\nff74d47d47280e6bbcbad1a7c82b1e0959c472ec\nfix: PHP-related fixes in BUILD.bazel and service.yamls\n\nThis PR also adds the rules for all 7 langauges in OsLogin and Kms BUILD.bazel files. Those build files were missing rules for 5 langagues, including PHP.\n\nThis PR is the prerequisite for migrating PHP synth.py scripts from artman to bazel.\n\nThe fixes in service.yaml fix regression made during proto annotation migration. This became visible only during PHP generation, because only PHP depends on the affected sections of the service.yaml config.\n\nPiperOrigin-RevId: 305108224\n\nfdbc7b1f63969307c71143a0c24fdfd02e739df6\nEnable gapicv2 for osconfig/agentendpoint/v1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305086443\n\n1490d30e1ae339570dd7826ba625a603ede91a08\nEnable gapicv2 for osconfig/v1beta\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305069755\n\n7bf824e82e5c3549642b150dc4a9579602000f34\nEnable gapicv2 for iam/credentials/v1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305065283\n\n9ff6fd3b22f99167827e89aae7778408b5e82425\nUpdates Dataproc v1 API:\n- Adds Dataproc Jobs.SubmitJobAsOperation RPC\n- Adds SparkR and Presto job types to WorkflowTemplates\n- Adds new Optional Components\n- Clarifies usage of some APIs\n\nPiperOrigin-RevId: 305053617\n\ncad0f5137a70d0d14a8d9acbfcee98e4cd3e9662\nUpdates to Dataproc v1beta2 API:\n- Adds SparkR and Presto job types to WorkflowTemplates\n- Adds new Optional Components\n- Clarifies usage of some APIs\n\nPiperOrigin-RevId: 305053062\n\na005f045a301535eeb4c4b3fa7bb94eec9d22a8b\nAdd support for Cloud EKM to the Cloud KMS service and resource protos.\n\nPiperOrigin-RevId: 305026790\n\n5077b1e4674afdbbf11dac3f5f43d36285ba53ff\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304836531\n\nd6cb4997910eda04c0c66c0f2fd043eeaa0f660d\nchore: enable gapic v2 and proto annotation for documentai API.\n\ncommitter @summer-ji-eng\n\nPiperOrigin-RevId: 304724866\n\n490bc556608bfa5b1548c9374b06152fa33d657e\nEnable gapicv2 for devtools/remoteworkers/v1test2\n\nCommitter: @miraleung\nPiperOrigin-RevId: 304718691\n\n9f78ce31a5bd7f4a63e3cf0ddf28221557adb7ed\nEnable gapicv2 for managedidentities/v1beta1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 304718676\n\n6e17d259b8e320bc51aa240cefef05ec753e2b83\ndocs: treat a dummy example URL as a string literal instead of a link\n\nPiperOrigin-RevId: 304716376\n\na8d76f99d3073aaccabdcc122c798a63e812c4fe\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 304702368\n\n65c749bc6a1d240416a0e6979381b67f97aff907\ndocs: fix formatting of some regexes and string literals.\n\nPiperOrigin-RevId: 304701150\n\n9119eefcd2b5ce845a680fa4ec4093ed733498f0\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304698702\n\n62a2a7cc33d3535638d220df238823eefcca930d\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304696461\n\n23848c8f64a5e81a239d6133378468185f1756dc\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304696192\n\n9514fa9e390a4c0715972c5b510cf4c10ad049a1\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 304695334\n\n0f7b1509a9a452808c3d07fe90fedfcea763d7d5\nfix: change config_schema_version to 2.0.0 for containeranalysis v1 gapic config.\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 304672648\n\n3d52f3c126fbfc31f067a7f54737b7f0dfbce163\nDialogflow weekly v2 library update:\n- Change `parent` field's resource_reference to specify child_type instead of type per client library generation requirement;\n- Change Session with its child resource pattern to support both projects/{project}/agent/sessions/{session} and projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session};\n- Fix `method_signature`\n- Regular documentation update\n\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 304635286\n\n4a6a01ce0ead505c245d11a2ce156de34800c58f\ndocs: change a relative URL to an absolute URL to fix broken links.\n\nPiperOrigin-RevId: 304633630\n\n1b969c28a6579265e89cd35e6c2ecacc89970e2d\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304620317\n\n5378173a889f9c7d83e36e52d38a6267190de692\nAdd v1beta2 SubmitJobAsOperation RPC to Dataproc.\n\nPiperOrigin-RevId: 304594381\n\n3d5d228a58bdf875e6147b228db3159010c735ee\nEnable visibility on the GetSnapshot and GetTopicSnapshots methods\n\nPiperOrigin-RevId: 304500143\n\n1346f5c11a0376bc82c5c03259b304de52671518\nRefresh public client library for Cloud Monitoring.\nIncrease default ListTimeSeries deadline to 90s.\n\nPiperOrigin-RevId: 304467075\n\n4a6cfccb4a32cb28db7366295d90078c6af3112f\ndocs: Fix link in monitoring summary description.\n\nPiperOrigin-RevId: 304438717\n\n6e2ea9a4b63a264090f1bd4b5b25766a3f634f3a\nfix: add interface name overrides back to logging gapic config.\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 304438432\n\n01f3ccbaa66cf3ae4e3b9fd140b1ecfbe54a3ed0\nFix: Add package/namespace options for C#, Ruby and PHP in remaining protos.\n\nPiperOrigin-RevId: 304416658\n\nb89abbf12cd3c086abddcd79adb0a653349f960a\nchore(google/maps): Rename nox.py to noxfile.py\n\nupstream wip fix here: https://github.com/googleapis/gapic-generator/pull/3156\n\nPiperOrigin-RevId: 304411146\n\nbbf26d7f11fae7789b13959bf100983c496c9807\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 304409906\n\n75047719f704d61f405cac6d7439637ab36c1232\nfix Dataproc: add missing `REQUIRED` annotation.\n\nPiperOrigin-RevId: 304305096\n\n7e1b880fd5d477176cf9b0bb9b137b9bea56e787\nAdd Ruby/PHP namespace options\n\nPiperOrigin-RevId: 304288402\n\naba342359b6743353195ca53f944fe71e6fb6cd4\nchore: add java assembly target for accesscontextmanager BUILD.bazel\n\nPiperOrigin-RevId: 304207684\n\ndc65f39f33cb139b3a2244199a3e722a4d94b679\nFor Secret Manager v1 and v1beta1, noted Secret ID character limitations.\n\nPiperOrigin-RevId: 304035052\n\n2ee8c4d06db823c29a127709e66c35e38b6e98ab\nchore(deps): Update gax-java dependency\nThis is to integrate java11 incompatibility fix\n\nPiperOrigin-RevId: 304032057\n\nb5c94cec71ea9b840dc0110a0275323313ecc85a\nchore: add java assembly target for orgpolicy BUILD.bazel\n\nPiperOrigin-RevId: 304021854\n\n690f4d6344197fde775230cec165a9db3b3929c7\nchore: use the latest protoc-java-resource-name-plugin in third_party/googleapis WORKSPACE.\n- trace up only one level when calculating parent types with singleton resource names\n\nPiperOrigin-RevId: 304007414\n\n87144228bd9920b824996355f27891310fad5a32\nEnable gapic v2 for DLP.\n\nCommitter: @hzyi-google\nPiperOrigin-RevId: 303999064\n\n17cfae00f2bb51cb1683f017da7e295a1b0f01a8\nAdd a new AuthorizationType for Data Source Definition.\n\nPiperOrigin-RevId: 303992863\n\n6da3d64919c006ef40cad2026f1e39084253afe2\nfix(google/maps): Change importpath to developers.google.com/maps/go.\n\nPiperOrigin-RevId: 303976942\n\n2983dccde54f0ce31793e1e628379616c468aea0\nbuild(google/maps): only modify root build.gradle with ext plugin\n\nPiperOrigin-RevId: 303975876\n\n00f0a285f2716ce57e98afe500e450b17b556ff8\nfix: Integerate gapic-generator java_gapic rules Java11 fix\n\nPiperOrigin-RevId: 303899179\n\na62857d26bd2ae15aec13a9244989e4104195b63\nfix: add proto_package to the artman config of dataproc v1beta2 to make artman smoketest pass.\n\nPiperOrigin-RevId: 303853989\n\nf260ba248df934fd4ddc22950fb529a59d79e0b5\nchore: use the latest gapic-generator in googleapis WORKSPACE.\n- PHP multi-pattern resource name support.\n- Trace up only one level when calculating parent types with singleton resource names\n\nPiperOrigin-RevId: 303836059\n\n89c7d455fffa5d8a7e73c2f4da43a74605ed72a6\nfeat: Add client library options to OsConfigService v1 patch APIs.\n\nPiperOrigin-RevId: 303831150\n\na45b0a2a8f6f497547ab531a4da978c76441d076\ndataproc: add back non-default retry parameters.\ncommitter: @hzyi-google\n\nPiperOrigin-RevId: 303830177\n\nad895ce95f1f6d2261fbbc3e8897958294e4f017\nenable gapic v2 for containeranalysis.\ncommitter: @hzyi-google\n\nPiperOrigin-RevId: 303821111\n\nbaf83e521834b67397839bcbe2d7864b49e38787\nAdding \"resource_reference\" annotations to services.\n\nPiperOrigin-RevId: 303791704\n\n7be2811ad17013a5ea24cd75dfd9e399dd6e18fe\nfix: Update gapic-generator version to pickup discogapic fixes\n\nPiperOrigin-RevId: 303545940\n\nb655808b3481a92f478ae2f828a6ce8220e40f32\ncloudasset: add org policy and access context manager protos to client libraries.\n\nPiperOrigin-RevId: 303527638\n\nd8c5da9a9471659b51d5862dd2ea7ad3c4bc49ef\nPopulate BAZEL.build files for AccessContextManager.\n\nPiperOrigin-RevId: 303526825\n\ncf9db7161cb9d4dbef06cd8bf5354ec485e51e2d\nPopulate BAZEL.build files for OrgPolicy.\n\nPiperOrigin-RevId: 303526702\n\n558b800ed594acc02555cc560fbb39c0e42bc438\nchore: turn on gapic v2 for Dataproc API.\nfix:\n- add missing method signatures\n- remove resource_reference not on a string field\n- adjust resource name pattern orders\n\nPiperOrigin-RevId: 303431167\n\n8eb444cf5ff63f68d826acbb37b2ac3da58655fb\nAdd logging protos for Recommender v1beta1.\n\nPiperOrigin-RevId: 303426030\n\n48a166ce9f6e2a88b10947341b37336fe9dd3478\nPush of PHP, C# and Ruby namespaces\n\nPiperOrigin-RevId: 303302813\n\n42f77489b300df2e27c84a7b65c4e8f04da20981\nThis is first release of the API protos and Bazel BUILD files for the Analytics Management API V1alpha.\n\nPiperOrigin-RevId: 303241805\n\n8bea81bfa461698981b3d3a488a95633d2f6e9ff\nchore: use latest protoc-java-resource-name-plugin in bazel WORKSPACE.\nnew commits:\n- fix: stop generating `parseList` and `toStringList` if a multi-pattern resource name has subclasses (#79)\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 303197602\n\nb14af92e565264675d6b12cd2c0ded6c94ddd7f8\nfix talent API incorrect placeholders in two resource name patterns.\ncommitter: @hzyi-google\n\nPiperOrigin-RevId: 303189497\n\n8e22db908ae09e1f7e2802c03b4563fd6b524e0e\nchore(google/maps): Update postprocessing script for Java.\n\n- Update root build.gradle to load local plugin\n- Change com.google.api.grpc group to com.google.maps\n\nPiperOrigin-RevId: 303176850\n\n65816afa71e588252b7119dc723592abe51ea106\nbazel: update gapic-generator-go to v0.12.5 and gapic-generator hash\n\nChanges to gapic-generator-go include:\n* feat: strip invalid link references in comments\n* chore: updating Go deps in bazel repositories\n\nChanges to gapic-generator include:\n* fix: bazel go build gen check for cloud in proto pkg name\n* Revert \"feat: allow static substitution for group name\"\n\nPiperOrigin-RevId: 303150338\n\nd4aa417ed2bba89c2d216900282bddfdafef6128\nFix incorrect retry config in gapic v2 for kms.\n\nPiperOrigin-RevId: 303010132\n\nfd08334533204fdd1b33f79fcb263dbb5bf13de0\nfix: osconfig/v1 update go_gapic_library target to microgen interface\n\nPiperOrigin-RevId: 303007866\n\ne2c0f2a0e06d86b50aba98f67f9f291587d986b3\nUpdate comments for google/rpc/error_details.proto.\n\nPiperOrigin-RevId: 303002528\n\nf786c7586748e78a286b1620ff3ddbf7b4dcab92\nfeat: Add OsConfigService v1 patch APIs.\n\nPiperOrigin-RevId: 302999346\n\n0341fa3fc2f4073a1b1f260d37b2ce620799f545\nTurn on gapic config v2 for kms.\n\nCommitter: @hzyi-google\nPiperOrigin-RevId: 302980301\n\n32dc6e832039b61ac3fb82c72eb0a27570aebcd6\nredis: v1beta1 enables REDIS_5_0 as an option for redis_version field and adds two new redis configs --stream-node-max-entries --stream-node-max-bytes\n\nPiperOrigin-RevId: 302958009\n\n685f16483cc4d87c35051f21f8f13ef4fdc919b4\nredis: v1 enables REDIS_5_0 as an option for redis_version field and adds two new redis configs --stream-node-max-entries --stream-node-max-bytes\n\nPiperOrigin-RevId: 302957729\n\n733cb282ae5e64673ef86c9a5dff647df803d8b7\nAdd GAPIC cofiguration for v1 client library genetration.\n\nPiperOrigin-RevId: 302928200\n\n1b0fff5f2ec6dc4a9443d9b50e70e9c94c30c45b\ndocs: remove an internal lint declaration\n\nPiperOrigin-RevId: 302928106\n\n2be23f3f3036a6f7ce0844def3d2d3da74e5d415\nfix(google/maps): Add post-processing rules for Google Maps APIs\n\nPiperOrigin-RevId: 302925222\n\n"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8",
-        "log": "e36822bfa0acb355502dab391b8ef9c4f30208d8\nchore(java): treat samples shared configuration dependency update as chore (#457)\n\n\n1b4cc80a7aaf164f6241937dd87f3bd1f4149e0c\nfix: do not run node 8 CI (#456)\n\n\n"
+        "sha": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25",
+        "log": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf\ndoc: describe the Autosynth & Synthtool protocol (#472)\n\n* doc: describe the Autosynth & Synthtool protocol\n\n* Accommodate review comments.\n980baaa738a1ad8fa02b4fdbd56be075ee77ece5\nfix: pin sphinx to <3.0.0 as new version causes new error (#471)\n\nThe error `toctree contains reference to document changlelog that doesn't have a title: no link will be generated` occurs as of 3.0.0. Pinning to 2.x until we address the docs build issue.\n\nTowards #470\n\nI did this manually for python-datastore https://github.com/googleapis/python-datastore/pull/22\n928b2998ac5023e7c7e254ab935f9ef022455aad\nchore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.15 (#466)\n\nCo-authored-by: Jeffrey Rennie \n188f1b1d53181f739b98f8aa5d40cfe99eb90c47\nfix: allow local and external deps to be specified (#469)\n\nModify noxfile.py to allow local and external dependencies for\nsystem tests to be specified.\n1df68ed6735ddce6797d0f83641a731c3c3f75b4\nfix: apache license URL (#468)\n\n\nf4a59efa54808c4b958263de87bc666ce41e415f\nfeat: Add discogapic support for GAPICBazel generation (#459)\n\n* feat: Add discogapic support for GAPICBazel generation\n\n* reformat with black\n\n* Rename source repository variable\n\nCo-authored-by: Jeffrey Rennie \n99820243d348191bc9c634f2b48ddf65096285ed\nfix: update template files for Node.js libraries (#463)\n\n\n3cbe6bcd5623139ac9834c43818424ddca5430cb\nfix(ruby): remove dead troubleshooting link from generated auth guide (#462)\n\n\na003d8655d3ebec2bbbd5fc3898e91e152265c67\ndocs: remove \"install stable\" instructions (#461)\n\nThe package hasn't been released to PyPI in some time\nf5e8c88d9870d8aa4eb43fa0b39f07e02bfbe4df\nchore(python): add license headers to config files; make small tweaks to templates (#458)\n\n\n"
       }
     }
   ],
@@ -33,8 +33,7 @@
         "apiName": "datastore",
         "apiVersion": "v1",
         "language": "java",
-        "generator": "gapic",
-        "config": "google/datastore/artman_datastore.yaml"
+        "generator": "bazel"
       }
     }
   ]

From 9043ef3f866c13f749e834f79f5874a27183d324 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 9 Apr 2020 19:44:06 +0200
Subject: [PATCH 0328/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.102.4 (#93)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a83c42ed2411..c1c8725f01ed 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
-      1.102.3
+      1.102.4
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 235b449de9df..4f85d25e6836 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.102.3
+      1.102.4
     
 
     

From 760c2d87c48206155578bae01fe280d419b25ca7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 14 Apr 2020 19:58:24 +0200
Subject: [PATCH 0329/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v5 (#98)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | major | `4.4.1` -> `5.1.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 9c1e939b41fd..b044a7ea2661 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        4.4.1
+        5.1.0
         pom
         import
       

From 32d5e37f244969ba980cd94a8eaa8165b368ebc6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 14 Apr 2020 22:12:10 +0200
Subject: [PATCH 0330/1784] deps: update dependency com.google.guava:guava-bom
 to v29 (#95)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.guava:guava-bom](https://togithub.com/google/guava) | major | `28.2-android` -> `29.0-android` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b21a4122513..67d44f99381b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
     1.28.1
     3.11.4
     4.13
-    28.2-android
+    29.0-android
     1.4.3
     0.24.0
     1.10.19

From d431ed112933231d68588d7e1d4fec417132223e Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 16 Apr 2020 08:38:04 -0700
Subject: [PATCH 0331/1784] chore: update common templates (#106)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/a8b4de14-bbed-43a8-a032-34b2812821a8/targets
---
 .kokoro/common.sh                 |  5 ++++
 .kokoro/dependencies.sh           | 48 +++++++++++++++++++++++++++++++
 .kokoro/nightly/integration.cfg   | 11 +++++--
 .kokoro/nightly/samples.cfg       |  8 +++++-
 .kokoro/presubmit/integration.cfg | 14 ++++++---
 .kokoro/presubmit/samples.cfg     | 14 ++++++---
 synth.metadata                    |  7 ++---
 7 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index 8f09de5d3d10..a8d0ea04d37d 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -52,3 +52,8 @@ function retry_with_backoff {
 
     return $exit_code
 }
+
+## Helper functionss
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }
\ No newline at end of file
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 0aade871ce10..cf3bb4347e01 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -36,3 +36,51 @@ retry_with_backoff 3 10 \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
+
+echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
+## Run dependency list completeness check
+function completenessCheck() {
+  # Output dep list with compile scope generated using the original pom
+  msg "Generating dependency list using original pom..."
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
+
+  # Output dep list generated using the flattened pom (test scope deps are ommitted)
+  msg "Generating dependency list using flattened pom..."
+  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
+
+  # Compare two dependency lists
+  msg "Comparing dependency lists..."
+  diff .org-list.txt .new-list.txt >.diff.txt
+  if [[ $? == 0 ]]
+    then
+      msg "Success. No diff!"
+  else
+    msg "Diff found. See below: "
+    msg "You can also check .diff.txt file located in $1."
+    cat .diff.txt
+    return 1
+  fi
+}
+
+# Allow failures to continue running the script
+set +e
+
+error_count=0
+for path in $(find -name ".flattened-pom.xml")
+do
+  # Check flattened pom in each dir that contains it for completeness
+  dir=$(dirname "$path")
+  pushd "$dir"
+  completenessCheck "$dir"
+  error_count=$(($error_count + $?))
+  popd
+done
+
+if [[ $error_count == 0 ]]
+then
+  msg "All checks passed."
+  exit 0
+else
+  msg "Errors found. See log statements above."
+  exit 1
+fi
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index ca027480092f..40c4abb7bf08 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -10,20 +10,25 @@ env_vars: {
   key: "JOB_TYPE"
   value: "integration"
 }
-
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
   value: "gcloud-devel"
 }
 
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
 env_vars: {
   key: "ENABLE_BUILD_COP"
   value: "true"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
 }
 
 before_action {
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
index b4b051cd016f..20aabd55de11 100644
--- a/.kokoro/nightly/samples.cfg
+++ b/.kokoro/nightly/samples.cfg
@@ -11,9 +11,15 @@ env_vars: {
   value: "samples"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index 141f90c13c56..522e5b10101c 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -11,14 +11,20 @@ env_vars: {
   value: "integration"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
-    key: "GCLOUD_PROJECT"
-    value: "gcloud-devel"
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
 }
 
 before_action {
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
index fa7b493d0b5c..1171aead01f0 100644
--- a/.kokoro/presubmit/samples.cfg
+++ b/.kokoro/presubmit/samples.cfg
@@ -11,14 +11,20 @@ env_vars: {
   value: "samples"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
-    key: "GCLOUD_PROJECT"
-    value: "gcloud-devel"
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
 }
 
 before_action {
diff --git a/synth.metadata b/synth.metadata
index 4f4ab0fd5782..d9ff8131a184 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,5 +1,4 @@
 {
-  "updateTime": "2020-04-09T00:14:55.498118Z",
   "sources": [
     {
       "git": {
@@ -13,16 +12,14 @@
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
         "sha": "d741cd976975c745d0199987aff0e908b8352992",
-        "internalRef": "305561906",
-        "log": "d741cd976975c745d0199987aff0e908b8352992\nchore: enable gapicv2 for firestore/v1 API\n\nNote that this contains breaking Java changes:\n  com.google.cloud.firestore.v1.FirestoreClient: Method 'public void deleteDocument(com.google.firestore.v1.AnyPathName)' has been removed\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305561906\n\n0d69cddaa23b556e7299f84ad55a02ec1cad55a9\nchore: enable gapicv2 for firestore/admin/v1 API\n\nCommitter: @miraleung\n\nThere are the following breaking changes due to the collection_id discrepancy between [1] and [2]\n\n1. https://github.com/googleapis/googleapis/blob/6f8350c0df231d7e742fa10dbf929f33047715c9/google/firestore/admin/v1/firestore_gapic.yaml#L24-L29\n2. https://github.com/googleapis/googleapis/blob/6f8350c0df231d7e742fa10dbf929f33047715c9/google/firestore/admin/v1/field.proto#L39\n```\ncom.google.firestore.admin.v1.FieldName: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.FieldName: Method 'public java.lang.String getFieldId()' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public java.lang.String getFieldId()' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public com.google.firestore.admin.v1.FieldName$Builder setCollectionId(java.lang.String)' has been removed\ncom.google.firestore.admin.v1.FieldName$Builder: Method 'public com.google.firestore.admin.v1.FieldName$Builder setFieldId(java.lang.String)' has been removed\ncom.google.firestore.admin.v1.IndexName: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.IndexName: Method 'public java.lang.String getIndexId()' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public java.lang.String getCollectionId()' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public java.lang.String getIndexId()' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public com.google.firestore.admin.v1.IndexName$Builder setCollectionId(java.lang.String)' has been removed\ncom.google.firestore.admin.v1.IndexName$Builder: Method 'public com.google.firestore.admin.v1.IndexName$Builder setIndexId(java.lang.String)' has been removed\n```\n\nPiperOrigin-RevId: 305561114\n\n6f8350c0df231d7e742fa10dbf929f33047715c9\nchore: enable gapicv2 for firestore/v1beta1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305537104\n\nd398d687aad9eab4c6ceee9cd5e012fa61f7e28c\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 305496764\n\n5520cb891a72ab0b0cbe3facaca7b012785f5b49\nchore: update gapic-generator to cd3c9ee7\n\nChanges include:\n* update generated nox file\n* fix generated license text alignment\n\nPiperOrigin-RevId: 305484038\n\nb20965f260d70e57b7dcd312cd356d6a81f31f8e\nUpdating retry configuration settings.\n\nPiperOrigin-RevId: 305431885\n\n83d7f20c06182cb6ada9a3b47daf17b2fd22b020\nMigrate dialogflow from gapic v1 to gapic v2.\nIncluding breaking changes (resource pattern change) introduced in cl/304043500.\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 305358314\n\nf8a97692250a6c781d87528995a5c72d41ca7762\nchore: enable gapic v2 and proto annotation for Grafeas API.\n\ncommitter: @noahdietz\nPiperOrigin-RevId: 305354660\n\nb1a5ca68468eb1587168972c9d15928e98ba92b0\nEnable gapicv2 for v1/osconfig\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305351235\n\nc803327f9b1dd2583b070645b5b86e5e7ead3161\nEnable gapicv2 for osconfig/agentendpoint/v1beta\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305350472\n\n99dddf1de598f95a71d3536f5c170d84f0c0ef87\nchore: enable gapicv2 for build/v1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305349884\n\nbf85ee3ed64951c14b19ef8577689f43ee6f0f41\nchore: enable gapicv2 for cloudbuild/v1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305349873\n\nf497c7aa912df121e11772767e667fdbc10a63d9\nchore: enable gapic v2 and proto annotation for Web Security Scanner v1alpha API.\n\ncommitter: @noahdietz\nPiperOrigin-RevId: 305349342\n\n0669a37c66d76bd413343da69420bb75c49062e7\nchore: rename unused GAPIC v1 configs for IAM to legacy\n\ncommitter: @noahdietz\nPiperOrigin-RevId: 305340308\n\naf7da29c24814a1c873c22f477e9dd8dd5a17b0b\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 305330079\n\n3f767aa32b4b3313027d05b503aaba63e0c432a3\ndocs: Update an out-of-date external link.\n\nPiperOrigin-RevId: 305329485\n\n9ede34d093b9d786a974448fc7a3a17948c203e2\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 305327985\n\n27daba50281357b676e1ba882422ebeab4ce4f92\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 305327500\n\n82de0f6f04649651958b96fbc5b0b39dd4dbbd01\nFix: Add missing resource name definition (from the Compute API).\n\nPiperOrigin-RevId: 305324763\n\n744591190e828440f72745aef217f883afd1fd71\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 305323909\n\n1247c135ceaedfe04261d27a64aaecf78ffbae74\nchore: enable gapicv2 for videointelligence/v1beta2 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305321976\n\n633c8b13227b9e3810749964d580e5be504db488\nchore: enable gapicv2 for videointelligence/v1p1beta1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305320877\n\n29aac60f121dc43382b37ff92f2dbb692d94143a\ndocs: fix broken link to policy reference documentation.\n\nPiperOrigin-RevId: 305319540\n\n54ddbbf14c489b8a2f0731aa39408c016f5a8387\nbazel: update gapic-generator-go to v0.13.0\n\nChanges include:\n* add clientHook feature\n\nPiperOrigin-RevId: 305289945\n\n823facb4ca6a4b36b817ce955a790dcb40cf808f\nchore: enable gapicv2 for videointelligence/v1p3beta1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305155214\n\n6b9c969d42bcb0f8206675bd868ed7d1ddcdaef9\nAdd API for bigqueryreservation v1.\n\nPiperOrigin-RevId: 305151484\n\n514f7d27811832a9f58b83d6f6305d894b097cf6\nchore: enable gapicv2 for phishingprotection/v1beta1 API\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305126983\n\nff74d47d47280e6bbcbad1a7c82b1e0959c472ec\nfix: PHP-related fixes in BUILD.bazel and service.yamls\n\nThis PR also adds the rules for all 7 langauges in OsLogin and Kms BUILD.bazel files. Those build files were missing rules for 5 langagues, including PHP.\n\nThis PR is the prerequisite for migrating PHP synth.py scripts from artman to bazel.\n\nThe fixes in service.yaml fix regression made during proto annotation migration. This became visible only during PHP generation, because only PHP depends on the affected sections of the service.yaml config.\n\nPiperOrigin-RevId: 305108224\n\nfdbc7b1f63969307c71143a0c24fdfd02e739df6\nEnable gapicv2 for osconfig/agentendpoint/v1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305086443\n\n1490d30e1ae339570dd7826ba625a603ede91a08\nEnable gapicv2 for osconfig/v1beta\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305069755\n\n7bf824e82e5c3549642b150dc4a9579602000f34\nEnable gapicv2 for iam/credentials/v1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 305065283\n\n9ff6fd3b22f99167827e89aae7778408b5e82425\nUpdates Dataproc v1 API:\n- Adds Dataproc Jobs.SubmitJobAsOperation RPC\n- Adds SparkR and Presto job types to WorkflowTemplates\n- Adds new Optional Components\n- Clarifies usage of some APIs\n\nPiperOrigin-RevId: 305053617\n\ncad0f5137a70d0d14a8d9acbfcee98e4cd3e9662\nUpdates to Dataproc v1beta2 API:\n- Adds SparkR and Presto job types to WorkflowTemplates\n- Adds new Optional Components\n- Clarifies usage of some APIs\n\nPiperOrigin-RevId: 305053062\n\na005f045a301535eeb4c4b3fa7bb94eec9d22a8b\nAdd support for Cloud EKM to the Cloud KMS service and resource protos.\n\nPiperOrigin-RevId: 305026790\n\n5077b1e4674afdbbf11dac3f5f43d36285ba53ff\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304836531\n\nd6cb4997910eda04c0c66c0f2fd043eeaa0f660d\nchore: enable gapic v2 and proto annotation for documentai API.\n\ncommitter @summer-ji-eng\n\nPiperOrigin-RevId: 304724866\n\n490bc556608bfa5b1548c9374b06152fa33d657e\nEnable gapicv2 for devtools/remoteworkers/v1test2\n\nCommitter: @miraleung\nPiperOrigin-RevId: 304718691\n\n9f78ce31a5bd7f4a63e3cf0ddf28221557adb7ed\nEnable gapicv2 for managedidentities/v1beta1\n\nCommitter: @miraleung\nPiperOrigin-RevId: 304718676\n\n6e17d259b8e320bc51aa240cefef05ec753e2b83\ndocs: treat a dummy example URL as a string literal instead of a link\n\nPiperOrigin-RevId: 304716376\n\na8d76f99d3073aaccabdcc122c798a63e812c4fe\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 304702368\n\n65c749bc6a1d240416a0e6979381b67f97aff907\ndocs: fix formatting of some regexes and string literals.\n\nPiperOrigin-RevId: 304701150\n\n9119eefcd2b5ce845a680fa4ec4093ed733498f0\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304698702\n\n62a2a7cc33d3535638d220df238823eefcca930d\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304696461\n\n23848c8f64a5e81a239d6133378468185f1756dc\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304696192\n\n9514fa9e390a4c0715972c5b510cf4c10ad049a1\ndocs: change relative URLs to absolute URLs to fix broken links.\n\nPiperOrigin-RevId: 304695334\n\n0f7b1509a9a452808c3d07fe90fedfcea763d7d5\nfix: change config_schema_version to 2.0.0 for containeranalysis v1 gapic config.\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 304672648\n\n3d52f3c126fbfc31f067a7f54737b7f0dfbce163\nDialogflow weekly v2 library update:\n- Change `parent` field's resource_reference to specify child_type instead of type per client library generation requirement;\n- Change Session with its child resource pattern to support both projects/{project}/agent/sessions/{session} and projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session};\n- Fix `method_signature`\n- Regular documentation update\n\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 304635286\n\n4a6a01ce0ead505c245d11a2ce156de34800c58f\ndocs: change a relative URL to an absolute URL to fix broken links.\n\nPiperOrigin-RevId: 304633630\n\n1b969c28a6579265e89cd35e6c2ecacc89970e2d\nchore: set Ruby namespace in proto options\n\nPiperOrigin-RevId: 304620317\n\n5378173a889f9c7d83e36e52d38a6267190de692\nAdd v1beta2 SubmitJobAsOperation RPC to Dataproc.\n\nPiperOrigin-RevId: 304594381\n\n3d5d228a58bdf875e6147b228db3159010c735ee\nEnable visibility on the GetSnapshot and GetTopicSnapshots methods\n\nPiperOrigin-RevId: 304500143\n\n1346f5c11a0376bc82c5c03259b304de52671518\nRefresh public client library for Cloud Monitoring.\nIncrease default ListTimeSeries deadline to 90s.\n\nPiperOrigin-RevId: 304467075\n\n4a6cfccb4a32cb28db7366295d90078c6af3112f\ndocs: Fix link in monitoring summary description.\n\nPiperOrigin-RevId: 304438717\n\n6e2ea9a4b63a264090f1bd4b5b25766a3f634f3a\nfix: add interface name overrides back to logging gapic config.\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 304438432\n\n01f3ccbaa66cf3ae4e3b9fd140b1ecfbe54a3ed0\nFix: Add package/namespace options for C#, Ruby and PHP in remaining protos.\n\nPiperOrigin-RevId: 304416658\n\nb89abbf12cd3c086abddcd79adb0a653349f960a\nchore(google/maps): Rename nox.py to noxfile.py\n\nupstream wip fix here: https://github.com/googleapis/gapic-generator/pull/3156\n\nPiperOrigin-RevId: 304411146\n\nbbf26d7f11fae7789b13959bf100983c496c9807\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 304409906\n\n75047719f704d61f405cac6d7439637ab36c1232\nfix Dataproc: add missing `REQUIRED` annotation.\n\nPiperOrigin-RevId: 304305096\n\n7e1b880fd5d477176cf9b0bb9b137b9bea56e787\nAdd Ruby/PHP namespace options\n\nPiperOrigin-RevId: 304288402\n\naba342359b6743353195ca53f944fe71e6fb6cd4\nchore: add java assembly target for accesscontextmanager BUILD.bazel\n\nPiperOrigin-RevId: 304207684\n\ndc65f39f33cb139b3a2244199a3e722a4d94b679\nFor Secret Manager v1 and v1beta1, noted Secret ID character limitations.\n\nPiperOrigin-RevId: 304035052\n\n2ee8c4d06db823c29a127709e66c35e38b6e98ab\nchore(deps): Update gax-java dependency\nThis is to integrate java11 incompatibility fix\n\nPiperOrigin-RevId: 304032057\n\nb5c94cec71ea9b840dc0110a0275323313ecc85a\nchore: add java assembly target for orgpolicy BUILD.bazel\n\nPiperOrigin-RevId: 304021854\n\n690f4d6344197fde775230cec165a9db3b3929c7\nchore: use the latest protoc-java-resource-name-plugin in third_party/googleapis WORKSPACE.\n- trace up only one level when calculating parent types with singleton resource names\n\nPiperOrigin-RevId: 304007414\n\n87144228bd9920b824996355f27891310fad5a32\nEnable gapic v2 for DLP.\n\nCommitter: @hzyi-google\nPiperOrigin-RevId: 303999064\n\n17cfae00f2bb51cb1683f017da7e295a1b0f01a8\nAdd a new AuthorizationType for Data Source Definition.\n\nPiperOrigin-RevId: 303992863\n\n6da3d64919c006ef40cad2026f1e39084253afe2\nfix(google/maps): Change importpath to developers.google.com/maps/go.\n\nPiperOrigin-RevId: 303976942\n\n2983dccde54f0ce31793e1e628379616c468aea0\nbuild(google/maps): only modify root build.gradle with ext plugin\n\nPiperOrigin-RevId: 303975876\n\n00f0a285f2716ce57e98afe500e450b17b556ff8\nfix: Integerate gapic-generator java_gapic rules Java11 fix\n\nPiperOrigin-RevId: 303899179\n\na62857d26bd2ae15aec13a9244989e4104195b63\nfix: add proto_package to the artman config of dataproc v1beta2 to make artman smoketest pass.\n\nPiperOrigin-RevId: 303853989\n\nf260ba248df934fd4ddc22950fb529a59d79e0b5\nchore: use the latest gapic-generator in googleapis WORKSPACE.\n- PHP multi-pattern resource name support.\n- Trace up only one level when calculating parent types with singleton resource names\n\nPiperOrigin-RevId: 303836059\n\n89c7d455fffa5d8a7e73c2f4da43a74605ed72a6\nfeat: Add client library options to OsConfigService v1 patch APIs.\n\nPiperOrigin-RevId: 303831150\n\na45b0a2a8f6f497547ab531a4da978c76441d076\ndataproc: add back non-default retry parameters.\ncommitter: @hzyi-google\n\nPiperOrigin-RevId: 303830177\n\nad895ce95f1f6d2261fbbc3e8897958294e4f017\nenable gapic v2 for containeranalysis.\ncommitter: @hzyi-google\n\nPiperOrigin-RevId: 303821111\n\nbaf83e521834b67397839bcbe2d7864b49e38787\nAdding \"resource_reference\" annotations to services.\n\nPiperOrigin-RevId: 303791704\n\n7be2811ad17013a5ea24cd75dfd9e399dd6e18fe\nfix: Update gapic-generator version to pickup discogapic fixes\n\nPiperOrigin-RevId: 303545940\n\nb655808b3481a92f478ae2f828a6ce8220e40f32\ncloudasset: add org policy and access context manager protos to client libraries.\n\nPiperOrigin-RevId: 303527638\n\nd8c5da9a9471659b51d5862dd2ea7ad3c4bc49ef\nPopulate BAZEL.build files for AccessContextManager.\n\nPiperOrigin-RevId: 303526825\n\ncf9db7161cb9d4dbef06cd8bf5354ec485e51e2d\nPopulate BAZEL.build files for OrgPolicy.\n\nPiperOrigin-RevId: 303526702\n\n558b800ed594acc02555cc560fbb39c0e42bc438\nchore: turn on gapic v2 for Dataproc API.\nfix:\n- add missing method signatures\n- remove resource_reference not on a string field\n- adjust resource name pattern orders\n\nPiperOrigin-RevId: 303431167\n\n8eb444cf5ff63f68d826acbb37b2ac3da58655fb\nAdd logging protos for Recommender v1beta1.\n\nPiperOrigin-RevId: 303426030\n\n48a166ce9f6e2a88b10947341b37336fe9dd3478\nPush of PHP, C# and Ruby namespaces\n\nPiperOrigin-RevId: 303302813\n\n42f77489b300df2e27c84a7b65c4e8f04da20981\nThis is first release of the API protos and Bazel BUILD files for the Analytics Management API V1alpha.\n\nPiperOrigin-RevId: 303241805\n\n8bea81bfa461698981b3d3a488a95633d2f6e9ff\nchore: use latest protoc-java-resource-name-plugin in bazel WORKSPACE.\nnew commits:\n- fix: stop generating `parseList` and `toStringList` if a multi-pattern resource name has subclasses (#79)\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 303197602\n\nb14af92e565264675d6b12cd2c0ded6c94ddd7f8\nfix talent API incorrect placeholders in two resource name patterns.\ncommitter: @hzyi-google\n\nPiperOrigin-RevId: 303189497\n\n8e22db908ae09e1f7e2802c03b4563fd6b524e0e\nchore(google/maps): Update postprocessing script for Java.\n\n- Update root build.gradle to load local plugin\n- Change com.google.api.grpc group to com.google.maps\n\nPiperOrigin-RevId: 303176850\n\n65816afa71e588252b7119dc723592abe51ea106\nbazel: update gapic-generator-go to v0.12.5 and gapic-generator hash\n\nChanges to gapic-generator-go include:\n* feat: strip invalid link references in comments\n* chore: updating Go deps in bazel repositories\n\nChanges to gapic-generator include:\n* fix: bazel go build gen check for cloud in proto pkg name\n* Revert \"feat: allow static substitution for group name\"\n\nPiperOrigin-RevId: 303150338\n\nd4aa417ed2bba89c2d216900282bddfdafef6128\nFix incorrect retry config in gapic v2 for kms.\n\nPiperOrigin-RevId: 303010132\n\nfd08334533204fdd1b33f79fcb263dbb5bf13de0\nfix: osconfig/v1 update go_gapic_library target to microgen interface\n\nPiperOrigin-RevId: 303007866\n\ne2c0f2a0e06d86b50aba98f67f9f291587d986b3\nUpdate comments for google/rpc/error_details.proto.\n\nPiperOrigin-RevId: 303002528\n\nf786c7586748e78a286b1620ff3ddbf7b4dcab92\nfeat: Add OsConfigService v1 patch APIs.\n\nPiperOrigin-RevId: 302999346\n\n0341fa3fc2f4073a1b1f260d37b2ce620799f545\nTurn on gapic config v2 for kms.\n\nCommitter: @hzyi-google\nPiperOrigin-RevId: 302980301\n\n32dc6e832039b61ac3fb82c72eb0a27570aebcd6\nredis: v1beta1 enables REDIS_5_0 as an option for redis_version field and adds two new redis configs --stream-node-max-entries --stream-node-max-bytes\n\nPiperOrigin-RevId: 302958009\n\n685f16483cc4d87c35051f21f8f13ef4fdc919b4\nredis: v1 enables REDIS_5_0 as an option for redis_version field and adds two new redis configs --stream-node-max-entries --stream-node-max-bytes\n\nPiperOrigin-RevId: 302957729\n\n733cb282ae5e64673ef86c9a5dff647df803d8b7\nAdd GAPIC cofiguration for v1 client library genetration.\n\nPiperOrigin-RevId: 302928200\n\n1b0fff5f2ec6dc4a9443d9b50e70e9c94c30c45b\ndocs: remove an internal lint declaration\n\nPiperOrigin-RevId: 302928106\n\n2be23f3f3036a6f7ce0844def3d2d3da74e5d415\nfix(google/maps): Add post-processing rules for Google Maps APIs\n\nPiperOrigin-RevId: 302925222\n\n"
+        "internalRef": "305561906"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25",
-        "log": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf\ndoc: describe the Autosynth & Synthtool protocol (#472)\n\n* doc: describe the Autosynth & Synthtool protocol\n\n* Accommodate review comments.\n980baaa738a1ad8fa02b4fdbd56be075ee77ece5\nfix: pin sphinx to <3.0.0 as new version causes new error (#471)\n\nThe error `toctree contains reference to document changlelog that doesn't have a title: no link will be generated` occurs as of 3.0.0. Pinning to 2.x until we address the docs build issue.\n\nTowards #470\n\nI did this manually for python-datastore https://github.com/googleapis/python-datastore/pull/22\n928b2998ac5023e7c7e254ab935f9ef022455aad\nchore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.15 (#466)\n\nCo-authored-by: Jeffrey Rennie \n188f1b1d53181f739b98f8aa5d40cfe99eb90c47\nfix: allow local and external deps to be specified (#469)\n\nModify noxfile.py to allow local and external dependencies for\nsystem tests to be specified.\n1df68ed6735ddce6797d0f83641a731c3c3f75b4\nfix: apache license URL (#468)\n\n\nf4a59efa54808c4b958263de87bc666ce41e415f\nfeat: Add discogapic support for GAPICBazel generation (#459)\n\n* feat: Add discogapic support for GAPICBazel generation\n\n* reformat with black\n\n* Rename source repository variable\n\nCo-authored-by: Jeffrey Rennie \n99820243d348191bc9c634f2b48ddf65096285ed\nfix: update template files for Node.js libraries (#463)\n\n\n3cbe6bcd5623139ac9834c43818424ddca5430cb\nfix(ruby): remove dead troubleshooting link from generated auth guide (#462)\n\n\na003d8655d3ebec2bbbd5fc3898e91e152265c67\ndocs: remove \"install stable\" instructions (#461)\n\nThe package hasn't been released to PyPI in some time\nf5e8c88d9870d8aa4eb43fa0b39f07e02bfbe4df\nchore(python): add license headers to config files; make small tweaks to templates (#458)\n\n\n"
+        "sha": "52638600f387deb98efb5f9c85fec39e82aa9052"
       }
     }
   ],

From 2b8f8ab8655270e9d6d291f1576ff3313ac06345 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 16 Apr 2020 18:46:11 +0200
Subject: [PATCH 0332/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.16 (#105)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | patch | `1.0.15` -> `1.0.16` |

---

### Release Notes



GoogleCloudPlatform/java-repo-tools

### [`v1.0.16`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/releases/v1.0.16)

[Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.15...v1.0.16)

Add a few SpotBugs exclusions:

-   `RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE` - existing - codegen bug
-   `UPM_UNCALLED_PRIVATE_METHOD` - probably SpotBug issue
-   `NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE` - likely SpotBug issue
-   `CLI_CONSTANT_LIST_INDEX` - style issue particular to our samples
-   `OBL_UNSATISFIED_OBLIGATION` - issue for SQL clients




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index c1c8725f01ed..1aec5ce2f432 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.15
+    1.0.16
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index 7dcc9cc87c60..6a47fd35bead 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.15
+    1.0.16
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4f85d25e6836..58a4c73c136c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.15
+    1.0.16
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b044a7ea2661..32eb7f29ec92 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.15
+    1.0.16
   
 
   

From df23adf1ca6840ade0d1fd95d206865181eefcb4 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 17 Apr 2020 08:48:43 +0200
Subject: [PATCH 0333/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.17 (#107)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | patch | `1.0.16` -> `1.0.17` |

---

### Release Notes



GoogleCloudPlatform/java-repo-tools

### [`v1.0.17`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/releases/v1.0.17)

[Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.16...v1.0.17)

-   require -P lint
     Lets not burden customers with our development rules.
    -   Move Checkstyle, ErrorProne, PMD, and SpotBugs to only run w/ -P lint
    -   Update the Readme
-   spotbugs-annotations 4.0.2




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1aec5ce2f432..15ed06e92f6d 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.16
+    1.0.17
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index 6a47fd35bead..dda0f27c3db3 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.16
+    1.0.17
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 58a4c73c136c..4802d9eac37f 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.16
+    1.0.17
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 32eb7f29ec92..4cc2fdb7dd1f 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.16
+    1.0.17
   
 
   

From fb3566d31600b9ed629a2daa46c5202a894181b2 Mon Sep 17 00:00:00 2001
From: Stephanie Wang 
Date: Fri, 24 Apr 2020 14:25:10 -0400
Subject: [PATCH 0334/1784] feat: add flatten plugin to client and proto
 modules (#108)

---
 .gitignore                              |  1 +
 google-cloud-datastore/pom.xml          |  9 +++++++++
 pom.xml                                 |  6 ------
 proto-google-cloud-datastore-v1/pom.xml | 11 +++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79dd1e39e0b1..6f5e4424d742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ target/
 *.iml
 __pycache__/
 
+.flattened-pom.xml
\ No newline at end of file
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 17d8745a8182..0f4ad9636a39 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -97,4 +97,13 @@
       test
     
   
+
+  
+    
+      
+        org.codehaus.mojo
+        flatten-maven-plugin
+      
+    
+  
 
diff --git a/pom.xml b/pom.xml
index 67d44f99381b..4881caa69ddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,17 +253,11 @@
         google-oauth-client
         1.30.6
       
-
       
         org.threeten
         threetenbp
         ${threeten.version}
       
-      
-        javax.annotation
-        javax.annotation-api
-        ${javax.annotations.version}
-      
 
       
         junit
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1a7d2cebf8f7..1292a9f98216 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -24,6 +24,16 @@
       compile
     
   
+
+  
+    
+      
+        org.codehaus.mojo
+        flatten-maven-plugin
+      
+    
+  
+
   
     
       java9
@@ -34,6 +44,7 @@
         
           javax.annotation
           javax.annotation-api
+          ${javax.annotations.version}
         
       
     

From 41d571d1e18f1400f7975a6e82646417ed39ee84 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 24 Apr 2020 20:27:17 +0200
Subject: [PATCH 0335/1784] deps: update dependency org.threeten:threetenbp to
 v1.4.4 (#112)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4881caa69ddd..a5c69b47f9e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
     3.11.4
     4.13
     29.0-android
-    1.4.3
+    1.4.4
     0.24.0
     1.10.19
     1.3.2

From cd3c5531d08b7c66de6f7ba7736a8b81f6112771 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 24 Apr 2020 20:40:11 +0200
Subject: [PATCH 0336/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v5.2.0 (#111)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `5.1.0` -> `5.2.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 4cc2fdb7dd1f..7a04e2bce2df 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        5.1.0
+        5.2.0
         pom
         import
       

From ad6b8803d4cd55fa37ba57fd3edafad256c41aed Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Sat, 25 Apr 2020 00:58:56 +0200
Subject: [PATCH 0337/1784] deps: update dependency io.grpc:grpc-bom to v1.29.0
 (#110)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [io.grpc:grpc-bom](https://togithub.com/grpc/grpc-java) | minor | `1.28.1` -> `1.29.0` |

---

### Release Notes



grpc/grpc-java

### [`v1.29.0`](https://togithub.com/grpc/grpc-java/releases/v1.29.0)

[Compare Source](https://togithub.com/grpc/grpc-java/compare/v1.28.1...v1.29.0)

#### Behavioral Changes

-   core, grpclb: change policy selection strategy for Grpclb policy (move logic of querying SRV into Grpclb's own resolver) ([#​6723](https://togithub.com/grpc/grpc-java/issues/6723)). System property `io.grpc.internal.DnsNameResolverProvider.enable_grpclb` is eliminated, grpc-grpclb dependency implicitly enables querying SRV records since v1.24.2

#### New Features

-   core: `ServerInterceptors.useInputStreamMessages()` now preserves the `KnownLength` interface when wrapping InputStream ([#​6852](https://togithub.com/grpc/grpc-java/issues/6852)). This should prevent certain optimizations from being disabled when using useInputStreamMessages
-   core: `ServerInterceptors.useInputStreamMessages()` and `useMarshalledMessages()` now preserve the SchemaDescriptor, so the methods are now compatible with the reflection service ([#​6851](https://togithub.com/grpc/grpc-java/issues/6851))

#### Bug Fixes

-   core: Fix IllegalStateException if remote-specified decompressor is unknown ([#​6864](https://togithub.com/grpc/grpc-java/issues/6864))
-   core: keep round_robin lb subchannel in TRANSIENT_FAILURE until becoming READY ([#​6657](https://togithub.com/grpc/grpc-java/issues/6657)). This avoids RPC being indefinitely queued when subchannels are bouncing back and forth between CONNECTING and TRANSIENT_FAILURE
-   netty: fixed a bug when grpc-netty and grpc-netty-shaded were both used, which could result in "ClassCastException: io.netty.util.AsciiString cannot be cast to io.grpc.netty.shaded.io.netty.util.AsciiString" ([#​6765](https://togithub.com/grpc/grpc-java/issues/6765))
-   netty: Prevent thread interruption during server start from leaking socket ([#​6867](https://togithub.com/grpc/grpc-java/issues/6867))
-   okhttp: fix incorrect connection-level flow control handling at beginning of connection ([#​6742](https://togithub.com/grpc/grpc-java/issues/6742)). This only impacted users of `OkHttpChannelBuilder.flowControlWindow()`, who seem to be few since this bug was not reported sooner
-   core: A Java 9+ ABI compatibility issue with java.nio.ByteBuffer is fixed ([#​6839](https://togithub.com/grpc/grpc-java/issues/6839)). This only impacted users manually compiling grpc-java with JDK 9+ and then using it as a library for applications that run with JDK 8- (e.g., on Android). This does not impact the pre-built JARs on Maven Central
-   core: fixed a bug in health check config propagation. ([#​6804](https://togithub.com/grpc/grpc-java/issues/6804))
-   benchmarks: some netty benchmarks failed to start and are now fixed ([#​6877](https://togithub.com/grpc/grpc-java/issues/6877)). This was a regression introduced in v1.23.0

#### Documentation

-   Add Javadoc for grpc-services and grpc-grpclb to the grpc-all project. This increases the number of classes shown at 
-   examples: Add a JWT authentication example ([#​5915](https://togithub.com/grpc/grpc-java/issues/5915))

#### Dependencies

-   Bump guava to 28.2-android ([#​6772](https://togithub.com/grpc/grpc-java/issues/6772))
-   Bump netty to 4.1.48.Final, bump tcnative to 2.0.30.Final ([#​6845](https://togithub.com/grpc/grpc-java/issues/6845))
-   Bump truth version to 1.0.1 ([#​6754](https://togithub.com/grpc/grpc-java/issues/6754))

#### Compiling

-   android: add grpc-android into main build ([#​6793](https://togithub.com/grpc/grpc-java/issues/6793)). Compiling with `-PskipAndroid=false` (default) includes building grpc-android module, which requires Android SDK

#### Acknowledgements

[@​chrisschek](https://togithub.com/chrisschek)
[@​elharo](https://togithub.com/elharo) Elliotte Rusty Harold
[@​herbyderby](https://togithub.com/herbyderby) Chris Nokleberg
[@​markb74](https://togithub.com/markb74)
[@​ST-DDT](https://togithub.com/ST-DDT)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a5c69b47f9e1..54b6c1585953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
     1.9.0
     1.17.0
     1.56.0
-    1.28.1
+    1.29.0
     3.11.4
     4.13
     29.0-android

From c2a8d0c429e219d80ed795ed499592055505cc93 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Mon, 27 Apr 2020 14:37:37 -0400
Subject: [PATCH 0338/1784] test: update ITDatastoreTest test to attempt
 multiple times if a test fails (#104)

Datastore (when not Firestore in Datastore mode) is eventually
consistent. Sometimes this means queries may not show the expected
results within the short timespan of a test. This change adds a new
JUnit Rule - MultipleAttemptsRule - which allows tests to attempt to
succeed up to three times. If a test is unable to pass within the 3
allowed attempts, the errors from each attempt will be returned as an
overall failure.

Fixes #97
Fixes #101
---
 .../cloud/datastore/it/ITDatastoreTest.java   |  2 +
 .../datastore/it/MultipleAttemptsRule.java    | 71 +++++++++++++++++++
 .../it/MultipleAttemptsRuleTest.java          | 37 ++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java

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 798b37e0a7a2..7e7fec35f61f 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
@@ -154,6 +154,8 @@ public class ITDatastoreTest {
 
   @Rule public Timeout globalTimeout = Timeout.seconds(100);
 
+  @Rule public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3);
+
   @AfterClass
   public static void afterClass() {
     HELPER.deleteNamespace();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
new file mode 100644
index 000000000000..8472f3131343
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2020 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.cloud.datastore.it;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.MultipleFailureException;
+import org.junit.runners.model.Statement;
+
+/**
+ * A JUnit rule that allows us to allow multiple attempts of a test execution before it is
+ * ultimately failed. When it fails, all failures will be propagated as the result of the test.
+ */
+public final class MultipleAttemptsRule implements TestRule {
+  private final long initialBackoffMillis;
+  private final int attemptCount;
+
+  MultipleAttemptsRule(int attemptCount) {
+    this(attemptCount, 1000L);
+  }
+
+  MultipleAttemptsRule(int attemptCount, long initialBackoffMillis) {
+    checkState(attemptCount > 0, "attemptCount must be > 0");
+    checkState(initialBackoffMillis > 0, "initialBackoffMillis must be > 0");
+    this.initialBackoffMillis = initialBackoffMillis;
+    this.attemptCount = attemptCount;
+  }
+
+  @Override
+  public Statement apply(final Statement base, Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        List failures = new ArrayList<>();
+
+        long retryIntervalMillis = initialBackoffMillis;
+
+        for (int i = 1; i <= attemptCount; i++) {
+          try {
+            base.evaluate();
+            return;
+          } catch (Throwable t) {
+            failures.add(t);
+            Thread.sleep(retryIntervalMillis);
+            retryIntervalMillis *= 1.5f;
+          }
+        }
+
+        MultipleFailureException.assertEmpty(failures);
+      }
+    };
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java
new file mode 100644
index 000000000000..bb6a3c2f5593
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 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.cloud.datastore.it;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+public final class MultipleAttemptsRuleTest {
+
+  private static final int NUMBER_OF_ATTEMPTS = 5;
+
+  @Rule public MultipleAttemptsRule rr = new MultipleAttemptsRule(NUMBER_OF_ATTEMPTS, 10);
+
+  private int numberAttempted = 0;
+
+  @Test
+  public void wontPassUntil5() {
+    numberAttempted += 1;
+    assertEquals(NUMBER_OF_ATTEMPTS, numberAttempted);
+  }
+}

From cad3bfbbe739ab3ed5ebea89bee620ef8bbefd95 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 27 Apr 2020 23:08:25 +0200
Subject: [PATCH 0339/1784] deps: update core transport dependencies to v1.35.0
 (#114)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| com.google.http-client:google-http-client-jackson2 | minor | `1.34.2` -> `1.35.0` |
| com.google.http-client:google-http-client | minor | `1.34.2` -> `1.35.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 54b6c1585953..b751ee8c529e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,12 +241,12 @@
       
         com.google.http-client
         google-http-client
-        1.34.2
+        1.35.0
       
       
         com.google.http-client
         google-http-client-jackson2
-        1.34.2
+        1.35.0
       
       
         com.google.oauth-client

From 97864cbbffdb29420745491eaabb212da9b48147 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 29 Apr 2020 01:06:39 +0200
Subject: [PATCH 0340/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v5.3.0 (#115)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `5.2.0` -> `5.3.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 7a04e2bce2df..418021033808 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        5.2.0
+        5.3.0
         pom
         import
       

From b484256c30ac9117eb82688c801966b6ace856df Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 5 May 2020 03:00:57 +0200
Subject: [PATCH 0341/1784] deps: update dependency
 com.google.api.grpc:proto-google-common-protos to v1.18.0 (#117)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.api.grpc:proto-google-common-protos](https://togithub.com/googleapis/java-iam) | minor | `1.17.0` -> `1.18.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b751ee8c529e..a9356361c817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
     https://googleapis.dev/java/google-api-grpc/latest
     1.93.4
     1.9.0
-    1.17.0
+    1.18.0
     1.56.0
     1.29.0
     3.11.4

From edab2fbe4f24fdafd0df116cebdb4fde60b0f6b1 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 6 May 2020 14:44:16 -0700
Subject: [PATCH 0342/1784] chore: regenerate proto files (#121)

Update comments on protos to clarify size limits on values.

* Integrate Python GAPIC Microgenerator in googleapis.
This PR uses using documentai as an example.
Depends on https://github.com/googleapis/gapic-generator-python/pull/402

PiperOrigin-RevId: 309824146

Source-Author: Google APIs 
Source-Date: Mon May 4 15:06:44 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: e0f9d9e1f9de890db765be46f45ca8490723e3eb
Source-Link: https://github.com/googleapis/googleapis/commit/e0f9d9e1f9de890db765be46f45ca8490723e3eb

* fix(python): use python installed by pyenv for bazel (#520)

Source-Author: Jeff Ching 
Source-Date: Mon May 4 15:52:28 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: a2c1c4f89a5e220e7b39420ebea33623c7c72804
Source-Link: https://github.com/googleapis/synthtool/commit/a2c1c4f89a5e220e7b39420ebea33623c7c72804

* Fix documentation for string_value. The value does not have to be at least 1MB, but rather, at most 1MB.

PiperOrigin-RevId: 309845930

Source-Author: Google APIs 
Source-Date: Mon May 4 16:55:46 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 1b5a8d2bbb69c5a04db26bd546d2888e609c6bab
Source-Link: https://github.com/googleapis/googleapis/commit/1b5a8d2bbb69c5a04db26bd546d2888e609c6bab

* fix: make args optional (#521)

Source-Author: Summer Ji 
Source-Date: Tue May 5 09:52:17 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: ea3ae392fced25d7d6f5c7ef9c8a1f24768a0936
Source-Link: https://github.com/googleapis/synthtool/commit/ea3ae392fced25d7d6f5c7ef9c8a1f24768a0936

* fix: make .kokoro-autosynth executable (#522)

to fix https://github.com/googleapis/synthtool/issues/519

Source-Author: Jeffrey Rennie 
Source-Date: Tue May 5 10:12:11 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: ab883569eb0257bbf16a6d825fd018b3adde3912
Source-Link: https://github.com/googleapis/synthtool/commit/ab883569eb0257bbf16a6d825fd018b3adde3912

* fix: add resource reference to proto files
chore: update copyright and comments

PiperOrigin-RevId: 309990843

Source-Author: Google APIs 
Source-Date: Tue May 5 11:51:12 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 4bef0001ac7040431ea24b6187424fdec9c08b1b
Source-Link: https://github.com/googleapis/googleapis/commit/4bef0001ac7040431ea24b6187424fdec9c08b1b
---
 .../java/com/google/datastore/v1/Value.java   | 28 +++++++++----------
 .../google/datastore/v1/ValueOrBuilder.java   |  8 +++---
 .../proto/google/datastore/v1/entity.proto    |  4 +--
 synth.metadata                                |  8 +++---
 4 files changed, 24 insertions(+), 24 deletions(-)

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 69928d03df65..9cf42afcd4ee 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
@@ -501,8 +501,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed), may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -530,8 +530,8 @@ public java.lang.String getStringValue() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed), may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -2097,8 +2097,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed), may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2126,8 +2126,8 @@ public java.lang.String getStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed), may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2155,8 +2155,8 @@ public com.google.protobuf.ByteString getStringValueBytes() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed), may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2178,8 +2178,8 @@ public Builder setStringValue(java.lang.String value) {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed), may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2199,8 +2199,8 @@ public Builder clearStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at least 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed), may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
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 3f61abd94ac6..f7e039308f9e 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
@@ -168,8 +168,8 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed), may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -182,8 +182,8 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at least 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed), may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
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 96d13ecccc14..dc3a6012075c 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
@@ -145,8 +145,8 @@ message Value {
     Key key_value = 5;
 
     // A UTF-8 encoded string value.
-    // When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-    // Otherwise, may be set to at least 1,000,000 bytes.
+    // When `exclude_from_indexes` is false (it is indexed), may have at most
+    // 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
     string string_value = 17;
 
     // A blob value.
diff --git a/synth.metadata b/synth.metadata
index d9ff8131a184..d18a2a117fb6 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,22 +4,22 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "592d4b21f2637ed2f6b60a984ec215239ad2f923"
+        "sha": "b484256c30ac9117eb82688c801966b6ace856df"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "d741cd976975c745d0199987aff0e908b8352992",
-        "internalRef": "305561906"
+        "sha": "4bef0001ac7040431ea24b6187424fdec9c08b1b",
+        "internalRef": "309990843"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "52638600f387deb98efb5f9c85fec39e82aa9052"
+        "sha": "ab883569eb0257bbf16a6d825fd018b3adde3912"
       }
     }
   ],

From 80823698416bbe08e2d22fbc81ec3709ad2552c8 Mon Sep 17 00:00:00 2001
From: Cameron Zahedi 
Date: Mon, 11 May 2020 16:16:01 -0600
Subject: [PATCH 0343/1784] feat: Create CODEOWNERS (#122)

---
 .github/CODEOWNERS | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000000..39a8fc72bc4f
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,10 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+#
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+
+# The firestore-dpe team is the default owner for anything not
+# explicitly taken by someone else.
+*                               @googleapis/firestore-dpe

From 7de3525cf3e3c7e065847b872c59355544517fe6 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 12 May 2020 08:46:08 -0700
Subject: [PATCH 0344/1784] ci: enable GitHub actions (#123)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8807a95d-0d7c-4251-bd7e-a87799fc9f67/targets

Source-Link: https://github.com/googleapis/synthtool/commit/98c50772ec23295c64cf0d2ddf199ea52961fd4c
Source-Link: https://github.com/googleapis/synthtool/commit/55cdc844877d97139f25004229842624a6a86a02
---
 .github/workflows/ci.yaml | 76 +++++++++++++++++++++++++++++++++++++++
 .kokoro/build.bat         |  2 +-
 synth.metadata            |  4 +--
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/ci.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 000000000000..445b4bf82ffd
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,76 @@
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+name: ci
+jobs:
+  units:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [7, 8, 11]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test
+    - name: coverage
+      uses: codecov/codecov-action@v1
+      with:
+        name: actions ${{matrix.java}}
+  windows:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/build.bat
+      env:
+        JOB_TYPE: test
+  dependencies:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/dependencies.sh
+  linkage-monitor:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/linkage-monitor.sh
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: lint
+  clirr:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: clirr
\ No newline at end of file
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
index 96f027f411a4..05826ad93fe8 100644
--- a/.kokoro/build.bat
+++ b/.kokoro/build.bat
@@ -1,3 +1,3 @@
 :: See documentation in type-shell-output.bat
 
-"C:\Program Files\Git\bin\bash.exe" github/java-datastore/.kokoro/build.sh
+"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
diff --git a/synth.metadata b/synth.metadata
index d18a2a117fb6..1b686b42954f 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "b484256c30ac9117eb82688c801966b6ace856df"
+        "sha": "80823698416bbe08e2d22fbc81ec3709ad2552c8"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "ab883569eb0257bbf16a6d825fd018b3adde3912"
+        "sha": "98c50772ec23295c64cf0d2ddf199ea52961fd4c"
       }
     }
   ],

From 147197d0655a509a11f906e95d5f81d57193c562 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 13 May 2020 13:26:42 -0700
Subject: [PATCH 0345/1784] docs: update CONTRIBUTING.md to include code
 formatting (#534) (#124)

Co-authored-by: Jeff Ching 
Co-authored-by: Jeffrey Rennie 

Source-Author: Brian Chen 
Source-Date: Tue May 12 10:24:59 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 5b48b0716a36ca069db3038da7e205c87a22ed19
Source-Link: https://github.com/googleapis/synthtool/commit/5b48b0716a36ca069db3038da7e205c87a22ed19
---
 CONTRIBUTING.md | 11 ++++++++++-
 synth.metadata  |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 085021ddec26..f2dbdee06bc3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -99,7 +99,16 @@ mvn -Penable-samples clean verify
     ```
 
 2. [Activate](#profile-activation) the profile.
-3. Define your samples in a normal Maven project in the `samples/` directory
+3. Define your samples in a normal Maven project in the `samples/` directory.
+
+### Code Formatting
+
+Code in this repo is formatted with
+[google-java-format](https://github.com/google/google-java-format).
+To run formatting on your project, you can run:
+```
+mvn com.coveo:fmt-maven-plugin:format
+```
 
 ### Profile Activation
 
diff --git a/synth.metadata b/synth.metadata
index 1b686b42954f..538ee7c10667 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "80823698416bbe08e2d22fbc81ec3709ad2552c8"
+        "sha": "7de3525cf3e3c7e065847b872c59355544517fe6"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "98c50772ec23295c64cf0d2ddf199ea52961fd4c"
+        "sha": "5b48b0716a36ca069db3038da7e205c87a22ed19"
       }
     }
   ],

From 0eb5c31569a1067387514cf8d3c7f5715a623e89 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 15 May 2020 01:51:48 +0530
Subject: [PATCH 0346/1784] chore: remove unused maven project properties
 (#125)

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a9356361c817..3187a1f55132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,10 +161,7 @@
     4.13
     29.0-android
     1.4.4
-    0.24.0
-    1.10.19
     1.3.2
-    1.0.1
   
 
   

From ed9b895d57db302a731e38bc6708310baa69cd67 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 15 May 2020 01:52:52 +0530
Subject: [PATCH 0347/1784] docs: fix java doc link of
 LocalDatastoreHelper#stop (#126)

---
 .../google/cloud/datastore/testing/LocalDatastoreHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2792b494c5ce..51bcb6d3201d 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
@@ -242,7 +242,7 @@ public void stop(Duration timeout) throws IOException, InterruptedException, Tim
   }
 
   /**
-   * Stops the Datastore emulator. The same as {@link stop(Duration)} but with timeout duration of
+   * Stops the Datastore emulator. The same as {@link #stop(Duration)} but with timeout duration of
    * 20 seconds.
    *
    * 
It is important to stop the emulator. Since the emulator runs in its own process, not

From a76dd0abc096208499c9ebf9e1e023706e975110 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 18 May 2020 21:54:19 +0200
Subject: [PATCH 0348/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v5.4.0 (#128)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 418021033808..3da7d7e7cf33 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        5.3.0
+        5.4.0
         pom
         import
       

From 8a310f313e53fac802ca75ea539fc4656337c6ee Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 18 May 2020 22:02:25 +0200
Subject: [PATCH 0349/1784] deps: update dependency
 com.google.protobuf:protobuf-java to v3.12.0 (#127)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3187a1f55132..7fb92bd8ef53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
     1.18.0
     1.56.0
     1.29.0
-    3.11.4
+    3.12.0
     4.13
     29.0-android
     1.4.4

From 72e29ff3460b12436e76d445aad7b8ae0e4ee82d Mon Sep 17 00:00:00 2001
From: Stephanie Wang 
Date: Tue, 19 May 2020 16:17:37 -0400
Subject: [PATCH 0350/1784] feat: implement google-cloud-shared-dependencies
 BOM (#135)

---
 pom.xml | 89 ++++-----------------------------------------------------
 1 file changed, 6 insertions(+), 83 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7fb92bd8ef53..82dd2754262c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,52 +152,23 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.93.4
-    1.9.0
-    1.18.0
-    1.56.0
-    1.29.0
-    3.12.0
-    4.13
-    29.0-android
-    1.4.4
     1.3.2
   
 
   
     
       
-        com.google.api.grpc
-        proto-google-cloud-datastore-v1
-        0.85.5-SNAPSHOT
-      
-
-      
-        io.grpc
-        grpc-bom
-        ${grpc.version}
-        pom
-        import
-      
-      
-        com.google.api
-        gax-bom
-        ${gax.version}
-        pom
-        import
-      
-      
-        com.google.guava
-        guava-bom
-        ${guava.version}
+        com.google.cloud
+        google-cloud-shared-dependencies
+        0.4.0
         pom
         import
       
 
       
-        com.google.cloud
-        google-cloud-core-http
-        ${google.core.version}
+        com.google.api.grpc
+        proto-google-cloud-datastore-v1
+        0.85.5-SNAPSHOT
       
       
         com.google.cloud.datastore
@@ -210,71 +181,23 @@
           
         
       
-      
-        com.google.protobuf
-        protobuf-java
-        ${protobuf.version}
-      
-      
-        com.google.api
-        api-common
-        ${google.api-common.version}
-      
-      
-        com.google.api.grpc
-        proto-google-common-protos
-        ${google.common-protos.version}
-      
-      
-        com.google.cloud
-        google-cloud-core
-        ${google.core.version}
-      
       
         com.google.auth
         google-auth-library-oauth2-http
         0.20.0
       
-      
-        com.google.http-client
-        google-http-client
-        1.35.0
-      
-      
-        com.google.http-client
-        google-http-client-jackson2
-        1.35.0
-      
       
         com.google.oauth-client
         google-oauth-client
         1.30.6
       
-      
-        org.threeten
-        threetenbp
-        ${threeten.version}
-      
 
-      
-        junit
-        junit
-        ${junit.version}
-        test
-      
       
         org.easymock
         easymock
         3.6
         test
       
-      
-        com.google.cloud
-        google-cloud-core
-        test-jar
-        test
-        ${google.core.version}
-      
     
   
 

From b7b89e30d746205cda54e4730a0f5a1fd8d0ede9 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 20 May 2020 21:08:23 +0200
Subject: [PATCH 0351/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.6.0 (#136)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | minor | `0.5.0` -> `0.6.0` |

---

### Release Notes



googleapis/java-shared-config

### [`v0.6.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​060-httpswwwgithubcomgoogleapisjava-shared-configcomparev050v060-2020-05-19)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.5.0...v0.6.0)

##### Features

-   add new configuration necessary to support auto-value ([#​136](https://www.github.com/googleapis/java-shared-config/issues/136)) ([c14689b](https://www.github.com/googleapis/java-shared-config/commit/c14689b8791c173687f719d73156a989aedd7ba6))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 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 68132188c99a..cb2c478b6a0d 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
-    0.5.0
+    0.6.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 82dd2754262c..d8e9cf47299f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.5.0
+    0.6.0
   
 
   

From 660f216302fedaf2f5fe0f4c76cdab8fca65cbd1 Mon Sep 17 00:00:00 2001
From: Stephanie Wang 
Date: Wed, 27 May 2020 13:30:07 -0400
Subject: [PATCH 0352/1784] deps: bump shared-deps version and add back certain
 test deps (#139)

---
 pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d8e9cf47299f..9bcd6e645f1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.4.0
+        0.5.0
         pom
         import
       
@@ -192,6 +192,13 @@
         1.30.6
       
 
+      
+      
+        junit
+        junit
+        4.13
+        test
+      
       
         org.easymock
         easymock

From 1a60812308aefa48214a7f1360f2f849a26bd69f Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 28 May 2020 10:16:29 -0700
Subject: [PATCH 0353/1784] chore(bazel): update protobuf, rules_go, gazelle,
 and gapic-generator-go versions (#141)

- protobuf v3.12.1
- rules_go v0.23.0
- gazelle v0.21.0
- gapic-generator-go v0.14.1

PiperOrigin-RevId: 313460921

Source-Author: Google APIs 
Source-Date: Wed May 27 14:10:16 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: c4e37010d74071851ff24121f522e802231ac86e
Source-Link: https://github.com/googleapis/googleapis/commit/c4e37010d74071851ff24121f522e802231ac86e
---
 .../datastore/v1/AllocateIdsRequest.java      |  7 ++++
 .../datastore/v1/AllocateIdsResponse.java     |  5 +++
 .../com/google/datastore/v1/ArrayValue.java   |  5 +++
 .../datastore/v1/BeginTransactionRequest.java |  5 +++
 .../v1/BeginTransactionResponse.java          |  2 +
 .../google/datastore/v1/CommitRequest.java    | 17 ++++++++
 .../google/datastore/v1/CommitResponse.java   |  7 ++++
 .../google/datastore/v1/CompositeFilter.java  | 14 +++++++
 .../java/com/google/datastore/v1/Entity.java  | 13 ++++++
 .../com/google/datastore/v1/EntityResult.java | 11 +++++
 .../java/com/google/datastore/v1/Filter.java  | 12 ++++++
 .../com/google/datastore/v1/GqlQuery.java     | 19 +++++++++
 .../datastore/v1/GqlQueryParameter.java       |  7 ++++
 .../java/com/google/datastore/v1/Key.java     | 13 ++++++
 .../google/datastore/v1/KindExpression.java   |  2 +
 .../google/datastore/v1/LookupRequest.java    | 10 +++++
 .../google/datastore/v1/LookupResponse.java   | 15 +++++++
 .../com/google/datastore/v1/Mutation.java     | 25 +++++++++++
 .../google/datastore/v1/MutationResult.java   |  7 ++++
 .../com/google/datastore/v1/PartitionId.java  |  4 ++
 .../com/google/datastore/v1/Projection.java   |  3 ++
 .../google/datastore/v1/PropertyFilter.java   | 15 +++++++
 .../google/datastore/v1/PropertyOrder.java    | 12 ++++++
 .../datastore/v1/PropertyReference.java       |  2 +
 .../java/com/google/datastore/v1/Query.java   | 32 ++++++++++++++
 .../google/datastore/v1/QueryResultBatch.java | 27 ++++++++++++
 .../com/google/datastore/v1/ReadOptions.java  |  7 ++++
 .../datastore/v1/ReserveIdsRequest.java       |  9 ++++
 .../google/datastore/v1/RollbackRequest.java  |  4 ++
 .../google/datastore/v1/RunQueryRequest.java  | 20 +++++++++
 .../google/datastore/v1/RunQueryResponse.java |  6 +++
 .../datastore/v1/TransactionOptions.java      | 14 +++++++
 .../java/com/google/datastore/v1/Value.java   | 42 +++++++++++++++++++
 synth.metadata                                |  6 +--
 34 files changed, 396 insertions(+), 3 deletions(-)

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 1e5c2b4fff44..b2136418f4e6 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
@@ -138,6 +138,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -160,6 +161,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -185,6 +187,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public java.util.List getKeysList() {
     return keys_;
   }
@@ -199,6 +202,7 @@ public java.util.List getKeysList() {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
@@ -213,6 +217,7 @@ public java.util.List getKeysOrB
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public int getKeysCount() {
     return keys_.size();
   }
@@ -227,6 +232,7 @@ public int getKeysCount() {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
@@ -241,6 +247,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
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 7040cbbfa039..2495a76d4022 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
@@ -129,6 +129,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
+  @java.lang.Override
   public java.util.List getKeysList() {
     return keys_;
   }
@@ -142,6 +143,7 @@ public java.util.List getKeysList() {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
+  @java.lang.Override
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
@@ -155,6 +157,7 @@ public java.util.List getKeysOrB
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
+  @java.lang.Override
   public int getKeysCount() {
     return keys_.size();
   }
@@ -168,6 +171,7 @@ public int getKeysCount() {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
@@ -181,6 +185,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
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 2de3e68b32a3..707f9c49dd26 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
@@ -131,6 +131,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
+  @java.lang.Override
   public java.util.List getValuesList() {
     return values_;
   }
@@ -145,6 +146,7 @@ public java.util.List getValuesList() {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
+  @java.lang.Override
   public java.util.List getValuesOrBuilderList() {
     return values_;
   }
@@ -159,6 +161,7 @@ public java.util.List getValue
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
+  @java.lang.Override
   public int getValuesCount() {
     return values_.size();
   }
@@ -173,6 +176,7 @@ public int getValuesCount() {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Value getValues(int index) {
     return values_.get(index);
   }
@@ -187,6 +191,7 @@ public com.google.datastore.v1.Value getValues(int index) {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
     return values_.get(index);
   }
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 4eeca6e24364..2002ba54214e 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
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -162,6 +163,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -187,6 +189,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    * @return Whether the transactionOptions field is set.
    */
+  @java.lang.Override
   public boolean hasTransactionOptions() {
     return transactionOptions_ != null;
   }
@@ -201,6 +204,7 @@ public boolean hasTransactionOptions() {
    *
    * @return The transactionOptions.
    */
+  @java.lang.Override
   public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
     return transactionOptions_ == null
         ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
@@ -215,6 +219,7 @@ public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
    */
+  @java.lang.Override
   public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptionsOrBuilder() {
     return getTransactionOptions();
   }
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 b1809c176eb1..e158c0f0cc3c 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
@@ -122,6 +122,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The transaction.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
@@ -454,6 +455,7 @@ public Builder mergeFrom(
      *
      * @return The transaction.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
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 8f4f7abae48c..2fb7893435c4 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
@@ -265,6 +265,10 @@ public Mode findValueByNumber(int number) {
         };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
       return getDescriptor().getValues().get(ordinal());
     }
 
@@ -354,6 +358,7 @@ public TransactionSelectorCase getTransactionSelectorCase() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -376,6 +381,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -401,6 +407,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    * @return The enum numeric value on the wire for mode.
    */
+  @java.lang.Override
   public int getModeValue() {
     return mode_;
   }
@@ -415,6 +422,7 @@ public int getModeValue() {
    *
    * @return The mode.
    */
+  @java.lang.Override
   public com.google.datastore.v1.CommitRequest.Mode getMode() {
     @SuppressWarnings("deprecation")
     com.google.datastore.v1.CommitRequest.Mode result =
@@ -436,6 +444,7 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
    *
    * @return The transaction.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTransaction() {
     if (transactionSelectorCase_ == 1) {
       return (com.google.protobuf.ByteString) transactionSelector_;
@@ -463,6 +472,7 @@ public com.google.protobuf.ByteString getTransaction() {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
+  @java.lang.Override
   public java.util.List getMutationsList() {
     return mutations_;
   }
@@ -484,6 +494,7 @@ public java.util.List getMutationsList() {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
+  @java.lang.Override
   public java.util.List
       getMutationsOrBuilderList() {
     return mutations_;
@@ -506,6 +517,7 @@ public java.util.List getMutationsList() {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
+  @java.lang.Override
   public int getMutationsCount() {
     return mutations_.size();
   }
@@ -527,6 +539,7 @@ public int getMutationsCount() {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Mutation getMutations(int index) {
     return mutations_.get(index);
   }
@@ -548,6 +561,7 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
+  @java.lang.Override
   public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index) {
     return mutations_.get(index);
   }
@@ -1112,6 +1126,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      *
      * @return The enum numeric value on the wire for mode.
      */
+    @java.lang.Override
     public int getModeValue() {
       return mode_;
     }
@@ -1128,6 +1143,7 @@ public int getModeValue() {
      * @return This builder for chaining.
      */
     public Builder setModeValue(int value) {
+
       mode_ = value;
       onChanged();
       return this;
@@ -1143,6 +1159,7 @@ public Builder setModeValue(int value) {
      *
      * @return The mode.
      */
+    @java.lang.Override
     public com.google.datastore.v1.CommitRequest.Mode getMode() {
       @SuppressWarnings("deprecation")
       com.google.datastore.v1.CommitRequest.Mode result =
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 d7af5d5fc5e7..65706cccb38a 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
@@ -137,6 +137,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
+  @java.lang.Override
   public java.util.List getMutationResultsList() {
     return mutationResults_;
   }
@@ -150,6 +151,7 @@ public java.util.List getMutationResults
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
+  @java.lang.Override
   public java.util.List
       getMutationResultsOrBuilderList() {
     return mutationResults_;
@@ -164,6 +166,7 @@ public java.util.List getMutationResults
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
+  @java.lang.Override
   public int getMutationResultsCount() {
     return mutationResults_.size();
   }
@@ -177,6 +180,7 @@ public int getMutationResultsCount() {
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.MutationResult getMutationResults(int index) {
     return mutationResults_.get(index);
   }
@@ -190,6 +194,7 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(int index) {
     return mutationResults_.get(index);
   }
@@ -208,6 +213,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
    *
    * @return The indexUpdates.
    */
+  @java.lang.Override
   public int getIndexUpdates() {
     return indexUpdates_;
   }
@@ -969,6 +975,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
      *
      * @return The indexUpdates.
      */
+    @java.lang.Override
     public int getIndexUpdates() {
       return indexUpdates_;
     }
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 90dc8bc51849..349aee53a2c7 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
@@ -225,6 +225,10 @@ public Operator findValueByNumber(int number) {
         };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
       return getDescriptor().getValues().get(ordinal());
     }
 
@@ -270,6 +274,7 @@ private Operator(int value) {
    *
    * @return The enum numeric value on the wire for op.
    */
+  @java.lang.Override
   public int getOpValue() {
     return op_;
   }
@@ -284,6 +289,7 @@ public int getOpValue() {
    *
    * @return The op.
    */
+  @java.lang.Override
   public com.google.datastore.v1.CompositeFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
     com.google.datastore.v1.CompositeFilter.Operator result =
@@ -303,6 +309,7 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
+  @java.lang.Override
   public java.util.List getFiltersList() {
     return filters_;
   }
@@ -316,6 +323,7 @@ public java.util.List getFiltersList() {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
+  @java.lang.Override
   public java.util.List
       getFiltersOrBuilderList() {
     return filters_;
@@ -330,6 +338,7 @@ public java.util.List getFiltersList() {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
+  @java.lang.Override
   public int getFiltersCount() {
     return filters_.size();
   }
@@ -343,6 +352,7 @@ public int getFiltersCount() {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Filter getFilters(int index) {
     return filters_.get(index);
   }
@@ -356,6 +366,7 @@ public com.google.datastore.v1.Filter getFilters(int index) {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
     return filters_.get(index);
   }
@@ -744,6 +755,7 @@ public Builder mergeFrom(
      *
      * @return The enum numeric value on the wire for op.
      */
+    @java.lang.Override
     public int getOpValue() {
       return op_;
     }
@@ -760,6 +772,7 @@ public int getOpValue() {
      * @return This builder for chaining.
      */
     public Builder setOpValue(int value) {
+
       op_ = value;
       onChanged();
       return this;
@@ -775,6 +788,7 @@ public Builder setOpValue(int value) {
      *
      * @return The op.
      */
+    @java.lang.Override
     public com.google.datastore.v1.CompositeFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
       com.google.datastore.v1.CompositeFilter.Operator result =
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index bd89b24ee4bd..a9cfad568f3e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -163,6 +163,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * @return Whether the key field is set.
    */
+  @java.lang.Override
   public boolean hasKey() {
     return key_ != null;
   }
@@ -181,6 +182,7 @@ public boolean hasKey() {
    *
    * @return The key.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
@@ -197,6 +199,7 @@ public com.google.datastore.v1.Key getKey() {
    *
    * .google.datastore.v1.Key key = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
     return getKey();
   }
@@ -243,6 +246,7 @@ public int getPropertiesCount() {
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+  @java.lang.Override
   public boolean containsProperties(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -250,6 +254,7 @@ public boolean containsProperties(java.lang.String key) {
     return internalGetProperties().getMap().containsKey(key);
   }
   /** Use {@link #getPropertiesMap()} instead. */
+  @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map getProperties() {
     return getPropertiesMap();
@@ -268,6 +273,7 @@ public java.util.Map getPropert
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+  @java.lang.Override
   public java.util.Map getPropertiesMap() {
     return internalGetProperties().getMap();
   }
@@ -285,6 +291,7 @@ public java.util.Map getPropert
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Value getPropertiesOrDefault(
       java.lang.String key, com.google.datastore.v1.Value defaultValue) {
     if (key == null) {
@@ -308,6 +315,7 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -947,6 +955,7 @@ public int getPropertiesCount() {
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
+    @java.lang.Override
     public boolean containsProperties(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
@@ -954,6 +963,7 @@ public boolean containsProperties(java.lang.String key) {
       return internalGetProperties().getMap().containsKey(key);
     }
     /** Use {@link #getPropertiesMap()} instead. */
+    @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map getProperties() {
       return getPropertiesMap();
@@ -972,6 +982,7 @@ public java.util.Map getPropert
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
+    @java.lang.Override
     public java.util.Map getPropertiesMap() {
       return internalGetProperties().getMap();
     }
@@ -989,6 +1000,7 @@ public java.util.Map getPropert
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
+    @java.lang.Override
     public com.google.datastore.v1.Value getPropertiesOrDefault(
         java.lang.String key, com.google.datastore.v1.Value defaultValue) {
       if (key == null) {
@@ -1012,6 +1024,7 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
+    @java.lang.Override
     public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
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 10653417a0f7..732a3012dacd 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
@@ -276,6 +276,10 @@ public ResultType findValueByNumber(int number) {
         };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
       return getDescriptor().getValues().get(ordinal());
     }
 
@@ -321,6 +325,7 @@ private ResultType(int value) {
    *
    * @return Whether the entity field is set.
    */
+  @java.lang.Override
   public boolean hasEntity() {
     return entity_ != null;
   }
@@ -335,6 +340,7 @@ public boolean hasEntity() {
    *
    * @return The entity.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Entity getEntity() {
     return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
   }
@@ -347,6 +353,7 @@ public com.google.datastore.v1.Entity getEntity() {
    *
    * .google.datastore.v1.Entity entity = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
     return getEntity();
   }
@@ -370,6 +377,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
    *
    * @return The version.
    */
+  @java.lang.Override
   public long getVersion() {
     return version_;
   }
@@ -388,6 +396,7 @@ public long getVersion() {
    *
    * @return The cursor.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getCursor() {
     return cursor_;
   }
@@ -944,6 +953,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
      *
      * @return The version.
      */
+    @java.lang.Override
     public long getVersion() {
       return version_;
     }
@@ -1008,6 +1018,7 @@ public Builder clearVersion() {
      *
      * @return The cursor.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getCursor() {
       return cursor_;
     }
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 4fbff2da52a5..324e8bf63493 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
@@ -191,6 +191,7 @@ public FilterTypeCase getFilterTypeCase() {
    *
    * @return Whether the compositeFilter field is set.
    */
+  @java.lang.Override
   public boolean hasCompositeFilter() {
     return filterTypeCase_ == 1;
   }
@@ -205,6 +206,7 @@ public boolean hasCompositeFilter() {
    *
    * @return The compositeFilter.
    */
+  @java.lang.Override
   public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
     if (filterTypeCase_ == 1) {
       return (com.google.datastore.v1.CompositeFilter) filterType_;
@@ -220,6 +222,7 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder() {
     if (filterTypeCase_ == 1) {
       return (com.google.datastore.v1.CompositeFilter) filterType_;
@@ -239,6 +242,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
    *
    * @return Whether the propertyFilter field is set.
    */
+  @java.lang.Override
   public boolean hasPropertyFilter() {
     return filterTypeCase_ == 2;
   }
@@ -253,6 +257,7 @@ public boolean hasPropertyFilter() {
    *
    * @return The propertyFilter.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
     if (filterTypeCase_ == 2) {
       return (com.google.datastore.v1.PropertyFilter) filterType_;
@@ -268,6 +273,7 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder() {
     if (filterTypeCase_ == 2) {
       return (com.google.datastore.v1.PropertyFilter) filterType_;
@@ -673,6 +679,7 @@ public Builder clearFilterType() {
      *
      * @return Whether the compositeFilter field is set.
      */
+    @java.lang.Override
     public boolean hasCompositeFilter() {
       return filterTypeCase_ == 1;
     }
@@ -687,6 +694,7 @@ public boolean hasCompositeFilter() {
      *
      * @return The compositeFilter.
      */
+    @java.lang.Override
     public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
       if (compositeFilterBuilder_ == null) {
         if (filterTypeCase_ == 1) {
@@ -819,6 +827,7 @@ public com.google.datastore.v1.CompositeFilter.Builder getCompositeFilterBuilder
      *
      * .google.datastore.v1.CompositeFilter composite_filter = 1;
      */
+    @java.lang.Override
     public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder() {
       if ((filterTypeCase_ == 1) && (compositeFilterBuilder_ != null)) {
         return compositeFilterBuilder_.getMessageOrBuilder();
@@ -879,6 +888,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
      *
      * @return Whether the propertyFilter field is set.
      */
+    @java.lang.Override
     public boolean hasPropertyFilter() {
       return filterTypeCase_ == 2;
     }
@@ -893,6 +903,7 @@ public boolean hasPropertyFilter() {
      *
      * @return The propertyFilter.
      */
+    @java.lang.Override
     public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
       if (propertyFilterBuilder_ == null) {
         if (filterTypeCase_ == 2) {
@@ -1025,6 +1036,7 @@ public com.google.datastore.v1.PropertyFilter.Builder getPropertyFilterBuilder()
      *
      * .google.datastore.v1.PropertyFilter property_filter = 2;
      */
+    @java.lang.Override
     public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder() {
       if ((filterTypeCase_ == 2) && (propertyFilterBuilder_ != null)) {
         return propertyFilterBuilder_.getMessageOrBuilder();
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 758f999728e5..03a1fbd1ee74 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
@@ -177,6 +177,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * @return The queryString.
    */
+  @java.lang.Override
   public java.lang.String getQueryString() {
     java.lang.Object ref = queryString_;
     if (ref instanceof java.lang.String) {
@@ -200,6 +201,7 @@ public java.lang.String getQueryString() {
    *
    * @return The bytes for queryString.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getQueryStringBytes() {
     java.lang.Object ref = queryString_;
     if (ref instanceof java.lang.String) {
@@ -228,6 +230,7 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
    *
    * @return The allowLiterals.
    */
+  @java.lang.Override
   public boolean getAllowLiterals() {
     return allowLiterals_;
   }
@@ -275,6 +278,7 @@ public int getNamedBindingsCount() {
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
+  @java.lang.Override
   public boolean containsNamedBindings(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -282,6 +286,7 @@ public boolean containsNamedBindings(java.lang.String key) {
     return internalGetNamedBindings().getMap().containsKey(key);
   }
   /** Use {@link #getNamedBindingsMap()} instead. */
+  @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map
       getNamedBindings() {
@@ -299,6 +304,7 @@ public boolean containsNamedBindings(java.lang.String key) {
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
+  @java.lang.Override
   public java.util.Map
       getNamedBindingsMap() {
     return internalGetNamedBindings().getMap();
@@ -315,6 +321,7 @@ public boolean containsNamedBindings(java.lang.String key) {
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
+  @java.lang.Override
   public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
       java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
     if (key == null) {
@@ -336,6 +343,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
+  @java.lang.Override
   public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -362,6 +370,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
+  @java.lang.Override
   public java.util.List getPositionalBindingsList() {
     return positionalBindings_;
   }
@@ -377,6 +386,7 @@ public java.util.List getPositionalBi
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
+  @java.lang.Override
   public java.util.List
       getPositionalBindingsOrBuilderList() {
     return positionalBindings_;
@@ -393,6 +403,7 @@ public java.util.List getPositionalBi
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
+  @java.lang.Override
   public int getPositionalBindingsCount() {
     return positionalBindings_.size();
   }
@@ -408,6 +419,7 @@ public int getPositionalBindingsCount() {
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
+  @java.lang.Override
   public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index) {
     return positionalBindings_.get(index);
   }
@@ -423,6 +435,7 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
+  @java.lang.Override
   public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder(
       int index) {
     return positionalBindings_.get(index);
@@ -984,6 +997,7 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
      *
      * @return The allowLiterals.
      */
+    @java.lang.Override
     public boolean getAllowLiterals() {
       return allowLiterals_;
     }
@@ -1073,6 +1087,7 @@ public int getNamedBindingsCount() {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
+    @java.lang.Override
     public boolean containsNamedBindings(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
@@ -1080,6 +1095,7 @@ public boolean containsNamedBindings(java.lang.String key) {
       return internalGetNamedBindings().getMap().containsKey(key);
     }
     /** Use {@link #getNamedBindingsMap()} instead. */
+    @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map
         getNamedBindings() {
@@ -1097,6 +1113,7 @@ public boolean containsNamedBindings(java.lang.String key) {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
+    @java.lang.Override
     public java.util.Map
         getNamedBindingsMap() {
       return internalGetNamedBindings().getMap();
@@ -1113,6 +1130,7 @@ public boolean containsNamedBindings(java.lang.String key) {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
+    @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
         java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
       if (key == null) {
@@ -1134,6 +1152,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
+    @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
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 38c132e6ca58..29569cc45f12 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
@@ -182,6 +182,7 @@ public ParameterTypeCase getParameterTypeCase() {
    *
    * @return Whether the value field is set.
    */
+  @java.lang.Override
   public boolean hasValue() {
     return parameterTypeCase_ == 2;
   }
@@ -196,6 +197,7 @@ public boolean hasValue() {
    *
    * @return The value.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Value getValue() {
     if (parameterTypeCase_ == 2) {
       return (com.google.datastore.v1.Value) parameterType_;
@@ -211,6 +213,7 @@ public com.google.datastore.v1.Value getValue() {
    *
    * .google.datastore.v1.Value value = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
     if (parameterTypeCase_ == 2) {
       return (com.google.datastore.v1.Value) parameterType_;
@@ -231,6 +234,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
    *
    * @return The cursor.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getCursor() {
     if (parameterTypeCase_ == 3) {
       return (com.google.protobuf.ByteString) parameterType_;
@@ -636,6 +640,7 @@ public Builder clearParameterType() {
      *
      * @return Whether the value field is set.
      */
+    @java.lang.Override
     public boolean hasValue() {
       return parameterTypeCase_ == 2;
     }
@@ -650,6 +655,7 @@ public boolean hasValue() {
      *
      * @return The value.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Value getValue() {
       if (valueBuilder_ == null) {
         if (parameterTypeCase_ == 2) {
@@ -781,6 +787,7 @@ public com.google.datastore.v1.Value.Builder getValueBuilder() {
      *
      * .google.datastore.v1.Value value = 2;
      */
+    @java.lang.Override
     public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       if ((parameterTypeCase_ == 2) && (valueBuilder_ != null)) {
         return valueBuilder_.getMessageOrBuilder();
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 3b418fb698ab..1b7e16d21073 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
@@ -391,6 +391,7 @@ public IdTypeCase getIdTypeCase() {
      *
      * @return The kind.
      */
+    @java.lang.Override
     public java.lang.String getKind() {
       java.lang.Object ref = kind_;
       if (ref instanceof java.lang.String) {
@@ -416,6 +417,7 @@ public java.lang.String getKind() {
      *
      * @return The bytes for kind.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getKindBytes() {
       java.lang.Object ref = kind_;
       if (ref instanceof java.lang.String) {
@@ -442,6 +444,7 @@ public com.google.protobuf.ByteString getKindBytes() {
      *
      * @return The id.
      */
+    @java.lang.Override
     public long getId() {
       if (idTypeCase_ == 2) {
         return (java.lang.Long) idType_;
@@ -1106,6 +1109,7 @@ public Builder clearId() {
        *
        * @return The name.
        */
+      @java.lang.Override
       public java.lang.String getName() {
         java.lang.Object ref = "";
         if (idTypeCase_ == 3) {
@@ -1136,6 +1140,7 @@ public java.lang.String getName() {
        *
        * @return The bytes for name.
        */
+      @java.lang.Override
       public com.google.protobuf.ByteString getNameBytes() {
         java.lang.Object ref = "";
         if (idTypeCase_ == 3) {
@@ -1291,6 +1296,7 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
    *
    * @return Whether the partitionId field is set.
    */
+  @java.lang.Override
   public boolean hasPartitionId() {
     return partitionId_ != null;
   }
@@ -1307,6 +1313,7 @@ public boolean hasPartitionId() {
    *
    * @return The partitionId.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PartitionId getPartitionId() {
     return partitionId_ == null
         ? com.google.datastore.v1.PartitionId.getDefaultInstance()
@@ -1323,6 +1330,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
    *
    * .google.datastore.v1.PartitionId partition_id = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
     return getPartitionId();
   }
@@ -1351,6 +1359,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
+  @java.lang.Override
   public java.util.List getPathList() {
     return path_;
   }
@@ -1376,6 +1385,7 @@ public java.util.List getPathList() {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
+  @java.lang.Override
   public java.util.List
       getPathOrBuilderList() {
     return path_;
@@ -1402,6 +1412,7 @@ public java.util.List getPathList() {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
+  @java.lang.Override
   public int getPathCount() {
     return path_.size();
   }
@@ -1427,6 +1438,7 @@ public int getPathCount() {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key.PathElement getPath(int index) {
     return path_.get(index);
   }
@@ -1452,6 +1464,7 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int index) {
     return path_.get(index);
   }
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 c1398f4885ca..879ce1ff6c97 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
@@ -124,6 +124,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -146,6 +147,7 @@ public java.lang.String getName() {
    *
    * @return The bytes for name.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getNameBytes() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
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 ae647700093b..ce7c5ec6ce3c 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
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -176,6 +177,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -201,6 +203,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    * @return Whether the readOptions field is set.
    */
+  @java.lang.Override
   public boolean hasReadOptions() {
     return readOptions_ != null;
   }
@@ -215,6 +218,7 @@ public boolean hasReadOptions() {
    *
    * @return The readOptions.
    */
+  @java.lang.Override
   public com.google.datastore.v1.ReadOptions getReadOptions() {
     return readOptions_ == null
         ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
@@ -229,6 +233,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
    *
    * .google.datastore.v1.ReadOptions read_options = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
     return getReadOptions();
   }
@@ -245,6 +250,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
    * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public java.util.List getKeysList() {
     return keys_;
   }
@@ -258,6 +264,7 @@ public java.util.List getKeysList() {
    * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
@@ -271,6 +278,7 @@ public java.util.List getKeysOrB
    * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public int getKeysCount() {
     return keys_.size();
   }
@@ -284,6 +292,7 @@ public int getKeysCount() {
    * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
@@ -297,6 +306,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
    * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
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 7bf96d1cda55..3beadafa5a57 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
@@ -161,6 +161,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
+  @java.lang.Override
   public java.util.List getFoundList() {
     return found_;
   }
@@ -175,6 +176,7 @@ public java.util.List getFoundList() {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
+  @java.lang.Override
   public java.util.List
       getFoundOrBuilderList() {
     return found_;
@@ -190,6 +192,7 @@ public java.util.List getFoundList() {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
+  @java.lang.Override
   public int getFoundCount() {
     return found_.size();
   }
@@ -204,6 +207,7 @@ public int getFoundCount() {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityResult getFound(int index) {
     return found_.get(index);
   }
@@ -218,6 +222,7 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index) {
     return found_.get(index);
   }
@@ -235,6 +240,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
+  @java.lang.Override
   public java.util.List getMissingList() {
     return missing_;
   }
@@ -249,6 +255,7 @@ public java.util.List getMissingList() {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
+  @java.lang.Override
   public java.util.List
       getMissingOrBuilderList() {
     return missing_;
@@ -264,6 +271,7 @@ public java.util.List getMissingList() {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
+  @java.lang.Override
   public int getMissingCount() {
     return missing_.size();
   }
@@ -278,6 +286,7 @@ public int getMissingCount() {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityResult getMissing(int index) {
     return missing_.get(index);
   }
@@ -292,6 +301,7 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int index) {
     return missing_.get(index);
   }
@@ -309,6 +319,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
+  @java.lang.Override
   public java.util.List getDeferredList() {
     return deferred_;
   }
@@ -323,6 +334,7 @@ public java.util.List getDeferredList() {
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
+  @java.lang.Override
   public java.util.List getDeferredOrBuilderList() {
     return deferred_;
   }
@@ -337,6 +349,7 @@ public java.util.List getDeferre
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
+  @java.lang.Override
   public int getDeferredCount() {
     return deferred_.size();
   }
@@ -351,6 +364,7 @@ public int getDeferredCount() {
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getDeferred(int index) {
     return deferred_.get(index);
   }
@@ -365,6 +379,7 @@ public com.google.datastore.v1.Key getDeferred(int index) {
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
     return deferred_.get(index);
   }
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 b92d928b8914..3bda64242ac0 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
@@ -277,6 +277,7 @@ public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
    *
    * @return Whether the insert field is set.
    */
+  @java.lang.Override
   public boolean hasInsert() {
     return operationCase_ == 4;
   }
@@ -292,6 +293,7 @@ public boolean hasInsert() {
    *
    * @return The insert.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Entity getInsert() {
     if (operationCase_ == 4) {
       return (com.google.datastore.v1.Entity) operation_;
@@ -308,6 +310,7 @@ public com.google.datastore.v1.Entity getInsert() {
    *
    * .google.datastore.v1.Entity insert = 4;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
     if (operationCase_ == 4) {
       return (com.google.datastore.v1.Entity) operation_;
@@ -328,6 +331,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
    *
    * @return Whether the update field is set.
    */
+  @java.lang.Override
   public boolean hasUpdate() {
     return operationCase_ == 5;
   }
@@ -343,6 +347,7 @@ public boolean hasUpdate() {
    *
    * @return The update.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Entity getUpdate() {
     if (operationCase_ == 5) {
       return (com.google.datastore.v1.Entity) operation_;
@@ -359,6 +364,7 @@ public com.google.datastore.v1.Entity getUpdate() {
    *
    * .google.datastore.v1.Entity update = 5;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
     if (operationCase_ == 5) {
       return (com.google.datastore.v1.Entity) operation_;
@@ -379,6 +385,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
    *
    * @return Whether the upsert field is set.
    */
+  @java.lang.Override
   public boolean hasUpsert() {
     return operationCase_ == 6;
   }
@@ -394,6 +401,7 @@ public boolean hasUpsert() {
    *
    * @return The upsert.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Entity getUpsert() {
     if (operationCase_ == 6) {
       return (com.google.datastore.v1.Entity) operation_;
@@ -410,6 +418,7 @@ public com.google.datastore.v1.Entity getUpsert() {
    *
    * .google.datastore.v1.Entity upsert = 6;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
     if (operationCase_ == 6) {
       return (com.google.datastore.v1.Entity) operation_;
@@ -430,6 +439,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
    *
    * @return Whether the delete field is set.
    */
+  @java.lang.Override
   public boolean hasDelete() {
     return operationCase_ == 7;
   }
@@ -445,6 +455,7 @@ public boolean hasDelete() {
    *
    * @return The delete.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getDelete() {
     if (operationCase_ == 7) {
       return (com.google.datastore.v1.Key) operation_;
@@ -461,6 +472,7 @@ public com.google.datastore.v1.Key getDelete() {
    *
    * .google.datastore.v1.Key delete = 7;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
     if (operationCase_ == 7) {
       return (com.google.datastore.v1.Key) operation_;
@@ -481,6 +493,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
    *
    * @return The baseVersion.
    */
+  @java.lang.Override
   public long getBaseVersion() {
     if (conflictDetectionStrategyCase_ == 8) {
       return (java.lang.Long) conflictDetectionStrategy_;
@@ -998,6 +1011,7 @@ public Builder clearConflictDetectionStrategy() {
      *
      * @return Whether the insert field is set.
      */
+    @java.lang.Override
     public boolean hasInsert() {
       return operationCase_ == 4;
     }
@@ -1013,6 +1027,7 @@ public boolean hasInsert() {
      *
      * @return The insert.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Entity getInsert() {
       if (insertBuilder_ == null) {
         if (operationCase_ == 4) {
@@ -1149,6 +1164,7 @@ public com.google.datastore.v1.Entity.Builder getInsertBuilder() {
      *
      * .google.datastore.v1.Entity insert = 4;
      */
+    @java.lang.Override
     public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
       if ((operationCase_ == 4) && (insertBuilder_ != null)) {
         return insertBuilder_.getMessageOrBuilder();
@@ -1209,6 +1225,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
      *
      * @return Whether the update field is set.
      */
+    @java.lang.Override
     public boolean hasUpdate() {
       return operationCase_ == 5;
     }
@@ -1224,6 +1241,7 @@ public boolean hasUpdate() {
      *
      * @return The update.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Entity getUpdate() {
       if (updateBuilder_ == null) {
         if (operationCase_ == 5) {
@@ -1360,6 +1378,7 @@ public com.google.datastore.v1.Entity.Builder getUpdateBuilder() {
      *
      * .google.datastore.v1.Entity update = 5;
      */
+    @java.lang.Override
     public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
       if ((operationCase_ == 5) && (updateBuilder_ != null)) {
         return updateBuilder_.getMessageOrBuilder();
@@ -1420,6 +1439,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
      *
      * @return Whether the upsert field is set.
      */
+    @java.lang.Override
     public boolean hasUpsert() {
       return operationCase_ == 6;
     }
@@ -1435,6 +1455,7 @@ public boolean hasUpsert() {
      *
      * @return The upsert.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Entity getUpsert() {
       if (upsertBuilder_ == null) {
         if (operationCase_ == 6) {
@@ -1571,6 +1592,7 @@ public com.google.datastore.v1.Entity.Builder getUpsertBuilder() {
      *
      * .google.datastore.v1.Entity upsert = 6;
      */
+    @java.lang.Override
     public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
       if ((operationCase_ == 6) && (upsertBuilder_ != null)) {
         return upsertBuilder_.getMessageOrBuilder();
@@ -1631,6 +1653,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
      *
      * @return Whether the delete field is set.
      */
+    @java.lang.Override
     public boolean hasDelete() {
       return operationCase_ == 7;
     }
@@ -1646,6 +1669,7 @@ public boolean hasDelete() {
      *
      * @return The delete.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Key getDelete() {
       if (deleteBuilder_ == null) {
         if (operationCase_ == 7) {
@@ -1781,6 +1805,7 @@ public com.google.datastore.v1.Key.Builder getDeleteBuilder() {
      *
      * .google.datastore.v1.Key delete = 7;
      */
+    @java.lang.Override
     public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
       if ((operationCase_ == 7) && (deleteBuilder_ != null)) {
         return deleteBuilder_.getMessageOrBuilder();
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 0617675943b6..48a891412862 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
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the key field is set.
    */
+  @java.lang.Override
   public boolean hasKey() {
     return key_ != null;
   }
@@ -155,6 +156,7 @@ public boolean hasKey() {
    *
    * @return The key.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
@@ -168,6 +170,7 @@ public com.google.datastore.v1.Key getKey() {
    *
    * .google.datastore.v1.Key key = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
     return getKey();
   }
@@ -189,6 +192,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
    *
    * @return The version.
    */
+  @java.lang.Override
   public long getVersion() {
     return version_;
   }
@@ -207,6 +211,7 @@ public long getVersion() {
    *
    * @return The conflictDetected.
    */
+  @java.lang.Override
   public boolean getConflictDetected() {
     return conflictDetected_;
   }
@@ -770,6 +775,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
      *
      * @return The version.
      */
+    @java.lang.Override
     public long getVersion() {
       return version_;
     }
@@ -830,6 +836,7 @@ public Builder clearVersion() {
      *
      * @return The conflictDetected.
      */
+    @java.lang.Override
     public boolean getConflictDetected() {
       return conflictDetected_;
     }
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 8dd325642284..ab8e5d834a13 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
@@ -147,6 +147,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -169,6 +170,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -194,6 +196,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    * @return The namespaceId.
    */
+  @java.lang.Override
   public java.lang.String getNamespaceId() {
     java.lang.Object ref = namespaceId_;
     if (ref instanceof java.lang.String) {
@@ -216,6 +219,7 @@ public java.lang.String getNamespaceId() {
    *
    * @return The bytes for namespaceId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getNamespaceIdBytes() {
     java.lang.Object ref = namespaceId_;
     if (ref instanceof java.lang.String) {
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 7babf6056d17..81088877b4de 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
@@ -131,6 +131,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the property field is set.
    */
+  @java.lang.Override
   public boolean hasProperty() {
     return property_ != null;
   }
@@ -145,6 +146,7 @@ public boolean hasProperty() {
    *
    * @return The property.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReference getProperty() {
     return property_ == null
         ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
@@ -159,6 +161,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
    *
    * .google.datastore.v1.PropertyReference property = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
     return getProperty();
   }
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 44db5e21111a..8e53aca99bd8 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
@@ -350,6 +350,10 @@ public Operator findValueByNumber(int number) {
         };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
       return getDescriptor().getValues().get(ordinal());
     }
 
@@ -395,6 +399,7 @@ private Operator(int value) {
    *
    * @return Whether the property field is set.
    */
+  @java.lang.Override
   public boolean hasProperty() {
     return property_ != null;
   }
@@ -409,6 +414,7 @@ public boolean hasProperty() {
    *
    * @return The property.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReference getProperty() {
     return property_ == null
         ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
@@ -423,6 +429,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
    *
    * .google.datastore.v1.PropertyReference property = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
     return getProperty();
   }
@@ -440,6 +447,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
    *
    * @return The enum numeric value on the wire for op.
    */
+  @java.lang.Override
   public int getOpValue() {
     return op_;
   }
@@ -454,6 +462,7 @@ public int getOpValue() {
    *
    * @return The op.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
     com.google.datastore.v1.PropertyFilter.Operator result =
@@ -474,6 +483,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() {
    *
    * @return Whether the value field is set.
    */
+  @java.lang.Override
   public boolean hasValue() {
     return value_ != null;
   }
@@ -488,6 +498,7 @@ public boolean hasValue() {
    *
    * @return The value.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Value getValue() {
     return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
   }
@@ -500,6 +511,7 @@ public com.google.datastore.v1.Value getValue() {
    *
    * .google.datastore.v1.Value value = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
     return getValue();
   }
@@ -1071,6 +1083,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      *
      * @return The enum numeric value on the wire for op.
      */
+    @java.lang.Override
     public int getOpValue() {
       return op_;
     }
@@ -1087,6 +1100,7 @@ public int getOpValue() {
      * @return This builder for chaining.
      */
     public Builder setOpValue(int value) {
+
       op_ = value;
       onChanged();
       return this;
@@ -1102,6 +1116,7 @@ public Builder setOpValue(int value) {
      *
      * @return The op.
      */
+    @java.lang.Override
     public com.google.datastore.v1.PropertyFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
       com.google.datastore.v1.PropertyFilter.Operator result =
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 4876eefb5c0f..a70a8182d0c1 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
@@ -248,6 +248,10 @@ public Direction findValueByNumber(int number) {
         };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
       return getDescriptor().getValues().get(ordinal());
     }
 
@@ -293,6 +297,7 @@ private Direction(int value) {
    *
    * @return Whether the property field is set.
    */
+  @java.lang.Override
   public boolean hasProperty() {
     return property_ != null;
   }
@@ -307,6 +312,7 @@ public boolean hasProperty() {
    *
    * @return The property.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReference getProperty() {
     return property_ == null
         ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
@@ -321,6 +327,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
    *
    * .google.datastore.v1.PropertyReference property = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
     return getProperty();
   }
@@ -338,6 +345,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
    *
    * @return The enum numeric value on the wire for direction.
    */
+  @java.lang.Override
   public int getDirectionValue() {
     return direction_;
   }
@@ -352,6 +360,7 @@ public int getDirectionValue() {
    *
    * @return The direction.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
     @SuppressWarnings("deprecation")
     com.google.datastore.v1.PropertyOrder.Direction result =
@@ -899,6 +908,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      *
      * @return The enum numeric value on the wire for direction.
      */
+    @java.lang.Override
     public int getDirectionValue() {
       return direction_;
     }
@@ -915,6 +925,7 @@ public int getDirectionValue() {
      * @return This builder for chaining.
      */
     public Builder setDirectionValue(int value) {
+
       direction_ = value;
       onChanged();
       return this;
@@ -930,6 +941,7 @@ public Builder setDirectionValue(int value) {
      *
      * @return The direction.
      */
+    @java.lang.Override
     public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
       @SuppressWarnings("deprecation")
       com.google.datastore.v1.PropertyOrder.Direction result =
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 33d3a347ce2c..6b46643de740 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
@@ -125,6 +125,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -148,6 +149,7 @@ public java.lang.String getName() {
    *
    * @return The bytes for name.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getNameBytes() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
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 56390c2ac1bd..237d64b049fb 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
@@ -220,6 +220,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
+  @java.lang.Override
   public java.util.List getProjectionList() {
     return projection_;
   }
@@ -232,6 +233,7 @@ public java.util.List getProjectionList() {
    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
+  @java.lang.Override
   public java.util.List
       getProjectionOrBuilderList() {
     return projection_;
@@ -245,6 +247,7 @@ public java.util.List getProjectionList() {
    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
+  @java.lang.Override
   public int getProjectionCount() {
     return projection_.size();
   }
@@ -257,6 +260,7 @@ public int getProjectionCount() {
    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.Projection getProjection(int index) {
     return projection_.get(index);
   }
@@ -269,6 +273,7 @@ public com.google.datastore.v1.Projection getProjection(int index) {
    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int index) {
     return projection_.get(index);
   }
@@ -285,6 +290,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
+  @java.lang.Override
   public java.util.List getKindList() {
     return kind_;
   }
@@ -298,6 +304,7 @@ public java.util.List getKindList() {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
+  @java.lang.Override
   public java.util.List
       getKindOrBuilderList() {
     return kind_;
@@ -312,6 +319,7 @@ public java.util.List getKindList() {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
+  @java.lang.Override
   public int getKindCount() {
     return kind_.size();
   }
@@ -325,6 +333,7 @@ public int getKindCount() {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KindExpression getKind(int index) {
     return kind_.get(index);
   }
@@ -338,6 +347,7 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int index) {
     return kind_.get(index);
   }
@@ -355,6 +365,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
    *
    * @return Whether the filter field is set.
    */
+  @java.lang.Override
   public boolean hasFilter() {
     return filter_ != null;
   }
@@ -369,6 +380,7 @@ public boolean hasFilter() {
    *
    * @return The filter.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Filter getFilter() {
     return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
   }
@@ -381,6 +393,7 @@ public com.google.datastore.v1.Filter getFilter() {
    *
    * .google.datastore.v1.Filter filter = 4;
    */
+  @java.lang.Override
   public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
     return getFilter();
   }
@@ -396,6 +409,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
+  @java.lang.Override
   public java.util.List getOrderList() {
     return order_;
   }
@@ -408,6 +422,7 @@ public java.util.List getOrderList() {
    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
+  @java.lang.Override
   public java.util.List
       getOrderOrBuilderList() {
     return order_;
@@ -421,6 +436,7 @@ public java.util.List getOrderList() {
    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
+  @java.lang.Override
   public int getOrderCount() {
     return order_.size();
   }
@@ -433,6 +449,7 @@ public int getOrderCount() {
    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyOrder getOrder(int index) {
     return order_.get(index);
   }
@@ -445,6 +462,7 @@ public com.google.datastore.v1.PropertyOrder getOrder(int index) {
    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int index) {
     return order_.get(index);
   }
@@ -462,6 +480,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
+  @java.lang.Override
   public java.util.List getDistinctOnList() {
     return distinctOn_;
   }
@@ -476,6 +495,7 @@ public java.util.List getDistinctOnLi
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
+  @java.lang.Override
   public java.util.List
       getDistinctOnOrBuilderList() {
     return distinctOn_;
@@ -491,6 +511,7 @@ public java.util.List getDistinctOnLi
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
+  @java.lang.Override
   public int getDistinctOnCount() {
     return distinctOn_.size();
   }
@@ -505,6 +526,7 @@ public int getDistinctOnCount() {
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
     return distinctOn_.get(index);
   }
@@ -519,6 +541,7 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(int index) {
     return distinctOn_.get(index);
   }
@@ -539,6 +562,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
    *
    * @return The startCursor.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getStartCursor() {
     return startCursor_;
   }
@@ -559,6 +583,7 @@ public com.google.protobuf.ByteString getStartCursor() {
    *
    * @return The endCursor.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getEndCursor() {
     return endCursor_;
   }
@@ -577,6 +602,7 @@ public com.google.protobuf.ByteString getEndCursor() {
    *
    * @return The offset.
    */
+  @java.lang.Override
   public int getOffset() {
     return offset_;
   }
@@ -597,6 +623,7 @@ public int getOffset() {
    *
    * @return Whether the limit field is set.
    */
+  @java.lang.Override
   public boolean hasLimit() {
     return limit_ != null;
   }
@@ -614,6 +641,7 @@ public boolean hasLimit() {
    *
    * @return The limit.
    */
+  @java.lang.Override
   public com.google.protobuf.Int32Value getLimit() {
     return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
   }
@@ -629,6 +657,7 @@ public com.google.protobuf.Int32Value getLimit() {
    *
    * .google.protobuf.Int32Value limit = 12;
    */
+  @java.lang.Override
   public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
     return getLimit();
   }
@@ -2893,6 +2922,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
      *
      * @return The startCursor.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getStartCursor() {
       return startCursor_;
     }
@@ -2956,6 +2986,7 @@ public Builder clearStartCursor() {
      *
      * @return The endCursor.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
@@ -3017,6 +3048,7 @@ public Builder clearEndCursor() {
      *
      * @return The offset.
      */
+    @java.lang.Override
     public int getOffset() {
       return offset_;
     }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 832ad31c777f..2665c0ac0579 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -325,6 +325,10 @@ public MoreResultsType findValueByNumber(int number) {
             };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
       return getDescriptor().getValues().get(ordinal());
     }
 
@@ -371,6 +375,7 @@ private MoreResultsType(int value) {
    *
    * @return The skippedResults.
    */
+  @java.lang.Override
   public int getSkippedResults() {
     return skippedResults_;
   }
@@ -389,6 +394,7 @@ public int getSkippedResults() {
    *
    * @return The skippedCursor.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getSkippedCursor() {
     return skippedCursor_;
   }
@@ -406,6 +412,7 @@ public com.google.protobuf.ByteString getSkippedCursor() {
    *
    * @return The enum numeric value on the wire for entityResultType.
    */
+  @java.lang.Override
   public int getEntityResultTypeValue() {
     return entityResultType_;
   }
@@ -420,6 +427,7 @@ public int getEntityResultTypeValue() {
    *
    * @return The entityResultType.
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
     @SuppressWarnings("deprecation")
     com.google.datastore.v1.EntityResult.ResultType result =
@@ -438,6 +446,7 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
+  @java.lang.Override
   public java.util.List getEntityResultsList() {
     return entityResults_;
   }
@@ -450,6 +459,7 @@ public java.util.List getEntityResultsList
    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
+  @java.lang.Override
   public java.util.List
       getEntityResultsOrBuilderList() {
     return entityResults_;
@@ -463,6 +473,7 @@ public java.util.List getEntityResultsList
    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
+  @java.lang.Override
   public int getEntityResultsCount() {
     return entityResults_.size();
   }
@@ -475,6 +486,7 @@ public int getEntityResultsCount() {
    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityResult getEntityResults(int index) {
     return entityResults_.get(index);
   }
@@ -487,6 +499,7 @@ public com.google.datastore.v1.EntityResult getEntityResults(int index) {
    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(int index) {
     return entityResults_.get(index);
   }
@@ -504,6 +517,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
    *
    * @return The endCursor.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getEndCursor() {
     return endCursor_;
   }
@@ -521,6 +535,7 @@ public com.google.protobuf.ByteString getEndCursor() {
    *
    * @return The enum numeric value on the wire for moreResults.
    */
+  @java.lang.Override
   public int getMoreResultsValue() {
     return moreResults_;
   }
@@ -535,6 +550,7 @@ public int getMoreResultsValue() {
    *
    * @return The moreResults.
    */
+  @java.lang.Override
   public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
     @SuppressWarnings("deprecation")
     com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
@@ -564,6 +580,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
    *
    * @return The snapshotVersion.
    */
+  @java.lang.Override
   public long getSnapshotVersion() {
     return snapshotVersion_;
   }
@@ -1033,6 +1050,7 @@ public Builder mergeFrom(
      *
      * @return The skippedResults.
      */
+    @java.lang.Override
     public int getSkippedResults() {
       return skippedResults_;
     }
@@ -1085,6 +1103,7 @@ public Builder clearSkippedResults() {
      *
      * @return The skippedCursor.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getSkippedCursor() {
       return skippedCursor_;
     }
@@ -1141,6 +1160,7 @@ public Builder clearSkippedCursor() {
      *
      * @return The enum numeric value on the wire for entityResultType.
      */
+    @java.lang.Override
     public int getEntityResultTypeValue() {
       return entityResultType_;
     }
@@ -1157,6 +1177,7 @@ public int getEntityResultTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setEntityResultTypeValue(int value) {
+
       entityResultType_ = value;
       onChanged();
       return this;
@@ -1172,6 +1193,7 @@ public Builder setEntityResultTypeValue(int value) {
      *
      * @return The entityResultType.
      */
+    @java.lang.Override
     public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
       @SuppressWarnings("deprecation")
       com.google.datastore.v1.EntityResult.ResultType result =
@@ -1582,6 +1604,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
      *
      * @return The endCursor.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
@@ -1636,6 +1659,7 @@ public Builder clearEndCursor() {
      *
      * @return The enum numeric value on the wire for moreResults.
      */
+    @java.lang.Override
     public int getMoreResultsValue() {
       return moreResults_;
     }
@@ -1652,6 +1676,7 @@ public int getMoreResultsValue() {
      * @return This builder for chaining.
      */
     public Builder setMoreResultsValue(int value) {
+
       moreResults_ = value;
       onChanged();
       return this;
@@ -1667,6 +1692,7 @@ public Builder setMoreResultsValue(int value) {
      *
      * @return The moreResults.
      */
+    @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
       @SuppressWarnings("deprecation")
       com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
@@ -1733,6 +1759,7 @@ public Builder clearMoreResults() {
      *
      * @return The snapshotVersion.
      */
+    @java.lang.Override
     public long getSnapshotVersion() {
       return snapshotVersion_;
     }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 92816e64e7d1..6e52f3142334 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -237,6 +237,10 @@ public ReadConsistency findValueByNumber(int number) {
             };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
       return getDescriptor().getValues().get(ordinal());
     }
 
@@ -375,6 +379,7 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
    *
    * @return The transaction.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTransaction() {
     if (consistencyTypeCase_ == 2) {
       return (com.google.protobuf.ByteString) consistencyType_;
@@ -769,6 +774,7 @@ public Builder clearConsistencyType() {
      *
      * @return The enum numeric value on the wire for readConsistency.
      */
+    @java.lang.Override
     public int getReadConsistencyValue() {
       if (consistencyTypeCase_ == 1) {
         return ((java.lang.Integer) consistencyType_).intValue();
@@ -806,6 +812,7 @@ public Builder setReadConsistencyValue(int value) {
      *
      * @return The readConsistency.
      */
+    @java.lang.Override
     public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
       if (consistencyTypeCase_ == 1) {
         @SuppressWarnings("deprecation")
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 da2f1ed94550..2b4d518f5142 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
@@ -146,6 +146,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -168,6 +169,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -193,6 +195,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    * @return The databaseId.
    */
+  @java.lang.Override
   public java.lang.String getDatabaseId() {
     java.lang.Object ref = databaseId_;
     if (ref instanceof java.lang.String) {
@@ -215,6 +218,7 @@ public java.lang.String getDatabaseId() {
    *
    * @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) {
@@ -240,6 +244,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public java.util.List getKeysList() {
     return keys_;
   }
@@ -254,6 +259,7 @@ public java.util.List getKeysList() {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
@@ -268,6 +274,7 @@ public java.util.List getKeysOrB
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public int getKeysCount() {
     return keys_.size();
   }
@@ -282,6 +289,7 @@ public int getKeysCount() {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
@@ -296,6 +304,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
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 8737207deaaa..919ba78a978e 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
@@ -130,6 +130,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -152,6 +153,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -178,6 +180,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    * @return The transaction.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
@@ -631,6 +634,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      *
      * @return The transaction.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
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 a40f591056ea..e95e1d65385a 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
@@ -233,6 +233,7 @@ public QueryTypeCase getQueryTypeCase() {
    *
    * @return The projectId.
    */
+  @java.lang.Override
   public java.lang.String getProjectId() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -255,6 +256,7 @@ public java.lang.String getProjectId() {
    *
    * @return The bytes for projectId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
@@ -283,6 +285,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    *
    * @return Whether the partitionId field is set.
    */
+  @java.lang.Override
   public boolean hasPartitionId() {
     return partitionId_ != null;
   }
@@ -300,6 +303,7 @@ public boolean hasPartitionId() {
    *
    * @return The partitionId.
    */
+  @java.lang.Override
   public com.google.datastore.v1.PartitionId getPartitionId() {
     return partitionId_ == null
         ? com.google.datastore.v1.PartitionId.getDefaultInstance()
@@ -317,6 +321,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
    *
    * .google.datastore.v1.PartitionId partition_id = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
     return getPartitionId();
   }
@@ -334,6 +339,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
    *
    * @return Whether the readOptions field is set.
    */
+  @java.lang.Override
   public boolean hasReadOptions() {
     return readOptions_ != null;
   }
@@ -348,6 +354,7 @@ public boolean hasReadOptions() {
    *
    * @return The readOptions.
    */
+  @java.lang.Override
   public com.google.datastore.v1.ReadOptions getReadOptions() {
     return readOptions_ == null
         ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
@@ -362,6 +369,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
    *
    * .google.datastore.v1.ReadOptions read_options = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
     return getReadOptions();
   }
@@ -378,6 +386,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
    *
    * @return Whether the query field is set.
    */
+  @java.lang.Override
   public boolean hasQuery() {
     return queryTypeCase_ == 3;
   }
@@ -392,6 +401,7 @@ public boolean hasQuery() {
    *
    * @return The query.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Query getQuery() {
     if (queryTypeCase_ == 3) {
       return (com.google.datastore.v1.Query) queryType_;
@@ -407,6 +417,7 @@ public com.google.datastore.v1.Query getQuery() {
    *
    * .google.datastore.v1.Query query = 3;
    */
+  @java.lang.Override
   public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
     if (queryTypeCase_ == 3) {
       return (com.google.datastore.v1.Query) queryType_;
@@ -426,6 +437,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
    *
    * @return Whether the gqlQuery field is set.
    */
+  @java.lang.Override
   public boolean hasGqlQuery() {
     return queryTypeCase_ == 7;
   }
@@ -440,6 +452,7 @@ public boolean hasGqlQuery() {
    *
    * @return The gqlQuery.
    */
+  @java.lang.Override
   public com.google.datastore.v1.GqlQuery getGqlQuery() {
     if (queryTypeCase_ == 7) {
       return (com.google.datastore.v1.GqlQuery) queryType_;
@@ -455,6 +468,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
    */
+  @java.lang.Override
   public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     if (queryTypeCase_ == 7) {
       return (com.google.datastore.v1.GqlQuery) queryType_;
@@ -1438,6 +1452,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
      *
      * @return Whether the query field is set.
      */
+    @java.lang.Override
     public boolean hasQuery() {
       return queryTypeCase_ == 3;
     }
@@ -1452,6 +1467,7 @@ public boolean hasQuery() {
      *
      * @return The query.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Query getQuery() {
       if (queryBuilder_ == null) {
         if (queryTypeCase_ == 3) {
@@ -1582,6 +1598,7 @@ public com.google.datastore.v1.Query.Builder getQueryBuilder() {
      *
      * .google.datastore.v1.Query query = 3;
      */
+    @java.lang.Override
     public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       if ((queryTypeCase_ == 3) && (queryBuilder_ != null)) {
         return queryBuilder_.getMessageOrBuilder();
@@ -1640,6 +1657,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
      *
      * @return Whether the gqlQuery field is set.
      */
+    @java.lang.Override
     public boolean hasGqlQuery() {
       return queryTypeCase_ == 7;
     }
@@ -1654,6 +1672,7 @@ public boolean hasGqlQuery() {
      *
      * @return The gqlQuery.
      */
+    @java.lang.Override
     public com.google.datastore.v1.GqlQuery getGqlQuery() {
       if (gqlQueryBuilder_ == null) {
         if (queryTypeCase_ == 7) {
@@ -1785,6 +1804,7 @@ public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
      *
      * .google.datastore.v1.GqlQuery gql_query = 7;
      */
+    @java.lang.Override
     public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       if ((queryTypeCase_ == 7) && (gqlQueryBuilder_ != null)) {
         return gqlQueryBuilder_.getMessageOrBuilder();
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 7be8c3891fa1..2b68ba248b57 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
@@ -145,6 +145,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the batch field is set.
    */
+  @java.lang.Override
   public boolean hasBatch() {
     return batch_ != null;
   }
@@ -159,6 +160,7 @@ public boolean hasBatch() {
    *
    * @return The batch.
    */
+  @java.lang.Override
   public com.google.datastore.v1.QueryResultBatch getBatch() {
     return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
   }
@@ -171,6 +173,7 @@ public com.google.datastore.v1.QueryResultBatch getBatch() {
    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
     return getBatch();
   }
@@ -188,6 +191,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
    *
    * @return Whether the query field is set.
    */
+  @java.lang.Override
   public boolean hasQuery() {
     return query_ != null;
   }
@@ -202,6 +206,7 @@ public boolean hasQuery() {
    *
    * @return The query.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Query getQuery() {
     return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
   }
@@ -214,6 +219,7 @@ public com.google.datastore.v1.Query getQuery() {
    *
    * .google.datastore.v1.Query query = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
     return getQuery();
   }
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 76094d9b74ee..bea8e32c2613 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
@@ -263,6 +263,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * @return The previousTransaction.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getPreviousTransaction() {
       return previousTransaction_;
     }
@@ -602,6 +603,7 @@ public Builder mergeFrom(
        *
        * @return The previousTransaction.
        */
+      @java.lang.Override
       public com.google.protobuf.ByteString getPreviousTransaction() {
         return previousTransaction_;
       }
@@ -1202,6 +1204,7 @@ public ModeCase getModeCase() {
    *
    * @return Whether the readWrite field is set.
    */
+  @java.lang.Override
   public boolean hasReadWrite() {
     return modeCase_ == 1;
   }
@@ -1216,6 +1219,7 @@ public boolean hasReadWrite() {
    *
    * @return The readWrite.
    */
+  @java.lang.Override
   public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
     if (modeCase_ == 1) {
       return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
@@ -1231,6 +1235,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
    */
+  @java.lang.Override
   public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
     if (modeCase_ == 1) {
       return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
@@ -1250,6 +1255,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
    *
    * @return Whether the readOnly field is set.
    */
+  @java.lang.Override
   public boolean hasReadOnly() {
     return modeCase_ == 2;
   }
@@ -1264,6 +1270,7 @@ public boolean hasReadOnly() {
    *
    * @return The readOnly.
    */
+  @java.lang.Override
   public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
     if (modeCase_ == 2) {
       return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
@@ -1279,6 +1286,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
    */
+  @java.lang.Override
   public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
     if (modeCase_ == 2) {
       return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
@@ -1691,6 +1699,7 @@ public Builder clearMode() {
      *
      * @return Whether the readWrite field is set.
      */
+    @java.lang.Override
     public boolean hasReadWrite() {
       return modeCase_ == 1;
     }
@@ -1705,6 +1714,7 @@ public boolean hasReadWrite() {
      *
      * @return The readWrite.
      */
+    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
       if (readWriteBuilder_ == null) {
         if (modeCase_ == 1) {
@@ -1837,6 +1847,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite.Builder getReadWrite
      *
      * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
      */
+    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
       if ((modeCase_ == 1) && (readWriteBuilder_ != null)) {
         return readWriteBuilder_.getMessageOrBuilder();
@@ -1897,6 +1908,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
      *
      * @return Whether the readOnly field is set.
      */
+    @java.lang.Override
     public boolean hasReadOnly() {
       return modeCase_ == 2;
     }
@@ -1911,6 +1923,7 @@ public boolean hasReadOnly() {
      *
      * @return The readOnly.
      */
+    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
       if (readOnlyBuilder_ == null) {
         if (modeCase_ == 2) {
@@ -2043,6 +2056,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBu
      *
      * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
      */
+    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
       if ((modeCase_ == 2) && (readOnlyBuilder_ != null)) {
         return readOnlyBuilder_.getMessageOrBuilder();
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 9cf42afcd4ee..60f6c33fae5e 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
@@ -348,6 +348,7 @@ public com.google.protobuf.NullValue getNullValue() {
    *
    * @return The booleanValue.
    */
+  @java.lang.Override
   public boolean getBooleanValue() {
     if (valueTypeCase_ == 1) {
       return (java.lang.Boolean) valueType_;
@@ -367,6 +368,7 @@ public boolean getBooleanValue() {
    *
    * @return The integerValue.
    */
+  @java.lang.Override
   public long getIntegerValue() {
     if (valueTypeCase_ == 2) {
       return (java.lang.Long) valueType_;
@@ -386,6 +388,7 @@ public long getIntegerValue() {
    *
    * @return The doubleValue.
    */
+  @java.lang.Override
   public double getDoubleValue() {
     if (valueTypeCase_ == 3) {
       return (java.lang.Double) valueType_;
@@ -407,6 +410,7 @@ public double getDoubleValue() {
    *
    * @return Whether the timestampValue field is set.
    */
+  @java.lang.Override
   public boolean hasTimestampValue() {
     return valueTypeCase_ == 10;
   }
@@ -423,6 +427,7 @@ public boolean hasTimestampValue() {
    *
    * @return The timestampValue.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getTimestampValue() {
     if (valueTypeCase_ == 10) {
       return (com.google.protobuf.Timestamp) valueType_;
@@ -440,6 +445,7 @@ public com.google.protobuf.Timestamp getTimestampValue() {
    *
    * .google.protobuf.Timestamp timestamp_value = 10;
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
     if (valueTypeCase_ == 10) {
       return (com.google.protobuf.Timestamp) valueType_;
@@ -459,6 +465,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
    *
    * @return Whether the keyValue field is set.
    */
+  @java.lang.Override
   public boolean hasKeyValue() {
     return valueTypeCase_ == 5;
   }
@@ -473,6 +480,7 @@ public boolean hasKeyValue() {
    *
    * @return The keyValue.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Key getKeyValue() {
     if (valueTypeCase_ == 5) {
       return (com.google.datastore.v1.Key) valueType_;
@@ -488,6 +496,7 @@ public com.google.datastore.v1.Key getKeyValue() {
    *
    * .google.datastore.v1.Key key_value = 5;
    */
+  @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
     if (valueTypeCase_ == 5) {
       return (com.google.datastore.v1.Key) valueType_;
@@ -570,6 +579,7 @@ public com.google.protobuf.ByteString getStringValueBytes() {
    *
    * @return The blobValue.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getBlobValue() {
     if (valueTypeCase_ == 18) {
       return (com.google.protobuf.ByteString) valueType_;
@@ -589,6 +599,7 @@ public com.google.protobuf.ByteString getBlobValue() {
    *
    * @return Whether the geoPointValue field is set.
    */
+  @java.lang.Override
   public boolean hasGeoPointValue() {
     return valueTypeCase_ == 8;
   }
@@ -603,6 +614,7 @@ public boolean hasGeoPointValue() {
    *
    * @return The geoPointValue.
    */
+  @java.lang.Override
   public com.google.type.LatLng getGeoPointValue() {
     if (valueTypeCase_ == 8) {
       return (com.google.type.LatLng) valueType_;
@@ -618,6 +630,7 @@ public com.google.type.LatLng getGeoPointValue() {
    *
    * .google.type.LatLng geo_point_value = 8;
    */
+  @java.lang.Override
   public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
     if (valueTypeCase_ == 8) {
       return (com.google.type.LatLng) valueType_;
@@ -640,6 +653,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
    *
    * @return Whether the entityValue field is set.
    */
+  @java.lang.Override
   public boolean hasEntityValue() {
     return valueTypeCase_ == 6;
   }
@@ -657,6 +671,7 @@ public boolean hasEntityValue() {
    *
    * @return The entityValue.
    */
+  @java.lang.Override
   public com.google.datastore.v1.Entity getEntityValue() {
     if (valueTypeCase_ == 6) {
       return (com.google.datastore.v1.Entity) valueType_;
@@ -675,6 +690,7 @@ public com.google.datastore.v1.Entity getEntityValue() {
    *
    * .google.datastore.v1.Entity entity_value = 6;
    */
+  @java.lang.Override
   public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
     if (valueTypeCase_ == 6) {
       return (com.google.datastore.v1.Entity) valueType_;
@@ -697,6 +713,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
    *
    * @return Whether the arrayValue field is set.
    */
+  @java.lang.Override
   public boolean hasArrayValue() {
     return valueTypeCase_ == 9;
   }
@@ -714,6 +731,7 @@ public boolean hasArrayValue() {
    *
    * @return The arrayValue.
    */
+  @java.lang.Override
   public com.google.datastore.v1.ArrayValue getArrayValue() {
     if (valueTypeCase_ == 9) {
       return (com.google.datastore.v1.ArrayValue) valueType_;
@@ -732,6 +750,7 @@ public com.google.datastore.v1.ArrayValue getArrayValue() {
    *
    * .google.datastore.v1.ArrayValue array_value = 9;
    */
+  @java.lang.Override
   public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
     if (valueTypeCase_ == 9) {
       return (com.google.datastore.v1.ArrayValue) valueType_;
@@ -752,6 +771,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
    *
    * @return The meaning.
    */
+  @java.lang.Override
   public int getMeaning() {
     return meaning_;
   }
@@ -770,6 +790,7 @@ public int getMeaning() {
    *
    * @return The excludeFromIndexes.
    */
+  @java.lang.Override
   public boolean getExcludeFromIndexes() {
     return excludeFromIndexes_;
   }
@@ -1421,6 +1442,7 @@ public Builder clearValueType() {
      *
      * @return The enum numeric value on the wire for nullValue.
      */
+    @java.lang.Override
     public int getNullValueValue() {
       if (valueTypeCase_ == 11) {
         return ((java.lang.Integer) valueType_).intValue();
@@ -1456,6 +1478,7 @@ public Builder setNullValueValue(int value) {
      *
      * @return The nullValue.
      */
+    @java.lang.Override
     public com.google.protobuf.NullValue getNullValue() {
       if (valueTypeCase_ == 11) {
         @SuppressWarnings("deprecation")
@@ -1689,6 +1712,7 @@ public Builder clearDoubleValue() {
      *
      * @return Whether the timestampValue field is set.
      */
+    @java.lang.Override
     public boolean hasTimestampValue() {
       return valueTypeCase_ == 10;
     }
@@ -1705,6 +1729,7 @@ public boolean hasTimestampValue() {
      *
      * @return The timestampValue.
      */
+    @java.lang.Override
     public com.google.protobuf.Timestamp getTimestampValue() {
       if (timestampValueBuilder_ == null) {
         if (valueTypeCase_ == 10) {
@@ -1847,6 +1872,7 @@ public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() {
      *
      * .google.protobuf.Timestamp timestamp_value = 10;
      */
+    @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
       if ((valueTypeCase_ == 10) && (timestampValueBuilder_ != null)) {
         return timestampValueBuilder_.getMessageOrBuilder();
@@ -1907,6 +1933,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
      *
      * @return Whether the keyValue field is set.
      */
+    @java.lang.Override
     public boolean hasKeyValue() {
       return valueTypeCase_ == 5;
     }
@@ -1921,6 +1948,7 @@ public boolean hasKeyValue() {
      *
      * @return The keyValue.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Key getKeyValue() {
       if (keyValueBuilder_ == null) {
         if (valueTypeCase_ == 5) {
@@ -2050,6 +2078,7 @@ public com.google.datastore.v1.Key.Builder getKeyValueBuilder() {
      *
      * .google.datastore.v1.Key key_value = 5;
      */
+    @java.lang.Override
     public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
       if ((valueTypeCase_ == 5) && (keyValueBuilder_ != null)) {
         return keyValueBuilder_.getMessageOrBuilder();
@@ -2105,6 +2134,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      *
      * @return The stringValue.
      */
+    @java.lang.Override
     public java.lang.String getStringValue() {
       java.lang.Object ref = "";
       if (valueTypeCase_ == 17) {
@@ -2134,6 +2164,7 @@ public java.lang.String getStringValue() {
      *
      * @return The bytes for stringValue.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getStringValueBytes() {
       java.lang.Object ref = "";
       if (valueTypeCase_ == 17) {
@@ -2300,6 +2331,7 @@ public Builder clearBlobValue() {
      *
      * @return Whether the geoPointValue field is set.
      */
+    @java.lang.Override
     public boolean hasGeoPointValue() {
       return valueTypeCase_ == 8;
     }
@@ -2314,6 +2346,7 @@ public boolean hasGeoPointValue() {
      *
      * @return The geoPointValue.
      */
+    @java.lang.Override
     public com.google.type.LatLng getGeoPointValue() {
       if (geoPointValueBuilder_ == null) {
         if (valueTypeCase_ == 8) {
@@ -2443,6 +2476,7 @@ public com.google.type.LatLng.Builder getGeoPointValueBuilder() {
      *
      * .google.type.LatLng geo_point_value = 8;
      */
+    @java.lang.Override
     public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
       if ((valueTypeCase_ == 8) && (geoPointValueBuilder_ != null)) {
         return geoPointValueBuilder_.getMessageOrBuilder();
@@ -2502,6 +2536,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
      *
      * @return Whether the entityValue field is set.
      */
+    @java.lang.Override
     public boolean hasEntityValue() {
       return valueTypeCase_ == 6;
     }
@@ -2519,6 +2554,7 @@ public boolean hasEntityValue() {
      *
      * @return The entityValue.
      */
+    @java.lang.Override
     public com.google.datastore.v1.Entity getEntityValue() {
       if (entityValueBuilder_ == null) {
         if (valueTypeCase_ == 6) {
@@ -2667,6 +2703,7 @@ public com.google.datastore.v1.Entity.Builder getEntityValueBuilder() {
      *
      * .google.datastore.v1.Entity entity_value = 6;
      */
+    @java.lang.Override
     public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
       if ((valueTypeCase_ == 6) && (entityValueBuilder_ != null)) {
         return entityValueBuilder_.getMessageOrBuilder();
@@ -2731,6 +2768,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
      *
      * @return Whether the arrayValue field is set.
      */
+    @java.lang.Override
     public boolean hasArrayValue() {
       return valueTypeCase_ == 9;
     }
@@ -2748,6 +2786,7 @@ public boolean hasArrayValue() {
      *
      * @return The arrayValue.
      */
+    @java.lang.Override
     public com.google.datastore.v1.ArrayValue getArrayValue() {
       if (arrayValueBuilder_ == null) {
         if (valueTypeCase_ == 9) {
@@ -2897,6 +2936,7 @@ public com.google.datastore.v1.ArrayValue.Builder getArrayValueBuilder() {
      *
      * .google.datastore.v1.ArrayValue array_value = 9;
      */
+    @java.lang.Override
     public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
       if ((valueTypeCase_ == 9) && (arrayValueBuilder_ != null)) {
         return arrayValueBuilder_.getMessageOrBuilder();
@@ -2954,6 +2994,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
      *
      * @return The meaning.
      */
+    @java.lang.Override
     public int getMeaning() {
       return meaning_;
     }
@@ -3006,6 +3047,7 @@ public Builder clearMeaning() {
      *
      * @return The excludeFromIndexes.
      */
+    @java.lang.Override
     public boolean getExcludeFromIndexes() {
       return excludeFromIndexes_;
     }
diff --git a/synth.metadata b/synth.metadata
index 538ee7c10667..d33ca02edc4e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "7de3525cf3e3c7e065847b872c59355544517fe6"
+        "sha": "660f216302fedaf2f5fe0f4c76cdab8fca65cbd1"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "4bef0001ac7040431ea24b6187424fdec9c08b1b",
-        "internalRef": "309990843"
+        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
+        "internalRef": "313460921"
       }
     },
     {

From 712779c4a25bd5f74b9557931a84bd4a812279c7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 28 May 2020 19:17:35 +0200
Subject: [PATCH 0354/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.6.0 (#140)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9bcd6e645f1b..1dc7e910c636 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.5.0
+        0.6.0
         pom
         import
       

From e1a5a65d2ae2d45c4871e3e7b2e9089ad5cdc542 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 28 May 2020 22:22:29 +0200
Subject: [PATCH 0355/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.7.0 (#142)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1dc7e910c636..631d644955f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.6.0
+        0.7.0
         pom
         import
       

From 57676383dcaa75bd7adefd80e3ab714b583d1d0a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 29 May 2020 20:38:39 +0200
Subject: [PATCH 0356/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v5.5.0 (#143)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `5.4.0` -> `5.5.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 3da7d7e7cf33..056cf90b2d25 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        5.4.0
+        5.5.0
         pom
         import
       

From 82ee74ed4487f90f97856bc766edb53b66474378 Mon Sep 17 00:00:00 2001
From: vadimyushprakh <53714362+vadimyushprakh@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:40:36 -0700
Subject: [PATCH 0357/1784] fix: update retry logic for operations that can be
 associated with a transaction (#144)

Update retry logic for those operations which can be associated with a
transaction such that they will not be retried unnecessarily if the
transaction is `ABORTED`. This change ultimately effects those operations
which result in a `LookupRequest`, a `CommitRequest` or a `RunQueryRequest`
and are part of a transaction.
---
 .../google/cloud/datastore/DatastoreImpl.java | 14 +++-
 .../TransactionOperationExceptionHandler.java | 68 +++++++++++++++++++
 .../cloud/datastore/ITDatastoreTest.java      | 50 ++++++++++++++
 3 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java

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 be31594e7696..25e434227aee 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
@@ -51,6 +51,8 @@ final class DatastoreImpl extends BaseService implements Datas
   private final RetrySettings retrySettings;
   private static final ExceptionHandler TRANSACTION_EXCEPTION_HANDLER =
       TransactionExceptionHandler.build();
+  private static final ExceptionHandler TRANSACTION_OPERATION_EXCEPTION_HANDLER =
+      TransactionOperationExceptionHandler.build();
 
   DatastoreImpl(DatastoreOptions options) {
     super(options);
@@ -182,7 +184,9 @@ public com.google.datastore.v1.RunQueryResponse call() throws DatastoreException
             }
           },
           retrySettings,
-          EXCEPTION_HANDLER,
+          requestPb.getReadOptions().getTransaction().isEmpty()
+              ? EXCEPTION_HANDLER
+              : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
@@ -394,7 +398,9 @@ public com.google.datastore.v1.LookupResponse call() throws DatastoreException {
             }
           },
           retrySettings,
-          EXCEPTION_HANDLER,
+          requestPb.getReadOptions().getTransaction().isEmpty()
+              ? EXCEPTION_HANDLER
+              : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
@@ -532,7 +538,9 @@ public com.google.datastore.v1.CommitResponse call() throws DatastoreException {
             }
           },
           retrySettings,
-          EXCEPTION_HANDLER,
+          requestPb.getTransaction().isEmpty()
+              ? EXCEPTION_HANDLER
+              : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
       throw DatastoreException.translateAndThrow(e);
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java
new file mode 100644
index 000000000000..0556555d00c7
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017 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.cloud.datastore;
+
+import com.google.api.core.BetaApi;
+import com.google.cloud.BaseService;
+import com.google.cloud.ExceptionHandler;
+import com.google.cloud.ExceptionHandler.Interceptor;
+
+@BetaApi
+public class TransactionOperationExceptionHandler {
+
+  public static final Interceptor TRANSACTION_OPERATION_EXCEPTION_HANDLER_INTERCEPTOR =
+      new Interceptor() {
+
+        private static final long serialVersionUID = -1240723093072535978L;
+
+        private static final int ABORTED_CODE = 10;
+
+        @Override
+        public RetryResult beforeEval(Exception exception) {
+          if (exception instanceof DatastoreException) {
+            DatastoreException e = getInnerException((DatastoreException) exception);
+            if (e.getCode() == ABORTED_CODE
+                || e.getReason() != null && e.getReason().equals("ABORTED")) {
+              return RetryResult.NO_RETRY;
+            }
+          }
+          return BaseService.EXCEPTION_HANDLER_INTERCEPTOR.beforeEval(exception);
+        }
+
+        @Override
+        public RetryResult afterEval(Exception exception, RetryResult retryResult) {
+          return BaseService.EXCEPTION_HANDLER_INTERCEPTOR.afterEval(exception, retryResult);
+        }
+
+        private DatastoreException getInnerException(DatastoreException exception) {
+          while (exception.getCause() instanceof DatastoreException) {
+            exception = (DatastoreException) exception.getCause();
+          }
+          return exception;
+        }
+      };
+
+  public static ExceptionHandler build() {
+    return ExceptionHandler.newBuilder()
+        .abortOn(RuntimeException.class)
+        .addInterceptors(TRANSACTION_OPERATION_EXCEPTION_HANDLER_INTERCEPTOR)
+        .build();
+  }
+
+  /** Intentionally private empty constructor to disable instantiation of this class. */
+  private TransactionOperationExceptionHandler() {}
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
index 8049e0957c43..442a6eb72b75 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
@@ -1135,6 +1135,56 @@ public void testRetryableException() {
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
+  @Test
+  public void testRetryableExceptionForOperationWithTxn() {
+    ByteString txnBytes = ByteString.copyFromUtf8("txn1");
+    LookupRequest requestPb =
+        LookupRequest.newBuilder()
+            .addKeys(KEY1.toPb())
+            .setReadOptions(ReadOptions.newBuilder().setTransaction(txnBytes).build())
+            .build();
+    LookupResponse responsePb =
+        LookupResponse.newBuilder()
+            .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb()))
+            .build();
+    EasyMock.expect(rpcMock.beginTransaction(EasyMock.anyObject(BeginTransactionRequest.class)))
+        .andReturn(BeginTransactionResponse.newBuilder().setTransaction(txnBytes).build());
+    EasyMock.expect(rpcMock.lookup(requestPb))
+        .andThrow(new DatastoreException(14, "UNAVAILABLE", "UNAVAILABLE", null))
+        .andReturn(responsePb);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    Datastore datastore = rpcMockOptions.getService();
+    Transaction transaction = datastore.newTransaction();
+    Entity entity = transaction.get(KEY1);
+    assertEquals(ENTITY1, entity);
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
+  @Test
+  public void testNonRetryableExceptionForOperationWithTxn() {
+    ByteString txnBytes = ByteString.copyFromUtf8("txn1");
+    LookupRequest requestPb =
+        LookupRequest.newBuilder()
+            .addKeys(KEY1.toPb())
+            .setReadOptions(ReadOptions.newBuilder().setTransaction(txnBytes).build())
+            .build();
+    EasyMock.expect(rpcMock.beginTransaction(EasyMock.anyObject(BeginTransactionRequest.class)))
+        .andReturn(BeginTransactionResponse.newBuilder().setTransaction(txnBytes).build());
+    EasyMock.expect(rpcMock.lookup(requestPb))
+        .andThrow(new DatastoreException(10, "ABORTED", "ABORTED", null))
+        .times(1);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    try {
+      Datastore datastore = rpcMockOptions.getService();
+      Transaction transaction = datastore.newTransaction();
+      transaction.get(KEY1);
+      Assert.fail();
+      EasyMock.verify(rpcFactoryMock, rpcMock);
+    } catch (DatastoreException ex) {
+      assertEquals("ABORTED", ex.getMessage());
+    }
+  }
+
   @Test
   public void testNonRetryableException() {
     LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();

From c34770fc94e49a1a52e41a66d71f33461e8685a5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 2 Jun 2020 21:48:06 +0000
Subject: [PATCH 0358/1784] chore: release 1.102.0 (#113)

:robot: I have created a release \*beep\* \*boop\*
---
## [1.102.0](https://www.github.com/googleapis/java-datastore/compare/v1.101.4...v1.102.0) (2020-06-02)


### Features

* add flatten plugin to client and proto modules ([#108](https://www.github.com/googleapis/java-datastore/issues/108)) ([fb3566d](https://www.github.com/googleapis/java-datastore/commit/fb3566d31600b9ed629a2daa46c5202a894181b2))
* Create CODEOWNERS ([#122](https://www.github.com/googleapis/java-datastore/issues/122)) ([8082369](https://www.github.com/googleapis/java-datastore/commit/80823698416bbe08e2d22fbc81ec3709ad2552c8))
* implement google-cloud-shared-dependencies BOM ([#135](https://www.github.com/googleapis/java-datastore/issues/135)) ([72e29ff](https://www.github.com/googleapis/java-datastore/commit/72e29ff3460b12436e76d445aad7b8ae0e4ee82d))


### Bug Fixes

* update retry logic for operations that can be associated with a transaction ([#144](https://www.github.com/googleapis/java-datastore/issues/144)) ([82ee74e](https://www.github.com/googleapis/java-datastore/commit/82ee74ed4487f90f97856bc766edb53b66474378))


### Dependencies

* bump shared-deps version and add back certain test deps ([#139](https://www.github.com/googleapis/java-datastore/issues/139)) ([660f216](https://www.github.com/googleapis/java-datastore/commit/660f216302fedaf2f5fe0f4c76cdab8fca65cbd1))
* update core transport dependencies to v1.35.0 ([#114](https://www.github.com/googleapis/java-datastore/issues/114)) ([cad3bfb](https://www.github.com/googleapis/java-datastore/commit/cad3bfbbe739ab3ed5ebea89bee620ef8bbefd95))
* update dependency com.google.api.grpc:proto-google-common-protos to v1.18.0 ([#117](https://www.github.com/googleapis/java-datastore/issues/117)) ([b484256](https://www.github.com/googleapis/java-datastore/commit/b484256c30ac9117eb82688c801966b6ace856df))
* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.6.0 ([#140](https://www.github.com/googleapis/java-datastore/issues/140)) ([712779c](https://www.github.com/googleapis/java-datastore/commit/712779c4a25bd5f74b9557931a84bd4a812279c7))
* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.7.0 ([#142](https://www.github.com/googleapis/java-datastore/issues/142)) ([e1a5a65](https://www.github.com/googleapis/java-datastore/commit/e1a5a65d2ae2d45c4871e3e7b2e9089ad5cdc542))
* update dependency com.google.guava:guava-bom to v29 ([#95](https://www.github.com/googleapis/java-datastore/issues/95)) ([32d5e37](https://www.github.com/googleapis/java-datastore/commit/32d5e37f244969ba980cd94a8eaa8165b368ebc6))
* update dependency com.google.protobuf:protobuf-java to v3.12.0 ([#127](https://www.github.com/googleapis/java-datastore/issues/127)) ([8a310f3](https://www.github.com/googleapis/java-datastore/commit/8a310f313e53fac802ca75ea539fc4656337c6ee))
* update dependency io.grpc:grpc-bom to v1.29.0 ([#110](https://www.github.com/googleapis/java-datastore/issues/110)) ([ad6b880](https://www.github.com/googleapis/java-datastore/commit/ad6b8803d4cd55fa37ba57fd3edafad256c41aed))
* update dependency org.threeten:threetenbp to v1.4.4 ([#112](https://www.github.com/googleapis/java-datastore/issues/112)) ([41d571d](https://www.github.com/googleapis/java-datastore/commit/41d571d1e18f1400f7975a6e82646417ed39ee84))


### Documentation

* fix java doc link of LocalDatastoreHelper#stop ([#126](https://www.github.com/googleapis/java-datastore/issues/126)) ([ed9b895](https://www.github.com/googleapis/java-datastore/commit/ed9b895d57db302a731e38bc6708310baa69cd67))
* update CONTRIBUTING.md to include code formatting ([#534](https://www.github.com/googleapis/java-datastore/issues/534)) ([#124](https://www.github.com/googleapis/java-datastore/issues/124)) ([147197d](https://www.github.com/googleapis/java-datastore/commit/147197d0655a509a11f906e95d5f81d57193c562))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 33 +++++++++++++++++++++++++
 README.md                               |  6 ++---
 google-cloud-datastore-bom/pom.xml      |  6 ++---
 google-cloud-datastore/pom.xml          |  4 +--
 pom.xml                                 |  4 +--
 proto-google-cloud-datastore-v1/pom.xml |  4 +--
 versions.txt                            |  8 +++---
 7 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f841b3c3e1c7..29d5835f1f16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Changelog
 
+## [1.102.0](https://www.github.com/googleapis/java-datastore/compare/v1.101.4...v1.102.0) (2020-06-02)
+
+
+### Features
+
+* add flatten plugin to client and proto modules ([#108](https://www.github.com/googleapis/java-datastore/issues/108)) ([fb3566d](https://www.github.com/googleapis/java-datastore/commit/fb3566d31600b9ed629a2daa46c5202a894181b2))
+* Create CODEOWNERS ([#122](https://www.github.com/googleapis/java-datastore/issues/122)) ([8082369](https://www.github.com/googleapis/java-datastore/commit/80823698416bbe08e2d22fbc81ec3709ad2552c8))
+* implement google-cloud-shared-dependencies BOM ([#135](https://www.github.com/googleapis/java-datastore/issues/135)) ([72e29ff](https://www.github.com/googleapis/java-datastore/commit/72e29ff3460b12436e76d445aad7b8ae0e4ee82d))
+
+
+### Bug Fixes
+
+* update retry logic for operations that can be associated with a transaction ([#144](https://www.github.com/googleapis/java-datastore/issues/144)) ([82ee74e](https://www.github.com/googleapis/java-datastore/commit/82ee74ed4487f90f97856bc766edb53b66474378))
+
+
+### Dependencies
+
+* bump shared-deps version and add back certain test deps ([#139](https://www.github.com/googleapis/java-datastore/issues/139)) ([660f216](https://www.github.com/googleapis/java-datastore/commit/660f216302fedaf2f5fe0f4c76cdab8fca65cbd1))
+* update core transport dependencies to v1.35.0 ([#114](https://www.github.com/googleapis/java-datastore/issues/114)) ([cad3bfb](https://www.github.com/googleapis/java-datastore/commit/cad3bfbbe739ab3ed5ebea89bee620ef8bbefd95))
+* update dependency com.google.api.grpc:proto-google-common-protos to v1.18.0 ([#117](https://www.github.com/googleapis/java-datastore/issues/117)) ([b484256](https://www.github.com/googleapis/java-datastore/commit/b484256c30ac9117eb82688c801966b6ace856df))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.6.0 ([#140](https://www.github.com/googleapis/java-datastore/issues/140)) ([712779c](https://www.github.com/googleapis/java-datastore/commit/712779c4a25bd5f74b9557931a84bd4a812279c7))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.7.0 ([#142](https://www.github.com/googleapis/java-datastore/issues/142)) ([e1a5a65](https://www.github.com/googleapis/java-datastore/commit/e1a5a65d2ae2d45c4871e3e7b2e9089ad5cdc542))
+* update dependency com.google.guava:guava-bom to v29 ([#95](https://www.github.com/googleapis/java-datastore/issues/95)) ([32d5e37](https://www.github.com/googleapis/java-datastore/commit/32d5e37f244969ba980cd94a8eaa8165b368ebc6))
+* update dependency com.google.protobuf:protobuf-java to v3.12.0 ([#127](https://www.github.com/googleapis/java-datastore/issues/127)) ([8a310f3](https://www.github.com/googleapis/java-datastore/commit/8a310f313e53fac802ca75ea539fc4656337c6ee))
+* update dependency io.grpc:grpc-bom to v1.29.0 ([#110](https://www.github.com/googleapis/java-datastore/issues/110)) ([ad6b880](https://www.github.com/googleapis/java-datastore/commit/ad6b8803d4cd55fa37ba57fd3edafad256c41aed))
+* update dependency org.threeten:threetenbp to v1.4.4 ([#112](https://www.github.com/googleapis/java-datastore/issues/112)) ([41d571d](https://www.github.com/googleapis/java-datastore/commit/41d571d1e18f1400f7975a6e82646417ed39ee84))
+
+
+### Documentation
+
+* fix java doc link of LocalDatastoreHelper#stop ([#126](https://www.github.com/googleapis/java-datastore/issues/126)) ([ed9b895](https://www.github.com/googleapis/java-datastore/commit/ed9b895d57db302a731e38bc6708310baa69cd67))
+* update CONTRIBUTING.md to include code formatting ([#534](https://www.github.com/googleapis/java-datastore/issues/534)) ([#124](https://www.github.com/googleapis/java-datastore/issues/124)) ([147197d](https://www.github.com/googleapis/java-datastore/commit/147197d0655a509a11f906e95d5f81d57193c562))
+
 ### [1.101.4](https://www.github.com/googleapis/java-datastore/compare/v1.101.3...v1.101.4) (2020-04-08)
 
 
diff --git a/README.md b/README.md
index ec6912af2496..60d08e86e6dc 100644
--- a/README.md
+++ b/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.102.4
+  1.103.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.102.4'
+compile 'com.google.cloud:google-cloud-datastore:1.103.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.102.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.103.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index cb2c478b6a0d..290ecc62bb7c 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
-  1.102.5-SNAPSHOT
+  1.103.0
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.5-SNAPSHOT
+        0.86.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.102.5-SNAPSHOT
+        1.103.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0f4ad9636a39..375b94f36e0b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.102.5-SNAPSHOT
+  1.103.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.5-SNAPSHOT
+    1.103.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 631d644955f4..d1a5f3d56fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.102.5-SNAPSHOT
+  1.103.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -168,7 +168,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.85.5-SNAPSHOT
+        0.86.0
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1292a9f98216..58e3d6cbbfc1 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.85.5-SNAPSHOT
+  0.86.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.102.5-SNAPSHOT
+    1.103.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 2351fb5626d4..d45e277c9e69 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.102.4:1.102.5-SNAPSHOT
-google-cloud-datastore-bom:1.102.4:1.102.5-SNAPSHOT
-google-cloud-datastore-parent:1.102.4:1.102.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.85.4:0.85.5-SNAPSHOT
+google-cloud-datastore:1.103.0:1.103.0
+google-cloud-datastore-bom:1.103.0:1.103.0
+google-cloud-datastore-parent:1.103.0:1.103.0
+proto-google-cloud-datastore-v1:0.86.0:0.86.0
 

From c509a2a4229f864edef8681677d73f3c7be1101f Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Tue, 2 Jun 2020 19:00:07 -0400
Subject: [PATCH 0359/1784] fix: fix version number in changelog to correctly
 reflect what was released to maven central (#145)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29d5835f1f16..0542833ecb76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [1.102.0](https://www.github.com/googleapis/java-datastore/compare/v1.101.4...v1.102.0) (2020-06-02)
+## [1.103.0](https://www.github.com/googleapis/java-datastore/compare/v1.102.4...v1.103.0) (2020-06-02)
 
 
 ### Features

From 33809368e7536836bf38861e833b76d1eef12251 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 3 Jun 2020 21:49:54 +0200
Subject: [PATCH 0360/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.103.0 (#147)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 15ed06e92f6d..19e09b4a5198 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
-      1.102.4
+      1.103.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4802d9eac37f..fa30ad648357 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.102.4
+      1.103.0
     
 
     

From d572efb1d8367086d2062c3a2f2c0ae61b85abf8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2020 19:54:13 +0000
Subject: [PATCH 0361/1784] chore: release 1.103.1-SNAPSHOT (#146)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 290ecc62bb7c..c99c4dc2d80c 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
-  1.103.0
+  1.103.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.86.0
+        0.86.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.103.0
+        1.103.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 375b94f36e0b..6de85518f295 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.103.0
+  1.103.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.103.0
+    1.103.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index d1a5f3d56fb3..e35aab7296b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.103.0
+  1.103.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -168,7 +168,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.86.0
+        0.86.1-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 58e3d6cbbfc1..9ca61e77372b 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.86.0
+  0.86.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.103.0
+    1.103.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index d45e277c9e69..e4c2b72ebb84 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.103.0:1.103.0
-google-cloud-datastore-bom:1.103.0:1.103.0
-google-cloud-datastore-parent:1.103.0:1.103.0
-proto-google-cloud-datastore-v1:0.86.0:0.86.0
+google-cloud-datastore:1.103.0:1.103.1-SNAPSHOT
+google-cloud-datastore-bom:1.103.0:1.103.1-SNAPSHOT
+google-cloud-datastore-parent:1.103.0:1.103.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.86.0:0.86.1-SNAPSHOT
 

From 976d9791572117dc703d8d7d6963bdd6603ecd63 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 5 Jun 2020 00:54:28 +0530
Subject: [PATCH 0362/1784] feat: add support to customize gcloud command of
 LocalDatastoreHelper (#137)

Refactor creation of LocalDatastoreHelper to provide a builder (in addition
to the existing factory methods) which allow finer grained configuration
including the ability to set a storage directory to be passed when starting
the emulator.
---
 .../testing/LocalDatastoreHelper.java         | 105 ++++++++++++++----
 .../testing/ITLocalDatastoreHelperTest.java   |  93 ++++++++++++++++
 2 files changed, 176 insertions(+), 22 deletions(-)

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 51bcb6d3201d..2867d7e3069f 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
@@ -35,7 +35,6 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.threeten.bp.Duration;
 
@@ -50,6 +49,7 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
   private final List emulatorRunners;
   private final double consistency;
   private final Path gcdPath;
+  private boolean storeOnDisk;
 
   // Gcloud emulator settings
   private static final String GCLOUD_CMD_TEXT = "gcloud beta emulators datastore start";
@@ -78,39 +78,87 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
     }
   }
 
-  private LocalDatastoreHelper(double consistency, int port) {
+  /** A builder for {@code LocalDatastoreHelper} objects. */
+  public static class Builder {
+    private double consistency;
+    private int port;
+    private Path dataDir;
+    private boolean storeOnDisk = true;
+
+    private Builder() {}
+
+    private Builder(LocalDatastoreHelper helper) {
+      this.consistency = helper.consistency;
+      this.dataDir = helper.gcdPath;
+      this.storeOnDisk = helper.storeOnDisk;
+    }
+
+    public Builder setConsistency(double consistency) {
+      this.consistency = consistency;
+      return this;
+    }
+
+    public Builder setPort(int port) {
+      this.port = port;
+      return this;
+    }
+
+    public Builder setDataDir(Path dataDir) {
+      this.dataDir = dataDir;
+      return this;
+    }
+
+    public Builder setStoreOnDisk(boolean storeOnDisk) {
+      this.storeOnDisk = storeOnDisk;
+      return this;
+    }
+
+    /** Creates a {@code LocalDatastoreHelper} object. */
+    public LocalDatastoreHelper build() {
+      return new LocalDatastoreHelper(this);
+    }
+  }
+
+  private LocalDatastoreHelper(Builder builder) {
     super(
         "datastore",
-        port > 0 ? port : BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
+        builder.port > 0 ? builder.port : BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
         PROJECT_ID_PREFIX + UUID.randomUUID().toString());
-    Path tmpDirectory = null;
-    try {
-      tmpDirectory = Files.createTempDirectory("gcd");
-    } catch (IOException ex) {
-      getLogger().log(Level.WARNING, "Failed to create temporary directory");
-    }
-    this.gcdPath = tmpDirectory;
-    this.consistency = consistency;
+    this.consistency = builder.consistency > 0 ? builder.consistency : DEFAULT_CONSISTENCY;
+    this.gcdPath = builder.dataDir;
+    this.storeOnDisk = builder.storeOnDisk;
     String binName = BIN_NAME;
     if (isWindows()) {
       binName = BIN_NAME.replace("/", "\\");
     }
     List gcloudCommand = new ArrayList<>(Arrays.asList(GCLOUD_CMD_TEXT.split(" ")));
     gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + "localhost:" + getPort());
-    gcloudCommand.add(CONSISTENCY_FLAG + consistency);
-    gcloudCommand.add("--no-store-on-disk");
+    gcloudCommand.add(CONSISTENCY_FLAG + builder.consistency);
+    if (!builder.storeOnDisk) {
+      gcloudCommand.add("--no-store-on-disk");
+    }
     GcloudEmulatorRunner gcloudRunner =
         new GcloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION);
     List binCommand = new ArrayList<>(Arrays.asList(binName, "start"));
     binCommand.add("--testing");
     binCommand.add(BIN_CMD_PORT_FLAG + getPort());
-    binCommand.add(CONSISTENCY_FLAG + consistency);
-    if (gcdPath != null) {
-      gcloudCommand.add("--data-dir=" + gcdPath.toString());
+    binCommand.add(CONSISTENCY_FLAG + getConsistency());
+    if (builder.dataDir != null) {
+      gcloudCommand.add("--data-dir=" + getGcdPath());
     }
     DownloadableEmulatorRunner downloadRunner =
         new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM);
-    emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner);
+    this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner);
+  }
+
+  /** Returns a builder for {@code LocalDatastoreHelper} object. */
+  public LocalDatastoreHelper.Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  /** Returns a builder for {@code LocalDatastoreHelper} object. */
+  public static LocalDatastoreHelper.Builder newBuilder() {
+    return new LocalDatastoreHelper.Builder();
   }
 
   @Override
@@ -153,6 +201,16 @@ public double getConsistency() {
     return consistency;
   }
 
+  /** Returns the data directory path of the local Datastore emulator. */
+  public Path getGcdPath() {
+    return gcdPath;
+  }
+
+  /** Returns {@code true} data persist on disk, otherwise {@code false} data not store on disk. */
+  public boolean isStoreOnDisk() {
+    return storeOnDisk;
+  }
+
   /**
    * Creates a local Datastore helper with the specified settings for project ID and consistency.
    *
@@ -162,7 +220,7 @@ public double getConsistency() {
    *     consistency of non-ancestor queries; non-ancestor queries are eventually consistent.
    */
   public static LocalDatastoreHelper create(double consistency) {
-    return create(consistency, 0);
+    return LocalDatastoreHelper.newBuilder().setConsistency(consistency).setPort(0).build();
   }
 
   /**
@@ -176,7 +234,7 @@ public static LocalDatastoreHelper create(double consistency) {
    *     emulator will search for a free random port.
    */
   public static LocalDatastoreHelper create(double consistency, int port) {
-    return new LocalDatastoreHelper(consistency, port);
+    return LocalDatastoreHelper.newBuilder().setConsistency(consistency).setPort(port).build();
   }
 
   /**
@@ -187,7 +245,10 @@ public static LocalDatastoreHelper create(double consistency, int port) {
    *     emulator will search for a free random port.
    */
   public static LocalDatastoreHelper create(int port) {
-    return new LocalDatastoreHelper(DEFAULT_CONSISTENCY, port);
+    return LocalDatastoreHelper.newBuilder()
+        .setConsistency(DEFAULT_CONSISTENCY)
+        .setPort(port)
+        .build();
   }
 
   /**
@@ -197,7 +258,7 @@ public static LocalDatastoreHelper create(int port) {
    * all writes are immediately visible.
    */
   public static LocalDatastoreHelper create() {
-    return create(DEFAULT_CONSISTENCY);
+    return LocalDatastoreHelper.newBuilder().setConsistency(DEFAULT_CONSISTENCY).build();
   }
 
   /**
@@ -254,7 +315,7 @@ public void stop() throws IOException, InterruptedException, TimeoutException {
     stop(Duration.ofSeconds(20));
   }
 
-  private static void deleteRecursively(Path path) throws IOException {
+  static void deleteRecursively(Path path) throws IOException {
     if (path == null || !Files.exists(path)) {
       return;
     }
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 9da207a4a6d4..6cc236a8b37e 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
@@ -30,8 +30,12 @@
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Key;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.concurrent.TimeoutException;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -43,6 +47,17 @@ public class ITLocalDatastoreHelperTest {
   private static final double TOLERANCE = 0.00001;
   private static final String PROJECT_ID_PREFIX = "test-project-";
   private static final String NAMESPACE = "namespace";
+  private Path dataDir;
+
+  @Before
+  public void setUp() throws IOException {
+    dataDir = Files.createTempDirectory("gcd");
+  }
+
+  @After
+  public void tearDown() throws IOException {
+    LocalDatastoreHelper.deleteRecursively(dataDir);
+  }
 
   @Test
   public void testCreate() {
@@ -54,6 +69,57 @@ public void testCreate() {
     assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
   }
 
+  @Test
+  public void testCreateWithBuilder() {
+    LocalDatastoreHelper helper =
+        LocalDatastoreHelper.newBuilder()
+            .setConsistency(0.75)
+            .setPort(8081)
+            .setStoreOnDisk(false)
+            .setDataDir(dataDir)
+            .build();
+    assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE);
+    assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
+    assertFalse(helper.isStoreOnDisk());
+    assertEquals(8081, helper.getPort());
+    assertEquals(dataDir, helper.getGcdPath());
+    LocalDatastoreHelper incompleteHelper = LocalDatastoreHelper.newBuilder().build();
+    assertTrue(Math.abs(0.9 - incompleteHelper.getConsistency()) < TOLERANCE);
+    assertTrue(incompleteHelper.getProjectId().startsWith(PROJECT_ID_PREFIX));
+  }
+
+  @Test
+  public void testCreateWithToBuilder() throws IOException {
+    LocalDatastoreHelper helper =
+        LocalDatastoreHelper.newBuilder()
+            .setConsistency(0.75)
+            .setPort(8081)
+            .setStoreOnDisk(false)
+            .setDataDir(dataDir)
+            .build();
+    assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE);
+    assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
+    assertFalse(helper.isStoreOnDisk());
+    assertEquals(8081, helper.getPort());
+    assertEquals(dataDir, helper.getGcdPath());
+    LocalDatastoreHelper actualHelper = helper.toBuilder().build();
+    assertLocalDatastoreHelpersEquivelent(helper, actualHelper);
+    Path dataDir = Files.createTempDirectory("gcd_data_dir");
+    actualHelper =
+        helper
+            .toBuilder()
+            .setConsistency(0.85)
+            .setPort(9091)
+            .setStoreOnDisk(true)
+            .setDataDir(dataDir)
+            .build();
+    assertTrue(Math.abs(0.85 - actualHelper.getConsistency()) < TOLERANCE);
+    assertTrue(actualHelper.isStoreOnDisk());
+    assertEquals(9091, actualHelper.getPort());
+    assertEquals(dataDir, actualHelper.getGcdPath());
+    LocalDatastoreHelper.deleteRecursively(dataDir);
+  }
+
   @Test
   public void testCreatePort() {
     LocalDatastoreHelper helper = LocalDatastoreHelper.create(0.75, 8888);
@@ -103,4 +169,31 @@ public void testStartStopReset() throws IOException, InterruptedException, Timeo
       assertNotNull(ex.getMessage());
     }
   }
+
+  @Test
+  public void testStartStopResetWithBuilder()
+      throws IOException, InterruptedException, TimeoutException {
+    try {
+      LocalDatastoreHelper helper = LocalDatastoreHelper.newBuilder().build();
+      helper.start();
+      Datastore datastore = helper.getOptions().getService();
+      Key key = datastore.newKeyFactory().setKind("kind").newKey("name");
+      datastore.put(Entity.newBuilder(key).build());
+      assertNotNull(datastore.get(key));
+      helper.reset();
+      assertNull(datastore.get(key));
+      helper.stop(Duration.ofMinutes(1));
+      datastore.get(key);
+      Assert.fail();
+    } catch (DatastoreException ex) {
+      assertNotNull(ex.getMessage());
+    }
+  }
+
+  public void assertLocalDatastoreHelpersEquivelent(
+      LocalDatastoreHelper expected, LocalDatastoreHelper actual) {
+    assertEquals(expected.getConsistency(), actual.getConsistency(), 0);
+    assertEquals(expected.isStoreOnDisk(), actual.isStoreOnDisk());
+    assertEquals(expected.getGcdPath(), actual.getGcdPath());
+  }
 }

From 425f6db057cbd78a1e91ed71684183ab7fd59c48 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 5 Jun 2020 11:26:32 -0700
Subject: [PATCH 0363/1784] chore(java_templates): add default CODEOWNERS files
 for samples reviews (#152)

This should automatically request reviews from the googleapis/java-samples-reviewers team for changes to samples Java code.

If you provide a `codeowner_team` in the `.repo-metadata.json` configuration file, it also adds an entry for any Java code. Note that later entries in the file take precedence over earlier ones so samples Java code will only require reviews by the samples team.

Source-Author: Jeff Ching 
Source-Date: Wed Jun 3 15:32:11 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 8b65daa222d193b689279162781baf0aa1f0ffd2
Source-Link: https://github.com/googleapis/synthtool/commit/8b65daa222d193b689279162781baf0aa1f0ffd2
---
 .github/CODEOWNERS | 8 +++-----
 synth.metadata     | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 39a8fc72bc4f..6137bef2a259 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,10 +1,8 @@
 # Code owners file.
 # This file controls who is tagged for review for any given pull request.
-#
+
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-
-# The firestore-dpe team is the default owner for anything not
-# explicitly taken by someone else.
-*                               @googleapis/firestore-dpe
+# The java-samples-reviewers team is the default owner for samples changes
+samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/synth.metadata b/synth.metadata
index d33ca02edc4e..fa5495de69dc 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "660f216302fedaf2f5fe0f4c76cdab8fca65cbd1"
+        "sha": "d572efb1d8367086d2062c3a2f2c0ae61b85abf8"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5b48b0716a36ca069db3038da7e205c87a22ed19"
+        "sha": "8b65daa222d193b689279162781baf0aa1f0ffd2"
       }
     }
   ],

From 5aee52f5013d6780e523e0c6d7d00a1826b83b9b Mon Sep 17 00:00:00 2001
From: Suraj Dhamecha <48670070+suraj-qlogic@users.noreply.github.com>
Date: Tue, 9 Jun 2020 01:27:32 +0530
Subject: [PATCH 0364/1784] feat: add opencensus tracing/stats support for
 Datastore RPC operations (#130)

---
 google-cloud-datastore/pom.xml                |  4 +
 .../google/cloud/datastore/DatastoreImpl.java | 64 ++++++++++++----
 .../com/google/cloud/datastore/TraceUtil.java | 74 +++++++++++++++++++
 .../datastore/spi/v1/HttpDatastoreRpc.java    | 12 ++-
 pom.xml                                       |  1 -
 5 files changed, 139 insertions(+), 16 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6de85518f295..703612e6f016 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -78,6 +78,10 @@
       com.google.auth
       google-auth-library-oauth2-http
     
+    
+      io.opencensus
+      opencensus-api
+    
 
     
     
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 25e434227aee..f4bd6b0be1c0 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
@@ -34,6 +34,9 @@
 import com.google.datastore.v1.ReserveIdsRequest;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.protobuf.ByteString;
+import io.opencensus.common.Scope;
+import io.opencensus.trace.Span;
+import io.opencensus.trace.Status;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -53,6 +56,7 @@ final class DatastoreImpl extends BaseService implements Datas
       TransactionExceptionHandler.build();
   private static final ExceptionHandler TRANSACTION_OPERATION_EXCEPTION_HANDLER =
       TransactionOperationExceptionHandler.build();
+  private final TraceUtil traceUtil = TraceUtil.getInstance();;
 
   DatastoreImpl(DatastoreOptions options) {
     super(options);
@@ -132,30 +136,36 @@ public T call() throws DatastoreException {
 
   @Override
   public  T runInTransaction(final TransactionCallable callable) {
-    final DatastoreImpl self = this;
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_TRANSACTION);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
-          new ReadWriteTransactionCallable(self, callable, null),
+          new ReadWriteTransactionCallable(this, callable, null),
           retrySettings,
           TRANSACTION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
   @Override
   public  T runInTransaction(
       final TransactionCallable callable, TransactionOptions transactionOptions) {
-    final DatastoreImpl self = this;
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_TRANSACTION);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
-          new ReadWriteTransactionCallable(self, callable, transactionOptions),
+          new ReadWriteTransactionCallable(this, callable, transactionOptions),
           retrySettings,
           TRANSACTION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
@@ -175,7 +185,8 @@  QueryResults run(com.google.datastore.v1.ReadOptions readOptionsPb, Query
 
   com.google.datastore.v1.RunQueryResponse runQuery(
       final com.google.datastore.v1.RunQueryRequest requestPb) {
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RUNQUERY);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -189,7 +200,10 @@ public com.google.datastore.v1.RunQueryResponse call() throws DatastoreException
               : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
@@ -229,7 +243,8 @@ public List allocateId(IncompleteKey... keys) {
 
   private com.google.datastore.v1.AllocateIdsResponse allocateIds(
       final com.google.datastore.v1.AllocateIdsRequest requestPb) {
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_ALLOCATEIDS);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -241,7 +256,10 @@ public com.google.datastore.v1.AllocateIdsResponse call() throws DatastoreExcept
           EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
@@ -389,7 +407,8 @@ protected Entity computeNext() {
 
   com.google.datastore.v1.LookupResponse lookup(
       final com.google.datastore.v1.LookupRequest requestPb) {
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_LOOKUP);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -403,7 +422,10 @@ public com.google.datastore.v1.LookupResponse call() throws DatastoreException {
               : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
@@ -425,7 +447,8 @@ public List reserveIds(Key... keys) {
 
   com.google.datastore.v1.ReserveIdsResponse reserveIds(
       final com.google.datastore.v1.ReserveIdsRequest requestPb) {
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RESERVEIDS);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -437,7 +460,10 @@ public com.google.datastore.v1.ReserveIdsResponse call() throws DatastoreExcepti
           EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
@@ -529,7 +555,8 @@ private com.google.datastore.v1.CommitResponse commitMutation(
 
   com.google.datastore.v1.CommitResponse commit(
       final com.google.datastore.v1.CommitRequest requestPb) {
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_COMMIT);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -543,7 +570,10 @@ public com.google.datastore.v1.CommitResponse call() throws DatastoreException {
               : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
@@ -554,7 +584,8 @@ ByteString requestTransactionId(
 
   com.google.datastore.v1.BeginTransactionResponse beginTransaction(
       final com.google.datastore.v1.BeginTransactionRequest requestPb) {
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_BEGINTRANSACTION);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -567,7 +598,10 @@ public com.google.datastore.v1.BeginTransactionResponse call()
           EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 
@@ -579,7 +613,8 @@ void rollbackTransaction(ByteString transaction) {
   }
 
   void rollback(final com.google.datastore.v1.RollbackRequest requestPb) {
-    try {
+    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_ROLLBACK);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
       RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -592,7 +627,10 @@ public Void call() throws DatastoreException {
           EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
       throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
     }
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
new file mode 100644
index 000000000000..1f28b2e80833
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020 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.cloud.datastore;
+
+import com.google.cloud.datastore.spi.v1.HttpDatastoreRpc;
+import io.opencensus.trace.EndSpanOptions;
+import io.opencensus.trace.Span;
+import io.opencensus.trace.Tracer;
+import io.opencensus.trace.Tracing;
+
+/**
+ * Helper class for tracing utility. It is used for instrumenting {@link HttpDatastoreRpc} with
+ * OpenCensus APIs.
+ *
+ * 
TraceUtil instances are created by the {@link TraceUtil#getInstance()} method.
+ */
+public class TraceUtil {
+  private final Tracer tracer = Tracing.getTracer();
+  private static final TraceUtil traceUtil = new TraceUtil();
+  static final String SPAN_NAME_ALLOCATEIDS = "CloudDatastoreOperation.allocateIds";
+  static final String SPAN_NAME_TRANSACTION = "CloudDatastoreOperation.readWriteTransaction";
+  static final String SPAN_NAME_BEGINTRANSACTION = "CloudDatastoreOperation.beginTransaction";
+  static final String SPAN_NAME_COMMIT = "CloudDatastoreOperation.commit";
+  static final String SPAN_NAME_LOOKUP = "CloudDatastoreOperation.lookup";
+  static final String SPAN_NAME_RESERVEIDS = "CloudDatastoreOperation.reserveIds";
+  static final String SPAN_NAME_ROLLBACK = "CloudDatastoreOperation.rollback";
+  static final String SPAN_NAME_RUNQUERY = "CloudDatastoreOperation.runQuery";
+  static final EndSpanOptions END_SPAN_OPTIONS =
+      EndSpanOptions.builder().setSampleToLocalSpanStore(true).build();
+
+  /**
+   * Starts a new span.
+   *
+   * @param spanName The name of the returned Span.
+   * @return The newly created {@link Span}.
+   */
+  protected Span startSpan(String spanName) {
+    return tracer.spanBuilder(spanName).startSpan();
+  }
+
+  /**
+   * Return the global {@link Tracer}.
+   *
+   * @return The global {@link Tracer}.
+   */
+  public Tracer getTracer() {
+    return tracer;
+  }
+
+  /**
+   * Return TraceUtil Object.
+   *
+   * @return An instance of {@link TraceUtil}
+   */
+  public static TraceUtil getInstance() {
+    return traceUtil;
+  }
+
+  private TraceUtil() {}
+}
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 7d3434108c67..4f13b4600488 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
@@ -21,6 +21,8 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.cloud.datastore.DatastoreException;
 import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.TraceUtil;
+import com.google.cloud.http.CensusHttpModule;
 import com.google.cloud.http.HttpTransportOptions;
 import com.google.datastore.v1.AllocateIdsRequest;
 import com.google.datastore.v1.AllocateIdsResponse;
@@ -75,12 +77,18 @@ public HttpDatastoreRpc(DatastoreOptions options) {
 
   private HttpRequestInitializer getHttpRequestInitializer(
       final DatastoreOptions options, HttpTransportOptions httpTransportOptions) {
-    final HttpRequestInitializer delegate = httpTransportOptions.getHttpRequestInitializer(options);
+    // Open Census initialization
+    CensusHttpModule censusHttpModule =
+        new CensusHttpModule(TraceUtil.getInstance().getTracer(), true);
+    final HttpRequestInitializer censusHttpModuleHttpRequestInitializer =
+        censusHttpModule.getHttpRequestInitializer(
+            httpTransportOptions.getHttpRequestInitializer(options));
+
     final String applicationName = options.getApplicationName();
     return new HttpRequestInitializer() {
       @Override
       public void initialize(HttpRequest httpRequest) throws IOException {
-        delegate.initialize(httpRequest);
+        censusHttpModuleHttpRequestInitializer.initialize(httpRequest);
         httpRequest.getHeaders().setUserAgent(applicationName);
       }
     };
diff --git a/pom.xml b/pom.xml
index e35aab7296b0..5a493fe293bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,7 +191,6 @@
         google-oauth-client
         1.30.6
       
-
       
       
         junit

From be4aaec6e75ccbd1548ec15918536465a6eddf7f Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 8 Jun 2020 15:49:34 -0700
Subject: [PATCH 0365/1784] chore(java_templates): re-generate common files
 (#155)

* chore: turn on renovate-bot master issue for java repos

Source-Author: Stephanie Wang 
Source-Date: Thu Jun 4 18:23:16 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: cac9eef310652bf138dd76b716e4986e757d62ac
Source-Link: https://github.com/googleapis/synthtool/commit/cac9eef310652bf138dd76b716e4986e757d62ac

* build(java): skip lint on samples directory

Let the samples test decide how to enforce linting

Source-Author: Jeff Ching 
Source-Date: Fri Jun 5 13:40:10 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 987270824bd26f6a8c716d5e2022057b8ae7b26e
Source-Link: https://github.com/googleapis/synthtool/commit/987270824bd26f6a8c716d5e2022057b8ae7b26e
---
 .kokoro/build.sh | 4 +---
 renovate.json    | 3 ++-
 synth.metadata   | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index cc3cd547dc8c..feda37d3d99b 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -51,9 +51,7 @@ test)
     RETURN_CODE=$?
     ;;
 lint)
-    mvn \
-      -Penable-samples \
-      com.coveo:fmt-maven-plugin:check
+    mvn com.coveo:fmt-maven-plugin:check
     RETURN_CODE=$?
     ;;
 javadoc)
diff --git a/renovate.json b/renovate.json
index 83457deb1094..538ff9137e3b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -76,5 +76,6 @@
       "groupName": "jackson dependencies"
     }
   ],
-  "semanticCommits": true
+  "semanticCommits": true,
+  "masterIssue": true
 }
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index fa5495de69dc..bd3e25bcc4f8 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "d572efb1d8367086d2062c3a2f2c0ae61b85abf8"
+        "sha": "425f6db057cbd78a1e91ed71684183ab7fd59c48"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8b65daa222d193b689279162781baf0aa1f0ffd2"
+        "sha": "987270824bd26f6a8c716d5e2022057b8ae7b26e"
       }
     }
   ],

From 9b82b4219da00b64e2e76ad0f6b34c599261c419 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 9 Jun 2020 22:23:56 +0200
Subject: [PATCH 0366/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v5.6.0 (#157)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 056cf90b2d25..1a38dce4cbb2 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        5.5.0
+        5.6.0
         pom
         import
       

From 4025bb7050952586d62fbde9b82aedff754acd9a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 11 Jun 2020 00:44:28 +0200
Subject: [PATCH 0367/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.18 (#158)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| com.google.cloud.samples:shared-configuration | patch | `1.0.17` -> `1.0.18` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 19e09b4a5198..749f5d3f5d15 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.17
+    1.0.18
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index dda0f27c3db3..d75c749490f9 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.17
+    1.0.18
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fa30ad648357..2e5e1d8d2ee6 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.17
+    1.0.18
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 1a38dce4cbb2..fffff3db01f5 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.17
+    1.0.18
   
 
   

From c4079786354b6f1220af1af2f0ee821aea13e1f4 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 11 Jun 2020 00:51:00 +0200
Subject: [PATCH 0368/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v5.7.0 (#160)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `5.6.0` -> `5.7.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index fffff3db01f5..34f30a354cee 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        5.6.0
+        5.7.0
         pom
         import
       

From 5434c7d7f00a96f8dd7091996b032d856b68e73f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 11 Jun 2020 02:01:10 +0200
Subject: [PATCH 0369/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.8.0 (#159)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | minor | `0.6.0` -> `0.8.0` |

---

### Release Notes



googleapis/java-shared-config

### [`v0.8.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​080-httpswwwgithubcomgoogleapisjava-shared-configcomparev070v080-2020-06-10)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.7.0...v0.8.0)

##### Features

-   revert "feat: mark auto-value-annotations scope as provided" ([#​154](https://www.github.com/googleapis/java-shared-config/issues/154)) ([88afb4e](https://www.github.com/googleapis/java-shared-config/commit/88afb4e7c57cb6e00929c098135314a926d9da30))

### [`v0.7.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​070-httpswwwgithubcomgoogleapisjava-shared-configcomparev060v070-2020-06-10)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.6.0...v0.7.0)

##### Features

-   mark auto-value-annotations scope as provided ([#​151](https://www.github.com/googleapis/java-shared-config/issues/151)) ([44ea4cb](https://www.github.com/googleapis/java-shared-config/commit/44ea4cbbf92b4ad35ffaffb7a01a1bce05063daf))

##### Bug Fixes

-   lock the google-java-format version used by formatter plugin ([#​149](https://www.github.com/googleapis/java-shared-config/issues/149)) ([d58c054](https://www.github.com/googleapis/java-shared-config/commit/d58c05437a4ea8767db2bebfcc405ec77aeb9705))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 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 c99c4dc2d80c..0c0ad522c059 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
-    0.6.0
+    0.8.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 5a493fe293bd..4ad71919078c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.6.0
+    0.8.0
   
 
   

From 39c8d723b318d08ca494b71167eaa80b1df6423d Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 12 Jun 2020 22:29:51 +0200
Subject: [PATCH 0370/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.8.0 (#161)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4ad71919078c..29d091c7e967 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.7.0
+        0.8.0
         pom
         import
       

From ef8e715fc990de03e6ef393367f24fffd2efbd29 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 15 Jun 2020 12:55:49 -0700
Subject: [PATCH 0371/1784] chore: set Ruby namespace in proto options (#162)

PiperOrigin-RevId: 316124477

Source-Author: Google APIs 
Source-Date: Fri Jun 12 10:06:09 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: c829fa0bfa725adaf20d82e86cbc1220e3ffd784
Source-Link: https://github.com/googleapis/googleapis/commit/c829fa0bfa725adaf20d82e86cbc1220e3ffd784
---
 .../main/java/com/google/datastore/v1/DatastoreProto.java   | 5 +++--
 .../src/main/java/com/google/datastore/v1/EntityProto.java  | 5 +++--
 .../src/main/java/com/google/datastore/v1/QueryProto.java   | 5 +++--
 .../src/main/proto/google/datastore/v1/datastore.proto      | 1 +
 .../src/main/proto/google/datastore/v1/entity.proto         | 1 +
 .../src/main/proto/google/datastore/v1/query.proto          | 1 +
 synth.metadata                                              | 6 +++---
 7 files changed, 15 insertions(+), 9 deletions(-)

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 dc4d63dccc4d..fd59f03e9636 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
@@ -214,11 +214,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ds:\001*\332A\017project_id,keys\032v\312A\030datastore.go"
           + "ogleapis.com\322AXhttps://www.googleapis.co"
           + "m/auth/cloud-platform,https://www.google"
-          + "apis.com/auth/datastoreB\241\001\n\027com.google.d"
+          + "apis.com/auth/datastoreB\300\001\n\027com.google.d"
           + "atastore.v1B\016DatastoreProtoP\001Z
Date: Mon, 15 Jun 2020 22:02:35 +0200
Subject: [PATCH 0372/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.8.1 (#163)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 29d091c7e967..5914bbb9907d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.8.0
+        0.8.1
         pom
         import
       

From f1874f1b2745724ccc2345f35b65fb577f53683e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 15 Jun 2020 22:06:04 +0200
Subject: [PATCH 0373/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.8.1 (#164)

---
 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 0c0ad522c059..393f6b5cc09b 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
-    0.8.0
+    0.8.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 5914bbb9907d..30af217e1d79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.8.0
+    0.8.1
   
 
   

From 12cacad03680338cda0f74fd595734deb87168be Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 16 Jun 2020 12:41:50 -0700
Subject: [PATCH 0374/1784] ci: update CI config to use secret manager
 integration for credentials (#166)

* ci(java): switch to secret manager from keystore

* ci(java): switch to secret manager from keystore, use java-docs-samples user for samples tests

* fix: we don't need to supply a service account

Source-Author: Jeff Ching 
Source-Date: Mon Jun 15 11:45:21 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: d1addcdf80aa9ddef8c932c89c919024bbad7af3
Source-Link: https://github.com/googleapis/synthtool/commit/d1addcdf80aa9ddef8c932c89c919024bbad7af3

* samples(java): fix bad character in samples.cfg from copy/paste

Somehow an invisible character was copy/pasted into the file and Kokoro
cannot parse the file.

Source-Author: Jeff Ching 
Source-Date: Mon Jun 15 15:42:10 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 6d3eed67a45fd58f9c7bfa173c32e4fd4fed058f
Source-Link: https://github.com/googleapis/synthtool/commit/6d3eed67a45fd58f9c7bfa173c32e4fd4fed058f

* ci(java): switch integration test secrets to secret manager

Source-Author: Jeff Ching 
Source-Date: Tue Jun 16 09:26:06 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 6eb80fa9f96433af8dbeb1c8323aa80cda49b374
Source-Link: https://github.com/googleapis/synthtool/commit/6eb80fa9f96433af8dbeb1c8323aa80cda49b374

* ci(java): fix typo in java integration test secret name

Source-Author: BenWhitehead 
Source-Date: Tue Jun 16 13:32:19 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: c4f3059c27591eb24d6942a0e357ec94c80459f2
Source-Link: https://github.com/googleapis/synthtool/commit/c4f3059c27591eb24d6942a0e357ec94c80459f2
---
 .kokoro/build.sh                  |  2 +-
 .kokoro/nightly/integration.cfg   | 12 +++------
 .kokoro/nightly/samples.cfg       | 16 +++++-------
 .kokoro/populate-secrets.sh       | 43 +++++++++++++++++++++++++++++++
 .kokoro/presubmit/integration.cfg | 12 +++------
 .kokoro/presubmit/samples.cfg     | 14 ++++------
 .kokoro/trampoline.sh             |  2 ++
 synth.metadata                    |  4 +--
 8 files changed, 67 insertions(+), 38 deletions(-)
 create mode 100755 .kokoro/populate-secrets.sh

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index feda37d3d99b..7535c0aac0a4 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -39,7 +39,7 @@ retry_with_backoff 3 10 \
 
 # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
 if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
-    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
+    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 
 RETURN_CODE=0
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 40c4abb7bf08..0048c8ece7e5 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -28,14 +28,10 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-it-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
 }
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
index 20aabd55de11..f25429314f4d 100644
--- a/.kokoro/nightly/samples.cfg
+++ b/.kokoro/nightly/samples.cfg
@@ -24,19 +24,15 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-docs-samples-service-account"
 }
 
 env_vars: {
-  key: "ENABLE_BUILD_COP"
-  value: "true"
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
 }
diff --git a/.kokoro/populate-secrets.sh b/.kokoro/populate-secrets.sh
new file mode 100755
index 000000000000..f52514257ef0
--- /dev/null
+++ b/.kokoro/populate-secrets.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Copyright 2020 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.
+
+set -eo pipefail
+
+function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;}
+function msg { println "$*" >&2 ;}
+function println { printf '%s\n' "$(now) $*" ;}
+
+
+# Populates requested secrets set in SECRET_MANAGER_KEYS from service account:
+# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com
+SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
+msg "Creating folder on disk for secrets: ${SECRET_LOCATION}"
+mkdir -p ${SECRET_LOCATION}
+for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
+do
+  msg "Retrieving secret ${key}"
+  docker run --entrypoint=gcloud \
+    --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
+    gcr.io/google.com/cloudsdktool/cloud-sdk \
+    secrets versions access latest \
+    --project cloud-devrel-kokoro-resources \
+    --secret ${key} > \
+    "${SECRET_LOCATION}/${key}"
+  if [[ $? == 0 ]]; then
+    msg "Secret written to ${SECRET_LOCATION}/${key}"
+  else
+    msg "Error retrieving secret ${key}"
+  fi
+done
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index 522e5b10101c..dded67a9d54a 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -24,14 +24,10 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-it-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
 }
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
index 1171aead01f0..01e0960047b8 100644
--- a/.kokoro/presubmit/samples.cfg
+++ b/.kokoro/presubmit/samples.cfg
@@ -24,14 +24,10 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-docs-samples-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
-}
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
+}
\ No newline at end of file
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
index ba17ce01466b..9da0f8398773 100644
--- a/.kokoro/trampoline.sh
+++ b/.kokoro/trampoline.sh
@@ -21,4 +21,6 @@ function cleanup() {
     echo "cleanup";
 }
 trap cleanup EXIT
+
+$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
 python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
diff --git a/synth.metadata b/synth.metadata
index e5335f66366c..c6089f985b37 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "39c8d723b318d08ca494b71167eaa80b1df6423d"
+        "sha": "f1874f1b2745724ccc2345f35b65fb577f53683e"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "987270824bd26f6a8c716d5e2022057b8ae7b26e"
+        "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2"
       }
     }
   ],

From 74f138f0949a8d82c5d31b53d3faf3f3f428613c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 17 Jun 2020 01:30:41 +0200
Subject: [PATCH 0375/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v6 (#167)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | major | `5.7.0` -> `6.0.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 34f30a354cee..738cd7efbce5 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        5.7.0
+        6.0.0
         pom
         import
       

From a1e570c212398355f9684644c8edb94d179f47df Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 17 Jun 2020 19:40:39 +0200
Subject: [PATCH 0376/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v7 (#171)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | major | `6.0.0` -> `7.0.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 738cd7efbce5..f4cc04008e33 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        6.0.0
+        7.0.0
         pom
         import
       

From e72ee3c2b67e301c61d13c00aa4863c29c211915 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 19:06:07 +0000
Subject: [PATCH 0377/1784] chore: release 1.104.0 (#154)

:robot: I have created a release \*beep\* \*boop\*
---
## [1.104.0](https://www.github.com/googleapis/java-datastore/compare/v1.103.0...v1.104.0) (2020-06-17)


### Features

* add opencensus tracing/stats support for Datastore RPC operations ([#130](https://www.github.com/googleapis/java-datastore/issues/130)) ([5aee52f](https://www.github.com/googleapis/java-datastore/commit/5aee52f5013d6780e523e0c6d7d00a1826b83b9b))
* add support to customize gcloud command of LocalDatastoreHelper ([#137](https://www.github.com/googleapis/java-datastore/issues/137)) ([976d979](https://www.github.com/googleapis/java-datastore/commit/976d9791572117dc703d8d7d6963bdd6603ecd63))


### Bug Fixes

* fix version number in changelog to correctly reflect what was released to maven central ([#145](https://www.github.com/googleapis/java-datastore/issues/145)) ([c509a2a](https://www.github.com/googleapis/java-datastore/commit/c509a2a4229f864edef8681677d73f3c7be1101f))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.0 ([#161](https://www.github.com/googleapis/java-datastore/issues/161)) ([39c8d72](https://www.github.com/googleapis/java-datastore/commit/39c8d723b318d08ca494b71167eaa80b1df6423d))
* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.1 ([#163](https://www.github.com/googleapis/java-datastore/issues/163)) ([7bfa07e](https://www.github.com/googleapis/java-datastore/commit/7bfa07eb3a7cf84fcf3e19f6a33914162fa28499))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 19 +++++++++++++++++++
 README.md                               |  6 +++---
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0542833ecb76..925c17a3be5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [1.104.0](https://www.github.com/googleapis/java-datastore/compare/v1.103.0...v1.104.0) (2020-06-17)
+
+
+### Features
+
+* add opencensus tracing/stats support for Datastore RPC operations ([#130](https://www.github.com/googleapis/java-datastore/issues/130)) ([5aee52f](https://www.github.com/googleapis/java-datastore/commit/5aee52f5013d6780e523e0c6d7d00a1826b83b9b))
+* add support to customize gcloud command of LocalDatastoreHelper ([#137](https://www.github.com/googleapis/java-datastore/issues/137)) ([976d979](https://www.github.com/googleapis/java-datastore/commit/976d9791572117dc703d8d7d6963bdd6603ecd63))
+
+
+### Bug Fixes
+
+* fix version number in changelog to correctly reflect what was released to maven central ([#145](https://www.github.com/googleapis/java-datastore/issues/145)) ([c509a2a](https://www.github.com/googleapis/java-datastore/commit/c509a2a4229f864edef8681677d73f3c7be1101f))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.0 ([#161](https://www.github.com/googleapis/java-datastore/issues/161)) ([39c8d72](https://www.github.com/googleapis/java-datastore/commit/39c8d723b318d08ca494b71167eaa80b1df6423d))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.1 ([#163](https://www.github.com/googleapis/java-datastore/issues/163)) ([7bfa07e](https://www.github.com/googleapis/java-datastore/commit/7bfa07eb3a7cf84fcf3e19f6a33914162fa28499))
+
 ## [1.103.0](https://www.github.com/googleapis/java-datastore/compare/v1.102.4...v1.103.0) (2020-06-02)
 
 
diff --git a/README.md b/README.md
index 60d08e86e6dc..213eb9f9bf09 100644
--- a/README.md
+++ b/README.md
@@ -37,16 +37,16 @@ If you are using Maven without a BOM, add this to your dependencies.
 
   com.google.cloud
   google-cloud-datastore
-  1.103.0
+  1.104.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.103.0'
+compile 'com.google.cloud:google-cloud-datastore:1.104.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.103.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.104.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 393f6b5cc09b..1a3b53317306 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
-  1.103.1-SNAPSHOT
+  1.104.0
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.86.1-SNAPSHOT
+        0.87.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.103.1-SNAPSHOT
+        1.104.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 703612e6f016..518648f69a8b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.103.1-SNAPSHOT
+  1.104.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.103.1-SNAPSHOT
+    1.104.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 30af217e1d79..72bbbc0ee89d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.103.1-SNAPSHOT
+  1.104.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -168,7 +168,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.86.1-SNAPSHOT
+        0.87.0
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9ca61e77372b..de0b88bc0a6d 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.86.1-SNAPSHOT
+  0.87.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.103.1-SNAPSHOT
+    1.104.0
   
   
     
diff --git a/versions.txt b/versions.txt
index e4c2b72ebb84..492e61c8b4c8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.103.0:1.103.1-SNAPSHOT
-google-cloud-datastore-bom:1.103.0:1.103.1-SNAPSHOT
-google-cloud-datastore-parent:1.103.0:1.103.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.86.0:0.86.1-SNAPSHOT
+google-cloud-datastore:1.104.0:1.104.0
+google-cloud-datastore-bom:1.104.0:1.104.0
+google-cloud-datastore-parent:1.104.0:1.104.0
+proto-google-cloud-datastore-v1:0.87.0:0.87.0
 

From e15510084e1d20cfd350983b5ad5810e36d41cf3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 18 Jun 2020 22:35:42 +0200
Subject: [PATCH 0378/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.104.0 (#172)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 749f5d3f5d15..22d7ba045efd 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
-      1.103.0
+      1.104.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2e5e1d8d2ee6..c341fb63bc09 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.103.0
+      1.104.0
     
 
     

From 713fd904132d55a6e7fb9f2b01f3361c0010d7df Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 21:36:08 +0000
Subject: [PATCH 0379/1784] chore: release 1.104.1-SNAPSHOT (#173)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 1a3b53317306..495a23ba7d83 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
-  1.104.0
+  1.104.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.87.0
+        0.87.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.104.0
+        1.104.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 518648f69a8b..4d4c3a9a3785 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.104.0
+  1.104.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.104.0
+    1.104.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 72bbbc0ee89d..3bc16dea5cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.104.0
+  1.104.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -168,7 +168,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.87.0
+        0.87.1-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index de0b88bc0a6d..002263efe571 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.87.0
+  0.87.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.104.0
+    1.104.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 492e61c8b4c8..3e94f3954011 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.104.0:1.104.0
-google-cloud-datastore-bom:1.104.0:1.104.0
-google-cloud-datastore-parent:1.104.0:1.104.0
-proto-google-cloud-datastore-v1:0.87.0:0.87.0
+google-cloud-datastore:1.104.0:1.104.1-SNAPSHOT
+google-cloud-datastore-bom:1.104.0:1.104.1-SNAPSHOT
+google-cloud-datastore-parent:1.104.0:1.104.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.87.0:0.87.1-SNAPSHOT
 

From 8618c1848e71424fa164fee9d8b7b53641b6b823 Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Fri, 19 Jun 2020 18:50:09 -0700
Subject: [PATCH 0380/1784] feat(deps): adopt flatten plugin and
 google-cloud-shared-dependencies (#174)

---
 pom.xml                                 | 1 -
 proto-google-cloud-datastore-v1/pom.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3bc16dea5cfe..5f7436a6c086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,6 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    1.3.2
   
 
   
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 002263efe571..8e7e8d517ab6 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -44,7 +44,6 @@
         
           javax.annotation
           javax.annotation-api
-          ${javax.annotations.version}
         
       
     

From ae6dc45dcd8b9cc71d08d22e6fc4437cea09bede Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 22 Jun 2020 22:51:11 +0200
Subject: [PATCH 0381/1784] build(deps): update dependency
 org.codehaus.mojo:build-helper-maven-plugin to v3.2.0 (#177)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [org.codehaus.mojo:build-helper-maven-plugin](http://www.mojohaus.org/build-helper-maven-plugin/) ([source](https://togithub.com/mojohaus/build-helper-maven-plugin)) | minor | `3.1.0` -> `3.2.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 22d7ba045efd..5303163b8556 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -53,7 +53,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.1.0
+        3.2.0
         
           
             add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c341fb63bc09..ced7beed0bc8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -52,7 +52,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.1.0
+        3.2.0
         
           
             add-snippets-source

From 805aa78533d1181ccae84ec83bcf7961813b2bef Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 23 Jun 2020 00:43:21 +0200
Subject: [PATCH 0382/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v7.0.1 (#178)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | patch | `7.0.0` -> `7.0.1` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f4cc04008e33..508ce9688b8d 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        7.0.0
+        7.0.1
         pom
         import
       

From 6b8eb9f6e26227dd1bffca9b02c21045e90e650f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 24 Jun 2020 00:09:53 +0200
Subject: [PATCH 0383/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v7.0.2 (#180)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 508ce9688b8d..b0b5a17be988 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        7.0.1
+        7.0.2
         pom
         import
       

From a55127121b8cf371b36c1c6279c3cac6a877523c Mon Sep 17 00:00:00 2001
From: David Supplee 
Date: Tue, 23 Jun 2020 15:11:31 -0700
Subject: [PATCH 0384/1784] chore: update client_documentation link (#179)

---
 .repo-metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index d1f6e9e2398b..f0c0aefad9ba 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -2,7 +2,7 @@
   "name": "datastore",
   "name_pretty": "Cloud Datastore",
   "product_documentation": "https://cloud.google.com/datastore",
-  "client_documentation": "https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/asset/v1beta1/package-summary.html",
+  "client_documentation": "https://googleapis.dev/java/google-cloud-datastore/latest/index.html",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
   "release_level": "ga",
   "language": "java",

From 8e793754b7da676c98da273a741f6ede2bf220b7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 25 Jun 2020 21:41:06 +0200
Subject: [PATCH 0385/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v8 (#182)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b0b5a17be988..abaf534c1aa8 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        7.0.2
+        8.0.0
         pom
         import
       

From 4fa4df40d63d7fbce023d6231830dcc296c29dd1 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Fri, 26 Jun 2020 12:10:00 -0400
Subject: [PATCH 0386/1784] deps: remove direct declaration of
 google-auth-library-oauth2-http (#184)

Rather than having a direct managed dependency for
google-auth-library-oauth2-http use the version provided by
google-cloud-shared-dependencies.
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f7436a6c086..e5785b6a3834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,11 +180,6 @@
           
         
       
-      
-        com.google.auth
-        google-auth-library-oauth2-http
-        0.20.0
-      
       
         com.google.oauth-client
         google-oauth-client

From 16bfb9a0127f4969a796ad95cc11cf2b8b92d0f3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 30 Jun 2020 17:07:46 +0200
Subject: [PATCH 0387/1784] deps: update dependency
 com.google.oauth-client:google-oauth-client to v1.31.0 (#186)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e5785b6a3834..ae11fdd3a939 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
       
         com.google.oauth-client
         google-oauth-client
-        1.30.6
+        1.31.0
       
       
       

From 941bea016f1ce4e1c1fd027b1671f950e9c52160 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 1 Jul 2020 19:50:28 +0200
Subject: [PATCH 0388/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.8.2 (#187)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae11fdd3a939..f2c19d059b7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.8.1
+        0.8.2
         pom
         import
       

From 485a4cc5c71ce4b4ce3c1569b1f7a9d261bfc505 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 6 Jul 2020 22:59:11 +0200
Subject: [PATCH 0389/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.9.2 (#189)

---
 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 495a23ba7d83..19cf07b9bb22 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
-    0.8.1
+    0.9.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index f2c19d059b7a..c6c7045f98a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.8.1
+    0.9.2
   
 
   

From 4de5241268ee97a88bd6a066db97177b8b7f5b07 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Mon, 6 Jul 2020 17:20:35 -0400
Subject: [PATCH 0390/1784] build: add javax.annotation-api
 maven-dependency-plugin ignore for java9+ profile activation (#190)

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index c6c7045f98a3..68e5ce421a97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,6 +211,7 @@
             
               com.google.http-client:google-http-client-jackson2
               com.google.oauth-client:google-oauth-client
+              javax.annotation:javax.annotation-api
             
           
         

From 4c40b17989a64736df503ca9f35002ee12b88d86 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 9 Jul 2020 11:56:21 -0700
Subject: [PATCH 0391/1784] ci(java): run dependency test on Java 8 and 11
 (#185)

Redo fix in #633 with proper jinja templating format

Source-Author: Jeff Ching 
Source-Date: Fri Jun 19 16:52:15 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 4f2c9f752a94042472fc03c5bd9e06e89817d2bd
Source-Link: https://github.com/googleapis/synthtool/commit/4f2c9f752a94042472fc03c5bd9e06e89817d2bd
---
 .github/workflows/ci.yaml | 5 ++++-
 .kokoro/dependencies.sh   | 4 +++-
 synth.metadata            | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 445b4bf82ffd..683022075665 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -36,11 +36,14 @@ jobs:
         JOB_TYPE: test
   dependencies:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
   linkage-monitor:
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index cf3bb4347e01..cee4f11e7547 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -41,8 +41,10 @@ echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
 ## Run dependency list completeness check
 function completenessCheck() {
   # Output dep list with compile scope generated using the original pom
+  # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
+  # This is stripped from the output as it is not present in the flattened pom.
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
 
   # Output dep list generated using the flattened pom (test scope deps are ommitted)
   msg "Generating dependency list using flattened pom..."
diff --git a/synth.metadata b/synth.metadata
index c6089f985b37..2f0838df39f6 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "f1874f1b2745724ccc2345f35b65fb577f53683e"
+        "sha": "4de5241268ee97a88bd6a066db97177b8b7f5b07"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2"
+        "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd"
       }
     }
   ],

From 2a2b15c76c3284516347276e4a279d5d00ef2719 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 9 Jul 2020 13:10:03 -0700
Subject: [PATCH 0392/1784] chore: regenerate CODEOWNERS from templates (#153)

CODEOWNERS is now managed by templates and we can configure the default team in the .repo-metadata.json file.
---
 .github/CODEOWNERS  |  3 +++
 .repo-metadata.json |  1 +
 synth.metadata      | 10 +++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6137bef2a259..538bf5f097a3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,5 +4,8 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
+# The @googleapis/firestore-dpe is the default owner for changes in this repo
+**/*.java               @googleapis/firestore-dpe
+
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.repo-metadata.json b/.repo-metadata.json
index f0c0aefad9ba..1f65ef5c9680 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -9,5 +9,6 @@
   "repo": "googleapis/java-datastore",
   "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
+  "codeowner_team": "@googleapis/firestore-dpe",
   "api_id": "datastore.googleapis.com"
 }
diff --git a/synth.metadata b/synth.metadata
index 2f0838df39f6..dc9cd9c1cb07 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -3,23 +3,23 @@
     {
       "git": {
         "name": ".",
-        "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "4de5241268ee97a88bd6a066db97177b8b7f5b07"
+        "remote": "git@github.com:BenWhitehead/java-datastore.git",
+        "sha": "d0b86f4ef69f52925a5670385e494177e841cef2"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c829fa0bfa725adaf20d82e86cbc1220e3ffd784",
-        "internalRef": "316124477"
+        "sha": "99ae9a76dbecb2aab008d5403e25413f5da0f436",
+        "internalRef": "320455075"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd"
+        "sha": "799d8e6522c1ef7cb55a70d9ea0b15e045c3d00b"
       }
     }
   ],

From a89eb08be1cd9689d38b8b67c472cc928e3549c1 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 10 Jul 2020 18:11:33 +0200
Subject: [PATCH 0393/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.8.3 (#191)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 68e5ce421a97..a2a1a5a1c2f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.8.2
+        0.8.3
         pom
         import
       

From bc55730c92df8d8b6a692c1782834a3dd024c7e2 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 17 Jul 2020 00:42:11 +0200
Subject: [PATCH 0394/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v8.1.0 (#192)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `8.0.0` -> `8.1.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index abaf534c1aa8..b3b37ed3b1e6 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        8.0.0
+        8.1.0
         pom
         import
       

From a2d589acf8dc55764e91fa6aafcb7740b34f2e73 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 31 Jul 2020 10:54:44 -0700
Subject: [PATCH 0395/1784] build: add cloud-RAD for Java (#193)

Co-authored-by: Jeff Ching 

Source-Author: Les Vogel 
Source-Date: Thu Jul 30 13:09:50 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: dd230c816f88d0141fcd0be83498986287220d1b
Source-Link: https://github.com/googleapis/synthtool/commit/dd230c816f88d0141fcd0be83498986287220d1b
---
 .kokoro/release/publish_javadoc.cfg |  10 ++
 .kokoro/release/publish_javadoc.sh  |  25 ++++-
 synth.metadata                      | 158 +++++++++++++++++++++++++++-
 3 files changed, 188 insertions(+), 5 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
index f321c5f609a6..5429fad5e17e 100644
--- a/.kokoro/release/publish_javadoc.cfg
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -1,14 +1,24 @@
 # Format: //devtools/kokoro/config/proto/build.proto
+
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/"
+
 env_vars: {
   key: "STAGING_BUCKET"
   value: "docs-staging"
 }
 
+env_vars: {
+  key: "STAGING_BUCKET_V2"
+  value: "docs-staging-v2-staging"
+  # Production will be at: docs-staging-v2
+}
+
 env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-datastore/.kokoro/release/publish_javadoc.sh"
 }
 
+
 before_action {
   fetch_keystore {
     keystore_resource {
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 3dd8fe4a9ab1..0597eb24139a 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -24,6 +24,11 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
   exit 1
 fi
 
+if [[ -z "${STAGING_BUCKET_V2}" ]]; then
+  echo "Need to set STAGING_BUCKET_V2 environment variable"
+  exit 1
+fi
+
 # work from the git root directory
 pushd $(dirname "$0")/../../
 
@@ -31,13 +36,13 @@ pushd $(dirname "$0")/../../
 python3 -m pip install gcp-docuploader
 
 # compile all packages
-mvn clean install -B -DskipTests=true
+mvn clean install -B -q -DskipTests=true
 
 NAME=google-cloud-datastore
 VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 
 # build the docs
-mvn site -B
+mvn site -B -q
 
 pushd target/site/apidocs
 
@@ -53,3 +58,19 @@ python3 -m docuploader upload . \
   --staging-bucket ${STAGING_BUCKET}
 
 popd
+
+# V2
+mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"
+
+pushd target/devsite
+
+# create metadata
+python3 -m docuploader create-metadata \
+  --name ${NAME} \
+  --version ${VERSION} \
+  --language java
+
+# upload docs
+python3 -m docuploader upload . \
+  --credentials ${CREDENTIALS} \
+  --staging-bucket ${STAGING_BUCKET_V2}
diff --git a/synth.metadata b/synth.metadata
index dc9cd9c1cb07..63396cfc950d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -3,8 +3,8 @@
     {
       "git": {
         "name": ".",
-        "remote": "git@github.com:BenWhitehead/java-datastore.git",
-        "sha": "d0b86f4ef69f52925a5670385e494177e841cef2"
+        "remote": "https://github.com/googleapis/java-datastore.git",
+        "sha": "bc55730c92df8d8b6a692c1782834a3dd024c7e2"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "799d8e6522c1ef7cb55a70d9ea0b15e045c3d00b"
+        "sha": "dd230c816f88d0141fcd0be83498986287220d1b"
       }
     }
   ],
@@ -33,5 +33,157 @@
         "generator": "bazel"
       }
     }
+  ],
+  "generatedFiles": [
+    ".github/CODEOWNERS",
+    ".github/ISSUE_TEMPLATE/bug_report.md",
+    ".github/ISSUE_TEMPLATE/feature_request.md",
+    ".github/ISSUE_TEMPLATE/support_request.md",
+    ".github/PULL_REQUEST_TEMPLATE.md",
+    ".github/release-please.yml",
+    ".github/trusted-contribution.yml",
+    ".github/workflows/ci.yaml",
+    ".kokoro/build.bat",
+    ".kokoro/build.sh",
+    ".kokoro/coerce_logs.sh",
+    ".kokoro/common.cfg",
+    ".kokoro/common.sh",
+    ".kokoro/continuous/common.cfg",
+    ".kokoro/continuous/dependencies.cfg",
+    ".kokoro/continuous/integration.cfg",
+    ".kokoro/continuous/java11.cfg",
+    ".kokoro/continuous/java7.cfg",
+    ".kokoro/continuous/java8-osx.cfg",
+    ".kokoro/continuous/java8-win.cfg",
+    ".kokoro/continuous/java8.cfg",
+    ".kokoro/continuous/lint.cfg",
+    ".kokoro/continuous/propose_release.cfg",
+    ".kokoro/continuous/samples.cfg",
+    ".kokoro/dependencies.sh",
+    ".kokoro/linkage-monitor.sh",
+    ".kokoro/nightly/common.cfg",
+    ".kokoro/nightly/dependencies.cfg",
+    ".kokoro/nightly/integration.cfg",
+    ".kokoro/nightly/java11.cfg",
+    ".kokoro/nightly/java7.cfg",
+    ".kokoro/nightly/java8-osx.cfg",
+    ".kokoro/nightly/java8-win.cfg",
+    ".kokoro/nightly/java8.cfg",
+    ".kokoro/nightly/lint.cfg",
+    ".kokoro/nightly/samples.cfg",
+    ".kokoro/populate-secrets.sh",
+    ".kokoro/presubmit/clirr.cfg",
+    ".kokoro/presubmit/common.cfg",
+    ".kokoro/presubmit/dependencies.cfg",
+    ".kokoro/presubmit/integration.cfg",
+    ".kokoro/presubmit/java11.cfg",
+    ".kokoro/presubmit/java7.cfg",
+    ".kokoro/presubmit/java8-osx.cfg",
+    ".kokoro/presubmit/java8-win.cfg",
+    ".kokoro/presubmit/java8.cfg",
+    ".kokoro/presubmit/linkage-monitor.cfg",
+    ".kokoro/presubmit/lint.cfg",
+    ".kokoro/presubmit/samples.cfg",
+    ".kokoro/release/bump_snapshot.cfg",
+    ".kokoro/release/common.cfg",
+    ".kokoro/release/common.sh",
+    ".kokoro/release/drop.cfg",
+    ".kokoro/release/drop.sh",
+    ".kokoro/release/promote.cfg",
+    ".kokoro/release/promote.sh",
+    ".kokoro/release/publish_javadoc.cfg",
+    ".kokoro/release/publish_javadoc.sh",
+    ".kokoro/release/snapshot.cfg",
+    ".kokoro/release/snapshot.sh",
+    ".kokoro/release/stage.cfg",
+    ".kokoro/release/stage.sh",
+    ".kokoro/trampoline.sh",
+    "CODE_OF_CONDUCT.md",
+    "CONTRIBUTING.md",
+    "LICENSE",
+    "codecov.yaml",
+    "java.header",
+    "license-checks.xml",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java",
+    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java",
+    "proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto",
+    "proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto",
+    "proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto",
+    "renovate.json",
+    "samples/install-without-bom/pom.xml",
+    "samples/pom.xml",
+    "samples/snapshot/pom.xml",
+    "samples/snippets/pom.xml"
   ]
 }
\ No newline at end of file

From 7214e0ae224633e2effc023d10494e0164a8f9dc Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 4 Aug 2020 20:24:31 +0200
Subject: [PATCH 0396/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.8.4 (#196)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a2a1a5a1c2f3..434a878742db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.8.3
+        0.8.4
         pom
         import
       

From 21c4f6c95dc8281c26f0d410e3fe52c0600bd2c2 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 6 Aug 2020 15:47:20 -0700
Subject: [PATCH 0397/1784] cleanup: removes unused kokoro config files (#197)

* cleanup: removes unused kokoro config files

Removes unused kokoro files from the java library template. We have
stopped running some of these due to Github quota issues.

* fix:reverts back samples.cfg files

The files presubmit/samples.cfg and nightly/samples.cfg should remain in
the java template repository.

Co-authored-by: Jeffrey Rennie 

Source-Author: Thiago Nunes 
Source-Date: Thu Aug 6 09:48:58 2020 +1000
Source-Repo: googleapis/synthtool
Source-Sha: 4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4
Source-Link: https://github.com/googleapis/synthtool/commit/4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4
---
 .kokoro/continuous/dependencies.cfg    | 12 ------
 .kokoro/continuous/integration.cfg     |  7 ----
 .kokoro/continuous/java11.cfg          |  7 ----
 .kokoro/continuous/java7.cfg           |  7 ----
 .kokoro/continuous/java8-osx.cfg       |  3 --
 .kokoro/continuous/java8-win.cfg       |  3 --
 .kokoro/continuous/lint.cfg            | 13 -------
 .kokoro/continuous/propose_release.cfg | 53 --------------------------
 .kokoro/continuous/samples.cfg         | 31 ---------------
 .kokoro/nightly/dependencies.cfg       | 12 ------
 .kokoro/nightly/lint.cfg               | 13 -------
 synth.metadata                         | 15 +-------
 12 files changed, 2 insertions(+), 174 deletions(-)
 delete mode 100644 .kokoro/continuous/dependencies.cfg
 delete mode 100644 .kokoro/continuous/integration.cfg
 delete mode 100644 .kokoro/continuous/java11.cfg
 delete mode 100644 .kokoro/continuous/java7.cfg
 delete mode 100644 .kokoro/continuous/java8-osx.cfg
 delete mode 100644 .kokoro/continuous/java8-win.cfg
 delete mode 100644 .kokoro/continuous/lint.cfg
 delete mode 100644 .kokoro/continuous/propose_release.cfg
 delete mode 100644 .kokoro/continuous/samples.cfg
 delete mode 100644 .kokoro/nightly/dependencies.cfg
 delete mode 100644 .kokoro/nightly/lint.cfg

diff --git a/.kokoro/continuous/dependencies.cfg b/.kokoro/continuous/dependencies.cfg
deleted file mode 100644
index 8908efe02d46..000000000000
--- a/.kokoro/continuous/dependencies.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/dependencies.sh"
-}
diff --git a/.kokoro/continuous/integration.cfg b/.kokoro/continuous/integration.cfg
deleted file mode 100644
index 3b017fc80f04..000000000000
--- a/.kokoro/continuous/integration.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
diff --git a/.kokoro/continuous/java11.cfg b/.kokoro/continuous/java11.cfg
deleted file mode 100644
index 709f2b4c73db..000000000000
--- a/.kokoro/continuous/java11.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
-}
diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg
deleted file mode 100644
index cb24f44eea3b..000000000000
--- a/.kokoro/continuous/java7.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
-}
diff --git a/.kokoro/continuous/java8-osx.cfg b/.kokoro/continuous/java8-osx.cfg
deleted file mode 100644
index 3ba7de0b1e16..000000000000
--- a/.kokoro/continuous/java8-osx.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "java-datastore/.kokoro/build.sh"
diff --git a/.kokoro/continuous/java8-win.cfg b/.kokoro/continuous/java8-win.cfg
deleted file mode 100644
index 85494f810009..000000000000
--- a/.kokoro/continuous/java8-win.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "java-datastore/.kokoro/build.bat"
diff --git a/.kokoro/continuous/lint.cfg b/.kokoro/continuous/lint.cfg
deleted file mode 100644
index 6d323c8ae768..000000000000
--- a/.kokoro/continuous/lint.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "lint"
-}
\ No newline at end of file
diff --git a/.kokoro/continuous/propose_release.cfg b/.kokoro/continuous/propose_release.cfg
deleted file mode 100644
index 8ca7ae7f718a..000000000000
--- a/.kokoro/continuous/propose_release.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-  }
-}
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# Use the trampoline script to run in docker.
-build_file: "java-datastore/.kokoro/trampoline.sh"
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/continuous/propose_release.sh"
-}
-
-# tokens used by release-please to keep an up-to-date release PR.
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "github-magic-proxy-key-release-please"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "github-magic-proxy-token-release-please"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "github-magic-proxy-url-release-please"
-    }
-  }
-}
diff --git a/.kokoro/continuous/samples.cfg b/.kokoro/continuous/samples.cfg
deleted file mode 100644
index fa7b493d0b5c..000000000000
--- a/.kokoro/continuous/samples.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "samples"
-}
-
-env_vars: {
-    key: "GCLOUD_PROJECT"
-    value: "gcloud-devel"
-}
-
-env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
-}
diff --git a/.kokoro/nightly/dependencies.cfg b/.kokoro/nightly/dependencies.cfg
deleted file mode 100644
index 8908efe02d46..000000000000
--- a/.kokoro/nightly/dependencies.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/dependencies.sh"
-}
diff --git a/.kokoro/nightly/lint.cfg b/.kokoro/nightly/lint.cfg
deleted file mode 100644
index 6d323c8ae768..000000000000
--- a/.kokoro/nightly/lint.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "lint"
-}
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index 63396cfc950d..f784adce1226 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "bc55730c92df8d8b6a692c1782834a3dd024c7e2"
+        "sha": "7214e0ae224633e2effc023d10494e0164a8f9dc"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "dd230c816f88d0141fcd0be83498986287220d1b"
+        "sha": "4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4"
       }
     }
   ],
@@ -49,27 +49,16 @@
     ".kokoro/common.cfg",
     ".kokoro/common.sh",
     ".kokoro/continuous/common.cfg",
-    ".kokoro/continuous/dependencies.cfg",
-    ".kokoro/continuous/integration.cfg",
-    ".kokoro/continuous/java11.cfg",
-    ".kokoro/continuous/java7.cfg",
-    ".kokoro/continuous/java8-osx.cfg",
-    ".kokoro/continuous/java8-win.cfg",
     ".kokoro/continuous/java8.cfg",
-    ".kokoro/continuous/lint.cfg",
-    ".kokoro/continuous/propose_release.cfg",
-    ".kokoro/continuous/samples.cfg",
     ".kokoro/dependencies.sh",
     ".kokoro/linkage-monitor.sh",
     ".kokoro/nightly/common.cfg",
-    ".kokoro/nightly/dependencies.cfg",
     ".kokoro/nightly/integration.cfg",
     ".kokoro/nightly/java11.cfg",
     ".kokoro/nightly/java7.cfg",
     ".kokoro/nightly/java8-osx.cfg",
     ".kokoro/nightly/java8-win.cfg",
     ".kokoro/nightly/java8.cfg",
-    ".kokoro/nightly/lint.cfg",
     ".kokoro/nightly/samples.cfg",
     ".kokoro/populate-secrets.sh",
     ".kokoro/presubmit/clirr.cfg",

From 60a080c07c73562962c24684b5f5314e5888c2d5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 7 Aug 2020 10:42:10 -0700
Subject: [PATCH 0398/1784] build: update dependencies check to only check for
 runtime and compile scopes (#198)

* change:Updated dependencies check to only use runtime & compile scope

* Update dependencies.sh

* feat: update dependencies check to only check for runtime and compile
scopes

Co-authored-by: Saleh Mostafa 
Co-authored-by: Jeffrey Rennie 

Source-Author: salehsquared 
Source-Date: Thu Aug 6 13:01:02 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: f8823dec98277a9516f2fb6fae9f58b3a59a23e1
Source-Link: https://github.com/googleapis/synthtool/commit/f8823dec98277a9516f2fb6fae9f58b3a59a23e1
---
 .kokoro/dependencies.sh | 9 +++++----
 synth.metadata          | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index cee4f11e7547..c91e5a56937a 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -43,12 +43,13 @@ function completenessCheck() {
   # Output dep list with compile scope generated using the original pom
   # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
   # This is stripped from the output as it is not present in the flattened pom.
+  # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
+  mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
 
-  # Output dep list generated using the flattened pom (test scope deps are ommitted)
+  # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
   msg "Generating dependency list using flattened pom..."
-  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
+  mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
 
   # Compare two dependency lists
   msg "Comparing dependency lists..."
@@ -85,4 +86,4 @@ then
 else
   msg "Errors found. See log statements above."
   exit 1
-fi
+fi
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index f784adce1226..a579e9258038 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "7214e0ae224633e2effc023d10494e0164a8f9dc"
+        "sha": "21c4f6c95dc8281c26f0d410e3fe52c0600bd2c2"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4"
+        "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"
       }
     }
   ],

From 6a959d3f7ca75ba5da1d1c4cb509593d3be39e98 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 7 Aug 2020 23:34:17 +0200
Subject: [PATCH 0399/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.8.6 (#199)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | patch | `0.8.4` -> `0.8.6` |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.8.6`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​086-httpswwwgithubcomgoogleapisjava-shared-dependenciescomparev085v086-2020-08-07)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.8.5...v0.8.6)

### [`v0.8.5`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​085-httpswwwgithubcomgoogleapisjava-shared-dependenciescomparev084v085-2020-08-07)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.8.4...v0.8.5)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 434a878742db..919f370c4512 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.8.4
+        0.8.6
         pom
         import
       

From 9425972905d1e370192eeb3bbfe837f5a7fb25cf Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Wed, 12 Aug 2020 16:38:03 +0000
Subject: [PATCH 0400/1784] docs: libraries-bom 8.1.0 (#200)

@chingor13
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 213eb9f9bf09..75af413892fb 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with a BOM, add this to your pom.xml file.
   
     com.google.cloud
     libraries-bom
-    3.0.0
+    8.1.0
     pom
     import
    

From 55dd1083f3a5ace6a39f1376563d3c43f8fbd4ce Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 14 Aug 2020 04:26:16 +0200
Subject: [PATCH 0401/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v9 (#201)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | major | `8.1.0` -> `9.0.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b3b37ed3b1e6..ffd8d8903b65 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        8.1.0
+        9.0.0
         pom
         import
       

From 44095b3c76f0913e0c39af5723eedbc6d18b60e8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 18 Aug 2020 00:04:13 +0200
Subject: [PATCH 0402/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v9.1.0

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index ffd8d8903b65..1995442a292f 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        9.0.0
+        9.1.0
         pom
         import
       

From d188c4cc65fc726532f99943beaff744e38f7fc6 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 18 Aug 2020 09:57:31 -0700
Subject: [PATCH 0403/1784] chore(java_templates): add lint/static analysis
 presubmit checks for samples (#203)

* chore(java_templates): add lint/static analysis presubmit checks for samples

* chore: fix trailing whitespace

Source-Author: Jeff Ching 
Source-Date: Mon Aug 17 14:29:16 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: c3caf0704f25a0c365f1c315e804a30b87c62a75
Source-Link: https://github.com/googleapis/synthtool/commit/c3caf0704f25a0c365f1c315e804a30b87c62a75
---
 .github/workflows/samples.yaml | 24 ++++++++++++++++++++++++
 synth.metadata                 |  5 +++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/samples.yaml

diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
new file mode 100644
index 000000000000..34bf860f6912
--- /dev/null
+++ b/.github/workflows/samples.yaml
@@ -0,0 +1,24 @@
+on:
+  pull_request:
+name: samples
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Run checkstyle
+        run: mvn -P lint --quiet --batch-mode checkstyle:check
+        working-directory: samples/snippets
+  static:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Run PMD & Spotbugs
+        run: mvn -P lint --quiet --batch-mode compile pmd:cpd-check spotbugs:check
+        working-directory: samples/snippets
diff --git a/synth.metadata b/synth.metadata
index a579e9258038..5e015cdb0948 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "21c4f6c95dc8281c26f0d410e3fe52c0600bd2c2"
+        "sha": "44095b3c76f0913e0c39af5723eedbc6d18b60e8"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"
+        "sha": "c3caf0704f25a0c365f1c315e804a30b87c62a75"
       }
     }
   ],
@@ -43,6 +43,7 @@
     ".github/release-please.yml",
     ".github/trusted-contribution.yml",
     ".github/workflows/ci.yaml",
+    ".github/workflows/samples.yaml",
     ".kokoro/build.bat",
     ".kokoro/build.sh",
     ".kokoro/coerce_logs.sh",

From 254988134ad240aac3bab3e48ee2e3c69e4dd54b Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 21 Aug 2020 09:22:44 -0700
Subject: [PATCH 0404/1784] chore(java_templates): stop running pmd/spotbugs
 checks for samples (#206)

This was creating too much noise. We will revisit with other options and/or tune these checks.

Source-Author: Jeff Ching 
Source-Date: Wed Aug 19 12:26:49 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 9602086c6c5b05db77950c7f7495a2a3868f3537
Source-Link: https://github.com/googleapis/synthtool/commit/9602086c6c5b05db77950c7f7495a2a3868f3537
---
 .github/workflows/samples.yaml | 10 ----------
 synth.metadata                 |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index 34bf860f6912..a1d50073069d 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -12,13 +12,3 @@ jobs:
       - name: Run checkstyle
         run: mvn -P lint --quiet --batch-mode checkstyle:check
         working-directory: samples/snippets
-  static:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - name: Run PMD & Spotbugs
-        run: mvn -P lint --quiet --batch-mode compile pmd:cpd-check spotbugs:check
-        working-directory: samples/snippets
diff --git a/synth.metadata b/synth.metadata
index 5e015cdb0948..ad64070217a4 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "44095b3c76f0913e0c39af5723eedbc6d18b60e8"
+        "sha": "d188c4cc65fc726532f99943beaff744e38f7fc6"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c3caf0704f25a0c365f1c315e804a30b87c62a75"
+        "sha": "9602086c6c5b05db77950c7f7495a2a3868f3537"
       }
     }
   ],

From d6eca596440371e31031d36d600466b8e13e8109 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 26 Aug 2020 09:31:49 -0700
Subject: [PATCH 0405/1784] build: temporarily disable reporting to unblock
 releases

Source-Author: Stephanie Wang 
Source-Date: Tue Aug 25 13:05:26 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 968465a1cad496e1292ef4584a054a35f756ff94
Source-Link: https://github.com/googleapis/synthtool/commit/968465a1cad496e1292ef4584a054a35f756ff94
---
 .kokoro/release/stage.sh | 5 +++--
 synth.metadata           | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 3c482cbc55f1..d19191fc896c 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -16,8 +16,9 @@
 set -eo pipefail
 
 # Start the releasetool reporter
-python3 -m pip install gcp-releasetool
-python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
+# Disable reporting due to issue observed with Kokoro blocking releases
+# python3 -m pip install gcp-releasetool
+# python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
 
 source $(dirname "$0")/common.sh
 MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
diff --git a/synth.metadata b/synth.metadata
index ad64070217a4..bd32f2d1f89a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "d188c4cc65fc726532f99943beaff744e38f7fc6"
+        "sha": "254988134ad240aac3bab3e48ee2e3c69e4dd54b"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "9602086c6c5b05db77950c7f7495a2a3868f3537"
+        "sha": "968465a1cad496e1292ef4584a054a35f756ff94"
       }
     }
   ],

From 2cacc10e6678f9f041bf4cc8b5ffc6d8db03d28b Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 27 Aug 2020 09:27:05 -0700
Subject: [PATCH 0406/1784] build(java): switch to release-publish app for
 notifying GitHub of release status

Source-Author: Jeff Ching 
Source-Date: Wed Aug 26 21:48:06 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 019c7168faa0e56619f792693a8acdb30d6de19b
Source-Link: https://github.com/googleapis/synthtool/commit/019c7168faa0e56619f792693a8acdb30d6de19b
---
 .kokoro/release/stage.cfg | 31 +++----------------------------
 .kokoro/release/stage.sh  |  5 ++---
 synth.metadata            |  4 ++--
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg
index c6ff500b2524..159e4cfdfaec 100644
--- a/.kokoro/release/stage.cfg
+++ b/.kokoro/release/stage.cfg
@@ -13,32 +13,7 @@ action {
   }
 }
 
-# Fetch the token needed for reporting release status to GitHub
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "yoshi-automation-github-key"
-    }
-  }
-}
-
-# Fetch magictoken to use with Magic Github Proxy
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "releasetool-magictoken"
-    }
-  }
-}
-
-# Fetch api key to use with Magic Github Proxy
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "magic-github-proxy-api-key"
-    }
-  }
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
 }
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index d19191fc896c..3c482cbc55f1 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -16,9 +16,8 @@
 set -eo pipefail
 
 # Start the releasetool reporter
-# Disable reporting due to issue observed with Kokoro blocking releases
-# python3 -m pip install gcp-releasetool
-# python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
+python3 -m pip install gcp-releasetool
+python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
 
 source $(dirname "$0")/common.sh
 MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
diff --git a/synth.metadata b/synth.metadata
index bd32f2d1f89a..70f2f18e5542 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "254988134ad240aac3bab3e48ee2e3c69e4dd54b"
+        "sha": "d6eca596440371e31031d36d600466b8e13e8109"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "968465a1cad496e1292ef4584a054a35f756ff94"
+        "sha": "019c7168faa0e56619f792693a8acdb30d6de19b"
       }
     }
   ],

From 023229a15edbbe773bd03410ed0784aba248ad6e Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 28 Aug 2020 01:18:22 +0530
Subject: [PATCH 0407/1784] fix: query result start with startCursor if
 specified (#207)

---
 .../cloud/datastore/QueryResultsImpl.java     |  5 +----
 .../cloud/datastore/ITDatastoreTest.java      | 21 ++++++++++++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   | 22 +++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)

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 3c8bba10a089..9ed822985002 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
@@ -71,10 +71,7 @@ private void sendRequest() {
     requestPb.setPartitionId(partitionIdPb);
     query.populatePb(requestPb);
     runQueryResponsePb = datastore.runQuery(requestPb.build());
-    mostRecentQueryPb = runQueryResponsePb.getQuery();
-    if (mostRecentQueryPb == null) {
-      mostRecentQueryPb = requestPb.getQuery();
-    }
+    mostRecentQueryPb = requestPb.getQuery();
     moreResults = runQueryResponsePb.getBatch().getMoreResults();
     lastBatch = moreResults != MoreResultsType.NOT_FINISHED;
     entityResultPbIter = runQueryResponsePb.getBatch().getEntityResultsList().iterator();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
index 442a6eb72b75..5a3bc7e00431 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
@@ -1242,4 +1242,25 @@ public void testGqlQueryWithNullBinding() {
     }
     assertEquals(1, count);
   }
+
+  @Test
+  public void testQueryWithStartCursor() {
+    Entity entity1 =
+        Entity.newBuilder(Key.newBuilder(PROJECT_ID, KIND1, "name-01").build()).build();
+    Entity entity2 =
+        Entity.newBuilder(Key.newBuilder(PROJECT_ID, KIND1, "name-02").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());
+    run1.next();
+    Cursor cursor1 = run1.getCursorAfter();
+    assertNotNull(cursor1);
+    QueryResults run2 =
+        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());
+  }
 }
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 7e7fec35f61f..3db8cfe3e8e9 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
@@ -28,6 +28,7 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.datastore.Batch;
 import com.google.cloud.datastore.BooleanValue;
+import com.google.cloud.datastore.Cursor;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreException;
 import com.google.cloud.datastore.DatastoreOptions;
@@ -898,4 +899,25 @@ public void testGqlQueryWithNullBinding() {
     assertEquals(ENTITY1, results.next());
     assertFalse(results.hasNext());
   }
+
+  @Test
+  public void testQueryWithStartCursor() {
+    Entity entity1 =
+        Entity.newBuilder(Key.newBuilder(PROJECT_ID, KIND1, "name-01").build()).build();
+    Entity entity2 =
+        Entity.newBuilder(Key.newBuilder(PROJECT_ID, KIND1, "name-02").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());
+    run1.next();
+    Cursor cursor1 = run1.getCursorAfter();
+    assertNotNull(cursor1);
+    QueryResults run2 =
+        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());
+  }
 }

From 9407c4afec3de6e18c96c24872269e61c8ad40fb Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 28 Aug 2020 22:34:40 +0530
Subject: [PATCH 0408/1784] docs: update libraries-bom (#211)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 75af413892fb..970d85923156 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with a BOM, add this to your pom.xml file.
   
     com.google.cloud
     libraries-bom
-    8.1.0
+    9.1.0
     pom
     import
    

From 3c75a58b860fb0a946167861a535433e3a1b1092 Mon Sep 17 00:00:00 2001
From: BenWhitehead 
Date: Tue, 1 Sep 2020 17:34:33 -0400
Subject: [PATCH 0409/1784] chore(build): update synth config to generate
 README.md (#213)

---
 .readme-partials.yaml | 122 ++++++++++++++++++++++++
 .repo-metadata.json   |   3 +-
 README.md             | 215 +++++++++++++++++++++++++-----------------
 synth.py              |   5 +-
 4 files changed, 257 insertions(+), 88 deletions(-)
 create mode 100644 .readme-partials.yaml

diff --git a/.readme-partials.yaml b/.readme-partials.yaml
new file mode 100644
index 000000000000..0796b52e551d
--- /dev/null
+++ b/.readme-partials.yaml
@@ -0,0 +1,122 @@
+custom_content: |
+  See the [Google Cloud Datastore docs][cloud-datastore-activation] for more details on how to activate
+  Cloud Datastore for your project.
+
+  See the [Datastore client library docs][datastore-client-lib-docs] to learn how to interact
+  with the Cloud Datastore using this Client Library.
+
+  #### Creating an authorized service object
+  To make authenticated requests to Google Cloud Datastore, you must create a service object with credentials. You can then make API calls by calling methods on the Datastore service object. The simplest way to authenticate is to use [Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials). These credentials are automatically inferred from your environment, so you only need the following code to create your service object:
+
+  ```java
+  import com.google.cloud.datastore.Datastore;
+  import com.google.cloud.datastore.DatastoreOptions;
+
+  Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+  ```
+
+  For other authentication options, see the [Authentication](https://github.com/googleapis/google-cloud-java#authentication) page.
+
+  #### Storing data
+  Objects in Datastore are known as entities. Entities are grouped by "kind" and have keys for easy access. In this code snippet, we will create a new entity representing a person and store that data by the person's email.  First, add the following imports at the top of your file:
+
+  ```java
+  import com.google.cloud.datastore.Entity;
+  import com.google.cloud.datastore.Key;
+  import com.google.cloud.datastore.KeyFactory;
+  ```
+
+  Then add the following code to put an entity in Datastore.
+
+  ```java
+  KeyFactory keyFactory = datastore.newKeyFactory().setKind("Person");
+  Key key = keyFactory.newKey("john.doe@gmail.com");
+  Entity entity = Entity.newBuilder(key)
+      .set("name", "John Doe")
+      .set("age", 51)
+      .set("favorite_food", "pizza")
+      .build();
+  datastore.put(entity);
+  ```
+
+  Later, if you want to get this entity back, add the following to your code:
+
+  ```java
+  Entity johnEntity = datastore.get(key);
+  ```
+
+  #### Running a query
+  In addition to retrieving entities by their keys, you can perform queries to retrieve entities by
+  the values of their properties. A typical query includes an entity kind, filters to select entities
+  with matching values, and sort orders to sequence the results. `google-cloud-datastore` supports two
+  types of queries: `StructuredQuery` (that allows you to construct query elements) and `GqlQuery`
+  (which operates using [GQL syntax](https://cloud.google.com/datastore/docs/apis/gql/gql_reference))
+  in string format. In this tutorial, we will use a simple `StructuredQuery`.
+
+  Suppose that you've added more people to Datastore, and now you want to find all people whose favorite food is pizza. Import the following:
+
+  ```java
+  import com.google.cloud.datastore.Query;
+  import com.google.cloud.datastore.QueryResults;
+  import com.google.cloud.datastore.StructuredQuery;
+  import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+  ```
+
+  Then add the following code to your program:
+
+  ```java
+  Query query = Query.newEntityQueryBuilder()
+      .setKind("Person")
+      .setFilter(PropertyFilter.eq("favorite_food", "pizza"))
+      .build();
+  QueryResults results = datastore.run(query);
+  while (results.hasNext()) {
+    Entity currentEntity = results.next();
+    System.out.println(currentEntity.getString("name") + ", you're invited to a pizza party!");
+  }
+  ```
+
+  Cloud Datastore relies on indexing to run queries. Indexing is turned on by default for most types of properties. To read more about indexing, see the [Cloud Datastore Index Configuration documentation](https://cloud.google.com/datastore/docs/tools/indexconfig).
+
+  #### Updating data
+  Another thing you'll probably want to do is update your data. The following snippet shows how to update a Datastore entity if it exists.
+
+  ``` java
+  KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
+  Key key = keyFactory.newKey("keyName");
+  Entity entity = datastore.get(key);
+  if (entity != null) {
+    System.out.println("Updating access_time for " + entity.getString("name"));
+    entity = Entity.newBuilder(entity)
+        .set("access_time", DateTime.now())
+        .build();
+    datastore.update(entity);
+  }
+  ```
+
+  The complete source code can be found at
+  [UpdateEntity.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
+
+  #### Complete source code
+
+  In
+  [AddEntitiesAndRunQuery.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
+  we put together all the code to store data and run queries into one program. The program assumes that you are
+  running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
+  the code from the main method to your application's servlet class and change the print statements to
+  display on your webpage.
+
+  Testing
+  -------
+
+  This library has tools to help write tests for code that uses the Datastore.
+
+  See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
+
+  Example Applications
+  --------------------
+  - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
+    - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
+  - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
+  - [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks.
+    - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/sparkjava#how-does-it-work).
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 1f65ef5c9680..188b904e2190 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -10,5 +10,6 @@
   "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
   "codeowner_team": "@googleapis/firestore-dpe",
-  "api_id": "datastore.googleapis.com"
+  "api_id": "datastore.googleapis.com",
+  "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries."
 }
diff --git a/README.md b/README.md
index 970d85923156..bbb3477f5a8b 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,50 @@
-Google Cloud Java Client for Datastore
-======================================
+# Google Cloud Datastore Client for Java
 
-Java idiomatic client for [Google Cloud Datastore][cloud-datastore].
+Java idiomatic client for [Cloud Datastore][product-docs].
 
-[![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/master.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/master.html)
-[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg)]( https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg)
-[![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java)
+[![Maven][maven-version-image]][maven-version-link]
+![Stability][stability-image]
 
-- [Product Documentation][datastore-product-docs]
-- [Client Library Documentation][datastore-client-lib-docs]
+- [Product Documentation][product-docs]
+- [Client Library Documentation][javadocs]
 
-Quickstart
-----------
-If you are using Maven with a BOM, add this to your pom.xml file.
+## Quickstart
+
+If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
 ```xml
 
- 
+  
+    
+      com.google.cloud
+      libraries-bom
+      9.1.0
+      pom
+      import
+    
+  
+
+
+
   
     com.google.cloud
-    libraries-bom
-    9.1.0
-    pom
-    import
-   
- 
-
+    google-cloud-datastore
+  
 
-
-  com.google.cloud
-  google-cloud-datastore
-
 ```
-[//]: # ({x-version-update-start:google-cloud-datastore:released})
-If you are using Maven without a BOM, add this to your dependencies.
+
+If you are using Maven without BOM, add this to your dependencies:
+
 ```xml
 
   com.google.cloud
   google-cloud-datastore
   1.104.0
 
+
 ```
+
+[//]: # ({x-version-update-start:google-cloud-datastore:released})
+
 If you are using Gradle, add this to your dependencies
 ```Groovy
 compile 'com.google.cloud:google-cloud-datastore:1.104.0'
@@ -50,46 +55,44 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.104.0"
 ```
 [//]: # ({x-version-update-end})
 
-Example Applications
---------------------
-- [`DatastoreExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore.
-- [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
-  - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
-- [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
-- [`GuestBook`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/appengine/guestbook-cloud-datastore) - An App Engine Standard guestbook that uses Cloud Datastore.
-- [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks.
-  - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/sparkjava#how-does-it-work).
-- [`TaskList`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/datastore/src/main/java/com/google/datastore/snippets/TaskList.java) - A command line application that uses Cloud Datastore to manage a to-do list.
-  - Read about how to run the application on its [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/datastore).
+## Authentication
 
-Authentication
---------------
+See the [Authentication][authentication] section in the base directory's README.
 
-See the [Authentication](https://github.com/googleapis/google-cloud-java#authentication) section in the base directory's README.
+## Getting Started
 
-About Google Cloud Datastore
-----------------------------
+### Prerequisites
 
-Google [Cloud Datastore][cloud-datastore] is a fully managed, schemaless database for
+You will need a [Google Cloud Platform Console][developer-console] project with the Cloud Datastore [API enabled][enable-api].
+
+[Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by
+[installing the Google Cloud SDK][cloud-sdk] and running the following commands in command line:
+`gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
+
+### Installation and setup
+
+You'll need to obtain the `google-cloud-datastore` library.  See the [Quickstart](#quickstart) section
+to add `google-cloud-datastore` as a dependency in your code.
+
+## About Cloud Datastore
+
+
+[Cloud Datastore][product-docs] is a fully managed, schemaless database for
 storing non-relational data. Cloud Datastore automatically scales with
 your users and supports ACID transactions, high availability of reads and
 writes, strong consistency for reads and ancestor queries, and eventual
 consistency for all other queries.
 
+See the [Cloud Datastore client library docs][javadocs] to learn how to
+use this Cloud Datastore Client Library.
+
+
 See the [Google Cloud Datastore docs][cloud-datastore-activation] for more details on how to activate
 Cloud Datastore for your project.
 
 See the [Datastore client library docs][datastore-client-lib-docs] to learn how to interact
 with the Cloud Datastore using this Client Library.
 
-Getting Started
----------------
-#### Prerequisites
-For this tutorial, you will need a [Google Developers Console](https://console.developers.google.com/) project with the Datastore API enabled. [Follow these instructions](https://cloud.google.com/resource-manager/docs/creating-managing-projects) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
-
-#### Installation and setup
-You'll need to obtain the `google-cloud-datastore` library.  See the [Quickstart](#quickstart) section to add `google-cloud-datastore` as a dependency in your code.
-
 #### Creating an authorized service object
 To make authenticated requests to Google Cloud Datastore, you must create a service object with credentials. You can then make API calls by calling methods on the Datastore service object. The simplest way to authenticate is to use [Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials). These credentials are automatically inferred from your environment, so you only need the following code to create your service object:
 
@@ -191,55 +194,99 @@ running on Compute Engine or from your own desktop. To run the example on App En
 the code from the main method to your application's servlet class and change the print statements to
 display on your webpage.
 
-Troubleshooting
----------------
+Testing
+-------
 
-To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
+This library has tools to help write tests for code that uses the Datastore.
 
-Transport
----------
-Datastore uses HTTP for the transport layer.
+See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
 
-Java Versions
--------------
+Example Applications
+--------------------
+- [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
+  - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
+- [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
+- [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks.
+  - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/sparkjava#how-does-it-work).
 
-Java 7 or above is required for using this client.
 
-Testing
--------
 
-This library has tools to help write tests for code that uses the Datastore.
 
-See [TESTING] to read more about testing.
+## Samples
 
-Versioning
-----------
+Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tree/master/samples) directory. The samples' `README.md`
+has instructions for running the samples.
 
-This library follows [Semantic Versioning](http://semver.org/).
+| Sample                      | Source Code                       | Try it |
+| --------------------------- | --------------------------------- | ------ |
+| Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/master/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
+| Task List | [source code](https://github.com/googleapis/java-datastore/blob/master/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
-It is currently in major version one (``1.y.z``), which means that the public API should be considered stable.
 
-Contributing
-------------
 
-Contributions to this library are always welcome and highly encouraged.
+## Troubleshooting
 
-See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/googleapis/google-cloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
+To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting].
 
-Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
+## Java Versions
 
-License
--------
+Java 7 or above is required for using this client.
 
-Apache 2.0 - See [LICENSE] for more information.
+## Versioning
 
 
-[CONTRIBUTING]:https://github.com/googleapis/google-cloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/googleapis/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[LICENSE]: https://github.com/googleapis/google-cloud-java/blob/master/LICENSE
-[TESTING]: https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore
-[cloud-platform]: https://cloud.google.com/
-[cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate
-[cloud-datastore]: https://cloud.google.com/datastore/
-[datastore-product-docs]: https://cloud.google.com/datastore/docs/
-[datastore-client-lib-docs]: https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/datastore/package-summary.html
+This library follows [Semantic Versioning](http://semver.org/).
+
+
+## Contributing
+
+
+Contributions to this library are always welcome and highly encouraged.
+
+See [CONTRIBUTING][contributing] for more information how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in
+this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more
+information.
+
+## License
+
+Apache 2.0 - See [LICENSE][license] for more information.
+
+## CI Status
+
+Java Version | Status
+------------ | ------
+Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]
+Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
+Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
+Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
+Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
+
+[product-docs]: https://cloud.google.com/datastore
+[javadocs]: https://googleapis.dev/java/google-cloud-datastore/latest/index.html
+[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.svg
+[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.html
+[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.svg
+[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.html
+[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-osx.svg
+[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-osx.html
+[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.svg
+[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.html
+[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.svg
+[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
+[stability-image]: https://img.shields.io/badge/stability-ga-green
+[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
+[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-datastore&core=gav
+[authentication]: https://github.com/googleapis/google-cloud-java#authentication
+[developer-console]: https://console.developers.google.com/
+[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
+[cloud-sdk]: https://cloud.google.com/sdk/
+[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting
+[contributing]: https://github.com/googleapis/java-datastore/blob/master/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-datastore/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/java-datastore/blob/master/LICENSE
+
+[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com
+[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
+[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png
diff --git a/synth.py b/synth.py
index d04690762ea1..7220e8879d50 100644
--- a/synth.py
+++ b/synth.py
@@ -66,6 +66,5 @@
   java.format_code('google-cloud-datastore/src')
   java.format_code(f'proto-google-cloud-{service}-{version}/src')
 
-java.common_templates(excludes=[
-    'README.md',
-])
+java.common_templates()
+

From a8f91a263c3798beb9b956bc801c16aebb6fafcb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 17 Sep 2020 15:49:30 -0400
Subject: [PATCH 0410/1784] chore: release 1.105.0 (#175)

* chore: updated CHANGELOG.md [ci skip]

* chore: updated README.md [ci skip]

* chore: updated versions.txt [ci skip]

* chore: updated samples/pom.xml [ci skip]

* chore: updated proto-google-cloud-datastore-v1/pom.xml [ci skip]

* chore: updated google-cloud-datastore/pom.xml [ci skip]

* chore: updated samples/install-without-bom/pom.xml [ci skip]

* chore: updated samples/snapshot/pom.xml [ci skip]

* chore: updated google-cloud-datastore-bom/pom.xml [ci skip]

* chore: updated pom.xml [ci skip]

* chore: updated samples/snippets/pom.xml

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                            | 28 +++++++++++++++++++++++++
 README.md                               |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 +++----
 7 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 925c17a3be5f..6e0c6283bde8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## [1.105.0](https://www.github.com/googleapis/java-datastore/compare/v1.104.0...v1.105.0) (2020-09-01)
+
+
+### Features
+
+* **deps:** adopt flatten plugin and google-cloud-shared-dependencies ([#174](https://www.github.com/googleapis/java-datastore/issues/174)) ([8618c18](https://www.github.com/googleapis/java-datastore/commit/8618c1848e71424fa164fee9d8b7b53641b6b823))
+
+
+### Bug Fixes
+
+* query result start with startCursor if specified ([#207](https://www.github.com/googleapis/java-datastore/issues/207)) ([023229a](https://www.github.com/googleapis/java-datastore/commit/023229a15edbbe773bd03410ed0784aba248ad6e))
+
+
+### Dependencies
+
+* remove direct declaration of google-auth-library-oauth2-http ([#184](https://www.github.com/googleapis/java-datastore/issues/184)) ([4fa4df4](https://www.github.com/googleapis/java-datastore/commit/4fa4df40d63d7fbce023d6231830dcc296c29dd1))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.2 ([#187](https://www.github.com/googleapis/java-datastore/issues/187)) ([941bea0](https://www.github.com/googleapis/java-datastore/commit/941bea016f1ce4e1c1fd027b1671f950e9c52160))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.3 ([#191](https://www.github.com/googleapis/java-datastore/issues/191)) ([a89eb08](https://www.github.com/googleapis/java-datastore/commit/a89eb08be1cd9689d38b8b67c472cc928e3549c1))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.4 ([#196](https://www.github.com/googleapis/java-datastore/issues/196)) ([7214e0a](https://www.github.com/googleapis/java-datastore/commit/7214e0ae224633e2effc023d10494e0164a8f9dc))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.6 ([#199](https://www.github.com/googleapis/java-datastore/issues/199)) ([6a959d3](https://www.github.com/googleapis/java-datastore/commit/6a959d3f7ca75ba5da1d1c4cb509593d3be39e98))
+* update dependency com.google.oauth-client:google-oauth-client to v1.31.0 ([#186](https://www.github.com/googleapis/java-datastore/issues/186)) ([16bfb9a](https://www.github.com/googleapis/java-datastore/commit/16bfb9a0127f4969a796ad95cc11cf2b8b92d0f3))
+
+
+### Documentation
+
+* libraries-bom 8.1.0 ([#200](https://www.github.com/googleapis/java-datastore/issues/200)) ([9425972](https://www.github.com/googleapis/java-datastore/commit/9425972905d1e370192eeb3bbfe837f5a7fb25cf))
+* update libraries-bom ([#211](https://www.github.com/googleapis/java-datastore/issues/211)) ([9407c4a](https://www.github.com/googleapis/java-datastore/commit/9407c4afec3de6e18c96c24872269e61c8ad40fb))
+
 ## [1.104.0](https://www.github.com/googleapis/java-datastore/compare/v1.103.0...v1.104.0) (2020-06-17)
 
 
diff --git a/README.md b/README.md
index bbb3477f5a8b..3ad8286e4979 100644
--- a/README.md
+++ b/README.md
@@ -47,11 +47,11 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.104.0'
+compile 'com.google.cloud:google-cloud-datastore:1.105.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.104.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 19cf07b9bb22..cd830c0a67cc 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
-  1.104.1-SNAPSHOT
+  1.105.0
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.87.1-SNAPSHOT
+        0.88.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.104.1-SNAPSHOT
+        1.105.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4d4c3a9a3785..724ad4a00b43 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.104.1-SNAPSHOT
+  1.105.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.104.1-SNAPSHOT
+    1.105.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 919f370c4512..c06a6c2f23cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.104.1-SNAPSHOT
+  1.105.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.87.1-SNAPSHOT
+        0.88.0
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8e7e8d517ab6..d5d7dcd2fc8d 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.87.1-SNAPSHOT
+  0.88.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.104.1-SNAPSHOT
+    1.105.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 3e94f3954011..96e4e4ae4ff5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.104.0:1.104.1-SNAPSHOT
-google-cloud-datastore-bom:1.104.0:1.104.1-SNAPSHOT
-google-cloud-datastore-parent:1.104.0:1.104.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.87.0:0.87.1-SNAPSHOT
+google-cloud-datastore:1.105.0:1.105.0
+google-cloud-datastore-bom:1.105.0:1.105.0
+google-cloud-datastore-parent:1.105.0:1.105.0
+proto-google-cloud-datastore-v1:0.88.0:0.88.0
 

From ed5ef1da2fc66c55356904b11300ef25c01b00f4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 18 Sep 2020 19:08:04 +0000
Subject: [PATCH 0411/1784] chore: release 1.105.1-SNAPSHOT (#215)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index cd830c0a67cc..4d3ff3c9d1a0 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
-  1.105.0
+  1.105.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.0
+        0.88.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.0
+        1.105.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 724ad4a00b43..0762435b6476 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.0
+  1.105.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.0
+    1.105.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index c06a6c2f23cf..6e11ce5599c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.0
+  1.105.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.0
+        0.88.1-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d5d7dcd2fc8d..ed4a93692659 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.88.0
+  0.88.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.0
+    1.105.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 96e4e4ae4ff5..690baaa8d096 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.0:1.105.0
-google-cloud-datastore-bom:1.105.0:1.105.0
-google-cloud-datastore-parent:1.105.0:1.105.0
-proto-google-cloud-datastore-v1:0.88.0:0.88.0
+google-cloud-datastore:1.105.0:1.105.1-SNAPSHOT
+google-cloud-datastore-bom:1.105.0:1.105.1-SNAPSHOT
+google-cloud-datastore-parent:1.105.0:1.105.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.0:0.88.1-SNAPSHOT
 

From 4f016e03d88e2d488e09418acc5ca4ec817341bf Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 18 Sep 2020 12:08:42 -0700
Subject: [PATCH 0412/1784] build(ci): enable auto-release for
 dependency-update-only releases (#214)

Automatically perform a Java client library release when:
1. Only dependency updates are going out in the release since any releases containing bug fixes, build changes or new features should be supervised;
2. There are no outstanding/open dependency update pull requests in the repo. This is to avoid multiple/redundant releases;
3. It is a SNAPSHOT release which is automatically generated post regular release -- this requires no human supervision.

Testing done in 5 java-bigquery* client library repos. Example:
[chore: release 0.3.4 ](https://github.com/googleapis/java-bigqueryconnection/pull/130)
[chore: release 0.3.5-SNAPSHOT](https://github.com/googleapis/java-bigqueryconnection/pull/131)

Source-Author: Stephanie Wang 
Source-Date: Thu Sep 17 15:30:02 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 538a68019eb4a36a0cdfa4021f324dd01b784395
Source-Link: https://github.com/googleapis/synthtool/commit/538a68019eb4a36a0cdfa4021f324dd01b784395
---
 .github/workflows/auto-release.yaml | 69 +++++++++++++++++++++++++++++
 synth.metadata                      |  6 ++-
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/auto-release.yaml

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
new file mode 100644
index 000000000000..d26427e468a4
--- /dev/null
+++ b/.github/workflows/auto-release.yaml
@@ -0,0 +1,69 @@
+on:
+  pull_request:
+name: auto-release
+jobs:
+  approve:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/github-script@v3.0.0
+      with:
+        github-token: ${{secrets.GITHUB_TOKEN}}
+        debug: true
+        script: |
+          // only approve PRs from release-please[bot]
+          if (context.payload.pull_request.user.login !== "release-please[bot]") {
+            return;
+          }
+
+          // only approve PRs like "chore: release "
+          if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+            return;
+          }
+
+          // trigger auto-release when
+          // 1) it is a SNAPSHOT release (auto-generated post regular release)
+          // 2) there are dependency updates only
+          // 3) there are no open dependency update PRs in this repo (to avoid multiple releases)
+          if (
+            context.payload.pull_request.body.includes("Fix") ||
+            context.payload.pull_request.body.includes("Build") ||
+            context.payload.pull_request.body.includes("Documentation") ||
+            context.payload.pull_request.body.includes("BREAKING CHANGES") ||
+            context.payload.pull_request.body.includes("Features")
+          ) {
+            console.log( "Not auto-releasing since it is not a dependency-update-only release." );
+            return;
+          }
+
+          const promise = github.pulls.list.endpoint({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            state: 'open'
+          });
+          const open_pulls = await github.paginate(promise)
+
+          if ( open_pulls.length > 1 && !context.payload.pull_request.title.includes("SNAPSHOT") ) {
+            for ( const pull of open_pulls ) {
+              if ( pull.title.startsWith("deps: update dependency") ) {
+                console.log( "Not auto-releasing yet since there are dependency update PRs open in this repo." );
+                return;
+              }
+            }
+          }
+
+          // approve release PR
+          await github.pulls.createReview({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: 'Rubber stamped release!',
+            pull_number: context.payload.pull_request.number,
+            event: 'APPROVE'
+          });
+
+          // attach kokoro:force-run and automerge labels
+          await github.issues.addLabels({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            issue_number: context.payload.pull_request.number,
+            labels: ['kokoro:force-run', 'automerge']
+          });
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index 70f2f18e5542..764bea661c22 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "d6eca596440371e31031d36d600466b8e13e8109"
+        "sha": "a8f91a263c3798beb9b956bc801c16aebb6fafcb"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "019c7168faa0e56619f792693a8acdb30d6de19b"
+        "sha": "538a68019eb4a36a0cdfa4021f324dd01b784395"
       }
     }
   ],
@@ -42,6 +42,7 @@
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/release-please.yml",
     ".github/trusted-contribution.yml",
+    ".github/workflows/auto-release.yaml",
     ".github/workflows/ci.yaml",
     ".github/workflows/samples.yaml",
     ".kokoro/build.bat",
@@ -91,6 +92,7 @@
     "CODE_OF_CONDUCT.md",
     "CONTRIBUTING.md",
     "LICENSE",
+    "README.md",
     "codecov.yaml",
     "java.header",
     "license-checks.xml",

From 89fb0e7fb67857176b5d3ded3f0a5e2aaf76880b Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 22 Sep 2020 09:19:14 -0700
Subject: [PATCH 0413/1784] chore(java): set yoshi-java as default CODEOWNER
 (#216)

Source-Author: Jeff Ching 
Source-Date: Mon Sep 21 09:00:06 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 80003a3de2d8a75f5b47cb2e77e018f7f0f776cc
Source-Link: https://github.com/googleapis/synthtool/commit/80003a3de2d8a75f5b47cb2e77e018f7f0f776cc
---
 .github/CODEOWNERS | 1 +
 synth.metadata     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 538bf5f097a3..3cb45a71056f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,6 +5,7 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
 # The @googleapis/firestore-dpe is the default owner for changes in this repo
+*                       @googleapis/yoshi-java @googleapis/firestore-dpe
 **/*.java               @googleapis/firestore-dpe
 
 # The java-samples-reviewers team is the default owner for samples changes
diff --git a/synth.metadata b/synth.metadata
index 764bea661c22..e948674a40a9 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a8f91a263c3798beb9b956bc801c16aebb6fafcb"
+        "sha": "4f016e03d88e2d488e09418acc5ca4ec817341bf"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "538a68019eb4a36a0cdfa4021f324dd01b784395"
+        "sha": "80003a3de2d8a75f5b47cb2e77e018f7f0f776cc"
       }
     }
   ],

From a8a4bb8b2c4c15ee6eea1a65044b3fa8e31b7510 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 24 Sep 2020 11:09:00 -0700
Subject: [PATCH 0414/1784] build(java): use yoshi-approver token for
 auto-approve (#218)

Source-Author: Jeff Ching 
Source-Date: Wed Sep 23 12:46:45 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 916c10e8581804df2b48a0f0457d848f3faa582e
Source-Link: https://github.com/googleapis/synthtool/commit/916c10e8581804df2b48a0f0457d848f3faa582e
---
 .github/workflows/auto-release.yaml | 4 ++--
 synth.metadata                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index d26427e468a4..c8494910553a 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -7,7 +7,7 @@ jobs:
     steps:
     - uses: actions/github-script@v3.0.0
       with:
-        github-token: ${{secrets.GITHUB_TOKEN}}
+        github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
         debug: true
         script: |
           // only approve PRs from release-please[bot]
@@ -66,4 +66,4 @@ jobs:
             repo: context.repo.repo,
             issue_number: context.payload.pull_request.number,
             labels: ['kokoro:force-run', 'automerge']
-          });
\ No newline at end of file
+          });
diff --git a/synth.metadata b/synth.metadata
index e948674a40a9..08bc77d72289 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "4f016e03d88e2d488e09418acc5ca4ec817341bf"
+        "sha": "89fb0e7fb67857176b5d3ded3f0a5e2aaf76880b"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "80003a3de2d8a75f5b47cb2e77e018f7f0f776cc"
+        "sha": "916c10e8581804df2b48a0f0457d848f3faa582e"
       }
     }
   ],

From 1f028b47f36430b00ae17cbb80eee324b875e237 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Thu, 24 Sep 2020 11:12:03 -0700
Subject: [PATCH 0415/1784] chore: add repo settings configuration (#217)

---
 .github/sync-repo-settings.yaml | 49 +++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 .github/sync-repo-settings.yaml

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
new file mode 100644
index 000000000000..6bddd18eac90
--- /dev/null
+++ b/.github/sync-repo-settings.yaml
@@ -0,0 +1,49 @@
+
+# Whether or not rebase-merging is enabled on this repository.
+# Defaults to `true`
+rebaseMergeAllowed: false
+
+# Whether or not squash-merging is enabled on this repository.
+# Defaults to `true`
+squashMergeAllowed: true
+
+# Whether or not PRs are merged with a merge commit on this repository.
+# Defaults to `false`
+mergeCommitAllowed: false
+
+# Rules for master branch protection
+branchProtectionRules:
+# Identifies the protection rule pattern. Name of the branch to be protected.
+# Defaults to `master`
+- pattern: master
+  # Can admins overwrite branch protection.
+  # Defaults to `true`
+  isAdminEnforced: true
+  # Number of approving reviews required to update matching branches.
+  # Defaults to `1`
+  requiredApprovingReviewCount: 1
+  # Are reviews from code owners required to update matching branches.
+  # Defaults to `false`
+  requiresCodeOwnerReviews: true
+  # Require up to date branches
+  requiresStrictStatusChecks: false
+  # List of required status check contexts that must pass for commits to be accepted to matching branches.
+  requiredStatusCheckContexts:
+    - "dependencies (8)"
+    - "dependencies (11)"
+    - "linkage-monitor"
+    - "lint"
+    - "clirr"
+    - "units (7)"
+    - "units (8)"
+    - "units (11)"
+    - "Kokoro - Test: Integration"
+    - "cla/google"
+# List of explicit permissions to add (additive only)
+permissionRules:
+- team: yoshi-admins
+  permission: admin
+- team: yoshi-java-admins
+  permission: admin
+- team: yoshi-java
+  permission: push
\ No newline at end of file

From 69c595452549c9a4401816c0a7c94ce6b38ee97d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 25 Sep 2020 13:47:29 -0700
Subject: [PATCH 0416/1784] chore(ci): skip autorelease workflow on non-release
 PRs and release PRs without content changes (#219)

* chore(ci): skip autorelease workflow on non-release PRs

Source-Author: Stephanie Wang 
Source-Date: Thu Sep 24 16:57:32 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 95dbe1bee3c7f7e52ddb24a54c37080620e0d1a2
Source-Link: https://github.com/googleapis/synthtool/commit/95dbe1bee3c7f7e52ddb24a54c37080620e0d1a2

* chore(ci): verify autorelease release PR content has changes

Source-Author: Stephanie Wang 
Source-Date: Thu Sep 24 18:06:14 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: da29da32b3a988457b49ae290112b74f14b713cc
Source-Link: https://github.com/googleapis/synthtool/commit/da29da32b3a988457b49ae290112b74f14b713cc
---
 .github/workflows/auto-release.yaml | 19 +++++++++++++++++++
 synth.metadata                      |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index c8494910553a..bc1554aecba2 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -4,6 +4,7 @@ name: auto-release
 jobs:
   approve:
     runs-on: ubuntu-latest
+    if: contains(github.head_ref, 'release-v')
     steps:
     - uses: actions/github-script@v3.0.0
       with:
@@ -20,6 +21,24 @@ jobs:
             return;
           }
 
+          // only approve PRs with pom.xml and versions.txt changes
+          const filesPromise = github.pulls.listFiles.endpoint({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            pull_number: context.payload.pull_request.number,
+          });
+          const changed_files = await github.paginate(filesPromise)
+
+          if ( changed_files.length < 1 ) {
+            console.log( "Not proceeding since PR is empty!" )
+            return;
+          }
+
+          if ( !changed_files.some(v => v.filename.includes("pom")) || !changed_files.some(v => v.filename.includes("versions.txt")) ) {
+            console.log( "PR file changes do not have pom.xml or versions.txt -- something is wrong. PTAL!" )
+            return;
+          }
+
           // trigger auto-release when
           // 1) it is a SNAPSHOT release (auto-generated post regular release)
           // 2) there are dependency updates only
diff --git a/synth.metadata b/synth.metadata
index 08bc77d72289..443350890bc8 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "89fb0e7fb67857176b5d3ded3f0a5e2aaf76880b"
+        "sha": "1f028b47f36430b00ae17cbb80eee324b875e237"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "916c10e8581804df2b48a0f0457d848f3faa582e"
+        "sha": "da29da32b3a988457b49ae290112b74f14b713cc"
       }
     }
   ],

From 593fc662e11ea446cd3fc7864cfa9a1b75480fba Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Tue, 29 Sep 2020 23:05:52 +0530
Subject: [PATCH 0417/1784] docs: update libraries-bom (#220)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3ad8286e4979..1262f640577e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      9.1.0
+      11.0.0
       pom
       import
     

From c01ba4502c81bdc3606f5a34d8d9eb573a800d84 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 30 Sep 2020 09:12:20 -0700
Subject: [PATCH 0418/1784] chore(java): use separate autosynth job for README
 (#223)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/52bbaa55-e421-4eef-8134-3f067b5c8364/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/e6168630be3e31eede633ba2c6f1cd64248dec1c
---
 .github/readme/synth.py       | 19 ++++++++++++
 .kokoro/continuous/readme.cfg | 55 +++++++++++++++++++++++++++++++++++
 .kokoro/readme.sh             | 36 +++++++++++++++++++++++
 synth.metadata                |  8 +++--
 4 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 .github/readme/synth.py
 create mode 100644 .kokoro/continuous/readme.cfg
 create mode 100644 .kokoro/readme.sh

diff --git a/.github/readme/synth.py b/.github/readme/synth.py
new file mode 100644
index 000000000000..7b48cc28d361
--- /dev/null
+++ b/.github/readme/synth.py
@@ -0,0 +1,19 @@
+# Copyright 2020 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.
+
+"""This script is used to synthesize generated the README for this library."""
+
+from synthtool.languages import java
+
+java.custom_templates(["java_library/README.md"])
diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
new file mode 100644
index 000000000000..8df31c595c47
--- /dev/null
+++ b/.kokoro/continuous/readme.cfg
@@ -0,0 +1,55 @@
+# Copyright 2020 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.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-datastore/.kokoro/readme.sh"
+}
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.log"
+  }
+}
+
+# The github token is stored here.
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "yoshi-automation-github-key"
+      # TODO(theacodes): remove this after secrets have globally propagated
+      backend_type: FASTCONFIGPUSH
+    }
+  }
+}
+
+# Common env vars for all repositories and builds.
+env_vars: {
+    key: "GITHUB_USER"
+    value: "yoshi-automation"
+}
+env_vars: {
+    key: "GITHUB_EMAIL"
+    value: "yoshi-automation@google.com"
+}
diff --git a/.kokoro/readme.sh b/.kokoro/readme.sh
new file mode 100644
index 000000000000..023f51d863db
--- /dev/null
+++ b/.kokoro/readme.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright 2020 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.
+
+set -eo pipefail
+
+cd ${KOKORO_ARTIFACTS_DIR}/github/java-datastore
+
+# Disable buffering, so that the logs stream through.
+export PYTHONUNBUFFERED=1
+
+# Kokoro exposes this as a file, but the scripts expect just a plain variable.
+export GITHUB_TOKEN=$(cat ${KOKORO_KEYSTORE_DIR}/73713_yoshi-automation-github-key)
+
+# Setup git credentials
+echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials
+git config --global credential.helper 'store --file ~/.git-credentials'
+
+python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool
+python3.6 -m autosynth.synth \
+    --repository=googleapis/java-datastore \
+    --synth-file-name=.github/readme/synth.py \
+    --metadata-path=.github/readme/synth.metadata \
+    --pr-title="chore: regenerate README" \
+    --branch-suffix="readme"
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index 443350890bc8..97ed5897dbbd 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "1f028b47f36430b00ae17cbb80eee324b875e237"
+        "sha": "593fc662e11ea446cd3fc7864cfa9a1b75480fba"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "da29da32b3a988457b49ae290112b74f14b713cc"
+        "sha": "e6168630be3e31eede633ba2c6f1cd64248dec1c"
       }
     }
   ],
@@ -40,6 +40,7 @@
     ".github/ISSUE_TEMPLATE/feature_request.md",
     ".github/ISSUE_TEMPLATE/support_request.md",
     ".github/PULL_REQUEST_TEMPLATE.md",
+    ".github/readme/synth.py",
     ".github/release-please.yml",
     ".github/trusted-contribution.yml",
     ".github/workflows/auto-release.yaml",
@@ -52,6 +53,7 @@
     ".kokoro/common.sh",
     ".kokoro/continuous/common.cfg",
     ".kokoro/continuous/java8.cfg",
+    ".kokoro/continuous/readme.cfg",
     ".kokoro/dependencies.sh",
     ".kokoro/linkage-monitor.sh",
     ".kokoro/nightly/common.cfg",
@@ -75,6 +77,7 @@
     ".kokoro/presubmit/linkage-monitor.cfg",
     ".kokoro/presubmit/lint.cfg",
     ".kokoro/presubmit/samples.cfg",
+    ".kokoro/readme.sh",
     ".kokoro/release/bump_snapshot.cfg",
     ".kokoro/release/common.cfg",
     ".kokoro/release/common.sh",
@@ -92,7 +95,6 @@
     "CODE_OF_CONDUCT.md",
     "CONTRIBUTING.md",
     "LICENSE",
-    "README.md",
     "codecov.yaml",
     "java.header",
     "license-checks.xml",

From 4d27538d07dd5bdee20a4f4c3fd494b9b59ddd3c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 30 Sep 2020 16:54:17 -0700
Subject: [PATCH 0419/1784] build: rename samples lint workflow to checkstyle
 to disambiguate branch protection with unit lint (#224)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/d930cc96-a531-49bb-98d1-aa98f3e84e7c/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/8a7a3021fe97aa0a3641db642fe2b767f1c8110f
---
 .github/workflows/samples.yaml | 2 +-
 synth.metadata                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index a1d50073069d..c46230a78c38 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -2,7 +2,7 @@ on:
   pull_request:
 name: samples
 jobs:
-  lint:
+  checkstyle:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/synth.metadata b/synth.metadata
index 97ed5897dbbd..092ec879db32 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "593fc662e11ea446cd3fc7864cfa9a1b75480fba"
+        "sha": "c01ba4502c81bdc3606f5a34d8d9eb573a800d84"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "e6168630be3e31eede633ba2c6f1cd64248dec1c"
+        "sha": "8a7a3021fe97aa0a3641db642fe2b767f1c8110f"
       }
     }
   ],

From 127ad55171e717d1e6e28bb311bccfb51d4cece6 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 8 Oct 2020 14:31:47 -0700
Subject: [PATCH 0420/1784] build(java): readme.sh should be executable (#225)

Source-Author: Jeff Ching 
Source-Date: Wed Sep 30 13:20:04 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 0762e8ee2ec21cdfc4d82020b985a104feb0453b
Source-Link: https://github.com/googleapis/synthtool/commit/0762e8ee2ec21cdfc4d82020b985a104feb0453b
---
 .kokoro/readme.sh | 0
 synth.metadata    | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 .kokoro/readme.sh

diff --git a/.kokoro/readme.sh b/.kokoro/readme.sh
old mode 100644
new mode 100755
diff --git a/synth.metadata b/synth.metadata
index 092ec879db32..0f61a2728f4e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c01ba4502c81bdc3606f5a34d8d9eb573a800d84"
+        "sha": "4d27538d07dd5bdee20a4f4c3fd494b9b59ddd3c"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8a7a3021fe97aa0a3641db642fe2b767f1c8110f"
+        "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b"
       }
     }
   ],

From e611211027e532741b062cf9607a95ddf9e260b2 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 8 Oct 2020 16:54:38 -0700
Subject: [PATCH 0421/1784] chore: regenerate README (#226)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-10-08 21:33:49,298 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working directory clean
2020-10-08 21:33:50,241 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/c48e557a-fcfa-4922-b58e-021a13a91edd/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 18 ++++++++++++++++++
 README.md                                    |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 .github/readme/synth.metadata/synth.metadata

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
new file mode 100644
index 000000000000..6fa11a309fd0
--- /dev/null
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -0,0 +1,18 @@
+{
+  "sources": [
+    {
+      "git": {
+        "name": ".",
+        "remote": "https://github.com/googleapis/java-datastore.git",
+        "sha": "127ad55171e717d1e6e28bb311bccfb51d4cece6"
+      }
+    },
+    {
+      "git": {
+        "name": "synthtool",
+        "remote": "https://github.com/googleapis/synthtool.git",
+        "sha": "b6164c26a111f7f587099d31253abb96b5737bb2"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 1262f640577e..3ad8286e4979 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      11.0.0
+      9.1.0
       pom
       import
     

From 9e1608ed3351080fee5d0d2c7f257180653fb7f5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 14 Oct 2020 09:16:29 -0700
Subject: [PATCH 0422/1784] ci(java): suggest formatting fixes (#231)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/c7323cb0-257b-4ad3-b644-b94b558b2a13/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/b65ef07d99946d23e900ef2cc490274a16edd336
---
 .github/workflows/formatting.yaml | 25 +++++++++++++++++++++++++
 synth.metadata                    |  5 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/formatting.yaml

diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml
new file mode 100644
index 000000000000..d4d367cfce03
--- /dev/null
+++ b/.github/workflows/formatting.yaml
@@ -0,0 +1,25 @@
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+    branches:
+      - master
+name: format
+jobs:
+  format-code:
+    runs-on: ubuntu-latest
+    env:
+      ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - run: "mvn com.coveo:fmt-maven-plugin:format"
+      - uses: googleapis/code-suggester@v1.8.0
+        with:
+          command: review
+          pull_number: ${{ github.event.pull_request.number }}
+          git_dir: '.'
diff --git a/synth.metadata b/synth.metadata
index 0f61a2728f4e..99a0f436873d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "4d27538d07dd5bdee20a4f4c3fd494b9b59ddd3c"
+        "sha": "e611211027e532741b062cf9607a95ddf9e260b2"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b"
+        "sha": "b65ef07d99946d23e900ef2cc490274a16edd336"
       }
     }
   ],
@@ -45,6 +45,7 @@
     ".github/trusted-contribution.yml",
     ".github/workflows/auto-release.yaml",
     ".github/workflows/ci.yaml",
+    ".github/workflows/formatting.yaml",
     ".github/workflows/samples.yaml",
     ".kokoro/build.bat",
     ".kokoro/build.sh",

From 5104395015385ee18648e8cf0414f24654405b42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 16:34:04 +0000
Subject: [PATCH 0423/1784] build(deps-dev): bump junit from 4.13 to 4.13.1 in
 /samples/install-without-bom (#229)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.


Release notes

Sourced from junit's releases.




JUnit 4.13.1


Please refer to the release notes for details.







Changelog

Sourced from junit's changelog.




Summary of changes in version 4.13.1


Rules


Security fix: TemporaryFolder now limits access to temporary folders on Java 1.7 or later


A local information disclosure vulnerability in TemporaryFolder has been fixed. See the published security advisory for details.


Test Runners


[Pull request #1669:](junit-team/junit#1669) Make FrameworkField constructor public


Prior to this change, custom runners could make FrameworkMethod instances, but not FrameworkField instances. This small change allows for both now, because FrameworkField's constructor has been promoted from package-private to public.







Commits

    

  • 1b683f4 [maven-release-plugin] prepare release r4.13.1
    • 

  • ce6ce3a Draft 4.13.1 release notes
    • 

  • c29dd82 Change version to 4.13.1-SNAPSHOT
    • 

  • 1d17486 Add a link to assertThrows in exception testing
    • 

  • 543905d Use separate line for annotation in Javadoc
    • 

  • 510e906 Add sub headlines to class Javadoc
    • 

  • 610155b Merge pull request from GHSA-269g-pwp5-87pp
    • 

  • b6cfd1e Explicitly wrap float parameter for consistency (#1671)
    • 

  • a5d205c Fix GitHub link in FAQ (#1672)
    • 

  • 3a5c6b4 Deprecated since jdk9 replacing constructor instance of Double and Float (#1660)
    • 

  • Additional commits viewable in compare view
    • 








[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=junit:junit&package-manager=maven&previous-version=4.13&new-version=4.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---



Dependabot commands and options



You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/googleapis/java-datastore/network/alerts).



---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 5303163b8556..340ac417697e 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -36,7 +36,7 @@
     
       junit
       junit
-      4.13
+      4.13.1
       test
     
     

From b20637501060d965229acafdeef65fd9146aa080 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 16:36:04 +0000
Subject: [PATCH 0424/1784] build(deps-dev): bump junit from 4.13 to 4.13.1 in
 /samples/snapshot (#230)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.


Release notes

Sourced from junit's releases.




JUnit 4.13.1


Please refer to the release notes for details.







Changelog

Sourced from junit's changelog.




Summary of changes in version 4.13.1


Rules


Security fix: TemporaryFolder now limits access to temporary folders on Java 1.7 or later


A local information disclosure vulnerability in TemporaryFolder has been fixed. See the published security advisory for details.


Test Runners


[Pull request #1669:](junit-team/junit#1669) Make FrameworkField constructor public


Prior to this change, custom runners could make FrameworkMethod instances, but not FrameworkField instances. This small change allows for both now, because FrameworkField's constructor has been promoted from package-private to public.







Commits

    

  • 1b683f4 [maven-release-plugin] prepare release r4.13.1
    • 

  • ce6ce3a Draft 4.13.1 release notes
    • 

  • c29dd82 Change version to 4.13.1-SNAPSHOT
    • 

  • 1d17486 Add a link to assertThrows in exception testing
    • 

  • 543905d Use separate line for annotation in Javadoc
    • 

  • 510e906 Add sub headlines to class Javadoc
    • 

  • 610155b Merge pull request from GHSA-269g-pwp5-87pp
    • 

  • b6cfd1e Explicitly wrap float parameter for consistency (#1671)
    • 

  • a5d205c Fix GitHub link in FAQ (#1672)
    • 

  • 3a5c6b4 Deprecated since jdk9 replacing constructor instance of Double and Float (#1660)
    • 

  • Additional commits viewable in compare view
    • 








[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=junit:junit&package-manager=maven&previous-version=4.13&new-version=4.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---



Dependabot commands and options



You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/googleapis/java-datastore/network/alerts).



---
 samples/snapshot/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ced7beed0bc8..8dcfbe8efa1b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -34,7 +34,7 @@
     
       junit
       junit
-      4.13
+      4.13.1
       test
     
     

From 7cbc877ad680abd7098fc6d4914c83aae0002779 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 16:36:09 +0000
Subject: [PATCH 0425/1784] build(deps): bump junit from 4.13 to 4.13.1 (#227)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.


Release notes

Sourced from junit's releases.




JUnit 4.13.1


Please refer to the release notes for details.







Changelog

Sourced from junit's changelog.




Summary of changes in version 4.13.1


Rules


Security fix: TemporaryFolder now limits access to temporary folders on Java 1.7 or later


A local information disclosure vulnerability in TemporaryFolder has been fixed. See the published security advisory for details.


Test Runners


[Pull request #1669:](junit-team/junit#1669) Make FrameworkField constructor public


Prior to this change, custom runners could make FrameworkMethod instances, but not FrameworkField instances. This small change allows for both now, because FrameworkField's constructor has been promoted from package-private to public.







Commits

    

  • 1b683f4 [maven-release-plugin] prepare release r4.13.1
    • 

  • ce6ce3a Draft 4.13.1 release notes
    • 

  • c29dd82 Change version to 4.13.1-SNAPSHOT
    • 

  • 1d17486 Add a link to assertThrows in exception testing
    • 

  • 543905d Use separate line for annotation in Javadoc
    • 

  • 510e906 Add sub headlines to class Javadoc
    • 

  • 610155b Merge pull request from GHSA-269g-pwp5-87pp
    • 

  • b6cfd1e Explicitly wrap float parameter for consistency (#1671)
    • 

  • a5d205c Fix GitHub link in FAQ (#1672)
    • 

  • 3a5c6b4 Deprecated since jdk9 replacing constructor instance of Double and Float (#1660)
    • 

  • Additional commits viewable in compare view
    • 








[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=junit:junit&package-manager=maven&previous-version=4.13&new-version=4.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---



Dependabot commands and options



You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/googleapis/java-datastore/network/alerts).



---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6e11ce5599c8..72a3c59f8527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,7 @@
       
         junit
         junit
-        4.13
+        4.13.1
         test
       
       

From 86b06991e841028e5c3f09ca77b35bb6d5d2b4a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 16:48:04 +0000
Subject: [PATCH 0426/1784] build(deps-dev): bump junit from 4.13 to 4.13.1 in
 /samples/snippets (#228)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.


Release notes

Sourced from junit's releases.




JUnit 4.13.1


Please refer to the release notes for details.







Changelog

Sourced from junit's changelog.




Summary of changes in version 4.13.1


Rules


Security fix: TemporaryFolder now limits access to temporary folders on Java 1.7 or later


A local information disclosure vulnerability in TemporaryFolder has been fixed. See the published security advisory for details.


Test Runners


[Pull request #1669:](junit-team/junit#1669) Make FrameworkField constructor public


Prior to this change, custom runners could make FrameworkMethod instances, but not FrameworkField instances. This small change allows for both now, because FrameworkField's constructor has been promoted from package-private to public.







Commits

    

  • 1b683f4 [maven-release-plugin] prepare release r4.13.1
    • 

  • ce6ce3a Draft 4.13.1 release notes
    • 

  • c29dd82 Change version to 4.13.1-SNAPSHOT
    • 

  • 1d17486 Add a link to assertThrows in exception testing
    • 

  • 543905d Use separate line for annotation in Javadoc
    • 

  • 510e906 Add sub headlines to class Javadoc
    • 

  • 610155b Merge pull request from GHSA-269g-pwp5-87pp
    • 

  • b6cfd1e Explicitly wrap float parameter for consistency (#1671)
    • 

  • a5d205c Fix GitHub link in FAQ (#1672)
    • 

  • 3a5c6b4 Deprecated since jdk9 replacing constructor instance of Double and Float (#1660)
    • 

  • Additional commits viewable in compare view
    • 








[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=junit:junit&package-manager=maven&previous-version=4.13&new-version=4.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---



Dependabot commands and options



You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/googleapis/java-datastore/network/alerts).



---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 1995442a292f..59b858aa2775 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -47,7 +47,7 @@
     
       junit
       junit
-      4.13
+      4.13.1
       test
     
     

From f36d48cb0cb60c71362a083e3f3117bc79157159 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 15 Oct 2020 17:04:22 -0700
Subject: [PATCH 0427/1784] ci(java): restrict presubmit samples ITs to only
 snapshot (#233)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/fbbe40e0-e2ab-4acf-9ad7-1fe4653b43d5/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/27e0e916cbfdb3d5ff6639b686cc04f78a0b0386
---
 .kokoro/build.sh | 11 +++++++++--
 synth.metadata   |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 7535c0aac0a4..0166be7c52f4 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -69,9 +69,16 @@ integration)
     RETURN_CODE=$?
     ;;
 samples)
-    if [[ -f samples/pom.xml ]]
+    SAMPLES_DIR=samples
+    # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
+    if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]]
     then
-        pushd samples
+      SAMPLES_DIR=samples/snapshot
+    fi
+
+    if [[ -f ${SAMPLES_DIR}/pom.xml ]]
+    then
+        pushd {SAMPLES_DIR}
         mvn -B \
           -Penable-samples \
           -DtrimStackTrace=false \
diff --git a/synth.metadata b/synth.metadata
index 99a0f436873d..41a58fc1b012 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "e611211027e532741b062cf9607a95ddf9e260b2"
+        "sha": "86b06991e841028e5c3f09ca77b35bb6d5d2b4a1"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "b65ef07d99946d23e900ef2cc490274a16edd336"
+        "sha": "27e0e916cbfdb3d5ff6639b686cc04f78a0b0386"
       }
     }
   ],

From 6a6393c431c337d31f639de8fb3a3d4bb8ea9576 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 16 Oct 2020 09:08:24 -0700
Subject: [PATCH 0428/1784] build(java): auto-approve README regeneration
 (#235)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/21d46434-1f66-4dee-862f-7b883a683c46/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1
---
 .github/workflows/approve-readme.yaml | 54 +++++++++++++++++++++++++++
 synth.metadata                        |  5 ++-
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/approve-readme.yaml

diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
new file mode 100644
index 000000000000..e2d841d6c5a0
--- /dev/null
+++ b/.github/workflows/approve-readme.yaml
@@ -0,0 +1,54 @@
+on:
+  pull_request:
+name: auto-merge-readme
+jobs:
+  approve:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
+    steps:
+      - uses: actions/github-script@v3.0.0
+        with:
+          github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
+          script: |
+            // only approve PRs from yoshi-automation
+            if (context.payload.pull_request.user.login !== "yoshi-automation") {
+              return;
+            }
+
+            // only approve PRs like "chore: release "
+            if (!context.payload.pull_request.title === "chore: regenerate README") {
+              return;
+            }
+
+            // only approve PRs with README.md and synth.metadata changes
+            const files = new Set(
+              (
+                await github.paginate(
+                  github.pulls.listFiles.endpoint({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: context.payload.pull_request.number,
+                  })
+                )
+              ).map(file => file.filename)
+            );
+            if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) {
+              return;
+            }
+
+            // approve README regeneration PR
+            await github.pulls.createReview({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Rubber stamped PR!',
+              pull_number: context.payload.pull_request.number,
+              event: 'APPROVE'
+            });
+
+            // attach automerge label
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              labels: ['automerge']
+            });
diff --git a/synth.metadata b/synth.metadata
index 41a58fc1b012..91f1b4843630 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "86b06991e841028e5c3f09ca77b35bb6d5d2b4a1"
+        "sha": "f36d48cb0cb60c71362a083e3f3117bc79157159"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "27e0e916cbfdb3d5ff6639b686cc04f78a0b0386"
+        "sha": "7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1"
       }
     }
   ],
@@ -43,6 +43,7 @@
     ".github/readme/synth.py",
     ".github/release-please.yml",
     ".github/trusted-contribution.yml",
+    ".github/workflows/approve-readme.yaml",
     ".github/workflows/auto-release.yaml",
     ".github/workflows/ci.yaml",
     ".github/workflows/formatting.yaml",

From 9aa87434c125bee0085ffde33e9614358874ded7 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 16 Oct 2020 13:04:03 -0700
Subject: [PATCH 0429/1784] chore: regenerate README (#234)

---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 6fa11a309fd0..d2d164c58a19 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "127ad55171e717d1e6e28bb311bccfb51d4cece6"
+        "sha": "f36d48cb0cb60c71362a083e3f3117bc79157159"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "b6164c26a111f7f587099d31253abb96b5737bb2"
+        "sha": "7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1"
       }
     }
   ]
diff --git a/README.md b/README.md
index 3ad8286e4979..02bfb18d7d83 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,6 @@ If you are using Maven without BOM, add this to your dependencies:
 
 ```
 
-[//]: # ({x-version-update-start:google-cloud-datastore:released})
-
 If you are using Gradle, add this to your dependencies
 ```Groovy
 compile 'com.google.cloud:google-cloud-datastore:1.105.0'
@@ -53,7 +51,6 @@ If you are using SBT, add this to your dependencies
 ```Scala
 libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.0"
 ```
-[//]: # ({x-version-update-end})
 
 ## Authentication
 

From de2c473b1fc0e518c840cbce6a912abe24b4cb95 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 20 Oct 2020 15:44:16 -0700
Subject: [PATCH 0430/1784] build(java): enable snippet-bot (#237)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8e612041-fee6-48c6-a4b4-cd4a514d71be/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/5a506ec8765cc04f7e29f888b8e9b257d9a7ae11
---
 .github/snippet-bot.yml | 0
 synth.metadata          | 5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 .github/snippet-bot.yml

diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/synth.metadata b/synth.metadata
index 91f1b4843630..299a855a9730 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "f36d48cb0cb60c71362a083e3f3117bc79157159"
+        "sha": "9aa87434c125bee0085ffde33e9614358874ded7"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1"
+        "sha": "5a506ec8765cc04f7e29f888b8e9b257d9a7ae11"
       }
     }
   ],
@@ -42,6 +42,7 @@
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/readme/synth.py",
     ".github/release-please.yml",
+    ".github/snippet-bot.yml",
     ".github/trusted-contribution.yml",
     ".github/workflows/approve-readme.yaml",
     ".github/workflows/auto-release.yaml",

From 7325fa0ba489efe31a58f64c2d3e2b55cd156822 Mon Sep 17 00:00:00 2001
From: Suraj Dhamecha <48670070+suraj-qlogic@users.noreply.github.com>
Date: Thu, 22 Oct 2020 00:00:09 +0530
Subject: [PATCH 0431/1784] docs: update google cloud libraries-bom (#236)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 02bfb18d7d83..fd3da3969798 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      9.1.0
+      12.1.0
       pom
       import
     

From 942f41a9365cfad06e638e08e952a5d3b63459a3 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 21 Oct 2020 12:18:17 -0700
Subject: [PATCH 0432/1784] chore: regenerate README (#239)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-10-21 18:34:36,688 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working directory clean
2020-10-21 18:34:37,613 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/fe6dacfd-c68b-4f2d-a770-8e6c2848313a/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index d2d164c58a19..bb897180b638 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "f36d48cb0cb60c71362a083e3f3117bc79157159"
+        "sha": "7325fa0ba489efe31a58f64c2d3e2b55cd156822"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1"
+        "sha": "901ddd44e9ef7887ee681b9183bbdea99437fdcc"
       }
     }
   ]
diff --git a/README.md b/README.md
index fd3da3969798..02bfb18d7d83 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      12.1.0
+      9.1.0
       pom
       import
     

From 657ce3a00b8710396e3406743a14b2686b1ff6ef Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 22 Oct 2020 11:21:45 -0700
Subject: [PATCH 0433/1784] chore: clean up and update renovate.json (#238)

To remove unused package groupings and add "test" commit type

Source-Author: Stephanie Wang 
Source-Date: Tue Oct 20 18:31:45 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 6abb59097be84599a1d6091fe534a49e5c5cf948
Source-Link: https://github.com/googleapis/synthtool/commit/6abb59097be84599a1d6091fe534a49e5c5cf948
---
 renovate.json  | 30 +++++++++++-------------------
 synth.metadata |  4 ++--
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/renovate.json b/renovate.json
index 538ff9137e3b..13d5057257ba 100644
--- a/renovate.json
+++ b/renovate.json
@@ -17,24 +17,6 @@
       ],
       "versionScheme": "docker"
     },
-    {
-      "packagePatterns": [
-        "^com.google.api:gax",
-        "^com.google.auth:",
-        "^com.google.cloud:google-cloud-core",
-        "^io.grpc:",
-        "^com.google.guava:"
-      ],
-      "groupName": "core dependencies"
-    },
-    {
-      "packagePatterns": [
-        "^com.google.http-client:",
-        "^com.google.oauth-client:",
-        "^com.google.api-client:"
-      ],
-      "groupName": "core transport dependencies"
-    },
     {
       "packagePatterns": [
         "*"
@@ -63,6 +45,16 @@
       "semanticCommitType": "chore",
       "semanticCommitScope": "deps"
     },
+    {
+      "packagePatterns": [
+        "^junit:junit",
+        "^com.google.truth:truth",
+        "^org.mockito:mockito-core",
+        "^org.objenesis:objenesis"
+      ],
+      "semanticCommitType": "test",
+      "semanticCommitScope": "deps"
+    },
     {
       "packagePatterns": [
         "^com.google.cloud:google-cloud-"
@@ -78,4 +70,4 @@
   ],
   "semanticCommits": true,
   "masterIssue": true
-}
\ No newline at end of file
+}
diff --git a/synth.metadata b/synth.metadata
index 299a855a9730..ae179d626b00 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "9aa87434c125bee0085ffde33e9614358874ded7"
+        "sha": "de2c473b1fc0e518c840cbce6a912abe24b4cb95"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5a506ec8765cc04f7e29f888b8e9b257d9a7ae11"
+        "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948"
       }
     }
   ],

From 01360a68bdf0e821db149557ef40f749b3845da6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 22 Oct 2020 21:40:26 +0200
Subject: [PATCH 0434/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.21 (#241)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud.samples:shared-configuration](com/google/cloud/samples/shared-configuration) | patch | `1.0.18` -> `1.0.21` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 340ac417697e..7691368ae0d5 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.18
+    1.0.21
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index d75c749490f9..93b0d1050389 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.18
+    1.0.21
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8dcfbe8efa1b..7196e0ebd5db 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.18
+    1.0.21
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 59b858aa2775..aad539650e6d 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.18
+    1.0.21
   
 
   

From efd94dfa6242a1cc146fd212fecf534327151f3b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 22 Oct 2020 21:40:34 +0200
Subject: [PATCH 0435/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.0 (#242)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | minor | `1.104.0` -> `1.105.0` |

---

### Release Notes



googleapis/java-datastore

### [`v1.105.0`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11050-httpswwwgithubcomgoogleapisjava-datastorecomparev11040v11050-2020-09-01)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.104.0...v1.105.0)

##### Features

-   **deps:** adopt flatten plugin and google-cloud-shared-dependencies ([#​174](https://www.github.com/googleapis/java-datastore/issues/174)) ([8618c18](https://www.github.com/googleapis/java-datastore/commit/8618c1848e71424fa164fee9d8b7b53641b6b823))

##### Bug Fixes

-   query result start with startCursor if specified ([#​207](https://www.github.com/googleapis/java-datastore/issues/207)) ([023229a](https://www.github.com/googleapis/java-datastore/commit/023229a15edbbe773bd03410ed0784aba248ad6e))

##### Dependencies

-   remove direct declaration of google-auth-library-oauth2-http ([#​184](https://www.github.com/googleapis/java-datastore/issues/184)) ([4fa4df4](https://www.github.com/googleapis/java-datastore/commit/4fa4df40d63d7fbce023d6231830dcc296c29dd1))
-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.2 ([#​187](https://www.github.com/googleapis/java-datastore/issues/187)) ([941bea0](https://www.github.com/googleapis/java-datastore/commit/941bea016f1ce4e1c1fd027b1671f950e9c52160))
-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.3 ([#​191](https://www.github.com/googleapis/java-datastore/issues/191)) ([a89eb08](https://www.github.com/googleapis/java-datastore/commit/a89eb08be1cd9689d38b8b67c472cc928e3549c1))
-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.4 ([#​196](https://www.github.com/googleapis/java-datastore/issues/196)) ([7214e0a](https://www.github.com/googleapis/java-datastore/commit/7214e0ae224633e2effc023d10494e0164a8f9dc))
-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.6 ([#​199](https://www.github.com/googleapis/java-datastore/issues/199)) ([6a959d3](https://www.github.com/googleapis/java-datastore/commit/6a959d3f7ca75ba5da1d1c4cb509593d3be39e98))
-   update dependency com.google.oauth-client:google-oauth-client to v1.31.0 ([#​186](https://www.github.com/googleapis/java-datastore/issues/186)) ([16bfb9a](https://www.github.com/googleapis/java-datastore/commit/16bfb9a0127f4969a796ad95cc11cf2b8b92d0f3))

##### Documentation

-   libraries-bom 8.1.0 ([#​200](https://www.github.com/googleapis/java-datastore/issues/200)) ([9425972](https://www.github.com/googleapis/java-datastore/commit/9425972905d1e370192eeb3bbfe837f5a7fb25cf))
-   update libraries-bom ([#​211](https://www.github.com/googleapis/java-datastore/issues/211)) ([9407c4a](https://www.github.com/googleapis/java-datastore/commit/9407c4afec3de6e18c96c24872269e61c8ad40fb))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 7691368ae0d5..72412f2bb9a7 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
-      1.104.0
+      1.105.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7196e0ebd5db..5e96ee19e60b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.104.0
+      1.105.0
     
 
     

From 298a1402a386b87aeba2bc78e6bf66a4f422ef94 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 22 Oct 2020 21:42:17 +0200
Subject: [PATCH 0436/1784] test(deps): update dependency
 com.google.truth:truth to v1.1 (#245)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.truth:truth](com/google/truth/truth) | minor | `1.0.1` -> `1.1` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 72412f2bb9a7..97a3188711b0 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.0.1
+      1.1
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5e96ee19e60b..3aa28a25befd 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -40,7 +40,7 @@
     
       com.google.truth
       truth
-      1.0.1
+      1.1
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index aad539650e6d..36a2291f684a 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.0.1
+      1.1
       test
     
   

From 5d3ebdc2c0f3044b377e049151892ea0059f6cc7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 22 Oct 2020 22:04:16 +0200
Subject: [PATCH 0437/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v13 (#246)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | major | `9.1.0` -> `13.1.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 36a2291f684a..e0f58c62d4fc 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        9.1.0
+        13.1.0
         pom
         import
       

From 45e4ce6bda7a1885cc0f9ebd188b66383edde35d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 22 Oct 2020 13:38:15 -0700
Subject: [PATCH 0438/1784] chore: regenerate README (#247)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-10-22 19:46:37,339 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working directory clean
2020-10-22 19:46:38,288 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/533a2dbe-f57c-4948-b7f7-cc5d7b37eb7d/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index bb897180b638..86f0457122ed 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "7325fa0ba489efe31a58f64c2d3e2b55cd156822"
+        "sha": "298a1402a386b87aeba2bc78e6bf66a4f422ef94"
       }
     },
     {
diff --git a/README.md b/README.md
index 02bfb18d7d83..3cef9e7ff39a 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.104.0
+  1.105.0
 
 
 ```

From a9990724835955e7e04c3ac1d046f2079961c575 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 22 Oct 2020 13:56:17 -0700
Subject: [PATCH 0439/1784] chore: regenerate README (#248)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-10-22 20:45:48,263 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working directory clean
2020-10-22 20:45:49,190 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/955e323e-a994-4913-8024-25660f39ea93/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 86f0457122ed..157e6c368a84 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "298a1402a386b87aeba2bc78e6bf66a4f422ef94"
+        "sha": "45e4ce6bda7a1885cc0f9ebd188b66383edde35d"
       }
     },
     {
diff --git a/README.md b/README.md
index 3cef9e7ff39a..43aa3c6d2e3e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      9.1.0
+      13.1.0
       pom
       import
     

From af6a180f3d5548319b1822d84ec917f14549d603 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 26 Oct 2020 16:52:23 -0700
Subject: [PATCH 0440/1784] chore: regenerate common templates (#249)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8bb66718-6c73-48bc-9fe4-75dc94d1a47a/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/5f6ef0ec5501d33c4667885b37a7685a30d41a76
Source-Link: https://github.com/googleapis/synthtool/commit/9593c3b5b714cc9b17c445aee8834ac2b4b9348b
---
 .kokoro/release/publish_javadoc.sh | 2 +-
 CODE_OF_CONDUCT.md                 | 7 ++++---
 synth.metadata                     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 0597eb24139a..4cbf02bc8967 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -62,7 +62,7 @@ popd
 # V2
 mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"
 
-pushd target/devsite
+pushd target/devsite/reference
 
 # create metadata
 python3 -m docuploader create-metadata \
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 6b2238bb75e0..2add2547a812 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,4 @@
+
 # Code of Conduct
 
 ## Our Pledge
@@ -69,12 +70,12 @@ dispute. If you are unable to resolve the matter for any reason, or if the
 behavior is threatening or harassing, report it. We are dedicated to providing
 an environment where participants feel welcome and safe.
 
-Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the
-Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to
+Reports should be directed to *googleapis-stewards@google.com*, the
+Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to
 receive and address reported violations of the code of conduct. They will then
 work with a committee consisting of representatives from the Open Source
 Programs Office and the Google Open Source Strategy team. If for any reason you
-are uncomfortable reaching out the Project Steward, please email
+are uncomfortable reaching out to the Project Steward, please email
 opensource@google.com.
 
 We will investigate every complaint, but you may not receive a direct response.
diff --git a/synth.metadata b/synth.metadata
index ae179d626b00..7c5a49e0041e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "de2c473b1fc0e518c840cbce6a912abe24b4cb95"
+        "sha": "a9990724835955e7e04c3ac1d046f2079961c575"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948"
+        "sha": "5f6ef0ec5501d33c4667885b37a7685a30d41a76"
       }
     }
   ],

From 5c4dfe72fb37684e3e37f7c5061357eca2b0d893 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Oct 2020 01:00:17 +0100
Subject: [PATCH 0441/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v13.2.0 (#250)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `13.1.0` -> `13.2.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e0f58c62d4fc..78433c10a4d9 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        13.1.0
+        13.2.0
         pom
         import
       

From a76e427ff6cdff626a06242f69e16dade4a2e9cf Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 27 Oct 2020 11:06:21 -0700
Subject: [PATCH 0442/1784] chore(ci): fix typo in restrict presubmit samples
 ITs to only snapshot (#252)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/e1618cb3-d96b-427f-9c50-971f9f53c51f/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/f68649c5f26bcff6817c6d21e90dac0fc71fef8e
---
 .kokoro/build.sh | 2 +-
 synth.metadata   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 0166be7c52f4..a39f066c2794 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -78,7 +78,7 @@ samples)
 
     if [[ -f ${SAMPLES_DIR}/pom.xml ]]
     then
-        pushd {SAMPLES_DIR}
+        pushd ${SAMPLES_DIR}
         mvn -B \
           -Penable-samples \
           -DtrimStackTrace=false \
diff --git a/synth.metadata b/synth.metadata
index 7c5a49e0041e..5fe140103fc9 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a9990724835955e7e04c3ac1d046f2079961c575"
+        "sha": "5c4dfe72fb37684e3e37f7c5061357eca2b0d893"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5f6ef0ec5501d33c4667885b37a7685a30d41a76"
+        "sha": "f68649c5f26bcff6817c6d21e90dac0fc71fef8e"
       }
     }
   ],

From 71913abd7599a022041123e7e0e31ac7ee65ce2c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Oct 2020 20:08:25 +0100
Subject: [PATCH 0443/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.9.3 (#240)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | patch | `0.9.2` -> `0.9.3` |

---

### Release Notes



googleapis/java-shared-config

### [`v0.9.3`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​093-httpswwwgithubcomgoogleapisjava-shared-configcomparev092v093-2020-10-15)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.9.2...v0.9.3)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 4d3ff3c9d1a0..6f1f24ff1833 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
-    0.9.2
+    0.9.3
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 72a3c59f8527..3c8a73b13b4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.9.2
+    0.9.3
   
 
   

From a6d25c31f13f5ff9317bdb24d3f27fd8dcab5758 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Oct 2020 21:27:21 +0100
Subject: [PATCH 0444/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v13.3.0 (#251)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 78433c10a4d9..d69b3e276b50 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        13.2.0
+        13.3.0
         pom
         import
       

From 5ed250d830eb5bc7172cf5f43fec3fdf2f1136cf Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Oct 2020 21:40:37 +0100
Subject: [PATCH 0445/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.9.4 (#254)

---
 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 6f1f24ff1833..bb6697e4029b 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
-    0.9.3
+    0.9.4
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 3c8a73b13b4e..4c070d380e24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.9.3
+    0.9.4
   
 
   

From d275db8e3f14783acfebb9dff7347a871dcd9727 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Oct 2020 22:36:31 +0100
Subject: [PATCH 0446/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.13.0 (#243)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4c070d380e24..f3d4ee1ff300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.8.6
+        0.13.0
         pom
         import
       

From b984e360ccaf30f55b239f831430256f3231036f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Oct 2020 22:46:14 +0100
Subject: [PATCH 0447/1784] deps: update dependency
 com.google.oauth-client:google-oauth-client to v1.31.1 (#244)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f3d4ee1ff300..bad9919e062f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
       
         com.google.oauth-client
         google-oauth-client
-        1.31.0
+        1.31.1
       
       
       

From 223330e37ec21e5d29961a6eae18093e0bfdec10 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 27 Oct 2020 14:58:05 -0700
Subject: [PATCH 0448/1784] chore: regenerate README (#253)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-10-27 21:50:13,348 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working directory clean
2020-10-27 21:50:14,366 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/99087a53-fff3-4ae7-a034-2a70a71ebda2/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 157e6c368a84..455f2f003a47 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "45e4ce6bda7a1885cc0f9ebd188b66383edde35d"
+        "sha": "b984e360ccaf30f55b239f831430256f3231036f"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "901ddd44e9ef7887ee681b9183bbdea99437fdcc"
+        "sha": "ea52b8a0bd560f72f376efcf45197fb7c8869120"
       }
     }
   ]
diff --git a/README.md b/README.md
index 43aa3c6d2e3e..0316f45f7822 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      13.1.0
+      13.3.0
       pom
       import
     

From d1fc3f4fde84703c8087213fbb24ae1c6a09a33c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 30 Oct 2020 16:36:40 -0700
Subject: [PATCH 0449/1784] chore(java): enable generated-files-bot (#255)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/2dd0fca0-df43-46b1-aa25-4c588cd16a2a/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/b19b401571e77192f8dd38eab5fb2300a0de9324
---
 .github/generated-files-bot.yml | 7 +++++++
 synth.metadata                  | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .github/generated-files-bot.yml

diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml
new file mode 100644
index 000000000000..20f3acc28172
--- /dev/null
+++ b/.github/generated-files-bot.yml
@@ -0,0 +1,7 @@
+externalManifests:
+- type: json
+  file: 'synth.metadata'
+  jsonpath: '$.generatedFiles[*]'
+- type: json
+  file: '.github/readme/synth.metadata/synth.metadata'
+  jsonpath: '$.generatedFiles[*]'
diff --git a/synth.metadata b/synth.metadata
index 5fe140103fc9..83e27ba66a3f 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "5c4dfe72fb37684e3e37f7c5061357eca2b0d893"
+        "sha": "223330e37ec21e5d29961a6eae18093e0bfdec10"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "f68649c5f26bcff6817c6d21e90dac0fc71fef8e"
+        "sha": "b19b401571e77192f8dd38eab5fb2300a0de9324"
       }
     }
   ],
@@ -40,6 +40,7 @@
     ".github/ISSUE_TEMPLATE/feature_request.md",
     ".github/ISSUE_TEMPLATE/support_request.md",
     ".github/PULL_REQUEST_TEMPLATE.md",
+    ".github/generated-files-bot.yml",
     ".github/readme/synth.py",
     ".github/release-please.yml",
     ".github/snippet-bot.yml",

From 07a193a345c2243bc0a8019230b1ac9d1d49ea88 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 5 Nov 2020 14:06:41 -0800
Subject: [PATCH 0450/1784] chore(java): use production staging bucket (#256)

Source-Author: Les Vogel 
Source-Date: Wed Nov 4 10:18:01 2020 -0800
Source-Repo: googleapis/synthtool
Source-Sha: c7824ea48ff6d4d42dfae0849aec8a85acd90bd9
Source-Link: https://github.com/googleapis/synthtool/commit/c7824ea48ff6d4d42dfae0849aec8a85acd90bd9
---
 .kokoro/release/publish_javadoc.cfg | 2 +-
 synth.metadata                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
index 5429fad5e17e..c92b0da5b7fb 100644
--- a/.kokoro/release/publish_javadoc.cfg
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -9,7 +9,7 @@ env_vars: {
 
 env_vars: {
   key: "STAGING_BUCKET_V2"
-  value: "docs-staging-v2-staging"
+  value: "docs-staging-v2"
   # Production will be at: docs-staging-v2
 }
 
diff --git a/synth.metadata b/synth.metadata
index 83e27ba66a3f..d7315b11bf74 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "223330e37ec21e5d29961a6eae18093e0bfdec10"
+        "sha": "d1fc3f4fde84703c8087213fbb24ae1c6a09a33c"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "b19b401571e77192f8dd38eab5fb2300a0de9324"
+        "sha": "c7824ea48ff6d4d42dfae0849aec8a85acd90bd9"
       }
     }
   ],

From a116501394a97345abd30e20a60369e340aec498 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 9 Nov 2020 17:33:01 -0800
Subject: [PATCH 0451/1784] chore(java): ignore return code 28 in README
 autosynth job (#257)

Exit code 28 is returned if no changes are required and should not be considered a failure.

Source-Author: Jeff Ching 
Source-Date: Mon Nov 9 14:51:28 2020 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279
Source-Link: https://github.com/googleapis/synthtool/commit/7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279
---
 .kokoro/readme.sh | 11 ++++++++++-
 synth.metadata    |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.kokoro/readme.sh b/.kokoro/readme.sh
index 023f51d863db..982fd48ee4c4 100755
--- a/.kokoro/readme.sh
+++ b/.kokoro/readme.sh
@@ -28,9 +28,18 @@ echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials
 git config --global credential.helper 'store --file ~/.git-credentials'
 
 python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool
+
+set +e
 python3.6 -m autosynth.synth \
     --repository=googleapis/java-datastore \
     --synth-file-name=.github/readme/synth.py \
     --metadata-path=.github/readme/synth.metadata \
     --pr-title="chore: regenerate README" \
-    --branch-suffix="readme"
\ No newline at end of file
+    --branch-suffix="readme"
+
+# autosynth returns 28 to signal there are no changes
+RETURN_CODE=$?
+if [[ ${RETURN_CODE} -ne 0 && ${RETURN_CODE} -ne 28 ]]
+then
+    exit ${RETURN_CODE}
+fi
diff --git a/synth.metadata b/synth.metadata
index d7315b11bf74..2742334a9a98 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "d1fc3f4fde84703c8087213fbb24ae1c6a09a33c"
+        "sha": "07a193a345c2243bc0a8019230b1ac9d1d49ea88"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c7824ea48ff6d4d42dfae0849aec8a85acd90bd9"
+        "sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279"
       }
     }
   ],

From ac3bb643d8f837f46c0356804efd6a9cede16aeb Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 13 Nov 2020 13:14:38 -0800
Subject: [PATCH 0452/1784] build(java): use code-suggester v1 tag rather than
 full semver (#258)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/46d21ebc-352c-40a7-a3eb-c0d98306d320/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/7d652819519dfa24da9e14548232e4aaba71a11c
---
 .github/workflows/formatting.yaml | 2 +-
 synth.metadata                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml
index d4d367cfce03..6844407b4d97 100644
--- a/.github/workflows/formatting.yaml
+++ b/.github/workflows/formatting.yaml
@@ -18,7 +18,7 @@ jobs:
         with:
           java-version: 11
       - run: "mvn com.coveo:fmt-maven-plugin:format"
-      - uses: googleapis/code-suggester@v1.8.0
+      - uses: googleapis/code-suggester@v1
         with:
           command: review
           pull_number: ${{ github.event.pull_request.number }}
diff --git a/synth.metadata b/synth.metadata
index 2742334a9a98..3d60b5c16eaa 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "07a193a345c2243bc0a8019230b1ac9d1d49ea88"
+        "sha": "a116501394a97345abd30e20a60369e340aec498"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279"
+        "sha": "7d652819519dfa24da9e14548232e4aaba71a11c"
       }
     }
   ],

From d6c68e7e09f5e5728f2f082d5e95503df04a2ec2 Mon Sep 17 00:00:00 2001
From: Stephanie Wang 
Date: Mon, 16 Nov 2020 18:05:00 -0500
Subject: [PATCH 0453/1784] deps: update google-cloud-shared-dependencies to
 0.15.0 (#259)

to address customer issue
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bad9919e062f..f02c1181e202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.13.0
+        0.15.0
         pom
         import
       

From 3939f32484e4b156c5c7b5f157f75980fa4c0759 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 23:16:03 +0000
Subject: [PATCH 0454/1784] chore: release 1.105.1 (#221)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.1](https://www.github.com/googleapis/java-datastore/compare/v1.105.0...v1.105.1) (2020-11-16)


### Documentation

* update google cloud libraries-bom ([#236](https://www.github.com/googleapis/java-datastore/issues/236)) ([7325fa0](https://www.github.com/googleapis/java-datastore/commit/7325fa0ba489efe31a58f64c2d3e2b55cd156822))
* update libraries-bom ([#220](https://www.github.com/googleapis/java-datastore/issues/220)) ([593fc66](https://www.github.com/googleapis/java-datastore/commit/593fc662e11ea446cd3fc7864cfa9a1b75480fba))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.13.0 ([#243](https://www.github.com/googleapis/java-datastore/issues/243)) ([d275db8](https://www.github.com/googleapis/java-datastore/commit/d275db8e3f14783acfebb9dff7347a871dcd9727))
* update dependency com.google.oauth-client:google-oauth-client to v1.31.1 ([#244](https://www.github.com/googleapis/java-datastore/issues/244)) ([b984e36](https://www.github.com/googleapis/java-datastore/commit/b984e360ccaf30f55b239f831430256f3231036f))
* update google-cloud-shared-dependencies to 0.15.0 ([#259](https://www.github.com/googleapis/java-datastore/issues/259)) ([d6c68e7](https://www.github.com/googleapis/java-datastore/commit/d6c68e7e09f5e5728f2f082d5e95503df04a2ec2))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 15 +++++++++++++++
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 6 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e0c6283bde8..03b22aa74ad2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+### [1.105.1](https://www.github.com/googleapis/java-datastore/compare/v1.105.0...v1.105.1) (2020-11-16)
+
+
+### Documentation
+
+* update google cloud libraries-bom ([#236](https://www.github.com/googleapis/java-datastore/issues/236)) ([7325fa0](https://www.github.com/googleapis/java-datastore/commit/7325fa0ba489efe31a58f64c2d3e2b55cd156822))
+* update libraries-bom ([#220](https://www.github.com/googleapis/java-datastore/issues/220)) ([593fc66](https://www.github.com/googleapis/java-datastore/commit/593fc662e11ea446cd3fc7864cfa9a1b75480fba))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.13.0 ([#243](https://www.github.com/googleapis/java-datastore/issues/243)) ([d275db8](https://www.github.com/googleapis/java-datastore/commit/d275db8e3f14783acfebb9dff7347a871dcd9727))
+* update dependency com.google.oauth-client:google-oauth-client to v1.31.1 ([#244](https://www.github.com/googleapis/java-datastore/issues/244)) ([b984e36](https://www.github.com/googleapis/java-datastore/commit/b984e360ccaf30f55b239f831430256f3231036f))
+* update google-cloud-shared-dependencies to 0.15.0 ([#259](https://www.github.com/googleapis/java-datastore/issues/259)) ([d6c68e7](https://www.github.com/googleapis/java-datastore/commit/d6c68e7e09f5e5728f2f082d5e95503df04a2ec2))
+
 ## [1.105.0](https://www.github.com/googleapis/java-datastore/compare/v1.104.0...v1.105.0) (2020-09-01)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index bb6697e4029b..912eca450881 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
-  1.105.1-SNAPSHOT
+  1.105.1
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.1-SNAPSHOT
+        0.88.1
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.1-SNAPSHOT
+        1.105.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0762435b6476..4ba8ea20d9d8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.1-SNAPSHOT
+  1.105.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.1-SNAPSHOT
+    1.105.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index f02c1181e202..37a7e12c2b4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.1-SNAPSHOT
+  1.105.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.1-SNAPSHOT
+        0.88.1
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ed4a93692659..bf555fc458d5 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.88.1-SNAPSHOT
+  0.88.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.1-SNAPSHOT
+    1.105.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 690baaa8d096..1651475809e7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.0:1.105.1-SNAPSHOT
-google-cloud-datastore-bom:1.105.0:1.105.1-SNAPSHOT
-google-cloud-datastore-parent:1.105.0:1.105.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.0:0.88.1-SNAPSHOT
+google-cloud-datastore:1.105.1:1.105.1
+google-cloud-datastore-bom:1.105.1:1.105.1
+google-cloud-datastore-parent:1.105.1:1.105.1
+proto-google-cloud-datastore-v1:0.88.1:0.88.1
 

From 1d807e6df139399f296c4e780864bf5f5e5acb6e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 17 Nov 2020 09:12:02 +0000
Subject: [PATCH 0455/1784] chore: release 1.105.2-SNAPSHOT (#260)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 912eca450881..4a906012daf3 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
-  1.105.1
+  1.105.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.1
+        0.88.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.1
+        1.105.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4ba8ea20d9d8..1b2deeee9680 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.1
+  1.105.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.1
+    1.105.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 37a7e12c2b4f..b31926698e01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.1
+  1.105.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.1
+        0.88.2-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index bf555fc458d5..d428577520b6 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.88.1
+  0.88.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.1
+    1.105.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 1651475809e7..228e0e125a8d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.1:1.105.1
-google-cloud-datastore-bom:1.105.1:1.105.1
-google-cloud-datastore-parent:1.105.1:1.105.1
-proto-google-cloud-datastore-v1:0.88.1:0.88.1
+google-cloud-datastore:1.105.1:1.105.2-SNAPSHOT
+google-cloud-datastore-bom:1.105.1:1.105.2-SNAPSHOT
+google-cloud-datastore-parent:1.105.1:1.105.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.1:0.88.2-SNAPSHOT
 

From 45918ec931dd9ba02672ebaf7209771fa871a8ca Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 17 Nov 2020 01:20:03 -0800
Subject: [PATCH 0456/1784] chore: regenerate README (#261)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-11-17 09:14:13,173 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working directory clean
2020-11-17 09:14:14,112 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/64a78e82-232a-41f0-8637-ec3cdd463250/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 455f2f003a47..4f5b92f83701 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "b984e360ccaf30f55b239f831430256f3231036f"
+        "sha": "1d807e6df139399f296c4e780864bf5f5e5acb6e"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "ea52b8a0bd560f72f376efcf45197fb7c8869120"
+        "sha": "d5fc0bcf9ea9789c5b0e3154a9e3b29e5cea6116"
       }
     }
   ]
diff --git a/README.md b/README.md
index 0316f45f7822..2a44564127e4 100644
--- a/README.md
+++ b/README.md
@@ -45,11 +45,11 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.0'
+compile 'com.google.cloud:google-cloud-datastore:1.105.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.1"
 ```
 
 ## Authentication

From 0a0816e6d3f66dc870b53c2baf475be199153755 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 18 Nov 2020 09:56:11 -0800
Subject: [PATCH 0457/1784] build(java): use actions/github-script v3 tag
 rather than full semver (#262)

So that renovate-bot stops proposing PRs like [this](https://github.com/googleapis/java-bigquerydatatransfer/pull/515/files)!

Source-Author: Stephanie Wang 
Source-Date: Tue Nov 17 13:02:02 2020 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58
Source-Link: https://github.com/googleapis/synthtool/commit/7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58
---
 .github/workflows/approve-readme.yaml | 2 +-
 .github/workflows/auto-release.yaml   | 2 +-
 synth.metadata                        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index e2d841d6c5a0..7513acaebcc2 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
     steps:
-      - uses: actions/github-script@v3.0.0
+      - uses: actions/github-script@v3
         with:
           github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
           script: |
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index bc1554aecba2..2b6cdbc976c4 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.head_ref, 'release-v')
     steps:
-    - uses: actions/github-script@v3.0.0
+    - uses: actions/github-script@v3
       with:
         github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
         debug: true
diff --git a/synth.metadata b/synth.metadata
index 3d60b5c16eaa..f0ad1db8b11d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a116501394a97345abd30e20a60369e340aec498"
+        "sha": "45918ec931dd9ba02672ebaf7209771fa871a8ca"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7d652819519dfa24da9e14548232e4aaba71a11c"
+        "sha": "7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58"
       }
     }
   ],

From 83a0a61c19b0256b930a2b50a4be728f03922e48 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 19 Nov 2020 17:58:34 +0100
Subject: [PATCH 0458/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v13.4.0 (#264)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `13.3.0` -> `13.4.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d69b3e276b50..e241dc557c4e 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        13.3.0
+        13.4.0
         pom
         import
       

From b660f4475a16b9730c0338f20aa259153a31ffd3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 19 Nov 2020 18:40:32 +0100
Subject: [PATCH 0459/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.1 (#263)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | patch | `1.105.0` -> `1.105.1` |

---

### Release Notes



googleapis/java-datastore

### [`v1.105.1`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11051-httpswwwgithubcomgoogleapisjava-datastorecomparev11050v11051-2020-11-16)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.105.0...v1.105.1)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 97a3188711b0..28a3bffd2929 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
-      1.105.0
+      1.105.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3aa28a25befd..eb11e4e435ee 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.0
+      1.105.1
     
 
     

From 3f165c7843b7241340eae8e9ad391357e36df237 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 20 Nov 2020 17:05:18 +0100
Subject: [PATCH 0460/1784] deps: update dependency
 com.google.oauth-client:google-oauth-client to v1.31.2 (#265)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b31926698e01..73873ae8819b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
       
         com.google.oauth-client
         google-oauth-client
-        1.31.1
+        1.31.2
       
       
       

From 29f9dcb0a99d6a642244eb1f246dace3f1794da6 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 20 Nov 2020 08:08:14 -0800
Subject: [PATCH 0461/1784] chore(java): retry staging portion of the release
 with backoff (#268)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/a571fa0d-937f-4072-b361-6272dcdc7f29/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/68742c6016bf0d16948a572633d17955a8737414
---
 .kokoro/common.sh        |  1 -
 .kokoro/release/stage.sh | 17 ++++++++++-------
 synth.metadata           |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index a8d0ea04d37d..ace89f45a9de 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -25,7 +25,6 @@ function retry_with_backoff {
     
     # allow a failures to continue
     set +e
-    echo "${command}"
     ${command}
     exit_code=$?
 
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 3c482cbc55f1..16126d2eb53f 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -20,19 +20,22 @@ python3 -m pip install gcp-releasetool
 python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
 
 source $(dirname "$0")/common.sh
+source $(dirname "$0")/../common.sh
 MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
 pushd $(dirname "$0")/../../
 
 setup_environment_secrets
 create_settings_xml_file "settings.xml"
 
-mvn clean install deploy -B \
-  --settings ${MAVEN_SETTINGS_FILE} \
-  -DskipTests=true \
-  -DperformRelease=true \
-  -Dgpg.executable=gpg \
-  -Dgpg.passphrase=${GPG_PASSPHRASE} \
-  -Dgpg.homedir=${GPG_HOMEDIR}
+# attempt to stage 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn clean install deploy -B \
+    --settings ${MAVEN_SETTINGS_FILE} \
+    -DskipTests=true \
+    -DperformRelease=true \
+    -Dgpg.executable=gpg \
+    -Dgpg.passphrase=${GPG_PASSPHRASE} \
+    -Dgpg.homedir=${GPG_HOMEDIR}
 
 if [[ -n "${AUTORELEASE_PR}" ]]
 then
diff --git a/synth.metadata b/synth.metadata
index f0ad1db8b11d..2849699567f6 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "45918ec931dd9ba02672ebaf7209771fa871a8ca"
+        "sha": "b660f4475a16b9730c0338f20aa259153a31ffd3"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58"
+        "sha": "68742c6016bf0d16948a572633d17955a8737414"
       }
     }
   ],

From 5d069507295f9f2bea0502dd010cdaa69883a580 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 20 Nov 2020 16:12:09 +0000
Subject: [PATCH 0462/1784] chore: release 1.105.2 (#269)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.2](https://www.github.com/googleapis/java-datastore/compare/v1.105.1...v1.105.2) (2020-11-20)


### Dependencies

* update dependency com.google.oauth-client:google-oauth-client to v1.31.2 ([#265](https://www.github.com/googleapis/java-datastore/issues/265)) ([3f165c7](https://www.github.com/googleapis/java-datastore/commit/3f165c7843b7241340eae8e9ad391357e36df237))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03b22aa74ad2..8b3af1e13da6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.105.2](https://www.github.com/googleapis/java-datastore/compare/v1.105.1...v1.105.2) (2020-11-20)
+
+
+### Dependencies
+
+* update dependency com.google.oauth-client:google-oauth-client to v1.31.2 ([#265](https://www.github.com/googleapis/java-datastore/issues/265)) ([3f165c7](https://www.github.com/googleapis/java-datastore/commit/3f165c7843b7241340eae8e9ad391357e36df237))
+
 ### [1.105.1](https://www.github.com/googleapis/java-datastore/compare/v1.105.0...v1.105.1) (2020-11-16)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4a906012daf3..ae94b5f5eeb8 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
-  1.105.2-SNAPSHOT
+  1.105.2
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.2-SNAPSHOT
+        0.88.2
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.2-SNAPSHOT
+        1.105.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1b2deeee9680..ab709996ebfe 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.2-SNAPSHOT
+  1.105.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.2-SNAPSHOT
+    1.105.2
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 73873ae8819b..375403cb0959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.2-SNAPSHOT
+  1.105.2
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.2-SNAPSHOT
+        0.88.2
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d428577520b6..36fec3b8499c 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.88.2-SNAPSHOT
+  0.88.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.2-SNAPSHOT
+    1.105.2
   
   
     
diff --git a/versions.txt b/versions.txt
index 228e0e125a8d..bceab0a03e49 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.1:1.105.2-SNAPSHOT
-google-cloud-datastore-bom:1.105.1:1.105.2-SNAPSHOT
-google-cloud-datastore-parent:1.105.1:1.105.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.1:0.88.2-SNAPSHOT
+google-cloud-datastore:1.105.2:1.105.2
+google-cloud-datastore-bom:1.105.2:1.105.2
+google-cloud-datastore-parent:1.105.2:1.105.2
+proto-google-cloud-datastore-v1:0.88.2:0.88.2
 

From 964f59ee6b126adc0f0d5224e4dabd21d2d2745f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Sat, 21 Nov 2020 09:10:03 +0000
Subject: [PATCH 0463/1784] chore: release 1.105.3-SNAPSHOT (#271)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ae94b5f5eeb8..4b3bbe900b30 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
-  1.105.2
+  1.105.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.2
+        0.88.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.2
+        1.105.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ab709996ebfe..9ffbd8444716 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.2
+  1.105.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.2
+    1.105.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 375403cb0959..a4ae0d703c70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.2
+  1.105.3-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.2
+        0.88.3-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 36fec3b8499c..682d411485c1 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.88.2
+  0.88.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.2
+    1.105.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index bceab0a03e49..cc3444625b5c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.2:1.105.2
-google-cloud-datastore-bom:1.105.2:1.105.2
-google-cloud-datastore-parent:1.105.2:1.105.2
-proto-google-cloud-datastore-v1:0.88.2:0.88.2
+google-cloud-datastore:1.105.2:1.105.3-SNAPSHOT
+google-cloud-datastore-bom:1.105.2:1.105.3-SNAPSHOT
+google-cloud-datastore-parent:1.105.2:1.105.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.2:0.88.3-SNAPSHOT
 

From 1192a701569b30a00f3255ba9b801651c9b1ad55 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 24 Nov 2020 13:12:19 -0800
Subject: [PATCH 0464/1784] build(java): enable blunderbuss for samples (#273)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/10ed3537-c223-47a2-9e7d-6b4c309f0b8e/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/943bb78606d035001123030067dffcc34f4645f2
---
 .github/blunderbuss.yml | 7 +++++++
 synth.metadata          | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .github/blunderbuss.yml

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
new file mode 100644
index 000000000000..1a23ea42b141
--- /dev/null
+++ b/.github/blunderbuss.yml
@@ -0,0 +1,7 @@
+# Configuration for the Blunderbuss GitHub app. For more info see
+# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+assign_prs_by:
+- labels:
+  - samples
+  to:
+  - googleapis/java-samples-reviewers
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index 2849699567f6..4add5a7ba703 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "b660f4475a16b9730c0338f20aa259153a31ffd3"
+        "sha": "964f59ee6b126adc0f0d5224e4dabd21d2d2745f"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "68742c6016bf0d16948a572633d17955a8737414"
+        "sha": "943bb78606d035001123030067dffcc34f4645f2"
       }
     }
   ],
@@ -40,6 +40,7 @@
     ".github/ISSUE_TEMPLATE/feature_request.md",
     ".github/ISSUE_TEMPLATE/support_request.md",
     ".github/PULL_REQUEST_TEMPLATE.md",
+    ".github/blunderbuss.yml",
     ".github/generated-files-bot.yml",
     ".github/readme/synth.py",
     ".github/release-please.yml",

From 6862fa43c9bfd3f32a1da2ec188379a8427594aa Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 25 Nov 2020 18:26:17 +0100
Subject: [PATCH 0465/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v16 (#266)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e241dc557c4e..d593165e3471 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        13.4.0
+        16.1.0
         pom
         import
       

From 517b0ec901145c2bd46b714079d193116b988fbe Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 25 Nov 2020 09:34:48 -0800
Subject: [PATCH 0466/1784] chore: regenerate README (#267)

---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 4f5b92f83701..6a02074ed5bf 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "1d807e6df139399f296c4e780864bf5f5e5acb6e"
+        "sha": "83a0a61c19b0256b930a2b50a4be728f03922e48"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "d5fc0bcf9ea9789c5b0e3154a9e3b29e5cea6116"
+        "sha": "39b7149da4026765385403632db3c6f63db96b2c"
       }
     }
   ]
diff --git a/README.md b/README.md
index 2a44564127e4..129623ebffd2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      13.3.0
+      13.4.0
       pom
       import
     

From eb3339b7a1001e94e9145f49604ff64aa35c917f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 25 Nov 2020 20:14:13 +0100
Subject: [PATCH 0467/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.2 (#270)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 28a3bffd2929..5c34e98d373f 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
-      1.105.1
+      1.105.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index eb11e4e435ee..23cee9aa8894 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.1
+      1.105.2
     
 
     

From fbfa25bf7ef717ec12364ccd76e7f5b35d51234e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 2 Dec 2020 22:24:09 +0100
Subject: [PATCH 0468/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.16.0 (#277)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | minor | `0.15.0` -> `0.16.0` |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.16.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0160-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0150v0160-2020-12-02)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.15.0...v0.16.0)

##### Dependencies

-   update dependency com.fasterxml.jackson:jackson-bom to v2.12.0 ([#​225](https://www.github.com/googleapis/java-shared-dependencies/issues/225)) ([b78a1ef](https://www.github.com/googleapis/java-shared-dependencies/commit/b78a1ef83ad946b0d29cd0dff46e48fbde44d120))
-   update dependency com.google.api-client:google-api-client-bom to v1.31.1 ([#​215](https://www.github.com/googleapis/java-shared-dependencies/issues/215)) ([08d643a](https://www.github.com/googleapis/java-shared-dependencies/commit/08d643aaf289984b87d734274830712af82585b6))
-   update dependency com.google.protobuf:protobuf-bom to v3.14.0 ([#​217](https://www.github.com/googleapis/java-shared-dependencies/issues/217)) ([01a9c64](https://www.github.com/googleapis/java-shared-dependencies/commit/01a9c6442906e8482a53712eba95ccc6f7040928))
-   update dependency io.grpc:grpc-bom to v1.34.0 ([#​228](https://www.github.com/googleapis/java-shared-dependencies/issues/228)) ([425d1ea](https://www.github.com/googleapis/java-shared-dependencies/commit/425d1eab2a046c365f816f946576e4030e7c3696))
-   update gax.version to v1.60.1 ([#​223](https://www.github.com/googleapis/java-shared-dependencies/issues/223)) ([84c75bd](https://www.github.com/googleapis/java-shared-dependencies/commit/84c75bdbd3f86ef7187373289ee08ad3a0c24719))
-   update google.core.version to v1.94.0 ([#​212](https://www.github.com/googleapis/java-shared-dependencies/issues/212)) ([764ef5e](https://www.github.com/googleapis/java-shared-dependencies/commit/764ef5e9a2272cd9244a8fc5cc107ffacf9e9d5b))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 a4ae0d703c70..0a5f08de6170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.15.0
+        0.16.0
         pom
         import
       

From 7a5ebf6ecfd3a6ac11235a1ed07b9e3aa68a391d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 22:14:24 +0000
Subject: [PATCH 0469/1784] chore: release 1.105.3 (#278)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.3](https://www.github.com/googleapis/java-datastore/compare/v1.105.2...v1.105.3) (2020-12-02)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#277](https://www.github.com/googleapis/java-datastore/issues/277)) ([fbfa25b](https://www.github.com/googleapis/java-datastore/commit/fbfa25bf7ef717ec12364ccd76e7f5b35d51234e))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b3af1e13da6..c5d3aef49cbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.105.3](https://www.github.com/googleapis/java-datastore/compare/v1.105.2...v1.105.3) (2020-12-02)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#277](https://www.github.com/googleapis/java-datastore/issues/277)) ([fbfa25b](https://www.github.com/googleapis/java-datastore/commit/fbfa25bf7ef717ec12364ccd76e7f5b35d51234e))
+
 ### [1.105.2](https://www.github.com/googleapis/java-datastore/compare/v1.105.1...v1.105.2) (2020-11-20)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4b3bbe900b30..6a17c4fcaca9 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
-  1.105.3-SNAPSHOT
+  1.105.3
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.3-SNAPSHOT
+        0.88.3
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.3-SNAPSHOT
+        1.105.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9ffbd8444716..3f7928345109 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.3-SNAPSHOT
+  1.105.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.3-SNAPSHOT
+    1.105.3
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 0a5f08de6170..8bf3c2064e05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.3-SNAPSHOT
+  1.105.3
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.3-SNAPSHOT
+        0.88.3
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 682d411485c1..bb39b441eed3 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.88.3-SNAPSHOT
+  0.88.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.3-SNAPSHOT
+    1.105.3
   
   
     
diff --git a/versions.txt b/versions.txt
index cc3444625b5c..02300445c25a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.2:1.105.3-SNAPSHOT
-google-cloud-datastore-bom:1.105.2:1.105.3-SNAPSHOT
-google-cloud-datastore-parent:1.105.2:1.105.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.2:0.88.3-SNAPSHOT
+google-cloud-datastore:1.105.3:1.105.3
+google-cloud-datastore-bom:1.105.3:1.105.3
+google-cloud-datastore-parent:1.105.3:1.105.3
+proto-google-cloud-datastore-v1:0.88.3:0.88.3
 

From 11bd1890490aeddc7f2d91a3c71f6fe33ca571ac Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 3 Dec 2020 09:28:03 +0000
Subject: [PATCH 0470/1784] chore: release 1.105.4-SNAPSHOT (#280)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6a17c4fcaca9..3c0af99bdcc7 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
-  1.105.3
+  1.105.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.3
+        0.88.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.3
+        1.105.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3f7928345109..e092ffddc3d9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.3
+  1.105.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.3
+    1.105.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 8bf3c2064e05..3f18bedd698d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.3
+  1.105.4-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.3
+        0.88.4-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index bb39b441eed3..ded8873e842d 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.88.3
+  0.88.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.3
+    1.105.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 02300445c25a..eef776db104a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.3:1.105.3
-google-cloud-datastore-bom:1.105.3:1.105.3
-google-cloud-datastore-parent:1.105.3:1.105.3
-proto-google-cloud-datastore-v1:0.88.3:0.88.3
+google-cloud-datastore:1.105.3:1.105.4-SNAPSHOT
+google-cloud-datastore-bom:1.105.3:1.105.4-SNAPSHOT
+google-cloud-datastore-parent:1.105.3:1.105.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.3:0.88.4-SNAPSHOT
 

From 4c8d52f942aec897099d52cf54cdb4c33ab390cc Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 8 Dec 2020 11:24:15 -0800
Subject: [PATCH 0471/1784] chore: Update publish_javadoc.sh (#281)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/ac2da3dd-6246-4a6b-aec0-9614b3823dfa/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/5d11bd2888c38ce1fb6fa6bf25494a4219a73928
---
 .kokoro/release/publish_javadoc.sh | 7 ++++---
 synth.metadata                     | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 4cbf02bc8967..7f563e24e312 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -38,8 +38,8 @@ python3 -m pip install gcp-docuploader
 # compile all packages
 mvn clean install -B -q -DskipTests=true
 
-NAME=google-cloud-datastore
-VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+export NAME=google-cloud-datastore
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 
 # build the docs
 mvn site -B -q
@@ -59,7 +59,8 @@ python3 -m docuploader upload . \
 
 popd
 
-# V2
+# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required.  Beware of accidental updates.
+
 mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"
 
 pushd target/devsite/reference
diff --git a/synth.metadata b/synth.metadata
index 4add5a7ba703..a700a104eb80 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "964f59ee6b126adc0f0d5224e4dabd21d2d2745f"
+        "sha": "11bd1890490aeddc7f2d91a3c71f6fe33ca571ac"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "943bb78606d035001123030067dffcc34f4645f2"
+        "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928"
       }
     }
   ],

From 7203098e4ab09bb73c3b66ff4c6100aac02d20c4 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 11 Dec 2020 04:03:19 +0530
Subject: [PATCH 0472/1784] fix: broken links (#276)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 129623ebffd2..f27435013b4b 100644
--- a/README.md
+++ b/README.md
@@ -180,12 +180,12 @@ if (entity != null) {
 ```
 
 The complete source code can be found at
-[UpdateEntity.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
+[UpdateEntity.java](https://github.com/googleapis/google-cloud-java/blob/master/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
 
 #### Complete source code
 
 In
-[AddEntitiesAndRunQuery.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
+[AddEntitiesAndRunQuery.java](https://github.com/googleapis/google-cloud-java/blob/master/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
 we put together all the code to store data and run queries into one program. The program assumes that you are
 running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
 the code from the main method to your application's servlet class and change the print statements to

From 5b4a9f71ef37eaa17d4dbc02a3817e1b42de6aef Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 10 Dec 2020 23:34:29 +0100
Subject: [PATCH 0473/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.3 (#282)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 5c34e98d373f..692029fa91b4 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
-      1.105.2
+      1.105.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 23cee9aa8894..97eaa090d3b9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.2
+      1.105.3
     
 
     

From b323187011d66bb12410a2f762c13bb8e21ad227 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 14 Dec 2020 22:23:38 +0100
Subject: [PATCH 0474/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.16.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f18bedd698d..8583f2fb02ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.16.0
+        0.16.1
         pom
         import
       

From d0854ff24e44789d87c29a17684461b057257fac Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 14 Dec 2020 14:10:41 -0800
Subject: [PATCH 0475/1784] chore: regenerate README (#285)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-12-14 21:26:09,434 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2020-12-14 21:26:10,384 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/e8ec50e2-4062-4866-8b2f-abcfa547ecc5/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata |  4 ++--
 README.md                                    | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 6a02074ed5bf..6a9e890ac487 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "83a0a61c19b0256b930a2b50a4be728f03922e48"
+        "sha": "b323187011d66bb12410a2f762c13bb8e21ad227"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "39b7149da4026765385403632db3c6f63db96b2c"
+        "sha": "996775eca5fd934edac3c2ae34b80ff0395b1717"
       }
     }
   ]
diff --git a/README.md b/README.md
index f27435013b4b..8311fe59427b 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      13.4.0
+      16.1.0
       pom
       import
     
@@ -38,18 +38,18 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.105.0
+  1.105.3
 
 
 ```
 
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.1'
+compile 'com.google.cloud:google-cloud-datastore:1.105.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.3"
 ```
 
 ## Authentication
@@ -180,12 +180,12 @@ if (entity != null) {
 ```
 
 The complete source code can be found at
-[UpdateEntity.java](https://github.com/googleapis/google-cloud-java/blob/master/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
+[UpdateEntity.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
 
 #### Complete source code
 
 In
-[AddEntitiesAndRunQuery.java](https://github.com/googleapis/google-cloud-java/blob/master/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
+[AddEntitiesAndRunQuery.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
 we put together all the code to store data and run queries into one program. The program assumes that you are
 running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
 the code from the main method to your application's servlet class and change the print statements to
@@ -260,6 +260,8 @@ Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
 Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
 Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
 
+Java is a registered trademark of Oracle and/or its affiliates.
+
 [product-docs]: https://cloud.google.com/datastore
 [javadocs]: https://googleapis.dev/java/google-cloud-datastore/latest/index.html
 [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.svg

From 86e4194bc27f90ac358da69b6394171d2d3647d6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:22:14 +0000
Subject: [PATCH 0476/1784] chore: release 1.105.4 (#283)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.4](https://www.github.com/googleapis/java-datastore/compare/v1.105.3...v1.105.4) (2020-12-14)


### Bug Fixes

* broken links ([#276](https://www.github.com/googleapis/java-datastore/issues/276)) ([7203098](https://www.github.com/googleapis/java-datastore/commit/7203098e4ab09bb73c3b66ff4c6100aac02d20c4))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.1 ([b323187](https://www.github.com/googleapis/java-datastore/commit/b323187011d66bb12410a2f762c13bb8e21ad227))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 12 ++++++++++++
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5d3aef49cbb..59f5c8cc417b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### [1.105.4](https://www.github.com/googleapis/java-datastore/compare/v1.105.3...v1.105.4) (2020-12-14)
+
+
+### Bug Fixes
+
+* broken links ([#276](https://www.github.com/googleapis/java-datastore/issues/276)) ([7203098](https://www.github.com/googleapis/java-datastore/commit/7203098e4ab09bb73c3b66ff4c6100aac02d20c4))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.1 ([b323187](https://www.github.com/googleapis/java-datastore/commit/b323187011d66bb12410a2f762c13bb8e21ad227))
+
 ### [1.105.3](https://www.github.com/googleapis/java-datastore/compare/v1.105.2...v1.105.3) (2020-12-02)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3c0af99bdcc7..502c3f3e1659 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
-  1.105.4-SNAPSHOT
+  1.105.4
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.4-SNAPSHOT
+        0.88.4
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.4-SNAPSHOT
+        1.105.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e092ffddc3d9..4ba7f13f0aaf 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.4-SNAPSHOT
+  1.105.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.4-SNAPSHOT
+    1.105.4
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 8583f2fb02ec..f00d65d36922 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.4-SNAPSHOT
+  1.105.4
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.4-SNAPSHOT
+        0.88.4
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ded8873e842d..590b0c28c586 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.88.4-SNAPSHOT
+  0.88.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.4-SNAPSHOT
+    1.105.4
   
   
     
diff --git a/versions.txt b/versions.txt
index eef776db104a..21f3d588ae60 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.3:1.105.4-SNAPSHOT
-google-cloud-datastore-bom:1.105.3:1.105.4-SNAPSHOT
-google-cloud-datastore-parent:1.105.3:1.105.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.3:0.88.4-SNAPSHOT
+google-cloud-datastore:1.105.4:1.105.4
+google-cloud-datastore-bom:1.105.4:1.105.4
+google-cloud-datastore-parent:1.105.4:1.105.4
+proto-google-cloud-datastore-v1:0.88.4:0.88.4
 

From d6a12bebf6983408949982bdfd33c5b483323202 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 09:14:13 +0000
Subject: [PATCH 0477/1784] chore: release 1.105.5-SNAPSHOT (#286)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 502c3f3e1659..b40a75f4d3f4 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
-  1.105.4
+  1.105.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.4
+        0.88.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.4
+        1.105.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4ba7f13f0aaf..ae1ca9c15f14 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.4
+  1.105.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.4
+    1.105.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index f00d65d36922..64bf397657a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.4
+  1.105.5-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.4
+        0.88.5-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 590b0c28c586..0ce93c7decfa 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.88.4
+  0.88.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.4
+    1.105.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 21f3d588ae60..0dcc27fcd0b0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.4:1.105.4
-google-cloud-datastore-bom:1.105.4:1.105.4
-google-cloud-datastore-parent:1.105.4:1.105.4
-proto-google-cloud-datastore-v1:0.88.4:0.88.4
+google-cloud-datastore:1.105.4:1.105.5-SNAPSHOT
+google-cloud-datastore-bom:1.105.4:1.105.5-SNAPSHOT
+google-cloud-datastore-parent:1.105.4:1.105.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.4:0.88.5-SNAPSHOT
 

From 30f11d234e63723b0f8afe57f6d3390cb54ad9fe Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 15 Dec 2020 19:30:04 +0100
Subject: [PATCH 0478/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.17.0 (#288)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | minor | `0.16.1` -> `0.17.0` |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.17.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0170-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0161v0170-2020-12-15)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.16.1...v0.17.0)

##### Dependencies

-   update dependency com.google.guava:guava-bom to v30.1-android ([#​236](https://www.github.com/googleapis/java-shared-dependencies/issues/236)) ([78ebf7f](https://www.github.com/googleapis/java-shared-dependencies/commit/78ebf7fcec3ec0308ccd5103b719f02dde7ec6d8))
-   update dependency io.grpc:grpc-bom to v1.34.1 ([#​238](https://www.github.com/googleapis/java-shared-dependencies/issues/238)) ([ee7e020](https://www.github.com/googleapis/java-shared-dependencies/commit/ee7e020a4631f2b288d1c6f5d681423d156e3c2d))
-   update iam.version to v1.0.5 ([#​237](https://www.github.com/googleapis/java-shared-dependencies/issues/237)) ([bbe6be6](https://www.github.com/googleapis/java-shared-dependencies/commit/bbe6be650a93cf365f2439ae9c8bebf2ade83ddd))

##### [0.16.1](https://www.github.com/googleapis/java-shared-dependencies/compare/0.16.0...v0.16.1) (2020-12-14)

##### Dependencies

-   rollback gRPC to 1.33.1 ([#​234](https://www.github.com/googleapis/java-shared-dependencies/issues/234)) ([67cc384](https://www.github.com/googleapis/java-shared-dependencies/commit/67cc384bacab8592d5bbc92db2469affee473eb7))
-   update dependency com.google.auth:google-auth-library-bom to v0.22.1 ([#​229](https://www.github.com/googleapis/java-shared-dependencies/issues/229)) ([1c13161](https://www.github.com/googleapis/java-shared-dependencies/commit/1c13161fa289cd5f3923f389fd5b14f3b7b4a84d))
-   update dependency com.google.auth:google-auth-library-bom to v0.22.2 ([#​235](https://www.github.com/googleapis/java-shared-dependencies/issues/235)) ([67434eb](https://www.github.com/googleapis/java-shared-dependencies/commit/67434eb4bb0789abcabb3055155672b2c2e70125))
-   update iam.version to v1.0.4 ([#​231](https://www.github.com/googleapis/java-shared-dependencies/issues/231)) ([5edf99e](https://www.github.com/googleapis/java-shared-dependencies/commit/5edf99e0149a1b70eb52b8921e9eb04fb84d9160))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 64bf397657a7..b75f35d7574f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.16.1
+        0.17.0
         pom
         import
       

From 4494d3068917bbefee335565e803756b3835e2dd Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 19:06:03 +0000
Subject: [PATCH 0479/1784] chore: release 1.105.5 (#289)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.5](https://www.github.com/googleapis/java-datastore/compare/v1.105.4...v1.105.5) (2020-12-15)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.17.0 ([#288](https://www.github.com/googleapis/java-datastore/issues/288)) ([30f11d2](https://www.github.com/googleapis/java-datastore/commit/30f11d234e63723b0f8afe57f6d3390cb54ad9fe))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59f5c8cc417b..dffc3eff4027 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.105.5](https://www.github.com/googleapis/java-datastore/compare/v1.105.4...v1.105.5) (2020-12-15)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.17.0 ([#288](https://www.github.com/googleapis/java-datastore/issues/288)) ([30f11d2](https://www.github.com/googleapis/java-datastore/commit/30f11d234e63723b0f8afe57f6d3390cb54ad9fe))
+
 ### [1.105.4](https://www.github.com/googleapis/java-datastore/compare/v1.105.3...v1.105.4) (2020-12-14)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b40a75f4d3f4..790942fab1dc 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
-  1.105.5-SNAPSHOT
+  1.105.5
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.5-SNAPSHOT
+        0.88.5
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.5-SNAPSHOT
+        1.105.5
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ae1ca9c15f14..fab604f3ef9f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.5-SNAPSHOT
+  1.105.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.5-SNAPSHOT
+    1.105.5
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index b75f35d7574f..56d6ffffc1f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.5-SNAPSHOT
+  1.105.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.5-SNAPSHOT
+        0.88.5
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0ce93c7decfa..0a02a26c310a 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.88.5-SNAPSHOT
+  0.88.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.5-SNAPSHOT
+    1.105.5
   
   
     
diff --git a/versions.txt b/versions.txt
index 0dcc27fcd0b0..24e90c42f866 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.4:1.105.5-SNAPSHOT
-google-cloud-datastore-bom:1.105.4:1.105.5-SNAPSHOT
-google-cloud-datastore-parent:1.105.4:1.105.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.4:0.88.5-SNAPSHOT
+google-cloud-datastore:1.105.5:1.105.5
+google-cloud-datastore-bom:1.105.5:1.105.5
+google-cloud-datastore-parent:1.105.5:1.105.5
+proto-google-cloud-datastore-v1:0.88.5:0.88.5
 

From 155a122261ff6df97701f906bb87f01f42a5c834 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 15 Dec 2020 23:32:16 +0100
Subject: [PATCH 0480/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v16.2.0 (#290)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `16.1.0` -> `16.2.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d593165e3471..ffde2383039d 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        16.1.0
+        16.2.0
         pom
         import
       

From 0144d6cb9eb0f2f79e3dbcf94ce3db0c16205c4a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 23:04:06 +0000
Subject: [PATCH 0481/1784] chore: release 1.105.6-SNAPSHOT (#291)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 790942fab1dc..ec743ee5acae 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
-  1.105.5
+  1.105.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.5
+        0.88.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.5
+        1.105.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index fab604f3ef9f..f9d5beb34312 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.5
+  1.105.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.5
+    1.105.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 56d6ffffc1f3..256b3236b0f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.5
+  1.105.6-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.5
+        0.88.6-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0a02a26c310a..069981d94097 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.88.5
+  0.88.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.5
+    1.105.6-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 24e90c42f866..c376154c4e82 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.5:1.105.5
-google-cloud-datastore-bom:1.105.5:1.105.5
-google-cloud-datastore-parent:1.105.5:1.105.5
-proto-google-cloud-datastore-v1:0.88.5:0.88.5
+google-cloud-datastore:1.105.5:1.105.6-SNAPSHOT
+google-cloud-datastore-bom:1.105.5:1.105.6-SNAPSHOT
+google-cloud-datastore-parent:1.105.5:1.105.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.5:0.88.6-SNAPSHOT
 

From 92cf328e55940cba19f6911c69dd6ddf1a1a142c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 15 Dec 2020 15:16:27 -0800
Subject: [PATCH 0482/1784] chore: regenerate README (#292)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2020-12-15 22:38:02,942 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2020-12-15 22:38:03,781 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/fff790d1-39f2-45f9-bdbf-9849b3e96f8e/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 6a9e890ac487..c38515ad9f0f 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "b323187011d66bb12410a2f762c13bb8e21ad227"
+        "sha": "155a122261ff6df97701f906bb87f01f42a5c834"
       }
     },
     {
diff --git a/README.md b/README.md
index 8311fe59427b..1ec4a96f94f1 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      16.1.0
+      16.2.0
       pom
       import
     

From 5679c0446558af7f3fbba92ef703694cd14eb237 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 16 Dec 2020 08:44:33 -0800
Subject: [PATCH 0483/1784] ci(java): ignore bot users for generate-files-bot
 (#293)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/327b9688-150a-41d8-be5c-d8f2a0d78277/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/3f67ceece7e797a5736a25488aae35405649b90b
---
 .github/generated-files-bot.yml | 4 ++++
 synth.metadata                  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml
index 20f3acc28172..47c2ba132e01 100644
--- a/.github/generated-files-bot.yml
+++ b/.github/generated-files-bot.yml
@@ -5,3 +5,7 @@ externalManifests:
 - type: json
   file: '.github/readme/synth.metadata/synth.metadata'
   jsonpath: '$.generatedFiles[*]'
+ignoreAuthors:
+- 'renovate-bot'
+- 'yoshi-automation'
+- 'release-please[bot]'
diff --git a/synth.metadata b/synth.metadata
index a700a104eb80..96c1c185e301 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "11bd1890490aeddc7f2d91a3c71f6fe33ca571ac"
+        "sha": "92cf328e55940cba19f6911c69dd6ddf1a1a142c"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928"
+        "sha": "3f67ceece7e797a5736a25488aae35405649b90b"
       }
     }
   ],

From b73262b9d90d169c24dcb8eaa925858c5f9248fb Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 29 Dec 2020 14:37:50 -0800
Subject: [PATCH 0484/1784] chore(java): remove formatter action

Source-Author: Jeff Ching 
Source-Date: Tue Dec 29 10:50:17 2020 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 6133907dbb3ddab204a17a15d5c53ec0aae9b033
Source-Link: https://github.com/googleapis/synthtool/commit/6133907dbb3ddab204a17a15d5c53ec0aae9b033
---
 .github/workflows/formatting.yaml | 25 -------------------------
 synth.metadata                    |  5 ++---
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/formatting.yaml

diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml
deleted file mode 100644
index 6844407b4d97..000000000000
--- a/.github/workflows/formatting.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-    branches:
-      - master
-name: format
-jobs:
-  format-code:
-    runs-on: ubuntu-latest
-    env:
-      ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - run: "mvn com.coveo:fmt-maven-plugin:format"
-      - uses: googleapis/code-suggester@v1
-        with:
-          command: review
-          pull_number: ${{ github.event.pull_request.number }}
-          git_dir: '.'
diff --git a/synth.metadata b/synth.metadata
index 96c1c185e301..a9ef95d63879 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "92cf328e55940cba19f6911c69dd6ddf1a1a142c"
+        "sha": "5679c0446558af7f3fbba92ef703694cd14eb237"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "3f67ceece7e797a5736a25488aae35405649b90b"
+        "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033"
       }
     }
   ],
@@ -49,7 +49,6 @@
     ".github/workflows/approve-readme.yaml",
     ".github/workflows/auto-release.yaml",
     ".github/workflows/ci.yaml",
-    ".github/workflows/formatting.yaml",
     ".github/workflows/samples.yaml",
     ".kokoro/build.bat",
     ".kokoro/build.sh",

From e934906f9278b36ae20b12ee42a8f229e4c7cf43 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 7 Jan 2021 22:00:08 +0100
Subject: [PATCH 0485/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v16.2.1 (#298)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index ffde2383039d..581eac6f9202 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        16.2.0
+        16.2.1
         pom
         import
       

From e6de0325696557417c5c5f70f6cb52423f58d508 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 7 Jan 2021 22:08:16 +0100
Subject: [PATCH 0486/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.5 (#297)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 692029fa91b4..1ea4a54b1fc6 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
-      1.105.3
+      1.105.5
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 97eaa090d3b9..207d06f29cee 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.3
+      1.105.5
     
 
     

From 491dc5894e767677caa48ff8b3f2cc7fc6909a11 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 7 Jan 2021 13:10:09 -0800
Subject: [PATCH 0487/1784] chore: regenerate README (#299)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-01-07 21:02:21,798 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-01-07 21:02:22,656 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/958cbbb5-eceb-412a-a4cd-29695197db57/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata |  4 ++--
 README.md                                    | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index c38515ad9f0f..e221e9e5fa2c 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "155a122261ff6df97701f906bb87f01f42a5c834"
+        "sha": "e934906f9278b36ae20b12ee42a8f229e4c7cf43"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "996775eca5fd934edac3c2ae34b80ff0395b1717"
+        "sha": "41a4e56982620d3edcf110d76f4fcdfdec471ac8"
       }
     }
   ]
diff --git a/README.md b/README.md
index 1ec4a96f94f1..fba39ba89893 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      16.2.0
+      16.2.1
       pom
       import
     
@@ -43,13 +43,20 @@ If you are using Maven without BOM, add this to your dependencies:
 
 ```
 
-If you are using Gradle, add this to your dependencies
+If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.3'
+implementation platform('com.google.cloud:libraries-bom:16.2.1')
+
+compile 'com.google.cloud:google-cloud-datastore'
+```
+If you are using Gradle without BOM, add this to your dependencies
+```Groovy
+compile 'com.google.cloud:google-cloud-datastore:1.105.5'
 ```
+
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.5"
 ```
 
 ## Authentication

From 7033ebc7710f674097aaf932c9068add76c3e0ca Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 7 Jan 2021 13:18:06 -0800
Subject: [PATCH 0488/1784] chore: regenerate README (#300)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-01-07 21:10:38,276 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-01-07 21:10:39,231 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/65107d0b-bf65-43a1-854a-0fdbc69219be/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index e221e9e5fa2c..6b7a837431b1 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "e934906f9278b36ae20b12ee42a8f229e4c7cf43"
+        "sha": "491dc5894e767677caa48ff8b3f2cc7fc6909a11"
       }
     },
     {
diff --git a/README.md b/README.md
index fba39ba89893..22adc397a8be 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.105.3
+  1.105.5
 
 
 ```

From f03b4ceae059a6be93b48776cfcf51dbd53c8c1d Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 11 Jan 2021 21:12:40 +0100
Subject: [PATCH 0489/1784] deps: update dependency
 com.google.oauth-client:google-oauth-client to v1.31.4 (#301)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 256b3236b0f1..d6429a130c18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
       
         com.google.oauth-client
         google-oauth-client
-        1.31.2
+        1.31.4
       
       
       

From ce0030b6243409703b1648703688de19cd980aec Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 11 Jan 2021 20:34:08 +0000
Subject: [PATCH 0490/1784] chore: release 1.105.6 (#303)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.6](https://www.github.com/googleapis/java-datastore/compare/v1.105.5...v1.105.6) (2021-01-11)


### Dependencies

* update dependency com.google.oauth-client:google-oauth-client to v1.31.4 ([#301](https://www.github.com/googleapis/java-datastore/issues/301)) ([f03b4ce](https://www.github.com/googleapis/java-datastore/commit/f03b4ceae059a6be93b48776cfcf51dbd53c8c1d))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dffc3eff4027..f893da7de801 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.105.6](https://www.github.com/googleapis/java-datastore/compare/v1.105.5...v1.105.6) (2021-01-11)
+
+
+### Dependencies
+
+* update dependency com.google.oauth-client:google-oauth-client to v1.31.4 ([#301](https://www.github.com/googleapis/java-datastore/issues/301)) ([f03b4ce](https://www.github.com/googleapis/java-datastore/commit/f03b4ceae059a6be93b48776cfcf51dbd53c8c1d))
+
 ### [1.105.5](https://www.github.com/googleapis/java-datastore/compare/v1.105.4...v1.105.5) (2020-12-15)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ec743ee5acae..0f54ea8121a1 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
-  1.105.6-SNAPSHOT
+  1.105.6
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.6-SNAPSHOT
+        0.88.6
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.6-SNAPSHOT
+        1.105.6
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f9d5beb34312..578ee2ecfb46 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.6-SNAPSHOT
+  1.105.6
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.6-SNAPSHOT
+    1.105.6
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index d6429a130c18..a749f60c7acc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.6-SNAPSHOT
+  1.105.6
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.6-SNAPSHOT
+        0.88.6
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 069981d94097..0238449b4e65 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.88.6-SNAPSHOT
+  0.88.6
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.6-SNAPSHOT
+    1.105.6
   
   
     
diff --git a/versions.txt b/versions.txt
index c376154c4e82..e92b71b43688 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.5:1.105.6-SNAPSHOT
-google-cloud-datastore-bom:1.105.5:1.105.6-SNAPSHOT
-google-cloud-datastore-parent:1.105.5:1.105.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.5:0.88.6-SNAPSHOT
+google-cloud-datastore:1.105.6:1.105.6
+google-cloud-datastore-bom:1.105.6:1.105.6
+google-cloud-datastore-parent:1.105.6:1.105.6
+proto-google-cloud-datastore-v1:0.88.6:0.88.6
 

From 7db9be7a7d2b061edcba8f41a9127beb661c0a33 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 12 Jan 2021 09:08:03 +0000
Subject: [PATCH 0491/1784] chore: release 1.105.7-SNAPSHOT (#305)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0f54ea8121a1..f8c275198840 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
-  1.105.6
+  1.105.7-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.6
+        0.88.7-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.6
+        1.105.7-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 578ee2ecfb46..00313e7def3e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.6
+  1.105.7-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.6
+    1.105.7-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index a749f60c7acc..abfee3e8e5e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.6
+  1.105.7-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.6
+        0.88.7-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0238449b4e65..520c33a300c3 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.88.6
+  0.88.7-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.6
+    1.105.7-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index e92b71b43688..435476d494eb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.6:1.105.6
-google-cloud-datastore-bom:1.105.6:1.105.6
-google-cloud-datastore-parent:1.105.6:1.105.6
-proto-google-cloud-datastore-v1:0.88.6:0.88.6
+google-cloud-datastore:1.105.6:1.105.7-SNAPSHOT
+google-cloud-datastore-bom:1.105.6:1.105.7-SNAPSHOT
+google-cloud-datastore-parent:1.105.6:1.105.7-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.6:0.88.7-SNAPSHOT
 

From a695f61118c9eccfb2d0d8c5d4b9dcd8474f1d49 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 12 Jan 2021 01:16:02 -0800
Subject: [PATCH 0492/1784] chore: regenerate README (#306)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-01-12 09:10:10,903 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-01-12 09:10:11,750 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/ef18946e-82e8-4006-9fe1-a722b2e19aed/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 6b7a837431b1..d11ad1b5b038 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "491dc5894e767677caa48ff8b3f2cc7fc6909a11"
+        "sha": "7db9be7a7d2b061edcba8f41a9127beb661c0a33"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "41a4e56982620d3edcf110d76f4fcdfdec471ac8"
+        "sha": "16ec872dd898d7de6e1822badfac32484b5d9031"
       }
     }
   ]
diff --git a/README.md b/README.md
index 22adc397a8be..9c1f70dd3590 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.5'
+compile 'com.google.cloud:google-cloud-datastore:1.105.6'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.6"
 ```
 
 ## Authentication

From d1764909c89d9b987dcc5123614ccc8dbdc7c908 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 12 Jan 2021 13:15:24 +0100
Subject: [PATCH 0493/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.6 (#304)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1ea4a54b1fc6..732b0b497971 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
-      1.105.5
+      1.105.6
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 207d06f29cee..3a80c29b7160 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.5
+      1.105.6
     
 
     

From 57d01a51e7276c639f2218d6d30ad2174047ae14 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 12 Jan 2021 04:24:02 -0800
Subject: [PATCH 0494/1784] chore: regenerate README (#308)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-01-12 12:17:38,980 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-01-12 12:17:39,957 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/e3de47bd-de4b-417b-a4c5-62bc380810f3/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index d11ad1b5b038..a439100b4198 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "7db9be7a7d2b061edcba8f41a9127beb661c0a33"
+        "sha": "d1764909c89d9b987dcc5123614ccc8dbdc7c908"
       }
     },
     {
diff --git a/README.md b/README.md
index 9c1f70dd3590..d6cacf45a22d 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.105.5
+  1.105.6
 
 
 ```

From 59e011053d555fd9637cb1543fb039d456a7c259 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 15 Jan 2021 20:42:13 +0100
Subject: [PATCH 0495/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v16.3.0 (#310)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 581eac6f9202..46f30dcd7b49 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        16.2.1
+        16.3.0
         pom
         import
       

From bb693d374bfc9b3ed4f3ce5f40c60ad8607ffaa3 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 15 Jan 2021 11:52:04 -0800
Subject: [PATCH 0496/1784] chore: regenerate README (#311)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-01-15 19:44:49,314 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-01-15 19:44:50,224 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/82039860-7757-46b1-ba3f-aaeddfe1ba4b/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index a439100b4198..76a8ae344dfe 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "d1764909c89d9b987dcc5123614ccc8dbdc7c908"
+        "sha": "59e011053d555fd9637cb1543fb039d456a7c259"
       }
     },
     {
diff --git a/README.md b/README.md
index d6cacf45a22d..1216a3333381 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      16.2.1
+      16.3.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:16.2.1')
+implementation platform('com.google.cloud:libraries-bom:16.3.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 211ac202d4fd9b5b7b07bc0b21e56d98e8bc18e5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 21 Jan 2021 20:51:06 +0100
Subject: [PATCH 0497/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.18.0 (#309)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index abfee3e8e5e2..eac366c0e8ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.17.0
+        0.18.0
         pom
         import
       

From b80c990c0115d37f93e8786424a930279cd6b6da Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:02:03 +0000
Subject: [PATCH 0498/1784] chore: release 1.105.7 (#312)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.7](https://www.github.com/googleapis/java-datastore/compare/v1.105.6...v1.105.7) (2021-01-21)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.18.0 ([#309](https://www.github.com/googleapis/java-datastore/issues/309)) ([211ac20](https://www.github.com/googleapis/java-datastore/commit/211ac202d4fd9b5b7b07bc0b21e56d98e8bc18e5))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f893da7de801..0791256fe9b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.105.7](https://www.github.com/googleapis/java-datastore/compare/v1.105.6...v1.105.7) (2021-01-21)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.18.0 ([#309](https://www.github.com/googleapis/java-datastore/issues/309)) ([211ac20](https://www.github.com/googleapis/java-datastore/commit/211ac202d4fd9b5b7b07bc0b21e56d98e8bc18e5))
+
 ### [1.105.6](https://www.github.com/googleapis/java-datastore/compare/v1.105.5...v1.105.6) (2021-01-11)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f8c275198840..8c3fb34a1063 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
-  1.105.7-SNAPSHOT
+  1.105.7
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.7-SNAPSHOT
+        0.88.7
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.7-SNAPSHOT
+        1.105.7
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 00313e7def3e..ee27ede1d3ad 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.7-SNAPSHOT
+  1.105.7
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.7-SNAPSHOT
+    1.105.7
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index eac366c0e8ac..dee227c0168c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.7-SNAPSHOT
+  1.105.7
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.7-SNAPSHOT
+        0.88.7
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 520c33a300c3..3a37fec61636 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.88.7-SNAPSHOT
+  0.88.7
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.7-SNAPSHOT
+    1.105.7
   
   
     
diff --git a/versions.txt b/versions.txt
index 435476d494eb..10a323146833 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.6:1.105.7-SNAPSHOT
-google-cloud-datastore-bom:1.105.6:1.105.7-SNAPSHOT
-google-cloud-datastore-parent:1.105.6:1.105.7-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.6:0.88.7-SNAPSHOT
+google-cloud-datastore:1.105.7:1.105.7
+google-cloud-datastore-bom:1.105.7:1.105.7
+google-cloud-datastore-parent:1.105.7:1.105.7
+proto-google-cloud-datastore-v1:0.88.7:0.88.7
 

From a9c1f3f7ff6d900e86d8e6a0ae24b4b9e682b118 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 22 Jan 2021 09:08:03 +0000
Subject: [PATCH 0499/1784] chore: release 1.105.8-SNAPSHOT (#313)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8c3fb34a1063..7019cf6311b9 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
-  1.105.7
+  1.105.8-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.7
+        0.88.8-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.7
+        1.105.8-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ee27ede1d3ad..12daadc49c97 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.7
+  1.105.8-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.7
+    1.105.8-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index dee227c0168c..f3f30888553a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.7
+  1.105.8-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.7
+        0.88.8-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3a37fec61636..127e6bb73a57 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.88.7
+  0.88.8-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.7
+    1.105.8-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 10a323146833..29c02665c03c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.7:1.105.7
-google-cloud-datastore-bom:1.105.7:1.105.7
-google-cloud-datastore-parent:1.105.7:1.105.7
-proto-google-cloud-datastore-v1:0.88.7:0.88.7
+google-cloud-datastore:1.105.7:1.105.8-SNAPSHOT
+google-cloud-datastore-bom:1.105.7:1.105.8-SNAPSHOT
+google-cloud-datastore-parent:1.105.7:1.105.8-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.7:0.88.8-SNAPSHOT
 

From a9a2c83ce4b5583e53c2e04ef38642ed57802270 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 22 Jan 2021 01:16:02 -0800
Subject: [PATCH 0500/1784] chore: regenerate README (#314)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-01-22 09:10:12,454 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-01-22 09:10:13,450 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/bce3a213-14ad-404d-84f6-6be00d75f5d7/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 76a8ae344dfe..e35a28baa7bd 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "59e011053d555fd9637cb1543fb039d456a7c259"
+        "sha": "a9c1f3f7ff6d900e86d8e6a0ae24b4b9e682b118"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "16ec872dd898d7de6e1822badfac32484b5d9031"
+        "sha": "b259489b06b25f399768b74b8baa943991f38ea7"
       }
     }
   ]
diff --git a/README.md b/README.md
index 1216a3333381..6556d47311ee 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.6'
+compile 'com.google.cloud:google-cloud-datastore:1.105.7'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.6"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.7"
 ```
 
 ## Authentication

From 1d67eb7ec9ba780d8040be6ed62cb05dfbc2d6fc Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 26 Jan 2021 11:14:04 -0800
Subject: [PATCH 0501/1784] chore: adding docfx doclet resource (#318)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/11676c06-4b47-49bf-b330-a8f1fcd14996/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/3816b080296d4d52975079fd26c110dd26ba25af
---
 .kokoro/release/publish_javadoc.cfg | 3 +++
 synth.metadata                      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
index c92b0da5b7fb..046b8e1b515e 100644
--- a/.kokoro/release/publish_javadoc.cfg
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -27,3 +27,6 @@ before_action {
     }
   }
 }
+
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index a9ef95d63879..62392e3c77ae 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "5679c0446558af7f3fbba92ef703694cd14eb237"
+        "sha": "a9a2c83ce4b5583e53c2e04ef38642ed57802270"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033"
+        "sha": "3816b080296d4d52975079fd26c110dd26ba25af"
       }
     }
   ],

From e472b9be203bba11362db70961b0425b9d80123a Mon Sep 17 00:00:00 2001
From: Justin Beckwith 
Date: Thu, 28 Jan 2021 22:14:21 -0800
Subject: [PATCH 0502/1784] build: migrate to flakybot (#320)

---
 .kokoro/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index a39f066c2794..606012e761a7 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -110,8 +110,8 @@ bash .kokoro/coerce_logs.sh
 
 if [[ "${ENABLE_BUILD_COP}" == "true" ]]
 then
-    chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop
-    ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-datastore
+    chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
+    ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-datastore
 fi
 
 echo "exiting with ${RETURN_CODE}"

From 97048d66f3307ba35ca2df1fe10a10e16c974864 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 1 Feb 2021 16:03:01 +0100
Subject: [PATCH 0503/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.10.0 (#321)

---
 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 7019cf6311b9..089460083df3 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
-    0.9.4
+    0.10.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index f3f30888553a..f81db75e71f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.9.4
+    0.10.0
   
 
   

From 5abed4dbcc040f1b4c08f558cf5b44119862bf7f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 1 Feb 2021 19:09:26 +0100
Subject: [PATCH 0504/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.7 (#315)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 732b0b497971..fe1f5bc0d6b1 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
-      1.105.6
+      1.105.7
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3a80c29b7160..1fdeccc25aa8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.6
+      1.105.7
     
 
     

From 30c94f9caed22aab8882dca70a52c708391cecdb Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 1 Feb 2021 10:18:02 -0800
Subject: [PATCH 0505/1784] chore: regenerate README (#323)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-02-01 18:11:40,272 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-02-01 18:11:41,175 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/3b1a6563-1266-46f1-845c-a798e0ee6329/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index e35a28baa7bd..9ce8e3206b40 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a9c1f3f7ff6d900e86d8e6a0ae24b4b9e682b118"
+        "sha": "5abed4dbcc040f1b4c08f558cf5b44119862bf7f"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "b259489b06b25f399768b74b8baa943991f38ea7"
+        "sha": "a38d9dbf2fe5e0352b1dffd7eb15e31809c7fd62"
       }
     }
   ]
diff --git a/README.md b/README.md
index 6556d47311ee..7d0288702994 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.105.6
+  1.105.7
 
 
 ```

From cf9a158ae19859e342eb20ecff84b7ec3bb860bd Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 3 Feb 2021 09:03:57 -0800
Subject: [PATCH 0506/1784] chore: Re-generated to pick up changes from
 synthtool. (#327)

* changes without context

        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.

* build: migrate to flakybot

Source-Author: Justin Beckwith 
Source-Date: Thu Jan 28 22:22:38 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: d1bb9173100f62c0cfc8f3138b62241e7f47ca6a
Source-Link: https://github.com/googleapis/synthtool/commit/d1bb9173100f62c0cfc8f3138b62241e7f47ca6a

* build(java): generate docfx yml on release

* feat: generate docfx yml on release

* fix: updates name variable

* fix: remove non needed resource

* fix: update date

Source-Author: Emily Ball 
Source-Date: Mon Feb 1 15:24:59 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 5de29e9434b63ea6d7e46dc348521c62969af1a1
Source-Link: https://github.com/googleapis/synthtool/commit/5de29e9434b63ea6d7e46dc348521c62969af1a1

* build(java): run linkage monitor as GitHub action

Source-Author: Tomo Suzuki 
Source-Date: Tue Feb 2 16:20:26 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: e935c9ecb47da0f2e054f5f1845f7cf7c95fa625
Source-Link: https://github.com/googleapis/synthtool/commit/e935c9ecb47da0f2e054f5f1845f7cf7c95fa625
---
 .github/workflows/ci.yaml             | 13 ++++++-
 .kokoro/linkage-monitor.sh            | 46 ----------------------
 .kokoro/release/publish_javadoc.cfg   |  5 +--
 .kokoro/release/publish_javadoc11.cfg | 30 +++++++++++++++
 .kokoro/release/publish_javadoc11.sh  | 55 +++++++++++++++++++++++++++
 synth.metadata                        |  7 ++--
 6 files changed, 102 insertions(+), 54 deletions(-)
 delete mode 100755 .kokoro/linkage-monitor.sh
 create mode 100644 .kokoro/release/publish_javadoc11.cfg
 create mode 100755 .kokoro/release/publish_javadoc11.sh

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 683022075665..98a472e132d6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -54,7 +54,18 @@ jobs:
       with:
         java-version: 8
     - run: java -version
-    - run: .kokoro/linkage-monitor.sh
+    - name: Install artifacts to local Maven repository
+      run: |
+        source .kokoro/common.sh
+        retry_with_backoff 3 10 \
+            mvn install -B -V \
+                -Dmaven.test.skip -DskipTests=true \
+                -Dclirr.skip=true \
+                -Denforcer.skip=true \
+                -Dmaven.javadoc.skip=true \
+                -Dgcloud.download.skip=true
+      shell: bash
+    - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
   lint:
     runs-on: ubuntu-latest
     steps:
diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
deleted file mode 100755
index 759ab4e2c220..000000000000
--- a/.kokoro/linkage-monitor.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-# Copyright 2019 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.
-
-set -eo pipefail
-# Display commands being run.
-set -x
-
-## Get the directory of the build script
-scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-## cd to the parent directory, i.e. the root of the git repo
-cd ${scriptDir}/..
-
-# include common functions
-source ${scriptDir}/common.sh
-
-# Print out Java version
-java -version
-echo ${JOB_TYPE}
-
-# attempt to install 3 times with exponential backoff (starting with 10 seconds)
-retry_with_backoff 3 10 \
-  mvn install -B -V \
-    -DskipTests=true \
-    -Dclirr.skip=true \
-    -Denforcer.skip=true \
-    -Dmaven.javadoc.skip=true \
-    -Dgcloud.download.skip=true
-
-# Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
-JAR=linkage-monitor-latest-all-deps.jar
-curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}"
-
-# Fails if there's new linkage errors compared with baseline
-java -jar ${JAR} com.google.cloud:libraries-bom
diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
index 046b8e1b515e..a884714d5d19 100644
--- a/.kokoro/release/publish_javadoc.cfg
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -26,7 +26,4 @@ before_action {
       keyname: "docuploader_service_account"
     }
   }
-}
-
-# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg
new file mode 100644
index 000000000000..2ddd71ce63ec
--- /dev/null
+++ b/.kokoro/release/publish_javadoc11.cfg
@@ -0,0 +1,30 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "STAGING_BUCKET_V2"
+  value: "docs-staging-v2"
+  # Production will be at: docs-staging-v2
+}
+
+# Configure the docker image for kokoro-trampoline
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/java-memcache/.kokoro/release/publish_javadoc11.sh"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "docuploader_service_account"
+    }
+  }
+}
+
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
\ No newline at end of file
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
new file mode 100755
index 000000000000..34ff55ebcf59
--- /dev/null
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+# Copyright 2021 Google Inc.
+#
+# 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.
+
+set -eo pipefail
+
+if [[ -z "${CREDENTIALS}" ]]; then
+  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
+fi
+
+if [[ -z "${STAGING_BUCKET_V2}" ]]; then
+  echo "Need to set STAGING_BUCKET_V2 environment variable"
+  exit 1
+fi
+
+# work from the git root directory
+pushd $(dirname "$0")/../../
+
+# install docuploader package
+python3 -m pip install gcp-docuploader
+
+# compile all packages
+mvn clean install -B -q -DskipTests=true
+
+export NAME=google-cloud-datastore
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+
+# V3 generates docfx yml from javadoc
+# generate yml
+mvn clean site -B -q -P docFX
+
+pushd target/docfx-yml
+
+# create metadata
+python3 -m docuploader create-metadata \
+ --name ${NAME} \
+ --version ${VERSION} \
+ --language java
+
+# upload yml
+python3 -m docuploader upload . \
+ --credentials ${CREDENTIALS} \
+ --staging-bucket ${STAGING_BUCKET_V2} \
+ --destination-prefix docfx-
diff --git a/synth.metadata b/synth.metadata
index 62392e3c77ae..2b36d4bf99e2 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a9a2c83ce4b5583e53c2e04ef38642ed57802270"
+        "sha": "30c94f9caed22aab8882dca70a52c708391cecdb"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "3816b080296d4d52975079fd26c110dd26ba25af"
+        "sha": "e935c9ecb47da0f2e054f5f1845f7cf7c95fa625"
       }
     }
   ],
@@ -59,7 +59,6 @@
     ".kokoro/continuous/java8.cfg",
     ".kokoro/continuous/readme.cfg",
     ".kokoro/dependencies.sh",
-    ".kokoro/linkage-monitor.sh",
     ".kokoro/nightly/common.cfg",
     ".kokoro/nightly/integration.cfg",
     ".kokoro/nightly/java11.cfg",
@@ -91,6 +90,8 @@
     ".kokoro/release/promote.sh",
     ".kokoro/release/publish_javadoc.cfg",
     ".kokoro/release/publish_javadoc.sh",
+    ".kokoro/release/publish_javadoc11.cfg",
+    ".kokoro/release/publish_javadoc11.sh",
     ".kokoro/release/snapshot.cfg",
     ".kokoro/release/snapshot.sh",
     ".kokoro/release/stage.cfg",

From bb743ebcd4e24708f61a68441cae8920fdfab19c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 4 Feb 2021 10:00:15 -0800
Subject: [PATCH 0507/1784] build(java): update autorelease branch name check
 (#328)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/1bee5a28-eca1-4bf4-bafb-e5d12b2af620/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/140ba24a136c63e7f10a998a63e7898aed63ea7d
---
 .github/workflows/auto-release.yaml | 2 +-
 synth.metadata                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 2b6cdbc976c4..76e6404b4e09 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -17,7 +17,7 @@ jobs:
           }
 
           // only approve PRs like "chore: release "
-          if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+          if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
             return;
           }
 
diff --git a/synth.metadata b/synth.metadata
index 2b36d4bf99e2..0163fbecb41e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "30c94f9caed22aab8882dca70a52c708391cecdb"
+        "sha": "cf9a158ae19859e342eb20ecff84b7ec3bb860bd"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "e935c9ecb47da0f2e054f5f1845f7cf7c95fa625"
+        "sha": "140ba24a136c63e7f10a998a63e7898aed63ea7d"
       }
     }
   ],

From 65edd7d9dbdb34f4939bb9a81c3712a2248e1a4b Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 4 Feb 2021 16:26:07 -0800
Subject: [PATCH 0508/1784] chore: Re-generated to pick up changes from
 synthtool. (#329)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/6e80cdc5-e3cc-4a87-af9b-624be8759c22/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5
Source-Link: https://github.com/googleapis/synthtool/commit/27b2d4f4674840628d0b75c5941e89c12af4764f
---
 .kokoro/release/publish_javadoc11.cfg | 4 ++--
 LICENSE                               | 1 -
 synth.metadata                        | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg
index 2ddd71ce63ec..dcdd6a4d4f54 100644
--- a/.kokoro/release/publish_javadoc11.cfg
+++ b/.kokoro/release/publish_javadoc11.cfg
@@ -14,7 +14,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-memcache/.kokoro/release/publish_javadoc11.sh"
+  value: "github/java-datastore/.kokoro/release/publish_javadoc11.sh"
 }
 
 before_action {
@@ -27,4 +27,4 @@ before_action {
 }
 
 # Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
\ No newline at end of file
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
diff --git a/LICENSE b/LICENSE
index d64569567334..261eeb9e9f8b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/synth.metadata b/synth.metadata
index 0163fbecb41e..52d8b3b4b721 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "cf9a158ae19859e342eb20ecff84b7ec3bb860bd"
+        "sha": "bb743ebcd4e24708f61a68441cae8920fdfab19c"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "140ba24a136c63e7f10a998a63e7898aed63ea7d"
+        "sha": "692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5"
       }
     }
   ],

From dddc859cf82ea5fcbf0368521d77015fa389945a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 9 Feb 2021 16:57:56 +0100
Subject: [PATCH 0509/1784] test(deps): update dependency
 com.google.truth:truth to v1.1.2 (#322)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index fe1f5bc0d6b1..608dc5a66a3c 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.1
+      1.1.2
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1fdeccc25aa8..4e4116ba47a1 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -40,7 +40,7 @@
     
       com.google.truth
       truth
-      1.1
+      1.1.2
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 46f30dcd7b49..a755ecea2f54 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.1
+      1.1.2
       test
     
   

From ebbdc11b51a2d4ccc4bcdd09715c4d37d21fd322 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 10 Feb 2021 14:33:40 +0100
Subject: [PATCH 0510/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v16.4.0 (#332)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index a755ecea2f54..1bb0872d3cf1 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        16.3.0
+        16.4.0
         pom
         import
       

From 86fffab92ad58d90469e8e5e29825960e7b3779e Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 10 Feb 2021 09:00:38 -0800
Subject: [PATCH 0511/1784] build(java): update autorelease script (#331)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8ae9af40-372e-4b53-9579-33a36c0aa209/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/2414b817065726eae0bc525346c7e874f969369d
---
 .github/workflows/auto-release.yaml | 4 ++--
 synth.metadata                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 76e6404b4e09..7c8816a7d7b1 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -4,7 +4,7 @@ name: auto-release
 jobs:
   approve:
     runs-on: ubuntu-latest
-    if: contains(github.head_ref, 'release-v')
+    if: contains(github.head_ref, 'release-please')
     steps:
     - uses: actions/github-script@v3
       with:
@@ -16,7 +16,7 @@ jobs:
             return;
           }
 
-          // only approve PRs like "chore: release "
+          // only approve PRs like "chore(master): release "
           if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
             return;
           }
diff --git a/synth.metadata b/synth.metadata
index 52d8b3b4b721..603abd636df4 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "bb743ebcd4e24708f61a68441cae8920fdfab19c"
+        "sha": "dddc859cf82ea5fcbf0368521d77015fa389945a"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5"
+        "sha": "2414b817065726eae0bc525346c7e874f969369d"
       }
     }
   ],

From 381343a9580fe096b06212f38428cc36092db26d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 11 Feb 2021 13:34:03 -0800
Subject: [PATCH 0512/1784] chore: regenerate README (#330)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-02-09 16:03:21,034 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-02-09 16:03:21,910 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/956ac6a3-a55a-4c1a-8e84-8c32567240e3/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 9ce8e3206b40..5a7252a92275 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "5abed4dbcc040f1b4c08f558cf5b44119862bf7f"
+        "sha": "dddc859cf82ea5fcbf0368521d77015fa389945a"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "a38d9dbf2fe5e0352b1dffd7eb15e31809c7fd62"
+        "sha": "4679e7e415221f03ff2a71e3ffad75b9ec41d87e"
       }
     }
   ]
diff --git a/README.md b/README.md
index 7d0288702994..c01c31fe490b 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:16.3.0')
+implementation platform('com.google.cloud:libraries-bom:16.4.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From b4ef16f542a5e8666d979433f8e5c76a58e65d32 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 11 Feb 2021 14:00:04 -0800
Subject: [PATCH 0513/1784] chore: regenerate README (#333)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-02-11 21:36:34,437 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-02-11 21:36:36,023 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/b6e1563e-e09a-4e75-8e09-2bb7ea26d98e/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 5a7252a92275..81112e498585 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "dddc859cf82ea5fcbf0368521d77015fa389945a"
+        "sha": "381343a9580fe096b06212f38428cc36092db26d"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4679e7e415221f03ff2a71e3ffad75b9ec41d87e"
+        "sha": "2414b817065726eae0bc525346c7e874f969369d"
       }
     }
   ]
diff --git a/README.md b/README.md
index c01c31fe490b..329b611f5644 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      16.3.0
+      16.4.0
       pom
       import
     

From 24fdcb36fd48195920320714bed54ec45e31afdc Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 16 Feb 2021 19:04:15 +0100
Subject: [PATCH 0514/1784] test(deps): update dependency junit:junit to
 v4.13.2 (#334)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [junit:junit](http://junit.org) ([source](https://togithub.com/junit-team/junit4)) | `4.13.1` -> `4.13.2` | [![age](https://badges.renovateapi.com/packages/maven/junit:junit/4.13.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/junit:junit/4.13.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/junit:junit/4.13.2/compatibility-slim/4.13.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/junit:junit/4.13.2/confidence-slim/4.13.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 pom.xml                             | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f81db75e71f5..cfcea822bf92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,7 @@
       
         junit
         junit
-        4.13.1
+        4.13.2
         test
       
       
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 608dc5a66a3c..2fd7f8e6e347 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -36,7 +36,7 @@
     
       junit
       junit
-      4.13.1
+      4.13.2
       test
     
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4e4116ba47a1..742feb50f334 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -34,7 +34,7 @@
     
       junit
       junit
-      4.13.1
+      4.13.2
       test
     
     
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 1bb0872d3cf1..e297802d2544 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -47,7 +47,7 @@
     
       junit
       junit
-      4.13.1
+      4.13.2
       test
     
     

From 3181aeae9758456c5a90530da22a997d101274e1 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 16 Feb 2021 16:18:17 -0800
Subject: [PATCH 0515/1784] ci: linkage monitor CI job to use build.sh (#335)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/549c8707-14a7-4963-9d20-bbd5d5285b08/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/f327d3b657a63ae4a8efd7f011a15eacae36b59c
---
 .github/workflows/ci.yaml | 13 +++----------
 synth.metadata            |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 98a472e132d6..def8b3a2c84d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -55,17 +55,10 @@ jobs:
         java-version: 8
     - run: java -version
     - name: Install artifacts to local Maven repository
-      run: |
-        source .kokoro/common.sh
-        retry_with_backoff 3 10 \
-            mvn install -B -V \
-                -Dmaven.test.skip -DskipTests=true \
-                -Dclirr.skip=true \
-                -Denforcer.skip=true \
-                -Dmaven.javadoc.skip=true \
-                -Dgcloud.download.skip=true
+      run: .kokoro/build.sh
       shell: bash
-    - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
+    - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
+      uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
   lint:
     runs-on: ubuntu-latest
     steps:
diff --git a/synth.metadata b/synth.metadata
index 603abd636df4..63c4cad52c71 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "dddc859cf82ea5fcbf0368521d77015fa389945a"
+        "sha": "24fdcb36fd48195920320714bed54ec45e31afdc"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "2414b817065726eae0bc525346c7e874f969369d"
+        "sha": "f327d3b657a63ae4a8efd7f011a15eacae36b59c"
       }
     }
   ],

From c46e176fd9d49dcc25a031b8967130ba1ef0dbef Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 17 Feb 2021 09:06:34 -0800
Subject: [PATCH 0516/1784] chore: update cloud-rad buckets (#336)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/076d8116-2173-4482-aeb4-8514456cfb36/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/b416a7befcdbc42de41cf387dcf428f894fb812b
---
 .kokoro/release/publish_javadoc.cfg   | 4 ++--
 .kokoro/release/publish_javadoc.sh    | 2 +-
 .kokoro/release/publish_javadoc11.cfg | 2 +-
 .kokoro/release/publish_javadoc11.sh  | 2 +-
 synth.metadata                        | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
index a884714d5d19..c89135d5c7cd 100644
--- a/.kokoro/release/publish_javadoc.cfg
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -7,10 +7,10 @@ env_vars: {
   value: "docs-staging"
 }
 
+# cloud-rad staging
 env_vars: {
   key: "STAGING_BUCKET_V2"
-  value: "docs-staging-v2"
-  # Production will be at: docs-staging-v2
+  value: "docs-staging-v2-staging"
 }
 
 env_vars: {
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 7f563e24e312..3cc6d4151e74 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \
   --version ${VERSION} \
   --language java
 
-# upload docs
+# upload docs to staging bucket
 python3 -m docuploader upload . \
   --credentials ${CREDENTIALS} \
   --staging-bucket ${STAGING_BUCKET_V2}
diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg
index dcdd6a4d4f54..1a57bbcca8ae 100644
--- a/.kokoro/release/publish_javadoc11.cfg
+++ b/.kokoro/release/publish_javadoc11.cfg
@@ -1,9 +1,9 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
+# cloud-rad production
 env_vars: {
   key: "STAGING_BUCKET_V2"
   value: "docs-staging-v2"
-  # Production will be at: docs-staging-v2
 }
 
 # Configure the docker image for kokoro-trampoline
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 34ff55ebcf59..7c5e6f5dbfe2 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -48,7 +48,7 @@ python3 -m docuploader create-metadata \
  --version ${VERSION} \
  --language java
 
-# upload yml
+# upload yml to production bucket
 python3 -m docuploader upload . \
  --credentials ${CREDENTIALS} \
  --staging-bucket ${STAGING_BUCKET_V2} \
diff --git a/synth.metadata b/synth.metadata
index 63c4cad52c71..1c1c2a5d7075 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "24fdcb36fd48195920320714bed54ec45e31afdc"
+        "sha": "3181aeae9758456c5a90530da22a997d101274e1"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "f327d3b657a63ae4a8efd7f011a15eacae36b59c"
+        "sha": "b416a7befcdbc42de41cf387dcf428f894fb812b"
       }
     }
   ],

From 9ee440c280e00f56c089a67bcbaa601ea83fc74a Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 19 Feb 2021 20:42:03 -0800
Subject: [PATCH 0517/1784] build: skip Maven download logs (#338)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/62fbd93a-0469-4c6e-9547-84dbcc2a707d/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/1aeca92e4a38f47134cb955f52ea76f84f09ff88
---
 .kokoro/build.sh | 2 ++
 synth.metadata   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 606012e761a7..acd364ff797c 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -60,6 +60,7 @@ javadoc)
     ;;
 integration)
     mvn -B ${INTEGRATION_TEST_ARGS} \
+      -ntp \
       -Penable-integration-tests \
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
@@ -81,6 +82,7 @@ samples)
         pushd ${SAMPLES_DIR}
         mvn -B \
           -Penable-samples \
+          -ntp \
           -DtrimStackTrace=false \
           -Dclirr.skip=true \
           -Denforcer.skip=true \
diff --git a/synth.metadata b/synth.metadata
index 1c1c2a5d7075..710e1e2d2f08 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "3181aeae9758456c5a90530da22a997d101274e1"
+        "sha": "c46e176fd9d49dcc25a031b8967130ba1ef0dbef"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "b416a7befcdbc42de41cf387dcf428f894fb812b"
+        "sha": "1aeca92e4a38f47134cb955f52ea76f84f09ff88"
       }
     }
   ],

From ebd20c5504b9442bebdf1e9506c7b023b7cb8aea Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Sat, 20 Feb 2021 05:06:50 -0800
Subject: [PATCH 0518/1784] build: reduce download junk in log files (#340)

* fix: less download junk log files

* Update build.sh

Source-Author: Elliotte Rusty Harold 
Source-Date: Fri Feb 19 01:42:29 2021 +0000
Source-Repo: googleapis/synthtool
Source-Sha: 6946fd71ae9215b0e7ae188f5057df765ee6d7d2
Source-Link: https://github.com/googleapis/synthtool/commit/6946fd71ae9215b0e7ae188f5057df765ee6d7d2
---
 .kokoro/build.sh        | 2 +-
 .kokoro/dependencies.sh | 4 ++--
 synth.metadata          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index acd364ff797c..894bfd4a57b2 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -29,7 +29,7 @@ echo ${JOB_TYPE}
 
 # attempt to install 3 times with exponential backoff (starting with 10 seconds)
 retry_with_backoff 3 10 \
-  mvn install -B -V \
+  mvn install -B -V -ntp \
     -DskipTests=true \
     -Dclirr.skip=true \
     -Denforcer.skip=true \
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index c91e5a56937a..0fb8c8436ccc 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
 retry_with_backoff 3 10 \
-  mvn install -B -V \
+  mvn install -B -V -ntp \
     -DskipTests=true \
     -Dclirr.skip=true
 
@@ -86,4 +86,4 @@ then
 else
   msg "Errors found. See log statements above."
   exit 1
-fi
\ No newline at end of file
+fi
diff --git a/synth.metadata b/synth.metadata
index 710e1e2d2f08..19e49ab481f7 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c46e176fd9d49dcc25a031b8967130ba1ef0dbef"
+        "sha": "9ee440c280e00f56c089a67bcbaa601ea83fc74a"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "1aeca92e4a38f47134cb955f52ea76f84f09ff88"
+        "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"
       }
     }
   ],

From 393bd29b15d818b6f7ab34542dcd3ca6b956f61d Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 23 Feb 2021 00:52:06 +0100
Subject: [PATCH 0519/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.19.0 (#339)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `0.18.0` -> `0.19.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.19.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.19.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.19.0/compatibility-slim/0.18.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.19.0/confidence-slim/0.18.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.19.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0190-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0180v0190-2021-02-19)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.18.0...v0.19.0)

##### Bug Fixes

-   update repo name ([#​274](https://www.github.com/googleapis/java-shared-dependencies/issues/274)) ([4a98470](https://www.github.com/googleapis/java-shared-dependencies/commit/4a98470b7493c98137191b7bb3cabca23f98628f))

##### Dependencies

-   downgrade opencensus version back to 0.28.0 ([#​265](https://www.github.com/googleapis/java-shared-dependencies/issues/265)) ([f37025c](https://www.github.com/googleapis/java-shared-dependencies/commit/f37025c70f951b1e34904ee983815c0ed8ec4086))
-   update dependency com.google.api-client:google-api-client-bom to v1.31.2 ([#​254](https://www.github.com/googleapis/java-shared-dependencies/issues/254)) ([1b0b4a6](https://www.github.com/googleapis/java-shared-dependencies/commit/1b0b4a637cae0c22cd0336c527002025780317d5))
-   update dependency com.google.auth:google-auth-library-bom to v0.23.0 ([#​261](https://www.github.com/googleapis/java-shared-dependencies/issues/261)) ([1c0b7bd](https://www.github.com/googleapis/java-shared-dependencies/commit/1c0b7bd60b3d73c16cc6c19ab90d8ccedece3706))
-   update dependency com.google.cloud:google-cloud-core to v1.94.1 ([#​272](https://www.github.com/googleapis/java-shared-dependencies/issues/272)) ([44fd4c3](https://www.github.com/googleapis/java-shared-dependencies/commit/44fd4c3c6cae98bd514525f03462b830050828a8))
-   update dependency com.google.errorprone:error_prone_annotations to v2.5.1 ([#​255](https://www.github.com/googleapis/java-shared-dependencies/issues/255)) ([6367023](https://www.github.com/googleapis/java-shared-dependencies/commit/63670233424e8f24c3924bba5e2cb6ca97525795))
-   update dependency com.google.http-client:google-http-client-bom to v1.38.1 ([#​253](https://www.github.com/googleapis/java-shared-dependencies/issues/253)) ([ad87c74](https://www.github.com/googleapis/java-shared-dependencies/commit/ad87c74d9d893726042156d65850806d92e79952))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.0 ([#​278](https://www.github.com/googleapis/java-shared-dependencies/issues/278)) ([989efbd](https://www.github.com/googleapis/java-shared-dependencies/commit/989efbd29bcf4135f7abce49a697303df2cf1a60))
-   update dependency io.grpc:grpc-bom to v1.35.0 ([#​248](https://www.github.com/googleapis/java-shared-dependencies/issues/248)) ([7a28c6e](https://www.github.com/googleapis/java-shared-dependencies/commit/7a28c6e7053c181993b1288adcae56de89312113))
-   update gax.version to v1.61.0 ([#​277](https://www.github.com/googleapis/java-shared-dependencies/issues/277)) ([f1c3fb9](https://www.github.com/googleapis/java-shared-dependencies/commit/f1c3fb9295f2e1c130b9fc329faa60f4f8474ba6))
-   update iam.version to v1.0.7 ([#​252](https://www.github.com/googleapis/java-shared-dependencies/issues/252)) ([5cb3ed9](https://www.github.com/googleapis/java-shared-dependencies/commit/5cb3ed906537269cd7f8d9ccf4b065754b5f5b48))
-   update iam.version to v1.0.8 ([#​273](https://www.github.com/googleapis/java-shared-dependencies/issues/273)) ([4d5e7f7](https://www.github.com/googleapis/java-shared-dependencies/commit/4d5e7f720d847918b307a83c95cea10c244ba595))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 cfcea822bf92..967237355a72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.18.0
+        0.19.0
         pom
         import
       

From 49f94e2bb50f75cb6e078ee822455f8624ccf76f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 23 Feb 2021 00:04:10 +0000
Subject: [PATCH 0520/1784] chore(master): release 1.105.8 (#341)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.8](https://www.github.com/googleapis/java-datastore/compare/v1.105.7...v1.105.8) (2021-02-22)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.19.0 ([#339](https://www.github.com/googleapis/java-datastore/issues/339)) ([393bd29](https://www.github.com/googleapis/java-datastore/commit/393bd29b15d818b6f7ab34542dcd3ca6b956f61d))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0791256fe9b4..eb8ed259b223 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.105.8](https://www.github.com/googleapis/java-datastore/compare/v1.105.7...v1.105.8) (2021-02-22)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.19.0 ([#339](https://www.github.com/googleapis/java-datastore/issues/339)) ([393bd29](https://www.github.com/googleapis/java-datastore/commit/393bd29b15d818b6f7ab34542dcd3ca6b956f61d))
+
 ### [1.105.7](https://www.github.com/googleapis/java-datastore/compare/v1.105.6...v1.105.7) (2021-01-21)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 089460083df3..18c53a32b4c6 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
-  1.105.8-SNAPSHOT
+  1.105.8
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.8-SNAPSHOT
+        0.88.8
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.8-SNAPSHOT
+        1.105.8
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 12daadc49c97..3e9221d269f0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.8-SNAPSHOT
+  1.105.8
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.8-SNAPSHOT
+    1.105.8
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 967237355a72..d1d85c5a0aa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.8-SNAPSHOT
+  1.105.8
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.8-SNAPSHOT
+        0.88.8
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 127e6bb73a57..df89f4f04a1c 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.88.8-SNAPSHOT
+  0.88.8
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.8-SNAPSHOT
+    1.105.8
   
   
     
diff --git a/versions.txt b/versions.txt
index 29c02665c03c..75f2f229ce6e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.7:1.105.8-SNAPSHOT
-google-cloud-datastore-bom:1.105.7:1.105.8-SNAPSHOT
-google-cloud-datastore-parent:1.105.7:1.105.8-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.7:0.88.8-SNAPSHOT
+google-cloud-datastore:1.105.8:1.105.8
+google-cloud-datastore-bom:1.105.8:1.105.8
+google-cloud-datastore-parent:1.105.8:1.105.8
+proto-google-cloud-datastore-v1:0.88.8:0.88.8
 

From 144004508094c3f3094c9e7096211a75e22bd93f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 23 Feb 2021 00:24:04 +0000
Subject: [PATCH 0521/1784] chore(master): release 1.105.9-SNAPSHOT (#342)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 18c53a32b4c6..8c12698d8d4e 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
-  1.105.8
+  1.105.9-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.8
+        0.88.9-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.8
+        1.105.9-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3e9221d269f0..42e67cb05124 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.8
+  1.105.9-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.8
+    1.105.9-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index d1d85c5a0aa5..1f9fb13c19fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.8
+  1.105.9-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.8
+        0.88.9-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index df89f4f04a1c..812675efa8ef 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.88.8
+  0.88.9-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.8
+    1.105.9-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 75f2f229ce6e..f2ec290349d6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.8:1.105.8
-google-cloud-datastore-bom:1.105.8:1.105.8
-google-cloud-datastore-parent:1.105.8:1.105.8
-proto-google-cloud-datastore-v1:0.88.8:0.88.8
+google-cloud-datastore:1.105.8:1.105.9-SNAPSHOT
+google-cloud-datastore-bom:1.105.8:1.105.9-SNAPSHOT
+google-cloud-datastore-parent:1.105.8:1.105.9-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.8:0.88.9-SNAPSHOT
 

From 1e82a31ff88223bb96b1ddd2b0584461c9113e50 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 24 Feb 2021 20:36:12 +0100
Subject: [PATCH 0522/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v17 (#344)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `16.4.0` -> `17.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/compatibility-slim/16.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/confidence-slim/16.4.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e297802d2544..0249a844795d 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        16.4.0
+        17.0.0
         pom
         import
       

From 07b8159623a31e3c85b565eee89fc074e1034ab7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 24 Feb 2021 20:52:24 +0100
Subject: [PATCH 0523/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.8 (#343)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `1.105.7` -> `1.105.8` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.105.8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.105.8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.105.8/compatibility-slim/1.105.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.105.8/confidence-slim/1.105.7)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-datastore

### [`v1.105.8`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11058-httpswwwgithubcomgoogleapisjava-datastorecomparev11057v11058-2021-02-22)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.105.7...v1.105.8)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 2fd7f8e6e347..b76e02733a51 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
-      1.105.7
+      1.105.8
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 742feb50f334..93f7dad46585 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.7
+      1.105.8
     
 
     

From 11ca1766c5594bc26774dddc7527908f245e1b67 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 24 Feb 2021 11:58:04 -0800
Subject: [PATCH 0524/1784] chore: regenerate README (#345)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-02-24 19:38:23,364 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-02-24 19:38:24,926 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/0bc52500-d7bf-4040-a4c4-defc49a553ee/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 81112e498585..d577620b22b7 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "381343a9580fe096b06212f38428cc36092db26d"
+        "sha": "1e82a31ff88223bb96b1ddd2b0584461c9113e50"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "2414b817065726eae0bc525346c7e874f969369d"
+        "sha": "79ab0b44a2cc7d803d07c107f9faf07729fc4012"
       }
     }
   ]
diff --git a/README.md b/README.md
index 329b611f5644..f4566454da84 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      16.4.0
+      17.0.0
       pom
       import
     
@@ -45,18 +45,18 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:16.4.0')
+implementation platform('com.google.cloud:libraries-bom:17.0.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.7'
+compile 'com.google.cloud:google-cloud-datastore:1.105.8'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.7"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.8"
 ```
 
 ## Authentication

From 62d285aa7f6d8e9ed72612c14bb8642f76e7ccf1 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 24 Feb 2021 13:52:03 -0800
Subject: [PATCH 0525/1784] chore: regenerate README (#346)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-02-24 20:01:32,627 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-02-24 20:01:34,109 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/7ce5099e-4865-4d7f-8915-26f5b2e26dda/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index d577620b22b7..453076f033b8 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "1e82a31ff88223bb96b1ddd2b0584461c9113e50"
+        "sha": "11ca1766c5594bc26774dddc7527908f245e1b67"
       }
     },
     {
diff --git a/README.md b/README.md
index f4566454da84..f632742c8137 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.105.7
+  1.105.8
 
 
 ```

From d045c8fc8999bf6e55c4790bcde382b0b01a403e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 25 Feb 2021 01:12:15 +0100
Subject: [PATCH 0526/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v18 (#347)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `17.0.0` -> `18.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/compatibility-slim/17.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/confidence-slim/17.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 0249a844795d..cf167fa7dd32 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        17.0.0
+        18.0.0
         pom
         import
       

From 041fac070756a706ead0a9e2b4bc2670dc7dccde Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 24 Feb 2021 16:26:07 -0800
Subject: [PATCH 0527/1784] chore: regenerate README (#348)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-02-25 00:17:27,662 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-02-25 00:17:29,214 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/7c6524fb-bdf2-4a28-9027-72d5029f493d/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 453076f033b8..d336a1c8bc88 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "11ca1766c5594bc26774dddc7527908f245e1b67"
+        "sha": "d045c8fc8999bf6e55c4790bcde382b0b01a403e"
       }
     },
     {
diff --git a/README.md b/README.md
index f632742c8137..77bb5fe028a8 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      17.0.0
+      18.0.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:17.0.0')
+implementation platform('com.google.cloud:libraries-bom:18.0.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 53ffc2c35efb686f10c9837465744875a3dd4828 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 25 Feb 2021 20:38:18 +0100
Subject: [PATCH 0528/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.11.0 (#349)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.10.0` -> `0.11.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.0/compatibility-slim/0.10.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.0/confidence-slim/0.10.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-config

### [`v0.11.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​0110-httpswwwgithubcomgoogleapisjava-shared-configcomparev0100v0110-2021-02-25)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.10.0...v0.11.0)

##### Features

-   migrate releases to the new Google Sonatype endpoint to address Sonatype errors. ([#​230](https://www.github.com/googleapis/java-shared-config/issues/230)) ([ff6a95f](https://www.github.com/googleapis/java-shared-config/commit/ff6a95f7b0d24a1c37c38ba8ac6c6624ee97cc15))

##### Dependencies

-   update dependency com.puppycrawl.tools:checkstyle to v8.40 ([#​221](https://www.github.com/googleapis/java-shared-config/issues/221)) ([d9b2d4a](https://www.github.com/googleapis/java-shared-config/commit/d9b2d4aab9a9bba1c2df6fcb52ac96ee8b001ad6))
-   update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.1.2 ([#​219](https://www.github.com/googleapis/java-shared-config/issues/219)) ([f7c3f79](https://www.github.com/googleapis/java-shared-config/commit/f7c3f798ef8ad1bc59ae673c84fbdd9f93ee2413))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 8c12698d8d4e..81f7e370a352 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
-    0.10.0
+    0.11.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 1f9fb13c19fc..2e3d5be28462 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.10.0
+    0.11.0
   
 
   

From 13336fbe4dc5ea54ea0b50f2dce4c7534e8203ce Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 25 Feb 2021 23:36:25 +0100
Subject: [PATCH 0529/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.20.0 (#350)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `0.19.0` -> `0.20.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.0/compatibility-slim/0.19.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.0/confidence-slim/0.19.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.20.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0200-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0190v0200-2021-02-25)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.19.0...v0.20.0)

##### Dependencies

-   update dependency com.google.auth:google-auth-library-bom to v0.24.0 ([#​284](https://www.github.com/googleapis/java-shared-dependencies/issues/284)) ([5e4914c](https://www.github.com/googleapis/java-shared-dependencies/commit/5e4914cc4a8ccd41a219f150a7455da116d1594b))
-   update dependency com.google.http-client:google-http-client-bom to v1.39.0 ([#​288](https://www.github.com/googleapis/java-shared-dependencies/issues/288)) ([70bb862](https://www.github.com/googleapis/java-shared-dependencies/commit/70bb862029b840fbd99ba0109fa2b8f585812793))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.1 ([#​282](https://www.github.com/googleapis/java-shared-dependencies/issues/282)) ([44283bd](https://www.github.com/googleapis/java-shared-dependencies/commit/44283bdfdc9288b4a8d16b6ed3a61541792d147e))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.2 ([#​287](https://www.github.com/googleapis/java-shared-dependencies/issues/287)) ([bdae560](https://www.github.com/googleapis/java-shared-dependencies/commit/bdae5600f9033219ef8beb6c4d1c521fb062eaec))
-   update dependency io.grpc:grpc-bom to v1.36.0 ([#​285](https://www.github.com/googleapis/java-shared-dependencies/issues/285)) ([c59771b](https://www.github.com/googleapis/java-shared-dependencies/commit/c59771b2436ac1a4fbc92b48049900472dd6d3ff))
-   update gax.version to v1.62.0 ([#​291](https://www.github.com/googleapis/java-shared-dependencies/issues/291)) ([66bd070](https://www.github.com/googleapis/java-shared-dependencies/commit/66bd0702bd3deb64e0f6c73635e0ffd51a4d637e))
-   update google.common-protos.version to v2.1.0 ([#​289](https://www.github.com/googleapis/java-shared-dependencies/issues/289)) ([43c9f02](https://www.github.com/googleapis/java-shared-dependencies/commit/43c9f026b1fa82f38dcb93b902281c2559e82d8e))
-   update iam.version to v1.0.9 ([#​281](https://www.github.com/googleapis/java-shared-dependencies/issues/281)) ([ee44d0b](https://www.github.com/googleapis/java-shared-dependencies/commit/ee44d0b41e101931ccf5de2561dfcfcc9ff88b88))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 2e3d5be28462..e2824b027ca0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.19.0
+        0.20.0
         pom
         import
       

From af9aab13278c83bf64f68289fab0e6244bfc30ca Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 25 Feb 2021 22:48:08 +0000
Subject: [PATCH 0530/1784] chore(master): release 1.105.9 (#351)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.105.9](https://www.github.com/googleapis/java-datastore/compare/v1.105.8...v1.105.9) (2021-02-25)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.0 ([#350](https://www.github.com/googleapis/java-datastore/issues/350)) ([13336fb](https://www.github.com/googleapis/java-datastore/commit/13336fbe4dc5ea54ea0b50f2dce4c7534e8203ce))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb8ed259b223..a1eb72189973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.105.9](https://www.github.com/googleapis/java-datastore/compare/v1.105.8...v1.105.9) (2021-02-25)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.0 ([#350](https://www.github.com/googleapis/java-datastore/issues/350)) ([13336fb](https://www.github.com/googleapis/java-datastore/commit/13336fbe4dc5ea54ea0b50f2dce4c7534e8203ce))
+
 ### [1.105.8](https://www.github.com/googleapis/java-datastore/compare/v1.105.7...v1.105.8) (2021-02-22)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 81f7e370a352..babc2d53613e 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
-  1.105.9-SNAPSHOT
+  1.105.9
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.9-SNAPSHOT
+        0.88.9
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.9-SNAPSHOT
+        1.105.9
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 42e67cb05124..9148a8693a80 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.9-SNAPSHOT
+  1.105.9
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.9-SNAPSHOT
+    1.105.9
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index e2824b027ca0..0887e35826ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.9-SNAPSHOT
+  1.105.9
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.9-SNAPSHOT
+        0.88.9
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 812675efa8ef..a71076cf7041 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.88.9-SNAPSHOT
+  0.88.9
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.9-SNAPSHOT
+    1.105.9
   
   
     
diff --git a/versions.txt b/versions.txt
index f2ec290349d6..a8fdb71e8dd6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.8:1.105.9-SNAPSHOT
-google-cloud-datastore-bom:1.105.8:1.105.9-SNAPSHOT
-google-cloud-datastore-parent:1.105.8:1.105.9-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.8:0.88.9-SNAPSHOT
+google-cloud-datastore:1.105.9:1.105.9
+google-cloud-datastore-bom:1.105.9:1.105.9
+google-cloud-datastore-parent:1.105.9:1.105.9
+proto-google-cloud-datastore-v1:0.88.9:0.88.9
 

From 4a7cb74d39ec1895e758a248ee111ddc7af63515 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 25 Feb 2021 22:56:10 +0000
Subject: [PATCH 0531/1784] chore(master): release 1.105.10-SNAPSHOT (#352)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index babc2d53613e..da3e61d9adaf 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
-  1.105.9
+  1.105.10-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.9
+        0.88.10-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.9
+        1.105.10-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9148a8693a80..7cf05fd02e10 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.9
+  1.105.10-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.9
+    1.105.10-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 0887e35826ae..1a5890922d00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.9
+  1.105.10-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.9
+        0.88.10-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a71076cf7041..563e956a0db7 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.88.9
+  0.88.10-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.9
+    1.105.10-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index a8fdb71e8dd6..a8fa2ef51c26 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.9:1.105.9
-google-cloud-datastore-bom:1.105.9:1.105.9
-google-cloud-datastore-parent:1.105.9:1.105.9
-proto-google-cloud-datastore-v1:0.88.9:0.88.9
+google-cloud-datastore:1.105.9:1.105.10-SNAPSHOT
+google-cloud-datastore-bom:1.105.9:1.105.10-SNAPSHOT
+google-cloud-datastore-parent:1.105.9:1.105.10-SNAPSHOT
+proto-google-cloud-datastore-v1:0.88.9:0.88.10-SNAPSHOT
 

From 3b1f67af118b188e57a7dda77d2c265672765a6a Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 2 Mar 2021 10:26:11 -0800
Subject: [PATCH 0532/1784] feat(generator): update protoc to v3.15.3 (#354)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/20ff8108-4bb8-44d9-b386-bf2432a15754/targets

- [ ] To automatically regenerate this PR, check this box.

PiperOrigin-RevId: 359781040
Source-Link: https://github.com/googleapis/googleapis/commit/f6dd7e47620566925a4b3f1ce029e74e1b2f2516
---
 .../clirr-ignored-differences.xml             |   9 +
 .../google/datastore/v1/CommitRequest.java    |  33 ++++
 .../datastore/v1/CommitRequestOrBuilder.java  |  14 ++
 .../datastore/v1/GqlQueryParameter.java       |  31 +++
 .../v1/GqlQueryParameterOrBuilder.java        |  13 ++
 .../java/com/google/datastore/v1/Key.java     |  97 +++++++++
 .../com/google/datastore/v1/Mutation.java     |  31 +++
 .../datastore/v1/MutationOrBuilder.java       |  13 ++
 .../com/google/datastore/v1/ReadOptions.java  |  64 ++++++
 .../datastore/v1/ReadOptionsOrBuilder.java    |  27 +++
 .../java/com/google/datastore/v1/Value.java   | 184 ++++++++++++++++++
 .../google/datastore/v1/ValueOrBuilder.java   |  77 ++++++++
 synth.metadata                                |   6 +-
 13 files changed, 596 insertions(+), 3 deletions(-)
 create mode 100644 proto-google-cloud-datastore-v1/clirr-ignored-differences.xml

diff --git a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
new file mode 100644
index 000000000000..433c9d79c9e3
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
@@ -0,0 +1,9 @@
+
+
+
+  
+    7012
+    com/google/datastore/v1/*OrBuilder
+    * has*(*)
+  
+
\ No newline at end of file
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 2fb7893435c4..8cb52b2d0256 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
@@ -431,6 +431,23 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
+  /**
+   *
+   *
+   * 
+   * The identifier of the transaction associated with the commit. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * 

+   *
+   * bytes transaction = 1;
+   *
+   * @return Whether the transaction field is set.
+   */
+  @java.lang.Override
+  public boolean hasTransaction() {
+    return transactionSelectorCase_ == 1;
+  }
   /**
    *
    *
@@ -1205,6 +1222,22 @@ public Builder clearMode() {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * The identifier of the transaction associated with the commit. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     * 

+     *
+     * bytes transaction = 1;
+     *
+     * @return Whether the transaction field is set.
+     */
+    public boolean hasTransaction() {
+      return transactionSelectorCase_ == 1;
+    }
     /**
      *
      *
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 8f7d768451c2..b5f4a1bce392 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
@@ -73,6 +73,20 @@ public interface CommitRequestOrBuilder
    */
   com.google.datastore.v1.CommitRequest.Mode getMode();
 
+  /**
+   *
+   *
+   * 
+   * The identifier of the transaction associated with the commit. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * 

+   *
+   * bytes transaction = 1;
+   *
+   * @return Whether the transaction field is set.
+   */
+  boolean hasTransaction();
   /**
    *
    *
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 29569cc45f12..a9cf4946d8fb 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
@@ -222,6 +222,22 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
   }
 
   public static final int CURSOR_FIELD_NUMBER = 3;
+  /**
+   *
+   *
+   * 
+   * A query cursor. Query cursors are returned in query
+   * result batches.
+   * 

+   *
+   * bytes cursor = 3;
+   *
+   * @return Whether the cursor field is set.
+   */
+  @java.lang.Override
+  public boolean hasCursor() {
+    return parameterTypeCase_ == 3;
+  }
   /**
    *
    *
@@ -830,6 +846,21 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       return valueBuilder_;
     }
 
+    /**
+     *
+     *
+     * 
+     * A query cursor. Query cursors are returned in query
+     * result batches.
+     * 

+     *
+     * bytes cursor = 3;
+     *
+     * @return Whether the cursor field is set.
+     */
+    public boolean hasCursor() {
+      return parameterTypeCase_ == 3;
+    }
     /**
      *
      *
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 88d62712fc17..d519e570730e 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
@@ -58,6 +58,19 @@ public interface GqlQueryParameterOrBuilder
    */
   com.google.datastore.v1.ValueOrBuilder getValueOrBuilder();
 
+  /**
+   *
+   *
+   * 
+   * A query cursor. Query cursors are returned in query
+   * result batches.
+   * 

+   *
+   * bytes cursor = 3;
+   *
+   * @return Whether the cursor field is set.
+   */
+  boolean hasCursor();
   /**
    *
    *
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 1b7e16d21073..3e58eb2a52fd 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
@@ -172,6 +172,20 @@ public interface PathElementOrBuilder
      */
     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.
+     * 

+     *
+     * int64 id = 2;
+     *
+     * @return Whether the id field is set.
+     */
+    boolean hasId();
     /**
      *
      *
@@ -187,6 +201,21 @@ public interface PathElementOrBuilder
      */
     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 `""`.
+     * 

+     *
+     * string name = 3;
+     *
+     * @return Whether the name field is set.
+     */
+    boolean hasName();
     /**
      *
      *
@@ -431,6 +460,23 @@ public com.google.protobuf.ByteString getKindBytes() {
     }
 
     public static final int ID_FIELD_NUMBER = 2;
+    /**
+     *
+     *
+     * 
+     * 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.
+     * 

+     *
+     * int64 id = 2;
+     *
+     * @return Whether the id field is set.
+     */
+    @java.lang.Override
+    public boolean hasId() {
+      return idTypeCase_ == 2;
+    }
     /**
      *
      *
@@ -453,6 +499,23 @@ public long getId() {
     }
 
     public static final int NAME_FIELD_NUMBER = 3;
+    /**
+     *
+     *
+     * 
+     * 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 `""`.
+     * 

+     *
+     * string name = 3;
+     *
+     * @return Whether the name field is set.
+     */
+    public boolean hasName() {
+      return idTypeCase_ == 3;
+    }
     /**
      *
      *
@@ -1034,6 +1097,22 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
+      /**
+       *
+       *
+       * 
+       * 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.
+       * 

+       *
+       * int64 id = 2;
+       *
+       * @return Whether the id field is set.
+       */
+      public boolean hasId() {
+        return idTypeCase_ == 2;
+      }
       /**
        *
        *
@@ -1095,6 +1174,24 @@ public Builder clearId() {
         return this;
       }
 
+      /**
+       *
+       *
+       * 
+       * 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 `""`.
+       * 

+       *
+       * string name = 3;
+       *
+       * @return Whether the name field is set.
+       */
+      @java.lang.Override
+      public boolean hasName() {
+        return idTypeCase_ == 3;
+      }
       /**
        *
        *
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 3bda64242ac0..de2c233167bc 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
@@ -481,6 +481,22 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
   }
 
   public static final int BASE_VERSION_FIELD_NUMBER = 8;
+  /**
+   *
+   *
+   * 
+   * The version of the entity that this mutation is being applied to. If this
+   * does not match the current version on the server, the mutation conflicts.
+   * 

+   *
+   * int64 base_version = 8;
+   *
+   * @return Whether the baseVersion field is set.
+   */
+  @java.lang.Override
+  public boolean hasBaseVersion() {
+    return conflictDetectionStrategyCase_ == 8;
+  }
   /**
    *
    *
@@ -1849,6 +1865,21 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
       return deleteBuilder_;
     }
 
+    /**
+     *
+     *
+     * 
+     * The version of the entity that this mutation is being applied to. If this
+     * does not match the current version on the server, the mutation conflicts.
+     * 

+     *
+     * int64 base_version = 8;
+     *
+     * @return Whether the baseVersion field is set.
+     */
+    public boolean hasBaseVersion() {
+      return conflictDetectionStrategyCase_ == 8;
+    }
     /**
      *
      *
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 2957934aed5c..b3a41be07f96 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
@@ -175,6 +175,19 @@ public interface MutationOrBuilder
    */
   com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder();
 
+  /**
+   *
+   *
+   * 
+   * The version of the entity that this mutation is being applied to. If this
+   * does not match the current version on the server, the mutation conflicts.
+   * 

+   *
+   * int64 base_version = 8;
+   *
+   * @return Whether the baseVersion field is set.
+   */
+  boolean hasBaseVersion();
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 6e52f3142334..8cffd170123a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -322,6 +322,21 @@ public ConsistencyTypeCase getConsistencyTypeCase() {
   }
 
   public static final int READ_CONSISTENCY_FIELD_NUMBER = 1;
+  /**
+   *
+   *
+   * 
+   * The non-transactional read consistency to use.
+   * Cannot be set to `STRONG` for global queries.
+   * 

+   *
+   * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+   *
+   * @return Whether the readConsistency field is set.
+   */
+  public boolean hasReadConsistency() {
+    return consistencyTypeCase_ == 1;
+  }
   /**
    *
    *
@@ -366,6 +381,23 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
+  /**
+   *
+   *
+   * 
+   * The identifier of the transaction in which to read. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * 

+   *
+   * bytes transaction = 2;
+   *
+   * @return Whether the transaction field is set.
+   */
+  @java.lang.Override
+  public boolean hasTransaction() {
+    return consistencyTypeCase_ == 2;
+  }
   /**
    *
    *
@@ -762,6 +794,22 @@ public Builder clearConsistencyType() {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * The non-transactional read consistency to use.
+     * Cannot be set to `STRONG` for global queries.
+     * 

+     *
+     * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+     *
+     * @return Whether the readConsistency field is set.
+     */
+    @java.lang.Override
+    public boolean hasReadConsistency() {
+      return consistencyTypeCase_ == 1;
+    }
     /**
      *
      *
@@ -868,6 +916,22 @@ public Builder clearReadConsistency() {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * The identifier of the transaction in which to read. A
+     * transaction identifier is returned by a call to
+     * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+     * 

+     *
+     * bytes transaction = 2;
+     *
+     * @return Whether the transaction field is set.
+     */
+    public boolean hasTransaction() {
+      return consistencyTypeCase_ == 2;
+    }
     /**
      *
      *
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 182cde5d9b38..f4a67b58598f 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
@@ -23,6 +23,19 @@ public interface ReadOptionsOrBuilder
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReadOptions)
     com.google.protobuf.MessageOrBuilder {
 
+  /**
+   *
+   *
+   * 
+   * The non-transactional read consistency to use.
+   * Cannot be set to `STRONG` for global queries.
+   * 

+   *
+   * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
+   *
+   * @return Whether the readConsistency field is set.
+   */
+  boolean hasReadConsistency();
   /**
    *
    *
@@ -50,6 +63,20 @@ public interface ReadOptionsOrBuilder
    */
   com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency();
 
+  /**
+   *
+   *
+   * 
+   * The identifier of the transaction in which to read. A
+   * transaction identifier is returned by a call to
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * 

+   *
+   * bytes transaction = 2;
+   *
+   * @return Whether the transaction field is set.
+   */
+  boolean hasTransaction();
   /**
    *
    *
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 60f6c33fae5e..72a17f6bdf6a 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
@@ -298,6 +298,20 @@ public ValueTypeCase getValueTypeCase() {
   }
 
   public static final int NULL_VALUE_FIELD_NUMBER = 11;
+  /**
+   *
+   *
+   * 
+   * A null value.
+   * 

+   *
+   * .google.protobuf.NullValue null_value = 11;
+   *
+   * @return Whether the nullValue field is set.
+   */
+  public boolean hasNullValue() {
+    return valueTypeCase_ == 11;
+  }
   /**
    *
    *
@@ -337,6 +351,21 @@ public com.google.protobuf.NullValue getNullValue() {
   }
 
   public static final int BOOLEAN_VALUE_FIELD_NUMBER = 1;
+  /**
+   *
+   *
+   * 
+   * A boolean value.
+   * 

+   *
+   * bool boolean_value = 1;
+   *
+   * @return Whether the booleanValue field is set.
+   */
+  @java.lang.Override
+  public boolean hasBooleanValue() {
+    return valueTypeCase_ == 1;
+  }
   /**
    *
    *
@@ -357,6 +386,21 @@ public boolean getBooleanValue() {
   }
 
   public static final int INTEGER_VALUE_FIELD_NUMBER = 2;
+  /**
+   *
+   *
+   * 
+   * An integer value.
+   * 

+   *
+   * int64 integer_value = 2;
+   *
+   * @return Whether the integerValue field is set.
+   */
+  @java.lang.Override
+  public boolean hasIntegerValue() {
+    return valueTypeCase_ == 2;
+  }
   /**
    *
    *
@@ -377,6 +421,21 @@ public long getIntegerValue() {
   }
 
   public static final int DOUBLE_VALUE_FIELD_NUMBER = 3;
+  /**
+   *
+   *
+   * 
+   * A double value.
+   * 

+   *
+   * double double_value = 3;
+   *
+   * @return Whether the doubleValue field is set.
+   */
+  @java.lang.Override
+  public boolean hasDoubleValue() {
+    return valueTypeCase_ == 3;
+  }
   /**
    *
    *
@@ -505,6 +564,22 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
   }
 
   public static final int STRING_VALUE_FIELD_NUMBER = 17;
+  /**
+   *
+   *
+   * 
+   * A UTF-8 encoded string value.
+   * When `exclude_from_indexes` is false (it is indexed), may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * 

+   *
+   * string string_value = 17;
+   *
+   * @return Whether the stringValue field is set.
+   */
+  public boolean hasStringValue() {
+    return valueTypeCase_ == 17;
+  }
   /**
    *
    *
@@ -565,6 +640,24 @@ public com.google.protobuf.ByteString getStringValueBytes() {
   }
 
   public static final int BLOB_VALUE_FIELD_NUMBER = 18;
+  /**
+   *
+   *
+   * 
+   * A blob value.
+   * May have at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+   * In JSON requests, must be base64-encoded.
+   * 

+   *
+   * bytes blob_value = 18;
+   *
+   * @return Whether the blobValue field is set.
+   */
+  @java.lang.Override
+  public boolean hasBlobValue() {
+    return valueTypeCase_ == 18;
+  }
   /**
    *
    *
@@ -1431,6 +1524,21 @@ public Builder clearValueType() {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * A null value.
+     * 

+     *
+     * .google.protobuf.NullValue null_value = 11;
+     *
+     * @return Whether the nullValue field is set.
+     */
+    @java.lang.Override
+    public boolean hasNullValue() {
+      return valueTypeCase_ == 11;
+    }
     /**
      *
      *
@@ -1529,6 +1637,20 @@ public Builder clearNullValue() {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * A boolean value.
+     * 

+     *
+     * bool boolean_value = 1;
+     *
+     * @return Whether the booleanValue field is set.
+     */
+    public boolean hasBooleanValue() {
+      return valueTypeCase_ == 1;
+    }
     /**
      *
      *
@@ -1584,6 +1706,20 @@ public Builder clearBooleanValue() {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * An integer value.
+     * 

+     *
+     * int64 integer_value = 2;
+     *
+     * @return Whether the integerValue field is set.
+     */
+    public boolean hasIntegerValue() {
+      return valueTypeCase_ == 2;
+    }
     /**
      *
      *
@@ -1639,6 +1775,20 @@ public Builder clearIntegerValue() {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * A double value.
+     * 

+     *
+     * double double_value = 3;
+     *
+     * @return Whether the doubleValue field is set.
+     */
+    public boolean hasDoubleValue() {
+      return valueTypeCase_ == 3;
+    }
     /**
      *
      *
@@ -2121,6 +2271,23 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
       return keyValueBuilder_;
     }
 
+    /**
+     *
+     *
+     * 
+     * A UTF-8 encoded string value.
+     * When `exclude_from_indexes` is false (it is indexed), may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+     * 

+     *
+     * string string_value = 17;
+     *
+     * @return Whether the stringValue field is set.
+     */
+    @java.lang.Override
+    public boolean hasStringValue() {
+      return valueTypeCase_ == 17;
+    }
     /**
      *
      *
@@ -2250,6 +2417,23 @@ public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
+    /**
+     *
+     *
+     * 
+     * A blob value.
+     * May have at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+     * In JSON requests, must be base64-encoded.
+     * 

+     *
+     * bytes blob_value = 18;
+     *
+     * @return Whether the blobValue field is set.
+     */
+    public boolean hasBlobValue() {
+      return valueTypeCase_ == 18;
+    }
     /**
      *
      *
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 f7e039308f9e..b965e9596ba7 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
@@ -23,6 +23,18 @@ public interface ValueOrBuilder
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Value)
     com.google.protobuf.MessageOrBuilder {
 
+  /**
+   *
+   *
+   * 
+   * A null value.
+   * 

+   *
+   * .google.protobuf.NullValue null_value = 11;
+   *
+   * @return Whether the nullValue field is set.
+   */
+  boolean hasNullValue();
   /**
    *
    *
@@ -48,6 +60,18 @@ public interface ValueOrBuilder
    */
   com.google.protobuf.NullValue getNullValue();
 
+  /**
+   *
+   *
+   * 
+   * A boolean value.
+   * 

+   *
+   * bool boolean_value = 1;
+   *
+   * @return Whether the booleanValue field is set.
+   */
+  boolean hasBooleanValue();
   /**
    *
    *
@@ -61,6 +85,18 @@ public interface ValueOrBuilder
    */
   boolean getBooleanValue();
 
+  /**
+   *
+   *
+   * 
+   * An integer value.
+   * 

+   *
+   * int64 integer_value = 2;
+   *
+   * @return Whether the integerValue field is set.
+   */
+  boolean hasIntegerValue();
   /**
    *
    *
@@ -74,6 +110,18 @@ public interface ValueOrBuilder
    */
   long getIntegerValue();
 
+  /**
+   *
+   *
+   * 
+   * A double value.
+   * 

+   *
+   * double double_value = 3;
+   *
+   * @return Whether the doubleValue field is set.
+   */
+  boolean hasDoubleValue();
   /**
    *
    *
@@ -163,6 +211,20 @@ public interface ValueOrBuilder
    */
   com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder();
 
+  /**
+   *
+   *
+   * 
+   * A UTF-8 encoded string value.
+   * When `exclude_from_indexes` is false (it is indexed), may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * 

+   *
+   * string string_value = 17;
+   *
+   * @return Whether the stringValue field is set.
+   */
+  boolean hasStringValue();
   /**
    *
    *
@@ -192,6 +254,21 @@ public interface ValueOrBuilder
    */
   com.google.protobuf.ByteString getStringValueBytes();
 
+  /**
+   *
+   *
+   * 
+   * A blob value.
+   * May have at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false, may have at most 1500 bytes.
+   * In JSON requests, must be base64-encoded.
+   * 

+   *
+   * bytes blob_value = 18;
+   *
+   * @return Whether the blobValue field is set.
+   */
+  boolean hasBlobValue();
   /**
    *
    *
diff --git a/synth.metadata b/synth.metadata
index 19e49ab481f7..72e95af0bb6d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "9ee440c280e00f56c089a67bcbaa601ea83fc74a"
+        "sha": "4a7cb74d39ec1895e758a248ee111ddc7af63515"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "99ae9a76dbecb2aab008d5403e25413f5da0f436",
-        "internalRef": "320455075"
+        "sha": "f6dd7e47620566925a4b3f1ce029e74e1b2f2516",
+        "internalRef": "359781040"
       }
     },
     {

From fb34aff01c577c573f283e09c09043296d10a2ae Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 2 Mar 2021 10:38:03 -0800
Subject: [PATCH 0533/1784] chore: regenerate README (#357)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-03-02 18:28:23,028 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-03-02 18:28:23,900 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/a9c607b2-bf80-41af-af92-510f2130ae26/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index d336a1c8bc88..5cf7525847d4 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "d045c8fc8999bf6e55c4790bcde382b0b01a403e"
+        "sha": "3b1f67af118b188e57a7dda77d2c265672765a6a"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "79ab0b44a2cc7d803d07c107f9faf07729fc4012"
+        "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5"
       }
     }
   ]
diff --git a/README.md b/README.md
index 77bb5fe028a8..3770c6dbc857 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.8'
+compile 'com.google.cloud:google-cloud-datastore:1.105.9'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.8"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.9"
 ```
 
 ## Authentication

From 43589603cdd0d97d8d11e30680cd2edae6c3178d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 2 Mar 2021 16:44:37 -0800
Subject: [PATCH 0534/1784] chore: remove docLava v2 doc generation (#358)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/ee71d617-e341-4f08-b5ee-4a7d066ce934/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/21da7d9fa02f6916d9f87cf4072b3547b5c72eb5
---
 .kokoro/release/publish_javadoc.cfg |  8 +-------
 .kokoro/release/publish_javadoc.sh  | 19 -------------------
 synth.metadata                      |  4 ++--
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
index c89135d5c7cd..49de6872d79c 100644
--- a/.kokoro/release/publish_javadoc.cfg
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -7,12 +7,6 @@ env_vars: {
   value: "docs-staging"
 }
 
-# cloud-rad staging
-env_vars: {
-  key: "STAGING_BUCKET_V2"
-  value: "docs-staging-v2-staging"
-}
-
 env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-datastore/.kokoro/release/publish_javadoc.sh"
@@ -26,4 +20,4 @@ before_action {
       keyname: "docuploader_service_account"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 3cc6d4151e74..45a8ed51588f 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -56,22 +56,3 @@ python3 -m docuploader create-metadata \
 python3 -m docuploader upload . \
   --credentials ${CREDENTIALS} \
   --staging-bucket ${STAGING_BUCKET}
-
-popd
-
-# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required.  Beware of accidental updates.
-
-mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"
-
-pushd target/devsite/reference
-
-# create metadata
-python3 -m docuploader create-metadata \
-  --name ${NAME} \
-  --version ${VERSION} \
-  --language java
-
-# upload docs to staging bucket
-python3 -m docuploader upload . \
-  --credentials ${CREDENTIALS} \
-  --staging-bucket ${STAGING_BUCKET_V2}
diff --git a/synth.metadata b/synth.metadata
index 72e95af0bb6d..0d17e8f453cc 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "4a7cb74d39ec1895e758a248ee111ddc7af63515"
+        "sha": "fb34aff01c577c573f283e09c09043296d10a2ae"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"
+        "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5"
       }
     }
   ],

From 0bf87b87e4b3b5796285e38091087a02f498934f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 3 Mar 2021 20:18:39 +0100
Subject: [PATCH 0535/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.105.9 (#353)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index b76e02733a51..0bcb86c0c337 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
-      1.105.8
+      1.105.9
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 93f7dad46585..47c0dc323221 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.8
+      1.105.9
     
 
     

From dc149e8ddb29a0f1888dc98bb8349e8014040233 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 3 Mar 2021 20:36:21 +0100
Subject: [PATCH 0536/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v18.1.0 (#359)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `18.0.0` -> `18.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.1.0/compatibility-slim/18.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.1.0/confidence-slim/18.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index cf167fa7dd32..71450225b313 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        18.0.0
+        18.1.0
         pom
         import
       

From 54a183779eb61445bf01d99c32cba859f7327d98 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 3 Mar 2021 11:40:11 -0800
Subject: [PATCH 0537/1784] chore: regenerate README (#360)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-03-03 19:20:52,424 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-03-03 19:20:53,299 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/2fb510c1-cff3-4123-9ead-8231cf4bd19b/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 5cf7525847d4..3a4cfbb33737 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "3b1f67af118b188e57a7dda77d2c265672765a6a"
+        "sha": "0bf87b87e4b3b5796285e38091087a02f498934f"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5"
+        "sha": "2e7bd5cc66a3f0b90ce1c150eb35c89eeb9872d6"
       }
     }
   ]
diff --git a/README.md b/README.md
index 3770c6dbc857..aca586c31d0b 100644
--- a/README.md
+++ b/README.md
@@ -38,14 +38,14 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.105.8
+  1.105.9
 
 
 ```
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:18.0.0')
+implementation platform('com.google.cloud:libraries-bom:18.1.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From f4e0c53e0c677c0014d4db334ec7530281d8c74e Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 3 Mar 2021 12:40:05 -0800
Subject: [PATCH 0538/1784] chore: regenerate README (#361)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-03-03 19:47:34,264 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-03-03 19:47:35,145 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/00760147-1e97-4c49-b28b-16591b70b3fe/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 3a4cfbb33737..492688a5aff3 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "0bf87b87e4b3b5796285e38091087a02f498934f"
+        "sha": "54a183779eb61445bf01d99c32cba859f7327d98"
       }
     },
     {
diff --git a/README.md b/README.md
index aca586c31d0b..5050b11a32f3 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      18.0.0
+      18.1.0
       pom
       import
     

From a6cee5c8dee68e2d1f291bbd6e709c175ce831f7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 4 Mar 2021 20:36:21 +0100
Subject: [PATCH 0539/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v19 (#362)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `18.1.0` -> `19.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.0.0/compatibility-slim/18.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.0.0/confidence-slim/18.1.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 71450225b313..0f12b8f12463 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        18.1.0
+        19.0.0
         pom
         import
       

From e2050e5519c003872f1adefb8cdb7f90d7e30b73 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 4 Mar 2021 12:04:21 -0800
Subject: [PATCH 0540/1784] chore: regenerate README (#363)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-03-04 19:39:26,549 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-03-04 19:39:27,432 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/c63f837d-1477-417e-93a3-f7cb30b19d3f/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 492688a5aff3..689fcaf09528 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "54a183779eb61445bf01d99c32cba859f7327d98"
+        "sha": "a6cee5c8dee68e2d1f291bbd6e709c175ce831f7"
       }
     },
     {
diff --git a/README.md b/README.md
index 5050b11a32f3..68e6b8c70ab1 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      18.1.0
+      19.0.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:18.1.0')
+implementation platform('com.google.cloud:libraries-bom:19.0.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 48266d0995980454e60192dda7d9fc03d1491ed5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 4 Mar 2021 15:52:29 -0800
Subject: [PATCH 0541/1784] chore: copy README to docfx-yml dir (#364)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/d7228b3e-1797-4121-9880-b79d0244a6b6/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/d0bdade9a962042dc0f770cf631086f3db59b5b0
---
 .kokoro/release/publish_javadoc11.sh | 5 ++++-
 synth.metadata                       | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 7c5e6f5dbfe2..ef7fd42bda2f 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -40,6 +40,9 @@ export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 # generate yml
 mvn clean site -B -q -P docFX
 
+# copy README to docfx-yml dir and rename index.md
+cp README.md target/docfx-yml/index.md
+
 pushd target/docfx-yml
 
 # create metadata
@@ -52,4 +55,4 @@ python3 -m docuploader create-metadata \
 python3 -m docuploader upload . \
  --credentials ${CREDENTIALS} \
  --staging-bucket ${STAGING_BUCKET_V2} \
- --destination-prefix docfx-
+ --destination-prefix docfx
diff --git a/synth.metadata b/synth.metadata
index 0d17e8f453cc..563c152abb9e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "fb34aff01c577c573f283e09c09043296d10a2ae"
+        "sha": "e2050e5519c003872f1adefb8cdb7f90d7e30b73"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5"
+        "sha": "d0bdade9a962042dc0f770cf631086f3db59b5b0"
       }
     }
   ],

From ccc4a015bc30b5b7bf43eb6af697a44b7be2e041 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 9 Mar 2021 21:44:30 +0100
Subject: [PATCH 0542/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.20.1 (#365)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `0.20.0` -> `0.20.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.1/compatibility-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.20.1/confidence-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.20.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0201-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0200v0201-2021-03-09)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.20.0...v0.20.1)




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 1a5890922d00..ceac9e68c2e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.20.0
+        0.20.1
         pom
         import
       

From 89f5488dda20cb5d72247c7460a1663d1faee62f Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 10 Mar 2021 16:10:36 -0800
Subject: [PATCH 0543/1784] build(java): update autorelease title check in
 response to the new multi release branch changes (#366)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/50a12256-ca5e-4f80-a8f2-ba3c4ab12a2c/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: https://github.com/googleapis/synthtool/commit/0b064d767537e0675fc053e53fca473c5c701fb8
---
 .github/workflows/auto-release.yaml | 4 ++--
 synth.metadata                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 7c8816a7d7b1..9b4fd4d8348d 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -16,8 +16,8 @@ jobs:
             return;
           }
 
-          // only approve PRs like "chore(master): release "
-          if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
+          // only approve PRs like "chore: release "
+          if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
             return;
           }
 
diff --git a/synth.metadata b/synth.metadata
index 563c152abb9e..a34f37ae614a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "e2050e5519c003872f1adefb8cdb7f90d7e30b73"
+        "sha": "ccc4a015bc30b5b7bf43eb6af697a44b7be2e041"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "d0bdade9a962042dc0f770cf631086f3db59b5b0"
+        "sha": "0b064d767537e0675fc053e53fca473c5c701fb8"
       }
     }
   ],

From 53be2946a99a79457ffeb8dda2f9b644590e786a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 11 Mar 2021 01:10:06 +0000
Subject: [PATCH 0544/1784] chore: release 1.106.0 (#356)

:robot: I have created a release \*beep\* \*boop\*
---
## [1.106.0](https://www.github.com/googleapis/java-datastore/compare/v1.105.9...v1.106.0) (2021-03-11)


### Features

* **generator:** update protoc to v3.15.3 ([#354](https://www.github.com/googleapis/java-datastore/issues/354)) ([3b1f67a](https://www.github.com/googleapis/java-datastore/commit/3b1f67af118b188e57a7dda77d2c265672765a6a))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.1 ([#365](https://www.github.com/googleapis/java-datastore/issues/365)) ([ccc4a01](https://www.github.com/googleapis/java-datastore/commit/ccc4a015bc30b5b7bf43eb6af697a44b7be2e041))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 12 ++++++++++++
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1eb72189973..6bcb5b1eb82c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.106.0](https://www.github.com/googleapis/java-datastore/compare/v1.105.9...v1.106.0) (2021-03-11)
+
+
+### Features
+
+* **generator:** update protoc to v3.15.3 ([#354](https://www.github.com/googleapis/java-datastore/issues/354)) ([3b1f67a](https://www.github.com/googleapis/java-datastore/commit/3b1f67af118b188e57a7dda77d2c265672765a6a))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.1 ([#365](https://www.github.com/googleapis/java-datastore/issues/365)) ([ccc4a01](https://www.github.com/googleapis/java-datastore/commit/ccc4a015bc30b5b7bf43eb6af697a44b7be2e041))
+
 ### [1.105.9](https://www.github.com/googleapis/java-datastore/compare/v1.105.8...v1.105.9) (2021-02-25)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index da3e61d9adaf..7241042127f7 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
-  1.105.10-SNAPSHOT
+  1.106.0
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.10-SNAPSHOT
+        0.89.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.105.10-SNAPSHOT
+        1.106.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7cf05fd02e10..44717dc50da1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.105.10-SNAPSHOT
+  1.106.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.10-SNAPSHOT
+    1.106.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index ceac9e68c2e7..cb6f1d1c5f2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.105.10-SNAPSHOT
+  1.106.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.88.10-SNAPSHOT
+        0.89.0
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 563e956a0db7..4539216fa5ee 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.88.10-SNAPSHOT
+  0.89.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.105.10-SNAPSHOT
+    1.106.0
   
   
     
diff --git a/versions.txt b/versions.txt
index a8fa2ef51c26..b4cb80e4bdd4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.105.9:1.105.10-SNAPSHOT
-google-cloud-datastore-bom:1.105.9:1.105.10-SNAPSHOT
-google-cloud-datastore-parent:1.105.9:1.105.10-SNAPSHOT
-proto-google-cloud-datastore-v1:0.88.9:0.88.10-SNAPSHOT
+google-cloud-datastore:1.106.0:1.106.0
+google-cloud-datastore-bom:1.106.0:1.106.0
+google-cloud-datastore-parent:1.106.0:1.106.0
+proto-google-cloud-datastore-v1:0.89.0:0.89.0
 

From 8d7b9162f5d02d45f38edd6b5da02c8f3efae504 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 11 Mar 2021 01:16:06 +0000
Subject: [PATCH 0545/1784] chore: release 1.106.1-SNAPSHOT (#367)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7241042127f7..2263a5776748 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
-  1.106.0
+  1.106.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.0
+        0.89.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.0
+        1.106.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 44717dc50da1..3fd3f0772a8c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.0
+  1.106.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.0
+    1.106.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index cb6f1d1c5f2f..b9457c52d6e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.0
+  1.106.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.0
+        0.89.1-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4539216fa5ee..1339108ce24b 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.89.0
+  0.89.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.0
+    1.106.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index b4cb80e4bdd4..f6e40b403fec 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.0:1.106.0
-google-cloud-datastore-bom:1.106.0:1.106.0
-google-cloud-datastore-parent:1.106.0:1.106.0
-proto-google-cloud-datastore-v1:0.89.0:0.89.0
+google-cloud-datastore:1.106.0:1.106.1-SNAPSHOT
+google-cloud-datastore-bom:1.106.0:1.106.1-SNAPSHOT
+google-cloud-datastore-parent:1.106.0:1.106.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.89.0:0.89.1-SNAPSHOT
 

From d6a2dde141365ea465f2cb280947f7b7c088485b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 18 Mar 2021 02:34:02 +0100
Subject: [PATCH 0546/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v19.2.0 (#369)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `19.0.0` -> `19.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.0/compatibility-slim/19.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.0/confidence-slim/19.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 0f12b8f12463..b19cf7f55950 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        19.0.0
+        19.2.0
         pom
         import
       

From ace1310fb1891a3fa3474f510a5a46d8f940e3bd Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 17 Mar 2021 18:42:03 -0700
Subject: [PATCH 0547/1784] chore: regenerate README (#370)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-03-18 01:36:16,384 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-03-18 01:36:17,302 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/ec651000-ed7a-43e4-a323-dcec3bf7be92/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 689fcaf09528..33c2537b1f35 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a6cee5c8dee68e2d1f291bbd6e709c175ce831f7"
+        "sha": "d6a2dde141365ea465f2cb280947f7b7c088485b"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "2e7bd5cc66a3f0b90ce1c150eb35c89eeb9872d6"
+        "sha": "78437c732a60c64895778697b078497b0988346c"
       }
     }
   ]
diff --git a/README.md b/README.md
index 68e6b8c70ab1..468a382720f3 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      19.0.0
+      19.2.0
       pom
       import
     
@@ -45,18 +45,18 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:19.0.0')
+implementation platform('com.google.cloud:libraries-bom:19.2.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.105.9'
+compile 'com.google.cloud:google-cloud-datastore:1.106.0'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.105.9"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.0"
 ```
 
 ## Authentication

From ec5946ac84201a385ee29ac5bb191e9ee1706046 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 19 Mar 2021 19:04:22 +0100
Subject: [PATCH 0548/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v19.2.1 (#371)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `19.2.0` -> `19.2.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.1/compatibility-slim/19.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/19.2.1/confidence-slim/19.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b19cf7f55950..eb3223f6e580 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        19.2.0
+        19.2.1
         pom
         import
       

From 850ff0e6d0a279ccf8a5f98164d45900b48d80a5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 19 Mar 2021 11:44:02 -0700
Subject: [PATCH 0549/1784] chore: regenerate README (#372)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-03-19 18:08:16,772 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-03-19 18:08:17,647 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/437c7f43-1e34-46b4-a83a-0e427abbe43b/targets

- [ ] To automatically regenerate this PR, check this box.
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 33c2537b1f35..502ddfd62138 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "d6a2dde141365ea465f2cb280947f7b7c088485b"
+        "sha": "ec5946ac84201a385ee29ac5bb191e9ee1706046"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "78437c732a60c64895778697b078497b0988346c"
+        "sha": "8b13da943497f75c5303700bff5aabdd85d939e0"
       }
     }
   ]
diff --git a/README.md b/README.md
index 468a382720f3..81ca151b9d3d 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      19.2.0
+      19.2.1
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:19.2.0')
+implementation platform('com.google.cloud:libraries-bom:19.2.1')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 40d711599c761f6ac966d7246741ea7628743f98 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 23 Mar 2021 16:42:16 +0100
Subject: [PATCH 0550/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.106.0 (#368)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `1.105.9` -> `1.106.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.0/compatibility-slim/1.105.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.0/confidence-slim/1.105.9)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-datastore

### [`v1.106.0`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11060-httpswwwgithubcomgoogleapisjava-datastorecomparev11059v11060-2021-03-11)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.105.9...v1.106.0)

##### Features

-   **generator:** update protoc to v3.15.3 ([#​354](https://www.github.com/googleapis/java-datastore/issues/354)) ([3b1f67a](https://www.github.com/googleapis/java-datastore/commit/3b1f67af118b188e57a7dda77d2c265672765a6a))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.1 ([#​365](https://www.github.com/googleapis/java-datastore/issues/365)) ([ccc4a01](https://www.github.com/googleapis/java-datastore/commit/ccc4a015bc30b5b7bf43eb6af697a44b7be2e041))

##### [1.105.9](https://www.github.com/googleapis/java-datastore/compare/v1.105.8...v1.105.9) (2021-02-25)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.0 ([#​350](https://www.github.com/googleapis/java-datastore/issues/350)) ([13336fb](https://www.github.com/googleapis/java-datastore/commit/13336fbe4dc5ea54ea0b50f2dce4c7534e8203ce))

##### [1.105.8](https://www.github.com/googleapis/java-datastore/compare/v1.105.7...v1.105.8) (2021-02-22)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.19.0 ([#​339](https://www.github.com/googleapis/java-datastore/issues/339)) ([393bd29](https://www.github.com/googleapis/java-datastore/commit/393bd29b15d818b6f7ab34542dcd3ca6b956f61d))

##### [1.105.7](https://www.github.com/googleapis/java-datastore/compare/v1.105.6...v1.105.7) (2021-01-21)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.18.0 ([#​309](https://www.github.com/googleapis/java-datastore/issues/309)) ([211ac20](https://www.github.com/googleapis/java-datastore/commit/211ac202d4fd9b5b7b07bc0b21e56d98e8bc18e5))

##### [1.105.6](https://www.github.com/googleapis/java-datastore/compare/v1.105.5...v1.105.6) (2021-01-11)

##### Dependencies

-   update dependency com.google.oauth-client:google-oauth-client to v1.31.4 ([#​301](https://www.github.com/googleapis/java-datastore/issues/301)) ([f03b4ce](https://www.github.com/googleapis/java-datastore/commit/f03b4ceae059a6be93b48776cfcf51dbd53c8c1d))

##### [1.105.5](https://www.github.com/googleapis/java-datastore/compare/v1.105.4...v1.105.5) (2020-12-15)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.17.0 ([#​288](https://www.github.com/googleapis/java-datastore/issues/288)) ([30f11d2](https://www.github.com/googleapis/java-datastore/commit/30f11d234e63723b0f8afe57f6d3390cb54ad9fe))

##### [1.105.4](https://www.github.com/googleapis/java-datastore/compare/v1.105.3...v1.105.4) (2020-12-14)

##### Bug Fixes

-   broken links ([#​276](https://www.github.com/googleapis/java-datastore/issues/276)) ([7203098](https://www.github.com/googleapis/java-datastore/commit/7203098e4ab09bb73c3b66ff4c6100aac02d20c4))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.1 ([b323187](https://www.github.com/googleapis/java-datastore/commit/b323187011d66bb12410a2f762c13bb8e21ad227))

##### [1.105.3](https://www.github.com/googleapis/java-datastore/compare/v1.105.2...v1.105.3) (2020-12-02)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#​277](https://www.github.com/googleapis/java-datastore/issues/277)) ([fbfa25b](https://www.github.com/googleapis/java-datastore/commit/fbfa25bf7ef717ec12364ccd76e7f5b35d51234e))

##### [1.105.2](https://www.github.com/googleapis/java-datastore/compare/v1.105.1...v1.105.2) (2020-11-20)

##### Dependencies

-   update dependency com.google.oauth-client:google-oauth-client to v1.31.2 ([#​265](https://www.github.com/googleapis/java-datastore/issues/265)) ([3f165c7](https://www.github.com/googleapis/java-datastore/commit/3f165c7843b7241340eae8e9ad391357e36df237))

##### [1.105.1](https://www.github.com/googleapis/java-datastore/compare/v1.105.0...v1.105.1) (2020-11-16)

##### Documentation

-   update google cloud libraries-bom ([#​236](https://www.github.com/googleapis/java-datastore/issues/236)) ([7325fa0](https://www.github.com/googleapis/java-datastore/commit/7325fa0ba489efe31a58f64c2d3e2b55cd156822))
-   update libraries-bom ([#​220](https://www.github.com/googleapis/java-datastore/issues/220)) ([593fc66](https://www.github.com/googleapis/java-datastore/commit/593fc662e11ea446cd3fc7864cfa9a1b75480fba))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.13.0 ([#​243](https://www.github.com/googleapis/java-datastore/issues/243)) ([d275db8](https://www.github.com/googleapis/java-datastore/commit/d275db8e3f14783acfebb9dff7347a871dcd9727))
-   update dependency com.google.oauth-client:google-oauth-client to v1.31.1 ([#​244](https://www.github.com/googleapis/java-datastore/issues/244)) ([b984e36](https://www.github.com/googleapis/java-datastore/commit/b984e360ccaf30f55b239f831430256f3231036f))
-   update google-cloud-shared-dependencies to 0.15.0 ([#​259](https://www.github.com/googleapis/java-datastore/issues/259)) ([d6c68e7](https://www.github.com/googleapis/java-datastore/commit/d6c68e7e09f5e5728f2f082d5e95503df04a2ec2))




---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 0bcb86c0c337..43a6d18c8f9e 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
-      1.105.9
+      1.106.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 47c0dc323221..c99326a98fda 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.105.9
+      1.106.0
     
 
     

From fd5854857919e53f653751f79616aaa1e5d7fdd0 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 23 Mar 2021 09:06:09 -0700
Subject: [PATCH 0551/1784] chore: regenerate README (#373)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-03-23 15:44:37,228 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-03-23 15:44:38,157 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/59d04c2a-2a34-4046-aa0b-9ddecb821ff3/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 502ddfd62138..0981eff686aa 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "ec5946ac84201a385ee29ac5bb191e9ee1706046"
+        "sha": "40d711599c761f6ac966d7246741ea7628743f98"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8b13da943497f75c5303700bff5aabdd85d939e0"
+        "sha": "c84c8f156e09702e1c8946bfb9746e6f5892cf27"
       }
     }
   ]
diff --git a/README.md b/README.md
index 81ca151b9d3d..6f764970e866 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.105.9
+  1.106.0
 
 
 ```

From 1a15d9978c2fcdb17cd210f4758e4dfd42d50615 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 24 Mar 2021 16:08:06 -0700
Subject: [PATCH 0552/1784] chore(java): detect sample-secrets in build.sh
 (#374)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/d55a1379-0d11-4919-8fb9-7dd3f61a70ab/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef
---
 .kokoro/build.sh | 5 +++++
 synth.metadata   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 894bfd4a57b2..b8a12076ec3e 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -79,6 +79,11 @@ samples)
 
     if [[ -f ${SAMPLES_DIR}/pom.xml ]]
     then
+        for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
+          [[ -f "$FILE" ]] || continue
+          source "$FILE"
+        done
+
         pushd ${SAMPLES_DIR}
         mvn -B \
           -Penable-samples \
diff --git a/synth.metadata b/synth.metadata
index a34f37ae614a..26af94a9ccb0 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "ccc4a015bc30b5b7bf43eb6af697a44b7be2e041"
+        "sha": "fd5854857919e53f653751f79616aaa1e5d7fdd0"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "0b064d767537e0675fc053e53fca473c5c701fb8"
+        "sha": "bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef"
       }
     }
   ],

From 1651b887da02c10fd5f8e761303e6eff7c3c45c4 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 29 Mar 2021 15:34:06 -0700
Subject: [PATCH 0553/1784] chore: remove staging bucket v2 (#375)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/a5bf99b0-f2a5-4ac0-ae4c-9e4e0ef0adde/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/572ef8f70edd9041f5bcfa71511aed6aecfc2098
---
 .kokoro/release/publish_javadoc.sh | 5 -----
 synth.metadata                     | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 45a8ed51588f..18b3da5839aa 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
   exit 1
 fi
 
-if [[ -z "${STAGING_BUCKET_V2}" ]]; then
-  echo "Need to set STAGING_BUCKET_V2 environment variable"
-  exit 1
-fi
-
 # work from the git root directory
 pushd $(dirname "$0")/../../
 
diff --git a/synth.metadata b/synth.metadata
index 26af94a9ccb0..abfcc9e712b3 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "fd5854857919e53f653751f79616aaa1e5d7fdd0"
+        "sha": "1a15d9978c2fcdb17cd210f4758e4dfd42d50615"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef"
+        "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"
       }
     }
   ],

From f55449c712b4717fe73c1ce48f8973932d5f21ed Mon Sep 17 00:00:00 2001
From: Vasu Nori <48367170+vnorigoog@users.noreply.github.com>
Date: Tue, 30 Mar 2021 15:51:29 -0700
Subject: [PATCH 0554/1784] feat: add optional end-to-end checksum support for
 http 1.1 requests (#261)

Update RemoteRpc to optionally support end-to-end checksums. If enabled,
when sending a request to datastore a checksum will be calculated and
included as a header of the request. When receiving a response from
datastore and the checksum header is present, a checksum of the payload
will be computed and validated to match the values specified in the
header. If validation of the response fails, an IOException will be thrown
to signal possible payload corruption.

By default, checksum validation is not enabled. To enable checksum validation
the environment variable `GOOGLE_CLOUD_DATASTORE_HTTP_ENABLE_E2E_CHECKSUM`
should be set to `true`.
---
 .../client/ChecksumEnforcingInputStream.java  | 109 ++++++++++++++++++
 .../v1/client/EndToEndChecksumHandler.java    |  77 +++++++++++++
 .../google/datastore/v1/client/RemoteRpc.java |  38 +++++-
 .../ChecksumEnforcingInputStreamTest.java     | 109 ++++++++++++++++++
 .../client/EndToEndChecksumHandlerTest.java   |  74 ++++++++++++
 .../datastore/v1/client/RemoteRpcTest.java    |  45 ++++++++
 6 files changed, 449 insertions(+), 3 deletions(-)
 create mode 100644 datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
 create mode 100644 datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
 create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
 create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java

diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
new file mode 100644
index 000000000000..f74dc004c453
--- /dev/null
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2021 Google LLC. All Rights Reserved.
+ *
+ * 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;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.api.client.http.HttpResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+
+/** This class provides End-to-End Checksum API for http protocol. */
+class ChecksumEnforcingInputStream extends InputStream {
+  private final InputStream delegate;
+  private final MessageDigest messageDigest;
+  private final String expectedChecksum;
+
+  ChecksumEnforcingInputStream(InputStream originalInputStream,
+                               HttpResponse response,
+                               MessageDigest digest) {
+    this(originalInputStream, EndToEndChecksumHandler.getChecksumHeader(response), digest);
+  }
+
+  @VisibleForTesting
+  ChecksumEnforcingInputStream(InputStream originalInputStream,
+                               String checksum,
+                               MessageDigest digest) {
+    delegate = originalInputStream;
+    expectedChecksum = checksum;
+    messageDigest = digest;
+  }
+
+  @Override
+  public int available() throws IOException {
+    return delegate.available();
+  }
+
+  @Override
+  public void close() throws IOException {
+    delegate.close();
+  }
+
+  @Override
+  public void mark(int readlimit) {
+    throw new RuntimeException("mark(int) Not Supported");
+  }
+
+  @Override
+  public boolean markSupported() {
+    // This class doesn't support mark, reset methods!
+    return false;
+  }
+
+  @Override
+  public int read() throws IOException {
+    throw new RuntimeException("read() Not Supported");
+  }
+
+  @Override
+  public int read(byte[] b) throws IOException {
+    throw new RuntimeException("read(byte[]) Not Supported");
+  }
+
+  @Override
+  public int read(byte[] b, int off, int len) throws IOException {
+    if (len <= 0) return 0;
+    int i = delegate.read(b, off, len);
+    if (i > 0) {
+      messageDigest.update(b, off, i);
+    } else {
+      // no more payload to read. compute checksum and verify
+      if (!expectedChecksum.equalsIgnoreCase(
+          com.google.common.io.BaseEncoding.base16().encode(messageDigest.digest()))) {
+        throw new IOException("possible memory corruption on payload detected");
+      }
+    }
+    return i;
+  }
+
+  @Override
+  public void reset() throws IOException {
+    throw new RuntimeException("reset() Not Supported");
+  }
+
+  @Override
+  public long skip(long n) throws IOException {
+    if (n <= 0) return 0;
+    // TODO: handle the case of n > Integer.MAX_VALUE ( that is, n > (2GB - 1). It is highly
+    // unlikely that callers will want to skip that many bytes. That is the entire payload
+    if (n > Integer.MAX_VALUE) {
+      throw new IOException("can't skip more than Integer.MAX bytes");
+    }
+    int intSkip = (int) n;
+    byte[] b = new byte[intSkip];
+    return read(b, 0, intSkip);
+  }
+}
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
new file mode 100644
index 000000000000..591ebe3f6ad8
--- /dev/null
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021 Google LLC. All Rights Reserved.
+ *
+ * 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;
+
+import com.google.api.client.http.HttpResponse;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/** This class provides End-to-End Checksum API for http protocol. */
+class EndToEndChecksumHandler {
+  /** The checksum http header on http requests */
+  static final String HTTP_REQUEST_CHECKSUM_HEADER = "x-request-checksum-348659783";
+  /** The checksum http header on http responses */
+  static final String HTTP_RESPONSE_CHECKSUM_HEADER = "x-response-checksum-348659783";
+  /** Algorithm used for checksum */
+  private static final String MD5 = "MD5";
+
+  /**
+   * Create and return checksum as a string value for the input 'bytes'.
+   *
+   * @param bytes raw message for which the checksum is being computed
+   * @return computed checksum as a hex string
+   * @throws RuntimeException if MD5 Algorithm is not found in the VM
+   */
+  static String computeChecksum(byte[] bytes) {
+    if (bytes == null || (bytes.length == 0)) {
+      return null;
+    }
+    return com.google.common.io.BaseEncoding.base16().encode(
+        getMessageDigestInstance().digest(bytes));
+  }
+
+  /**
+   * Validates the checksum for the given input 'bytes' and returns true if valid, false otherwise.
+   *
+   * @param checksum the checksum as a hex string
+   * @param bytes the raw message for which the checksum was sent
+   * @return {@code true} if input checksum is valid for the input bytes; {@code false} otherwise
+   */
+  static boolean validateChecksum(String checksum, byte[] bytes) {
+    return checksum != null
+        && !checksum.isEmpty()
+        && bytes != null
+        && bytes.length > 0
+        && checksum.equalsIgnoreCase(computeChecksum(bytes));
+  }
+
+  static MessageDigest getMessageDigestInstance() {
+    try {
+      return MessageDigest.getInstance(MD5);
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException("MD5 algorithm is not found when computing checksum!");
+    }
+  }
+
+  static boolean hasChecksumHeader(HttpResponse response) {
+    String checksum = getChecksumHeader(response);
+    return checksum != null && !checksum.isEmpty();
+  }
+
+  static String getChecksumHeader(HttpResponse response) {
+    return response.getHeaders().getFirstHeaderStringValue(HTTP_RESPONSE_CHECKSUM_HEADER);
+  }
+}
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 1c422844df5c..e0b2e378b786 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
@@ -23,6 +23,7 @@
 import com.google.api.client.http.HttpStatusCodes;
 import com.google.api.client.http.protobuf.ProtoHttpContent;
 import com.google.api.client.util.IOUtils;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.MessageLite;
 import com.google.rpc.Code;
 import com.google.rpc.Status;
@@ -42,13 +43,17 @@
 class RemoteRpc {
   private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName());
 
-  private static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version";
+  @VisibleForTesting
+  static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version";
   private static final String API_FORMAT_VERSION = "2";
 
   private final HttpRequestFactory client;
   private final HttpRequestInitializer initializer;
   private final String url;
   private final AtomicInteger rpcCount = new AtomicInteger(0);
+  // Not final - so it can be set/reset in Unittests
+  private static boolean enableE2EChecksum = Boolean.parseBoolean(
+      System.getenv("GOOGLE_CLOUD_DATASTORE_HTTP_ENABLE_E2E_CHECKSUM"));
 
   RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) {
     this.client = client;
@@ -80,7 +85,7 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
         rpcCount.incrementAndGet();
         ProtoHttpContent payload = new ProtoHttpContent(request);
         HttpRequest httpRequest = client.buildPostRequest(resolveURL(methodName), payload);
-        httpRequest.getHeaders().put(API_FORMAT_VERSION_HEADER, API_FORMAT_VERSION);
+        setHeaders(request, httpRequest);
         // 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);
@@ -98,7 +103,12 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
                 httpResponse.getStatusCode());
           }
         }
-        return httpResponse.getContent();
+        InputStream inputStream = httpResponse.getContent();
+        return enableE2EChecksum && EndToEndChecksumHandler.hasChecksumHeader(httpResponse)
+            ? new ChecksumEnforcingInputStream(inputStream,
+                                               httpResponse,
+                                               EndToEndChecksumHandler.getMessageDigestInstance())
+            : inputStream;
       } catch (SocketTimeoutException e) {
         throw makeException(url, methodName, Code.DEADLINE_EXCEEDED, "Deadline exceeded", e);
       } catch (IOException e) {
@@ -110,6 +120,28 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
     }
   }
 
+  @VisibleForTesting
+  void setHeaders(MessageLite request, HttpRequest httpRequest) {
+    httpRequest.getHeaders().put(API_FORMAT_VERSION_HEADER, API_FORMAT_VERSION);
+    if (enableE2EChecksum && request != null) {
+      String checksum = EndToEndChecksumHandler.computeChecksum(request.toByteArray());
+      if (checksum != null) {
+        httpRequest.getHeaders().put(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER,
+            checksum);
+      }
+    }
+  }
+
+  @VisibleForTesting
+  HttpRequestFactory getClient() {
+    return client;
+  }
+
+  @VisibleForTesting
+  static void setSystemEnvE2EChecksum(boolean enableE2EChecksum) {
+    RemoteRpc.enableE2EChecksum = enableE2EChecksum;
+  }
+
   void resetRpcCount() {
     rpcCount.set(0);
   }
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
new file mode 100644
index 000000000000..32d43fb44be0
--- /dev/null
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2021 Google LLC. All Rights Reserved.
+ *
+ * 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;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Test for {@link ChecksumEnforcingInputStream}. */
+@RunWith(JUnit4.class)
+public class ChecksumEnforcingInputStreamTest {
+  private final MessageDigest digest = EndToEndChecksumHandler.getMessageDigestInstance();
+
+  public void test(int payloadSize) throws Exception {
+    ChecksumEnforcingInputStream testInstance = setUpData(payloadSize);
+    // read 1000 bytes at a time
+    // Since checksum should be correct, do not expect IOException
+    byte[] buf = new byte[1000];
+    try {
+      while (testInstance.read(buf, 0, 1000) != -1) {
+         // do nothing with the bytes read
+      }
+    } catch (IOException e) {
+      fail("checksum verification failed!");
+    }
+  }
+
+  @Test
+  public void read_withValidChecksum_differentPayloadSizes() throws Exception {
+    // test with various payload sizes (1, 2, 2**2, 2**3 etc upto 2**28 = 256MB)
+    for (int i = 0, payloadSize = 1; i < 29; i++) {
+      long start = System.currentTimeMillis();
+      test(payloadSize);
+      payloadSize *= 2;
+      long duration = System.currentTimeMillis() - start;
+      // log test duration times for bigger payloads
+      if (i > 20) {
+        System.out.println("Test duration for payloadsize = 2** " + i + " is: " + duration + "ms");
+      }
+    }
+  }
+
+  @Test
+  public void read_withInvalidChecksum() {
+    // build a test instance with invalidchecksum
+    ChecksumEnforcingInputStream instance = new ChecksumEnforcingInputStream(
+        new ByteArrayInputStream("hello there".getBytes(UTF_8)),
+        "this checksum is invalid",
+        digest);
+    // read 1000 bytes at a time
+    // Since checksum should be correct, do not expect IOException
+    byte[] buf = new byte[1000];
+    try {
+      while (instance.read(buf, 0, 1000) != -1) {
+        // do nothing with the bytes read
+      }
+    } catch (IOException e) {
+      // this is expected
+      return;
+    }
+    fail("should have failed");
+  }
+
+  @Test
+  public void markNotSupported() throws Exception {
+    ChecksumEnforcingInputStream testInstance = setUpData(1);
+    assertFalse(testInstance.markSupported());
+  }
+
+  private ChecksumEnforcingInputStream setUpData(int payloadSize) throws Exception {
+    // setup a String of size = input param: payloadSize
+    String str = "This is a repeating string.";
+    String payload;
+    if (payloadSize > str.length()) {
+      int num = payloadSize / str.length();
+      StringBuffer buf = new StringBuffer();
+      for (int i = 0; i < num; i++) {
+        buf.append(str);
+      }
+      payload = buf.toString();
+    } else {
+      payload = str.substring(0, payloadSize);
+    }
+    byte[] bytes = payload.getBytes(UTF_8);
+    String expectedChecksum = EndToEndChecksumHandler.computeChecksum(bytes);
+    return new ChecksumEnforcingInputStream(new ByteArrayInputStream(bytes),
+                                            expectedChecksum, digest);
+  }
+}
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
new file mode 100644
index 000000000000..593ccd23dc64
--- /dev/null
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2021 Google LLC. All Rights Reserved.
+ *
+ * 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;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Test for {@link EndToEndChecksumHandler}. */
+@RunWith(JUnit4.class)
+public class EndToEndChecksumHandlerTest {
+  private byte[] payloadBytes = "This is a long string with numbers 1234, 134.56 ".getBytes(UTF_8);
+
+  @Test
+  public void validateChecksum_correctChecksum() {
+    String computed = EndToEndChecksumHandler.computeChecksum(payloadBytes);
+    assertTrue(EndToEndChecksumHandler.validateChecksum(computed, payloadBytes));
+  }
+
+  @Test
+  public void validateChecksum_incorrectChecksum() {
+    String computed = EndToEndChecksumHandler.computeChecksum("random string".getBytes(UTF_8));
+    assertFalse(EndToEndChecksumHandler.validateChecksum(computed, payloadBytes));
+  }
+
+  @Test
+  public void validateChecksum_nullChecksum() {
+    assertFalse(EndToEndChecksumHandler.validateChecksum(null, payloadBytes));
+  }
+
+  @Test
+  public void validateChecksum_emptyChecksum() {
+    assertFalse(EndToEndChecksumHandler.validateChecksum("", payloadBytes));
+  }
+
+  @Test
+  public void validateChecksum_nullPayload() {
+    assertFalse(EndToEndChecksumHandler.validateChecksum("foo", null));
+  }
+
+  @Test
+  public void validateChecksum_emptyPayload() {
+    assertFalse(EndToEndChecksumHandler.validateChecksum("foo", new byte[0]));
+  }
+
+  @Test
+  public void computeChecksum_nullInputBytes() {
+    assertNull(EndToEndChecksumHandler.computeChecksum(null));
+  }
+
+  @Test
+  public void computeChecksum_emptyArrayForInputBytes() {
+    assertNull(EndToEndChecksumHandler.computeChecksum(new byte[0]));
+  }
+}
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 86f2559f4c64..377f92d8cc5d 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
@@ -16,13 +16,19 @@
 package com.google.datastore.v1.client;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
+import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
+import com.google.api.client.http.protobuf.ProtoHttpContent;
 import com.google.api.client.util.Charsets;
 import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.RollbackRequest;
 import com.google.protobuf.ByteString;
+import com.google.protobuf.MessageLite;
 import com.google.rpc.Code;
 import com.google.rpc.Status;
 import java.io.ByteArrayInputStream;
@@ -132,6 +138,45 @@ public void testGzip() throws IOException, DatastoreException {
     assertEquals(-1, injectedTestValues.inputStream.read());
   }
 
+  @Test
+  public void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
+    // Enable E2E-Checksum system env variable
+    RemoteRpc.setSystemEnvE2EChecksum(true);
+    MessageLite request = RollbackRequest.newBuilder()
+        .setTransaction(ByteString.copyFromUtf8("project-id"))
+        .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);
+    assertNotNull(httpRequest.getHeaders()
+        .getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
+    // Expect to find e2e-checksum header
+    String header = httpRequest.getHeaders().getFirstHeaderStringValue(
+        EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER);
+    assertEquals(32, header.length());
+  }
+
+  @Test
+  public void testHttpHeaders_doNotExpectE2eChecksumHeader() throws IOException {
+    // disable E2E-Checksum system env variable
+    RemoteRpc.setSystemEnvE2EChecksum(false);
+    MessageLite request = RollbackRequest.newBuilder()
+        .setTransaction(ByteString.copyFromUtf8("project-id"))
+        .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);
+    assertNotNull(httpRequest.getHeaders()
+        .getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
+    // Do not expect to find e2e-checksum header
+    assertNull(httpRequest.getHeaders().getFirstHeaderStringValue(
+        EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER));
+  }
+
   private static BeginTransactionResponse newBeginTransactionResponse() {
     return BeginTransactionResponse.newBuilder()
         .setTransaction(ByteString.copyFromUtf8("blah-blah-blah"))

From f8cb9ea93c9703d2f67b56d1622128ff4000fa17 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 6 Apr 2021 01:50:58 +0200
Subject: [PATCH 0555/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.22 (#378)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 43a6d18c8f9e..bf92f5303c53 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.21
+    1.0.22
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index 93b0d1050389..5a66b8a0c250 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.21
+    1.0.22
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c99326a98fda..f68b96e3f29e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.21
+    1.0.22
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index eb3223f6e580..d6bcf0f19cb2 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.21
+    1.0.22
   
 
   

From 7577e1b1cb1af0539fc931059fbb48ee5e934447 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 9 Apr 2021 22:36:08 +0200
Subject: [PATCH 0556/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.21.0 (#380)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `0.20.1` -> `0.21.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/compatibility-slim/0.20.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/confidence-slim/0.20.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.21.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0210-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0201v0210-2021-04-09)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.20.1...v0.21.0)

##### Dependencies

-   update dependency com.google.auth:google-auth-library-bom to v0.25.0 ([#​310](https://www.github.com/googleapis/java-shared-dependencies/issues/310)) ([8f3a0f0](https://www.github.com/googleapis/java-shared-dependencies/commit/8f3a0f002b787f7b27cfe031654fa20bf342f839))
-   update dependency com.google.auth:google-auth-library-bom to v0.25.2 ([#​311](https://www.github.com/googleapis/java-shared-dependencies/issues/311)) ([6c47a3e](https://www.github.com/googleapis/java-shared-dependencies/commit/6c47a3edbd9da04ba255487a66c0f3a41393217d))
-   update dependency com.google.errorprone:error_prone_annotations to v2.6.0 ([#​315](https://www.github.com/googleapis/java-shared-dependencies/issues/315)) ([dc254ca](https://www.github.com/googleapis/java-shared-dependencies/commit/dc254ca7359b68fe9411f7b96130ffb416b45c6f))
-   update dependency com.google.http-client:google-http-client-bom to v1.39.1 ([#​309](https://www.github.com/googleapis/java-shared-dependencies/issues/309)) ([37225e2](https://www.github.com/googleapis/java-shared-dependencies/commit/37225e2d1b32a618765391720b57ff29e7b8f7f9))
-   update dependency com.google.http-client:google-http-client-bom to v1.39.2 ([#​321](https://www.github.com/googleapis/java-shared-dependencies/issues/321)) ([273c66d](https://www.github.com/googleapis/java-shared-dependencies/commit/273c66d374f7cd6040aac2f302fd1c1dc0f4a1c0))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.6 ([#​308](https://www.github.com/googleapis/java-shared-dependencies/issues/308)) ([b29dd05](https://www.github.com/googleapis/java-shared-dependencies/commit/b29dd0535f02b56607f64ba69e85d4d468902789))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.7 ([#​316](https://www.github.com/googleapis/java-shared-dependencies/issues/316)) ([9c00d77](https://www.github.com/googleapis/java-shared-dependencies/commit/9c00d7753c1f7b963deb9ad69dcfe24ba28da5a2))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.8 ([#​319](https://www.github.com/googleapis/java-shared-dependencies/issues/319)) ([15e5ae2](https://www.github.com/googleapis/java-shared-dependencies/commit/15e5ae2ef46eedcd790ffd8644677d36db5c63f9))
-   update dependency io.grpc:grpc-bom to v1.37.0 ([#​313](https://www.github.com/googleapis/java-shared-dependencies/issues/313)) ([c599351](https://www.github.com/googleapis/java-shared-dependencies/commit/c5993511c7305e1ced42d73552a93a25dc5e1ac1))
-   update gax.version to v1.63.0 ([#​318](https://www.github.com/googleapis/java-shared-dependencies/issues/318)) ([ba709da](https://www.github.com/googleapis/java-shared-dependencies/commit/ba709da6fb0e9bcfc83e663588336598737b46e4))
-   update google.core.version to v1.94.4 ([#​305](https://www.github.com/googleapis/java-shared-dependencies/issues/305)) ([0d38f4c](https://www.github.com/googleapis/java-shared-dependencies/commit/0d38f4c9ffadcfd9446712b8bf0729399b0c9e91))
-   update google.core.version to v1.94.5 ([#​320](https://www.github.com/googleapis/java-shared-dependencies/issues/320)) ([3439721](https://www.github.com/googleapis/java-shared-dependencies/commit/3439721da83a8b92d9c4b6ecfd158cfb1e1a0503))
-   update guava to 30.1.1-android ([#​322](https://www.github.com/googleapis/java-shared-dependencies/issues/322)) ([a6b5d3b](https://www.github.com/googleapis/java-shared-dependencies/commit/a6b5d3b8ccfc352bf0d1678952ce3cd8b7a8361e))
-   update iam.version to v1.0.11 ([#​304](https://www.github.com/googleapis/java-shared-dependencies/issues/304)) ([95a5264](https://www.github.com/googleapis/java-shared-dependencies/commit/95a526442b3d24c83782523d38dd3931e828d757))

##### [0.20.1](https://www.github.com/googleapis/java-shared-dependencies/compare/0.20.0...v0.20.1) (2021-03-09)

##### Dependencies

-   update dependency com.fasterxml.jackson:jackson-bom to v2.12.2 ([#​301](https://www.github.com/googleapis/java-shared-dependencies/issues/301)) ([7c01eba](https://www.github.com/googleapis/java-shared-dependencies/commit/7c01ebabb6fd65b7404e56651b0ba27f505bb033))
-   update dependency com.google.api-client:google-api-client-bom to v1.31.3 ([#​295](https://www.github.com/googleapis/java-shared-dependencies/issues/295)) ([a0774e9](https://www.github.com/googleapis/java-shared-dependencies/commit/a0774e9d62d00614142bc4c14214a83dda66d4ad))
-   update dependency com.google.api.grpc:grpc-google-iam-v1 to v1.0.10 ([#​292](https://www.github.com/googleapis/java-shared-dependencies/issues/292)) ([b629789](https://www.github.com/googleapis/java-shared-dependencies/commit/b629789e3a1cc9a7308b829c034b09b06e24fc07))
-   update dependency com.google.auth:google-auth-library-bom to v0.24.1 ([#​293](https://www.github.com/googleapis/java-shared-dependencies/issues/293)) ([d85ec34](https://www.github.com/googleapis/java-shared-dependencies/commit/d85ec347ccdd14dfdab10d365d2c2f8df3035e4d))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.3 ([#​294](https://www.github.com/googleapis/java-shared-dependencies/issues/294)) ([58c01aa](https://www.github.com/googleapis/java-shared-dependencies/commit/58c01aa076e2c4954986185f913bac2c51a1e6fb))
-   update dependency com.google.protobuf:protobuf-bom to v3.15.5 ([#​302](https://www.github.com/googleapis/java-shared-dependencies/issues/302)) ([e9d5e6e](https://www.github.com/googleapis/java-shared-dependencies/commit/e9d5e6ee6039915da186315ceada673ac37b88d3))
-   update google.core.version to v1.94.2 ([#​296](https://www.github.com/googleapis/java-shared-dependencies/issues/296)) ([af83b90](https://www.github.com/googleapis/java-shared-dependencies/commit/af83b901be0c03d507189999215d35345602fad7))
-   update google.core.version to v1.94.3 ([#​300](https://www.github.com/googleapis/java-shared-dependencies/issues/300)) ([3e73176](https://www.github.com/googleapis/java-shared-dependencies/commit/3e73176af0b07dfe621163b301174b5b5820dfa2))




---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 b9457c52d6e9..17b042f07207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.20.1
+        0.21.0
         pom
         import
       

From 898022c91ce583c2d54dbfa8f8c6ac0187d5af9d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 12 Apr 2021 07:22:18 -0700
Subject: [PATCH 0557/1784] build(java): skip javadoc tests during dependencies
 test (#383)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/33ced83d-18be-4eec-9f43-00d6fbbc175a/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/5b0e1592dd7d70b485e157ea4b3eb1704ecbd015
---
 .kokoro/dependencies.sh | 1 +
 synth.metadata          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 0fb8c8436ccc..59d2aafc790f 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 retry_with_backoff 3 10 \
   mvn install -B -V -ntp \
     -DskipTests=true \
+    -Dmaven.javadoc.skip=true \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/synth.metadata b/synth.metadata
index abfcc9e712b3..1d40a3f401e7 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "1a15d9978c2fcdb17cd210f4758e4dfd42d50615"
+        "sha": "7577e1b1cb1af0539fc931059fbb48ee5e934447"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"
+        "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015"
       }
     }
   ],

From b76036097978237b5d154074781fa065b9c6d8bf Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 12 Apr 2021 08:12:08 -0700
Subject: [PATCH 0558/1784] chore: regenerate README (#384)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-12 14:26:07,757 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-12 14:26:09,536 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/b4f6c8d8-310d-4cd8-8bb8-6889cd12f9f1/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 0981eff686aa..f3d0629f5585 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "40d711599c761f6ac966d7246741ea7628743f98"
+        "sha": "898022c91ce583c2d54dbfa8f8c6ac0187d5af9d"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c84c8f156e09702e1c8946bfb9746e6f5892cf27"
+        "sha": "0a071b3460344886297a304253bf924aa68ddb7e"
       }
     }
   ]
diff --git a/README.md b/README.md
index 6f764970e866..a4c2f0d5423d 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:19.2.1')
+implementation platform('com.google.cloud:libraries-bom:20.0.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From c92ca39945a20a782a8b7dee5944813bc4484058 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 12 Apr 2021 22:04:37 +0200
Subject: [PATCH 0559/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20 (#385)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `19.2.1` -> `20.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/compatibility-slim/19.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/confidence-slim/19.2.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d6bcf0f19cb2..5c88833e193a 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        19.2.1
+        20.0.0
         pom
         import
       

From 917719cb36d4d55b586b6fde7a0e0950a26cd233 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 12 Apr 2021 22:06:18 +0200
Subject: [PATCH 0560/1784] deps: update dependency
 com.google.oauth-client:google-oauth-client to v1.31.5 (#379)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| com.google.oauth-client:google-oauth-client | `1.31.4` -> `1.31.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.oauth-client:google-oauth-client/1.31.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.oauth-client:google-oauth-client/1.31.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.oauth-client:google-oauth-client/1.31.5/compatibility-slim/1.31.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.oauth-client:google-oauth-client/1.31.5/confidence-slim/1.31.4)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 17b042f07207..9a5355a8325b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
       
         com.google.oauth-client
         google-oauth-client
-        1.31.4
+        1.31.5
       
       
       

From 8581c36f1221ea50a262e839f0189ab109a4e6d7 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 20:30:19 +0000
Subject: [PATCH 0561/1784] chore: release 1.106.1 (#381)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.106.1](https://www.github.com/googleapis/java-datastore/compare/v1.106.0...v1.106.1) (2021-04-12)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 ([#380](https://www.github.com/googleapis/java-datastore/issues/380)) ([7577e1b](https://www.github.com/googleapis/java-datastore/commit/7577e1b1cb1af0539fc931059fbb48ee5e934447))
* update dependency com.google.oauth-client:google-oauth-client to v1.31.5 ([#379](https://www.github.com/googleapis/java-datastore/issues/379)) ([917719c](https://www.github.com/googleapis/java-datastore/commit/917719cb36d4d55b586b6fde7a0e0950a26cd233))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 8 ++++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bcb5b1eb82c..bb085560ef32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### [1.106.1](https://www.github.com/googleapis/java-datastore/compare/v1.106.0...v1.106.1) (2021-04-12)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 ([#380](https://www.github.com/googleapis/java-datastore/issues/380)) ([7577e1b](https://www.github.com/googleapis/java-datastore/commit/7577e1b1cb1af0539fc931059fbb48ee5e934447))
+* update dependency com.google.oauth-client:google-oauth-client to v1.31.5 ([#379](https://www.github.com/googleapis/java-datastore/issues/379)) ([917719c](https://www.github.com/googleapis/java-datastore/commit/917719cb36d4d55b586b6fde7a0e0950a26cd233))
+
 ## [1.106.0](https://www.github.com/googleapis/java-datastore/compare/v1.105.9...v1.106.0) (2021-03-11)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2263a5776748..7929774b397c 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
-  1.106.1-SNAPSHOT
+  1.106.1
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.1-SNAPSHOT
+        0.89.1
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.1-SNAPSHOT
+        1.106.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3fd3f0772a8c..94a65bb6f4be 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.1-SNAPSHOT
+  1.106.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.1-SNAPSHOT
+    1.106.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 9a5355a8325b..103d35419c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.1-SNAPSHOT
+  1.106.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.1-SNAPSHOT
+        0.89.1
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1339108ce24b..8db7276a3f63 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.89.1-SNAPSHOT
+  0.89.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.1-SNAPSHOT
+    1.106.1
   
   
     
diff --git a/versions.txt b/versions.txt
index f6e40b403fec..f29994142693 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.0:1.106.1-SNAPSHOT
-google-cloud-datastore-bom:1.106.0:1.106.1-SNAPSHOT
-google-cloud-datastore-parent:1.106.0:1.106.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.89.0:0.89.1-SNAPSHOT
+google-cloud-datastore:1.106.1:1.106.1
+google-cloud-datastore-bom:1.106.1:1.106.1
+google-cloud-datastore-parent:1.106.1:1.106.1
+proto-google-cloud-datastore-v1:0.89.1:0.89.1
 

From 3270c72e9cbdafd293b4342f7fbb337d38d57ed2 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 12 Apr 2021 13:36:27 -0700
Subject: [PATCH 0562/1784] chore: regenerate README (#386)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-12 20:06:56,138 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-12 20:06:57,393 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/eb085dbc-c64c-4bd2-b4ae-5ccf70855954/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index f3d0629f5585..9e8464d988ff 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "898022c91ce583c2d54dbfa8f8c6ac0187d5af9d"
+        "sha": "917719cb36d4d55b586b6fde7a0e0950a26cd233"
       }
     },
     {
diff --git a/README.md b/README.md
index a4c2f0d5423d..745dd12a8c5b 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      19.2.1
+      20.0.0
       pom
       import
     

From 01ccfb0d7a2f8ecd279f49b0a19e153b79a12048 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 20:54:17 +0000
Subject: [PATCH 0563/1784] chore: release 1.106.2-SNAPSHOT (#387)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7929774b397c..753b4849634d 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
-  1.106.1
+  1.106.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.1
+        0.89.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.1
+        1.106.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 94a65bb6f4be..18f3104d23bb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.1
+  1.106.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.1
+    1.106.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 103d35419c95..f652d1f504a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.1
+  1.106.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.1
+        0.89.2-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8db7276a3f63..1aa75fa13733 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.89.1
+  0.89.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.1
+    1.106.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index f29994142693..dccbc6ab4cd5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.1:1.106.1
-google-cloud-datastore-bom:1.106.1:1.106.1
-google-cloud-datastore-parent:1.106.1:1.106.1
-proto-google-cloud-datastore-v1:0.89.1:0.89.1
+google-cloud-datastore:1.106.1:1.106.2-SNAPSHOT
+google-cloud-datastore-bom:1.106.1:1.106.2-SNAPSHOT
+google-cloud-datastore-parent:1.106.1:1.106.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.89.1:0.89.2-SNAPSHOT
 

From 10b03365c227d7b6f15ba60eb946079a3f70b729 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 13 Apr 2021 08:38:12 -0700
Subject: [PATCH 0564/1784] fix: typo (#389)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/a39ccf4b-409a-4423-9b0c-4dc43267f906/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/082e1ca0863b13ada8594fe91845380765da5b70
---
 .kokoro/build.sh | 2 +-
 synth.metadata   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index b8a12076ec3e..23b1f5d043bb 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -37,7 +37,7 @@ retry_with_backoff 3 10 \
     -Dgcloud.download.skip=true \
     -T 1C
 
-# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
+# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
 if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
     export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
diff --git a/synth.metadata b/synth.metadata
index 1d40a3f401e7..e5902d9407e1 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "7577e1b1cb1af0539fc931059fbb48ee5e934447"
+        "sha": "01ccfb0d7a2f8ecd279f49b0a19e153b79a12048"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015"
+        "sha": "082e1ca0863b13ada8594fe91845380765da5b70"
       }
     }
   ],
@@ -45,6 +45,7 @@
     ".github/readme/synth.py",
     ".github/release-please.yml",
     ".github/snippet-bot.yml",
+    ".github/sync-repo-settings.yaml",
     ".github/trusted-contribution.yml",
     ".github/workflows/approve-readme.yaml",
     ".github/workflows/auto-release.yaml",

From 7b3c51806c9fd5826e467ec4d0e1536de74a28b2 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 13 Apr 2021 09:18:09 -0700
Subject: [PATCH 0565/1784] chore: regenerate README (#391)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-13 15:40:34,741 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-13 15:40:35,954 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/5c8292c2-b89c-4d64-972a-aba49460ec06/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 9e8464d988ff..00947ac95966 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "917719cb36d4d55b586b6fde7a0e0950a26cd233"
+        "sha": "10b03365c227d7b6f15ba60eb946079a3f70b729"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "0a071b3460344886297a304253bf924aa68ddb7e"
+        "sha": "082e1ca0863b13ada8594fe91845380765da5b70"
       }
     }
   ]
diff --git a/README.md b/README.md
index 745dd12a8c5b..3e0ba9b7f120 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.106.0'
+compile 'com.google.cloud:google-cloud-datastore:1.106.1'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.1"
 ```
 
 ## Authentication

From 9fcb0ed474235fbaf8d4a84363de81622fdffa8a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 14 Apr 2021 03:00:55 +0200
Subject: [PATCH 0566/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.106.1 (#388)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index bf92f5303c53..87416666ec54 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
-      1.106.0
+      1.106.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f68b96e3f29e..ea7bb1a01ca3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.106.0
+      1.106.1
     
 
     

From 246e96153a00cd82ada848cbca21e6d797d9a738 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 14 Apr 2021 08:00:06 -0700
Subject: [PATCH 0567/1784] chore: regenerate README (#392)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-14 01:03:14,465 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-14 01:03:15,778 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/9230d36b-baf8-445a-a2b2-d6ea5a11df2d/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 00947ac95966..9834e462d8c7 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "10b03365c227d7b6f15ba60eb946079a3f70b729"
+        "sha": "9fcb0ed474235fbaf8d4a84363de81622fdffa8a"
       }
     },
     {
diff --git a/README.md b/README.md
index 3e0ba9b7f120..9154b38c53a4 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.106.0
+  1.106.1
 
 
 ```

From 4af790dae6207c21387d12660c8972847517b197 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 14 Apr 2021 23:12:26 +0200
Subject: [PATCH 0568/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.11.1 (#393)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.11.0` -> `0.11.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.1/compatibility-slim/0.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.1/confidence-slim/0.11.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-config

### [`v0.11.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​0111-httpswwwgithubcomgoogleapisjava-shared-configcomparev0110v0111-2021-04-14)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.11.0...v0.11.1)




---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 753b4849634d..51343c1fadd9 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
-    0.11.0
+    0.11.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index f652d1f504a3..03aa35d53334 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.11.0
+    0.11.1
   
 
   

From 397ae6cdbf2effa926d0a4503148970ee7e5d8cf Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 15 Apr 2021 08:32:20 -0700
Subject: [PATCH 0569/1784] fix: release scripts from issuing overlapping
 phases (#394)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/42e6b423-50a1-45f0-be87-e54e9aaf68d2/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d
---
 .kokoro/release/snapshot.sh | 2 +-
 .kokoro/release/stage.sh    | 2 +-
 synth.metadata              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
index 098168a7373c..1f55b77024d8 100755
--- a/.kokoro/release/snapshot.sh
+++ b/.kokoro/release/snapshot.sh
@@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt
 setup_environment_secrets
 create_settings_xml_file "settings.xml"
 
-mvn clean install deploy -B \
+mvn clean deploy -B \
   --settings ${MAVEN_SETTINGS_FILE} \
   -DperformRelease=true \
   -Dgpg.executable=gpg \
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 16126d2eb53f..8a1033843cb1 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml"
 
 # attempt to stage 3 times with exponential backoff (starting with 10 seconds)
 retry_with_backoff 3 10 \
-  mvn clean install deploy -B \
+  mvn clean deploy -B \
     --settings ${MAVEN_SETTINGS_FILE} \
     -DskipTests=true \
     -DperformRelease=true \
diff --git a/synth.metadata b/synth.metadata
index e5902d9407e1..6391dfb05b7a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "01ccfb0d7a2f8ecd279f49b0a19e153b79a12048"
+        "sha": "4af790dae6207c21387d12660c8972847517b197"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "082e1ca0863b13ada8594fe91845380765da5b70"
+        "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d"
       }
     }
   ],

From c6e85eb9e858295b8820c2ea355c67657480cee2 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 15 Apr 2021 23:37:17 +0200
Subject: [PATCH 0570/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.1.0 (#395)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 5c88833e193a..fcd5fbbe3643 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.0.0
+        20.1.0
         pom
         import
       

From 68669cf1fc3f21a5d47d0181d6043ce3d636ac4c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 19 Apr 2021 08:24:07 -0700
Subject: [PATCH 0571/1784] chore: regenerate README (#396)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-15 21:41:09,203 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-15 21:41:10,444 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/27e279d2-d960-4474-a5d5-f5122234a196/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 9834e462d8c7..c23d1757c397 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "9fcb0ed474235fbaf8d4a84363de81622fdffa8a"
+        "sha": "c6e85eb9e858295b8820c2ea355c67657480cee2"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "082e1ca0863b13ada8594fe91845380765da5b70"
+        "sha": "043cc620d6a6111816d9e09f2a97208565fde958"
       }
     }
   ]
diff --git a/README.md b/README.md
index 9154b38c53a4..d24e52b66733 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.0.0
+      20.1.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.0.0')
+implementation platform('com.google.cloud:libraries-bom:20.1.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 947befed8e074c244cb68099ed5e9a6ad0721caf Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 20 Apr 2021 17:28:16 +0200
Subject: [PATCH 0572/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v0.21.1 (#397)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `0.21.0` -> `0.21.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.1/compatibility-slim/0.21.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.1/confidence-slim/0.21.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v0.21.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0211-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0210v0211-2021-04-19)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.21.0...v0.21.1)




---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 03aa35d53334..70078260a4d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.21.0
+        0.21.1
         pom
         import
       

From 95b873a4cb0019b9465eb14cafdfd246b8af5041 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 15:52:02 +0000
Subject: [PATCH 0573/1784] chore: release 1.106.2 (#390)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.106.2](https://www.github.com/googleapis/java-datastore/compare/v1.106.1...v1.106.2) (2021-04-20)


### Bug Fixes

* release scripts from issuing overlapping phases ([#394](https://www.github.com/googleapis/java-datastore/issues/394)) ([397ae6c](https://www.github.com/googleapis/java-datastore/commit/397ae6cdbf2effa926d0a4503148970ee7e5d8cf))
* typo ([#389](https://www.github.com/googleapis/java-datastore/issues/389)) ([10b0336](https://www.github.com/googleapis/java-datastore/commit/10b03365c227d7b6f15ba60eb946079a3f70b729))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#397](https://www.github.com/googleapis/java-datastore/issues/397)) ([947befe](https://www.github.com/googleapis/java-datastore/commit/947befed8e074c244cb68099ed5e9a6ad0721caf))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 13 +++++++++++++
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb085560ef32..06a477d9d729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+### [1.106.2](https://www.github.com/googleapis/java-datastore/compare/v1.106.1...v1.106.2) (2021-04-20)
+
+
+### Bug Fixes
+
+* release scripts from issuing overlapping phases ([#394](https://www.github.com/googleapis/java-datastore/issues/394)) ([397ae6c](https://www.github.com/googleapis/java-datastore/commit/397ae6cdbf2effa926d0a4503148970ee7e5d8cf))
+* typo ([#389](https://www.github.com/googleapis/java-datastore/issues/389)) ([10b0336](https://www.github.com/googleapis/java-datastore/commit/10b03365c227d7b6f15ba60eb946079a3f70b729))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#397](https://www.github.com/googleapis/java-datastore/issues/397)) ([947befe](https://www.github.com/googleapis/java-datastore/commit/947befed8e074c244cb68099ed5e9a6ad0721caf))
+
 ### [1.106.1](https://www.github.com/googleapis/java-datastore/compare/v1.106.0...v1.106.1) (2021-04-12)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 51343c1fadd9..0ea3c2b2c050 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
-  1.106.2-SNAPSHOT
+  1.106.2
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.2-SNAPSHOT
+        0.89.2
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.2-SNAPSHOT
+        1.106.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 18f3104d23bb..1fe24dace3c7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.2-SNAPSHOT
+  1.106.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.2-SNAPSHOT
+    1.106.2
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 70078260a4d9..e4fa6d98fbd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.2-SNAPSHOT
+  1.106.2
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.2-SNAPSHOT
+        0.89.2
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1aa75fa13733..00cab5f033fa 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.89.2-SNAPSHOT
+  0.89.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.2-SNAPSHOT
+    1.106.2
   
   
     
diff --git a/versions.txt b/versions.txt
index dccbc6ab4cd5..7061b1707176 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.1:1.106.2-SNAPSHOT
-google-cloud-datastore-bom:1.106.1:1.106.2-SNAPSHOT
-google-cloud-datastore-parent:1.106.1:1.106.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.89.1:0.89.2-SNAPSHOT
+google-cloud-datastore:1.106.2:1.106.2
+google-cloud-datastore-bom:1.106.2:1.106.2
+google-cloud-datastore-parent:1.106.2:1.106.2
+proto-google-cloud-datastore-v1:0.89.2:0.89.2
 

From c497bb643e9d0b013a13344b3e7f3ad6452a9219 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 16:18:02 +0000
Subject: [PATCH 0574/1784] chore: release 1.106.3-SNAPSHOT (#400)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0ea3c2b2c050..5c844a1172c7 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
-  1.106.2
+  1.106.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.2
+        0.89.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.2
+        1.106.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1fe24dace3c7..36ba59fd84cc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.2
+  1.106.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.2
+    1.106.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index e4fa6d98fbd7..9c014c8099ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.2
+  1.106.3-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.2
+        0.89.3-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 00cab5f033fa..67e408c06eae 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.89.2
+  0.89.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.2
+    1.106.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 7061b1707176..b0b984415d0b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.2:1.106.2
-google-cloud-datastore-bom:1.106.2:1.106.2
-google-cloud-datastore-parent:1.106.2:1.106.2
-proto-google-cloud-datastore-v1:0.89.2:0.89.2
+google-cloud-datastore:1.106.2:1.106.3-SNAPSHOT
+google-cloud-datastore-bom:1.106.2:1.106.3-SNAPSHOT
+google-cloud-datastore-parent:1.106.2:1.106.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.89.2:0.89.3-SNAPSHOT
 

From a47c67d5e4abac61efa678b40d167d48b4d4d907 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 23 Apr 2021 00:34:02 +0200
Subject: [PATCH 0575/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.11.2 (#403)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.11.1` -> `0.11.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.2/compatibility-slim/0.11.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.11.2/confidence-slim/0.11.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-config

### [`v0.11.2`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​0112-httpswwwgithubcomgoogleapisjava-shared-configcomparev0111v0112-2021-04-22)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.11.1...v0.11.2)




---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 5c844a1172c7..215f05ec6ace 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
-    0.11.1
+    0.11.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 9c014c8099ce..c40880319c68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.11.1
+    0.11.2
   
 
   

From c168760909dbfb5d2d6ad176a4822e9a7dcc1d47 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 23 Apr 2021 23:40:02 +0200
Subject: [PATCH 0576/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v1 (#404)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `0.21.1` -> `1.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.0.0/compatibility-slim/0.21.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.0.0/confidence-slim/0.21.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v1.0.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​100-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0211v100-2021-04-23)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.21.1...v1.0.0)

##### Features

-   promote to 1.0.0 ([#​341](https://www.github.com/googleapis/java-shared-dependencies/issues/341)) ([eddce7b](https://www.github.com/googleapis/java-shared-dependencies/commit/eddce7bda196d757c0bb93a05574cc742e3d7ff6))

##### Dependencies

-   update dependency com.google.api:api-common to v1.10.3 ([#​340](https://www.github.com/googleapis/java-shared-dependencies/issues/340)) ([6a7fc33](https://www.github.com/googleapis/java-shared-dependencies/commit/6a7fc33548c199d5f310b3ee5024907882d22726))
-   update dependency com.google.auth:google-auth-library-bom to v0.25.4 ([#​334](https://www.github.com/googleapis/java-shared-dependencies/issues/334)) ([e5c747d](https://www.github.com/googleapis/java-shared-dependencies/commit/e5c747d245194effc258ae706e7764153010cd53))
-   update dependency com.google.auth:google-auth-library-bom to v0.25.5 ([#​338](https://www.github.com/googleapis/java-shared-dependencies/issues/338)) ([ffa1df5](https://www.github.com/googleapis/java-shared-dependencies/commit/ffa1df5497b5365f520b665a202b8caf6521fc9d))
-   update dependency org.threeten:threetenbp to v1.5.1 ([#​335](https://www.github.com/googleapis/java-shared-dependencies/issues/335)) ([c8c6df4](https://www.github.com/googleapis/java-shared-dependencies/commit/c8c6df48e7f80944544939e502f4f08543af2631))
-   update google.core.version to v1.94.8 ([#​342](https://www.github.com/googleapis/java-shared-dependencies/issues/342)) ([d946dd2](https://www.github.com/googleapis/java-shared-dependencies/commit/d946dd2299aac32f969a2226a1391e1e73f00e62))

##### [0.21.1](https://www.github.com/googleapis/java-shared-dependencies/compare/0.21.0...v0.21.1) (2021-04-19)

##### Bug Fixes

-   release scripts from issuing overlapping phases ([#​332](https://www.github.com/googleapis/java-shared-dependencies/issues/332)) ([e289825](https://www.github.com/googleapis/java-shared-dependencies/commit/e289825a3bc45b4796db7ce4347f8d9d9251a410))

##### Dependencies

-   update dependency com.fasterxml.jackson:jackson-bom to v2.12.3 ([#​329](https://www.github.com/googleapis/java-shared-dependencies/issues/329)) ([a77b4fc](https://www.github.com/googleapis/java-shared-dependencies/commit/a77b4fcc2ea5caf366c76a4698bac6d4c9abc92e))
-   update dependency com.google.api-client:google-api-client-bom to v1.31.4 ([#​326](https://www.github.com/googleapis/java-shared-dependencies/issues/326)) ([409d24f](https://www.github.com/googleapis/java-shared-dependencies/commit/409d24f8a0cac30e41ca45eb2711aecb335d70dd))
-   update dependency com.google.auth:google-auth-library-bom to v0.25.3 ([#​328](https://www.github.com/googleapis/java-shared-dependencies/issues/328)) ([88cfc08](https://www.github.com/googleapis/java-shared-dependencies/commit/88cfc08952881200e23ed95cfa2eebad85ec7ab3))
-   update google.core.version to v1.94.7 ([#​324](https://www.github.com/googleapis/java-shared-dependencies/issues/324)) ([0412c88](https://www.github.com/googleapis/java-shared-dependencies/commit/0412c88468940c1182bc0761bfe269a6688fe7b7))
-   update iam.version to v1.0.12 ([#​327](https://www.github.com/googleapis/java-shared-dependencies/issues/327)) ([548d5f5](https://www.github.com/googleapis/java-shared-dependencies/commit/548d5f53c4f264f1cbb9ca72fdfe4608ab16b480))




---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 c40880319c68..b8f23948861e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        0.21.1
+        1.0.0
         pom
         import
       

From f6d24d0ea1b1a72c22f268d9bb021b8aadd39421 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 23 Apr 2021 14:54:08 -0700
Subject: [PATCH 0577/1784] chore: regenerate README (#406)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-23 21:42:15,609 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-23 21:42:16,860 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/0764198c-15bc-42b6-8034-07e8228275b0/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index c23d1757c397..e4c4ddb2c02d 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c6e85eb9e858295b8820c2ea355c67657480cee2"
+        "sha": "c168760909dbfb5d2d6ad176a4822e9a7dcc1d47"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "043cc620d6a6111816d9e09f2a97208565fde958"
+        "sha": "5a6f30b8bb7672cf237c4f75d5aa96bfba170e7f"
       }
     }
   ]
diff --git a/README.md b/README.md
index d24e52b66733..14be196fc1f5 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.106.1'
+compile 'com.google.cloud:google-cloud-datastore:1.106.2'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.2"
 ```
 
 ## Authentication

From 5ce954eefd06c1c1f60a6a735bc7141170d4d66f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 17:58:11 +0000
Subject: [PATCH 0578/1784] chore: release 1.106.3 (#405)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.106.3](https://www.github.com/googleapis/java-datastore/compare/v1.106.2...v1.106.3) (2021-04-23)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#404](https://www.github.com/googleapis/java-datastore/issues/404)) ([c168760](https://www.github.com/googleapis/java-datastore/commit/c168760909dbfb5d2d6ad176a4822e9a7dcc1d47))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06a477d9d729..f77bc79e5dbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.106.3](https://www.github.com/googleapis/java-datastore/compare/v1.106.2...v1.106.3) (2021-04-23)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#404](https://www.github.com/googleapis/java-datastore/issues/404)) ([c168760](https://www.github.com/googleapis/java-datastore/commit/c168760909dbfb5d2d6ad176a4822e9a7dcc1d47))
+
 ### [1.106.2](https://www.github.com/googleapis/java-datastore/compare/v1.106.1...v1.106.2) (2021-04-20)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 215f05ec6ace..4083ee7fd887 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
-  1.106.3-SNAPSHOT
+  1.106.3
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.3-SNAPSHOT
+        0.89.3
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.3-SNAPSHOT
+        1.106.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 36ba59fd84cc..3d7f7a38b722 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.3-SNAPSHOT
+  1.106.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.3-SNAPSHOT
+    1.106.3
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index b8f23948861e..a8d1318dca57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.3-SNAPSHOT
+  1.106.3
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.3-SNAPSHOT
+        0.89.3
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 67e408c06eae..3a92acb19a7c 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.89.3-SNAPSHOT
+  0.89.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.3-SNAPSHOT
+    1.106.3
   
   
     
diff --git a/versions.txt b/versions.txt
index b0b984415d0b..92997ad64e5d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.2:1.106.3-SNAPSHOT
-google-cloud-datastore-bom:1.106.2:1.106.3-SNAPSHOT
-google-cloud-datastore-parent:1.106.2:1.106.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.89.2:0.89.3-SNAPSHOT
+google-cloud-datastore:1.106.3:1.106.3
+google-cloud-datastore-bom:1.106.3:1.106.3
+google-cloud-datastore-parent:1.106.3:1.106.3
+proto-google-cloud-datastore-v1:0.89.3:0.89.3
 

From a69acb443da163ecacee9a7c82652e880cff5afc Mon Sep 17 00:00:00 2001
From: "google-cloud-policy-bot[bot]"
 <80869356+google-cloud-policy-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 18:26:12 +0000
Subject: [PATCH 0579/1784] chore: add SECURITY.md (#408)

add a security policy
---
 SECURITY.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000000..8b58ae9c01ae
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.

From 6517c43ce0d28a18d13c14ecd52fee8bb50d9631 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 29 Apr 2021 16:40:19 +0200
Subject: [PATCH 0580/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.2.0 (#409)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.1.0` -> `20.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.2.0/compatibility-slim/20.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.2.0/confidence-slim/20.1.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index fcd5fbbe3643..283310a1188e 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.1.0
+        20.2.0
         pom
         import
       

From b61f0bf81ab9a22e9a86dc9c042f367dbe77c1e2 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 29 Apr 2021 07:50:14 -0700
Subject: [PATCH 0581/1784] chore: regenerate README (#410)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-29 14:42:38,144 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-29 14:42:39,511 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/5f940e54-dfd7-44b9-8be1-249140583d70/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index e4c4ddb2c02d..4dfef1af085c 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c168760909dbfb5d2d6ad176a4822e9a7dcc1d47"
+        "sha": "6517c43ce0d28a18d13c14ecd52fee8bb50d9631"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5a6f30b8bb7672cf237c4f75d5aa96bfba170e7f"
+        "sha": "06a8cd0ff7e81b05e6c503eab510ec622384caa7"
       }
     }
   ]
diff --git a/README.md b/README.md
index 14be196fc1f5..7d553d267ca2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.1.0
+      20.2.0
       pom
       import
     
@@ -45,18 +45,18 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.1.0')
+implementation platform('com.google.cloud:libraries-bom:20.2.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.106.2'
+compile 'com.google.cloud:google-cloud-datastore:1.106.3'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.3"
 ```
 
 ## Authentication

From 71b84e8d2af39deb5d07b0b2643dbdd0afc80ae8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 30 Apr 2021 20:16:03 +0200
Subject: [PATCH 0582/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.106.3 (#401)

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `1.106.1` -> `1.106.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.3/compatibility-slim/1.106.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.106.3/confidence-slim/1.106.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-datastore

### [`v1.106.3`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11063-httpswwwgithubcomgoogleapisjava-datastorecomparev11062v11063-2021-04-23)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.106.2...v1.106.3)

### [`v1.106.2`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11062-httpswwwgithubcomgoogleapisjava-datastorecomparev11061v11062-2021-04-20)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.106.1...v1.106.2)




---

### Configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 87416666ec54..36255b9255a8 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
-      1.106.1
+      1.106.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ea7bb1a01ca3..2fb3f6bd1017 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.106.1
+      1.106.3
     
 
     

From bfabd758e4c1033aa01cc65f157e238a232dd1eb Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 30 Apr 2021 11:32:23 -0700
Subject: [PATCH 0583/1784] chore: regenerate README (#411)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-04-30 18:21:34,607 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-30 18:21:35,807 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/6bce48a2-696b-46b2-b5a2-b685642cad8c/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 4dfef1af085c..4e3f2a8812a7 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "6517c43ce0d28a18d13c14ecd52fee8bb50d9631"
+        "sha": "71b84e8d2af39deb5d07b0b2643dbdd0afc80ae8"
       }
     },
     {
diff --git a/README.md b/README.md
index 7d553d267ca2..5a50302801d2 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.106.1
+  1.106.3
 
 
 ```

From 03b6d5ed1ff9e4741b4085ebf5e919861eed1a28 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 4 May 2021 09:08:30 -0700
Subject: [PATCH 0584/1784] build(java): switch to release-please for release
 tagging (#412)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/4d67a5a1-abab-4644-93fd-993084fdbdb4/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/release-please.yml | 3 ++-
 synth.metadata             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index dce2c8450921..8ca7f9cabc29 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -1,2 +1,3 @@
+bumpMinorPreMajor: true
+handleGHRelease: true
 releaseType: java-yoshi
-bumpMinorPreMajor: true
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index 6391dfb05b7a..1b9f7586ea57 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "4af790dae6207c21387d12660c8972847517b197"
+        "sha": "bfabd758e4c1033aa01cc65f157e238a232dd1eb"
       }
     },
     {

From 0e4ac4be5af744fdb5fe4d8a5aeaa95d9ac8ead5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 10 May 2021 10:14:13 -0700
Subject: [PATCH 0585/1784] chore: adding cloud-rad java xrefs (#413)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/86e74812-c02f-4f90-8e42-37c2aca2b51d/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/046994f491c02806aea60118e214a9edd67f5ab7
---
 .kokoro/release/publish_javadoc11.sh | 7 +++++++
 synth.metadata                       | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index ef7fd42bda2f..682e0bfcd3c5 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -49,6 +49,13 @@ pushd target/docfx-yml
 python3 -m docuploader create-metadata \
  --name ${NAME} \
  --version ${VERSION} \
+ --xrefs devsite://java/gax \
+ --xrefs devsite://java/google-cloud-core \
+ --xrefs devsite://java/api-common \
+ --xrefs devsite://java/proto-google-common-protos \
+ --xrefs devsite://java/google-api-client \
+ --xrefs devsite://java/google-http-client \
+ --xrefs devsite://java/protobuf \
  --language java
 
 # upload yml to production bucket
diff --git a/synth.metadata b/synth.metadata
index 1b9f7586ea57..35efcba29b6d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "bfabd758e4c1033aa01cc65f157e238a232dd1eb"
+        "sha": "03b6d5ed1ff9e4741b4085ebf5e919861eed1a28"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d"
+        "sha": "046994f491c02806aea60118e214a9edd67f5ab7"
       }
     }
   ],

From 0ecddb25c43569e3b50e96ceec102bec52bad7d6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 11 May 2021 03:22:11 +0200
Subject: [PATCH 0586/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v1.1.0 (#417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `1.0.0` -> `1.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.1.0/compatibility-slim/1.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.1.0/confidence-slim/1.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes



googleapis/java-shared-dependencies

### [`v1.1.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​110-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare100v110-2021-05-10)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v1.0.0...v1.1.0)

##### Dependencies

-   update dependency com.google.protobuf:protobuf-bom to v3.16.0 ([#​348](https://www.github.com/googleapis/java-shared-dependencies/issues/348)) ([0aacfde](https://www.github.com/googleapis/java-shared-dependencies/commit/0aacfdeec70e30803734db8287c47e4fad5481ef))
-   update gax.version to v1.64.0 ([#​345](https://www.github.com/googleapis/java-shared-dependencies/issues/345)) ([478bd35](https://www.github.com/googleapis/java-shared-dependencies/commit/478bd35296293e81c7e70157f50bfbebdc1bb54d))
-   update iam.version to v1.0.13 ([#​343](https://www.github.com/googleapis/java-shared-dependencies/issues/343)) ([3637923](https://www.github.com/googleapis/java-shared-dependencies/commit/363792392b71deff5cc5731104b631122fba5e61))




---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 a8d1318dca57..c5534396125a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        1.0.0
+        1.1.0
         pom
         import
       

From 8277f908ea459c2272114ea259a286af970979c0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 11 May 2021 18:50:02 +0000
Subject: [PATCH 0587/1784] chore: release 1.106.4-SNAPSHOT (#407)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4083ee7fd887..e86800ba3989 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
-  1.106.3
+  1.106.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.3
+        0.89.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.3
+        1.106.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3d7f7a38b722..3913c2a4baad 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.3
+  1.106.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.3
+    1.106.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index c5534396125a..5ec11414ebd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.3
+  1.106.4-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.3
+        0.89.4-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3a92acb19a7c..03acce31fa91 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.89.3
+  0.89.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.3
+    1.106.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 92997ad64e5d..70b77415ac83 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.3:1.106.3
-google-cloud-datastore-bom:1.106.3:1.106.3
-google-cloud-datastore-parent:1.106.3:1.106.3
-proto-google-cloud-datastore-v1:0.89.3:0.89.3
+google-cloud-datastore:1.106.3:1.106.4-SNAPSHOT
+google-cloud-datastore-bom:1.106.3:1.106.4-SNAPSHOT
+google-cloud-datastore-parent:1.106.3:1.106.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.89.3:0.89.4-SNAPSHOT
 

From 50329f355d3e4efe29187e1faff72a47dc785cde Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 11 May 2021 18:56:02 +0000
Subject: [PATCH 0588/1784] chore: release 1.106.4 (#418)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.106.4](https://www.github.com/googleapis/java-datastore/compare/v1.106.3...v1.106.4) (2021-05-11)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#417](https://www.github.com/googleapis/java-datastore/issues/417)) ([0ecddb2](https://www.github.com/googleapis/java-datastore/commit/0ecddb25c43569e3b50e96ceec102bec52bad7d6))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f77bc79e5dbd..06a5b92e59ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.106.4](https://www.github.com/googleapis/java-datastore/compare/v1.106.3...v1.106.4) (2021-05-11)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#417](https://www.github.com/googleapis/java-datastore/issues/417)) ([0ecddb2](https://www.github.com/googleapis/java-datastore/commit/0ecddb25c43569e3b50e96ceec102bec52bad7d6))
+
 ### [1.106.3](https://www.github.com/googleapis/java-datastore/compare/v1.106.2...v1.106.3) (2021-04-23)
 
 
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e86800ba3989..640e3feae58b 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
-  1.106.4-SNAPSHOT
+  1.106.4
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.4-SNAPSHOT
+        0.89.4
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.4-SNAPSHOT
+        1.106.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3913c2a4baad..4c48c408e445 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.4-SNAPSHOT
+  1.106.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.4-SNAPSHOT
+    1.106.4
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 5ec11414ebd3..f4e2ab9b0dfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.4-SNAPSHOT
+  1.106.4
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.4-SNAPSHOT
+        0.89.4
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 03acce31fa91..bdf94fed8620 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.89.4-SNAPSHOT
+  0.89.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.4-SNAPSHOT
+    1.106.4
   
   
     
diff --git a/versions.txt b/versions.txt
index 70b77415ac83..ef38c90f9ab9 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.3:1.106.4-SNAPSHOT
-google-cloud-datastore-bom:1.106.3:1.106.4-SNAPSHOT
-google-cloud-datastore-parent:1.106.3:1.106.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.89.3:0.89.4-SNAPSHOT
+google-cloud-datastore:1.106.4:1.106.4
+google-cloud-datastore-bom:1.106.4:1.106.4
+google-cloud-datastore-parent:1.106.4:1.106.4
+proto-google-cloud-datastore-v1:0.89.4:0.89.4
 

From 76faa6b88e9ed204ed62800ad5ad6195445ccaed Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 11 May 2021 19:02:03 +0000
Subject: [PATCH 0589/1784] chore: release 1.106.5-SNAPSHOT (#419)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 4 ++--
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 640e3feae58b..d39cb3790b45 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
-  1.106.4
+  1.106.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.4
+        0.89.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.4
+        1.106.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4c48c408e445..2c4d600d5bb7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.4
+  1.106.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.4
+    1.106.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index f4e2ab9b0dfc..08cac4f86bff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.4
+  1.106.5-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,7 +167,7 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.4
+        0.89.5-SNAPSHOT
       
       
         com.google.cloud.datastore
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index bdf94fed8620..ef1b9484983d 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.89.4
+  0.89.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.4
+    1.106.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index ef38c90f9ab9..3e5c2218c281 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.4:1.106.4
-google-cloud-datastore-bom:1.106.4:1.106.4
-google-cloud-datastore-parent:1.106.4:1.106.4
-proto-google-cloud-datastore-v1:0.89.4:0.89.4
+google-cloud-datastore:1.106.4:1.106.5-SNAPSHOT
+google-cloud-datastore-bom:1.106.4:1.106.5-SNAPSHOT
+google-cloud-datastore-parent:1.106.4:1.106.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.89.4:0.89.5-SNAPSHOT
 

From 9e943c1cc4722d7e8ef75c5c726975ef19f11fea Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 11 May 2021 16:32:05 -0700
Subject: [PATCH 0590/1784] chore: regenerate README (#416)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-05-10 17:34:02,307 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-05-10 17:34:05,034 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/90f248bc-b652-4080-b66a-69c8eb61f7db/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 4e3f2a8812a7..0a3f6b80bd49 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "71b84e8d2af39deb5d07b0b2643dbdd0afc80ae8"
+        "sha": "0e4ac4be5af744fdb5fe4d8a5aeaa95d9ac8ead5"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "06a8cd0ff7e81b05e6c503eab510ec622384caa7"
+        "sha": "6726988c677bb78385868bfc48dbfa2fe981d44a"
       }
     }
   ]
diff --git a/README.md b/README.md
index 5a50302801d2..e11b958a27ff 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.2.0')
+implementation platform('com.google.cloud:libraries-bom:20.3.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 0607c604a6ef4d5b33505ef0ce61ef3c275694e9 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 11 May 2021 16:46:04 -0700
Subject: [PATCH 0591/1784] chore: regenerate README (#421)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-05-11 23:40:16,301 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-05-11 23:40:17,684 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/aa65d86a-b74e-4c2d-9df0-8a4a39904113/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 0a3f6b80bd49..856780743a31 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "0e4ac4be5af744fdb5fe4d8a5aeaa95d9ac8ead5"
+        "sha": "9e943c1cc4722d7e8ef75c5c726975ef19f11fea"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6726988c677bb78385868bfc48dbfa2fe981d44a"
+        "sha": "f7e7449a641ce47f2a04ed577dec48e109325e76"
       }
     }
   ]
diff --git a/README.md b/README.md
index e11b958a27ff..204cb225cac8 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.106.3'
+compile 'com.google.cloud:google-cloud-datastore:1.106.4'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.4"
 ```
 
 ## Authentication

From a1ea05f975365a7eba6607aeae1d144b8c49453c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 13 May 2021 15:58:02 +0200
Subject: [PATCH 0592/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.3.0 (#415)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.2.0` -> `20.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.3.0/compatibility-slim/20.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.3.0/confidence-slim/20.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 283310a1188e..70c6099b23fd 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.2.0
+        20.3.0
         pom
         import
       

From af7528f49250916ac4a5ce0b51b6150f780c22d5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 13 May 2021 07:12:08 -0700
Subject: [PATCH 0593/1784] chore: regenerate README (#422)

This PR was generated using Autosynth. :rainbow:



Log from Synthtool

```
2021-05-13 14:02:50,568 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-05-13 14:02:51,812 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```



Full log will be available here:
https://source.cloud.google.com/results/invocations/cec070fa-bb3b-4290-bc82-9829f3cb2b09/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 856780743a31..2b8c6a4f900b 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "9e943c1cc4722d7e8ef75c5c726975ef19f11fea"
+        "sha": "a1ea05f975365a7eba6607aeae1d144b8c49453c"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "f7e7449a641ce47f2a04ed577dec48e109325e76"
+        "sha": "bd8281a06cc7f84906e04d4843c1d3d386a980cd"
       }
     }
   ]
diff --git a/README.md b/README.md
index 204cb225cac8..bb17743d5fe0 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.2.0
+      20.3.0
       pom
       import
     

From b842b7d140f311b00cdb108330ccd72cd25aa1e9 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 13 May 2021 16:38:33 -0700
Subject: [PATCH 0594/1784] build(java): remove codecov action (#423)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/e6b0cbbb-c315-4d47-a85f-ad59f2a76c78/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1
---
 .github/workflows/ci.yaml | 6 +-----
 synth.metadata            | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index def8b3a2c84d..0195b32f00b4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,10 +19,6 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
-    - name: coverage
-      uses: codecov/codecov-action@v1
-      with:
-        name: actions ${{matrix.java}}
   windows:
     runs-on: windows-latest
     steps:
@@ -80,4 +76,4 @@ jobs:
     - run: java -version
     - run: .kokoro/build.sh
       env:
-        JOB_TYPE: clirr
\ No newline at end of file
+        JOB_TYPE: clirr
diff --git a/synth.metadata b/synth.metadata
index 35efcba29b6d..317c8f55d7da 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "03b6d5ed1ff9e4741b4085ebf5e919861eed1a28"
+        "sha": "af7528f49250916ac4a5ce0b51b6150f780c22d5"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "046994f491c02806aea60118e214a9edd67f5ab7"
+        "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1"
       }
     }
   ],

From 449ea8805f26108ef60a92be5add9782e63a9809 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Fri, 14 May 2021 14:11:22 -0400
Subject: [PATCH 0595/1784] delete .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b83d22266ac8..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/

From 5aa175ea2a687e9165a30df56c5fe4109e4a7a0f Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Fri, 14 May 2021 14:12:40 -0400
Subject: [PATCH 0596/1784] move pom

---
 datastore-v1-proto-client/src/pom.xml | 108 ++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 datastore-v1-proto-client/src/pom.xml

diff --git a/datastore-v1-proto-client/src/pom.xml b/datastore-v1-proto-client/src/pom.xml
new file mode 100644
index 000000000000..91835e84b8f1
--- /dev/null
+++ b/datastore-v1-proto-client/src/pom.xml
@@ -0,0 +1,108 @@
+
+
+
+  4.0.0
+  datastore-v1-proto-client
+  1.6.3
+
+  ${project.groupId}:${project.artifactId}
+
+  jar
+  
+    Low level client for accessing Google Cloud Datastore v1.
+  
+  
+    com.google.cloud.datastore
+    datastore-v1-proto-client-parent
+    1.6.3
+  
+
+  
+    
+      com.google.api.grpc
+      proto-google-cloud-datastore-v1
+    
+
+    
+      com.google.http-client
+      google-http-client
+    
+
+    
+      com.google.http-client
+      google-http-client-protobuf
+    
+
+    
+      com.google.http-client
+      google-http-client-jackson2
+    
+
+    
+      com.google.oauth-client
+      google-oauth-client
+    
+
+    
+      com.google.api-client
+      google-api-client
+    
+
+    
+      com.google.guava
+      guava
+    
+
+    
+    
+      junit
+      junit
+      test
+    
+
+    
+      com.google.truth
+      truth
+      test
+    
+  
+
+  
+    
+      
+        org.apache.maven.plugins
+        maven-compiler-plugin
+      
+
+      
+        org.apache.maven.plugins
+        maven-source-plugin
+      
+
+      
+        org.apache.maven.plugins
+        maven-javadoc-plugin
+      
+
+      
+        org.apache.maven.plugins
+        maven-gpg-plugin
+      
+    
+  
+

From 9f115b77e3d18e92a7f9f45f49e61c525bc6648e Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Fri, 14 May 2021 14:13:21 -0400
Subject: [PATCH 0597/1784] move pom

---
 datastore-v1-proto-client/{src => }/pom.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename datastore-v1-proto-client/{src => }/pom.xml (100%)

diff --git a/datastore-v1-proto-client/src/pom.xml b/datastore-v1-proto-client/pom.xml
similarity index 100%
rename from datastore-v1-proto-client/src/pom.xml
rename to datastore-v1-proto-client/pom.xml

From 62411b9eb95c490df48cd711a633310ced8baf53 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Fri, 14 May 2021 14:26:25 -0400
Subject: [PATCH 0598/1784] add module, run formatter, fix any failing builds

---
 datastore-v1-proto-client/pom.xml             |  53 ++--
 .../client/ChecksumEnforcingInputStream.java  |  14 +-
 .../google/datastore/v1/client/Datastore.java |  12 +-
 .../v1/client/DatastoreEmulator.java          |   6 +-
 .../v1/client/DatastoreException.java         |  14 +-
 .../datastore/v1/client/DatastoreFactory.java |  46 ++--
 .../datastore/v1/client/DatastoreHelper.java  | 252 ++++++++----------
 .../datastore/v1/client/DatastoreOptions.java |  43 ++-
 .../v1/client/EndToEndChecksumHandler.java    |   6 +-
 .../datastore/v1/client/QuerySplitter.java    |   5 +-
 .../v1/client/QuerySplitterImpl.java          |  57 ++--
 .../google/datastore/v1/client/RemoteRpc.java |  69 +++--
 .../ChecksumEnforcingInputStreamTest.java     |  17 +-
 .../v1/client/DatastoreFactoryTest.java       |  64 ++---
 .../v1/client/DatastoreHelperTest.java        |  95 +++----
 .../datastore/v1/client/DatastoreTest.java    | 218 +++++++--------
 .../client/EndToEndChecksumHandlerTest.java   |   3 +-
 .../datastore/v1/client/RemoteRpcTest.java    |  95 ++++---
 pom.xml                                       |   1 +
 versions.txt                                  |   1 +
 20 files changed, 503 insertions(+), 568 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 91835e84b8f1..718f03bd7e61 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -18,19 +18,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   4.0.0
   datastore-v1-proto-client
-  1.6.3
+  1.6.4-SNAPSHOT
 
-  ${project.groupId}:${project.artifactId}
+  
+    com.google.cloud
+    google-cloud-datastore-parent
+    1.106.5-SNAPSHOT
+  
 
   jar
   
     Low level client for accessing Google Cloud Datastore v1.
   
-  
-    com.google.cloud.datastore
-    datastore-v1-proto-client-parent
-    1.6.3
-  
 
   
     
@@ -68,6 +67,21 @@
       guava
     
 
+    
+      com.google.code.findbugs
+      jsr305
+    
+
+    
+      com.google.api.grpc
+      proto-google-common-protos
+    
+
+    
+      com.google.protobuf
+      protobuf-java
+    
+
     
     
       junit
@@ -78,31 +92,8 @@
     
       com.google.truth
       truth
+      1.1.2
       test
     
   
-
-  
-    
-      
-        org.apache.maven.plugins
-        maven-compiler-plugin
-      
-
-      
-        org.apache.maven.plugins
-        maven-source-plugin
-      
-
-      
-        org.apache.maven.plugins
-        maven-javadoc-plugin
-      
-
-      
-        org.apache.maven.plugins
-        maven-gpg-plugin
-      
-    
-  
 
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
index f74dc004c453..2b9674917738 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC. All Rights Reserved.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package com.google.datastore.v1.client;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.api.client.http.HttpResponse;
+import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -27,16 +27,14 @@ class ChecksumEnforcingInputStream extends InputStream {
   private final MessageDigest messageDigest;
   private final String expectedChecksum;
 
-  ChecksumEnforcingInputStream(InputStream originalInputStream,
-                               HttpResponse response,
-                               MessageDigest digest) {
+  ChecksumEnforcingInputStream(
+      InputStream originalInputStream, HttpResponse response, MessageDigest digest) {
     this(originalInputStream, EndToEndChecksumHandler.getChecksumHeader(response), digest);
   }
 
   @VisibleForTesting
-  ChecksumEnforcingInputStream(InputStream originalInputStream,
-                               String checksum,
-                               MessageDigest digest) {
+  ChecksumEnforcingInputStream(
+      InputStream originalInputStream, String checksum, MessageDigest digest) {
     delegate = originalInputStream;
     expectedChecksum = checksum;
     messageDigest = digest;
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 eb33dc6276ba..8426b6e2865a 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
@@ -46,24 +46,22 @@ public class Datastore {
     this.remoteRpc = remoteRpc;
   }
 
-  /**
-   * Reset the RPC count.
-   */
+  /** Reset the RPC count. */
   public void resetRpcCount() {
     remoteRpc.resetRpcCount();
   }
 
   /**
-   * Returns the number of RPC calls made since the client was created
-   * or {@link #resetRpcCount} was called.
+   * Returns the number of RPC calls made since the client was created or {@link #resetRpcCount} was
+   * called.
    */
   public int getRpcCount() {
     return remoteRpc.getRpcCount();
   }
 
   private DatastoreException invalidResponseException(String method, IOException exception) {
-    return RemoteRpc.makeException(remoteRpc.getUrl(), method, Code.UNAVAILABLE,
-        "Invalid response", exception);
+    return RemoteRpc.makeException(
+        remoteRpc.getUrl(), method, Code.UNAVAILABLE, "Invalid response", exception);
   }
 
   public AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws DatastoreException {
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
index a6c656df5bef..721073e12f70 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
@@ -78,7 +78,11 @@ public class DatastoreEmulator extends Datastore {
   private final DatastoreEmulatorOptions options;
 
   /** Internal state lifecycle management. */
-  enum State {NEW, STARTED, STOPPED}
+  enum State {
+    NEW,
+    STARTED,
+    STOPPED
+  }
 
   private volatile State state = State.NEW;
 
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
index e259aa9e6c02..b5ff17c4db67 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
@@ -17,9 +17,7 @@
 
 import com.google.rpc.Code;
 
-/**
- * Indicates an error in a {@link Datastore} call.
- */
+/** Indicates an error in a {@link Datastore} call. */
 public class DatastoreException extends Exception {
   private final String methodName;
   private final Code code;
@@ -30,20 +28,16 @@ public DatastoreException(String methodName, Code code, String message, Throwabl
     this.code = code;
   }
 
-  /**
-   * @return the canonical error code
-   */
+  /** @return the canonical error code */
   public Code getCode() {
     return code;
   }
 
-  /**
-   * @return the datastore method name
-   */
+  /** @return the datastore method name */
   public String getMethodName() {
     return methodName;
   }
-  
+
   @Override
   public String toString() {
     return String.format("%s, code=%s", super.toString(), code);
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
index bece878d5ab4..5a3f4183be07 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
@@ -21,7 +21,6 @@
 import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -32,9 +31,7 @@
 import java.util.logging.Logger;
 import java.util.logging.StreamHandler;
 
-/**
- * Client factory for {@link Datastore}.
- */
+/** Client factory for {@link Datastore}. */
 public class DatastoreFactory {
 
   // Lazy load this because we might be running inside App Engine and this
@@ -54,9 +51,8 @@ public static DatastoreFactory get() {
   }
 
   /**
-   * Provides access to a datastore using the provided options.  Logs
-   * into the application using the credentials available via these
-   * options.
+   * Provides access to a datastore using the provided options. Logs into the application using the
+   * credentials available via these options.
    *
    * @throws IllegalArgumentException if the server or credentials weren't provided.
    */
@@ -64,9 +60,7 @@ public Datastore create(DatastoreOptions options) {
     return new Datastore(newRemoteRpc(options));
   }
 
-  /**
-   * Constructs a Google APIs HTTP client with the associated credentials.
-   */
+  /** Constructs a Google APIs HTTP client with the associated credentials. */
   public HttpRequestFactory makeClient(DatastoreOptions options) {
     Credential credential = options.getCredential();
     HttpTransport transport = options.getTransport();
@@ -77,9 +71,7 @@ public HttpRequestFactory makeClient(DatastoreOptions options) {
     return transport.createRequestFactory(credential);
   }
 
-  /**
-   * Starts logging datastore method calls to the console. (Useful within tests.)
-   */
+  /** Starts logging datastore method calls to the console. (Useful within tests.) */
   public static void logMethodCalls() {
     Logger logger = Logger.getLogger(Datastore.class.getName());
     logger.setLevel(Level.FINE);
@@ -88,9 +80,7 @@ public static void logMethodCalls() {
     }
   }
 
-  /**
-   * Build a valid datastore URL.
-   */
+  /** Build a valid datastore URL. */
   String buildProjectEndpoint(DatastoreOptions options) {
     if (options.getProjectEndpoint() != null) {
       return options.getProjectEndpoint();
@@ -98,14 +88,13 @@ String buildProjectEndpoint(DatastoreOptions options) {
     // DatastoreOptions ensures either project endpoint or project ID is set.
     String projectId = checkNotNull(options.getProjectId());
     if (options.getHost() != null) {
-      return validateUrl(String.format("https://%s/%s/projects/%s",
-          options.getHost(), VERSION, projectId));
+      return validateUrl(
+          String.format("https://%s/%s/projects/%s", options.getHost(), VERSION, projectId));
     } else if (options.getLocalHost() != null) {
-      return validateUrl(String.format("http://%s/%s/projects/%s",
-          options.getLocalHost(), VERSION, projectId));
+      return validateUrl(
+          String.format("http://%s/%s/projects/%s", options.getLocalHost(), VERSION, projectId));
     }
-    return validateUrl(String.format("%s/%s/projects/%s",
-        DEFAULT_HOST, VERSION, projectId));
+    return validateUrl(String.format("%s/%s/projects/%s", DEFAULT_HOST, VERSION, projectId));
   }
 
   protected RemoteRpc newRemoteRpc(DatastoreOptions options) {
@@ -127,12 +116,13 @@ private static String validateUrl(String url) {
   private static synchronized StreamHandler getStreamHandler() {
     if (methodHandler == null) {
       methodHandler = new ConsoleHandler();
-      methodHandler.setFormatter(new Formatter() {
-        @Override
-        public String format(LogRecord record) {
-          return record.getMessage() + "\n";
-        }
-      });
+      methodHandler.setFormatter(
+          new Formatter() {
+            @Override
+            public String format(LogRecord record) {
+              return record.getMessage() + "\n";
+            }
+          });
       methodHandler.setLevel(Level.FINE);
     }
     return methodHandler;
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 1b187f1c82f5..5b092c9871b9 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
@@ -56,9 +56,7 @@
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
-/**
- * Helper methods for {@link Datastore}.
- */
+/** Helper methods for {@link Datastore}. */
 // TODO: Accept OrBuilders when possible.
 public final class DatastoreHelper {
   private static final Logger logger = Logger.getLogger(DatastoreHelper.class.getName());
@@ -66,39 +64,29 @@ public final class DatastoreHelper {
   private static final int MICROSECONDS_PER_SECOND = 1000 * 1000;
   private static final int NANOSECONDS_PER_MICROSECOND = 1000;
 
-  /** The property used in the Datastore to give us a random distribution. **/
+  /** The property used in the Datastore to give us a random distribution. * */
   public static final String SCATTER_PROPERTY_NAME = "__scatter__";
 
-  /** The property used in the Datastore to get the key of the entity. **/
+  /** The property used in the Datastore to get the key of the entity. * */
   public static final String KEY_PROPERTY_NAME = "__key__";
 
-  /**
-   * Name of the environment variable used to set the project ID.
-   */
+  /** Name of the environment variable used to set the project ID. */
   public static final String PROJECT_ID_ENV_VAR = "DATASTORE_PROJECT_ID";
-  
-  /**
-   * Name of the environment variable used to set the local host.
-   */
+
+  /** Name of the environment variable used to set the local host. */
   public static final String LOCAL_HOST_ENV_VAR = "DATASTORE_EMULATOR_HOST";
-  
-  /**
-   * Name of the environment variable used to set the service account.
-   */
+
+  /** Name of the environment variable used to set the service account. */
   public static final String SERVICE_ACCOUNT_ENV_VAR = "DATASTORE_SERVICE_ACCOUNT";
-  
-  /**
-   * Name of the environment variable used to set the private key file.
-   */
+
+  /** Name of the environment variable used to set the private key file. */
   public static final String PRIVATE_KEY_FILE_ENV_VAR = "DATASTORE_PRIVATE_KEY_FILE";
 
   private static final String URL_OVERRIDE_ENV_VAR = "__DATASTORE_URL_OVERRIDE";
 
   private static final AtomicReference projectIdFromComputeEngine = new AtomicReference<>();
 
-  /**
-   * Comparator for Keys
-   */
+  /** Comparator for Keys */
   private static final class KeyComparator implements Comparator {
 
     static final KeyComparator INSTANCE = new KeyComparator();
@@ -160,8 +148,8 @@ static JsonFactory newJsonFactory() {
    * @param privateKeyFile the file name from which to get the private key.
    * @return valid credentials or {@code null}
    */
-  public static Credential getServiceAccountCredential(String serviceAccountId,
-      String privateKeyFile) throws GeneralSecurityException, IOException {
+  public static Credential getServiceAccountCredential(
+      String serviceAccountId, String privateKeyFile) throws GeneralSecurityException, IOException {
     return getServiceAccountCredential(serviceAccountId, privateKeyFile, DatastoreOptions.SCOPES);
   }
 
@@ -170,13 +158,13 @@ public static Credential getServiceAccountCredential(String serviceAccountId,
    *
    * @param serviceAccountId service account ID (typically an e-mail address).
    * @param privateKeyFile the file name from which to get the private key.
-   * @param serviceAccountScopes Collection of OAuth scopes to use with the the service
-   *        account flow or {@code null} if not.
+   * @param serviceAccountScopes Collection of OAuth scopes to use with the the service account flow
+   *     or {@code null} if not.
    * @return valid credentials or {@code null}
    */
-  public static Credential getServiceAccountCredential(String serviceAccountId,
-      String privateKeyFile, Collection serviceAccountScopes)
-          throws GeneralSecurityException, IOException {
+  public static Credential getServiceAccountCredential(
+      String serviceAccountId, String privateKeyFile, Collection serviceAccountScopes)
+      throws GeneralSecurityException, IOException {
     return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes)
         .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile))
         .build();
@@ -187,12 +175,12 @@ public static Credential getServiceAccountCredential(String serviceAccountId,
    *
    * @param serviceAccountId service account ID (typically an e-mail address).
    * @param privateKey the private key for the given account.
-   * @param serviceAccountScopes Collection of OAuth scopes to use with the the service
-   *        account flow or {@code null} if not.
+   * @param serviceAccountScopes Collection of OAuth scopes to use with the the service account flow
+   *     or {@code null} if not.
    * @return valid credentials or {@code null}
    */
-  public static Credential getServiceAccountCredential(String serviceAccountId,
-      PrivateKey privateKey, Collection serviceAccountScopes)
+  public static Credential getServiceAccountCredential(
+      String serviceAccountId, PrivateKey privateKey, Collection serviceAccountScopes)
       throws GeneralSecurityException, IOException {
     return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes)
         .setServiceAccountPrivateKey(privateKey)
@@ -214,20 +202,22 @@ private static GoogleCredential.Builder getCredentialBuilderWithoutPrivateKey(
   /**
    * Constructs a {@link Datastore} from environment variables and/or the Compute Engine metadata
    * server.
-   * 
+   *
    * 
The project ID is determined from, in order of preference:
+   *
    * 
    
    *   
  • DATASTORE_PROJECT_ID environment variable
    *   
  • Compute Engine
    * 

    *
    * 
Credentials are taken from, in order of preference:
+   *
    * 
    
    *   
  1. No credentials (if the DATASTORE_EMULATOR_HOST environment variable is set)
    *   
  2. Service Account specified by the DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE
-   *     environment variables
-   *   
  3. Google Application Default as described at
-   *     {@link "https://developers.google.com/identity/protocols/application-default-credentials"}
+   *       environment variables
+   *   
  4. Google Application Default as described at {@link
+   *       "https://developers.google.com/identity/protocols/application-default-credentials"}
    * 

    */
   public static DatastoreOptions.Builder getOptionsFromEnv()
@@ -240,25 +230,28 @@ public static DatastoreOptions.Builder getOptionsFromEnv()
 
   private static Credential getCredentialFromEnv() throws GeneralSecurityException, IOException {
     if (System.getenv(LOCAL_HOST_ENV_VAR) != null) {
-      logger.log(Level.INFO, "{0} environment variable was set. Not using credentials.",
+      logger.log(
+          Level.INFO,
+          "{0} environment variable was set. Not using credentials.",
           new Object[] {LOCAL_HOST_ENV_VAR});
       return null;
     }
     String serviceAccount = System.getenv(SERVICE_ACCOUNT_ENV_VAR);
     String privateKeyFile = System.getenv(PRIVATE_KEY_FILE_ENV_VAR);
     if (serviceAccount != null && privateKeyFile != null) {
-      logger.log(Level.INFO, "{0} and {1} environment variables were set. "
-          + "Using service account credential.",
+      logger.log(
+          Level.INFO,
+          "{0} and {1} environment variables were set. " + "Using service account credential.",
           new Object[] {SERVICE_ACCOUNT_ENV_VAR, PRIVATE_KEY_FILE_ENV_VAR});
       return getServiceAccountCredential(serviceAccount, privateKeyFile);
     }
-    return GoogleCredential.getApplicationDefault()
-        .createScoped(DatastoreOptions.SCOPES);
+    return GoogleCredential.getApplicationDefault().createScoped(DatastoreOptions.SCOPES);
   }
 
   /**
    * Determines the project id from the environment. Uses the following sources in order of
    * preference:
+   *
    * 
    
    *   
  1. Value of the DATASTORE_PROJECT_ID environment variable
    *   
  2. Compute Engine
@@ -274,9 +267,12 @@ private static String getProjectIdFromEnv() {
     if (projectIdFromComputeEngine != null) {
       return projectIdFromComputeEngine;
     }
-    throw new IllegalStateException(String.format("Could not determine project ID."
-        + " If you are not running on Compute Engine, set the"
-        + " %s environment variable.", PROJECT_ID_ENV_VAR));
+    throw new IllegalStateException(
+        String.format(
+            "Could not determine project ID."
+                + " If you are not running on Compute Engine, set the"
+                + " %s environment variable.",
+            PROJECT_ID_ENV_VAR));
   }
 
   /**
@@ -318,16 +314,17 @@ private static String queryProjectIdFromComputeEngine() {
   private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options) {
     // DATASTORE_HOST is deprecated.
     if (System.getenv("DATASTORE_HOST") != null) {
-      logger.warning(String.format(
-          "Ignoring value of environment variable DATASTORE_HOST. "
-          + "To point datastore to a host running locally, use "
-          + "the environment variable %s.",
-          LOCAL_HOST_ENV_VAR));
+      logger.warning(
+          String.format(
+              "Ignoring value of environment variable DATASTORE_HOST. "
+                  + "To point datastore to a host running locally, use "
+                  + "the environment variable %s.",
+              LOCAL_HOST_ENV_VAR));
     }
     String projectId = getProjectIdFromEnv();
     if (System.getenv(URL_OVERRIDE_ENV_VAR) != null) {
-      options.projectEndpoint(String.format("%s/projects/%s",
-          System.getenv(URL_OVERRIDE_ENV_VAR), projectId));
+      options.projectEndpoint(
+          String.format("%s/projects/%s", System.getenv(URL_OVERRIDE_ENV_VAR), projectId));
       return;
     }
     if (System.getenv(LOCAL_HOST_ENV_VAR) != null) {
@@ -339,9 +336,7 @@ private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options)
     return;
   }
 
-  /**
-   * @see #getOptionsFromEnv()
-   */
+  /** @see #getOptionsFromEnv() */
   public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException {
     return DatastoreFactory.get().create(getOptionsFromEnv().build());
   }
@@ -349,7 +344,7 @@ public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, I
   /**
    * Gets a {@link QuerySplitter}.
    *
-   * The returned {@link QuerySplitter#getSplits} cannot accept a query that contains inequality
+   * 
    The returned {@link QuerySplitter#getSplits} cannot accept a query that contains inequality
    * filters, a sort filter, or a missing kind.
    */
   public static QuerySplitter getQuerySplitter() {
@@ -360,79 +355,64 @@ public static Comparator getKeyComparator() {
     return KeyComparator.INSTANCE;
   }
 
-  /**
-   * Make a sort order for use in a query.
-   */
-  public static PropertyOrder.Builder makeOrder(String property,
-      PropertyOrder.Direction direction) {
+  /** Make a sort order for use in a query. */
+  public static PropertyOrder.Builder makeOrder(
+      String property, PropertyOrder.Direction direction) {
     return PropertyOrder.newBuilder()
         .setProperty(makePropertyReference(property))
         .setDirection(direction);
   }
 
-  /**
-   * Makes an ancestor filter.
-   */
+  /** Makes an ancestor filter. */
   public static Filter.Builder makeAncestorFilter(Key ancestor) {
     return makeFilter(
-        DatastoreHelper.KEY_PROPERTY_NAME, PropertyFilter.Operator.HAS_ANCESTOR,
+        DatastoreHelper.KEY_PROPERTY_NAME,
+        PropertyFilter.Operator.HAS_ANCESTOR,
         makeValue(ancestor));
   }
 
-  /**
-   * Make a filter on a property for use in a query.
-   */
-  public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator,
-      Value value) {
+  /** Make a filter on a property for use in a query. */
+  public static Filter.Builder makeFilter(
+      String property, PropertyFilter.Operator operator, Value value) {
     return Filter.newBuilder()
-        .setPropertyFilter(PropertyFilter.newBuilder()
-            .setProperty(makePropertyReference(property))
-            .setOp(operator)
-            .setValue(value));
+        .setPropertyFilter(
+            PropertyFilter.newBuilder()
+                .setProperty(makePropertyReference(property))
+                .setOp(operator)
+                .setValue(value));
   }
 
-  /**
-   * Make a filter on a property for use in a query.
-   */
-  public static Filter.Builder makeFilter(String property, PropertyFilter.Operator operator,
-      Value.Builder value) {
+  /** Make a filter on a property for use in a query. */
+  public static Filter.Builder makeFilter(
+      String property, PropertyFilter.Operator operator, Value.Builder value) {
     return makeFilter(property, operator, value.build());
   }
 
-  /**
-   * Make a composite filter from the given sub-filters using AND to combine filters.
-   */
+  /** Make a composite filter from the given sub-filters using AND to combine filters. */
   public static Filter.Builder makeAndFilter(Filter... subfilters) {
     return makeAndFilter(Arrays.asList(subfilters));
   }
 
-  /**
-   * Make a composite filter from the given sub-filters using AND to combine filters.
-   */
+  /** Make a composite filter from the given sub-filters using AND to combine filters. */
   public static Filter.Builder makeAndFilter(Iterable subfilters) {
     return Filter.newBuilder()
-        .setCompositeFilter(CompositeFilter.newBuilder()
-            .addAllFilters(subfilters)
-            .setOp(CompositeFilter.Operator.AND));
+        .setCompositeFilter(
+            CompositeFilter.newBuilder()
+                .addAllFilters(subfilters)
+                .setOp(CompositeFilter.Operator.AND));
   }
 
-  /**
-   * Make a property reference for use in a query.
-   */
+  /** Make a property reference for use in a query. */
   public static PropertyReference.Builder makePropertyReference(String propertyName) {
     return PropertyReference.newBuilder().setName(propertyName);
   }
 
-  /**
-   * Make an array value containing the specified values.
-   */
+  /** Make an array value containing the specified values. */
   public static Value.Builder makeValue(Iterable values) {
     return Value.newBuilder().setArrayValue(ArrayValue.newBuilder().addAllValues(values));
   }
 
-  /**
-   * Make a list value containing the specified values.
-   */
+  /** Make a list value containing the specified values. */
   public static Value.Builder makeValue(Value value1, Value value2, Value... rest) {
     ArrayValue.Builder arrayValue = ArrayValue.newBuilder();
     arrayValue.addValues(value1);
@@ -441,11 +421,9 @@ public static Value.Builder makeValue(Value value1, Value value2, Value... rest)
     return Value.newBuilder().setArrayValue(arrayValue);
   }
 
-  /**
-   * Make an array value containing the specified values.
-   */
-  public static Value.Builder makeValue(Value.Builder value1, Value.Builder value2,
-      Value.Builder... rest) {
+  /** Make an array value containing the specified values. */
+  public static Value.Builder makeValue(
+      Value.Builder value1, Value.Builder value2, Value.Builder... rest) {
     ArrayValue.Builder arrayValue = ArrayValue.newBuilder();
     arrayValue.addValues(value1);
     arrayValue.addValues(value2);
@@ -455,72 +433,52 @@ public static Value.Builder makeValue(Value.Builder value1, Value.Builder value2
     return Value.newBuilder().setArrayValue(arrayValue);
   }
 
-  /**
-   * Make a key value.
-   */
+  /** Make a key value. */
   public static Value.Builder makeValue(Key key) {
     return Value.newBuilder().setKeyValue(key);
   }
 
-  /**
-   * Make a key value.
-   */
+  /** Make a key value. */
   public static Value.Builder makeValue(Key.Builder key) {
     return makeValue(key.build());
   }
 
-  /**
-   * Make an integer value.
-   */
+  /** Make an integer value. */
   public static Value.Builder makeValue(long key) {
     return Value.newBuilder().setIntegerValue(key);
   }
 
-  /**
-   * Make a floating point value.
-   */
+  /** Make a floating point value. */
   public static Value.Builder makeValue(double value) {
     return Value.newBuilder().setDoubleValue(value);
   }
 
-  /**
-   * Make a boolean value.
-   */
+  /** Make a boolean value. */
   public static Value.Builder makeValue(boolean value) {
     return Value.newBuilder().setBooleanValue(value);
   }
 
-  /**
-   * Make a string value.
-   */
+  /** Make a string value. */
   public static Value.Builder makeValue(String value) {
     return Value.newBuilder().setStringValue(value);
   }
 
-  /**
-   * Make an entity value.
-   */
+  /** Make an entity value. */
   public static Value.Builder makeValue(Entity entity) {
     return Value.newBuilder().setEntityValue(entity);
   }
 
-  /**
-   * Make a entity value.
-   */
+  /** Make a entity value. */
   public static Value.Builder makeValue(Entity.Builder entity) {
     return makeValue(entity.build());
   }
 
-  /**
-   * Make a ByteString value.
-   */
+  /** Make a ByteString value. */
   public static Value.Builder makeValue(ByteString blob) {
     return Value.newBuilder().setBlobValue(blob);
   }
 
-  /**
-   * Make a timestamp value given a date.
-   */
+  /** Make a timestamp value given a date. */
   public static Value.Builder makeValue(Date date) {
     return Value.newBuilder().setTimestampValue(toTimestamp(date.getTime() * 1000L));
   }
@@ -539,45 +497,43 @@ private static Timestamp.Builder toTimestamp(long microseconds) {
         .setNanos((int) microsecondsRemainder * NANOSECONDS_PER_MICROSECOND);
   }
 
-  /**
-   * Makes a GeoPoint value.
-   */
+  /** Makes a GeoPoint value. */
   public static Value.Builder makeValue(LatLng value) {
     return Value.newBuilder().setGeoPointValue(value);
   }
 
-  /**
-   * Makes a GeoPoint 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.
+   * Make a key from the specified path of kind/id-or-name pairs and/or Keys.
    *
    * 
    The id-or-name values must be either String, Long, Integer or Short.
    *
-   * 
    The last id-or-name value may be omitted, in which case an entity without
-   * an id is created (for use with automatic id allocation).
+   * 
    The last id-or-name value may be omitted, in which case an entity without an id is created
+   * (for use with automatic id allocation).
    *
-   * 
    The PartitionIds of all Keys in the path must be equal. The returned
-   * Key.Builder will use this PartitionId.
+   * 
    The PartitionIds of all Keys in the path must be equal. The returned Key.Builder will use
+   * this PartitionId.
    */
   public static Key.Builder makeKey(Object... elements) {
     Key.Builder key = Key.newBuilder();
     PartitionId partitionId = null;
     for (int pathIndex = 0; pathIndex < elements.length; pathIndex += 2) {
       PathElement.Builder pathElement = PathElement.newBuilder();
-      Object element =  elements[pathIndex];
+      Object element = elements[pathIndex];
       if (element instanceof Key) {
         Key subKey = (Key) element;
         if (partitionId == null) {
           partitionId = subKey.getPartitionId();
         } else if (!partitionId.equals(subKey.getPartitionId())) {
-          throw new IllegalArgumentException("Partition IDs did not match, found: "
-              + partitionId + " and " + subKey.getPartitionId());
+          throw new IllegalArgumentException(
+              "Partition IDs did not match, found: "
+                  + partitionId
+                  + " and "
+                  + subKey.getPartitionId());
         }
         key.addAllPath(((Key) element).getPathList());
         // We increment by 2, but since we got a Key argument we're only consuming 1 element in this
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 d70d3c00c97d..9ad9ca5527d2 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
@@ -48,11 +48,12 @@ public class DatastoreOptions {
 
   private final Credential credential;
   private final HttpTransport transport;
-  public static final List SCOPES = Arrays.asList(
-      "https://www.googleapis.com/auth/datastore");
+  public static final List SCOPES =
+      Arrays.asList("https://www.googleapis.com/auth/datastore");
 
   DatastoreOptions(Builder b) {
-    checkArgument(b.projectId != null || b.projectEndpoint != null,
+    checkArgument(
+        b.projectId != null || b.projectEndpoint != null,
         "Either project ID or project endpoint must be provided.");
     this.projectId = b.projectId;
     this.projectEndpoint = b.projectEndpoint;
@@ -63,9 +64,7 @@ public class DatastoreOptions {
     this.transport = b.transport;
   }
 
-  /**
-   * Builder for {@link DatastoreOptions}.
-   */
+  /** Builder for {@link DatastoreOptions}. */
   public static class Builder {
     private static final String PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR =
         "Cannot set both project endpoint and project ID.";
@@ -80,7 +79,7 @@ public static class Builder {
     private Credential credential;
     private HttpTransport transport;
 
-    public Builder() { }
+    public Builder() {}
 
     public Builder(DatastoreOptions options) {
       this.projectId = options.projectId;
@@ -96,9 +95,7 @@ public DatastoreOptions build() {
       return new DatastoreOptions(this);
     }
 
-    /**
-     * Sets the project ID used to access Cloud Datastore.
-     */
+    /** Sets the project ID used to access Cloud Datastore. */
     public Builder projectId(String projectId) {
       checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR);
       this.projectId = projectId;
@@ -106,8 +103,8 @@ public Builder projectId(String projectId) {
     }
 
     /**
-     * Sets the host used to access Cloud Datastore. To connect to the Cloud Datastore Emulator,
-     * use {@link #localHost} instead.
+     * Sets the host used to access Cloud Datastore. To connect to the Cloud Datastore Emulator, use
+     * {@link #localHost} instead.
      */
     public Builder host(String host) {
       checkArgument(projectEndpoint == null && localHost == null, PROJECT_ENDPOINT_AND_HOST_ERROR);
@@ -121,8 +118,8 @@ public Builder host(String host) {
 
     /**
      * Configures the client to access Cloud Datastore on a local host (typically a Cloud Datastore
-     * Emulator instance). Call this method also configures the client not to attach credentials
-     * to requests.
+     * Emulator instance). Call this method also configures the client not to attach credentials to
+     * requests.
      */
     public Builder localHost(String localHost) {
       checkArgument(projectEndpoint == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR);
@@ -137,7 +134,7 @@ public Builder localHost(String localHost) {
     /**
      * Sets the project endpoint used to access Cloud Datastore. Prefer using {@link #projectId}
      * and/or {@link #host}/{@link #localHost} when possible.
-     * 
+     *
      * @deprecated Use {@link #projectId} and/or {@link #host}/{@link #localHost} instead.
      */
     @Deprecated
@@ -145,32 +142,26 @@ public Builder projectEndpoint(String projectEndpoint) {
       checkArgument(projectId == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR);
       checkArgument(localHost == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR);
       if (!includesScheme(projectEndpoint)) {
-        throw new IllegalArgumentException(String.format(
-            "Project endpoint \"%s\" must include scheme.", projectEndpoint));
+        throw new IllegalArgumentException(
+            String.format("Project endpoint \"%s\" must include scheme.", projectEndpoint));
       }
       this.projectEndpoint = projectEndpoint;
       return this;
     }
 
-    /**
-     * Sets the (optional) initializer to run on HTTP requests to Cloud Datastore.
-     */
+    /** Sets the (optional) initializer to run on HTTP requests to Cloud Datastore. */
     public Builder initializer(HttpRequestInitializer initializer) {
       this.initializer = initializer;
       return this;
     }
 
-    /**
-     * Sets the Google APIs {@link Credential} used to access Cloud Datastore.
-     */
+    /** Sets the Google APIs {@link Credential} used to access Cloud Datastore. */
     public Builder credential(Credential credential) {
       this.credential = credential;
       return this;
     }
 
-    /**
-     * Sets the transport used to access Cloud Datastore.
-     */
+    /** Sets the transport used to access Cloud Datastore. */
     public Builder transport(HttpTransport transport) {
       this.transport = transport;
       return this;
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
index 591ebe3f6ad8..06d08d499b00 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC. All Rights Reserved.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,8 +39,8 @@ static String computeChecksum(byte[] bytes) {
     if (bytes == null || (bytes.length == 0)) {
       return null;
     }
-    return com.google.common.io.BaseEncoding.base16().encode(
-        getMessageDigestInstance().digest(bytes));
+    return com.google.common.io.BaseEncoding.base16()
+        .encode(getMessageDigestInstance().digest(bytes));
   }
 
   /**
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
index e220ad35cad4..44b1c2c50f14 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
@@ -17,12 +17,9 @@
 
 import com.google.datastore.v1.PartitionId;
 import com.google.datastore.v1.Query;
-
 import java.util.List;
 
-/**
- * Provides the ability to split a query into multiple shards.
- */
+/** Provides the ability to split a query into multiple shards. */
 public interface QuerySplitter {
 
   /**
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 91c7fb4b260c..d1055cdd3da9 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
@@ -30,7 +30,6 @@
 import com.google.datastore.v1.QueryResultBatch;
 import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
 import com.google.datastore.v1.RunQueryRequest;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -39,16 +38,20 @@
 /**
  * Provides the ability to split a query into multiple shards using Cloud Datastore.
  *
- * 
    This implementation of the QuerySplitter uses the __scatter__ property to gather
- * random split points for a query.
+ * 
    This implementation of the QuerySplitter uses the __scatter__ property to gather random split
+ * points for a query.
  */
 final class QuerySplitterImpl implements QuerySplitter {
 
-  /** The number of keys to sample for each split. **/
+  /** The number of keys to sample for each split. * */
   private static final int KEYS_PER_SPLIT = 32;
 
-  private static final EnumSet UNSUPPORTED_OPERATORS = EnumSet.of(Operator.LESS_THAN,
-      Operator.LESS_THAN_OR_EQUAL, Operator.GREATER_THAN, Operator.GREATER_THAN_OR_EQUAL);
+  private static final EnumSet UNSUPPORTED_OPERATORS =
+      EnumSet.of(
+          Operator.LESS_THAN,
+          Operator.LESS_THAN_OR_EQUAL,
+          Operator.GREATER_THAN,
+          Operator.GREATER_THAN_OR_EQUAL);
 
   static final QuerySplitter INSTANCE = new QuerySplitterImpl();
 
@@ -81,6 +84,7 @@ public List getSplits(
 
   /**
    * Verify that the given number of splits is not out of bounds.
+   *
    * @param numSplits the number of splits.
    * @throws IllegalArgumentException if the split size is invalid.
    */
@@ -93,8 +97,8 @@ private void validateSplitSize(int numSplits) throws IllegalArgumentException {
   /**
    * Validates that we only have allowable filters.
    *
-   * 
    Note that equality and ancestor filters are allowed, however they may result in
-   * inefficient sharding.
+   * 
    Note that equality and ancestor filters are allowed, however they may result in inefficient
+   * sharding.
    */
   private void validateFilter(Filter filter) throws IllegalArgumentException {
     switch (filter.getFilterTypeCase()) {
@@ -148,15 +152,21 @@ private Query createSplit(Key lastKey, Key nextKey, Query query) {
       keyFilters.add(query.getFilter());
     }
     if (lastKey != null) {
-      Filter lowerBound = DatastoreHelper.makeFilter(DatastoreHelper.KEY_PROPERTY_NAME,
-          PropertyFilter.Operator.GREATER_THAN_OR_EQUAL,
-          DatastoreHelper.makeValue(lastKey)).build();
+      Filter lowerBound =
+          DatastoreHelper.makeFilter(
+                  DatastoreHelper.KEY_PROPERTY_NAME,
+                  PropertyFilter.Operator.GREATER_THAN_OR_EQUAL,
+                  DatastoreHelper.makeValue(lastKey))
+              .build();
       keyFilters.add(lowerBound);
     }
     if (nextKey != null) {
-      Filter upperBound = DatastoreHelper.makeFilter(DatastoreHelper.KEY_PROPERTY_NAME,
-          PropertyFilter.Operator.LESS_THAN,
-          DatastoreHelper.makeValue(nextKey)).build();
+      Filter upperBound =
+          DatastoreHelper.makeFilter(
+                  DatastoreHelper.KEY_PROPERTY_NAME,
+                  PropertyFilter.Operator.LESS_THAN,
+                  DatastoreHelper.makeValue(nextKey))
+              .build();
       keyFilters.add(upperBound);
     }
     return Query.newBuilder(query).setFilter(makeAndFilter(keyFilters)).build();
@@ -165,9 +175,8 @@ private Query createSplit(Key lastKey, Key nextKey, Query query) {
   /**
    * Gets a list of split keys given a desired number of splits.
    *
-   * 
    This list will contain multiple split keys for each split. Only a single split key
-   * will be chosen as the split point, however providing multiple keys allows for more uniform
-   * sharding.
+   * 
    This list will contain multiple split keys for each split. Only a single split key will be
+   * chosen as the split point, however providing multiple keys allows for more uniform sharding.
    *
    * @param numSplits the number of desired splits.
    * @param query the user query.
@@ -194,8 +203,9 @@ private List getScatterKeys(
         keySplits.add(result.getEntity().getKey());
       }
       scatterPointQuery.setStartCursor(batch.getEndCursor());
-      scatterPointQuery.getLimitBuilder().setValue(
-          scatterPointQuery.getLimit().getValue() - batch.getEntityResultsCount());
+      scatterPointQuery
+          .getLimitBuilder()
+          .setValue(scatterPointQuery.getLimit().getValue() - batch.getEntityResultsCount());
     } while (batch.getMoreResults() == MoreResultsType.NOT_FINISHED);
     Collections.sort(keySplits, DatastoreHelper.getKeyComparator());
     return keySplits;
@@ -214,16 +224,16 @@ private Query.Builder createScatterQuery(Query query, int numSplits) {
     // the same category.
     Query.Builder scatterPointQuery = Query.newBuilder();
     scatterPointQuery.addAllKind(query.getKindList());
-    scatterPointQuery.addOrder(DatastoreHelper.makeOrder(
-        DatastoreHelper.SCATTER_PROPERTY_NAME, Direction.ASCENDING));
+    scatterPointQuery.addOrder(
+        DatastoreHelper.makeOrder(DatastoreHelper.SCATTER_PROPERTY_NAME, Direction.ASCENDING));
     // There is a split containing entities before and after each scatter entity:
     // ||---*------*------*------*------*------*------*---||  = scatter entity
     // If we represent each split as a region before a scatter entity, there is an extra region
     // following the last scatter point. Thus, we do not need the scatter entities for the last
     // region.
     scatterPointQuery.getLimitBuilder().setValue((numSplits - 1) * KEYS_PER_SPLIT);
-    scatterPointQuery.addProjection(Projection.newBuilder().setProperty(
-        PropertyReference.newBuilder().setName("__key__")));
+    scatterPointQuery.addProjection(
+        Projection.newBuilder().setProperty(PropertyReference.newBuilder().setName("__key__")));
     return scatterPointQuery;
   }
 
@@ -267,5 +277,4 @@ private Iterable getSplitKey(List keys, int numSplits) {
 
     return keysList;
   }
-
 }
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 e0b2e378b786..17763c9c1482 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
@@ -43,8 +43,7 @@
 class RemoteRpc {
   private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName());
 
-  @VisibleForTesting
-  static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version";
+  @VisibleForTesting static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version";
   private static final String API_FORMAT_VERSION = "2";
 
   private final HttpRequestFactory client;
@@ -52,8 +51,8 @@ class RemoteRpc {
   private final String url;
   private final AtomicInteger rpcCount = new AtomicInteger(0);
   // Not final - so it can be set/reset in Unittests
-  private static boolean enableE2EChecksum = Boolean.parseBoolean(
-      System.getenv("GOOGLE_CLOUD_DATASTORE_HTTP_ENABLE_E2E_CHECKSUM"));
+  private static boolean enableE2EChecksum =
+      Boolean.parseBoolean(System.getenv("GOOGLE_CLOUD_DATASTORE_HTTP_ENABLE_E2E_CHECKSUM"));
 
   RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) {
     this.client = client;
@@ -70,8 +69,8 @@ class RemoteRpc {
   /**
    * Makes an RPC call using the client. Logs how long it took and any exceptions.
    *
-   * NOTE: The request could be an InputStream too, but the http client will need to
-   * find its length, which will require buffering it anyways.
+   * 
    NOTE: The request could be an InputStream too, but the http client will need to find its
+   * length, which will require buffering it anyways.
    *
    * @throws DatastoreException if the RPC fails.
    */
@@ -98,16 +97,20 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
         httpResponse = httpRequest.execute();
         if (!httpResponse.isSuccessStatusCode()) {
           try (InputStream content = httpResponse.getContent()) {
-            throw makeException(url, methodName, content,
-                httpResponse.getContentType(), httpResponse.getContentCharset(), null,
+            throw makeException(
+                url,
+                methodName,
+                content,
+                httpResponse.getContentType(),
+                httpResponse.getContentCharset(),
+                null,
                 httpResponse.getStatusCode());
           }
         }
         InputStream inputStream = httpResponse.getContent();
         return enableE2EChecksum && EndToEndChecksumHandler.hasChecksumHeader(httpResponse)
-            ? new ChecksumEnforcingInputStream(inputStream,
-                                               httpResponse,
-                                               EndToEndChecksumHandler.getMessageDigestInstance())
+            ? new ChecksumEnforcingInputStream(
+                inputStream, httpResponse, EndToEndChecksumHandler.getMessageDigestInstance())
             : inputStream;
       } catch (SocketTimeoutException e) {
         throw makeException(url, methodName, Code.DEADLINE_EXCEEDED, "Deadline exceeded", e);
@@ -126,8 +129,9 @@ void setHeaders(MessageLite request, HttpRequest httpRequest) {
     if (enableE2EChecksum && request != null) {
       String checksum = EndToEndChecksumHandler.computeChecksum(request.toByteArray());
       if (checksum != null) {
-        httpRequest.getHeaders().put(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER,
-            checksum);
+        httpRequest
+            .getHeaders()
+            .put(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER, checksum);
       }
     }
   }
@@ -162,14 +166,20 @@ HttpRequestFactory getHttpRequestFactory() {
     return client;
   }
 
-  public static DatastoreException makeException(String url, String methodName, Code code,
-      String message, Throwable cause) {
-    logger.fine("remote datastore call " + methodName + " against " + url  + " failed: " + message);
+  public static DatastoreException makeException(
+      String url, String methodName, Code code, String message, Throwable cause) {
+    logger.fine("remote datastore call " + methodName + " against " + url + " failed: " + message);
     return new DatastoreException(methodName, code, message, cause);
   }
 
-  static DatastoreException makeException(String url, String methodName, InputStream content,
-      String contentType, Charset contentCharset, Throwable cause, int httpStatusCode) {
+  static DatastoreException makeException(
+      String url,
+      String methodName,
+      InputStream content,
+      String contentType,
+      Charset contentCharset,
+      Throwable cause,
+      int httpStatusCode) {
     if (!contentType.equals("application/x-protobuf")) {
       String responseContent;
       try {
@@ -179,7 +189,10 @@ static DatastoreException makeException(String url, String methodName, InputStre
       } catch (IOException e) {
         responseContent = "";
       }
-      return makeException(url, methodName, Code.INTERNAL,
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
           String.format(
               "Non-protobuf error: %s. HTTP status code was %d.", responseContent, httpStatusCode),
           cause);
@@ -189,7 +202,10 @@ static DatastoreException makeException(String url, String methodName, InputStre
     try {
       rpcStatus = Status.parseFrom(content);
     } catch (IOException e) {
-      return makeException(url, methodName, Code.INTERNAL,
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
           String.format(
               "Unable to parse Status protocol buffer: HTTP status code was %s.", httpStatusCode),
           e);
@@ -197,7 +213,10 @@ static DatastoreException makeException(String url, String methodName, InputStre
 
     Code code = Code.forNumber(rpcStatus.getCode());
     if (code == null) {
-      return makeException(url, methodName, Code.INTERNAL,
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
           String.format(
               "Invalid error code: %d. Message: %s.", rpcStatus.getCode(), rpcStatus.getMessage()),
           cause);
@@ -208,8 +227,12 @@ static DatastoreException makeException(String url, String methodName, InputStre
       if (httpStatusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {
         return makeException(url, methodName, Code.UNAUTHENTICATED, "Unauthenticated.", cause);
       }
-      return makeException(url, methodName, Code.INTERNAL,
-          String.format("Unexpected OK error code with HTTP status code of %d. Message: %s.",
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
+          String.format(
+              "Unexpected OK error code with HTTP status code of %d. Message: %s.",
               httpStatusCode, rpcStatus.getMessage()),
           cause);
     }
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
index 32d43fb44be0..9972056677e9 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC. All Rights Reserved.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public void test(int payloadSize) throws Exception {
     byte[] buf = new byte[1000];
     try {
       while (testInstance.read(buf, 0, 1000) != -1) {
-         // do nothing with the bytes read
+        // do nothing with the bytes read
       }
     } catch (IOException e) {
       fail("checksum verification failed!");
@@ -63,10 +63,11 @@ public void read_withValidChecksum_differentPayloadSizes() throws Exception {
   @Test
   public void read_withInvalidChecksum() {
     // build a test instance with invalidchecksum
-    ChecksumEnforcingInputStream instance = new ChecksumEnforcingInputStream(
-        new ByteArrayInputStream("hello there".getBytes(UTF_8)),
-        "this checksum is invalid",
-        digest);
+    ChecksumEnforcingInputStream instance =
+        new ChecksumEnforcingInputStream(
+            new ByteArrayInputStream("hello there".getBytes(UTF_8)),
+            "this checksum is invalid",
+            digest);
     // read 1000 bytes at a time
     // Since checksum should be correct, do not expect IOException
     byte[] buf = new byte[1000];
@@ -103,7 +104,7 @@ private ChecksumEnforcingInputStream setUpData(int payloadSize) throws Exception
     }
     byte[] bytes = payload.getBytes(UTF_8);
     String expectedChecksum = EndToEndChecksumHandler.computeChecksum(bytes);
-    return new ChecksumEnforcingInputStream(new ByteArrayInputStream(bytes),
-                                            expectedChecksum, digest);
+    return new ChecksumEnforcingInputStream(
+        new ByteArrayInputStream(bytes), expectedChecksum, digest);
   }
 }
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
index 22e1459967bc..0414bcbe9789 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
@@ -23,83 +23,69 @@
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.javanet.NetHttpTransport;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Test for {@link DatastoreFactory}.
- */
+/** Test for {@link DatastoreFactory}. */
 @RunWith(JUnit4.class)
 public class DatastoreFactoryTest {
   private static final String PROJECT_ID = "project-id";
-  
+
   private DatastoreFactory factory = DatastoreFactory.get();
 
   /**
-   * Without specifying a credential or transport, the factory will create
-   * a default transport on its own.
+   * Without specifying a credential or transport, the factory will create a default transport on
+   * its own.
    */
   @Test
   public void makeClient_Default() {
-    DatastoreOptions options = new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .build();
+    DatastoreOptions options = new DatastoreOptions.Builder().projectId(PROJECT_ID).build();
     HttpRequestFactory f = factory.makeClient(options);
     assertNotNull(f.getTransport());
     assertTrue(f.getTransport() instanceof NetHttpTransport);
   }
 
   /**
-   * Specifying a credential, but not a transport, the factory will use the
-   * transport from the credential.
+   * Specifying a credential, but not a transport, the factory will use the transport from the
+   * credential.
    */
   @Test
   public void makeClient_WithCredential() {
     NetHttpTransport transport = new NetHttpTransport();
-    GoogleCredential credential = new GoogleCredential.Builder()
-        .setTransport(transport)
-        .build();
-    DatastoreOptions options = new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .credential(credential)
-        .build();
+    GoogleCredential credential = new GoogleCredential.Builder().setTransport(transport).build();
+    DatastoreOptions options =
+        new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(credential).build();
     HttpRequestFactory f = factory.makeClient(options);
     assertEquals(transport, f.getTransport());
   }
-  
-  /**
-   * Specifying a transport, but not a credential, the factory will use the
-   * transport specified.
-   */
+
+  /** Specifying a transport, but not a credential, the factory will use the transport specified. */
   @Test
   public void makeClient_WithTransport() {
     NetHttpTransport transport = new NetHttpTransport();
-    DatastoreOptions options = new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .transport(transport)
-        .build();
+    DatastoreOptions options =
+        new DatastoreOptions.Builder().projectId(PROJECT_ID).transport(transport).build();
     HttpRequestFactory f = factory.makeClient(options);
     assertEquals(transport, f.getTransport());
   }
-  
+
   /**
-   * Specifying both credential and transport, the factory will use the
-   * transport specified and not the one in the credential.
+   * Specifying both credential and transport, the factory will use the transport specified and not
+   * the one in the credential.
    */
   @Test
   public void makeClient_WithCredentialTransport() {
     NetHttpTransport credTransport = new NetHttpTransport();
     NetHttpTransport transport = new NetHttpTransport();
-    GoogleCredential credential = new GoogleCredential.Builder()
-        .setTransport(credTransport)
-        .build();
-    DatastoreOptions options = new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .credential(credential)
-        .transport(transport)
-        .build();
+    GoogleCredential credential =
+        new GoogleCredential.Builder().setTransport(credTransport).build();
+    DatastoreOptions options =
+        new DatastoreOptions.Builder()
+            .projectId(PROJECT_ID)
+            .credential(credential)
+            .transport(transport)
+            .build();
     HttpRequestFactory f = factory.makeClient(options);
     assertNotSame(credTransport, f.getTransport());
     assertEquals(transport, f.getTransport());
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
index 1bd166bcc1c6..5fcb214e8ff5 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
@@ -28,34 +28,23 @@
 import com.google.datastore.v1.Value.ValueTypeCase;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Timestamp;
-
+import java.util.Date;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.util.Date;
-
-/**
- * Tests for {@link DatastoreHelper}.
- */
+/** Tests for {@link DatastoreHelper}. */
 @RunWith(JUnit4.class)
 public class DatastoreHelperTest {
 
-  private static final Key PARENT = Key.newBuilder()
-      .addPath(Key.PathElement.newBuilder()
-          .setKind("Parent")
-          .setId(23L))
-      .build();
-  private static final Key GRANDPARENT = Key.newBuilder()
-      .addPath(Key.PathElement.newBuilder()
-          .setKind("Grandparent")
-          .setId(24L))
-      .build();
-  private static final Key CHILD = Key.newBuilder()
-      .addPath(Key.PathElement.newBuilder()
-          .setKind("Child")
-          .setId(26L))
-      .build();
+  private static final Key PARENT =
+      Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Parent").setId(23L)).build();
+  private static final Key GRANDPARENT =
+      Key.newBuilder()
+          .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L))
+          .build();
+  private static final Key CHILD =
+      Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Child").setId(26L)).build();
 
   @Test
   public void testMakeKey_BadTypeForKind() {
@@ -83,45 +72,35 @@ public void testMakeKey_Empty() {
   @Test
   public void testMakeKey_Incomplete() {
     assertEquals(
-        Key.newBuilder()
-            .addPath(Key.PathElement.newBuilder().setKind("Foo"))
-            .build(),
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo")).build(),
         makeKey("Foo").build());
   }
 
   @Test
   public void testMakeKey_IdInt() {
     assertEquals(
-        Key.newBuilder()
-            .addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1))
-            .build(),
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(),
         makeKey("Foo", 1).build());
   }
 
   @Test
   public void testMakeKey_IdLong() {
     assertEquals(
-        Key.newBuilder()
-            .addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1))
-            .build(),
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(),
         makeKey("Foo", 1L).build());
   }
 
   @Test
   public void testMakeKey_IdShort() {
     assertEquals(
-        Key.newBuilder()
-            .addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1))
-            .build(),
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(),
         makeKey("Foo", (short) 1).build());
   }
 
   @Test
   public void testMakeKey_Name() {
     assertEquals(
-        Key.newBuilder()
-            .addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi"))
-            .build(),
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi")).build(),
         makeKey("Foo", "hi").build());
   }
 
@@ -184,21 +163,14 @@ public void testMakeKey_KeyKindIdKey() {
   @Test
   public void testMakeKey_Key() {
     // Just 1 key
-    assertEquals(
-        Key.newBuilder()
-            .addPath(CHILD.getPath(0))
-            .build(),
-        makeKey(CHILD).build());
+    assertEquals(Key.newBuilder().addPath(CHILD.getPath(0)).build(), makeKey(CHILD).build());
   }
 
   @Test
   public void testMakeKey_KeyKey() {
     // Just 2 keys
     assertEquals(
-        Key.newBuilder()
-            .addPath(PARENT.getPath(0))
-            .addPath(CHILD.getPath(0))
-            .build(),
+        Key.newBuilder().addPath(PARENT.getPath(0)).addPath(CHILD.getPath(0)).build(),
         makeKey(PARENT, CHILD).build());
   }
 
@@ -252,12 +224,8 @@ public void testMakeKey_MultiLevelKey() {
 
   @Test
   public void testMakeKey_PartitionId() {
-    PartitionId partitionId = PartitionId.newBuilder()
-        .setNamespaceId("namespace-id")
-        .build();
-    Key parent = PARENT.toBuilder()
-        .setPartitionId(partitionId)
-        .build();
+    PartitionId partitionId = PartitionId.newBuilder().setNamespaceId("namespace-id").build();
+    Key parent = PARENT.toBuilder().setPartitionId(partitionId).build();
     assertEquals(
         Key.newBuilder()
             .setPartitionId(partitionId)
@@ -269,12 +237,9 @@ public void testMakeKey_PartitionId() {
 
   @Test
   public void testMakeKey_NonMatchingPartitionId2() {
-    PartitionId partitionId1 = PartitionId.newBuilder()
-        .setNamespaceId("namespace-id")
-        .build();
-    PartitionId partitionId2 = PartitionId.newBuilder()
-        .setNamespaceId("another-namespace-id")
-        .build();
+    PartitionId partitionId1 = PartitionId.newBuilder().setNamespaceId("namespace-id").build();
+    PartitionId partitionId2 =
+        PartitionId.newBuilder().setNamespaceId("another-namespace-id").build();
     try {
       makeKey(
           PARENT.toBuilder().setPartitionId(partitionId1).build(),
@@ -302,9 +267,9 @@ public void testMakeTimestampValue() throws Exception {
     // Timestamp specification requires that nanos >= 0 even if the timestamp
     // is before the epoch.
     assertConversion(0, 0, 0);
-    assertConversion(-250, -1, 750_000_000);  // 1/4 second before epoch
-    assertConversion(-500, -1, 500_000_000);  // 1/2 second before epoch
-    assertConversion(-750, -1, 250_000_000);  // 3/4 second before epoch
+    assertConversion(-250, -1, 750_000_000); // 1/4 second before epoch
+    assertConversion(-500, -1, 500_000_000); // 1/2 second before epoch
+    assertConversion(-750, -1, 250_000_000); // 3/4 second before epoch
 
     // If nanos % 1_000_000 != 0, precision is lost (via truncation) when
     // converting to milliseconds.
@@ -329,16 +294,16 @@ private void assertMillisecondsToTimestamp(long millis, long seconds, long nanos
   }
 
   private void assertTimestampToMilliseconds(long millis, long seconds, int nanos) {
-    Value.Builder value = Value.newBuilder().setTimestampValue(Timestamp.newBuilder()
-        .setSeconds(seconds)
-        .setNanos(nanos));
+    Value.Builder value =
+        Value.newBuilder()
+            .setTimestampValue(Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos));
     assertEquals(millis, DatastoreHelper.toDate(value.build()).getTime());
   }
 
   @Test
   public void testProjectionHandling() {
-    assertEquals(ByteString.copyFromUtf8("hi"),
-        getByteString(makeValue("hi").setMeaning(18).build()));
+    assertEquals(
+        ByteString.copyFromUtf8("hi"), getByteString(makeValue("hi").setMeaning(18).build()));
     try {
       getByteString(makeValue("hi").build());
       fail("Expected IllegalArgumentException");
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
index 617960bd3fa9..a4a51cd15f34 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
@@ -68,20 +68,16 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Tests for {@link DatastoreFactory} and {@link Datastore}.
- */
+/** Tests for {@link DatastoreFactory} and {@link Datastore}. */
 @RunWith(JUnit4.class)
 public class DatastoreTest {
   private static final String PROJECT_ID = "project-id";
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
+  @Rule public ExpectedException thrown = ExpectedException.none();
 
   private DatastoreFactory factory = new MockDatastoreFactory();
-  private DatastoreOptions.Builder options = new DatastoreOptions.Builder()
-      .projectId(PROJECT_ID)
-      .credential(new MockCredential());
+  private DatastoreOptions.Builder options =
+      new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(new MockCredential());
 
   @Test
   public void options_NoProjectIdOrProjectEndpoint() throws Exception {
@@ -95,73 +91,73 @@ public void options_NoProjectIdOrProjectEndpoint() throws Exception {
   public void options_ProjectIdAndProjectEndpoint() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Cannot set both project endpoint and project ID");
-    options = new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
+    options =
+        new DatastoreOptions.Builder()
+            .projectId(PROJECT_ID)
+            .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
   }
 
   @Test
   public void options_LocalHostAndProjectEndpoint() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Can set at most one of project endpoint, host, and local host");
-    options = new DatastoreOptions.Builder()
-        .localHost("localhost:8080")
-        .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
+    options =
+        new DatastoreOptions.Builder()
+            .localHost("localhost:8080")
+            .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
   }
 
   @Test
   public void options_HostAndProjectEndpoint() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Can set at most one of project endpoint, host, and local host");
-    options = new DatastoreOptions.Builder()
-        .host("foo-datastore.googleapis.com")
-        .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
+    options =
+        new DatastoreOptions.Builder()
+            .host("foo-datastore.googleapis.com")
+            .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
   }
 
   @Test
   public void options_HostAndLocalHost() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Can set at most one of project endpoint, host, and local host");
-    options = new DatastoreOptions.Builder()
-        .host("foo-datastore.googleapis.com")
-        .localHost("localhost:8080");
+    options =
+        new DatastoreOptions.Builder()
+            .host("foo-datastore.googleapis.com")
+            .localHost("localhost:8080");
   }
 
   @Test
   public void options_InvalidLocalHost() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Illegal character");
-    factory.create(new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .localHost("!not a valid url!")
-        .build());
+    factory.create(
+        new DatastoreOptions.Builder()
+            .projectId(PROJECT_ID)
+            .localHost("!not a valid url!")
+            .build());
   }
 
   @Test
   public void options_SchemeInLocalHost() {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Local host \"http://localhost:8080\" must not include scheme");
-    new DatastoreOptions.Builder()
-        .localHost("http://localhost:8080");
+    new DatastoreOptions.Builder().localHost("http://localhost:8080");
   }
 
   @Test
   public void options_InvalidHost() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Illegal character");
-    factory.create(new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .host("!not a valid url!")
-        .build());
+    factory.create(
+        new DatastoreOptions.Builder().projectId(PROJECT_ID).host("!not a valid url!").build());
   }
 
   @Test
   public void options_SchemeInHost() {
     thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(
-        "Host \"http://foo-datastore.googleapis.com\" must not include scheme");
-    new DatastoreOptions.Builder()
-        .host("http://foo-datastore.googleapis.com");
+    thrown.expectMessage("Host \"http://foo-datastore.googleapis.com\" must not include scheme");
+    new DatastoreOptions.Builder().host("http://foo-datastore.googleapis.com");
   }
 
   @Test
@@ -172,48 +168,55 @@ public void create_NullOptions() throws Exception {
 
   @Test
   public void create_Host() {
-    Datastore datastore = factory.create(new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .host("foo-datastore.googleapis.com")
-        .build());
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectId(PROJECT_ID)
+                .host("foo-datastore.googleapis.com")
+                .build());
     assertThat(datastore.remoteRpc.getUrl())
         .isEqualTo("https://foo-datastore.googleapis.com/v1/projects/project-id");
   }
 
   @Test
   public void create_LocalHost() {
-    Datastore datastore = factory.create(new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .localHost("localhost:8080")
-        .build());
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectId(PROJECT_ID)
+                .localHost("localhost:8080")
+                .build());
     assertThat(datastore.remoteRpc.getUrl())
         .isEqualTo("http://localhost:8080/v1/projects/project-id");
   }
 
   @Test
   public void create_LocalHostIp() {
-    Datastore datastore = factory.create(new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .localHost("127.0.0.1:8080")
-        .build());
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectId(PROJECT_ID)
+                .localHost("127.0.0.1:8080")
+                .build());
     assertThat(datastore.remoteRpc.getUrl())
         .isEqualTo("http://127.0.0.1:8080/v1/projects/project-id");
   }
 
   @Test
   public void create_DefaultHost() {
-    Datastore datastore = factory.create(new DatastoreOptions.Builder()
-        .projectId(PROJECT_ID)
-        .build());
+    Datastore datastore =
+        factory.create(new DatastoreOptions.Builder().projectId(PROJECT_ID).build());
     assertThat(datastore.remoteRpc.getUrl())
         .isEqualTo("https://datastore.googleapis.com/v1/projects/project-id");
   }
 
   @Test
   public void create_ProjectEndpoint() {
-    Datastore datastore = factory.create(new DatastoreOptions.Builder()
-        .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id")
-        .build());
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id")
+                .build());
     assertThat(datastore.remoteRpc.getUrl())
         .isEqualTo("http://prom-qa/datastore/v1beta42/projects/project-id");
   }
@@ -223,20 +226,22 @@ public void create_ProjectEndpointNoScheme() {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage(
         "Project endpoint \"localhost:1234/datastore/v1beta42/projects/project-id\" must"
-        + " include scheme.");
-    factory.create(new DatastoreOptions.Builder()
-        .projectEndpoint("localhost:1234/datastore/v1beta42/projects/project-id")
-        .build());
+            + " include scheme.");
+    factory.create(
+        new DatastoreOptions.Builder()
+            .projectEndpoint("localhost:1234/datastore/v1beta42/projects/project-id")
+            .build());
   }
 
   @Test
   public void initializer() throws Exception {
-    options.initializer(new HttpRequestInitializer() {
-      @Override
-      public void initialize(HttpRequest request) {
-        request.getHeaders().setCookie("magic");
-      }
-    });
+    options.initializer(
+        new HttpRequestInitializer() {
+          @Override
+          public void initialize(HttpRequest request) {
+            request.getHeaders().setCookie("magic");
+          }
+        });
     Datastore datastore = factory.create(options.build());
     MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
     AllocateIdsRequest request = AllocateIdsRequest.newBuilder().build();
@@ -296,7 +301,8 @@ public void runQuery() throws Exception {
     RunQueryRequest.Builder request = RunQueryRequest.newBuilder();
     request.getQueryBuilder();
     RunQueryResponse.Builder response = RunQueryResponse.newBuilder();
-    response.getBatchBuilder()
+    response
+        .getBatchBuilder()
         .setEntityResultType(EntityResult.ResultType.FULL)
         .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED);
     expectRpc("runQuery", request.build(), response.build());
@@ -308,9 +314,9 @@ private void expectRpc(String methodName, Message request, Message response) thr
 
     mockClient.setNextResponse(response);
     @SuppressWarnings("rawtypes")
-    Class[] methodArgs = { request.getClass() };
+    Class[] methodArgs = {request.getClass()};
     Method call = Datastore.class.getMethod(methodName, methodArgs);
-    Object[] callArgs = { request };
+    Object[] callArgs = {request};
     assertEquals(response, call.invoke(datastore, callArgs));
 
     assertEquals("/v1/projects/project-id:" + methodName, mockClient.lastPath);
@@ -364,15 +370,16 @@ private void expectRpc(String methodName, Message request, Message response) thr
 
   private static class MockCredential extends Credential {
     MockCredential() {
-      super(new AccessMethod() {
-          @Override
-          public void intercept(HttpRequest request, String accessToken) throws IOException {
-          }
-          @Override
-          public String getAccessTokenFromRequest(HttpRequest request) {
-            return "MockAccessToken";
-          }
-        });
+      super(
+          new AccessMethod() {
+            @Override
+            public void intercept(HttpRequest request, String accessToken) throws IOException {}
+
+            @Override
+            public String getAccessTokenFromRequest(HttpRequest request) {
+              return "MockAccessToken";
+            }
+          });
     }
   }
 
@@ -411,37 +418,40 @@ void setNextException(IOException exception) {
 
     @Override
     public HttpRequestFactory makeClient(DatastoreOptions options) {
-      HttpTransport transport = new MockHttpTransport() {
-          @Override
-          public LowLevelHttpRequest buildRequest(String method, String url) {
-            return new MockLowLevelHttpRequest(url) {
-              @Override
-              public LowLevelHttpResponse execute() throws IOException {
-                lastPath = new GenericUrl(getUrl()).getRawPath();
-                lastMimeType = getContentType();
-                lastCookies = getHeaderValues("Cookie");
-                lastApiFormatHeaderValue =
-                    Iterables.getOnlyElement(getHeaderValues("X-Goog-Api-Format-Version"));
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                getStreamingContent().writeTo(out);
-                lastBody = out.toByteArray();
-                if (nextException != null) {
-                  throw nextException;
-                }
-                MockLowLevelHttpResponse response = new MockLowLevelHttpResponse()
-                    .setStatusCode(nextStatus)
-                    .setContentType("application/x-protobuf");
-                if (nextError != null) {
-                  assertNull(nextResponse);
-                  response.setContent(new TestableByteArrayInputStream(nextError.toByteArray()));
-                } else {
-                  response.setContent(new TestableByteArrayInputStream(nextResponse.toByteArray()));
+      HttpTransport transport =
+          new MockHttpTransport() {
+            @Override
+            public LowLevelHttpRequest buildRequest(String method, String url) {
+              return new MockLowLevelHttpRequest(url) {
+                @Override
+                public LowLevelHttpResponse execute() throws IOException {
+                  lastPath = new GenericUrl(getUrl()).getRawPath();
+                  lastMimeType = getContentType();
+                  lastCookies = getHeaderValues("Cookie");
+                  lastApiFormatHeaderValue =
+                      Iterables.getOnlyElement(getHeaderValues("X-Goog-Api-Format-Version"));
+                  ByteArrayOutputStream out = new ByteArrayOutputStream();
+                  getStreamingContent().writeTo(out);
+                  lastBody = out.toByteArray();
+                  if (nextException != null) {
+                    throw nextException;
+                  }
+                  MockLowLevelHttpResponse response =
+                      new MockLowLevelHttpResponse()
+                          .setStatusCode(nextStatus)
+                          .setContentType("application/x-protobuf");
+                  if (nextError != null) {
+                    assertNull(nextResponse);
+                    response.setContent(new TestableByteArrayInputStream(nextError.toByteArray()));
+                  } else {
+                    response.setContent(
+                        new TestableByteArrayInputStream(nextResponse.toByteArray()));
+                  }
+                  return response;
                 }
-                return response;
-              }
-            };
-          }
-        };
+              };
+            }
+          };
       Credential credential = options.getCredential();
       return transport.createRequestFactory(credential);
     }
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
index 593ccd23dc64..b0a7e4e86088 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC. All Rights Reserved.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
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 377f92d8cc5d..27f3008650c5 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
@@ -40,9 +40,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Test for {@link RemoteRpc}.
- */
+/** Test for {@link RemoteRpc}. */
 @RunWith(JUnit4.class)
 public class RemoteRpcTest {
 
@@ -55,22 +53,35 @@ public void testException() {
             .setCode(Code.UNAUTHENTICATED_VALUE)
             .setMessage("The request does not have valid authentication credentials.")
             .build();
-    DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME,
-        new ByteArrayInputStream(statusProto.toByteArray()), "application/x-protobuf",
-        Charsets.UTF_8, new RuntimeException(), 401);
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream(statusProto.toByteArray()),
+            "application/x-protobuf",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            401);
     assertEquals(Code.UNAUTHENTICATED, exception.getCode());
-    assertEquals("The request does not have valid authentication credentials.",
-        exception.getMessage());
+    assertEquals(
+        "The request does not have valid authentication credentials.", exception.getMessage());
     assertEquals(METHOD_NAME, exception.getMethodName());
   }
 
   @Test
   public void testInvalidProtoException() {
-    DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME,
-        new ByteArrayInputStream("".getBytes()), "application/x-protobuf",
-        Charsets.UTF_8, new RuntimeException(), 401);
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream("".getBytes()),
+            "application/x-protobuf",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            401);
     assertEquals(Code.INTERNAL, exception.getCode());
-    assertEquals("Unable to parse Status protocol buffer: HTTP status code was 401.",
+    assertEquals(
+        "Unable to parse Status protocol buffer: HTTP status code was 401.",
         exception.getMessage());
     assertEquals(METHOD_NAME, exception.getMethodName());
   }
@@ -113,9 +124,15 @@ public void testEmptyProtoExceptionUnauthenticated() {
 
   @Test
   public void testPlainTextException() {
-    DatastoreException exception = RemoteRpc.makeException("url", METHOD_NAME,
-        new ByteArrayInputStream("Text Error".getBytes()), "text/plain", Charsets.UTF_8,
-        new RuntimeException(), 401);
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream("Text Error".getBytes()),
+            "text/plain",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            401);
     assertEquals(Code.INTERNAL, exception.getCode());
     assertEquals(
         "Non-protobuf error: Text Error. HTTP status code was 401.", exception.getMessage());
@@ -142,19 +159,21 @@ public void testGzip() throws IOException, DatastoreException {
   public void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
     // Enable E2E-Checksum system env variable
     RemoteRpc.setSystemEnvE2EChecksum(true);
-    MessageLite request = RollbackRequest.newBuilder()
-        .setTransaction(ByteString.copyFromUtf8("project-id"))
-        .build();
-    RemoteRpc rpc = newRemoteRpc(new InjectedTestValues(gzip(newBeginTransactionResponse()),
-        new byte[1], true));
-    HttpRequest httpRequest = rpc.getClient().buildPostRequest(rpc.resolveURL("blah"),
-        new ProtoHttpContent(request));
+    MessageLite request =
+        RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8("project-id")).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);
-    assertNotNull(httpRequest.getHeaders()
-        .getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
+    assertNotNull(
+        httpRequest.getHeaders().getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
     // Expect to find e2e-checksum header
-    String header = httpRequest.getHeaders().getFirstHeaderStringValue(
-        EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER);
+    String header =
+        httpRequest
+            .getHeaders()
+            .getFirstHeaderStringValue(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER);
     assertEquals(32, header.length());
   }
 
@@ -162,19 +181,21 @@ public void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
   public void testHttpHeaders_doNotExpectE2eChecksumHeader() throws IOException {
     // disable E2E-Checksum system env variable
     RemoteRpc.setSystemEnvE2EChecksum(false);
-    MessageLite request = RollbackRequest.newBuilder()
-        .setTransaction(ByteString.copyFromUtf8("project-id"))
-        .build();
-    RemoteRpc rpc = newRemoteRpc(new InjectedTestValues(gzip(newBeginTransactionResponse()),
-        new byte[1], true));
-    HttpRequest httpRequest = rpc.getClient().buildPostRequest(rpc.resolveURL("blah"),
-        new ProtoHttpContent(request));
+    MessageLite request =
+        RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8("project-id")).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);
-    assertNotNull(httpRequest.getHeaders()
-        .getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
+    assertNotNull(
+        httpRequest.getHeaders().getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
     // Do not expect to find e2e-checksum header
-    assertNull(httpRequest.getHeaders().getFirstHeaderStringValue(
-        EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER));
+    assertNull(
+        httpRequest
+            .getHeaders()
+            .getFirstHeaderStringValue(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER));
   }
 
   private static BeginTransactionResponse newBeginTransactionResponse() {
diff --git a/pom.xml b/pom.xml
index 08cac4f86bff..15ae9819ae2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,7 @@
   
 
   
+    datastore-v1-proto-client
     proto-google-cloud-datastore-v1
     google-cloud-datastore
     google-cloud-datastore-bom
diff --git a/versions.txt b/versions.txt
index 3e5c2218c281..3b94ddf8da5d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -5,4 +5,5 @@ google-cloud-datastore:1.106.4:1.106.5-SNAPSHOT
 google-cloud-datastore-bom:1.106.4:1.106.5-SNAPSHOT
 google-cloud-datastore-parent:1.106.4:1.106.5-SNAPSHOT
 proto-google-cloud-datastore-v1:0.89.4:0.89.5-SNAPSHOT
+datastore-v1-proto-client:1.6.3:1.6.4-SNAPSHOT
 

From 4efd9b359be85948faadbd8b8a15dfaed45c4da7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 17 May 2021 03:46:22 +0200
Subject: [PATCH 0599/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.4.0 (#424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.3.0` -> `20.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/compatibility-slim/20.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/confidence-slim/20.3.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 70c6099b23fd..d28eda28f2f6 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.3.0
+        20.4.0
         pom
         import
       

From f89df6f219c2bd702e18758fc22150c6c3485e0e Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Sun, 16 May 2021 19:02:06 -0700
Subject: [PATCH 0600/1784] chore: regenerate README (#426)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-05-17 01:52:22,297 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-05-17 01:52:23,611 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/2da7b935-431c-46ae-a34d-28078566718f/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 2b8c6a4f900b..6cc78ae401d6 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a1ea05f975365a7eba6607aeae1d144b8c49453c"
+        "sha": "4efd9b359be85948faadbd8b8a15dfaed45c4da7"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "bd8281a06cc7f84906e04d4843c1d3d386a980cd"
+        "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1"
       }
     }
   ]
diff --git a/README.md b/README.md
index bb17743d5fe0..5d9e8efd59f6 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.3.0
+      20.4.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.3.0')
+implementation platform('com.google.cloud:libraries-bom:20.4.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 5fd6621a2d92c9b03fb3d0a349fe778181e91061 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Mon, 17 May 2021 11:47:24 -0400
Subject: [PATCH 0601/1784] have dependencies use snapshot version

---
 datastore-v1-proto-client/pom.xml | 1 +
 pom.xml                           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 718f03bd7e61..ba8a9b31712f 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -17,6 +17,7 @@
 
   4.0.0
+  com.google.cloud.datastore
   datastore-v1-proto-client
   1.6.4-SNAPSHOT
 
diff --git a/pom.xml b/pom.xml
index 15ae9819ae2a..d6e4bdb4018a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,7 +172,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.6.3
+        1.6.4-SNAPSHOT
         
           
             com.google.api.grpc

From 156e3dfbed326d8ebcf30bff0c27ff01a61ee8a8 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Mon, 17 May 2021 12:34:39 -0400
Subject: [PATCH 0602/1784] close input stream after each run

---
 .../datastore/v1/client/ChecksumEnforcingInputStreamTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
index 9972056677e9..31981617d07c 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -42,6 +42,8 @@ public void test(int payloadSize) throws Exception {
       }
     } catch (IOException e) {
       fail("checksum verification failed!");
+    } finally {
+      testInstance.close();
     }
   }
 

From 32ee2204f87f56207a30079afb93553f0ba17172 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Mon, 17 May 2021 12:37:01 -0400
Subject: [PATCH 0603/1784] use try with resources

---
 .../v1/client/ChecksumEnforcingInputStreamTest.java        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
index 31981617d07c..9807354e2c73 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -32,18 +32,15 @@ public class ChecksumEnforcingInputStreamTest {
   private final MessageDigest digest = EndToEndChecksumHandler.getMessageDigestInstance();
 
   public void test(int payloadSize) throws Exception {
-    ChecksumEnforcingInputStream testInstance = setUpData(payloadSize);
     // read 1000 bytes at a time
     // Since checksum should be correct, do not expect IOException
-    byte[] buf = new byte[1000];
-    try {
+    try (ChecksumEnforcingInputStream testInstance = setUpData(payloadSize)) {
+      byte[] buf = new byte[1000];
       while (testInstance.read(buf, 0, 1000) != -1) {
         // do nothing with the bytes read
       }
     } catch (IOException e) {
       fail("checksum verification failed!");
-    } finally {
-      testInstance.close();
     }
   }
 

From 756784b2033a1eff3068fbb2a85047018ff9683e Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Mon, 17 May 2021 12:41:12 -0400
Subject: [PATCH 0604/1784] use try with resources

---
 .../ChecksumEnforcingInputStreamTest.java     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
index 9807354e2c73..5712104147bf 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -62,15 +62,13 @@ public void read_withValidChecksum_differentPayloadSizes() throws Exception {
   @Test
   public void read_withInvalidChecksum() {
     // build a test instance with invalidchecksum
-    ChecksumEnforcingInputStream instance =
-        new ChecksumEnforcingInputStream(
-            new ByteArrayInputStream("hello there".getBytes(UTF_8)),
-            "this checksum is invalid",
-            digest);
     // read 1000 bytes at a time
     // Since checksum should be correct, do not expect IOException
-    byte[] buf = new byte[1000];
-    try {
+    try (ChecksumEnforcingInputStream instance = new ChecksumEnforcingInputStream(
+            new ByteArrayInputStream("hello there".getBytes(UTF_8)),
+            "this checksum is invalid",
+            digest)) {
+      byte[] buf = new byte[1000];
       while (instance.read(buf, 0, 1000) != -1) {
         // do nothing with the bytes read
       }
@@ -83,8 +81,9 @@ public void read_withInvalidChecksum() {
 
   @Test
   public void markNotSupported() throws Exception {
-    ChecksumEnforcingInputStream testInstance = setUpData(1);
-    assertFalse(testInstance.markSupported());
+    try (ChecksumEnforcingInputStream testInstance = setUpData(1)) {
+      assertFalse(testInstance.markSupported());
+    }
   }
 
   private ChecksumEnforcingInputStream setUpData(int payloadSize) throws Exception {
@@ -93,7 +92,7 @@ private ChecksumEnforcingInputStream setUpData(int payloadSize) throws Exception
     String payload;
     if (payloadSize > str.length()) {
       int num = payloadSize / str.length();
-      StringBuffer buf = new StringBuffer();
+      StringBuilder buf = new StringBuilder();
       for (int i = 0; i < num; i++) {
         buf.append(str);
       }

From 320dc1239980c25af0938cf2aad319cc25b5a848 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Mon, 17 May 2021 15:11:47 -0400
Subject: [PATCH 0605/1784] add test config

---
 .kokoro/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 23b1f5d043bb..a16e4d77741d 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,6 +47,7 @@ set +e
 
 case ${JOB_TYPE} in
 test)
+    export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
     mvn test -B -Dclirr.skip=true -Denforcer.skip=true
     RETURN_CODE=$?
     ;;

From a655613178d143dc94d2fe107e2321a33d983a16 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary 
Date: Mon, 17 May 2021 15:13:46 -0400
Subject: [PATCH 0606/1784] adjust xmx value

---
 .kokoro/build.sh                              |  1 -
 datastore-v1-proto-client/pom.xml             | 26 +++++++++++++++++++
 .../ChecksumEnforcingInputStreamTest.java     |  3 ++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index a16e4d77741d..23b1f5d043bb 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,7 +47,6 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
     mvn test -B -Dclirr.skip=true -Denforcer.skip=true
     RETURN_CODE=$?
     ;;
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ba8a9b31712f..621995b8738b 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -97,4 +97,30 @@
       test
     
   
+
+  
+    
+      
+        org.apache.maven.plugins
+        maven-surefire-plugin
+        3.0.0-M5
+        
+          
+          
+            **/*SmokeTest.java
+            **/IT*.java
+          
+          sponge_log
+          -Xmx2048m
+        
+        
+          
+            org.apache.maven.surefire
+            surefire-junit47
+            3.0.0-M5
+          
+        
+      
+    
+  
 
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
index 5712104147bf..47592f987351 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -64,7 +64,8 @@ public void read_withInvalidChecksum() {
     // build a test instance with invalidchecksum
     // read 1000 bytes at a time
     // Since checksum should be correct, do not expect IOException
-    try (ChecksumEnforcingInputStream instance = new ChecksumEnforcingInputStream(
+    try (ChecksumEnforcingInputStream instance =
+        new ChecksumEnforcingInputStream(
             new ByteArrayInputStream("hello there".getBytes(UTF_8)),
             "this checksum is invalid",
             digest)) {

From 3699b36878fb9d50c50e7638ed1e46fd44ebcb41 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 17 May 2021 22:56:41 +0200
Subject: [PATCH 0607/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.106.4 (#420)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 36255b9255a8..632a7e95e7cf 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
-      1.106.3
+      1.106.4
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2fb3f6bd1017..519b74ced24e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.106.3
+      1.106.4
     
 
     

From 778e75b27f31a0ef0058af4d3e867e05bc8993c7 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 17 May 2021 14:04:15 -0700
Subject: [PATCH 0608/1784] chore: regenerate README (#428)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-05-17 20:58:51,777 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-05-17 20:58:53,146 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/765f04fe-d4f4-4558-808a-89f065eb0b37/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 6cc78ae401d6..bbf2ef4efa95 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "4efd9b359be85948faadbd8b8a15dfaed45c4da7"
+        "sha": "3699b36878fb9d50c50e7638ed1e46fd44ebcb41"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1"
+        "sha": "c86c7a60985644eab557949363a38301d40d78d2"
       }
     }
   ]
diff --git a/README.md b/README.md
index 5d9e8efd59f6..e74704c89ecd 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.106.3
+  1.106.4
 
 
 ```

From 586709b7a1a2f9b8ca93c872b0a42c762d92894d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 17 May 2021 16:18:16 -0700
Subject: [PATCH 0609/1784] chore: add changelog to cloud-rad (#429)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/81e4ad9c-db2f-4f59-8745-b52a48665ccc/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/c86c7a60985644eab557949363a38301d40d78d2
---
 .kokoro/release/publish_javadoc11.sh | 2 ++
 synth.metadata                       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 682e0bfcd3c5..4a6619862b69 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -42,6 +42,8 @@ mvn clean site -B -q -P docFX
 
 # copy README to docfx-yml dir and rename index.md
 cp README.md target/docfx-yml/index.md
+# copy CHANGELOG to docfx-yml dir and rename history.md
+cp CHANGELOG.md target/docfx-yml/history.md
 
 pushd target/docfx-yml
 
diff --git a/synth.metadata b/synth.metadata
index 317c8f55d7da..fa8f84830dbf 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "af7528f49250916ac4a5ce0b51b6150f780c22d5"
+        "sha": "778e75b27f31a0ef0058af4d3e867e05bc8993c7"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1"
+        "sha": "c86c7a60985644eab557949363a38301d40d78d2"
       }
     }
   ],

From 86c4dfe1a9ae4fdcf1b788281be0f57d14c6d353 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 19 May 2021 03:36:29 +0200
Subject: [PATCH 0610/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v1.2.0 (#430)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d6e4bdb4018a..8fd4ad4446bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        1.1.0
+        1.2.0
         pom
         import
       

From ed336d67c45376726822f792dc992ae85b23a93c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 01:44:08 +0000
Subject: [PATCH 0611/1784] chore: release 1.106.5 (#431)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.106.5](https://www.github.com/googleapis/java-datastore/compare/v1.106.4...v1.106.5) (2021-05-19)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#430](https://www.github.com/googleapis/java-datastore/issues/430)) ([86c4dfe](https://www.github.com/googleapis/java-datastore/commit/86c4dfe1a9ae4fdcf1b788281be0f57d14c6d353))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06a5b92e59ad..11b4807a08be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.106.5](https://www.github.com/googleapis/java-datastore/compare/v1.106.4...v1.106.5) (2021-05-19)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#430](https://www.github.com/googleapis/java-datastore/issues/430)) ([86c4dfe](https://www.github.com/googleapis/java-datastore/commit/86c4dfe1a9ae4fdcf1b788281be0f57d14c6d353))
+
 ### [1.106.4](https://www.github.com/googleapis/java-datastore/compare/v1.106.3...v1.106.4) (2021-05-11)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 621995b8738b..05c191ed0648 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
-  1.6.4-SNAPSHOT
+  1.6.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.5-SNAPSHOT
+    1.106.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d39cb3790b45..feddbb6ecf90 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
-  1.106.5-SNAPSHOT
+  1.106.5
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.5-SNAPSHOT
+        0.89.5
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.5-SNAPSHOT
+        1.106.5
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2c4d600d5bb7..1c773cd5e10f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.5-SNAPSHOT
+  1.106.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.5-SNAPSHOT
+    1.106.5
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 8fd4ad4446bb..4309b2940188 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.5-SNAPSHOT
+  1.106.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,12 +167,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.5-SNAPSHOT
+        0.89.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.6.4-SNAPSHOT
+        1.6.4
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ef1b9484983d..2cc19db6a7a2 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.89.5-SNAPSHOT
+  0.89.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.5-SNAPSHOT
+    1.106.5
   
   
     
diff --git a/versions.txt b/versions.txt
index 3b94ddf8da5d..44e843cc374b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.4:1.106.5-SNAPSHOT
-google-cloud-datastore-bom:1.106.4:1.106.5-SNAPSHOT
-google-cloud-datastore-parent:1.106.4:1.106.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.89.4:0.89.5-SNAPSHOT
-datastore-v1-proto-client:1.6.3:1.6.4-SNAPSHOT
+google-cloud-datastore:1.106.5:1.106.5
+google-cloud-datastore-bom:1.106.5:1.106.5
+google-cloud-datastore-parent:1.106.5:1.106.5
+proto-google-cloud-datastore-v1:0.89.5:0.89.5
+datastore-v1-proto-client:1.6.4:1.6.4
 

From b8c0f8e47633c421b6f330d544060fdcadf4f5ea Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 01:50:04 +0000
Subject: [PATCH 0612/1784] chore: release 1.106.6-SNAPSHOT (#432)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 05c191ed0648..454416916837 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
-  1.6.4
+  1.6.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.5
+    1.106.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index feddbb6ecf90..460e0c0684e6 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
-  1.106.5
+  1.106.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.5
+        0.89.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.5
+        1.106.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1c773cd5e10f..7b19dfc03f04 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.5
+  1.106.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.5
+    1.106.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 4309b2940188..d854dce5125f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.5
+  1.106.6-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,12 +167,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.5
+        0.89.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.6.4
+        1.6.5-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2cc19db6a7a2..a90e3e3ffadc 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.89.5
+  0.89.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.5
+    1.106.6-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 44e843cc374b..dd2b30897cfb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.5:1.106.5
-google-cloud-datastore-bom:1.106.5:1.106.5
-google-cloud-datastore-parent:1.106.5:1.106.5
-proto-google-cloud-datastore-v1:0.89.5:0.89.5
-datastore-v1-proto-client:1.6.4:1.6.4
+google-cloud-datastore:1.106.5:1.106.6-SNAPSHOT
+google-cloud-datastore-bom:1.106.5:1.106.6-SNAPSHOT
+google-cloud-datastore-parent:1.106.5:1.106.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.89.5:0.89.6-SNAPSHOT
+datastore-v1-proto-client:1.6.4:1.6.5-SNAPSHOT
 

From a8bc7957719c10a323eba17a68137476de068c5d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 19 May 2021 07:18:31 -0700
Subject: [PATCH 0613/1784] feat: add `gcf-owl-bot[bot]` to `ignoreAuthors`
 (#433)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/89d4fac7-23f8-4cf0-b412-6ccac17af7af/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/7332178a11ddddc91188dc0f25bca1ccadcaa6c6
---
 .github/generated-files-bot.yml | 1 +
 synth.metadata                  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml
index 47c2ba132e01..c644a24e1129 100644
--- a/.github/generated-files-bot.yml
+++ b/.github/generated-files-bot.yml
@@ -9,3 +9,4 @@ ignoreAuthors:
 - 'renovate-bot'
 - 'yoshi-automation'
 - 'release-please[bot]'
+- 'gcf-owl-bot[bot]'
diff --git a/synth.metadata b/synth.metadata
index fa8f84830dbf..993ec26c4f96 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "778e75b27f31a0ef0058af4d3e867e05bc8993c7"
+        "sha": "b8c0f8e47633c421b6f330d544060fdcadf4f5ea"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c86c7a60985644eab557949363a38301d40d78d2"
+        "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6"
       }
     }
   ],

From e9b58327f4773699d75f50e85453ee1b19622cf3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 19 May 2021 22:17:47 +0200
Subject: [PATCH 0614/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.106.5 (#436)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 632a7e95e7cf..b39b72c10b58 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
-      1.106.4
+      1.106.5
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 519b74ced24e..f94508d1d475 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.106.4
+      1.106.5
     
 
     

From 947c19de159e1e562b29ceb7932a4e598afa6198 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 19 May 2021 22:18:00 +0200
Subject: [PATCH 0615/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.12.0 (#435)

---
 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 460e0c0684e6..9a3816012814 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
-    0.11.2
+    0.12.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index d854dce5125f..c7394fb30f64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.11.2
+    0.12.0
   
 
   

From dbc8987e413fca8b82b66574d3279118d4c9d14f Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 19 May 2021 13:26:05 -0700
Subject: [PATCH 0616/1784] chore: regenerate README (#439)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-05-19 20:20:08,938 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-05-19 20:20:10,231 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/877fa953-1b8a-42a2-80ba-af6a9703b358/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index bbf2ef4efa95..118b358b7221 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "3699b36878fb9d50c50e7638ed1e46fd44ebcb41"
+        "sha": "947c19de159e1e562b29ceb7932a4e598afa6198"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c86c7a60985644eab557949363a38301d40d78d2"
+        "sha": "bf148334fb9ee928d4c302d2aa32eb61252808d1"
       }
     }
   ]
diff --git a/README.md b/README.md
index e74704c89ecd..33179a1147a8 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.106.4
+  1.106.5
 
 
 ```
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.106.4'
+compile 'com.google.cloud:google-cloud-datastore:1.106.5'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.5"
 ```
 
 ## Authentication

From 7aecb01f6df96df0e98fb4d0bd1a1201a5df1171 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 19 May 2021 17:50:04 -0400
Subject: [PATCH 0617/1784] build: configure branch 1.106.5-sp as a release
 branch (#437)

enable releases
---
 .github/release-please.yml      |  5 ++
 .github/sync-repo-settings.yaml | 82 +++++++++++++++------------------
 2 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 8ca7f9cabc29..ab54c6e93e36 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -1,3 +1,8 @@
 bumpMinorPreMajor: true
 handleGHRelease: true
 releaseType: java-yoshi
+branches:
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-lts
+    branch: 1.106.5-sp
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 6bddd18eac90..7ab847eed6e7 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -1,49 +1,43 @@
-
-# Whether or not rebase-merging is enabled on this repository.
-# Defaults to `true`
 rebaseMergeAllowed: false
-
-# Whether or not squash-merging is enabled on this repository.
-# Defaults to `true`
 squashMergeAllowed: true
-
-# Whether or not PRs are merged with a merge commit on this repository.
-# Defaults to `false`
 mergeCommitAllowed: false
-
-# Rules for master branch protection
 branchProtectionRules:
-# Identifies the protection rule pattern. Name of the branch to be protected.
-# Defaults to `master`
-- pattern: master
-  # Can admins overwrite branch protection.
-  # Defaults to `true`
-  isAdminEnforced: true
-  # Number of approving reviews required to update matching branches.
-  # Defaults to `1`
-  requiredApprovingReviewCount: 1
-  # Are reviews from code owners required to update matching branches.
-  # Defaults to `false`
-  requiresCodeOwnerReviews: true
-  # Require up to date branches
-  requiresStrictStatusChecks: false
-  # List of required status check contexts that must pass for commits to be accepted to matching branches.
-  requiredStatusCheckContexts:
-    - "dependencies (8)"
-    - "dependencies (11)"
-    - "linkage-monitor"
-    - "lint"
-    - "clirr"
-    - "units (7)"
-    - "units (8)"
-    - "units (11)"
-    - "Kokoro - Test: Integration"
-    - "cla/google"
-# List of explicit permissions to add (additive only)
+  - pattern: master
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - linkage-monitor
+      - lint
+      - clirr
+      - units (7)
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+  - pattern: 1.106.5-sp
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - linkage-monitor
+      - lint
+      - clirr
+      - units (7)
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
 permissionRules:
-- team: yoshi-admins
-  permission: admin
-- team: yoshi-java-admins
-  permission: admin
-- team: yoshi-java
-  permission: push
\ No newline at end of file
+  - team: yoshi-admins
+    permission: admin
+  - team: yoshi-java-admins
+    permission: admin
+  - team: yoshi-java
+    permission: push

From 4edb2092a54e32d968da05b508ce6fbd969e9569 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 26 May 2021 02:55:45 +0200
Subject: [PATCH 0618/1784] test(deps): update dependency
 com.google.truth:truth to v1.1.3 (#448)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 454416916837..f56d57221daf 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -93,7 +93,7 @@
     
       com.google.truth
       truth
-      1.1.2
+      1.1.3
       test
     
       
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index b39b72c10b58..8f1bcd88ffaf 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.1.2
+      1.1.3
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f94508d1d475..64b6b3bd0b81 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -40,7 +40,7 @@
     
       com.google.truth
       truth
-      1.1.2
+      1.1.3
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d28eda28f2f6..e60dc4f33644 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.1.2
+      1.1.3
       test
     
   

From 39231d6679ee1cea9d605024547ed04d3e824179 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 26 May 2021 02:57:42 +0200
Subject: [PATCH 0619/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.5.0 (#447)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e60dc4f33644..e16e7e317b05 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.4.0
+        20.5.0
         pom
         import
       

From 200b23e5aae064d0d61bd025f7f8fbc4623e8878 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 25 May 2021 18:04:06 -0700
Subject: [PATCH 0620/1784] chore: regenerate README (#449)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-05-26 00:57:49,277 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-05-26 00:57:50,524 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/c0da8235-0776-43c9-af1b-14c5cbe08f29/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 118b358b7221..6331c749f13f 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "947c19de159e1e562b29ceb7932a4e598afa6198"
+        "sha": "39231d6679ee1cea9d605024547ed04d3e824179"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "bf148334fb9ee928d4c302d2aa32eb61252808d1"
+        "sha": "a2de127f90799cd5bace653b1dcc5dd2ca8b19c9"
       }
     }
   ]
diff --git a/README.md b/README.md
index 33179a1147a8..eba40282500c 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.4.0
+      20.5.0
       pom
       import
     
@@ -45,18 +45,18 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.4.0')
+implementation platform('com.google.cloud:libraries-bom:20.5.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.106.5'
+compile 'com.google.cloud:google-cloud-datastore:1.106.5-sp.1'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.5-sp.1"
 ```
 
 ## Authentication

From a510debc966c191defeb97260ea7e625e3812813 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 31 May 2021 09:36:02 -0700
Subject: [PATCH 0621/1784] chore: dump maven version along with java (#444)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/77f4b242-0926-4e4e-acee-48c7b5d1aa76/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/8eae0234a16b26c2ff616d305dbd9786c8b10a47
---
 .kokoro/build.sh | 4 ++--
 synth.metadata   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 23b1f5d043bb..bad8ae5def42 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -23,8 +23,8 @@ cd ${scriptDir}/..
 # include common functions
 source ${scriptDir}/common.sh
 
-# Print out Java version
-java -version
+# Print out Maven & Java version
+mvn -version
 echo ${JOB_TYPE}
 
 # attempt to install 3 times with exponential backoff (starting with 10 seconds)
diff --git a/synth.metadata b/synth.metadata
index 993ec26c4f96..d0273e19a33f 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "b8c0f8e47633c421b6f330d544060fdcadf4f5ea"
+        "sha": "7aecb01f6df96df0e98fb4d0bd1a1201a5df1171"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6"
+        "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
       }
     }
   ],

From 00ca1a680f744ea3c5855136b79ba6de384583ed Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 4 Jun 2021 17:10:27 +0200
Subject: [PATCH 0622/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v1.3.0 (#451)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `1.2.0` -> `1.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.3.0/compatibility-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.3.0/confidence-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v1.3.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​130-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare120v130-2021-06-03)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v1.2.0...v1.3.0)

##### Features

-   add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#​365](https://www.github.com/googleapis/java-shared-dependencies/issues/365)) ([7e8309b](https://www.github.com/googleapis/java-shared-dependencies/commit/7e8309bf67ade0fe2b09f792848136cd88b4d2e4))

##### Dependencies

-   update dependency com.google.auth:google-auth-library-bom to v0.26.0 ([#​368](https://www.github.com/googleapis/java-shared-dependencies/issues/368)) ([38256a8](https://www.github.com/googleapis/java-shared-dependencies/commit/38256a82cb6896c3f5e5ea6ca5d8d671c412bf84))
-   update dependency com.google.cloud:google-cloud-core-bom to v1.95.0 ([#​377](https://www.github.com/googleapis/java-shared-dependencies/issues/377)) ([297ea62](https://www.github.com/googleapis/java-shared-dependencies/commit/297ea621e02f8c0679c8b07ed399d11eaacecc14))
-   update dependency com.google.code.gson:gson to v2.8.7 ([#​370](https://www.github.com/googleapis/java-shared-dependencies/issues/370)) ([cdc1b8e](https://www.github.com/googleapis/java-shared-dependencies/commit/cdc1b8ea1c93f97b712081ca8dc8ea57f342b69e))
-   update dependency com.google.protobuf:protobuf-bom to v3.17.1 ([#​369](https://www.github.com/googleapis/java-shared-dependencies/issues/369)) ([5a19574](https://www.github.com/googleapis/java-shared-dependencies/commit/5a19574bc626bb3c6b573ed1d177e8907188dec1))
-   update dependency com.google.protobuf:protobuf-bom to v3.17.2 ([#​374](https://www.github.com/googleapis/java-shared-dependencies/issues/374)) ([83516e6](https://www.github.com/googleapis/java-shared-dependencies/commit/83516e691b99e5e5d22d27e561781a5ade5fb514))
-   update dependency io.grpc:grpc-bom to v1.38.0 ([#​364](https://www.github.com/googleapis/java-shared-dependencies/issues/364)) ([00db570](https://www.github.com/googleapis/java-shared-dependencies/commit/00db5701c3b0aa609f3778c06911a9a0248ca342))
-   update gax.version to v1.65.0 ([#​376](https://www.github.com/googleapis/java-shared-dependencies/issues/376)) ([b793a0d](https://www.github.com/googleapis/java-shared-dependencies/commit/b793a0d7744ff1b0f8ae5d3d13ec4776ae8d3089))
-   update google.common-protos.version to v2.3.1 ([#​366](https://www.github.com/googleapis/java-shared-dependencies/issues/366)) ([7d6a7fa](https://www.github.com/googleapis/java-shared-dependencies/commit/7d6a7fa7a2cad2b3f2ecf45e42d2ed5db0b60a43))
-   update google.common-protos.version to v2.3.2 ([#​375](https://www.github.com/googleapis/java-shared-dependencies/issues/375)) ([68a47ad](https://www.github.com/googleapis/java-shared-dependencies/commit/68a47ad3243f3e980db74c9c8505a1b3063c131b))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 c7394fb30f64..00e69d22e63e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        1.2.0
+        1.3.0
         pom
         import
       

From fdfb4d093ae0a56b64a906b175df2072e3ce13de Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 7 Jun 2021 16:58:36 +0200
Subject: [PATCH 0623/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.6.0 (#453)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e16e7e317b05..310094cc90ca 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.5.0
+        20.6.0
         pom
         import
       

From c7df8fc5c00288a414281f7c252bbdccb95017a0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 7 Jun 2021 16:58:52 +0200
Subject: [PATCH 0624/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.0.23 (#452)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 8f1bcd88ffaf..a751f567a155 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.22
+    1.0.23
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index 5a66b8a0c250..f4725d6e6c83 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.22
+    1.0.23
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 64b6b3bd0b81..e92e4ebee3e5 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.22
+    1.0.23
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 310094cc90ca..a69165eb7050 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.22
+    1.0.23
   
 
   

From 9070c0057b13a977213ce4594800d5b098bac266 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 7 Jun 2021 08:10:02 -0700
Subject: [PATCH 0625/1784] chore: regenerate README (#454)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-06-07 15:02:56,773 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-06-07 15:02:58,009 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/0a3a36ff-4025-431c-aa0c-91c60144fd0a/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 6331c749f13f..a50fe2637e0b 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "39231d6679ee1cea9d605024547ed04d3e824179"
+        "sha": "c7df8fc5c00288a414281f7c252bbdccb95017a0"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "a2de127f90799cd5bace653b1dcc5dd2ca8b19c9"
+        "sha": "8da7927493739fa36130360019ca21258242f73a"
       }
     }
   ]
diff --git a/README.md b/README.md
index eba40282500c..c0edbbf6be7e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.5.0
+      20.6.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.5.0')
+implementation platform('com.google.cloud:libraries-bom:20.6.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From b7c48c3af445119f6e0bc839bf75943a1716719e Mon Sep 17 00:00:00 2001
From: Takashi Matsuo 
Date: Tue, 15 Jun 2021 16:14:59 -0700
Subject: [PATCH 0626/1784] chore: create flakybot.yaml (#455)

---
 .github/flakybot.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/flakybot.yaml

diff --git a/.github/flakybot.yaml b/.github/flakybot.yaml
new file mode 100644
index 000000000000..cb83375f9893
--- /dev/null
+++ b/.github/flakybot.yaml
@@ -0,0 +1 @@
+issuePriority: p2

From 1e514c00c4f0f3735295330b255c52eb61af72aa Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 16 Jun 2021 11:01:59 -0700
Subject: [PATCH 0627/1784] fix: Update dependencies.sh to not break on mac
 (#456)

Source-Author: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com>
Source-Date: Tue Jun 15 14:06:42 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 8f76a885deaaf2fe234daeba4a8cc4d1b3de8086
Source-Link: https://github.com/googleapis/synthtool/commit/8f76a885deaaf2fe234daeba4a8cc4d1b3de8086
---
 .kokoro/dependencies.sh | 4 ++--
 synth.metadata          | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 59d2aafc790f..a7e999d33bfb 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -46,7 +46,7 @@ function completenessCheck() {
   # This is stripped from the output as it is not present in the flattened pom.
   # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
+  mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
 
   # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
   msg "Generating dependency list using flattened pom..."
@@ -70,7 +70,7 @@ function completenessCheck() {
 set +e
 
 error_count=0
-for path in $(find -name ".flattened-pom.xml")
+for path in **/.flattened-pom.xml
 do
   # Check flattened pom in each dir that contains it for completeness
   dir=$(dirname "$path")
diff --git a/synth.metadata b/synth.metadata
index d0273e19a33f..7ef0c197c3e6 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "7aecb01f6df96df0e98fb4d0bd1a1201a5df1171"
+        "sha": "b7c48c3af445119f6e0bc839bf75943a1716719e"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
+        "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
       }
     }
   ],
@@ -101,6 +101,7 @@
     "CODE_OF_CONDUCT.md",
     "CONTRIBUTING.md",
     "LICENSE",
+    "SECURITY.md",
     "codecov.yaml",
     "java.header",
     "license-checks.xml",

From 6b9aea8a3dd9280f0e35b011ab77b2cdc240d6d0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 16 Jun 2021 18:10:12 +0000
Subject: [PATCH 0628/1784] chore: release 1.107.0 (#434)

:robot: I have created a release \*beep\* \*boop\*
---
## [1.107.0](https://www.github.com/googleapis/java-datastore/compare/v1.106.5...v1.107.0) (2021-06-16)


### Features

* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#433](https://www.github.com/googleapis/java-datastore/issues/433)) ([a8bc795](https://www.github.com/googleapis/java-datastore/commit/a8bc7957719c10a323eba17a68137476de068c5d))


### Bug Fixes

* Update dependencies.sh to not break on mac ([#456](https://www.github.com/googleapis/java-datastore/issues/456)) ([1e514c0](https://www.github.com/googleapis/java-datastore/commit/1e514c00c4f0f3735295330b255c52eb61af72aa))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.3.0 ([#451](https://www.github.com/googleapis/java-datastore/issues/451)) ([00ca1a6](https://www.github.com/googleapis/java-datastore/commit/00ca1a680f744ea3c5855136b79ba6de384583ed))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 17 +++++++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11b4807a08be..186e9a56e50a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [1.107.0](https://www.github.com/googleapis/java-datastore/compare/v1.106.5...v1.107.0) (2021-06-16)
+
+
+### Features
+
+* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#433](https://www.github.com/googleapis/java-datastore/issues/433)) ([a8bc795](https://www.github.com/googleapis/java-datastore/commit/a8bc7957719c10a323eba17a68137476de068c5d))
+
+
+### Bug Fixes
+
+* Update dependencies.sh to not break on mac ([#456](https://www.github.com/googleapis/java-datastore/issues/456)) ([1e514c0](https://www.github.com/googleapis/java-datastore/commit/1e514c00c4f0f3735295330b255c52eb61af72aa))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.3.0 ([#451](https://www.github.com/googleapis/java-datastore/issues/451)) ([00ca1a6](https://www.github.com/googleapis/java-datastore/commit/00ca1a680f744ea3c5855136b79ba6de384583ed))
+
 ### [1.106.5](https://www.github.com/googleapis/java-datastore/compare/v1.106.4...v1.106.5) (2021-05-19)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f56d57221daf..2d93604bfeef 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
-  1.6.5-SNAPSHOT
+  1.7.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.6-SNAPSHOT
+    1.107.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 9a3816012814..5c948bca8406 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
-  1.106.6-SNAPSHOT
+  1.107.0
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.6-SNAPSHOT
+        0.90.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.106.6-SNAPSHOT
+        1.107.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7b19dfc03f04..68679a1f0534 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.106.6-SNAPSHOT
+  1.107.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.6-SNAPSHOT
+    1.107.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 00e69d22e63e..910de8368fb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.106.6-SNAPSHOT
+  1.107.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,12 +167,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.89.6-SNAPSHOT
+        0.90.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.6.5-SNAPSHOT
+        1.7.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a90e3e3ffadc..0656e5ce5e87 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.89.6-SNAPSHOT
+  0.90.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.106.6-SNAPSHOT
+    1.107.0
   
   
     
diff --git a/versions.txt b/versions.txt
index dd2b30897cfb..c467b509bc40 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.106.5:1.106.6-SNAPSHOT
-google-cloud-datastore-bom:1.106.5:1.106.6-SNAPSHOT
-google-cloud-datastore-parent:1.106.5:1.106.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.89.5:0.89.6-SNAPSHOT
-datastore-v1-proto-client:1.6.4:1.6.5-SNAPSHOT
+google-cloud-datastore:1.107.0:1.107.0
+google-cloud-datastore-bom:1.107.0:1.107.0
+google-cloud-datastore-parent:1.107.0:1.107.0
+proto-google-cloud-datastore-v1:0.90.0:0.90.0
+datastore-v1-proto-client:1.7.0:1.7.0
 

From 60c2f0b980aed9658f88a48f2bcdd0bdf4d1fb81 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 16 Jun 2021 18:16:11 +0000
Subject: [PATCH 0629/1784] chore: release 1.107.1-SNAPSHOT (#457)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2d93604bfeef..b77a5e4c0914 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
-  1.7.0
+  1.7.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.0
+    1.107.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5c948bca8406..563233496eca 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
-  1.107.0
+  1.107.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.0
+        0.90.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.107.0
+        1.107.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 68679a1f0534..604feb297a7d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.107.0
+  1.107.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.0
+    1.107.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 910de8368fb7..f0e2f2771b28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.107.0
+  1.107.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,12 +167,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.0
+        0.90.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.7.0
+        1.7.1-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0656e5ce5e87..697bf846b07a 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.90.0
+  0.90.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.0
+    1.107.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index c467b509bc40..3c5a1bf74102 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.107.0:1.107.0
-google-cloud-datastore-bom:1.107.0:1.107.0
-google-cloud-datastore-parent:1.107.0:1.107.0
-proto-google-cloud-datastore-v1:0.90.0:0.90.0
-datastore-v1-proto-client:1.7.0:1.7.0
+google-cloud-datastore:1.107.0:1.107.1-SNAPSHOT
+google-cloud-datastore-bom:1.107.0:1.107.1-SNAPSHOT
+google-cloud-datastore-parent:1.107.0:1.107.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.90.0:0.90.1-SNAPSHOT
+datastore-v1-proto-client:1.7.0:1.7.1-SNAPSHOT
 

From 9ed656033f0fd21656ec72ceea215d3cf52cd5c4 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 16 Jun 2021 21:28:12 +0200
Subject: [PATCH 0630/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.107.0 (#458)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `1.106.5` -> `1.107.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.0/compatibility-slim/1.106.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.0/confidence-slim/1.106.5)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v1.107.0`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11070-httpswwwgithubcomgoogleapisjava-datastorecomparev11065v11070-2021-06-16)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.106.5-sp.1...v1.107.0)

##### Features

-   add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#​433](https://www.github.com/googleapis/java-datastore/issues/433)) ([a8bc795](https://www.github.com/googleapis/java-datastore/commit/a8bc7957719c10a323eba17a68137476de068c5d))

##### Bug Fixes

-   Update dependencies.sh to not break on mac ([#​456](https://www.github.com/googleapis/java-datastore/issues/456)) ([1e514c0](https://www.github.com/googleapis/java-datastore/commit/1e514c00c4f0f3735295330b255c52eb61af72aa))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v1.3.0 ([#​451](https://www.github.com/googleapis/java-datastore/issues/451)) ([00ca1a6](https://www.github.com/googleapis/java-datastore/commit/00ca1a680f744ea3c5855136b79ba6de384583ed))

##### [1.106.5](https://www.github.com/googleapis/java-datastore/compare/v1.106.4...v1.106.5) (2021-05-19)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#​430](https://www.github.com/googleapis/java-datastore/issues/430)) ([86c4dfe](https://www.github.com/googleapis/java-datastore/commit/86c4dfe1a9ae4fdcf1b788281be0f57d14c6d353))

##### [1.106.4](https://www.github.com/googleapis/java-datastore/compare/v1.106.3...v1.106.4) (2021-05-11)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#​417](https://www.github.com/googleapis/java-datastore/issues/417)) ([0ecddb2](https://www.github.com/googleapis/java-datastore/commit/0ecddb25c43569e3b50e96ceec102bec52bad7d6))

##### [1.106.3](https://www.github.com/googleapis/java-datastore/compare/v1.106.2...v1.106.3) (2021-04-23)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#​404](https://www.github.com/googleapis/java-datastore/issues/404)) ([c168760](https://www.github.com/googleapis/java-datastore/commit/c168760909dbfb5d2d6ad176a4822e9a7dcc1d47))

##### [1.106.2](https://www.github.com/googleapis/java-datastore/compare/v1.106.1...v1.106.2) (2021-04-20)

##### Bug Fixes

-   release scripts from issuing overlapping phases ([#​394](https://www.github.com/googleapis/java-datastore/issues/394)) ([397ae6c](https://www.github.com/googleapis/java-datastore/commit/397ae6cdbf2effa926d0a4503148970ee7e5d8cf))
-   typo ([#​389](https://www.github.com/googleapis/java-datastore/issues/389)) ([10b0336](https://www.github.com/googleapis/java-datastore/commit/10b03365c227d7b6f15ba60eb946079a3f70b729))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#​397](https://www.github.com/googleapis/java-datastore/issues/397)) ([947befe](https://www.github.com/googleapis/java-datastore/commit/947befed8e074c244cb68099ed5e9a6ad0721caf))

##### [1.106.1](https://www.github.com/googleapis/java-datastore/compare/v1.106.0...v1.106.1) (2021-04-12)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 ([#​380](https://www.github.com/googleapis/java-datastore/issues/380)) ([7577e1b](https://www.github.com/googleapis/java-datastore/commit/7577e1b1cb1af0539fc931059fbb48ee5e934447))
-   update dependency com.google.oauth-client:google-oauth-client to v1.31.5 ([#​379](https://www.github.com/googleapis/java-datastore/issues/379)) ([917719c](https://www.github.com/googleapis/java-datastore/commit/917719cb36d4d55b586b6fde7a0e0950a26cd233))

### [`v1.106.5-sp.1`](https://togithub.com/googleapis/java-datastore/releases/v1.106.5-sp.1)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.106.5...v1.106.5-sp.1)

##### Features

-   configure initial sp version ([#​438](https://www.github.com/googleapis/java-datastore/issues/438)) ([a7ccf8b](https://www.github.com/googleapis/java-datastore/commit/a7ccf8b9bd8c8ad3702a01f727604d775bdd98e1))

##### Dependencies

-   align dependencies to 1.106.0 release ([#​441](https://www.github.com/googleapis/java-datastore/issues/441)) ([ead4617](https://www.github.com/googleapis/java-datastore/commit/ead46179d551c563c20bd7b299936bd59ed0ca0e))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a751f567a155..adb64f9dda97 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
-      1.106.5
+      1.107.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e92e4ebee3e5..ae8cd24b7767 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.106.5
+      1.107.0
     
 
     

From f0ac89b8b10d9d6212f660b80ce8adac8460273c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 16 Jun 2021 12:40:14 -0700
Subject: [PATCH 0631/1784] chore: regenerate README (#459)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-06-16 19:32:37,859 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-06-16 19:32:39,082 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/d5f4931c-fa94-4080-bcba-19131a70d1d0/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index a50fe2637e0b..18145401d674 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c7df8fc5c00288a414281f7c252bbdccb95017a0"
+        "sha": "9ed656033f0fd21656ec72ceea215d3cf52cd5c4"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8da7927493739fa36130360019ca21258242f73a"
+        "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
       }
     }
   ]
diff --git a/README.md b/README.md
index c0edbbf6be7e..da74a1c3d987 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.106.5
+  1.107.0
 
 
 ```
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.106.5-sp.1'
+compile 'com.google.cloud:google-cloud-datastore:1.107.0'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.106.5-sp.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.107.0"
 ```
 
 ## Authentication

From 2b6da603981b3c31a42358a5dc9a81dd5be670ae Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 22 Jun 2021 08:04:04 -0700
Subject: [PATCH 0632/1784] chore: minimize noise from build scripts (#460)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/0bf5b74f-4b50-422c-80c8-b7567b17ae67/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/1c0c698705e668ccb3d68556ae7260f16ce63a6e
---
 .kokoro/coerce_logs.sh | 1 -
 synth.metadata         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
index 5cf7ba49e6bb..46edbf7f2fcd 100755
--- a/.kokoro/coerce_logs.sh
+++ b/.kokoro/coerce_logs.sh
@@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
 echo "coercing sponge logs..."
 for xml in `find . -name *-sponge_log.xml`
 do
-  echo "processing ${xml}"
   class=$(basename ${xml} | cut -d- -f2)
   dir=$(dirname ${xml})/${job}/${class}
   text=$(dirname ${xml})/${class}-sponge_log.txt
diff --git a/synth.metadata b/synth.metadata
index 7ef0c197c3e6..40a820a9088c 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "b7c48c3af445119f6e0bc839bf75943a1716719e"
+        "sha": "f0ac89b8b10d9d6212f660b80ce8adac8460273c"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
+        "sha": "1c0c698705e668ccb3d68556ae7260f16ce63a6e"
       }
     }
   ],

From 147a3e5a80b2597258c4b78ae54d4be5d45b4df1 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 23 Jun 2021 09:00:27 -0700
Subject: [PATCH 0633/1784] fix: Add `shopt -s nullglob` to dependencies script
 (#461)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/75d75f9a-5d82-4c0e-b1e1-62bad996136b/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/87254ac89a9559864c0a245d6b150406439ce3d8
---
 .kokoro/dependencies.sh | 1 +
 synth.metadata          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index a7e999d33bfb..9030ba8f99ff 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 set -eo pipefail
+shopt -s nullglob
 
 ## Get the directory of the build script
 scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
diff --git a/synth.metadata b/synth.metadata
index 40a820a9088c..bef75ee7bf1a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "f0ac89b8b10d9d6212f660b80ce8adac8460273c"
+        "sha": "2b6da603981b3c31a42358a5dc9a81dd5be670ae"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "1c0c698705e668ccb3d68556ae7260f16ce63a6e"
+        "sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
       }
     }
   ],

From d5ae3fa738c97cc776bbb7cb7cff5f808fbc4bd4 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 23 Jun 2021 09:14:19 -0700
Subject: [PATCH 0634/1784] chore: regenerate README (#464)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-06-23 16:03:07,319 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-06-23 16:03:08,693 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/27a9a463-6e36-4bed-a4d6-bf14509658d9/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 18145401d674..f6f8bbb35fc2 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "9ed656033f0fd21656ec72ceea215d3cf52cd5c4"
+        "sha": "147a3e5a80b2597258c4b78ae54d4be5d45b4df1"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
+        "sha": "9763f20e4b7bb1091082462b2f7970e965d0d414"
       }
     }
   ]
diff --git a/README.md b/README.md
index da74a1c3d987..dd1683b769c1 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.6.0')
+implementation platform('com.google.cloud:libraries-bom:20.7.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 9a83695cd5913096dc3d810c385d62c579bd7ace Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 30 Jun 2021 22:38:22 +0200
Subject: [PATCH 0635/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v1.4.0 (#465)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `1.3.0` -> `1.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/compatibility-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/confidence-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v1.4.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​140-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare130v140-2021-06-30)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v1.3.0...v1.4.0)

##### Features

-   add grpc-gcp to dependencyManagement ([#​389](https://www.github.com/googleapis/java-shared-dependencies/issues/389)) ([57fd2e6](https://www.github.com/googleapis/java-shared-dependencies/commit/57fd2e646e28e37e0b5e4e1b37425d4897a8776f))

##### Bug Fixes

-   Add `shopt -s nullglob` to dependencies script ([#​392](https://www.github.com/googleapis/java-shared-dependencies/issues/392)) ([f8f29df](https://www.github.com/googleapis/java-shared-dependencies/commit/f8f29df1c9cc6eca517c99113fb9509fd611ac92))
-   Add common httpclient and oauth dependencies ([#​391](https://www.github.com/googleapis/java-shared-dependencies/issues/391)) ([09660e1](https://www.github.com/googleapis/java-shared-dependencies/commit/09660e1e50c96dcd7df4e80d8ad357f8256eda6c))
-   Update dependencies.sh to not break on mac ([#​384](https://www.github.com/googleapis/java-shared-dependencies/issues/384)) ([0ae2841](https://www.github.com/googleapis/java-shared-dependencies/commit/0ae2841d7ce2885d041795c58a38d2d3973c2e5a))

##### Dependencies

-   update dependency com.google.api-client:google-api-client-bom to v1.32.1 ([#​390](https://www.github.com/googleapis/java-shared-dependencies/issues/390)) ([00288c1](https://www.github.com/googleapis/java-shared-dependencies/commit/00288c18d09616582c8bec961ecc5c00ef1d4288))
-   update dependency com.google.api:api-common to v1.10.4 ([#​385](https://www.github.com/googleapis/java-shared-dependencies/issues/385)) ([5f2b39b](https://www.github.com/googleapis/java-shared-dependencies/commit/5f2b39b5bdc4cec9d5ab2f050e11000ed372d057))
-   update dependency com.google.api:gax-grpc to v1.65.1 ([#​382](https://www.github.com/googleapis/java-shared-dependencies/issues/382)) ([a2a1547](https://www.github.com/googleapis/java-shared-dependencies/commit/a2a15471dee21207a0b97b3bc8f6f59d6a4a2d13))
-   update dependency com.google.protobuf:protobuf-bom to v3.17.3 ([#​379](https://www.github.com/googleapis/java-shared-dependencies/issues/379)) ([6f43eb5](https://www.github.com/googleapis/java-shared-dependencies/commit/6f43eb553dca98140d343bee3f1003096d79ee6c))
-   update dependency io.grpc:grpc-bom to v1.38.1 ([#​386](https://www.github.com/googleapis/java-shared-dependencies/issues/386)) ([7b1d4cf](https://www.github.com/googleapis/java-shared-dependencies/commit/7b1d4cf317fbd75b91d6a63f82b5fc2f46eaf3ca))
-   update dependency io.grpc:grpc-bom to v1.39.0 ([#​394](https://www.github.com/googleapis/java-shared-dependencies/issues/394)) ([ebc8af6](https://www.github.com/googleapis/java-shared-dependencies/commit/ebc8af6b3f850b58b35d9720a7a0b1545d4616bd))
-   update gax.version to v1.66.0 ([#​395](https://www.github.com/googleapis/java-shared-dependencies/issues/395)) ([c73f73e](https://www.github.com/googleapis/java-shared-dependencies/commit/c73f73e84740a8117be342a66e179eaf3e29c6fd))
-   update google.core.version to v1.95.1 ([#​381](https://www.github.com/googleapis/java-shared-dependencies/issues/381)) ([4496153](https://www.github.com/googleapis/java-shared-dependencies/commit/44961532f621b0ab19e9e7feebb7d588aef5d423))
-   update google.core.version to v1.95.2 ([#​383](https://www.github.com/googleapis/java-shared-dependencies/issues/383)) ([7216859](https://www.github.com/googleapis/java-shared-dependencies/commit/7216859bcd67fa1ce1119831c33c50a2d5b79324))
-   update google.core.version to v1.95.3 ([#​388](https://www.github.com/googleapis/java-shared-dependencies/issues/388)) ([354e4e8](https://www.github.com/googleapis/java-shared-dependencies/commit/354e4e811f4ba886406681a4261ac0455a9eb2d2))
-   update google.core.version to v1.95.4 ([#​393](https://www.github.com/googleapis/java-shared-dependencies/issues/393)) ([be78ad8](https://www.github.com/googleapis/java-shared-dependencies/commit/be78ad85e31d8876eabafee7aa8242712573cb46))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 f0e2f2771b28..a5a419c09668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        1.3.0
+        1.4.0
         pom
         import
       

From 3f32c42e8ba62d1599b49f095d5b66e97f602ef9 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 30 Jun 2021 22:42:22 +0200
Subject: [PATCH 0636/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.7.0 (#462)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.6.0` -> `20.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/compatibility-slim/20.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/confidence-slim/20.6.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index a69165eb7050..832ed4deff0c 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.6.0
+        20.7.0
         pom
         import
       

From bf448057728441b3d24ccf2d8824944e4f35de90 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 30 Jun 2021 13:50:22 -0700
Subject: [PATCH 0637/1784] chore: regenerate README (#466)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-06-30 20:44:40,693 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-06-30 20:44:41,971 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/783c155b-832b-4440-ba35-172fd435f71c/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index f6f8bbb35fc2..dad427938356 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "147a3e5a80b2597258c4b78ae54d4be5d45b4df1"
+        "sha": "3f32c42e8ba62d1599b49f095d5b66e97f602ef9"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "9763f20e4b7bb1091082462b2f7970e965d0d414"
+        "sha": "39652e3948f455fd0b77535a0145eeec561a3706"
       }
     }
   ]
diff --git a/README.md b/README.md
index dd1683b769c1..99b27bb9ba96 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.6.0
+      20.7.0
       pom
       import
     

From b40fff966f3f92e64efc58e5e07d8f96ef2e845a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:52:21 +0000
Subject: [PATCH 0638/1784] chore: release 1.107.1 (#463)

:robot: I have created a release \*beep\* \*boop\*
---
### [1.107.1](https://www.github.com/googleapis/java-datastore/compare/v1.107.0...v1.107.1) (2021-06-30)


### Bug Fixes

* Add `shopt -s nullglob` to dependencies script ([#461](https://www.github.com/googleapis/java-datastore/issues/461)) ([147a3e5](https://www.github.com/googleapis/java-datastore/commit/147a3e5a80b2597258c4b78ae54d4be5d45b4df1))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#465](https://www.github.com/googleapis/java-datastore/issues/465)) ([9a83695](https://www.github.com/googleapis/java-datastore/commit/9a83695cd5913096dc3d810c385d62c579bd7ace))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 12 ++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 186e9a56e50a..57cf2f90cf10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### [1.107.1](https://www.github.com/googleapis/java-datastore/compare/v1.107.0...v1.107.1) (2021-06-30)
+
+
+### Bug Fixes
+
+* Add `shopt -s nullglob` to dependencies script ([#461](https://www.github.com/googleapis/java-datastore/issues/461)) ([147a3e5](https://www.github.com/googleapis/java-datastore/commit/147a3e5a80b2597258c4b78ae54d4be5d45b4df1))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#465](https://www.github.com/googleapis/java-datastore/issues/465)) ([9a83695](https://www.github.com/googleapis/java-datastore/commit/9a83695cd5913096dc3d810c385d62c579bd7ace))
+
 ## [1.107.0](https://www.github.com/googleapis/java-datastore/compare/v1.106.5...v1.107.0) (2021-06-16)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b77a5e4c0914..6a21b0283943 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
-  1.7.1-SNAPSHOT
+  1.7.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.1-SNAPSHOT
+    1.107.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 563233496eca..0f90d8ee5393 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
-  1.107.1-SNAPSHOT
+  1.107.1
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.1-SNAPSHOT
+        0.90.1
       
       
         com.google.cloud
         google-cloud-datastore
-        1.107.1-SNAPSHOT
+        1.107.1
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 604feb297a7d..a728d789c834 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.107.1-SNAPSHOT
+  1.107.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.1-SNAPSHOT
+    1.107.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index a5a419c09668..e350dd826d65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.107.1-SNAPSHOT
+  1.107.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,12 +167,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.1-SNAPSHOT
+        0.90.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.7.1-SNAPSHOT
+        1.7.1
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 697bf846b07a..1f25fd7b897a 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.90.1-SNAPSHOT
+  0.90.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.1-SNAPSHOT
+    1.107.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 3c5a1bf74102..eb725ac3ffa4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.107.0:1.107.1-SNAPSHOT
-google-cloud-datastore-bom:1.107.0:1.107.1-SNAPSHOT
-google-cloud-datastore-parent:1.107.0:1.107.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.90.0:0.90.1-SNAPSHOT
-datastore-v1-proto-client:1.7.0:1.7.1-SNAPSHOT
+google-cloud-datastore:1.107.1:1.107.1
+google-cloud-datastore-bom:1.107.1:1.107.1
+google-cloud-datastore-parent:1.107.1:1.107.1
+proto-google-cloud-datastore-v1:0.90.1:0.90.1
+datastore-v1-proto-client:1.7.1:1.7.1
 

From db9489c27b18228f051a5d454810e09a6143fbac Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:58:21 +0000
Subject: [PATCH 0639/1784] chore: release 1.107.2-SNAPSHOT (#467)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6a21b0283943..0f90024fe4dd 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
-  1.7.1
+  1.7.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.1
+    1.107.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0f90d8ee5393..006447736b80 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
-  1.107.1
+  1.107.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -63,12 +63,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.1
+        0.90.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.107.1
+        1.107.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a728d789c834..380b2a9dabbd 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.107.1
+  1.107.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.1
+    1.107.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index e350dd826d65..fc37d660fffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.107.1
+  1.107.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -167,12 +167,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.1
+        0.90.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.7.1
+        1.7.2-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1f25fd7b897a..9b6c643015ef 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.90.1
+  0.90.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.1
+    1.107.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index eb725ac3ffa4..5df643bec47c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.107.1:1.107.1
-google-cloud-datastore-bom:1.107.1:1.107.1
-google-cloud-datastore-parent:1.107.1:1.107.1
-proto-google-cloud-datastore-v1:0.90.1:0.90.1
-datastore-v1-proto-client:1.7.1:1.7.1
+google-cloud-datastore:1.107.1:1.107.2-SNAPSHOT
+google-cloud-datastore-bom:1.107.1:1.107.2-SNAPSHOT
+google-cloud-datastore-parent:1.107.1:1.107.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.90.1:0.90.2-SNAPSHOT
+datastore-v1-proto-client:1.7.1:1.7.2-SNAPSHOT
 

From 8578d7c2d5da7cb83b87198554af0e8b86caf3f4 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 2 Jul 2021 22:20:33 +0200
Subject: [PATCH 0640/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v1.107.1 (#468)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `1.107.0` -> `1.107.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.1/compatibility-slim/1.107.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/1.107.1/confidence-slim/1.107.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v1.107.1`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​11071-httpswwwgithubcomgoogleapisjava-datastorecomparev11070v11071-2021-06-30)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v1.107.0...v1.107.1)


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index adb64f9dda97..a55b06d5c7a8 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
-      1.107.0
+      1.107.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ae8cd24b7767..7d4a99837933 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.107.0
+      1.107.1
     
 
     

From 5eb6018a824ec0fe602c3008a9d396d4ba60b3a5 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 2 Jul 2021 13:30:36 -0700
Subject: [PATCH 0641/1784] chore: regenerate README (#469)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-07-02 20:22:50,029 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-07-02 20:22:51,124 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/07445694-3f57-4b0d-98f9-4ee8fc56136d/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index dad427938356..11baf5d45de0 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "3f32c42e8ba62d1599b49f095d5b66e97f602ef9"
+        "sha": "8578d7c2d5da7cb83b87198554af0e8b86caf3f4"
       }
     },
     {
diff --git a/README.md b/README.md
index 99b27bb9ba96..954562b60897 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  1.107.0
+  1.107.1
 
 
 ```
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.107.0'
+compile 'com.google.cloud:google-cloud-datastore:1.107.1'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.107.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.107.1"
 ```
 
 ## Authentication

From 8b922fd2ae568a1440c529996bb2465d6f536059 Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Wed, 7 Jul 2021 10:54:26 -0400
Subject: [PATCH 0642/1784] chore: remove distributionManagement section (#470)

All java client libraries inherit the distributionManagement section form shared-config. To prevent individual pom files from overriding the shared-config version of distributionManagement, it is being removed.
---
 pom.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc37d660fffa..127b2822f300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,16 +129,7 @@
     https://github.com/googleapis/java-datastore/issues
     GitHub Issues
   
-  
-    
-      sonatype-nexus-snapshots
-      https://oss.sonatype.org/content/repositories/snapshots
-    
-    
-      sonatype-nexus-staging
-      https://oss.sonatype.org/service/local/staging/deploy/maven2/
-    
-  
+  
   
     
       Apache-2.0

From 9ce8e9d6cbd2692e146e1c5d5103ec5e1b59e313 Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Thu, 8 Jul 2021 12:32:38 -0400
Subject: [PATCH 0643/1784] chore: remove distributionManagement section (#471)

All java client libraries inherit the distributionManagement section form shared-config. To prevent individual pom files from overriding the shared-config version of distributionManagement, it is being removed.
---
 google-cloud-datastore-bom/pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 006447736b80..035b99651686 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -39,17 +39,6 @@
     https://github.com/googleapis/java-datastore
   
 
-  
-    
-      sonatype-nexus-snapshots
-      https://oss.sonatype.org/content/repositories/snapshots
-    
-    
-      sonatype-nexus-staging
-      https://oss.sonatype.org/service/local/staging/deploy/maven2/
-    
-  
-
   
     
       The Apache Software License, Version 2.0

From c9bbd933927f687e3691187d7cd21f03acb3f118 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 9 Jul 2021 16:38:27 +0200
Subject: [PATCH 0644/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.8.0 (#472)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.7.0` -> `20.8.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/compatibility-slim/20.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/confidence-slim/20.7.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 832ed4deff0c..c1b068d41afd 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.7.0
+        20.8.0
         pom
         import
       

From f10eb9a8b449b0ad9c75c7c01eb05ea8a8d04625 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 9 Jul 2021 07:50:18 -0700
Subject: [PATCH 0645/1784] chore: regenerate README (#474)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-07-09 14:41:09,378 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-07-09 14:41:10,716 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/2bcb521c-044f-4de0-9332-6aaf061629e6/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 11baf5d45de0..a89028511b14 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "8578d7c2d5da7cb83b87198554af0e8b86caf3f4"
+        "sha": "c9bbd933927f687e3691187d7cd21f03acb3f118"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "39652e3948f455fd0b77535a0145eeec561a3706"
+        "sha": "09c59c20a4bf0daed1665af59035ff240fe356df"
       }
     }
   ]
diff --git a/README.md b/README.md
index 954562b60897..e5241a243790 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.7.0
+      20.8.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.7.0')
+implementation platform('com.google.cloud:libraries-bom:20.8.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 3aa2cf118342419a317a68f3ec1a61917bcbb511 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 13 Jul 2021 11:26:28 -0700
Subject: [PATCH 0646/1784] chore: remove All rights reserved clause from
 java.header (#473)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/e278faaf-4497-439c-a104-7bdeda21de9b/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/09c59c20a4bf0daed1665af59035ff240fe356df
---
 .../main/java/com/google/datastore/v1/client/Datastore.java   | 2 +-
 .../com/google/datastore/v1/client/DatastoreEmulator.java     | 2 +-
 .../datastore/v1/client/DatastoreEmulatorException.java       | 2 +-
 .../google/datastore/v1/client/DatastoreEmulatorFactory.java  | 2 +-
 .../google/datastore/v1/client/DatastoreEmulatorOptions.java  | 2 +-
 .../com/google/datastore/v1/client/DatastoreException.java    | 2 +-
 .../java/com/google/datastore/v1/client/DatastoreFactory.java | 2 +-
 .../java/com/google/datastore/v1/client/DatastoreHelper.java  | 2 +-
 .../java/com/google/datastore/v1/client/DatastoreOptions.java | 2 +-
 .../java/com/google/datastore/v1/client/QuerySplitter.java    | 2 +-
 .../com/google/datastore/v1/client/QuerySplitterImpl.java     | 2 +-
 .../main/java/com/google/datastore/v1/client/RemoteRpc.java   | 2 +-
 .../com/google/datastore/v1/client/DatastoreEmulatorTest.java | 2 +-
 .../com/google/datastore/v1/client/DatastoreFactoryTest.java  | 2 +-
 .../com/google/datastore/v1/client/DatastoreHelperTest.java   | 2 +-
 .../java/com/google/datastore/v1/client/DatastoreTest.java    | 2 +-
 .../java/com/google/datastore/v1/client/RemoteRpcTest.java    | 2 +-
 java.header                                                   | 2 +-
 synth.metadata                                                | 4 ++--
 19 files changed, 20 insertions(+), 20 deletions(-)

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 8426b6e2865a..db117142fb79 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
index 721073e12f70..2fb11ebe8917 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java
index f0f3a177f620..69c0bc9e0fe4 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java
index c8cc6ab29f91..7a5de0a5e317 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java
index 83348319bf0c..ee73d56f4f90 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
index b5ff17c4db67..400e633088f8 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
index 5a3f4183be07..f5e56d2cc388 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5b092c9871b9..ca265a23051f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9ad9ca5527d2..8da86dc41707 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
index 44b1c2c50f14..5286f7842e86 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d1055cdd3da9..92fb384181ca 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 17763c9c1482..2c9d4d34e5bd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java
index 477bd6a5012d..f195e61c475a 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
index 0414bcbe9789..02bb44a52c58 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
index 5fcb214e8ff5..20325a4f0598 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
index a4a51cd15f34..ca4fcc449bfd 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 27f3008650c5..b5f82369b507 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java.header b/java.header
index 3a9b503aa24f..d0970ba7d375 100644
--- a/java.header
+++ b/java.header
@@ -1,5 +1,5 @@
 ^/\*$
-^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$
+^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$
 ^ \*$
 ^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$
 ^ \* you may not use this file except in compliance with the License\.$
diff --git a/synth.metadata b/synth.metadata
index bef75ee7bf1a..b68b8b6d151b 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "2b6da603981b3c31a42358a5dc9a81dd5be670ae"
+        "sha": "9ce8e9d6cbd2692e146e1c5d5103ec5e1b59e313"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
+        "sha": "09c59c20a4bf0daed1665af59035ff240fe356df"
       }
     }
   ],

From bd3e360867f666cc7fecaa07f55baec78e1460f9 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 15 Jul 2021 07:28:36 -0700
Subject: [PATCH 0647/1784] chore: add dependencyDashboardLabels to
 renovate.json (#475)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/981980c3-5fea-43d1-b171-ee4f4e7925f5/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/5d3c52f5db664eee9026db76b5bcb466f3a09ca9
---
 renovate.json  | 5 ++++-
 synth.metadata | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/renovate.json b/renovate.json
index 13d5057257ba..840e731d5c84 100644
--- a/renovate.json
+++ b/renovate.json
@@ -69,5 +69,8 @@
     }
   ],
   "semanticCommits": true,
-  "masterIssue": true
+  "dependencyDashboard": true,
+  "dependencyDashboardLabels": [
+    "type: process"
+  ]
 }
diff --git a/synth.metadata b/synth.metadata
index b68b8b6d151b..b0d7468d5c4c 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "9ce8e9d6cbd2692e146e1c5d5103ec5e1b59e313"
+        "sha": "3aa2cf118342419a317a68f3ec1a61917bcbb511"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "09c59c20a4bf0daed1665af59035ff240fe356df"
+        "sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9"
       }
     }
   ],

From f8450bd038e6489ca9e074c3167fa3b74d3fceff Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 15 Jul 2021 07:42:11 -0700
Subject: [PATCH 0648/1784] chore: regenerate README (#476)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-07-15 14:34:36,004 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-07-15 14:34:37,207 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/888c9172-f4b6-4198-a6fd-93a42f6013e9/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata |  4 +-
 README.md                                    | 48 +++++++++++++++++++-
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index a89028511b14..c3e898841b04 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c9bbd933927f687e3691187d7cd21f03acb3f118"
+        "sha": "bd3e360867f666cc7fecaa07f55baec78e1460f9"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "09c59c20a4bf0daed1665af59035ff240fe356df"
+        "sha": "4124d245133c0f740ac5e6fa2e7daeba327f1297"
       }
     }
   ]
diff --git a/README.md b/README.md
index e5241a243790..1b32b3a152ec 100644
--- a/README.md
+++ b/README.md
@@ -232,10 +232,50 @@ has instructions for running the samples.
 
 To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting].
 
-## Java Versions
+## Supported Java Versions
 
 Java 7 or above is required for using this client.
 
+Google's Java client libraries,
+[Google Cloud Client Libraries][cloudlibs]
+and
+[Google Cloud API Libraries][apilibs],
+follow the
+[Oracle Java SE support roadmap][oracle]
+(see the Oracle Java SE Product Releases section).
+
+### For new development
+
+In general, new feature development occurs with support for the lowest Java
+LTS version covered by  Oracle's Premier Support (which typically lasts 5 years
+from initial General Availability). If the minimum required JVM for a given
+library is changed, it is accompanied by a [semver][semver] major release.
+
+Java 11 and (in September 2021) Java 17 are the best choices for new
+development.
+
+### Keeping production systems current
+
+Google tests its client libraries with all current LTS versions covered by
+Oracle's Extended Support (which typically lasts 8 years from initial
+General Availability).
+
+#### Legacy support
+
+Google's client libraries support legacy versions of Java runtimes with long
+term stable libraries that don't receive feature updates on a best efforts basis
+as it may not be possible to backport all patches.
+
+Google provides updates on a best efforts basis to apps that continue to use
+Java 7, though apps might need to upgrade to current versions of the library
+that supports their JVM.
+
+#### Where to find specific information
+
+The latest versions and the supported Java versions are identified on
+the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME`
+and on [google-cloud-java][g-c-j].
+
 ## Versioning
 
 
@@ -296,3 +336,9 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com
 [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
 [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png
+
+[semver]: https://semver.org/
+[cloudlibs]: https://cloud.google.com/apis/docs/client-libraries-explained
+[apilibs]: https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries
+[oracle]: https://www.oracle.com/java/technologies/java-se-support-roadmap.html
+[g-c-j]: http://github.com/googleapis/google-cloud-java

From fc8c1857d01515c50f6c2db4027cef650969e5ec Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 26 Jul 2021 18:05:41 +0200
Subject: [PATCH 0649/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v20.9.0 (#477)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c1b068d41afd..dfa468875452 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.8.0
+        20.9.0
         pom
         import
       

From 001df5711dbef329c08c20d97b946f53f6ef9afc Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 26 Jul 2021 09:14:10 -0700
Subject: [PATCH 0650/1784] chore: regenerate README (#478)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-07-26 16:07:55,096 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-07-26 16:07:56,175 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/bb97b42e-92f9-4d38-8228-8f1f3812b55b/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index c3e898841b04..62624f1ef2b3 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "bd3e360867f666cc7fecaa07f55baec78e1460f9"
+        "sha": "fc8c1857d01515c50f6c2db4027cef650969e5ec"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4124d245133c0f740ac5e6fa2e7daeba327f1297"
+        "sha": "dd05f9d12f134871c9e45282349c9856fbebecdd"
       }
     }
   ]
diff --git a/README.md b/README.md
index 1b32b3a152ec..d73a5b2d1f44 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.8.0
+      20.9.0
       pom
       import
     
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.8.0')
+implementation platform('com.google.cloud:libraries-bom:20.9.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```
@@ -218,8 +218,7 @@ Example Applications
 
 ## Samples
 
-Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tree/master/samples) directory. The samples' `README.md`
-has instructions for running the samples.
+Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tree/master/samples) directory.
 
 | Sample                      | Source Code                       | Try it |
 | --------------------------- | --------------------------------- | ------ |

From e7ad9750ec56459c08fdf829b56fd09d6e9635d6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Jul 2021 22:48:26 +0200
Subject: [PATCH 0651/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v0.13.1 (#480)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.12.0` -> `0.13.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/compatibility-slim/0.12.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/confidence-slim/0.12.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v0.13.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​0131-httpswwwgithubcomgoogleapisjava-shared-configcomparev0130v0131-2021-07-27)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.13.0...v0.13.1)

### [`v0.13.0`](https://togithub.com/googleapis/java-shared-config/releases/v0.13.0)

##### Features

-   add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#​264](https://www.github.com/googleapis/java-shared-config/issues/264)) ([d274af8](https://www.github.com/googleapis/java-shared-config/commit/d274af836ac9b3e98be84e551b7e9e552397ecc1))

##### Bug Fixes

-   Add shopt -s nullglob to dependencies script ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf))
-   Update dependencies.sh to not break on mac  ([#​276](https://www.github.com/googleapis/java-shared-config/issues/276)) ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf))

##### Dependencies

-   update auto-value-annotation.version to v1.8.2 ([#​275](https://www.github.com/googleapis/java-shared-config/issues/275)) ([4d15246](https://www.github.com/googleapis/java-shared-config/commit/4d152461a5592940a8be762c7a8698a02dbe26cf))
-   update dependency com.puppycrawl.tools:checkstyle to v8.43 ([#​266](https://www.github.com/googleapis/java-shared-config/issues/266)) ([fae7961](https://www.github.com/googleapis/java-shared-config/commit/fae7961412b33e34e8fcfec78d1451894d4e61d9))
-   update dependency com.puppycrawl.tools:checkstyle to v8.44 ([#​274](https://www.github.com/googleapis/java-shared-config/issues/274)) ([d53d0e0](https://www.github.com/googleapis/java-shared-config/commit/d53d0e0935e908d16f4e7cf763577cf3fd8128d3))

***


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 035b99651686..4f42b0d16707 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
-    0.12.0
+    0.13.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 127b2822f300..37115461ad4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.12.0
+    0.13.1
   
 
   

From c5f227b3ba517dedc79d0a2ab5a36a4306aa83c6 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 27 Jul 2021 14:02:24 -0700
Subject: [PATCH 0652/1784] chore: regenerate README (#481)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-07-27 20:52:24,643 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-07-27 20:52:25,939 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/18aaf667-43ca-4e12-bc7e-f8973da15c4c/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata |  4 ++--
 README.md                                    | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 62624f1ef2b3..7c9be59dc3bc 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "fc8c1857d01515c50f6c2db4027cef650969e5ec"
+        "sha": "e7ad9750ec56459c08fdf829b56fd09d6e9635d6"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "dd05f9d12f134871c9e45282349c9856fbebecdd"
+        "sha": "3d32990b6f4b57be77455e3ca89e6e21cd0c06b3"
       }
     }
   ]
diff --git a/README.md b/README.md
index d73a5b2d1f44..bb9b78c26267 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,11 @@ Java idiomatic client for [Cloud Datastore][product-docs].
 - [Product Documentation][product-docs]
 - [Client Library Documentation][javadocs]
 
+
 ## Quickstart
 
 If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
+
 ```xml
 
   
@@ -34,6 +36,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
 
 If you are using Maven without BOM, add this to your dependencies:
 
+
 ```xml
 
   com.google.cloud
@@ -44,17 +47,20 @@ If you are using Maven without BOM, add this to your dependencies:
 ```
 
 If you are using Gradle 5.x or later, add this to your dependencies
+
 ```Groovy
 implementation platform('com.google.cloud:libraries-bom:20.9.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
+
 ```Groovy
 compile 'com.google.cloud:google-cloud-datastore:1.107.1'
 ```
 
 If you are using SBT, add this to your dependencies
+
 ```Scala
 libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.107.1"
 ```
@@ -63,6 +69,10 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.107.1"
 
 See the [Authentication][authentication] section in the base directory's README.
 
+## Authorization
+
+The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired Cloud Datastore APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Cloud Datastore API calls.
+
 ## Getting Started
 
 ### Prerequisites
@@ -281,6 +291,7 @@ and on [google-cloud-java][g-c-j].
 This library follows [Semantic Versioning](http://semver.org/).
 
 
+
 ## Contributing
 
 
@@ -292,6 +303,7 @@ Please note that this project is released with a Contributor Code of Conduct. By
 this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more
 information.
 
+
 ## License
 
 Apache 2.0 - See [LICENSE][license] for more information.
@@ -324,6 +336,9 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
 [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-datastore&core=gav
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
+[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
+[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
+[iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-sdk]: https://cloud.google.com/sdk/

From 75870eae051499da0f1fc6159de9ada0add794cc Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Thu, 29 Jul 2021 15:44:21 -0400
Subject: [PATCH 0653/1784] build: configure branch java7 as a release branch
 (#482)

enable releases
---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index ab54c6e93e36..4a9e95940835 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -6,3 +6,7 @@ branches:
     handleGHRelease: true
     releaseType: java-lts
     branch: 1.106.5-sp
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-yoshi
+    branch: java7
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 7ab847eed6e7..99056495518a 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -34,6 +34,22 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
+  - pattern: java7
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - linkage-monitor
+      - lint
+      - clirr
+      - units (7)
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
 permissionRules:
   - team: yoshi-admins
     permission: admin

From d1e96533bb72a146ae93c1b56bcda349f3ddb767 Mon Sep 17 00:00:00 2001
From: Emily Ball 
Date: Thu, 29 Jul 2021 18:19:22 -0700
Subject: [PATCH 0654/1784] ci: remove java 7 units check (#484)

---
 .github/sync-repo-settings.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 99056495518a..c123a3b45348 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -13,7 +13,6 @@ branchProtectionRules:
       - linkage-monitor
       - lint
       - clirr
-      - units (7)
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
@@ -29,7 +28,6 @@ branchProtectionRules:
       - linkage-monitor
       - lint
       - clirr
-      - units (7)
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'

From 515f373a1565b33161c315a10d9da06811e4b002 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 4 Aug 2021 10:22:21 -0700
Subject: [PATCH 0655/1784] chore: remove java 7 units check (#483)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/27059726-f658-43de-b74b-71b32fd2a6e0/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/1a2878d6909dd10ca4e3c1b5943d6622e996054e
---
 .github/workflows/ci.yaml | 2 +-
 synth.metadata            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0195b32f00b4..65ae6ecdda77 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [7, 8, 11]
+        java: [8, 11]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v1
diff --git a/synth.metadata b/synth.metadata
index b0d7468d5c4c..b22d633c7b46 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "3aa2cf118342419a317a68f3ec1a61917bcbb511"
+        "sha": "c5f227b3ba517dedc79d0a2ab5a36a4306aa83c6"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9"
+        "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e"
       }
     }
   ],

From eb06d6204987899bba7a34691fd914955b00ccee Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 5 Aug 2021 16:54:36 +0200
Subject: [PATCH 0656/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1 (#486)

---
 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 4f42b0d16707..173234ac83db 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
-    0.13.1
+    1.0.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 37115461ad4d..ba4689b07f0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    0.13.1
+    1.0.0
   
 
   

From d3e1af5091ca864f6495a1440d475ecbabe465d4 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Fri, 6 Aug 2021 16:10:45 -0400
Subject: [PATCH 0657/1784] feat!: upgrade shared dependencies to 2.0.0 (#490)

Opening in favor of #489
---
 datastore-v1-proto-client/pom.xml | 6 ++++++
 pom.xml                           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 0f90024fe4dd..e793ee35f3ba 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -95,6 +95,12 @@
       truth
       1.1.3
       test
+      
+        
+          org.checkerframework
+          checker-qual
+        
+      
     
   
 
diff --git a/pom.xml b/pom.xml
index ba4689b07f0e..4eaaf426ccdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        1.4.0
+        2.0.0
         pom
         import
       

From 7ac4da40f157e9a111a576d677105a75f2387c0f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 10 Aug 2021 16:26:28 +0000
Subject: [PATCH 0658/1784] chore: release 2.0.0 (#491)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:robot: I have created a release \*beep\* \*boop\*
---
## [2.0.0](https://www.github.com/googleapis/java-datastore/compare/v1.107.1...v2.0.0) (2021-08-06)


### ⚠ BREAKING CHANGES

* update compile level to Java 1.8 ([#486](https://github.com/googleapis/java-datastore/pull/486))
* upgrade shared dependencies to 2.0.0 (#490)

### Features

* update compile level to Java 1.8 ([#486](https://github.com/googleapis/java-datastore/pull/486))
* upgrade shared dependencies to 2.0.0 ([#490](https://www.github.com/googleapis/java-datastore/issues/490)) ([d3e1af5](https://www.github.com/googleapis/java-datastore/commit/d3e1af5091ca864f6495a1440d475ecbabe465d4))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 13 +++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57cf2f90cf10..c477bbb0399b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.0.0](https://www.github.com/googleapis/java-datastore/compare/v1.107.1...v2.0.0) (2021-08-06)
+
+
+### ⚠ BREAKING CHANGES
+
+* update compile level to Java 1.8 ([#486](https://github.com/googleapis/java-datastore/pull/486))
+* upgrade shared dependencies to 2.0.0 (#490)
+
+### Features
+
+* update compile level to Java 1.8 ([#486](https://github.com/googleapis/java-datastore/pull/486))
+* upgrade shared dependencies to 2.0.0 ([#490](https://www.github.com/googleapis/java-datastore/issues/490)) ([d3e1af5](https://www.github.com/googleapis/java-datastore/commit/d3e1af5091ca864f6495a1440d475ecbabe465d4))
+
 ### [1.107.1](https://www.github.com/googleapis/java-datastore/compare/v1.107.0...v1.107.1) (2021-06-30)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index e793ee35f3ba..463560386434 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
-  1.7.2-SNAPSHOT
+  2.0.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.2-SNAPSHOT
+    2.0.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 173234ac83db..33ad4d0d3abf 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
-  1.107.2-SNAPSHOT
+  2.0.0
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.2-SNAPSHOT
+        0.91.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.107.2-SNAPSHOT
+        2.0.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 380b2a9dabbd..6bd9aa4bf36e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.107.2-SNAPSHOT
+  2.0.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.2-SNAPSHOT
+    2.0.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 4eaaf426ccdb..a2f1b5c46e26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  1.107.2-SNAPSHOT
+  2.0.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.90.2-SNAPSHOT
+        0.91.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        1.7.2-SNAPSHOT
+        2.0.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9b6c643015ef..b005ee049e86 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.90.2-SNAPSHOT
+  0.91.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    1.107.2-SNAPSHOT
+    2.0.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 5df643bec47c..cf58bf8a9bd5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:1.107.1:1.107.2-SNAPSHOT
-google-cloud-datastore-bom:1.107.1:1.107.2-SNAPSHOT
-google-cloud-datastore-parent:1.107.1:1.107.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.90.1:0.90.2-SNAPSHOT
-datastore-v1-proto-client:1.7.1:1.7.2-SNAPSHOT
+google-cloud-datastore:2.0.0:2.0.0
+google-cloud-datastore-bom:2.0.0:2.0.0
+google-cloud-datastore-parent:2.0.0:2.0.0
+proto-google-cloud-datastore-v1:0.91.0:0.91.0
+datastore-v1-proto-client:2.0.0:2.0.0
 

From 75df53a3e6530c0432d6e273d751f2b01048d9d6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 10 Aug 2021 16:44:32 +0000
Subject: [PATCH 0659/1784] chore: release 2.0.1-SNAPSHOT (#493)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 463560386434..b88974673c02 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.0.0
+  2.0.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.0
+    2.0.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 33ad4d0d3abf..ce6665bb02e6 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.0.0
+  2.0.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.0
+        0.91.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.0
+        2.0.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6bd9aa4bf36e..aaa7c309d64f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.0
+  2.0.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.0
+    2.0.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index a2f1b5c46e26..5605b40990e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.0
+  2.0.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.0
+        0.91.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.0
+        2.0.1-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b005ee049e86..fc0f57875c88 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.91.0
+  0.91.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.0
+    2.0.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index cf58bf8a9bd5..3e0f9e4740f0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.0:2.0.0
-google-cloud-datastore-bom:2.0.0:2.0.0
-google-cloud-datastore-parent:2.0.0:2.0.0
-proto-google-cloud-datastore-v1:0.91.0:0.91.0
-datastore-v1-proto-client:2.0.0:2.0.0
+google-cloud-datastore:2.0.0:2.0.1-SNAPSHOT
+google-cloud-datastore-bom:2.0.0:2.0.1-SNAPSHOT
+google-cloud-datastore-parent:2.0.0:2.0.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.91.0:0.91.1-SNAPSHOT
+datastore-v1-proto-client:2.0.0:2.0.1-SNAPSHOT
 

From f0a92ccfa1d7abf03e2dfcbc36ecac6659f2642c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 11 Aug 2021 00:15:52 +0200
Subject: [PATCH 0660/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2 (#494)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a55b06d5c7a8..7236ffce1bfd 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
-      1.107.1
+      2.0.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7d4a99837933..43a12116983b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      1.107.1
+      2.0.0
     
 
     

From 1ee00034bb098095cb852a5bbefdfdb9def33f16 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 10 Aug 2021 15:46:40 -0700
Subject: [PATCH 0661/1784] chore: regenerate README (#495)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-08-10 22:27:21,420 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-08-10 22:27:22,625 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/3c8d158e-887f-4d0d-8ad9-47aa747a8807/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 7c9be59dc3bc..bd7ed0dea126 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "e7ad9750ec56459c08fdf829b56fd09d6e9635d6"
+        "sha": "f0a92ccfa1d7abf03e2dfcbc36ecac6659f2642c"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "3d32990b6f4b57be77455e3ca89e6e21cd0c06b3"
+        "sha": "6252f2cd074c38f37b44abe5e96d128733eb1b61"
       }
     }
   ]
diff --git a/README.md b/README.md
index bb9b78c26267..55c55b0469b3 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
-  1.107.1
+  2.0.0
 
 
 ```
@@ -56,13 +56,13 @@ compile 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.107.1'
+compile 'com.google.cloud:google-cloud-datastore:2.0.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.107.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.0"
 ```
 
 ## Authentication

From a8dde5dcb5575f391db0d300ac7cf56c029a51f7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 12 Aug 2021 16:23:26 +0200
Subject: [PATCH 0662/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.0.1 (#496)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5605b40990e0..65e2c262aeb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.0.0
+        2.0.1
         pom
         import
       

From dc96276de72e065e59d4791d746eebd1cb00cdd1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 12 Aug 2021 14:32:27 +0000
Subject: [PATCH 0663/1784] chore: release 2.0.1 (#498)

:robot: I have created a release \*beep\* \*boop\*
---
### [2.0.1](https://www.github.com/googleapis/java-datastore/compare/v2.0.0...v2.0.1) (2021-08-12)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.0.1 ([#496](https://www.github.com/googleapis/java-datastore/issues/496)) ([a8dde5d](https://www.github.com/googleapis/java-datastore/commit/a8dde5dcb5575f391db0d300ac7cf56c029a51f7))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c477bbb0399b..8ce7bfa5fe2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.0.1](https://www.github.com/googleapis/java-datastore/compare/v2.0.0...v2.0.1) (2021-08-12)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.0.1 ([#496](https://www.github.com/googleapis/java-datastore/issues/496)) ([a8dde5d](https://www.github.com/googleapis/java-datastore/commit/a8dde5dcb5575f391db0d300ac7cf56c029a51f7))
+
 ## [2.0.0](https://www.github.com/googleapis/java-datastore/compare/v1.107.1...v2.0.0) (2021-08-06)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b88974673c02..a119a2a93dd0 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.0.1-SNAPSHOT
+  2.0.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.1-SNAPSHOT
+    2.0.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ce6665bb02e6..45782f455191 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.0.1-SNAPSHOT
+  2.0.1
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.1-SNAPSHOT
+        0.91.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.1-SNAPSHOT
+        2.0.1
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index aaa7c309d64f..518c8c476e05 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.1-SNAPSHOT
+  2.0.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.1-SNAPSHOT
+    2.0.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 65e2c262aeb1..dd4a6a6552c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.1-SNAPSHOT
+  2.0.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.1-SNAPSHOT
+        0.91.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.1-SNAPSHOT
+        2.0.1
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index fc0f57875c88..52d73b1fed6c 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.91.1-SNAPSHOT
+  0.91.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.1-SNAPSHOT
+    2.0.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 3e0f9e4740f0..f0a1846dab6e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.0:2.0.1-SNAPSHOT
-google-cloud-datastore-bom:2.0.0:2.0.1-SNAPSHOT
-google-cloud-datastore-parent:2.0.0:2.0.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.91.0:0.91.1-SNAPSHOT
-datastore-v1-proto-client:2.0.0:2.0.1-SNAPSHOT
+google-cloud-datastore:2.0.1:2.0.1
+google-cloud-datastore-bom:2.0.1:2.0.1
+google-cloud-datastore-parent:2.0.1:2.0.1
+proto-google-cloud-datastore-v1:0.91.1:0.91.1
+datastore-v1-proto-client:2.0.1:2.0.1
 

From 67e1f0f1e48e5d45167cda3d53a8ae5f0597d712 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 12 Aug 2021 14:40:28 +0000
Subject: [PATCH 0664/1784] chore: release 2.0.2-SNAPSHOT (#499)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a119a2a93dd0..dda6387e4695 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.0.1
+  2.0.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.1
+    2.0.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 45782f455191..0ac0c9d05c65 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.0.1
+  2.0.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.1
+        0.91.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.1
+        2.0.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 518c8c476e05..d815a977a8e2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.1
+  2.0.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.1
+    2.0.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index dd4a6a6552c6..e83bbad1888f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.1
+  2.0.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.1
+        0.91.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.1
+        2.0.2-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 52d73b1fed6c..6dab81a59be0 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.91.1
+  0.91.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.1
+    2.0.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index f0a1846dab6e..3844461e694f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.1:2.0.1
-google-cloud-datastore-bom:2.0.1:2.0.1
-google-cloud-datastore-parent:2.0.1:2.0.1
-proto-google-cloud-datastore-v1:0.91.1:0.91.1
-datastore-v1-proto-client:2.0.1:2.0.1
+google-cloud-datastore:2.0.1:2.0.2-SNAPSHOT
+google-cloud-datastore-bom:2.0.1:2.0.2-SNAPSHOT
+google-cloud-datastore-parent:2.0.1:2.0.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.91.1:0.91.2-SNAPSHOT
+datastore-v1-proto-client:2.0.1:2.0.2-SNAPSHOT
 

From 9a1f46ebc6787fe1c95fe2118c685feff53b4ff0 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 16 Aug 2021 06:47:56 -0700
Subject: [PATCH 0665/1784] build(java): use ENABLE_FLAKYBOT env variable
 (#501)

Kokoro job config now supports both environment variables during this migration period.

Source-Author: Jeff Ching 
Source-Date: Thu Aug 12 10:10:27 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: ff01716e16d2c6e87eaf87197b753ac9fcbbed5d
Source-Link: https://github.com/googleapis/synthtool/commit/ff01716e16d2c6e87eaf87197b753ac9fcbbed5d
---
 .kokoro/build.sh                | 2 +-
 .kokoro/nightly/integration.cfg | 2 +-
 .kokoro/nightly/samples.cfg     | 2 +-
 synth.metadata                  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index bad8ae5def42..9ddc69070e9a 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -115,7 +115,7 @@ fi
 # fix output location of logs
 bash .kokoro/coerce_logs.sh
 
-if [[ "${ENABLE_BUILD_COP}" == "true" ]]
+if [[ "${ENABLE_FLAKYBOT}" == "true" ]]
 then
     chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
     ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-datastore
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 0048c8ece7e5..e51c7b4c6c11 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -22,7 +22,7 @@ env_vars: {
 }
 
 env_vars: {
-  key: "ENABLE_BUILD_COP"
+  key: "ENABLE_FLAKYBOT"
   value: "true"
 }
 
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
index f25429314f4d..9761fd8648cb 100644
--- a/.kokoro/nightly/samples.cfg
+++ b/.kokoro/nightly/samples.cfg
@@ -33,6 +33,6 @@ env_vars: {
 }
 
 env_vars: {
-  key: "ENABLE_BUILD_COP"
+  key: "ENABLE_FLAKYBOT"
   value: "true"
 }
diff --git a/synth.metadata b/synth.metadata
index b22d633c7b46..418e22e1b533 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c5f227b3ba517dedc79d0a2ab5a36a4306aa83c6"
+        "sha": "67e1f0f1e48e5d45167cda3d53a8ae5f0597d712"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e"
+        "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d"
       }
     }
   ],

From 7ec82bdd8297c14a2fa8f54ed0236a3614c048e6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 16 Aug 2021 15:48:12 +0200
Subject: [PATCH 0666/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.0.1 (#500)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 7236ffce1bfd..4ef5838e4d52 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.0.0
+      2.0.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 43a12116983b..c2973e8e7b92 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.0.0
+      2.0.1
     
 
     

From be267f0268e869884b0232557a518819eb625033 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 16 Aug 2021 06:56:23 -0700
Subject: [PATCH 0667/1784] chore: regenerate README (#502)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-08-16 13:50:08,547 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-08-16 13:50:10,078 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/675816a2-f8a2-4763-b7b8-d688a6bbcacf/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index bd7ed0dea126..8249906e1d57 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "f0a92ccfa1d7abf03e2dfcbc36ecac6659f2642c"
+        "sha": "7ec82bdd8297c14a2fa8f54ed0236a3614c048e6"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6252f2cd074c38f37b44abe5e96d128733eb1b61"
+        "sha": "facee4cc1ea096cd8bcc008bb85929daa7c414c0"
       }
     }
   ]
diff --git a/README.md b/README.md
index 55c55b0469b3..1dca82f7a9de 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.0.0
+  2.0.1
 
 
 ```
@@ -56,13 +56,13 @@ compile 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:2.0.0'
+compile 'com.google.cloud:google-cloud-datastore:2.0.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.1"
 ```
 
 ## Authentication

From a47a0ce1e6c70cedf1a2b02323b92f6509db99d4 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 17 Aug 2021 16:56:38 +0200
Subject: [PATCH 0668/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v21 (#503)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.9.0` -> `21.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/compatibility-slim/20.9.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/confidence-slim/20.9.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index dfa468875452..53efdf9a4cdb 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        20.9.0
+        21.0.0
         pom
         import
       

From 1962cf96312e41c118cce4a8a79cc78c211bf515 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 17 Aug 2021 08:06:44 -0700
Subject: [PATCH 0669/1784] chore: regenerate README (#504)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-08-17 15:00:51,360 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-08-17 15:00:52,644 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/5192a81b-80b9-4e53-be7d-44992f9698ed/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 8249906e1d57..749ee64a4e32 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "7ec82bdd8297c14a2fa8f54ed0236a3614c048e6"
+        "sha": "a47a0ce1e6c70cedf1a2b02323b92f6509db99d4"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "facee4cc1ea096cd8bcc008bb85929daa7c414c0"
+        "sha": "a01e1a0bf70754f51450958b966bd673945d1e6e"
       }
     }
   ]
diff --git a/README.md b/README.md
index 1dca82f7a9de..70050551f13c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      20.9.0
+      21.0.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.9.0')
+implementation platform('com.google.cloud:libraries-bom:21.0.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 17f380c3ecbf007c9b60c4b85af42dace2416fdc Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 20 Aug 2021 00:03:05 +0200
Subject: [PATCH 0670/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.0.1 (#505)

---
 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 0ac0c9d05c65..28f67ffd2b9f 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.0.0
+    1.0.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index e83bbad1888f..6bbc737b7f67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.0.0
+    1.0.1
   
 
   

From 231a87fabd2450bb3169a4098ab6196baeeb05c8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 23 Aug 2021 22:50:49 +0200
Subject: [PATCH 0671/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.1.0 (#507)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.0.1` -> `2.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.1.0/compatibility-slim/2.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.1.0/confidence-slim/2.0.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.1.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​210-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare201v210-2021-08-23)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.0.1...v2.1.0)

##### Dependencies

-   update dependency com.google.auth:google-auth-library-bom to v1.1.0 ([#​439](https://www.togithub.com/googleapis/java-shared-dependencies/issues/439)) ([ca52bd9](https://www.github.com/googleapis/java-shared-dependencies/commit/ca52bd9c099c96bf7b5a57aa85d39b58a610c875))
-   update dependency com.google.cloud:google-cloud-core-bom to v2.1.0 ([#​444](https://www.togithub.com/googleapis/java-shared-dependencies/issues/444)) ([ff914c6](https://www.github.com/googleapis/java-shared-dependencies/commit/ff914c6de9e3e7fa6ba75591d3d5077c5421827d))
-   update dependency com.google.code.gson:gson to v2.8.8 ([#​442](https://www.togithub.com/googleapis/java-shared-dependencies/issues/442)) ([79a093f](https://www.github.com/googleapis/java-shared-dependencies/commit/79a093f9ccea4d47cf8b678570a1c9699029a8b2))
-   update dependency com.google.errorprone:error_prone_annotations to v2.9.0 ([#​441](https://www.togithub.com/googleapis/java-shared-dependencies/issues/441)) ([e644a4b](https://www.github.com/googleapis/java-shared-dependencies/commit/e644a4b504ab8aa5771f9be36861d1730ea9bcc9))
-   update dependency io.grpc:grpc-bom to v1.40.0 ([#​438](https://www.togithub.com/googleapis/java-shared-dependencies/issues/438)) ([c3f8fb4](https://www.github.com/googleapis/java-shared-dependencies/commit/c3f8fb4408f5dc6c7f7dc0e14f0c24fa755433a5))
-   update gax.version to v2.3.0 ([#​437](https://www.togithub.com/googleapis/java-shared-dependencies/issues/437)) ([e59aaad](https://www.github.com/googleapis/java-shared-dependencies/commit/e59aaadd76e40ab5ea31c3e812686a4ba0471a49))

##### [2.0.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.0.0...v2.0.1) (2021-08-11)

##### Dependencies

-   update dependency com.google.api:api-common to v2.0.1 ([#​431](https://www.togithub.com/googleapis/java-shared-dependencies/issues/431)) ([b1a52c8](https://www.github.com/googleapis/java-shared-dependencies/commit/b1a52c83e19be7be80086f2010e928171b046f62))
-   update gax.version to v2.1.0 ([#​432](https://www.togithub.com/googleapis/java-shared-dependencies/issues/432)) ([7f53006](https://www.github.com/googleapis/java-shared-dependencies/commit/7f53006d021e839f52325a87d7c4715eff88818d))
-   update google.core.version to v2.0.4 ([#​430](https://www.togithub.com/googleapis/java-shared-dependencies/issues/430)) ([d0465ad](https://www.github.com/googleapis/java-shared-dependencies/commit/d0465ad3a79993d4e854078ea992e53ab9add07f))
-   update google.core.version to v2.0.5 ([#​434](https://www.togithub.com/googleapis/java-shared-dependencies/issues/434)) ([af00753](https://www.github.com/googleapis/java-shared-dependencies/commit/af0075390034cba5cefede8260ab03f728d525a8))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 6bbc737b7f67..8a6a90331875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.0.1
+        2.1.0
         pom
         import
       

From 42074b77295a3326548ca9fb6a784f5412dd06da Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 21:40:34 +0000
Subject: [PATCH 0672/1784] chore: release 2.0.2 (#508)

:robot: I have created a release \*beep\* \*boop\*
---
### [2.0.2](https://www.github.com/googleapis/java-datastore/compare/v2.0.1...v2.0.2) (2021-08-23)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.1.0 ([#507](https://www.github.com/googleapis/java-datastore/issues/507)) ([231a87f](https://www.github.com/googleapis/java-datastore/commit/231a87fabd2450bb3169a4098ab6196baeeb05c8))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ce7bfa5fe2b..6eb898d15eff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.0.2](https://www.github.com/googleapis/java-datastore/compare/v2.0.1...v2.0.2) (2021-08-23)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.1.0 ([#507](https://www.github.com/googleapis/java-datastore/issues/507)) ([231a87f](https://www.github.com/googleapis/java-datastore/commit/231a87fabd2450bb3169a4098ab6196baeeb05c8))
+
 ### [2.0.1](https://www.github.com/googleapis/java-datastore/compare/v2.0.0...v2.0.1) (2021-08-12)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index dda6387e4695..70aa364bdab9 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.0.2-SNAPSHOT
+  2.0.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.2-SNAPSHOT
+    2.0.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 28f67ffd2b9f..b66905f4acaf 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.0.2-SNAPSHOT
+  2.0.2
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.2-SNAPSHOT
+        0.91.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.2-SNAPSHOT
+        2.0.2
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d815a977a8e2..cb6c1e667314 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.2-SNAPSHOT
+  2.0.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.2-SNAPSHOT
+    2.0.2
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 8a6a90331875..dfaf79b2e332 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.2-SNAPSHOT
+  2.0.2
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.2-SNAPSHOT
+        0.91.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.2-SNAPSHOT
+        2.0.2
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6dab81a59be0..69dfe608582b 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.91.2-SNAPSHOT
+  0.91.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.2-SNAPSHOT
+    2.0.2
   
   
     
diff --git a/versions.txt b/versions.txt
index 3844461e694f..6bb4b9078541 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.1:2.0.2-SNAPSHOT
-google-cloud-datastore-bom:2.0.1:2.0.2-SNAPSHOT
-google-cloud-datastore-parent:2.0.1:2.0.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.91.1:0.91.2-SNAPSHOT
-datastore-v1-proto-client:2.0.1:2.0.2-SNAPSHOT
+google-cloud-datastore:2.0.2:2.0.2
+google-cloud-datastore-bom:2.0.2:2.0.2
+google-cloud-datastore-parent:2.0.2:2.0.2
+proto-google-cloud-datastore-v1:0.91.2:0.91.2
+datastore-v1-proto-client:2.0.2:2.0.2
 

From b50dc129b943965854d8d8171112411408077c3d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 22:02:32 +0000
Subject: [PATCH 0673/1784] chore: release 2.0.3-SNAPSHOT (#509)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 70aa364bdab9..886efa0a3457 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.0.2
+  2.0.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.2
+    2.0.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b66905f4acaf..cfb124e338a2 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.0.2
+  2.0.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.2
+        0.91.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.2
+        2.0.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cb6c1e667314..4e9412e465bf 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.2
+  2.0.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.2
+    2.0.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index dfaf79b2e332..7d1cf68cc001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.2
+  2.0.3-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.2
+        0.91.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.2
+        2.0.3-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 69dfe608582b..80d3d59fac69 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.91.2
+  0.91.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.2
+    2.0.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 6bb4b9078541..1314ec101e38 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.2:2.0.2
-google-cloud-datastore-bom:2.0.2:2.0.2
-google-cloud-datastore-parent:2.0.2:2.0.2
-proto-google-cloud-datastore-v1:0.91.2:0.91.2
-datastore-v1-proto-client:2.0.2:2.0.2
+google-cloud-datastore:2.0.2:2.0.3-SNAPSHOT
+google-cloud-datastore-bom:2.0.2:2.0.3-SNAPSHOT
+google-cloud-datastore-parent:2.0.2:2.0.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.91.2:0.91.3-SNAPSHOT
+datastore-v1-proto-client:2.0.2:2.0.3-SNAPSHOT
 

From 51fb68f0f3a791c28f9b3d73fb6fc4fd7dfe2d3c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 24 Aug 2021 17:39:01 +0200
Subject: [PATCH 0674/1784] deps: update dependency
 com.google.oauth-client:google-oauth-client to v1.32.1 (#511)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7d1cf68cc001..047d17ec29a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,7 @@
       
         com.google.oauth-client
         google-oauth-client
-        1.31.5
+        1.32.1
       
       
       

From 001deacf1029f7b39d729685d796795cd98b72d4 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 24 Aug 2021 17:39:17 +0200
Subject: [PATCH 0675/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.0.2 (#510)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4ef5838e4d52..39034df4c8ae 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.0.1
+      2.0.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c2973e8e7b92..173d7c1110a9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.0.1
+      2.0.2
     
 
     

From 0192b19d87b727f8efd5d8d10907ceb17352c368 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 24 Aug 2021 15:46:10 +0000
Subject: [PATCH 0676/1784] chore: release 2.0.3 (#512)

:robot: I have created a release \*beep\* \*boop\*
---
### [2.0.3](https://www.github.com/googleapis/java-datastore/compare/v2.0.2...v2.0.3) (2021-08-24)


### Dependencies

* update dependency com.google.oauth-client:google-oauth-client to v1.32.1 ([#511](https://www.github.com/googleapis/java-datastore/issues/511)) ([51fb68f](https://www.github.com/googleapis/java-datastore/commit/51fb68f0f3a791c28f9b3d73fb6fc4fd7dfe2d3c))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eb898d15eff..4b4bc7afb2da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.0.3](https://www.github.com/googleapis/java-datastore/compare/v2.0.2...v2.0.3) (2021-08-24)
+
+
+### Dependencies
+
+* update dependency com.google.oauth-client:google-oauth-client to v1.32.1 ([#511](https://www.github.com/googleapis/java-datastore/issues/511)) ([51fb68f](https://www.github.com/googleapis/java-datastore/commit/51fb68f0f3a791c28f9b3d73fb6fc4fd7dfe2d3c))
+
 ### [2.0.2](https://www.github.com/googleapis/java-datastore/compare/v2.0.1...v2.0.2) (2021-08-23)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 886efa0a3457..97b38c234770 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.0.3-SNAPSHOT
+  2.0.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.3-SNAPSHOT
+    2.0.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index cfb124e338a2..1022b68613f1 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.0.3-SNAPSHOT
+  2.0.3
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.3-SNAPSHOT
+        0.91.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.3-SNAPSHOT
+        2.0.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4e9412e465bf..e700fbcb6bd6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.3-SNAPSHOT
+  2.0.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.3-SNAPSHOT
+    2.0.3
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 047d17ec29a0..ef1bfaed518a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.3-SNAPSHOT
+  2.0.3
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.3-SNAPSHOT
+        0.91.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.3-SNAPSHOT
+        2.0.3
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 80d3d59fac69..e53922e2d42c 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.91.3-SNAPSHOT
+  0.91.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.3-SNAPSHOT
+    2.0.3
   
   
     
diff --git a/versions.txt b/versions.txt
index 1314ec101e38..3d99f0d75738 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.2:2.0.3-SNAPSHOT
-google-cloud-datastore-bom:2.0.2:2.0.3-SNAPSHOT
-google-cloud-datastore-parent:2.0.2:2.0.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.91.2:0.91.3-SNAPSHOT
-datastore-v1-proto-client:2.0.2:2.0.3-SNAPSHOT
+google-cloud-datastore:2.0.3:2.0.3
+google-cloud-datastore-bom:2.0.3:2.0.3
+google-cloud-datastore-parent:2.0.3:2.0.3
+proto-google-cloud-datastore-v1:0.91.3:0.91.3
+datastore-v1-proto-client:2.0.3:2.0.3
 

From adb6723e2763d72314e5ac16dc1c0aa0f988c5f3 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 24 Aug 2021 08:48:24 -0700
Subject: [PATCH 0677/1784] chore: regenerate README (#513)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-08-24 15:41:12,962 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-08-24 15:41:14,118 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/8dee5b7f-ee50-40c6-ad0b-1242522739d9/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 749ee64a4e32..ec17b04ed542 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a47a0ce1e6c70cedf1a2b02323b92f6509db99d4"
+        "sha": "001deacf1029f7b39d729685d796795cd98b72d4"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "a01e1a0bf70754f51450958b966bd673945d1e6e"
+        "sha": "8032ab5a32471d85ece8fc261df16cc40fbfa4fb"
       }
     }
   ]
diff --git a/README.md b/README.md
index 70050551f13c..e244defd2dd6 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.0.1
+  2.0.2
 
 
 ```
@@ -56,13 +56,13 @@ compile 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:2.0.1'
+compile 'com.google.cloud:google-cloud-datastore:2.0.2'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.2"
 ```
 
 ## Authentication

From a99af57070fac891323169a55e5daa262473d439 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 24 Aug 2021 15:52:23 +0000
Subject: [PATCH 0678/1784] chore: release 2.0.4-SNAPSHOT (#514)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 97b38c234770..a78ed63422fc 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.0.3
+  2.0.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.3
+    2.0.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 1022b68613f1..3c0e67519e87 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.0.3
+  2.0.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.3
+        0.91.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.3
+        2.0.4-SNAPSHOT
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e700fbcb6bd6..e9886588aaf6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.3
+  2.0.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.3
+    2.0.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index ef1bfaed518a..47d488a0cf84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.3
+  2.0.4-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.3
+        0.91.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.3
+        2.0.4-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e53922e2d42c..5334b7813a73 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.91.3
+  0.91.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.3
+    2.0.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 3d99f0d75738..f394d63aeb73 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.3:2.0.3
-google-cloud-datastore-bom:2.0.3:2.0.3
-google-cloud-datastore-parent:2.0.3:2.0.3
-proto-google-cloud-datastore-v1:0.91.3:0.91.3
-datastore-v1-proto-client:2.0.3:2.0.3
+google-cloud-datastore:2.0.3:2.0.4-SNAPSHOT
+google-cloud-datastore-bom:2.0.3:2.0.4-SNAPSHOT
+google-cloud-datastore-parent:2.0.3:2.0.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.91.3:0.91.4-SNAPSHOT
+datastore-v1-proto-client:2.0.3:2.0.4-SNAPSHOT
 

From e9db3f956dac1c56a376d5a57872a27181586994 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 24 Aug 2021 19:36:42 +0200
Subject: [PATCH 0679/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.0.3 (#516)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 39034df4c8ae..3c31e1b0db1a 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.0.2
+      2.0.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 173d7c1110a9..5a5231b4253d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.0.2
+      2.0.3
     
 
     

From 7ed9471255a4cec4e3e656eafd4a869356246980 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 24 Aug 2021 10:46:17 -0700
Subject: [PATCH 0680/1784] chore: regenerate README (#517)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-08-24 17:38:56,551 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-08-24 17:38:57,581 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/99b3cc22-ba48-4d98-a981-0d72b0f8d5b8/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 2 +-
 README.md                                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index ec17b04ed542..395422d70512 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "001deacf1029f7b39d729685d796795cd98b72d4"
+        "sha": "e9db3f956dac1c56a376d5a57872a27181586994"
       }
     },
     {
diff --git a/README.md b/README.md
index e244defd2dd6..08ea37bf96ad 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.0.2
+  2.0.3
 
 
 ```
@@ -56,13 +56,13 @@ compile 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:2.0.2'
+compile 'com.google.cloud:google-cloud-datastore:2.0.3'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.3"
 ```
 
 ## Authentication

From e4ae76cd1375baab3c59e381ccac40b62c3516f4 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki 
Date: Tue, 24 Aug 2021 14:32:46 -0400
Subject: [PATCH 0681/1784] ci: removing linkage-monitor from the required
 checks (#515)

Linkage Monitor is no longer needed, because the Libraries BOM synchronizes with Google Cloud BOM and the shared dependencies BOM https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/2137
---
 .github/sync-repo-settings.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index c123a3b45348..5c3b3bd123af 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -10,7 +10,6 @@ branchProtectionRules:
     requiredStatusCheckContexts:
       - dependencies (8)
       - dependencies (11)
-      - linkage-monitor
       - lint
       - clirr
       - units (8)
@@ -25,7 +24,6 @@ branchProtectionRules:
     requiredStatusCheckContexts:
       - dependencies (8)
       - dependencies (11)
-      - linkage-monitor
       - lint
       - clirr
       - units (8)
@@ -40,7 +38,6 @@ branchProtectionRules:
     requiredStatusCheckContexts:
       - dependencies (8)
       - dependencies (11)
-      - linkage-monitor
       - lint
       - clirr
       - units (7)

From d36e7bc54c27b55d96f04c615453cb18dda5dcda Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 26 Aug 2021 09:06:10 -0700
Subject: [PATCH 0682/1784] chore: enable release-trigger bot (#518)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/ed02a3e1-b378-497e-80e9-bc65989974c2/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/63cff634aabb85854caa511c5837ea6b45f42b4b
---
 .github/release-trigger.yml | 1 +
 synth.metadata              | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 .github/release-trigger.yml

diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
new file mode 100644
index 000000000000..d4ca94189e16
--- /dev/null
+++ b/.github/release-trigger.yml
@@ -0,0 +1 @@
+enabled: true
diff --git a/synth.metadata b/synth.metadata
index 418e22e1b533..32a8913b64bb 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "67e1f0f1e48e5d45167cda3d53a8ae5f0597d712"
+        "sha": "e4ae76cd1375baab3c59e381ccac40b62c3516f4"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d"
+        "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b"
       }
     }
   ],
@@ -44,6 +44,7 @@
     ".github/generated-files-bot.yml",
     ".github/readme/synth.py",
     ".github/release-please.yml",
+    ".github/release-trigger.yml",
     ".github/snippet-bot.yml",
     ".github/sync-repo-settings.yaml",
     ".github/trusted-contribution.yml",

From 76397bf7ce27804101a1622e82f436cac0dcd605 Mon Sep 17 00:00:00 2001
From: Aristide Niyungeko <2230766+aristide-n@users.noreply.github.com>
Date: Thu, 26 Aug 2021 12:20:11 -0700
Subject: [PATCH 0683/1784] feat: support overriding the emulator download URL
 in LocalDatastoreHelper (#492)

Fixes #376
---
 .../cloud/datastore/testing/LocalDatastoreHelper.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 2867d7e3069f..e586f7e55805 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
@@ -63,6 +63,8 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
   private static final String MD5_CHECKSUM = "ec2237a0f0ac54964c6bd95e12c73720";
   private static final String BIN_CMD_PORT_FLAG = "--port=";
   private static final URL EMULATOR_URL;
+  private static final String EMULATOR_URL_ENV_VAR = "DATASTORE_EMULATOR_URL";
+  private static final String ACCESS_TOKEN = System.getenv("DATASTORE_EMULATOR_ACCESS_TOKEN");
 
   // Common settings
   private static final String CONSISTENCY_FLAG = "--consistency=";
@@ -72,7 +74,11 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
 
   static {
     try {
-      EMULATOR_URL = new URL("http://storage.googleapis.com/gcd/tools/" + FILENAME);
+      if (System.getenv(EMULATOR_URL_ENV_VAR) == null) {
+        EMULATOR_URL = new URL("http://storage.googleapis.com/gcd/tools/" + FILENAME);
+      } else {
+        EMULATOR_URL = new URL(System.getenv(EMULATOR_URL_ENV_VAR));
+      }
     } catch (MalformedURLException ex) {
       throw new IllegalStateException(ex);
     }
@@ -147,7 +153,7 @@ private LocalDatastoreHelper(Builder builder) {
       gcloudCommand.add("--data-dir=" + getGcdPath());
     }
     DownloadableEmulatorRunner downloadRunner =
-        new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM);
+        new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM, ACCESS_TOKEN);
     this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner);
   }
 

From a6a5b33f51dcd632d187c1b790d59cb6454d1efd Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 27 Aug 2021 17:01:15 +0200
Subject: [PATCH 0684/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v22 (#521)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `21.0.0` -> `22.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/compatibility-slim/21.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/confidence-slim/21.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 53efdf9a4cdb..13f5ff1b63bb 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        21.0.0
+        22.0.0
         pom
         import
       

From 750e43caca5662e82511fd8adee6e1ac1bd19186 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 27 Aug 2021 08:12:24 -0700
Subject: [PATCH 0685/1784] chore: regenerate README (#522)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-08-27 15:05:59,607 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-08-27 15:06:00,634 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/1c2f57ff-17e8-439e-bdf8-73b2998a1e26/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 395422d70512..84ddc0a9ef0b 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "e9db3f956dac1c56a376d5a57872a27181586994"
+        "sha": "a6a5b33f51dcd632d187c1b790d59cb6454d1efd"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8032ab5a32471d85ece8fc261df16cc40fbfa4fb"
+        "sha": "31728d872f50e439ded2f67fa8d67955b26a4e35"
       }
     }
   ]
diff --git a/README.md b/README.md
index 08ea37bf96ad..9a1dd40bad2c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      21.0.0
+      22.0.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:21.0.0')
+implementation platform('com.google.cloud:libraries-bom:22.0.0')
 
 compile 'com.google.cloud:google-cloud-datastore'
 ```

From 60a95791ffe048e87fa6b0ad2c43bbc1b1838a24 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 31 Aug 2021 13:13:00 -0700
Subject: [PATCH 0686/1784] ci: removing linkage-monitor from the required
 checks (#520)

Source-Author: Tomo Suzuki 
Source-Date: Wed Aug 25 13:18:10 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22
Source-Link: https://github.com/googleapis/synthtool/commit/e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22
---
 .github/workflows/ci.yaml | 13 -------------
 synth.metadata            |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 65ae6ecdda77..d510359d97df 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -42,19 +42,6 @@ jobs:
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
-  linkage-monitor:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - run: java -version
-    - name: Install artifacts to local Maven repository
-      run: .kokoro/build.sh
-      shell: bash
-    - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
-      uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
   lint:
     runs-on: ubuntu-latest
     steps:
diff --git a/synth.metadata b/synth.metadata
index 32a8913b64bb..01f54eb03d66 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "e4ae76cd1375baab3c59e381ccac40b62c3516f4"
+        "sha": "76397bf7ce27804101a1622e82f436cac0dcd605"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b"
+        "sha": "e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22"
       }
     }
   ],

From 52f3d3ba0e9418e4f59d60fe3d19d6e7d6c2ce9e Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 31 Aug 2021 13:22:17 -0700
Subject: [PATCH 0687/1784] chore: regenerate README (#523)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-08-31 20:15:05,805 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-08-31 20:15:07,336 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/cb9d4e9c-e9b4-43a4-8159-5fd18ab10106/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata | 4 ++--
 README.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 84ddc0a9ef0b..b2d114f28639 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a6a5b33f51dcd632d187c1b790d59cb6454d1efd"
+        "sha": "60a95791ffe048e87fa6b0ad2c43bbc1b1838a24"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "31728d872f50e439ded2f67fa8d67955b26a4e35"
+        "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9"
       }
     }
   ]
diff --git a/README.md b/README.md
index 9a1dd40bad2c..466574ffc81a 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
 implementation platform('com.google.cloud:libraries-bom:22.0.0')
 
-compile 'com.google.cloud:google-cloud-datastore'
+implementation 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:2.0.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.0.3'
 ```
 
 If you are using SBT, add this to your dependencies

From 81b9de5b8bc6e788618b2530a9f47ca97aa30d98 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 31 Aug 2021 22:50:45 +0200
Subject: [PATCH 0688/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.2.0 (#524)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.1.0` -> `2.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/compatibility-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/confidence-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.2.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​220-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare210v220-2021-08-31)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.1.0...v2.2.0)

##### Dependencies

-   update dependency com.fasterxml.jackson:jackson-bom to v2.12.5 ([#​456](https://www.togithub.com/googleapis/java-shared-dependencies/issues/456)) ([05b58e8](https://www.github.com/googleapis/java-shared-dependencies/commit/05b58e84ff6617bdcbb1ea644aa6e061bdea0319))
-   update dependency com.google.api:api-common to v2.0.2 ([#​450](https://www.togithub.com/googleapis/java-shared-dependencies/issues/450)) ([51caebe](https://www.github.com/googleapis/java-shared-dependencies/commit/51caebe89bfade98866f63952bf82bc663a0179a))
-   update dependency com.google.http-client:google-http-client-bom to v1.40.0 ([#​455](https://www.togithub.com/googleapis/java-shared-dependencies/issues/455)) ([82a5e42](https://www.github.com/googleapis/java-shared-dependencies/commit/82a5e42b06570a2c7c9d53b03161b110a44487a1))
-   update dependency com.google.oauth-client:google-oauth-client-bom to v1.32.1 ([#​447](https://www.togithub.com/googleapis/java-shared-dependencies/issues/447)) ([9d2b895](https://www.github.com/googleapis/java-shared-dependencies/commit/9d2b8958f62daa6a3015a8ac052762fb3d79b35b))
-   update dependency io.grpc:grpc-bom to v1.40.1 ([#​451](https://www.togithub.com/googleapis/java-shared-dependencies/issues/451)) ([df668ea](https://www.github.com/googleapis/java-shared-dependencies/commit/df668ead8830a40acf9d5605d47f93c465b779c0))
-   update gax.version to v2.4.0 ([#​458](https://www.togithub.com/googleapis/java-shared-dependencies/issues/458)) ([a797d9e](https://www.github.com/googleapis/java-shared-dependencies/commit/a797d9eb8a4bcb3025a9511eae61271278a4a5c9))
-   update google.common-protos.version to v2.5.0 ([#​457](https://www.togithub.com/googleapis/java-shared-dependencies/issues/457)) ([38c7bb9](https://www.github.com/googleapis/java-shared-dependencies/commit/38c7bb925414d90ff3065650d06589f79bcab9b6))
-   update google.core.version to v2.1.1 ([#​449](https://www.togithub.com/googleapis/java-shared-dependencies/issues/449)) ([b28723a](https://www.github.com/googleapis/java-shared-dependencies/commit/b28723ace0c27ebc73f23a2d094e0fe9ba8a9075))
-   update google.core.version to v2.1.2 ([#​459](https://www.togithub.com/googleapis/java-shared-dependencies/issues/459)) ([df4d5b7](https://www.github.com/googleapis/java-shared-dependencies/commit/df4d5b7717386f5e0e2cca87bd9afc56b2c7aee8))
-   update iam.version to v1.1.0 ([#​448](https://www.togithub.com/googleapis/java-shared-dependencies/issues/448)) ([3967928](https://www.github.com/googleapis/java-shared-dependencies/commit/39679287f3ef8c1cbca5dfc8aca3f69cfee3d4a6))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 47d488a0cf84..9c3dc6458b0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.1.0
+        2.2.0
         pom
         import
       

From 75c4ed81372d2032c8fc629d537900bd3f6fe032 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 31 Aug 2021 15:04:45 -0700
Subject: [PATCH 0689/1784] build(java): update renovate config to mark
 conformance tests as a test commit type (#525)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/5b325cc6-691a-4054-abaa-fd08ce604955/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/9a238a0623879c3de129a376c6085d4a862f6eb9
---
 renovate.json  | 3 ++-
 synth.metadata | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/renovate.json b/renovate.json
index 840e731d5c84..7bbedfd56e2a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -50,7 +50,8 @@
         "^junit:junit",
         "^com.google.truth:truth",
         "^org.mockito:mockito-core",
-        "^org.objenesis:objenesis"
+        "^org.objenesis:objenesis",
+        "^com.google.cloud:google-cloud-conformance-tests"
       ],
       "semanticCommitType": "test",
       "semanticCommitScope": "deps"
diff --git a/synth.metadata b/synth.metadata
index 01f54eb03d66..aafeb97ec34a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "76397bf7ce27804101a1622e82f436cac0dcd605"
+        "sha": "81b9de5b8bc6e788618b2530a9f47ca97aa30d98"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22"
+        "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9"
       }
     }
   ],

From e4da914b3f831e93410e07bb74f8bdf69d8f3309 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:29:11 +0000
Subject: [PATCH 0690/1784] chore: release 2.1.0 (#519)

:robot: I have created a release \*beep\* \*boop\*
---
## [2.1.0](https://www.github.com/googleapis/java-datastore/compare/v2.0.3...v2.1.0) (2021-08-31)


### Features

* support overriding the emulator download URL in LocalDatastoreHelper ([#492](https://www.github.com/googleapis/java-datastore/issues/492)) ([76397bf](https://www.github.com/googleapis/java-datastore/commit/76397bf7ce27804101a1622e82f436cac0dcd605)), closes [#376](https://www.github.com/googleapis/java-datastore/issues/376)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#524](https://www.github.com/googleapis/java-datastore/issues/524)) ([81b9de5](https://www.github.com/googleapis/java-datastore/commit/81b9de5b8bc6e788618b2530a9f47ca97aa30d98))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 12 ++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b4bc7afb2da..44bc9408297d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.1.0](https://www.github.com/googleapis/java-datastore/compare/v2.0.3...v2.1.0) (2021-08-31)
+
+
+### Features
+
+* support overriding the emulator download URL in LocalDatastoreHelper ([#492](https://www.github.com/googleapis/java-datastore/issues/492)) ([76397bf](https://www.github.com/googleapis/java-datastore/commit/76397bf7ce27804101a1622e82f436cac0dcd605)), closes [#376](https://www.github.com/googleapis/java-datastore/issues/376)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#524](https://www.github.com/googleapis/java-datastore/issues/524)) ([81b9de5](https://www.github.com/googleapis/java-datastore/commit/81b9de5b8bc6e788618b2530a9f47ca97aa30d98))
+
 ### [2.0.3](https://www.github.com/googleapis/java-datastore/compare/v2.0.2...v2.0.3) (2021-08-24)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a78ed63422fc..15cb85e3137a 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.0.4-SNAPSHOT
+  2.1.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.4-SNAPSHOT
+    2.1.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3c0e67519e87..baf723a73af7 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.0.4-SNAPSHOT
+  2.1.0
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.4-SNAPSHOT
+        0.92.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.0.4-SNAPSHOT
+        2.1.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e9886588aaf6..62396d1a04d7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.0.4-SNAPSHOT
+  2.1.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.4-SNAPSHOT
+    2.1.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 9c3dc6458b0d..dbc85a988ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.0.4-SNAPSHOT
+  2.1.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.91.4-SNAPSHOT
+        0.92.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.0.4-SNAPSHOT
+        2.1.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 5334b7813a73..c204be7a9c36 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.91.4-SNAPSHOT
+  0.92.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.0.4-SNAPSHOT
+    2.1.0
   
   
     
diff --git a/versions.txt b/versions.txt
index f394d63aeb73..d6bc02a656f8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.0.3:2.0.4-SNAPSHOT
-google-cloud-datastore-bom:2.0.3:2.0.4-SNAPSHOT
-google-cloud-datastore-parent:2.0.3:2.0.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.91.3:0.91.4-SNAPSHOT
-datastore-v1-proto-client:2.0.3:2.0.4-SNAPSHOT
+google-cloud-datastore:2.1.0:2.1.0
+google-cloud-datastore-bom:2.1.0:2.1.0
+google-cloud-datastore-parent:2.1.0:2.1.0
+proto-google-cloud-datastore-v1:0.92.0:0.92.0
+datastore-v1-proto-client:2.1.0:2.1.0
 

From 3499bad3cf840a178768e80c310cfe98714d4843 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:36:36 +0000
Subject: [PATCH 0691/1784] chore: release 2.1.1-SNAPSHOT (#526)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 15cb85e3137a..4236c648e908 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.1.0
+  2.1.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.0
+    2.1.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index baf723a73af7..8bebfd9c7508 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.1.0
+  2.1.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.0
+        0.92.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.0
+        2.1.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 62396d1a04d7..db326db9add6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.0
+  2.1.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.0
+    2.1.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index dbc85a988ecd..529b25ade201 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.0
+  2.1.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.0
+        0.92.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.0
+        2.1.1-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c204be7a9c36..b8782731e1e1 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.92.0
+  0.92.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.0
+    2.1.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index d6bc02a656f8..0adece718722 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.0:2.1.0
-google-cloud-datastore-bom:2.1.0:2.1.0
-google-cloud-datastore-parent:2.1.0:2.1.0
-proto-google-cloud-datastore-v1:0.92.0:0.92.0
-datastore-v1-proto-client:2.1.0:2.1.0
+google-cloud-datastore:2.1.0:2.1.1-SNAPSHOT
+google-cloud-datastore-bom:2.1.0:2.1.1-SNAPSHOT
+google-cloud-datastore-parent:2.1.0:2.1.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.92.0:0.92.1-SNAPSHOT
+datastore-v1-proto-client:2.1.0:2.1.1-SNAPSHOT
 

From 8e23454826672a7743e8f67f9bc9ccec2c7204f6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 2 Sep 2021 18:28:32 +0200
Subject: [PATCH 0692/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.1.0 (#527)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.0.3` -> `2.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.1.0/compatibility-slim/2.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.1.0/confidence-slim/2.0.3)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.1.0`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​210-httpswwwgithubcomgoogleapisjava-datastorecomparev203v210-2021-08-31)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.0.3...v2.1.0)

##### Features

-   support overriding the emulator download URL in LocalDatastoreHelper ([#​492](https://www.togithub.com/googleapis/java-datastore/issues/492)) ([76397bf](https://www.github.com/googleapis/java-datastore/commit/76397bf7ce27804101a1622e82f436cac0dcd605)), closes [#​376](https://www.togithub.com/googleapis/java-datastore/issues/376)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#​524](https://www.togithub.com/googleapis/java-datastore/issues/524)) ([81b9de5](https://www.github.com/googleapis/java-datastore/commit/81b9de5b8bc6e788618b2530a9f47ca97aa30d98))

##### [2.0.3](https://www.github.com/googleapis/java-datastore/compare/v2.0.2...v2.0.3) (2021-08-24)

##### Dependencies

-   update dependency com.google.oauth-client:google-oauth-client to v1.32.1 ([#​511](https://www.togithub.com/googleapis/java-datastore/issues/511)) ([51fb68f](https://www.github.com/googleapis/java-datastore/commit/51fb68f0f3a791c28f9b3d73fb6fc4fd7dfe2d3c))

##### [2.0.2](https://www.github.com/googleapis/java-datastore/compare/v2.0.1...v2.0.2) (2021-08-23)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.1.0 ([#​507](https://www.togithub.com/googleapis/java-datastore/issues/507)) ([231a87f](https://www.github.com/googleapis/java-datastore/commit/231a87fabd2450bb3169a4098ab6196baeeb05c8))

##### [2.0.1](https://www.github.com/googleapis/java-datastore/compare/v2.0.0...v2.0.1) (2021-08-12)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.0.1 ([#​496](https://www.togithub.com/googleapis/java-datastore/issues/496)) ([a8dde5d](https://www.github.com/googleapis/java-datastore/commit/a8dde5dcb5575f391db0d300ac7cf56c029a51f7))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 3c31e1b0db1a..473298a6d394 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.0.3
+      2.1.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5a5231b4253d..f0c9206ef88d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.0.3
+      2.1.0
     
 
     

From 1df66809c5ca9f4b94a9f2e51ad96b88af9c5cfe Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 3 Sep 2021 08:46:14 -0700
Subject: [PATCH 0693/1784] chore(java): install maven 3.8.1 at runtime (#529)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/e94472c3-adac-4a62-b2e3-9e3d53a2f9cd/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/ad7fd76e17bf9494a3e47ff9cf445f61564432e0
---
 .github/workflows/ci.yaml | 14 +++++++++++++-
 synth.metadata            |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d510359d97df..e23d923e1e72 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,6 +12,9 @@ jobs:
         java: [8, 11]
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: ${{matrix.java}}
@@ -37,6 +40,9 @@ jobs:
         java: [8, 11]
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: ${{matrix.java}}
@@ -46,6 +52,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
@@ -57,10 +66,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
       env:
-        JOB_TYPE: clirr
+        JOB_TYPE: clirr
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index aafeb97ec34a..3ffd76d721a0 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "81b9de5b8bc6e788618b2530a9f47ca97aa30d98"
+        "sha": "8e23454826672a7743e8f67f9bc9ccec2c7204f6"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9"
+        "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0"
       }
     }
   ],

From 1f50cd82af6f51072616a8c384e33dd4519a1110 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 8 Sep 2021 08:37:49 -0700
Subject: [PATCH 0694/1784] chore(java): update windows build (#531)

to install maven 3.8.1 at runtime too (related to #1202)

Tested in [java-bigquerystorage](https://github.com/googleapis/java-bigquerystorage/pull/1291/commits/7834f4ff86858f6ed0b8068ea66dadf6365e399a)

Source-Author: Stephanie Wang 
Source-Date: Tue Sep 7 13:04:27 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 17ee6e5c08f2eb47029beee4776ce990e56b3925
Source-Link: https://github.com/googleapis/synthtool/commit/17ee6e5c08f2eb47029beee4776ce990e56b3925
---
 .github/workflows/ci.yaml | 5 ++++-
 synth.metadata            | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e23d923e1e72..3becb5c022a3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -26,6 +26,9 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
@@ -75,4 +78,4 @@ jobs:
     - run: java -version
     - run: .kokoro/build.sh
       env:
-        JOB_TYPE: clirr
\ No newline at end of file
+        JOB_TYPE: clirr
diff --git a/synth.metadata b/synth.metadata
index 3ffd76d721a0..c0effc88f8bd 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "8e23454826672a7743e8f67f9bc9ccec2c7204f6"
+        "sha": "1df66809c5ca9f4b94a9f2e51ad96b88af9c5cfe"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0"
+        "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925"
       }
     }
   ],

From b1932d97b8263c2bcfdf31179bb5705988d8d516 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 8 Sep 2021 17:38:19 +0200
Subject: [PATCH 0695/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v23 (#530)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 13f5ff1b63bb..58abbe3d5627 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        22.0.0
+        23.0.0
         pom
         import
       

From 1419adf6a1366dde1d8b7a8fe58e36bda1a8d2d0 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 8 Sep 2021 08:48:28 -0700
Subject: [PATCH 0696/1784] chore: regenerate README (#532)

This PR was generated using Autosynth. :rainbow:



    Log from Synthtool

```
2021-09-08 15:41:46,846 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-09-08 15:41:47,965 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.

```

    

Full log will be available here:
https://source.cloud.google.com/results/invocations/cf5614d5-a6d6-4549-95dc-241ed722649c/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
 .github/readme/synth.metadata/synth.metadata |  4 ++--
 README.md                                    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index b2d114f28639..250e22d86232 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "60a95791ffe048e87fa6b0ad2c43bbc1b1838a24"
+        "sha": "b1932d97b8263c2bcfdf31179bb5705988d8d516"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9"
+        "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925"
       }
     }
   ]
diff --git a/README.md b/README.md
index 466574ffc81a..cdb33ce134d7 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      22.0.0
+      23.0.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.0.3
+  2.1.0
 
 
 ```
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:22.0.0')
+implementation platform('com.google.cloud:libraries-bom:23.0.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.0.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.1.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.1.0"
 ```
 
 ## Authentication

From df53434ad07f2402b8ead655ab68909ae78a9789 Mon Sep 17 00:00:00 2001
From: Jeff Ching 
Date: Wed, 8 Sep 2021 13:14:52 -0700
Subject: [PATCH 0697/1784] chore: remove readme autosynth config (#533)

---
 .kokoro/continuous/readme.cfg | 55 -----------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 .kokoro/continuous/readme.cfg

diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
deleted file mode 100644
index 8df31c595c47..000000000000
--- a/.kokoro/continuous/readme.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020 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.
-
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/readme.sh"
-}
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-    regex: "**/*sponge_log.log"
-  }
-}
-
-# The github token is stored here.
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "yoshi-automation-github-key"
-      # TODO(theacodes): remove this after secrets have globally propagated
-      backend_type: FASTCONFIGPUSH
-    }
-  }
-}
-
-# Common env vars for all repositories and builds.
-env_vars: {
-    key: "GITHUB_USER"
-    value: "yoshi-automation"
-}
-env_vars: {
-    key: "GITHUB_EMAIL"
-    value: "yoshi-automation@google.com"
-}

From cdcae1d040398de77394754ec24cbfc58c2b0f6d Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 9 Sep 2021 13:22:19 -0700
Subject: [PATCH 0698/1784] chore: synthtool template updates (#535)

* changes without context

        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.

* chore(java): remove readme autosynth job config

README generation is now handled by owlbot

Source-Author: Jeff Ching 
Source-Date: Wed Sep 8 12:11:28 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: df5093b950d4aafd49a4c7758d74c44485263ada
Source-Link: https://github.com/googleapis/synthtool/commit/df5093b950d4aafd49a4c7758d74c44485263ada

* chore: remove readme synth.py config

Source-Author: Jeff Ching 
Source-Date: Wed Sep 8 13:23:41 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 2d31a9243781b282202b4f76dc7bbc8b45803196
Source-Link: https://github.com/googleapis/synthtool/commit/2d31a9243781b282202b4f76dc7bbc8b45803196

* chore: add gcf-owl-bot to list of trusted contributors

Source-Author: Jeff Ching 
Source-Date: Wed Sep 8 13:42:12 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: a6b97202771f89a4b76873d43ea9a07d7fc95f91
Source-Link: https://github.com/googleapis/synthtool/commit/a6b97202771f89a4b76873d43ea9a07d7fc95f91

* chore(java): update shared-config and shared-dependencies version in pom template

Source-Author: Neenu Shaji 
Source-Date: Wed Sep 8 17:28:48 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e
Source-Link: https://github.com/googleapis/synthtool/commit/396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e
---
 .github/readme/synth.py              | 19 -------------------
 .github/trusted-contribution.yml     |  3 ++-
 .kokoro/release/common.sh            |  2 +-
 .kokoro/release/drop.sh              |  2 +-
 .kokoro/release/promote.sh           |  2 +-
 .kokoro/release/publish_javadoc.sh   |  2 +-
 .kokoro/release/publish_javadoc11.sh |  2 +-
 .kokoro/release/stage.sh             |  2 +-
 .kokoro/trampoline.sh                |  2 +-
 synth.metadata                       |  6 ++----
 10 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 .github/readme/synth.py

diff --git a/.github/readme/synth.py b/.github/readme/synth.py
deleted file mode 100644
index 7b48cc28d361..000000000000
--- a/.github/readme/synth.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020 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.
-
-"""This script is used to synthesize generated the README for this library."""
-
-from synthtool.languages import java
-
-java.custom_templates(["java_library/README.md"])
diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
index f247d5c78934..a0ba1f7d9078 100644
--- a/.github/trusted-contribution.yml
+++ b/.github/trusted-contribution.yml
@@ -1,2 +1,3 @@
 trustedContributors:
-- renovate-bot
\ No newline at end of file
+- renovate-bot
+- gcf-owl-bot[bot]
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
index 6e3f65999b3d..7f78ee414faf 100755
--- a/.kokoro/release/common.sh
+++ b/.kokoro/release/common.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
index 5c4551efa2c0..742ec1a88600 100755
--- a/.kokoro/release/drop.sh
+++ b/.kokoro/release/drop.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
index 1fa95fa537a3..3cac3d8a97d7 100755
--- a/.kokoro/release/promote.sh
+++ b/.kokoro/release/promote.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 18b3da5839aa..89872968a4ec 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019 Google Inc.
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 4a6619862b69..b3887101ebe2 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021 Google Inc.
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 8a1033843cb1..77dc4e8f0f3a 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
index 9da0f8398773..8b69b793c9ec 100644
--- a/.kokoro/trampoline.sh
+++ b/.kokoro/trampoline.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/synth.metadata b/synth.metadata
index c0effc88f8bd..b7575f94656e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "1df66809c5ca9f4b94a9f2e51ad96b88af9c5cfe"
+        "sha": "df53434ad07f2402b8ead655ab68909ae78a9789"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925"
+        "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e"
       }
     }
   ],
@@ -42,7 +42,6 @@
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/blunderbuss.yml",
     ".github/generated-files-bot.yml",
-    ".github/readme/synth.py",
     ".github/release-please.yml",
     ".github/release-trigger.yml",
     ".github/snippet-bot.yml",
@@ -59,7 +58,6 @@
     ".kokoro/common.sh",
     ".kokoro/continuous/common.cfg",
     ".kokoro/continuous/java8.cfg",
-    ".kokoro/continuous/readme.cfg",
     ".kokoro/dependencies.sh",
     ".kokoro/nightly/common.cfg",
     ".kokoro/nightly/integration.cfg",

From fcad6de0e44257f9ad3e27a1e3ef7df909eece10 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 14 Sep 2021 03:54:20 +0200
Subject: [PATCH 0699/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.0.2 (#537)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.0.1` -> `1.0.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/compatibility-slim/1.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/confidence-slim/1.0.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.0.2`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​102-httpswwwgithubcomgoogleapisjava-shared-configcomparev101v102-2021-09-13)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2)


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 8bebfd9c7508..24106e4122fa 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.0.1
+    1.0.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 529b25ade201..8998098917d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.0.1
+    1.0.2
   
 
   

From b9b0e79f6510311666b1ba442cab124d9c6c547f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 14 Sep 2021 04:22:18 +0200
Subject: [PATCH 0700/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.2.1 (#536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.2.0` -> `2.2.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/compatibility-slim/2.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/confidence-slim/2.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.2.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​221-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare220v221-2021-09-13)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.2.0...v2.2.1)


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 8998098917d5..bcd8df4278c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.2.0
+        2.2.1
         pom
         import
       

From cc273c1ccb8a01456689a61260b221ffc0042943 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 02:30:32 +0000
Subject: [PATCH 0701/1784] chore: release 2.1.1 (#538)

:robot: I have created a release \*beep\* \*boop\*
---
### [2.1.1](https://www.github.com/googleapis/java-datastore/compare/v2.1.0...v2.1.1) (2021-09-14)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#536](https://www.github.com/googleapis/java-datastore/issues/536)) ([b9b0e79](https://www.github.com/googleapis/java-datastore/commit/b9b0e79f6510311666b1ba442cab124d9c6c547f))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44bc9408297d..b66b5b4d6094 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.1.1](https://www.github.com/googleapis/java-datastore/compare/v2.1.0...v2.1.1) (2021-09-14)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#536](https://www.github.com/googleapis/java-datastore/issues/536)) ([b9b0e79](https://www.github.com/googleapis/java-datastore/commit/b9b0e79f6510311666b1ba442cab124d9c6c547f))
+
 ## [2.1.0](https://www.github.com/googleapis/java-datastore/compare/v2.0.3...v2.1.0) (2021-08-31)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4236c648e908..8695c639f4c5 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.1.1-SNAPSHOT
+  2.1.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.1-SNAPSHOT
+    2.1.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 24106e4122fa..83a00a6f379d 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.1.1-SNAPSHOT
+  2.1.1
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.1-SNAPSHOT
+        0.92.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.1-SNAPSHOT
+        2.1.1
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index db326db9add6..41ef0f651a62 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.1-SNAPSHOT
+  2.1.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.1-SNAPSHOT
+    2.1.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index bcd8df4278c5..de1319fd52ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.1-SNAPSHOT
+  2.1.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.1-SNAPSHOT
+        0.92.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.1-SNAPSHOT
+        2.1.1
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b8782731e1e1..e3384037b733 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.92.1-SNAPSHOT
+  0.92.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.1-SNAPSHOT
+    2.1.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 0adece718722..3220404ea7b1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.0:2.1.1-SNAPSHOT
-google-cloud-datastore-bom:2.1.0:2.1.1-SNAPSHOT
-google-cloud-datastore-parent:2.1.0:2.1.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.92.0:0.92.1-SNAPSHOT
-datastore-v1-proto-client:2.1.0:2.1.1-SNAPSHOT
+google-cloud-datastore:2.1.1:2.1.1
+google-cloud-datastore-bom:2.1.1:2.1.1
+google-cloud-datastore-parent:2.1.1:2.1.1
+proto-google-cloud-datastore-v1:0.92.1:0.92.1
+datastore-v1-proto-client:2.1.1:2.1.1
 

From 7cbbd5f311e9ab0ec5911dbce3f6efe9d9204530 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 02:40:20 +0000
Subject: [PATCH 0702/1784] chore: release 2.1.2-SNAPSHOT (#539)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8695c639f4c5..585e3bc993af 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.1.1
+  2.1.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.1
+    2.1.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 83a00a6f379d..33b6071a518c 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.1.1
+  2.1.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.1
+        0.92.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.1
+        2.1.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 41ef0f651a62..7cafebd22d6a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.1
+  2.1.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.1
+    2.1.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index de1319fd52ba..3c5204706568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.1
+  2.1.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.1
+        0.92.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.1
+        2.1.2-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e3384037b733..d62b27d7216e 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.92.1
+  0.92.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.1
+    2.1.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 3220404ea7b1..b0bf4a2040a6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.1:2.1.1
-google-cloud-datastore-bom:2.1.1:2.1.1
-google-cloud-datastore-parent:2.1.1:2.1.1
-proto-google-cloud-datastore-v1:0.92.1:0.92.1
-datastore-v1-proto-client:2.1.1:2.1.1
+google-cloud-datastore:2.1.1:2.1.2-SNAPSHOT
+google-cloud-datastore-bom:2.1.1:2.1.2-SNAPSHOT
+google-cloud-datastore-parent:2.1.1:2.1.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.92.1:0.92.2-SNAPSHOT
+datastore-v1-proto-client:2.1.1:2.1.2-SNAPSHOT
 

From 7a2e0306ccd1b4447e1dd142ec7c14e5bbaff0a3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 22 Sep 2021 16:24:12 +0200
Subject: [PATCH 0703/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.0.3 (#542)

---
 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 33b6071a518c..836d993c7eea 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.0.2
+    1.0.3
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 3c5204706568..8763b36e8a63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.0.2
+    1.0.3
   
 
   

From 3d1a18a984ec9c0610c0d10e720ea06fe2369695 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 22 Sep 2021 20:26:32 +0200
Subject: [PATCH 0704/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.3.0 (#543)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.2.1` -> `2.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/compatibility-slim/2.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/confidence-slim/2.2.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.3.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​230-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare221v230-2021-09-22)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.2.1...v2.3.0)

##### Dependencies

-   keep protobuf at 3.17.3 (not the latest 3.18.0) ([#​476](https://www.togithub.com/googleapis/java-shared-dependencies/issues/476)) ([e207c81](https://www.github.com/googleapis/java-shared-dependencies/commit/e207c818f220967e3618d7a9d36f2cf26c07892e))
-   update gax.version to v2.5.0 ([#​479](https://www.togithub.com/googleapis/java-shared-dependencies/issues/479)) ([e22e62a](https://www.github.com/googleapis/java-shared-dependencies/commit/e22e62a3b248023ae94da2a02ec50006377a5157))
-   update google.core.version to v2.1.4 ([#​473](https://www.togithub.com/googleapis/java-shared-dependencies/issues/473)) ([116f278](https://www.github.com/googleapis/java-shared-dependencies/commit/116f2783dfc18f215905ceaff9f85f331f83472b))
-   update google.core.version to v2.1.6 ([#​478](https://www.togithub.com/googleapis/java-shared-dependencies/issues/478)) ([9e09728](https://www.github.com/googleapis/java-shared-dependencies/commit/9e0972834764b25e5e194e0e805efc5453120df3))
-   update iam.version to v1.1.1 ([#​470](https://www.togithub.com/googleapis/java-shared-dependencies/issues/470)) ([3b6e960](https://www.github.com/googleapis/java-shared-dependencies/commit/3b6e96050af8d976a30165481d764d8226143a39))
-   update iam.version to v1.1.2 ([#​472](https://www.togithub.com/googleapis/java-shared-dependencies/issues/472)) ([85329cc](https://www.github.com/googleapis/java-shared-dependencies/commit/85329cc6c13d16fe2eeeb076959ee16a752c1f9e))

##### [2.2.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.2.0...v2.2.1) (2021-09-13)

##### Dependencies

-   update gax.version to v2.4.1 ([#​464](https://www.togithub.com/googleapis/java-shared-dependencies/issues/464)) ([bc7c6d7](https://www.github.com/googleapis/java-shared-dependencies/commit/bc7c6d7ca161ebfa31895c375d65bca29d4c7336))
-   update google.core.version to v2.1.3 ([#​465](https://www.togithub.com/googleapis/java-shared-dependencies/issues/465)) ([848f608](https://www.github.com/googleapis/java-shared-dependencies/commit/848f608ae850bd2dd80ec56034eb0c9a18f0415b))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 8763b36e8a63..510b6ac88d11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.2.1
+        2.3.0
         pom
         import
       

From 6dee6a939b7d056d43f72063578b3b3e108333ba Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 18:42:34 +0000
Subject: [PATCH 0705/1784] chore: release 2.1.2 (#544)

:robot: I have created a release \*beep\* \*boop\*
---
### [2.1.2](https://www.github.com/googleapis/java-datastore/compare/v2.1.1...v2.1.2) (2021-09-22)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 ([#543](https://www.github.com/googleapis/java-datastore/issues/543)) ([3d1a18a](https://www.github.com/googleapis/java-datastore/commit/3d1a18a984ec9c0610c0d10e720ea06fe2369695))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b66b5b4d6094..a17b52c138e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.1.2](https://www.github.com/googleapis/java-datastore/compare/v2.1.1...v2.1.2) (2021-09-22)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 ([#543](https://www.github.com/googleapis/java-datastore/issues/543)) ([3d1a18a](https://www.github.com/googleapis/java-datastore/commit/3d1a18a984ec9c0610c0d10e720ea06fe2369695))
+
 ### [2.1.1](https://www.github.com/googleapis/java-datastore/compare/v2.1.0...v2.1.1) (2021-09-14)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 585e3bc993af..b40bc1761fcd 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.1.2-SNAPSHOT
+  2.1.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.2-SNAPSHOT
+    2.1.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 836d993c7eea..d22cc9304974 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.1.2-SNAPSHOT
+  2.1.2
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.2-SNAPSHOT
+        0.92.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.2-SNAPSHOT
+        2.1.2
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7cafebd22d6a..35a86c254fec 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.2-SNAPSHOT
+  2.1.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.2-SNAPSHOT
+    2.1.2
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 510b6ac88d11..5a7835e39046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.2-SNAPSHOT
+  2.1.2
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.2-SNAPSHOT
+        0.92.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.2-SNAPSHOT
+        2.1.2
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d62b27d7216e..7612408e255f 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.92.2-SNAPSHOT
+  0.92.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.2-SNAPSHOT
+    2.1.2
   
   
     
diff --git a/versions.txt b/versions.txt
index b0bf4a2040a6..a5a09d4777c2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.1:2.1.2-SNAPSHOT
-google-cloud-datastore-bom:2.1.1:2.1.2-SNAPSHOT
-google-cloud-datastore-parent:2.1.1:2.1.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.92.1:0.92.2-SNAPSHOT
-datastore-v1-proto-client:2.1.1:2.1.2-SNAPSHOT
+google-cloud-datastore:2.1.2:2.1.2
+google-cloud-datastore-bom:2.1.2:2.1.2
+google-cloud-datastore-parent:2.1.2:2.1.2
+proto-google-cloud-datastore-v1:0.92.2:0.92.2
+datastore-v1-proto-client:2.1.2:2.1.2
 

From c1ad277613f6fadf798a0da20eed2558a56754af Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 19:01:11 +0000
Subject: [PATCH 0706/1784] chore: release 2.1.3-SNAPSHOT (#545)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b40bc1761fcd..b44aed202542 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.1.2
+  2.1.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.2
+    2.1.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d22cc9304974..f112d1d10b78 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.1.2
+  2.1.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.2
+        0.92.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.2
+        2.1.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 35a86c254fec..10f31ce581d0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.2
+  2.1.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.2
+    2.1.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 5a7835e39046..3379ec9bdf39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.2
+  2.1.3-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.2
+        0.92.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.2
+        2.1.3-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7612408e255f..2717c63cce08 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.92.2
+  0.92.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.2
+    2.1.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index a5a09d4777c2..2442a729dfdd 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.2:2.1.2
-google-cloud-datastore-bom:2.1.2:2.1.2
-google-cloud-datastore-parent:2.1.2:2.1.2
-proto-google-cloud-datastore-v1:0.92.2:0.92.2
-datastore-v1-proto-client:2.1.2:2.1.2
+google-cloud-datastore:2.1.2:2.1.3-SNAPSHOT
+google-cloud-datastore-bom:2.1.2:2.1.3-SNAPSHOT
+google-cloud-datastore-parent:2.1.2:2.1.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.92.2:0.92.3-SNAPSHOT
+datastore-v1-proto-client:2.1.2:2.1.3-SNAPSHOT
 

From bd22515ba6670dd9cf56bd82ff4cdd0b40b5b106 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 22 Sep 2021 22:19:50 +0200
Subject: [PATCH 0707/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.1.2 (#546)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 473298a6d394..9ebf579a555a 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.1.0
+      2.1.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f0c9206ef88d..99bd4d939a92 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.1.0
+      2.1.2
     
 
     

From baddb6a311134d64b5e5894b661a7f7191c1b325 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 24 Sep 2021 11:45:57 -0700
Subject: [PATCH 0708/1784] chore(java): remove dependencyDashboardLabel config
 from renovate.json (#547)

Source-Author: Neenu Shaji 
Source-Date: Thu Sep 23 14:36:33 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 0752ff727a19a467dffed335d5e59303689cf0d1
Source-Link: https://github.com/googleapis/synthtool/commit/0752ff727a19a467dffed335d5e59303689cf0d1
---
 renovate.json  | 5 +----
 synth.metadata | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/renovate.json b/renovate.json
index 7bbedfd56e2a..2f6e8a062004 100644
--- a/renovate.json
+++ b/renovate.json
@@ -70,8 +70,5 @@
     }
   ],
   "semanticCommits": true,
-  "dependencyDashboard": true,
-  "dependencyDashboardLabels": [
-    "type: process"
-  ]
+  "dependencyDashboard": true
 }
diff --git a/synth.metadata b/synth.metadata
index b7575f94656e..5872b771d3de 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "df53434ad07f2402b8ead655ab68909ae78a9789"
+        "sha": "bd22515ba6670dd9cf56bd82ff4cdd0b40b5b106"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e"
+        "sha": "0752ff727a19a467dffed335d5e59303689cf0d1"
       }
     }
   ],

From 01517260cc687825279d2ae93d40d0436448b2f3 Mon Sep 17 00:00:00 2001
From: Vasu Nori <48367170+vnorigoog@users.noreply.github.com>
Date: Tue, 28 Sep 2021 11:01:27 -0700
Subject: [PATCH 0709/1784] Change checksum algorithm to CRC32C. And localize
 checksum handling to one file. (#506)

---
 .../client/ChecksumEnforcingInputStream.java  | 18 ++++------
 .../v1/client/EndToEndChecksumHandler.java    | 34 +++++++++++--------
 .../google/datastore/v1/client/RemoteRpc.java |  3 +-
 .../ChecksumEnforcingInputStreamTest.java     | 12 ++-----
 .../datastore/v1/client/RemoteRpcTest.java    |  2 +-
 5 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
index 2b9674917738..0b91f18e2bb9 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
@@ -19,25 +19,22 @@
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.MessageDigest;
 
 /** This class provides End-to-End Checksum API for http protocol. */
 class ChecksumEnforcingInputStream extends InputStream {
   private final InputStream delegate;
-  private final MessageDigest messageDigest;
+  private final EndToEndChecksumHandler endToEndChecksumHandler;
   private final String expectedChecksum;
 
-  ChecksumEnforcingInputStream(
-      InputStream originalInputStream, HttpResponse response, MessageDigest digest) {
-    this(originalInputStream, EndToEndChecksumHandler.getChecksumHeader(response), digest);
+  ChecksumEnforcingInputStream(InputStream originalInputStream, HttpResponse response) {
+    this(originalInputStream, EndToEndChecksumHandler.getChecksumHeader(response));
   }
 
   @VisibleForTesting
-  ChecksumEnforcingInputStream(
-      InputStream originalInputStream, String checksum, MessageDigest digest) {
+  ChecksumEnforcingInputStream(InputStream originalInputStream, String checksum) {
     delegate = originalInputStream;
     expectedChecksum = checksum;
-    messageDigest = digest;
+    endToEndChecksumHandler = new EndToEndChecksumHandler();
   }
 
   @Override
@@ -76,11 +73,10 @@ public int read(byte[] b, int off, int len) throws IOException {
     if (len <= 0) return 0;
     int i = delegate.read(b, off, len);
     if (i > 0) {
-      messageDigest.update(b, off, i);
+      endToEndChecksumHandler.update(b, off, i);
     } else {
       // no more payload to read. compute checksum and verify
-      if (!expectedChecksum.equalsIgnoreCase(
-          com.google.common.io.BaseEncoding.base16().encode(messageDigest.digest()))) {
+      if (!expectedChecksum.equalsIgnoreCase(endToEndChecksumHandler.hash())) {
         throw new IOException("possible memory corruption on payload detected");
       }
     }
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
index 06d08d499b00..01aa303c851d 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
@@ -16,8 +16,9 @@
 package com.google.datastore.v1.client;
 
 import com.google.api.client.http.HttpResponse;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import com.google.common.hash.HashCode;
+import com.google.common.hash.Hasher;
+import com.google.common.hash.Hashing;
 
 /** This class provides End-to-End Checksum API for http protocol. */
 class EndToEndChecksumHandler {
@@ -25,22 +26,25 @@ class EndToEndChecksumHandler {
   static final String HTTP_REQUEST_CHECKSUM_HEADER = "x-request-checksum-348659783";
   /** The checksum http header on http responses */
   static final String HTTP_RESPONSE_CHECKSUM_HEADER = "x-response-checksum-348659783";
-  /** Algorithm used for checksum */
-  private static final String MD5 = "MD5";
+
+  final Hasher hasher = EndToEndChecksumHandler.getNewCrc32cHasher();
 
   /**
    * Create and return checksum as a string value for the input 'bytes'.
    *
    * @param bytes raw message for which the checksum is being computed
    * @return computed checksum as a hex string
-   * @throws RuntimeException if MD5 Algorithm is not found in the VM
    */
   static String computeChecksum(byte[] bytes) {
     if (bytes == null || (bytes.length == 0)) {
       return null;
     }
-    return com.google.common.io.BaseEncoding.base16()
-        .encode(getMessageDigestInstance().digest(bytes));
+    HashCode hc = getNewCrc32cHasher().putBytes(bytes).hash();
+    return hc.toString();
+  }
+
+  private static Hasher getNewCrc32cHasher() {
+    return Hashing.crc32c().newHasher();
   }
 
   /**
@@ -58,14 +62,6 @@ static boolean validateChecksum(String checksum, byte[] bytes) {
         && checksum.equalsIgnoreCase(computeChecksum(bytes));
   }
 
-  static MessageDigest getMessageDigestInstance() {
-    try {
-      return MessageDigest.getInstance(MD5);
-    } catch (NoSuchAlgorithmException e) {
-      throw new RuntimeException("MD5 algorithm is not found when computing checksum!");
-    }
-  }
-
   static boolean hasChecksumHeader(HttpResponse response) {
     String checksum = getChecksumHeader(response);
     return checksum != null && !checksum.isEmpty();
@@ -74,4 +70,12 @@ static boolean hasChecksumHeader(HttpResponse response) {
   static String getChecksumHeader(HttpResponse response) {
     return response.getHeaders().getFirstHeaderStringValue(HTTP_RESPONSE_CHECKSUM_HEADER);
   }
+
+  void update(byte[] bytes, int off, int len) {
+    hasher.putBytes(bytes, off, len);
+  }
+
+  String hash() {
+    return hasher.hash().toString();
+  }
 }
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 2c9d4d34e5bd..321eea72ab59 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
@@ -109,8 +109,7 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
         }
         InputStream inputStream = httpResponse.getContent();
         return enableE2EChecksum && EndToEndChecksumHandler.hasChecksumHeader(httpResponse)
-            ? new ChecksumEnforcingInputStream(
-                inputStream, httpResponse, EndToEndChecksumHandler.getMessageDigestInstance())
+            ? new ChecksumEnforcingInputStream(inputStream, httpResponse)
             : inputStream;
       } catch (SocketTimeoutException e) {
         throw makeException(url, methodName, Code.DEADLINE_EXCEEDED, "Deadline exceeded", e);
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
index 47592f987351..dbe0e766ae10 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -21,7 +21,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -29,8 +28,6 @@
 /** Test for {@link ChecksumEnforcingInputStream}. */
 @RunWith(JUnit4.class)
 public class ChecksumEnforcingInputStreamTest {
-  private final MessageDigest digest = EndToEndChecksumHandler.getMessageDigestInstance();
-
   public void test(int payloadSize) throws Exception {
     // read 1000 bytes at a time
     // Since checksum should be correct, do not expect IOException
@@ -40,7 +37,7 @@ public void test(int payloadSize) throws Exception {
         // do nothing with the bytes read
       }
     } catch (IOException e) {
-      fail("checksum verification failed!");
+      fail("checksum verification failed! " + e.getMessage());
     }
   }
 
@@ -66,9 +63,7 @@ public void read_withInvalidChecksum() {
     // Since checksum should be correct, do not expect IOException
     try (ChecksumEnforcingInputStream instance =
         new ChecksumEnforcingInputStream(
-            new ByteArrayInputStream("hello there".getBytes(UTF_8)),
-            "this checksum is invalid",
-            digest)) {
+            new ByteArrayInputStream("hello there".getBytes(UTF_8)), "this checksum is invalid")) {
       byte[] buf = new byte[1000];
       while (instance.read(buf, 0, 1000) != -1) {
         // do nothing with the bytes read
@@ -103,7 +98,6 @@ private ChecksumEnforcingInputStream setUpData(int payloadSize) throws Exception
     }
     byte[] bytes = payload.getBytes(UTF_8);
     String expectedChecksum = EndToEndChecksumHandler.computeChecksum(bytes);
-    return new ChecksumEnforcingInputStream(
-        new ByteArrayInputStream(bytes), expectedChecksum, digest);
+    return new ChecksumEnforcingInputStream(new ByteArrayInputStream(bytes), expectedChecksum);
   }
 }
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 b5f82369b507..ebcb1239644f 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
@@ -174,7 +174,7 @@ public void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
         httpRequest
             .getHeaders()
             .getFirstHeaderStringValue(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER);
-    assertEquals(32, header.length());
+    assertEquals(8, header.length());
   }
 
   @Test

From d9deb7d99392783e83d9efcb265d40852bd3228b Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 28 Sep 2021 13:13:21 -0700
Subject: [PATCH 0710/1784] chore: re-generated to pick up changes from
 synthtool (#548)

* chore(java): rename master branch to main

Source-Author: Neenu Shaji 
Source-Date: Mon Sep 27 10:04:11 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 67ab4f9f4272ad13f4b809de47fd0dec05f425ad
Source-Link: https://github.com/googleapis/synthtool/commit/67ab4f9f4272ad13f4b809de47fd0dec05f425ad

* build: add jdk 17 to java units and dependency builds

* update dependencies.sh to not pass MaxPermSize when jdk 17 is used. MaxPermSize is an unrecognized flag in jdk 17.

Source-Author: BenWhitehead 
Source-Date: Mon Sep 27 11:34:46 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: a4be3384ccb92364795d981f2863f6986fcee620
Source-Link: https://github.com/googleapis/synthtool/commit/a4be3384ccb92364795d981f2863f6986fcee620
---
 .github/blunderbuss.yml   |  2 +-
 .github/workflows/ci.yaml | 21 +++++++++++++--------
 .kokoro/dependencies.sh   | 23 ++++++++++++++++++++++-
 synth.metadata            |  4 ++--
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 1a23ea42b141..2176b0543214 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,5 +1,5 @@
 # Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
 assign_prs_by:
 - labels:
   - samples
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3becb5c022a3..2425d7234f42 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 name: ci
 jobs:
@@ -9,14 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/build.sh
@@ -29,8 +30,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.bat
@@ -40,14 +42,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
@@ -58,8 +61,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
@@ -72,8 +76,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9030ba8f99ff..9a5105d7ebf4 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -28,7 +28,28 @@ source ${scriptDir}/common.sh
 java -version
 echo $JOB_TYPE
 
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+function determineMavenOpts() {
+  local javaVersion=$(
+    # filter down to the version line, then pull out the version between quotes,
+    # then trim the version number down to its minimal number (removing any
+    # update or suffix number).
+    java -version 2>&1 | grep "version" \
+      | sed -E 's/^.*"(.*?)".*$/\1/g' \
+      | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
+  )
+
+  case $javaVersion in
+    "17")
+      # MaxPermSize is no longer supported as of jdk 17
+      echo -n "-Xmx1024m"
+      ;;
+    *)
+      echo -n "-Xmx1024m -XX:MaxPermSize=128m"
+      ;;
+  esac
+}
+
+export MAVEN_OPTS=$(determineMavenOpts)
 
 # this should run maven enforcer
 retry_with_backoff 3 10 \
diff --git a/synth.metadata b/synth.metadata
index 5872b771d3de..09d17998cb99 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "bd22515ba6670dd9cf56bd82ff4cdd0b40b5b106"
+        "sha": "baddb6a311134d64b5e5894b661a7f7191c1b325"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "0752ff727a19a467dffed335d5e59303689cf0d1"
+        "sha": "a4be3384ccb92364795d981f2863f6986fcee620"
       }
     }
   ],

From 97a05accdf6d05ebed14140f81268936dd3d6d06 Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Wed, 29 Sep 2021 14:32:53 -0400
Subject: [PATCH 0711/1784] chore: change branch master to main in github
 configurations (#550)

---
 .github/sync-repo-settings.yaml |  2 +-
 README.md                       | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 5c3b3bd123af..aaee184530af 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -2,7 +2,7 @@ rebaseMergeAllowed: false
 squashMergeAllowed: true
 mergeCommitAllowed: false
 branchProtectionRules:
-  - pattern: master
+  - pattern: main
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
diff --git a/README.md b/README.md
index cdb33ce134d7..c956dab0d8fd 100644
--- a/README.md
+++ b/README.md
@@ -213,27 +213,27 @@ Testing
 
 This library has tools to help write tests for code that uses the Datastore.
 
-See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
+See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/main/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
 
 Example Applications
 --------------------
-- [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
+- [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/main/bookshelf) - An App Engine app that manages a virtual bookshelf.
   - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
-- [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
-- [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks.
-  - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/sparkjava#how-does-it-work).
+- [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/main/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
+- [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks.
+  - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/main/flexible/sparkjava#how-does-it-work).
 
 
 
 
 ## Samples
 
-Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tree/master/samples) directory.
+Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tree/main/samples) directory.
 
 | Sample                      | Source Code                       | Try it |
 | --------------------------- | --------------------------------- | ------ |
-| Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/master/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
-| Task List | [source code](https://github.com/googleapis/java-datastore/blob/master/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
+| Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
+| Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
 
 
@@ -342,10 +342,10 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-sdk]: https://cloud.google.com/sdk/
-[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting
-[contributing]: https://github.com/googleapis/java-datastore/blob/master/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-datastore/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[license]: https://github.com/googleapis/java-datastore/blob/master/LICENSE
+[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
+[contributing]: https://github.com/googleapis/java-datastore/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-datastore/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/java-datastore/blob/main/LICENSE
 
 [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com
 [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM

From 19ea12bb4f2270447891012b8329a527246cb100 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 1 Oct 2021 16:12:24 +0200
Subject: [PATCH 0712/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v23.1.0 (#551)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `23.0.0` -> `23.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/compatibility-slim/23.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/confidence-slim/23.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 58abbe3d5627..7e65333485c1 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        23.0.0
+        23.1.0
         pom
         import
       

From d3d01db50ed5d7a43019467736a9319c23eccb7b Mon Sep 17 00:00:00 2001
From: Emily Ball 
Date: Fri, 1 Oct 2021 09:23:15 -0700
Subject: [PATCH 0713/1784] chore: change branch master to main (#549)


From b64c44b4cb069c475eb2b7f6808fa34f8207ce6e Mon Sep 17 00:00:00 2001
From: Emily Ball 
Date: Thu, 7 Oct 2021 10:50:39 -0700
Subject: [PATCH 0714/1784] chore: update repo-metadata.json
 client_documentation link (#552)

---
 .repo-metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index 188b904e2190..dcac615af025 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -2,7 +2,7 @@
   "name": "datastore",
   "name_pretty": "Cloud Datastore",
   "product_documentation": "https://cloud.google.com/datastore",
-  "client_documentation": "https://googleapis.dev/java/google-cloud-datastore/latest/index.html",
+  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
   "release_level": "ga",
   "language": "java",

From 68223857df0fbcce40ee0eda9db4eea9347536b3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 13 Oct 2021 17:30:35 +0200
Subject: [PATCH 0715/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.1.0 (#553)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.0.3` -> `1.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/compatibility-slim/1.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/confidence-slim/1.0.3)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.1.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​110-httpswwwgithubcomgoogleapisjava-shared-configcomparev103v110-2021-10-12)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.3...v1.1.0)

##### Features

-   introduce Maven configuration for GraalVM testing ([#​314](https://www.togithub.com/googleapis/java-shared-config/issues/314)) ([28fbeb8](https://www.github.com/googleapis/java-shared-config/commit/28fbeb86c4466a58a05d6933584564dbf3352e79))

##### Bug Fixes

-   update doclet version ([#​332](https://www.togithub.com/googleapis/java-shared-config/issues/332)) ([3fd0350](https://www.github.com/googleapis/java-shared-config/commit/3fd035030e4f0954dd1f62f7b8ea62583685880c))

##### Dependencies

-   update dependency com.puppycrawl.tools:checkstyle to v9.0.1 ([#​327](https://www.togithub.com/googleapis/java-shared-config/issues/327)) ([b6c9b65](https://www.github.com/googleapis/java-shared-config/commit/b6c9b657550db2dee6b36edbb9a6084baee125e2))
-   update dependency org.graalvm.buildtools:junit-platform-native to v0.9.6 ([#​330](https://www.togithub.com/googleapis/java-shared-config/issues/330)) ([271ed7d](https://www.github.com/googleapis/java-shared-config/commit/271ed7dba35623e22fc8a7f7d477e6043e772014))
-   update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.6 ([#​331](https://www.togithub.com/googleapis/java-shared-config/issues/331)) ([4f9ba15](https://www.github.com/googleapis/java-shared-config/commit/4f9ba1551df0a2d4fc8c9acca8a951afbe8cb78a))
-   update dependency org.junit.vintage:junit-vintage-engine to v5.8.1 ([#​329](https://www.togithub.com/googleapis/java-shared-config/issues/329)) ([4a8789e](https://www.github.com/googleapis/java-shared-config/commit/4a8789ee814ba8a3480beecc76c16fd1cb4e5f12))

##### [1.0.3](https://www.github.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3) (2021-09-21)

##### Bug Fixes

-   update java-docfx-doclet version ([#​315](https://www.togithub.com/googleapis/java-shared-config/issues/315)) ([07af07c](https://www.github.com/googleapis/java-shared-config/commit/07af07c188447ea5728ecd2700121ff477d1c58a))

##### [1.0.2](https://www.github.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2) (2021-09-13)

##### Bug Fixes

-   specify animal-sniffer-maven-plugin version ([#​308](https://www.togithub.com/googleapis/java-shared-config/issues/308)) ([378bf43](https://www.github.com/googleapis/java-shared-config/commit/378bf431383306c1cdd0a4f922956c87edf321b5))
-   update java docfx doclet version ([#​312](https://www.togithub.com/googleapis/java-shared-config/issues/312)) ([dd7f6e0](https://www.github.com/googleapis/java-shared-config/commit/dd7f6e0c1a7cc73831b74b4475457611a8c097d3))

##### Dependencies

-   update dependency com.puppycrawl.tools:checkstyle to v9 ([#​303](https://www.togithub.com/googleapis/java-shared-config/issues/303)) ([71faea3](https://www.github.com/googleapis/java-shared-config/commit/71faea38d4132407598550e2bb4c77f9d4a4d83d))

##### [1.0.1](https://www.github.com/googleapis/java-shared-config/compare/v1.0.0...v1.0.1) (2021-08-18)

##### Dependencies

-   update dependency com.puppycrawl.tools:checkstyle to v8.45.1 ([#​292](https://www.togithub.com/googleapis/java-shared-config/issues/292)) ([66bf6e6](https://www.github.com/googleapis/java-shared-config/commit/66bf6e6fb95997b9eb4b34268b8d20c2fbe9ed5a))


    

---

### Configuration

📅 **Schedule**: 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, check this box.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 f112d1d10b78..d909eb05861b 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.0.3
+    1.1.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 3379ec9bdf39..faab9caf668e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.0.3
+    1.1.0
   
 
   

From 9d9afee9a6242c4670326ff1d091af48da26c459 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 20 Oct 2021 17:18:25 +0200
Subject: [PATCH 0716/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.4.0 (#559)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.3.0` -> `2.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/compatibility-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/confidence-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.4.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​240-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare230v240-2021-10-18)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.3.0...v2.4.0)

##### Dependencies

-   update dependency com.fasterxml.jackson:jackson-bom to v2.13.0 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150))
-   update dependency com.google.api-client:google-api-client-bom to v1.32.2 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150))
-   update dependency com.google.api:api-common to v2.0.5 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150))
-   update dependency com.google.auth:google-auth-library-bom to v1.2.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150))
-   update dependency com.google.guava:guava-bom to v31 ([#​498](https://www.togithub.com/googleapis/java-shared-dependencies/issues/498)) ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150))
-   update dependency com.google.http-client:google-http-client-bom to v1.40.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150))
-   update dependency com.google.protobuf:protobuf-bom to v3.18.1 ([#​494](https://www.togithub.com/googleapis/java-shared-dependencies/issues/494)) ([a30e376](https://www.github.com/googleapis/java-shared-dependencies/commit/a30e3762b5fb0e2d31304d211c12eb2c1320f0c1))
-   update dependency io.grpc:grpc-bom to v1.41.0 ([#​482](https://www.togithub.com/googleapis/java-shared-dependencies/issues/482)) ([8a7d227](https://www.github.com/googleapis/java-shared-dependencies/commit/8a7d227f2a1dab9ff23d247a4e6131c817804c36))
-   update gax.version to v2.6.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150))
-   update iam.version to v1.1.6 ([#​485](https://www.togithub.com/googleapis/java-shared-dependencies/issues/485)) ([cef7e09](https://www.github.com/googleapis/java-shared-dependencies/commit/cef7e090bbc2e3ae775fa83505f98df286ba7d42))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 faab9caf668e..d1ff80a4d8dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.3.0
+        2.4.0
         pom
         import
       

From cbb9e69f8b5c5ef07b438da1ded4c9bff042dfce Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 15:30:23 +0000
Subject: [PATCH 0717/1784] chore: release 2.1.3 (#560)

:robot: I have created a release \*beep\* \*boop\*
---
### [2.1.3](https://www.github.com/googleapis/java-datastore/compare/v2.1.2...v2.1.3) (2021-10-20)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#559](https://www.github.com/googleapis/java-datastore/issues/559)) ([9d9afee](https://www.github.com/googleapis/java-datastore/commit/9d9afee9a6242c4670326ff1d091af48da26c459))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17b52c138e7..3c409302434a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.1.3](https://www.github.com/googleapis/java-datastore/compare/v2.1.2...v2.1.3) (2021-10-20)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#559](https://www.github.com/googleapis/java-datastore/issues/559)) ([9d9afee](https://www.github.com/googleapis/java-datastore/commit/9d9afee9a6242c4670326ff1d091af48da26c459))
+
 ### [2.1.2](https://www.github.com/googleapis/java-datastore/compare/v2.1.1...v2.1.2) (2021-09-22)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b44aed202542..9acfad51b1d2 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.1.3-SNAPSHOT
+  2.1.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.3-SNAPSHOT
+    2.1.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d909eb05861b..87e00820a8f5 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.1.3-SNAPSHOT
+  2.1.3
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.3-SNAPSHOT
+        0.92.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.3-SNAPSHOT
+        2.1.3
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 10f31ce581d0..8752a49493b5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.3-SNAPSHOT
+  2.1.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.3-SNAPSHOT
+    2.1.3
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index d1ff80a4d8dc..f17d3d4a4325 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.3-SNAPSHOT
+  2.1.3
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.3-SNAPSHOT
+        0.92.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.3-SNAPSHOT
+        2.1.3
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2717c63cce08..25bdf9fb124b 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.92.3-SNAPSHOT
+  0.92.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.3-SNAPSHOT
+    2.1.3
   
   
     
diff --git a/versions.txt b/versions.txt
index 2442a729dfdd..fa67597e062b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.2:2.1.3-SNAPSHOT
-google-cloud-datastore-bom:2.1.2:2.1.3-SNAPSHOT
-google-cloud-datastore-parent:2.1.2:2.1.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.92.2:0.92.3-SNAPSHOT
-datastore-v1-proto-client:2.1.2:2.1.3-SNAPSHOT
+google-cloud-datastore:2.1.3:2.1.3
+google-cloud-datastore-bom:2.1.3:2.1.3
+google-cloud-datastore-parent:2.1.3:2.1.3
+proto-google-cloud-datastore-v1:0.92.3:0.92.3
+datastore-v1-proto-client:2.1.3:2.1.3
 

From 61d62077f1b99b24c38c106af79224f6af4c6ed2 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 15:38:22 +0000
Subject: [PATCH 0718/1784] chore: release 2.1.4-SNAPSHOT (#561)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 9acfad51b1d2..77cc049be88f 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.1.3
+  2.1.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.3
+    2.1.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 87e00820a8f5..d6cc1f9803ae 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.1.3
+  2.1.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.3
+        0.92.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.3
+        2.1.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8752a49493b5..e5fa2510db78 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.3
+  2.1.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.3
+    2.1.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index f17d3d4a4325..700330c35ed9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.3
+  2.1.4-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.3
+        0.92.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.3
+        2.1.4-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 25bdf9fb124b..ae898339dda8 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.92.3
+  0.92.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.3
+    2.1.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index fa67597e062b..fc91221c882c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.3:2.1.3
-google-cloud-datastore-bom:2.1.3:2.1.3
-google-cloud-datastore-parent:2.1.3:2.1.3
-proto-google-cloud-datastore-v1:0.92.3:0.92.3
-datastore-v1-proto-client:2.1.3:2.1.3
+google-cloud-datastore:2.1.3:2.1.4-SNAPSHOT
+google-cloud-datastore-bom:2.1.3:2.1.4-SNAPSHOT
+google-cloud-datastore-parent:2.1.3:2.1.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.92.3:0.92.4-SNAPSHOT
+datastore-v1-proto-client:2.1.3:2.1.4-SNAPSHOT
 

From 97843352b2b3d9f66c7365e382cb32f9fa1b2ab1 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 20 Oct 2021 20:04:43 +0200
Subject: [PATCH 0719/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.1.3 (#562)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 9ebf579a555a..912c42c05854 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.1.2
+      2.1.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 99bd4d939a92..177213aeba5a 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.1.2
+      2.1.3
     
 
     

From d4bef0e0f2ac83bcc37be38c9f6ab08be863071b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 22 Oct 2021 00:12:28 +0200
Subject: [PATCH 0720/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.2.0 (#563)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.1.0` -> `1.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.2.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​120-httpswwwgithubcomgoogleapisjava-shared-configcomparev110v120-2021-10-21)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.1.0...v1.2.0)

##### Features

-   Introduce Native Image testing build script changes ([#​1240](https://www.togithub.com/googleapis/java-shared-config/issues/1240)) ([#​334](https://www.togithub.com/googleapis/java-shared-config/issues/334)) ([4643cf1](https://www.github.com/googleapis/java-shared-config/commit/4643cf15be0b37fa8fa905d544d438cda7ef2ecd))

##### Bug Fixes

-   **java:** downgrade native maven plugin version ([#​335](https://www.togithub.com/googleapis/java-shared-config/issues/335)) ([5834284](https://www.github.com/googleapis/java-shared-config/commit/5834284176fb34713d10082ce04f3b6abba85ad8))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 d6cc1f9803ae..aa710d562d46 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.1.0
+    1.2.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 700330c35ed9..2a8c36992991 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.1.0
+    1.2.0
   
 
   

From 238f73cf4104fdbf09739f6afcd4b44da8fde6ad Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 25 Oct 2021 08:20:56 -0700
Subject: [PATCH 0721/1784] build: Introduce Native Image testing build script
 changes (#556)

Adds additional switch case to build.sh to accommodate native image testing.

Source-Author: Daniel Zou 
Source-Date: Mon Oct 18 11:42:09 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: d45942be8066ad57bd0509f4a16e1fac78ecc50f
Source-Link: https://github.com/googleapis/synthtool/commit/d45942be8066ad57bd0509f4a16e1fac78ecc50f
---
 .kokoro/build.sh                     |  5 +++++
 .kokoro/presubmit/graalvm-native.cfg | 33 ++++++++++++++++++++++++++++
 synth.metadata                       |  5 +++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 .kokoro/presubmit/graalvm-native.cfg

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 9ddc69070e9a..2939c4431223 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -69,6 +69,11 @@ integration)
       verify
     RETURN_CODE=$?
     ;;
+graalvm)
+    # Run Unit and Integration Tests with Native Image
+    mvn test -Pnative -Penable-integration-tests
+    RETURN_CODE=$?
+    ;;
 samples)
     SAMPLES_DIR=samples
     # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
new file mode 100644
index 000000000000..4c7225ec924e
--- /dev/null
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/synth.metadata b/synth.metadata
index 09d17998cb99..69218d9f2fa5 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "baddb6a311134d64b5e5894b661a7f7191c1b325"
+        "sha": "68223857df0fbcce40ee0eda9db4eea9347536b3"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "a4be3384ccb92364795d981f2863f6986fcee620"
+        "sha": "d45942be8066ad57bd0509f4a16e1fac78ecc50f"
       }
     }
   ],
@@ -71,6 +71,7 @@
     ".kokoro/presubmit/clirr.cfg",
     ".kokoro/presubmit/common.cfg",
     ".kokoro/presubmit/dependencies.cfg",
+    ".kokoro/presubmit/graalvm-native.cfg",
     ".kokoro/presubmit/integration.cfg",
     ".kokoro/presubmit/java11.cfg",
     ".kokoro/presubmit/java7.cfg",

From 71da2cac4ee52802876bb2e8975757a2196c3ee3 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 25 Oct 2021 08:30:12 -0700
Subject: [PATCH 0722/1784] chore: protobuf 3.18.1 (#555)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/6c36d33a-e118-40fa-be81-d54f579fe14f/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

PiperOrigin-RevId: 403132955
Source-Link: https://github.com/googleapis/googleapis/commit/d2977af9e9f1fc0c9dc8368352daa032471f3c63
---
 .../java/com/google/datastore/v1/AllocateIdsRequest.java  | 4 ++--
 .../com/google/datastore/v1/BeginTransactionRequest.java  | 4 ++--
 .../main/java/com/google/datastore/v1/CommitRequest.java  | 4 ++--
 .../src/main/java/com/google/datastore/v1/GqlQuery.java   | 4 ++--
 .../src/main/java/com/google/datastore/v1/Key.java        | 4 ++--
 .../main/java/com/google/datastore/v1/KindExpression.java | 4 ++--
 .../main/java/com/google/datastore/v1/LookupRequest.java  | 4 ++--
 .../main/java/com/google/datastore/v1/PartitionId.java    | 8 ++++----
 .../java/com/google/datastore/v1/PropertyReference.java   | 4 ++--
 .../java/com/google/datastore/v1/ReserveIdsRequest.java   | 8 ++++----
 .../java/com/google/datastore/v1/RollbackRequest.java     | 4 ++--
 .../java/com/google/datastore/v1/RunQueryRequest.java     | 4 ++--
 synth.metadata                                            | 4 ++--
 13 files changed, 30 insertions(+), 30 deletions(-)

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 b2136418f4e6..1f66e03641c2 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
@@ -269,7 +269,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
     unknownFields.writeTo(output);
@@ -284,7 +284,7 @@ public int getSerializedSize() {
     for (int i = 0; i < keys_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     size += unknownFields.getSerializedSize();
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 2002ba54214e..05fdca81fdfd 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
@@ -238,7 +238,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
     if (transactionOptions_ != null) {
@@ -253,7 +253,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     if (transactionOptions_ != null) {
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 8cb52b2d0256..c981ef1ef79d 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
@@ -606,7 +606,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < mutations_.size(); i++) {
       output.writeMessage(6, mutations_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
     unknownFields.writeTo(output);
@@ -629,7 +629,7 @@ public int getSerializedSize() {
     for (int i = 0; i < mutations_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, mutations_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     size += unknownFields.getSerializedSize();
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 03a1fbd1ee74..c4c693fc7c5f 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
@@ -455,7 +455,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getQueryStringBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(queryString_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, queryString_);
     }
     if (allowLiterals_ != false) {
@@ -475,7 +475,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getQueryStringBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(queryString_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, queryString_);
     }
     if (allowLiterals_ != false) {
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 3e58eb2a52fd..d813ff65a80f 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
@@ -591,7 +591,7 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (!getKindBytes().isEmpty()) {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kind_);
       }
       if (idTypeCase_ == 2) {
@@ -609,7 +609,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!getKindBytes().isEmpty()) {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kind_);
       }
       if (idTypeCase_ == 2) {
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 879ce1ff6c97..4e99be4545c4 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
@@ -174,7 +174,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
     unknownFields.writeTo(output);
@@ -186,7 +186,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
     size += unknownFields.getSerializedSize();
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 ce7c5ec6ce3c..d4d01de69364 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
@@ -331,7 +331,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(3, keys_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
     unknownFields.writeTo(output);
@@ -349,7 +349,7 @@ public int getSerializedSize() {
     for (int i = 0; i < keys_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, keys_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     size += unknownFields.getSerializedSize();
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 ab8e5d834a13..6ae103685fc6 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
@@ -246,10 +246,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectId_);
     }
-    if (!getNamespaceIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_);
     }
     unknownFields.writeTo(output);
@@ -261,10 +261,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectId_);
     }
-    if (!getNamespaceIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_);
     }
     size += unknownFields.getSerializedSize();
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 6b46643de740..c7489ac5d9a2 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
@@ -176,7 +176,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
     }
     unknownFields.writeTo(output);
@@ -188,7 +188,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_);
     }
     size += unknownFields.getSerializedSize();
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 2b4d518f5142..069747718c90 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
@@ -326,10 +326,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
-    if (!getDatabaseIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
     unknownFields.writeTo(output);
@@ -344,10 +344,10 @@ public int getSerializedSize() {
     for (int i = 0; i < keys_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
-    if (!getDatabaseIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
     size += unknownFields.getSerializedSize();
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 919ba78a978e..d7037cd40a19 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
@@ -202,7 +202,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(1, transaction_);
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
     unknownFields.writeTo(output);
@@ -217,7 +217,7 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_);
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     size += unknownFields.getSerializedSize();
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 e95e1d65385a..8b9d57bad296 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
@@ -502,7 +502,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (queryTypeCase_ == 7) {
       output.writeMessage(7, (com.google.datastore.v1.GqlQuery) queryType_);
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
     unknownFields.writeTo(output);
@@ -530,7 +530,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               7, (com.google.datastore.v1.GqlQuery) queryType_);
     }
-    if (!getProjectIdBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     size += unknownFields.getSerializedSize();
diff --git a/synth.metadata b/synth.metadata
index 69218d9f2fa5..ca96a7d9a957 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "f6dd7e47620566925a4b3f1ce029e74e1b2f2516",
-        "internalRef": "359781040"
+        "sha": "d2977af9e9f1fc0c9dc8368352daa032471f3c63",
+        "internalRef": "403132955"
       }
     },
     {

From eb47af6ea878c7b53e5e63531c3285d30daa1f30 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 25 Oct 2021 14:12:13 -0400
Subject: [PATCH 0723/1784] build: configure branch 2.1.x as a release branch
 (#564)

---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 4a9e95940835..5968fe28eff3 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -10,3 +10,7 @@ branches:
     handleGHRelease: true
     releaseType: java-yoshi
     branch: java7
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.1.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index aaee184530af..ebdf852e9811 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -45,6 +45,20 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
+  - pattern: 2.1.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
 permissionRules:
   - team: yoshi-admins
     permission: admin

From a23066fcd13f4ad373ab16f13df014a23f639390 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 25 Oct 2021 17:10:15 -0400
Subject: [PATCH 0724/1784] feat: next release to 2.2.0 (#567)


From 19dd87fc0c929be278256d8fc25e0bf1fde29769 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 25 Oct 2021 16:41:12 -0700
Subject: [PATCH 0725/1784] fix(java): java 17 dependency arguments (#569)

Source-Author: kolea2 <45548808+kolea2@users.noreply.github.com>
Source-Date: Mon Oct 25 11:06:10 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: cb2755306975de4c54ea549c9deb25703b3731bb
Source-Link: https://github.com/googleapis/synthtool/commit/cb2755306975de4c54ea549c9deb25703b3731bb
---
 .kokoro/dependencies.sh | 10 ++++------
 synth.metadata          |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9a5105d7ebf4..d7476cfe9727 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -38,15 +38,13 @@ function determineMavenOpts() {
       | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
   )
 
-  case $javaVersion in
-    "17")
+  if [[ $javaVersion == 17* ]]
+    then
       # MaxPermSize is no longer supported as of jdk 17
       echo -n "-Xmx1024m"
-      ;;
-    *)
+  else
       echo -n "-Xmx1024m -XX:MaxPermSize=128m"
-      ;;
-  esac
+  fi
 }
 
 export MAVEN_OPTS=$(determineMavenOpts)
diff --git a/synth.metadata b/synth.metadata
index ca96a7d9a957..e0077640c0d1 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "68223857df0fbcce40ee0eda9db4eea9347536b3"
+        "sha": "a23066fcd13f4ad373ab16f13df014a23f639390"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "d45942be8066ad57bd0509f4a16e1fac78ecc50f"
+        "sha": "cb2755306975de4c54ea549c9deb25703b3731bb"
       }
     }
   ],

From 2d1a6d04a7b0c167495955e2988e563d74b97fc3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 27 Oct 2021 16:42:59 +0200
Subject: [PATCH 0726/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v24 (#571)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 7e65333485c1..65ba1e584edb 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        23.1.0
+        24.0.0
         pom
         import
       

From 18ab54aa1ba7e909a9a5ce6524cc89193579a3e7 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 4 Nov 2021 15:24:21 -0700
Subject: [PATCH 0727/1784] chore(java): remove pin on Apache Maven 3.8.1 from
 github actions (#573)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/b95706bc-5492-4d4a-9b4a-6487b19cad52/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/79d7936da1cf04ce1b4ead7d2c10dccccd852caf
---
 .github/workflows/ci.yaml | 17 +----------------
 synth.metadata            |  4 ++--
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2425d7234f42..d95a11a26273 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,9 +12,6 @@ jobs:
         java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
     - uses: actions/setup-java@v2
       with:
         distribution: zulu
@@ -27,9 +24,6 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
     - uses: actions/setup-java@v2
       with:
         distribution: zulu
@@ -45,9 +39,6 @@ jobs:
         java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
     - uses: actions/setup-java@v2
       with:
         distribution: zulu
@@ -58,9 +49,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
     - uses: actions/setup-java@v2
       with:
         distribution: zulu
@@ -73,9 +61,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
     - uses: actions/setup-java@v2
       with:
         distribution: zulu
@@ -83,4 +68,4 @@ jobs:
     - run: java -version
     - run: .kokoro/build.sh
       env:
-        JOB_TYPE: clirr
+        JOB_TYPE: clirr
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index e0077640c0d1..caa62109e79c 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "a23066fcd13f4ad373ab16f13df014a23f639390"
+        "sha": "2d1a6d04a7b0c167495955e2988e563d74b97fc3"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "cb2755306975de4c54ea549c9deb25703b3731bb"
+        "sha": "79d7936da1cf04ce1b4ead7d2c10dccccd852caf"
       }
     }
   ],

From 0216b37f564967954cfdfd31edd300aebbcaabb8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 9 Nov 2021 00:24:11 +0100
Subject: [PATCH 0728/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.2.1 (#575)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.0` -> `1.2.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/compatibility-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/confidence-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.2.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​121-httpswwwgithubcomgoogleapisjava-shared-configcomparev120v121-2021-11-08)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.0...v1.2.1)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 aa710d562d46..3f7188f12a25 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.2.0
+    1.2.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 2a8c36992991..868c959edaa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.2.0
+    1.2.1
   
 
   

From 6e98e3dda60298b60629dcf74ab3bae44f042bb6 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 10 Nov 2021 11:19:23 -0800
Subject: [PATCH 0729/1784] ci: update ci.yaml (#574)

Let's let all the unit tests complete for now.  Java 17 isn't quite ready.

Source-Author: Les Vogel 
Source-Date: Fri Nov 5 11:31:10 2021 -1000
Source-Repo: googleapis/synthtool
Source-Sha: 717a6a1fe247df095092de1321eadc9da887a06c
Source-Link: https://github.com/googleapis/synthtool/commit/717a6a1fe247df095092de1321eadc9da887a06c
---
 .github/workflows/ci.yaml | 3 ++-
 synth.metadata            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d95a11a26273..93b337c62839 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,6 +8,7 @@ jobs:
   units:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         java: [8, 11, 17]
     steps:
@@ -68,4 +69,4 @@ jobs:
     - run: java -version
     - run: .kokoro/build.sh
       env:
-        JOB_TYPE: clirr
\ No newline at end of file
+        JOB_TYPE: clirr
diff --git a/synth.metadata b/synth.metadata
index caa62109e79c..c05261aefc73 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "2d1a6d04a7b0c167495955e2988e563d74b97fc3"
+        "sha": "18ab54aa1ba7e909a9a5ce6524cc89193579a3e7"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "79d7936da1cf04ce1b4ead7d2c10dccccd852caf"
+        "sha": "717a6a1fe247df095092de1321eadc9da887a06c"
       }
     }
   ],

From 931e6ec846b446c369b5394c5284f6f26bb299ee Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 15 Nov 2021 17:02:15 +0100
Subject: [PATCH 0730/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.5.0 (#577)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.4.0` -> `2.5.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/confidence-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.5.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​250-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare240v250-2021-11-12)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.4.0...v2.5.0)

##### Features

-   next release from main branch is 2.5.0 ([#​510](https://www.togithub.com/googleapis/java-shared-dependencies/issues/510)) ([ca9eb8a](https://www.github.com/googleapis/java-shared-dependencies/commit/ca9eb8a40ae81d69de0d82d9499ef21b0136ae49))

##### Bug Fixes

-   dependencies.sh to work with Java 17 ([#​516](https://www.togithub.com/googleapis/java-shared-dependencies/issues/516)) ([8422c1d](https://www.github.com/googleapis/java-shared-dependencies/commit/8422c1d7e9ef479f348e63c530789050b5235426))

##### Dependencies

-   update dependency com.google.api:api-common to v2.1.0 ([#​508](https://www.togithub.com/googleapis/java-shared-dependencies/issues/508)) ([ae32d16](https://www.github.com/googleapis/java-shared-dependencies/commit/ae32d1689c78fc1469206c8c0df0ebaca59edd2c))
-   update dependency com.google.auth:google-auth-library-bom to v1.2.2 ([#​506](https://www.togithub.com/googleapis/java-shared-dependencies/issues/506)) ([b9a8209](https://www.github.com/googleapis/java-shared-dependencies/commit/b9a82098655f29e858bd0c7a9b1049a379e5062a))
-   update dependency com.google.auth:google-auth-library-bom to v1.3.0 ([#​524](https://www.togithub.com/googleapis/java-shared-dependencies/issues/524)) ([fc07879](https://www.github.com/googleapis/java-shared-dependencies/commit/fc07879fa6531e39b21977fe77abc19354a1fd33))
-   update dependency com.google.code.gson:gson to v2.8.9 ([#​509](https://www.togithub.com/googleapis/java-shared-dependencies/issues/509)) ([bece99b](https://www.github.com/googleapis/java-shared-dependencies/commit/bece99bb3e0365e60e7376ba18d046ab6436a235))
-   update dependency com.google.errorprone:error_prone_annotations to v2.10.0 ([#​512](https://www.togithub.com/googleapis/java-shared-dependencies/issues/512)) ([c281f13](https://www.github.com/googleapis/java-shared-dependencies/commit/c281f137525e2111e97349657be578ed1fc832f2))
-   update dependency com.google.protobuf:protobuf-bom to v3.19.1 ([#​505](https://www.togithub.com/googleapis/java-shared-dependencies/issues/505)) ([94cde96](https://www.github.com/googleapis/java-shared-dependencies/commit/94cde96069900f9f8c2ff9a522671d03b26828bd))
-   update dependency io.grpc:grpc-bom to v1.42.1 ([#​513](https://www.togithub.com/googleapis/java-shared-dependencies/issues/513)) ([0d2b774](https://www.github.com/googleapis/java-shared-dependencies/commit/0d2b774287a132821cc6fe2789140086bc48d525))
-   update dependency org.checkerframework:checker-qual to v3.19.0 ([#​501](https://www.togithub.com/googleapis/java-shared-dependencies/issues/501)) ([2b3e0b5](https://www.github.com/googleapis/java-shared-dependencies/commit/2b3e0b5ddc3a645b20a837f3123394f1ca114f08))
-   update dependency org.threeten:threetenbp to v1.5.2 ([#​514](https://www.togithub.com/googleapis/java-shared-dependencies/issues/514)) ([4885f40](https://www.github.com/googleapis/java-shared-dependencies/commit/4885f402e2c70435cd10d4f1b893df9873808c56))
-   update gax.version to v2.7.0 ([#​515](https://www.togithub.com/googleapis/java-shared-dependencies/issues/515)) ([567e728](https://www.github.com/googleapis/java-shared-dependencies/commit/567e728b0e59233a04e2d04183e6a0c36cca2437))
-   update google.core.version to v2.3.0 ([#​530](https://www.togithub.com/googleapis/java-shared-dependencies/issues/530)) ([78e87e9](https://www.github.com/googleapis/java-shared-dependencies/commit/78e87e96befab34dc4a494e752aeb473cd14a156))
-   update iam.version to v1.1.7 ([#​504](https://www.togithub.com/googleapis/java-shared-dependencies/issues/504)) ([63dd583](https://www.github.com/googleapis/java-shared-dependencies/commit/63dd583c80f35b01a66fd1908d41467468c66436))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 868c959edaa3..ecb4ca2abe61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.4.0
+        2.5.0
         pom
         import
       

From 719d7c73427aaa71d71199820ff07f0fbba56f7c Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 15 Nov 2021 13:24:21 -0800
Subject: [PATCH 0731/1784] chore: cleanup cloud RAD generation (#576)

chore: update jre to 11 for linter

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8b3befd6-3465-421d-9830-334a4226cb78/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: https://github.com/googleapis/synthtool/commit/42a3786737c17ece39924d7025f3be481812da53
Source-Link: https://github.com/googleapis/synthtool/commit/99ea92a109dbcd4e2b8c179e337848ba6a25fe16
---
 .github/workflows/ci.yaml            |  2 +-
 .kokoro/release/publish_javadoc11.sh | 10 +++-------
 synth.metadata                       |  4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 93b337c62839..05de1f60dcf0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -53,7 +53,7 @@ jobs:
     - uses: actions/setup-java@v2
       with:
         distribution: zulu
-        java-version: 8
+        java-version: 11
     - run: java -version
     - run: .kokoro/build.sh
       env:
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index b3887101ebe2..3f49b4ea0b11 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true
 export NAME=google-cloud-datastore
 export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 
-# V3 generates docfx yml from javadoc
-# generate yml
-mvn clean site -B -q -P docFX
-
-# copy README to docfx-yml dir and rename index.md
-cp README.md target/docfx-yml/index.md
-# copy CHANGELOG to docfx-yml dir and rename history.md
+# cloud RAD generation
+mvn clean javadoc:aggregate -B -q -P docFX
+# include CHANGELOG
 cp CHANGELOG.md target/docfx-yml/history.md
 
 pushd target/docfx-yml
diff --git a/synth.metadata b/synth.metadata
index c05261aefc73..f831626d7b7f 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "18ab54aa1ba7e909a9a5ce6524cc89193579a3e7"
+        "sha": "6e98e3dda60298b60629dcf74ab3bae44f042bb6"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "717a6a1fe247df095092de1321eadc9da887a06c"
+        "sha": "42a3786737c17ece39924d7025f3be481812da53"
       }
     }
   ],

From 55c1614c3775da6113a252adca645d7eccad08ea Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 16 Nov 2021 14:48:34 +0000
Subject: [PATCH 0732/1784] chore: release 2.2.0 (#568)

:robot: I have created a release \*beep\* \*boop\*
---
## [2.2.0](https://www.github.com/googleapis/java-datastore/compare/v2.1.3...v2.2.0) (2021-11-15)


### Features

* next release to 2.2.0 ([#567](https://www.github.com/googleapis/java-datastore/issues/567)) ([a23066f](https://www.github.com/googleapis/java-datastore/commit/a23066fcd13f4ad373ab16f13df014a23f639390))


### Bug Fixes

* **java:** java 17 dependency arguments ([#569](https://www.github.com/googleapis/java-datastore/issues/569)) ([19dd87f](https://www.github.com/googleapis/java-datastore/commit/19dd87fc0c929be278256d8fc25e0bf1fde29769))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#577](https://www.github.com/googleapis/java-datastore/issues/577)) ([931e6ec](https://www.github.com/googleapis/java-datastore/commit/931e6ec846b446c369b5394c5284f6f26bb299ee))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 17 +++++++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c409302434a..bf246cfc1c7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [2.2.0](https://www.github.com/googleapis/java-datastore/compare/v2.1.3...v2.2.0) (2021-11-15)
+
+
+### Features
+
+* next release to 2.2.0 ([#567](https://www.github.com/googleapis/java-datastore/issues/567)) ([a23066f](https://www.github.com/googleapis/java-datastore/commit/a23066fcd13f4ad373ab16f13df014a23f639390))
+
+
+### Bug Fixes
+
+* **java:** java 17 dependency arguments ([#569](https://www.github.com/googleapis/java-datastore/issues/569)) ([19dd87f](https://www.github.com/googleapis/java-datastore/commit/19dd87fc0c929be278256d8fc25e0bf1fde29769))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#577](https://www.github.com/googleapis/java-datastore/issues/577)) ([931e6ec](https://www.github.com/googleapis/java-datastore/commit/931e6ec846b446c369b5394c5284f6f26bb299ee))
+
 ### [2.1.3](https://www.github.com/googleapis/java-datastore/compare/v2.1.2...v2.1.3) (2021-10-20)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 77cc049be88f..aefce91560e2 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.1.4-SNAPSHOT
+  2.2.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.4-SNAPSHOT
+    2.2.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3f7188f12a25..f839f214f715 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.1.4-SNAPSHOT
+  2.2.0
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.4-SNAPSHOT
+        0.93.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.1.4-SNAPSHOT
+        2.2.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e5fa2510db78..75693e63d421 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.1.4-SNAPSHOT
+  2.2.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.4-SNAPSHOT
+    2.2.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index ecb4ca2abe61..3d8544d85cc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.1.4-SNAPSHOT
+  2.2.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.92.4-SNAPSHOT
+        0.93.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.1.4-SNAPSHOT
+        2.2.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ae898339dda8..8a77fa4c274c 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.92.4-SNAPSHOT
+  0.93.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.1.4-SNAPSHOT
+    2.2.0
   
   
     
diff --git a/versions.txt b/versions.txt
index fc91221c882c..05703abfcc35 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.1.3:2.1.4-SNAPSHOT
-google-cloud-datastore-bom:2.1.3:2.1.4-SNAPSHOT
-google-cloud-datastore-parent:2.1.3:2.1.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.92.3:0.92.4-SNAPSHOT
-datastore-v1-proto-client:2.1.3:2.1.4-SNAPSHOT
+google-cloud-datastore:2.2.0:2.2.0
+google-cloud-datastore-bom:2.2.0:2.2.0
+google-cloud-datastore-parent:2.2.0:2.2.0
+proto-google-cloud-datastore-v1:0.93.0:0.93.0
+datastore-v1-proto-client:2.2.0:2.2.0
 

From d7b518bfc688f6236b0e97437509e6bcb85fb2b4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 16 Nov 2021 14:56:19 +0000
Subject: [PATCH 0733/1784] chore: release 2.2.1-SNAPSHOT (#578)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index aefce91560e2..6347c0d90263 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.2.0
+  2.2.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.0
+    2.2.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f839f214f715..79a41f137d57 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.2.0
+  2.2.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.0
+        0.93.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.0
+        2.2.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 75693e63d421..03063c053fd7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.0
+  2.2.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.0
+    2.2.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 3d8544d85cc7..501d8d30acc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.0
+  2.2.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.0
+        0.93.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.0
+        2.2.1-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8a77fa4c274c..45e25ce57a16 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.93.0
+  0.93.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.0
+    2.2.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 05703abfcc35..0382a94918a3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.0:2.2.0
-google-cloud-datastore-bom:2.2.0:2.2.0
-google-cloud-datastore-parent:2.2.0:2.2.0
-proto-google-cloud-datastore-v1:0.93.0:0.93.0
-datastore-v1-proto-client:2.2.0:2.2.0
+google-cloud-datastore:2.2.0:2.2.1-SNAPSHOT
+google-cloud-datastore-bom:2.2.0:2.2.1-SNAPSHOT
+google-cloud-datastore-parent:2.2.0:2.2.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.0:0.93.1-SNAPSHOT
+datastore-v1-proto-client:2.2.0:2.2.1-SNAPSHOT
 

From 03f719c67ef11e96121cb9be37488d84da1a242a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 17 Nov 2021 18:38:29 +0100
Subject: [PATCH 0734/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.2.2 (#579)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.1` -> `1.2.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/compatibility-slim/1.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/confidence-slim/1.2.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.2.2`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​122-httpswwwgithubcomgoogleapisjava-shared-configcomparev121v122-2021-11-16)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 79a41f137d57..adab74105374 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.2.1
+    1.2.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 501d8d30acc9..70e8778d6720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.2.1
+    1.2.2
   
 
   

From 34cd2d378c3eb3b3004c2c97e5d3f7e6072d69ea Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 17 Nov 2021 23:37:49 +0100
Subject: [PATCH 0735/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.0 (#580)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 912c42c05854..e9dc3036c1ae 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.1.3
+      2.2.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 177213aeba5a..511d0a21fac3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.1.3
+      2.2.0
     
 
     

From fb0f468d4ad9232c676154d4a6def54ced020ed4 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Mon, 29 Nov 2021 07:56:39 -0800
Subject: [PATCH 0736/1784] chore: remove enable-samples profile (#582)

Source-Author: Neenu Shaji 
Source-Date: Mon Nov 22 11:22:11 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 7a7c48f96e90d1cdc3ab0cc8293279fdcb10fd36
Source-Link: https://github.com/googleapis/synthtool/commit/7a7c48f96e90d1cdc3ab0cc8293279fdcb10fd36
---
 .kokoro/build.sh |  1 -
 CONTRIBUTING.md  | 61 ++++++------------------------------------------
 synth.metadata   |  4 ++--
 3 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 2939c4431223..d5a978bde246 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -91,7 +91,6 @@ samples)
 
         pushd ${SAMPLES_DIR}
         mvn -B \
-          -Penable-samples \
           -ntp \
           -DtrimStackTrace=false \
           -Dclirr.skip=true \
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f2dbdee06bc3..b65dd279c946 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify
 
 ## Code Samples
 
-Code Samples must be bundled in separate Maven modules, and guarded by a
-Maven profile with the name `enable-samples`.
+All code samples must be in compliance with the [java sample formatting guide][3].
+Code Samples must be bundled in separate Maven modules.
 
 The samples must be separate from the primary project for a few reasons:
-1. Primary projects have a minimum Java version of Java 7 whereas samples have
-   a minimum Java version of Java 8. Due to this we need the ability to
+1. Primary projects have a minimum Java version of Java 8 whereas samples can have
+   Java version of Java 11. Due to this we need the ability to
    selectively exclude samples from a build run.
 2. Many code samples depend on external GCP services and need
    credentials to access the service.
@@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons:
 ### Building
 
 ```bash
-mvn -Penable-samples clean verify
+mvn clean verify
 ```
 
 Some samples require access to GCP services and require a service account:
 
 ```bash
 export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
-mvn -Penable-samples clean verify
+mvn clean verify
 ```
 
-### Profile Config
-
-1. To add samples in a profile to your Maven project, add the following to your
-`pom.xml`
-
-    ```xml
-    
-      [...]
-      
-        
-          enable-samples
-          
-            sample
-          
-        
-      
-      [...]
-    
-    ```
-
-2. [Activate](#profile-activation) the profile.
-3. Define your samples in a normal Maven project in the `samples/` directory.
-
 ### Code Formatting
 
 Code in this repo is formatted with
@@ -110,30 +87,6 @@ To run formatting on your project, you can run:
 mvn com.coveo:fmt-maven-plugin:format
 ```
 
-### Profile Activation
-
-To include code samples when building and testing the project, enable the 
-`enable-samples` Maven profile.
-
-#### Command line
-
-To activate the Maven profile on the command line add `-Penable-samples` to your
-Maven command.
-
-#### Maven `settings.xml`
-
-To activate the Maven profile in your `~/.m2/settings.xml` add an entry of
-`enable-samples` following the instructions in [Active Profiles][2].
-
-This method has the benefit of applying to all projects you build (and is
-respected by IntelliJ IDEA) and is recommended if you are going to be
-contributing samples to several projects.
-
-#### IntelliJ IDEA
-
-To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in
-[Activate Maven profiles][3] to activate `enable-samples`.
-
 [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account
 [2]: https://maven.apache.org/settings.html#Active_Profiles
-[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles
+[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index f831626d7b7f..c7b606d2400d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "6e98e3dda60298b60629dcf74ab3bae44f042bb6"
+        "sha": "34cd2d378c3eb3b3004c2c97e5d3f7e6072d69ea"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "42a3786737c17ece39924d7025f3be481812da53"
+        "sha": "7a7c48f96e90d1cdc3ab0cc8293279fdcb10fd36"
       }
     }
   ],

From c1d1b91e0a74e97177ab0874ede975da9bad4368 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Sat, 4 Dec 2021 00:34:14 +0100
Subject: [PATCH 0737/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.5.1 (#586)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.5.0` -> `2.5.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/compatibility-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/confidence-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.5.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​251-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare250v251-2021-12-03)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.5.0...v2.5.1)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 70e8778d6720..31930c890228 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.5.0
+        2.5.1
         pom
         import
       

From 1892f8b6cabf2d619147c65686040c2a343c8824 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 3 Dec 2021 23:40:36 +0000
Subject: [PATCH 0738/1784] chore: release 2.2.1 (#587)

:robot: I have created a release \*beep\* \*boop\*
---
### [2.2.1](https://www.github.com/googleapis/java-datastore/compare/v2.2.0...v2.2.1) (2021-12-03)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#586](https://www.github.com/googleapis/java-datastore/issues/586)) ([c1d1b91](https://www.github.com/googleapis/java-datastore/commit/c1d1b91e0a74e97177ab0874ede975da9bad4368))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf246cfc1c7e..97b4475be2d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.2.1](https://www.github.com/googleapis/java-datastore/compare/v2.2.0...v2.2.1) (2021-12-03)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#586](https://www.github.com/googleapis/java-datastore/issues/586)) ([c1d1b91](https://www.github.com/googleapis/java-datastore/commit/c1d1b91e0a74e97177ab0874ede975da9bad4368))
+
 ## [2.2.0](https://www.github.com/googleapis/java-datastore/compare/v2.1.3...v2.2.0) (2021-11-15)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6347c0d90263..b308b6c4198d 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.2.1-SNAPSHOT
+  2.2.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.1-SNAPSHOT
+    2.2.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index adab74105374..83e6cf14abeb 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.2.1-SNAPSHOT
+  2.2.1
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.1-SNAPSHOT
+        0.93.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.1-SNAPSHOT
+        2.2.1
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 03063c053fd7..cec8339142d5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.1-SNAPSHOT
+  2.2.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.1-SNAPSHOT
+    2.2.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 31930c890228..c978d9de9508 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.1-SNAPSHOT
+  2.2.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.1-SNAPSHOT
+        0.93.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.1-SNAPSHOT
+        2.2.1
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 45e25ce57a16..6ea179e6b8a1 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.93.1-SNAPSHOT
+  0.93.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.1-SNAPSHOT
+    2.2.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 0382a94918a3..85d995048349 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.0:2.2.1-SNAPSHOT
-google-cloud-datastore-bom:2.2.0:2.2.1-SNAPSHOT
-google-cloud-datastore-parent:2.2.0:2.2.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.0:0.93.1-SNAPSHOT
-datastore-v1-proto-client:2.2.0:2.2.1-SNAPSHOT
+google-cloud-datastore:2.2.1:2.2.1
+google-cloud-datastore-bom:2.2.1:2.2.1
+google-cloud-datastore-parent:2.2.1:2.2.1
+proto-google-cloud-datastore-v1:0.93.1:0.93.1
+datastore-v1-proto-client:2.2.1:2.2.1
 

From e08f9d93d8a8b912fffd602bed3189c1bed664a6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 3 Dec 2021 23:48:14 +0000
Subject: [PATCH 0739/1784] chore: release 2.2.2-SNAPSHOT (#588)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b308b6c4198d..62fb56ba655e 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.2.1
+  2.2.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.1
+    2.2.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 83e6cf14abeb..c4b0b357e782 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.2.1
+  2.2.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.1
+        0.93.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.1
+        2.2.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cec8339142d5..fa0e94379d2a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.1
+  2.2.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.1
+    2.2.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index c978d9de9508..1e50808749b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.1
+  2.2.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.1
+        0.93.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.1
+        2.2.2-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6ea179e6b8a1..ab19f023c585 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.93.1
+  0.93.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.1
+    2.2.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 85d995048349..feb739cce971 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.1:2.2.1
-google-cloud-datastore-bom:2.2.1:2.2.1
-google-cloud-datastore-parent:2.2.1:2.2.1
-proto-google-cloud-datastore-v1:0.93.1:0.93.1
-datastore-v1-proto-client:2.2.1:2.2.1
+google-cloud-datastore:2.2.1:2.2.2-SNAPSHOT
+google-cloud-datastore-bom:2.2.1:2.2.2-SNAPSHOT
+google-cloud-datastore-parent:2.2.1:2.2.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.1:0.93.2-SNAPSHOT
+datastore-v1-proto-client:2.2.1:2.2.2-SNAPSHOT
 

From e3f2a63a50e2a6ad0d7680c6a0e9a39c7c2aa401 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 6 Dec 2021 23:38:34 +0100
Subject: [PATCH 0740/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.1 (#589)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.0` -> `2.2.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.1/compatibility-slim/2.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.1/confidence-slim/2.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.1`](https://togithub.com/googleapis/java-datastore/blob/master/CHANGELOG.md#​221-httpswwwgithubcomgoogleapisjava-datastorecomparev220v221-2021-12-03)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.0...v2.2.1)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e9dc3036c1ae..e205eb96c7e3 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.2.0
+      2.2.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 511d0a21fac3..7d8a502fa2c3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.0
+      2.2.1
     
 
     

From 6e1ef2dc16b3adbb15b1309e93a70f0efa4158d0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 7 Dec 2021 00:28:10 +0100
Subject: [PATCH 0741/1784] chore(deps): update dependency
 com.google.cloud.samples:shared-configuration to v1.2.0 (#585)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | `1.0.23` -> `1.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/compatibility-slim/1.0.23)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/confidence-slim/1.0.23)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
GoogleCloudPlatform/java-repo-tools

### [`v1.2.0`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.24...v1.2.0)

[Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.24...v1.2.0)

### [`v1.0.24`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.23...v1.0.24)

[Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.23...v1.0.24)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e205eb96c7e3..950d299d3c6c 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.23
+    1.2.0
   
 
   
diff --git a/samples/pom.xml b/samples/pom.xml
index f4725d6e6c83..093ab12a3699 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.23
+    1.2.0
   
 
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7d8a502fa2c3..07c4dcd7f518 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.23
+    1.2.0
   
 
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 65ba1e584edb..3c0c96c94175 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud.samples
     shared-configuration
-    1.0.23
+    1.2.0
   
 
   

From 9b6496e92cb48ca1bfc0b1a733d564466f28deca Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Tue, 7 Dec 2021 09:21:36 -0800
Subject: [PATCH 0742/1784] fix(java): add -ntp flag to native image testing
 command (#593)

Source-Author: Daniel Zou 
Source-Date: Mon Dec 6 11:14:51 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 723f3ce6c8927683e96cd7a4a02b59606a14eafc
Source-Link: https://github.com/googleapis/synthtool/commit/723f3ce6c8927683e96cd7a4a02b59606a14eafc
---
 .kokoro/build.sh | 2 +-
 synth.metadata   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index d5a978bde246..c8fbef2b0aad 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -71,7 +71,7 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn test -Pnative -Penable-integration-tests
+    mvn -ntp -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
 samples)
diff --git a/synth.metadata b/synth.metadata
index c7b606d2400d..c72bd7ba4ad1 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "34cd2d378c3eb3b3004c2c97e5d3f7e6072d69ea"
+        "sha": "e08f9d93d8a8b912fffd602bed3189c1bed664a6"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7a7c48f96e90d1cdc3ab0cc8293279fdcb10fd36"
+        "sha": "723f3ce6c8927683e96cd7a4a02b59606a14eafc"
       }
     }
   ],

From 143981f6b334f5ddb648628d92f8a2506e091b38 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 9 Dec 2021 00:12:16 +0100
Subject: [PATCH 0743/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v24.1.0 (#598)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 3c0c96c94175..1b9d068909bb 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        24.0.0
+        24.1.0
         pom
         import
       

From 29017729ec90d2fca334d5c92861430d8d08430a Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Tue, 21 Dec 2021 14:40:12 -0500
Subject: [PATCH 0744/1784] chore: add enumeration type of library (#599)

---
 .repo-metadata.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index dcac615af025..de10f157f170 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,5 +11,6 @@
   "distribution_name": "com.google.cloud:google-cloud-datastore",
   "codeowner_team": "@googleapis/firestore-dpe",
   "api_id": "datastore.googleapis.com",
+  "library_type": "GAPIC_COMBO",
   "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries."
 }

From 453eceb382496990f127d71c8517b1a87e6d1a7b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 28 Dec 2021 21:46:35 +0100
Subject: [PATCH 0745/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v24.1.1 (#600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `24.1.0` -> `24.1.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/compatibility-slim/24.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/confidence-slim/24.1.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 1b9d068909bb..b2bad4d7a561 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        24.1.0
+        24.1.1
         pom
         import
       

From 25064308e2bb956eb25cc6d6b63cc22490f8aed0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 6 Jan 2022 22:02:17 +0100
Subject: [PATCH 0746/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.2.4 (#605)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.2` -> `1.2.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/compatibility-slim/1.2.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/confidence-slim/1.2.2)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.2.4`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​124-httpswwwgithubcomgoogleapisjava-shared-configcomparev123v124-2022-01-06)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.3...v1.2.4)

### [`v1.2.3`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​123-httpswwwgithubcomgoogleapisjava-shared-configcomparev122v123-2022-01-04)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.2...v1.2.3)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 c4b0b357e782..257ea2d48ff6 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.2.2
+    1.2.4
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 1e50808749b5..8f50083b6069 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.2.2
+    1.2.4
   
 
   

From 2d90ad06ce137a15c9c3c39c5544b0846bed1ddb Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 7 Jan 2022 04:20:53 +0100
Subject: [PATCH 0747/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v24.1.2 (#606)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `24.1.1` -> `24.1.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.2/compatibility-slim/24.1.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.2/confidence-slim/24.1.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b2bad4d7a561..e0d2bc450cb0 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        24.1.1
+        24.1.2
         pom
         import
       

From 095fd5dbe470083d37b561b615952e39f46544c3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 7 Jan 2022 16:24:22 +0100
Subject: [PATCH 0748/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.6.0 (#607)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.5.1` -> `2.6.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/compatibility-slim/2.5.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/confidence-slim/2.5.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.6.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​260-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare251v260-2022-01-07)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.5.1...v2.6.0)

##### Bug Fixes

-   **java:** add -ntp flag to native image testing command ([#​1299](https://www.togithub.com/googleapis/java-shared-dependencies/issues/1299)) ([#​546](https://www.togithub.com/googleapis/java-shared-dependencies/issues/546)) ([d8bb8d9](https://www.github.com/googleapis/java-shared-dependencies/commit/d8bb8d9d8e3b8c582f768cd3164e8580ec334511))
-   **java:** run Maven in plain console-friendly mode ([#​1301](https://www.togithub.com/googleapis/java-shared-dependencies/issues/1301)) ([#​557](https://www.togithub.com/googleapis/java-shared-dependencies/issues/557)) ([6b57d08](https://www.github.com/googleapis/java-shared-dependencies/commit/6b57d08816ec6c1dfb637cae022624e896930ad8))

##### Dependencies

-   gRPC upgrade to 1.43.2 ([#​567](https://www.togithub.com/googleapis/java-shared-dependencies/issues/567)) ([c946655](https://www.github.com/googleapis/java-shared-dependencies/commit/c94665571f26d24fbbb3f89ef5a3db99663bfdba))
-   update dependency com.google.api-client:google-api-client-bom to v1.33.0 ([#​563](https://www.togithub.com/googleapis/java-shared-dependencies/issues/563)) ([0aedddb](https://www.github.com/googleapis/java-shared-dependencies/commit/0aedddb9a535753767d56f5910f355c7a1c8509c))
-   update dependency com.google.api:api-common to v2.1.2 ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f))
-   update dependency com.google.http-client:google-http-client-bom to v1.41.0 ([#​562](https://www.togithub.com/googleapis/java-shared-dependencies/issues/562)) ([6da0735](https://www.github.com/googleapis/java-shared-dependencies/commit/6da0735d4db9df998d11c549488a024b800bed65))
-   update dependency io.grpc:grpc-bom to v1.43.1 ([#​553](https://www.togithub.com/googleapis/java-shared-dependencies/issues/553)) ([b787c8f](https://www.github.com/googleapis/java-shared-dependencies/commit/b787c8f2032b7ffc9797158c3ff214b7813f34b7))
-   update dependency org.apache.httpcomponents:httpcore to v4.4.15 ([#​550](https://www.togithub.com/googleapis/java-shared-dependencies/issues/550)) ([e2d3dba](https://www.github.com/googleapis/java-shared-dependencies/commit/e2d3dbad6dd54c117abb5ab1b6137cfee4e5a32b))
-   update dependency org.checkerframework:checker-qual to v3.20.0 ([#​549](https://www.togithub.com/googleapis/java-shared-dependencies/issues/549)) ([586df59](https://www.github.com/googleapis/java-shared-dependencies/commit/586df5949d4ddca11d0705d696882c32d8436c31))
-   update gax.version to v2.8.0 ([#​564](https://www.togithub.com/googleapis/java-shared-dependencies/issues/564)) ([9ad5d4f](https://www.github.com/googleapis/java-shared-dependencies/commit/9ad5d4f5385753a0c5739ef400f5d346e3342b84))
-   update gax.version to v2.8.1 ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f))
-   update google.common-protos.version to v2.7.1 ([#​561](https://www.togithub.com/googleapis/java-shared-dependencies/issues/561)) ([9aa860d](https://www.github.com/googleapis/java-shared-dependencies/commit/9aa860d92f745f1d4382eb16439bf17ac6ca8ae9))
-   update google.core.version to v2.3.5 ([#​565](https://www.togithub.com/googleapis/java-shared-dependencies/issues/565)) ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f))
-   update iam.version to v1.2.0 ([#​547](https://www.togithub.com/googleapis/java-shared-dependencies/issues/547)) ([3232c82](https://www.github.com/googleapis/java-shared-dependencies/commit/3232c828b628cb604a200b3e569e56e758e5e11d))
-   upgrading protobuf to 3.19.2 ([#​560](https://www.togithub.com/googleapis/java-shared-dependencies/issues/560)) ([7ef3325](https://www.github.com/googleapis/java-shared-dependencies/commit/7ef33250f5473348d3546210b7a534360f476101))

##### [2.5.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.5.0...v2.5.1) (2021-12-03)

##### Dependencies

-   update dependency com.google.api:api-common to v2.1.1 ([#​533](https://www.togithub.com/googleapis/java-shared-dependencies/issues/533)) ([4e23adb](https://www.github.com/googleapis/java-shared-dependencies/commit/4e23adb666dfaa18ae8bf869aca030153de16d62))
-   update gax.version to v2.7.1 ([#​544](https://www.togithub.com/googleapis/java-shared-dependencies/issues/544)) ([5a0c480](https://www.github.com/googleapis/java-shared-dependencies/commit/5a0c480671fa834e600edc6ac6fe77967d1b79b3))
-   update google.common-protos.version to v2.7.0 ([#​542](https://www.togithub.com/googleapis/java-shared-dependencies/issues/542)) ([af97eb5](https://www.github.com/googleapis/java-shared-dependencies/commit/af97eb5d9cff397080fdb3d4a6dbf7c2692e0358))
-   update google.core.version to v2.3.3 ([#​534](https://www.togithub.com/googleapis/java-shared-dependencies/issues/534)) ([885acef](https://www.github.com/googleapis/java-shared-dependencies/commit/885acefe4ff5313eb53dc43b4825ca597b97dcfd))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 8f50083b6069..e800ca38c5f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.5.1
+        2.6.0
         pom
         import
       

From 7fdfa7de8c02fbec5ea410a677c02b28ce12b77d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 7 Jan 2022 13:12:18 -0500
Subject: [PATCH 0749/1784] chore: release 2.2.2 (#595)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                            | 12 ++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97b4475be2d8..4b6744cb5efc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### [2.2.2](https://www.github.com/googleapis/java-datastore/compare/v2.2.1...v2.2.2) (2022-01-07)
+
+
+### Bug Fixes
+
+* **java:** add -ntp flag to native image testing command ([#593](https://www.github.com/googleapis/java-datastore/issues/593)) ([9b6496e](https://www.github.com/googleapis/java-datastore/commit/9b6496e92cb48ca1bfc0b1a733d564466f28deca))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.6.0 ([#607](https://www.github.com/googleapis/java-datastore/issues/607)) ([095fd5d](https://www.github.com/googleapis/java-datastore/commit/095fd5dbe470083d37b561b615952e39f46544c3))
+
 ### [2.2.1](https://www.github.com/googleapis/java-datastore/compare/v2.2.0...v2.2.1) (2021-12-03)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 62fb56ba655e..bca7b455580d 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.2.2-SNAPSHOT
+  2.2.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.2-SNAPSHOT
+    2.2.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 257ea2d48ff6..8ef1d7bdbb2d 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.2.2-SNAPSHOT
+  2.2.2
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.2-SNAPSHOT
+        0.93.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.2-SNAPSHOT
+        2.2.2
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index fa0e94379d2a..7ef02f3bdcf5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.2-SNAPSHOT
+  2.2.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.2-SNAPSHOT
+    2.2.2
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index e800ca38c5f9..f496ae5332fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.2-SNAPSHOT
+  2.2.2
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.2-SNAPSHOT
+        0.93.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.2-SNAPSHOT
+        2.2.2
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ab19f023c585..a9d928d5857f 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.93.2-SNAPSHOT
+  0.93.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.2-SNAPSHOT
+    2.2.2
   
   
     
diff --git a/versions.txt b/versions.txt
index feb739cce971..040d2cd8c51a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.1:2.2.2-SNAPSHOT
-google-cloud-datastore-bom:2.2.1:2.2.2-SNAPSHOT
-google-cloud-datastore-parent:2.2.1:2.2.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.1:0.93.2-SNAPSHOT
-datastore-v1-proto-client:2.2.1:2.2.2-SNAPSHOT
+google-cloud-datastore:2.2.2:2.2.2
+google-cloud-datastore-bom:2.2.2:2.2.2
+google-cloud-datastore-parent:2.2.2:2.2.2
+proto-google-cloud-datastore-v1:0.93.2:0.93.2
+datastore-v1-proto-client:2.2.2:2.2.2
 

From 27f4a5a25b01c4775859f48370a7b63322a2b0b0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 7 Jan 2022 18:30:23 +0000
Subject: [PATCH 0750/1784] chore: release 2.2.3-SNAPSHOT (#609)

:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index bca7b455580d..72674fce0ace 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.2.2
+  2.2.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.2
+    2.2.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8ef1d7bdbb2d..79d889221225 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.2.2
+  2.2.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.2
+        0.93.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.2
+        2.2.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7ef02f3bdcf5..cb3ab2717f09 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.2
+  2.2.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.2
+    2.2.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index f496ae5332fe..653da7519538 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.2
+  2.2.3-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.2
+        0.93.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.2
+        2.2.3-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a9d928d5857f..a9813704f892 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.93.2
+  0.93.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.2
+    2.2.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 040d2cd8c51a..91ac810b659d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.2:2.2.2
-google-cloud-datastore-bom:2.2.2:2.2.2
-google-cloud-datastore-parent:2.2.2:2.2.2
-proto-google-cloud-datastore-v1:0.93.2:0.93.2
-datastore-v1-proto-client:2.2.2:2.2.2
+google-cloud-datastore:2.2.2:2.2.3-SNAPSHOT
+google-cloud-datastore-bom:2.2.2:2.2.3-SNAPSHOT
+google-cloud-datastore-parent:2.2.2:2.2.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.2:0.93.3-SNAPSHOT
+datastore-v1-proto-client:2.2.2:2.2.3-SNAPSHOT
 

From 61dbd04381c0b0d6d8408e5b319b58d559c6d33f Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Mon, 10 Jan 2022 18:52:31 -0500
Subject: [PATCH 0751/1784] chore: change name to api_shortname in
 .repo-metadata.json (#615)

---
 .repo-metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index de10f157f170..dda5be8a0b08 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -1,5 +1,5 @@
 {
-  "name": "datastore",
+  "api_shortname": "datastore",
   "name_pretty": "Cloud Datastore",
   "product_documentation": "https://cloud.google.com/datastore",
   "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history",

From 63080eb28ef1aee1c2e415eecb330967482bf641 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 12 Jan 2022 17:58:34 +0100
Subject: [PATCH 0752/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.2.5 (#618)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.4` -> `1.2.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/compatibility-slim/1.2.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/confidence-slim/1.2.4)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.2.5`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​125-httpsgithubcomgoogleapisjava-shared-configcomparev124v125-2022-01-11)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.4...v1.2.5)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 79d889221225..8e08f8f62a2a 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.2.4
+    1.2.5
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 653da7519538..77576660548c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.2.4
+    1.2.5
   
 
   

From 36327e9072113d7c44b68f30d6cb2c557bb43d99 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 12 Jan 2022 18:00:20 +0100
Subject: [PATCH 0753/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.2 (#610)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.1` -> `2.2.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.2/compatibility-slim/2.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.2/confidence-slim/2.2.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​222-httpswwwgithubcomgoogleapisjava-datastorecomparev221v222-2022-01-07)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.1...v2.2.2)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 950d299d3c6c..862492a417ef 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.2.1
+      2.2.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 07c4dcd7f518..2d5058e8d7c2 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.1
+      2.2.2
     
 
     

From 6162838144b204a52f03777cfda0cd7aa2363b4c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 12 Jan 2022 18:08:22 +0100
Subject: [PATCH 0754/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v24.2.0 (#619)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `24.1.2` -> `24.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.2.0/compatibility-slim/24.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.2.0/confidence-slim/24.1.2)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e0d2bc450cb0..ee1384b09bf5 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        24.1.2
+        24.2.0
         pom
         import
       

From 3c41468e61b91314079dd3774c60d8fc1e959c8f Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Wed, 12 Jan 2022 10:14:27 -0800
Subject: [PATCH 0755/1784] chore(java): update variable name to api_shortname
 in README template (#616)

* chore(java): update variable name to api_shortname in README template

* chore: fix test

* chore: fix test

Source-Author: Neenu Shaji 
Source-Date: Mon Jan 10 20:41:34 2022 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 6355638dfed614fe5977a06d59dc010370f88582
Source-Link: https://github.com/googleapis/synthtool/commit/6355638dfed614fe5977a06d59dc010370f88582
---
 .github/ISSUE_TEMPLATE/bug_report.md |  2 +-
 .kokoro/build.sh                     | 10 +++++-----
 synth.metadata                       |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 11763abd4668..630ca5ddb300 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible:
    General, Core, and Other are also allowed as types
 2. OS type and version:
 3. Java version:
-4. datastore version(s):
+4.  version(s):
 
 #### Steps to reproduce
 
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index c8fbef2b0aad..aa42294793a8 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,15 +47,15 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
     RETURN_CODE=$?
     ;;
 lint)
-    mvn com.coveo:fmt-maven-plugin:check
+    mvn com.coveo:fmt-maven-plugin:check -B -ntp
     RETURN_CODE=$?
     ;;
 javadoc)
-    mvn javadoc:javadoc javadoc:test-javadoc
+    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
     RETURN_CODE=$?
     ;;
 integration)
@@ -71,7 +71,7 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
 samples)
@@ -104,7 +104,7 @@ samples)
     fi
     ;;
 clirr)
-    mvn -B -Denforcer.skip=true clirr:check
+    mvn -B -ntp -Denforcer.skip=true clirr:check
     RETURN_CODE=$?
     ;;
 *)
diff --git a/synth.metadata b/synth.metadata
index c72bd7ba4ad1..1a44651240c9 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,22 +4,22 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "e08f9d93d8a8b912fffd602bed3189c1bed664a6"
+        "sha": "61dbd04381c0b0d6d8408e5b319b58d559c6d33f"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "d2977af9e9f1fc0c9dc8368352daa032471f3c63",
-        "internalRef": "403132955"
+        "sha": "10380880f030101709b3ebe1eb1dd121fa8b4116",
+        "internalRef": "420859180"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "723f3ce6c8927683e96cd7a4a02b59606a14eafc"
+        "sha": "6355638dfed614fe5977a06d59dc010370f88582"
       }
     }
   ],

From e6a3cb291cdb7db0fb32ccde53b64a41e31d6053 Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Thu, 13 Jan 2022 14:28:16 -0500
Subject: [PATCH 0756/1784] chore: update release-level in .repo-metadata.json
 (#621)

---
 .repo-metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index dda5be8a0b08..565a33748144 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -4,7 +4,7 @@
   "product_documentation": "https://cloud.google.com/datastore",
   "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
-  "release_level": "ga",
+  "release_level": "stable",
   "language": "java",
   "repo": "googleapis/java-datastore",
   "repo_short": "java-datastore",

From fab0fd6ae955c3d5ad0346af6b9f725915560bc8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 18 Jan 2022 20:10:19 +0100
Subject: [PATCH 0757/1784] build(deps): update dependency
 org.codehaus.mojo:build-helper-maven-plugin to v3.3.0 (#608)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.codehaus.mojo:build-helper-maven-plugin](http://www.mojohaus.org/build-helper-maven-plugin/) ([source](https://togithub.com/mojohaus/build-helper-maven-plugin)) | `3.2.0` -> `3.3.0` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/compatibility-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/confidence-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 862492a417ef..9d572ed6c243 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -53,7 +53,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.2.0
+        3.3.0
         
           
             add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2d5058e8d7c2..8c10f1f55f4d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -52,7 +52,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.2.0
+        3.3.0
         
           
             add-snippets-source

From a24215c650c8cb2eb20bbc99f0ccc4c2fd91ac9a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 19 Jan 2022 02:20:34 +0100
Subject: [PATCH 0758/1784] deps: update dependency org.easymock:easymock to v4
 (#614)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.easymock:easymock](http://easymock.org) ([source](https://togithub.com/easymock/easymock)) | `3.6` -> `4.3` | [![age](https://badges.renovateapi.com/packages/maven/org.easymock:easymock/4.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.easymock:easymock/4.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.easymock:easymock/4.3/compatibility-slim/3.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.easymock:easymock/4.3/confidence-slim/3.6)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 77576660548c..4331a0148341 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
       
         org.easymock
         easymock
-        3.6
+        4.3
         test
       
         

From ea973af5ab5296a08f75f322706e0f9cd58fcba6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 21 Jan 2022 21:34:35 +0100
Subject: [PATCH 0759/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.2.6 (#624)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.5` -> `1.2.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/compatibility-slim/1.2.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/confidence-slim/1.2.5)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.2.6`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​126-httpsgithubcomgoogleapisjava-shared-configcomparev125v126-2022-01-19)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.5...v1.2.6)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 8e08f8f62a2a..23e14a3326c5 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.2.5
+    1.2.6
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 4331a0148341..a19e5929d74c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.2.5
+    1.2.6
   
 
   

From 298e0b0651355649629888dcbacafc2970df4167 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 31 Jan 2022 23:44:07 -0500
Subject: [PATCH 0760/1784] deps: update shared dependencies to 2.7.0 and
 remove google-oauth-client from dependency management (#629)

---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a19e5929d74c..9dabaf1ecd66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.6.0
+        2.7.0
         pom
         import
       
@@ -171,11 +171,6 @@
               
             
           
-      
-        com.google.oauth-client
-        google-oauth-client
-        1.32.1
-      
       
       
         junit

From ff99216c6a66000c30ebf074e4bffe28db10683a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 16:08:50 +0000
Subject: [PATCH 0761/1784] chore(main): release 2.2.3 (#622)

:robot: I have created a release *beep* *boop*
---


### [2.2.3](https://github.com/googleapis/java-datastore/compare/v2.2.2...v2.2.3) (2022-02-01)


### Dependencies

* update dependency org.easymock:easymock to v4 ([#614](https://github.com/googleapis/java-datastore/issues/614)) ([a24215c](https://github.com/googleapis/java-datastore/commit/a24215c650c8cb2eb20bbc99f0ccc4c2fd91ac9a))
* update shared dependencies to 2.7.0 and remove google-oauth-client from dependency management ([#629](https://github.com/googleapis/java-datastore/issues/629)) ([298e0b0](https://github.com/googleapis/java-datastore/commit/298e0b0651355649629888dcbacafc2970df4167))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  8 ++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b6744cb5efc..eb681007cf3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### [2.2.3](https://github.com/googleapis/java-datastore/compare/v2.2.2...v2.2.3) (2022-02-01)
+
+
+### Dependencies
+
+* update dependency org.easymock:easymock to v4 ([#614](https://github.com/googleapis/java-datastore/issues/614)) ([a24215c](https://github.com/googleapis/java-datastore/commit/a24215c650c8cb2eb20bbc99f0ccc4c2fd91ac9a))
+* update shared dependencies to 2.7.0 and remove google-oauth-client from dependency management ([#629](https://github.com/googleapis/java-datastore/issues/629)) ([298e0b0](https://github.com/googleapis/java-datastore/commit/298e0b0651355649629888dcbacafc2970df4167))
+
 ### [2.2.2](https://www.github.com/googleapis/java-datastore/compare/v2.2.1...v2.2.2) (2022-01-07)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 72674fce0ace..32b38d586cd7 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.2.3-SNAPSHOT
+  2.2.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.3-SNAPSHOT
+    2.2.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 23e14a3326c5..bcb413b8e2e0 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.2.3-SNAPSHOT
+  2.2.3
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.3-SNAPSHOT
+        0.93.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.3-SNAPSHOT
+        2.2.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cb3ab2717f09..30a379d11b2f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.3-SNAPSHOT
+  2.2.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.3-SNAPSHOT
+    2.2.3
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 9dabaf1ecd66..923c8722c4d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.3-SNAPSHOT
+  2.2.3
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.3-SNAPSHOT
+        0.93.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.3-SNAPSHOT
+        2.2.3
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a9813704f892..cd9994970416 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.93.3-SNAPSHOT
+  0.93.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.3-SNAPSHOT
+    2.2.3
   
   
     
diff --git a/versions.txt b/versions.txt
index 91ac810b659d..d0bb02b823af 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.2:2.2.3-SNAPSHOT
-google-cloud-datastore-bom:2.2.2:2.2.3-SNAPSHOT
-google-cloud-datastore-parent:2.2.2:2.2.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.2:0.93.3-SNAPSHOT
-datastore-v1-proto-client:2.2.2:2.2.3-SNAPSHOT
+google-cloud-datastore:2.2.3:2.2.3
+google-cloud-datastore-bom:2.2.3:2.2.3
+google-cloud-datastore-parent:2.2.3:2.2.3
+proto-google-cloud-datastore-v1:0.93.3:0.93.3
+datastore-v1-proto-client:2.2.3:2.2.3
 

From b2d0196001a23b314100e35177735d36e9d8616f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 16:34:50 +0000
Subject: [PATCH 0762/1784] chore(main): release 2.2.4-SNAPSHOT (#630)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 32b38d586cd7..c550366c3f42 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.2.3
+  2.2.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.3
+    2.2.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index bcb413b8e2e0..6cd42e706669 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.2.3
+  2.2.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.3
+        0.93.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.3
+        2.2.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 30a379d11b2f..f55a82c149f0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.3
+  2.2.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.3
+    2.2.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 923c8722c4d2..cd5cc220d9e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.3
+  2.2.4-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.3
+        0.93.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.3
+        2.2.4-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cd9994970416..eb3e32aba472 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.93.3
+  0.93.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.3
+    2.2.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index d0bb02b823af..6d9902850c48 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.3:2.2.3
-google-cloud-datastore-bom:2.2.3:2.2.3
-google-cloud-datastore-parent:2.2.3:2.2.3
-proto-google-cloud-datastore-v1:0.93.3:0.93.3
-datastore-v1-proto-client:2.2.3:2.2.3
+google-cloud-datastore:2.2.3:2.2.4-SNAPSHOT
+google-cloud-datastore-bom:2.2.3:2.2.4-SNAPSHOT
+google-cloud-datastore-parent:2.2.3:2.2.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.3:0.93.4-SNAPSHOT
+datastore-v1-proto-client:2.2.3:2.2.4-SNAPSHOT
 

From 66b2c7620d6c050eaef99c328812224fe02e0428 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 2 Feb 2022 05:44:29 +0100
Subject: [PATCH 0763/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.3 (#631)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.2` -> `2.2.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.3/compatibility-slim/2.2.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.3/confidence-slim/2.2.2)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​223-httpsgithubcomgoogleapisjava-datastorecomparev222v223-2022-02-01)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.2...v2.2.3)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 9d572ed6c243..bc339cb3e12f 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.2.2
+      2.2.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8c10f1f55f4d..452a0c260880 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.2
+      2.2.3
     
 
     

From 7ddb3779271338b9ff01df91ac446450eba45ba8 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Thu, 3 Feb 2022 11:40:56 -0800
Subject: [PATCH 0764/1784] deps(java): update actions/github-script action to
 v5 (#626)

Source-Author: Neenu Shaji 
Source-Date: Tue Jan 25 17:48:06 2022 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 466412a75d636d69bcf8a42d9a5f956e73ac421d
Source-Link: https://github.com/googleapis/synthtool/commit/466412a75d636d69bcf8a42d9a5f956e73ac421d
---
 .github/workflows/approve-readme.yaml | 2 +-
 .github/workflows/auto-release.yaml   | 2 +-
 synth.metadata                        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index 7513acaebcc2..c5132427982f 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v5
         with:
           github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
           script: |
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 9b4fd4d8348d..59c7cadde314 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.head_ref, 'release-please')
     steps:
-    - uses: actions/github-script@v3
+    - uses: actions/github-script@v5
       with:
         github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
         debug: true
diff --git a/synth.metadata b/synth.metadata
index 1a44651240c9..4ff1edde0761 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "61dbd04381c0b0d6d8408e5b319b58d559c6d33f"
+        "sha": "ea973af5ab5296a08f75f322706e0f9cd58fcba6"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6355638dfed614fe5977a06d59dc010370f88582"
+        "sha": "466412a75d636d69bcf8a42d9a5f956e73ac421d"
       }
     }
   ],

From 1810bae27175ea5db1fa8ea78a36fc717461f496 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 21:05:00 +0000
Subject: [PATCH 0765/1784] chore(main): release 2.2.4 (#633)

:robot: I have created a release *beep* *boop*
---


### [2.2.4](https://github.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4) (2022-02-03)


### Dependencies

* **java:** update actions/github-script action to v5 ([#626](https://github.com/googleapis/java-datastore/issues/626)) ([7ddb377](https://github.com/googleapis/java-datastore/commit/7ddb3779271338b9ff01df91ac446450eba45ba8))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            |  7 +++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb681007cf3a..e2ccb7f5fe35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.2.4](https://github.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4) (2022-02-03)
+
+
+### Dependencies
+
+* **java:** update actions/github-script action to v5 ([#626](https://github.com/googleapis/java-datastore/issues/626)) ([7ddb377](https://github.com/googleapis/java-datastore/commit/7ddb3779271338b9ff01df91ac446450eba45ba8))
+
 ### [2.2.3](https://github.com/googleapis/java-datastore/compare/v2.2.2...v2.2.3) (2022-02-01)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index c550366c3f42..780bfea9a80c 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.2.4-SNAPSHOT
+  2.2.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.4-SNAPSHOT
+    2.2.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6cd42e706669..ea9969cd13eb 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.2.4-SNAPSHOT
+  2.2.4
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.4-SNAPSHOT
+        0.93.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.4-SNAPSHOT
+        2.2.4
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f55a82c149f0..2f1c9e7107ff 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.4-SNAPSHOT
+  2.2.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.4-SNAPSHOT
+    2.2.4
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index cd5cc220d9e6..18b84bd5476c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.4-SNAPSHOT
+  2.2.4
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.4-SNAPSHOT
+        0.93.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.4-SNAPSHOT
+        2.2.4
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index eb3e32aba472..1a96a91ada81 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.93.4-SNAPSHOT
+  0.93.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.4-SNAPSHOT
+    2.2.4
   
   
     
diff --git a/versions.txt b/versions.txt
index 6d9902850c48..2bbb42f5cffb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.3:2.2.4-SNAPSHOT
-google-cloud-datastore-bom:2.2.3:2.2.4-SNAPSHOT
-google-cloud-datastore-parent:2.2.3:2.2.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.3:0.93.4-SNAPSHOT
-datastore-v1-proto-client:2.2.3:2.2.4-SNAPSHOT
+google-cloud-datastore:2.2.4:2.2.4
+google-cloud-datastore-bom:2.2.4:2.2.4
+google-cloud-datastore-parent:2.2.4:2.2.4
+proto-google-cloud-datastore-v1:0.93.4:0.93.4
+datastore-v1-proto-client:2.2.4:2.2.4
 

From cc23b99c1fad166c1cc8b072ace0920cac250201 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 4 Feb 2022 01:30:42 +0000
Subject: [PATCH 0766/1784] chore(main): release 2.2.5-SNAPSHOT (#634)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  6 +++---
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 780bfea9a80c..efb2dad09f72 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.2.4
+  2.2.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.4
+    2.2.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ea9969cd13eb..bb4c4af8c362 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.2.4
+  2.2.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.4
+        0.93.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.2.4
+        2.2.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2f1c9e7107ff..a723c28f5a14 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.4
+  2.2.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.4
+    2.2.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 18b84bd5476c..59aab6c2c73d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.4
+  2.2.5-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,12 +158,12 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.4
+        0.93.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.4
+        2.2.5-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1a96a91ada81..c76cdc1b2d32 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.93.4
+  0.93.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.4
+    2.2.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 2bbb42f5cffb..05561e8ca04b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.4:2.2.4
-google-cloud-datastore-bom:2.2.4:2.2.4
-google-cloud-datastore-parent:2.2.4:2.2.4
-proto-google-cloud-datastore-v1:0.93.4:0.93.4
-datastore-v1-proto-client:2.2.4:2.2.4
+google-cloud-datastore:2.2.4:2.2.5-SNAPSHOT
+google-cloud-datastore-bom:2.2.4:2.2.5-SNAPSHOT
+google-cloud-datastore-parent:2.2.4:2.2.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.4:0.93.5-SNAPSHOT
+datastore-v1-proto-client:2.2.4:2.2.5-SNAPSHOT
 

From 74d6d7396f756d81c8ff258505b7c69c3c6344b0 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 4 Feb 2022 11:12:57 -0800
Subject: [PATCH 0767/1784] chore: add kokoro config to run nightly integration
 test on java11.0.14 (#635)

Source-Author: Neenu Shaji 
Source-Date: Thu Feb 3 13:21:25 2022 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 010e6b0541130bef2cfe453380a31bea959278c5
Source-Link: https://github.com/googleapis/synthtool/commit/010e6b0541130bef2cfe453380a31bea959278c5
---
 .kokoro/nightly/java11-integration.cfg | 37 ++++++++++++++++++++++++++
 synth.metadata                         |  5 ++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 .kokoro/nightly/java11-integration.cfg

diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg
new file mode 100644
index 000000000000..58049cc38f11
--- /dev/null
+++ b/.kokoro/nightly/java11-integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/java11014"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "ENABLE_FLAKYBOT"
+  value: "true"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/synth.metadata b/synth.metadata
index 4ff1edde0761..b2f526b6c686 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "ea973af5ab5296a08f75f322706e0f9cd58fcba6"
+        "sha": "1810bae27175ea5db1fa8ea78a36fc717461f496"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "466412a75d636d69bcf8a42d9a5f956e73ac421d"
+        "sha": "010e6b0541130bef2cfe453380a31bea959278c5"
       }
     }
   ],
@@ -61,6 +61,7 @@
     ".kokoro/dependencies.sh",
     ".kokoro/nightly/common.cfg",
     ".kokoro/nightly/integration.cfg",
+    ".kokoro/nightly/java11-integration.cfg",
     ".kokoro/nightly/java11.cfg",
     ".kokoro/nightly/java7.cfg",
     ".kokoro/nightly/java8-osx.cfg",

From 2507460d86e700adb470a282097604cfb98a555e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 8 Feb 2022 18:40:49 +0100
Subject: [PATCH 0768/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.2.7 (#638)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.6` -> `1.2.7` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/compatibility-slim/1.2.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/confidence-slim/1.2.6)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.2.7`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​127-httpsgithubcomgoogleapisjava-shared-configcomparev126v127-2022-02-04)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.6...v1.2.7)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 bb4c4af8c362..310d1d781d2a 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.2.6
+    1.2.7
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 59aab6c2c73d..a01e575da7ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.2.6
+    1.2.7
   
 
   

From c3c9fb7dcd6bd29aaedc3b64db2323d463d6ddf9 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 8 Feb 2022 20:14:49 +0100
Subject: [PATCH 0769/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.4 (#636)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.3` -> `2.2.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/compatibility-slim/2.2.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/confidence-slim/2.2.3)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.4`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​224-httpsgithubcomgoogleapisjava-datastorecomparev223v224-2022-02-03)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index bc339cb3e12f..3484131b6926 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.2.3
+      2.2.4
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 452a0c260880..b6625214c1b1 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.3
+      2.2.4
     
 
     

From 577978cf5ecc5b644599ea98927534ca7a71a8d8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 8 Feb 2022 23:14:52 +0100
Subject: [PATCH 0770/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v24.3.0 (#639)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java)) | `24.2.0` -> `24.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/compatibility-slim/24.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/confidence-slim/24.2.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index ee1384b09bf5..becb3dbe5dd4 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        24.2.0
+        24.3.0
         pom
         import
       

From d8ce0e7df9c297977c674bd35def7fec957bfce0 Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Mon, 14 Feb 2022 16:40:52 -0500
Subject: [PATCH 0771/1784] chore: migrate to owlbot (#584)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: migrate to owlbot

* update owlbot

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix readme partials

* fix xmls

Co-authored-by: Kristen O'Leary 
Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml                     |   3 +
 .github/.OwlBot.yaml                          |  25 +
 .github/workflows/approve-readme.yaml         |  15 +
 .github/workflows/auto-release.yaml           |  27 +-
 .github/workflows/ci.yaml                     |  15 +
 .github/workflows/samples.yaml                |  15 +
 .kokoro/build.bat                             |  15 +
 .readme-partials.yaml                         |  10 +-
 .repo-metadata.json                           |   5 +-
 README.md                                     |  17 +-
 datastore-v1-proto-client/pom.xml             |   2 +-
 google-cloud-datastore-bom/pom.xml            |  12 +-
 google-cloud-datastore/pom.xml                |   4 +-
 .../google/cloud/datastore/package-info.java  |   4 +-
 .../cloud/datastore/testing/package-info.java |   2 +-
 synth.py => owlbot.py                         |  52 +-
 pom.xml                                       |  14 +-
 proto-google-cloud-datastore-v1/pom.xml       |   2 +-
 .../example/datastore/QuickstartSample.java   |   7 +-
 .../google/datastore/snippets/TaskList.java   |  25 +-
 .../example/datastore/QuickstartSampleIT.java |   4 +-
 .../datastore/snippets/ConceptsTest.java      | 502 ++++++++++--------
 versions.txt                                  |   2 -
 23 files changed, 465 insertions(+), 314 deletions(-)
 create mode 100644 .github/.OwlBot.lock.yaml
 create mode 100644 .github/.OwlBot.yaml
 rename synth.py => owlbot.py (55%)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
new file mode 100644
index 000000000000..3aedd6c119d5
--- /dev/null
+++ b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+  digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
+  image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
new file mode 100644
index 000000000000..d110678c0179
--- /dev/null
+++ b/.github/.OwlBot.yaml
@@ -0,0 +1,25 @@
+# Copyright 2021 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.
+
+docker:
+  image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
+deep-remove-regex:
+- "/proto-google-.*/src"
+
+deep-preserve-regex:
+- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
+
+deep-copy-regex:
+- source: "/google/datastore/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-$1/src"
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index c5132427982f..1bb182327612 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -1,3 +1,18 @@
+# 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.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
 on:
   pull_request:
 name: auto-merge-readme
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 59c7cadde314..18e23230d98f 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -1,3 +1,18 @@
+# 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.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
 on:
   pull_request:
 name: auto-release
@@ -16,13 +31,13 @@ jobs:
             return;
           }
 
-          // only approve PRs like "chore: release "
-          if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+          // only approve PRs like "chore(main): release "
+          if (  !context.payload.pull_request.title.startsWith("chore(main): release") ) {
             return;
           }
 
           // only approve PRs with pom.xml and versions.txt changes
-          const filesPromise = github.pulls.listFiles.endpoint({
+          const filesPromise = github.rest.pulls.listFiles.endpoint({
             owner: context.repo.owner,
             repo: context.repo.repo,
             pull_number: context.payload.pull_request.number,
@@ -54,7 +69,7 @@ jobs:
             return;
           }
 
-          const promise = github.pulls.list.endpoint({
+          const promise = github.rest.pulls.list.endpoint({
             owner: context.repo.owner,
             repo: context.repo.repo,
             state: 'open'
@@ -71,7 +86,7 @@ jobs:
           }
 
           // approve release PR
-          await github.pulls.createReview({
+          await github.rest.pulls.createReview({
             owner: context.repo.owner,
             repo: context.repo.repo,
             body: 'Rubber stamped release!',
@@ -80,7 +95,7 @@ jobs:
           });
 
           // attach kokoro:force-run and automerge labels
-          await github.issues.addLabels({
+          await github.rest.issues.addLabels({
             owner: context.repo.owner,
             repo: context.repo.repo,
             issue_number: context.payload.pull_request.number,
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 05de1f60dcf0..6b5e56aaacd1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,3 +1,18 @@
+# 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.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
 on:
   push:
     branches:
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index c46230a78c38..d5d964df15fa 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -1,3 +1,18 @@
+# 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.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
 on:
   pull_request:
 name: samples
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
index 05826ad93fe8..cc602c9eba80 100644
--- a/.kokoro/build.bat
+++ b/.kokoro/build.bat
@@ -1,3 +1,18 @@
 :: See documentation in type-shell-output.bat
+# 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.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
 
 "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
diff --git a/.readme-partials.yaml b/.readme-partials.yaml
index 0796b52e551d..971616778001 100644
--- a/.readme-partials.yaml
+++ b/.readme-partials.yaml
@@ -111,12 +111,12 @@ custom_content: |
 
   This library has tools to help write tests for code that uses the Datastore.
 
-  See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
+  See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/main/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
 
   Example Applications
   --------------------
-  - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
+  - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/main/bookshelf) - An App Engine app that manages a virtual bookshelf.
     - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
-  - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
-  - [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks.
-    - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/sparkjava#how-does-it-work).
+  - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/main/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
+  - [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks.
+    - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/main/flexible/sparkjava#how-does-it-work).
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 565a33748144..72965ea86996 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -12,5 +12,8 @@
   "codeowner_team": "@googleapis/firestore-dpe",
   "api_id": "datastore.googleapis.com",
   "library_type": "GAPIC_COMBO",
-  "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries."
+  "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.",
+  "excluded_dependencies": "grpc-google-cloud-datastore-v1",
+  "extra_versioned_modules": "datastore-v1-proto-client",
+  "excluded_poms": "grpc-google-cloud-datastore-v1"
 }
diff --git a/README.md b/README.md
index c956dab0d8fd..e43387695fb3 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      23.0.0
+      24.3.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.1.0
+  2.2.4
 
 
 ```
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:23.0.0')
+implementation platform('com.google.cloud:libraries-bom:24.3.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.1.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.2.4'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.1.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.4"
 ```
 
 ## Authentication
@@ -243,7 +243,7 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr
 
 ## Supported Java Versions
 
-Java 7 or above is required for using this client.
+Java 8 or above is required for using this client.
 
 Google's Java client libraries,
 [Google Cloud Client Libraries][cloudlibs]
@@ -312,7 +312,6 @@ Apache 2.0 - See [LICENSE][license] for more information.
 
 Java Version | Status
 ------------ | ------
-Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]
 Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
 Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
 Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
@@ -321,7 +320,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
 Java is a registered trademark of Oracle and/or its affiliates.
 
 [product-docs]: https://cloud.google.com/datastore
-[javadocs]: https://googleapis.dev/java/google-cloud-datastore/latest/index.html
+[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
 [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.svg
 [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.html
 [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.svg
@@ -332,7 +331,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.html
 [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.svg
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
-[stability-image]: https://img.shields.io/badge/stability-ga-green
+[stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
 [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-datastore&core=gav
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index efb2dad09f72..0e0e5e422f2c 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -24,7 +24,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5-SNAPSHOT
+    2.2.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 310d1d781d2a..13f831b33575 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -1,4 +1,4 @@
-
+
 
   4.0.0
   com.google.cloud
@@ -49,16 +49,16 @@
 
   
     
-      
-        com.google.api.grpc
-        proto-google-cloud-datastore-v1
-        0.93.5-SNAPSHOT
-      
       
         com.google.cloud
         google-cloud-datastore
         2.2.5-SNAPSHOT
       
+      
+        com.google.api.grpc
+        proto-google-cloud-datastore-v1
+        0.93.5-SNAPSHOT
+      
     
   
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a723c28f5a14..dbdff3bf33d9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -1,4 +1,4 @@
-
+
 
   4.0.0
   google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5-SNAPSHOT
+    2.2.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
index e2c598534b13..f0f35511fe30 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
@@ -19,7 +19,7 @@
  *
  * 
    Here's a simple usage example for using google-cloud from App/Compute Engine. This example
  * shows how to create a Datastore entity. For the complete source code see 
+ * href="https://github.com/googleapis/google-cloud-java/tree/main/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/CreateEntity.java">
  * CreateEntity.java.
  *
  * 
    {@code
@@ -36,7 +36,7 @@
  *
  * 
    This second example shows how to get and update a Datastore entity if it exists. For the
  * complete source code see 
+ * href="https://github.com/googleapis/google-cloud-java/main/master/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java">
  * UpdateEntity.java.
  *
  * 
    {@code
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
index 007bb3d998a0..86a13fefff69 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
@@ -34,7 +34,7 @@
  * }
    
  *
  * @see 
+ *     href="https://github.com/googleapis/google-cloud-java/main/master/TESTING.md#testing-code-that-uses-datastore">
  *     Google Cloud Java tools for testing
  */
 package com.google.cloud.datastore.testing;
diff --git a/synth.py b/owlbot.py
similarity index 55%
rename from synth.py
rename to owlbot.py
index 7220e8879d50..784f35a4093e 100644
--- a/synth.py
+++ b/owlbot.py
@@ -1,10 +1,10 @@
-# Copyright 2018 Google LLC
+# Copyright 2021 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
+#     https://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,
@@ -12,16 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This script is used to synthesize generated parts of this library."""
-
 import synthtool as s
-import synthtool.gcp as gcp
-import synthtool.languages.java as java
-
-AUTOSYNTH_MULTIPLE_COMMITS = True
-
-gapic = gcp.GAPICBazel()
-
+from synthtool.languages import java
 protobuf_header = "// Generated by the protocol buffer compiler.  DO NOT EDIT!"
 # License header
 license_header = """/*
@@ -40,31 +32,17 @@
  * limitations under the License.
  */
 """
-
 service = 'datastore'
-versions = ['v1']
-
-for version in versions:
-  library = gapic.java_library(
-      service=service,
-      version=version,
-      bazel_target=f'//google/{service}/{version}:google-cloud-{service}-{version}-java',
-      proto_path=f'google/{service}/{version}',
-  )
-
-  library = library / f'google-cloud-{service}-{version}-java'
-
-  s.replace(
-      library / f'proto-google-cloud-{service}-{version}-java/src/**/*.java',
-      protobuf_header,
-      f'{license_header}{protobuf_header}'
-  )
-
-  # Datastore only generates protos
-  s.copy(library / f'proto-google-cloud-{service}-{version}-java/src', f'proto-google-cloud-{service}-{version}/src')
-
-  java.format_code('google-cloud-datastore/src')
-  java.format_code(f'proto-google-cloud-{service}-{version}/src')
-
+version = 'v1'
+
+for library in s.get_staging_dirs():
+    # put any special-case replacements here
+    s.replace(
+        f'owl-bot-staging/v1/proto-google-cloud-{service}-{version}-java/src/**/*.java',
+        protobuf_header,
+        f'{license_header}{protobuf_header}'
+    )
+    s.move(library)
+
+s.remove_staging_dirs()
 java.common_templates()
-
diff --git a/pom.xml b/pom.xml
index a01e575da7ee..9049b1003392 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.5-SNAPSHOT
+  2.2.5-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -155,6 +155,11 @@
         import
       
 
+      
+        com.google.cloud
+        google-cloud-datastore
+        2.2.1-SNAPSHOT
+      
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
@@ -206,9 +211,10 @@
   
 
   
-    datastore-v1-proto-client
-    proto-google-cloud-datastore-v1
     google-cloud-datastore
+    proto-google-cloud-datastore-v1
+    datastore-v1-proto-client
     google-cloud-datastore-bom
   
-
+
+  
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c76cdc1b2d32..06798a186314 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -10,7 +10,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5-SNAPSHOT
+    2.2.5-SNAPSHOT
   
   
     
diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java
index ba1a677062eb..437ceb3a0858 100644
--- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java
+++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java
@@ -36,20 +36,17 @@ public static void main(String... args) throws Exception {
     Key taskKey = datastore.newKeyFactory().setKind(kind).newKey(name);
 
     // Prepares the new entity
-    Entity task = Entity.newBuilder(taskKey)
-        .set("description", "Buy milk")
-        .build();
+    Entity task = Entity.newBuilder(taskKey).set("description", "Buy milk").build();
 
     // Saves the entity
     datastore.put(task);
 
     System.out.printf("Saved %s: %s%n", task.getKey().getName(), task.getString("description"));
 
-    //Retrieve entity
+    // Retrieve entity
     Entity retrieved = datastore.get(taskKey);
 
     System.out.printf("Retrieved %s: %s%n", taskKey.getName(), retrieved.getString("description"));
-
   }
 }
 // [END datastore_quickstart]
diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
index 3f035d3e3dec..135beddeddb0 100644
--- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
+++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
@@ -54,11 +54,14 @@ public class TaskList {
    */
   Key addTask(String description) {
     Key key = datastore.allocateId(keyFactory.newKey());
-    Entity task = Entity.newBuilder(key)
-        .set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build())
-        .set("created", Timestamp.now())
-        .set("done", false)
-        .build();
+    Entity task =
+        Entity.newBuilder(key)
+            .set(
+                "description",
+                StringValue.newBuilder(description).setExcludeFromIndexes(true).build())
+            .set("created", Timestamp.now())
+            .set("done", false)
+            .build();
     datastore.put(task);
     return key;
   }
@@ -128,8 +131,12 @@ static List formatTasks(Iterator tasks) {
         strings.add(
             String.format("%d : %s (done)", task.getKey().getId(), task.getString("description")));
       } else {
-        strings.add(String.format("%d : %s (created %s)", task.getKey().getId(),
-            task.getString("description"), task.getTimestamp("created")));
+        strings.add(
+            String.format(
+                "%d : %s (created %s)",
+                task.getKey().getId(),
+                task.getString("description"),
+                task.getTimestamp("created")));
       }
     }
     return strings;
@@ -198,8 +205,8 @@ private void assertArgsLength(String[] args, int expectedLength) {
   /**
    * Exercises the methods defined in this class.
    *
-   * 
    Assumes that you are authenticated using the Google Cloud SDK (using
-   * {@code gcloud auth application-default login}).
+   * 
    Assumes that you are authenticated using the Google Cloud SDK (using {@code gcloud auth
+   * application-default login}).
    */
   public static void main(String[] args) throws Exception {
     TaskList taskList = new TaskList();
diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
index 6bb2dfe30e4a..1d46f20a443e 100644
--- a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
+++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
@@ -29,9 +29,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Tests for quickstart sample.
- */
+/** Tests for quickstart sample. */
 @RunWith(JUnit4.class)
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
 public class QuickstartSampleIT {
diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 92500ddf9219..1d10f1f6d728 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -75,9 +75,7 @@
 import org.junit.runners.JUnit4;
 import org.threeten.bp.Duration;
 
-/**
- * Contains Cloud Datastore snippets demonstrating concepts for documentation.
- */
+/** Contains Cloud Datastore snippets demonstrating concepts for documentation. */
 @RunWith(JUnit4.class)
 public class ConceptsTest {
 
@@ -92,8 +90,7 @@ public class ConceptsTest {
   private Timestamp endDate;
   private Timestamp includedDate;
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
+  @Rule public ExpectedException thrown = ExpectedException.none();
 
   /**
    * Starts the local Datastore emulator.
@@ -107,7 +104,7 @@ public static void beforeClass() throws IOException, InterruptedException {
   }
 
   /**
-   * Initializes Datastore and cleans out any residual values.  Also initializes global variables
+   * Initializes Datastore and cleans out any residual values. Also initializes global variables
    * used for testing.
    */
   @Before
@@ -163,10 +160,12 @@ public void testNamedKey() {
   @Test
   public void testKeyWithParent() {
     // [START datastore_key_with_parent]
-    Key taskKey = datastore.newKeyFactory()
-        .addAncestors(PathElement.of("TaskList", "default"))
-        .setKind("Task")
-        .newKey("sampleTask");
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .setKind("Task")
+            .newKey("sampleTask");
     // [END datastore_key_with_parent]
     assertValidKey(taskKey);
   }
@@ -174,9 +173,11 @@ public void testKeyWithParent() {
   @Test
   public void testKeyWithMultilevelParent() {
     // [START datastore_key_with_multilevel_parent]
-    KeyFactory keyFactory = datastore.newKeyFactory()
-        .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default"))
-        .setKind("Task");
+    KeyFactory keyFactory =
+        datastore
+            .newKeyFactory()
+            .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default"))
+            .setKind("Task");
     Key taskKey = keyFactory.newKey("sampleTask");
     // [END datastore_key_with_multilevel_parent]
     assertValidKey(taskKey);
@@ -190,16 +191,19 @@ private void assertValidEntity(Entity original) {
   @Test
   public void testEntityWithParent() {
     // [START datastore_entity_with_parent]
-    Key taskKey = datastore.newKeyFactory()
-        .addAncestors(PathElement.of("TaskList", "default"))
-        .setKind("Task")
-        .newKey("sampleTask");
-    Entity task = Entity.newBuilder(taskKey)
-        .set("category", "Personal")
-        .set("done", false)
-        .set("priority", 4)
-        .set("description", "Learn Cloud Datastore")
-        .build();
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .setKind("Task")
+            .newKey("sampleTask");
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
     // [END datastore_entity_with_parent]
     assertValidEntity(task);
   }
@@ -207,15 +211,17 @@ public void testEntityWithParent() {
   @Test
   public void testProperties() {
     // [START datastore_properties]
-    Entity task = Entity.newBuilder(taskKey)
-        .set("category", "Personal")
-        .set("created", Timestamp.now())
-        .set("done", false)
-        .set("priority", 4)
-        .set("percent_complete", 10.0)
-        .set("description",
-          StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
-        .build();
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("created", Timestamp.now())
+            .set("done", false)
+            .set("priority", 4)
+            .set("percent_complete", 10.0)
+            .set(
+                "description",
+                StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
+            .build();
     // [END datastore_properties]
     assertValidEntity(task);
   }
@@ -223,10 +229,11 @@ public void testProperties() {
   @Test
   public void testArrayValue() {
     // [START datastore_array_value]
-    Entity task = Entity.newBuilder(taskKey)
-        .set("tags", "fun", "programming")
-        .set("collaborators", ListValue.of("alice", "bob"))
-        .build();
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("tags", "fun", "programming")
+            .set("collaborators", ListValue.of("alice", "bob"))
+            .build();
     // [END datastore_array_value]
     assertValidEntity(task);
   }
@@ -234,15 +241,14 @@ public void testArrayValue() {
   @Test
   public void testBasicEntity() {
     // [START datastore_basic_entity]
-    Key taskKey = datastore.newKeyFactory()
-        .setKind("Task")
-        .newKey("sampleTask");
-    Entity task = Entity.newBuilder(taskKey)
-        .set("category", "Personal")
-        .set("done", false)
-        .set("priority", 4)
-        .set("description", "Learn Cloud Datastore")
-        .build();
+    Key taskKey = datastore.newKeyFactory().setKind("Task").newKey("sampleTask");
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
     // [END datastore_basic_entity]
     assertValidEntity(task);
   }
@@ -293,18 +299,20 @@ public void testDelete() {
   }
 
   private List setUpBatchTests(Key taskKey1, Key taskKey2) {
-    Entity task1 = Entity.newBuilder(taskKey1)
-        .set("category", "Personal")
-        .set("done", false)
-        .set("priority", 4)
-        .set("description", "Learn Cloud Datastore")
-        .build();
-    Entity task2 = Entity.newBuilder(taskKey2)
-        .set("category", "Personal")
-        .set("done", false)
-        .set("priority", 5)
-        .set("description", "Integrate Cloud Datastore")
-        .build();
+    Entity task1 =
+        Entity.newBuilder(taskKey1)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
+    Entity task2 =
+        Entity.newBuilder(taskKey2)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 5)
+            .set("description", "Integrate Cloud Datastore")
+            .build();
     datastore.put(task1, task2);
     return ImmutableList.of(task1, task2);
   }
@@ -312,18 +320,20 @@ private List setUpBatchTests(Key taskKey1, Key taskKey2) {
   @Test
   public void testBatchUpsert() {
     // [START datastore_batch_upsert]
-    FullEntity task1 = FullEntity.newBuilder(keyFactory.newKey())
-        .set("category", "Personal")
-        .set("done", false)
-        .set("priority", 4)
-        .set("description", "Learn Cloud Datastore")
-        .build();
-    FullEntity task2 = Entity.newBuilder(keyFactory.newKey())
-        .set("category", "Personal")
-        .set("done", false)
-        .set("priority", 5)
-        .set("description", "Integrate Cloud Datastore")
-        .build();
+    FullEntity task1 =
+        FullEntity.newBuilder(keyFactory.newKey())
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
+    FullEntity task2 =
+        Entity.newBuilder(keyFactory.newKey())
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 5)
+            .set("description", "Integrate Cloud Datastore")
+            .build();
     List tasks = datastore.add(task1, task2);
     Key taskKey1 = tasks.get(0).getKey();
     Key taskKey2 = tasks.get(1).getKey();
@@ -357,21 +367,25 @@ public void testBatchDelete() {
   }
 
   private void setUpQueryTests() {
-    Key taskKey = datastore.newKeyFactory()
-        .setKind("Task")
-        .addAncestors(PathElement.of("TaskList", "default"))
-        .newKey("someTask");
-    datastore.put(Entity.newBuilder(taskKey)
-        .set("category", "Personal")
-        .set("done", false)
-        .set("completed", false)
-        .set("priority", 4)
-        .set("created", includedDate)
-        .set("percent_complete", 10.0)
-        .set("description",
-            StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
-        .set("tag", "fun", "l", "programming")
-        .build());
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .setKind("Task")
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .newKey("someTask");
+    datastore.put(
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("completed", false)
+            .set("priority", 4)
+            .set("created", includedDate)
+            .set("percent_complete", 10.0)
+            .set(
+                "description",
+                StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
+            .set("tag", "fun", "l", "programming")
+            .build());
   }
 
   private  V assertValidQuery(Query query) {
@@ -390,12 +404,14 @@ private  void assertInvalidQuery(Query query) {
   public void testBasicQuery() {
     setUpQueryTests();
     // [START datastore_basic_query]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(CompositeFilter.and(
-            PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4)))
-        .setOrderBy(OrderBy.desc("priority"))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4)))
+            .setOrderBy(OrderBy.desc("priority"))
+            .build();
     // [END datastore_basic_query]
     assertValidQuery(query);
   }
@@ -416,8 +432,10 @@ public void testPropertyFilter() {
     setUpQueryTests();
     // [START datastore_property_filter]
     Query query =
-        Query.newEntityQueryBuilder().setKind("Task").setFilter(PropertyFilter.eq("done", false))
-        .build();
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.eq("done", false))
+            .build();
     // [END datastore_property_filter]
     assertValidQuery(query);
   }
@@ -426,11 +444,13 @@ public void testPropertyFilter() {
   public void testCompositeFilter() {
     setUpQueryTests();
     // [START datastore_composite_filter]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(
-            CompositeFilter.and(PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4)))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4)))
+            .build();
     // [END datastore_composite_filter]
     assertValidQuery(query);
   }
@@ -439,10 +459,11 @@ public void testCompositeFilter() {
   public void testKeyFilter() {
     setUpQueryTests();
     // [START datastore_key_filter]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask")))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask")))
+            .build();
     // [END datastore_key_filter]
     assertValidQuery(query);
   }
@@ -471,10 +492,11 @@ public void testDescendingSort() {
   public void testMultiSort() {
     setUpQueryTests();
     // [START datastore_multi_sort]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created"))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created"))
+            .build();
     // [END datastore_multi_sort]
     assertValidQuery(query);
   }
@@ -494,11 +516,13 @@ public void testKindlessQuery() {
   public void testAncestorQuery() {
     setUpQueryTests();
     // [START datastore_ancestor_query]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(PropertyFilter.hasAncestor(
-            datastore.newKeyFactory().setKind("TaskList").newKey("default")))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                PropertyFilter.hasAncestor(
+                    datastore.newKeyFactory().setKind("TaskList").newKey("default")))
+            .build();
     // [END datastore_ancestor_query]
     assertValidQuery(query);
   }
@@ -507,10 +531,11 @@ public void testAncestorQuery() {
   public void testProjectionQuery() {
     setUpQueryTests();
     // [START datastore_projection_query]
-    Query query = Query.newProjectionEntityQueryBuilder()
-        .setKind("Task")
-        .setProjection("priority", "percent_complete")
-        .build();
+    Query query =
+        Query.newProjectionEntityQueryBuilder()
+            .setKind("Task")
+            .setProjection("priority", "percent_complete")
+            .build();
     // [END datastore_projection_query]
     assertValidQuery(query);
   }
@@ -518,10 +543,11 @@ public void testProjectionQuery() {
   @Test
   public void testRunProjectionQuery() {
     setUpQueryTests();
-    Query query = Query.newProjectionEntityQueryBuilder()
-        .setKind("Task")
-        .setProjection("priority", "percent_complete")
-        .build();
+    Query query =
+        Query.newProjectionEntityQueryBuilder()
+            .setKind("Task")
+            .setProjection("priority", "percent_complete")
+            .build();
     // [START datastore_run_query_projection]
     List priorities = new LinkedList<>();
     List percentCompletes = new LinkedList<>();
@@ -549,12 +575,13 @@ public void testKeysOnlyQuery() {
   public void testDistinctOnQuery() {
     setUpQueryTests();
     // [START datastore_distinct_on_query]
-    Query query = Query.newProjectionEntityQueryBuilder()
-        .setKind("Task")
-        .setProjection("category", "priority")
-        .setDistinctOn("category")
-        .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority"))
-        .build();
+    Query query =
+        Query.newProjectionEntityQueryBuilder()
+            .setKind("Task")
+            .setProjection("category", "priority")
+            .setDistinctOn("category")
+            .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority"))
+            .build();
     // [END datastore_distinct_on_query]
     assertValidQuery(query);
   }
@@ -563,11 +590,13 @@ public void testDistinctOnQuery() {
   public void testArrayValueInequalityRange() {
     setUpQueryTests();
     // [START datastore_array_value_inequality_range]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(CompositeFilter.and(
-            PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math")))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math")))
+            .build();
     // [END datastore_array_value_inequality_range]
     QueryResults results = datastore.run(query);
     assertFalse(results.hasNext());
@@ -577,11 +606,13 @@ public void testArrayValueInequalityRange() {
   public void testArrayValueEquality() {
     setUpQueryTests();
     // [START datastore_array_value_equality]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(CompositeFilter.and(
-            PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming")))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming")))
+            .build();
     // [END datastore_array_value_equality]
     assertValidQuery(query);
   }
@@ -590,11 +621,13 @@ public void testArrayValueEquality() {
   public void testInequalityRange() {
     setUpQueryTests();
     // [START datastore_inequality_range]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(CompositeFilter.and(
-            PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
+            .build();
     // [END datastore_inequality_range]
     assertValidQuery(query);
   }
@@ -602,11 +635,13 @@ public void testInequalityRange() {
   @Test
   public void testInequalityInvalid() {
     // [START datastore_inequality_invalid]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(CompositeFilter.and(
-            PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3)))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3)))
+            .build();
     // [END datastore_inequality_invalid]
     assertInvalidQuery(query);
   }
@@ -615,11 +650,15 @@ public void testInequalityInvalid() {
   public void testEqualAndInequalityRange() {
     setUpQueryTests();
     // [START datastore_equal_and_inequality_range]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(CompositeFilter.and(PropertyFilter.eq("priority", 4),
-            PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("priority", 4),
+                    PropertyFilter.gt("created", startDate),
+                    PropertyFilter.lt("created", endDate)))
+            .build();
     // [END datastore_equal_and_inequality_range]
     assertValidQuery(query);
   }
@@ -628,11 +667,12 @@ public void testEqualAndInequalityRange() {
   public void testInequalitySort() {
     setUpQueryTests();
     // [START datastore_inequality_sort]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(PropertyFilter.gt("priority", 3))
-        .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created"))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.gt("priority", 3))
+            .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created"))
+            .build();
     // [END datastore_inequality_sort]
     assertValidQuery(query);
   }
@@ -640,11 +680,12 @@ public void testInequalitySort() {
   @Test
   public void testInequalitySortInvalidNotSame() {
     // [START datastore_inequality_sort_invalid_not_same]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(PropertyFilter.gt("priority", 3))
-        .setOrderBy(OrderBy.asc("created"))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.gt("priority", 3))
+            .setOrderBy(OrderBy.asc("created"))
+            .build();
     // [END datastore_inequality_sort_invalid_not_same]
     assertInvalidQuery(query);
   }
@@ -652,11 +693,12 @@ public void testInequalitySortInvalidNotSame() {
   @Test
   public void testInequalitySortInvalidNotFirst() {
     // [START datastore_inequality_sort_invalid_not_first]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(PropertyFilter.gt("priority", 3))
-        .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority"))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.gt("priority", 3))
+            .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority"))
+            .build();
     // [END datastore_inequality_sort_invalid_not_first]
     assertInvalidQuery(query);
   }
@@ -682,8 +724,8 @@ public void testCursorPaging() {
 
   private Cursor cursorPaging(int pageSize, Cursor pageCursor) {
     // [START datastore_cursor_paging]
-    EntityQuery.Builder queryBuilder = Query.newEntityQueryBuilder().setKind("Task")
-        .setLimit(pageSize);
+    EntityQuery.Builder queryBuilder =
+        Query.newEntityQueryBuilder().setKind("Task").setLimit(pageSize);
     if (pageCursor != null) {
       queryBuilder.setStartCursor(pageCursor);
     }
@@ -701,11 +743,13 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) {
   public void testEventualConsistentQuery() {
     setUpQueryTests();
     // [START datastore_eventual_consistent_query]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(PropertyFilter.hasAncestor(
-            datastore.newKeyFactory().setKind("TaskList").newKey("default")))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(
+                PropertyFilter.hasAncestor(
+                    datastore.newKeyFactory().setKind("TaskList").newKey("default")))
+            .build();
     datastore.run(query, ReadOption.eventualConsistency());
     // [END datastore_eventual_consistent_query]
     assertValidQuery(query);
@@ -715,10 +759,11 @@ public void testEventualConsistentQuery() {
   public void testUnindexedPropertyQuery() {
     setUpQueryTests();
     // [START datastore_unindexed_property_query]
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("Task")
-        .setFilter(PropertyFilter.eq("description", "A task description"))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.eq("description", "A task description"))
+            .build();
     // [END datastore_unindexed_property_query]
     QueryResults results = datastore.run(query);
     assertFalse(results.hasNext());
@@ -727,11 +772,12 @@ public void testUnindexedPropertyQuery() {
   @Test
   public void testExplodingProperties() {
     // [START datastore_exploding_properties]
-    Entity task = Entity.newBuilder(taskKey)
-        .set("tags", "fun", "programming", "learn")
-        .set("collaborators", "alice", "bob", "charlie")
-        .set("created", Timestamp.now())
-        .build();
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("tags", "fun", "programming", "learn")
+            .set("collaborators", "alice", "bob", "charlie")
+            .set("created", Timestamp.now())
+            .build();
     // [END datastore_exploding_properties]
     assertValidEntity(task);
   }
@@ -766,8 +812,8 @@ void transferFunds(Key fromKey, Key toKey, long amount) {
       Entity updatedFrom =
           Entity.newBuilder(from).set("balance", from.getLong("balance") - amount).build();
       Entity to = entities.get(1);
-      Entity updatedTo = Entity.newBuilder(to).set("balance", to.getLong("balance") + amount)
-          .build();
+      Entity updatedTo =
+          Entity.newBuilder(to).set("balance", to.getLong("balance") + amount).build();
       txn.put(updatedFrom, updatedTo);
       txn.commit();
     } finally {
@@ -831,17 +877,16 @@ public void testTransactionalSingleEntityGroupReadOnly() {
     // [START datastore_transactional_single_entity_group_read_only]
     Entity taskList;
     QueryResults tasks;
-    Transaction txn = datastore.newTransaction(
-        TransactionOptions.newBuilder()
-            .setReadOnly(ReadOnly.newBuilder().build())
-            .build()
-    );
+    Transaction txn =
+        datastore.newTransaction(
+            TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build());
     try {
       taskList = txn.get(taskListKey);
-      Query query = Query.newEntityQueryBuilder()
-          .setKind("Task")
-          .setFilter(PropertyFilter.hasAncestor(taskListKey))
-          .build();
+      Query query =
+          Query.newEntityQueryBuilder()
+              .setKind("Task")
+              .setFilter(PropertyFilter.hasAncestor(taskListKey))
+              .build();
       tasks = txn.run(query);
       txn.commit();
     } finally {
@@ -862,12 +907,14 @@ public void testNamespaceRunQuery() {
     KeyFactory keyFactory = datastore.newKeyFactory().setKind("__namespace__");
     Key startNamespace = keyFactory.newKey("g");
     Key endNamespace = keyFactory.newKey("h");
-    Query query = Query.newKeyQueryBuilder()
-        .setKind("__namespace__")
-        .setFilter(CompositeFilter.and(
-            PropertyFilter.gt("__key__", startNamespace),
-            PropertyFilter.lt("__key__", endNamespace)))
-        .build();
+    Query query =
+        Query.newKeyQueryBuilder()
+            .setKind("__namespace__")
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("__key__", startNamespace),
+                    PropertyFilter.lt("__key__", endNamespace)))
+            .build();
     List namespaces = new ArrayList<>();
     QueryResults results = datastore.run(query);
     while (results.hasNext()) {
@@ -910,8 +957,18 @@ public void testPropertyRunQuery() {
       properties.add(propertyName);
     }
     // [END datastore_property_run_query]
-    Map> expected = ImmutableMap.of("Task", ImmutableSet.of(
-        "done", "category", "done", "completed", "priority", "created", "percent_complete", "tag"));
+    Map> expected =
+        ImmutableMap.of(
+            "Task",
+            ImmutableSet.of(
+                "done",
+                "category",
+                "done",
+                "completed",
+                "priority",
+                "created",
+                "percent_complete",
+                "tag"));
     assertEquals(expected, propertiesByKind);
   }
 
@@ -920,10 +977,11 @@ public void testPropertyByKindRunQuery() {
     setUpQueryTests();
     // [START datastore_property_by_kind_run_query]
     Key key = datastore.newKeyFactory().setKind("__kind__").newKey("Task");
-    Query query = Query.newEntityQueryBuilder()
-        .setKind("__property__")
-        .setFilter(PropertyFilter.hasAncestor(key))
-        .build();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("__property__")
+            .setFilter(PropertyFilter.hasAncestor(key))
+            .build();
     QueryResults results = datastore.run(query);
     Map> representationsByProperty = new HashMap<>();
     while (results.hasNext()) {
@@ -940,15 +998,16 @@ public void testPropertyByKindRunQuery() {
       }
     }
     // [END datastore_property_by_kind_run_query]
-    Map> expected = ImmutableMap.>builder()
-        .put("category", Collections.singleton("STRING"))
-        .put("done", Collections.singleton("BOOLEAN"))
-        .put("completed", Collections.singleton("BOOLEAN"))
-        .put("priority", Collections.singleton("INT64"))
-        .put("created", Collections.singleton("INT64"))
-        .put("percent_complete", Collections.singleton("DOUBLE"))
-        .put("tag", Collections.singleton("STRING"))
-        .build();
+    Map> expected =
+        ImmutableMap.>builder()
+            .put("category", Collections.singleton("STRING"))
+            .put("done", Collections.singleton("BOOLEAN"))
+            .put("completed", Collections.singleton("BOOLEAN"))
+            .put("priority", Collections.singleton("INT64"))
+            .put("created", Collections.singleton("INT64"))
+            .put("percent_complete", Collections.singleton("DOUBLE"))
+            .put("tag", Collections.singleton("STRING"))
+            .build();
     assertEquals(expected, representationsByProperty);
   }
 
@@ -956,14 +1015,17 @@ public void testPropertyByKindRunQuery() {
   public void testPropertyFilteringRunQuery() {
     setUpQueryTests();
     // [START datastore_property_filtering_run_query]
-    Key startKey = datastore.newKeyFactory()
-        .setKind("__property__")
-        .addAncestors(PathElement.of("__kind__", "Task"))
-        .newKey("priority");
-    Query query = Query.newKeyQueryBuilder()
-        .setKind("__property__")
-        .setFilter(PropertyFilter.ge("__key__", startKey))
-        .build();
+    Key startKey =
+        datastore
+            .newKeyFactory()
+            .setKind("__property__")
+            .addAncestors(PathElement.of("__kind__", "Task"))
+            .newKey("priority");
+    Query query =
+        Query.newKeyQueryBuilder()
+            .setKind("__property__")
+            .setFilter(PropertyFilter.ge("__key__", startKey))
+            .build();
     Map> propertiesByKind = new HashMap<>();
     QueryResults keys = datastore.run(query);
     while (keys.hasNext()) {
diff --git a/versions.txt b/versions.txt
index 05561e8ca04b..829809f01a0b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -3,7 +3,5 @@
 
 google-cloud-datastore:2.2.4:2.2.5-SNAPSHOT
 google-cloud-datastore-bom:2.2.4:2.2.5-SNAPSHOT
-google-cloud-datastore-parent:2.2.4:2.2.5-SNAPSHOT
 proto-google-cloud-datastore-v1:0.93.4:0.93.5-SNAPSHOT
 datastore-v1-proto-client:2.2.4:2.2.5-SNAPSHOT
-

From 648f89239d62d41941159a9584e8f636360ae0db Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 15 Feb 2022 01:06:52 +0100
Subject: [PATCH 0772/1784] build(deps): update dependency
 org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.10 (#642)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.sonatype.plugins:nexus-staging-maven-plugin](http://www.sonatype.com/) ([source](https://togithub.com/sonatype/nexus-maven-plugins)) | `1.6.8` -> `1.6.10` | [![age](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/compatibility-slim/1.6.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/confidence-slim/1.6.8)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
sonatype/nexus-maven-plugins

### [`v1.6.10`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.9...release-1.6.10)

[Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.9...release-1.6.10)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 093ab12a3699..97b39da4966d 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -46,7 +46,7 @@
       
         org.sonatype.plugins
         nexus-staging-maven-plugin
-        1.6.8
+        1.6.10
         
           true
         

From ee16bcedbc0a742377afa59b94e1e8c70a6890a0 Mon Sep 17 00:00:00 2001
From: Neenu Shaji 
Date: Tue, 15 Feb 2022 11:11:53 -0500
Subject: [PATCH 0773/1784] chore: make owlbot check required (#594)

---
 .github/sync-repo-settings.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index ebdf852e9811..ac06e4c3d8e3 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -16,6 +16,7 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
+      - OwlBot Post Processor
   - pattern: 1.106.5-sp
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
@@ -59,6 +60,7 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
+      - OwlBot Post Processor
 permissionRules:
   - team: yoshi-admins
     permission: admin

From 5d0f48403f6746bb7901b13aa223e4de31c3c5a4 Mon Sep 17 00:00:00 2001
From: Patrick Costello 
Date: Tue, 15 Feb 2022 08:57:44 -0800
Subject: [PATCH 0774/1784] fix: Use ImmutableMap.Bulder.buildOrThrow() instead
 of build(). (#632)

---
 .../src/main/java/com/google/cloud/datastore/GqlQuery.java    | 2 +-
 .../src/main/java/com/google/cloud/datastore/ReadOption.java  | 2 +-
 .../src/main/java/com/google/cloud/datastore/ValueType.java   | 2 +-
 .../src/test/java/com/google/cloud/datastore/ValueTest.java   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index df198f1f073c..2b99fd0a9d79 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -449,7 +449,7 @@ public Map getNamedBindings() {
     for (Map.Entry binding : namedBindings.entrySet()) {
       builder.put(binding.getKey(), binding.getValue().getCursorOrValue());
     }
-    return builder.build();
+    return builder.buildOrThrow();
   }
 
   /** Returns an immutable list of positional bindings (using original order). */
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index 5e8c092fc5ae..69fe58513c5a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -62,6 +62,6 @@ static Map, ReadOption> asImmutableMap(ReadOption...
     for (ReadOption option : options) {
       builder.put(option.getClass(), option);
     }
-    return builder.build();
+    return builder.buildOrThrow();
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
index 72bacca6984e..13e3c7af6ace 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
@@ -76,7 +76,7 @@ public enum ValueType {
         builder.put(fieldId, valueType);
       }
     }
-    DESCRIPTOR_TO_TYPE_MAP = builder.build();
+    DESCRIPTOR_TO_TYPE_MAP = builder.buildOrThrow();
   }
 
   , B extends ValueBuilder> ValueType(
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
index 365fcae72253..8d53dc736e82 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
@@ -58,7 +58,7 @@ public class ValueTest {
           .put(ValueType.RAW_VALUE, new Object[] {RawValue.class, RAW_VALUE.get()})
           .put(ValueType.LAT_LNG, new Object[] {LatLngValue.class, LAT_LNG_VALUE.get()})
           .put(ValueType.STRING, new Object[] {StringValue.class, STRING_VALUE.get()})
-          .build();
+          .buildOrThrow();
 
   private ImmutableMap> typeToValue;
 
@@ -110,7 +110,7 @@ public void setUp() throws Exception {
         assertTrue("Could not find an of method for " + valueClass, found);
       }
     }
-    typeToValue = builder.build();
+    typeToValue = builder.buildOrThrow();
   }
 
   @Test

From b793e7d1bfb8ade4a76f05321c94ab79c8bd6442 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 17 Feb 2022 14:35:11 +0100
Subject: [PATCH 0775/1784] build(deps): update dependency
 org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.11 (#644)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.sonatype.plugins:nexus-staging-maven-plugin](http://www.sonatype.com/) ([source](https://togithub.com/sonatype/nexus-maven-plugins)) | `1.6.10` -> `1.6.11` | [![age](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/compatibility-slim/1.6.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/confidence-slim/1.6.10)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
sonatype/nexus-maven-plugins

### [`v1.6.11`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.10...release-1.6.11)

[Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.10...release-1.6.11)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 97b39da4966d..7061e1504a7e 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -46,7 +46,7 @@
       
         org.sonatype.plugins
         nexus-staging-maven-plugin
-        1.6.10
+        1.6.11
         
           true
         

From f728901b4984f1cc79a02ecc2ff631322974d761 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Thu, 24 Feb 2022 21:04:12 -0500
Subject: [PATCH 0776/1784] docs(sample): Add sample for native image support
 in Datastore (#640)

* docs(sample): add native image sample for Datastore
---
 samples/native-image-sample/README.md         |  96 ++++++++++++
 samples/native-image-sample/pom.xml           | 147 ++++++++++++++++++
 .../datastore/NativeImageDatastoreSample.java | 137 ++++++++++++++++
 .../ITNativeImageDatastoreSample.java         |  75 +++++++++
 samples/pom.xml                               |   1 +
 5 files changed, 456 insertions(+)
 create mode 100644 samples/native-image-sample/README.md
 create mode 100644 samples/native-image-sample/pom.xml
 create mode 100644 samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
 create mode 100644 samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java

diff --git a/samples/native-image-sample/README.md b/samples/native-image-sample/README.md
new file mode 100644
index 000000000000..94d053bdca21
--- /dev/null
+++ b/samples/native-image-sample/README.md
@@ -0,0 +1,96 @@
+# Datastore Sample Application with Native Image
+
+This application uses the [Google Cloud Datastore client library](https://cloud.google.com/datastore/docs/reference/libraries) and is compatible with Native Image compilation.
+
+This sample runs through some basic operations of creating/deleting entities, running queries, and running transaction code.
+
+## Setup Instructions
+
+You will need to follow these prerequisite steps in order to run the samples:
+
+1. If you have not already, [create a Google Cloud Platform Project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project).
+
+2. Install the [Google Cloud SDK](https://cloud.google.com/sdk/) which will allow you to run the sample with your project's credentials.
+
+   Once installed, log in with Application Default Credentials using the following command:
+
+    ```
+    gcloud auth application-default login
+    ```
+
+   **Note:** Authenticating with Application Default Credentials is convenient to use during development, but we recommend [alternate methods of authentication](https://cloud.google.com/docs/authentication/production) during production use.
+
+3. Install the GraalVM compiler.
+
+   You can follow the [official installation instructions](https://www.graalvm.org/docs/getting-started/#install-graalvm) from the GraalVM website.
+   After following the instructions, ensure that you install the native image extension installed by running:
+
+    ```
+    gu install native-image
+    ```
+
+   Once you finish following the instructions, verify that the default version of Java is set to the GraalVM version by running `java -version` in a terminal.
+
+   You will see something similar to the below output:
+
+    ```
+    $ java -version
+   
+    openjdk version "11.0.7" 2020-04-14
+    OpenJDK Runtime Environment GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02)
+    OpenJDK 64-Bit Server VM GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02, mixed mode, sharing)
+    ```
+## Sample
+1. **(Optional)** If you wish to run the application against the [Datastore emulator](https://cloud.google.com/sdk/gcloud/reference/beta/emulators/datastore), ensure that you have the [Google Cloud SDK](https://cloud.google.com/sdk) installed.
+
+   In a new terminal window, start the emulator via `gcloud`:
+
+    ```
+    gcloud beta emulators datastore start --host-port=localhost:9010
+    ```
+
+   Leave the emulator running in this terminal for now.
+   In the next section, we will run the sample application against the Datastore emulator instance.
+
+2. Navigate to this directory and compile the application with the native image compiler.
+
+    ```
+    mvn package -P native -DskipTests
+    ```
+
+3. **(Optional)** If you're using the emulator, export the `DATASTORE_EMULATOR_HOST` as an environment variable in your terminal.
+
+    ```
+    export DATASTORE_EMULATOR_HOST=localhost:9010
+    ``` 
+
+   The Datastore Client Libraries will detect this environment variable and automatically connect to the emulator instance if this variable is set.
+
+4. Run the application.
+
+    ```
+    ./target/native-image-sample
+    ```
+
+5. The application will run through some basic Datastore operations and log some output statements.
+
+   ```
+      Successfully added entity.
+      Reading entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e
+      Successfully deleted entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e
+      Run fake transaction code.
+      Found entity:
+          name=de4f36f4-3936-4252-98d3-e0d56d485254
+          kind=test-kind
+          namespace=nativeimage-test-namespace
+          properties={description=StringValue{valueType=STRING, excludeFromIndexes=false, meaning=0, value=hello world}}
+      Ran transaction callable.
+   ```
+
+### Sample Integration test with Native Image Support
+
+In order to run the sample integration test as a native image, call the following command:
+
+   ```
+   mvn test -Pnative
+   ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
new file mode 100644
index 000000000000..e0031c993b47
--- /dev/null
+++ b/samples/native-image-sample/pom.xml
@@ -0,0 +1,147 @@
+
+
+  4.0.0
+  com.example.datastore
+  native-image-sample
+  Native Image Sample
+  https://github.com/googleapis/java-datastore
+
+  
+  
+    com.google.cloud.samples
+    shared-configuration
+    1.2.0
+  
+
+  
+    11
+    11
+    UTF-8
+  
+
+  
+    
+      
+        com.google.cloud
+        libraries-bom
+        24.2.0
+        pom
+        import
+      
+    
+  
+
+  
+    
+      com.google.cloud
+      google-cloud-datastore
+    
+
+    
+      junit
+      junit
+      4.13.2
+      test
+    
+    
+      com.google.truth
+      truth
+      1.1.3
+      test
+    
+  
+
+  
+    
+      
+        org.apache.maven.plugins
+        maven-jar-plugin
+        
+          
+            
+              com.example.datastore.NativeImageDatastoreSample
+              
+            
+          
+        
+      
+    
+  
+
+  
+  
+    
+      native
+
+      
+        
+          com.google.cloud
+          native-image-support
+          0.12.4
+        
+        
+          org.junit.vintage
+          junit-vintage-engine
+          5.8.2
+          test
+        
+        
+          org.graalvm.buildtools
+          junit-platform-native
+          0.9.9
+          test
+        
+      
+
+      
+        
+          
+            org.apache.maven.plugins
+            maven-surefire-plugin
+             
+            2.22.2
+            
+              
+                **/IT*
+              
+            
+          
+          
+            org.graalvm.buildtools
+            native-maven-plugin
+            0.9.9
+            true
+            
+              com.example.datastore.NativeImageDatastoreSample
+              
+              
+                --no-fallback
+                --no-server
+              
+            
+            
+              
+                build-native
+                
+                  build
+                  test
+                
+                package
+              
+              
+                test-native
+                
+                  test
+                
+                test
+              
+            
+          
+        
+      
+    
+  
+
\ No newline at end of file
diff --git a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
new file mode 100644
index 000000000000..54d27985ed62
--- /dev/null
+++ b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2020-2021 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
+ *
+ *     https://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.example.datastore;
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.datastore.Transaction;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.UUID;
+
+/**
+ * Sample Datastore Application.
+ */
+public class NativeImageDatastoreSample {
+
+  /* Datastore namespace where entities will be created. */
+  private static final String TEST_NAMESPACE = "nativeimage-test-namespace";
+
+  /* Datastore kind used. */
+  private static final String TEST_KIND = "test-kind";
+
+  /**
+   * Entrypoint to the Datastore sample application.
+   */
+  public static void main(String[] args) {
+    Instant startTime = Instant.now();
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    String testId = UUID.randomUUID().toString();
+
+    addEntity(datastore, testId);
+    getEntity(datastore, testId);
+    deleteEntity(datastore, testId);
+
+    runTransaction(datastore);
+
+    String id = UUID.randomUUID().toString();
+    Key key = createKey(datastore, id);
+    runTransactionCallable(datastore, key);
+    Instant endTime = Instant.now();
+    Duration duration = Duration.between(startTime, endTime);
+    System.out.println("Duration: " + duration.toString());
+  }
+
+  static void addEntity(Datastore datastore, String id) {
+    Key key = createKey(datastore, id);
+    Entity entity = Entity.newBuilder(key)
+        .set("description", "hello world")
+        .build();
+    datastore.add(entity);
+    System.out.println("Successfully added entity.");
+  }
+
+  static void getEntity(Datastore datastore, String id) {
+    Key key = createKey(datastore, id);
+    Entity entity = datastore.get(key);
+    System.out.println("Reading entity: " + entity.getKey().getName());
+  }
+
+  static void deleteEntity(Datastore datastore, String id) {
+    Key key = createKey(datastore, id);
+    datastore.delete(key);
+
+    Entity entity = datastore.get(key);
+    if (entity == null) {
+      System.out.println("Successfully deleted entity: " + id);
+    } else {
+      throw new RuntimeException("Failed to delete entity: " + id);
+    }
+  }
+
+  static void runTransactionCallable(Datastore datastore, Key entityKey) {
+    datastore.runInTransaction(client -> {
+      Entity entity = Entity.newBuilder(entityKey)
+          .set("description", "hello world")
+          .build();
+      datastore.add(entity);
+
+      StructuredQuery query =
+          Query.newEntityQueryBuilder()
+              .setNamespace(TEST_NAMESPACE)
+              .setKind(TEST_KIND)
+              .build();
+
+      QueryResults results = datastore.run(query);
+      while (results.hasNext()) {
+        Entity result = results.next();
+        String name = result.getKey().getName();
+        String kind = result.getKey().getKind();
+        String namespace = result.getKey().getNamespace();
+        System.out.println(
+            "Found entity:" + "\n\t\tname=" + name + "\n\t\tkind=" + kind + "\n\t\tnamespace="
+                + namespace + "\n\t\tproperties=" + result.getProperties().toString());
+      }
+
+      datastore.delete(entityKey);
+      return null;
+    });
+
+    System.out.println("Ran transaction callable.");
+  }
+
+  private static void runTransaction(Datastore datastore) {
+    Transaction transaction = datastore.newTransaction();
+    transaction.commit();
+    transaction = datastore.newTransaction();
+    transaction.rollback();
+    System.out.println("Run fake transaction code.");
+  }
+
+  static Key createKey(Datastore datastore, String id) {
+    return datastore.newKeyFactory()
+        .setNamespace(TEST_NAMESPACE)
+        .setKind(TEST_KIND)
+        .newKey(id);
+  }
+}
\ No newline at end of file
diff --git a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java
new file mode 100644
index 000000000000..315ecd9095a9
--- /dev/null
+++ b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java
@@ -0,0 +1,75 @@
+/*
+ * 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
+ *
+ *     https://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.example.datastore;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Key;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests for {@link com.example.datastore.NativeImageDatastoreSample}
+ */
+public class ITNativeImageDatastoreSample {
+
+  private Datastore datastore;
+  private ByteArrayOutputStream bout;
+  private PrintStream out;
+
+  @Before
+  public void setUp() {
+    datastore = DatastoreOptions.getDefaultInstance().getService();
+    bout = new ByteArrayOutputStream();
+    out = new PrintStream(bout);
+    System.setOut(out);
+
+  }
+
+  @Test
+  public void testAddAndGetEntity() {
+    bout.reset();
+    String testId = "test-id-" + UUID.randomUUID();
+    NativeImageDatastoreSample.addEntity(datastore, testId);
+    NativeImageDatastoreSample.getEntity(datastore, testId);
+    assertThat(bout.toString()).contains(
+        "Reading entity: " + testId);
+
+    NativeImageDatastoreSample.deleteEntity(datastore, testId);
+  }
+
+  @Test
+  public void testRunTransactionalCallable() {
+    bout.reset();
+    String testId = "test-id-" + UUID.randomUUID();
+    Key key = NativeImageDatastoreSample.createKey(datastore, testId);
+    NativeImageDatastoreSample.runTransactionCallable(datastore, key);
+    assertThat(bout.toString()).contains(
+        "Found entity:" + "\n\t\tname=" + testId + "\n\t\tkind=test-kind"
+            + "\n\t\tnamespace=nativeimage-test-namespace"
+            + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false,"
+            + " meaning=0, value=hello world}}\n"
+            + "Ran transaction callable.");
+
+    NativeImageDatastoreSample.deleteEntity(datastore, "test-id");
+  }
+}
\ No newline at end of file
diff --git a/samples/pom.xml b/samples/pom.xml
index 7061e1504a7e..c06f96333158 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -31,6 +31,7 @@
     install-without-bom
     snapshot
     snippets
+    native-image-sample
   
 
   

From 78227f5cdd26d8ddb0cdfa49c44728e717de6584 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 22:04:35 +0000
Subject: [PATCH 0777/1784] ci: pull request template includes sample format
 (#1357) (#649)

Source-Link: https://github.com/googleapis/synthtool/commit/e122cb03ea37652946651346736d99b9dcc4311f
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67
---
 .github/.OwlBot.lock.yaml                     | 15 +++-
 .github/PULL_REQUEST_TEMPLATE.md              |  3 +
 README.md                                     |  1 +
 .../datastore/NativeImageDatastoreSample.java | 74 +++++++++----------
 .../ITNativeImageDatastoreSample.java         | 26 +++----
 5 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 3aedd6c119d5..9351fdfb9ac8 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,16 @@
+# 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.
 docker:
-  digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
+  digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index df85b451ceb4..a2a811faba59 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few
 - [ ] Appropriate docs were updated (if necessary)
 
 Fixes # ☕️
+
+If you write sample code, please follow the [samples format](
+https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
diff --git a/README.md b/README.md
index e43387695fb3..098cc8f2ae8f 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 
 | Sample                      | Source Code                       | Try it |
 | --------------------------- | --------------------------------- | ------ |
+| Native Image Datastore Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) |
 | Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
 | Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
diff --git a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
index 54d27985ed62..7ce5c900a964 100644
--- a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
+++ b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
@@ -28,9 +28,7 @@
 import java.time.Instant;
 import java.util.UUID;
 
-/**
- * Sample Datastore Application.
- */
+/** Sample Datastore Application. */
 public class NativeImageDatastoreSample {
 
   /* Datastore namespace where entities will be created. */
@@ -39,9 +37,7 @@ public class NativeImageDatastoreSample {
   /* Datastore kind used. */
   private static final String TEST_KIND = "test-kind";
 
-  /**
-   * Entrypoint to the Datastore sample application.
-   */
+  /** Entrypoint to the Datastore sample application. */
   public static void main(String[] args) {
     Instant startTime = Instant.now();
     Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
@@ -64,9 +60,7 @@ public static void main(String[] args) {
 
   static void addEntity(Datastore datastore, String id) {
     Key key = createKey(datastore, id);
-    Entity entity = Entity.newBuilder(key)
-        .set("description", "hello world")
-        .build();
+    Entity entity = Entity.newBuilder(key).set("description", "hello world").build();
     datastore.add(entity);
     System.out.println("Successfully added entity.");
   }
@@ -90,32 +84,35 @@ static void deleteEntity(Datastore datastore, String id) {
   }
 
   static void runTransactionCallable(Datastore datastore, Key entityKey) {
-    datastore.runInTransaction(client -> {
-      Entity entity = Entity.newBuilder(entityKey)
-          .set("description", "hello world")
-          .build();
-      datastore.add(entity);
-
-      StructuredQuery query =
-          Query.newEntityQueryBuilder()
-              .setNamespace(TEST_NAMESPACE)
-              .setKind(TEST_KIND)
-              .build();
-
-      QueryResults results = datastore.run(query);
-      while (results.hasNext()) {
-        Entity result = results.next();
-        String name = result.getKey().getName();
-        String kind = result.getKey().getKind();
-        String namespace = result.getKey().getNamespace();
-        System.out.println(
-            "Found entity:" + "\n\t\tname=" + name + "\n\t\tkind=" + kind + "\n\t\tnamespace="
-                + namespace + "\n\t\tproperties=" + result.getProperties().toString());
-      }
-
-      datastore.delete(entityKey);
-      return null;
-    });
+    datastore.runInTransaction(
+        client -> {
+          Entity entity = Entity.newBuilder(entityKey).set("description", "hello world").build();
+          datastore.add(entity);
+
+          StructuredQuery query =
+              Query.newEntityQueryBuilder().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).build();
+
+          QueryResults results = datastore.run(query);
+          while (results.hasNext()) {
+            Entity result = results.next();
+            String name = result.getKey().getName();
+            String kind = result.getKey().getKind();
+            String namespace = result.getKey().getNamespace();
+            System.out.println(
+                "Found entity:"
+                    + "\n\t\tname="
+                    + name
+                    + "\n\t\tkind="
+                    + kind
+                    + "\n\t\tnamespace="
+                    + namespace
+                    + "\n\t\tproperties="
+                    + result.getProperties().toString());
+          }
+
+          datastore.delete(entityKey);
+          return null;
+        });
 
     System.out.println("Ran transaction callable.");
   }
@@ -129,9 +126,6 @@ private static void runTransaction(Datastore datastore) {
   }
 
   static Key createKey(Datastore datastore, String id) {
-    return datastore.newKeyFactory()
-        .setNamespace(TEST_NAMESPACE)
-        .setKind(TEST_KIND)
-        .newKey(id);
+    return datastore.newKeyFactory().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).newKey(id);
   }
-}
\ No newline at end of file
+}
diff --git a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java
index 315ecd9095a9..710f18367554 100644
--- a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java
+++ b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java
@@ -27,9 +27,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- * Tests for {@link com.example.datastore.NativeImageDatastoreSample}
- */
+/** Tests for {@link com.example.datastore.NativeImageDatastoreSample} */
 public class ITNativeImageDatastoreSample {
 
   private Datastore datastore;
@@ -42,7 +40,6 @@ public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
     System.setOut(out);
-
   }
 
   @Test
@@ -51,8 +48,7 @@ public void testAddAndGetEntity() {
     String testId = "test-id-" + UUID.randomUUID();
     NativeImageDatastoreSample.addEntity(datastore, testId);
     NativeImageDatastoreSample.getEntity(datastore, testId);
-    assertThat(bout.toString()).contains(
-        "Reading entity: " + testId);
+    assertThat(bout.toString()).contains("Reading entity: " + testId);
 
     NativeImageDatastoreSample.deleteEntity(datastore, testId);
   }
@@ -63,13 +59,17 @@ public void testRunTransactionalCallable() {
     String testId = "test-id-" + UUID.randomUUID();
     Key key = NativeImageDatastoreSample.createKey(datastore, testId);
     NativeImageDatastoreSample.runTransactionCallable(datastore, key);
-    assertThat(bout.toString()).contains(
-        "Found entity:" + "\n\t\tname=" + testId + "\n\t\tkind=test-kind"
-            + "\n\t\tnamespace=nativeimage-test-namespace"
-            + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false,"
-            + " meaning=0, value=hello world}}\n"
-            + "Ran transaction callable.");
+    assertThat(bout.toString())
+        .contains(
+            "Found entity:"
+                + "\n\t\tname="
+                + testId
+                + "\n\t\tkind=test-kind"
+                + "\n\t\tnamespace=nativeimage-test-namespace"
+                + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false,"
+                + " meaning=0, value=hello world}}\n"
+                + "Ran transaction callable.");
 
     NativeImageDatastoreSample.deleteEntity(datastore, "test-id");
   }
-}
\ No newline at end of file
+}

From 8d85b64faa72265851e92562f5381ace1088c066 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 28 Feb 2022 23:20:32 +0100
Subject: [PATCH 0778/1784] deps: update actions/setup-java action to v3 (#648)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [actions/setup-java](https://togithub.com/actions/setup-java) | action | major | `v1` -> `v3` |
| [actions/setup-java](https://togithub.com/actions/setup-java) | action | major | `v2` -> `v3` |

---

### Release Notes


    
actions/setup-java

### [`v3`](https://togithub.com/actions/setup-java/compare/v2...v3)

[Compare Source](https://togithub.com/actions/setup-java/compare/v2...v3)

### [`v2`](https://togithub.com/actions/setup-java/compare/v1...v2)

[Compare Source](https://togithub.com/actions/setup-java/compare/v1...v2)


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).

From d6e2a16fe2e6dfd07892ff6928118a4a031de9f2 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 28 Feb 2022 23:34:13 +0100
Subject: [PATCH 0779/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.10 (#647)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.9` -> `0.9.10` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/compatibility-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/confidence-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.10`](https://togithub.com/graalvm/native-build-tools/releases/0.9.10)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.9...0.9.10)

#### What's Changed

Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog).

-   Introduce skipNativeTests flag in Maven plugin by [@​sbrannen](https://togithub.com/sbrannen) in [https://github.com/graalvm/native-build-tools/pull/193](https://togithub.com/graalvm/native-build-tools/pull/193)
-   Fix system property breaking build cacheability by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/192](https://togithub.com/graalvm/native-build-tools/pull/192)
-   Make sure executable ends with `.exe` under Windows by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/199](https://togithub.com/graalvm/native-build-tools/pull/199)
-   Make it possible to override the classpath by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/200](https://togithub.com/graalvm/native-build-tools/pull/200)
-   Upgrade to Gradle 7.4 by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/202](https://togithub.com/graalvm/native-build-tools/pull/202)
-   Fix race condition if tests are executed in parallel by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/195](https://togithub.com/graalvm/native-build-tools/pull/195)
-   Add support for `@arg` file by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/205](https://togithub.com/graalvm/native-build-tools/pull/205)

**Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.9...0.9.10


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 e0031c993b47..e3b91be00d9c 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -112,7 +112,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.9
+            0.9.10
             true
             
               com.example.datastore.NativeImageDatastoreSample

From c62a39074a44e58222115b05f14e3ffdd52273c0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 28 Feb 2022 23:56:23 +0100
Subject: [PATCH 0780/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.10 (#646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.9` -> `0.9.10` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/compatibility-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/confidence-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.10`](https://togithub.com/graalvm/native-build-tools/releases/0.9.10)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.9...0.9.10)

#### What's Changed

Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog).

-   Introduce skipNativeTests flag in Maven plugin by [@​sbrannen](https://togithub.com/sbrannen) in [https://github.com/graalvm/native-build-tools/pull/193](https://togithub.com/graalvm/native-build-tools/pull/193)
-   Fix system property breaking build cacheability by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/192](https://togithub.com/graalvm/native-build-tools/pull/192)
-   Make sure executable ends with `.exe` under Windows by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/199](https://togithub.com/graalvm/native-build-tools/pull/199)
-   Make it possible to override the classpath by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/200](https://togithub.com/graalvm/native-build-tools/pull/200)
-   Upgrade to Gradle 7.4 by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/202](https://togithub.com/graalvm/native-build-tools/pull/202)
-   Fix race condition if tests are executed in parallel by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/195](https://togithub.com/graalvm/native-build-tools/pull/195)
-   Add support for `@arg` file by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/205](https://togithub.com/graalvm/native-build-tools/pull/205)

**Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.9...0.9.10


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 e3b91be00d9c..0352a305f6c3 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -91,7 +91,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.9
+          0.9.10
           test
         
           

From b4495542bb086e7e169fea10795342e78aac2e1e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 1 Mar 2022 18:46:25 +0100
Subject: [PATCH 0781/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.12.5 (#650)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.4` -> `0.12.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/compatibility-slim/0.12.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/confidence-slim/0.12.4)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 0352a305f6c3..37bfecaa2eaa 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.4
+          0.12.5
         
         
           org.junit.vintage

From eda44efd14d8b4a6e8df8dbfb24317382b072aa1 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:34:19 +0000
Subject: [PATCH 0782/1784] chore: update github actions (#1361) (#652)

* chore: update github actions

* chore: update
Source-Link: https://github.com/googleapis/synthtool/commit/1622741e6877d4b335b137ac7e07f7f32d4e5af7
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a
---
 .github/.OwlBot.lock.yaml             |  2 +-
 .github/workflows/approve-readme.yaml |  2 +-
 .github/workflows/auto-release.yaml   |  2 +-
 .github/workflows/ci.yaml             | 20 ++++++++++----------
 .github/workflows/samples.yaml        |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 9351fdfb9ac8..53941094cf48 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67
+  digest: sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index 1bb182327612..f5fc7d5169eb 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
     steps:
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         with:
           github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
           script: |
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 18e23230d98f..7a106d007edf 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.head_ref, 'release-please')
     steps:
-    - uses: actions/github-script@v5
+    - uses: actions/github-script@v6
       with:
         github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
         debug: true
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6b5e56aaacd1..83ef7f9c2cf3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,8 +27,8 @@ jobs:
       matrix:
         java: [8, 11, 17]
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: zulu
         java-version: ${{matrix.java}}
@@ -39,8 +39,8 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: zulu
         java-version: 8
@@ -54,8 +54,8 @@ jobs:
       matrix:
         java: [8, 11, 17]
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: zulu
         java-version: ${{matrix.java}}
@@ -64,8 +64,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: zulu
         java-version: 11
@@ -76,8 +76,8 @@ jobs:
   clirr:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: zulu
         java-version: 8
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index d5d964df15fa..de737e92a8a2 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -20,8 +20,8 @@ jobs:
   checkstyle:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           java-version: 8
       - name: Run checkstyle

From adc952c482641e00f12ccf296b8b160e6664058d Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 2 Mar 2022 19:53:36 +0100
Subject: [PATCH 0783/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v24.4.0 (#655)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v24.4.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 098cc8f2ae8f..b9831504666a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      24.3.0
+      24.4.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:24.3.0')
+implementation platform('com.google.cloud:libraries-bom:24.4.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 37bfecaa2eaa..bfcfec05dafa 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -27,7 +27,7 @@
       
         com.google.cloud
         libraries-bom
-        24.2.0
+        24.4.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index becb3dbe5dd4..d0f043054dca 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        24.3.0
+        24.4.0
         pom
         import
       

From 5e69833713421d7deee2f4cf2f50a725270c36e0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 2 Mar 2022 19:53:51 +0100
Subject: [PATCH 0784/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.12.6 (#654)

---
 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 bfcfec05dafa..421b4f2788e4 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.5
+          0.12.6
         
         
           org.junit.vintage

From b95ee9635173617cd13605928b306974c70423e8 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Wed, 2 Mar 2022 13:58:56 -0500
Subject: [PATCH 0785/1784] docs(sample): Use Java 8 for Native Image sample
 (#656)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs(sample): Use Java 8 for Native Image sample

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix formatting

Co-authored-by: Owl Bot 
---
 samples/native-image-sample/pom.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 421b4f2788e4..70d0675a1c40 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -17,8 +17,9 @@
   
 
   
-    11
-    11
+    
+    1.8
+    1.8
     UTF-8
   
 
@@ -62,8 +63,7 @@
         
           
             
-              com.example.datastore.NativeImageDatastoreSample
-              
+              com.example.datastore.NativeImageDatastoreSample
             
           
         
@@ -115,8 +115,7 @@
             0.9.10
             true
             
-              com.example.datastore.NativeImageDatastoreSample
-              
+              com.example.datastore.NativeImageDatastoreSample
               
                 --no-fallback
                 --no-server

From 5692998d3f527dd88d058ffe2bd24492031fbe40 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 19:22:26 +0000
Subject: [PATCH 0786/1784] chore: fix license header in build.bat (#1363)
 (#657)

* chore: fix license header in build.bat

* chore: add disctribution field for setup-java action
Source-Link: https://github.com/googleapis/synthtool/commit/4fea5f40a9075f3ba205ede0b453010cf080e194
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e
---
 .github/.OwlBot.lock.yaml      |  2 +-
 .github/workflows/samples.yaml |  1 +
 .kokoro/build.bat              | 30 +++++++++++++++---------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 53941094cf48..3473042c086e 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a
+  digest: sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index de737e92a8a2..912ed8b2b027 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -23,6 +23,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
+          distribution: zulu
           java-version: 8
       - name: Run checkstyle
         run: mvn -P lint --quiet --batch-mode checkstyle:check
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
index cc602c9eba80..067cf4a4c489 100644
--- a/.kokoro/build.bat
+++ b/.kokoro/build.bat
@@ -1,18 +1,18 @@
+:: 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.
+:: Github action job to test core java library features on
+:: downstream client libraries before they are released.
 :: See documentation in type-shell-output.bat
-# 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.
-# Github action job to test core java library features on
-# downstream client libraries before they are released.
 
 "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh

From 03162a69c01c5cddc524b99325900196aa26cd0d Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 2 Mar 2022 22:48:28 +0100
Subject: [PATCH 0787/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.8.0 (#653)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.7.0` -> `2.8.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/compatibility-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/confidence-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.8.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​280-httpsgithubcomgoogleapisjava-shared-dependenciescomparev270v280-2022-03-02)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.7.0...v2.8.0)

##### Dependencies

-   update dependency com.google.api-client:google-api-client-bom to v1.33.2 ([#​602](https://togithub.com/googleapis/java-shared-dependencies/issues/602)) ([85b132f](https://togithub.com/googleapis/java-shared-dependencies/commit/85b132f5830772646025b6a9fbbb970a941b86b5))
-   update dependency com.google.api:api-common to v2.1.4 ([#​605](https://togithub.com/googleapis/java-shared-dependencies/issues/605)) ([ca7d49a](https://togithub.com/googleapis/java-shared-dependencies/commit/ca7d49aee26b6d90abd2afd61c20861d2307fe9c))
-   update dependency com.google.auth:google-auth-library-bom to v1.5.3 ([#​614](https://togithub.com/googleapis/java-shared-dependencies/issues/614)) ([e6413f3](https://togithub.com/googleapis/java-shared-dependencies/commit/e6413f3b1be78473ace7085c344eda2d78cdf01a))
-   update dependency com.google.cloud:google-cloud-core to v2.5.6 ([#​621](https://togithub.com/googleapis/java-shared-dependencies/issues/621)) ([3d5669f](https://togithub.com/googleapis/java-shared-dependencies/commit/3d5669f215689dd2df71200ffe37d5a9d385cda8))
-   update dependency com.google.code.gson:gson to v2.9.0 ([#​611](https://togithub.com/googleapis/java-shared-dependencies/issues/611)) ([f59c28d](https://togithub.com/googleapis/java-shared-dependencies/commit/f59c28d8cd30ada1237f7722135ba148dce6315e))
-   update dependency com.google.http-client:google-http-client-bom to v1.41.4 ([#​608](https://togithub.com/googleapis/java-shared-dependencies/issues/608)) ([f9a4f23](https://togithub.com/googleapis/java-shared-dependencies/commit/f9a4f23d3a32148ac59e53eaae6558ccbceca12c))
-   update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.1 ([#​606](https://togithub.com/googleapis/java-shared-dependencies/issues/606)) ([3882494](https://togithub.com/googleapis/java-shared-dependencies/commit/3882494770d48fcc02ed19088aa06612a8e440eb))
-   update dependency com.google.protobuf:protobuf-bom to v3.19.4 ([#​593](https://togithub.com/googleapis/java-shared-dependencies/issues/593)) ([1e155bf](https://togithub.com/googleapis/java-shared-dependencies/commit/1e155bfc957bbb7e25d2e0994cdecaa81843bdc5))
-   update dependency io.grpc:grpc-bom to v1.44.1 ([#​613](https://togithub.com/googleapis/java-shared-dependencies/issues/613)) ([3038a2c](https://togithub.com/googleapis/java-shared-dependencies/commit/3038a2c86cd20c91b65f2d7926eeb739147a68db))
-   update dependency junit:junit to v4.13.2 ([#​607](https://togithub.com/googleapis/java-shared-dependencies/issues/607)) ([987e617](https://togithub.com/googleapis/java-shared-dependencies/commit/987e61796c7a093e005fe8832cf39275c391b2c1))
-   update dependency org.checkerframework:checker-qual to v3.21.3 ([#​596](https://togithub.com/googleapis/java-shared-dependencies/issues/596)) ([ac5083c](https://togithub.com/googleapis/java-shared-dependencies/commit/ac5083cd010924dc128f041c2cdbab20166a6bf0))
-   update gax.version to v2.12.2 ([#​592](https://togithub.com/googleapis/java-shared-dependencies/issues/592)) ([713ff8d](https://togithub.com/googleapis/java-shared-dependencies/commit/713ff8dd94f939c417524616bc47c771a3fbe0cf))
-   update google.common-protos.version to v2.7.4 ([#​603](https://togithub.com/googleapis/java-shared-dependencies/issues/603)) ([bb9b4c7](https://togithub.com/googleapis/java-shared-dependencies/commit/bb9b4c7e39552cc73b3b9d4c826b26e8cb74459f))
-   update google.core.version ([#​599](https://togithub.com/googleapis/java-shared-dependencies/issues/599)) ([327d0df](https://togithub.com/googleapis/java-shared-dependencies/commit/327d0df9b57203c0d4f426de0380770d3d7910d6))
-   update iam.version to v1.2.6 ([#​598](https://togithub.com/googleapis/java-shared-dependencies/issues/598)) ([2801439](https://togithub.com/googleapis/java-shared-dependencies/commit/280143964c7c3b93a8d7f67215ba2cc74ffce761))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 9049b1003392..ede7af17efac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.7.0
+        2.8.0
         pom
         import
       

From 486fe80301f8452bd63c1049fa42f103c3c21590 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 22:04:28 +0000
Subject: [PATCH 0788/1784] chore(main): release 2.2.5 (#643)

:robot: I have created a release *beep* *boop*
---


### [2.2.5](https://github.com/googleapis/java-datastore/compare/v2.2.4...v2.2.5) (2022-03-02)


### Bug Fixes

* Use ImmutableMap.Bulder.buildOrThrow() instead of build(). ([#632](https://github.com/googleapis/java-datastore/issues/632)) ([5d0f484](https://github.com/googleapis/java-datastore/commit/5d0f48403f6746bb7901b13aa223e4de31c3c5a4))


### Documentation

* **sample:** Add sample for native image support in Datastore ([#640](https://github.com/googleapis/java-datastore/issues/640)) ([f728901](https://github.com/googleapis/java-datastore/commit/f728901b4984f1cc79a02ecc2ff631322974d761))
* **sample:** Use Java 8 for Native Image sample ([#656](https://github.com/googleapis/java-datastore/issues/656)) ([b95ee96](https://github.com/googleapis/java-datastore/commit/b95ee9635173617cd13605928b306974c70423e8))


### Dependencies

* update actions/setup-java action to v3 ([#648](https://github.com/googleapis/java-datastore/issues/648)) ([8d85b64](https://github.com/googleapis/java-datastore/commit/8d85b64faa72265851e92562f5381ace1088c066))
* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#653](https://github.com/googleapis/java-datastore/issues/653)) ([03162a6](https://github.com/googleapis/java-datastore/commit/03162a69c01c5cddc524b99325900196aa26cd0d))
* update dependency com.google.cloud:native-image-support to v0.12.5 ([#650](https://github.com/googleapis/java-datastore/issues/650)) ([b449554](https://github.com/googleapis/java-datastore/commit/b4495542bb086e7e169fea10795342e78aac2e1e))
* update dependency com.google.cloud:native-image-support to v0.12.6 ([#654](https://github.com/googleapis/java-datastore/issues/654)) ([5e69833](https://github.com/googleapis/java-datastore/commit/5e69833713421d7deee2f4cf2f50a725270c36e0))
* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#646](https://github.com/googleapis/java-datastore/issues/646)) ([c62a390](https://github.com/googleapis/java-datastore/commit/c62a39074a44e58222115b05f14e3ffdd52273c0))
* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#647](https://github.com/googleapis/java-datastore/issues/647)) ([d6e2a16](https://github.com/googleapis/java-datastore/commit/d6e2a16fe2e6dfd07892ff6928118a4a031de9f2))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 23 +++++++++++++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  8 ++++----
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2ccb7f5fe35..42cbadf85d64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+### [2.2.5](https://github.com/googleapis/java-datastore/compare/v2.2.4...v2.2.5) (2022-03-02)
+
+
+### Bug Fixes
+
+* Use ImmutableMap.Bulder.buildOrThrow() instead of build(). ([#632](https://github.com/googleapis/java-datastore/issues/632)) ([5d0f484](https://github.com/googleapis/java-datastore/commit/5d0f48403f6746bb7901b13aa223e4de31c3c5a4))
+
+
+### Documentation
+
+* **sample:** Add sample for native image support in Datastore ([#640](https://github.com/googleapis/java-datastore/issues/640)) ([f728901](https://github.com/googleapis/java-datastore/commit/f728901b4984f1cc79a02ecc2ff631322974d761))
+* **sample:** Use Java 8 for Native Image sample ([#656](https://github.com/googleapis/java-datastore/issues/656)) ([b95ee96](https://github.com/googleapis/java-datastore/commit/b95ee9635173617cd13605928b306974c70423e8))
+
+
+### Dependencies
+
+* update actions/setup-java action to v3 ([#648](https://github.com/googleapis/java-datastore/issues/648)) ([8d85b64](https://github.com/googleapis/java-datastore/commit/8d85b64faa72265851e92562f5381ace1088c066))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#653](https://github.com/googleapis/java-datastore/issues/653)) ([03162a6](https://github.com/googleapis/java-datastore/commit/03162a69c01c5cddc524b99325900196aa26cd0d))
+* update dependency com.google.cloud:native-image-support to v0.12.5 ([#650](https://github.com/googleapis/java-datastore/issues/650)) ([b449554](https://github.com/googleapis/java-datastore/commit/b4495542bb086e7e169fea10795342e78aac2e1e))
+* update dependency com.google.cloud:native-image-support to v0.12.6 ([#654](https://github.com/googleapis/java-datastore/issues/654)) ([5e69833](https://github.com/googleapis/java-datastore/commit/5e69833713421d7deee2f4cf2f50a725270c36e0))
+* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#646](https://github.com/googleapis/java-datastore/issues/646)) ([c62a390](https://github.com/googleapis/java-datastore/commit/c62a39074a44e58222115b05f14e3ffdd52273c0))
+* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#647](https://github.com/googleapis/java-datastore/issues/647)) ([d6e2a16](https://github.com/googleapis/java-datastore/commit/d6e2a16fe2e6dfd07892ff6928118a4a031de9f2))
+
 ### [2.2.4](https://github.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4) (2022-02-03)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 0e0e5e422f2c..33e64545a819 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.2.5-SNAPSHOT
+  2.2.5
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5-SNAPSHOT
+    2.2.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 13f831b33575..3f4bf50245fa 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.2.5-SNAPSHOT
+  2.2.5
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.5-SNAPSHOT
+        2.2.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.5-SNAPSHOT
+        0.93.5
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index dbdff3bf33d9..3027c465fdec 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.5-SNAPSHOT
+  2.2.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5-SNAPSHOT
+    2.2.5
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index ede7af17efac..cf4b22b5bceb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.5-SNAPSHOT
+  2.2.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,17 +158,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.1-SNAPSHOT
+        2.2.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.5-SNAPSHOT
+        0.93.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.5-SNAPSHOT
+        2.2.5
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 06798a186314..4bc81ed232f2 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.93.5-SNAPSHOT
+  0.93.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5-SNAPSHOT
+    2.2.5
   
   
     
diff --git a/versions.txt b/versions.txt
index 829809f01a0b..314218ba3d06 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.4:2.2.5-SNAPSHOT
-google-cloud-datastore-bom:2.2.4:2.2.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.4:0.93.5-SNAPSHOT
-datastore-v1-proto-client:2.2.4:2.2.5-SNAPSHOT
+google-cloud-datastore:2.2.5:2.2.5
+google-cloud-datastore-bom:2.2.5:2.2.5
+proto-google-cloud-datastore-v1:0.93.5:0.93.5
+datastore-v1-proto-client:2.2.5:2.2.5

From 54290a703aa78a411b9935b146f2fac29eaa4c38 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 22:12:38 +0000
Subject: [PATCH 0789/1784] chore(main): release 2.2.6-SNAPSHOT (#658)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 33e64545a819..afc0f106654a 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.2.5
+  2.2.6-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5
+    2.2.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3f4bf50245fa..71a019a9fc1a 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.2.5
+  2.2.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.5
+        2.2.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.5
+        0.93.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3027c465fdec..0fc09ca93442 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.5
+  2.2.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5
+    2.2.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index cf4b22b5bceb..c6c8ddd68353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.5
+  2.2.6-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,17 +158,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.5
+        2.2.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.5
+        0.93.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.5
+        2.2.6-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4bc81ed232f2..7a39d3fb55cf 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.93.5
+  0.93.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.5
+    2.2.6-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 314218ba3d06..2803bc95ee3b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.5:2.2.5
-google-cloud-datastore-bom:2.2.5:2.2.5
-proto-google-cloud-datastore-v1:0.93.5:0.93.5
-datastore-v1-proto-client:2.2.5:2.2.5
+google-cloud-datastore:2.2.5:2.2.6-SNAPSHOT
+google-cloud-datastore-bom:2.2.5:2.2.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.5:0.93.6-SNAPSHOT
+datastore-v1-proto-client:2.2.5:2.2.6-SNAPSHOT

From bfdbc5b7dfac4221494c178aa43c533e5609b50b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 3 Mar 2022 03:04:28 +0100
Subject: [PATCH 0790/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.5 (#659)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.4` -> `2.2.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.5/compatibility-slim/2.2.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.5/confidence-slim/2.2.4)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.5`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​225-httpsgithubcomgoogleapisjava-datastorecomparev224v225-2022-03-02)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.4...v2.2.5)


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b9831504666a..ba7e45d8bb6a 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.2.4
+  2.2.5
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.2.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.2.5'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.5"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 3484131b6926..33da6541e249 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.2.4
+      2.2.5
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b6625214c1b1..200cc2daac84 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.4
+      2.2.5
     
 
     

From 288c812b7981de82d472bd776ee120050a2c887e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 8 Mar 2022 02:56:24 +0000
Subject: [PATCH 0791/1784] chore: update java template (#1367) (#660)

* chore: update java template

* chore: fix tests

* chore: fix tests

* chore: update project
Source-Link: https://github.com/googleapis/synthtool/commit/1155a97fed1c195d10ad406d483bc8ac2507f1d7
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa
---
 .github/.OwlBot.lock.yaml       | 2 +-
 .kokoro/nightly/integration.cfg | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 3473042c086e..426cf83e2ec6 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e
+  digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index e51c7b4c6c11..a2907a257b2b 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -13,12 +13,12 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {

From 11634dfd6e536cb0e37ef5bb91435cc54614c8f6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 8 Mar 2022 21:28:19 +0100
Subject: [PATCH 0792/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.12.7 (#661)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.6` -> `0.12.7` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.7/compatibility-slim/0.12.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.7/confidence-slim/0.12.6)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 70d0675a1c40..60d736b4bedc 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.6
+          0.12.7
         
         
           org.junit.vintage

From caf06c0a1e8b0323a3288ace5983ffc6fc902e45 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 8 Mar 2022 21:30:26 +0100
Subject: [PATCH 0793/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.3.0 (#662)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.7` -> `1.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.0/compatibility-slim/1.2.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.0/confidence-slim/1.2.7)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.3.0`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​130-httpsgithubcomgoogleapisjava-shared-configcomparev127v130-2022-03-07)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.7...v1.3.0)

##### Features

-   increase IT timeout from 20 to 60 mins ([#​440](https://togithub.com/googleapis/java-shared-config/issues/440)) ([a4427bc](https://togithub.com/googleapis/java-shared-config/commit/a4427bceebd0624e23f0b02bb24d7ed46ea4b3a6))

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.6 ([#​423](https://togithub.com/googleapis/java-shared-config/issues/423)) ([9a0cb79](https://togithub.com/googleapis/java-shared-config/commit/9a0cb79896d5c97dc3c5648a6740d53eb9ada673))
-   update dependency com.puppycrawl.tools:checkstyle to v9.3 ([#​415](https://togithub.com/googleapis/java-shared-config/issues/415)) ([9e2d3fd](https://togithub.com/googleapis/java-shared-config/commit/9e2d3fd8bd42bc210dae5798f7d5dfe950c29f51))
-   update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#​429](https://togithub.com/googleapis/java-shared-config/issues/429)) ([0355f29](https://togithub.com/googleapis/java-shared-config/commit/0355f2988ebcff19615b72bc65523555e4844523))
-   update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#​430](https://togithub.com/googleapis/java-shared-config/issues/430)) ([16984d2](https://togithub.com/googleapis/java-shared-config/commit/16984d25a84aa6a8daf2a0925ea57cd0d3f0ee24))

##### [1.2.7](https://togithub.com/googleapis/java-shared-config/compare/v1.2.6...v1.2.7) (2022-02-04)

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.0 ([#​414](https://togithub.com/googleapis/java-shared-config/issues/414)) ([2133cc0](https://togithub.com/googleapis/java-shared-config/commit/2133cc093efd8420e352274f3eab09de819ff796))

##### [1.2.6](https://togithub.com/googleapis/java-shared-config/compare/v1.2.5...v1.2.6) (2022-01-19)

##### Bug Fixes

-   library should released as 1.2.6 ([#​408](https://togithub.com/googleapis/java-shared-config/issues/408)) ([4972daa](https://togithub.com/googleapis/java-shared-config/commit/4972daa60467797566c4b043cebd322577b8eb73))

##### [1.2.5](https://togithub.com/googleapis/java-shared-config/compare/v1.2.4...v1.2.5) (2022-01-11)

##### Bug Fixes

-   **java:** Enable unit tests in generated libraries for native image testing ([#​394](https://togithub.com/googleapis/java-shared-config/issues/394)) ([a453b9f](https://togithub.com/googleapis/java-shared-config/commit/a453b9f141c7555f2fd5333eb17d223410ab66eb))

##### [1.2.4](https://www.github.com/googleapis/java-shared-config/compare/v1.2.3...v1.2.4) (2022-01-06)

##### Dependencies

-   revert dependency com.google.googlejavaformat:google-java-format to v1.7 ([#​391](https://www.togithub.com/googleapis/java-shared-config/issues/391)) ([17077fb](https://www.github.com/googleapis/java-shared-config/commit/17077fb1a58eef7098dc5e1e9b2c78a63c5c11e1))

##### [1.2.3](https://www.github.com/googleapis/java-shared-config/compare/v1.2.2...v1.2.3) (2022-01-04)

##### Bug Fixes

-   **java:** add -ntp flag to native image testing command ([#​1299](https://www.togithub.com/googleapis/java-shared-config/issues/1299)) ([#​376](https://www.togithub.com/googleapis/java-shared-config/issues/376)) ([50e7a10](https://www.github.com/googleapis/java-shared-config/commit/50e7a10a8dca0505fd831e3dd929577d2f82b011))
-   **java:** Only enable integration tests for native image testing ([#​375](https://www.togithub.com/googleapis/java-shared-config/issues/375)) ([663f421](https://www.github.com/googleapis/java-shared-config/commit/663f421de342afcba24703079f778738045d3ff2))
-   **java:** Pass missing integration test flags to native image test commands ([#​1309](https://www.togithub.com/googleapis/java-shared-config/issues/1309)) ([#​383](https://www.togithub.com/googleapis/java-shared-config/issues/383)) ([b17b44e](https://www.github.com/googleapis/java-shared-config/commit/b17b44e37fe44ba61616417189c6b2271f3a4d18))

##### Dependencies

-   update auto-value-annotation.version to v1.9 ([#​378](https://www.togithub.com/googleapis/java-shared-config/issues/378)) ([5e1cd0e](https://www.github.com/googleapis/java-shared-config/commit/5e1cd0e39910548ec4eb6639da979c3b66411503))
-   update dependency com.google.googlejavaformat:google-java-format to v1.13.0 ([#​361](https://www.togithub.com/googleapis/java-shared-config/issues/361)) ([095d60a](https://www.github.com/googleapis/java-shared-config/commit/095d60a061a574dcf84b9fcf26dff48617a306b1))
-   update dependency com.puppycrawl.tools:checkstyle to v9.2 ([#​366](https://www.togithub.com/googleapis/java-shared-config/issues/366)) ([061df67](https://www.github.com/googleapis/java-shared-config/commit/061df676d8b2fef5bbb0ce9661d3c96fcb57e73a))
-   update dependency com.puppycrawl.tools:checkstyle to v9.2.1 ([#​382](https://www.togithub.com/googleapis/java-shared-config/issues/382)) ([1a182c5](https://www.github.com/googleapis/java-shared-config/commit/1a182c52e7c5431875296940d68c9bdfcf74be00))
-   update dependency org.graalvm.buildtools:junit-platform-native to v0.9.9 ([#​379](https://www.togithub.com/googleapis/java-shared-config/issues/379)) ([0a2b05f](https://www.github.com/googleapis/java-shared-config/commit/0a2b05ff7f649331efbc4dd540705da10691a2f1))
-   update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.8 ([#​372](https://www.togithub.com/googleapis/java-shared-config/issues/372)) ([6fe795e](https://www.github.com/googleapis/java-shared-config/commit/6fe795ede39575656ef1609bf7aac28c1d170976))
-   update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.9 ([#​380](https://www.togithub.com/googleapis/java-shared-config/issues/380)) ([f2efad5](https://www.github.com/googleapis/java-shared-config/commit/f2efad585b431fe186c7900a8171a999c689405b))
-   update dependency org.junit.vintage:junit-vintage-engine to v5.8.2 ([#​365](https://www.togithub.com/googleapis/java-shared-config/issues/365)) ([604058d](https://www.github.com/googleapis/java-shared-config/commit/604058d52dc962db9a506762926576542687285e))

##### [1.2.2](https://www.github.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2) (2021-11-16)

##### Bug Fixes

-   update dependency com.google.cloud:native-image-support to v0.10.0 ([#​358](https://www.togithub.com/googleapis/java-shared-config/issues/358)) ([0441958](https://www.github.com/googleapis/java-shared-config/commit/044195865a1122d419cadae90fddbf8dc5b4a32d))

##### [1.2.1](https://www.github.com/googleapis/java-shared-config/compare/v1.2.0...v1.2.1) (2021-11-08)

##### Bug Fixes

-   Add native image feature to register protobuf reflection in tests ([#​347](https://www.togithub.com/googleapis/java-shared-config/issues/347)) ([88c3e3b](https://www.github.com/googleapis/java-shared-config/commit/88c3e3b0ad1e480e0fdbe9f6fe1f9df183066ee6))

##### Dependencies

-   update dependency com.google.auto.service:auto-service-annotations to v1.0.1 ([#​346](https://www.togithub.com/googleapis/java-shared-config/issues/346)) ([9c1f943](https://www.github.com/googleapis/java-shared-config/commit/9c1f94345fb47346fe66f901976c2347b8102bc8))
-   update dependency com.google.cloud:native-image-support to v0.9.0 ([#​350](https://www.togithub.com/googleapis/java-shared-config/issues/350)) ([3b496b0](https://www.github.com/googleapis/java-shared-config/commit/3b496b03bd95e59fcd1a3a1eb6cc0dfd330db769))
-   update dependency com.puppycrawl.tools:checkstyle to v9.1 ([#​345](https://www.togithub.com/googleapis/java-shared-config/issues/345)) ([f5c03d3](https://www.github.com/googleapis/java-shared-config/commit/f5c03d35684ef4e0bb3178ab6056f231f3f4faf6))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 71a019a9fc1a..938d9b3c4147 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.2.7
+    1.3.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index c6c8ddd68353..fe52c3149a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.2.7
+    1.3.0
   
 
   

From 2ecf4df23e1e5522800642dc7c60889ad2afbc80 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 8 Mar 2022 20:38:22 +0000
Subject: [PATCH 0794/1784] chore(main): release 2.2.6 (#663)

:robot: I have created a release *beep* *boop*
---


### [2.2.6](https://github.com/googleapis/java-datastore/compare/v2.2.5...v2.2.6) (2022-03-08)


### Dependencies

* update dependency com.google.cloud:native-image-support to v0.12.7 ([#661](https://github.com/googleapis/java-datastore/issues/661)) ([11634df](https://github.com/googleapis/java-datastore/commit/11634dfd6e536cb0e37ef5bb91435cc54614c8f6))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42cbadf85d64..3de44e61b25d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.2.6](https://github.com/googleapis/java-datastore/compare/v2.2.5...v2.2.6) (2022-03-08)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:native-image-support to v0.12.7 ([#661](https://github.com/googleapis/java-datastore/issues/661)) ([11634df](https://github.com/googleapis/java-datastore/commit/11634dfd6e536cb0e37ef5bb91435cc54614c8f6))
+
 ### [2.2.5](https://github.com/googleapis/java-datastore/compare/v2.2.4...v2.2.5) (2022-03-02)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index afc0f106654a..a64f471e9688 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.2.6-SNAPSHOT
+  2.2.6
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.6-SNAPSHOT
+    2.2.6
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 938d9b3c4147..f44f22252581 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.2.6-SNAPSHOT
+  2.2.6
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.6-SNAPSHOT
+        2.2.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.6-SNAPSHOT
+        0.93.6
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0fc09ca93442..e4dc81045f02 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.6-SNAPSHOT
+  2.2.6
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.6-SNAPSHOT
+    2.2.6
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index fe52c3149a40..e84d9d731b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.6-SNAPSHOT
+  2.2.6
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,17 +158,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.6-SNAPSHOT
+        2.2.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.6-SNAPSHOT
+        0.93.6
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.6-SNAPSHOT
+        2.2.6
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7a39d3fb55cf..3cbced5baee9 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.93.6-SNAPSHOT
+  0.93.6
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.6-SNAPSHOT
+    2.2.6
   
   
     
diff --git a/versions.txt b/versions.txt
index 2803bc95ee3b..d19ad04e684d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.5:2.2.6-SNAPSHOT
-google-cloud-datastore-bom:2.2.5:2.2.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.5:0.93.6-SNAPSHOT
-datastore-v1-proto-client:2.2.5:2.2.6-SNAPSHOT
+google-cloud-datastore:2.2.6:2.2.6
+google-cloud-datastore-bom:2.2.6:2.2.6
+proto-google-cloud-datastore-v1:0.93.6:0.93.6
+datastore-v1-proto-client:2.2.6:2.2.6

From 6f7cde5f0ccb665388f338c361f8ae8c05bc1898 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 8 Mar 2022 20:54:16 +0000
Subject: [PATCH 0795/1784] chore(main): release 2.2.7-SNAPSHOT (#664)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a64f471e9688..3f28199ed901 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.2.6
+  2.2.7-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.6
+    2.2.7-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f44f22252581..eaf75988879b 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.2.6
+  2.2.7-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.6
+        2.2.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.6
+        0.93.7-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e4dc81045f02..3ed7ca074166 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.6
+  2.2.7-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.6
+    2.2.7-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index e84d9d731b39..ef84f57f1810 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.6
+  2.2.7-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,17 +158,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.6
+        2.2.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.6
+        0.93.7-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.6
+        2.2.7-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3cbced5baee9..20c68517bca0 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.93.6
+  0.93.7-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.6
+    2.2.7-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index d19ad04e684d..2be1e5810ade 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.6:2.2.6
-google-cloud-datastore-bom:2.2.6:2.2.6
-proto-google-cloud-datastore-v1:0.93.6:0.93.6
-datastore-v1-proto-client:2.2.6:2.2.6
+google-cloud-datastore:2.2.6:2.2.7-SNAPSHOT
+google-cloud-datastore-bom:2.2.6:2.2.7-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.6:0.93.7-SNAPSHOT
+datastore-v1-proto-client:2.2.6:2.2.7-SNAPSHOT

From 2f893b62df4c9a38d4efee6c6cc49d6aef9655fd Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 9 Mar 2022 18:28:25 +0100
Subject: [PATCH 0796/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.6 (#667)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.5` -> `2.2.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.6/compatibility-slim/2.2.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.6/confidence-slim/2.2.5)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.6`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​226-httpsgithubcomgoogleapisjava-datastorecomparev225v226-2022-03-08)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.5...v2.2.6)


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ba7e45d8bb6a..322fcb6c9a18 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.2.5
+  2.2.6
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.2.5'
+implementation 'com.google.cloud:google-cloud-datastore:2.2.6'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.6"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 33da6541e249..ed75fc3c0191 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.2.5
+      2.2.6
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 200cc2daac84..924704e07520 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.5
+      2.2.6
     
 
     

From 917a3fe427a697816790be131a113d6962667458 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 9 Mar 2022 18:28:33 +0100
Subject: [PATCH 0797/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.12.8 (#668)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.7` -> `0.12.8` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.8/compatibility-slim/0.12.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.8/confidence-slim/0.12.7)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 60d736b4bedc..7bc022c2c28a 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.7
+          0.12.8
         
         
           org.junit.vintage

From 4ea17efef6324e72aef49be3b651e787c5ff1198 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 9 Mar 2022 17:56:13 +0000
Subject: [PATCH 0798/1784] chore(main): release 2.2.7 (#669)

:robot: I have created a release *beep* *boop*
---


### [2.2.7](https://github.com/googleapis/java-datastore/compare/v2.2.6...v2.2.7) (2022-03-09)


### Dependencies

* update dependency com.google.cloud:native-image-support to v0.12.8 ([#668](https://github.com/googleapis/java-datastore/issues/668)) ([917a3fe](https://github.com/googleapis/java-datastore/commit/917a3fe427a697816790be131a113d6962667458))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3de44e61b25d..c0043adf758f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.2.7](https://github.com/googleapis/java-datastore/compare/v2.2.6...v2.2.7) (2022-03-09)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:native-image-support to v0.12.8 ([#668](https://github.com/googleapis/java-datastore/issues/668)) ([917a3fe](https://github.com/googleapis/java-datastore/commit/917a3fe427a697816790be131a113d6962667458))
+
 ### [2.2.6](https://github.com/googleapis/java-datastore/compare/v2.2.5...v2.2.6) (2022-03-08)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3f28199ed901..d841514bd9ae 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.2.7-SNAPSHOT
+  2.2.7
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.7-SNAPSHOT
+    2.2.7
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index eaf75988879b..83496247cdfb 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.2.7-SNAPSHOT
+  2.2.7
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.7-SNAPSHOT
+        2.2.7
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.7-SNAPSHOT
+        0.93.7
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3ed7ca074166..e276a8f78c24 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.7-SNAPSHOT
+  2.2.7
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.7-SNAPSHOT
+    2.2.7
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index ef84f57f1810..882d477a6012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.7-SNAPSHOT
+  2.2.7
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,17 +158,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.7-SNAPSHOT
+        2.2.7
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.7-SNAPSHOT
+        0.93.7
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.7-SNAPSHOT
+        2.2.7
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 20c68517bca0..8e42f7b29af5 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.93.7-SNAPSHOT
+  0.93.7
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.7-SNAPSHOT
+    2.2.7
   
   
     
diff --git a/versions.txt b/versions.txt
index 2be1e5810ade..1f1fe637011b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.6:2.2.7-SNAPSHOT
-google-cloud-datastore-bom:2.2.6:2.2.7-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.6:0.93.7-SNAPSHOT
-datastore-v1-proto-client:2.2.6:2.2.7-SNAPSHOT
+google-cloud-datastore:2.2.7:2.2.7
+google-cloud-datastore-bom:2.2.7:2.2.7
+proto-google-cloud-datastore-v1:0.93.7:0.93.7
+datastore-v1-proto-client:2.2.7:2.2.7

From 1af26bb5dfc29dca8a4a083e23cc5bf1f40dd5ec Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 9 Mar 2022 18:08:14 +0000
Subject: [PATCH 0799/1784] chore(main): release 2.2.8-SNAPSHOT (#670)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d841514bd9ae..8f4f15adbfab 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.2.7
+  2.2.8-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.7
+    2.2.8-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 83496247cdfb..5ddb7d9d45ac 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.2.7
+  2.2.8-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.7
+        2.2.8-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.7
+        0.93.8-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e276a8f78c24..8d90c89a85b4 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.7
+  2.2.8-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.7
+    2.2.8-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 882d477a6012..7f5a96faa258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.7
+  2.2.8-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -158,17 +158,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.7
+        2.2.8-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.7
+        0.93.8-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.7
+        2.2.8-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8e42f7b29af5..a7fcdb612c18 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.93.7
+  0.93.8-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.7
+    2.2.8-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 1f1fe637011b..be51b88d4bd4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.7:2.2.7
-google-cloud-datastore-bom:2.2.7:2.2.7
-proto-google-cloud-datastore-v1:0.93.7:0.93.7
-datastore-v1-proto-client:2.2.7:2.2.7
+google-cloud-datastore:2.2.7:2.2.8-SNAPSHOT
+google-cloud-datastore-bom:2.2.7:2.2.8-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.7:0.93.8-SNAPSHOT
+datastore-v1-proto-client:2.2.7:2.2.8-SNAPSHOT

From 77f4832a6ce961cd6a08233fdc4c175bcc7b1ec5 Mon Sep 17 00:00:00 2001
From: Nathan Herring 
Date: Wed, 9 Mar 2022 13:45:57 -0800
Subject: [PATCH 0800/1784] style: Add errorprone warnings. (#592)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* style: Add errorprone warnings.

Related to #590.

* 🦉 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 
Co-authored-by: kolea2 <45548808+kolea2@users.noreply.github.com>
---
 README.md |  4 ++--
 pom.xml   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 322fcb6c9a18..2870de94eacc 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.2.6'
+implementation 'com.google.cloud:google-cloud-datastore:2.2.7'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.6"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.7"
 ```
 
 ## Authentication
diff --git a/pom.xml b/pom.xml
index 7f5a96faa258..1312e229506d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
+    2.10.0
   
 
   
@@ -210,6 +211,49 @@
     
   
 
+  
+    
+      java9
+      
+        [9,)
+      
+      
+        
+          
+            org.apache.maven.plugins
+            maven-compiler-plugin
+            3.8.0
+            
+              UTF-8
+              true
+              
+                -XDcompilePolicy=simple
+                -Xplugin:ErrorProne
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+                -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+                -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+              
+              
+                
+                  com.google.errorprone
+                  error_prone_core
+                  ${error-prone.version}
+                
+              
+            
+          
+        
+      
+    
+  
+
   
     google-cloud-datastore
     proto-google-cloud-datastore-v1

From 93010c9e8e4b0c91eeff48ec2bd0c4cc4647a415 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 10 Mar 2022 23:14:11 +0100
Subject: [PATCH 0801/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-compiler-plugin to v3.10.0 (#672)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.apache.maven.plugins:maven-compiler-plugin](https://maven.apache.org/plugins/) | `3.8.0` -> `3.10.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.0/compatibility-slim/3.8.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.0/confidence-slim/3.8.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 1312e229506d..00f8dcb3523f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@
           
             org.apache.maven.plugins
             maven-compiler-plugin
-            3.8.0
+            3.10.0
             
               UTF-8
               true

From 41745156b78d07b1fcd264ecbcb2ece2d7c6c4e5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 10 Mar 2022 23:14:35 +0100
Subject: [PATCH 0802/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.7 (#674)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.6` -> `2.2.7` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.7/compatibility-slim/2.2.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.7/confidence-slim/2.2.6)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.7`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​227-httpsgithubcomgoogleapisjava-datastorecomparev226v227-2022-03-09)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.6...v2.2.7)


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 2870de94eacc..8ca902a27ba8 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.2.6
+  2.2.7
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index ed75fc3c0191..4b37475371b7 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.2.6
+      2.2.7
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 924704e07520..0dd05bdaf8b5 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.6
+      2.2.7
     
 
     

From 4338c4008c5e5bf7522713b45d13950f1a881ee7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 10 Mar 2022 23:16:19 +0100
Subject: [PATCH 0803/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.12.9 (#671)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.8` -> `0.12.9` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.9/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.9/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.9/compatibility-slim/0.12.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.9/confidence-slim/0.12.8)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 7bc022c2c28a..1b7a1cfdb87b 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.8
+          0.12.9
         
         
           org.junit.vintage

From 0888bac22704f5b2befd170267be28454f5ee059 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 10 Mar 2022 23:18:28 +0100
Subject: [PATCH 0804/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.11.0 (#673)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.10.0` -> `2.11.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.11.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.11.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.11.0/compatibility-slim/2.10.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.11.0/confidence-slim/2.10.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone

### [`v2.11.0`](https://togithub.com/google/error-prone/releases/v2.11.0)

[Compare Source](https://togithub.com/google/error-prone/compare/v2.10.0...v2.11.0)

Error Prone now requires JDK 11 or newer ([https://github.com/google/error-prone/issues/2730](https://togithub.com/google/error-prone/issues/2730)).

New checks

-   [`AutoValueBuilderDefaultsInConstructor`](http://errorprone.info/bugpattern/AutoValueBuilderDefaultsInConstructor)
-   [`FloggerLogString`](http://errorprone.info/bugpattern/FloggerLogString)
-   [`UnicodeDirectionalityCharacters`](http://errorprone.info/bugpattern/UnicodeDirectionalityCharacters)
-   [`UnicodeInCode`](http://errorprone.info/bugpattern/UnicodeInCode)
-   [`AlreadyChecked`](http://errorprone.info/bugpattern/AlreadyChecked)
-   [`BugPatternNaming`](http://errorprone.info/bugpattern/BugPatternNaming)
-   [`MissingImplementsComparable`](http://errorprone.info/bugpattern/MissingImplementsComparable)
-   [`NegativeCharLiteral`](http://errorprone.info/bugpattern/NegativeCharLiteral)
-   [`PreferredInterfaceType`](http://errorprone.info/bugpattern/PreferredInterfaceType)
-   [`StronglyTypeByteString`](http://errorprone.info/bugpattern/StronglyTypeByteString)
-   [`UsingJsr305CheckReturnValue`](http://errorprone.info/bugpattern/UsingJsr305CheckReturnValue)

Fixed issues: [#​2641](https://togithub.com/google/error-prone/issues/2641), [#​2705](https://togithub.com/google/error-prone/issues/2705), [#​2776](https://togithub.com/google/error-prone/issues/2776), [#​2798](https://togithub.com/google/error-prone/issues/2798), [#​2799](https://togithub.com/google/error-prone/issues/2799), [#​2819](https://togithub.com/google/error-prone/issues/2819), [#​2820](https://togithub.com/google/error-prone/issues/2820), [#​2831](https://togithub.com/google/error-prone/issues/2831), [#​2833](https://togithub.com/google/error-prone/issues/2833), [#​2834](https://togithub.com/google/error-prone/issues/2834), [#​2835](https://togithub.com/google/error-prone/issues/2835), [#​2861](https://togithub.com/google/error-prone/issues/2861), [#​2873](https://togithub.com/google/error-prone/issues/2873), [#​2889](https://togithub.com/google/error-prone/issues/2889), [#​2892](https://togithub.com/google/error-prone/issues/2892), [#​2901](https://togithub.com/google/error-prone/issues/2901)

**Full Changelog**: https://github.com/google/error-prone/compare/v2.10.0...v2.11.0


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 00f8dcb3523f..c43206a5bf36 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.10.0
+    2.11.0
       
 
   

From b90fd00b50737cd96bb8805ba43c5b8b5c24a89c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 10 Mar 2022 22:30:29 +0000
Subject: [PATCH 0805/1784] chore(main): release 2.2.8 (#675)

:robot: I have created a release *beep* *boop*
---


### [2.2.8](https://github.com/googleapis/java-datastore/compare/v2.2.7...v2.2.8) (2022-03-10)


### Dependencies

* update dependency com.google.cloud:native-image-support to v0.12.9 ([#671](https://github.com/googleapis/java-datastore/issues/671)) ([4338c40](https://github.com/googleapis/java-datastore/commit/4338c4008c5e5bf7522713b45d13950f1a881ee7))
* update dependency com.google.errorprone:error_prone_core to v2.11.0 ([#673](https://github.com/googleapis/java-datastore/issues/673)) ([0888bac](https://github.com/googleapis/java-datastore/commit/0888bac22704f5b2befd170267be28454f5ee059))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 8 ++++++++
 README.md                               | 2 +-
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 8 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0043adf758f..aed64b87d321 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### [2.2.8](https://github.com/googleapis/java-datastore/compare/v2.2.7...v2.2.8) (2022-03-10)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:native-image-support to v0.12.9 ([#671](https://github.com/googleapis/java-datastore/issues/671)) ([4338c40](https://github.com/googleapis/java-datastore/commit/4338c4008c5e5bf7522713b45d13950f1a881ee7))
+* update dependency com.google.errorprone:error_prone_core to v2.11.0 ([#673](https://github.com/googleapis/java-datastore/issues/673)) ([0888bac](https://github.com/googleapis/java-datastore/commit/0888bac22704f5b2befd170267be28454f5ee059))
+
 ### [2.2.7](https://github.com/googleapis/java-datastore/compare/v2.2.6...v2.2.7) (2022-03-09)
 
 
diff --git a/README.md b/README.md
index 8ca902a27ba8..e3c1d3c1ee5e 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:24.4.0')
+implementation platform('com.google.cloud:libraries-bom:25.0.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8f4f15adbfab..ace1de3acf8f 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.2.8-SNAPSHOT
+  2.2.8
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.8-SNAPSHOT
+    2.2.8
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5ddb7d9d45ac..e35337fe2ec4 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.2.8-SNAPSHOT
+  2.2.8
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.8-SNAPSHOT
+        2.2.8
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.8-SNAPSHOT
+        0.93.8
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8d90c89a85b4..9bd06170b8b0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.8-SNAPSHOT
+  2.2.8
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.8-SNAPSHOT
+    2.2.8
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index c43206a5bf36..d45ea536ee95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.8-SNAPSHOT
+  2.2.8
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.8-SNAPSHOT
+        2.2.8
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.8-SNAPSHOT
+        0.93.8
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.8-SNAPSHOT
+        2.2.8
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a7fcdb612c18..bb210ef4cd01 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.93.8-SNAPSHOT
+  0.93.8
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.8-SNAPSHOT
+    2.2.8
   
   
     
diff --git a/versions.txt b/versions.txt
index be51b88d4bd4..0911e8141af3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.7:2.2.8-SNAPSHOT
-google-cloud-datastore-bom:2.2.7:2.2.8-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.7:0.93.8-SNAPSHOT
-datastore-v1-proto-client:2.2.7:2.2.8-SNAPSHOT
+google-cloud-datastore:2.2.8:2.2.8
+google-cloud-datastore-bom:2.2.8:2.2.8
+proto-google-cloud-datastore-v1:0.93.8:0.93.8
+datastore-v1-proto-client:2.2.8:2.2.8

From 83eb5b272007d807b9d32b63513e415c8b90ae0e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 10 Mar 2022 22:42:22 +0000
Subject: [PATCH 0806/1784] chore(main): release 2.2.9-SNAPSHOT (#676)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ace1de3acf8f..4ab09b721971 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.2.8
+  2.2.9-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.8
+    2.2.9-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e35337fe2ec4..862f1ed6be34 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.2.8
+  2.2.9-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.8
+        2.2.9-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.8
+        0.93.9-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9bd06170b8b0..16c19401012c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.8
+  2.2.9-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.8
+    2.2.9-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index d45ea536ee95..445f72e04bb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.8
+  2.2.9-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.8
+        2.2.9-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.8
+        0.93.9-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.8
+        2.2.9-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index bb210ef4cd01..3a23ec1f2f3d 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.93.8
+  0.93.9-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.8
+    2.2.9-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 0911e8141af3..89be7500305a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.8:2.2.8
-google-cloud-datastore-bom:2.2.8:2.2.8
-proto-google-cloud-datastore-v1:0.93.8:0.93.8
-datastore-v1-proto-client:2.2.8:2.2.8
+google-cloud-datastore:2.2.8:2.2.9-SNAPSHOT
+google-cloud-datastore-bom:2.2.8:2.2.9-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.8:0.93.9-SNAPSHOT
+datastore-v1-proto-client:2.2.8:2.2.9-SNAPSHOT

From 6327bce7031b52835652b93fd4c144f4c8631bf1 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 14 Mar 2022 22:56:39 +0100
Subject: [PATCH 0807/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v25 (#680)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java)) | `24.4.0` -> `25.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.0.0/compatibility-slim/24.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.0.0/confidence-slim/24.4.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 6 +++---
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e3c1d3c1ee5e..5cc63da8ffcc 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      24.4.0
+      25.0.0
       pom
       import
     
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.2.7'
+implementation 'com.google.cloud:google-cloud-datastore:2.2.8'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.7"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.8"
 ```
 
 ## Authentication
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 1b7a1cfdb87b..c52d92641e61 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        24.4.0
+        25.0.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d0f043054dca..920da67a9c73 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        24.4.0
+        25.0.0
         pom
         import
       

From c45b41312b91fc54fd4a5533e613abf68f18fcb5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 14 Mar 2022 23:02:15 +0100
Subject: [PATCH 0808/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-compiler-plugin to v3.10.1 (#677)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.apache.maven.plugins:maven-compiler-plugin](https://maven.apache.org/plugins/) | `3.10.0` -> `3.10.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.1/compatibility-slim/3.10.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-compiler-plugin/3.10.1/confidence-slim/3.10.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 445f72e04bb3..bd9b68b7d15a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@
           
             org.apache.maven.plugins
             maven-compiler-plugin
-            3.10.0
+            3.10.1
             
               UTF-8
               true

From 0f8afd7409955efb89b481218861fa9ee531de89 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 14 Mar 2022 23:36:28 +0100
Subject: [PATCH 0809/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.12.10 (#679)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.9` -> `0.12.10` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.10/compatibility-slim/0.12.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.10/confidence-slim/0.12.9)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 c52d92641e61..f0a62450db6e 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.9
+          0.12.10
         
         
           org.junit.vintage

From 9e80bc2d0e70f140d24163b1bfdbf9b95008b74c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:46:22 +0000
Subject: [PATCH 0810/1784] chore(main): release 2.2.9 (#681)

:robot: I have created a release *beep* *boop*
---


### [2.2.9](https://github.com/googleapis/java-datastore/compare/v2.2.8...v2.2.9) (2022-03-14)


### Dependencies

* update dependency com.google.cloud:native-image-support to v0.12.10 ([#679](https://github.com/googleapis/java-datastore/issues/679)) ([0f8afd7](https://github.com/googleapis/java-datastore/commit/0f8afd7409955efb89b481218861fa9ee531de89))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aed64b87d321..c7a42555c370 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.2.9](https://github.com/googleapis/java-datastore/compare/v2.2.8...v2.2.9) (2022-03-14)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:native-image-support to v0.12.10 ([#679](https://github.com/googleapis/java-datastore/issues/679)) ([0f8afd7](https://github.com/googleapis/java-datastore/commit/0f8afd7409955efb89b481218861fa9ee531de89))
+
 ### [2.2.8](https://github.com/googleapis/java-datastore/compare/v2.2.7...v2.2.8) (2022-03-10)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4ab09b721971..1bfb722402da 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.2.9-SNAPSHOT
+  2.2.9
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.9-SNAPSHOT
+    2.2.9
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 862f1ed6be34..c71c77a1e402 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.2.9-SNAPSHOT
+  2.2.9
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.9-SNAPSHOT
+        2.2.9
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.9-SNAPSHOT
+        0.93.9
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 16c19401012c..02f15090ad6b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.9-SNAPSHOT
+  2.2.9
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.9-SNAPSHOT
+    2.2.9
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index bd9b68b7d15a..372150042700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.9-SNAPSHOT
+  2.2.9
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.9-SNAPSHOT
+        2.2.9
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.9-SNAPSHOT
+        0.93.9
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.9-SNAPSHOT
+        2.2.9
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3a23ec1f2f3d..6f46861784eb 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.93.9-SNAPSHOT
+  0.93.9
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.9-SNAPSHOT
+    2.2.9
   
   
     
diff --git a/versions.txt b/versions.txt
index 89be7500305a..4532a0077e78 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.8:2.2.9-SNAPSHOT
-google-cloud-datastore-bom:2.2.8:2.2.9-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.8:0.93.9-SNAPSHOT
-datastore-v1-proto-client:2.2.8:2.2.9-SNAPSHOT
+google-cloud-datastore:2.2.9:2.2.9
+google-cloud-datastore-bom:2.2.9:2.2.9
+proto-google-cloud-datastore-v1:0.93.9:0.93.9
+datastore-v1-proto-client:2.2.9:2.2.9

From 69d220eb76c5f20f5bf4618e8ed30913b3121359 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 23:04:38 +0000
Subject: [PATCH 0811/1784] chore(main): release 2.2.10-SNAPSHOT (#682)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 1bfb722402da..9ead4b24d3f1 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.2.9
+  2.2.10-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.9
+    2.2.10-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c71c77a1e402..2fa021f8d92b 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.2.9
+  2.2.10-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.9
+        2.2.10-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.9
+        0.93.10-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 02f15090ad6b..6e311c22439d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.9
+  2.2.10-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.9
+    2.2.10-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 372150042700..30f48de2972a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.9
+  2.2.10-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.9
+        2.2.10-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.9
+        0.93.10-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.9
+        2.2.10-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6f46861784eb..827dde5aa4ab 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.93.9
+  0.93.10-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.9
+    2.2.10-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 4532a0077e78..1fcb253d63f3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.9:2.2.9
-google-cloud-datastore-bom:2.2.9:2.2.9
-proto-google-cloud-datastore-v1:0.93.9:0.93.9
-datastore-v1-proto-client:2.2.9:2.2.9
+google-cloud-datastore:2.2.9:2.2.10-SNAPSHOT
+google-cloud-datastore-bom:2.2.9:2.2.10-SNAPSHOT
+proto-google-cloud-datastore-v1:0.93.9:0.93.10-SNAPSHOT
+datastore-v1-proto-client:2.2.9:2.2.10-SNAPSHOT

From 529f08bd4c924dc0bfe7f31f6de70799de6a911a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 15 Mar 2022 00:10:18 +0100
Subject: [PATCH 0812/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.8 (#678)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.7` -> `2.2.8` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.8/compatibility-slim/2.2.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.8/confidence-slim/2.2.7)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.8`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​228-httpsgithubcomgoogleapisjava-datastorecomparev227v228-2022-03-10)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.7...v2.2.8)


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 5cc63da8ffcc..117629849956 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.2.7
+  2.2.8
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4b37475371b7..61b4890e5b96 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.2.7
+      2.2.8
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0dd05bdaf8b5..24e595189864 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.7
+      2.2.8
     
 
     

From e9ef125bc3ef8c7a133b441626a638db1134d9de Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 16 Mar 2022 15:42:17 +0100
Subject: [PATCH 0813/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.2.9 (#683)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.8` -> `2.2.9` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.9/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.9/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.9/compatibility-slim/2.2.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.9/confidence-slim/2.2.8)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.2.9`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​229-httpsgithubcomgoogleapisjava-datastorecomparev228v229-2022-03-14)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.8...v2.2.9)


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 117629849956..69ac3fa6df0d 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.2.8
+  2.2.9
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.2.8'
+implementation 'com.google.cloud:google-cloud-datastore:2.2.9'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.8"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.9"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 61b4890e5b96..4a7fff2a5cb5 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.2.8
+      2.2.9
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 24e595189864..fa77f55fb047 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.8
+      2.2.9
     
 
     

From 73786bd44d1bd2725796c62dbebadcbe27abb824 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 17 Mar 2022 19:12:18 +0000
Subject: [PATCH 0814/1784] feat: add IN/NOT_IN/NOT_EQUALS support to cloud
 datastore proto (#684)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 434824722

Source-Link: https://github.com/googleapis/googleapis/commit/4bfdcd371b9fac734d4b2ee8d8beae4f9f5e1aba

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5982b9b085388d6c9a90a5578ebe47518fe0932e
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTk4MmI5YjA4NTM4OGQ2YzlhOTBhNTU3OGViZTQ3NTE4ZmUwOTMyZSJ9
---
 .../datastore/v1/AllocateIdsRequest.java      |   2 +-
 .../v1/AllocateIdsRequestOrBuilder.java       |   2 +-
 .../datastore/v1/AllocateIdsResponse.java     |   2 +-
 .../v1/AllocateIdsResponseOrBuilder.java      |   2 +-
 .../com/google/datastore/v1/ArrayValue.java   |   2 +-
 .../datastore/v1/ArrayValueOrBuilder.java     |   2 +-
 .../datastore/v1/BeginTransactionRequest.java |   2 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |   2 +-
 .../v1/BeginTransactionResponse.java          |   2 +-
 .../v1/BeginTransactionResponseOrBuilder.java |   2 +-
 .../google/datastore/v1/CommitRequest.java    |   2 +-
 .../datastore/v1/CommitRequestOrBuilder.java  |   2 +-
 .../google/datastore/v1/CommitResponse.java   |   2 +-
 .../datastore/v1/CommitResponseOrBuilder.java |   2 +-
 .../google/datastore/v1/CompositeFilter.java  |   2 +-
 .../v1/CompositeFilterOrBuilder.java          |   2 +-
 .../google/datastore/v1/DatastoreProto.java   |   2 +-
 .../java/com/google/datastore/v1/Entity.java  |   2 +-
 .../google/datastore/v1/EntityOrBuilder.java  |   2 +-
 .../com/google/datastore/v1/EntityProto.java  |  71 ++++-----
 .../com/google/datastore/v1/EntityResult.java |   2 +-
 .../datastore/v1/EntityResultOrBuilder.java   |   2 +-
 .../java/com/google/datastore/v1/Filter.java  |   2 +-
 .../google/datastore/v1/FilterOrBuilder.java  |   2 +-
 .../com/google/datastore/v1/GqlQuery.java     |   2 +-
 .../datastore/v1/GqlQueryOrBuilder.java       |   2 +-
 .../datastore/v1/GqlQueryParameter.java       |   2 +-
 .../v1/GqlQueryParameterOrBuilder.java        |   2 +-
 .../java/com/google/datastore/v1/Key.java     |   2 +-
 .../com/google/datastore/v1/KeyOrBuilder.java |   2 +-
 .../google/datastore/v1/KindExpression.java   |   2 +-
 .../datastore/v1/KindExpressionOrBuilder.java |   2 +-
 .../google/datastore/v1/LookupRequest.java    |   2 +-
 .../datastore/v1/LookupRequestOrBuilder.java  |   2 +-
 .../google/datastore/v1/LookupResponse.java   |   2 +-
 .../datastore/v1/LookupResponseOrBuilder.java |   2 +-
 .../com/google/datastore/v1/Mutation.java     |  32 ++--
 .../datastore/v1/MutationOrBuilder.java       |  12 +-
 .../google/datastore/v1/MutationResult.java   |   2 +-
 .../datastore/v1/MutationResultOrBuilder.java |   2 +-
 .../com/google/datastore/v1/PartitionId.java  |   8 +-
 .../datastore/v1/PartitionIdOrBuilder.java    |   2 +-
 .../com/google/datastore/v1/Projection.java   |   2 +-
 .../datastore/v1/ProjectionOrBuilder.java     |   2 +-
 .../google/datastore/v1/PropertyFilter.java   | 132 ++++++++++++++--
 .../datastore/v1/PropertyFilterOrBuilder.java |   2 +-
 .../google/datastore/v1/PropertyOrder.java    |   2 +-
 .../datastore/v1/PropertyOrderOrBuilder.java  |   2 +-
 .../datastore/v1/PropertyReference.java       |   2 +-
 .../v1/PropertyReferenceOrBuilder.java        |   2 +-
 .../java/com/google/datastore/v1/Query.java   |   2 +-
 .../google/datastore/v1/QueryOrBuilder.java   |   2 +-
 .../com/google/datastore/v1/QueryProto.java   | 145 +++++++++---------
 .../google/datastore/v1/QueryResultBatch.java |   2 +-
 .../v1/QueryResultBatchOrBuilder.java         |   2 +-
 .../com/google/datastore/v1/ReadOptions.java  |   2 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |   2 +-
 .../datastore/v1/ReserveIdsRequest.java       |   2 +-
 .../v1/ReserveIdsRequestOrBuilder.java        |   2 +-
 .../datastore/v1/ReserveIdsResponse.java      |   2 +-
 .../v1/ReserveIdsResponseOrBuilder.java       |   2 +-
 .../google/datastore/v1/RollbackRequest.java  |   2 +-
 .../v1/RollbackRequestOrBuilder.java          |   2 +-
 .../google/datastore/v1/RollbackResponse.java |   2 +-
 .../v1/RollbackResponseOrBuilder.java         |   2 +-
 .../google/datastore/v1/RunQueryRequest.java  |   2 +-
 .../v1/RunQueryRequestOrBuilder.java          |   2 +-
 .../google/datastore/v1/RunQueryResponse.java |   2 +-
 .../v1/RunQueryResponseOrBuilder.java         |   2 +-
 .../datastore/v1/TransactionOptions.java      |   2 +-
 .../v1/TransactionOptionsOrBuilder.java       |   2 +-
 .../java/com/google/datastore/v1/Value.java   |  38 ++---
 .../google/datastore/v1/ValueOrBuilder.java   |  14 +-
 .../proto/google/datastore/v1/datastore.proto |  20 ++-
 .../proto/google/datastore/v1/entity.proto    |  10 +-
 .../proto/google/datastore/v1/query.proto     |  61 ++++++--
 76 files changed, 413 insertions(+), 260 deletions(-)

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 1f66e03641c2..2226a3df348a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 34e9db57bf1b..c348f5838105 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 2495a76d4022..76ac0469f67d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 1ba60a1b4b1a..af7bb209e580 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 707f9c49dd26..809b138c2435 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index d0b1fdef5167..c9f60605fe94 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 05fdca81fdfd..c21f6c7dd483 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 50ba8a2ff79a..31bd754504fd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e158c0f0cc3c..bb28249087f3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index dcd155818e44..950fac3fbe68 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c981ef1ef79d..6e40e8ca44e0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b5f4a1bce392..db235efddcec 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 65706cccb38a..781a479b88d7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 7394bb2d0e70..9a6f308c7cbf 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 349aee53a2c7..7fa99e9c7624 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 aed9664e821e..ad644173ed67 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 fd59f03e9636..41b425c3a857 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index a9cfad568f3e..f6ba0751de4d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 745700b13d2d..b001d910781a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 6b6b02e304f9..4040129ea128 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,46 +65,44 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n google/datastore/v1/entity.proto\022\023goog"
-          + "le.datastore.v1\032\034google/api/annotations."
-          + "proto\032\034google/protobuf/struct.proto\032\037goo"
-          + "gle/protobuf/timestamp.proto\032\030google/typ"
-          + "e/latlng.proto\"7\n\013PartitionId\022\022\n\nproject"
-          + "_id\030\002 \001(\t\022\024\n\014namespace_id\030\004 \001(\t\"\267\001\n\003Key\022"
-          + "6\n\014partition_id\030\001 \001(\0132 .google.datastore"
-          + ".v1.PartitionId\0222\n\004path\030\002 \003(\0132$.google.d"
-          + "atastore.v1.Key.PathElement\032D\n\013PathEleme"
-          + "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003"
-          + " \001(\tH\000B\t\n\007id_type\"8\n\nArrayValue\022*\n\006value"
-          + "s\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n\005"
-          + "Value\0220\n\nnull_value\030\013 \001(\0162\032.google.proto"
-          + "buf.NullValueH\000\022\027\n\rboolean_value\030\001 \001(\010H\000"
-          + "\022\027\n\rinteger_value\030\002 \001(\003H\000\022\026\n\014double_valu"
-          + "e\030\003 \001(\001H\000\0225\n\017timestamp_value\030\n \001(\0132\032.goo"
-          + "gle.protobuf.TimestampH\000\022-\n\tkey_value\030\005 "
-          + "\001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014strin"
-          + "g_value\030\021 \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n"
-          + "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat"
-          + "LngH\000\0223\n\014entity_value\030\006 \001(\0132\033.google.dat"
-          + "astore.v1.EntityH\000\0226\n\013array_value\030\t \001(\0132"
-          + "\037.google.datastore.v1.ArrayValueH\000\022\017\n\007me"
-          + "aning\030\016 \001(\005\022\034\n\024exclude_from_indexes\030\023 \001("
-          + "\010B\014\n\nvalue_type\"\277\001\n\006Entity\022%\n\003key\030\001 \001(\0132"
-          + "\030.google.datastore.v1.Key\022?\n\nproperties\030"
-          + "\003 \003(\0132+.google.datastore.v1.Entity.Prope"
-          + "rtiesEntry\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001"
-          + "(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore.v1."
-          + "Value:\0028\001B\275\001\n\027com.google.datastore.v1B\013E"
-          + "ntityProtoP\001Z
-   * The version of the entity that this mutation is being applied to. If this
-   * does not match the current version on the server, the mutation conflicts.
+   * The version of the entity that this mutation is being applied
+   * to. If this does not match the current version on the server, the
+   * mutation conflicts.
    * 
    
    *
    * int64 base_version = 8;
@@ -501,8 +502,9 @@ public boolean hasBaseVersion() {
    *
    *
    * 
    -   * The version of the entity that this mutation is being applied to. If this
-   * does not match the current version on the server, the mutation conflicts.
+   * The version of the entity that this mutation is being applied
+   * to. If this does not match the current version on the server, the
+   * mutation conflicts.
    * 
    
    *
    * int64 base_version = 8;
@@ -1869,8 +1871,9 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
      *
      *
      * 
    -     * The version of the entity that this mutation is being applied to. If this
-     * does not match the current version on the server, the mutation conflicts.
+     * The version of the entity that this mutation is being applied
+     * to. If this does not match the current version on the server, the
+     * mutation conflicts.
      * 
    
      *
      * int64 base_version = 8;
@@ -1884,8 +1887,9 @@ public boolean hasBaseVersion() {
      *
      *
      * 
    -     * The version of the entity that this mutation is being applied to. If this
-     * does not match the current version on the server, the mutation conflicts.
+     * The version of the entity that this mutation is being applied
+     * to. If this does not match the current version on the server, the
+     * mutation conflicts.
      * 
    
      *
      * int64 base_version = 8;
@@ -1902,8 +1906,9 @@ public long getBaseVersion() {
      *
      *
      * 
    -     * The version of the entity that this mutation is being applied to. If this
-     * does not match the current version on the server, the mutation conflicts.
+     * The version of the entity that this mutation is being applied
+     * to. If this does not match the current version on the server, the
+     * mutation conflicts.
      * 
    
      *
      * int64 base_version = 8;
@@ -1921,8 +1926,9 @@ public Builder setBaseVersion(long value) {
      *
      *
      * 
    -     * The version of the entity that this mutation is being applied to. If this
-     * does not match the current version on the server, the mutation conflicts.
+     * The version of the entity that this mutation is being applied
+     * to. If this does not match the current version on the server, the
+     * mutation conflicts.
      * 
    
      *
      * int64 base_version = 8;
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 b3a41be07f96..672998d722cb 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -179,8 +179,9 @@ public interface MutationOrBuilder
    *
    *
    * 
    -   * The version of the entity that this mutation is being applied to. If this
-   * does not match the current version on the server, the mutation conflicts.
+   * The version of the entity that this mutation is being applied
+   * to. If this does not match the current version on the server, the
+   * mutation conflicts.
    * 
    
    *
    * int64 base_version = 8;
@@ -192,8 +193,9 @@ public interface MutationOrBuilder
    *
    *
    * 
    -   * The version of the entity that this mutation is being applied to. If this
-   * does not match the current version on the server, the mutation conflicts.
+   * The version of the entity that this mutation is being applied
+   * to. If this does not match the current version on the server, the
+   * mutation conflicts.
    * 
    
    *
    * int64 base_version = 8;
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 48a891412862..ecc28914b4e4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 9d330b494def..777a56ae989e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6ae103685fc6..88f69754a1e7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,7 @@
  * 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
- * an active state.
+ * Reads and writes of foreign partition IDs may fail if the project is not in an active state.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PartitionId}
@@ -416,8 +415,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 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
-   * an active state.
+   * Reads and writes of foreign partition IDs may fail if the project is not in an active state.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PartitionId}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index f05a034a6861..4d6a0cf4389f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 81088877b4de..9694f3eb6fe3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index dc4b14a5db5d..5f3d6c3b2011 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8e53aca99bd8..aacca8108946 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,7 +165,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Less than.
+     * The given `property` is less than the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * LESS_THAN = 1;
@@ -175,7 +177,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Less than or equal.
+     * The given `property` is less than or equal to the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * LESS_THAN_OR_EQUAL = 2;
@@ -185,7 +189,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Greater than.
+     * The given `property` is greater than the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * GREATER_THAN = 3;
@@ -195,7 +201,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Greater than or equal.
+     * The given `property` is greater than or equal to the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * GREATER_THAN_OR_EQUAL = 4;
@@ -205,7 +213,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Equal.
+     * The given `property` is equal to the given `value`.
      * 

      *
      * EQUAL = 5;
@@ -215,12 +223,54 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Has ancestor.
+     * 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.
+     * 

+     *
+     * IN = 6;
+     */
+    IN(6),
+    /**
+     *
+     *
+     * 
+     * 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`.
+     * 

+     *
+     * NOT_EQUAL = 9;
+     */
+    NOT_EQUAL(9),
+    /**
+     *
+     *
+     * 
+     * Limit the result set to the given entity and its descendants.
+     * Requires:
+     * * That `value` is an entity key.
      * 

      *
      * HAS_ANCESTOR = 11;
      */
     HAS_ANCESTOR(11),
+    /**
+     *
+     *
+     * 
+     * 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`.
+     * 

+     *
+     * NOT_IN = 13;
+     */
+    NOT_IN(13),
     UNRECOGNIZED(-1),
     ;
 
@@ -238,7 +288,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Less than.
+     * The given `property` is less than the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * LESS_THAN = 1;
@@ -248,7 +300,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Less than or equal.
+     * The given `property` is less than or equal to the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * LESS_THAN_OR_EQUAL = 2;
@@ -258,7 +312,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Greater than.
+     * The given `property` is greater than the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * GREATER_THAN = 3;
@@ -268,7 +324,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Greater than or equal.
+     * The given `property` is greater than or equal to the given `value`.
+     * Requires:
+     * * That `property` comes first in `order_by`.
      * 

      *
      * GREATER_THAN_OR_EQUAL = 4;
@@ -278,7 +336,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Equal.
+     * The given `property` is equal to the given `value`.
      * 

      *
      * EQUAL = 5;
@@ -288,12 +346,54 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * 
-     * Has ancestor.
+     * 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.
+     * 

+     *
+     * IN = 6;
+     */
+    public static final int IN_VALUE = 6;
+    /**
+     *
+     *
+     * 
+     * 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`.
+     * 

+     *
+     * NOT_EQUAL = 9;
+     */
+    public static final int NOT_EQUAL_VALUE = 9;
+    /**
+     *
+     *
+     * 
+     * Limit the result set to the given entity and its descendants.
+     * Requires:
+     * * That `value` is an entity key.
      * 

      *
      * HAS_ANCESTOR = 11;
      */
     public static final int HAS_ANCESTOR_VALUE = 11;
+    /**
+     *
+     *
+     * 
+     * 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`.
+     * 

+     *
+     * NOT_IN = 13;
+     */
+    public static final int NOT_IN_VALUE = 13;
 
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
@@ -331,8 +431,14 @@ public static Operator forNumber(int value) {
           return GREATER_THAN_OR_EQUAL;
         case 5:
           return EQUAL;
+        case 6:
+          return IN;
+        case 9:
+          return NOT_EQUAL;
         case 11:
           return HAS_ANCESTOR;
+        case 13:
+          return NOT_IN;
         default:
           return null;
       }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index 311c260a6dee..f9d3ba4bfa3f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a70a8182d0c1..751138715bbe 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index bb9417a94936..93cb3f926740 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c7489ac5d9a2..9bab6ed71918 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 45f2069d7dbc..105bbe4d3833 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 237d64b049fb..0ed85ebc8c8c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 56d8980c3297..f06b1b616ace 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0af6d7e8cbd4..fa56f7282551 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,85 +89,82 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n\037google/datastore/v1/query.proto\022\023googl"
-          + "e.datastore.v1\032\034google/api/annotations.p"
-          + "roto\032 google/datastore/v1/entity.proto\032\036"
-          + "google/protobuf/wrappers.proto\032\030google/t"
-          + "ype/latlng.proto\"\257\001\n\014EntityResult\022+\n\006ent"
-          + "ity\030\001 \001(\0132\033.google.datastore.v1.Entity\022\017"
-          + "\n\007version\030\004 \001(\003\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResul"
-          + "tType\022\033\n\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FU"
-          + "LL\020\001\022\016\n\nPROJECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Q"
-          + "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast"
-          + "ore.v1.Projection\0221\n\004kind\030\003 \003(\0132#.google"
-          + ".datastore.v1.KindExpression\022+\n\006filter\030\004"
-          + " \001(\0132\033.google.datastore.v1.Filter\0221\n\005ord"
-          + "er\030\005 \003(\0132\".google.datastore.v1.PropertyO"
-          + "rder\022;\n\013distinct_on\030\006 \003(\0132&.google.datas"
-          + "tore.v1.PropertyReference\022\024\n\014start_curso"
-          + "r\030\007 \001(\014\022\022\n\nend_cursor\030\010 \001(\014\022\016\n\006offset\030\n "
-          + "\001(\005\022*\n\005limit\030\014 \001(\0132\033.google.protobuf.Int"
-          + "32Value\"\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\""
-          + "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr"
-          + "ojection\0228\n\010property\030\001 \001(\0132&.google.data"
-          + "store.v1.PropertyReference\"\321\001\n\rPropertyO"
-          + "rder\0228\n\010property\030\001 \001(\0132&.google.datastor"
-          + "e.v1.PropertyReference\022?\n\tdirection\030\002 \001("
-          + "\0162,.google.datastore.v1.PropertyOrder.Di"
-          + "rection\"E\n\tDirection\022\031\n\025DIRECTION_UNSPEC"
-          + "IFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"\231"
-          + "\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$.go"
-          + "ogle.datastore.v1.CompositeFilterH\000\022>\n\017p"
-          + "roperty_filter\030\002 \001(\0132#.google.datastore."
-          + "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C"
-          + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data"
-          + "store.v1.CompositeFilter.Operator\022,\n\007fil"
-          + "ters\030\002 \003(\0132\033.google.datastore.v1.Filter\""
-          + "-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\007\n"
-          + "\003AND\020\001\"\307\002\n\016PropertyFilter\0228\n\010property\030\001 "
-          + "\001(\0132&.google.datastore.v1.PropertyRefere"
-          + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr"
-          + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g"
-          + "oogle.datastore.v1.Value\"\225\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_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020"
-          + "\n\014HAS_ANCESTOR\020\013\"\245\002\n\010GqlQuery\022\024\n\014query_s"
-          + "tring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016n"
-          + "amed_bindings\030\005 \003(\01320.google.datastore.v"
-          + "1.GqlQuery.NamedBindingsEntry\022C\n\023positio"
-          + "nal_bindings\030\004 \003(\0132&.google.datastore.v1"
-          + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry"
-          + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da"
-          + "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ"
-          + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da"
-          + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016"
-          + "parameter_type\"\336\003\n\020QueryResultBatch\022\027\n\017s"
-          + "kipped_results\030\006 \001(\005\022\026\n\016skipped_cursor\030\003"
-          + " \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,.googl"
-          + "e.datastore.v1.EntityResult.ResultType\0229"
-          + "\n\016entity_results\030\002 \003(\0132!.google.datastor"
-          + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n"
-          + "\014more_results\030\005 \001(\01625.google.datastore.v"
-          + "1.QueryResultBatch.MoreResultsType\022\030\n\020sn"
-          + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType"
-          + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N"
-          + "OT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTER_LIMI"
-          + "T\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\n\017property_filter\030\002"
+          + " \001(\0132#.google.datastore.v1.PropertyFilte"
+          + "rH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter\0229"
+          + "\n\002op\030\001 \001(\0162-.google.datastore.v1.Composi"
+          + "teFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.goo"
+          + "gle.datastore.v1.Filter\"-\n\010Operator\022\030\n\024O"
+          + "PERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\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\"\336\003\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\""
+          + "\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS_TYPE"
+          + "_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE"
+          + "_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_A"
+          + "FTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n\027c"
+          + "om.google.datastore.v1B\nQueryProtoP\001Z
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed), may have at most
-   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -585,8 +585,8 @@ public boolean hasStringValue() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed), may have at most
-   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -614,8 +614,8 @@ public java.lang.String getStringValue() {
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed), may have at most
-   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -2276,8 +2276,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed), may have at most
-     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2293,8 +2293,8 @@ public boolean hasStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed), may have at most
-     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2323,8 +2323,8 @@ public java.lang.String getStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed), may have at most
-     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2353,8 +2353,8 @@ public com.google.protobuf.ByteString getStringValueBytes() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed), may have at most
-     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2376,8 +2376,8 @@ public Builder setStringValue(java.lang.String value) {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed), may have at most
-     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
@@ -2397,8 +2397,8 @@ public Builder clearStringValue() {
      *
      * 
      * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed), may have at most
-     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+     * Otherwise, may be set to at most 1,000,000 bytes.
      * 

      *
      * string string_value = 17;
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 b965e9596ba7..340dd566221e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -216,8 +216,8 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed), may have at most
-   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -230,8 +230,8 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed), may have at most
-   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
@@ -244,8 +244,8 @@ public interface ValueOrBuilder
    *
    * 
    * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed), may have at most
-   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+   * Otherwise, may be set to at most 1,000,000 bytes.
    * 

    *
    * string string_value = 17;
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 ad016194ab2d..6a29b0e98407 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
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC.
+// 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.
@@ -328,8 +328,9 @@ message Mutation {
   // with the current version of the entity on the server. Conflicting mutations
   // are not applied, and are marked as such in MutationResult.
   oneof conflict_detection_strategy {
-    // The version of the entity that this mutation is being applied to. If this
-    // does not match the current version on the server, the mutation conflicts.
+    // The version of the entity that this mutation is being applied
+    // to. If this does not match the current version on the server, the
+    // mutation conflicts.
     int64 base_version = 8;
   }
 }
@@ -366,9 +367,16 @@ message ReadOptions {
     EVENTUAL = 2;
   }
 
-  // If not specified, lookups and ancestor queries default to
-  // `read_consistency`=`STRONG`, global queries default to
-  // `read_consistency`=`EVENTUAL`.
+  // For Cloud Datastore, if read_consistency is not specified, then lookups and
+  // ancestor queries default to `read_consistency`=`STRONG`, global queries
+  // default to `read_consistency`=`EVENTUAL`.
+  //
+  // For Cloud Firestore in Datastore mode, if read_consistency is not specified
+  // then lookups and all queries default to `read_consistency`=`STRONG`.
+  //
+  // Explicitly setting `read_consistency`=`EVENTUAL` will result in eventually
+  // consistent lookups & queries in both Cloud Datastore & Cloud Firestore in
+  // Datastore mode.
   oneof consistency_type {
     // The non-transactional read consistency to use.
     // Cannot be set to `STRONG` for global queries.
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 61286cd7a2c0..befbcd7b6578 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
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC.
+// 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.
@@ -16,7 +16,6 @@ syntax = "proto3";
 
 package google.datastore.v1;
 
-import "google/api/annotations.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 import "google/type/latlng.proto";
@@ -47,8 +46,7 @@ option ruby_package = "Google::Cloud::Datastore::V1";
 //
 // 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
-// an active state.
+// Reads and writes of foreign partition IDs may fail if the project is not in an active state.
 message PartitionId {
   // The ID of the project to which the entities belong.
   string project_id = 2;
@@ -146,8 +144,8 @@ message Value {
     Key key_value = 5;
 
     // A UTF-8 encoded string value.
-    // When `exclude_from_indexes` is false (it is indexed), may have at most
-    // 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
+    // When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
+    // Otherwise, may be set to at most 1,000,000 bytes.
     string string_value = 17;
 
     // A blob value.
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 4cb3ef99b839..3e64618393b2 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
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC.
+// 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.
@@ -16,10 +16,8 @@ syntax = "proto3";
 
 package google.datastore.v1;
 
-import "google/api/annotations.proto";
 import "google/datastore/v1/entity.proto";
 import "google/protobuf/wrappers.proto";
-import "google/type/latlng.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.V1";
 option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore";
@@ -190,23 +188,68 @@ message PropertyFilter {
     // Unspecified. This value must not be used.
     OPERATOR_UNSPECIFIED = 0;
 
-    // Less than.
+    // The given `property` is less than the given `value`.
+    //
+    // Requires:
+    //
+    // * That `property` comes first in `order_by`.
     LESS_THAN = 1;
 
-    // Less than or equal.
+    // The given `property` is less than or equal to the given `value`.
+    //
+    // Requires:
+    //
+    // * That `property` comes first in `order_by`.
     LESS_THAN_OR_EQUAL = 2;
 
-    // Greater than.
+    // The given `property` is greater than the given `value`.
+    //
+    // Requires:
+    //
+    // * That `property` comes first in `order_by`.
     GREATER_THAN = 3;
 
-    // Greater than or equal.
+    // The given `property` is greater than or equal to the given `value`.
+    //
+    // Requires:
+    //
+    // * That `property` comes first in `order_by`.
     GREATER_THAN_OR_EQUAL = 4;
 
-    // Equal.
+    // The given `property` is equal to the given `value`.
     EQUAL = 5;
 
-    // Has ancestor.
+    // 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.
+    IN = 6;
+
+    // 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`.
+    NOT_EQUAL = 9;
+
+    // Limit the result set to the given entity and its descendants.
+    //
+    // Requires:
+    //
+    // * That `value` is an entity key.
     HAS_ANCESTOR = 11;
+
+    // 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`.
+    NOT_IN = 13;
   }
 
   // The property to filter by.

From 91807b92fa1f410cec6184f2b2dd1c300666878c Mon Sep 17 00:00:00 2001
From: Emily Ball 
Date: Fri, 18 Mar 2022 07:09:07 -0700
Subject: [PATCH 0815/1784] docs: update doc link (#685)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: update doc link

* 🦉 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 
---
 .../java/com/google/datastore/v1/client/DatastoreHelper.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 ca265a23051f..0a8bba8c5ed3 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
@@ -216,8 +216,8 @@ private static GoogleCredential.Builder getCredentialBuilderWithoutPrivateKey(
    *   
  • No credentials (if the DATASTORE_EMULATOR_HOST environment variable is set)
    *   
  • Service Account specified by the DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE
    *       environment variables
-   *   
  • Google Application Default as described at {@link
-   *       "https://developers.google.com/identity/protocols/application-default-credentials"}
+   *   
  • Google Application Default as described here.
    * 
    */
   public static DatastoreOptions.Builder getOptionsFromEnv()

From d886eb6d089cb509886c42647ebeb2895fbdc3c4 Mon Sep 17 00:00:00 2001
From: Mariatta Wijaya 
Date: Mon, 21 Mar 2022 11:26:23 -0700
Subject: [PATCH 0816/1784] chore: Change the Codeowner to cloud-native-db-dpes
 (#686)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Change the Codeowner to cloud-native-db-dpes

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Add api-firestore team

* Update CODEOWNERS

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Add @googleapis/api-firestore to the codeowner

* 🦉 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 
---
 .github/CODEOWNERS  | 6 +++---
 .repo-metadata.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3cb45a71056f..3f27438f2c5d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,9 +4,9 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/firestore-dpe is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/firestore-dpe
-**/*.java               @googleapis/firestore-dpe
+# The @googleapis/cloud-native-db-dpes @googleapis/api-firestore is the default owner for changes in this repo
+*                       @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-firestore
+**/*.java               @googleapis/cloud-native-db-dpes @googleapis/api-firestore
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 72965ea86996..6e452200e920 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -9,7 +9,7 @@
   "repo": "googleapis/java-datastore",
   "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
-  "codeowner_team": "@googleapis/firestore-dpe",
+  "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-firestore",
   "api_id": "datastore.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.",

From 3ccbc7557476dedd531b82035251d2a98354c718 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 21 Mar 2022 15:16:51 -0400
Subject: [PATCH 0817/1784] feat: fix next release version (#689)


From 17d9bcb4ba4df865aef45153ec29de1de40875ab Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 24 Mar 2022 16:12:33 +0100
Subject: [PATCH 0818/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.11 (#691)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.10` -> `0.9.11` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.11/compatibility-slim/0.9.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.11/confidence-slim/0.9.10)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.11`](https://togithub.com/graalvm/native-build-tools/releases/0.9.11)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.10...0.9.11)

##### What's Changed

Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog).

-   Add issue templates by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/216](https://togithub.com/graalvm/native-build-tools/pull/216)
-   Fix [@​arg](https://togithub.com/arg) file not being used for tests in Maven by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/212](https://togithub.com/graalvm/native-build-tools/pull/212)
-   Make it possible to use environment variables in native tests by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/217](https://togithub.com/graalvm/native-build-tools/pull/217)
-   Fix incorrect declaration of output directory by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/219](https://togithub.com/graalvm/native-build-tools/pull/219)
-   Refactor build by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/220](https://togithub.com/graalvm/native-build-tools/pull/220)
-   Integrate native configuration repository with Gradle by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/204](https://togithub.com/graalvm/native-build-tools/pull/204)
-   Rework argfile generation by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/223](https://togithub.com/graalvm/native-build-tools/pull/223)
-   Rename `metadataRepository` and document feature by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/225](https://togithub.com/graalvm/native-build-tools/pull/225)
-   Support applications with custom packaging types by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://github.com/graalvm/native-build-tools/pull/226](https://togithub.com/graalvm/native-build-tools/pull/226)

##### New Contributors

-   [@​alvarosanchez](https://togithub.com/alvarosanchez) made their first contribution in [https://github.com/graalvm/native-build-tools/pull/226](https://togithub.com/graalvm/native-build-tools/pull/226)

**Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.10...0.9.11


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 f0a62450db6e..543335ead477 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -91,7 +91,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.10
+          0.9.11
           test
         
       

From 4c4961404aabba6cc183e6a133f112449db2bb77 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 24 Mar 2022 16:14:17 +0100
Subject: [PATCH 0819/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.11 (#692)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.10` -> `0.9.11` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.11/compatibility-slim/0.9.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.11/confidence-slim/0.9.10)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.11`](https://togithub.com/graalvm/native-build-tools/releases/0.9.11)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.10...0.9.11)

##### What's Changed

Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog).

-   Add issue templates by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/216](https://togithub.com/graalvm/native-build-tools/pull/216)
-   Fix [@​arg](https://togithub.com/arg) file not being used for tests in Maven by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/212](https://togithub.com/graalvm/native-build-tools/pull/212)
-   Make it possible to use environment variables in native tests by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/217](https://togithub.com/graalvm/native-build-tools/pull/217)
-   Fix incorrect declaration of output directory by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/219](https://togithub.com/graalvm/native-build-tools/pull/219)
-   Refactor build by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/220](https://togithub.com/graalvm/native-build-tools/pull/220)
-   Integrate native configuration repository with Gradle by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/204](https://togithub.com/graalvm/native-build-tools/pull/204)
-   Rework argfile generation by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/223](https://togithub.com/graalvm/native-build-tools/pull/223)
-   Rename `metadataRepository` and document feature by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/225](https://togithub.com/graalvm/native-build-tools/pull/225)
-   Support applications with custom packaging types by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://github.com/graalvm/native-build-tools/pull/226](https://togithub.com/graalvm/native-build-tools/pull/226)

##### New Contributors

-   [@​alvarosanchez](https://togithub.com/alvarosanchez) made their first contribution in [https://github.com/graalvm/native-build-tools/pull/226](https://togithub.com/graalvm/native-build-tools/pull/226)

**Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.10...0.9.11


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 543335ead477..0f44ca5beef4 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -112,7 +112,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.10
+            0.9.11
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 875b6615dc7c09a8e0db83d9ccf18b881a39bad2 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 29 Mar 2022 15:53:12 +0200
Subject: [PATCH 0820/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.9.0 (#695)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 30f48de2972a..4349bb94e7aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.8.0
+        2.9.0
         pom
         import
       

From 5e986815471cb3350673f7a5e669d3cd09bf1a8a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 29 Mar 2022 16:00:17 +0200
Subject: [PATCH 0821/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.12.11 (#694)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.10` -> `0.12.11` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/compatibility-slim/0.12.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/confidence-slim/0.12.10)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 0f44ca5beef4..fc84c1b2987f 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.10
+          0.12.11
         
         
           org.junit.vintage

From edddf56ea0546fa19eb0dd7d963b96fffa05dc8f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 29 Mar 2022 19:04:17 +0200
Subject: [PATCH 0822/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.3.2 (#693)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.3.0` -> `1.3.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.2/compatibility-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.3.2/confidence-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.3.2`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​132-httpsgithubcomgoogleapisjava-shared-configcomparev131v132-2022-03-28)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.3.1...v1.3.2)

### [`v1.3.1`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​131-httpsgithubcomgoogleapisjava-shared-configcomparev130v131-2022-03-25)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.3.0...v1.3.1)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 2fa021f8d92b..7164d4e257e3 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.3.0
+    1.3.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 4349bb94e7aa..e864cc32ca8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.3.0
+    1.3.2
   
 
   

From ab939f541a6d28867b73f251171d9c243d60c8a5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 09:27:23 -0400
Subject: [PATCH 0823/1784] chore(main): release 2.3.0 (#687)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                            | 20 ++++++++++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  8 ++++----
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7a42555c370..585b6ccaf471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [2.3.0](https://github.com/googleapis/java-datastore/compare/v2.2.9...v2.3.0) (2022-03-29)
+
+
+### Features
+
+* fix next release version ([#689](https://github.com/googleapis/java-datastore/issues/689)) ([3ccbc75](https://github.com/googleapis/java-datastore/commit/3ccbc7557476dedd531b82035251d2a98354c718))
+
+
+### Documentation
+
+* update doc link ([#685](https://github.com/googleapis/java-datastore/issues/685)) ([91807b9](https://github.com/googleapis/java-datastore/commit/91807b92fa1f410cec6184f2b2dd1c300666878c))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.9.0 ([#695](https://github.com/googleapis/java-datastore/issues/695)) ([875b661](https://github.com/googleapis/java-datastore/commit/875b6615dc7c09a8e0db83d9ccf18b881a39bad2))
+* update dependency com.google.cloud:native-image-support to v0.12.11 ([#694](https://github.com/googleapis/java-datastore/issues/694)) ([5e98681](https://github.com/googleapis/java-datastore/commit/5e986815471cb3350673f7a5e669d3cd09bf1a8a))
+* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.11 ([#691](https://github.com/googleapis/java-datastore/issues/691)) ([17d9bcb](https://github.com/googleapis/java-datastore/commit/17d9bcb4ba4df865aef45153ec29de1de40875ab))
+* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.11 ([#692](https://github.com/googleapis/java-datastore/issues/692)) ([4c49614](https://github.com/googleapis/java-datastore/commit/4c4961404aabba6cc183e6a133f112449db2bb77))
+
 ### [2.2.9](https://github.com/googleapis/java-datastore/compare/v2.2.8...v2.2.9) (2022-03-14)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 9ead4b24d3f1..2dd583af36af 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.2.10-SNAPSHOT
+  2.3.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.10-SNAPSHOT
+    2.3.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7164d4e257e3..3db201484e54 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.2.10-SNAPSHOT
+  2.3.0
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.10-SNAPSHOT
+        2.3.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.10-SNAPSHOT
+        0.94.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6e311c22439d..85547a52b5c1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.2.10-SNAPSHOT
+  2.3.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.10-SNAPSHOT
+    2.3.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index e864cc32ca8d..69acf5655cdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.2.10-SNAPSHOT
+  2.3.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.2.10-SNAPSHOT
+        2.3.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.93.10-SNAPSHOT
+        0.94.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.2.10-SNAPSHOT
+        2.3.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 827dde5aa4ab..0866b496cac1 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.93.10-SNAPSHOT
+  0.94.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.2.10-SNAPSHOT
+    2.3.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 1fcb253d63f3..308d3dfc8fac 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.2.9:2.2.10-SNAPSHOT
-google-cloud-datastore-bom:2.2.9:2.2.10-SNAPSHOT
-proto-google-cloud-datastore-v1:0.93.9:0.93.10-SNAPSHOT
-datastore-v1-proto-client:2.2.9:2.2.10-SNAPSHOT
+google-cloud-datastore:2.3.0:2.3.0
+google-cloud-datastore-bom:2.3.0:2.3.0
+proto-google-cloud-datastore-v1:0.94.0:0.94.0
+datastore-v1-proto-client:2.3.0:2.3.0

From 4084af9adb57be702e006301379d6c2d6ed2ed34 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 13:34:12 +0000
Subject: [PATCH 0824/1784] chore(main): release 2.3.1-SNAPSHOT (#696)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2dd583af36af..ef2b68ca7c04 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.3.0
+  2.3.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.0
+    2.3.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3db201484e54..662db986bdff 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.3.0
+  2.3.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.0
+        2.3.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.0
+        0.94.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 85547a52b5c1..c646b8e7e7a2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.3.0
+  2.3.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.0
+    2.3.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 69acf5655cdd..e98ac10ed823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.3.0
+  2.3.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.0
+        2.3.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.0
+        0.94.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.3.0
+        2.3.1-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0866b496cac1..4e934a82a1b5 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.94.0
+  0.94.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.0
+    2.3.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 308d3dfc8fac..cbc72c4a7bf0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.3.0:2.3.0
-google-cloud-datastore-bom:2.3.0:2.3.0
-proto-google-cloud-datastore-v1:0.94.0:0.94.0
-datastore-v1-proto-client:2.3.0:2.3.0
+google-cloud-datastore:2.3.0:2.3.1-SNAPSHOT
+google-cloud-datastore-bom:2.3.0:2.3.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.94.0:0.94.1-SNAPSHOT
+datastore-v1-proto-client:2.3.0:2.3.1-SNAPSHOT

From b01f11c8ed815b36ef27962bd280ab42e1718d81 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 1 Apr 2022 18:36:18 +0200
Subject: [PATCH 0825/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.3.0 (#697)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.9` -> `2.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.0/compatibility-slim/2.2.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.0/confidence-slim/2.2.9)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.3.0`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​230-httpsgithubcomgoogleapisjava-datastorecomparev229v230-2022-03-29)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.9...v2.3.0)

##### Features

-   fix next release version ([#​689](https://togithub.com/googleapis/java-datastore/issues/689)) ([3ccbc75](https://togithub.com/googleapis/java-datastore/commit/3ccbc7557476dedd531b82035251d2a98354c718))

##### Documentation

-   update doc link ([#​685](https://togithub.com/googleapis/java-datastore/issues/685)) ([91807b9](https://togithub.com/googleapis/java-datastore/commit/91807b92fa1f410cec6184f2b2dd1c300666878c))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.9.0 ([#​695](https://togithub.com/googleapis/java-datastore/issues/695)) ([875b661](https://togithub.com/googleapis/java-datastore/commit/875b6615dc7c09a8e0db83d9ccf18b881a39bad2))
-   update dependency com.google.cloud:native-image-support to v0.12.11 ([#​694](https://togithub.com/googleapis/java-datastore/issues/694)) ([5e98681](https://togithub.com/googleapis/java-datastore/commit/5e986815471cb3350673f7a5e669d3cd09bf1a8a))
-   update dependency org.graalvm.buildtools:junit-platform-native to v0.9.11 ([#​691](https://togithub.com/googleapis/java-datastore/issues/691)) ([17d9bcb](https://togithub.com/googleapis/java-datastore/commit/17d9bcb4ba4df865aef45153ec29de1de40875ab))
-   update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.11 ([#​692](https://togithub.com/googleapis/java-datastore/issues/692)) ([4c49614](https://togithub.com/googleapis/java-datastore/commit/4c4961404aabba6cc183e6a133f112449db2bb77))

##### [2.2.9](https://togithub.com/googleapis/java-datastore/compare/v2.2.8...v2.2.9) (2022-03-14)

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.10 ([#​679](https://togithub.com/googleapis/java-datastore/issues/679)) ([0f8afd7](https://togithub.com/googleapis/java-datastore/commit/0f8afd7409955efb89b481218861fa9ee531de89))

##### [2.2.8](https://togithub.com/googleapis/java-datastore/compare/v2.2.7...v2.2.8) (2022-03-10)

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.9 ([#​671](https://togithub.com/googleapis/java-datastore/issues/671)) ([4338c40](https://togithub.com/googleapis/java-datastore/commit/4338c4008c5e5bf7522713b45d13950f1a881ee7))
-   update dependency com.google.errorprone:error_prone_core to v2.11.0 ([#​673](https://togithub.com/googleapis/java-datastore/issues/673)) ([0888bac](https://togithub.com/googleapis/java-datastore/commit/0888bac22704f5b2befd170267be28454f5ee059))

##### [2.2.7](https://togithub.com/googleapis/java-datastore/compare/v2.2.6...v2.2.7) (2022-03-09)

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.8 ([#​668](https://togithub.com/googleapis/java-datastore/issues/668)) ([917a3fe](https://togithub.com/googleapis/java-datastore/commit/917a3fe427a697816790be131a113d6962667458))

##### [2.2.6](https://togithub.com/googleapis/java-datastore/compare/v2.2.5...v2.2.6) (2022-03-08)

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.7 ([#​661](https://togithub.com/googleapis/java-datastore/issues/661)) ([11634df](https://togithub.com/googleapis/java-datastore/commit/11634dfd6e536cb0e37ef5bb91435cc54614c8f6))

##### [2.2.5](https://togithub.com/googleapis/java-datastore/compare/v2.2.4...v2.2.5) (2022-03-02)

##### Bug Fixes

-   Use ImmutableMap.Bulder.buildOrThrow() instead of build(). ([#​632](https://togithub.com/googleapis/java-datastore/issues/632)) ([5d0f484](https://togithub.com/googleapis/java-datastore/commit/5d0f48403f6746bb7901b13aa223e4de31c3c5a4))

##### Documentation

-   **sample:** Add sample for native image support in Datastore ([#​640](https://togithub.com/googleapis/java-datastore/issues/640)) ([f728901](https://togithub.com/googleapis/java-datastore/commit/f728901b4984f1cc79a02ecc2ff631322974d761))
-   **sample:** Use Java 8 for Native Image sample ([#​656](https://togithub.com/googleapis/java-datastore/issues/656)) ([b95ee96](https://togithub.com/googleapis/java-datastore/commit/b95ee9635173617cd13605928b306974c70423e8))

##### Dependencies

-   update actions/setup-java action to v3 ([#​648](https://togithub.com/googleapis/java-datastore/issues/648)) ([8d85b64](https://togithub.com/googleapis/java-datastore/commit/8d85b64faa72265851e92562f5381ace1088c066))
-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#​653](https://togithub.com/googleapis/java-datastore/issues/653)) ([03162a6](https://togithub.com/googleapis/java-datastore/commit/03162a69c01c5cddc524b99325900196aa26cd0d))
-   update dependency com.google.cloud:native-image-support to v0.12.5 ([#​650](https://togithub.com/googleapis/java-datastore/issues/650)) ([b449554](https://togithub.com/googleapis/java-datastore/commit/b4495542bb086e7e169fea10795342e78aac2e1e))
-   update dependency com.google.cloud:native-image-support to v0.12.6 ([#​654](https://togithub.com/googleapis/java-datastore/issues/654)) ([5e69833](https://togithub.com/googleapis/java-datastore/commit/5e69833713421d7deee2f4cf2f50a725270c36e0))
-   update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#​646](https://togithub.com/googleapis/java-datastore/issues/646)) ([c62a390](https://togithub.com/googleapis/java-datastore/commit/c62a39074a44e58222115b05f14e3ffdd52273c0))
-   update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#​647](https://togithub.com/googleapis/java-datastore/issues/647)) ([d6e2a16](https://togithub.com/googleapis/java-datastore/commit/d6e2a16fe2e6dfd07892ff6928118a4a031de9f2))

##### [2.2.4](https://togithub.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4) (2022-02-03)

##### Dependencies

-   **java:** update actions/github-script action to v5 ([#​626](https://togithub.com/googleapis/java-datastore/issues/626)) ([7ddb377](https://togithub.com/googleapis/java-datastore/commit/7ddb3779271338b9ff01df91ac446450eba45ba8))

##### [2.2.3](https://togithub.com/googleapis/java-datastore/compare/v2.2.2...v2.2.3) (2022-02-01)

##### Dependencies

-   update dependency org.easymock:easymock to v4 ([#​614](https://togithub.com/googleapis/java-datastore/issues/614)) ([a24215c](https://togithub.com/googleapis/java-datastore/commit/a24215c650c8cb2eb20bbc99f0ccc4c2fd91ac9a))
-   update shared dependencies to 2.7.0 and remove google-oauth-client from dependency management ([#​629](https://togithub.com/googleapis/java-datastore/issues/629)) ([298e0b0](https://togithub.com/googleapis/java-datastore/commit/298e0b0651355649629888dcbacafc2970df4167))

##### [2.2.2](https://www.github.com/googleapis/java-datastore/compare/v2.2.1...v2.2.2) (2022-01-07)

##### Bug Fixes

-   **java:** add -ntp flag to native image testing command ([#​593](https://www.togithub.com/googleapis/java-datastore/issues/593)) ([9b6496e](https://www.github.com/googleapis/java-datastore/commit/9b6496e92cb48ca1bfc0b1a733d564466f28deca))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.6.0 ([#​607](https://www.togithub.com/googleapis/java-datastore/issues/607)) ([095fd5d](https://www.github.com/googleapis/java-datastore/commit/095fd5dbe470083d37b561b615952e39f46544c3))

##### [2.2.1](https://www.github.com/googleapis/java-datastore/compare/v2.2.0...v2.2.1) (2021-12-03)

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#​586](https://www.togithub.com/googleapis/java-datastore/issues/586)) ([c1d1b91](https://www.github.com/googleapis/java-datastore/commit/c1d1b91e0a74e97177ab0874ede975da9bad4368))


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 69ac3fa6df0d..05f78e6c57d0 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.2.9
+  2.3.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.2.9'
+implementation 'com.google.cloud:google-cloud-datastore:2.3.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.9"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.3.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4a7fff2a5cb5..e2da5dad5963 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.2.9
+      2.3.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fa77f55fb047..3d350f63fa0d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.2.9
+      2.3.0
     
 
     

From d49fd593bbc941660bdb30174422663378f2da22 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 1 Apr 2022 18:44:17 +0200
Subject: [PATCH 0826/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v25.1.0 (#698)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java)) | `25.0.0` -> `25.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.1.0/compatibility-slim/25.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.1.0/confidence-slim/25.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 05f78e6c57d0..4415ef55e4f4 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      25.0.0
+      25.1.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:25.0.0')
+implementation platform('com.google.cloud:libraries-bom:25.1.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index fc84c1b2987f..eccbe8ce8c4e 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        25.0.0
+        25.1.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 920da67a9c73..27949d2eaf78 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        25.0.0
+        25.1.0
         pom
         import
       

From b2803ea19beab451a52c88dea0779ac463f29d44 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 7 Apr 2022 18:06:31 +0200
Subject: [PATCH 0827/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.12.1 (#701)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.11.0` -> `2.12.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.12.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.12.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.12.1/compatibility-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.12.1/confidence-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone

### [`v2.12.1`](https://togithub.com/google/error-prone/releases/v2.12.1)

[Compare Source](https://togithub.com/google/error-prone/compare/v2.12.0...v2.12.1)

-   This release adds an infrastructure optimization to `AppliedFix` source code processing.

-   [Release Diff: v2.12.0...v2.12.1](https://togithub.com/google/error-prone/compare/v2.12.0...v2.12.1).

### [`v2.12.0`](https://togithub.com/google/error-prone/releases/v2.12.0)

[Compare Source](https://togithub.com/google/error-prone/compare/v2.11.0...v2.12.0)

New checks

-   [`BoxedPrimitiveEquality`](http://errorprone.info/bugpattern/BoxedPrimitiveEquality)
-   [`DoubleBraceInitialization`](http://errorprone.info/bugpattern/DoubleBraceInitialization)
-   [`IgnoredPureGetter`](http://errorprone.info/bugpattern/IgnoredPureGetter)
-   [`LockOnBoxedPrimitive`](http://errorprone.info/bugpattern/LockOnBoxedPrimitive)
-   [`IncorrectMainMethod`](http://errorprone.info/bugpattern/IncorrectMainMethod)
-   [`LongDoubleConversion`](http://errorprone.info/bugpattern/LongDoubleConversion)
-   [`RobolectricShadowDirectlyOn`](http://errorprone.info/bugpattern/RobolectricShadowDirectlyOn)
-   [`StaticAssignmentOfThrowable`](http://errorprone.info/bugpattern/StaticAssignmentOfThrowable)
-   [`UnnecessaryLongToIntConversion`](http://errorprone.info/bugpattern/UnnecessaryLongToIntConversion)
-   [`Varifier`](http://errorprone.info/bugpattern/Varifier)

Fixed issues: [#​58](https://togithub.com/google/error-prone/issues/58), [#​65](https://togithub.com/google/error-prone/issues/65), [#​1327](https://togithub.com/google/error-prone/issues/1327), [#​1654](https://togithub.com/google/error-prone/issues/1654), [#​2858](https://togithub.com/google/error-prone/issues/2858), [#​2867](https://togithub.com/google/error-prone/issues/2867), [#​2916](https://togithub.com/google/error-prone/issues/2916), [#​2951](https://togithub.com/google/error-prone/issues/2951), [#​2954](https://togithub.com/google/error-prone/issues/2954), [#​3006](https://togithub.com/google/error-prone/issues/3006), [#​3008](https://togithub.com/google/error-prone/issues/3008)

**Full Changelog**: https://github.com/google/error-prone/compare/v2.11.0...v2.12.0


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 e98ac10ed823..1af2d062faca 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.11.0
+    2.12.1
       
 
   

From e3363f78d2d0a22117223680f9da0b2014338f98 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 7 Apr 2022 16:14:19 +0000
Subject: [PATCH 0828/1784] chore(main): release 2.3.1 (#703)

:robot: I have created a release *beep* *boop*
---


### [2.3.1](https://github.com/googleapis/java-datastore/compare/v2.3.0...v2.3.1) (2022-04-07)


### Dependencies

* update dependency com.google.errorprone:error_prone_core to v2.12.1 ([#701](https://github.com/googleapis/java-datastore/issues/701)) ([b2803ea](https://github.com/googleapis/java-datastore/commit/b2803ea19beab451a52c88dea0779ac463f29d44))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 585b6ccaf471..b6a70357f025 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.3.1](https://github.com/googleapis/java-datastore/compare/v2.3.0...v2.3.1) (2022-04-07)
+
+
+### Dependencies
+
+* update dependency com.google.errorprone:error_prone_core to v2.12.1 ([#701](https://github.com/googleapis/java-datastore/issues/701)) ([b2803ea](https://github.com/googleapis/java-datastore/commit/b2803ea19beab451a52c88dea0779ac463f29d44))
+
 ## [2.3.0](https://github.com/googleapis/java-datastore/compare/v2.2.9...v2.3.0) (2022-03-29)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ef2b68ca7c04..5005f45bb105 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.3.1-SNAPSHOT
+  2.3.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.1-SNAPSHOT
+    2.3.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 662db986bdff..5c076dfcbd8f 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.3.1-SNAPSHOT
+  2.3.1
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.1-SNAPSHOT
+        2.3.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.1-SNAPSHOT
+        0.94.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c646b8e7e7a2..71ee30a90e40 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.3.1-SNAPSHOT
+  2.3.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.1-SNAPSHOT
+    2.3.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 1af2d062faca..6efb34ee54fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.3.1-SNAPSHOT
+  2.3.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.1-SNAPSHOT
+        2.3.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.1-SNAPSHOT
+        0.94.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.3.1-SNAPSHOT
+        2.3.1
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4e934a82a1b5..e8623e2b687c 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.94.1-SNAPSHOT
+  0.94.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.1-SNAPSHOT
+    2.3.1
   
   
     
diff --git a/versions.txt b/versions.txt
index cbc72c4a7bf0..4849292fcdb9 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.3.0:2.3.1-SNAPSHOT
-google-cloud-datastore-bom:2.3.0:2.3.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.94.0:0.94.1-SNAPSHOT
-datastore-v1-proto-client:2.3.0:2.3.1-SNAPSHOT
+google-cloud-datastore:2.3.1:2.3.1
+google-cloud-datastore-bom:2.3.1:2.3.1
+proto-google-cloud-datastore-v1:0.94.1:0.94.1
+datastore-v1-proto-client:2.3.1:2.3.1

From 7f7c5e78634f153146015614ffed41a5d64436ef Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 7 Apr 2022 16:50:23 +0000
Subject: [PATCH 0829/1784] chore(main): release 2.3.2-SNAPSHOT (#704)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 5005f45bb105..e52e137a2a62 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.3.1
+  2.3.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.1
+    2.3.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5c076dfcbd8f..8b1fe37d6211 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.3.1
+  2.3.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.1
+        2.3.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.1
+        0.94.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 71ee30a90e40..f8e5391820ac 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.3.1
+  2.3.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.1
+    2.3.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 6efb34ee54fd..5fa064d0ff1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.3.1
+  2.3.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.1
+        2.3.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.1
+        0.94.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.3.1
+        2.3.2-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e8623e2b687c..d0bbc91b3933 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.94.1
+  0.94.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.1
+    2.3.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 4849292fcdb9..58719a4afec8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.3.1:2.3.1
-google-cloud-datastore-bom:2.3.1:2.3.1
-proto-google-cloud-datastore-v1:0.94.1:0.94.1
-datastore-v1-proto-client:2.3.1:2.3.1
+google-cloud-datastore:2.3.1:2.3.2-SNAPSHOT
+google-cloud-datastore-bom:2.3.1:2.3.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.94.1:0.94.2-SNAPSHOT
+datastore-v1-proto-client:2.3.1:2.3.2-SNAPSHOT

From a8f46a96890ab0a84bfc6aa39841debd716e2c72 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 11 Apr 2022 16:14:29 +0200
Subject: [PATCH 0830/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.3.1 (#705)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.3.0` -> `2.3.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.1/compatibility-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.3.1/confidence-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.3.1`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​231-httpsgithubcomgoogleapisjava-datastorecomparev230v231-2022-04-07)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.3.0...v2.3.1)


    

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4415ef55e4f4..4bc79495a1e9 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.3.0
+  2.3.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.3.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.3.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.3.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.3.1"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e2da5dad5963..b24840396cfd 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.3.0
+      2.3.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3d350f63fa0d..8a0207d5033b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.3.0
+      2.3.1
     
 
     

From e11bd20fb99a3d671b09e1b46247fdfd11927fbe Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Apr 2022 19:56:19 +0000
Subject: [PATCH 0831/1784] feat: expose new read_time API fields, currently
 only available in private preview (#706)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 440914241

Source-Link: https://github.com/googleapis/googleapis/commit/0ed730f27474890a727a72bdc85e6d20715e2f87

Source-Link: https://github.com/googleapis/googleapis-gen/commit/b2e5ae97fd24f64af0fef1999dad14945fdc3663
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjJlNWFlOTdmZDI0ZjY0YWYwZmVmMTk5OWRhZDE0OTQ1ZmRjMzY2MyJ9
---
 .../clirr-ignored-differences.xml             |  12 +-
 .../google/datastore/v1/CommitResponse.java   | 272 +++++++++++++
 .../datastore/v1/CommitResponseOrBuilder.java |  35 ++
 .../google/datastore/v1/DatastoreProto.java   | 167 ++++----
 .../com/google/datastore/v1/EntityResult.java | 308 +++++++++++++++
 .../datastore/v1/EntityResultOrBuilder.java   |  44 +++
 .../google/datastore/v1/LookupResponse.java   | 268 +++++++++++++
 .../datastore/v1/LookupResponseOrBuilder.java |  35 ++
 .../com/google/datastore/v1/Mutation.java     | 329 ++++++++++++++++
 .../datastore/v1/MutationOrBuilder.java       |  41 ++
 .../google/datastore/v1/MutationResult.java   | 308 +++++++++++++++
 .../datastore/v1/MutationResultOrBuilder.java |  44 +++
 .../com/google/datastore/v1/QueryProto.java   | 145 +++----
 .../google/datastore/v1/QueryResultBatch.java | 364 ++++++++++++++++++
 .../v1/QueryResultBatchOrBuilder.java         |  59 +++
 .../com/google/datastore/v1/ReadOptions.java  | 328 ++++++++++++++++
 .../datastore/v1/ReadOptionsOrBuilder.java    |  41 ++
 .../datastore/v1/TransactionOptions.java      | 321 ++++++++++++++-
 .../proto/google/datastore/v1/datastore.proto |  27 +-
 .../proto/google/datastore/v1/query.proto     |  19 +
 20 files changed, 3018 insertions(+), 149 deletions(-)

diff --git a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
index 433c9d79c9e3..e59f11f80a9f 100644
--- a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
@@ -6,4 +6,14 @@
     com/google/datastore/v1/*OrBuilder
     * has*(*)
   
-
\ No newline at end of file
+   
+    7012
+    com/google/datastore/v1/*OrBuilder
+    * get*(*)
+  
+   
+    7012
+    com/google/datastore/v1/*OrBuilder
+    boolean contains*(*)
+  
+
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 781a479b88d7..a19cec86379f 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
@@ -86,6 +86,21 @@ private CommitResponse(
           case 32:
             {
               indexUpdates_ = input.readInt32();
+              break;
+            }
+          case 66:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (commitTime_ != null) {
+                subBuilder = commitTime_.toBuilder();
+              }
+              commitTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(commitTime_);
+                commitTime_ = subBuilder.buildPartial();
+              }
+
               break;
             }
           default:
@@ -218,6 +233,52 @@ public int getIndexUpdates() {
     return indexUpdates_;
   }
 
+  public static final int COMMIT_TIME_FIELD_NUMBER = 8;
+  private com.google.protobuf.Timestamp commitTime_;
+  /**
+   *
+   *
+   * 
    +   * The transaction commit timestamp. Not set for non-transactional commits.
+   * 
    
+   *
+   * .google.protobuf.Timestamp commit_time = 8;
+   *
+   * @return Whether the commitTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasCommitTime() {
+    return commitTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The transaction commit timestamp. Not set for non-transactional commits.
+   * 
    
+   *
+   * .google.protobuf.Timestamp commit_time = 8;
+   *
+   * @return The commitTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getCommitTime() {
+    return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The transaction commit timestamp. Not set for non-transactional commits.
+   * 
    
+   *
+   * .google.protobuf.Timestamp commit_time = 8;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
+    return getCommitTime();
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -238,6 +299,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (indexUpdates_ != 0) {
       output.writeInt32(4, indexUpdates_);
     }
+    if (commitTime_ != null) {
+      output.writeMessage(8, getCommitTime());
+    }
     unknownFields.writeTo(output);
   }
 
@@ -253,6 +317,9 @@ public int getSerializedSize() {
     if (indexUpdates_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, indexUpdates_);
     }
+    if (commitTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCommitTime());
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -270,6 +337,10 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getMutationResultsList().equals(other.getMutationResultsList())) return false;
     if (getIndexUpdates() != other.getIndexUpdates()) return false;
+    if (hasCommitTime() != other.hasCommitTime()) return false;
+    if (hasCommitTime()) {
+      if (!getCommitTime().equals(other.getCommitTime())) return false;
+    }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -287,6 +358,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + INDEX_UPDATES_FIELD_NUMBER;
     hash = (53 * hash) + getIndexUpdates();
+    if (hasCommitTime()) {
+      hash = (37 * hash) + COMMIT_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCommitTime().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -442,6 +517,12 @@ public Builder clear() {
       }
       indexUpdates_ = 0;
 
+      if (commitTimeBuilder_ == null) {
+        commitTime_ = null;
+      } else {
+        commitTime_ = null;
+        commitTimeBuilder_ = null;
+      }
       return this;
     }
 
@@ -480,6 +561,11 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
         result.mutationResults_ = mutationResultsBuilder_.build();
       }
       result.indexUpdates_ = indexUpdates_;
+      if (commitTimeBuilder_ == null) {
+        result.commitTime_ = commitTime_;
+      } else {
+        result.commitTime_ = commitTimeBuilder_.build();
+      }
       onBuilt();
       return result;
     }
@@ -559,6 +645,9 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) {
       if (other.getIndexUpdates() != 0) {
         setIndexUpdates(other.getIndexUpdates());
       }
+      if (other.hasCommitTime()) {
+        mergeCommitTime(other.getCommitTime());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1017,6 +1106,189 @@ public Builder clearIndexUpdates() {
       return this;
     }
 
+    private com.google.protobuf.Timestamp commitTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        commitTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     *
+     * @return Whether the commitTime field is set.
+     */
+    public boolean hasCommitTime() {
+      return commitTimeBuilder_ != null || commitTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     *
+     * @return The commitTime.
+     */
+    public com.google.protobuf.Timestamp getCommitTime() {
+      if (commitTimeBuilder_ == null) {
+        return commitTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : commitTime_;
+      } else {
+        return commitTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     */
+    public Builder setCommitTime(com.google.protobuf.Timestamp value) {
+      if (commitTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        commitTime_ = value;
+        onChanged();
+      } else {
+        commitTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     */
+    public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (commitTimeBuilder_ == null) {
+        commitTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        commitTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     */
+    public Builder mergeCommitTime(com.google.protobuf.Timestamp value) {
+      if (commitTimeBuilder_ == null) {
+        if (commitTime_ != null) {
+          commitTime_ =
+              com.google.protobuf.Timestamp.newBuilder(commitTime_).mergeFrom(value).buildPartial();
+        } else {
+          commitTime_ = value;
+        }
+        onChanged();
+      } else {
+        commitTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     */
+    public Builder clearCommitTime() {
+      if (commitTimeBuilder_ == null) {
+        commitTime_ = null;
+        onChanged();
+      } else {
+        commitTime_ = null;
+        commitTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     */
+    public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() {
+
+      onChanged();
+      return getCommitTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     */
+    public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
+      if (commitTimeBuilder_ != null) {
+        return commitTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return commitTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : commitTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The transaction commit timestamp. Not set for non-transactional commits.
+     * 
    
+     *
+     * .google.protobuf.Timestamp commit_time = 8;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getCommitTimeFieldBuilder() {
+      if (commitTimeBuilder_ == null) {
+        commitTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getCommitTime(), getParentForChildren(), isClean());
+        commitTime_ = null;
+      }
+      return commitTimeBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 9a6f308c7cbf..9b1681cfa5c2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -93,4 +93,39 @@ public interface CommitResponseOrBuilder
    * @return The indexUpdates.
    */
   int getIndexUpdates();
+
+  /**
+   *
+   *
+   * 
    +   * The transaction commit timestamp. Not set for non-transactional commits.
+   * 
    
+   *
+   * .google.protobuf.Timestamp commit_time = 8;
+   *
+   * @return Whether the commitTime field is set.
+   */
+  boolean hasCommitTime();
+  /**
+   *
+   *
+   * 
    +   * The transaction commit timestamp. Not set for non-transactional commits.
+   * 
    
+   *
+   * .google.protobuf.Timestamp commit_time = 8;
+   *
+   * @return The commitTime.
+   */
+  com.google.protobuf.Timestamp getCommitTime();
+  /**
+   *
+   *
+   * 
    +   * The transaction commit timestamp. Not set for non-transactional commits.
+   * 
    
+   *
+   * .google.protobuf.Timestamp commit_time = 8;
+   */
+  com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder();
 }
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 41b425c3a857..256f06c9a7d4 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
@@ -121,15 +121,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ns.proto\032\027google/api/client.proto\032\037googl"
           + "e/api/field_behavior.proto\032 google/datas"
           + "tore/v1/entity.proto\032\037google/datastore/v"
-          + "1/query.proto\"\215\001\n\rLookupRequest\022\027\n\nproje"
-          + "ct_id\030\010 \001(\tB\003\340A\002\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\"\242\001"
-          + "\n\016LookupResponse\0220\n\005found\030\001 \003(\0132!.google"
-          + ".datastore.v1.EntityResult\0222\n\007missing\030\002 "
-          + "\003(\0132!.google.datastore.v1.EntityResult\022*"
-          + "\n\010deferred\030\003 \003(\0132\030.google.datastore.v1.K"
-          + "ey\"\211\002\n\017RunQueryRequest\022\027\n\nproject_id\030\010 \001"
+          + "1/query.proto\032\037google/protobuf/timestamp"
+          + ".proto\"\215\001\n\rLookupRequest\022\027\n\nproject_id\030\010"
+          + " \001(\tB\003\340A\002\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\"\321\001\n\016Looku"
+          + "pResponse\0220\n\005found\030\001 \003(\0132!.google.datast"
+          + "ore.v1.EntityResult\0222\n\007missing\030\002 \003(\0132!.g"
+          + "oogle.datastore.v1.EntityResult\022*\n\010defer"
+          + "red\030\003 \003(\0132\030.google.datastore.v1.Key\022-\n\tr"
+          + "ead_time\030\007 \001(\0132\032.google.protobuf.Timesta"
+          + "mp\"\211\002\n\017RunQueryRequest\022\027\n\nproject_id\030\010 \001"
           + "(\tB\003\340A\002\0226\n\014partition_id\030\002 \001(\0132 .google.d"
           + "atastore.v1.PartitionId\0226\n\014read_options\030"
           + "\001 \001(\0132 .google.datastore.v1.ReadOptions\022"
@@ -151,75 +153,81 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "n\030\001 \001(\014H\000\0220\n\tmutations\030\006 \003(\0132\035.google.da"
           + "tastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_UNSP"
           + "ECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_TRAN"
-          + "SACTIONAL\020\002B\026\n\024transaction_selector\"f\n\016C"
-          + "ommitResponse\022=\n\020mutation_results\030\003 \003(\0132"
-          + "#.google.datastore.v1.MutationResult\022\025\n\r"
-          + "index_updates\030\004 \001(\005\"Z\n\022AllocateIdsReques"
-          + "t\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022+\n\004keys\030\001 \003(\013"
-          + "2\030.google.datastore.v1.KeyB\003\340A\002\"=\n\023Alloc"
-          + "ateIdsResponse\022&\n\004keys\030\001 \003(\0132\030.google.da"
-          + "tastore.v1.Key\"n\n\021ReserveIdsRequest\022\027\n\np"
-          + "roject_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.Ke"
-          + "yB\003\340A\002\"\024\n\022ReserveIdsResponse\"\207\002\n\010Mutatio"
-          + "n\022-\n\006insert\030\004 \001(\0132\033.google.datastore.v1."
-          + "EntityH\000\022-\n\006update\030\005 \001(\0132\033.google.datast"
-          + "ore.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google"
-          + ".datastore.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030"
-          + ".google.datastore.v1.KeyH\000\022\026\n\014base_versi"
-          + "on\030\010 \001(\003H\001B\013\n\toperationB\035\n\033conflict_dete"
-          + "ction_strategy\"c\n\016MutationResult\022%\n\003key\030"
-          + "\003 \001(\0132\030.google.datastore.v1.Key\022\017\n\007versi"
-          + "on\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001(\010\"\325\001\n\013"
-          + "ReadOptions\022L\n\020read_consistency\030\001 \001(\01620."
-          + "google.datastore.v1.ReadOptions.ReadCons"
-          + "istencyH\000\022\025\n\013transaction\030\002 \001(\014H\000\"M\n\017Read"
+          + "SACTIONAL\020\002B\026\n\024transaction_selector\"\227\001\n\016"
+          + "CommitResponse\022=\n\020mutation_results\030\003 \003(\013"
+          + "2#.google.datastore.v1.MutationResult\022\025\n"
+          + "\rindex_updates\030\004 \001(\005\022/\n\013commit_time\030\010 \001("
+          + "\0132\032.google.protobuf.Timestamp\"Z\n\022Allocat"
+          + "eIdsRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022+\n\004"
+          + "keys\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\021ReserveIdsRe"
+          + "quest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013databa"
+          + "se_id\030\t \001(\t\022+\n\004keys\030\001 \003(\0132\030.google.datas"
+          + "tore.v1.KeyB\003\340A\002\"\024\n\022ReserveIdsResponse\"\272"
+          + "\002\n\010Mutation\022-\n\006insert\030\004 \001(\0132\033.google.dat"
+          + "astore.v1.EntityH\000\022-\n\006update\030\005 \001(\0132\033.goo"
+          + "gle.datastore.v1.EntityH\000\022-\n\006upsert\030\006 \001("
+          + "\0132\033.google.datastore.v1.EntityH\000\022*\n\006dele"
+          + "te\030\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014"
+          + "base_version\030\010 \001(\003H\001\0221\n\013update_time\030\013 \001("
+          + "\0132\032.google.protobuf.TimestampH\001B\013\n\topera"
+          + "tionB\035\n\033conflict_detection_strategy\"\224\001\n\016"
+          + "MutationResult\022%\n\003key\030\003 \001(\0132\030.google.dat"
+          + "astore.v1.Key\022\017\n\007version\030\004 \001(\003\022/\n\013update"
+          + "_time\030\006 \001(\0132\032.google.protobuf.Timestamp\022"
+          + "\031\n\021conflict_detected\030\005 \001(\010\"\206\002\n\013ReadOptio"
+          + "ns\022L\n\020read_consistency\030\001 \001(\01620.google.da"
+          + "tastore.v1.ReadOptions.ReadConsistencyH\000"
+          + "\022\025\n\013transaction\030\002 \001(\014H\000\022/\n\tread_time\030\004 \001"
+          + "(\0132\032.google.protobuf.TimestampH\000\"M\n\017Read"
           + "Consistency\022 \n\034READ_CONSISTENCY_UNSPECIF"
           + "IED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consi"
-          + "stency_type\"\343\001\n\022TransactionOptions\022G\n\nre"
+          + "stency_type\"\222\002\n\022TransactionOptions\022G\n\nre"
           + "ad_write\030\001 \001(\01321.google.datastore.v1.Tra"
           + "nsactionOptions.ReadWriteH\000\022E\n\tread_only"
           + "\030\002 \001(\01320.google.datastore.v1.Transaction"
           + "Options.ReadOnlyH\000\032)\n\tReadWrite\022\034\n\024previ"
-          + "ous_transaction\030\001 \001(\014\032\n\n\010ReadOnlyB\006\n\004mod"
-          + "e2\223\n\n\tDatastore\022\235\001\n\006Lookup\022\".google.data"
-          + "store.v1.LookupRequest\032#.google.datastor"
-          + "e.v1.LookupResponse\"J\202\323\344\223\002%\" /v1/project"
-          + "s/{project_id}:lookup:\001*\332A\034project_id,re"
-          + "ad_options,keys\022\206\001\n\010RunQuery\022$.google.da"
-          + "tastore.v1.RunQueryRequest\032%.google.data"
-          + "store.v1.RunQueryResponse\"-\202\323\344\223\002\'\"\"/v1/p"
-          + "rojects/{project_id}:runQuery:\001*\022\263\001\n\020Beg"
-          + "inTransaction\022,.google.datastore.v1.Begi"
-          + "nTransactionRequest\032-.google.datastore.v"
-          + "1.BeginTransactionResponse\"B\202\323\344\223\002/\"*/v1/"
-          + "projects/{project_id}:beginTransaction:\001"
-          + "*\332A\nproject_id\022\302\001\n\006Commit\022\".google.datas"
-          + "tore.v1.CommitRequest\032#.google.datastore"
-          + ".v1.CommitResponse\"o\202\323\344\223\002%\" /v1/projects"
-          + "/{project_id}:commit:\001*\332A%project_id,mod"
-          + "e,transaction,mutations\332A\031project_id,mod"
-          + "e,mutations\022\237\001\n\010Rollback\022$.google.datast"
-          + "ore.v1.RollbackRequest\032%.google.datastor"
-          + "e.v1.RollbackResponse\"F\202\323\344\223\002\'\"\"/v1/proje"
-          + "cts/{project_id}:rollback:\001*\332A\026project_i"
-          + "d,transaction\022\244\001\n\013AllocateIds\022\'.google.d"
-          + "atastore.v1.AllocateIdsRequest\032(.google."
-          + "datastore.v1.AllocateIdsResponse\"B\202\323\344\223\002*"
-          + "\"%/v1/projects/{project_id}:allocateIds:"
-          + "\001*\332A\017project_id,keys\022\240\001\n\nReserveIds\022&.go"
-          + "ogle.datastore.v1.ReserveIdsRequest\032\'.go"
-          + "ogle.datastore.v1.ReserveIdsResponse\"A\202\323"
-          + "\344\223\002)\"$/v1/projects/{project_id}:reserveI"
-          + "ds:\001*\332A\017project_id,keys\032v\312A\030datastore.go"
-          + "ogleapis.com\322AXhttps://www.googleapis.co"
-          + "m/auth/cloud-platform,https://www.google"
-          + "apis.com/auth/datastoreB\300\001\n\027com.google.d"
-          + "atastore.v1B\016DatastoreProtoP\001Z
+   * The time at which the entity was last changed.
+   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+   * results.
+   * If this entity is missing, this field will not be set.
+   * 
    • 
+   *
+   * .google.protobuf.Timestamp update_time = 5;
+   *
+   * @return Whether the updateTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasUpdateTime() {
+    return updateTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was last changed.
+   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+   * results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 5;
+   *
+   * @return The updateTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getUpdateTime() {
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was last changed.
+   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+   * results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 5;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+    return getUpdateTime();
+  }
+
   public static final int CURSOR_FIELD_NUMBER = 3;
   private com.google.protobuf.ByteString cursor_;
   /**
@@ -424,6 +494,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (version_ != 0L) {
       output.writeInt64(4, version_);
     }
+    if (updateTime_ != null) {
+      output.writeMessage(5, getUpdateTime());
+    }
     unknownFields.writeTo(output);
   }
 
@@ -442,6 +515,9 @@ public int getSerializedSize() {
     if (version_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, version_);
     }
+    if (updateTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime());
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -462,6 +538,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getEntity().equals(other.getEntity())) return false;
     }
     if (getVersion() != other.getVersion()) return false;
+    if (hasUpdateTime() != other.hasUpdateTime()) return false;
+    if (hasUpdateTime()) {
+      if (!getUpdateTime().equals(other.getUpdateTime())) return false;
+    }
     if (!getCursor().equals(other.getCursor())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -480,6 +560,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
+    if (hasUpdateTime()) {
+      hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateTime().hashCode();
+    }
     hash = (37 * hash) + CURSOR_FIELD_NUMBER;
     hash = (53 * hash) + getCursor().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -634,6 +718,12 @@ public Builder clear() {
       }
       version_ = 0L;
 
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
       cursor_ = com.google.protobuf.ByteString.EMPTY;
 
       return this;
@@ -668,6 +758,11 @@ public com.google.datastore.v1.EntityResult buildPartial() {
         result.entity_ = entityBuilder_.build();
       }
       result.version_ = version_;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
+      }
       result.cursor_ = cursor_;
       onBuilt();
       return result;
@@ -724,6 +819,9 @@ public Builder mergeFrom(com.google.datastore.v1.EntityResult other) {
       if (other.getVersion() != 0L) {
         setVersion(other.getVersion());
       }
+      if (other.hasUpdateTime()) {
+        mergeUpdateTime(other.getUpdateTime());
+      }
       if (other.getCursor() != com.google.protobuf.ByteString.EMPTY) {
         setCursor(other.getCursor());
       }
@@ -1005,6 +1103,216 @@ public Builder clearVersion() {
       return this;
     }
 
+    private com.google.protobuf.Timestamp updateTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        updateTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     *
+     * @return Whether the updateTime field is set.
+     */
+    public boolean hasUpdateTime() {
+      return updateTimeBuilder_ != null || updateTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     *
+     * @return The updateTime.
+     */
+    public com.google.protobuf.Timestamp getUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        return updateTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : updateTime_;
+      } else {
+        return updateTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateTime_ = value;
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     */
+    public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        } else {
+          updateTime_ = value;
+        }
+        onChanged();
+      } else {
+        updateTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     */
+    public Builder clearUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     */
+    public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
+
+      onChanged();
+      return getUpdateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     */
+    public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+      if (updateTimeBuilder_ != null) {
+        return updateTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return updateTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : updateTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was last changed.
+     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+     * results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 5;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getUpdateTimeFieldBuilder() {
+      if (updateTimeBuilder_ == null) {
+        updateTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getUpdateTime(), getParentForChildren(), isClean());
+        updateTime_ = null;
+      }
+      return updateTimeBuilder_;
+    }
+
     private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
      *
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 9113fb739772..6be5b8e1adaa 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
@@ -77,6 +77,50 @@ public interface EntityResultOrBuilder
    */
   long getVersion();
 
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was last changed.
+   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+   * results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 5;
+   *
+   * @return Whether the updateTime field is set.
+   */
+  boolean hasUpdateTime();
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was last changed.
+   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+   * results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 5;
+   *
+   * @return The updateTime.
+   */
+  com.google.protobuf.Timestamp getUpdateTime();
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was last changed.
+   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+   * results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 5;
+   */
+  com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
+
   /**
    *
    *
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 20ae9687f747..23563a3c6461 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
@@ -105,6 +105,21 @@ private LookupResponse(
                   input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
               break;
             }
+          case 58:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (readTime_ != null) {
+                subBuilder = readTime_.toBuilder();
+              }
+              readTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(readTime_);
+                readTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
           default:
             {
               if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -384,6 +399,52 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
     return deferred_.get(index);
   }
 
+  public static final int READ_TIME_FIELD_NUMBER = 7;
+  private com.google.protobuf.Timestamp readTime_;
+  /**
+   *
+   *
+   * 
    +   * The time at which these entities were read or found missing.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 7;
+   *
+   * @return Whether the readTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasReadTime() {
+    return readTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time at which these entities were read or found missing.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 7;
+   *
+   * @return The readTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getReadTime() {
+    return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time at which these entities were read or found missing.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 7;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+    return getReadTime();
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -407,6 +468,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < deferred_.size(); i++) {
       output.writeMessage(3, deferred_.get(i));
     }
+    if (readTime_ != null) {
+      output.writeMessage(7, getReadTime());
+    }
     unknownFields.writeTo(output);
   }
 
@@ -425,6 +489,9 @@ public int getSerializedSize() {
     for (int i = 0; i < deferred_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, deferred_.get(i));
     }
+    if (readTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getReadTime());
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -443,6 +510,10 @@ public boolean equals(final java.lang.Object obj) {
     if (!getFoundList().equals(other.getFoundList())) return false;
     if (!getMissingList().equals(other.getMissingList())) return false;
     if (!getDeferredList().equals(other.getDeferredList())) return false;
+    if (hasReadTime() != other.hasReadTime()) return false;
+    if (hasReadTime()) {
+      if (!getReadTime().equals(other.getReadTime())) return false;
+    }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -466,6 +537,10 @@ public int hashCode() {
       hash = (37 * hash) + DEFERRED_FIELD_NUMBER;
       hash = (53 * hash) + getDeferredList().hashCode();
     }
+    if (hasReadTime()) {
+      hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getReadTime().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -633,6 +708,12 @@ public Builder clear() {
       } else {
         deferredBuilder_.clear();
       }
+      if (readTimeBuilder_ == null) {
+        readTime_ = null;
+      } else {
+        readTime_ = null;
+        readTimeBuilder_ = null;
+      }
       return this;
     }
 
@@ -688,6 +769,11 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
       } else {
         result.deferred_ = deferredBuilder_.build();
       }
+      if (readTimeBuilder_ == null) {
+        result.readTime_ = readTime_;
+      } else {
+        result.readTime_ = readTimeBuilder_.build();
+      }
       onBuilt();
       return result;
     }
@@ -818,6 +904,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
           }
         }
       }
+      if (other.hasReadTime()) {
+        mergeReadTime(other.getReadTime());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1998,6 +2087,185 @@ public java.util.List getDeferredBuilderLis
       return deferredBuilder_;
     }
 
+    private com.google.protobuf.Timestamp readTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        readTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     *
+     * @return Whether the readTime field is set.
+     */
+    public boolean hasReadTime() {
+      return readTimeBuilder_ != null || readTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     *
+     * @return The readTime.
+     */
+    public com.google.protobuf.Timestamp getReadTime() {
+      if (readTimeBuilder_ == null) {
+        return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+      } else {
+        return readTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        readTime_ = value;
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (readTimeBuilder_ == null) {
+        readTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     */
+    public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (readTime_ != null) {
+          readTime_ =
+              com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+        } else {
+          readTime_ = value;
+        }
+        onChanged();
+      } else {
+        readTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     */
+    public Builder clearReadTime() {
+      if (readTimeBuilder_ == null) {
+        readTime_ = null;
+        onChanged();
+      } else {
+        readTime_ = null;
+        readTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     */
+    public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
+
+      onChanged();
+      return getReadTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     */
+    public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+      if (readTimeBuilder_ != null) {
+        return readTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which these entities were read or found missing.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 7;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getReadTimeFieldBuilder() {
+      if (readTimeBuilder_ == null) {
+        readTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getReadTime(), getParentForChildren(), isClean());
+        readTime_ = null;
+      }
+      return readTimeBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 496a9cdcfdd6..5d89e1b335da 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
@@ -205,4 +205,39 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.Key deferred = 3;
    */
   com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index);
+
+  /**
+   *
+   *
+   * 
    +   * The time at which these entities were read or found missing.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 7;
+   *
+   * @return Whether the readTime field is set.
+   */
+  boolean hasReadTime();
+  /**
+   *
+   *
+   * 
    +   * The time at which these entities were read or found missing.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 7;
+   *
+   * @return The readTime.
+   */
+  com.google.protobuf.Timestamp getReadTime();
+  /**
+   *
+   *
+   * 
    +   * The time at which these entities were read or found missing.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 7;
+   */
+  com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder();
 }
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 4bacc96282b5..ecc6b68f2f59 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
@@ -134,6 +134,22 @@ private Mutation(
               conflictDetectionStrategy_ = input.readInt64();
               break;
             }
+          case 90:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (conflictDetectionStrategyCase_ == 11) {
+                subBuilder =
+                    ((com.google.protobuf.Timestamp) conflictDetectionStrategy_).toBuilder();
+              }
+              conflictDetectionStrategy_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.protobuf.Timestamp) conflictDetectionStrategy_);
+                conflictDetectionStrategy_ = subBuilder.buildPartial();
+              }
+              conflictDetectionStrategyCase_ = 11;
+              break;
+            }
           default:
             {
               if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -228,6 +244,7 @@ public enum ConflictDetectionStrategyCase
           com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     BASE_VERSION(8),
+    UPDATE_TIME(11),
     CONFLICTDETECTIONSTRATEGY_NOT_SET(0);
     private final int value;
 
@@ -248,6 +265,8 @@ public static ConflictDetectionStrategyCase forNumber(int value) {
       switch (value) {
         case 8:
           return BASE_VERSION;
+        case 11:
+          return UPDATE_TIME;
         case 0:
           return CONFLICTDETECTIONSTRATEGY_NOT_SET;
         default:
@@ -519,6 +538,63 @@ public long getBaseVersion() {
     return 0L;
   }
 
+  public static final int UPDATE_TIME_FIELD_NUMBER = 11;
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity that this mutation is being applied
+   * to. If this does not match the current update time on the server, the
+   * mutation conflicts.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 11;
+   *
+   * @return Whether the updateTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasUpdateTime() {
+    return conflictDetectionStrategyCase_ == 11;
+  }
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity that this mutation is being applied
+   * to. If this does not match the current update time on the server, the
+   * mutation conflicts.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 11;
+   *
+   * @return The updateTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getUpdateTime() {
+    if (conflictDetectionStrategyCase_ == 11) {
+      return (com.google.protobuf.Timestamp) conflictDetectionStrategy_;
+    }
+    return com.google.protobuf.Timestamp.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity that this mutation is being applied
+   * to. If this does not match the current update time on the server, the
+   * mutation conflicts.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 11;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+    if (conflictDetectionStrategyCase_ == 11) {
+      return (com.google.protobuf.Timestamp) conflictDetectionStrategy_;
+    }
+    return com.google.protobuf.Timestamp.getDefaultInstance();
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -548,6 +624,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (conflictDetectionStrategyCase_ == 8) {
       output.writeInt64(8, (long) ((java.lang.Long) conflictDetectionStrategy_));
     }
+    if (conflictDetectionStrategyCase_ == 11) {
+      output.writeMessage(11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -582,6 +661,11 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeInt64Size(
               8, (long) ((java.lang.Long) conflictDetectionStrategy_));
     }
+    if (conflictDetectionStrategyCase_ == 11) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -620,6 +704,9 @@ public boolean equals(final java.lang.Object obj) {
       case 8:
         if (getBaseVersion() != other.getBaseVersion()) return false;
         break;
+      case 11:
+        if (!getUpdateTime().equals(other.getUpdateTime())) return false;
+        break;
       case 0:
       default:
     }
@@ -659,6 +746,10 @@ public int hashCode() {
         hash = (37 * hash) + BASE_VERSION_FIELD_NUMBER;
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getBaseVersion());
         break;
+      case 11:
+        hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getUpdateTime().hashCode();
+        break;
       case 0:
       default:
     }
@@ -867,6 +958,13 @@ public com.google.datastore.v1.Mutation buildPartial() {
       if (conflictDetectionStrategyCase_ == 8) {
         result.conflictDetectionStrategy_ = conflictDetectionStrategy_;
       }
+      if (conflictDetectionStrategyCase_ == 11) {
+        if (updateTimeBuilder_ == null) {
+          result.conflictDetectionStrategy_ = conflictDetectionStrategy_;
+        } else {
+          result.conflictDetectionStrategy_ = updateTimeBuilder_.build();
+        }
+      }
       result.operationCase_ = operationCase_;
       result.conflictDetectionStrategyCase_ = conflictDetectionStrategyCase_;
       onBuilt();
@@ -950,6 +1048,11 @@ public Builder mergeFrom(com.google.datastore.v1.Mutation other) {
             setBaseVersion(other.getBaseVersion());
             break;
           }
+        case UPDATE_TIME:
+          {
+            mergeUpdateTime(other.getUpdateTime());
+            break;
+          }
         case CONFLICTDETECTIONSTRATEGY_NOT_SET:
           {
             break;
@@ -1944,6 +2047,232 @@ public Builder clearBaseVersion() {
       return this;
     }
 
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        updateTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     *
+     * @return Whether the updateTime field is set.
+     */
+    @java.lang.Override
+    public boolean hasUpdateTime() {
+      return conflictDetectionStrategyCase_ == 11;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     *
+     * @return The updateTime.
+     */
+    @java.lang.Override
+    public com.google.protobuf.Timestamp getUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        if (conflictDetectionStrategyCase_ == 11) {
+          return (com.google.protobuf.Timestamp) conflictDetectionStrategy_;
+        }
+        return com.google.protobuf.Timestamp.getDefaultInstance();
+      } else {
+        if (conflictDetectionStrategyCase_ == 11) {
+          return updateTimeBuilder_.getMessage();
+        }
+        return com.google.protobuf.Timestamp.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        conflictDetectionStrategy_ = value;
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(value);
+      }
+      conflictDetectionStrategyCase_ = 11;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (updateTimeBuilder_ == null) {
+        conflictDetectionStrategy_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(builderForValue.build());
+      }
+      conflictDetectionStrategyCase_ = 11;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     */
+    public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (conflictDetectionStrategyCase_ == 11
+            && conflictDetectionStrategy_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          conflictDetectionStrategy_ =
+              com.google.protobuf.Timestamp.newBuilder(
+                      (com.google.protobuf.Timestamp) conflictDetectionStrategy_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          conflictDetectionStrategy_ = value;
+        }
+        onChanged();
+      } else {
+        if (conflictDetectionStrategyCase_ == 11) {
+          updateTimeBuilder_.mergeFrom(value);
+        }
+        updateTimeBuilder_.setMessage(value);
+      }
+      conflictDetectionStrategyCase_ = 11;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     */
+    public Builder clearUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        if (conflictDetectionStrategyCase_ == 11) {
+          conflictDetectionStrategyCase_ = 0;
+          conflictDetectionStrategy_ = null;
+          onChanged();
+        }
+      } else {
+        if (conflictDetectionStrategyCase_ == 11) {
+          conflictDetectionStrategyCase_ = 0;
+          conflictDetectionStrategy_ = null;
+        }
+        updateTimeBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     */
+    public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
+      return getUpdateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     */
+    @java.lang.Override
+    public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+      if ((conflictDetectionStrategyCase_ == 11) && (updateTimeBuilder_ != null)) {
+        return updateTimeBuilder_.getMessageOrBuilder();
+      } else {
+        if (conflictDetectionStrategyCase_ == 11) {
+          return (com.google.protobuf.Timestamp) conflictDetectionStrategy_;
+        }
+        return com.google.protobuf.Timestamp.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity that this mutation is being applied
+     * to. If this does not match the current update time on the server, the
+     * mutation conflicts.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 11;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getUpdateTimeFieldBuilder() {
+      if (updateTimeBuilder_ == null) {
+        if (!(conflictDetectionStrategyCase_ == 11)) {
+          conflictDetectionStrategy_ = com.google.protobuf.Timestamp.getDefaultInstance();
+        }
+        updateTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                (com.google.protobuf.Timestamp) conflictDetectionStrategy_,
+                getParentForChildren(),
+                isClean());
+        conflictDetectionStrategy_ = null;
+      }
+      conflictDetectionStrategyCase_ = 11;
+      onChanged();
+      ;
+      return updateTimeBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 672998d722cb..3257d3d22458 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
@@ -204,6 +204,47 @@ public interface MutationOrBuilder
    */
   long getBaseVersion();
 
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity that this mutation is being applied
+   * to. If this does not match the current update time on the server, the
+   * mutation conflicts.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 11;
+   *
+   * @return Whether the updateTime field is set.
+   */
+  boolean hasUpdateTime();
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity that this mutation is being applied
+   * to. If this does not match the current update time on the server, the
+   * mutation conflicts.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 11;
+   *
+   * @return The updateTime.
+   */
+  com.google.protobuf.Timestamp getUpdateTime();
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity that this mutation is being applied
+   * to. If this does not match the current update time on the server, the
+   * mutation conflicts.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 11;
+   */
+  com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
+
   public com.google.datastore.v1.Mutation.OperationCase getOperationCase();
 
   public com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase
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 ecc28914b4e4..c1c710167deb 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
@@ -90,6 +90,21 @@ private MutationResult(
           case 40:
             {
               conflictDetected_ = input.readBool();
+              break;
+            }
+          case 50:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
               break;
             }
           default:
@@ -197,6 +212,61 @@ public long getVersion() {
     return version_;
   }
 
+  public static final int UPDATE_TIME_FIELD_NUMBER = 6;
+  private com.google.protobuf.Timestamp updateTime_;
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity on the server after processing the mutation.
+   * If the mutation doesn't change anything on the server, then the timestamp
+   * will be the update timestamp of the current entity. This field will not be
+   * set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   *
+   * @return Whether the updateTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasUpdateTime() {
+    return updateTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity on the server after processing the mutation.
+   * If the mutation doesn't change anything on the server, then the timestamp
+   * will be the update timestamp of the current entity. This field will not be
+   * set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   *
+   * @return The updateTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getUpdateTime() {
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity on the server after processing the mutation.
+   * If the mutation doesn't change anything on the server, then the timestamp
+   * will be the update timestamp of the current entity. This field will not be
+   * set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+    return getUpdateTime();
+  }
+
   public static final int CONFLICT_DETECTED_FIELD_NUMBER = 5;
   private boolean conflictDetected_;
   /**
@@ -239,6 +309,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (conflictDetected_ != false) {
       output.writeBool(5, conflictDetected_);
     }
+    if (updateTime_ != null) {
+      output.writeMessage(6, getUpdateTime());
+    }
     unknownFields.writeTo(output);
   }
 
@@ -257,6 +330,9 @@ public int getSerializedSize() {
     if (conflictDetected_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(5, conflictDetected_);
     }
+    if (updateTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getUpdateTime());
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -277,6 +353,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getKey().equals(other.getKey())) return false;
     }
     if (getVersion() != other.getVersion()) return false;
+    if (hasUpdateTime() != other.hasUpdateTime()) return false;
+    if (hasUpdateTime()) {
+      if (!getUpdateTime().equals(other.getUpdateTime())) return false;
+    }
     if (getConflictDetected() != other.getConflictDetected()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -295,6 +375,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
+    if (hasUpdateTime()) {
+      hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateTime().hashCode();
+    }
     hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConflictDetected());
     hash = (29 * hash) + unknownFields.hashCode();
@@ -450,6 +534,12 @@ public Builder clear() {
       }
       version_ = 0L;
 
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
       conflictDetected_ = false;
 
       return this;
@@ -485,6 +575,11 @@ public com.google.datastore.v1.MutationResult buildPartial() {
         result.key_ = keyBuilder_.build();
       }
       result.version_ = version_;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
+      }
       result.conflictDetected_ = conflictDetected_;
       onBuilt();
       return result;
@@ -541,6 +636,9 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) {
       if (other.getVersion() != 0L) {
         setVersion(other.getVersion());
       }
+      if (other.hasUpdateTime()) {
+        mergeUpdateTime(other.getUpdateTime());
+      }
       if (other.getConflictDetected() != false) {
         setConflictDetected(other.getConflictDetected());
       }
@@ -823,6 +921,216 @@ public Builder clearVersion() {
       return this;
     }
 
+    private com.google.protobuf.Timestamp updateTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        updateTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     *
+     * @return Whether the updateTime field is set.
+     */
+    public boolean hasUpdateTime() {
+      return updateTimeBuilder_ != null || updateTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     *
+     * @return The updateTime.
+     */
+    public com.google.protobuf.Timestamp getUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        return updateTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : updateTime_;
+      } else {
+        return updateTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateTime_ = value;
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        } else {
+          updateTime_ = value;
+        }
+        onChanged();
+      } else {
+        updateTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder clearUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
+
+      onChanged();
+      return getUpdateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+      if (updateTimeBuilder_ != null) {
+        return updateTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return updateTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : updateTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The update time of the entity on the server after processing the mutation.
+     * If the mutation doesn't change anything on the server, then the timestamp
+     * will be the update timestamp of the current entity. This field will not be
+     * set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getUpdateTimeFieldBuilder() {
+      if (updateTimeBuilder_ == null) {
+        updateTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getUpdateTime(), getParentForChildren(), isClean());
+        updateTime_ = null;
+      }
+      return updateTimeBuilder_;
+    }
+
     private boolean conflictDetected_;
     /**
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 777a56ae989e..03f686a2cb28 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -78,6 +78,50 @@ public interface MutationResultOrBuilder
    */
   long getVersion();
 
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity on the server after processing the mutation.
+   * If the mutation doesn't change anything on the server, then the timestamp
+   * will be the update timestamp of the current entity. This field will not be
+   * set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   *
+   * @return Whether the updateTime field is set.
+   */
+  boolean hasUpdateTime();
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity on the server after processing the mutation.
+   * If the mutation doesn't change anything on the server, then the timestamp
+   * will be the update timestamp of the current entity. This field will not be
+   * set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   *
+   * @return The updateTime.
+   */
+  com.google.protobuf.Timestamp getUpdateTime();
+  /**
+   *
+   *
+   * 
    +   * The update time of the entity on the server after processing the mutation.
+   * If the mutation doesn't change anything on the server, then the timestamp
+   * will be the update timestamp of the current entity. This field will not be
+   * set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
+
   /**
    *
    *
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 fa56f7282551..d96e6c2d9a39 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
@@ -90,80 +90,85 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n\037google/datastore/v1/query.proto\022\023googl"
           + "e.datastore.v1\032 google/datastore/v1/enti"
-          + "ty.proto\032\036google/protobuf/wrappers.proto"
-          + "\"\257\001\n\014EntityResult\022+\n\006entity\030\001 \001(\0132\033.goog"
-          + "le.datastore.v1.Entity\022\017\n\007version\030\004 \001(\003\022"
-          + "\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESULT_"
-          + "TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJECTI"
-          + "ON\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojecti"
-          + "on\030\002 \003(\0132\037.google.datastore.v1.Projectio"
-          + "n\0221\n\004kind\030\003 \003(\0132#.google.datastore.v1.Ki"
-          + "ndExpression\022+\n\006filter\030\004 \001(\0132\033.google.da"
-          + "tastore.v1.Filter\0221\n\005order\030\005 \003(\0132\".googl"
-          + "e.datastore.v1.PropertyOrder\022;\n\013distinct"
-          + "_on\030\006 \003(\0132&.google.datastore.v1.Property"
-          + "Reference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend_c"
-          + "ursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit\030\014 \001"
-          + "(\0132\033.google.protobuf.Int32Value\"\036\n\016KindE"
-          + "xpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRefer"
-          + "ence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010prop"
-          + "erty\030\001 \001(\0132&.google.datastore.v1.Propert"
-          + "yReference\"\321\001\n\rPropertyOrder\0228\n\010property"
-          + "\030\001 \001(\0132&.google.datastore.v1.PropertyRef"
-          + "erence\022?\n\tdirection\030\002 \001(\0162,.google.datas"
-          + "tore.v1.PropertyOrder.Direction\"E\n\tDirec"
-          + "tion\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCEN"
-          + "DING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020com"
-          + "posite_filter\030\001 \001(\0132$.google.datastore.v"
-          + "1.CompositeFilterH\000\022>\n\017property_filter\030\002"
-          + " \001(\0132#.google.datastore.v1.PropertyFilte"
-          + "rH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter\0229"
-          + "\n\002op\030\001 \001(\0162-.google.datastore.v1.Composi"
-          + "teFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.goo"
-          + "gle.datastore.v1.Filter\"-\n\010Operator\022\030\n\024O"
-          + "PERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\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\"\336\003\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\""
-          + "\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS_TYPE"
-          + "_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE"
-          + "_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_A"
-          + "FTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n\027c"
-          + "om.google.datastore.v1B\nQueryProtoP\001Z\n\017property_filter"
+          + "\030\002 \001(\0132#.google.datastore.v1.PropertyFil"
+          + "terH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter"
+          + "\0229\n\002op\030\001 \001(\0162-.google.datastore.v1.Compo"
+          + "siteFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.g"
+          + "oogle.datastore.v1.Filter\"-\n\010Operator\022\030\n"
+          + "\024OPERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016Pro"
+          + "pertyFilter\0228\n\010property\030\001 \001(\0132&.google.d"
+          + "atastore.v1.PropertyReference\0228\n\002op\030\002 \001("
+          + "\0162,.google.datastore.v1.PropertyFilter.O"
+          + "perator\022)\n\005value\030\003 \001(\0132\032.google.datastor"
+          + "e.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSP"
+          + "ECIFIED\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_TH"
+          + "AN_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\010GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allo"
+          + "w_literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\013"
+          + "20.google.datastore.v1.GqlQuery.NamedBin"
+          + "dingsEntry\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\005va"
+          + "lue\030\002 \001(\0132&.google.datastore.v1.GqlQuery"
+          + "Parameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005va"
+          + "lue\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\020"
+          + "QueryResultBatch\022\027\n\017skipped_results\030\006 \001("
+          + "\005\022\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_resu"
+          + "lt_type\030\001 \001(\0162,.google.datastore.v1.Enti"
+          + "tyResult.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(\016"
+          + "25.google.datastore.v1.QueryResultBatch."
+          + "MoreResultsType\022\030\n\020snapshot_version\030\007 \001("
+          + "\003\022-\n\tread_time\030\010 \001(\0132\032.google.protobuf.T"
+          + "imestamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RES"
+          + "ULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020"
+          + "\001\022\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_"
+          + "RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULT"
+          + "S\020\003B\274\001\n\027com.google.datastore.v1B\nQueryPr"
+          + "otoP\001Z
+   * Read timestamp this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * 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.
+   * This value will not be set for eventually consistent queries in Cloud
+   * Datastore.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 8;
+   *
+   * @return Whether the readTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasReadTime() {
+    return readTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Read timestamp this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * 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.
+   * This value will not be set for eventually consistent queries in Cloud
+   * Datastore.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 8;
+   *
+   * @return The readTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getReadTime() {
+    return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Read timestamp this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * 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.
+   * This value will not be set for eventually consistent queries in Cloud
+   * Datastore.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 8;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+    return getReadTime();
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -623,6 +708,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (snapshotVersion_ != 0L) {
       output.writeInt64(7, snapshotVersion_);
     }
+    if (readTime_ != null) {
+      output.writeMessage(8, getReadTime());
+    }
     unknownFields.writeTo(output);
   }
 
@@ -656,6 +744,9 @@ public int getSerializedSize() {
     if (snapshotVersion_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(7, snapshotVersion_);
     }
+    if (readTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getReadTime());
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -678,6 +769,10 @@ public boolean equals(final java.lang.Object obj) {
     if (!getEndCursor().equals(other.getEndCursor())) return false;
     if (moreResults_ != other.moreResults_) return false;
     if (getSnapshotVersion() != other.getSnapshotVersion()) return false;
+    if (hasReadTime() != other.hasReadTime()) return false;
+    if (hasReadTime()) {
+      if (!getReadTime().equals(other.getReadTime())) return false;
+    }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -705,6 +800,10 @@ public int hashCode() {
     hash = (53 * hash) + moreResults_;
     hash = (37 * hash) + SNAPSHOT_VERSION_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getSnapshotVersion());
+    if (hasReadTime()) {
+      hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getReadTime().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -870,6 +969,12 @@ public Builder clear() {
 
       snapshotVersion_ = 0L;
 
+      if (readTimeBuilder_ == null) {
+        readTime_ = null;
+      } else {
+        readTime_ = null;
+        readTimeBuilder_ = null;
+      }
       return this;
     }
 
@@ -913,6 +1018,11 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
       result.endCursor_ = endCursor_;
       result.moreResults_ = moreResults_;
       result.snapshotVersion_ = snapshotVersion_;
+      if (readTimeBuilder_ == null) {
+        result.readTime_ = readTime_;
+      } else {
+        result.readTime_ = readTimeBuilder_.build();
+      }
       onBuilt();
       return result;
     }
@@ -1007,6 +1117,9 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
       if (other.getSnapshotVersion() != 0L) {
         setSnapshotVersion(other.getSnapshotVersion());
       }
+      if (other.hasReadTime()) {
+        mergeReadTime(other.getReadTime());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1813,6 +1926,257 @@ public Builder clearSnapshotVersion() {
       return this;
     }
 
+    private com.google.protobuf.Timestamp readTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        readTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     *
+     * @return Whether the readTime field is set.
+     */
+    public boolean hasReadTime() {
+      return readTimeBuilder_ != null || readTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     *
+     * @return The readTime.
+     */
+    public com.google.protobuf.Timestamp getReadTime() {
+      if (readTimeBuilder_ == null) {
+        return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+      } else {
+        return readTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        readTime_ = value;
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (readTimeBuilder_ == null) {
+        readTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     */
+    public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (readTime_ != null) {
+          readTime_ =
+              com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+        } else {
+          readTime_ = value;
+        }
+        onChanged();
+      } else {
+        readTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     */
+    public Builder clearReadTime() {
+      if (readTimeBuilder_ == null) {
+        readTime_ = null;
+        onChanged();
+      } else {
+        readTime_ = null;
+        readTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     */
+    public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
+
+      onChanged();
+      return getReadTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     */
+    public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+      if (readTimeBuilder_ != null) {
+        return readTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Read timestamp this batch was returned from.
+     * This applies to the range of results from the query's `start_cursor` (or
+     * the beginning of the query if no cursor was given) to this batch's
+     * `end_cursor` (not the query's `end_cursor`).
+     * 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.
+     * This value will not be set for eventually consistent queries in Cloud
+     * Datastore.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 8;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getReadTimeFieldBuilder() {
+      if (readTimeBuilder_ == null) {
+        readTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getReadTime(), getParentForChildren(), isClean());
+        readTime_ = null;
+      }
+      return readTimeBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index 835cd4cf57f3..f297d1da6678 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -184,4 +184,63 @@ public interface QueryResultBatchOrBuilder
    * @return The snapshotVersion.
    */
   long getSnapshotVersion();
+
+  /**
+   *
+   *
+   * 
    +   * Read timestamp this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * 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.
+   * This value will not be set for eventually consistent queries in Cloud
+   * Datastore.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 8;
+   *
+   * @return Whether the readTime field is set.
+   */
+  boolean hasReadTime();
+  /**
+   *
+   *
+   * 
    +   * Read timestamp this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * 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.
+   * This value will not be set for eventually consistent queries in Cloud
+   * Datastore.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 8;
+   *
+   * @return The readTime.
+   */
+  com.google.protobuf.Timestamp getReadTime();
+  /**
+   *
+   *
+   * 
    +   * Read timestamp this batch was returned from.
+   * This applies to the range of results from the query's `start_cursor` (or
+   * the beginning of the query if no cursor was given) to this batch's
+   * `end_cursor` (not the query's `end_cursor`).
+   * 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.
+   * This value will not be set for eventually consistent queries in Cloud
+   * Datastore.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 8;
+   */
+  com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder();
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 9326a5043488..73862ea67730 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -81,6 +81,21 @@ private ReadOptions(
               consistencyType_ = input.readBytes();
               break;
             }
+          case 34:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (consistencyTypeCase_ == 4) {
+                subBuilder = ((com.google.protobuf.Timestamp) consistencyType_).toBuilder();
+              }
+              consistencyType_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.protobuf.Timestamp) consistencyType_);
+                consistencyType_ = subBuilder.buildPartial();
+              }
+              consistencyTypeCase_ = 4;
+              break;
+            }
           default:
             {
               if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -283,6 +298,7 @@ public enum ConsistencyTypeCase
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     READ_CONSISTENCY(1),
     TRANSACTION(2),
+    READ_TIME(4),
     CONSISTENCYTYPE_NOT_SET(0);
     private final int value;
 
@@ -305,6 +321,8 @@ public static ConsistencyTypeCase forNumber(int value) {
           return READ_CONSISTENCY;
         case 2:
           return TRANSACTION;
+        case 4:
+          return READ_TIME;
         case 0:
           return CONSISTENCYTYPE_NOT_SET;
         default:
@@ -419,6 +437,63 @@ public com.google.protobuf.ByteString getTransaction() {
     return com.google.protobuf.ByteString.EMPTY;
   }
 
+  public static final int READ_TIME_FIELD_NUMBER = 4;
+  /**
+   *
+   *
+   * 
    +   * Reads entities as they were at the given time. This may not be older
+   * than 270 seconds.  This value is only supported for Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 4;
+   *
+   * @return Whether the readTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasReadTime() {
+    return consistencyTypeCase_ == 4;
+  }
+  /**
+   *
+   *
+   * 
    +   * Reads entities as they were at the given time. This may not be older
+   * than 270 seconds.  This value is only supported for Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 4;
+   *
+   * @return The readTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getReadTime() {
+    if (consistencyTypeCase_ == 4) {
+      return (com.google.protobuf.Timestamp) consistencyType_;
+    }
+    return com.google.protobuf.Timestamp.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Reads entities as they were at the given time. This may not be older
+   * than 270 seconds.  This value is only supported for Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 4;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+    if (consistencyTypeCase_ == 4) {
+      return (com.google.protobuf.Timestamp) consistencyType_;
+    }
+    return com.google.protobuf.Timestamp.getDefaultInstance();
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -439,6 +514,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (consistencyTypeCase_ == 2) {
       output.writeBytes(2, (com.google.protobuf.ByteString) consistencyType_);
     }
+    if (consistencyTypeCase_ == 4) {
+      output.writeMessage(4, (com.google.protobuf.Timestamp) consistencyType_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -458,6 +536,11 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeBytesSize(
               2, (com.google.protobuf.ByteString) consistencyType_);
     }
+    if (consistencyTypeCase_ == 4) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              4, (com.google.protobuf.Timestamp) consistencyType_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -481,6 +564,9 @@ public boolean equals(final java.lang.Object obj) {
       case 2:
         if (!getTransaction().equals(other.getTransaction())) return false;
         break;
+      case 4:
+        if (!getReadTime().equals(other.getReadTime())) return false;
+        break;
       case 0:
       default:
     }
@@ -504,6 +590,10 @@ public int hashCode() {
         hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
         hash = (53 * hash) + getTransaction().hashCode();
         break;
+      case 4:
+        hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getReadTime().hashCode();
+        break;
       case 0:
       default:
     }
@@ -685,6 +775,13 @@ public com.google.datastore.v1.ReadOptions buildPartial() {
       if (consistencyTypeCase_ == 2) {
         result.consistencyType_ = consistencyType_;
       }
+      if (consistencyTypeCase_ == 4) {
+        if (readTimeBuilder_ == null) {
+          result.consistencyType_ = consistencyType_;
+        } else {
+          result.consistencyType_ = readTimeBuilder_.build();
+        }
+      }
       result.consistencyTypeCase_ = consistencyTypeCase_;
       onBuilt();
       return result;
@@ -746,6 +843,11 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) {
             setTransaction(other.getTransaction());
             break;
           }
+        case READ_TIME:
+          {
+            mergeReadTime(other.getReadTime());
+            break;
+          }
         case CONSISTENCYTYPE_NOT_SET:
           {
             break;
@@ -996,6 +1098,232 @@ public Builder clearTransaction() {
       return this;
     }
 
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        readTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     *
+     * @return Whether the readTime field is set.
+     */
+    @java.lang.Override
+    public boolean hasReadTime() {
+      return consistencyTypeCase_ == 4;
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     *
+     * @return The readTime.
+     */
+    @java.lang.Override
+    public com.google.protobuf.Timestamp getReadTime() {
+      if (readTimeBuilder_ == null) {
+        if (consistencyTypeCase_ == 4) {
+          return (com.google.protobuf.Timestamp) consistencyType_;
+        }
+        return com.google.protobuf.Timestamp.getDefaultInstance();
+      } else {
+        if (consistencyTypeCase_ == 4) {
+          return readTimeBuilder_.getMessage();
+        }
+        return com.google.protobuf.Timestamp.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        consistencyType_ = value;
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(value);
+      }
+      consistencyTypeCase_ = 4;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (readTimeBuilder_ == null) {
+        consistencyType_ = builderForValue.build();
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(builderForValue.build());
+      }
+      consistencyTypeCase_ = 4;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     */
+    public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (consistencyTypeCase_ == 4
+            && consistencyType_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          consistencyType_ =
+              com.google.protobuf.Timestamp.newBuilder(
+                      (com.google.protobuf.Timestamp) consistencyType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          consistencyType_ = value;
+        }
+        onChanged();
+      } else {
+        if (consistencyTypeCase_ == 4) {
+          readTimeBuilder_.mergeFrom(value);
+        }
+        readTimeBuilder_.setMessage(value);
+      }
+      consistencyTypeCase_ = 4;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     */
+    public Builder clearReadTime() {
+      if (readTimeBuilder_ == null) {
+        if (consistencyTypeCase_ == 4) {
+          consistencyTypeCase_ = 0;
+          consistencyType_ = null;
+          onChanged();
+        }
+      } else {
+        if (consistencyTypeCase_ == 4) {
+          consistencyTypeCase_ = 0;
+          consistencyType_ = null;
+        }
+        readTimeBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     */
+    public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
+      return getReadTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     */
+    @java.lang.Override
+    public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+      if ((consistencyTypeCase_ == 4) && (readTimeBuilder_ != null)) {
+        return readTimeBuilder_.getMessageOrBuilder();
+      } else {
+        if (consistencyTypeCase_ == 4) {
+          return (com.google.protobuf.Timestamp) consistencyType_;
+        }
+        return com.google.protobuf.Timestamp.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities as they were at the given time. This may not be older
+     * than 270 seconds.  This value is only supported for Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getReadTimeFieldBuilder() {
+      if (readTimeBuilder_ == null) {
+        if (!(consistencyTypeCase_ == 4)) {
+          consistencyType_ = com.google.protobuf.Timestamp.getDefaultInstance();
+        }
+        readTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                (com.google.protobuf.Timestamp) consistencyType_,
+                getParentForChildren(),
+                isClean());
+        consistencyType_ = null;
+      }
+      consistencyTypeCase_ = 4;
+      onChanged();
+      ;
+      return readTimeBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 be0193329434..5f3c014023a5 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
@@ -92,5 +92,46 @@ public interface ReadOptionsOrBuilder
    */
   com.google.protobuf.ByteString getTransaction();
 
+  /**
+   *
+   *
+   * 
    +   * Reads entities as they were at the given time. This may not be older
+   * than 270 seconds.  This value is only supported for Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 4;
+   *
+   * @return Whether the readTime field is set.
+   */
+  boolean hasReadTime();
+  /**
+   *
+   *
+   * 
    +   * Reads entities as they were at the given time. This may not be older
+   * than 270 seconds.  This value is only supported for Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 4;
+   *
+   * @return The readTime.
+   */
+  com.google.protobuf.Timestamp getReadTime();
+  /**
+   *
+   *
+   * 
    +   * Reads entities as they were at the given time. This may not be older
+   * than 270 seconds.  This value is only supported for Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 4;
+   */
+  com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder();
+
   public com.google.datastore.v1.ReadOptions.ConsistencyTypeCase getConsistencyTypeCase();
 }
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 90d4a0d9ff2f..914a7c60e911 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
@@ -701,7 +701,46 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceFo
   public interface ReadOnlyOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions.ReadOnly)
-      com.google.protobuf.MessageOrBuilder {}
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     *
+     *
+     * 
    +     * Reads entities at the given time.
+     * This may not be older than 60 seconds.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 1;
+     *
+     * @return Whether the readTime field is set.
+     */
+    boolean hasReadTime();
+    /**
+     *
+     *
+     * 
    +     * Reads entities at the given time.
+     * This may not be older than 60 seconds.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 1;
+     *
+     * @return The readTime.
+     */
+    com.google.protobuf.Timestamp getReadTime();
+    /**
+     *
+     *
+     * 
    +     * Reads entities at the given time.
+     * This may not be older than 60 seconds.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 1;
+     */
+    com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder();
+  }
   /**
    *
    *
@@ -752,6 +791,21 @@ private ReadOnly(
             case 0:
               done = true;
               break;
+            case 10:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (readTime_ != null) {
+                  subBuilder = readTime_.toBuilder();
+                }
+                readTime_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(readTime_);
+                  readTime_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
             default:
               {
                 if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -786,6 +840,55 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
     }
 
+    public static final int READ_TIME_FIELD_NUMBER = 1;
+    private com.google.protobuf.Timestamp readTime_;
+    /**
+     *
+     *
+     * 
    +     * Reads entities at the given time.
+     * This may not be older than 60 seconds.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 1;
+     *
+     * @return Whether the readTime field is set.
+     */
+    @java.lang.Override
+    public boolean hasReadTime() {
+      return readTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities at the given time.
+     * This may not be older than 60 seconds.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 1;
+     *
+     * @return The readTime.
+     */
+    @java.lang.Override
+    public com.google.protobuf.Timestamp getReadTime() {
+      return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Reads entities at the given time.
+     * This may not be older than 60 seconds.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 1;
+     */
+    @java.lang.Override
+    public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+      return getReadTime();
+    }
+
     private byte memoizedIsInitialized = -1;
 
     @java.lang.Override
@@ -800,6 +903,9 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (readTime_ != null) {
+        output.writeMessage(1, getReadTime());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -809,6 +915,9 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (readTime_ != null) {
+        size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadTime());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -825,6 +934,10 @@ public boolean equals(final java.lang.Object obj) {
       com.google.datastore.v1.TransactionOptions.ReadOnly other =
           (com.google.datastore.v1.TransactionOptions.ReadOnly) obj;
 
+      if (hasReadTime() != other.hasReadTime()) return false;
+      if (hasReadTime()) {
+        if (!getReadTime().equals(other.getReadTime())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -836,6 +949,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasReadTime()) {
+        hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getReadTime().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -984,6 +1101,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        if (readTimeBuilder_ == null) {
+          readTime_ = null;
+        } else {
+          readTime_ = null;
+          readTimeBuilder_ = null;
+        }
         return this;
       }
 
@@ -1011,6 +1134,11 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() {
       public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
         com.google.datastore.v1.TransactionOptions.ReadOnly result =
             new com.google.datastore.v1.TransactionOptions.ReadOnly(this);
+        if (readTimeBuilder_ == null) {
+          result.readTime_ = readTime_;
+        } else {
+          result.readTime_ = readTimeBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -1063,6 +1191,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly other) {
         if (other == com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance())
           return this;
+        if (other.hasReadTime()) {
+          mergeReadTime(other.getReadTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1093,6 +1224,194 @@ public Builder mergeFrom(
         return this;
       }
 
+      private com.google.protobuf.Timestamp readTime_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp,
+              com.google.protobuf.Timestamp.Builder,
+              com.google.protobuf.TimestampOrBuilder>
+          readTimeBuilder_;
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       *
+       * @return Whether the readTime field is set.
+       */
+      public boolean hasReadTime() {
+        return readTimeBuilder_ != null || readTime_ != null;
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       *
+       * @return The readTime.
+       */
+      public com.google.protobuf.Timestamp getReadTime() {
+        if (readTimeBuilder_ == null) {
+          return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+        } else {
+          return readTimeBuilder_.getMessage();
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       */
+      public Builder setReadTime(com.google.protobuf.Timestamp value) {
+        if (readTimeBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          readTime_ = value;
+          onChanged();
+        } else {
+          readTimeBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       */
+      public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+        if (readTimeBuilder_ == null) {
+          readTime_ = builderForValue.build();
+          onChanged();
+        } else {
+          readTimeBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       */
+      public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
+        if (readTimeBuilder_ == null) {
+          if (readTime_ != null) {
+            readTime_ =
+                com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+          } else {
+            readTime_ = value;
+          }
+          onChanged();
+        } else {
+          readTimeBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       */
+      public Builder clearReadTime() {
+        if (readTimeBuilder_ == null) {
+          readTime_ = null;
+          onChanged();
+        } else {
+          readTime_ = null;
+          readTimeBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       */
+      public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
+
+        onChanged();
+        return getReadTimeFieldBuilder().getBuilder();
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       */
+      public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+        if (readTimeBuilder_ != null) {
+          return readTimeBuilder_.getMessageOrBuilder();
+        } else {
+          return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Reads entities at the given time.
+       * This may not be older than 60 seconds.
+       * 
    
+       *
+       * .google.protobuf.Timestamp read_time = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp,
+              com.google.protobuf.Timestamp.Builder,
+              com.google.protobuf.TimestampOrBuilder>
+          getReadTimeFieldBuilder() {
+        if (readTimeBuilder_ == null) {
+          readTimeBuilder_ =
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.protobuf.Timestamp,
+                  com.google.protobuf.Timestamp.Builder,
+                  com.google.protobuf.TimestampOrBuilder>(
+                  getReadTime(), getParentForChildren(), isClean());
+          readTime_ = null;
+        }
+        return readTimeBuilder_;
+      }
+
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
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 6a29b0e98407..22d930ad0d8f 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
@@ -21,6 +21,7 @@ import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/datastore/v1/entity.proto";
 import "google/datastore/v1/query.proto";
+import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.V1";
 option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore";
@@ -138,6 +139,9 @@ message LookupResponse {
   // order of results in this field is undefined and has no relation to the
   // order of the keys in the input.
   repeated Key deferred = 3;
+
+  // The time at which these entities were read or found missing.
+  google.protobuf.Timestamp read_time = 7;
 }
 
 // The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
@@ -259,6 +263,9 @@ message CommitResponse {
   // The number of index entries updated during the commit, or zero if none were
   // updated.
   int32 index_updates = 4;
+
+  // The transaction commit timestamp. Not set for non-transactional commits.
+  google.protobuf.Timestamp commit_time = 8;
 }
 
 // The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
@@ -332,6 +339,11 @@ message Mutation {
     // to. If this does not match the current version on the server, the
     // mutation conflicts.
     int64 base_version = 8;
+
+    // The update time of the entity that this mutation is being applied
+    // to. If this does not match the current update time on the server, the
+    // mutation conflicts.
+    google.protobuf.Timestamp update_time = 11;
   }
 }
 
@@ -348,6 +360,12 @@ message MutationResult {
   // than the version of any possible future entity.
   int64 version = 4;
 
+  // The update time of the entity on the server after processing the mutation.
+  // If the mutation doesn't change anything on the server, then the timestamp
+  // will be the update timestamp of the current entity. This field will not be
+  // set after a 'delete'.
+  google.protobuf.Timestamp update_time = 6;
+
   // Whether a conflict was detected for this mutation. Always false when a
   // conflict detection strategy field is not set in the mutation.
   bool conflict_detected = 5;
@@ -386,6 +404,11 @@ message ReadOptions {
     // transaction identifier is returned by a call to
     // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
     bytes transaction = 2;
+
+    // Reads entities as they were at the given time. This may not be older
+    // than 270 seconds.  This value is only supported for Cloud Firestore in
+    // Datastore mode.
+    google.protobuf.Timestamp read_time = 4;
   }
 }
 
@@ -403,7 +426,9 @@ message TransactionOptions {
 
   // Options specific to read-only transactions.
   message ReadOnly {
-
+    // Reads entities at the given time.
+    // This may not be older than 60 seconds.
+    google.protobuf.Timestamp read_time = 1;
   }
 
   // The `mode` of the transaction, indicating whether write operations are
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 3e64618393b2..00c020021fba 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
@@ -17,6 +17,7 @@ syntax = "proto3";
 package google.datastore.v1;
 
 import "google/datastore/v1/entity.proto";
+import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.V1";
@@ -62,6 +63,12 @@ message EntityResult {
   // is always set except for eventually consistent reads.
   int64 version = 4;
 
+  // The time at which the entity was last changed.
+  // This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
+  // results.
+  // If this entity is missing, this field will not be set.
+  google.protobuf.Timestamp update_time = 5;
+
   // A cursor that points to the position after the result entity.
   // Set only when the `EntityResult` is part of a `QueryResultBatch` message.
   bytes cursor = 3;
@@ -353,4 +360,16 @@ message QueryResultBatch {
   // is valid for all preceding batches.
   // The value will be zero for eventually consistent queries.
   int64 snapshot_version = 7;
+
+  // Read timestamp this batch was returned from.
+  // This applies to the range of results from the query's `start_cursor` (or
+  // the beginning of the query if no cursor was given) to this batch's
+  // `end_cursor` (not the query's `end_cursor`).
+  //
+  // 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.
+  // This value will not be set for eventually consistent queries in Cloud
+  // Datastore.
+  google.protobuf.Timestamp read_time = 8;
 }

From 3fa438f452b06b8fc04d0bc36088342a19199c4e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 14:48:37 +0000
Subject: [PATCH 0832/1784] chore: Enable Size-Label bot in all googleapis Java
 repositories (#1381) (#702)

* chore: Enable Size-Label bot in all googleapis Java repositories

Auto-label T-shirt size indicator should be assigned on every new pull request in all googleapis Java repositories

* Remove product

Remove product since it is by default true

* add license header

Co-authored-by: Neenu Shaji 
Source-Link: https://github.com/googleapis/synthtool/commit/54b2c6ac75370a4a3582431b4a3080f777ba1f11
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813
---
 .github/.OwlBot.lock.yaml |  3 ++-
 .github/auto-label.yaml   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 .github/auto-label.yaml

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 426cf83e2ec6..f60d774937f6 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa
+  digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813
+# created: 2022-04-06T16:30:03.627422514Z
diff --git a/.github/auto-label.yaml b/.github/auto-label.yaml
new file mode 100644
index 000000000000..4caef688b745
--- /dev/null
+++ b/.github/auto-label.yaml
@@ -0,0 +1,15 @@
+# Copyright 2021 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.
+requestsize:
+  enabled: true

From f22a1bce83c850e34f27984a4d57347d860f436b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 15 Apr 2022 01:20:11 +0200
Subject: [PATCH 0833/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.13.0 (#708)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.12.1` -> `2.13.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.0/compatibility-slim/2.12.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.0/confidence-slim/2.12.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone

### [`v2.13.0`](https://togithub.com/google/error-prone/releases/v2.13.0)

[Compare Source](https://togithub.com/google/error-prone/compare/v2.12.1...v2.13.0)

-   Handle all annotations with the simple name `Generated` in `-XepDisableWarningsInGeneratedCode` ([#​3094](https://togithub.com/google/error-prone/issues/3094))
-   Reconcile `BugChecker#isSuppressed` with suppression handling in `ErrorProneScanner` ([#​3094](https://togithub.com/google/error-prone/issues/3094))
-   Fix a bug in `enclosingPackage` ([`8fa64d4`](https://togithub.com/google/error-prone/commit/8fa64d48f3a1d8df852ed2546ba02b0e2b7585af))
-   Improve performance of fix application ([`186334b`](https://togithub.com/google/error-prone/commit/186334bcc45d9c275037cdcce3eb509ae8b7ff50))
-   Implicitly treat `@AutoBuilder` setter methods as `@CanIgnoreReturnValue`.
-   Remove some obsolete checks (`PublicConstructorForAbstractClass`, `HashCodeToString`)

[Release Diff: v2.12.1...v2.13.0](https://togithub.com/google/error-prone/compare/v2.12.1...v2.13.0).


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 5fa064d0ff1a..c1e5a4a6b449 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.12.1
+    2.13.0
   
 
   

From 354ad90aa075b203329b9ebde88f2b668351c37e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 15 Apr 2022 21:34:23 +0200
Subject: [PATCH 0834/1784] deps: update dependency
 com.google.cloud:native-image-support to v0.13.1 (#709)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.11` -> `0.13.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.13.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.13.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.13.1/compatibility-slim/0.12.11)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.13.1/confidence-slim/0.12.11)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 eccbe8ce8c4e..b51c226103f7 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
         
           com.google.cloud
           native-image-support
-          0.12.11
+          0.13.1
         
         
           org.junit.vintage

From ed8de9cc519d5817b8af2c9705b9f335b909b78a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 15 Apr 2022 21:38:16 +0200
Subject: [PATCH 0835/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.10.0 (#710)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.9.0` -> `2.10.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.10.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.10.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.10.0/compatibility-slim/2.9.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.10.0/confidence-slim/2.9.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v2.10.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​2100-httpsgithubcomgoogleapisjava-shared-dependenciescomparev290v2100-2022-04-15)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.9.0...v2.10.0)

##### Dependencies

-   google-cloud-core 2.6.0 ([#​668](https://togithub.com/googleapis/java-shared-dependencies/issues/668)) ([22f4d18](https://togithub.com/googleapis/java-shared-dependencies/commit/22f4d1809cbb9848174b3569ab527e4bef00d443))
-   reverting protobuf to 3.19.4 ([#​657](https://togithub.com/googleapis/java-shared-dependencies/issues/657)) ([8501e6d](https://togithub.com/googleapis/java-shared-dependencies/commit/8501e6d842c10d2370bbd5d5246070134336bddd))
-   update dependency com.fasterxml.jackson:jackson-bom to v2.13.2.20220328 ([#​646](https://togithub.com/googleapis/java-shared-dependencies/issues/646)) ([7bfd6d7](https://togithub.com/googleapis/java-shared-dependencies/commit/7bfd6d7073859d1955b91b368c6713a72ffa14b6))
-   update dependency com.google.api-client:google-api-client-bom to v1.34.0 ([#​662](https://togithub.com/googleapis/java-shared-dependencies/issues/662)) ([1b8e378](https://togithub.com/googleapis/java-shared-dependencies/commit/1b8e378fe0ccf2a28c759868caaf5ba593a95728))
-   update dependency com.google.errorprone:error_prone_annotations to v2.12.1 ([#​652](https://togithub.com/googleapis/java-shared-dependencies/issues/652)) ([1cc80ee](https://togithub.com/googleapis/java-shared-dependencies/commit/1cc80ee984ebcad9bc2a95e2f28c0a49fe924b37))
-   update dependency com.google.errorprone:error_prone_annotations to v2.13.0 ([#​669](https://togithub.com/googleapis/java-shared-dependencies/issues/669)) ([61b7834](https://togithub.com/googleapis/java-shared-dependencies/commit/61b78341b34a251722be4805a6bdd895cd64836c))
-   update dependency com.google.http-client:google-http-client-bom to v1.41.6 ([#​654](https://togithub.com/googleapis/java-shared-dependencies/issues/654)) ([140ef40](https://togithub.com/googleapis/java-shared-dependencies/commit/140ef405bc17ed83f5ce177df59affca14fbe49c))
-   update dependency com.google.http-client:google-http-client-bom to v1.41.7 ([#​658](https://togithub.com/googleapis/java-shared-dependencies/issues/658)) ([f6f93e5](https://togithub.com/googleapis/java-shared-dependencies/commit/f6f93e5b9172c9684623c4c148e4a8fe2fae1e94))
-   update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.2 ([#​655](https://togithub.com/googleapis/java-shared-dependencies/issues/655)) ([20cd9ed](https://togithub.com/googleapis/java-shared-dependencies/commit/20cd9eda112c96836a5ab7485a4247ed2bc0edb8))
-   update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.3 ([#​663](https://togithub.com/googleapis/java-shared-dependencies/issues/663)) ([f011a46](https://togithub.com/googleapis/java-shared-dependencies/commit/f011a46c551dba16851b4f8c919c40452fc5d5c3))
-   update dependency com.google.protobuf:protobuf-bom to v3.20.0 ([#​651](https://togithub.com/googleapis/java-shared-dependencies/issues/651)) ([ad2ff73](https://togithub.com/googleapis/java-shared-dependencies/commit/ad2ff73207dd6493321c77d8eca0022baf13b4ce))
-   update dependency io.grpc:grpc-bom to v1.45.1 ([#​647](https://togithub.com/googleapis/java-shared-dependencies/issues/647)) ([38e46fc](https://togithub.com/googleapis/java-shared-dependencies/commit/38e46fc4f03af0a02f30ce4a2fa222c71797ae15))
-   update dependency org.checkerframework:checker-qual to v3.21.4 ([#​650](https://togithub.com/googleapis/java-shared-dependencies/issues/650)) ([125e80a](https://togithub.com/googleapis/java-shared-dependencies/commit/125e80ab2c3225a00c03f5ff5de94872ebb94303))
-   update gax.version to v2.15.0 ([#​649](https://togithub.com/googleapis/java-shared-dependencies/issues/649)) ([c7f32a6](https://togithub.com/googleapis/java-shared-dependencies/commit/c7f32a68b14520104432282ac9598643700162eb))
-   update gax.version to v2.16.0 ([#​664](https://togithub.com/googleapis/java-shared-dependencies/issues/664)) ([caaf941](https://togithub.com/googleapis/java-shared-dependencies/commit/caaf941643af04295f5527a0144587d7bf040862))
-   update google.common-protos.version to v2.8.1 ([#​656](https://togithub.com/googleapis/java-shared-dependencies/issues/656)) ([df4a4a2](https://togithub.com/googleapis/java-shared-dependencies/commit/df4a4a2130a3cdb2965ea42962d1ea6a85506ba7))
-   update google.common-protos.version to v2.8.2 ([#​659](https://togithub.com/googleapis/java-shared-dependencies/issues/659)) ([b499e2b](https://togithub.com/googleapis/java-shared-dependencies/commit/b499e2bc99506d48d26e35bf6e68c09409ce8b11))
-   update google.common-protos.version to v2.8.3 ([#​660](https://togithub.com/googleapis/java-shared-dependencies/issues/660)) ([461081c](https://togithub.com/googleapis/java-shared-dependencies/commit/461081c0cf73057c1f6e07fc573453ad467a60ae))
-   update iam.version to v1.3.0 ([#​648](https://togithub.com/googleapis/java-shared-dependencies/issues/648)) ([6670c4f](https://togithub.com/googleapis/java-shared-dependencies/commit/6670c4f61fcf075c543bfd148eea49796e0662ce))
-   update iam.version to v1.3.1 ([#​661](https://togithub.com/googleapis/java-shared-dependencies/issues/661)) ([cc8fbe6](https://togithub.com/googleapis/java-shared-dependencies/commit/cc8fbe6eae03341c2ece7d3356febc843a74a812))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 c1e5a4a6b449..80b9193d016e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.9.0
+        2.10.0
         pom
         import
       

From a9f565d2d4251f36cf9868420c9ce6efb2b71be3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 18 Apr 2022 17:48:28 +0200
Subject: [PATCH 0836/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.13.1 (#711)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.13.0` -> `2.13.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.1/compatibility-slim/2.13.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.13.1/confidence-slim/2.13.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone

### [`v2.13.1`](https://togithub.com/google/error-prone/releases/v2.13.1)

[Compare Source](https://togithub.com/google/error-prone/compare/v2.13.0...v2.13.1)

#### What's Changed

-   Fix a crash in `UnnecessaryBoxedVariable` in [https://github.com/google/error-prone/pull/3118](https://togithub.com/google/error-prone/pull/3118)
-   Include the unicode character in the diagnostic message in [https://github.com/google/error-prone/pull/3119](https://togithub.com/google/error-prone/pull/3119)

**Full Changelog**: https://github.com/google/error-prone/compare/v2.13.0...v2.13.1


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 80b9193d016e..6e115121a6c8 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.13.0
+    2.13.1
   
 
   

From 9cc80c999d08d5ccfd667e765f94181904e17645 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 19 Apr 2022 11:46:14 -0400
Subject: [PATCH 0837/1784] feat: next release from main branch is 2.4.0 (#715)

---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 5968fe28eff3..a9897a66f307 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -14,3 +14,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.1.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.2.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index ac06e4c3d8e3..70afc52ae46f 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -61,6 +61,21 @@ branchProtectionRules:
       - 'Kokoro - Test: Integration'
       - cla/google
       - OwlBot Post Processor
+  - pattern: 2.2.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - OwlBot Post Processor
 permissionRules:
   - team: yoshi-admins
     permission: admin

From 259dd95323fa880959a25c40d2fdbd47f93e16b7 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 21 Apr 2022 19:36:16 +0200
Subject: [PATCH 0838/1784] build(deps): update dependency
 org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.13 (#722)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.sonatype.plugins:nexus-staging-maven-plugin](http://www.sonatype.com/) ([source](https://togithub.com/sonatype/nexus-maven-plugins)) | `1.6.11` -> `1.6.13` | [![age](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/compatibility-slim/1.6.11)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/confidence-slim/1.6.11)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
sonatype/nexus-maven-plugins

### [`v1.6.13`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.12...release-1.6.13)

[Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.12...release-1.6.13)

### [`v1.6.12`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.11...release-1.6.12)

[Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.11...release-1.6.12)


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index c06f96333158..5fac88a65325 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -47,7 +47,7 @@
       
         org.sonatype.plugins
         nexus-staging-maven-plugin
-        1.6.11
+        1.6.13
         
           true
         

From a98cc2021f9e34d5d4ad511bf2efb929260bbec0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 21 Apr 2022 19:44:03 +0200
Subject: [PATCH 0839/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.3.3 (#719)

---
 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 8b1fe37d6211..c9eb8b0f28c9 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.3.2
+    1.3.3
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 6e115121a6c8..3cf36abac2f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.3.2
+    1.3.3
   
 
   

From 0e2a80348646e80f4f024c25e98c9e6411a5dff8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 21 Apr 2022 18:10:11 +0000
Subject: [PATCH 0840/1784] chore(main): release 2.4.0 (#707)

:robot: I have created a release *beep* *boop*
---


## [2.4.0](https://github.com/googleapis/java-datastore/compare/v2.3.1...v2.4.0) (2022-04-21)


### Features

* expose new read_time API fields, currently only available in private preview ([#706](https://github.com/googleapis/java-datastore/issues/706)) ([e11bd20](https://github.com/googleapis/java-datastore/commit/e11bd20fb99a3d671b09e1b46247fdfd11927fbe))
* next release from main branch is 2.4.0 ([#715](https://github.com/googleapis/java-datastore/issues/715)) ([9cc80c9](https://github.com/googleapis/java-datastore/commit/9cc80c999d08d5ccfd667e765f94181904e17645))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.10.0 ([#710](https://github.com/googleapis/java-datastore/issues/710)) ([ed8de9c](https://github.com/googleapis/java-datastore/commit/ed8de9cc519d5817b8af2c9705b9f335b909b78a))
* update dependency com.google.cloud:native-image-support to v0.13.1 ([#709](https://github.com/googleapis/java-datastore/issues/709)) ([354ad90](https://github.com/googleapis/java-datastore/commit/354ad90aa075b203329b9ebde88f2b668351c37e))
* update dependency com.google.errorprone:error_prone_core to v2.13.0 ([#708](https://github.com/googleapis/java-datastore/issues/708)) ([f22a1bc](https://github.com/googleapis/java-datastore/commit/f22a1bce83c850e34f27984a4d57347d860f436b))
* update dependency com.google.errorprone:error_prone_core to v2.13.1 ([#711](https://github.com/googleapis/java-datastore/issues/711)) ([a9f565d](https://github.com/googleapis/java-datastore/commit/a9f565d2d4251f36cf9868420c9ce6efb2b71be3))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 16 ++++++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  8 ++++----
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6a70357f025..bd2685ecf981 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.4.0](https://github.com/googleapis/java-datastore/compare/v2.3.1...v2.4.0) (2022-04-21)
+
+
+### Features
+
+* expose new read_time API fields, currently only available in private preview ([#706](https://github.com/googleapis/java-datastore/issues/706)) ([e11bd20](https://github.com/googleapis/java-datastore/commit/e11bd20fb99a3d671b09e1b46247fdfd11927fbe))
+* next release from main branch is 2.4.0 ([#715](https://github.com/googleapis/java-datastore/issues/715)) ([9cc80c9](https://github.com/googleapis/java-datastore/commit/9cc80c999d08d5ccfd667e765f94181904e17645))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.10.0 ([#710](https://github.com/googleapis/java-datastore/issues/710)) ([ed8de9c](https://github.com/googleapis/java-datastore/commit/ed8de9cc519d5817b8af2c9705b9f335b909b78a))
+* update dependency com.google.cloud:native-image-support to v0.13.1 ([#709](https://github.com/googleapis/java-datastore/issues/709)) ([354ad90](https://github.com/googleapis/java-datastore/commit/354ad90aa075b203329b9ebde88f2b668351c37e))
+* update dependency com.google.errorprone:error_prone_core to v2.13.0 ([#708](https://github.com/googleapis/java-datastore/issues/708)) ([f22a1bc](https://github.com/googleapis/java-datastore/commit/f22a1bce83c850e34f27984a4d57347d860f436b))
+* update dependency com.google.errorprone:error_prone_core to v2.13.1 ([#711](https://github.com/googleapis/java-datastore/issues/711)) ([a9f565d](https://github.com/googleapis/java-datastore/commit/a9f565d2d4251f36cf9868420c9ce6efb2b71be3))
+
 ### [2.3.1](https://github.com/googleapis/java-datastore/compare/v2.3.0...v2.3.1) (2022-04-07)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index e52e137a2a62..8c753bf668dc 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.3.2-SNAPSHOT
+  2.4.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.2-SNAPSHOT
+    2.4.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c9eb8b0f28c9..a4e9fbaaf5f7 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.3.2-SNAPSHOT
+  2.4.0
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.2-SNAPSHOT
+        2.4.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.2-SNAPSHOT
+        0.95.0
       
     
       
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f8e5391820ac..c427a43bedbc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.3.2-SNAPSHOT
+  2.4.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.2-SNAPSHOT
+    2.4.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 3cf36abac2f1..ab90ab9b5032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.3.2-SNAPSHOT
+  2.4.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.3.2-SNAPSHOT
+        2.4.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.94.2-SNAPSHOT
+        0.95.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.3.2-SNAPSHOT
+        2.4.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d0bbc91b3933..f94d2bd74684 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.94.2-SNAPSHOT
+  0.95.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.3.2-SNAPSHOT
+    2.4.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 58719a4afec8..2c9c4c79e68d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.3.1:2.3.2-SNAPSHOT
-google-cloud-datastore-bom:2.3.1:2.3.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.94.1:0.94.2-SNAPSHOT
-datastore-v1-proto-client:2.3.1:2.3.2-SNAPSHOT
+google-cloud-datastore:2.4.0:2.4.0
+google-cloud-datastore-bom:2.4.0:2.4.0
+proto-google-cloud-datastore-v1:0.95.0:0.95.0
+datastore-v1-proto-client:2.4.0:2.4.0

From 2555267ab04c8146b9dbe62d8e48919acb171c6c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 21 Apr 2022 18:44:17 +0000
Subject: [PATCH 0841/1784] chore(main): release 2.4.1-SNAPSHOT (#725)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8c753bf668dc..6507d7446089 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.4.0
+  2.4.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.4.0
+    2.4.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a4e9fbaaf5f7..a7093234b3f1 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.4.0
+  2.4.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.4.0
+        2.4.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.95.0
+        0.95.1-SNAPSHOT
       
     
       
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c427a43bedbc..0defa11b75b9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.4.0
+  2.4.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.4.0
+    2.4.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index ab90ab9b5032..b2db5a39557f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.4.0
+  2.4.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.4.0
+        2.4.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.95.0
+        0.95.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.4.0
+        2.4.1-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f94d2bd74684..13e5d417e0b4 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.95.0
+  0.95.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.4.0
+    2.4.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 2c9c4c79e68d..6292b3d15d2f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.4.0:2.4.0
-google-cloud-datastore-bom:2.4.0:2.4.0
-proto-google-cloud-datastore-v1:0.95.0:0.95.0
-datastore-v1-proto-client:2.4.0:2.4.0
+google-cloud-datastore:2.4.0:2.4.1-SNAPSHOT
+google-cloud-datastore-bom:2.4.0:2.4.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.95.0:0.95.1-SNAPSHOT
+datastore-v1-proto-client:2.4.0:2.4.1-SNAPSHOT

From 957a6b5b940edc476344a38cc6038a4a4851039f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 22 Apr 2022 01:04:22 +0200
Subject: [PATCH 0842/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.4.0 (#726)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.3.1` -> `2.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.4.0/compatibility-slim/2.3.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.4.0/confidence-slim/2.3.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.4.0`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​240-httpsgithubcomgoogleapisjava-datastorecomparev231v240-2022-04-21)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.3.1...v2.4.0)

##### Features

-   expose new read_time API fields, currently only available in private preview ([#​706](https://togithub.com/googleapis/java-datastore/issues/706)) ([e11bd20](https://togithub.com/googleapis/java-datastore/commit/e11bd20fb99a3d671b09e1b46247fdfd11927fbe))
-   next release from main branch is 2.4.0 ([#​715](https://togithub.com/googleapis/java-datastore/issues/715)) ([9cc80c9](https://togithub.com/googleapis/java-datastore/commit/9cc80c999d08d5ccfd667e765f94181904e17645))

##### Dependencies

-   update dependency com.google.cloud:google-cloud-shared-dependencies to v2.10.0 ([#​710](https://togithub.com/googleapis/java-datastore/issues/710)) ([ed8de9c](https://togithub.com/googleapis/java-datastore/commit/ed8de9cc519d5817b8af2c9705b9f335b909b78a))
-   update dependency com.google.cloud:native-image-support to v0.13.1 ([#​709](https://togithub.com/googleapis/java-datastore/issues/709)) ([354ad90](https://togithub.com/googleapis/java-datastore/commit/354ad90aa075b203329b9ebde88f2b668351c37e))
-   update dependency com.google.errorprone:error_prone_core to v2.13.0 ([#​708](https://togithub.com/googleapis/java-datastore/issues/708)) ([f22a1bc](https://togithub.com/googleapis/java-datastore/commit/f22a1bce83c850e34f27984a4d57347d860f436b))
-   update dependency com.google.errorprone:error_prone_core to v2.13.1 ([#​711](https://togithub.com/googleapis/java-datastore/issues/711)) ([a9f565d](https://togithub.com/googleapis/java-datastore/commit/a9f565d2d4251f36cf9868420c9ce6efb2b71be3))

##### [2.3.1](https://togithub.com/googleapis/java-datastore/compare/v2.3.0...v2.3.1) (2022-04-07)

##### Dependencies

-   update dependency com.google.errorprone:error_prone_core to v2.12.1 ([#​701](https://togithub.com/googleapis/java-datastore/issues/701)) ([b2803ea](https://togithub.com/googleapis/java-datastore/commit/b2803ea19beab451a52c88dea0779ac463f29d44))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4bc79495a1e9..a7fcd2bcf0cd 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.3.1
+  2.4.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.3.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.4.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.3.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.4.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index b24840396cfd..b023270a44af 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.3.1
+      2.4.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8a0207d5033b..ae55572d1617 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.3.1
+      2.4.0
     
 
     

From 1f11f4aecd7cab7ce0f7e98cef61ec56ab6a0e11 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 27 Apr 2022 17:34:23 +0200
Subject: [PATCH 0843/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v25.2.0 (#728)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java)) | `25.1.0` -> `25.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.2.0/compatibility-slim/25.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.2.0/confidence-slim/25.1.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a7fcd2bcf0cd..f8b96a912b39 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      25.1.0
+      25.2.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:25.1.0')
+implementation platform('com.google.cloud:libraries-bom:25.2.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index b51c226103f7..70923d516302 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        25.1.0
+        25.2.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 27949d2eaf78..e1ad5fd7db47 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        25.1.0
+        25.2.0
         pom
         import
       

From 3a30e7520927a50b8457dd5ceea9700407a17e69 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Wed, 27 Apr 2022 14:33:34 -0400
Subject: [PATCH 0844/1784] fix(java): rename test to be picked up by native
 profile (#723)

* fix(java): rename test to be picked up by native profile
---
 datastore-v1-proto-client/pom.xml             |  15 +-
 .../native-image/native-image.properties      |   1 +
 .../META-INF/native-image/reflect-config.json |  32 ++++
 ...toreTest.java => DatastoreClientTest.java} | 164 +++++++++++-------
 ...TDatastoreTest.java => DatastoreTest.java} |   2 +-
 5 files changed, 138 insertions(+), 76 deletions(-)
 create mode 100644 datastore-v1-proto-client/src/main/resources/META-INF/native-image/native-image.properties
 create mode 100644 datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json
 rename datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/{DatastoreTest.java => DatastoreClientTest.java} (76%)
 rename google-cloud-datastore/src/test/java/com/google/cloud/datastore/{ITDatastoreTest.java => DatastoreTest.java} (99%)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6507d7446089..dcb521be9e84 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -109,24 +109,11 @@
       
         org.apache.maven.plugins
         maven-surefire-plugin
-        3.0.0-M5
         
-          
-          
-            **/*SmokeTest.java
-            **/IT*.java
-          
-          sponge_log
           -Xmx2048m
         
-        
-          
-            org.apache.maven.surefire
-            surefire-junit47
-            3.0.0-M5
-          
-        
       
     
   
+
     
diff --git a/datastore-v1-proto-client/src/main/resources/META-INF/native-image/native-image.properties b/datastore-v1-proto-client/src/main/resources/META-INF/native-image/native-image.properties
new file mode 100644
index 000000000000..0b5b2e18cb09
--- /dev/null
+++ b/datastore-v1-proto-client/src/main/resources/META-INF/native-image/native-image.properties
@@ -0,0 +1 @@
+Args = --enable-url-protocols=https,http
\ No newline at end of file
diff --git a/datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json b/datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json
new file mode 100644
index 000000000000..32b27f5d9eed
--- /dev/null
+++ b/datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json
@@ -0,0 +1,32 @@
+[
+  {
+    "name":"com.google.datastore.v1.client.Datastore",
+    "methods":[
+      {"name":"allocateIds","parameterTypes":["com.google.datastore.v1.AllocateIdsRequest"] },
+      {"name":"beginTransaction","parameterTypes":["com.google.datastore.v1.BeginTransactionRequest"] },
+      {"name":"commit","parameterTypes":["com.google.datastore.v1.CommitRequest"] },
+      {"name":"lookup","parameterTypes":["com.google.datastore.v1.LookupRequest"] },
+      {"name":"reserveIds","parameterTypes":["com.google.datastore.v1.ReserveIdsRequest"] },
+      {"name":"rollback","parameterTypes":["com.google.datastore.v1.RollbackRequest"] },
+      {"name":"runQuery","parameterTypes":["com.google.datastore.v1.RunQueryRequest"] }
+    ]
+  },
+  {
+    "name":"com.google.api.client.http.HttpRequest",
+    "allDeclaredFields":true,
+    "allPublicFields":true,
+    "allDeclaredMethods":true,
+    "allPublicMethods":true,
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true
+  },
+  {
+    "name":"com.google.api.client.http.HttpHeaders",
+    "allDeclaredFields":true,
+    "allPublicFields":true,
+    "allDeclaredMethods":true,
+    "allPublicMethods":true,
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true
+  }
+]
\ No newline at end of file
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
similarity index 76%
rename from datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
rename to datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
index ca4fcc449bfd..d8376dc29905 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
 import com.google.api.client.auth.oauth2.Credential;
@@ -62,108 +63,144 @@
 import java.lang.reflect.Method;
 import java.net.SocketTimeoutException;
 import java.util.List;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** Tests for {@link DatastoreFactory} and {@link Datastore}. */
 @RunWith(JUnit4.class)
-public class DatastoreTest {
+public class DatastoreClientTest {
   private static final String PROJECT_ID = "project-id";
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   private DatastoreFactory factory = new MockDatastoreFactory();
   private DatastoreOptions.Builder options =
       new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(new MockCredential());
 
   @Test
-  public void options_NoProjectIdOrProjectEndpoint() throws Exception {
-    options = new DatastoreOptions.Builder();
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Either project ID or project endpoint must be provided");
+  public void options_NoProjectIdOrProjectEndpoint() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> factory.create(new DatastoreOptions.Builder().build()));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Either project ID or project endpoint must be provided");
     factory.create(options.build());
   }
 
   @Test
   public void options_ProjectIdAndProjectEndpoint() throws Exception {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Cannot set both project endpoint and project ID");
-    options =
-        new DatastoreOptions.Builder()
-            .projectId(PROJECT_ID)
-            .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .projectId(PROJECT_ID)
+                    .projectEndpoint(
+                        "http://localhost:1234/datastore/v1beta42/projects/project-id"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Cannot set both project endpoint and project ID");
   }
 
   @Test
   public void options_LocalHostAndProjectEndpoint() throws Exception {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Can set at most one of project endpoint, host, and local host");
-    options =
-        new DatastoreOptions.Builder()
-            .localHost("localhost:8080")
-            .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .localHost("localhost:8080")
+                    .projectEndpoint(
+                        "http://localhost:1234/datastore/v1beta42/projects/project-id"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Can set at most one of project endpoint, host, and local host");
   }
 
   @Test
   public void options_HostAndProjectEndpoint() throws Exception {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Can set at most one of project endpoint, host, and local host");
-    options =
-        new DatastoreOptions.Builder()
-            .host("foo-datastore.googleapis.com")
-            .projectEndpoint("http://localhost:1234/datastore/v1beta42/projects/project-id");
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .host("foo-datastore.googleapis.com")
+                    .projectEndpoint(
+                        "http://localhost:1234/datastore/v1beta42/projects/project-id"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Can set at most one of project endpoint, host, and local host");
   }
 
   @Test
   public void options_HostAndLocalHost() throws Exception {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Can set at most one of project endpoint, host, and local host");
-    options =
-        new DatastoreOptions.Builder()
-            .host("foo-datastore.googleapis.com")
-            .localHost("localhost:8080");
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .host("foo-datastore.googleapis.com")
+                    .localHost("localhost:8080"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Can set at most one of project endpoint, host, and local host");
   }
 
   @Test
   public void options_InvalidLocalHost() throws Exception {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Illegal character");
-    factory.create(
-        new DatastoreOptions.Builder()
-            .projectId(PROJECT_ID)
-            .localHost("!not a valid url!")
-            .build());
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                factory.create(
+                    new DatastoreOptions.Builder()
+                        .projectId(PROJECT_ID)
+                        .localHost("!not a valid url!")
+                        .build()));
+    assertThat(exception).hasMessageThat().contains("Illegal character");
   }
 
   @Test
   public void options_SchemeInLocalHost() {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Local host \"http://localhost:8080\" must not include scheme");
-    new DatastoreOptions.Builder().localHost("http://localhost:8080");
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DatastoreOptions.Builder().localHost("http://localhost:8080"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Local host \"http://localhost:8080\" must not include scheme");
   }
 
   @Test
-  public void options_InvalidHost() throws Exception {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Illegal character");
-    factory.create(
-        new DatastoreOptions.Builder().projectId(PROJECT_ID).host("!not a valid url!").build());
+  public void options_InvalidHost() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                factory.create(
+                    new DatastoreOptions.Builder()
+                        .projectId(PROJECT_ID)
+                        .host("!not a valid url!")
+                        .build()));
+    assertThat(exception).hasMessageThat().contains("Illegal character");
   }
 
   @Test
   public void options_SchemeInHost() {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage("Host \"http://foo-datastore.googleapis.com\" must not include scheme");
-    new DatastoreOptions.Builder().host("http://foo-datastore.googleapis.com");
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DatastoreOptions.Builder().host("http://foo-datastore.googleapis.com"));
+
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Host \"http://foo-datastore.googleapis.com\" must not include scheme.");
   }
 
   @Test
   public void create_NullOptions() throws Exception {
-    thrown.expect(NullPointerException.class);
-    factory.create(null);
+    assertThrows(NullPointerException.class, () -> factory.create(null));
   }
 
   @Test
@@ -223,14 +260,19 @@ public void create_ProjectEndpoint() {
 
   @Test
   public void create_ProjectEndpointNoScheme() {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(
-        "Project endpoint \"localhost:1234/datastore/v1beta42/projects/project-id\" must"
-            + " include scheme.");
-    factory.create(
-        new DatastoreOptions.Builder()
-            .projectEndpoint("localhost:1234/datastore/v1beta42/projects/project-id")
-            .build());
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                factory.create(
+                    new DatastoreOptions.Builder()
+                        .projectEndpoint("localhost:1234/datastore/v1beta42/projects/project-id")
+                        .build()));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains(
+            "Project endpoint \"localhost:1234/datastore/v1beta42/projects/project-id\" must"
+                + " include scheme.");
   }
 
   @Test
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
similarity index 99%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
index 5a3bc7e00431..0a532b176f6e 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ITDatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
@@ -78,7 +78,7 @@
 import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
-public class ITDatastoreTest {
+public class DatastoreTest {
 
   private static LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0);
   private static final DatastoreOptions options = helper.getOptions();

From 51856917a2ca59b889460f962e9f90d7a1c02f2f Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Thu, 28 Apr 2022 10:21:58 -0400
Subject: [PATCH 0845/1784] docs(samples): remove unused dependency (#730)

---
 samples/native-image-sample/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 70923d516302..12e644d19926 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -77,11 +77,6 @@
       native
 
       
-        
-          com.google.cloud
-          native-image-support
-          0.13.1
-        
         
           org.junit.vintage
           junit-vintage-engine

From 7ea9470b89dd14b32ba238c09957b0a54a8da606 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 29 Apr 2022 22:14:44 +0200
Subject: [PATCH 0846/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.4.0 (#731)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.3.3` -> `1.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.4.0/compatibility-slim/1.3.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.4.0/confidence-slim/1.3.3)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.4.0`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​140-httpsgithubcomgoogleapisjava-shared-configcomparev133v140-2022-04-28)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.3.3...v1.4.0)

##### Features

-   **java:** remove native image module ([#​471](https://togithub.com/googleapis/java-shared-config/issues/471)) ([7fcba01](https://togithub.com/googleapis/java-shared-config/commit/7fcba016b3138d7beaa4e962853f9bc80f59438c))

##### [1.3.3](https://togithub.com/googleapis/java-shared-config/compare/v1.3.2...v1.3.3) (2022-04-19)

##### Bug Fixes

-   **java:** remove protobuf feature from native profile ([#​461](https://togithub.com/googleapis/java-shared-config/issues/461)) ([ffd07cb](https://togithub.com/googleapis/java-shared-config/commit/ffd07cb18ee7d45d4daee1d9ea6f6d321fdca874))

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.11 ([#​459](https://togithub.com/googleapis/java-shared-config/issues/459)) ([d20008d](https://togithub.com/googleapis/java-shared-config/commit/d20008df15209708fdf9d06828b567778190f4d0))
-   update dependency com.google.cloud:native-image-support to v0.13.1 ([#​465](https://togithub.com/googleapis/java-shared-config/issues/465)) ([b202064](https://togithub.com/googleapis/java-shared-config/commit/b2020648816feb4740ad70acedfed470d7da5bcf))

##### [1.3.2](https://togithub.com/googleapis/java-shared-config/compare/v1.3.1...v1.3.2) (2022-03-28)

##### Dependencies

-   revert google-java-format to 1.7 ([#​453](https://togithub.com/googleapis/java-shared-config/issues/453)) ([cbc777f](https://togithub.com/googleapis/java-shared-config/commit/cbc777f3e9ab75edb6fa2e0268a7446ae4111725))

##### [1.3.1](https://togithub.com/googleapis/java-shared-config/compare/v1.3.0...v1.3.1) (2022-03-25)

##### Dependencies

-   update dependency com.google.cloud:native-image-support to v0.12.10 ([#​443](https://togithub.com/googleapis/java-shared-config/issues/443)) ([5b39d5e](https://togithub.com/googleapis/java-shared-config/commit/5b39d5ee15121f052226ff873b6ab101e9c71de5))
-   update dependency com.google.googlejavaformat:google-java-format to v1.15.0 ([#​426](https://togithub.com/googleapis/java-shared-config/issues/426)) ([4c3c4b6](https://togithub.com/googleapis/java-shared-config/commit/4c3c4b66129632181e6bc363a0ecccf4f5aac914))
-   update dependency org.graalvm.buildtools:junit-platform-native to v0.9.11 ([#​448](https://togithub.com/googleapis/java-shared-config/issues/448)) ([f7f518e](https://togithub.com/googleapis/java-shared-config/commit/f7f518e87d1d9feb9ac54d7c099f97d8751ee3da))
-   update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.11 ([#​449](https://togithub.com/googleapis/java-shared-config/issues/449)) ([3e1c0b5](https://togithub.com/googleapis/java-shared-config/commit/3e1c0b5a1d2f4a0db88c06a0d683ed90cbc745e2))


    

---

### Configuration

📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
 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 a7093234b3f1..25ad155cf445 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.3.3
+    1.4.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index b2db5a39557f..2fbc203a51ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.3.3
+    1.4.0
   
 
   

From c69d6a28f86446bebc868e102688ba0152a804b4 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 2 May 2022 14:10:40 -0400
Subject: [PATCH 0847/1784] chore(bazel): update version of Protobuf to v3.20.1
 (#727)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(bazel): update version of Protobuf to v3.20.1

PiperOrigin-RevId: 444328399

Source-Link: https://github.com/googleapis/googleapis/commit/c7ca416c2856aad6a3f7092924e56b8cf0cb2534

Source-Link: https://github.com/googleapis/googleapis-gen/commit/d61705453a62b3ecda78aa30c192840ebc5a8a90
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDYxNzA1NDUzYTYyYjNlY2RhNzhhYTMwYzE5Mjg0MGViYzVhOGE5MCJ9

* 🦉 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 
---
 .../datastore/v1/AllocateIdsRequest.java      |  2 ++
 .../datastore/v1/AllocateIdsResponse.java     |  2 ++
 .../com/google/datastore/v1/ArrayValue.java   |  2 ++
 .../datastore/v1/BeginTransactionRequest.java |  2 ++
 .../v1/BeginTransactionResponse.java          |  2 ++
 .../google/datastore/v1/CommitRequest.java    |  4 ++-
 .../google/datastore/v1/CommitResponse.java   |  2 ++
 .../google/datastore/v1/CompositeFilter.java  |  2 ++
 .../java/com/google/datastore/v1/Entity.java  | 21 +++++++++-------
 .../google/datastore/v1/EntityOrBuilder.java  |  6 ++++-
 .../com/google/datastore/v1/EntityResult.java |  2 ++
 .../java/com/google/datastore/v1/Filter.java  |  8 ++++--
 .../com/google/datastore/v1/GqlQuery.java     | 21 +++++++++-------
 .../datastore/v1/GqlQueryOrBuilder.java       |  6 ++++-
 .../datastore/v1/GqlQueryParameter.java       |  7 ++++--
 .../java/com/google/datastore/v1/Key.java     |  6 ++++-
 .../google/datastore/v1/KindExpression.java   |  2 ++
 .../google/datastore/v1/LookupRequest.java    |  2 ++
 .../google/datastore/v1/LookupResponse.java   |  2 ++
 .../com/google/datastore/v1/Mutation.java     | 19 +++++++++-----
 .../google/datastore/v1/MutationResult.java   |  2 ++
 .../com/google/datastore/v1/PartitionId.java  |  2 ++
 .../com/google/datastore/v1/Projection.java   |  2 ++
 .../google/datastore/v1/PropertyFilter.java   |  2 ++
 .../google/datastore/v1/PropertyOrder.java    |  2 ++
 .../datastore/v1/PropertyReference.java       |  2 ++
 .../java/com/google/datastore/v1/Query.java   |  2 ++
 .../google/datastore/v1/QueryResultBatch.java |  2 ++
 .../com/google/datastore/v1/ReadOptions.java  |  7 ++++--
 .../datastore/v1/ReserveIdsRequest.java       |  2 ++
 .../datastore/v1/ReserveIdsResponse.java      |  2 ++
 .../google/datastore/v1/RollbackRequest.java  |  2 ++
 .../google/datastore/v1/RollbackResponse.java |  2 ++
 .../google/datastore/v1/RunQueryRequest.java  |  8 ++++--
 .../google/datastore/v1/RunQueryResponse.java |  2 ++
 .../datastore/v1/TransactionOptions.java      | 12 +++++++--
 .../java/com/google/datastore/v1/Value.java   | 25 ++++++++++++-------
 37 files changed, 151 insertions(+), 47 deletions(-)

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 2226a3df348a..6345bc13844d 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
@@ -99,6 +99,8 @@ private AllocateIdsRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 76ac0469f67d..a2e0dd89bd0e 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
@@ -91,6 +91,8 @@ private AllocateIdsResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 809b138c2435..8485701c200c 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
@@ -92,6 +92,8 @@ private ArrayValue(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 c21f6c7dd483..f77301b9d6b0 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
@@ -104,6 +104,8 @@ private BeginTransactionRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 bb28249087f3..a63b48ba7a38 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
@@ -86,6 +86,8 @@ private BeginTransactionResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 6e40e8ca44e0..1af1bc6c9be8 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
@@ -75,8 +75,8 @@ private CommitRequest(
             break;
           case 10:
             {
-              transactionSelectorCase_ = 1;
               transactionSelector_ = input.readBytes();
+              transactionSelectorCase_ = 1;
               break;
             }
           case 40:
@@ -114,6 +114,8 @@ private CommitRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 a19cec86379f..a11c8835772a 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
@@ -114,6 +114,8 @@ private CommitResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 7fa99e9c7624..72432f94482e 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
@@ -100,6 +100,8 @@ private CompositeFilter(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index f6ba0751de4d..6247f172aa4d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -113,6 +113,8 @@ private Entity(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -249,7 +251,7 @@ public int getPropertiesCount() {
   @java.lang.Override
   public boolean containsProperties(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetProperties().getMap().containsKey(key);
   }
@@ -295,7 +297,7 @@ public java.util.Map getPropert
   public com.google.datastore.v1.Value getPropertiesOrDefault(
       java.lang.String key, com.google.datastore.v1.Value defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map =
         internalGetProperties().getMap();
@@ -318,7 +320,7 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
   @java.lang.Override
   public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map =
         internalGetProperties().getMap();
@@ -958,7 +960,7 @@ public int getPropertiesCount() {
     @java.lang.Override
     public boolean containsProperties(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetProperties().getMap().containsKey(key);
     }
@@ -1004,7 +1006,7 @@ public java.util.Map getPropert
     public com.google.datastore.v1.Value getPropertiesOrDefault(
         java.lang.String key, com.google.datastore.v1.Value defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map =
           internalGetProperties().getMap();
@@ -1027,7 +1029,7 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
     @java.lang.Override
     public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map =
           internalGetProperties().getMap();
@@ -1057,7 +1059,7 @@ public Builder clearProperties() {
      */
     public Builder removeProperties(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableProperties().getMutableMap().remove(key);
       return this;
@@ -1083,11 +1085,12 @@ public java.util.Map getMutable
      */
     public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableProperties().getMutableMap().put(key, value);
       return this;
     }
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 b001d910781a..23abf4c0a890 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
@@ -132,8 +132,12 @@ public interface EntityOrBuilder
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+
+  /* nullable */
   com.google.datastore.v1.Value getPropertiesOrDefault(
-      java.lang.String key, com.google.datastore.v1.Value defaultValue);
+      java.lang.String key,
+      /* nullable */
+      com.google.datastore.v1.Value defaultValue);
   /**
    *
    *
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 c1a2a8ab46ce..226d3c862c96 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
@@ -121,6 +121,8 @@ private EntityResult(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 3c27998120af..9d6a72de94c9 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
@@ -111,6 +111,8 @@ private Filter(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -775,8 +777,9 @@ public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter valu
       } else {
         if (filterTypeCase_ == 1) {
           compositeFilterBuilder_.mergeFrom(value);
+        } else {
+          compositeFilterBuilder_.setMessage(value);
         }
-        compositeFilterBuilder_.setMessage(value);
       }
       filterTypeCase_ = 1;
       return this;
@@ -984,8 +987,9 @@ public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value)
       } else {
         if (filterTypeCase_ == 2) {
           propertyFilterBuilder_.mergeFrom(value);
+        } else {
+          propertyFilterBuilder_.setMessage(value);
         }
-        propertyFilterBuilder_.setMessage(value);
       }
       filterTypeCase_ = 2;
       return this;
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 c145b0a0fa3c..e2026ea3dd4a 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
@@ -127,6 +127,8 @@ private GqlQuery(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -281,7 +283,7 @@ public int getNamedBindingsCount() {
   @java.lang.Override
   public boolean containsNamedBindings(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetNamedBindings().getMap().containsKey(key);
   }
@@ -325,7 +327,7 @@ public boolean containsNamedBindings(java.lang.String key) {
   public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
       java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map =
         internalGetNamedBindings().getMap();
@@ -346,7 +348,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
   @java.lang.Override
   public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map =
         internalGetNamedBindings().getMap();
@@ -1090,7 +1092,7 @@ public int getNamedBindingsCount() {
     @java.lang.Override
     public boolean containsNamedBindings(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetNamedBindings().getMap().containsKey(key);
     }
@@ -1134,7 +1136,7 @@ public boolean containsNamedBindings(java.lang.String key) {
     public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
         java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map =
           internalGetNamedBindings().getMap();
@@ -1155,7 +1157,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
     @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map =
           internalGetNamedBindings().getMap();
@@ -1183,7 +1185,7 @@ public Builder clearNamedBindings() {
      */
     public Builder removeNamedBindings(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableNamedBindings().getMutableMap().remove(key);
       return this;
@@ -1209,11 +1211,12 @@ public Builder removeNamedBindings(java.lang.String key) {
     public Builder putNamedBindings(
         java.lang.String key, com.google.datastore.v1.GqlQueryParameter value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableNamedBindings().getMutableMap().put(key, value);
       return this;
     }
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 018b9fc83024..c53417b8c640 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
@@ -120,8 +120,12 @@ public interface GqlQueryOrBuilder
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
+
+  /* nullable */
   com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-      java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue);
+      java.lang.String key,
+      /* nullable */
+      com.google.datastore.v1.GqlQueryParameter defaultValue);
   /**
    *
    *
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 0ffacb78e9be..77f69f37ea7b 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
@@ -85,8 +85,8 @@ private GqlQueryParameter(
             }
           case 26:
             {
-              parameterTypeCase_ = 3;
               parameterType_ = input.readBytes();
+              parameterTypeCase_ = 3;
               break;
             }
           default:
@@ -100,6 +100,8 @@ private GqlQueryParameter(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -751,8 +753,9 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       } else {
         if (parameterTypeCase_ == 2) {
           valueBuilder_.mergeFrom(value);
+        } else {
+          valueBuilder_.setMessage(value);
         }
-        valueBuilder_.setMessage(value);
       }
       parameterTypeCase_ = 2;
       return this;
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 6992f443041b..f992eec2bd01 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
@@ -112,6 +112,8 @@ private Key(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -312,8 +314,8 @@ private PathElement(
               }
             case 16:
               {
-                idTypeCase_ = 2;
                 idType_ = input.readInt64();
+                idTypeCase_ = 2;
                 break;
               }
             case 26:
@@ -334,6 +336,8 @@ private PathElement(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
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 650cdabf6a88..2c1af7333bb1 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
@@ -88,6 +88,8 @@ private KindExpression(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 7c07c9ca5453..aa6053927190 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
@@ -115,6 +115,8 @@ private LookupRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 23563a3c6461..f28afaa4017d 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
@@ -131,6 +131,8 @@ private LookupResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 ecc6b68f2f59..aea812247d36 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
@@ -130,8 +130,8 @@ private Mutation(
             }
           case 64:
             {
-              conflictDetectionStrategyCase_ = 8;
               conflictDetectionStrategy_ = input.readInt64();
+              conflictDetectionStrategyCase_ = 8;
               break;
             }
           case 90:
@@ -161,6 +161,8 @@ private Mutation(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -1230,8 +1232,9 @@ public Builder mergeInsert(com.google.datastore.v1.Entity value) {
       } else {
         if (operationCase_ == 4) {
           insertBuilder_.mergeFrom(value);
+        } else {
+          insertBuilder_.setMessage(value);
         }
-        insertBuilder_.setMessage(value);
       }
       operationCase_ = 4;
       return this;
@@ -1444,8 +1447,9 @@ public Builder mergeUpdate(com.google.datastore.v1.Entity value) {
       } else {
         if (operationCase_ == 5) {
           updateBuilder_.mergeFrom(value);
+        } else {
+          updateBuilder_.setMessage(value);
         }
-        updateBuilder_.setMessage(value);
       }
       operationCase_ = 5;
       return this;
@@ -1658,8 +1662,9 @@ public Builder mergeUpsert(com.google.datastore.v1.Entity value) {
       } else {
         if (operationCase_ == 6) {
           upsertBuilder_.mergeFrom(value);
+        } else {
+          upsertBuilder_.setMessage(value);
         }
-        upsertBuilder_.setMessage(value);
       }
       operationCase_ = 6;
       return this;
@@ -1871,8 +1876,9 @@ public Builder mergeDelete(com.google.datastore.v1.Key value) {
       } else {
         if (operationCase_ == 7) {
           deleteBuilder_.mergeFrom(value);
+        } else {
+          deleteBuilder_.setMessage(value);
         }
-        deleteBuilder_.setMessage(value);
       }
       operationCase_ = 7;
       return this;
@@ -2168,8 +2174,9 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         if (conflictDetectionStrategyCase_ == 11) {
           updateTimeBuilder_.mergeFrom(value);
+        } else {
+          updateTimeBuilder_.setMessage(value);
         }
-        updateTimeBuilder_.setMessage(value);
       }
       conflictDetectionStrategyCase_ = 11;
       return this;
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 c1c710167deb..3a36fee6bfe5 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
@@ -118,6 +118,8 @@ private MutationResult(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 88f69754a1e7..7439b03adb6c 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
@@ -110,6 +110,8 @@ private PartitionId(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 9694f3eb6fe3..1d91086af446 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
@@ -95,6 +95,8 @@ private Projection(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 aacca8108946..cfaa78f90603 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
@@ -118,6 +118,8 @@ private PropertyFilter(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 751138715bbe..4eff592cb966 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
@@ -104,6 +104,8 @@ private PropertyOrder(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 9bab6ed71918..bc42d006471d 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
@@ -88,6 +88,8 @@ private PropertyReference(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 0ed85ebc8c8c..781346c620e9 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
@@ -176,6 +176,8 @@ private Query(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 6e480a0e2d8d..80dfe661d097 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -146,6 +146,8 @@ private QueryResultBatch(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 73862ea67730..ea77f95e4cdb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -77,8 +77,8 @@ private ReadOptions(
             }
           case 18:
             {
-              consistencyTypeCase_ = 2;
               consistencyType_ = input.readBytes();
+              consistencyTypeCase_ = 2;
               break;
             }
           case 34:
@@ -107,6 +107,8 @@ private ReadOptions(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -1219,8 +1221,9 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       } else {
         if (consistencyTypeCase_ == 4) {
           readTimeBuilder_.mergeFrom(value);
+        } else {
+          readTimeBuilder_.setMessage(value);
         }
-        readTimeBuilder_.setMessage(value);
       }
       consistencyTypeCase_ = 4;
       return this;
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 a50c067effca..27a8ef8a663c 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
@@ -107,6 +107,8 @@ private ReserveIdsRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 ea6149cca694..b889a46f1541 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
@@ -79,6 +79,8 @@ private ReserveIdsResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 0fa6f95946a2..75c24d61648d 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
@@ -94,6 +94,8 @@ private RollbackRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 e618a5b6ce95..0d96f1969501 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
@@ -80,6 +80,8 @@ private RollbackResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 e754250ee4ab..6da75072dc8e 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
@@ -150,6 +150,8 @@ private RunQueryRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -1546,8 +1548,9 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       } else {
         if (queryTypeCase_ == 3) {
           queryBuilder_.mergeFrom(value);
+        } else {
+          queryBuilder_.setMessage(value);
         }
-        queryBuilder_.setMessage(value);
       }
       queryTypeCase_ = 3;
       return this;
@@ -1752,8 +1755,9 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
       } else {
         if (queryTypeCase_ == 7) {
           gqlQueryBuilder_.mergeFrom(value);
+        } else {
+          gqlQueryBuilder_.setMessage(value);
         }
-        gqlQueryBuilder_.setMessage(value);
       }
       queryTypeCase_ = 7;
       return this;
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 5fae410e04a0..cc025af6b02a 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
@@ -109,6 +109,8 @@ private RunQueryResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 914a7c60e911..27a3efa73e54 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
@@ -118,6 +118,8 @@ private TransactionOptions(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -227,6 +229,8 @@ private ReadWrite(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -817,6 +821,8 @@ private ReadOnly(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -2114,8 +2120,9 @@ public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWri
       } else {
         if (modeCase_ == 1) {
           readWriteBuilder_.mergeFrom(value);
+        } else {
+          readWriteBuilder_.setMessage(value);
         }
-        readWriteBuilder_.setMessage(value);
       }
       modeCase_ = 1;
       return this;
@@ -2323,8 +2330,9 @@ public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly
       } else {
         if (modeCase_ == 2) {
           readOnlyBuilder_.mergeFrom(value);
+        } else {
+          readOnlyBuilder_.setMessage(value);
         }
-        readOnlyBuilder_.setMessage(value);
       }
       modeCase_ = 2;
       return this;
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 a82ccec078a5..9c1dc9ae8ef1 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
@@ -71,20 +71,20 @@ private Value(
             break;
           case 8:
             {
-              valueTypeCase_ = 1;
               valueType_ = input.readBool();
+              valueTypeCase_ = 1;
               break;
             }
           case 16:
             {
-              valueTypeCase_ = 2;
               valueType_ = input.readInt64();
+              valueTypeCase_ = 2;
               break;
             }
           case 25:
             {
-              valueTypeCase_ = 3;
               valueType_ = input.readDouble();
+              valueTypeCase_ = 3;
               break;
             }
           case 42:
@@ -182,8 +182,8 @@ private Value(
             }
           case 146:
             {
-              valueTypeCase_ = 18;
               valueType_ = input.readBytes();
+              valueTypeCase_ = 18;
               break;
             }
           case 152:
@@ -202,6 +202,8 @@ private Value(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -1964,8 +1966,9 @@ public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) {
       } else {
         if (valueTypeCase_ == 10) {
           timestampValueBuilder_.mergeFrom(value);
+        } else {
+          timestampValueBuilder_.setMessage(value);
         }
-        timestampValueBuilder_.setMessage(value);
       }
       valueTypeCase_ = 10;
       return this;
@@ -2176,8 +2179,9 @@ public Builder mergeKeyValue(com.google.datastore.v1.Key value) {
       } else {
         if (valueTypeCase_ == 5) {
           keyValueBuilder_.mergeFrom(value);
+        } else {
+          keyValueBuilder_.setMessage(value);
         }
-        keyValueBuilder_.setMessage(value);
       }
       valueTypeCase_ = 5;
       return this;
@@ -2608,8 +2612,9 @@ public Builder mergeGeoPointValue(com.google.type.LatLng value) {
       } else {
         if (valueTypeCase_ == 8) {
           geoPointValueBuilder_.mergeFrom(value);
+        } else {
+          geoPointValueBuilder_.setMessage(value);
         }
-        geoPointValueBuilder_.setMessage(value);
       }
       valueTypeCase_ = 8;
       return this;
@@ -2826,8 +2831,9 @@ public Builder mergeEntityValue(com.google.datastore.v1.Entity value) {
       } else {
         if (valueTypeCase_ == 6) {
           entityValueBuilder_.mergeFrom(value);
+        } else {
+          entityValueBuilder_.setMessage(value);
         }
-        entityValueBuilder_.setMessage(value);
       }
       valueTypeCase_ = 6;
       return this;
@@ -3059,8 +3065,9 @@ public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) {
       } else {
         if (valueTypeCase_ == 9) {
           arrayValueBuilder_.mergeFrom(value);
+        } else {
+          arrayValueBuilder_.setMessage(value);
         }
-        arrayValueBuilder_.setMessage(value);
       }
       valueTypeCase_ = 9;
       return this;

From 252a17490337dfef213e6296aadbaf592c0d1e9e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 19 May 2022 23:52:37 +0000
Subject: [PATCH 0848/1784] feat: add build scripts for native image testing in
 Java 17 (#1440) (#739)

Source-Link: https://github.com/googleapis/synthtool/commit/505ce5a7edb58bf6d9d4de10b4bb4e81000ae324
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74
---
 .github/.OwlBot.lock.yaml               |  4 +--
 .kokoro/build.sh                        |  5 ++++
 .kokoro/presubmit/graalvm-native-17.cfg | 33 +++++++++++++++++++++++++
 README.md                               |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 .kokoro/presubmit/graalvm-native-17.cfg

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index f60d774937f6..a79f06271b60 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813
-# created: 2022-04-06T16:30:03.627422514Z
+  digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74
+# created: 2022-05-19T15:12:45.278246753Z
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index aa42294793a8..048db943b50b 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -74,6 +74,11 @@ graalvm)
     mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
+graalvm17)
+    # Run Unit and Integration Tests with Native Image
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    RETURN_CODE=$?
+    ;;
 samples)
     SAMPLES_DIR=samples
     # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
new file mode 100644
index 000000000000..a3f7fb9d4943
--- /dev/null
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm17"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index f8b96a912b39..2e264ed40042 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:25.2.0')
+implementation platform('com.google.cloud:libraries-bom:25.3.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```

From 8eb0c5f6f2cdb0b681fad012a45bad253be6cb8a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 20 May 2022 19:57:07 +0200
Subject: [PATCH 0849/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.11.0 (#737)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.11.0

* 🦉 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 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2fbc203a51ad..da164bac767d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.10.0
+        2.11.0
         pom
         import
       

From a057ecb1dfb38943aa633d6a539ef0da99f107ca Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 20 May 2022 19:57:33 +0200
Subject: [PATCH 0850/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v25.3.0 (#735)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v25.3.0

* 🦉 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/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2e264ed40042..f3f195973f40 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      25.2.0
+      25.3.0
       pom
       import
     
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 12e644d19926..93eb45f2bf49 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        25.2.0
+        25.3.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e1ad5fd7db47..0df17e88b72b 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        25.2.0
+        25.3.0
         pom
         import
       

From 06bb08f6929c8e2b539a5c296d9c500d46c857af Mon Sep 17 00:00:00 2001
From: yixiaoshen 
Date: Mon, 23 May 2022 12:06:16 -0700
Subject: [PATCH 0851/1784] feat: add ReadOption.ReadTime to support timestamp
 reads. (#712)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 .../google/cloud/datastore/DatastoreImpl.java | 30 ++++++--
 .../google/cloud/datastore/ReadOption.java    | 31 ++++++++
 .../google/cloud/datastore/DatastoreTest.java | 48 +++++++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   | 70 +++++++++++++++++++
 4 files changed, 173 insertions(+), 6 deletions(-)

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 f4bd6b0be1c0..9892e151752c 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
@@ -23,6 +23,7 @@
 import com.google.cloud.RetryHelper.RetryHelperException;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.datastore.ReadOption.EventualConsistency;
+import com.google.cloud.datastore.ReadOption.ReadTime;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
@@ -338,12 +339,29 @@ public Iterator get(Iterable keys, ReadOption... options) {
 
   private static com.google.datastore.v1.ReadOptions toReadOptionsPb(ReadOption... options) {
     com.google.datastore.v1.ReadOptions readOptionsPb = null;
-    if (options != null
-        && ReadOption.asImmutableMap(options).containsKey(EventualConsistency.class)) {
-      readOptionsPb =
-          com.google.datastore.v1.ReadOptions.newBuilder()
-              .setReadConsistency(ReadConsistency.EVENTUAL)
-              .build();
+    if (options != null) {
+      Map, ReadOption> optionsByType =
+          ReadOption.asImmutableMap(options);
+
+      if (optionsByType.containsKey(EventualConsistency.class)
+          && optionsByType.containsKey(ReadTime.class)) {
+        throw DatastoreException.throwInvalidRequest(
+            "Can not use eventual consistency read with read time.");
+      }
+
+      if (optionsByType.containsKey(EventualConsistency.class)) {
+        readOptionsPb =
+            com.google.datastore.v1.ReadOptions.newBuilder()
+                .setReadConsistency(ReadConsistency.EVENTUAL)
+                .build();
+      }
+
+      if (optionsByType.containsKey(ReadTime.class)) {
+        readOptionsPb =
+            com.google.datastore.v1.ReadOptions.newBuilder()
+                .setReadTime(((ReadTime) optionsByType.get(ReadTime.class)).time().toProto())
+                .build();
+      }
     }
     return readOptionsPb;
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index 69fe58513c5a..a30533e2d07b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -16,6 +16,8 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
+import com.google.cloud.Timestamp;
 import com.google.common.collect.ImmutableMap;
 import java.io.Serializable;
 import java.util.Map;
@@ -47,6 +49,25 @@ public boolean isEventual() {
     }
   }
 
+  /**
+   * Reads entities as they were at the given time. This may not be older than 270 seconds. This
+   * value is only supported for Cloud Firestore in Datastore mode.
+   */
+  public static final class ReadTime extends ReadOption {
+
+    private static final long serialVersionUID = -6780321449114616067L;
+
+    private final Timestamp time;
+
+    private ReadTime(Timestamp time) {
+      this.time = time;
+    }
+
+    public Timestamp time() {
+      return time;
+    }
+  }
+
   private ReadOption() {}
 
   /**
@@ -57,6 +78,16 @@ public static EventualConsistency eventualConsistency() {
     return new EventualConsistency(true);
   }
 
+  /**
+   * Returns a {@code ReadOption} that specifies read time, allowing Datastore to return results
+   * from lookups and queries at a particular timestamp. This feature is currently in private
+   * preview.
+   */
+  @BetaApi
+  public static ReadTime readTime(Timestamp time) {
+    return new ReadTime(time);
+  }
+
   static Map, ReadOption> asImmutableMap(ReadOption... options) {
     ImmutableMap.Builder, ReadOption> builder = ImmutableMap.builder();
     for (ReadOption option : options) {
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 0a532b176f6e..fa077bc61e38 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
@@ -789,6 +789,26 @@ public void testEventualConsistencyQuery() {
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
+  @Test
+  public void testReadTimeQuery() {
+    Timestamp timestamp = Timestamp.now();
+    ReadOptions readOption = ReadOptions.newBuilder().setReadTime(timestamp.toProto()).build();
+    com.google.datastore.v1.GqlQuery query =
+        com.google.datastore.v1.GqlQuery.newBuilder().setQueryString("FROM * SELECT *").build();
+    RunQueryRequest.Builder expectedRequest =
+        RunQueryRequest.newBuilder()
+            .setReadOptions(readOption)
+            .setGqlQuery(query)
+            .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build());
+    EasyMock.expect(rpcMock.runQuery(expectedRequest.build()))
+        .andReturn(RunQueryResponse.newBuilder().build());
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    Datastore datastore = rpcMockOptions.getService();
+    datastore.run(
+        Query.newGqlQueryBuilder("FROM * SELECT *").build(), ReadOption.readTime(timestamp));
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
   @Test
   public void testToUrlSafe() {
     byte[][] invalidUtf8 =
@@ -921,6 +941,34 @@ public void testLookupEventualConsistency() {
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
+  @Test
+  public void testLookupReadTime() {
+    Timestamp timestamp = Timestamp.now();
+    ReadOptions readOption = ReadOptions.newBuilder().setReadTime(timestamp.toProto()).build();
+    com.google.datastore.v1.Key key =
+        com.google.datastore.v1.Key.newBuilder()
+            .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build())
+            .addPath(
+                com.google.datastore.v1.Key.PathElement.newBuilder()
+                    .setKind("kind1")
+                    .setName("name")
+                    .build())
+            .build();
+    LookupRequest lookupRequest =
+        LookupRequest.newBuilder().setReadOptions(readOption).addKeys(key).build();
+    EasyMock.expect(rpcMock.lookup(lookupRequest))
+        .andReturn(LookupResponse.newBuilder().build())
+        .times(3);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    com.google.cloud.datastore.Datastore datastore = rpcMockOptions.getService();
+    datastore.get(KEY1, com.google.cloud.datastore.ReadOption.readTime(timestamp));
+    datastore.get(
+        ImmutableList.of(KEY1), com.google.cloud.datastore.ReadOption.readTime(timestamp));
+    datastore.fetch(
+        ImmutableList.of(KEY1), com.google.cloud.datastore.ReadOption.readTime(timestamp));
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
   @Test
   public void testGetArrayNoDeferredResults() {
     datastore.put(ENTITY3);
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 3db8cfe3e8e9..21acf598c757 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
@@ -50,6 +50,7 @@
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.Query.ResultType;
 import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.ReadOption;
 import com.google.cloud.datastore.StringValue;
 import com.google.cloud.datastore.StructuredQuery;
 import com.google.cloud.datastore.StructuredQuery.OrderBy;
@@ -647,6 +648,31 @@ public void testGet() {
     assertFalse(entity.contains("bla"));
   }
 
+  @Test
+  public void testGetWithReadTime() throws InterruptedException {
+    Key key = Key.newBuilder(PROJECT_ID, "new_kind", "name").setNamespace(NAMESPACE).build();
+
+    try {
+      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());
+
+      Entity entity = DATASTORE.get(key);
+      StringValue value1 = entity.getValue("str");
+      assertEquals(StringValue.of("new_str_value"), value1);
+
+      entity = DATASTORE.get(key, ReadOption.readTime(now));
+      value1 = entity.getValue("str");
+      assertEquals(StringValue.of("old_str_value"), value1);
+    } finally {
+      DATASTORE.delete(key);
+    }
+  }
+
   @Test
   public void testGetArrayNoDeferredResults() {
     DATASTORE.put(ENTITY3);
@@ -920,4 +946,48 @@ public void testQueryWithStartCursor() {
     assertEquals(cursor2, cursor1);
     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())
+            .build();
+    Entity entity2 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-02").setNamespace(NAMESPACE).build())
+            .build();
+    Entity entity3 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-03").setNamespace(NAMESPACE).build())
+            .build();
+
+    DATASTORE.put(entity1, entity2);
+    Thread.sleep(1000);
+    Timestamp now = Timestamp.now();
+    Thread.sleep(1000);
+    DATASTORE.put(entity3);
+
+    try {
+      Query query = Query.newEntityQueryBuilder().setKind("new_kind").build();
+
+      QueryResults withoutReadTime = DATASTORE.run(query);
+      assertTrue(withoutReadTime.hasNext());
+      assertEquals(entity1, withoutReadTime.next());
+      assertTrue(withoutReadTime.hasNext());
+      assertEquals(entity2, withoutReadTime.next());
+      assertTrue(withoutReadTime.hasNext());
+      assertEquals(entity3, withoutReadTime.next());
+      assertFalse(withoutReadTime.hasNext());
+
+      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());
+    }
+  }
 }

From 5c3676e871264b552b579ea5d492c02ab54d501e Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 23 May 2022 16:21:40 -0400
Subject: [PATCH 0852/1784] deps: update shared deps to 2.12.0 (#740)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index da164bac767d..28748338a5cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.11.0
+        2.12.0
         pom
         import
       

From c04b37e23eae737ed67a6900677f07db743bd287 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 20:28:26 +0000
Subject: [PATCH 0853/1784] chore(main): release 2.5.0 (#729)

:robot: I have created a release *beep* *boop*
---


## [2.5.0](https://github.com/googleapis/java-datastore/compare/v2.4.0...v2.5.0) (2022-05-23)


### Features

* add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/java-datastore/issues/1440)) ([#739](https://github.com/googleapis/java-datastore/issues/739)) ([252a174](https://github.com/googleapis/java-datastore/commit/252a17490337dfef213e6296aadbaf592c0d1e9e))
* add ReadOption.ReadTime to support timestamp reads. ([#712](https://github.com/googleapis/java-datastore/issues/712)) ([06bb08f](https://github.com/googleapis/java-datastore/commit/06bb08f6929c8e2b539a5c296d9c500d46c857af))


### Bug Fixes

* **java:** rename test to be picked up by native profile ([#723](https://github.com/googleapis/java-datastore/issues/723)) ([3a30e75](https://github.com/googleapis/java-datastore/commit/3a30e7520927a50b8457dd5ceea9700407a17e69))


### Documentation

* **samples:** remove unused dependency ([#730](https://github.com/googleapis/java-datastore/issues/730)) ([5185691](https://github.com/googleapis/java-datastore/commit/51856917a2ca59b889460f962e9f90d7a1c02f2f))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.11.0 ([#737](https://github.com/googleapis/java-datastore/issues/737)) ([8eb0c5f](https://github.com/googleapis/java-datastore/commit/8eb0c5f6f2cdb0b681fad012a45bad253be6cb8a))
* update shared deps to 2.12.0 ([#740](https://github.com/googleapis/java-datastore/issues/740)) ([5c3676e](https://github.com/googleapis/java-datastore/commit/5c3676e871264b552b579ea5d492c02ab54d501e))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 24 ++++++++++++++++++++++++
 datastore-v1-proto-client/pom.xml       |  4 ++--
 google-cloud-datastore-bom/pom.xml      |  6 +++---
 google-cloud-datastore/pom.xml          |  4 ++--
 pom.xml                                 |  8 ++++----
 proto-google-cloud-datastore-v1/pom.xml |  4 ++--
 versions.txt                            |  8 ++++----
 7 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd2685ecf981..057e2e991775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## [2.5.0](https://github.com/googleapis/java-datastore/compare/v2.4.0...v2.5.0) (2022-05-23)
+
+
+### Features
+
+* add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/java-datastore/issues/1440)) ([#739](https://github.com/googleapis/java-datastore/issues/739)) ([252a174](https://github.com/googleapis/java-datastore/commit/252a17490337dfef213e6296aadbaf592c0d1e9e))
+* add ReadOption.ReadTime to support timestamp reads. ([#712](https://github.com/googleapis/java-datastore/issues/712)) ([06bb08f](https://github.com/googleapis/java-datastore/commit/06bb08f6929c8e2b539a5c296d9c500d46c857af))
+
+
+### Bug Fixes
+
+* **java:** rename test to be picked up by native profile ([#723](https://github.com/googleapis/java-datastore/issues/723)) ([3a30e75](https://github.com/googleapis/java-datastore/commit/3a30e7520927a50b8457dd5ceea9700407a17e69))
+
+
+### Documentation
+
+* **samples:** remove unused dependency ([#730](https://github.com/googleapis/java-datastore/issues/730)) ([5185691](https://github.com/googleapis/java-datastore/commit/51856917a2ca59b889460f962e9f90d7a1c02f2f))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.11.0 ([#737](https://github.com/googleapis/java-datastore/issues/737)) ([8eb0c5f](https://github.com/googleapis/java-datastore/commit/8eb0c5f6f2cdb0b681fad012a45bad253be6cb8a))
+* update shared deps to 2.12.0 ([#740](https://github.com/googleapis/java-datastore/issues/740)) ([5c3676e](https://github.com/googleapis/java-datastore/commit/5c3676e871264b552b579ea5d492c02ab54d501e))
+
 ## [2.4.0](https://github.com/googleapis/java-datastore/compare/v2.3.1...v2.4.0) (2022-04-21)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index dcb521be9e84..464ea7bb632f 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.4.1-SNAPSHOT
+  2.5.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.4.1-SNAPSHOT
+    2.5.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 25ad155cf445..2a258891de8e 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.4.1-SNAPSHOT
+  2.5.0
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.4.1-SNAPSHOT
+        2.5.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.95.1-SNAPSHOT
+        0.96.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0defa11b75b9..6262b90b9025 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.4.1-SNAPSHOT
+  2.5.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.4.1-SNAPSHOT
+    2.5.0
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 28748338a5cd..2967bfb77104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.4.1-SNAPSHOT
+  2.5.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.4.1-SNAPSHOT
+        2.5.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.95.1-SNAPSHOT
+        0.96.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.4.1-SNAPSHOT
+        2.5.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 13e5d417e0b4..739bc1264327 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.95.1-SNAPSHOT
+  0.96.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.4.1-SNAPSHOT
+    2.5.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 6292b3d15d2f..f53b32f89fb2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.4.0:2.4.1-SNAPSHOT
-google-cloud-datastore-bom:2.4.0:2.4.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.95.0:0.95.1-SNAPSHOT
-datastore-v1-proto-client:2.4.0:2.4.1-SNAPSHOT
+google-cloud-datastore:2.5.0:2.5.0
+google-cloud-datastore-bom:2.5.0:2.5.0
+proto-google-cloud-datastore-v1:0.96.0:0.96.0
+datastore-v1-proto-client:2.5.0:2.5.0

From c49b9ee41a206bf81156187878a9089523cf1f60 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 20:36:36 +0000
Subject: [PATCH 0854/1784] chore(main): release 2.5.1-SNAPSHOT (#741)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 464ea7bb632f..004744566598 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.5.0
+  2.5.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.0
+    2.5.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2a258891de8e..37ff5d363c62 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.5.0
+  2.5.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.5.0
+        2.5.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.0
+        0.96.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6262b90b9025..8041474624b8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.5.0
+  2.5.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.0
+    2.5.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 2967bfb77104..b394cd36db70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.5.0
+  2.5.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.5.0
+        2.5.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.0
+        0.96.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.5.0
+        2.5.1-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 739bc1264327..973acd2e3c59 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.96.0
+  0.96.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.0
+    2.5.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index f53b32f89fb2..bb6cdf1335d5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.5.0:2.5.0
-google-cloud-datastore-bom:2.5.0:2.5.0
-proto-google-cloud-datastore-v1:0.96.0:0.96.0
-datastore-v1-proto-client:2.5.0:2.5.0
+google-cloud-datastore:2.5.0:2.5.1-SNAPSHOT
+google-cloud-datastore-bom:2.5.0:2.5.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.96.0:0.96.1-SNAPSHOT
+datastore-v1-proto-client:2.5.0:2.5.1-SNAPSHOT

From e8ba44f0fe4bda26c0e4c1a89028265ec276daa8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 24 May 2022 17:12:08 +0200
Subject: [PATCH 0855/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.5.0 (#743)
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.5.0

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f3f195973f40..a232fa67144c 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.4.0
+  2.5.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.4.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.5.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.4.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.5.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index b023270a44af..246aa7026d0c 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.4.0
+      2.5.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ae55572d1617..6deb0824f598 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.4.0
+      2.5.0
     
 
     

From 51d9244b10f5bb754785e8267a51fddd9cdb6cb5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 26 May 2022 00:20:17 +0200
Subject: [PATCH 0856/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.14.0 (#744)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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.13.1` -> `2.14.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.14.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.14.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.14.0/compatibility-slim/2.13.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.14.0/confidence-slim/2.13.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone

### [`v2.14.0`](https://togithub.com/google/error-prone/releases/tag/v2.14.0)

[Compare Source](https://togithub.com/google/error-prone/compare/v2.13.1...v2.14.0)

New checkers:

-   [`BanJNDI`](https://errorprone.info/bugpattern/BanJNDI)
-   [`EmptyTopLevelDeclaration`](https://errorprone.info/bugpattern/EmptyTopLevelDeclaration)
-   [`ErroneousBitwiseExpression`](https://errorprone.info/bugpattern/ErroneousBitwiseExpression)
-   [`FuzzyEqualsShouldNotBeUsedInEqualsMethod`](https://errorprone.info/bugpattern/FuzzyEqualsShouldNotBeUsedInEqualsMethod)
-   [`Interruption`](https://errorprone.info/bugpattern/Interruption)
-   [`NullableOnContainingClass`](https://errorprone.info/bugpattern/NullableOnContainingClass)

Fixed issues: [#​3110](https://togithub.com/google/error-prone/issues/3110), [#​3193](https://togithub.com/google/error-prone/issues/3193)

**Full Changelog**: https://github.com/google/error-prone/compare/v2.13.1...v2.14.0


    

---

### Configuration

📅 **Schedule**: 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://renovate.whitesourcesoftware.com). 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 b394cd36db70..e05decab463b 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.13.1
+    2.14.0
       
 
   

From bd7f045271bbeda2ed52b9fc0b20a2fcc3ffc350 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 25 May 2022 22:34:20 +0000
Subject: [PATCH 0857/1784] chore(main): release 2.5.1 (#750)

:robot: I have created a release *beep* *boop*
---


### [2.5.1](https://github.com/googleapis/java-datastore/compare/v2.5.0...v2.5.1) (2022-05-25)


### Dependencies

* update dependency com.google.errorprone:error_prone_core to v2.14.0 ([#744](https://github.com/googleapis/java-datastore/issues/744)) ([51d9244](https://github.com/googleapis/java-datastore/commit/51d9244b10f5bb754785e8267a51fddd9cdb6cb5))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                            | 7 +++++++
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 057e2e991775..3379e26c711c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.5.1](https://github.com/googleapis/java-datastore/compare/v2.5.0...v2.5.1) (2022-05-25)
+
+
+### Dependencies
+
+* update dependency com.google.errorprone:error_prone_core to v2.14.0 ([#744](https://github.com/googleapis/java-datastore/issues/744)) ([51d9244](https://github.com/googleapis/java-datastore/commit/51d9244b10f5bb754785e8267a51fddd9cdb6cb5))
+
 ## [2.5.0](https://github.com/googleapis/java-datastore/compare/v2.4.0...v2.5.0) (2022-05-23)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 004744566598..143933cd5d3e 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.5.1-SNAPSHOT
+  2.5.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.1-SNAPSHOT
+    2.5.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 37ff5d363c62..f51da60b5395 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.5.1-SNAPSHOT
+  2.5.1
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.5.1-SNAPSHOT
+        2.5.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.1-SNAPSHOT
+        0.96.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8041474624b8..a9a5d6f26f25 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.5.1-SNAPSHOT
+  2.5.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.1-SNAPSHOT
+    2.5.1
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index e05decab463b..f155b790f462 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.5.1-SNAPSHOT
+  2.5.1
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.5.1-SNAPSHOT
+        2.5.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.1-SNAPSHOT
+        0.96.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.5.1-SNAPSHOT
+        2.5.1
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 973acd2e3c59..6ffe265016cb 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.96.1-SNAPSHOT
+  0.96.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.1-SNAPSHOT
+    2.5.1
   
   
     
diff --git a/versions.txt b/versions.txt
index bb6cdf1335d5..757a1a2bc1f7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.5.0:2.5.1-SNAPSHOT
-google-cloud-datastore-bom:2.5.0:2.5.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.96.0:0.96.1-SNAPSHOT
-datastore-v1-proto-client:2.5.0:2.5.1-SNAPSHOT
+google-cloud-datastore:2.5.1:2.5.1
+google-cloud-datastore-bom:2.5.1:2.5.1
+proto-google-cloud-datastore-v1:0.96.1:0.96.1
+datastore-v1-proto-client:2.5.1:2.5.1

From 24fae849c4bb8ce53b781faa1c21c1f6b408d797 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 25 May 2022 22:42:16 +0000
Subject: [PATCH 0858/1784] chore(main): release 2.5.2-SNAPSHOT (#751)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml       | 4 ++--
 google-cloud-datastore-bom/pom.xml      | 6 +++---
 google-cloud-datastore/pom.xml          | 4 ++--
 pom.xml                                 | 8 ++++----
 proto-google-cloud-datastore-v1/pom.xml | 4 ++--
 versions.txt                            | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 143933cd5d3e..3d35992b47d9 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.5.1
+  2.5.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.1
+    2.5.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f51da60b5395..a23405e48c07 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.5.1
+  2.5.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,12 +52,12 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.5.1
+        2.5.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.1
+        0.96.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a9a5d6f26f25..9635f1c75d60 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.5.1
+  2.5.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.1
+    2.5.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index f155b790f462..73853572c1e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.5.1
+  2.5.2-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,17 +159,17 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.5.1
+        2.5.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.1
+        0.96.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.5.1
+        2.5.2-SNAPSHOT
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6ffe265016cb..8a5e446c27d6 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.96.1
+  0.96.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.1
+    2.5.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 757a1a2bc1f7..5896f28c077a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.5.1:2.5.1
-google-cloud-datastore-bom:2.5.1:2.5.1
-proto-google-cloud-datastore-v1:0.96.1:0.96.1
-datastore-v1-proto-client:2.5.1:2.5.1
+google-cloud-datastore:2.5.1:2.5.2-SNAPSHOT
+google-cloud-datastore-bom:2.5.1:2.5.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.96.1:0.96.2-SNAPSHOT
+datastore-v1-proto-client:2.5.1:2.5.2-SNAPSHOT

From 48d0ba0bbc3080ff531ff4e9f6adf1de57d12721 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 26 May 2022 16:34:19 +0200
Subject: [PATCH 0859/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.5.1 (#753)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.5.0` -> `2.5.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.5.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.5.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.5.1/compatibility-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.5.1/confidence-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).
---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a232fa67144c..8ef1502657c6 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.5.0
+  2.5.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.5.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.5.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.5.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.5.1"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 246aa7026d0c..acc179dbc4ec 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.5.0
+      2.5.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 6deb0824f598..d333543e6279 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.5.0
+      2.5.1
     
 
     

From 3dd882a9ffe2a8828cdedcdc2e562c9354aebfbc Mon Sep 17 00:00:00 2001
From: Patrick Costello 
Date: Tue, 31 May 2022 10:00:05 -0700
Subject: [PATCH 0860/1784] feat: Expose Datastore Admin generated client
 (#748)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Create proto & grpc for Datastore admin V1.

* feat: Publish gapic admin client.

* chore: Run owl manually.

Correct missing dependencies not generated by owl.

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Remove incorrect dependency on locations grpc API.

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.yaml                          |    7 +
 google-cloud-datastore-bom/pom.xml            |   10 +
 google-cloud-datastore/pom.xml                |   27 +
 .../admin/v1/DatastoreAdminClient.java        |  970 +++++
 .../admin/v1/DatastoreAdminSettings.java      |  302 ++
 .../datastore/admin/v1/gapic_metadata.json    |   36 +
 .../datastore/admin/v1/package-info.java      |   95 +
 .../admin/v1/stub/DatastoreAdminStub.java     |  104 +
 .../v1/stub/DatastoreAdminStubSettings.java   |  670 ++++
 .../GrpcDatastoreAdminCallableFactory.java    |  113 +
 .../admin/v1/stub/GrpcDatastoreAdminStub.java |  385 ++
 .../admin/v1/DatastoreAdminClientTest.java    |  428 +++
 .../admin/v1/MockDatastoreAdmin.java          |   59 +
 .../admin/v1/MockDatastoreAdminImpl.java      |  192 +
 grpc-google-cloud-datastore-admin-v1/pom.xml  |   69 +
 .../admin/v1/DatastoreAdminGrpc.java          | 1241 +++++++
 pom.xml                                       |   17 +
 .../clirr-ignored-differences.xml             |   19 +
 proto-google-cloud-datastore-admin-v1/pom.xml |   34 +
 .../datastore/admin/v1/CommonMetadata.java    | 1912 ++++++++++
 .../admin/v1/CommonMetadataOrBuilder.java     |  206 ++
 .../admin/v1/CreateIndexRequest.java          |  920 +++++
 .../admin/v1/CreateIndexRequestOrBuilder.java |   88 +
 .../admin/v1/DatastoreAdminProto.java         |  405 ++
 .../DatastoreFirestoreMigrationMetadata.java  |  797 ++++
 ...reFirestoreMigrationMetadataOrBuilder.java |   79 +
 .../admin/v1/DeleteIndexRequest.java          |  816 ++++
 .../admin/v1/DeleteIndexRequestOrBuilder.java |   75 +
 .../datastore/admin/v1/EntityFilter.java      | 1102 ++++++
 .../admin/v1/EntityFilterOrBuilder.java       |  147 +
 .../admin/v1/ExportEntitiesMetadata.java      | 1775 +++++++++
 .../v1/ExportEntitiesMetadataOrBuilder.java   |  198 +
 .../admin/v1/ExportEntitiesRequest.java       | 1517 ++++++++
 .../v1/ExportEntitiesRequestOrBuilder.java    |  192 +
 .../admin/v1/ExportEntitiesResponse.java      |  659 ++++
 .../v1/ExportEntitiesResponseOrBuilder.java   |   56 +
 .../datastore/admin/v1/GetIndexRequest.java   |  813 ++++
 .../admin/v1/GetIndexRequestOrBuilder.java    |   75 +
 .../admin/v1/ImportEntitiesMetadata.java      | 1754 +++++++++
 .../v1/ImportEntitiesMetadataOrBuilder.java   |  192 +
 .../admin/v1/ImportEntitiesRequest.java       | 1532 ++++++++
 .../v1/ImportEntitiesRequestOrBuilder.java    |  195 +
 .../com/google/datastore/admin/v1/Index.java  | 3265 +++++++++++++++++
 .../admin/v1/IndexOperationMetadata.java      | 1191 ++++++
 .../v1/IndexOperationMetadataOrBuilder.java   |  120 +
 .../datastore/admin/v1/IndexOrBuilder.java    |  220 ++
 .../google/datastore/admin/v1/IndexProto.java |  106 +
 .../admin/v1/ListIndexesRequest.java          | 1047 ++++++
 .../admin/v1/ListIndexesRequestOrBuilder.java |  102 +
 .../admin/v1/ListIndexesResponse.java         | 1129 ++++++
 .../v1/ListIndexesResponseOrBuilder.java      |  101 +
 .../admin/v1/MigrationProgressEvent.java      | 2963 +++++++++++++++
 .../v1/MigrationProgressEventOrBuilder.java   |  141 +
 .../datastore/admin/v1/MigrationProto.java    |  137 +
 .../datastore/admin/v1/MigrationState.java    |  198 +
 .../admin/v1/MigrationStateEvent.java         |  613 ++++
 .../v1/MigrationStateEventOrBuilder.java      |   50 +
 .../datastore/admin/v1/MigrationStep.java     |  288 ++
 .../datastore/admin/v1/OperationType.java     |  220 ++
 .../google/datastore/admin/v1/Progress.java   |  641 ++++
 .../datastore/admin/v1/ProgressOrBuilder.java |   53 +
 .../datastore/admin/v1/datastore_admin.proto  |  511 +++
 .../google/datastore/admin/v1/index.proto     |  116 +
 .../google/datastore/admin/v1/migration.proto |  123 +
 .../java/com/google/datastore/v1/Key.java     |   63 +
 .../proto/google/datastore/v1/entity.proto    |   11 +
 versions.txt                                  |    2 +
 67 files changed, 33694 insertions(+)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/gapic_metadata.json
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
 create mode 100644 grpc-google-cloud-datastore-admin-v1/pom.xml
 create mode 100644 grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml
 create mode 100644 proto-google-cloud-datastore-admin-v1/pom.xml
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
 create mode 100644 proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto

diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
index d110678c0179..d89045599416 100644
--- a/.github/.OwlBot.yaml
+++ b/.github/.OwlBot.yaml
@@ -23,3 +23,10 @@ deep-preserve-regex:
 deep-copy-regex:
 - source: "/google/datastore/(v.*)/.*-java/proto-google-.*/src"
   dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-$1/src"
+- source: "/google/datastore/admin/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-admin-$1/src"
+- source: "/google/datastore/admin/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-admin-$1/src"
+# Admin & Data APIs share the same wrapper library.
+- source: "/google/datastore/admin/(v.*)/.*-java/gapic-google-.*/src"
+  dest: "/owl-bot-staging/$1/google-cloud-datastore/src"
\ No newline at end of file
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a23405e48c07..61f5da040345 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -54,11 +54,21 @@
         google-cloud-datastore
         2.5.2-SNAPSHOT
       
+      
+        com.google.api.grpc
+        grpc-google-cloud-datastore-admin-v1
+        2.5.2-SNAPSHOT
+      
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
         0.96.2-SNAPSHOT
       
+      
+        com.google.api.grpc
+        proto-google-cloud-datastore-admin-v1
+        2.5.2-SNAPSHOT
+      
     
   
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9635f1c75d60..53ebc76a0008 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -18,6 +18,10 @@
     google-cloud-datastore
   
   
+    
+      com.google.api.grpc
+      grpc-google-cloud-datastore-admin-v1
+    
     
       com.google.cloud
       google-cloud-core-http
@@ -26,6 +30,10 @@
       com.google.api.grpc
       proto-google-cloud-datastore-v1
     
+    
+      com.google.api.grpc
+      proto-google-cloud-datastore-admin-v1
+    
     
       com.google.cloud.datastore
       datastore-v1-proto-client
@@ -34,6 +42,14 @@
       io.grpc
       grpc-api
     
+    
+      io.grpc
+      grpc-protobuf
+    
+    
+      io.grpc
+      grpc-stub
+    
     
       com.google.api
       api-common
@@ -50,6 +66,10 @@
       com.google.api
       gax
     
+    
+      com.google.api
+      gax-grpc
+    
     
       com.google.guava
       guava
@@ -90,6 +110,13 @@
       test-jar
       test
     
+    
+    
+      com.google.api
+      gax-grpc
+      testlib
+      test
+    
     
       junit
       junit
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
new file mode 100644
index 000000000000..5bbcc6a29331
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -0,0 +1,970 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1;
+
+import com.google.api.core.ApiFuture;
+import com.google.api.core.ApiFutures;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.api.gax.paging.AbstractFixedSizeCollection;
+import com.google.api.gax.paging.AbstractPage;
+import com.google.api.gax.paging.AbstractPagedListResponse;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PageContext;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.datastore.admin.v1.stub.DatastoreAdminStub;
+import com.google.cloud.datastore.admin.v1.stub.DatastoreAdminStubSettings;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.EntityFilter;
+import com.google.datastore.admin.v1.ExportEntitiesMetadata;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesMetadata;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.IndexOperationMetadata;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.longrunning.OperationsClient;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Service Description: Google Cloud Datastore Admin API
+ *
+ * 
    The Datastore Admin API provides several admin services for Cloud Datastore.
+ *
+ * 
    ----------------------------------------------------------------------------- ## Concepts
+ *
+ * 
    Project, namespace, kind, and entity as defined in the Google Cloud Datastore API.
+ *
+ * 
    Operation: An Operation represents work being performed in the background.
+ *
+ * 
    EntityFilter: Allows specifying a subset of entities in a project. This is specified as a
+ * combination of kinds and namespaces (either or both of which may be all).
+ *
+ * 
    ----------------------------------------------------------------------------- ## Services
+ *
+ * 
    # Export/Import
+ *
+ * 
    The Export/Import service provides the ability to copy all or a subset of entities to/from
+ * Google Cloud Storage.
+ *
+ * 
    Exported data may be imported into Cloud Datastore for any Google Cloud Platform project. It
+ * is not restricted to the export source project. It is possible to export from one project and
+ * then import into another.
+ *
+ * 
    Exported data can also be loaded into Google BigQuery for analysis.
+ *
+ * 
    Exports and imports are performed asynchronously. An Operation resource is created for each
+ * export/import. The state (including any errors encountered) of the export/import may be queried
+ * via the Operation resource.
+ *
+ * 
    # Index
+ *
+ * 
    The index service manages Cloud Datastore composite indexes.
+ *
+ * 
    Index creation and deletion are performed asynchronously. An Operation resource is created for
+ * each such asynchronous operation. The state of the operation (including any errors encountered)
+ * may be queried via the Operation resource.
+ *
+ * 
    # Operation
+ *
+ * 
    The Operations collection provides a record of actions performed for the specified project
+ * (including any operations in progress). Operations are not created directly but through calls on
+ * other collections or resources.
+ *
+ * 
    An operation that is not yet done may be cancelled. The request to cancel is asynchronous and
+ * the operation may continue to run for some time after the request to cancel is made.
+ *
+ * 
    An operation that is done may be deleted so that it is no longer listed as part of the
+ * Operation collection.
+ *
+ * 
    ListOperations returns all pending operations, but not completed operations.
+ *
+ * 
    Operations are created by service DatastoreAdmin, but are accessed via service
+ * google.longrunning.Operations.
+ *
+ * 
    This class provides the ability to make remote calls to the backing service through method
+ * calls that map to API methods. Sample code to get started:
+ *
+ * 
    {@code
+ * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+ *   GetIndexRequest request =
+ *       GetIndexRequest.newBuilder()
+ *           .setProjectId("projectId-894832108")
+ *           .setIndexId("indexId1943291277")
+ *           .build();
+ *   Index response = datastoreAdminClient.getIndex(request);
+ * }
+ * }
    
+ *
+ * 
    Note: close() needs to be called on the DatastoreAdminClient object to clean up resources such
+ * as threads. In the example above, try-with-resources is used, which automatically calls close().
+ *
+ * 
    The surface of this class includes several types of Java methods for each of the API's
+ * methods:
+ *
+ * 
      
+ *   
    1. A "flattened" method. With this type of method, the fields of the request type have been
+ *       converted into function parameters. It may be the case that not all fields are available as
+ *       parameters, and not every API method will have a flattened method entry point.
+ *   
    2. A "request object" method. This type of method only takes one parameter, a request object,
+ *       which must be constructed before the call. Not every API method will have a request object
+ *       method.
+ *   
    3. A "callable" method. This type of method takes no parameters and returns an immutable API
+ *       callable object, which can be used to initiate calls to the service.
+ * 
    
+ *
+ * 
    See the individual methods for example code.
+ *
+ * 
    Many parameters require resource names to be formatted in a particular way. To assist with
+ * these names, this class includes a format method for each type of name, and additionally a parse
+ * method to extract the individual identifiers contained within names that are returned.
+ *
+ * 
    This class can be customized by passing in a custom instance of DatastoreAdminSettings to
+ * create(). For example:
+ *
+ * 
    To customize credentials:
+ *
+ * 
    {@code
+ * DatastoreAdminSettings datastoreAdminSettings =
+ *     DatastoreAdminSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .build();
+ * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings);
+ * }
    
+ *
+ * 
    To customize the endpoint:
+ *
+ * 
    {@code
+ * DatastoreAdminSettings datastoreAdminSettings =
+ *     DatastoreAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings);
+ * }
    
+ *
+ * 
    Please refer to the GitHub repository's samples for more quickstart code snippets.
+ */
+@Generated("by gapic-generator-java")
+public class DatastoreAdminClient implements BackgroundResource {
+  private final DatastoreAdminSettings settings;
+  private final DatastoreAdminStub stub;
+  private final OperationsClient operationsClient;
+
+  /** Constructs an instance of DatastoreAdminClient with default settings. */
+  public static final DatastoreAdminClient create() throws IOException {
+    return create(DatastoreAdminSettings.newBuilder().build());
+  }
+
+  /**
+   * Constructs an instance of DatastoreAdminClient, using the given settings. The channels are
+   * created based on the settings passed in, or defaults for any settings that are not set.
+   */
+  public static final DatastoreAdminClient create(DatastoreAdminSettings settings)
+      throws IOException {
+    return new DatastoreAdminClient(settings);
+  }
+
+  /**
+   * Constructs an instance of DatastoreAdminClient, using the given stub for making calls. This is
+   * for advanced usage - prefer using create(DatastoreAdminSettings).
+   */
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public static final DatastoreAdminClient create(DatastoreAdminStub stub) {
+    return new DatastoreAdminClient(stub);
+  }
+
+  /**
+   * Constructs an instance of DatastoreAdminClient, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected DatastoreAdminClient(DatastoreAdminSettings settings) throws IOException {
+    this.settings = settings;
+    this.stub = ((DatastoreAdminStubSettings) settings.getStubSettings()).createStub();
+    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  protected DatastoreAdminClient(DatastoreAdminStub stub) {
+    this.settings = null;
+    this.stub = stub;
+    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+  }
+
+  public final DatastoreAdminSettings getSettings() {
+    return settings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public DatastoreAdminStub getStub() {
+    return stub;
+  }
+
+  /**
+   * Returns the OperationsClient that can be used to query the status of a long-running operation
+   * returned by another API method call.
+   */
+  public final OperationsClient getOperationsClient() {
+    return operationsClient;
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Exports a copy of all or a subset of entities from Google Cloud Datastore to another storage
+   * system, such as Google Cloud Storage. Recent updates to entities may not be reflected in the
+   * export. The export occurs in the background and its progress can be monitored and managed via
+   * the Operation resource that is created. The output of an export may only be used once the
+   * associated operation is done. If an export operation is cancelled before completion it may
+   * leave partial data behind in Google Cloud Storage.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   Map labels = new HashMap<>();
+   *   EntityFilter entityFilter = EntityFilter.newBuilder().build();
+   *   String outputUrlPrefix = "outputUrlPrefix-1132598048";
+   *   ExportEntitiesResponse response =
+   *       datastoreAdminClient
+   *           .exportEntitiesAsync(projectId, labels, entityFilter, outputUrlPrefix)
+   *           .get();
+   * }
+   * }
    
+   *
+   * @param projectId Required. Project ID against which to make the request.
+   * @param labels Client-assigned labels.
+   * @param entityFilter Description of what data from the project is included in the export.
+   * @param outputUrlPrefix 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 name of the Cloud Storage
+   *     bucket and `NAMESPACE_PATH` is an optional Cloud Storage namespace path (this is not a
+   *     Cloud Datastore namespace). For more 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.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final OperationFuture exportEntitiesAsync(
+      String projectId,
+      Map labels,
+      EntityFilter entityFilter,
+      String outputUrlPrefix) {
+    ExportEntitiesRequest request =
+        ExportEntitiesRequest.newBuilder()
+            .setProjectId(projectId)
+            .putAllLabels(labels)
+            .setEntityFilter(entityFilter)
+            .setOutputUrlPrefix(outputUrlPrefix)
+            .build();
+    return exportEntitiesAsync(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Exports a copy of all or a subset of entities from Google Cloud Datastore to another storage
+   * system, such as Google Cloud Storage. Recent updates to entities may not be reflected in the
+   * export. The export occurs in the background and its progress can be monitored and managed via
+   * the Operation resource that is created. The output of an export may only be used once the
+   * associated operation is done. If an export operation is cancelled before completion it may
+   * leave partial data behind in Google Cloud Storage.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ExportEntitiesRequest request =
+   *       ExportEntitiesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .putAllLabels(new HashMap())
+   *           .setEntityFilter(EntityFilter.newBuilder().build())
+   *           .setOutputUrlPrefix("outputUrlPrefix-1132598048")
+   *           .build();
+   *   ExportEntitiesResponse response = datastoreAdminClient.exportEntitiesAsync(request).get();
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final OperationFuture exportEntitiesAsync(
+      ExportEntitiesRequest request) {
+    return exportEntitiesOperationCallable().futureCall(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Exports a copy of all or a subset of entities from Google Cloud Datastore to another storage
+   * system, such as Google Cloud Storage. Recent updates to entities may not be reflected in the
+   * export. The export occurs in the background and its progress can be monitored and managed via
+   * the Operation resource that is created. The output of an export may only be used once the
+   * associated operation is done. If an export operation is cancelled before completion it may
+   * leave partial data behind in Google Cloud Storage.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ExportEntitiesRequest request =
+   *       ExportEntitiesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .putAllLabels(new HashMap())
+   *           .setEntityFilter(EntityFilter.newBuilder().build())
+   *           .setOutputUrlPrefix("outputUrlPrefix-1132598048")
+   *           .build();
+   *   OperationFuture future =
+   *       datastoreAdminClient.exportEntitiesOperationCallable().futureCall(request);
+   *   // Do something.
+   *   ExportEntitiesResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final OperationCallable<
+          ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+      exportEntitiesOperationCallable() {
+    return stub.exportEntitiesOperationCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Exports a copy of all or a subset of entities from Google Cloud Datastore to another storage
+   * system, such as Google Cloud Storage. Recent updates to entities may not be reflected in the
+   * export. The export occurs in the background and its progress can be monitored and managed via
+   * the Operation resource that is created. The output of an export may only be used once the
+   * associated operation is done. If an export operation is cancelled before completion it may
+   * leave partial data behind in Google Cloud Storage.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ExportEntitiesRequest request =
+   *       ExportEntitiesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .putAllLabels(new HashMap())
+   *           .setEntityFilter(EntityFilter.newBuilder().build())
+   *           .setOutputUrlPrefix("outputUrlPrefix-1132598048")
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreAdminClient.exportEntitiesCallable().futureCall(request);
+   *   // Do something.
+   *   Operation response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable exportEntitiesCallable() {
+    return stub.exportEntitiesCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Imports entities into Google Cloud Datastore. Existing entities with the same key are
+   * overwritten. The import occurs in the background and its progress can be monitored and managed
+   * via the Operation resource that is created. If an ImportEntities operation is cancelled, it is
+   * possible that a subset of the data has already been imported to Cloud Datastore.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   Map labels = new HashMap<>();
+   *   String inputUrl = "inputUrl470706501";
+   *   EntityFilter entityFilter = EntityFilter.newBuilder().build();
+   *   datastoreAdminClient.importEntitiesAsync(projectId, labels, inputUrl, entityFilter).get();
+   * }
+   * }
    
+   *
+   * @param projectId Required. Project ID against which to make the request.
+   * @param labels Client-assigned labels.
+   * @param inputUrl Required. The full resource URL of the external storage location. Currently,
+   *     only Google Cloud Storage is supported. So input_url should be of the form:
+   *     `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where `BUCKET_NAME` is
+   *     the name of the Cloud Storage bucket, `NAMESPACE_PATH` is an optional Cloud Storage
+   *     namespace path (this is not a Cloud Datastore namespace), and
+   *     `OVERALL_EXPORT_METADATA_FILE` is the metadata file written by the ExportEntities
+   *     operation. For more information about Cloud Storage 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].
+   * @param entityFilter Optionally specify which kinds/namespaces are to be imported. If provided,
+   *     the list must be a subset of the EntityFilter used in creating the export, otherwise a
+   *     FAILED_PRECONDITION error will be returned. If no filter is specified then all entities
+   *     from the export are imported.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final OperationFuture importEntitiesAsync(
+      String projectId, Map labels, String inputUrl, EntityFilter entityFilter) {
+    ImportEntitiesRequest request =
+        ImportEntitiesRequest.newBuilder()
+            .setProjectId(projectId)
+            .putAllLabels(labels)
+            .setInputUrl(inputUrl)
+            .setEntityFilter(entityFilter)
+            .build();
+    return importEntitiesAsync(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Imports entities into Google Cloud Datastore. Existing entities with the same key are
+   * overwritten. The import occurs in the background and its progress can be monitored and managed
+   * via the Operation resource that is created. If an ImportEntities operation is cancelled, it is
+   * possible that a subset of the data has already been imported to Cloud Datastore.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ImportEntitiesRequest request =
+   *       ImportEntitiesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .putAllLabels(new HashMap())
+   *           .setInputUrl("inputUrl470706501")
+   *           .setEntityFilter(EntityFilter.newBuilder().build())
+   *           .build();
+   *   datastoreAdminClient.importEntitiesAsync(request).get();
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final OperationFuture importEntitiesAsync(
+      ImportEntitiesRequest request) {
+    return importEntitiesOperationCallable().futureCall(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Imports entities into Google Cloud Datastore. Existing entities with the same key are
+   * overwritten. The import occurs in the background and its progress can be monitored and managed
+   * via the Operation resource that is created. If an ImportEntities operation is cancelled, it is
+   * possible that a subset of the data has already been imported to Cloud Datastore.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ImportEntitiesRequest request =
+   *       ImportEntitiesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .putAllLabels(new HashMap())
+   *           .setInputUrl("inputUrl470706501")
+   *           .setEntityFilter(EntityFilter.newBuilder().build())
+   *           .build();
+   *   OperationFuture future =
+   *       datastoreAdminClient.importEntitiesOperationCallable().futureCall(request);
+   *   // Do something.
+   *   future.get();
+   * }
+   * }
    
+   */
+  public final OperationCallable
+      importEntitiesOperationCallable() {
+    return stub.importEntitiesOperationCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Imports entities into Google Cloud Datastore. Existing entities with the same key are
+   * overwritten. The import occurs in the background and its progress can be monitored and managed
+   * via the Operation resource that is created. If an ImportEntities operation is cancelled, it is
+   * possible that a subset of the data has already been imported to Cloud Datastore.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ImportEntitiesRequest request =
+   *       ImportEntitiesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .putAllLabels(new HashMap())
+   *           .setInputUrl("inputUrl470706501")
+   *           .setEntityFilter(EntityFilter.newBuilder().build())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreAdminClient.importEntitiesCallable().futureCall(request);
+   *   // Do something.
+   *   future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable importEntitiesCallable() {
+    return stub.importEntitiesCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Creates the specified index. A newly created index's initial state is `CREATING`. On completion
+   * of the returned [google.longrunning.Operation][google.longrunning.Operation], the state will be
+   * `READY`. If the index already exists, the call will return an `ALREADY_EXISTS` status.
+   *
+   * 
    During index creation, the process could result in an error, in which case the index will
+   * move to the `ERROR` state. The process can be recovered by fixing the data that caused the
+   * error, removing the index with [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex],
+   * then re-creating the index with [create]
+   * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+   *
+   * 
    Indexes with a single property cannot be created.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   CreateIndexRequest request =
+   *       CreateIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndex(Index.newBuilder().build())
+   *           .build();
+   *   Index response = datastoreAdminClient.createIndexAsync(request).get();
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final OperationFuture createIndexAsync(
+      CreateIndexRequest request) {
+    return createIndexOperationCallable().futureCall(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Creates the specified index. A newly created index's initial state is `CREATING`. On completion
+   * of the returned [google.longrunning.Operation][google.longrunning.Operation], the state will be
+   * `READY`. If the index already exists, the call will return an `ALREADY_EXISTS` status.
+   *
+   * 
    During index creation, the process could result in an error, in which case the index will
+   * move to the `ERROR` state. The process can be recovered by fixing the data that caused the
+   * error, removing the index with [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex],
+   * then re-creating the index with [create]
+   * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+   *
+   * 
    Indexes with a single property cannot be created.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   CreateIndexRequest request =
+   *       CreateIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndex(Index.newBuilder().build())
+   *           .build();
+   *   OperationFuture future =
+   *       datastoreAdminClient.createIndexOperationCallable().futureCall(request);
+   *   // Do something.
+   *   Index response = future.get();
+   * }
+   * }
    
+   */
+  public final OperationCallable
+      createIndexOperationCallable() {
+    return stub.createIndexOperationCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Creates the specified index. A newly created index's initial state is `CREATING`. On completion
+   * of the returned [google.longrunning.Operation][google.longrunning.Operation], the state will be
+   * `READY`. If the index already exists, the call will return an `ALREADY_EXISTS` status.
+   *
+   * 
    During index creation, the process could result in an error, in which case the index will
+   * move to the `ERROR` state. The process can be recovered by fixing the data that caused the
+   * error, removing the index with [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex],
+   * then re-creating the index with [create]
+   * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+   *
+   * 
    Indexes with a single property cannot be created.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   CreateIndexRequest request =
+   *       CreateIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndex(Index.newBuilder().build())
+   *           .build();
+   *   ApiFuture future = datastoreAdminClient.createIndexCallable().futureCall(request);
+   *   // Do something.
+   *   Operation response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable createIndexCallable() {
+    return stub.createIndexCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Deletes an existing index. An index can only be deleted if it is in a `READY` or `ERROR` state.
+   * On successful execution of the request, the index will be in a `DELETING`
+   * [state][google.datastore.admin.v1.Index.State]. And on completion of the returned
+   * [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+   *
+   * 
    During index deletion, the process could result in an error, in which case the index will
+   * move to the `ERROR` state. The process can be recovered by fixing the data that caused the
+   * error, followed by calling [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex]
+   * again.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   DeleteIndexRequest request =
+   *       DeleteIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndexId("indexId1943291277")
+   *           .build();
+   *   Index response = datastoreAdminClient.deleteIndexAsync(request).get();
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final OperationFuture deleteIndexAsync(
+      DeleteIndexRequest request) {
+    return deleteIndexOperationCallable().futureCall(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Deletes an existing index. An index can only be deleted if it is in a `READY` or `ERROR` state.
+   * On successful execution of the request, the index will be in a `DELETING`
+   * [state][google.datastore.admin.v1.Index.State]. And on completion of the returned
+   * [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+   *
+   * 
    During index deletion, the process could result in an error, in which case the index will
+   * move to the `ERROR` state. The process can be recovered by fixing the data that caused the
+   * error, followed by calling [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex]
+   * again.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   DeleteIndexRequest request =
+   *       DeleteIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndexId("indexId1943291277")
+   *           .build();
+   *   OperationFuture future =
+   *       datastoreAdminClient.deleteIndexOperationCallable().futureCall(request);
+   *   // Do something.
+   *   Index response = future.get();
+   * }
+   * }
    
+   */
+  public final OperationCallable
+      deleteIndexOperationCallable() {
+    return stub.deleteIndexOperationCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Deletes an existing index. An index can only be deleted if it is in a `READY` or `ERROR` state.
+   * On successful execution of the request, the index will be in a `DELETING`
+   * [state][google.datastore.admin.v1.Index.State]. And on completion of the returned
+   * [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+   *
+   * 
    During index deletion, the process could result in an error, in which case the index will
+   * move to the `ERROR` state. The process can be recovered by fixing the data that caused the
+   * error, followed by calling [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex]
+   * again.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   DeleteIndexRequest request =
+   *       DeleteIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndexId("indexId1943291277")
+   *           .build();
+   *   ApiFuture future = datastoreAdminClient.deleteIndexCallable().futureCall(request);
+   *   // Do something.
+   *   Operation response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable deleteIndexCallable() {
+    return stub.deleteIndexCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Gets an index.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   GetIndexRequest request =
+   *       GetIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndexId("indexId1943291277")
+   *           .build();
+   *   Index response = datastoreAdminClient.getIndex(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Index getIndex(GetIndexRequest request) {
+    return getIndexCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Gets an index.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   GetIndexRequest request =
+   *       GetIndexRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setIndexId("indexId1943291277")
+   *           .build();
+   *   ApiFuture future = datastoreAdminClient.getIndexCallable().futureCall(request);
+   *   // Do something.
+   *   Index response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable getIndexCallable() {
+    return stub.getIndexCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Lists the indexes that match the specified filters. Datastore uses an eventually consistent
+   * query to fetch the list of indexes and may occasionally return stale results.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ListIndexesRequest request =
+   *       ListIndexesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setFilter("filter-1274492040")
+   *           .setPageSize(883849137)
+   *           .setPageToken("pageToken873572522")
+   *           .build();
+   *   for (Index element : datastoreAdminClient.listIndexes(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListIndexesPagedResponse listIndexes(ListIndexesRequest request) {
+    return listIndexesPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Lists the indexes that match the specified filters. Datastore uses an eventually consistent
+   * query to fetch the list of indexes and may occasionally return stale results.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ListIndexesRequest request =
+   *       ListIndexesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setFilter("filter-1274492040")
+   *           .setPageSize(883849137)
+   *           .setPageToken("pageToken873572522")
+   *           .build();
+   *   ApiFuture future = datastoreAdminClient.listIndexesPagedCallable().futureCall(request);
+   *   // Do something.
+   *   for (Index element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * }
    
+   */
+  public final UnaryCallable
+      listIndexesPagedCallable() {
+    return stub.listIndexesPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Lists the indexes that match the specified filters. Datastore uses an eventually consistent
+   * query to fetch the list of indexes and may occasionally return stale results.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+   *   ListIndexesRequest request =
+   *       ListIndexesRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setFilter("filter-1274492040")
+   *           .setPageSize(883849137)
+   *           .setPageToken("pageToken873572522")
+   *           .build();
+   *   while (true) {
+   *     ListIndexesResponse response = datastoreAdminClient.listIndexesCallable().call(request);
+   *     for (Index element : response.getResponsesList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * }
    
+   */
+  public final UnaryCallable listIndexesCallable() {
+    return stub.listIndexesCallable();
+  }
+
+  @Override
+  public final void close() {
+    stub.close();
+  }
+
+  @Override
+  public void shutdown() {
+    stub.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return stub.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return stub.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    stub.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return stub.awaitTermination(duration, unit);
+  }
+
+  public static class ListIndexesPagedResponse
+      extends AbstractPagedListResponse<
+          ListIndexesRequest,
+          ListIndexesResponse,
+          Index,
+          ListIndexesPage,
+          ListIndexesFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListIndexesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage, input -> new ListIndexesPagedResponse(input), MoreExecutors.directExecutor());
+    }
+
+    private ListIndexesPagedResponse(ListIndexesPage page) {
+      super(page, ListIndexesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListIndexesPage
+      extends AbstractPage {
+
+    private ListIndexesPage(
+        PageContext context,
+        ListIndexesResponse response) {
+      super(context, response);
+    }
+
+    private static ListIndexesPage createEmptyPage() {
+      return new ListIndexesPage(null, null);
+    }
+
+    @Override
+    protected ListIndexesPage createPage(
+        PageContext context,
+        ListIndexesResponse response) {
+      return new ListIndexesPage(context, response);
+    }
+
+    @Override
+    public ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListIndexesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListIndexesRequest,
+          ListIndexesResponse,
+          Index,
+          ListIndexesPage,
+          ListIndexesFixedSizeCollection> {
+
+    private ListIndexesFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListIndexesFixedSizeCollection createEmptyCollection() {
+      return new ListIndexesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListIndexesFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListIndexesFixedSizeCollection(pages, collectionSize);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
new file mode 100644
index 000000000000..ebb971f5034a
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1;
+
+import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientSettings;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.datastore.admin.v1.stub.DatastoreAdminStubSettings;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.ExportEntitiesMetadata;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesMetadata;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.IndexOperationMetadata;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Settings class to configure an instance of {@link DatastoreAdminClient}.
+ *
+ * 
    The default instance has everything set to sensible defaults:
+ *
+ * 
      
+ *   
    • The default service address (datastore.googleapis.com) and default port (443) are used.
+ *   
    • Credentials are acquired automatically through Application Default Credentials.
+ *   
    • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 
    
+ *
+ * 
    The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object.
+ *
+ * 
    For example, to set the total timeout of getIndex to 30 seconds:
+ *
+ * 
    {@code
+ * DatastoreAdminSettings.Builder datastoreAdminSettingsBuilder =
+ *     DatastoreAdminSettings.newBuilder();
+ * datastoreAdminSettingsBuilder
+ *     .getIndexSettings()
+ *     .setRetrySettings(
+ *         datastoreAdminSettingsBuilder
+ *             .getIndexSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
+ * DatastoreAdminSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
+ * }
    
+ */
+@Generated("by gapic-generator-java")
+public class DatastoreAdminSettings extends ClientSettings {
+
+  /** Returns the object with the settings used for calls to exportEntities. */
+  public UnaryCallSettings exportEntitiesSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).exportEntitiesSettings();
+  }
+
+  /** Returns the object with the settings used for calls to exportEntities. */
+  public OperationCallSettings<
+          ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+      exportEntitiesOperationSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).exportEntitiesOperationSettings();
+  }
+
+  /** Returns the object with the settings used for calls to importEntities. */
+  public UnaryCallSettings importEntitiesSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).importEntitiesSettings();
+  }
+
+  /** Returns the object with the settings used for calls to importEntities. */
+  public OperationCallSettings
+      importEntitiesOperationSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).importEntitiesOperationSettings();
+  }
+
+  /** Returns the object with the settings used for calls to createIndex. */
+  public UnaryCallSettings createIndexSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).createIndexSettings();
+  }
+
+  /** Returns the object with the settings used for calls to createIndex. */
+  public OperationCallSettings
+      createIndexOperationSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).createIndexOperationSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteIndex. */
+  public UnaryCallSettings deleteIndexSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).deleteIndexSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteIndex. */
+  public OperationCallSettings
+      deleteIndexOperationSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).deleteIndexOperationSettings();
+  }
+
+  /** Returns the object with the settings used for calls to getIndex. */
+  public UnaryCallSettings getIndexSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).getIndexSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listIndexes. */
+  public PagedCallSettings
+      listIndexesSettings() {
+    return ((DatastoreAdminStubSettings) getStubSettings()).listIndexesSettings();
+  }
+
+  public static final DatastoreAdminSettings create(DatastoreAdminStubSettings stub)
+      throws IOException {
+    return new DatastoreAdminSettings.Builder(stub.toBuilder()).build();
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return DatastoreAdminStubSettings.defaultExecutorProviderBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return DatastoreAdminStubSettings.getDefaultEndpoint();
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DatastoreAdminStubSettings.getDefaultServiceScopes();
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return DatastoreAdminStubSettings.defaultCredentialsProviderBuilder();
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return DatastoreAdminStubSettings.defaultGrpcTransportProviderBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return DatastoreAdminStubSettings.defaultTransportChannelProvider();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return DatastoreAdminStubSettings.defaultApiClientHeaderProviderBuilder();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected DatastoreAdminSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+  }
+
+  /** Builder for DatastoreAdminSettings. */
+  public static class Builder extends ClientSettings.Builder {
+
+    protected Builder() throws IOException {
+      this(((ClientContext) null));
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(DatastoreAdminStubSettings.newBuilder(clientContext));
+    }
+
+    protected Builder(DatastoreAdminSettings settings) {
+      super(settings.getStubSettings().toBuilder());
+    }
+
+    protected Builder(DatastoreAdminStubSettings.Builder stubSettings) {
+      super(stubSettings);
+    }
+
+    private static Builder createDefault() {
+      return new Builder(DatastoreAdminStubSettings.newBuilder());
+    }
+
+    public DatastoreAdminStubSettings.Builder getStubSettingsBuilder() {
+      return ((DatastoreAdminStubSettings.Builder) getStubSettings());
+    }
+
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
    Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) {
+      super.applyToAllUnaryMethods(
+          getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
+      return this;
+    }
+
+    /** Returns the builder for the settings used for calls to exportEntities. */
+    public UnaryCallSettings.Builder exportEntitiesSettings() {
+      return getStubSettingsBuilder().exportEntitiesSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to exportEntities. */
+    public OperationCallSettings.Builder<
+            ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+        exportEntitiesOperationSettings() {
+      return getStubSettingsBuilder().exportEntitiesOperationSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to importEntities. */
+    public UnaryCallSettings.Builder importEntitiesSettings() {
+      return getStubSettingsBuilder().importEntitiesSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to importEntities. */
+    public OperationCallSettings.Builder
+        importEntitiesOperationSettings() {
+      return getStubSettingsBuilder().importEntitiesOperationSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to createIndex. */
+    public UnaryCallSettings.Builder createIndexSettings() {
+      return getStubSettingsBuilder().createIndexSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to createIndex. */
+    public OperationCallSettings.Builder
+        createIndexOperationSettings() {
+      return getStubSettingsBuilder().createIndexOperationSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteIndex. */
+    public UnaryCallSettings.Builder deleteIndexSettings() {
+      return getStubSettingsBuilder().deleteIndexSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteIndex. */
+    public OperationCallSettings.Builder
+        deleteIndexOperationSettings() {
+      return getStubSettingsBuilder().deleteIndexOperationSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getIndex. */
+    public UnaryCallSettings.Builder getIndexSettings() {
+      return getStubSettingsBuilder().getIndexSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listIndexes. */
+    public PagedCallSettings.Builder<
+            ListIndexesRequest, ListIndexesResponse, ListIndexesPagedResponse>
+        listIndexesSettings() {
+      return getStubSettingsBuilder().listIndexesSettings();
+    }
+
+    @Override
+    public DatastoreAdminSettings build() throws IOException {
+      return new DatastoreAdminSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/gapic_metadata.json b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/gapic_metadata.json
new file mode 100644
index 000000000000..205eb5dcde05
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/gapic_metadata.json
@@ -0,0 +1,36 @@
+{
+  "schema": "1.0",
+  "comment": "This file maps proto services/RPCs to the corresponding library clients/methods",
+  "language": "java",
+  "protoPackage": "google.datastore.admin.v1",
+  "libraryPackage": "com.google.cloud.datastore.admin.v1",
+  "services": {
+    "DatastoreAdmin": {
+      "clients": {
+        "grpc": {
+          "libraryClient": "DatastoreAdminClient",
+          "rpcs": {
+            "CreateIndex": {
+              "methods": ["createIndexAsync", "createIndexOperationCallable", "createIndexCallable"]
+            },
+            "DeleteIndex": {
+              "methods": ["deleteIndexAsync", "deleteIndexOperationCallable", "deleteIndexCallable"]
+            },
+            "ExportEntities": {
+              "methods": ["exportEntitiesAsync", "exportEntitiesAsync", "exportEntitiesOperationCallable", "exportEntitiesCallable"]
+            },
+            "GetIndex": {
+              "methods": ["getIndex", "getIndexCallable"]
+            },
+            "ImportEntities": {
+              "methods": ["importEntitiesAsync", "importEntitiesAsync", "importEntitiesOperationCallable", "importEntitiesCallable"]
+            },
+            "ListIndexes": {
+              "methods": ["listIndexes", "listIndexesPagedCallable", "listIndexesCallable"]
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
new file mode 100644
index 000000000000..dd1642f615a0
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.
+ */
+
+/**
+ * A client to Cloud Datastore API
+ *
+ * 
    The interfaces provided are listed below, along with usage samples.
+ *
+ * 
    ======================= DatastoreAdminClient =======================
+ *
+ * 
    Service Description: Google Cloud Datastore Admin API
+ *
+ * 
    The Datastore Admin API provides several admin services for Cloud Datastore.
+ *
+ * 
    ----------------------------------------------------------------------------- ## Concepts
+ *
+ * 
    Project, namespace, kind, and entity as defined in the Google Cloud Datastore API.
+ *
+ * 
    Operation: An Operation represents work being performed in the background.
+ *
+ * 
    EntityFilter: Allows specifying a subset of entities in a project. This is specified as a
+ * combination of kinds and namespaces (either or both of which may be all).
+ *
+ * 
    ----------------------------------------------------------------------------- ## Services
+ *
+ * 
    # Export/Import
+ *
+ * 
    The Export/Import service provides the ability to copy all or a subset of entities to/from
+ * Google Cloud Storage.
+ *
+ * 
    Exported data may be imported into Cloud Datastore for any Google Cloud Platform project. It
+ * is not restricted to the export source project. It is possible to export from one project and
+ * then import into another.
+ *
+ * 
    Exported data can also be loaded into Google BigQuery for analysis.
+ *
+ * 
    Exports and imports are performed asynchronously. An Operation resource is created for each
+ * export/import. The state (including any errors encountered) of the export/import may be queried
+ * via the Operation resource.
+ *
+ * 
    # Index
+ *
+ * 
    The index service manages Cloud Datastore composite indexes.
+ *
+ * 
    Index creation and deletion are performed asynchronously. An Operation resource is created for
+ * each such asynchronous operation. The state of the operation (including any errors encountered)
+ * may be queried via the Operation resource.
+ *
+ * 
    # Operation
+ *
+ * 
    The Operations collection provides a record of actions performed for the specified project
+ * (including any operations in progress). Operations are not created directly but through calls on
+ * other collections or resources.
+ *
+ * 
    An operation that is not yet done may be cancelled. The request to cancel is asynchronous and
+ * the operation may continue to run for some time after the request to cancel is made.
+ *
+ * 
    An operation that is done may be deleted so that it is no longer listed as part of the
+ * Operation collection.
+ *
+ * 
    ListOperations returns all pending operations, but not completed operations.
+ *
+ * 
    Operations are created by service DatastoreAdmin, but are accessed via service
+ * google.longrunning.Operations.
+ *
+ * 
    Sample for DatastoreAdminClient:
+ *
+ * 
    {@code
+ * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
+ *   GetIndexRequest request =
+ *       GetIndexRequest.newBuilder()
+ *           .setProjectId("projectId-894832108")
+ *           .setIndexId("indexId1943291277")
+ *           .build();
+ *   Index response = datastoreAdminClient.getIndex(request);
+ * }
+ * }
    
+ */
+@Generated("by gapic-generator-java")
+package com.google.cloud.datastore.admin.v1;
+
+import javax.annotation.Generated;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
new file mode 100644
index 000000000000..8014b0192357
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1.stub;
+
+import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
+
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.ExportEntitiesMetadata;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesMetadata;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.IndexOperationMetadata;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.OperationsStub;
+import com.google.protobuf.Empty;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Base stub class for the DatastoreAdmin service API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator-java")
+public abstract class DatastoreAdminStub implements BackgroundResource {
+
+  public OperationsStub getOperationsStub() {
+    throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
+  }
+
+  public OperationCallable
+      exportEntitiesOperationCallable() {
+    throw new UnsupportedOperationException("Not implemented: exportEntitiesOperationCallable()");
+  }
+
+  public UnaryCallable exportEntitiesCallable() {
+    throw new UnsupportedOperationException("Not implemented: exportEntitiesCallable()");
+  }
+
+  public OperationCallable
+      importEntitiesOperationCallable() {
+    throw new UnsupportedOperationException("Not implemented: importEntitiesOperationCallable()");
+  }
+
+  public UnaryCallable importEntitiesCallable() {
+    throw new UnsupportedOperationException("Not implemented: importEntitiesCallable()");
+  }
+
+  public OperationCallable
+      createIndexOperationCallable() {
+    throw new UnsupportedOperationException("Not implemented: createIndexOperationCallable()");
+  }
+
+  public UnaryCallable createIndexCallable() {
+    throw new UnsupportedOperationException("Not implemented: createIndexCallable()");
+  }
+
+  public OperationCallable
+      deleteIndexOperationCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteIndexOperationCallable()");
+  }
+
+  public UnaryCallable deleteIndexCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteIndexCallable()");
+  }
+
+  public UnaryCallable getIndexCallable() {
+    throw new UnsupportedOperationException("Not implemented: getIndexCallable()");
+  }
+
+  public UnaryCallable listIndexesPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listIndexesPagedCallable()");
+  }
+
+  public UnaryCallable listIndexesCallable() {
+    throw new UnsupportedOperationException("Not implemented: listIndexesCallable()");
+  }
+
+  @Override
+  public abstract void close();
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
new file mode 100644
index 000000000000..682fe82f31f6
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -0,0 +1,670 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1.stub;
+
+import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GaxProperties;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.grpc.ProtoOperationTransformers;
+import com.google.api.gax.longrunning.OperationSnapshot;
+import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.ApiCallContext;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.PageContext;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.PagedListDescriptor;
+import com.google.api.gax.rpc.PagedListResponseFactory;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.StubSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.ExportEntitiesMetadata;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesMetadata;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.IndexOperationMetadata;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+import org.threeten.bp.Duration;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Settings class to configure an instance of {@link DatastoreAdminStub}.
+ *
+ * 
    The default instance has everything set to sensible defaults:
+ *
+ * 
      
+ *   
    • The default service address (datastore.googleapis.com) and default port (443) are used.
+ *   
    • Credentials are acquired automatically through Application Default Credentials.
+ *   
    • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 
    
+ *
+ * 
    The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object.
+ *
+ * 
    For example, to set the total timeout of getIndex to 30 seconds:
+ *
+ * 
    {@code
+ * DatastoreAdminStubSettings.Builder datastoreAdminSettingsBuilder =
+ *     DatastoreAdminStubSettings.newBuilder();
+ * datastoreAdminSettingsBuilder
+ *     .getIndexSettings()
+ *     .setRetrySettings(
+ *         datastoreAdminSettingsBuilder
+ *             .getIndexSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
+ * DatastoreAdminStubSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
+ * }
    
+ */
+@Generated("by gapic-generator-java")
+public class DatastoreAdminStubSettings extends StubSettings {
+  /** The default scopes of the service. */
+  private static final ImmutableList DEFAULT_SERVICE_SCOPES =
+      ImmutableList.builder()
+          .add("https://www.googleapis.com/auth/cloud-platform")
+          .add("https://www.googleapis.com/auth/datastore")
+          .build();
+
+  private final UnaryCallSettings exportEntitiesSettings;
+  private final OperationCallSettings<
+          ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+      exportEntitiesOperationSettings;
+  private final UnaryCallSettings importEntitiesSettings;
+  private final OperationCallSettings
+      importEntitiesOperationSettings;
+  private final UnaryCallSettings createIndexSettings;
+  private final OperationCallSettings
+      createIndexOperationSettings;
+  private final UnaryCallSettings deleteIndexSettings;
+  private final OperationCallSettings
+      deleteIndexOperationSettings;
+  private final UnaryCallSettings getIndexSettings;
+  private final PagedCallSettings
+      listIndexesSettings;
+
+  private static final PagedListDescriptor
+      LIST_INDEXES_PAGE_STR_DESC =
+          new PagedListDescriptor() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListIndexesRequest injectToken(ListIndexesRequest payload, String token) {
+              return ListIndexesRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListIndexesRequest injectPageSize(ListIndexesRequest payload, int pageSize) {
+              return ListIndexesRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListIndexesRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListIndexesResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable extractResources(ListIndexesResponse payload) {
+              return payload.getIndexesList() == null
+                  ? ImmutableList.of()
+                  : payload.getIndexesList();
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListIndexesRequest, ListIndexesResponse, ListIndexesPagedResponse>
+      LIST_INDEXES_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListIndexesRequest, ListIndexesResponse, ListIndexesPagedResponse>() {
+            @Override
+            public ApiFuture getFuturePagedResponse(
+                UnaryCallable callable,
+                ListIndexesRequest request,
+                ApiCallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_INDEXES_PAGE_STR_DESC, request, context);
+              return ListIndexesPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  /** Returns the object with the settings used for calls to exportEntities. */
+  public UnaryCallSettings exportEntitiesSettings() {
+    return exportEntitiesSettings;
+  }
+
+  /** Returns the object with the settings used for calls to exportEntities. */
+  public OperationCallSettings<
+          ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+      exportEntitiesOperationSettings() {
+    return exportEntitiesOperationSettings;
+  }
+
+  /** Returns the object with the settings used for calls to importEntities. */
+  public UnaryCallSettings importEntitiesSettings() {
+    return importEntitiesSettings;
+  }
+
+  /** Returns the object with the settings used for calls to importEntities. */
+  public OperationCallSettings
+      importEntitiesOperationSettings() {
+    return importEntitiesOperationSettings;
+  }
+
+  /** Returns the object with the settings used for calls to createIndex. */
+  public UnaryCallSettings createIndexSettings() {
+    return createIndexSettings;
+  }
+
+  /** Returns the object with the settings used for calls to createIndex. */
+  public OperationCallSettings
+      createIndexOperationSettings() {
+    return createIndexOperationSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteIndex. */
+  public UnaryCallSettings deleteIndexSettings() {
+    return deleteIndexSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteIndex. */
+  public OperationCallSettings
+      deleteIndexOperationSettings() {
+    return deleteIndexOperationSettings;
+  }
+
+  /** Returns the object with the settings used for calls to getIndex. */
+  public UnaryCallSettings getIndexSettings() {
+    return getIndexSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listIndexes. */
+  public PagedCallSettings
+      listIndexesSettings() {
+    return listIndexesSettings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public DatastoreAdminStub createStub() throws IOException {
+    if (getTransportChannelProvider()
+        .getTransportName()
+        .equals(GrpcTransportChannel.getGrpcTransportName())) {
+      return GrpcDatastoreAdminStub.create(this);
+    }
+    throw new UnsupportedOperationException(
+        String.format(
+            "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return InstantiatingExecutorProvider.newBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return "datastore.googleapis.com:443";
+  }
+
+  /** Returns the default mTLS service endpoint. */
+  public static String getDefaultMtlsEndpoint() {
+    return "datastore.mtls.googleapis.com:443";
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DEFAULT_SERVICE_SCOPES;
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return defaultGrpcTransportProviderBuilder().build();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return ApiClientHeaderProvider.newBuilder()
+        .setGeneratedLibToken(
+            "gapic", GaxProperties.getLibraryVersion(DatastoreAdminStubSettings.class))
+        .setTransportToken(
+            GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected DatastoreAdminStubSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+
+    exportEntitiesSettings = settingsBuilder.exportEntitiesSettings().build();
+    exportEntitiesOperationSettings = settingsBuilder.exportEntitiesOperationSettings().build();
+    importEntitiesSettings = settingsBuilder.importEntitiesSettings().build();
+    importEntitiesOperationSettings = settingsBuilder.importEntitiesOperationSettings().build();
+    createIndexSettings = settingsBuilder.createIndexSettings().build();
+    createIndexOperationSettings = settingsBuilder.createIndexOperationSettings().build();
+    deleteIndexSettings = settingsBuilder.deleteIndexSettings().build();
+    deleteIndexOperationSettings = settingsBuilder.deleteIndexOperationSettings().build();
+    getIndexSettings = settingsBuilder.getIndexSettings().build();
+    listIndexesSettings = settingsBuilder.listIndexesSettings().build();
+  }
+
+  /** Builder for DatastoreAdminStubSettings. */
+  public static class Builder extends StubSettings.Builder {
+    private final ImmutableList> unaryMethodSettingsBuilders;
+    private final UnaryCallSettings.Builder
+        exportEntitiesSettings;
+    private final OperationCallSettings.Builder<
+            ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+        exportEntitiesOperationSettings;
+    private final UnaryCallSettings.Builder
+        importEntitiesSettings;
+    private final OperationCallSettings.Builder<
+            ImportEntitiesRequest, Empty, ImportEntitiesMetadata>
+        importEntitiesOperationSettings;
+    private final UnaryCallSettings.Builder createIndexSettings;
+    private final OperationCallSettings.Builder
+        createIndexOperationSettings;
+    private final UnaryCallSettings.Builder deleteIndexSettings;
+    private final OperationCallSettings.Builder
+        deleteIndexOperationSettings;
+    private final UnaryCallSettings.Builder getIndexSettings;
+    private final PagedCallSettings.Builder<
+            ListIndexesRequest, ListIndexesResponse, ListIndexesPagedResponse>
+        listIndexesSettings;
+    private static final ImmutableMap>
+        RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder> definitions =
+          ImmutableMap.builder();
+      definitions.put(
+          "no_retry_0_codes", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put(
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(
+              Lists.newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder definitions = ImmutableMap.builder();
+      RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("no_retry_0_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    protected Builder() {
+      this(((ClientContext) null));
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(clientContext);
+
+      exportEntitiesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      exportEntitiesOperationSettings = OperationCallSettings.newBuilder();
+      importEntitiesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      importEntitiesOperationSettings = OperationCallSettings.newBuilder();
+      createIndexSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      createIndexOperationSettings = OperationCallSettings.newBuilder();
+      deleteIndexSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      deleteIndexOperationSettings = OperationCallSettings.newBuilder();
+      getIndexSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      listIndexesSettings = PagedCallSettings.newBuilder(LIST_INDEXES_PAGE_STR_FACT);
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              exportEntitiesSettings,
+              importEntitiesSettings,
+              createIndexSettings,
+              deleteIndexSettings,
+              getIndexSettings,
+              listIndexesSettings);
+      initDefaults(this);
+    }
+
+    protected Builder(DatastoreAdminStubSettings settings) {
+      super(settings);
+
+      exportEntitiesSettings = settings.exportEntitiesSettings.toBuilder();
+      exportEntitiesOperationSettings = settings.exportEntitiesOperationSettings.toBuilder();
+      importEntitiesSettings = settings.importEntitiesSettings.toBuilder();
+      importEntitiesOperationSettings = settings.importEntitiesOperationSettings.toBuilder();
+      createIndexSettings = settings.createIndexSettings.toBuilder();
+      createIndexOperationSettings = settings.createIndexOperationSettings.toBuilder();
+      deleteIndexSettings = settings.deleteIndexSettings.toBuilder();
+      deleteIndexOperationSettings = settings.deleteIndexOperationSettings.toBuilder();
+      getIndexSettings = settings.getIndexSettings.toBuilder();
+      listIndexesSettings = settings.listIndexesSettings.toBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              exportEntitiesSettings,
+              importEntitiesSettings,
+              createIndexSettings,
+              deleteIndexSettings,
+              getIndexSettings,
+              listIndexesSettings);
+    }
+
+    private static Builder createDefault() {
+      Builder builder = new Builder(((ClientContext) null));
+
+      builder.setTransportChannelProvider(defaultTransportChannelProvider());
+      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+      builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
+      builder.setEndpoint(getDefaultEndpoint());
+      builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+      builder.setSwitchToMtlsEndpointAllowed(true);
+
+      return initDefaults(builder);
+    }
+
+    private static Builder initDefaults(Builder builder) {
+      builder
+          .exportEntitiesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
+
+      builder
+          .importEntitiesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
+
+      builder
+          .createIndexSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
+
+      builder
+          .deleteIndexSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
+
+      builder
+          .getIndexSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
+
+      builder
+          .listIndexesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
+
+      builder
+          .exportEntitiesOperationSettings()
+          .setInitialCallSettings(
+              UnaryCallSettings
+                  .newUnaryCallSettingsBuilder()
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"))
+                  .build())
+          .setResponseTransformer(
+              ProtoOperationTransformers.ResponseTransformer.create(ExportEntitiesResponse.class))
+          .setMetadataTransformer(
+              ProtoOperationTransformers.MetadataTransformer.create(ExportEntitiesMetadata.class))
+          .setPollingAlgorithm(
+              OperationTimedPollAlgorithm.create(
+                  RetrySettings.newBuilder()
+                      .setInitialRetryDelay(Duration.ofMillis(5000L))
+                      .setRetryDelayMultiplier(1.5)
+                      .setMaxRetryDelay(Duration.ofMillis(45000L))
+                      .setInitialRpcTimeout(Duration.ZERO)
+                      .setRpcTimeoutMultiplier(1.0)
+                      .setMaxRpcTimeout(Duration.ZERO)
+                      .setTotalTimeout(Duration.ofMillis(300000L))
+                      .build()));
+
+      builder
+          .importEntitiesOperationSettings()
+          .setInitialCallSettings(
+              UnaryCallSettings
+                  .newUnaryCallSettingsBuilder()
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"))
+                  .build())
+          .setResponseTransformer(
+              ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
+          .setMetadataTransformer(
+              ProtoOperationTransformers.MetadataTransformer.create(ImportEntitiesMetadata.class))
+          .setPollingAlgorithm(
+              OperationTimedPollAlgorithm.create(
+                  RetrySettings.newBuilder()
+                      .setInitialRetryDelay(Duration.ofMillis(5000L))
+                      .setRetryDelayMultiplier(1.5)
+                      .setMaxRetryDelay(Duration.ofMillis(45000L))
+                      .setInitialRpcTimeout(Duration.ZERO)
+                      .setRpcTimeoutMultiplier(1.0)
+                      .setMaxRpcTimeout(Duration.ZERO)
+                      .setTotalTimeout(Duration.ofMillis(300000L))
+                      .build()));
+
+      builder
+          .createIndexOperationSettings()
+          .setInitialCallSettings(
+              UnaryCallSettings.newUnaryCallSettingsBuilder()
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"))
+                  .build())
+          .setResponseTransformer(
+              ProtoOperationTransformers.ResponseTransformer.create(Index.class))
+          .setMetadataTransformer(
+              ProtoOperationTransformers.MetadataTransformer.create(IndexOperationMetadata.class))
+          .setPollingAlgorithm(
+              OperationTimedPollAlgorithm.create(
+                  RetrySettings.newBuilder()
+                      .setInitialRetryDelay(Duration.ofMillis(5000L))
+                      .setRetryDelayMultiplier(1.5)
+                      .setMaxRetryDelay(Duration.ofMillis(45000L))
+                      .setInitialRpcTimeout(Duration.ZERO)
+                      .setRpcTimeoutMultiplier(1.0)
+                      .setMaxRpcTimeout(Duration.ZERO)
+                      .setTotalTimeout(Duration.ofMillis(300000L))
+                      .build()));
+
+      builder
+          .deleteIndexOperationSettings()
+          .setInitialCallSettings(
+              UnaryCallSettings.newUnaryCallSettingsBuilder()
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"))
+                  .build())
+          .setResponseTransformer(
+              ProtoOperationTransformers.ResponseTransformer.create(Index.class))
+          .setMetadataTransformer(
+              ProtoOperationTransformers.MetadataTransformer.create(IndexOperationMetadata.class))
+          .setPollingAlgorithm(
+              OperationTimedPollAlgorithm.create(
+                  RetrySettings.newBuilder()
+                      .setInitialRetryDelay(Duration.ofMillis(5000L))
+                      .setRetryDelayMultiplier(1.5)
+                      .setMaxRetryDelay(Duration.ofMillis(45000L))
+                      .setInitialRpcTimeout(Duration.ZERO)
+                      .setRpcTimeoutMultiplier(1.0)
+                      .setMaxRpcTimeout(Duration.ZERO)
+                      .setTotalTimeout(Duration.ofMillis(300000L))
+                      .build()));
+
+      return builder;
+    }
+
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
    Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) {
+      super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
+      return this;
+    }
+
+    public ImmutableList> unaryMethodSettingsBuilders() {
+      return unaryMethodSettingsBuilders;
+    }
+
+    /** Returns the builder for the settings used for calls to exportEntities. */
+    public UnaryCallSettings.Builder exportEntitiesSettings() {
+      return exportEntitiesSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to exportEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder<
+            ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+        exportEntitiesOperationSettings() {
+      return exportEntitiesOperationSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to importEntities. */
+    public UnaryCallSettings.Builder importEntitiesSettings() {
+      return importEntitiesSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to importEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder
+        importEntitiesOperationSettings() {
+      return importEntitiesOperationSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to createIndex. */
+    public UnaryCallSettings.Builder createIndexSettings() {
+      return createIndexSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to createIndex. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder
+        createIndexOperationSettings() {
+      return createIndexOperationSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteIndex. */
+    public UnaryCallSettings.Builder deleteIndexSettings() {
+      return deleteIndexSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteIndex. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder
+        deleteIndexOperationSettings() {
+      return deleteIndexOperationSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getIndex. */
+    public UnaryCallSettings.Builder getIndexSettings() {
+      return getIndexSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listIndexes. */
+    public PagedCallSettings.Builder<
+            ListIndexesRequest, ListIndexesResponse, ListIndexesPagedResponse>
+        listIndexesSettings() {
+      return listIndexesSettings;
+    }
+
+    @Override
+    public DatastoreAdminStubSettings build() throws IOException {
+      return new DatastoreAdminStubSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
new file mode 100644
index 000000000000..6fa63fd35df1
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1.stub;
+
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcCallableFactory;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.BatchingCallSettings;
+import com.google.api.gax.rpc.BidiStreamingCallable;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientStreamingCallable;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.api.gax.rpc.StreamingCallSettings;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.OperationsStub;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * gRPC callable factory implementation for the DatastoreAdmin service API.
+ *
+ * 
    This class is for advanced usage.
+ */
+@Generated("by gapic-generator-java")
+public class GrpcDatastoreAdminCallableFactory implements GrpcStubCallableFactory {
+
+  @Override
+  public  UnaryCallable createUnaryCallable(
+      GrpcCallSettings grpcCallSettings,
+      UnaryCallSettings callSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createUnaryCallable(grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      UnaryCallable createPagedCallable(
+          GrpcCallSettings grpcCallSettings,
+          PagedCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createPagedCallable(grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public  UnaryCallable createBatchingCallable(
+      GrpcCallSettings grpcCallSettings,
+      BatchingCallSettings callSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createBatchingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      OperationCallable createOperationCallable(
+          GrpcCallSettings grpcCallSettings,
+          OperationCallSettings callSettings,
+          ClientContext clientContext,
+          OperationsStub operationsStub) {
+    return GrpcCallableFactory.createOperationCallable(
+        grpcCallSettings, callSettings, clientContext, operationsStub);
+  }
+
+  @Override
+  public 
+      BidiStreamingCallable createBidiStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createBidiStreamingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ServerStreamingCallable createServerStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          ServerStreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createServerStreamingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ClientStreamingCallable createClientStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createClientStreamingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
new file mode 100644
index 000000000000..81e35b3a0bbf
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1.stub;
+
+import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
+
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.BackgroundResourceAggregation;
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.common.collect.ImmutableMap;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.ExportEntitiesMetadata;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesMetadata;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.IndexOperationMetadata;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.GrpcOperationsStub;
+import com.google.protobuf.Empty;
+import io.grpc.MethodDescriptor;
+import io.grpc.protobuf.ProtoUtils;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * gRPC stub implementation for the DatastoreAdmin service API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator-java")
+public class GrpcDatastoreAdminStub extends DatastoreAdminStub {
+  private static final MethodDescriptor
+      exportEntitiesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/ExportEntities")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ExportEntitiesRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor
+      importEntitiesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/ImportEntities")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ImportEntitiesRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor createIndexMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/CreateIndex")
+          .setRequestMarshaller(ProtoUtils.marshaller(CreateIndexRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+          .build();
+
+  private static final MethodDescriptor deleteIndexMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/DeleteIndex")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteIndexRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+          .build();
+
+  private static final MethodDescriptor getIndexMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/GetIndex")
+          .setRequestMarshaller(ProtoUtils.marshaller(GetIndexRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Index.getDefaultInstance()))
+          .build();
+
+  private static final MethodDescriptor
+      listIndexesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/ListIndexes")
+              .setRequestMarshaller(ProtoUtils.marshaller(ListIndexesRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListIndexesResponse.getDefaultInstance()))
+              .build();
+
+  private final UnaryCallable exportEntitiesCallable;
+  private final OperationCallable<
+          ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+      exportEntitiesOperationCallable;
+  private final UnaryCallable importEntitiesCallable;
+  private final OperationCallable
+      importEntitiesOperationCallable;
+  private final UnaryCallable createIndexCallable;
+  private final OperationCallable
+      createIndexOperationCallable;
+  private final UnaryCallable deleteIndexCallable;
+  private final OperationCallable
+      deleteIndexOperationCallable;
+  private final UnaryCallable getIndexCallable;
+  private final UnaryCallable listIndexesCallable;
+  private final UnaryCallable
+      listIndexesPagedCallable;
+
+  private final BackgroundResource backgroundResources;
+  private final GrpcOperationsStub operationsStub;
+  private final GrpcStubCallableFactory callableFactory;
+
+  public static final GrpcDatastoreAdminStub create(DatastoreAdminStubSettings settings)
+      throws IOException {
+    return new GrpcDatastoreAdminStub(settings, ClientContext.create(settings));
+  }
+
+  public static final GrpcDatastoreAdminStub create(ClientContext clientContext)
+      throws IOException {
+    return new GrpcDatastoreAdminStub(
+        DatastoreAdminStubSettings.newBuilder().build(), clientContext);
+  }
+
+  public static final GrpcDatastoreAdminStub create(
+      ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException {
+    return new GrpcDatastoreAdminStub(
+        DatastoreAdminStubSettings.newBuilder().build(), clientContext, callableFactory);
+  }
+
+  /**
+   * Constructs an instance of GrpcDatastoreAdminStub, using the given settings. This is protected
+   * so that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcDatastoreAdminStub(DatastoreAdminStubSettings settings, ClientContext clientContext)
+      throws IOException {
+    this(settings, clientContext, new GrpcDatastoreAdminCallableFactory());
+  }
+
+  /**
+   * Constructs an instance of GrpcDatastoreAdminStub, using the given settings. This is protected
+   * so that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcDatastoreAdminStub(
+      DatastoreAdminStubSettings settings,
+      ClientContext clientContext,
+      GrpcStubCallableFactory callableFactory)
+      throws IOException {
+    this.callableFactory = callableFactory;
+    this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
+
+    GrpcCallSettings exportEntitiesTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(exportEntitiesMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  ImmutableMap.Builder params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  return params.build();
+                })
+            .build();
+    GrpcCallSettings importEntitiesTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(importEntitiesMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  ImmutableMap.Builder params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  return params.build();
+                })
+            .build();
+    GrpcCallSettings createIndexTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(createIndexMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  ImmutableMap.Builder params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  return params.build();
+                })
+            .build();
+    GrpcCallSettings deleteIndexTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteIndexMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  ImmutableMap.Builder params = ImmutableMap.builder();
+                  params.put("index_id", String.valueOf(request.getIndexId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  return params.build();
+                })
+            .build();
+    GrpcCallSettings getIndexTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getIndexMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  ImmutableMap.Builder params = ImmutableMap.builder();
+                  params.put("index_id", String.valueOf(request.getIndexId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  return params.build();
+                })
+            .build();
+    GrpcCallSettings listIndexesTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(listIndexesMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  ImmutableMap.Builder params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  return params.build();
+                })
+            .build();
+
+    this.exportEntitiesCallable =
+        callableFactory.createUnaryCallable(
+            exportEntitiesTransportSettings, settings.exportEntitiesSettings(), clientContext);
+    this.exportEntitiesOperationCallable =
+        callableFactory.createOperationCallable(
+            exportEntitiesTransportSettings,
+            settings.exportEntitiesOperationSettings(),
+            clientContext,
+            operationsStub);
+    this.importEntitiesCallable =
+        callableFactory.createUnaryCallable(
+            importEntitiesTransportSettings, settings.importEntitiesSettings(), clientContext);
+    this.importEntitiesOperationCallable =
+        callableFactory.createOperationCallable(
+            importEntitiesTransportSettings,
+            settings.importEntitiesOperationSettings(),
+            clientContext,
+            operationsStub);
+    this.createIndexCallable =
+        callableFactory.createUnaryCallable(
+            createIndexTransportSettings, settings.createIndexSettings(), clientContext);
+    this.createIndexOperationCallable =
+        callableFactory.createOperationCallable(
+            createIndexTransportSettings,
+            settings.createIndexOperationSettings(),
+            clientContext,
+            operationsStub);
+    this.deleteIndexCallable =
+        callableFactory.createUnaryCallable(
+            deleteIndexTransportSettings, settings.deleteIndexSettings(), clientContext);
+    this.deleteIndexOperationCallable =
+        callableFactory.createOperationCallable(
+            deleteIndexTransportSettings,
+            settings.deleteIndexOperationSettings(),
+            clientContext,
+            operationsStub);
+    this.getIndexCallable =
+        callableFactory.createUnaryCallable(
+            getIndexTransportSettings, settings.getIndexSettings(), clientContext);
+    this.listIndexesCallable =
+        callableFactory.createUnaryCallable(
+            listIndexesTransportSettings, settings.listIndexesSettings(), clientContext);
+    this.listIndexesPagedCallable =
+        callableFactory.createPagedCallable(
+            listIndexesTransportSettings, settings.listIndexesSettings(), clientContext);
+
+    this.backgroundResources =
+        new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+  }
+
+  public GrpcOperationsStub getOperationsStub() {
+    return operationsStub;
+  }
+
+  @Override
+  public UnaryCallable exportEntitiesCallable() {
+    return exportEntitiesCallable;
+  }
+
+  @Override
+  public OperationCallable
+      exportEntitiesOperationCallable() {
+    return exportEntitiesOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable importEntitiesCallable() {
+    return importEntitiesCallable;
+  }
+
+  @Override
+  public OperationCallable
+      importEntitiesOperationCallable() {
+    return importEntitiesOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable createIndexCallable() {
+    return createIndexCallable;
+  }
+
+  @Override
+  public OperationCallable
+      createIndexOperationCallable() {
+    return createIndexOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable deleteIndexCallable() {
+    return deleteIndexCallable;
+  }
+
+  @Override
+  public OperationCallable
+      deleteIndexOperationCallable() {
+    return deleteIndexOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable getIndexCallable() {
+    return getIndexCallable;
+  }
+
+  @Override
+  public UnaryCallable listIndexesCallable() {
+    return listIndexesCallable;
+  }
+
+  @Override
+  public UnaryCallable listIndexesPagedCallable() {
+    return listIndexesPagedCallable;
+  }
+
+  @Override
+  public final void close() {
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundResources.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return backgroundResources.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return backgroundResources.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    backgroundResources.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return backgroundResources.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
new file mode 100644
index 000000000000..577037ec4527
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
@@ -0,0 +1,428 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1;
+
+import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.testing.LocalChannelProvider;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.api.gax.grpc.testing.MockServiceHelper;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.common.collect.Lists;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.EntityFilter;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Any;
+import com.google.protobuf.Empty;
+import io.grpc.StatusRuntimeException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Generated;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@Generated("by gapic-generator-java")
+public class DatastoreAdminClientTest {
+  private static MockDatastoreAdmin mockDatastoreAdmin;
+  private static MockServiceHelper mockServiceHelper;
+  private LocalChannelProvider channelProvider;
+  private DatastoreAdminClient client;
+
+  @BeforeClass
+  public static void startStaticServer() {
+    mockDatastoreAdmin = new MockDatastoreAdmin();
+    mockServiceHelper =
+        new MockServiceHelper(
+            UUID.randomUUID().toString(), Arrays.asList(mockDatastoreAdmin));
+    mockServiceHelper.start();
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    mockServiceHelper.stop();
+  }
+
+  @Before
+  public void setUp() throws IOException {
+    mockServiceHelper.reset();
+    channelProvider = mockServiceHelper.createChannelProvider();
+    DatastoreAdminSettings settings =
+        DatastoreAdminSettings.newBuilder()
+            .setTransportChannelProvider(channelProvider)
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .build();
+    client = DatastoreAdminClient.create(settings);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    client.close();
+  }
+
+  @Test
+  public void exportEntitiesTest() throws Exception {
+    ExportEntitiesResponse expectedResponse =
+        ExportEntitiesResponse.newBuilder().setOutputUrl("outputUrl-2119300946").build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("exportEntitiesTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockDatastoreAdmin.addResponse(resultOperation);
+
+    String projectId = "projectId-894832108";
+    Map labels = new HashMap<>();
+    EntityFilter entityFilter = EntityFilter.newBuilder().build();
+    String outputUrlPrefix = "outputUrlPrefix-1132598048";
+
+    ExportEntitiesResponse actualResponse =
+        client.exportEntitiesAsync(projectId, labels, entityFilter, outputUrlPrefix).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastoreAdmin.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ExportEntitiesRequest actualRequest = ((ExportEntitiesRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(labels, actualRequest.getLabelsMap());
+    Assert.assertEquals(entityFilter, actualRequest.getEntityFilter());
+    Assert.assertEquals(outputUrlPrefix, actualRequest.getOutputUrlPrefix());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void exportEntitiesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastoreAdmin.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      Map labels = new HashMap<>();
+      EntityFilter entityFilter = EntityFilter.newBuilder().build();
+      String outputUrlPrefix = "outputUrlPrefix-1132598048";
+      client.exportEntitiesAsync(projectId, labels, entityFilter, outputUrlPrefix).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
+      InvalidArgumentException apiException = ((InvalidArgumentException) e.getCause());
+      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
+    }
+  }
+
+  @Test
+  public void importEntitiesTest() throws Exception {
+    Empty expectedResponse = Empty.newBuilder().build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("importEntitiesTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockDatastoreAdmin.addResponse(resultOperation);
+
+    String projectId = "projectId-894832108";
+    Map labels = new HashMap<>();
+    String inputUrl = "inputUrl470706501";
+    EntityFilter entityFilter = EntityFilter.newBuilder().build();
+
+    client.importEntitiesAsync(projectId, labels, inputUrl, entityFilter).get();
+
+    List actualRequests = mockDatastoreAdmin.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ImportEntitiesRequest actualRequest = ((ImportEntitiesRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(labels, actualRequest.getLabelsMap());
+    Assert.assertEquals(inputUrl, actualRequest.getInputUrl());
+    Assert.assertEquals(entityFilter, actualRequest.getEntityFilter());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void importEntitiesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastoreAdmin.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      Map labels = new HashMap<>();
+      String inputUrl = "inputUrl470706501";
+      EntityFilter entityFilter = EntityFilter.newBuilder().build();
+      client.importEntitiesAsync(projectId, labels, inputUrl, entityFilter).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
+      InvalidArgumentException apiException = ((InvalidArgumentException) e.getCause());
+      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
+    }
+  }
+
+  @Test
+  public void createIndexTest() throws Exception {
+    Index expectedResponse =
+        Index.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .setKind("kind3292052")
+            .addAllProperties(new ArrayList())
+            .build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("createIndexTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockDatastoreAdmin.addResponse(resultOperation);
+
+    CreateIndexRequest request =
+        CreateIndexRequest.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndex(Index.newBuilder().build())
+            .build();
+
+    Index actualResponse = client.createIndexAsync(request).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastoreAdmin.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CreateIndexRequest actualRequest = ((CreateIndexRequest) actualRequests.get(0));
+
+    Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId());
+    Assert.assertEquals(request.getIndex(), actualRequest.getIndex());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void createIndexExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastoreAdmin.addException(exception);
+
+    try {
+      CreateIndexRequest request =
+          CreateIndexRequest.newBuilder()
+              .setProjectId("projectId-894832108")
+              .setIndex(Index.newBuilder().build())
+              .build();
+      client.createIndexAsync(request).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
+      InvalidArgumentException apiException = ((InvalidArgumentException) e.getCause());
+      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
+    }
+  }
+
+  @Test
+  public void deleteIndexTest() throws Exception {
+    Index expectedResponse =
+        Index.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .setKind("kind3292052")
+            .addAllProperties(new ArrayList())
+            .build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("deleteIndexTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockDatastoreAdmin.addResponse(resultOperation);
+
+    DeleteIndexRequest request =
+        DeleteIndexRequest.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .build();
+
+    Index actualResponse = client.deleteIndexAsync(request).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastoreAdmin.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteIndexRequest actualRequest = ((DeleteIndexRequest) actualRequests.get(0));
+
+    Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId());
+    Assert.assertEquals(request.getIndexId(), actualRequest.getIndexId());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void deleteIndexExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastoreAdmin.addException(exception);
+
+    try {
+      DeleteIndexRequest request =
+          DeleteIndexRequest.newBuilder()
+              .setProjectId("projectId-894832108")
+              .setIndexId("indexId1943291277")
+              .build();
+      client.deleteIndexAsync(request).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
+      InvalidArgumentException apiException = ((InvalidArgumentException) e.getCause());
+      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
+    }
+  }
+
+  @Test
+  public void getIndexTest() throws Exception {
+    Index expectedResponse =
+        Index.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .setKind("kind3292052")
+            .addAllProperties(new ArrayList())
+            .build();
+    mockDatastoreAdmin.addResponse(expectedResponse);
+
+    GetIndexRequest request =
+        GetIndexRequest.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .build();
+
+    Index actualResponse = client.getIndex(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastoreAdmin.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetIndexRequest actualRequest = ((GetIndexRequest) actualRequests.get(0));
+
+    Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId());
+    Assert.assertEquals(request.getIndexId(), actualRequest.getIndexId());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void getIndexExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastoreAdmin.addException(exception);
+
+    try {
+      GetIndexRequest request =
+          GetIndexRequest.newBuilder()
+              .setProjectId("projectId-894832108")
+              .setIndexId("indexId1943291277")
+              .build();
+      client.getIndex(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void listIndexesTest() throws Exception {
+    Index responsesElement = Index.newBuilder().build();
+    ListIndexesResponse expectedResponse =
+        ListIndexesResponse.newBuilder()
+            .setNextPageToken("")
+            .addAllIndexes(Arrays.asList(responsesElement))
+            .build();
+    mockDatastoreAdmin.addResponse(expectedResponse);
+
+    ListIndexesRequest request =
+        ListIndexesRequest.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setFilter("filter-1274492040")
+            .setPageSize(883849137)
+            .setPageToken("pageToken873572522")
+            .build();
+
+    ListIndexesPagedResponse pagedListResponse = client.listIndexes(request);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getIndexesList().get(0), resources.get(0));
+
+    List actualRequests = mockDatastoreAdmin.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListIndexesRequest actualRequest = ((ListIndexesRequest) actualRequests.get(0));
+
+    Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId());
+    Assert.assertEquals(request.getFilter(), actualRequest.getFilter());
+    Assert.assertEquals(request.getPageSize(), actualRequest.getPageSize());
+    Assert.assertEquals(request.getPageToken(), actualRequest.getPageToken());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void listIndexesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastoreAdmin.addException(exception);
+
+    try {
+      ListIndexesRequest request =
+          ListIndexesRequest.newBuilder()
+              .setProjectId("projectId-894832108")
+              .setFilter("filter-1274492040")
+              .setPageSize(883849137)
+              .setPageToken("pageToken873572522")
+              .build();
+      client.listIndexes(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
new file mode 100644
index 000000000000..ee0a0961b549
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.protobuf.AbstractMessage;
+import io.grpc.ServerServiceDefinition;
+import java.util.List;
+import javax.annotation.Generated;
+
+@BetaApi
+@Generated("by gapic-generator-java")
+public class MockDatastoreAdmin implements MockGrpcService {
+  private final MockDatastoreAdminImpl serviceImpl;
+
+  public MockDatastoreAdmin() {
+    serviceImpl = new MockDatastoreAdminImpl();
+  }
+
+  @Override
+  public List getRequests() {
+    return serviceImpl.getRequests();
+  }
+
+  @Override
+  public void addResponse(AbstractMessage response) {
+    serviceImpl.addResponse(response);
+  }
+
+  @Override
+  public void addException(Exception exception) {
+    serviceImpl.addException(exception);
+  }
+
+  @Override
+  public ServerServiceDefinition getServiceDefinition() {
+    return serviceImpl.bindService();
+  }
+
+  @Override
+  public void reset() {
+    serviceImpl.reset();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
new file mode 100644
index 000000000000..9536e69e260f
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2021 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
+ *
+ *      https://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.cloud.datastore.admin.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DatastoreAdminGrpc.DatastoreAdminImplBase;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.protobuf.AbstractMessage;
+import io.grpc.stub.StreamObserver;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import javax.annotation.Generated;
+
+@BetaApi
+@Generated("by gapic-generator-java")
+public class MockDatastoreAdminImpl extends DatastoreAdminImplBase {
+  private List requests;
+  private Queue responses;
+
+  public MockDatastoreAdminImpl() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  public List getRequests() {
+    return requests;
+  }
+
+  public void addResponse(AbstractMessage response) {
+    responses.add(response);
+  }
+
+  public void setResponses(List responses) {
+    this.responses = new LinkedList(responses);
+  }
+
+  public void addException(Exception exception) {
+    responses.add(exception);
+  }
+
+  public void reset() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  @Override
+  public void exportEntities(
+      ExportEntitiesRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof Operation) {
+      requests.add(request);
+      responseObserver.onNext(((Operation) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method ExportEntities, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  Operation.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void importEntities(
+      ImportEntitiesRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof Operation) {
+      requests.add(request);
+      responseObserver.onNext(((Operation) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method ImportEntities, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  Operation.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void createIndex(CreateIndexRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof Operation) {
+      requests.add(request);
+      responseObserver.onNext(((Operation) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method CreateIndex, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  Operation.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void deleteIndex(DeleteIndexRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof Operation) {
+      requests.add(request);
+      responseObserver.onNext(((Operation) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method DeleteIndex, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  Operation.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void getIndex(GetIndexRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof Index) {
+      requests.add(request);
+      responseObserver.onNext(((Index) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method GetIndex, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  Index.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void listIndexes(
+      ListIndexesRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof ListIndexesResponse) {
+      requests.add(request);
+      responseObserver.onNext(((ListIndexesResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method ListIndexes, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  ListIndexesResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+}
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
new file mode 100644
index 000000000000..170eea0c2aad
--- /dev/null
+++ b/grpc-google-cloud-datastore-admin-v1/pom.xml
@@ -0,0 +1,69 @@
+
+  4.0.0
+  com.google.api.grpc
+  grpc-google-cloud-datastore-admin-v1
+  2.5.2-SNAPSHOT
+  grpc-google-cloud-datastore-admin-v1
+  GRPC library for google-cloud-datastore
+  
+    com.google.cloud
+    google-cloud-datastore-parent
+    2.5.2-SNAPSHOT
+  
+  
+    
+      io.grpc
+      grpc-api
+    
+    
+      io.grpc
+      grpc-stub
+    
+    
+      io.grpc
+      grpc-protobuf
+    
+    
+      com.google.protobuf
+      protobuf-java
+    
+    
+      com.google.api.grpc
+      proto-google-common-protos
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-datastore-admin-v1
+    
+    
+      com.google.guava
+      guava
+    
+  
+
+  
+    
+      java9
+      
+        [9,)
+      
+      
+        
+          javax.annotation
+          javax.annotation-api
+        
+      
+    
+  
+
+  
+    
+      
+          org.codehaus.mojo
+          flatten-maven-plugin
+        
+    
+  
+
\ No newline at end of file
diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
new file mode 100644
index 000000000000..29fc8fcdcfae
--- /dev/null
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -0,0 +1,1241 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.admin.v1;
+
+import static io.grpc.MethodDescriptor.generateFullMethodName;
+
+/**
+ *
+ *
+ * 
    + * Google Cloud Datastore Admin API
+ * The Datastore Admin API provides several admin services for Cloud Datastore.
+ * -----------------------------------------------------------------------------
+ * ## Concepts
+ * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+ * API.
+ * Operation: An Operation represents work being performed in the background.
+ * EntityFilter: Allows specifying a subset of entities in a project. This is
+ * specified as a combination of kinds and namespaces (either or both of which
+ * may be all).
+ * -----------------------------------------------------------------------------
+ * ## Services
+ * # Export/Import
+ * The Export/Import service provides the ability to copy all or a subset of
+ * entities to/from Google Cloud Storage.
+ * Exported data may be imported into Cloud Datastore for any Google Cloud
+ * Platform project. It is not restricted to the export source project. It is
+ * possible to export from one project and then import into another.
+ * Exported data can also be loaded into Google BigQuery for analysis.
+ * Exports and imports are performed asynchronously. An Operation resource is
+ * created for each export/import. The state (including any errors encountered)
+ * of the export/import may be queried via the Operation resource.
+ * # Index
+ * The index service manages Cloud Datastore composite indexes.
+ * Index creation and deletion are performed asynchronously.
+ * An Operation resource is created for each such asynchronous operation.
+ * The state of the operation (including any errors encountered)
+ * may be queried via the Operation resource.
+ * # Operation
+ * The Operations collection provides a record of actions performed for the
+ * specified project (including any operations in progress). Operations are not
+ * created directly but through calls on other collections or resources.
+ * An operation that is not yet done may be cancelled. The request to cancel is
+ * asynchronous and the operation may continue to run for some time after the
+ * request to cancel is made.
+ * An operation that is done may be deleted so that it is no longer listed as
+ * part of the Operation collection.
+ * ListOperations returns all pending operations, but not completed operations.
+ * Operations are created by service DatastoreAdmin,
+ * but are accessed via service google.longrunning.Operations.
+ * 
    
+ */
+@javax.annotation.Generated(
+    value = "by gRPC proto compiler",
+    comments = "Source: google/datastore/admin/v1/datastore_admin.proto")
+@io.grpc.stub.annotations.GrpcGenerated
+public final class DatastoreAdminGrpc {
+
+  private DatastoreAdminGrpc() {}
+
+  public static final String SERVICE_NAME = "google.datastore.admin.v1.DatastoreAdmin";
+
+  // Static method descriptors that strictly reflect the proto.
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.ExportEntitiesRequest, com.google.longrunning.Operation>
+      getExportEntitiesMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "ExportEntities",
+      requestType = com.google.datastore.admin.v1.ExportEntitiesRequest.class,
+      responseType = com.google.longrunning.Operation.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.ExportEntitiesRequest, com.google.longrunning.Operation>
+      getExportEntitiesMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.admin.v1.ExportEntitiesRequest, com.google.longrunning.Operation>
+        getExportEntitiesMethod;
+    if ((getExportEntitiesMethod = DatastoreAdminGrpc.getExportEntitiesMethod) == null) {
+      synchronized (DatastoreAdminGrpc.class) {
+        if ((getExportEntitiesMethod = DatastoreAdminGrpc.getExportEntitiesMethod) == null) {
+          DatastoreAdminGrpc.getExportEntitiesMethod =
+              getExportEntitiesMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ExportEntities"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.ExportEntitiesRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.longrunning.Operation.getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new DatastoreAdminMethodDescriptorSupplier("ExportEntities"))
+                      .build();
+        }
+      }
+    }
+    return getExportEntitiesMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.ImportEntitiesRequest, com.google.longrunning.Operation>
+      getImportEntitiesMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "ImportEntities",
+      requestType = com.google.datastore.admin.v1.ImportEntitiesRequest.class,
+      responseType = com.google.longrunning.Operation.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.ImportEntitiesRequest, com.google.longrunning.Operation>
+      getImportEntitiesMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.admin.v1.ImportEntitiesRequest, com.google.longrunning.Operation>
+        getImportEntitiesMethod;
+    if ((getImportEntitiesMethod = DatastoreAdminGrpc.getImportEntitiesMethod) == null) {
+      synchronized (DatastoreAdminGrpc.class) {
+        if ((getImportEntitiesMethod = DatastoreAdminGrpc.getImportEntitiesMethod) == null) {
+          DatastoreAdminGrpc.getImportEntitiesMethod =
+              getImportEntitiesMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ImportEntities"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.ImportEntitiesRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.longrunning.Operation.getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new DatastoreAdminMethodDescriptorSupplier("ImportEntities"))
+                      .build();
+        }
+      }
+    }
+    return getImportEntitiesMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.CreateIndexRequest, com.google.longrunning.Operation>
+      getCreateIndexMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "CreateIndex",
+      requestType = com.google.datastore.admin.v1.CreateIndexRequest.class,
+      responseType = com.google.longrunning.Operation.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.CreateIndexRequest, com.google.longrunning.Operation>
+      getCreateIndexMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.admin.v1.CreateIndexRequest, com.google.longrunning.Operation>
+        getCreateIndexMethod;
+    if ((getCreateIndexMethod = DatastoreAdminGrpc.getCreateIndexMethod) == null) {
+      synchronized (DatastoreAdminGrpc.class) {
+        if ((getCreateIndexMethod = DatastoreAdminGrpc.getCreateIndexMethod) == null) {
+          DatastoreAdminGrpc.getCreateIndexMethod =
+              getCreateIndexMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateIndex"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.CreateIndexRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.longrunning.Operation.getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new DatastoreAdminMethodDescriptorSupplier("CreateIndex"))
+                      .build();
+        }
+      }
+    }
+    return getCreateIndexMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.DeleteIndexRequest, com.google.longrunning.Operation>
+      getDeleteIndexMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "DeleteIndex",
+      requestType = com.google.datastore.admin.v1.DeleteIndexRequest.class,
+      responseType = com.google.longrunning.Operation.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.DeleteIndexRequest, com.google.longrunning.Operation>
+      getDeleteIndexMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.admin.v1.DeleteIndexRequest, com.google.longrunning.Operation>
+        getDeleteIndexMethod;
+    if ((getDeleteIndexMethod = DatastoreAdminGrpc.getDeleteIndexMethod) == null) {
+      synchronized (DatastoreAdminGrpc.class) {
+        if ((getDeleteIndexMethod = DatastoreAdminGrpc.getDeleteIndexMethod) == null) {
+          DatastoreAdminGrpc.getDeleteIndexMethod =
+              getDeleteIndexMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteIndex"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.DeleteIndexRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.longrunning.Operation.getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new DatastoreAdminMethodDescriptorSupplier("DeleteIndex"))
+                      .build();
+        }
+      }
+    }
+    return getDeleteIndexMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.GetIndexRequest, com.google.datastore.admin.v1.Index>
+      getGetIndexMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "GetIndex",
+      requestType = com.google.datastore.admin.v1.GetIndexRequest.class,
+      responseType = com.google.datastore.admin.v1.Index.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.GetIndexRequest, com.google.datastore.admin.v1.Index>
+      getGetIndexMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.admin.v1.GetIndexRequest, com.google.datastore.admin.v1.Index>
+        getGetIndexMethod;
+    if ((getGetIndexMethod = DatastoreAdminGrpc.getGetIndexMethod) == null) {
+      synchronized (DatastoreAdminGrpc.class) {
+        if ((getGetIndexMethod = DatastoreAdminGrpc.getGetIndexMethod) == null) {
+          DatastoreAdminGrpc.getGetIndexMethod =
+              getGetIndexMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetIndex"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.GetIndexRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.Index.getDefaultInstance()))
+                      .setSchemaDescriptor(new DatastoreAdminMethodDescriptorSupplier("GetIndex"))
+                      .build();
+        }
+      }
+    }
+    return getGetIndexMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.ListIndexesRequest,
+          com.google.datastore.admin.v1.ListIndexesResponse>
+      getListIndexesMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "ListIndexes",
+      requestType = com.google.datastore.admin.v1.ListIndexesRequest.class,
+      responseType = com.google.datastore.admin.v1.ListIndexesResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.admin.v1.ListIndexesRequest,
+          com.google.datastore.admin.v1.ListIndexesResponse>
+      getListIndexesMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.admin.v1.ListIndexesRequest,
+            com.google.datastore.admin.v1.ListIndexesResponse>
+        getListIndexesMethod;
+    if ((getListIndexesMethod = DatastoreAdminGrpc.getListIndexesMethod) == null) {
+      synchronized (DatastoreAdminGrpc.class) {
+        if ((getListIndexesMethod = DatastoreAdminGrpc.getListIndexesMethod) == null) {
+          DatastoreAdminGrpc.getListIndexesMethod =
+              getListIndexesMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListIndexes"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.ListIndexesRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.admin.v1.ListIndexesResponse
+                                  .getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new DatastoreAdminMethodDescriptorSupplier("ListIndexes"))
+                      .build();
+        }
+      }
+    }
+    return getListIndexesMethod;
+  }
+
+  /** Creates a new async stub that supports all call types for the service */
+  public static DatastoreAdminStub newStub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreAdminStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreAdminStub(channel, callOptions);
+          }
+        };
+    return DatastoreAdminStub.newStub(factory, channel);
+  }
+
+  /**
+   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
+   */
+  public static DatastoreAdminBlockingStub newBlockingStub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreAdminBlockingStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreAdminBlockingStub(channel, callOptions);
+          }
+        };
+    return DatastoreAdminBlockingStub.newStub(factory, channel);
+  }
+
+  /** Creates a new ListenableFuture-style stub that supports unary calls on the service */
+  public static DatastoreAdminFutureStub newFutureStub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreAdminFutureStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreAdminFutureStub(channel, callOptions);
+          }
+        };
+    return DatastoreAdminFutureStub.newStub(factory, channel);
+  }
+
+  /**
+   *
+   *
+   * 
    +   * Google Cloud Datastore Admin API
+   * The Datastore Admin API provides several admin services for Cloud Datastore.
+   * -----------------------------------------------------------------------------
+   * ## Concepts
+   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+   * API.
+   * Operation: An Operation represents work being performed in the background.
+   * EntityFilter: Allows specifying a subset of entities in a project. This is
+   * specified as a combination of kinds and namespaces (either or both of which
+   * may be all).
+   * -----------------------------------------------------------------------------
+   * ## Services
+   * # Export/Import
+   * The Export/Import service provides the ability to copy all or a subset of
+   * entities to/from Google Cloud Storage.
+   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * Platform project. It is not restricted to the export source project. It is
+   * possible to export from one project and then import into another.
+   * Exported data can also be loaded into Google BigQuery for analysis.
+   * Exports and imports are performed asynchronously. An Operation resource is
+   * created for each export/import. The state (including any errors encountered)
+   * of the export/import may be queried via the Operation resource.
+   * # Index
+   * The index service manages Cloud Datastore composite indexes.
+   * Index creation and deletion are performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * # Operation
+   * The Operations collection provides a record of actions performed for the
+   * specified project (including any operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * An operation that is not yet done may be cancelled. The request to cancel is
+   * asynchronous and the operation may continue to run for some time after the
+   * request to cancel is made.
+   * An operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection.
+   * ListOperations returns all pending operations, but not completed operations.
+   * Operations are created by service DatastoreAdmin,
+   * but are accessed via service google.longrunning.Operations.
+   * 
    
+   */
+  public abstract static class DatastoreAdminImplBase implements io.grpc.BindableService {
+
+    /**
+     *
+     *
+     * 
    +     * Exports a copy of all or a subset of entities from Google Cloud Datastore
+     * to another storage system, such as Google Cloud Storage. Recent updates to
+     * entities may not be reflected in the export. The export occurs in the
+     * background and its progress can be monitored and managed via the
+     * Operation resource that is created. The output of an export may only be
+     * used once the associated operation is done. If an export operation is
+     * cancelled before completion it may leave partial data behind in Google
+     * Cloud Storage.
+     * 
    
+     */
+    public void exportEntities(
+        com.google.datastore.admin.v1.ExportEntitiesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getExportEntitiesMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Imports entities into Google Cloud Datastore. Existing entities with the
+     * same key are overwritten. The import occurs in the background and its
+     * progress can be monitored and managed via the Operation resource that is
+     * created. If an ImportEntities operation is cancelled, it is possible
+     * that a subset of the data has already been imported to Cloud Datastore.
+     * 
    
+     */
+    public void importEntities(
+        com.google.datastore.admin.v1.ImportEntitiesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getImportEntitiesMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Creates the specified index.
+     * A newly created index's initial state is `CREATING`. On completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
+     * If the index already exists, the call will return an `ALREADY_EXISTS`
+     * status.
+     * During index creation, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, removing the index with
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then
+     * re-creating the index with [create]
+     * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+     * Indexes with a single property cannot be created.
+     * 
    
+     */
+    public void createIndex(
+        com.google.datastore.admin.v1.CreateIndexRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCreateIndexMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Deletes an existing index.
+     * An index can only be deleted if it is in a `READY` or `ERROR` state. On
+     * successful execution of the request, the index will be in a `DELETING`
+     * [state][google.datastore.admin.v1.Index.State]. And on completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * During index deletion, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, followed by calling
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
+     * 
    
+     */
+    public void deleteIndex(
+        com.google.datastore.admin.v1.DeleteIndexRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getDeleteIndexMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Gets an index.
+     * 
    
+     */
+    public void getIndex(
+        com.google.datastore.admin.v1.GetIndexRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetIndexMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Lists the indexes that match the specified filters.  Datastore uses an
+     * eventually consistent query to fetch the list of indexes and may
+     * occasionally return stale results.
+     * 
    
+     */
+    public void listIndexes(
+        com.google.datastore.admin.v1.ListIndexesRequest request,
+        io.grpc.stub.StreamObserver
+            responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getListIndexesMethod(), responseObserver);
+    }
+
+    @java.lang.Override
+    public final io.grpc.ServerServiceDefinition bindService() {
+      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+          .addMethod(
+              getExportEntitiesMethod(),
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
+                  new MethodHandlers<
+                      com.google.datastore.admin.v1.ExportEntitiesRequest,
+                      com.google.longrunning.Operation>(this, METHODID_EXPORT_ENTITIES)))
+          .addMethod(
+              getImportEntitiesMethod(),
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
+                  new MethodHandlers<
+                      com.google.datastore.admin.v1.ImportEntitiesRequest,
+                      com.google.longrunning.Operation>(this, METHODID_IMPORT_ENTITIES)))
+          .addMethod(
+              getCreateIndexMethod(),
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
+                  new MethodHandlers<
+                      com.google.datastore.admin.v1.CreateIndexRequest,
+                      com.google.longrunning.Operation>(this, METHODID_CREATE_INDEX)))
+          .addMethod(
+              getDeleteIndexMethod(),
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
+                  new MethodHandlers<
+                      com.google.datastore.admin.v1.DeleteIndexRequest,
+                      com.google.longrunning.Operation>(this, METHODID_DELETE_INDEX)))
+          .addMethod(
+              getGetIndexMethod(),
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
+                  new MethodHandlers<
+                      com.google.datastore.admin.v1.GetIndexRequest,
+                      com.google.datastore.admin.v1.Index>(this, METHODID_GET_INDEX)))
+          .addMethod(
+              getListIndexesMethod(),
+              io.grpc.stub.ServerCalls.asyncUnaryCall(
+                  new MethodHandlers<
+                      com.google.datastore.admin.v1.ListIndexesRequest,
+                      com.google.datastore.admin.v1.ListIndexesResponse>(
+                      this, METHODID_LIST_INDEXES)))
+          .build();
+    }
+  }
+
+  /**
+   *
+   *
+   * 
    +   * Google Cloud Datastore Admin API
+   * The Datastore Admin API provides several admin services for Cloud Datastore.
+   * -----------------------------------------------------------------------------
+   * ## Concepts
+   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+   * API.
+   * Operation: An Operation represents work being performed in the background.
+   * EntityFilter: Allows specifying a subset of entities in a project. This is
+   * specified as a combination of kinds and namespaces (either or both of which
+   * may be all).
+   * -----------------------------------------------------------------------------
+   * ## Services
+   * # Export/Import
+   * The Export/Import service provides the ability to copy all or a subset of
+   * entities to/from Google Cloud Storage.
+   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * Platform project. It is not restricted to the export source project. It is
+   * possible to export from one project and then import into another.
+   * Exported data can also be loaded into Google BigQuery for analysis.
+   * Exports and imports are performed asynchronously. An Operation resource is
+   * created for each export/import. The state (including any errors encountered)
+   * of the export/import may be queried via the Operation resource.
+   * # Index
+   * The index service manages Cloud Datastore composite indexes.
+   * Index creation and deletion are performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * # Operation
+   * The Operations collection provides a record of actions performed for the
+   * specified project (including any operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * An operation that is not yet done may be cancelled. The request to cancel is
+   * asynchronous and the operation may continue to run for some time after the
+   * request to cancel is made.
+   * An operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection.
+   * ListOperations returns all pending operations, but not completed operations.
+   * Operations are created by service DatastoreAdmin,
+   * but are accessed via service google.longrunning.Operations.
+   * 
    
+   */
+  public static final class DatastoreAdminStub
+      extends io.grpc.stub.AbstractAsyncStub {
+    private DatastoreAdminStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreAdminStub build(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreAdminStub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Exports a copy of all or a subset of entities from Google Cloud Datastore
+     * to another storage system, such as Google Cloud Storage. Recent updates to
+     * entities may not be reflected in the export. The export occurs in the
+     * background and its progress can be monitored and managed via the
+     * Operation resource that is created. The output of an export may only be
+     * used once the associated operation is done. If an export operation is
+     * cancelled before completion it may leave partial data behind in Google
+     * Cloud Storage.
+     * 
    
+     */
+    public void exportEntities(
+        com.google.datastore.admin.v1.ExportEntitiesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getExportEntitiesMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Imports entities into Google Cloud Datastore. Existing entities with the
+     * same key are overwritten. The import occurs in the background and its
+     * progress can be monitored and managed via the Operation resource that is
+     * created. If an ImportEntities operation is cancelled, it is possible
+     * that a subset of the data has already been imported to Cloud Datastore.
+     * 
    
+     */
+    public void importEntities(
+        com.google.datastore.admin.v1.ImportEntitiesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getImportEntitiesMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Creates the specified index.
+     * A newly created index's initial state is `CREATING`. On completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
+     * If the index already exists, the call will return an `ALREADY_EXISTS`
+     * status.
+     * During index creation, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, removing the index with
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then
+     * re-creating the index with [create]
+     * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+     * Indexes with a single property cannot be created.
+     * 
    
+     */
+    public void createIndex(
+        com.google.datastore.admin.v1.CreateIndexRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getCreateIndexMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Deletes an existing index.
+     * An index can only be deleted if it is in a `READY` or `ERROR` state. On
+     * successful execution of the request, the index will be in a `DELETING`
+     * [state][google.datastore.admin.v1.Index.State]. And on completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * During index deletion, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, followed by calling
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
+     * 
    
+     */
+    public void deleteIndex(
+        com.google.datastore.admin.v1.DeleteIndexRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getDeleteIndexMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Gets an index.
+     * 
    
+     */
+    public void getIndex(
+        com.google.datastore.admin.v1.GetIndexRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getGetIndexMethod(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Lists the indexes that match the specified filters.  Datastore uses an
+     * eventually consistent query to fetch the list of indexes and may
+     * occasionally return stale results.
+     * 
    
+     */
+    public void listIndexes(
+        com.google.datastore.admin.v1.ListIndexesRequest request,
+        io.grpc.stub.StreamObserver
+            responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getListIndexesMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+  }
+
+  /**
+   *
+   *
+   * 
    +   * Google Cloud Datastore Admin API
+   * The Datastore Admin API provides several admin services for Cloud Datastore.
+   * -----------------------------------------------------------------------------
+   * ## Concepts
+   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+   * API.
+   * Operation: An Operation represents work being performed in the background.
+   * EntityFilter: Allows specifying a subset of entities in a project. This is
+   * specified as a combination of kinds and namespaces (either or both of which
+   * may be all).
+   * -----------------------------------------------------------------------------
+   * ## Services
+   * # Export/Import
+   * The Export/Import service provides the ability to copy all or a subset of
+   * entities to/from Google Cloud Storage.
+   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * Platform project. It is not restricted to the export source project. It is
+   * possible to export from one project and then import into another.
+   * Exported data can also be loaded into Google BigQuery for analysis.
+   * Exports and imports are performed asynchronously. An Operation resource is
+   * created for each export/import. The state (including any errors encountered)
+   * of the export/import may be queried via the Operation resource.
+   * # Index
+   * The index service manages Cloud Datastore composite indexes.
+   * Index creation and deletion are performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * # Operation
+   * The Operations collection provides a record of actions performed for the
+   * specified project (including any operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * An operation that is not yet done may be cancelled. The request to cancel is
+   * asynchronous and the operation may continue to run for some time after the
+   * request to cancel is made.
+   * An operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection.
+   * ListOperations returns all pending operations, but not completed operations.
+   * Operations are created by service DatastoreAdmin,
+   * but are accessed via service google.longrunning.Operations.
+   * 
    
+   */
+  public static final class DatastoreAdminBlockingStub
+      extends io.grpc.stub.AbstractBlockingStub {
+    private DatastoreAdminBlockingStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreAdminBlockingStub build(
+        io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreAdminBlockingStub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Exports a copy of all or a subset of entities from Google Cloud Datastore
+     * to another storage system, such as Google Cloud Storage. Recent updates to
+     * entities may not be reflected in the export. The export occurs in the
+     * background and its progress can be monitored and managed via the
+     * Operation resource that is created. The output of an export may only be
+     * used once the associated operation is done. If an export operation is
+     * cancelled before completion it may leave partial data behind in Google
+     * Cloud Storage.
+     * 
    
+     */
+    public com.google.longrunning.Operation exportEntities(
+        com.google.datastore.admin.v1.ExportEntitiesRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getExportEntitiesMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Imports entities into Google Cloud Datastore. Existing entities with the
+     * same key are overwritten. The import occurs in the background and its
+     * progress can be monitored and managed via the Operation resource that is
+     * created. If an ImportEntities operation is cancelled, it is possible
+     * that a subset of the data has already been imported to Cloud Datastore.
+     * 
    
+     */
+    public com.google.longrunning.Operation importEntities(
+        com.google.datastore.admin.v1.ImportEntitiesRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getImportEntitiesMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Creates the specified index.
+     * A newly created index's initial state is `CREATING`. On completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
+     * If the index already exists, the call will return an `ALREADY_EXISTS`
+     * status.
+     * During index creation, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, removing the index with
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then
+     * re-creating the index with [create]
+     * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+     * Indexes with a single property cannot be created.
+     * 
    
+     */
+    public com.google.longrunning.Operation createIndex(
+        com.google.datastore.admin.v1.CreateIndexRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCreateIndexMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Deletes an existing index.
+     * An index can only be deleted if it is in a `READY` or `ERROR` state. On
+     * successful execution of the request, the index will be in a `DELETING`
+     * [state][google.datastore.admin.v1.Index.State]. And on completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * During index deletion, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, followed by calling
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
+     * 
    
+     */
+    public com.google.longrunning.Operation deleteIndex(
+        com.google.datastore.admin.v1.DeleteIndexRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getDeleteIndexMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Gets an index.
+     * 
    
+     */
+    public com.google.datastore.admin.v1.Index getIndex(
+        com.google.datastore.admin.v1.GetIndexRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getGetIndexMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Lists the indexes that match the specified filters.  Datastore uses an
+     * eventually consistent query to fetch the list of indexes and may
+     * occasionally return stale results.
+     * 
    
+     */
+    public com.google.datastore.admin.v1.ListIndexesResponse listIndexes(
+        com.google.datastore.admin.v1.ListIndexesRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getListIndexesMethod(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   *
+   *
+   * 
    +   * Google Cloud Datastore Admin API
+   * The Datastore Admin API provides several admin services for Cloud Datastore.
+   * -----------------------------------------------------------------------------
+   * ## Concepts
+   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+   * API.
+   * Operation: An Operation represents work being performed in the background.
+   * EntityFilter: Allows specifying a subset of entities in a project. This is
+   * specified as a combination of kinds and namespaces (either or both of which
+   * may be all).
+   * -----------------------------------------------------------------------------
+   * ## Services
+   * # Export/Import
+   * The Export/Import service provides the ability to copy all or a subset of
+   * entities to/from Google Cloud Storage.
+   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * Platform project. It is not restricted to the export source project. It is
+   * possible to export from one project and then import into another.
+   * Exported data can also be loaded into Google BigQuery for analysis.
+   * Exports and imports are performed asynchronously. An Operation resource is
+   * created for each export/import. The state (including any errors encountered)
+   * of the export/import may be queried via the Operation resource.
+   * # Index
+   * The index service manages Cloud Datastore composite indexes.
+   * Index creation and deletion are performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * # Operation
+   * The Operations collection provides a record of actions performed for the
+   * specified project (including any operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * An operation that is not yet done may be cancelled. The request to cancel is
+   * asynchronous and the operation may continue to run for some time after the
+   * request to cancel is made.
+   * An operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection.
+   * ListOperations returns all pending operations, but not completed operations.
+   * Operations are created by service DatastoreAdmin,
+   * but are accessed via service google.longrunning.Operations.
+   * 
    
+   */
+  public static final class DatastoreAdminFutureStub
+      extends io.grpc.stub.AbstractFutureStub {
+    private DatastoreAdminFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreAdminFutureStub build(
+        io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreAdminFutureStub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Exports a copy of all or a subset of entities from Google Cloud Datastore
+     * to another storage system, such as Google Cloud Storage. Recent updates to
+     * entities may not be reflected in the export. The export occurs in the
+     * background and its progress can be monitored and managed via the
+     * Operation resource that is created. The output of an export may only be
+     * used once the associated operation is done. If an export operation is
+     * cancelled before completion it may leave partial data behind in Google
+     * Cloud Storage.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture
+        exportEntities(com.google.datastore.admin.v1.ExportEntitiesRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getExportEntitiesMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Imports entities into Google Cloud Datastore. Existing entities with the
+     * same key are overwritten. The import occurs in the background and its
+     * progress can be monitored and managed via the Operation resource that is
+     * created. If an ImportEntities operation is cancelled, it is possible
+     * that a subset of the data has already been imported to Cloud Datastore.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture
+        importEntities(com.google.datastore.admin.v1.ImportEntitiesRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getImportEntitiesMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Creates the specified index.
+     * A newly created index's initial state is `CREATING`. On completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
+     * If the index already exists, the call will return an `ALREADY_EXISTS`
+     * status.
+     * During index creation, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, removing the index with
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then
+     * re-creating the index with [create]
+     * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+     * Indexes with a single property cannot be created.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture
+        createIndex(com.google.datastore.admin.v1.CreateIndexRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getCreateIndexMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Deletes an existing index.
+     * An index can only be deleted if it is in a `READY` or `ERROR` state. On
+     * successful execution of the request, the index will be in a `DELETING`
+     * [state][google.datastore.admin.v1.Index.State]. And on completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * During index deletion, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, followed by calling
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture
+        deleteIndex(com.google.datastore.admin.v1.DeleteIndexRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getDeleteIndexMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Gets an index.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture
+        getIndex(com.google.datastore.admin.v1.GetIndexRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getGetIndexMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Lists the indexes that match the specified filters.  Datastore uses an
+     * eventually consistent query to fetch the list of indexes and may
+     * occasionally return stale results.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.admin.v1.ListIndexesResponse>
+        listIndexes(com.google.datastore.admin.v1.ListIndexesRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getListIndexesMethod(), getCallOptions()), request);
+    }
+  }
+
+  private static final int METHODID_EXPORT_ENTITIES = 0;
+  private static final int METHODID_IMPORT_ENTITIES = 1;
+  private static final int METHODID_CREATE_INDEX = 2;
+  private static final int METHODID_DELETE_INDEX = 3;
+  private static final int METHODID_GET_INDEX = 4;
+  private static final int METHODID_LIST_INDEXES = 5;
+
+  private static final class MethodHandlers
+      implements io.grpc.stub.ServerCalls.UnaryMethod,
+          io.grpc.stub.ServerCalls.ServerStreamingMethod,
+          io.grpc.stub.ServerCalls.ClientStreamingMethod,
+          io.grpc.stub.ServerCalls.BidiStreamingMethod {
+    private final DatastoreAdminImplBase serviceImpl;
+    private final int methodId;
+
+    MethodHandlers(DatastoreAdminImplBase serviceImpl, int methodId) {
+      this.serviceImpl = serviceImpl;
+      this.methodId = methodId;
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        case METHODID_EXPORT_ENTITIES:
+          serviceImpl.exportEntities(
+              (com.google.datastore.admin.v1.ExportEntitiesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_IMPORT_ENTITIES:
+          serviceImpl.importEntities(
+              (com.google.datastore.admin.v1.ImportEntitiesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_CREATE_INDEX:
+          serviceImpl.createIndex(
+              (com.google.datastore.admin.v1.CreateIndexRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_DELETE_INDEX:
+          serviceImpl.deleteIndex(
+              (com.google.datastore.admin.v1.DeleteIndexRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_INDEX:
+          serviceImpl.getIndex(
+              (com.google.datastore.admin.v1.GetIndexRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_INDEXES:
+          serviceImpl.listIndexes(
+              (com.google.datastore.admin.v1.ListIndexesRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        default:
+          throw new AssertionError();
+      }
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public io.grpc.stub.StreamObserver invoke(
+        io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        default:
+          throw new AssertionError();
+      }
+    }
+  }
+
+  private abstract static class DatastoreAdminBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoFileDescriptorSupplier,
+          io.grpc.protobuf.ProtoServiceDescriptorSupplier {
+    DatastoreAdminBaseDescriptorSupplier() {}
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto.getDescriptor();
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
+      return getFileDescriptor().findServiceByName("DatastoreAdmin");
+    }
+  }
+
+  private static final class DatastoreAdminFileDescriptorSupplier
+      extends DatastoreAdminBaseDescriptorSupplier {
+    DatastoreAdminFileDescriptorSupplier() {}
+  }
+
+  private static final class DatastoreAdminMethodDescriptorSupplier
+      extends DatastoreAdminBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
+    private final String methodName;
+
+    DatastoreAdminMethodDescriptorSupplier(String methodName) {
+      this.methodName = methodName;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
+      return getServiceDescriptor().findMethodByName(methodName);
+    }
+  }
+
+  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
+
+  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
+    io.grpc.ServiceDescriptor result = serviceDescriptor;
+    if (result == null) {
+      synchronized (DatastoreAdminGrpc.class) {
+        result = serviceDescriptor;
+        if (result == null) {
+          serviceDescriptor =
+              result =
+                  io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
+                      .setSchemaDescriptor(new DatastoreAdminFileDescriptorSupplier())
+                      .addMethod(getExportEntitiesMethod())
+                      .addMethod(getImportEntitiesMethod())
+                      .addMethod(getCreateIndexMethod())
+                      .addMethod(getDeleteIndexMethod())
+                      .addMethod(getGetIndexMethod())
+                      .addMethod(getListIndexesMethod())
+                      .build();
+        }
+      }
+    }
+    return result;
+  }
+}
diff --git a/pom.xml b/pom.xml
index 73853572c1e2..391e807f0aa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,21 @@
         import
       
 
+      
+        com.google.api.grpc
+        proto-google-cloud-datastore-admin-v1
+        2.5.2-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        grpc-google-cloud-datastore-v1
+        2.5.2-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        grpc-google-cloud-datastore-admin-v1
+        2.5.2-SNAPSHOT
+      
       
         com.google.cloud
         google-cloud-datastore
@@ -256,7 +271,9 @@
 
   
     google-cloud-datastore
+    grpc-google-cloud-datastore-admin-v1
     proto-google-cloud-datastore-v1
+    proto-google-cloud-datastore-admin-v1
     datastore-v1-proto-client
     google-cloud-datastore-bom
   
diff --git a/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml
new file mode 100644
index 000000000000..c384c422ece1
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml
@@ -0,0 +1,19 @@
+
+
+
+  
+    7012
+    com/google/datastore/admin/v1/*OrBuilder
+    * get*(*)
+  
+  
+    7012
+    com/google/datastore/admin/v1/*OrBuilder
+    boolean contains*(*)
+  
+  
+    7012
+    com/google/datastore/admin/v1/*OrBuilder
+    boolean has*(*)
+  
+
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
new file mode 100644
index 000000000000..ac1106424fbc
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -0,0 +1,34 @@
+
+  4.0.0
+  com.google.api.grpc
+  proto-google-cloud-datastore-admin-v1
+  2.5.2-SNAPSHOT
+  proto-google-cloud-datastore-admin-v1
+  Proto library for google-cloud-datastore
+  
+    com.google.cloud
+    google-cloud-datastore-parent
+    2.5.2-SNAPSHOT
+  
+  
+    
+      com.google.protobuf
+      protobuf-java
+    
+    
+      com.google.api.grpc
+      proto-google-common-protos
+    
+  
+
+  
+    
+      
+          org.codehaus.mojo
+          flatten-maven-plugin
+        
+    
+  
+
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
new file mode 100644
index 000000000000..240290b300f2
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -0,0 +1,1912 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Metadata common to all Datastore Admin operations.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.CommonMetadata}
+ */
+public final class CommonMetadata extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.CommonMetadata)
+    CommonMetadataOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use CommonMetadata.newBuilder() to construct.
+  private CommonMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private CommonMetadata() {
+    operationType_ = 0;
+    state_ = 0;
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new CommonMetadata();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private CommonMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (startTime_ != null) {
+                subBuilder = startTime_.toBuilder();
+              }
+              startTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(startTime_);
+                startTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (endTime_ != null) {
+                subBuilder = endTime_.toBuilder();
+              }
+              endTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(endTime_);
+                endTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              operationType_ = rawValue;
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ =
+                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry labels__ =
+                  input.readMessage(
+                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+              break;
+            }
+          case 40:
+            {
+              int rawValue = input.readEnum();
+
+              state_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_CommonMetadata_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
+    switch (number) {
+      case 4:
+        return internalGetLabels();
+      default:
+        throw new RuntimeException("Invalid map field number: " + number);
+    }
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_CommonMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.CommonMetadata.class,
+            com.google.datastore.admin.v1.CommonMetadata.Builder.class);
+  }
+
+  /**
+   *
+   *
+   * 
    +   * The various possible states for an ongoing Operation.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.admin.v1.CommonMetadata.State}
+   */
+  public enum State implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * Unspecified.
+     * 
    
+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    STATE_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * Request is being prepared for processing.
+     * 
    
+     *
+     * INITIALIZING = 1;
+     */
+    INITIALIZING(1),
+    /**
+     *
+     *
+     * 
    +     * Request is actively being processed.
+     * 
    
+     *
+     * PROCESSING = 2;
+     */
+    PROCESSING(2),
+    /**
+     *
+     *
+     * 
    +     * Request is in the process of being cancelled after user called
+     * google.longrunning.Operations.CancelOperation on the operation.
+     * 
    
+     *
+     * CANCELLING = 3;
+     */
+    CANCELLING(3),
+    /**
+     *
+     *
+     * 
    +     * Request has been processed and is in its finalization stage.
+     * 
    
+     *
+     * FINALIZING = 4;
+     */
+    FINALIZING(4),
+    /**
+     *
+     *
+     * 
    +     * Request has completed successfully.
+     * 
    
+     *
+     * SUCCESSFUL = 5;
+     */
+    SUCCESSFUL(5),
+    /**
+     *
+     *
+     * 
    +     * Request has finished being processed, but encountered an error.
+     * 
    
+     *
+     * FAILED = 6;
+     */
+    FAILED(6),
+    /**
+     *
+     *
+     * 
    +     * Request has finished being cancelled after user called
+     * google.longrunning.Operations.CancelOperation.
+     * 
    
+     *
+     * CANCELLED = 7;
+     */
+    CANCELLED(7),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * Unspecified.
+     * 
    
+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    public static final int STATE_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * Request is being prepared for processing.
+     * 
    
+     *
+     * INITIALIZING = 1;
+     */
+    public static final int INITIALIZING_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * Request is actively being processed.
+     * 
    
+     *
+     * PROCESSING = 2;
+     */
+    public static final int PROCESSING_VALUE = 2;
+    /**
+     *
+     *
+     * 
    +     * Request is in the process of being cancelled after user called
+     * google.longrunning.Operations.CancelOperation on the operation.
+     * 
    
+     *
+     * CANCELLING = 3;
+     */
+    public static final int CANCELLING_VALUE = 3;
+    /**
+     *
+     *
+     * 
    +     * Request has been processed and is in its finalization stage.
+     * 
    
+     *
+     * FINALIZING = 4;
+     */
+    public static final int FINALIZING_VALUE = 4;
+    /**
+     *
+     *
+     * 
    +     * Request has completed successfully.
+     * 
    
+     *
+     * SUCCESSFUL = 5;
+     */
+    public static final int SUCCESSFUL_VALUE = 5;
+    /**
+     *
+     *
+     * 
    +     * Request has finished being processed, but encountered an error.
+     * 
    
+     *
+     * FAILED = 6;
+     */
+    public static final int FAILED_VALUE = 6;
+    /**
+     *
+     *
+     * 
    +     * Request has finished being cancelled after user called
+     * google.longrunning.Operations.CancelOperation.
+     * 
    
+     *
+     * CANCELLED = 7;
+     */
+    public static final int CANCELLED_VALUE = 7;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static State valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static State forNumber(int value) {
+      switch (value) {
+        case 0:
+          return STATE_UNSPECIFIED;
+        case 1:
+          return INITIALIZING;
+        case 2:
+          return PROCESSING;
+        case 3:
+          return CANCELLING;
+        case 4:
+          return FINALIZING;
+        case 5:
+          return SUCCESSFUL;
+        case 6:
+          return FAILED;
+        case 7:
+          return CANCELLED;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public State findValueByNumber(int number) {
+            return State.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.admin.v1.CommonMetadata.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final State[] VALUES = values();
+
+    public static State valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private State(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.CommonMetadata.State)
+  }
+
+  public static final int START_TIME_FIELD_NUMBER = 1;
+  private com.google.protobuf.Timestamp startTime_;
+  /**
+   *
+   *
+   * 
    +   * The time that work began on the operation.
+   * 
    
+   *
+   * .google.protobuf.Timestamp start_time = 1;
+   *
+   * @return Whether the startTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasStartTime() {
+    return startTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time that work began on the operation.
+   * 
    
+   *
+   * .google.protobuf.Timestamp start_time = 1;
+   *
+   * @return The startTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getStartTime() {
+    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time that work began on the operation.
+   * 
    
+   *
+   * .google.protobuf.Timestamp start_time = 1;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+    return getStartTime();
+  }
+
+  public static final int END_TIME_FIELD_NUMBER = 2;
+  private com.google.protobuf.Timestamp endTime_;
+  /**
+   *
+   *
+   * 
    +   * The time the operation ended, either successfully or otherwise.
+   * 
    
+   *
+   * .google.protobuf.Timestamp end_time = 2;
+   *
+   * @return Whether the endTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasEndTime() {
+    return endTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time the operation ended, either successfully or otherwise.
+   * 
    
+   *
+   * .google.protobuf.Timestamp end_time = 2;
+   *
+   * @return The endTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getEndTime() {
+    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time the operation ended, either successfully or otherwise.
+   * 
    
+   *
+   * .google.protobuf.Timestamp end_time = 2;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
+    return getEndTime();
+  }
+
+  public static final int OPERATION_TYPE_FIELD_NUMBER = 3;
+  private int operationType_;
+  /**
+   *
+   *
+   * 
    +   * The type of the operation. Can be used as a filter in
+   * ListOperationsRequest.
+   * 
    
+   *
+   * .google.datastore.admin.v1.OperationType operation_type = 3;
+   *
+   * @return The enum numeric value on the wire for operationType.
+   */
+  @java.lang.Override
+  public int getOperationTypeValue() {
+    return operationType_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The type of the operation. Can be used as a filter in
+   * ListOperationsRequest.
+   * 
    
+   *
+   * .google.datastore.admin.v1.OperationType operation_type = 3;
+   *
+   * @return The operationType.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.OperationType getOperationType() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.OperationType result =
+        com.google.datastore.admin.v1.OperationType.valueOf(operationType_);
+    return result == null ? com.google.datastore.admin.v1.OperationType.UNRECOGNIZED : result;
+  }
+
+  public static final int LABELS_FIELD_NUMBER = 4;
+
+  private static final class LabelsDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry defaultEntry =
+        com.google.protobuf.MapEntry.newDefaultInstance(
+            com.google.datastore.admin.v1.DatastoreAdminProto
+                .internal_static_google_datastore_admin_v1_CommonMetadata_LabelsEntry_descriptor,
+            com.google.protobuf.WireFormat.FieldType.STRING,
+            "",
+            com.google.protobuf.WireFormat.FieldType.STRING,
+            "");
+  }
+
+  private com.google.protobuf.MapField labels_;
+
+  private com.google.protobuf.MapField internalGetLabels() {
+    if (labels_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
+    }
+    return labels_;
+  }
+
+  public int getLabelsCount() {
+    return internalGetLabels().getMap().size();
+  }
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  @java.lang.Override
+  public boolean containsLabels(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    return internalGetLabels().getMap().containsKey(key);
+  }
+  /** Use {@link #getLabelsMap()} instead. */
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getLabels() {
+    return getLabelsMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  @java.lang.Override
+  public java.util.Map getLabelsMap() {
+    return internalGetLabels().getMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  @java.lang.Override
+  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    java.util.Map map = internalGetLabels().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  @java.lang.Override
+  public java.lang.String getLabelsOrThrow(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    java.util.Map map = internalGetLabels().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  public static final int STATE_FIELD_NUMBER = 5;
+  private int state_;
+  /**
+   *
+   *
+   * 
    +   * The current state of the Operation.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+   *
+   * @return The enum numeric value on the wire for state.
+   */
+  @java.lang.Override
+  public int getStateValue() {
+    return state_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The current state of the Operation.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+   *
+   * @return The state.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadata.State getState() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.CommonMetadata.State result =
+        com.google.datastore.admin.v1.CommonMetadata.State.valueOf(state_);
+    return result == null
+        ? com.google.datastore.admin.v1.CommonMetadata.State.UNRECOGNIZED
+        : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (startTime_ != null) {
+      output.writeMessage(1, getStartTime());
+    }
+    if (endTime_ != null) {
+      output.writeMessage(2, getEndTime());
+    }
+    if (operationType_
+        != com.google.datastore.admin.v1.OperationType.OPERATION_TYPE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(3, operationType_);
+    }
+    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+        output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 4);
+    if (state_
+        != com.google.datastore.admin.v1.CommonMetadata.State.STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(5, state_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (startTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStartTime());
+    }
+    if (endTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
+    }
+    if (operationType_
+        != com.google.datastore.admin.v1.OperationType.OPERATION_TYPE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, operationType_);
+    }
+    for (java.util.Map.Entry entry :
+        internalGetLabels().getMap().entrySet()) {
+      com.google.protobuf.MapEntry labels__ =
+          LabelsDefaultEntryHolder.defaultEntry
+              .newBuilderForType()
+              .setKey(entry.getKey())
+              .setValue(entry.getValue())
+              .build();
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, labels__);
+    }
+    if (state_
+        != com.google.datastore.admin.v1.CommonMetadata.State.STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, state_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.CommonMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.CommonMetadata other =
+        (com.google.datastore.admin.v1.CommonMetadata) obj;
+
+    if (hasStartTime() != other.hasStartTime()) return false;
+    if (hasStartTime()) {
+      if (!getStartTime().equals(other.getStartTime())) return false;
+    }
+    if (hasEndTime() != other.hasEndTime()) return false;
+    if (hasEndTime()) {
+      if (!getEndTime().equals(other.getEndTime())) return false;
+    }
+    if (operationType_ != other.operationType_) return false;
+    if (!internalGetLabels().equals(other.internalGetLabels())) return false;
+    if (state_ != other.state_) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasStartTime()) {
+      hash = (37 * hash) + START_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getStartTime().hashCode();
+    }
+    if (hasEndTime()) {
+      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getEndTime().hashCode();
+    }
+    hash = (37 * hash) + OPERATION_TYPE_FIELD_NUMBER;
+    hash = (53 * hash) + operationType_;
+    if (!internalGetLabels().getMap().isEmpty()) {
+      hash = (37 * hash) + LABELS_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetLabels().hashCode();
+    }
+    hash = (37 * hash) + STATE_FIELD_NUMBER;
+    hash = (53 * hash) + state_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.CommonMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.CommonMetadata}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.CommonMetadata)
+      com.google.datastore.admin.v1.CommonMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_CommonMetadata_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
+      switch (number) {
+        case 4:
+          return internalGetLabels();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+      switch (number) {
+        case 4:
+          return internalGetMutableLabels();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_CommonMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.CommonMetadata.class,
+              com.google.datastore.admin.v1.CommonMetadata.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.CommonMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+      } else {
+        startTime_ = null;
+        startTimeBuilder_ = null;
+      }
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+      } else {
+        endTime_ = null;
+        endTimeBuilder_ = null;
+      }
+      operationType_ = 0;
+
+      internalGetMutableLabels().clear();
+      state_ = 0;
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_CommonMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.CommonMetadata getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.CommonMetadata build() {
+      com.google.datastore.admin.v1.CommonMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.CommonMetadata buildPartial() {
+      com.google.datastore.admin.v1.CommonMetadata result =
+          new com.google.datastore.admin.v1.CommonMetadata(this);
+      int from_bitField0_ = bitField0_;
+      if (startTimeBuilder_ == null) {
+        result.startTime_ = startTime_;
+      } else {
+        result.startTime_ = startTimeBuilder_.build();
+      }
+      if (endTimeBuilder_ == null) {
+        result.endTime_ = endTime_;
+      } else {
+        result.endTime_ = endTimeBuilder_.build();
+      }
+      result.operationType_ = operationType_;
+      result.labels_ = internalGetLabels();
+      result.labels_.makeImmutable();
+      result.state_ = state_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.CommonMetadata) {
+        return mergeFrom((com.google.datastore.admin.v1.CommonMetadata) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.CommonMetadata other) {
+      if (other == com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()) return this;
+      if (other.hasStartTime()) {
+        mergeStartTime(other.getStartTime());
+      }
+      if (other.hasEndTime()) {
+        mergeEndTime(other.getEndTime());
+      }
+      if (other.operationType_ != 0) {
+        setOperationTypeValue(other.getOperationTypeValue());
+      }
+      internalGetMutableLabels().mergeFrom(other.internalGetLabels());
+      if (other.state_ != 0) {
+        setStateValue(other.getStateValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.CommonMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.CommonMetadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.protobuf.Timestamp startTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        startTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     *
+     * @return Whether the startTime field is set.
+     */
+    public boolean hasStartTime() {
+      return startTimeBuilder_ != null || startTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     *
+     * @return The startTime.
+     */
+    public com.google.protobuf.Timestamp getStartTime() {
+      if (startTimeBuilder_ == null) {
+        return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+      } else {
+        return startTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     */
+    public Builder setStartTime(com.google.protobuf.Timestamp value) {
+      if (startTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        startTime_ = value;
+        onChanged();
+      } else {
+        startTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     */
+    public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (startTimeBuilder_ == null) {
+        startTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        startTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     */
+    public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
+      if (startTimeBuilder_ == null) {
+        if (startTime_ != null) {
+          startTime_ =
+              com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
+        } else {
+          startTime_ = value;
+        }
+        onChanged();
+      } else {
+        startTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     */
+    public Builder clearStartTime() {
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+        onChanged();
+      } else {
+        startTime_ = null;
+        startTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     */
+    public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
+
+      onChanged();
+      return getStartTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     */
+    public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+      if (startTimeBuilder_ != null) {
+        return startTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time that work began on the operation.
+     * 
    
+     *
+     * .google.protobuf.Timestamp start_time = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getStartTimeFieldBuilder() {
+      if (startTimeBuilder_ == null) {
+        startTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getStartTime(), getParentForChildren(), isClean());
+        startTime_ = null;
+      }
+      return startTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp endTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        endTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     *
+     * @return Whether the endTime field is set.
+     */
+    public boolean hasEndTime() {
+      return endTimeBuilder_ != null || endTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     *
+     * @return The endTime.
+     */
+    public com.google.protobuf.Timestamp getEndTime() {
+      if (endTimeBuilder_ == null) {
+        return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+      } else {
+        return endTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     */
+    public Builder setEndTime(com.google.protobuf.Timestamp value) {
+      if (endTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        endTime_ = value;
+        onChanged();
+      } else {
+        endTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     */
+    public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (endTimeBuilder_ == null) {
+        endTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        endTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     */
+    public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
+      if (endTimeBuilder_ == null) {
+        if (endTime_ != null) {
+          endTime_ =
+              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
+        } else {
+          endTime_ = value;
+        }
+        onChanged();
+      } else {
+        endTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     */
+    public Builder clearEndTime() {
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+        onChanged();
+      } else {
+        endTime_ = null;
+        endTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     */
+    public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
+
+      onChanged();
+      return getEndTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     */
+    public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
+      if (endTimeBuilder_ != null) {
+        return endTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time the operation ended, either successfully or otherwise.
+     * 
    
+     *
+     * .google.protobuf.Timestamp end_time = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getEndTimeFieldBuilder() {
+      if (endTimeBuilder_ == null) {
+        endTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getEndTime(), getParentForChildren(), isClean());
+        endTime_ = null;
+      }
+      return endTimeBuilder_;
+    }
+
+    private int operationType_ = 0;
+    /**
+     *
+     *
+     * 
    +     * The type of the operation. Can be used as a filter in
+     * ListOperationsRequest.
+     * 
    
+     *
+     * .google.datastore.admin.v1.OperationType operation_type = 3;
+     *
+     * @return The enum numeric value on the wire for operationType.
+     */
+    @java.lang.Override
+    public int getOperationTypeValue() {
+      return operationType_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The type of the operation. Can be used as a filter in
+     * ListOperationsRequest.
+     * 
    
+     *
+     * .google.datastore.admin.v1.OperationType operation_type = 3;
+     *
+     * @param value The enum numeric value on the wire for operationType to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOperationTypeValue(int value) {
+
+      operationType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The type of the operation. Can be used as a filter in
+     * ListOperationsRequest.
+     * 
    
+     *
+     * .google.datastore.admin.v1.OperationType operation_type = 3;
+     *
+     * @return The operationType.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.OperationType getOperationType() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.OperationType result =
+          com.google.datastore.admin.v1.OperationType.valueOf(operationType_);
+      return result == null ? com.google.datastore.admin.v1.OperationType.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * The type of the operation. Can be used as a filter in
+     * ListOperationsRequest.
+     * 
    
+     *
+     * .google.datastore.admin.v1.OperationType operation_type = 3;
+     *
+     * @param value The operationType to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOperationType(com.google.datastore.admin.v1.OperationType value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      operationType_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The type of the operation. Can be used as a filter in
+     * ListOperationsRequest.
+     * 
    
+     *
+     * .google.datastore.admin.v1.OperationType operation_type = 3;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearOperationType() {
+
+      operationType_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.MapField labels_;
+
+    private com.google.protobuf.MapField internalGetLabels() {
+      if (labels_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
+      }
+      return labels_;
+    }
+
+    private com.google.protobuf.MapField
+        internalGetMutableLabels() {
+      onChanged();
+      ;
+      if (labels_ == null) {
+        labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+      }
+      if (!labels_.isMutable()) {
+        labels_ = labels_.copy();
+      }
+      return labels_;
+    }
+
+    public int getLabelsCount() {
+      return internalGetLabels().getMap().size();
+    }
+    /**
+     *
+     *
+     * 
    +     * The client-assigned labels which were provided when the operation was
+     * created. May also include additional labels.
+     * 
    
+     *
+     * map<string, string> labels = 4;
+     */
+    @java.lang.Override
+    public boolean containsLabels(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      return internalGetLabels().getMap().containsKey(key);
+    }
+    /** Use {@link #getLabelsMap()} instead. */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getLabels() {
+      return getLabelsMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * The client-assigned labels which were provided when the operation was
+     * created. May also include additional labels.
+     * 
    
+     *
+     * map<string, string> labels = 4;
+     */
+    @java.lang.Override
+    public java.util.Map getLabelsMap() {
+      return internalGetLabels().getMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * The client-assigned labels which were provided when the operation was
+     * created. May also include additional labels.
+     * 
    
+     *
+     * map<string, string> labels = 4;
+     */
+    @java.lang.Override
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      java.util.Map map = internalGetLabels().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     *
+     *
+     * 
    +     * The client-assigned labels which were provided when the operation was
+     * created. May also include additional labels.
+     * 
    
+     *
+     * map<string, string> labels = 4;
+     */
+    @java.lang.Override
+    public java.lang.String getLabelsOrThrow(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      java.util.Map map = internalGetLabels().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearLabels() {
+      internalGetMutableLabels().getMutableMap().clear();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The client-assigned labels which were provided when the operation was
+     * created. May also include additional labels.
+     * 
    
+     *
+     * map<string, string> labels = 4;
+     */
+    public Builder removeLabels(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableLabels().getMutableMap().remove(key);
+      return this;
+    }
+    /** Use alternate mutation accessors instead. */
+    @java.lang.Deprecated
+    public java.util.Map getMutableLabels() {
+      return internalGetMutableLabels().getMutableMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * The client-assigned labels which were provided when the operation was
+     * created. May also include additional labels.
+     * 
    
+     *
+     * map<string, string> labels = 4;
+     */
+    public Builder putLabels(java.lang.String key, java.lang.String value) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      if (value == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableLabels().getMutableMap().put(key, value);
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The client-assigned labels which were provided when the operation was
+     * created. May also include additional labels.
+     * 
    
+     *
+     * map<string, string> labels = 4;
+     */
+    public Builder putAllLabels(java.util.Map values) {
+      internalGetMutableLabels().getMutableMap().putAll(values);
+      return this;
+    }
+
+    private int state_ = 0;
+    /**
+     *
+     *
+     * 
    +     * The current state of the Operation.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+     *
+     * @return The enum numeric value on the wire for state.
+     */
+    @java.lang.Override
+    public int getStateValue() {
+      return state_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of the Operation.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+     *
+     * @param value The enum numeric value on the wire for state to set.
+     * @return This builder for chaining.
+     */
+    public Builder setStateValue(int value) {
+
+      state_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of the Operation.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+     *
+     * @return The state.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.CommonMetadata.State getState() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.CommonMetadata.State result =
+          com.google.datastore.admin.v1.CommonMetadata.State.valueOf(state_);
+      return result == null
+          ? com.google.datastore.admin.v1.CommonMetadata.State.UNRECOGNIZED
+          : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of the Operation.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+     *
+     * @param value The state to set.
+     * @return This builder for chaining.
+     */
+    public Builder setState(com.google.datastore.admin.v1.CommonMetadata.State value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      state_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of the Operation.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearState() {
+
+      state_ = 0;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.CommonMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.CommonMetadata)
+  private static final com.google.datastore.admin.v1.CommonMetadata DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.CommonMetadata();
+  }
+
+  public static com.google.datastore.admin.v1.CommonMetadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public CommonMetadata parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new CommonMetadata(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
new file mode 100644
index 000000000000..470d8c0400ac
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface CommonMetadataOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.CommonMetadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The time that work began on the operation.
+   * 
    
+   *
+   * .google.protobuf.Timestamp start_time = 1;
+   *
+   * @return Whether the startTime field is set.
+   */
+  boolean hasStartTime();
+  /**
+   *
+   *
+   * 
    +   * The time that work began on the operation.
+   * 
    
+   *
+   * .google.protobuf.Timestamp start_time = 1;
+   *
+   * @return The startTime.
+   */
+  com.google.protobuf.Timestamp getStartTime();
+  /**
+   *
+   *
+   * 
    +   * The time that work began on the operation.
+   * 
    
+   *
+   * .google.protobuf.Timestamp start_time = 1;
+   */
+  com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The time the operation ended, either successfully or otherwise.
+   * 
    
+   *
+   * .google.protobuf.Timestamp end_time = 2;
+   *
+   * @return Whether the endTime field is set.
+   */
+  boolean hasEndTime();
+  /**
+   *
+   *
+   * 
    +   * The time the operation ended, either successfully or otherwise.
+   * 
    
+   *
+   * .google.protobuf.Timestamp end_time = 2;
+   *
+   * @return The endTime.
+   */
+  com.google.protobuf.Timestamp getEndTime();
+  /**
+   *
+   *
+   * 
    +   * The time the operation ended, either successfully or otherwise.
+   * 
    
+   *
+   * .google.protobuf.Timestamp end_time = 2;
+   */
+  com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The type of the operation. Can be used as a filter in
+   * ListOperationsRequest.
+   * 
    
+   *
+   * .google.datastore.admin.v1.OperationType operation_type = 3;
+   *
+   * @return The enum numeric value on the wire for operationType.
+   */
+  int getOperationTypeValue();
+  /**
+   *
+   *
+   * 
    +   * The type of the operation. Can be used as a filter in
+   * ListOperationsRequest.
+   * 
    
+   *
+   * .google.datastore.admin.v1.OperationType operation_type = 3;
+   *
+   * @return The operationType.
+   */
+  com.google.datastore.admin.v1.OperationType getOperationType();
+
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  int getLabelsCount();
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  boolean containsLabels(java.lang.String key);
+  /** Use {@link #getLabelsMap()} instead. */
+  @java.lang.Deprecated
+  java.util.Map getLabels();
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  java.util.Map getLabelsMap();
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
+  /**
+   *
+   *
+   * 
    +   * The client-assigned labels which were provided when the operation was
+   * created. May also include additional labels.
+   * 
    
+   *
+   * map<string, string> labels = 4;
+   */
+  java.lang.String getLabelsOrThrow(java.lang.String key);
+
+  /**
+   *
+   *
+   * 
    +   * The current state of the Operation.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+   *
+   * @return The enum numeric value on the wire for state.
+   */
+  int getStateValue();
+  /**
+   *
+   *
+   * 
    +   * The current state of the Operation.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata.State state = 5;
+   *
+   * @return The state.
+   */
+  com.google.datastore.admin.v1.CommonMetadata.State getState();
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
new file mode 100644
index 000000000000..49f3175234d1
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -0,0 +1,920 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The request for
+ * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex][google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.CreateIndexRequest}
+ */
+public final class CreateIndexRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.CreateIndexRequest)
+    CreateIndexRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use CreateIndexRequest.newBuilder() to construct.
+  private CreateIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private CreateIndexRequest() {
+    projectId_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new CreateIndexRequest();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private CreateIndexRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              projectId_ = s;
+              break;
+            }
+          case 26:
+            {
+              com.google.datastore.admin.v1.Index.Builder subBuilder = null;
+              if (index_ != null) {
+                subBuilder = index_.toBuilder();
+              }
+              index_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Index.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(index_);
+                index_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_CreateIndexRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.CreateIndexRequest.class,
+            com.google.datastore.admin.v1.CreateIndexRequest.Builder.class);
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int INDEX_FIELD_NUMBER = 3;
+  private com.google.datastore.admin.v1.Index index_;
+  /**
+   *
+   *
+   * 
    +   * The index to create. The name and state fields are output only and will be
+   * ignored. Single property indexes cannot be created or deleted.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Index index = 3;
+   *
+   * @return Whether the index field is set.
+   */
+  @java.lang.Override
+  public boolean hasIndex() {
+    return index_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The index to create. The name and state fields are output only and will be
+   * ignored. Single property indexes cannot be created or deleted.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Index index = 3;
+   *
+   * @return The index.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Index getIndex() {
+    return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The index to create. The name and state fields are output only and will be
+   * ignored. Single property indexes cannot be created or deleted.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Index index = 3;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.IndexOrBuilder getIndexOrBuilder() {
+    return getIndex();
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
+    }
+    if (index_ != null) {
+      output.writeMessage(3, getIndex());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
+    }
+    if (index_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getIndex());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.CreateIndexRequest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.CreateIndexRequest other =
+        (com.google.datastore.admin.v1.CreateIndexRequest) obj;
+
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (hasIndex() != other.hasIndex()) return false;
+    if (hasIndex()) {
+      if (!getIndex().equals(other.getIndex())) return false;
+    }
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getProjectId().hashCode();
+    if (hasIndex()) {
+      hash = (37 * hash) + INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getIndex().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.CreateIndexRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The request for
+   * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex][google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.CreateIndexRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.CreateIndexRequest)
+      com.google.datastore.admin.v1.CreateIndexRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_CreateIndexRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.CreateIndexRequest.class,
+              com.google.datastore.admin.v1.CreateIndexRequest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.CreateIndexRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      if (indexBuilder_ == null) {
+        index_ = null;
+      } else {
+        index_ = null;
+        indexBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.CreateIndexRequest getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.CreateIndexRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.CreateIndexRequest build() {
+      com.google.datastore.admin.v1.CreateIndexRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.CreateIndexRequest buildPartial() {
+      com.google.datastore.admin.v1.CreateIndexRequest result =
+          new com.google.datastore.admin.v1.CreateIndexRequest(this);
+      result.projectId_ = projectId_;
+      if (indexBuilder_ == null) {
+        result.index_ = index_;
+      } else {
+        result.index_ = indexBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.CreateIndexRequest) {
+        return mergeFrom((com.google.datastore.admin.v1.CreateIndexRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.CreateIndexRequest other) {
+      if (other == com.google.datastore.admin.v1.CreateIndexRequest.getDefaultInstance())
+        return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      if (other.hasIndex()) {
+        mergeIndex(other.getIndex());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.CreateIndexRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.CreateIndexRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.datastore.admin.v1.Index index_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Index,
+            com.google.datastore.admin.v1.Index.Builder,
+            com.google.datastore.admin.v1.IndexOrBuilder>
+        indexBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     *
+     * @return Whether the index field is set.
+     */
+    public boolean hasIndex() {
+      return indexBuilder_ != null || index_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     *
+     * @return The index.
+     */
+    public com.google.datastore.admin.v1.Index getIndex() {
+      if (indexBuilder_ == null) {
+        return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_;
+      } else {
+        return indexBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     */
+    public Builder setIndex(com.google.datastore.admin.v1.Index value) {
+      if (indexBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        index_ = value;
+        onChanged();
+      } else {
+        indexBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     */
+    public Builder setIndex(com.google.datastore.admin.v1.Index.Builder builderForValue) {
+      if (indexBuilder_ == null) {
+        index_ = builderForValue.build();
+        onChanged();
+      } else {
+        indexBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     */
+    public Builder mergeIndex(com.google.datastore.admin.v1.Index value) {
+      if (indexBuilder_ == null) {
+        if (index_ != null) {
+          index_ =
+              com.google.datastore.admin.v1.Index.newBuilder(index_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          index_ = value;
+        }
+        onChanged();
+      } else {
+        indexBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     */
+    public Builder clearIndex() {
+      if (indexBuilder_ == null) {
+        index_ = null;
+        onChanged();
+      } else {
+        index_ = null;
+        indexBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     */
+    public com.google.datastore.admin.v1.Index.Builder getIndexBuilder() {
+
+      onChanged();
+      return getIndexFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     */
+    public com.google.datastore.admin.v1.IndexOrBuilder getIndexOrBuilder() {
+      if (indexBuilder_ != null) {
+        return indexBuilder_.getMessageOrBuilder();
+      } else {
+        return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The index to create. The name and state fields are output only and will be
+     * ignored. Single property indexes cannot be created or deleted.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Index index = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Index,
+            com.google.datastore.admin.v1.Index.Builder,
+            com.google.datastore.admin.v1.IndexOrBuilder>
+        getIndexFieldBuilder() {
+      if (indexBuilder_ == null) {
+        indexBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.Index,
+                com.google.datastore.admin.v1.Index.Builder,
+                com.google.datastore.admin.v1.IndexOrBuilder>(
+                getIndex(), getParentForChildren(), isClean());
+        index_ = null;
+      }
+      return indexBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.CreateIndexRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.CreateIndexRequest)
+  private static final com.google.datastore.admin.v1.CreateIndexRequest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.CreateIndexRequest();
+  }
+
+  public static com.google.datastore.admin.v1.CreateIndexRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public CreateIndexRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new CreateIndexRequest(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CreateIndexRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
new file mode 100644
index 000000000000..5aa22c75bb28
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface CreateIndexRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.CreateIndexRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  com.google.protobuf.ByteString getProjectIdBytes();
+
+  /**
+   *
+   *
+   * 
    +   * The index to create. The name and state fields are output only and will be
+   * ignored. Single property indexes cannot be created or deleted.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Index index = 3;
+   *
+   * @return Whether the index field is set.
+   */
+  boolean hasIndex();
+  /**
+   *
+   *
+   * 
    +   * The index to create. The name and state fields are output only and will be
+   * ignored. Single property indexes cannot be created or deleted.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Index index = 3;
+   *
+   * @return The index.
+   */
+  com.google.datastore.admin.v1.Index getIndex();
+  /**
+   *
+   *
+   * 
    +   * The index to create. The name and state fields are output only and will be
+   * ignored. Single property indexes cannot be created or deleted.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Index index = 3;
+   */
+  com.google.datastore.admin.v1.IndexOrBuilder getIndexOrBuilder();
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
new file mode 100644
index 000000000000..810e65ae7cbb
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public final class DatastoreAdminProto {
+  private DatastoreAdminProto() {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_CommonMetadata_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_CommonMetadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_CommonMetadata_LabelsEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_CommonMetadata_LabelsEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_Progress_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_Progress_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ExportEntitiesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ExportEntitiesRequest_LabelsEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ExportEntitiesRequest_LabelsEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ImportEntitiesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ImportEntitiesRequest_LabelsEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ImportEntitiesRequest_LabelsEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ExportEntitiesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_EntityFilter_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_EntityFilter_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_CreateIndexRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_DeleteIndexRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_GetIndexRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ListIndexesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_ListIndexesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_IndexOperationMetadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+    return descriptor;
+  }
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+  static {
+    java.lang.String[] descriptorData = {
+      "\n/google/datastore/admin/v1/datastore_ad"
+          + "min.proto\022\031google.datastore.admin.v1\032\034go"
+          + "ogle/api/annotations.proto\032\027google/api/c"
+          + "lient.proto\032\037google/api/field_behavior.p"
+          + "roto\032%google/datastore/admin/v1/index.pr"
+          + "oto\032)google/datastore/admin/v1/migration"
+          + ".proto\032#google/longrunning/operations.pr"
+          + "oto\032\037google/protobuf/timestamp.proto\"\364\003\n"
+          + "\016CommonMetadata\022.\n\nstart_time\030\001 \001(\0132\032.go"
+          + "ogle.protobuf.Timestamp\022,\n\010end_time\030\002 \001("
+          + "\0132\032.google.protobuf.Timestamp\022@\n\016operati"
+          + "on_type\030\003 \001(\0162(.google.datastore.admin.v"
+          + "1.OperationType\022E\n\006labels\030\004 \003(\01325.google"
+          + ".datastore.admin.v1.CommonMetadata.Label"
+          + "sEntry\022>\n\005state\030\005 \001(\0162/.google.datastore"
+          + ".admin.v1.CommonMetadata.State\032-\n\013Labels"
+          + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\213\001"
+          + "\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\020\n\014INITIA"
+          + "LIZING\020\001\022\016\n\nPROCESSING\020\002\022\016\n\nCANCELLING\020\003"
+          + "\022\016\n\nFINALIZING\020\004\022\016\n\nSUCCESSFUL\020\005\022\n\n\006FAIL"
+          + "ED\020\006\022\r\n\tCANCELLED\020\007\":\n\010Progress\022\026\n\016work_"
+          + "completed\030\001 \001(\003\022\026\n\016work_estimated\030\002 \001(\003\""
+          + "\215\002\n\025ExportEntitiesRequest\022\027\n\nproject_id\030"
+          + "\001 \001(\tB\003\340A\002\022L\n\006labels\030\002 \003(\0132<.google.data"
+          + "store.admin.v1.ExportEntitiesRequest.Lab"
+          + "elsEntry\022>\n\rentity_filter\030\003 \001(\0132\'.google"
+          + ".datastore.admin.v1.EntityFilter\022\036\n\021outp"
+          + "ut_url_prefix\030\004 \001(\tB\003\340A\002\032-\n\013LabelsEntry\022"
+          + "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\205\002\n\025Impo"
+          + "rtEntitiesRequest\022\027\n\nproject_id\030\001 \001(\tB\003\340"
+          + "A\002\022L\n\006labels\030\002 \003(\0132<.google.datastore.ad"
+          + "min.v1.ImportEntitiesRequest.LabelsEntry"
+          + "\022\026\n\tinput_url\030\003 \001(\tB\003\340A\002\022>\n\rentity_filte"
+          + "r\030\004 \001(\0132\'.google.datastore.admin.v1.Enti"
+          + "tyFilter\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005"
+          + "value\030\002 \001(\t:\0028\001\",\n\026ExportEntitiesRespons"
+          + "e\022\022\n\noutput_url\030\001 \001(\t\"\253\002\n\026ExportEntities"
+          + "Metadata\0229\n\006common\030\001 \001(\0132).google.datast"
+          + "ore.admin.v1.CommonMetadata\022>\n\021progress_"
+          + "entities\030\002 \001(\0132#.google.datastore.admin."
+          + "v1.Progress\022;\n\016progress_bytes\030\003 \001(\0132#.go"
+          + "ogle.datastore.admin.v1.Progress\022>\n\renti"
+          + "ty_filter\030\004 \001(\0132\'.google.datastore.admin"
+          + ".v1.EntityFilter\022\031\n\021output_url_prefix\030\005 "
+          + "\001(\t\"\243\002\n\026ImportEntitiesMetadata\0229\n\006common"
+          + "\030\001 \001(\0132).google.datastore.admin.v1.Commo"
+          + "nMetadata\022>\n\021progress_entities\030\002 \001(\0132#.g"
+          + "oogle.datastore.admin.v1.Progress\022;\n\016pro"
+          + "gress_bytes\030\003 \001(\0132#.google.datastore.adm"
+          + "in.v1.Progress\022>\n\rentity_filter\030\004 \001(\0132\'."
+          + "google.datastore.admin.v1.EntityFilter\022\021"
+          + "\n\tinput_url\030\005 \001(\t\"4\n\014EntityFilter\022\r\n\005kin"
+          + "ds\030\001 \003(\t\022\025\n\rnamespace_ids\030\002 \003(\t\"Y\n\022Creat"
+          + "eIndexRequest\022\022\n\nproject_id\030\001 \001(\t\022/\n\005ind"
+          + "ex\030\003 \001(\0132 .google.datastore.admin.v1.Ind"
+          + "ex\":\n\022DeleteIndexRequest\022\022\n\nproject_id\030\001"
+          + " \001(\t\022\020\n\010index_id\030\003 \001(\t\"7\n\017GetIndexReques"
+          + "t\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010index_id\030\003 \001(\t\""
+          + "_\n\022ListIndexesRequest\022\022\n\nproject_id\030\001 \001("
+          + "\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\022\022\n\n"
+          + "page_token\030\005 \001(\t\"a\n\023ListIndexesResponse\022"
+          + "1\n\007indexes\030\001 \003(\0132 .google.datastore.admi"
+          + "n.v1.Index\022\027\n\017next_page_token\030\002 \001(\t\"\245\001\n\026"
+          + "IndexOperationMetadata\0229\n\006common\030\001 \001(\0132)"
+          + ".google.datastore.admin.v1.CommonMetadat"
+          + "a\022>\n\021progress_entities\030\002 \001(\0132#.google.da"
+          + "tastore.admin.v1.Progress\022\020\n\010index_id\030\003 "
+          + "\001(\t\"\253\001\n#DatastoreFirestoreMigrationMetad"
+          + "ata\022B\n\017migration_state\030\001 \001(\0162).google.da"
+          + "tastore.admin.v1.MigrationState\022@\n\016migra"
+          + "tion_step\030\002 \001(\0162(.google.datastore.admin"
+          + ".v1.MigrationStep*}\n\rOperationType\022\036\n\032OP"
+          + "ERATION_TYPE_UNSPECIFIED\020\000\022\023\n\017EXPORT_ENT"
+          + "ITIES\020\001\022\023\n\017IMPORT_ENTITIES\020\002\022\020\n\014CREATE_I"
+          + "NDEX\020\003\022\020\n\014DELETE_INDEX\020\0042\204\n\n\016DatastoreAd"
+          + "min\022\366\001\n\016ExportEntities\0220.google.datastor"
+          + "e.admin.v1.ExportEntitiesRequest\032\035.googl"
+          + "e.longrunning.Operation\"\222\001\202\323\344\223\002%\" /v1/pr"
+          + "ojects/{project_id}:export:\001*\332A1project_"
+          + "id,labels,entity_filter,output_url_prefi"
+          + "x\312A0\n\026ExportEntitiesResponse\022\026ExportEnti"
+          + "tiesMetadata\022\355\001\n\016ImportEntities\0220.google"
+          + ".datastore.admin.v1.ImportEntitiesReques"
+          + "t\032\035.google.longrunning.Operation\"\211\001\202\323\344\223\002"
+          + "%\" /v1/projects/{project_id}:import:\001*\332A"
+          + ")project_id,labels,input_url,entity_filt"
+          + "er\312A/\n\025google.protobuf.Empty\022\026ImportEnti"
+          + "tiesMetadata\022\257\001\n\013CreateIndex\022-.google.da"
+          + "tastore.admin.v1.CreateIndexRequest\032\035.go"
+          + "ogle.longrunning.Operation\"R\202\323\344\223\002*\"!/v1/"
+          + "projects/{project_id}/indexes:\005index\312A\037\n"
+          + "\005Index\022\026IndexOperationMetadata\022\263\001\n\013Delet"
+          + "eIndex\022-.google.datastore.admin.v1.Delet"
+          + "eIndexRequest\032\035.google.longrunning.Opera"
+          + "tion\"V\202\323\344\223\002.*,/v1/projects/{project_id}/"
+          + "indexes/{index_id}\312A\037\n\005Index\022\026IndexOpera"
+          + "tionMetadata\022\216\001\n\010GetIndex\022*.google.datas"
+          + "tore.admin.v1.GetIndexRequest\032 .google.d"
+          + "atastore.admin.v1.Index\"4\202\323\344\223\002.\022,/v1/pro"
+          + "jects/{project_id}/indexes/{index_id}\022\227\001"
+          + "\n\013ListIndexes\022-.google.datastore.admin.v"
+          + "1.ListIndexesRequest\032..google.datastore."
+          + "admin.v1.ListIndexesResponse\")\202\323\344\223\002#\022!/v"
+          + "1/projects/{project_id}/indexes\032v\312A\030data"
+          + "store.googleapis.com\322AXhttps://www.googl"
+          + "eapis.com/auth/cloud-platform,https://ww"
+          + "w.googleapis.com/auth/datastoreB\340\001\n\035com."
+          + "google.datastore.admin.v1B\023DatastoreAdmi"
+          + "nProtoP\001Z>google.golang.org/genproto/goo"
+          + "gleapis/datastore/admin/v1;admin\252\002\037Googl"
+          + "e.Cloud.Datastore.Admin.V1\312\002\037Google\\Clou"
+          + "d\\Datastore\\Admin\\V1\352\002#Google::Cloud::Da"
+          + "tastore::Admin::V1b\006proto3"
+    };
+    descriptor =
+        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
+            descriptorData,
+            new com.google.protobuf.Descriptors.FileDescriptor[] {
+              com.google.api.AnnotationsProto.getDescriptor(),
+              com.google.api.ClientProto.getDescriptor(),
+              com.google.api.FieldBehaviorProto.getDescriptor(),
+              com.google.datastore.admin.v1.IndexProto.getDescriptor(),
+              com.google.datastore.admin.v1.MigrationProto.getDescriptor(),
+              com.google.longrunning.OperationsProto.getDescriptor(),
+              com.google.protobuf.TimestampProto.getDescriptor(),
+            });
+    internal_static_google_datastore_admin_v1_CommonMetadata_descriptor =
+        getDescriptor().getMessageTypes().get(0);
+    internal_static_google_datastore_admin_v1_CommonMetadata_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_CommonMetadata_descriptor,
+            new java.lang.String[] {
+              "StartTime", "EndTime", "OperationType", "Labels", "State",
+            });
+    internal_static_google_datastore_admin_v1_CommonMetadata_LabelsEntry_descriptor =
+        internal_static_google_datastore_admin_v1_CommonMetadata_descriptor.getNestedTypes().get(0);
+    internal_static_google_datastore_admin_v1_CommonMetadata_LabelsEntry_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_CommonMetadata_LabelsEntry_descriptor,
+            new java.lang.String[] {
+              "Key", "Value",
+            });
+    internal_static_google_datastore_admin_v1_Progress_descriptor =
+        getDescriptor().getMessageTypes().get(1);
+    internal_static_google_datastore_admin_v1_Progress_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_Progress_descriptor,
+            new java.lang.String[] {
+              "WorkCompleted", "WorkEstimated",
+            });
+    internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor =
+        getDescriptor().getMessageTypes().get(2);
+    internal_static_google_datastore_admin_v1_ExportEntitiesRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor,
+            new java.lang.String[] {
+              "ProjectId", "Labels", "EntityFilter", "OutputUrlPrefix",
+            });
+    internal_static_google_datastore_admin_v1_ExportEntitiesRequest_LabelsEntry_descriptor =
+        internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_datastore_admin_v1_ExportEntitiesRequest_LabelsEntry_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ExportEntitiesRequest_LabelsEntry_descriptor,
+            new java.lang.String[] {
+              "Key", "Value",
+            });
+    internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor =
+        getDescriptor().getMessageTypes().get(3);
+    internal_static_google_datastore_admin_v1_ImportEntitiesRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor,
+            new java.lang.String[] {
+              "ProjectId", "Labels", "InputUrl", "EntityFilter",
+            });
+    internal_static_google_datastore_admin_v1_ImportEntitiesRequest_LabelsEntry_descriptor =
+        internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_datastore_admin_v1_ImportEntitiesRequest_LabelsEntry_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ImportEntitiesRequest_LabelsEntry_descriptor,
+            new java.lang.String[] {
+              "Key", "Value",
+            });
+    internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor =
+        getDescriptor().getMessageTypes().get(4);
+    internal_static_google_datastore_admin_v1_ExportEntitiesResponse_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor,
+            new java.lang.String[] {
+              "OutputUrl",
+            });
+    internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor =
+        getDescriptor().getMessageTypes().get(5);
+    internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor,
+            new java.lang.String[] {
+              "Common", "ProgressEntities", "ProgressBytes", "EntityFilter", "OutputUrlPrefix",
+            });
+    internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor =
+        getDescriptor().getMessageTypes().get(6);
+    internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor,
+            new java.lang.String[] {
+              "Common", "ProgressEntities", "ProgressBytes", "EntityFilter", "InputUrl",
+            });
+    internal_static_google_datastore_admin_v1_EntityFilter_descriptor =
+        getDescriptor().getMessageTypes().get(7);
+    internal_static_google_datastore_admin_v1_EntityFilter_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_EntityFilter_descriptor,
+            new java.lang.String[] {
+              "Kinds", "NamespaceIds",
+            });
+    internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor =
+        getDescriptor().getMessageTypes().get(8);
+    internal_static_google_datastore_admin_v1_CreateIndexRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor,
+            new java.lang.String[] {
+              "ProjectId", "Index",
+            });
+    internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor =
+        getDescriptor().getMessageTypes().get(9);
+    internal_static_google_datastore_admin_v1_DeleteIndexRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor,
+            new java.lang.String[] {
+              "ProjectId", "IndexId",
+            });
+    internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor =
+        getDescriptor().getMessageTypes().get(10);
+    internal_static_google_datastore_admin_v1_GetIndexRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor,
+            new java.lang.String[] {
+              "ProjectId", "IndexId",
+            });
+    internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor =
+        getDescriptor().getMessageTypes().get(11);
+    internal_static_google_datastore_admin_v1_ListIndexesRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor,
+            new java.lang.String[] {
+              "ProjectId", "Filter", "PageSize", "PageToken",
+            });
+    internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor =
+        getDescriptor().getMessageTypes().get(12);
+    internal_static_google_datastore_admin_v1_ListIndexesResponse_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor,
+            new java.lang.String[] {
+              "Indexes", "NextPageToken",
+            });
+    internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor =
+        getDescriptor().getMessageTypes().get(13);
+    internal_static_google_datastore_admin_v1_IndexOperationMetadata_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor,
+            new java.lang.String[] {
+              "Common", "ProgressEntities", "IndexId",
+            });
+    internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor =
+        getDescriptor().getMessageTypes().get(14);
+    internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor,
+            new java.lang.String[] {
+              "MigrationState", "MigrationStep",
+            });
+    com.google.protobuf.ExtensionRegistry registry =
+        com.google.protobuf.ExtensionRegistry.newInstance();
+    registry.add(com.google.api.ClientProto.defaultHost);
+    registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
+    registry.add(com.google.api.AnnotationsProto.http);
+    registry.add(com.google.api.ClientProto.methodSignature);
+    registry.add(com.google.api.ClientProto.oauthScopes);
+    registry.add(com.google.longrunning.OperationsProto.operationInfo);
+    com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
+        descriptor, registry);
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.api.ClientProto.getDescriptor();
+    com.google.api.FieldBehaviorProto.getDescriptor();
+    com.google.datastore.admin.v1.IndexProto.getDescriptor();
+    com.google.datastore.admin.v1.MigrationProto.getDescriptor();
+    com.google.longrunning.OperationsProto.getDescriptor();
+    com.google.protobuf.TimestampProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
new file mode 100644
index 000000000000..911de0dae742
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -0,0 +1,797 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * 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}/datastore-firestore-migration`
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata}
+ */
+public final class DatastoreFirestoreMigrationMetadata
+    extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
+    DatastoreFirestoreMigrationMetadataOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use DatastoreFirestoreMigrationMetadata.newBuilder() to construct.
+  private DatastoreFirestoreMigrationMetadata(
+      com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private DatastoreFirestoreMigrationMetadata() {
+    migrationState_ = 0;
+    migrationStep_ = 0;
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new DatastoreFirestoreMigrationMetadata();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private DatastoreFirestoreMigrationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              migrationState_ = rawValue;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              migrationStep_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.class,
+            com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.Builder.class);
+  }
+
+  public static final int MIGRATION_STATE_FIELD_NUMBER = 1;
+  private int migrationState_;
+  /**
+   *
+   *
+   * 
    +   * The current state of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState migration_state = 1;
+   *
+   * @return The enum numeric value on the wire for migrationState.
+   */
+  @java.lang.Override
+  public int getMigrationStateValue() {
+    return migrationState_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The current state of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState migration_state = 1;
+   *
+   * @return The migrationState.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationState getMigrationState() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.MigrationState result =
+        com.google.datastore.admin.v1.MigrationState.valueOf(migrationState_);
+    return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
+  }
+
+  public static final int MIGRATION_STEP_FIELD_NUMBER = 2;
+  private int migrationStep_;
+  /**
+   *
+   *
+   * 
    +   * The current step of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+   *
+   * @return The enum numeric value on the wire for migrationStep.
+   */
+  @java.lang.Override
+  public int getMigrationStepValue() {
+    return migrationStep_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The current step of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+   *
+   * @return The migrationStep.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationStep getMigrationStep() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.MigrationStep result =
+        com.google.datastore.admin.v1.MigrationStep.valueOf(migrationStep_);
+    return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (migrationState_
+        != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, migrationState_);
+    }
+    if (migrationStep_
+        != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) {
+      output.writeEnum(2, migrationStep_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (migrationState_
+        != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, migrationState_);
+    }
+    if (migrationStep_
+        != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, migrationStep_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata other =
+        (com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata) obj;
+
+    if (migrationState_ != other.migrationState_) return false;
+    if (migrationStep_ != other.migrationStep_) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + MIGRATION_STATE_FIELD_NUMBER;
+    hash = (53 * hash) + migrationState_;
+    hash = (37 * hash) + MIGRATION_STEP_FIELD_NUMBER;
+    hash = (53 * hash) + migrationStep_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata
+      parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata
+      parseDelimitedFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(
+      com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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}/datastore-firestore-migration`
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
+      com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.class,
+              com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.Builder.class);
+    }
+
+    // Construct using
+    // com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      migrationState_ = 0;
+
+      migrationStep_ = 0;
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata
+        getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata build() {
+      com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata buildPartial() {
+      com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata result =
+          new com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata(this);
+      result.migrationState_ = migrationState_;
+      result.migrationStep_ = migrationStep_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata) {
+        return mergeFrom((com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(
+        com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata other) {
+      if (other
+          == com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.getDefaultInstance())
+        return this;
+      if (other.migrationState_ != 0) {
+        setMigrationStateValue(other.getMigrationStateValue());
+      }
+      if (other.migrationStep_ != 0) {
+        setMigrationStepValue(other.getMigrationStepValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
+                e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int migrationState_ = 0;
+    /**
+     *
+     *
+     * 
    +     * The current state of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState migration_state = 1;
+     *
+     * @return The enum numeric value on the wire for migrationState.
+     */
+    @java.lang.Override
+    public int getMigrationStateValue() {
+      return migrationState_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState migration_state = 1;
+     *
+     * @param value The enum numeric value on the wire for migrationState to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMigrationStateValue(int value) {
+
+      migrationState_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState migration_state = 1;
+     *
+     * @return The migrationState.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationState getMigrationState() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.MigrationState result =
+          com.google.datastore.admin.v1.MigrationState.valueOf(migrationState_);
+      return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState migration_state = 1;
+     *
+     * @param value The migrationState to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMigrationState(com.google.datastore.admin.v1.MigrationState value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      migrationState_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current state of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState migration_state = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearMigrationState() {
+
+      migrationState_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int migrationStep_ = 0;
+    /**
+     *
+     *
+     * 
    +     * The current step of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+     *
+     * @return The enum numeric value on the wire for migrationStep.
+     */
+    @java.lang.Override
+    public int getMigrationStepValue() {
+      return migrationStep_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current step of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+     *
+     * @param value The enum numeric value on the wire for migrationStep to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMigrationStepValue(int value) {
+
+      migrationStep_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current step of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+     *
+     * @return The migrationStep.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationStep getMigrationStep() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.MigrationStep result =
+          com.google.datastore.admin.v1.MigrationStep.valueOf(migrationStep_);
+      return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current step of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+     *
+     * @param value The migrationStep to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMigrationStep(com.google.datastore.admin.v1.MigrationStep value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      migrationStep_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The current step of migration from Cloud Datastore to Cloud Firestore in
+     * Datastore mode.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearMigrationStep() {
+
+      migrationStep_ = 0;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
+  private static final com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata
+      DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata();
+  }
+
+  public static com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata
+      getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public DatastoreFirestoreMigrationMetadata parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new DatastoreFirestoreMigrationMetadata(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata
+      getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
new file mode 100644
index 000000000000..5030636e500e
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface DatastoreFirestoreMigrationMetadataOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The current state of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState migration_state = 1;
+   *
+   * @return The enum numeric value on the wire for migrationState.
+   */
+  int getMigrationStateValue();
+  /**
+   *
+   *
+   * 
    +   * The current state of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState migration_state = 1;
+   *
+   * @return The migrationState.
+   */
+  com.google.datastore.admin.v1.MigrationState getMigrationState();
+
+  /**
+   *
+   *
+   * 
    +   * The current step of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+   *
+   * @return The enum numeric value on the wire for migrationStep.
+   */
+  int getMigrationStepValue();
+  /**
+   *
+   *
+   * 
    +   * The current step of migration from Cloud Datastore to Cloud Firestore in
+   * Datastore mode.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep migration_step = 2;
+   *
+   * @return The migrationStep.
+   */
+  com.google.datastore.admin.v1.MigrationStep getMigrationStep();
+}
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
new file mode 100644
index 000000000000..f3b255d0e8e6
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java
@@ -0,0 +1,816 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The request for
+ * [google.datastore.admin.v1.DatastoreAdmin.DeleteIndex][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.DeleteIndexRequest}
+ */
+public final class DeleteIndexRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.DeleteIndexRequest)
+    DeleteIndexRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use DeleteIndexRequest.newBuilder() to construct.
+  private DeleteIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private DeleteIndexRequest() {
+    projectId_ = "";
+    indexId_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new DeleteIndexRequest();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private DeleteIndexRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              projectId_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              indexId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_DeleteIndexRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.DeleteIndexRequest.class,
+            com.google.datastore.admin.v1.DeleteIndexRequest.Builder.class);
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int INDEX_ID_FIELD_NUMBER = 3;
+  private volatile java.lang.Object indexId_;
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to delete.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The indexId.
+   */
+  @java.lang.Override
+  public java.lang.String getIndexId() {
+    java.lang.Object ref = indexId_;
+    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();
+      indexId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to delete.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The bytes for indexId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getIndexIdBytes() {
+    java.lang.Object ref = indexId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      indexId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.DeleteIndexRequest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.DeleteIndexRequest other =
+        (com.google.datastore.admin.v1.DeleteIndexRequest) obj;
+
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getIndexId().equals(other.getIndexId())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getProjectId().hashCode();
+    hash = (37 * hash) + INDEX_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getIndexId().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.DeleteIndexRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The request for
+   * [google.datastore.admin.v1.DatastoreAdmin.DeleteIndex][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.DeleteIndexRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.DeleteIndexRequest)
+      com.google.datastore.admin.v1.DeleteIndexRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_DeleteIndexRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.DeleteIndexRequest.class,
+              com.google.datastore.admin.v1.DeleteIndexRequest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.DeleteIndexRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      indexId_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.DeleteIndexRequest getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.DeleteIndexRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.DeleteIndexRequest build() {
+      com.google.datastore.admin.v1.DeleteIndexRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.DeleteIndexRequest buildPartial() {
+      com.google.datastore.admin.v1.DeleteIndexRequest result =
+          new com.google.datastore.admin.v1.DeleteIndexRequest(this);
+      result.projectId_ = projectId_;
+      result.indexId_ = indexId_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.DeleteIndexRequest) {
+        return mergeFrom((com.google.datastore.admin.v1.DeleteIndexRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.DeleteIndexRequest other) {
+      if (other == com.google.datastore.admin.v1.DeleteIndexRequest.getDefaultInstance())
+        return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      if (!other.getIndexId().isEmpty()) {
+        indexId_ = other.indexId_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.DeleteIndexRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.DeleteIndexRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object indexId_ = "";
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to delete.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return The indexId.
+     */
+    public java.lang.String getIndexId() {
+      java.lang.Object ref = indexId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        indexId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to delete.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return The bytes for indexId.
+     */
+    public com.google.protobuf.ByteString getIndexIdBytes() {
+      java.lang.Object ref = indexId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        indexId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to delete.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @param value The indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to delete.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearIndexId() {
+
+      indexId_ = getDefaultInstance().getIndexId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to delete.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @param value The bytes for indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.DeleteIndexRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.DeleteIndexRequest)
+  private static final com.google.datastore.admin.v1.DeleteIndexRequest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.DeleteIndexRequest();
+  }
+
+  public static com.google.datastore.admin.v1.DeleteIndexRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public DeleteIndexRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new DeleteIndexRequest(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.DeleteIndexRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
new file mode 100644
index 000000000000..b33b297ede92
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface DeleteIndexRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.DeleteIndexRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  com.google.protobuf.ByteString getProjectIdBytes();
+
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to delete.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The indexId.
+   */
+  java.lang.String getIndexId();
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to delete.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The bytes for indexId.
+   */
+  com.google.protobuf.ByteString getIndexIdBytes();
+}
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
new file mode 100644
index 000000000000..f67639cd1a01
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java
@@ -0,0 +1,1102 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Identifies a subset of entities in a project. This is specified as
+ * 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']
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.EntityFilter}
+ */
+public final class EntityFilter extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.EntityFilter)
+    EntityFilterOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use EntityFilter.newBuilder() to construct.
+  private EntityFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private EntityFilter() {
+    kinds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    namespaceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new EntityFilter();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private EntityFilter(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                kinds_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              kinds_.add(s);
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                namespaceIds_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              namespaceIds_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        kinds_ = kinds_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        namespaceIds_ = namespaceIds_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_EntityFilter_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_EntityFilter_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.EntityFilter.class,
+            com.google.datastore.admin.v1.EntityFilter.Builder.class);
+  }
+
+  public static final int KINDS_FIELD_NUMBER = 1;
+  private com.google.protobuf.LazyStringList kinds_;
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @return A list containing the kinds.
+   */
+  public com.google.protobuf.ProtocolStringList getKindsList() {
+    return kinds_;
+  }
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @return The count of kinds.
+   */
+  public int getKindsCount() {
+    return kinds_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @param index The index of the element to return.
+   * @return The kinds at the given index.
+   */
+  public java.lang.String getKinds(int index) {
+    return kinds_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the kinds at the given index.
+   */
+  public com.google.protobuf.ByteString getKindsBytes(int index) {
+    return kinds_.getByteString(index);
+  }
+
+  public static final int NAMESPACE_IDS_FIELD_NUMBER = 2;
+  private com.google.protobuf.LazyStringList namespaceIds_;
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @return A list containing the namespaceIds.
+   */
+  public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
+    return namespaceIds_;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @return The count of namespaceIds.
+   */
+  public int getNamespaceIdsCount() {
+    return namespaceIds_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @param index The index of the element to return.
+   * @return The namespaceIds at the given index.
+   */
+  public java.lang.String getNamespaceIds(int index) {
+    return namespaceIds_.get(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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the namespaceIds at the given index.
+   */
+  public com.google.protobuf.ByteString getNamespaceIdsBytes(int index) {
+    return namespaceIds_.getByteString(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    for (int i = 0; i < kinds_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kinds_.getRaw(i));
+    }
+    for (int i = 0; i < namespaceIds_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, namespaceIds_.getRaw(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < kinds_.size(); i++) {
+        dataSize += computeStringSizeNoTag(kinds_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getKindsList().size();
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < namespaceIds_.size(); i++) {
+        dataSize += computeStringSizeNoTag(namespaceIds_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getNamespaceIdsList().size();
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.EntityFilter)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.EntityFilter other =
+        (com.google.datastore.admin.v1.EntityFilter) obj;
+
+    if (!getKindsList().equals(other.getKindsList())) return false;
+    if (!getNamespaceIdsList().equals(other.getNamespaceIdsList())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getKindsCount() > 0) {
+      hash = (37 * hash) + KINDS_FIELD_NUMBER;
+      hash = (53 * hash) + getKindsList().hashCode();
+    }
+    if (getNamespaceIdsCount() > 0) {
+      hash = (37 * hash) + NAMESPACE_IDS_FIELD_NUMBER;
+      hash = (53 * hash) + getNamespaceIdsList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.EntityFilter prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Identifies a subset of entities in a project. This is specified as
+   * 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']
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.EntityFilter}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.EntityFilter)
+      com.google.datastore.admin.v1.EntityFilterOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_EntityFilter_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_EntityFilter_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.EntityFilter.class,
+              com.google.datastore.admin.v1.EntityFilter.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.EntityFilter.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      kinds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      namespaceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_EntityFilter_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.EntityFilter getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.EntityFilter.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.EntityFilter build() {
+      com.google.datastore.admin.v1.EntityFilter result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.EntityFilter buildPartial() {
+      com.google.datastore.admin.v1.EntityFilter result =
+          new com.google.datastore.admin.v1.EntityFilter(this);
+      int from_bitField0_ = bitField0_;
+      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_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.EntityFilter) {
+        return mergeFrom((com.google.datastore.admin.v1.EntityFilter) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.EntityFilter other) {
+      if (other == com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()) return this;
+      if (!other.kinds_.isEmpty()) {
+        if (kinds_.isEmpty()) {
+          kinds_ = other.kinds_;
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          ensureKindsIsMutable();
+          kinds_.addAll(other.kinds_);
+        }
+        onChanged();
+      }
+      if (!other.namespaceIds_.isEmpty()) {
+        if (namespaceIds_.isEmpty()) {
+          namespaceIds_ = other.namespaceIds_;
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          ensureNamespaceIdsIsMutable();
+          namespaceIds_.addAll(other.namespaceIds_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.EntityFilter parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.EntityFilter) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.protobuf.LazyStringList kinds_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
+
+    private void ensureKindsIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        kinds_ = new com.google.protobuf.LazyStringArrayList(kinds_);
+        bitField0_ |= 0x00000001;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @return A list containing the kinds.
+     */
+    public com.google.protobuf.ProtocolStringList getKindsList() {
+      return kinds_.getUnmodifiableView();
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @return The count of kinds.
+     */
+    public int getKindsCount() {
+      return kinds_.size();
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @param index The index of the element to return.
+     * @return The kinds at the given index.
+     */
+    public java.lang.String getKinds(int index) {
+      return kinds_.get(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @param index The index of the value to return.
+     * @return The bytes of the kinds at the given index.
+     */
+    public com.google.protobuf.ByteString getKindsBytes(int index) {
+      return kinds_.getByteString(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @param index The index to set the value at.
+     * @param value The kinds to set.
+     * @return This builder for chaining.
+     */
+    public Builder setKinds(int index, java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureKindsIsMutable();
+      kinds_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @param value The kinds to add.
+     * @return This builder for chaining.
+     */
+    public Builder addKinds(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureKindsIsMutable();
+      kinds_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @param values The kinds to add.
+     * @return This builder for chaining.
+     */
+    public Builder addAllKinds(java.lang.Iterable values) {
+      ensureKindsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(values, kinds_);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearKinds() {
+      kinds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * If empty, then this represents all kinds.
+     * 
    
+     *
+     * repeated string kinds = 1;
+     *
+     * @param value The bytes of the kinds to add.
+     * @return This builder for chaining.
+     */
+    public Builder addKindsBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      ensureKindsIsMutable();
+      kinds_.add(value);
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.LazyStringList namespaceIds_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
+
+    private void ensureNamespaceIdsIsMutable() {
+      if (!((bitField0_ & 0x00000002) != 0)) {
+        namespaceIds_ = new com.google.protobuf.LazyStringArrayList(namespaceIds_);
+        bitField0_ |= 0x00000002;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @return A list containing the namespaceIds.
+     */
+    public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
+      return namespaceIds_.getUnmodifiableView();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @return The count of namespaceIds.
+     */
+    public int getNamespaceIdsCount() {
+      return namespaceIds_.size();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @param index The index of the element to return.
+     * @return The namespaceIds at the given index.
+     */
+    public java.lang.String getNamespaceIds(int index) {
+      return namespaceIds_.get(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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @param index The index of the value to return.
+     * @return The bytes of the namespaceIds at the given index.
+     */
+    public com.google.protobuf.ByteString getNamespaceIdsBytes(int index) {
+      return namespaceIds_.getByteString(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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @param index The index to set the value at.
+     * @param value The namespaceIds to set.
+     * @return This builder for chaining.
+     */
+    public Builder setNamespaceIds(int index, java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureNamespaceIdsIsMutable();
+      namespaceIds_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @param value The namespaceIds to add.
+     * @return This builder for chaining.
+     */
+    public Builder addNamespaceIds(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureNamespaceIdsIsMutable();
+      namespaceIds_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @param values The namespaceIds to add.
+     * @return This builder for chaining.
+     */
+    public Builder addAllNamespaceIds(java.lang.Iterable values) {
+      ensureNamespaceIdsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(values, namespaceIds_);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearNamespaceIds() {
+      namespaceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * Each namespace in this list must be unique.
+     * 
    
+     *
+     * repeated string namespace_ids = 2;
+     *
+     * @param value The bytes of the namespaceIds to add.
+     * @return This builder for chaining.
+     */
+    public Builder addNamespaceIdsBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      ensureNamespaceIdsIsMutable();
+      namespaceIds_.add(value);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.EntityFilter)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.EntityFilter)
+  private static final com.google.datastore.admin.v1.EntityFilter DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.EntityFilter();
+  }
+
+  public static com.google.datastore.admin.v1.EntityFilter getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public EntityFilter parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new EntityFilter(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilter getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..b39e13297a61
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface EntityFilterOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.EntityFilter)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @return A list containing the kinds.
+   */
+  java.util.List getKindsList();
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @return The count of kinds.
+   */
+  int getKindsCount();
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @param index The index of the element to return.
+   * @return The kinds at the given index.
+   */
+  java.lang.String getKinds(int index);
+  /**
+   *
+   *
+   * 
    +   * If empty, then this represents all kinds.
+   * 
    
+   *
+   * repeated string kinds = 1;
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the kinds at the given index.
+   */
+  com.google.protobuf.ByteString getKindsBytes(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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @return A list containing the namespaceIds.
+   */
+  java.util.List 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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @return The count of namespaceIds.
+   */
+  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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @param index The index of the element to return.
+   * @return The namespaceIds at the given index.
+   */
+  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.
+   * Each namespace in this list must be unique.
+   * 
    
+   *
+   * repeated string namespace_ids = 2;
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the namespaceIds at the given index.
+   */
+  com.google.protobuf.ByteString getNamespaceIdsBytes(int index);
+}
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
new file mode 100644
index 000000000000..646fc6921b08
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java
@@ -0,0 +1,1775 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Metadata for ExportEntities operations.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.ExportEntitiesMetadata}
+ */
+public final class ExportEntitiesMetadata extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesMetadata)
+    ExportEntitiesMetadataOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ExportEntitiesMetadata.newBuilder() to construct.
+  private ExportEntitiesMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ExportEntitiesMetadata() {
+    outputUrlPrefix_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ExportEntitiesMetadata();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private ExportEntitiesMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
+              if (progressEntities_ != null) {
+                subBuilder = progressEntities_.toBuilder();
+              }
+              progressEntities_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(progressEntities_);
+                progressEntities_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
+              if (progressBytes_ != null) {
+                subBuilder = progressBytes_.toBuilder();
+              }
+              progressBytes_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(progressBytes_);
+                progressBytes_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
+              if (entityFilter_ != null) {
+                subBuilder = entityFilter_.toBuilder();
+              }
+              entityFilter_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(entityFilter_);
+                entityFilter_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              outputUrlPrefix_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.ExportEntitiesMetadata.class,
+            com.google.datastore.admin.v1.ExportEntitiesMetadata.Builder.class);
+  }
+
+  public static final int COMMON_FIELD_NUMBER = 1;
+  private com.google.datastore.admin.v1.CommonMetadata common_;
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return Whether the common field is set.
+   */
+  @java.lang.Override
+  public boolean hasCommon() {
+    return common_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return The common.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadata getCommon() {
+    return common_ == null
+        ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+        : common_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
+    return getCommon();
+  }
+
+  public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
+  private com.google.datastore.admin.v1.Progress progressEntities_;
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return Whether the progressEntities field is set.
+   */
+  @java.lang.Override
+  public boolean hasProgressEntities() {
+    return progressEntities_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return The progressEntities.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Progress getProgressEntities() {
+    return progressEntities_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressEntities_;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
+    return getProgressEntities();
+  }
+
+  public static final int PROGRESS_BYTES_FIELD_NUMBER = 3;
+  private com.google.datastore.admin.v1.Progress progressBytes_;
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return Whether the progressBytes field is set.
+   */
+  @java.lang.Override
+  public boolean hasProgressBytes() {
+    return progressBytes_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return The progressBytes.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Progress getProgressBytes() {
+    return progressBytes_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressBytes_;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder() {
+    return getProgressBytes();
+  }
+
+  public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
+  private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being exported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  @java.lang.Override
+  public boolean hasEntityFilter() {
+    return entityFilter_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being exported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return The entityFilter.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being exported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+    return getEntityFilter();
+  }
+
+  public static final int OUTPUT_URL_PREFIX_FIELD_NUMBER = 5;
+  private volatile java.lang.Object outputUrlPrefix_;
+  /**
+   *
+   *
+   * 
    +   * Location for the export metadata and data files. This will be the same
+   * value as the
+   * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+   * field. The final output location is provided in
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+   * 
    
+   *
+   * string output_url_prefix = 5;
+   *
+   * @return The outputUrlPrefix.
+   */
+  @java.lang.Override
+  public java.lang.String getOutputUrlPrefix() {
+    java.lang.Object ref = outputUrlPrefix_;
+    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();
+      outputUrlPrefix_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Location for the export metadata and data files. This will be the same
+   * value as the
+   * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+   * field. The final output location is provided in
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+   * 
    
+   *
+   * string output_url_prefix = 5;
+   *
+   * @return The bytes for outputUrlPrefix.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
+    java.lang.Object ref = outputUrlPrefix_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      outputUrlPrefix_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (common_ != null) {
+      output.writeMessage(1, getCommon());
+    }
+    if (progressEntities_ != null) {
+      output.writeMessage(2, getProgressEntities());
+    }
+    if (progressBytes_ != null) {
+      output.writeMessage(3, getProgressBytes());
+    }
+    if (entityFilter_ != null) {
+      output.writeMessage(4, getEntityFilter());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, outputUrlPrefix_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (common_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
+    }
+    if (progressEntities_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getProgressEntities());
+    }
+    if (progressBytes_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getProgressBytes());
+    }
+    if (entityFilter_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, outputUrlPrefix_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.ExportEntitiesMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.ExportEntitiesMetadata other =
+        (com.google.datastore.admin.v1.ExportEntitiesMetadata) obj;
+
+    if (hasCommon() != other.hasCommon()) return false;
+    if (hasCommon()) {
+      if (!getCommon().equals(other.getCommon())) return false;
+    }
+    if (hasProgressEntities() != other.hasProgressEntities()) return false;
+    if (hasProgressEntities()) {
+      if (!getProgressEntities().equals(other.getProgressEntities())) return false;
+    }
+    if (hasProgressBytes() != other.hasProgressBytes()) return false;
+    if (hasProgressBytes()) {
+      if (!getProgressBytes().equals(other.getProgressBytes())) return false;
+    }
+    if (hasEntityFilter() != other.hasEntityFilter()) return false;
+    if (hasEntityFilter()) {
+      if (!getEntityFilter().equals(other.getEntityFilter())) return false;
+    }
+    if (!getOutputUrlPrefix().equals(other.getOutputUrlPrefix())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasCommon()) {
+      hash = (37 * hash) + COMMON_FIELD_NUMBER;
+      hash = (53 * hash) + getCommon().hashCode();
+    }
+    if (hasProgressEntities()) {
+      hash = (37 * hash) + PROGRESS_ENTITIES_FIELD_NUMBER;
+      hash = (53 * hash) + getProgressEntities().hashCode();
+    }
+    if (hasProgressBytes()) {
+      hash = (37 * hash) + PROGRESS_BYTES_FIELD_NUMBER;
+      hash = (53 * hash) + getProgressBytes().hashCode();
+    }
+    if (hasEntityFilter()) {
+      hash = (37 * hash) + ENTITY_FILTER_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityFilter().hashCode();
+    }
+    hash = (37 * hash) + OUTPUT_URL_PREFIX_FIELD_NUMBER;
+    hash = (53 * hash) + getOutputUrlPrefix().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.ExportEntitiesMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata for ExportEntities operations.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.ExportEntitiesMetadata}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.ExportEntitiesMetadata)
+      com.google.datastore.admin.v1.ExportEntitiesMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.ExportEntitiesMetadata.class,
+              com.google.datastore.admin.v1.ExportEntitiesMetadata.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.ExportEntitiesMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
+        commonBuilder_ = null;
+      }
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = null;
+      } else {
+        progressEntities_ = null;
+        progressEntitiesBuilder_ = null;
+      }
+      if (progressBytesBuilder_ == null) {
+        progressBytes_ = null;
+      } else {
+        progressBytes_ = null;
+        progressBytesBuilder_ = null;
+      }
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+      outputUrlPrefix_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesMetadata getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.ExportEntitiesMetadata.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesMetadata build() {
+      com.google.datastore.admin.v1.ExportEntitiesMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesMetadata buildPartial() {
+      com.google.datastore.admin.v1.ExportEntitiesMetadata result =
+          new com.google.datastore.admin.v1.ExportEntitiesMetadata(this);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
+      }
+      if (progressEntitiesBuilder_ == null) {
+        result.progressEntities_ = progressEntities_;
+      } else {
+        result.progressEntities_ = progressEntitiesBuilder_.build();
+      }
+      if (progressBytesBuilder_ == null) {
+        result.progressBytes_ = progressBytes_;
+      } else {
+        result.progressBytes_ = progressBytesBuilder_.build();
+      }
+      if (entityFilterBuilder_ == null) {
+        result.entityFilter_ = entityFilter_;
+      } else {
+        result.entityFilter_ = entityFilterBuilder_.build();
+      }
+      result.outputUrlPrefix_ = outputUrlPrefix_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.ExportEntitiesMetadata) {
+        return mergeFrom((com.google.datastore.admin.v1.ExportEntitiesMetadata) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesMetadata other) {
+      if (other == com.google.datastore.admin.v1.ExportEntitiesMetadata.getDefaultInstance())
+        return this;
+      if (other.hasCommon()) {
+        mergeCommon(other.getCommon());
+      }
+      if (other.hasProgressEntities()) {
+        mergeProgressEntities(other.getProgressEntities());
+      }
+      if (other.hasProgressBytes()) {
+        mergeProgressBytes(other.getProgressBytes());
+      }
+      if (other.hasEntityFilter()) {
+        mergeEntityFilter(other.getEntityFilter());
+      }
+      if (!other.getOutputUrlPrefix().isEmpty()) {
+        outputUrlPrefix_ = other.outputUrlPrefix_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.ExportEntitiesMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.ExportEntitiesMetadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.datastore.admin.v1.CommonMetadata common_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.CommonMetadata,
+            com.google.datastore.admin.v1.CommonMetadata.Builder,
+            com.google.datastore.admin.v1.CommonMetadataOrBuilder>
+        commonBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     *
+     * @return Whether the common field is set.
+     */
+    public boolean hasCommon() {
+      return commonBuilder_ != null || common_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     *
+     * @return The common.
+     */
+    public com.google.datastore.admin.v1.CommonMetadata getCommon() {
+      if (commonBuilder_ == null) {
+        return common_ == null
+            ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+            : common_;
+      } else {
+        return commonBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
+      if (commonBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        common_ = value;
+        onChanged();
+      } else {
+        commonBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder builderForValue) {
+      if (commonBuilder_ == null) {
+        common_ = builderForValue.build();
+        onChanged();
+      } else {
+        commonBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
+      if (commonBuilder_ == null) {
+        if (common_ != null) {
+          common_ =
+              com.google.datastore.admin.v1.CommonMetadata.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          common_ = value;
+        }
+        onChanged();
+      } else {
+        commonBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder clearCommon() {
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
+        commonBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
+
+      onChanged();
+      return getCommonFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
+      if (commonBuilder_ != null) {
+        return commonBuilder_.getMessageOrBuilder();
+      } else {
+        return common_ == null
+            ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+            : common_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.CommonMetadata,
+            com.google.datastore.admin.v1.CommonMetadata.Builder,
+            com.google.datastore.admin.v1.CommonMetadataOrBuilder>
+        getCommonFieldBuilder() {
+      if (commonBuilder_ == null) {
+        commonBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.CommonMetadata,
+                com.google.datastore.admin.v1.CommonMetadata.Builder,
+                com.google.datastore.admin.v1.CommonMetadataOrBuilder>(
+                getCommon(), getParentForChildren(), isClean());
+        common_ = null;
+      }
+      return commonBuilder_;
+    }
+
+    private com.google.datastore.admin.v1.Progress progressEntities_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        progressEntitiesBuilder_;
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     *
+     * @return Whether the progressEntities field is set.
+     */
+    public boolean hasProgressEntities() {
+      return progressEntitiesBuilder_ != null || progressEntities_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     *
+     * @return The progressEntities.
+     */
+    public com.google.datastore.admin.v1.Progress getProgressEntities() {
+      if (progressEntitiesBuilder_ == null) {
+        return progressEntities_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressEntities_;
+      } else {
+        return progressEntitiesBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value) {
+      if (progressEntitiesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        progressEntities_ = value;
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder setProgressEntities(
+        com.google.datastore.admin.v1.Progress.Builder builderForValue) {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = builderForValue.build();
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress value) {
+      if (progressEntitiesBuilder_ == null) {
+        if (progressEntities_ != null) {
+          progressEntities_ =
+              com.google.datastore.admin.v1.Progress.newBuilder(progressEntities_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          progressEntities_ = value;
+        }
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder clearProgressEntities() {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = null;
+        onChanged();
+      } else {
+        progressEntities_ = null;
+        progressEntitiesBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder() {
+
+      onChanged();
+      return getProgressEntitiesFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
+      if (progressEntitiesBuilder_ != null) {
+        return progressEntitiesBuilder_.getMessageOrBuilder();
+      } else {
+        return progressEntities_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressEntities_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        getProgressEntitiesFieldBuilder() {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntitiesBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.Progress,
+                com.google.datastore.admin.v1.Progress.Builder,
+                com.google.datastore.admin.v1.ProgressOrBuilder>(
+                getProgressEntities(), getParentForChildren(), isClean());
+        progressEntities_ = null;
+      }
+      return progressEntitiesBuilder_;
+    }
+
+    private com.google.datastore.admin.v1.Progress progressBytes_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        progressBytesBuilder_;
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     *
+     * @return Whether the progressBytes field is set.
+     */
+    public boolean hasProgressBytes() {
+      return progressBytesBuilder_ != null || progressBytes_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     *
+     * @return The progressBytes.
+     */
+    public com.google.datastore.admin.v1.Progress getProgressBytes() {
+      if (progressBytesBuilder_ == null) {
+        return progressBytes_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressBytes_;
+      } else {
+        return progressBytesBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) {
+      if (progressBytesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        progressBytes_ = value;
+        onChanged();
+      } else {
+        progressBytesBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder setProgressBytes(
+        com.google.datastore.admin.v1.Progress.Builder builderForValue) {
+      if (progressBytesBuilder_ == null) {
+        progressBytes_ = builderForValue.build();
+        onChanged();
+      } else {
+        progressBytesBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value) {
+      if (progressBytesBuilder_ == null) {
+        if (progressBytes_ != null) {
+          progressBytes_ =
+              com.google.datastore.admin.v1.Progress.newBuilder(progressBytes_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          progressBytes_ = value;
+        }
+        onChanged();
+      } else {
+        progressBytesBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder clearProgressBytes() {
+      if (progressBytesBuilder_ == null) {
+        progressBytes_ = null;
+        onChanged();
+      } else {
+        progressBytes_ = null;
+        progressBytesBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder() {
+
+      onChanged();
+      return getProgressBytesFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder() {
+      if (progressBytesBuilder_ != null) {
+        return progressBytesBuilder_.getMessageOrBuilder();
+      } else {
+        return progressBytes_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressBytes_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        getProgressBytesFieldBuilder() {
+      if (progressBytesBuilder_ == null) {
+        progressBytesBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.Progress,
+                com.google.datastore.admin.v1.Progress.Builder,
+                com.google.datastore.admin.v1.ProgressOrBuilder>(
+                getProgressBytes(), getParentForChildren(), isClean());
+        progressBytes_ = null;
+      }
+      return progressBytesBuilder_;
+    }
+
+    private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        entityFilterBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     *
+     * @return Whether the entityFilter field is set.
+     */
+    public boolean hasEntityFilter() {
+      return entityFilterBuilder_ != null || entityFilter_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     *
+     * @return The entityFilter.
+     */
+    public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      } else {
+        return entityFilterBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        entityFilter_ = value;
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder setEntityFilter(
+        com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = builderForValue.build();
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (entityFilter_ != null) {
+          entityFilter_ =
+              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          entityFilter_ = value;
+        }
+        onChanged();
+      } else {
+        entityFilterBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder clearEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+        onChanged();
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
+
+      onChanged();
+      return getEntityFilterFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+      if (entityFilterBuilder_ != null) {
+        return entityFilterBuilder_.getMessageOrBuilder();
+      } else {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being exported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        getEntityFilterFieldBuilder() {
+      if (entityFilterBuilder_ == null) {
+        entityFilterBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.EntityFilter,
+                com.google.datastore.admin.v1.EntityFilter.Builder,
+                com.google.datastore.admin.v1.EntityFilterOrBuilder>(
+                getEntityFilter(), getParentForChildren(), isClean());
+        entityFilter_ = null;
+      }
+      return entityFilterBuilder_;
+    }
+
+    private java.lang.Object outputUrlPrefix_ = "";
+    /**
+     *
+     *
+     * 
    +     * Location for the export metadata and data files. This will be the same
+     * value as the
+     * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+     * field. The final output location is provided in
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+     * 
    
+     *
+     * string output_url_prefix = 5;
+     *
+     * @return The outputUrlPrefix.
+     */
+    public java.lang.String getOutputUrlPrefix() {
+      java.lang.Object ref = outputUrlPrefix_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        outputUrlPrefix_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Location for the export metadata and data files. This will be the same
+     * value as the
+     * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+     * field. The final output location is provided in
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+     * 
    
+     *
+     * string output_url_prefix = 5;
+     *
+     * @return The bytes for outputUrlPrefix.
+     */
+    public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
+      java.lang.Object ref = outputUrlPrefix_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        outputUrlPrefix_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Location for the export metadata and data files. This will be the same
+     * value as the
+     * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+     * field. The final output location is provided in
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+     * 
    
+     *
+     * string output_url_prefix = 5;
+     *
+     * @param value The outputUrlPrefix to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOutputUrlPrefix(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      outputUrlPrefix_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Location for the export metadata and data files. This will be the same
+     * value as the
+     * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+     * field. The final output location is provided in
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+     * 
    
+     *
+     * string output_url_prefix = 5;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearOutputUrlPrefix() {
+
+      outputUrlPrefix_ = getDefaultInstance().getOutputUrlPrefix();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Location for the export metadata and data files. This will be the same
+     * value as the
+     * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+     * field. The final output location is provided in
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+     * 
    
+     *
+     * string output_url_prefix = 5;
+     *
+     * @param value The bytes for outputUrlPrefix to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOutputUrlPrefixBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      outputUrlPrefix_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.ExportEntitiesMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.ExportEntitiesMetadata)
+  private static final com.google.datastore.admin.v1.ExportEntitiesMetadata DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.ExportEntitiesMetadata();
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesMetadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ExportEntitiesMetadata parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ExportEntitiesMetadata(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ExportEntitiesMetadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
new file mode 100644
index 000000000000..408049d0c9f7
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ExportEntitiesMetadataOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.ExportEntitiesMetadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return Whether the common field is set.
+   */
+  boolean hasCommon();
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return The common.
+   */
+  com.google.datastore.admin.v1.CommonMetadata getCommon();
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   */
+  com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return Whether the progressEntities field is set.
+   */
+  boolean hasProgressEntities();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return The progressEntities.
+   */
+  com.google.datastore.admin.v1.Progress getProgressEntities();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   */
+  com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return Whether the progressBytes field is set.
+   */
+  boolean hasProgressBytes();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return The progressBytes.
+   */
+  com.google.datastore.admin.v1.Progress getProgressBytes();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   */
+  com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being exported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  boolean hasEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being exported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return The entityFilter.
+   */
+  com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being exported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   */
+  com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Location for the export metadata and data files. This will be the same
+   * value as the
+   * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+   * field. The final output location is provided in
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+   * 
    
+   *
+   * string output_url_prefix = 5;
+   *
+   * @return The outputUrlPrefix.
+   */
+  java.lang.String getOutputUrlPrefix();
+  /**
+   *
+   *
+   * 
    +   * Location for the export metadata and data files. This will be the same
+   * value as the
+   * [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+   * field. The final output location is provided in
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+   * 
    
+   *
+   * string output_url_prefix = 5;
+   *
+   * @return The bytes for outputUrlPrefix.
+   */
+  com.google.protobuf.ByteString getOutputUrlPrefixBytes();
+}
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
new file mode 100644
index 000000000000..6921596739e3
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java
@@ -0,0 +1,1517 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The request for
+ * [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.ExportEntitiesRequest}
+ */
+public final class ExportEntitiesRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesRequest)
+    ExportEntitiesRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ExportEntitiesRequest.newBuilder() to construct.
+  private ExportEntitiesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ExportEntitiesRequest() {
+    projectId_ = "";
+    outputUrlPrefix_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ExportEntitiesRequest();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private ExportEntitiesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              projectId_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ =
+                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry labels__ =
+                  input.readMessage(
+                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+              break;
+            }
+          case 26:
+            {
+              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
+              if (entityFilter_ != null) {
+                subBuilder = entityFilter_.toBuilder();
+              }
+              entityFilter_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(entityFilter_);
+                entityFilter_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              outputUrlPrefix_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
+    switch (number) {
+      case 2:
+        return internalGetLabels();
+      default:
+        throw new RuntimeException("Invalid map field number: " + number);
+    }
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.ExportEntitiesRequest.class,
+            com.google.datastore.admin.v1.ExportEntitiesRequest.Builder.class);
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int LABELS_FIELD_NUMBER = 2;
+
+  private static final class LabelsDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry defaultEntry =
+        com.google.protobuf.MapEntry.newDefaultInstance(
+            com.google.datastore.admin.v1.DatastoreAdminProto
+                .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_LabelsEntry_descriptor,
+            com.google.protobuf.WireFormat.FieldType.STRING,
+            "",
+            com.google.protobuf.WireFormat.FieldType.STRING,
+            "");
+  }
+
+  private com.google.protobuf.MapField labels_;
+
+  private com.google.protobuf.MapField internalGetLabels() {
+    if (labels_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
+    }
+    return labels_;
+  }
+
+  public int getLabelsCount() {
+    return internalGetLabels().getMap().size();
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public boolean containsLabels(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    return internalGetLabels().getMap().containsKey(key);
+  }
+  /** Use {@link #getLabelsMap()} instead. */
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getLabels() {
+    return getLabelsMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public java.util.Map getLabelsMap() {
+    return internalGetLabels().getMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    java.util.Map map = internalGetLabels().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public java.lang.String getLabelsOrThrow(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    java.util.Map map = internalGetLabels().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  public static final int ENTITY_FILTER_FIELD_NUMBER = 3;
+  private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+  /**
+   *
+   *
+   * 
    +   * Description of what data from the project is included in the export.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  @java.lang.Override
+  public boolean hasEntityFilter() {
+    return entityFilter_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Description of what data from the project is included in the export.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+   *
+   * @return The entityFilter.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Description of what data from the project is included in the export.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+    return getEntityFilter();
+  }
+
+  public static final int OUTPUT_URL_PREFIX_FIELD_NUMBER = 4;
+  private volatile java.lang.Object outputUrlPrefix_;
+  /**
+   *
+   *
+   * 
    +   * 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
+   * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+   * Storage namespace path (this is not a Cloud Datastore namespace). For more
+   * 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.
+   * 
    
+   *
+   * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The outputUrlPrefix.
+   */
+  @java.lang.Override
+  public java.lang.String getOutputUrlPrefix() {
+    java.lang.Object ref = outputUrlPrefix_;
+    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();
+      outputUrlPrefix_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * 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
+   * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+   * Storage namespace path (this is not a Cloud Datastore namespace). For more
+   * 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.
+   * 
    
+   *
+   * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for outputUrlPrefix.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
+    java.lang.Object ref = outputUrlPrefix_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      outputUrlPrefix_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
+    }
+    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+        output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 2);
+    if (entityFilter_ != null) {
+      output.writeMessage(3, getEntityFilter());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, outputUrlPrefix_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
+    }
+    for (java.util.Map.Entry entry :
+        internalGetLabels().getMap().entrySet()) {
+      com.google.protobuf.MapEntry labels__ =
+          LabelsDefaultEntryHolder.defaultEntry
+              .newBuilderForType()
+              .setKey(entry.getKey())
+              .setValue(entry.getValue())
+              .build();
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, labels__);
+    }
+    if (entityFilter_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getEntityFilter());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, outputUrlPrefix_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.ExportEntitiesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.ExportEntitiesRequest other =
+        (com.google.datastore.admin.v1.ExportEntitiesRequest) obj;
+
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!internalGetLabels().equals(other.internalGetLabels())) return false;
+    if (hasEntityFilter() != other.hasEntityFilter()) return false;
+    if (hasEntityFilter()) {
+      if (!getEntityFilter().equals(other.getEntityFilter())) return false;
+    }
+    if (!getOutputUrlPrefix().equals(other.getOutputUrlPrefix())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getProjectId().hashCode();
+    if (!internalGetLabels().getMap().isEmpty()) {
+      hash = (37 * hash) + LABELS_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetLabels().hashCode();
+    }
+    if (hasEntityFilter()) {
+      hash = (37 * hash) + ENTITY_FILTER_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityFilter().hashCode();
+    }
+    hash = (37 * hash) + OUTPUT_URL_PREFIX_FIELD_NUMBER;
+    hash = (53 * hash) + getOutputUrlPrefix().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.ExportEntitiesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The request for
+   * [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.ExportEntitiesRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.ExportEntitiesRequest)
+      com.google.datastore.admin.v1.ExportEntitiesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
+      switch (number) {
+        case 2:
+          return internalGetLabels();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+      switch (number) {
+        case 2:
+          return internalGetMutableLabels();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.ExportEntitiesRequest.class,
+              com.google.datastore.admin.v1.ExportEntitiesRequest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.ExportEntitiesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      internalGetMutableLabels().clear();
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+      outputUrlPrefix_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesRequest getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.ExportEntitiesRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesRequest build() {
+      com.google.datastore.admin.v1.ExportEntitiesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesRequest buildPartial() {
+      com.google.datastore.admin.v1.ExportEntitiesRequest result =
+          new com.google.datastore.admin.v1.ExportEntitiesRequest(this);
+      int from_bitField0_ = bitField0_;
+      result.projectId_ = projectId_;
+      result.labels_ = internalGetLabels();
+      result.labels_.makeImmutable();
+      if (entityFilterBuilder_ == null) {
+        result.entityFilter_ = entityFilter_;
+      } else {
+        result.entityFilter_ = entityFilterBuilder_.build();
+      }
+      result.outputUrlPrefix_ = outputUrlPrefix_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.ExportEntitiesRequest) {
+        return mergeFrom((com.google.datastore.admin.v1.ExportEntitiesRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesRequest other) {
+      if (other == com.google.datastore.admin.v1.ExportEntitiesRequest.getDefaultInstance())
+        return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      internalGetMutableLabels().mergeFrom(other.internalGetLabels());
+      if (other.hasEntityFilter()) {
+        mergeEntityFilter(other.getEntityFilter());
+      }
+      if (!other.getOutputUrlPrefix().isEmpty()) {
+        outputUrlPrefix_ = other.outputUrlPrefix_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.ExportEntitiesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.ExportEntitiesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.MapField labels_;
+
+    private com.google.protobuf.MapField internalGetLabels() {
+      if (labels_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
+      }
+      return labels_;
+    }
+
+    private com.google.protobuf.MapField
+        internalGetMutableLabels() {
+      onChanged();
+      ;
+      if (labels_ == null) {
+        labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+      }
+      if (!labels_.isMutable()) {
+        labels_ = labels_.copy();
+      }
+      return labels_;
+    }
+
+    public int getLabelsCount() {
+      return internalGetLabels().getMap().size();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public boolean containsLabels(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      return internalGetLabels().getMap().containsKey(key);
+    }
+    /** Use {@link #getLabelsMap()} instead. */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getLabels() {
+      return getLabelsMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public java.util.Map getLabelsMap() {
+      return internalGetLabels().getMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      java.util.Map map = internalGetLabels().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public java.lang.String getLabelsOrThrow(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      java.util.Map map = internalGetLabels().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearLabels() {
+      internalGetMutableLabels().getMutableMap().clear();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    public Builder removeLabels(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableLabels().getMutableMap().remove(key);
+      return this;
+    }
+    /** Use alternate mutation accessors instead. */
+    @java.lang.Deprecated
+    public java.util.Map getMutableLabels() {
+      return internalGetMutableLabels().getMutableMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    public Builder putLabels(java.lang.String key, java.lang.String value) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      if (value == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableLabels().getMutableMap().put(key, value);
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    public Builder putAllLabels(java.util.Map values) {
+      internalGetMutableLabels().getMutableMap().putAll(values);
+      return this;
+    }
+
+    private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        entityFilterBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     *
+     * @return Whether the entityFilter field is set.
+     */
+    public boolean hasEntityFilter() {
+      return entityFilterBuilder_ != null || entityFilter_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     *
+     * @return The entityFilter.
+     */
+    public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      } else {
+        return entityFilterBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     */
+    public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        entityFilter_ = value;
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     */
+    public Builder setEntityFilter(
+        com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = builderForValue.build();
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     */
+    public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (entityFilter_ != null) {
+          entityFilter_ =
+              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          entityFilter_ = value;
+        }
+        onChanged();
+      } else {
+        entityFilterBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     */
+    public Builder clearEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+        onChanged();
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     */
+    public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
+
+      onChanged();
+      return getEntityFilterFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     */
+    public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+      if (entityFilterBuilder_ != null) {
+        return entityFilterBuilder_.getMessageOrBuilder();
+      } else {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of what data from the project is included in the export.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        getEntityFilterFieldBuilder() {
+      if (entityFilterBuilder_ == null) {
+        entityFilterBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.EntityFilter,
+                com.google.datastore.admin.v1.EntityFilter.Builder,
+                com.google.datastore.admin.v1.EntityFilterOrBuilder>(
+                getEntityFilter(), getParentForChildren(), isClean());
+        entityFilter_ = null;
+      }
+      return entityFilterBuilder_;
+    }
+
+    private java.lang.Object outputUrlPrefix_ = "";
+    /**
+     *
+     *
+     * 
    +     * 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
+     * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+     * Storage namespace path (this is not a Cloud Datastore namespace). For more
+     * 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.
+     * 
    
+     *
+     * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The outputUrlPrefix.
+     */
+    public java.lang.String getOutputUrlPrefix() {
+      java.lang.Object ref = outputUrlPrefix_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        outputUrlPrefix_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+     * Storage namespace path (this is not a Cloud Datastore namespace). For more
+     * 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.
+     * 
    
+     *
+     * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for outputUrlPrefix.
+     */
+    public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
+      java.lang.Object ref = outputUrlPrefix_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        outputUrlPrefix_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+     * Storage namespace path (this is not a Cloud Datastore namespace). For more
+     * 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.
+     * 
    
+     *
+     * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The outputUrlPrefix to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOutputUrlPrefix(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      outputUrlPrefix_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+     * Storage namespace path (this is not a Cloud Datastore namespace). For more
+     * 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.
+     * 
    
+     *
+     * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearOutputUrlPrefix() {
+
+      outputUrlPrefix_ = getDefaultInstance().getOutputUrlPrefix();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+     * Storage namespace path (this is not a Cloud Datastore namespace). For more
+     * 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.
+     * 
    
+     *
+     * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for outputUrlPrefix to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOutputUrlPrefixBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      outputUrlPrefix_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.ExportEntitiesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.ExportEntitiesRequest)
+  private static final com.google.datastore.admin.v1.ExportEntitiesRequest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.ExportEntitiesRequest();
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ExportEntitiesRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ExportEntitiesRequest(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ExportEntitiesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..1e89f39dc38c
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ExportEntitiesRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.ExportEntitiesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
+   */
+  com.google.protobuf.ByteString getProjectIdBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  int getLabelsCount();
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  boolean containsLabels(java.lang.String key);
+  /** Use {@link #getLabelsMap()} instead. */
+  @java.lang.Deprecated
+  java.util.Map getLabels();
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  java.util.Map getLabelsMap();
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  java.lang.String getLabelsOrThrow(java.lang.String key);
+
+  /**
+   *
+   *
+   * 
    +   * Description of what data from the project is included in the export.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  boolean hasEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Description of what data from the project is included in the export.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+   *
+   * @return The entityFilter.
+   */
+  com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Description of what data from the project is included in the export.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
+   */
+  com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * 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
+   * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+   * Storage namespace path (this is not a Cloud Datastore namespace). For more
+   * 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.
+   * 
    
+   *
+   * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The outputUrlPrefix.
+   */
+  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
+   * name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+   * Storage namespace path (this is not a Cloud Datastore namespace). For more
+   * 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.
+   * 
    
+   *
+   * string output_url_prefix = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for outputUrlPrefix.
+   */
+  com.google.protobuf.ByteString getOutputUrlPrefixBytes();
+}
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
new file mode 100644
index 000000000000..43e882659cfa
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java
@@ -0,0 +1,659 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The response for
+ * [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.ExportEntitiesResponse}
+ */
+public final class ExportEntitiesResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesResponse)
+    ExportEntitiesResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ExportEntitiesResponse.newBuilder() to construct.
+  private ExportEntitiesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ExportEntitiesResponse() {
+    outputUrl_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ExportEntitiesResponse();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private ExportEntitiesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              outputUrl_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ExportEntitiesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.ExportEntitiesResponse.class,
+            com.google.datastore.admin.v1.ExportEntitiesResponse.Builder.class);
+  }
+
+  public static final int OUTPUT_URL_FIELD_NUMBER = 1;
+  private volatile java.lang.Object outputUrl_;
+  /**
+   *
+   *
+   * 
    +   * Location of the output metadata file. This can be used to begin an import
+   * into Cloud Datastore (this project or another project). See
+   * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+   * Only present if the operation completed successfully.
+   * 
    
+   *
+   * string output_url = 1;
+   *
+   * @return The outputUrl.
+   */
+  @java.lang.Override
+  public java.lang.String getOutputUrl() {
+    java.lang.Object ref = outputUrl_;
+    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();
+      outputUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Location of the output metadata file. This can be used to begin an import
+   * into Cloud Datastore (this project or another project). See
+   * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+   * Only present if the operation completed successfully.
+   * 
    
+   *
+   * string output_url = 1;
+   *
+   * @return The bytes for outputUrl.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getOutputUrlBytes() {
+    java.lang.Object ref = outputUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      outputUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrl_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, outputUrl_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrl_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, outputUrl_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.ExportEntitiesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.ExportEntitiesResponse other =
+        (com.google.datastore.admin.v1.ExportEntitiesResponse) obj;
+
+    if (!getOutputUrl().equals(other.getOutputUrl())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + OUTPUT_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getOutputUrl().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.ExportEntitiesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The response for
+   * [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.ExportEntitiesResponse}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.ExportEntitiesResponse)
+      com.google.datastore.admin.v1.ExportEntitiesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.ExportEntitiesResponse.class,
+              com.google.datastore.admin.v1.ExportEntitiesResponse.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.ExportEntitiesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      outputUrl_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesResponse getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.ExportEntitiesResponse.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesResponse build() {
+      com.google.datastore.admin.v1.ExportEntitiesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ExportEntitiesResponse buildPartial() {
+      com.google.datastore.admin.v1.ExportEntitiesResponse result =
+          new com.google.datastore.admin.v1.ExportEntitiesResponse(this);
+      result.outputUrl_ = outputUrl_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.ExportEntitiesResponse) {
+        return mergeFrom((com.google.datastore.admin.v1.ExportEntitiesResponse) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesResponse other) {
+      if (other == com.google.datastore.admin.v1.ExportEntitiesResponse.getDefaultInstance())
+        return this;
+      if (!other.getOutputUrl().isEmpty()) {
+        outputUrl_ = other.outputUrl_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.ExportEntitiesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.ExportEntitiesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object outputUrl_ = "";
+    /**
+     *
+     *
+     * 
    +     * Location of the output metadata file. This can be used to begin an import
+     * into Cloud Datastore (this project or another project). See
+     * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+     * Only present if the operation completed successfully.
+     * 
    
+     *
+     * string output_url = 1;
+     *
+     * @return The outputUrl.
+     */
+    public java.lang.String getOutputUrl() {
+      java.lang.Object ref = outputUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        outputUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Location of the output metadata file. This can be used to begin an import
+     * into Cloud Datastore (this project or another project). See
+     * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+     * Only present if the operation completed successfully.
+     * 
    
+     *
+     * string output_url = 1;
+     *
+     * @return The bytes for outputUrl.
+     */
+    public com.google.protobuf.ByteString getOutputUrlBytes() {
+      java.lang.Object ref = outputUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        outputUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Location of the output metadata file. This can be used to begin an import
+     * into Cloud Datastore (this project or another project). See
+     * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+     * Only present if the operation completed successfully.
+     * 
    
+     *
+     * string output_url = 1;
+     *
+     * @param value The outputUrl to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOutputUrl(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      outputUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Location of the output metadata file. This can be used to begin an import
+     * into Cloud Datastore (this project or another project). See
+     * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+     * Only present if the operation completed successfully.
+     * 
    
+     *
+     * string output_url = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearOutputUrl() {
+
+      outputUrl_ = getDefaultInstance().getOutputUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Location of the output metadata file. This can be used to begin an import
+     * into Cloud Datastore (this project or another project). See
+     * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+     * Only present if the operation completed successfully.
+     * 
    
+     *
+     * string output_url = 1;
+     *
+     * @param value The bytes for outputUrl to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOutputUrlBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      outputUrl_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.ExportEntitiesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.ExportEntitiesResponse)
+  private static final com.google.datastore.admin.v1.ExportEntitiesResponse DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.ExportEntitiesResponse();
+  }
+
+  public static com.google.datastore.admin.v1.ExportEntitiesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ExportEntitiesResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ExportEntitiesResponse(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ExportEntitiesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
new file mode 100644
index 000000000000..74b00e9cda7f
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ExportEntitiesResponseOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.ExportEntitiesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Location of the output metadata file. This can be used to begin an import
+   * into Cloud Datastore (this project or another project). See
+   * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+   * Only present if the operation completed successfully.
+   * 
    
+   *
+   * string output_url = 1;
+   *
+   * @return The outputUrl.
+   */
+  java.lang.String getOutputUrl();
+  /**
+   *
+   *
+   * 
    +   * Location of the output metadata file. This can be used to begin an import
+   * into Cloud Datastore (this project or another project). See
+   * [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+   * Only present if the operation completed successfully.
+   * 
    
+   *
+   * string output_url = 1;
+   *
+   * @return The bytes for outputUrl.
+   */
+  com.google.protobuf.ByteString getOutputUrlBytes();
+}
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
new file mode 100644
index 000000000000..fa24ee2178a3
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java
@@ -0,0 +1,813 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The request for [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.GetIndexRequest}
+ */
+public final class GetIndexRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.GetIndexRequest)
+    GetIndexRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use GetIndexRequest.newBuilder() to construct.
+  private GetIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private GetIndexRequest() {
+    projectId_ = "";
+    indexId_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new GetIndexRequest();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private GetIndexRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              projectId_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              indexId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_GetIndexRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.GetIndexRequest.class,
+            com.google.datastore.admin.v1.GetIndexRequest.Builder.class);
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int INDEX_ID_FIELD_NUMBER = 3;
+  private volatile java.lang.Object indexId_;
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to get.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The indexId.
+   */
+  @java.lang.Override
+  public java.lang.String getIndexId() {
+    java.lang.Object ref = indexId_;
+    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();
+      indexId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to get.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The bytes for indexId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getIndexIdBytes() {
+    java.lang.Object ref = indexId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      indexId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.GetIndexRequest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.GetIndexRequest other =
+        (com.google.datastore.admin.v1.GetIndexRequest) obj;
+
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getIndexId().equals(other.getIndexId())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getProjectId().hashCode();
+    hash = (37 * hash) + INDEX_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getIndexId().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.GetIndexRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The request for [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.GetIndexRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.GetIndexRequest)
+      com.google.datastore.admin.v1.GetIndexRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_GetIndexRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.GetIndexRequest.class,
+              com.google.datastore.admin.v1.GetIndexRequest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.GetIndexRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      indexId_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.GetIndexRequest getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.GetIndexRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.GetIndexRequest build() {
+      com.google.datastore.admin.v1.GetIndexRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.GetIndexRequest buildPartial() {
+      com.google.datastore.admin.v1.GetIndexRequest result =
+          new com.google.datastore.admin.v1.GetIndexRequest(this);
+      result.projectId_ = projectId_;
+      result.indexId_ = indexId_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.GetIndexRequest) {
+        return mergeFrom((com.google.datastore.admin.v1.GetIndexRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.GetIndexRequest other) {
+      if (other == com.google.datastore.admin.v1.GetIndexRequest.getDefaultInstance()) return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      if (!other.getIndexId().isEmpty()) {
+        indexId_ = other.indexId_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.GetIndexRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.GetIndexRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object indexId_ = "";
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to get.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return The indexId.
+     */
+    public java.lang.String getIndexId() {
+      java.lang.Object ref = indexId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        indexId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to get.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return The bytes for indexId.
+     */
+    public com.google.protobuf.ByteString getIndexIdBytes() {
+      java.lang.Object ref = indexId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        indexId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to get.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @param value The indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to get.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearIndexId() {
+
+      indexId_ = getDefaultInstance().getIndexId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The resource ID of the index to get.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @param value The bytes for indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.GetIndexRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.GetIndexRequest)
+  private static final com.google.datastore.admin.v1.GetIndexRequest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.GetIndexRequest();
+  }
+
+  public static com.google.datastore.admin.v1.GetIndexRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public GetIndexRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new GetIndexRequest(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.GetIndexRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
new file mode 100644
index 000000000000..14e873eb6e01
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface GetIndexRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.GetIndexRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  com.google.protobuf.ByteString getProjectIdBytes();
+
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to get.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The indexId.
+   */
+  java.lang.String getIndexId();
+  /**
+   *
+   *
+   * 
    +   * The resource ID of the index to get.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The bytes for indexId.
+   */
+  com.google.protobuf.ByteString getIndexIdBytes();
+}
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
new file mode 100644
index 000000000000..b4925d13aef7
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java
@@ -0,0 +1,1754 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Metadata for ImportEntities operations.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.ImportEntitiesMetadata}
+ */
+public final class ImportEntitiesMetadata extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ImportEntitiesMetadata)
+    ImportEntitiesMetadataOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ImportEntitiesMetadata.newBuilder() to construct.
+  private ImportEntitiesMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ImportEntitiesMetadata() {
+    inputUrl_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ImportEntitiesMetadata();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private ImportEntitiesMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
+              if (progressEntities_ != null) {
+                subBuilder = progressEntities_.toBuilder();
+              }
+              progressEntities_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(progressEntities_);
+                progressEntities_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
+              if (progressBytes_ != null) {
+                subBuilder = progressBytes_.toBuilder();
+              }
+              progressBytes_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(progressBytes_);
+                progressBytes_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
+              if (entityFilter_ != null) {
+                subBuilder = entityFilter_.toBuilder();
+              }
+              entityFilter_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(entityFilter_);
+                entityFilter_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              inputUrl_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.ImportEntitiesMetadata.class,
+            com.google.datastore.admin.v1.ImportEntitiesMetadata.Builder.class);
+  }
+
+  public static final int COMMON_FIELD_NUMBER = 1;
+  private com.google.datastore.admin.v1.CommonMetadata common_;
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return Whether the common field is set.
+   */
+  @java.lang.Override
+  public boolean hasCommon() {
+    return common_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return The common.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadata getCommon() {
+    return common_ == null
+        ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+        : common_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
+    return getCommon();
+  }
+
+  public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
+  private com.google.datastore.admin.v1.Progress progressEntities_;
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return Whether the progressEntities field is set.
+   */
+  @java.lang.Override
+  public boolean hasProgressEntities() {
+    return progressEntities_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return The progressEntities.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Progress getProgressEntities() {
+    return progressEntities_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressEntities_;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
+    return getProgressEntities();
+  }
+
+  public static final int PROGRESS_BYTES_FIELD_NUMBER = 3;
+  private com.google.datastore.admin.v1.Progress progressBytes_;
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return Whether the progressBytes field is set.
+   */
+  @java.lang.Override
+  public boolean hasProgressBytes() {
+    return progressBytes_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return The progressBytes.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Progress getProgressBytes() {
+    return progressBytes_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressBytes_;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder() {
+    return getProgressBytes();
+  }
+
+  public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
+  private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  @java.lang.Override
+  public boolean hasEntityFilter() {
+    return entityFilter_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return The entityFilter.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+    return getEntityFilter();
+  }
+
+  public static final int INPUT_URL_FIELD_NUMBER = 5;
+  private volatile java.lang.Object inputUrl_;
+  /**
+   *
+   *
+   * 
    +   * The location of the import metadata file. This will be the same value as
+   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * 
    
+   *
+   * string input_url = 5;
+   *
+   * @return The inputUrl.
+   */
+  @java.lang.Override
+  public java.lang.String getInputUrl() {
+    java.lang.Object ref = inputUrl_;
+    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();
+      inputUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * The location of the import metadata file. This will be the same value as
+   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * 
    
+   *
+   * string input_url = 5;
+   *
+   * @return The bytes for inputUrl.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getInputUrlBytes() {
+    java.lang.Object ref = inputUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      inputUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (common_ != null) {
+      output.writeMessage(1, getCommon());
+    }
+    if (progressEntities_ != null) {
+      output.writeMessage(2, getProgressEntities());
+    }
+    if (progressBytes_ != null) {
+      output.writeMessage(3, getProgressBytes());
+    }
+    if (entityFilter_ != null) {
+      output.writeMessage(4, getEntityFilter());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, inputUrl_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (common_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
+    }
+    if (progressEntities_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getProgressEntities());
+    }
+    if (progressBytes_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getProgressBytes());
+    }
+    if (entityFilter_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, inputUrl_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.ImportEntitiesMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.ImportEntitiesMetadata other =
+        (com.google.datastore.admin.v1.ImportEntitiesMetadata) obj;
+
+    if (hasCommon() != other.hasCommon()) return false;
+    if (hasCommon()) {
+      if (!getCommon().equals(other.getCommon())) return false;
+    }
+    if (hasProgressEntities() != other.hasProgressEntities()) return false;
+    if (hasProgressEntities()) {
+      if (!getProgressEntities().equals(other.getProgressEntities())) return false;
+    }
+    if (hasProgressBytes() != other.hasProgressBytes()) return false;
+    if (hasProgressBytes()) {
+      if (!getProgressBytes().equals(other.getProgressBytes())) return false;
+    }
+    if (hasEntityFilter() != other.hasEntityFilter()) return false;
+    if (hasEntityFilter()) {
+      if (!getEntityFilter().equals(other.getEntityFilter())) return false;
+    }
+    if (!getInputUrl().equals(other.getInputUrl())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasCommon()) {
+      hash = (37 * hash) + COMMON_FIELD_NUMBER;
+      hash = (53 * hash) + getCommon().hashCode();
+    }
+    if (hasProgressEntities()) {
+      hash = (37 * hash) + PROGRESS_ENTITIES_FIELD_NUMBER;
+      hash = (53 * hash) + getProgressEntities().hashCode();
+    }
+    if (hasProgressBytes()) {
+      hash = (37 * hash) + PROGRESS_BYTES_FIELD_NUMBER;
+      hash = (53 * hash) + getProgressBytes().hashCode();
+    }
+    if (hasEntityFilter()) {
+      hash = (37 * hash) + ENTITY_FILTER_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityFilter().hashCode();
+    }
+    hash = (37 * hash) + INPUT_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getInputUrl().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.ImportEntitiesMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata for ImportEntities operations.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.ImportEntitiesMetadata}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.ImportEntitiesMetadata)
+      com.google.datastore.admin.v1.ImportEntitiesMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.ImportEntitiesMetadata.class,
+              com.google.datastore.admin.v1.ImportEntitiesMetadata.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.ImportEntitiesMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
+        commonBuilder_ = null;
+      }
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = null;
+      } else {
+        progressEntities_ = null;
+        progressEntitiesBuilder_ = null;
+      }
+      if (progressBytesBuilder_ == null) {
+        progressBytes_ = null;
+      } else {
+        progressBytes_ = null;
+        progressBytesBuilder_ = null;
+      }
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+      inputUrl_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ImportEntitiesMetadata getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.ImportEntitiesMetadata.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ImportEntitiesMetadata build() {
+      com.google.datastore.admin.v1.ImportEntitiesMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ImportEntitiesMetadata buildPartial() {
+      com.google.datastore.admin.v1.ImportEntitiesMetadata result =
+          new com.google.datastore.admin.v1.ImportEntitiesMetadata(this);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
+      }
+      if (progressEntitiesBuilder_ == null) {
+        result.progressEntities_ = progressEntities_;
+      } else {
+        result.progressEntities_ = progressEntitiesBuilder_.build();
+      }
+      if (progressBytesBuilder_ == null) {
+        result.progressBytes_ = progressBytes_;
+      } else {
+        result.progressBytes_ = progressBytesBuilder_.build();
+      }
+      if (entityFilterBuilder_ == null) {
+        result.entityFilter_ = entityFilter_;
+      } else {
+        result.entityFilter_ = entityFilterBuilder_.build();
+      }
+      result.inputUrl_ = inputUrl_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.ImportEntitiesMetadata) {
+        return mergeFrom((com.google.datastore.admin.v1.ImportEntitiesMetadata) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesMetadata other) {
+      if (other == com.google.datastore.admin.v1.ImportEntitiesMetadata.getDefaultInstance())
+        return this;
+      if (other.hasCommon()) {
+        mergeCommon(other.getCommon());
+      }
+      if (other.hasProgressEntities()) {
+        mergeProgressEntities(other.getProgressEntities());
+      }
+      if (other.hasProgressBytes()) {
+        mergeProgressBytes(other.getProgressBytes());
+      }
+      if (other.hasEntityFilter()) {
+        mergeEntityFilter(other.getEntityFilter());
+      }
+      if (!other.getInputUrl().isEmpty()) {
+        inputUrl_ = other.inputUrl_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.ImportEntitiesMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.ImportEntitiesMetadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.datastore.admin.v1.CommonMetadata common_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.CommonMetadata,
+            com.google.datastore.admin.v1.CommonMetadata.Builder,
+            com.google.datastore.admin.v1.CommonMetadataOrBuilder>
+        commonBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     *
+     * @return Whether the common field is set.
+     */
+    public boolean hasCommon() {
+      return commonBuilder_ != null || common_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     *
+     * @return The common.
+     */
+    public com.google.datastore.admin.v1.CommonMetadata getCommon() {
+      if (commonBuilder_ == null) {
+        return common_ == null
+            ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+            : common_;
+      } else {
+        return commonBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
+      if (commonBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        common_ = value;
+        onChanged();
+      } else {
+        commonBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder builderForValue) {
+      if (commonBuilder_ == null) {
+        common_ = builderForValue.build();
+        onChanged();
+      } else {
+        commonBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
+      if (commonBuilder_ == null) {
+        if (common_ != null) {
+          common_ =
+              com.google.datastore.admin.v1.CommonMetadata.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          common_ = value;
+        }
+        onChanged();
+      } else {
+        commonBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder clearCommon() {
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
+        commonBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
+
+      onChanged();
+      return getCommonFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
+      if (commonBuilder_ != null) {
+        return commonBuilder_.getMessageOrBuilder();
+      } else {
+        return common_ == null
+            ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+            : common_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.CommonMetadata,
+            com.google.datastore.admin.v1.CommonMetadata.Builder,
+            com.google.datastore.admin.v1.CommonMetadataOrBuilder>
+        getCommonFieldBuilder() {
+      if (commonBuilder_ == null) {
+        commonBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.CommonMetadata,
+                com.google.datastore.admin.v1.CommonMetadata.Builder,
+                com.google.datastore.admin.v1.CommonMetadataOrBuilder>(
+                getCommon(), getParentForChildren(), isClean());
+        common_ = null;
+      }
+      return commonBuilder_;
+    }
+
+    private com.google.datastore.admin.v1.Progress progressEntities_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        progressEntitiesBuilder_;
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     *
+     * @return Whether the progressEntities field is set.
+     */
+    public boolean hasProgressEntities() {
+      return progressEntitiesBuilder_ != null || progressEntities_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     *
+     * @return The progressEntities.
+     */
+    public com.google.datastore.admin.v1.Progress getProgressEntities() {
+      if (progressEntitiesBuilder_ == null) {
+        return progressEntities_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressEntities_;
+      } else {
+        return progressEntitiesBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value) {
+      if (progressEntitiesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        progressEntities_ = value;
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder setProgressEntities(
+        com.google.datastore.admin.v1.Progress.Builder builderForValue) {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = builderForValue.build();
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress value) {
+      if (progressEntitiesBuilder_ == null) {
+        if (progressEntities_ != null) {
+          progressEntities_ =
+              com.google.datastore.admin.v1.Progress.newBuilder(progressEntities_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          progressEntities_ = value;
+        }
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder clearProgressEntities() {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = null;
+        onChanged();
+      } else {
+        progressEntities_ = null;
+        progressEntitiesBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder() {
+
+      onChanged();
+      return getProgressEntitiesFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
+      if (progressEntitiesBuilder_ != null) {
+        return progressEntitiesBuilder_.getMessageOrBuilder();
+      } else {
+        return progressEntities_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressEntities_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        getProgressEntitiesFieldBuilder() {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntitiesBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.Progress,
+                com.google.datastore.admin.v1.Progress.Builder,
+                com.google.datastore.admin.v1.ProgressOrBuilder>(
+                getProgressEntities(), getParentForChildren(), isClean());
+        progressEntities_ = null;
+      }
+      return progressEntitiesBuilder_;
+    }
+
+    private com.google.datastore.admin.v1.Progress progressBytes_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        progressBytesBuilder_;
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     *
+     * @return Whether the progressBytes field is set.
+     */
+    public boolean hasProgressBytes() {
+      return progressBytesBuilder_ != null || progressBytes_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     *
+     * @return The progressBytes.
+     */
+    public com.google.datastore.admin.v1.Progress getProgressBytes() {
+      if (progressBytesBuilder_ == null) {
+        return progressBytes_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressBytes_;
+      } else {
+        return progressBytesBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) {
+      if (progressBytesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        progressBytes_ = value;
+        onChanged();
+      } else {
+        progressBytesBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder setProgressBytes(
+        com.google.datastore.admin.v1.Progress.Builder builderForValue) {
+      if (progressBytesBuilder_ == null) {
+        progressBytes_ = builderForValue.build();
+        onChanged();
+      } else {
+        progressBytesBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value) {
+      if (progressBytesBuilder_ == null) {
+        if (progressBytes_ != null) {
+          progressBytes_ =
+              com.google.datastore.admin.v1.Progress.newBuilder(progressBytes_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          progressBytes_ = value;
+        }
+        onChanged();
+      } else {
+        progressBytesBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public Builder clearProgressBytes() {
+      if (progressBytesBuilder_ == null) {
+        progressBytes_ = null;
+        onChanged();
+      } else {
+        progressBytes_ = null;
+        progressBytesBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder() {
+
+      onChanged();
+      return getProgressBytesFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder() {
+      if (progressBytesBuilder_ != null) {
+        return progressBytesBuilder_.getMessageOrBuilder();
+      } else {
+        return progressBytes_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressBytes_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of bytes processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_bytes = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        getProgressBytesFieldBuilder() {
+      if (progressBytesBuilder_ == null) {
+        progressBytesBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.Progress,
+                com.google.datastore.admin.v1.Progress.Builder,
+                com.google.datastore.admin.v1.ProgressOrBuilder>(
+                getProgressBytes(), getParentForChildren(), isClean());
+        progressBytes_ = null;
+      }
+      return progressBytesBuilder_;
+    }
+
+    private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        entityFilterBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     *
+     * @return Whether the entityFilter field is set.
+     */
+    public boolean hasEntityFilter() {
+      return entityFilterBuilder_ != null || entityFilter_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     *
+     * @return The entityFilter.
+     */
+    public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      } else {
+        return entityFilterBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        entityFilter_ = value;
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder setEntityFilter(
+        com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = builderForValue.build();
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (entityFilter_ != null) {
+          entityFilter_ =
+              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          entityFilter_ = value;
+        }
+        onChanged();
+      } else {
+        entityFilterBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder clearEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+        onChanged();
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
+
+      onChanged();
+      return getEntityFilterFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+      if (entityFilterBuilder_ != null) {
+        return entityFilterBuilder_.getMessageOrBuilder();
+      } else {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Description of which entities are being imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        getEntityFilterFieldBuilder() {
+      if (entityFilterBuilder_ == null) {
+        entityFilterBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.EntityFilter,
+                com.google.datastore.admin.v1.EntityFilter.Builder,
+                com.google.datastore.admin.v1.EntityFilterOrBuilder>(
+                getEntityFilter(), getParentForChildren(), isClean());
+        entityFilter_ = null;
+      }
+      return entityFilterBuilder_;
+    }
+
+    private java.lang.Object inputUrl_ = "";
+    /**
+     *
+     *
+     * 
    +     * The location of the import metadata file. This will be the same value as
+     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * 
    
+     *
+     * string input_url = 5;
+     *
+     * @return The inputUrl.
+     */
+    public java.lang.String getInputUrl() {
+      java.lang.Object ref = inputUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        inputUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The location of the import metadata file. This will be the same value as
+     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * 
    
+     *
+     * string input_url = 5;
+     *
+     * @return The bytes for inputUrl.
+     */
+    public com.google.protobuf.ByteString getInputUrlBytes() {
+      java.lang.Object ref = inputUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        inputUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The location of the import metadata file. This will be the same value as
+     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * 
    
+     *
+     * string input_url = 5;
+     *
+     * @param value The inputUrl to set.
+     * @return This builder for chaining.
+     */
+    public Builder setInputUrl(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      inputUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The location of the import metadata file. This will be the same value as
+     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * 
    
+     *
+     * string input_url = 5;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearInputUrl() {
+
+      inputUrl_ = getDefaultInstance().getInputUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The location of the import metadata file. This will be the same value as
+     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * 
    
+     *
+     * string input_url = 5;
+     *
+     * @param value The bytes for inputUrl to set.
+     * @return This builder for chaining.
+     */
+    public Builder setInputUrlBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      inputUrl_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.ImportEntitiesMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.ImportEntitiesMetadata)
+  private static final com.google.datastore.admin.v1.ImportEntitiesMetadata DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.ImportEntitiesMetadata();
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesMetadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ImportEntitiesMetadata parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ImportEntitiesMetadata(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ImportEntitiesMetadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
new file mode 100644
index 000000000000..6cfc8190a592
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ImportEntitiesMetadataOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.ImportEntitiesMetadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return Whether the common field is set.
+   */
+  boolean hasCommon();
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return The common.
+   */
+  com.google.datastore.admin.v1.CommonMetadata getCommon();
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   */
+  com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return Whether the progressEntities field is set.
+   */
+  boolean hasProgressEntities();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return The progressEntities.
+   */
+  com.google.datastore.admin.v1.Progress getProgressEntities();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   */
+  com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return Whether the progressBytes field is set.
+   */
+  boolean hasProgressBytes();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   *
+   * @return The progressBytes.
+   */
+  com.google.datastore.admin.v1.Progress getProgressBytes();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of bytes processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_bytes = 3;
+   */
+  com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  boolean hasEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return The entityFilter.
+   */
+  com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Description of which entities are being imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   */
+  com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The location of the import metadata file. This will be the same value as
+   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * 
    
+   *
+   * string input_url = 5;
+   *
+   * @return The inputUrl.
+   */
+  java.lang.String getInputUrl();
+  /**
+   *
+   *
+   * 
    +   * The location of the import metadata file. This will be the same value as
+   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * 
    
+   *
+   * string input_url = 5;
+   *
+   * @return The bytes for inputUrl.
+   */
+  com.google.protobuf.ByteString getInputUrlBytes();
+}
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
new file mode 100644
index 000000000000..ecc1bcad757e
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java
@@ -0,0 +1,1532 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The request for
+ * [google.datastore.admin.v1.DatastoreAdmin.ImportEntities][google.datastore.admin.v1.DatastoreAdmin.ImportEntities].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.ImportEntitiesRequest}
+ */
+public final class ImportEntitiesRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ImportEntitiesRequest)
+    ImportEntitiesRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ImportEntitiesRequest.newBuilder() to construct.
+  private ImportEntitiesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ImportEntitiesRequest() {
+    projectId_ = "";
+    inputUrl_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ImportEntitiesRequest();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private ImportEntitiesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              projectId_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ =
+                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry labels__ =
+                  input.readMessage(
+                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              inputUrl_ = s;
+              break;
+            }
+          case 34:
+            {
+              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
+              if (entityFilter_ != null) {
+                subBuilder = entityFilter_.toBuilder();
+              }
+              entityFilter_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(entityFilter_);
+                entityFilter_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
+    switch (number) {
+      case 2:
+        return internalGetLabels();
+      default:
+        throw new RuntimeException("Invalid map field number: " + number);
+    }
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.ImportEntitiesRequest.class,
+            com.google.datastore.admin.v1.ImportEntitiesRequest.Builder.class);
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int LABELS_FIELD_NUMBER = 2;
+
+  private static final class LabelsDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry defaultEntry =
+        com.google.protobuf.MapEntry.newDefaultInstance(
+            com.google.datastore.admin.v1.DatastoreAdminProto
+                .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_LabelsEntry_descriptor,
+            com.google.protobuf.WireFormat.FieldType.STRING,
+            "",
+            com.google.protobuf.WireFormat.FieldType.STRING,
+            "");
+  }
+
+  private com.google.protobuf.MapField labels_;
+
+  private com.google.protobuf.MapField internalGetLabels() {
+    if (labels_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
+    }
+    return labels_;
+  }
+
+  public int getLabelsCount() {
+    return internalGetLabels().getMap().size();
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public boolean containsLabels(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    return internalGetLabels().getMap().containsKey(key);
+  }
+  /** Use {@link #getLabelsMap()} instead. */
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getLabels() {
+    return getLabelsMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public java.util.Map getLabelsMap() {
+    return internalGetLabels().getMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    java.util.Map map = internalGetLabels().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  @java.lang.Override
+  public java.lang.String getLabelsOrThrow(java.lang.String key) {
+    if (key == null) {
+      throw new java.lang.NullPointerException();
+    }
+    java.util.Map map = internalGetLabels().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  public static final int INPUT_URL_FIELD_NUMBER = 3;
+  private volatile java.lang.Object inputUrl_;
+  /**
+   *
+   *
+   * 
    +   * Required. The full resource URL of the external storage location. Currently, only
+   * Google Cloud Storage is supported. So input_url should be of the form:
+   * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+   * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+   * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+   * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+   * by the ExportEntities operation. For more information about Cloud Storage
+   * 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].
+   * 
    
+   *
+   * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The inputUrl.
+   */
+  @java.lang.Override
+  public java.lang.String getInputUrl() {
+    java.lang.Object ref = inputUrl_;
+    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();
+      inputUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The full resource URL of the external storage location. Currently, only
+   * Google Cloud Storage is supported. So input_url should be of the form:
+   * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+   * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+   * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+   * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+   * by the ExportEntities operation. For more information about Cloud Storage
+   * 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].
+   * 
    
+   *
+   * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for inputUrl.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getInputUrlBytes() {
+    java.lang.Object ref = inputUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      inputUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
+  private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+  /**
+   *
+   *
+   * 
    +   * Optionally specify which kinds/namespaces are to be imported. If provided,
+   * the list must be a subset of the EntityFilter used in creating the export,
+   * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+   * specified then all entities from the export are imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  @java.lang.Override
+  public boolean hasEntityFilter() {
+    return entityFilter_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optionally specify which kinds/namespaces are to be imported. If provided,
+   * the list must be a subset of the EntityFilter used in creating the export,
+   * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+   * specified then all entities from the export are imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return The entityFilter.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optionally specify which kinds/namespaces are to be imported. If provided,
+   * the list must be a subset of the EntityFilter used in creating the export,
+   * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+   * specified then all entities from the export are imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+    return getEntityFilter();
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
+    }
+    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+        output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 2);
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, inputUrl_);
+    }
+    if (entityFilter_ != null) {
+      output.writeMessage(4, getEntityFilter());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
+    }
+    for (java.util.Map.Entry entry :
+        internalGetLabels().getMap().entrySet()) {
+      com.google.protobuf.MapEntry labels__ =
+          LabelsDefaultEntryHolder.defaultEntry
+              .newBuilderForType()
+              .setKey(entry.getKey())
+              .setValue(entry.getValue())
+              .build();
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, labels__);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, inputUrl_);
+    }
+    if (entityFilter_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.ImportEntitiesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.ImportEntitiesRequest other =
+        (com.google.datastore.admin.v1.ImportEntitiesRequest) obj;
+
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!internalGetLabels().equals(other.internalGetLabels())) return false;
+    if (!getInputUrl().equals(other.getInputUrl())) return false;
+    if (hasEntityFilter() != other.hasEntityFilter()) return false;
+    if (hasEntityFilter()) {
+      if (!getEntityFilter().equals(other.getEntityFilter())) return false;
+    }
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getProjectId().hashCode();
+    if (!internalGetLabels().getMap().isEmpty()) {
+      hash = (37 * hash) + LABELS_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetLabels().hashCode();
+    }
+    hash = (37 * hash) + INPUT_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getInputUrl().hashCode();
+    if (hasEntityFilter()) {
+      hash = (37 * hash) + ENTITY_FILTER_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityFilter().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.ImportEntitiesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The request for
+   * [google.datastore.admin.v1.DatastoreAdmin.ImportEntities][google.datastore.admin.v1.DatastoreAdmin.ImportEntities].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.ImportEntitiesRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.ImportEntitiesRequest)
+      com.google.datastore.admin.v1.ImportEntitiesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
+      switch (number) {
+        case 2:
+          return internalGetLabels();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+      switch (number) {
+        case 2:
+          return internalGetMutableLabels();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.ImportEntitiesRequest.class,
+              com.google.datastore.admin.v1.ImportEntitiesRequest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.ImportEntitiesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      internalGetMutableLabels().clear();
+      inputUrl_ = "";
+
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ImportEntitiesRequest getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.ImportEntitiesRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ImportEntitiesRequest build() {
+      com.google.datastore.admin.v1.ImportEntitiesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ImportEntitiesRequest buildPartial() {
+      com.google.datastore.admin.v1.ImportEntitiesRequest result =
+          new com.google.datastore.admin.v1.ImportEntitiesRequest(this);
+      int from_bitField0_ = bitField0_;
+      result.projectId_ = projectId_;
+      result.labels_ = internalGetLabels();
+      result.labels_.makeImmutable();
+      result.inputUrl_ = inputUrl_;
+      if (entityFilterBuilder_ == null) {
+        result.entityFilter_ = entityFilter_;
+      } else {
+        result.entityFilter_ = entityFilterBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.ImportEntitiesRequest) {
+        return mergeFrom((com.google.datastore.admin.v1.ImportEntitiesRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesRequest other) {
+      if (other == com.google.datastore.admin.v1.ImportEntitiesRequest.getDefaultInstance())
+        return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      internalGetMutableLabels().mergeFrom(other.internalGetLabels());
+      if (!other.getInputUrl().isEmpty()) {
+        inputUrl_ = other.inputUrl_;
+        onChanged();
+      }
+      if (other.hasEntityFilter()) {
+        mergeEntityFilter(other.getEntityFilter());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.ImportEntitiesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.ImportEntitiesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.MapField labels_;
+
+    private com.google.protobuf.MapField internalGetLabels() {
+      if (labels_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
+      }
+      return labels_;
+    }
+
+    private com.google.protobuf.MapField
+        internalGetMutableLabels() {
+      onChanged();
+      ;
+      if (labels_ == null) {
+        labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+      }
+      if (!labels_.isMutable()) {
+        labels_ = labels_.copy();
+      }
+      return labels_;
+    }
+
+    public int getLabelsCount() {
+      return internalGetLabels().getMap().size();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public boolean containsLabels(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      return internalGetLabels().getMap().containsKey(key);
+    }
+    /** Use {@link #getLabelsMap()} instead. */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getLabels() {
+      return getLabelsMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public java.util.Map getLabelsMap() {
+      return internalGetLabels().getMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      java.util.Map map = internalGetLabels().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    @java.lang.Override
+    public java.lang.String getLabelsOrThrow(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      java.util.Map map = internalGetLabels().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearLabels() {
+      internalGetMutableLabels().getMutableMap().clear();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    public Builder removeLabels(java.lang.String key) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableLabels().getMutableMap().remove(key);
+      return this;
+    }
+    /** Use alternate mutation accessors instead. */
+    @java.lang.Deprecated
+    public java.util.Map getMutableLabels() {
+      return internalGetMutableLabels().getMutableMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    public Builder putLabels(java.lang.String key, java.lang.String value) {
+      if (key == null) {
+        throw new java.lang.NullPointerException();
+      }
+      if (value == null) {
+        throw new java.lang.NullPointerException();
+      }
+      internalGetMutableLabels().getMutableMap().put(key, value);
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Client-assigned labels.
+     * 
    
+     *
+     * map<string, string> labels = 2;
+     */
+    public Builder putAllLabels(java.util.Map values) {
+      internalGetMutableLabels().getMutableMap().putAll(values);
+      return this;
+    }
+
+    private java.lang.Object inputUrl_ = "";
+    /**
+     *
+     *
+     * 
    +     * Required. The full resource URL of the external storage location. Currently, only
+     * Google Cloud Storage is supported. So input_url should be of the form:
+     * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+     * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+     * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+     * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+     * by the ExportEntities operation. For more information about Cloud Storage
+     * 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].
+     * 
    
+     *
+     * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The inputUrl.
+     */
+    public java.lang.String getInputUrl() {
+      java.lang.Object ref = inputUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        inputUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The full resource URL of the external storage location. Currently, only
+     * Google Cloud Storage is supported. So input_url should be of the form:
+     * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+     * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+     * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+     * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+     * by the ExportEntities operation. For more information about Cloud Storage
+     * 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].
+     * 
    
+     *
+     * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for inputUrl.
+     */
+    public com.google.protobuf.ByteString getInputUrlBytes() {
+      java.lang.Object ref = inputUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        inputUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The full resource URL of the external storage location. Currently, only
+     * Google Cloud Storage is supported. So input_url should be of the form:
+     * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+     * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+     * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+     * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+     * by the ExportEntities operation. For more information about Cloud Storage
+     * 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].
+     * 
    
+     *
+     * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The inputUrl to set.
+     * @return This builder for chaining.
+     */
+    public Builder setInputUrl(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      inputUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The full resource URL of the external storage location. Currently, only
+     * Google Cloud Storage is supported. So input_url should be of the form:
+     * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+     * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+     * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+     * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+     * by the ExportEntities operation. For more information about Cloud Storage
+     * 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].
+     * 
    
+     *
+     * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearInputUrl() {
+
+      inputUrl_ = getDefaultInstance().getInputUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The full resource URL of the external storage location. Currently, only
+     * Google Cloud Storage is supported. So input_url should be of the form:
+     * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+     * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+     * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+     * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+     * by the ExportEntities operation. For more information about Cloud Storage
+     * 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].
+     * 
    
+     *
+     * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for inputUrl to set.
+     * @return This builder for chaining.
+     */
+    public Builder setInputUrlBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      inputUrl_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        entityFilterBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     *
+     * @return Whether the entityFilter field is set.
+     */
+    public boolean hasEntityFilter() {
+      return entityFilterBuilder_ != null || entityFilter_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     *
+     * @return The entityFilter.
+     */
+    public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      } else {
+        return entityFilterBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        entityFilter_ = value;
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder setEntityFilter(
+        com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = builderForValue.build();
+        onChanged();
+      } else {
+        entityFilterBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
+      if (entityFilterBuilder_ == null) {
+        if (entityFilter_ != null) {
+          entityFilter_ =
+              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          entityFilter_ = value;
+        }
+        onChanged();
+      } else {
+        entityFilterBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public Builder clearEntityFilter() {
+      if (entityFilterBuilder_ == null) {
+        entityFilter_ = null;
+        onChanged();
+      } else {
+        entityFilter_ = null;
+        entityFilterBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
+
+      onChanged();
+      return getEntityFilterFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
+      if (entityFilterBuilder_ != null) {
+        return entityFilterBuilder_.getMessageOrBuilder();
+      } else {
+        return entityFilter_ == null
+            ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+            : entityFilter_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optionally specify which kinds/namespaces are to be imported. If provided,
+     * the list must be a subset of the EntityFilter used in creating the export,
+     * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+     * specified then all entities from the export are imported.
+     * 
    
+     *
+     * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.EntityFilter,
+            com.google.datastore.admin.v1.EntityFilter.Builder,
+            com.google.datastore.admin.v1.EntityFilterOrBuilder>
+        getEntityFilterFieldBuilder() {
+      if (entityFilterBuilder_ == null) {
+        entityFilterBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.EntityFilter,
+                com.google.datastore.admin.v1.EntityFilter.Builder,
+                com.google.datastore.admin.v1.EntityFilterOrBuilder>(
+                getEntityFilter(), getParentForChildren(), isClean());
+        entityFilter_ = null;
+      }
+      return entityFilterBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.ImportEntitiesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.ImportEntitiesRequest)
+  private static final com.google.datastore.admin.v1.ImportEntitiesRequest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.ImportEntitiesRequest();
+  }
+
+  public static com.google.datastore.admin.v1.ImportEntitiesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ImportEntitiesRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ImportEntitiesRequest(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ImportEntitiesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..9d29365b46ff
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ImportEntitiesRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.ImportEntitiesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Required. Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
+   */
+  com.google.protobuf.ByteString getProjectIdBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  int getLabelsCount();
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  boolean containsLabels(java.lang.String key);
+  /** Use {@link #getLabelsMap()} instead. */
+  @java.lang.Deprecated
+  java.util.Map getLabels();
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  java.util.Map getLabelsMap();
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
+  /**
+   *
+   *
+   * 
    +   * Client-assigned labels.
+   * 
    
+   *
+   * map<string, string> labels = 2;
+   */
+  java.lang.String getLabelsOrThrow(java.lang.String key);
+
+  /**
+   *
+   *
+   * 
    +   * Required. The full resource URL of the external storage location. Currently, only
+   * Google Cloud Storage is supported. So input_url should be of the form:
+   * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+   * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+   * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+   * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+   * by the ExportEntities operation. For more information about Cloud Storage
+   * 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].
+   * 
    
+   *
+   * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The inputUrl.
+   */
+  java.lang.String getInputUrl();
+  /**
+   *
+   *
+   * 
    +   * Required. The full resource URL of the external storage location. Currently, only
+   * Google Cloud Storage is supported. So input_url should be of the form:
+   * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+   * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+   * an optional Cloud Storage namespace path (this is not a Cloud Datastore
+   * namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+   * by the ExportEntities operation. For more information about Cloud Storage
+   * 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].
+   * 
    
+   *
+   * string input_url = 3 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for inputUrl.
+   */
+  com.google.protobuf.ByteString getInputUrlBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Optionally specify which kinds/namespaces are to be imported. If provided,
+   * the list must be a subset of the EntityFilter used in creating the export,
+   * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+   * specified then all entities from the export are imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return Whether the entityFilter field is set.
+   */
+  boolean hasEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Optionally specify which kinds/namespaces are to be imported. If provided,
+   * the list must be a subset of the EntityFilter used in creating the export,
+   * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+   * specified then all entities from the export are imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   *
+   * @return The entityFilter.
+   */
+  com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+  /**
+   *
+   *
+   * 
    +   * Optionally specify which kinds/namespaces are to be imported. If provided,
+   * the list must be a subset of the EntityFilter used in creating the export,
+   * otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+   * specified then all entities from the export are imported.
+   * 
    
+   *
+   * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
+   */
+  com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder();
+}
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
new file mode 100644
index 000000000000..582005f9e884
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java
@@ -0,0 +1,3265 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/index.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Datastore composite index definition.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.Index}
+ */
+public final class Index extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Index)
+    IndexOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use Index.newBuilder() to construct.
+  private Index(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private Index() {
+    projectId_ = "";
+    indexId_ = "";
+    kind_ = "";
+    ancestor_ = 0;
+    properties_ = java.util.Collections.emptyList();
+    state_ = 0;
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Index();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private Index(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              projectId_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              indexId_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              kind_ = s;
+              break;
+            }
+          case 40:
+            {
+              int rawValue = input.readEnum();
+
+              ancestor_ = rawValue;
+              break;
+            }
+          case 50:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                properties_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              properties_.add(
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Index.IndexedProperty.parser(),
+                      extensionRegistry));
+              break;
+            }
+          case 56:
+            {
+              int rawValue = input.readEnum();
+
+              state_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        properties_ = java.util.Collections.unmodifiableList(properties_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.IndexProto
+        .internal_static_google_datastore_admin_v1_Index_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.IndexProto
+        .internal_static_google_datastore_admin_v1_Index_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.Index.class,
+            com.google.datastore.admin.v1.Index.Builder.class);
+  }
+
+  /**
+   *
+   *
+   * 
    +   * For an ordered index, specifies whether each of the entity's ancestors
+   * will be included.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.admin.v1.Index.AncestorMode}
+   */
+  public enum AncestorMode implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * The ancestor mode is unspecified.
+     * 
    
+     *
+     * ANCESTOR_MODE_UNSPECIFIED = 0;
+     */
+    ANCESTOR_MODE_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * Do not include the entity's ancestors in the index.
+     * 
    
+     *
+     * NONE = 1;
+     */
+    NONE(1),
+    /**
+     *
+     *
+     * 
    +     * Include all the entity's ancestors in the index.
+     * 
    
+     *
+     * ALL_ANCESTORS = 2;
+     */
+    ALL_ANCESTORS(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * The ancestor mode is unspecified.
+     * 
    
+     *
+     * ANCESTOR_MODE_UNSPECIFIED = 0;
+     */
+    public static final int ANCESTOR_MODE_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * Do not include the entity's ancestors in the index.
+     * 
    
+     *
+     * NONE = 1;
+     */
+    public static final int NONE_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * Include all the entity's ancestors in the index.
+     * 
    
+     *
+     * ALL_ANCESTORS = 2;
+     */
+    public static final int ALL_ANCESTORS_VALUE = 2;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static AncestorMode valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static AncestorMode forNumber(int value) {
+      switch (value) {
+        case 0:
+          return ANCESTOR_MODE_UNSPECIFIED;
+        case 1:
+          return NONE;
+        case 2:
+          return ALL_ANCESTORS;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public AncestorMode findValueByNumber(int number) {
+            return AncestorMode.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.admin.v1.Index.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final AncestorMode[] VALUES = values();
+
+    public static AncestorMode valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private AncestorMode(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.Index.AncestorMode)
+  }
+
+  /**
+   *
+   *
+   * 
    +   * The direction determines how a property is indexed.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.admin.v1.Index.Direction}
+   */
+  public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * The direction is unspecified.
+     * 
    
+     *
+     * DIRECTION_UNSPECIFIED = 0;
+     */
+    DIRECTION_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * The property's values are indexed so as to support sequencing in
+     * ascending order and also query by <, >, <=, >=, and =.
+     * 
    
+     *
+     * ASCENDING = 1;
+     */
+    ASCENDING(1),
+    /**
+     *
+     *
+     * 
    +     * The property's values are indexed so as to support sequencing in
+     * descending order and also query by <, >, <=, >=, and =.
+     * 
    
+     *
+     * DESCENDING = 2;
+     */
+    DESCENDING(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * The direction is unspecified.
+     * 
    
+     *
+     * DIRECTION_UNSPECIFIED = 0;
+     */
+    public static final int DIRECTION_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * The property's values are indexed so as to support sequencing in
+     * ascending order and also query by <, >, <=, >=, and =.
+     * 
    
+     *
+     * ASCENDING = 1;
+     */
+    public static final int ASCENDING_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * The property's values are indexed so as to support sequencing in
+     * descending order and also query by <, >, <=, >=, and =.
+     * 
    
+     *
+     * DESCENDING = 2;
+     */
+    public static final int DESCENDING_VALUE = 2;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static Direction valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static Direction forNumber(int value) {
+      switch (value) {
+        case 0:
+          return DIRECTION_UNSPECIFIED;
+        case 1:
+          return ASCENDING;
+        case 2:
+          return DESCENDING;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public Direction findValueByNumber(int number) {
+            return Direction.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.admin.v1.Index.getDescriptor().getEnumTypes().get(1);
+    }
+
+    private static final Direction[] VALUES = values();
+
+    public static Direction valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private Direction(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.Index.Direction)
+  }
+
+  /**
+   *
+   *
+   * 
    +   * The possible set of states of an index.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.admin.v1.Index.State}
+   */
+  public enum State implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * The state is unspecified.
+     * 
    
+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    STATE_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * The index is being created, and cannot be used by queries.
+     * There is an active long-running operation for the index.
+     * The index is updated when writing an entity.
+     * Some index data may exist.
+     * 
    
+     *
+     * CREATING = 1;
+     */
+    CREATING(1),
+    /**
+     *
+     *
+     * 
    +     * The index is ready to be used.
+     * The index is updated when writing an entity.
+     * The index is fully populated from all stored entities it applies to.
+     * 
    
+     *
+     * READY = 2;
+     */
+    READY(2),
+    /**
+     *
+     *
+     * 
    +     * The index is being deleted, and cannot be used by queries.
+     * There is an active long-running operation for the index.
+     * The index is not updated when writing an entity.
+     * Some index data may exist.
+     * 
    
+     *
+     * DELETING = 3;
+     */
+    DELETING(3),
+    /**
+     *
+     *
+     * 
    +     * The index was being created or deleted, but something went wrong.
+     * The index cannot by used by queries.
+     * There is no active long-running operation for the index,
+     * and the most recently finished long-running operation failed.
+     * The index is not updated when writing an entity.
+     * Some index data may exist.
+     * 
    
+     *
+     * ERROR = 4;
+     */
+    ERROR(4),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * The state is unspecified.
+     * 
    
+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    public static final int STATE_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * The index is being created, and cannot be used by queries.
+     * There is an active long-running operation for the index.
+     * The index is updated when writing an entity.
+     * Some index data may exist.
+     * 
    
+     *
+     * CREATING = 1;
+     */
+    public static final int CREATING_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * The index is ready to be used.
+     * The index is updated when writing an entity.
+     * The index is fully populated from all stored entities it applies to.
+     * 
    
+     *
+     * READY = 2;
+     */
+    public static final int READY_VALUE = 2;
+    /**
+     *
+     *
+     * 
    +     * The index is being deleted, and cannot be used by queries.
+     * There is an active long-running operation for the index.
+     * The index is not updated when writing an entity.
+     * Some index data may exist.
+     * 
    
+     *
+     * DELETING = 3;
+     */
+    public static final int DELETING_VALUE = 3;
+    /**
+     *
+     *
+     * 
    +     * The index was being created or deleted, but something went wrong.
+     * The index cannot by used by queries.
+     * There is no active long-running operation for the index,
+     * and the most recently finished long-running operation failed.
+     * The index is not updated when writing an entity.
+     * Some index data may exist.
+     * 
    
+     *
+     * ERROR = 4;
+     */
+    public static final int ERROR_VALUE = 4;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static State valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static State forNumber(int value) {
+      switch (value) {
+        case 0:
+          return STATE_UNSPECIFIED;
+        case 1:
+          return CREATING;
+        case 2:
+          return READY;
+        case 3:
+          return DELETING;
+        case 4:
+          return ERROR;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public State findValueByNumber(int number) {
+            return State.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.admin.v1.Index.getDescriptor().getEnumTypes().get(2);
+    }
+
+    private static final State[] VALUES = values();
+
+    public static State valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private State(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.Index.State)
+  }
+
+  public interface IndexedPropertyOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.Index.IndexedProperty)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     *
+     *
+     * 
    +     * Required. The property name to index.
+     * 
    
+     *
+     * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The name.
+     */
+    java.lang.String getName();
+    /**
+     *
+     *
+     * 
    +     * Required. The property name to index.
+     * 
    
+     *
+     * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for name.
+     */
+    com.google.protobuf.ByteString getNameBytes();
+
+    /**
+     *
+     *
+     * 
    +     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The enum numeric value on the wire for direction.
+     */
+    int getDirectionValue();
+    /**
+     *
+     *
+     * 
    +     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The direction.
+     */
+    com.google.datastore.admin.v1.Index.Direction getDirection();
+  }
+  /**
+   *
+   *
+   * 
    +   * A property of an index.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.Index.IndexedProperty}
+   */
+  public static final class IndexedProperty extends com.google.protobuf.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Index.IndexedProperty)
+      IndexedPropertyOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use IndexedProperty.newBuilder() to construct.
+    private IndexedProperty(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private IndexedProperty() {
+      name_ = "";
+      direction_ = 0;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new IndexedProperty();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private IndexedProperty(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                name_ = s;
+                break;
+              }
+            case 16:
+              {
+                int rawValue = input.readEnum();
+
+                direction_ = rawValue;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    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;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.IndexProto
+          .internal_static_google_datastore_admin_v1_Index_IndexedProperty_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.Index.IndexedProperty.class,
+              com.google.datastore.admin.v1.Index.IndexedProperty.Builder.class);
+    }
+
+    public static final int NAME_FIELD_NUMBER = 1;
+    private volatile java.lang.Object name_;
+    /**
+     *
+     *
+     * 
    +     * Required. The property name to index.
+     * 
    
+     *
+     * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The name.
+     */
+    @java.lang.Override
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      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();
+        name_ = s;
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The property name to index.
+     * 
    
+     *
+     * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for name.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int DIRECTION_FIELD_NUMBER = 2;
+    private int direction_;
+    /**
+     *
+     *
+     * 
    +     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The enum numeric value on the wire for direction.
+     */
+    @java.lang.Override
+    public int getDirectionValue() {
+      return direction_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The direction.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Index.Direction getDirection() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.Index.Direction result =
+          com.google.datastore.admin.v1.Index.Direction.valueOf(direction_);
+      return result == null ? com.google.datastore.admin.v1.Index.Direction.UNRECOGNIZED : result;
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+      }
+      if (direction_
+          != com.google.datastore.admin.v1.Index.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
+        output.writeEnum(2, direction_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+      }
+      if (direction_
+          != com.google.datastore.admin.v1.Index.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj instanceof com.google.datastore.admin.v1.Index.IndexedProperty)) {
+        return super.equals(obj);
+      }
+      com.google.datastore.admin.v1.Index.IndexedProperty other =
+          (com.google.datastore.admin.v1.Index.IndexedProperty) obj;
+
+      if (!getName().equals(other.getName())) return false;
+      if (direction_ != other.direction_) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getName().hashCode();
+      hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
+      hash = (53 * hash) + direction_;
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseDelimitedFrom(
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        com.google.datastore.admin.v1.Index.IndexedProperty prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     *
+     *
+     * 
    +     * A property of an index.
+     * 
    
+     *
+     * Protobuf type {@code google.datastore.admin.v1.Index.IndexedProperty}
+     */
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.Index.IndexedProperty)
+        com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder {
+      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;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.admin.v1.IndexProto
+            .internal_static_google_datastore_admin_v1_Index_IndexedProperty_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.admin.v1.Index.IndexedProperty.class,
+                com.google.datastore.admin.v1.Index.IndexedProperty.Builder.class);
+      }
+
+      // Construct using com.google.datastore.admin.v1.Index.IndexedProperty.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        name_ = "";
+
+        direction_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.admin.v1.IndexProto
+            .internal_static_google_datastore_admin_v1_Index_IndexedProperty_descriptor;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.Index.IndexedProperty getDefaultInstanceForType() {
+        return com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.Index.IndexedProperty build() {
+        com.google.datastore.admin.v1.Index.IndexedProperty result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.Index.IndexedProperty buildPartial() {
+        com.google.datastore.admin.v1.Index.IndexedProperty result =
+            new com.google.datastore.admin.v1.Index.IndexedProperty(this);
+        result.name_ = name_;
+        result.direction_ = direction_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.google.datastore.admin.v1.Index.IndexedProperty) {
+          return mergeFrom((com.google.datastore.admin.v1.Index.IndexedProperty) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.google.datastore.admin.v1.Index.IndexedProperty other) {
+        if (other == com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance())
+          return this;
+        if (!other.getName().isEmpty()) {
+          name_ = other.name_;
+          onChanged();
+        }
+        if (other.direction_ != 0) {
+          setDirectionValue(other.getDirectionValue());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.google.datastore.admin.v1.Index.IndexedProperty parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.datastore.admin.v1.Index.IndexedProperty) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private java.lang.Object name_ = "";
+      /**
+       *
+       *
+       * 
    +       * Required. The property name to index.
+       * 
    
+       *
+       * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+       *
+       * @return The name.
+       */
+      public java.lang.String getName() {
+        java.lang.Object ref = name_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          name_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The property name to index.
+       * 
    
+       *
+       * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+       *
+       * @return The bytes for name.
+       */
+      public com.google.protobuf.ByteString getNameBytes() {
+        java.lang.Object ref = name_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          name_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The property name to index.
+       * 
    
+       *
+       * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+       *
+       * @param value The name to set.
+       * @return This builder for chaining.
+       */
+      public Builder setName(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+
+        name_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The property name to index.
+       * 
    
+       *
+       * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearName() {
+
+        name_ = getDefaultInstance().getName();
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The property name to index.
+       * 
    
+       *
+       * string name = 1 [(.google.api.field_behavior) = REQUIRED];
+       *
+       * @param value The bytes for name to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNameBytes(com.google.protobuf.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        checkByteStringIsUtf8(value);
+
+        name_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int direction_ = 0;
+      /**
+       *
+       *
+       * 
    +       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+       * 
+       *
+       * @return The enum numeric value on the wire for direction.
+       */
+      @java.lang.Override
+      public int getDirectionValue() {
+        return direction_;
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+       * 
+       *
+       * @param value The enum numeric value on the wire for direction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDirectionValue(int value) {
+
+        direction_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+       * 
+       *
+       * @return The direction.
+       */
+      @java.lang.Override
+      public com.google.datastore.admin.v1.Index.Direction getDirection() {
+        @SuppressWarnings("deprecation")
+        com.google.datastore.admin.v1.Index.Direction result =
+            com.google.datastore.admin.v1.Index.Direction.valueOf(direction_);
+        return result == null ? com.google.datastore.admin.v1.Index.Direction.UNRECOGNIZED : result;
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+       * 
+       *
+       * @param value The direction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDirection(com.google.datastore.admin.v1.Index.Direction value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+
+        direction_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.Index.Direction direction = 2 [(.google.api.field_behavior) = REQUIRED];
+       * 
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearDirection() {
+
+        direction_ = 0;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.Index.IndexedProperty)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.Index.IndexedProperty)
+    private static final com.google.datastore.admin.v1.Index.IndexedProperty DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE = new com.google.datastore.admin.v1.Index.IndexedProperty();
+    }
+
+    public static com.google.datastore.admin.v1.Index.IndexedProperty getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser PARSER =
+        new com.google.protobuf.AbstractParser() {
+          @java.lang.Override
+          public IndexedProperty parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            return new IndexedProperty(input, extensionRegistry);
+          }
+        };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Index.IndexedProperty getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Output only. Project ID.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Output only. Project ID.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int INDEX_ID_FIELD_NUMBER = 3;
+  private volatile java.lang.Object indexId_;
+  /**
+   *
+   *
+   * 
    +   * Output only. The resource ID of the index.
+   * 
    
+   *
+   * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The indexId.
+   */
+  @java.lang.Override
+  public java.lang.String getIndexId() {
+    java.lang.Object ref = indexId_;
+    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();
+      indexId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Output only. The resource ID of the index.
+   * 
    
+   *
+   * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The bytes for indexId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getIndexIdBytes() {
+    java.lang.Object ref = indexId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      indexId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int KIND_FIELD_NUMBER = 4;
+  private volatile java.lang.Object kind_;
+  /**
+   *
+   *
+   * 
    +   * Required. The entity kind to which this index applies.
+   * 
    
+   *
+   * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The kind.
+   */
+  @java.lang.Override
+  public java.lang.String getKind() {
+    java.lang.Object ref = kind_;
+    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();
+      kind_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The entity kind to which this index applies.
+   * 
    
+   *
+   * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for kind.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getKindBytes() {
+    java.lang.Object ref = kind_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      kind_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int ANCESTOR_FIELD_NUMBER = 5;
+  private int ancestor_;
+  /**
+   *
+   *
+   * 
    +   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The enum numeric value on the wire for ancestor.
+   */
+  @java.lang.Override
+  public int getAncestorValue() {
+    return ancestor_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The ancestor.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.Index.AncestorMode result =
+        com.google.datastore.admin.v1.Index.AncestorMode.valueOf(ancestor_);
+    return result == null ? com.google.datastore.admin.v1.Index.AncestorMode.UNRECOGNIZED : result;
+  }
+
+  public static final int PROPERTIES_FIELD_NUMBER = 6;
+  private java.util.List properties_;
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  @java.lang.Override
+  public java.util.List getPropertiesList() {
+    return properties_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  @java.lang.Override
+  public java.util.List
+      getPropertiesOrBuilderList() {
+    return properties_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  @java.lang.Override
+  public int getPropertiesCount() {
+    return properties_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int index) {
+    return properties_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertiesOrBuilder(
+      int index) {
+    return properties_.get(index);
+  }
+
+  public static final int STATE_FIELD_NUMBER = 7;
+  private int state_;
+  /**
+   *
+   *
+   * 
    +   * Output only. The state of the index.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * 
+   *
+   * @return The enum numeric value on the wire for state.
+   */
+  @java.lang.Override
+  public int getStateValue() {
+    return state_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Output only. The state of the index.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * 
+   *
+   * @return The state.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Index.State getState() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.Index.State result =
+        com.google.datastore.admin.v1.Index.State.valueOf(state_);
+    return result == null ? com.google.datastore.admin.v1.Index.State.UNRECOGNIZED : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, kind_);
+    }
+    if (ancestor_
+        != com.google.datastore.admin.v1.Index.AncestorMode.ANCESTOR_MODE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(5, ancestor_);
+    }
+    for (int i = 0; i < properties_.size(); i++) {
+      output.writeMessage(6, properties_.get(i));
+    }
+    if (state_ != com.google.datastore.admin.v1.Index.State.STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(7, state_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, kind_);
+    }
+    if (ancestor_
+        != com.google.datastore.admin.v1.Index.AncestorMode.ANCESTOR_MODE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, ancestor_);
+    }
+    for (int i = 0; i < properties_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, properties_.get(i));
+    }
+    if (state_ != com.google.datastore.admin.v1.Index.State.STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(7, state_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.Index)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.Index other = (com.google.datastore.admin.v1.Index) obj;
+
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getIndexId().equals(other.getIndexId())) return false;
+    if (!getKind().equals(other.getKind())) return false;
+    if (ancestor_ != other.ancestor_) return false;
+    if (!getPropertiesList().equals(other.getPropertiesList())) return false;
+    if (state_ != other.state_) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getProjectId().hashCode();
+    hash = (37 * hash) + INDEX_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getIndexId().hashCode();
+    hash = (37 * hash) + KIND_FIELD_NUMBER;
+    hash = (53 * hash) + getKind().hashCode();
+    hash = (37 * hash) + ANCESTOR_FIELD_NUMBER;
+    hash = (53 * hash) + ancestor_;
+    if (getPropertiesCount() > 0) {
+      hash = (37 * hash) + PROPERTIES_FIELD_NUMBER;
+      hash = (53 * hash) + getPropertiesList().hashCode();
+    }
+    hash = (37 * hash) + STATE_FIELD_NUMBER;
+    hash = (53 * hash) + state_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.Index parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.Index prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Datastore composite index definition.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.Index}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.Index)
+      com.google.datastore.admin.v1.IndexOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.IndexProto
+          .internal_static_google_datastore_admin_v1_Index_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.IndexProto
+          .internal_static_google_datastore_admin_v1_Index_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.Index.class,
+              com.google.datastore.admin.v1.Index.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.Index.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPropertiesFieldBuilder();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      indexId_ = "";
+
+      kind_ = "";
+
+      ancestor_ = 0;
+
+      if (propertiesBuilder_ == null) {
+        properties_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        propertiesBuilder_.clear();
+      }
+      state_ = 0;
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.IndexProto
+          .internal_static_google_datastore_admin_v1_Index_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Index getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.Index.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Index build() {
+      com.google.datastore.admin.v1.Index result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Index buildPartial() {
+      com.google.datastore.admin.v1.Index result = new com.google.datastore.admin.v1.Index(this);
+      int from_bitField0_ = bitField0_;
+      result.projectId_ = projectId_;
+      result.indexId_ = indexId_;
+      result.kind_ = kind_;
+      result.ancestor_ = ancestor_;
+      if (propertiesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          properties_ = java.util.Collections.unmodifiableList(properties_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.properties_ = properties_;
+      } else {
+        result.properties_ = propertiesBuilder_.build();
+      }
+      result.state_ = state_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.Index) {
+        return mergeFrom((com.google.datastore.admin.v1.Index) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.Index other) {
+      if (other == com.google.datastore.admin.v1.Index.getDefaultInstance()) return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      if (!other.getIndexId().isEmpty()) {
+        indexId_ = other.indexId_;
+        onChanged();
+      }
+      if (!other.getKind().isEmpty()) {
+        kind_ = other.kind_;
+        onChanged();
+      }
+      if (other.ancestor_ != 0) {
+        setAncestorValue(other.getAncestorValue());
+      }
+      if (propertiesBuilder_ == null) {
+        if (!other.properties_.isEmpty()) {
+          if (properties_.isEmpty()) {
+            properties_ = other.properties_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensurePropertiesIsMutable();
+            properties_.addAll(other.properties_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.properties_.isEmpty()) {
+          if (propertiesBuilder_.isEmpty()) {
+            propertiesBuilder_.dispose();
+            propertiesBuilder_ = null;
+            properties_ = other.properties_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            propertiesBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getPropertiesFieldBuilder()
+                    : null;
+          } else {
+            propertiesBuilder_.addAllMessages(other.properties_);
+          }
+        }
+      }
+      if (other.state_ != 0) {
+        setStateValue(other.getStateValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.Index parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.Index) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Output only. Project ID.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. Project ID.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. Project ID.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. Project ID.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. Project ID.
+     * 
    
+     *
+     * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object indexId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Output only. The resource ID of the index.
+     * 
    
+     *
+     * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @return The indexId.
+     */
+    public java.lang.String getIndexId() {
+      java.lang.Object ref = indexId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        indexId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The resource ID of the index.
+     * 
    
+     *
+     * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @return The bytes for indexId.
+     */
+    public com.google.protobuf.ByteString getIndexIdBytes() {
+      java.lang.Object ref = indexId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        indexId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The resource ID of the index.
+     * 
    
+     *
+     * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @param value The indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The resource ID of the index.
+     * 
    
+     *
+     * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearIndexId() {
+
+      indexId_ = getDefaultInstance().getIndexId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The resource ID of the index.
+     * 
    
+     *
+     * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     *
+     * @param value The bytes for indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object kind_ = "";
+    /**
+     *
+     *
+     * 
    +     * Required. The entity kind to which this index applies.
+     * 
    
+     *
+     * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The kind.
+     */
+    public java.lang.String getKind() {
+      java.lang.Object ref = kind_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        kind_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The entity kind to which this index applies.
+     * 
    
+     *
+     * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for kind.
+     */
+    public com.google.protobuf.ByteString getKindBytes() {
+      java.lang.Object ref = kind_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        kind_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The entity kind to which this index applies.
+     * 
    
+     *
+     * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The kind to set.
+     * @return This builder for chaining.
+     */
+    public Builder setKind(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      kind_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The entity kind to which this index applies.
+     * 
    
+     *
+     * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearKind() {
+
+      kind_ = getDefaultInstance().getKind();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The entity kind to which this index applies.
+     * 
    
+     *
+     * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for kind to set.
+     * @return This builder for chaining.
+     */
+    public Builder setKindBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      kind_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int ancestor_ = 0;
+    /**
+     *
+     *
+     * 
    +     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The enum numeric value on the wire for ancestor.
+     */
+    @java.lang.Override
+    public int getAncestorValue() {
+      return ancestor_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @param value The enum numeric value on the wire for ancestor to set.
+     * @return This builder for chaining.
+     */
+    public Builder setAncestorValue(int value) {
+
+      ancestor_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The ancestor.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.Index.AncestorMode result =
+          com.google.datastore.admin.v1.Index.AncestorMode.valueOf(ancestor_);
+      return result == null
+          ? com.google.datastore.admin.v1.Index.AncestorMode.UNRECOGNIZED
+          : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @param value The ancestor to set.
+     * @return This builder for chaining.
+     */
+    public Builder setAncestor(com.google.datastore.admin.v1.Index.AncestorMode value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      ancestor_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearAncestor() {
+
+      ancestor_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.util.List properties_ =
+        java.util.Collections.emptyList();
+
+    private void ensurePropertiesIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        properties_ =
+            new java.util.ArrayList(
+                properties_);
+        bitField0_ |= 0x00000001;
+      }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.admin.v1.Index.IndexedProperty,
+            com.google.datastore.admin.v1.Index.IndexedProperty.Builder,
+            com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder>
+        propertiesBuilder_;
+
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public java.util.List getPropertiesList() {
+      if (propertiesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(properties_);
+      } else {
+        return propertiesBuilder_.getMessageList();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public int getPropertiesCount() {
+      if (propertiesBuilder_ == null) {
+        return properties_.size();
+      } else {
+        return propertiesBuilder_.getCount();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int index) {
+      if (propertiesBuilder_ == null) {
+        return properties_.get(index);
+      } else {
+        return propertiesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder setProperties(
+        int index, com.google.datastore.admin.v1.Index.IndexedProperty value) {
+      if (propertiesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePropertiesIsMutable();
+        properties_.set(index, value);
+        onChanged();
+      } else {
+        propertiesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder setProperties(
+        int index, com.google.datastore.admin.v1.Index.IndexedProperty.Builder builderForValue) {
+      if (propertiesBuilder_ == null) {
+        ensurePropertiesIsMutable();
+        properties_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        propertiesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder addProperties(com.google.datastore.admin.v1.Index.IndexedProperty value) {
+      if (propertiesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePropertiesIsMutable();
+        properties_.add(value);
+        onChanged();
+      } else {
+        propertiesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder addProperties(
+        int index, com.google.datastore.admin.v1.Index.IndexedProperty value) {
+      if (propertiesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePropertiesIsMutable();
+        properties_.add(index, value);
+        onChanged();
+      } else {
+        propertiesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder addProperties(
+        com.google.datastore.admin.v1.Index.IndexedProperty.Builder builderForValue) {
+      if (propertiesBuilder_ == null) {
+        ensurePropertiesIsMutable();
+        properties_.add(builderForValue.build());
+        onChanged();
+      } else {
+        propertiesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder addProperties(
+        int index, com.google.datastore.admin.v1.Index.IndexedProperty.Builder builderForValue) {
+      if (propertiesBuilder_ == null) {
+        ensurePropertiesIsMutable();
+        properties_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        propertiesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder addAllProperties(
+        java.lang.Iterable values) {
+      if (propertiesBuilder_ == null) {
+        ensurePropertiesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, properties_);
+        onChanged();
+      } else {
+        propertiesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder clearProperties() {
+      if (propertiesBuilder_ == null) {
+        properties_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        propertiesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder removeProperties(int index) {
+      if (propertiesBuilder_ == null) {
+        ensurePropertiesIsMutable();
+        properties_.remove(index);
+        onChanged();
+      } else {
+        propertiesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.admin.v1.Index.IndexedProperty.Builder getPropertiesBuilder(
+        int index) {
+      return getPropertiesFieldBuilder().getBuilder(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertiesOrBuilder(
+        int index) {
+      if (propertiesBuilder_ == null) {
+        return properties_.get(index);
+      } else {
+        return propertiesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public java.util.List
+        getPropertiesOrBuilderList() {
+      if (propertiesBuilder_ != null) {
+        return propertiesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(properties_);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addPropertiesBuilder() {
+      return getPropertiesFieldBuilder()
+          .addBuilder(com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addPropertiesBuilder(
+        int index) {
+      return getPropertiesFieldBuilder()
+          .addBuilder(
+              index, com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An ordered sequence of property names and their index attributes.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public java.util.List
+        getPropertiesBuilderList() {
+      return getPropertiesFieldBuilder().getBuilderList();
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.admin.v1.Index.IndexedProperty,
+            com.google.datastore.admin.v1.Index.IndexedProperty.Builder,
+            com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder>
+        getPropertiesFieldBuilder() {
+      if (propertiesBuilder_ == null) {
+        propertiesBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.admin.v1.Index.IndexedProperty,
+                com.google.datastore.admin.v1.Index.IndexedProperty.Builder,
+                com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder>(
+                properties_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        properties_ = null;
+      }
+      return propertiesBuilder_;
+    }
+
+    private int state_ = 0;
+    /**
+     *
+     *
+     * 
    +     * Output only. The state of the index.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * 
+     *
+     * @return The enum numeric value on the wire for state.
+     */
+    @java.lang.Override
+    public int getStateValue() {
+      return state_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The state of the index.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * 
+     *
+     * @param value The enum numeric value on the wire for state to set.
+     * @return This builder for chaining.
+     */
+    public Builder setStateValue(int value) {
+
+      state_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The state of the index.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * 
+     *
+     * @return The state.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Index.State getState() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.Index.State result =
+          com.google.datastore.admin.v1.Index.State.valueOf(state_);
+      return result == null ? com.google.datastore.admin.v1.Index.State.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The state of the index.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * 
+     *
+     * @param value The state to set.
+     * @return This builder for chaining.
+     */
+    public Builder setState(com.google.datastore.admin.v1.Index.State value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      state_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Output only. The state of the index.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+     * 
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearState() {
+
+      state_ = 0;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.Index)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.Index)
+  private static final com.google.datastore.admin.v1.Index DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.Index();
+  }
+
+  public static com.google.datastore.admin.v1.Index getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Index parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Index(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Index getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..3ec19e57865c
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java
@@ -0,0 +1,1191 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Metadata for Index operations.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.IndexOperationMetadata}
+ */
+public final class IndexOperationMetadata extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.IndexOperationMetadata)
+    IndexOperationMetadataOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use IndexOperationMetadata.newBuilder() to construct.
+  private IndexOperationMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private IndexOperationMetadata() {
+    indexId_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new IndexOperationMetadata();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private IndexOperationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
+              if (progressEntities_ != null) {
+                subBuilder = progressEntities_.toBuilder();
+              }
+              progressEntities_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(progressEntities_);
+                progressEntities_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              indexId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_IndexOperationMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.IndexOperationMetadata.class,
+            com.google.datastore.admin.v1.IndexOperationMetadata.Builder.class);
+  }
+
+  public static final int COMMON_FIELD_NUMBER = 1;
+  private com.google.datastore.admin.v1.CommonMetadata common_;
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return Whether the common field is set.
+   */
+  @java.lang.Override
+  public boolean hasCommon() {
+    return common_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return The common.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadata getCommon() {
+    return common_ == null
+        ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+        : common_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
+    return getCommon();
+  }
+
+  public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
+  private com.google.datastore.admin.v1.Progress progressEntities_;
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return Whether the progressEntities field is set.
+   */
+  @java.lang.Override
+  public boolean hasProgressEntities() {
+    return progressEntities_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return The progressEntities.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Progress getProgressEntities() {
+    return progressEntities_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressEntities_;
+  }
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
+    return getProgressEntities();
+  }
+
+  public static final int INDEX_ID_FIELD_NUMBER = 3;
+  private volatile java.lang.Object indexId_;
+  /**
+   *
+   *
+   * 
    +   * The index resource ID that this operation is acting on.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The indexId.
+   */
+  @java.lang.Override
+  public java.lang.String getIndexId() {
+    java.lang.Object ref = indexId_;
+    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();
+      indexId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * The index resource ID that this operation is acting on.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The bytes for indexId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getIndexIdBytes() {
+    java.lang.Object ref = indexId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      indexId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (common_ != null) {
+      output.writeMessage(1, getCommon());
+    }
+    if (progressEntities_ != null) {
+      output.writeMessage(2, getProgressEntities());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (common_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
+    }
+    if (progressEntities_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getProgressEntities());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.IndexOperationMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.IndexOperationMetadata other =
+        (com.google.datastore.admin.v1.IndexOperationMetadata) obj;
+
+    if (hasCommon() != other.hasCommon()) return false;
+    if (hasCommon()) {
+      if (!getCommon().equals(other.getCommon())) return false;
+    }
+    if (hasProgressEntities() != other.hasProgressEntities()) return false;
+    if (hasProgressEntities()) {
+      if (!getProgressEntities().equals(other.getProgressEntities())) return false;
+    }
+    if (!getIndexId().equals(other.getIndexId())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasCommon()) {
+      hash = (37 * hash) + COMMON_FIELD_NUMBER;
+      hash = (53 * hash) + getCommon().hashCode();
+    }
+    if (hasProgressEntities()) {
+      hash = (37 * hash) + PROGRESS_ENTITIES_FIELD_NUMBER;
+      hash = (53 * hash) + getProgressEntities().hashCode();
+    }
+    hash = (37 * hash) + INDEX_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getIndexId().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.IndexOperationMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Metadata for Index operations.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.IndexOperationMetadata}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.IndexOperationMetadata)
+      com.google.datastore.admin.v1.IndexOperationMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_IndexOperationMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.IndexOperationMetadata.class,
+              com.google.datastore.admin.v1.IndexOperationMetadata.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.IndexOperationMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
+        commonBuilder_ = null;
+      }
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = null;
+      } else {
+        progressEntities_ = null;
+        progressEntitiesBuilder_ = null;
+      }
+      indexId_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.IndexOperationMetadata getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.IndexOperationMetadata.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.IndexOperationMetadata build() {
+      com.google.datastore.admin.v1.IndexOperationMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.IndexOperationMetadata buildPartial() {
+      com.google.datastore.admin.v1.IndexOperationMetadata result =
+          new com.google.datastore.admin.v1.IndexOperationMetadata(this);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
+      }
+      if (progressEntitiesBuilder_ == null) {
+        result.progressEntities_ = progressEntities_;
+      } else {
+        result.progressEntities_ = progressEntitiesBuilder_.build();
+      }
+      result.indexId_ = indexId_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.IndexOperationMetadata) {
+        return mergeFrom((com.google.datastore.admin.v1.IndexOperationMetadata) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.IndexOperationMetadata other) {
+      if (other == com.google.datastore.admin.v1.IndexOperationMetadata.getDefaultInstance())
+        return this;
+      if (other.hasCommon()) {
+        mergeCommon(other.getCommon());
+      }
+      if (other.hasProgressEntities()) {
+        mergeProgressEntities(other.getProgressEntities());
+      }
+      if (!other.getIndexId().isEmpty()) {
+        indexId_ = other.indexId_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.IndexOperationMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.IndexOperationMetadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.datastore.admin.v1.CommonMetadata common_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.CommonMetadata,
+            com.google.datastore.admin.v1.CommonMetadata.Builder,
+            com.google.datastore.admin.v1.CommonMetadataOrBuilder>
+        commonBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     *
+     * @return Whether the common field is set.
+     */
+    public boolean hasCommon() {
+      return commonBuilder_ != null || common_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     *
+     * @return The common.
+     */
+    public com.google.datastore.admin.v1.CommonMetadata getCommon() {
+      if (commonBuilder_ == null) {
+        return common_ == null
+            ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+            : common_;
+      } else {
+        return commonBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
+      if (commonBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        common_ = value;
+        onChanged();
+      } else {
+        commonBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder builderForValue) {
+      if (commonBuilder_ == null) {
+        common_ = builderForValue.build();
+        onChanged();
+      } else {
+        commonBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
+      if (commonBuilder_ == null) {
+        if (common_ != null) {
+          common_ =
+              com.google.datastore.admin.v1.CommonMetadata.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          common_ = value;
+        }
+        onChanged();
+      } else {
+        commonBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public Builder clearCommon() {
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
+        commonBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
+
+      onChanged();
+      return getCommonFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
+      if (commonBuilder_ != null) {
+        return commonBuilder_.getMessageOrBuilder();
+      } else {
+        return common_ == null
+            ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+            : common_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Metadata common to all Datastore Admin operations.
+     * 
    
+     *
+     * .google.datastore.admin.v1.CommonMetadata common = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.CommonMetadata,
+            com.google.datastore.admin.v1.CommonMetadata.Builder,
+            com.google.datastore.admin.v1.CommonMetadataOrBuilder>
+        getCommonFieldBuilder() {
+      if (commonBuilder_ == null) {
+        commonBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.CommonMetadata,
+                com.google.datastore.admin.v1.CommonMetadata.Builder,
+                com.google.datastore.admin.v1.CommonMetadataOrBuilder>(
+                getCommon(), getParentForChildren(), isClean());
+        common_ = null;
+      }
+      return commonBuilder_;
+    }
+
+    private com.google.datastore.admin.v1.Progress progressEntities_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        progressEntitiesBuilder_;
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     *
+     * @return Whether the progressEntities field is set.
+     */
+    public boolean hasProgressEntities() {
+      return progressEntitiesBuilder_ != null || progressEntities_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     *
+     * @return The progressEntities.
+     */
+    public com.google.datastore.admin.v1.Progress getProgressEntities() {
+      if (progressEntitiesBuilder_ == null) {
+        return progressEntities_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressEntities_;
+      } else {
+        return progressEntitiesBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value) {
+      if (progressEntitiesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        progressEntities_ = value;
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder setProgressEntities(
+        com.google.datastore.admin.v1.Progress.Builder builderForValue) {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = builderForValue.build();
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress value) {
+      if (progressEntitiesBuilder_ == null) {
+        if (progressEntities_ != null) {
+          progressEntities_ =
+              com.google.datastore.admin.v1.Progress.newBuilder(progressEntities_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          progressEntities_ = value;
+        }
+        onChanged();
+      } else {
+        progressEntitiesBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public Builder clearProgressEntities() {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntities_ = null;
+        onChanged();
+      } else {
+        progressEntities_ = null;
+        progressEntitiesBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder() {
+
+      onChanged();
+      return getProgressEntitiesFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
+      if (progressEntitiesBuilder_ != null) {
+        return progressEntitiesBuilder_.getMessageOrBuilder();
+      } else {
+        return progressEntities_ == null
+            ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+            : progressEntities_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of the number of entities processed.
+     * 
    
+     *
+     * .google.datastore.admin.v1.Progress progress_entities = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.Progress,
+            com.google.datastore.admin.v1.Progress.Builder,
+            com.google.datastore.admin.v1.ProgressOrBuilder>
+        getProgressEntitiesFieldBuilder() {
+      if (progressEntitiesBuilder_ == null) {
+        progressEntitiesBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.Progress,
+                com.google.datastore.admin.v1.Progress.Builder,
+                com.google.datastore.admin.v1.ProgressOrBuilder>(
+                getProgressEntities(), getParentForChildren(), isClean());
+        progressEntities_ = null;
+      }
+      return progressEntitiesBuilder_;
+    }
+
+    private java.lang.Object indexId_ = "";
+    /**
+     *
+     *
+     * 
    +     * The index resource ID that this operation is acting on.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return The indexId.
+     */
+    public java.lang.String getIndexId() {
+      java.lang.Object ref = indexId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        indexId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The index resource ID that this operation is acting on.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return The bytes for indexId.
+     */
+    public com.google.protobuf.ByteString getIndexIdBytes() {
+      java.lang.Object ref = indexId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        indexId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The index resource ID that this operation is acting on.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @param value The indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The index resource ID that this operation is acting on.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearIndexId() {
+
+      indexId_ = getDefaultInstance().getIndexId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The index resource ID that this operation is acting on.
+     * 
    
+     *
+     * string index_id = 3;
+     *
+     * @param value The bytes for indexId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      indexId_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.IndexOperationMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.IndexOperationMetadata)
+  private static final com.google.datastore.admin.v1.IndexOperationMetadata DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.IndexOperationMetadata();
+  }
+
+  public static com.google.datastore.admin.v1.IndexOperationMetadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public IndexOperationMetadata parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new IndexOperationMetadata(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.IndexOperationMetadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
new file mode 100644
index 000000000000..9d655f96734e
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface IndexOperationMetadataOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.IndexOperationMetadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return Whether the common field is set.
+   */
+  boolean hasCommon();
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   *
+   * @return The common.
+   */
+  com.google.datastore.admin.v1.CommonMetadata getCommon();
+  /**
+   *
+   *
+   * 
    +   * Metadata common to all Datastore Admin operations.
+   * 
    
+   *
+   * .google.datastore.admin.v1.CommonMetadata common = 1;
+   */
+  com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return Whether the progressEntities field is set.
+   */
+  boolean hasProgressEntities();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   *
+   * @return The progressEntities.
+   */
+  com.google.datastore.admin.v1.Progress getProgressEntities();
+  /**
+   *
+   *
+   * 
    +   * An estimate of the number of entities processed.
+   * 
    
+   *
+   * .google.datastore.admin.v1.Progress progress_entities = 2;
+   */
+  com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The index resource ID that this operation is acting on.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The indexId.
+   */
+  java.lang.String getIndexId();
+  /**
+   *
+   *
+   * 
    +   * The index resource ID that this operation is acting on.
+   * 
    
+   *
+   * string index_id = 3;
+   *
+   * @return The bytes for indexId.
+   */
+  com.google.protobuf.ByteString getIndexIdBytes();
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
new file mode 100644
index 000000000000..37fca791f8b6
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/index.proto
+
+package com.google.datastore.admin.v1;
+
+public interface IndexOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.Index)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Output only. Project ID.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Output only. Project ID.
+   * 
    
+   *
+   * string project_id = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The bytes for projectId.
+   */
+  com.google.protobuf.ByteString getProjectIdBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Output only. The resource ID of the index.
+   * 
    
+   *
+   * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The indexId.
+   */
+  java.lang.String getIndexId();
+  /**
+   *
+   *
+   * 
    +   * Output only. The resource ID of the index.
+   * 
    
+   *
+   * string index_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   *
+   * @return The bytes for indexId.
+   */
+  com.google.protobuf.ByteString getIndexIdBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Required. The entity kind to which this index applies.
+   * 
    
+   *
+   * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The kind.
+   */
+  java.lang.String getKind();
+  /**
+   *
+   *
+   * 
    +   * Required. The entity kind to which this index applies.
+   * 
    
+   *
+   * string kind = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for kind.
+   */
+  com.google.protobuf.ByteString getKindBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The enum numeric value on the wire for ancestor.
+   */
+  int getAncestorValue();
+  /**
+   *
+   *
+   * 
    +   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.AncestorMode ancestor = 5 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The ancestor.
+   */
+  com.google.datastore.admin.v1.Index.AncestorMode getAncestor();
+
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  java.util.List getPropertiesList();
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int index);
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  int getPropertiesCount();
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  java.util.List
+      getPropertiesOrBuilderList();
+  /**
+   *
+   *
+   * 
    +   * Required. An ordered sequence of property names and their index attributes.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.admin.v1.Index.IndexedProperty properties = 6 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertiesOrBuilder(int index);
+
+  /**
+   *
+   *
+   * 
    +   * Output only. The state of the index.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * 
+   *
+   * @return The enum numeric value on the wire for state.
+   */
+  int getStateValue();
+  /**
+   *
+   *
+   * 
    +   * Output only. The state of the index.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.Index.State state = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
+   * 
+   *
+   * @return The state.
+   */
+  com.google.datastore.admin.v1.Index.State getState();
+}
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
new file mode 100644
index 000000000000..da3e67c5c229
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/index.proto
+
+package com.google.datastore.admin.v1;
+
+public final class IndexProto {
+  private IndexProto() {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_Index_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_Index_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_Index_IndexedProperty_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_Index_IndexedProperty_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+    return descriptor;
+  }
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+  static {
+    java.lang.String[] descriptorData = {
+      "\n%google/datastore/admin/v1/index.proto\022"
+          + "\031google.datastore.admin.v1\032\037google/api/f"
+          + "ield_behavior.proto\032\034google/api/annotati"
+          + "ons.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-.google.datast"
+          + "ore.admin.v1.Index.AncestorModeB\003\340A\002\022I\n\n"
+          + "properties\030\006 \003(\01320.google.datastore.admi"
+          + "n.v1.Index.IndexedPropertyB\003\340A\002\022:\n\005state"
+          + "\030\007 \001(\0162&.google.datastore.admin.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.da"
+          + "tastore.admin.v1.Index.DirectionB\003\340A\002\"J\n"
+          + "\014AncestorMode\022\035\n\031ANCESTOR_MODE_UNSPECIFI"
+          + "ED\020\000\022\010\n\004NONE\020\001\022\021\n\rALL_ANCESTORS\020\002\"E\n\tDir"
+          + "ection\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASC"
+          + "ENDING\020\001\022\016\n\nDESCENDING\020\002\"P\n\005State\022\025\n\021STA"
+          + "TE_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\327\001\n\035com.googl"
+          + "e.datastore.admin.v1B\nIndexProtoP\001Z>goog"
+          + "le.golang.org/genproto/googleapis/datast"
+          + "ore/admin/v1;admin\252\002\037Google.Cloud.Datast"
+          + "ore.Admin.V1\312\002\037Google\\Cloud\\Datastore\\Ad"
+          + "min\\V1\352\002#Google::Cloud::Datastore::Admin"
+          + "::V1b\006proto3"
+    };
+    descriptor =
+        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
+            descriptorData,
+            new com.google.protobuf.Descriptors.FileDescriptor[] {
+              com.google.api.FieldBehaviorProto.getDescriptor(),
+              com.google.api.AnnotationsProto.getDescriptor(),
+            });
+    internal_static_google_datastore_admin_v1_Index_descriptor =
+        getDescriptor().getMessageTypes().get(0);
+    internal_static_google_datastore_admin_v1_Index_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_Index_descriptor,
+            new java.lang.String[] {
+              "ProjectId", "IndexId", "Kind", "Ancestor", "Properties", "State",
+            });
+    internal_static_google_datastore_admin_v1_Index_IndexedProperty_descriptor =
+        internal_static_google_datastore_admin_v1_Index_descriptor.getNestedTypes().get(0);
+    internal_static_google_datastore_admin_v1_Index_IndexedProperty_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_Index_IndexedProperty_descriptor,
+            new java.lang.String[] {
+              "Name", "Direction",
+            });
+    com.google.protobuf.ExtensionRegistry registry =
+        com.google.protobuf.ExtensionRegistry.newInstance();
+    registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
+    com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
+        descriptor, registry);
+    com.google.api.FieldBehaviorProto.getDescriptor();
+    com.google.api.AnnotationsProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
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
new file mode 100644
index 000000000000..e9cb9a2faa1b
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java
@@ -0,0 +1,1047 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The request for
+ * [google.datastore.admin.v1.DatastoreAdmin.ListIndexes][google.datastore.admin.v1.DatastoreAdmin.ListIndexes].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.ListIndexesRequest}
+ */
+public final class ListIndexesRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ListIndexesRequest)
+    ListIndexesRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ListIndexesRequest.newBuilder() to construct.
+  private ListIndexesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ListIndexesRequest() {
+    projectId_ = "";
+    filter_ = "";
+    pageToken_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ListIndexesRequest();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private ListIndexesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              projectId_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              filter_ = s;
+              break;
+            }
+          case 32:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ListIndexesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.ListIndexesRequest.class,
+            com.google.datastore.admin.v1.ListIndexesRequest.Builder.class);
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int FILTER_FIELD_NUMBER = 3;
+  private volatile java.lang.Object filter_;
+  /**
+   * string filter = 3;
+   *
+   * @return The filter.
+   */
+  @java.lang.Override
+  public java.lang.String getFilter() {
+    java.lang.Object ref = filter_;
+    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();
+      filter_ = s;
+      return s;
+    }
+  }
+  /**
+   * string filter = 3;
+   *
+   * @return The bytes for filter.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getFilterBytes() {
+    java.lang.Object ref = filter_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      filter_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 4;
+  private int pageSize_;
+  /**
+   *
+   *
+   * 
    +   * The maximum number of items to return.  If zero, then all results will be
+   * returned.
+   * 
    
+   *
+   * int32 page_size = 4;
+   *
+   * @return The pageSize.
+   */
+  @java.lang.Override
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 5;
+  private volatile java.lang.Object pageToken_;
+  /**
+   *
+   *
+   * 
    +   * The next_page_token value returned from a previous List request, if any.
+   * 
    
+   *
+   * string page_token = 5;
+   *
+   * @return The pageToken.
+   */
+  @java.lang.Override
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    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();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * The next_page_token value returned from a previous List request, if any.
+   * 
    
+   *
+   * string page_token = 5;
+   *
+   * @return The bytes for pageToken.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, filter_);
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(4, pageSize_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, pageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, filter_);
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, pageSize_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, pageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.ListIndexesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.ListIndexesRequest other =
+        (com.google.datastore.admin.v1.ListIndexesRequest) obj;
+
+    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getFilter().equals(other.getFilter())) return false;
+    if (getPageSize() != other.getPageSize()) return false;
+    if (!getPageToken().equals(other.getPageToken())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getProjectId().hashCode();
+    hash = (37 * hash) + FILTER_FIELD_NUMBER;
+    hash = (53 * hash) + getFilter().hashCode();
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.ListIndexesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The request for
+   * [google.datastore.admin.v1.DatastoreAdmin.ListIndexes][google.datastore.admin.v1.DatastoreAdmin.ListIndexes].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.ListIndexesRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.ListIndexesRequest)
+      com.google.datastore.admin.v1.ListIndexesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ListIndexesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.ListIndexesRequest.class,
+              com.google.datastore.admin.v1.ListIndexesRequest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.ListIndexesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      filter_ = "";
+
+      pageSize_ = 0;
+
+      pageToken_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ListIndexesRequest getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.ListIndexesRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ListIndexesRequest build() {
+      com.google.datastore.admin.v1.ListIndexesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ListIndexesRequest buildPartial() {
+      com.google.datastore.admin.v1.ListIndexesRequest result =
+          new com.google.datastore.admin.v1.ListIndexesRequest(this);
+      result.projectId_ = projectId_;
+      result.filter_ = filter_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.ListIndexesRequest) {
+        return mergeFrom((com.google.datastore.admin.v1.ListIndexesRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesRequest other) {
+      if (other == com.google.datastore.admin.v1.ListIndexesRequest.getDefaultInstance())
+        return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      if (!other.getFilter().isEmpty()) {
+        filter_ = other.filter_;
+        onChanged();
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.ListIndexesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.ListIndexesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Project ID against which to make the request.
+     * 
    
+     *
+     * string project_id = 1;
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object filter_ = "";
+    /**
+     * string filter = 3;
+     *
+     * @return The filter.
+     */
+    public java.lang.String getFilter() {
+      java.lang.Object ref = filter_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        filter_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * string filter = 3;
+     *
+     * @return The bytes for filter.
+     */
+    public com.google.protobuf.ByteString getFilterBytes() {
+      java.lang.Object ref = filter_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        filter_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * string filter = 3;
+     *
+     * @param value The filter to set.
+     * @return This builder for chaining.
+     */
+    public Builder setFilter(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      filter_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * string filter = 3;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearFilter() {
+
+      filter_ = getDefaultInstance().getFilter();
+      onChanged();
+      return this;
+    }
+    /**
+     * string filter = 3;
+     *
+     * @param value The bytes for filter to set.
+     * @return This builder for chaining.
+     */
+    public Builder setFilterBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      filter_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int pageSize_;
+    /**
+     *
+     *
+     * 
    +     * The maximum number of items to return.  If zero, then all results will be
+     * returned.
+     * 
    
+     *
+     * int32 page_size = 4;
+     *
+     * @return The pageSize.
+     */
+    @java.lang.Override
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The maximum number of items to return.  If zero, then all results will be
+     * returned.
+     * 
    
+     *
+     * int32 page_size = 4;
+     *
+     * @param value The pageSize to set.
+     * @return This builder for chaining.
+     */
+    public Builder setPageSize(int value) {
+
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The maximum number of items to return.  If zero, then all results will be
+     * returned.
+     * 
    
+     *
+     * int32 page_size = 4;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearPageSize() {
+
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     *
+     *
+     * 
    +     * The next_page_token value returned from a previous List request, if any.
+     * 
    
+     *
+     * string page_token = 5;
+     *
+     * @return The pageToken.
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The next_page_token value returned from a previous List request, if any.
+     * 
    
+     *
+     * string page_token = 5;
+     *
+     * @return The bytes for pageToken.
+     */
+    public com.google.protobuf.ByteString getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The next_page_token value returned from a previous List request, if any.
+     * 
    
+     *
+     * string page_token = 5;
+     *
+     * @param value The pageToken to set.
+     * @return This builder for chaining.
+     */
+    public Builder setPageToken(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The next_page_token value returned from a previous List request, if any.
+     * 
    
+     *
+     * string page_token = 5;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearPageToken() {
+
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The next_page_token value returned from a previous List request, if any.
+     * 
    
+     *
+     * string page_token = 5;
+     *
+     * @param value The bytes for pageToken to set.
+     * @return This builder for chaining.
+     */
+    public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.ListIndexesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.ListIndexesRequest)
+  private static final com.google.datastore.admin.v1.ListIndexesRequest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.ListIndexesRequest();
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ListIndexesRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ListIndexesRequest(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ListIndexesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
new file mode 100644
index 000000000000..4fe56656a67f
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ListIndexesRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.ListIndexesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Project ID against which to make the request.
+   * 
    
+   *
+   * string project_id = 1;
+   *
+   * @return The bytes for projectId.
+   */
+  com.google.protobuf.ByteString getProjectIdBytes();
+
+  /**
+   * string filter = 3;
+   *
+   * @return The filter.
+   */
+  java.lang.String getFilter();
+  /**
+   * string filter = 3;
+   *
+   * @return The bytes for filter.
+   */
+  com.google.protobuf.ByteString getFilterBytes();
+
+  /**
+   *
+   *
+   * 
    +   * The maximum number of items to return.  If zero, then all results will be
+   * returned.
+   * 
    
+   *
+   * int32 page_size = 4;
+   *
+   * @return The pageSize.
+   */
+  int getPageSize();
+
+  /**
+   *
+   *
+   * 
    +   * The next_page_token value returned from a previous List request, if any.
+   * 
    
+   *
+   * string page_token = 5;
+   *
+   * @return The pageToken.
+   */
+  java.lang.String getPageToken();
+  /**
+   *
+   *
+   * 
    +   * The next_page_token value returned from a previous List request, if any.
+   * 
    
+   *
+   * string page_token = 5;
+   *
+   * @return The bytes for pageToken.
+   */
+  com.google.protobuf.ByteString getPageTokenBytes();
+}
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
new file mode 100644
index 000000000000..acf63df2cb29
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java
@@ -0,0 +1,1129 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * The response for
+ * [google.datastore.admin.v1.DatastoreAdmin.ListIndexes][google.datastore.admin.v1.DatastoreAdmin.ListIndexes].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.ListIndexesResponse}
+ */
+public final class ListIndexesResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ListIndexesResponse)
+    ListIndexesResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ListIndexesResponse.newBuilder() to construct.
+  private ListIndexesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ListIndexesResponse() {
+    indexes_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ListIndexesResponse();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private ListIndexesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                indexes_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              indexes_.add(
+                  input.readMessage(
+                      com.google.datastore.admin.v1.Index.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        indexes_ = java.util.Collections.unmodifiableList(indexes_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_ListIndexesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.ListIndexesResponse.class,
+            com.google.datastore.admin.v1.ListIndexesResponse.Builder.class);
+  }
+
+  public static final int INDEXES_FIELD_NUMBER = 1;
+  private java.util.List indexes_;
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  @java.lang.Override
+  public java.util.List getIndexesList() {
+    return indexes_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  @java.lang.Override
+  public java.util.List
+      getIndexesOrBuilderList() {
+    return indexes_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  @java.lang.Override
+  public int getIndexesCount() {
+    return indexes_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Index getIndexes(int index) {
+    return indexes_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int index) {
+    return indexes_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   *
+   *
+   * 
    +   * The standard List next-page token.
+   * 
    
+   *
+   * string next_page_token = 2;
+   *
+   * @return The nextPageToken.
+   */
+  @java.lang.Override
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    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();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * The standard List next-page token.
+   * 
    
+   *
+   * string next_page_token = 2;
+   *
+   * @return The bytes for nextPageToken.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    for (int i = 0; i < indexes_.size(); i++) {
+      output.writeMessage(1, indexes_.get(i));
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < indexes_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, indexes_.get(i));
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.ListIndexesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.ListIndexesResponse other =
+        (com.google.datastore.admin.v1.ListIndexesResponse) obj;
+
+    if (!getIndexesList().equals(other.getIndexesList())) return false;
+    if (!getNextPageToken().equals(other.getNextPageToken())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getIndexesCount() > 0) {
+      hash = (37 * hash) + INDEXES_FIELD_NUMBER;
+      hash = (53 * hash) + getIndexesList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.ListIndexesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The response for
+   * [google.datastore.admin.v1.DatastoreAdmin.ListIndexes][google.datastore.admin.v1.DatastoreAdmin.ListIndexes].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.ListIndexesResponse}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.ListIndexesResponse)
+      com.google.datastore.admin.v1.ListIndexesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ListIndexesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.ListIndexesResponse.class,
+              com.google.datastore.admin.v1.ListIndexesResponse.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.ListIndexesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getIndexesFieldBuilder();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (indexesBuilder_ == null) {
+        indexes_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        indexesBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ListIndexesResponse getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.ListIndexesResponse.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ListIndexesResponse build() {
+      com.google.datastore.admin.v1.ListIndexesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.ListIndexesResponse buildPartial() {
+      com.google.datastore.admin.v1.ListIndexesResponse result =
+          new com.google.datastore.admin.v1.ListIndexesResponse(this);
+      int from_bitField0_ = bitField0_;
+      if (indexesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          indexes_ = java.util.Collections.unmodifiableList(indexes_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.indexes_ = indexes_;
+      } else {
+        result.indexes_ = indexesBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.ListIndexesResponse) {
+        return mergeFrom((com.google.datastore.admin.v1.ListIndexesResponse) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesResponse other) {
+      if (other == com.google.datastore.admin.v1.ListIndexesResponse.getDefaultInstance())
+        return this;
+      if (indexesBuilder_ == null) {
+        if (!other.indexes_.isEmpty()) {
+          if (indexes_.isEmpty()) {
+            indexes_ = other.indexes_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureIndexesIsMutable();
+            indexes_.addAll(other.indexes_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.indexes_.isEmpty()) {
+          if (indexesBuilder_.isEmpty()) {
+            indexesBuilder_.dispose();
+            indexesBuilder_ = null;
+            indexes_ = other.indexes_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            indexesBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getIndexesFieldBuilder()
+                    : null;
+          } else {
+            indexesBuilder_.addAllMessages(other.indexes_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.ListIndexesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.ListIndexesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.util.List indexes_ =
+        java.util.Collections.emptyList();
+
+    private void ensureIndexesIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        indexes_ = new java.util.ArrayList(indexes_);
+        bitField0_ |= 0x00000001;
+      }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.admin.v1.Index,
+            com.google.datastore.admin.v1.Index.Builder,
+            com.google.datastore.admin.v1.IndexOrBuilder>
+        indexesBuilder_;
+
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public java.util.List getIndexesList() {
+      if (indexesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(indexes_);
+      } else {
+        return indexesBuilder_.getMessageList();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public int getIndexesCount() {
+      if (indexesBuilder_ == null) {
+        return indexes_.size();
+      } else {
+        return indexesBuilder_.getCount();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public com.google.datastore.admin.v1.Index getIndexes(int index) {
+      if (indexesBuilder_ == null) {
+        return indexes_.get(index);
+      } else {
+        return indexesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder setIndexes(int index, com.google.datastore.admin.v1.Index value) {
+      if (indexesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureIndexesIsMutable();
+        indexes_.set(index, value);
+        onChanged();
+      } else {
+        indexesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder setIndexes(
+        int index, com.google.datastore.admin.v1.Index.Builder builderForValue) {
+      if (indexesBuilder_ == null) {
+        ensureIndexesIsMutable();
+        indexes_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        indexesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder addIndexes(com.google.datastore.admin.v1.Index value) {
+      if (indexesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureIndexesIsMutable();
+        indexes_.add(value);
+        onChanged();
+      } else {
+        indexesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder addIndexes(int index, com.google.datastore.admin.v1.Index value) {
+      if (indexesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureIndexesIsMutable();
+        indexes_.add(index, value);
+        onChanged();
+      } else {
+        indexesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder addIndexes(com.google.datastore.admin.v1.Index.Builder builderForValue) {
+      if (indexesBuilder_ == null) {
+        ensureIndexesIsMutable();
+        indexes_.add(builderForValue.build());
+        onChanged();
+      } else {
+        indexesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder addIndexes(
+        int index, com.google.datastore.admin.v1.Index.Builder builderForValue) {
+      if (indexesBuilder_ == null) {
+        ensureIndexesIsMutable();
+        indexes_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        indexesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder addAllIndexes(
+        java.lang.Iterable values) {
+      if (indexesBuilder_ == null) {
+        ensureIndexesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, indexes_);
+        onChanged();
+      } else {
+        indexesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder clearIndexes() {
+      if (indexesBuilder_ == null) {
+        indexes_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        indexesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public Builder removeIndexes(int index) {
+      if (indexesBuilder_ == null) {
+        ensureIndexesIsMutable();
+        indexes_.remove(index);
+        onChanged();
+      } else {
+        indexesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public com.google.datastore.admin.v1.Index.Builder getIndexesBuilder(int index) {
+      return getIndexesFieldBuilder().getBuilder(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int index) {
+      if (indexesBuilder_ == null) {
+        return indexes_.get(index);
+      } else {
+        return indexesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public java.util.List
+        getIndexesOrBuilderList() {
+      if (indexesBuilder_ != null) {
+        return indexesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(indexes_);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public com.google.datastore.admin.v1.Index.Builder addIndexesBuilder() {
+      return getIndexesFieldBuilder()
+          .addBuilder(com.google.datastore.admin.v1.Index.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public com.google.datastore.admin.v1.Index.Builder addIndexesBuilder(int index) {
+      return getIndexesFieldBuilder()
+          .addBuilder(index, com.google.datastore.admin.v1.Index.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes.
+     * 
    
+     *
+     * repeated .google.datastore.admin.v1.Index indexes = 1;
+     */
+    public java.util.List getIndexesBuilderList() {
+      return getIndexesFieldBuilder().getBuilderList();
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.admin.v1.Index,
+            com.google.datastore.admin.v1.Index.Builder,
+            com.google.datastore.admin.v1.IndexOrBuilder>
+        getIndexesFieldBuilder() {
+      if (indexesBuilder_ == null) {
+        indexesBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.admin.v1.Index,
+                com.google.datastore.admin.v1.Index.Builder,
+                com.google.datastore.admin.v1.IndexOrBuilder>(
+                indexes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        indexes_ = null;
+      }
+      return indexesBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     *
+     *
+     * 
    +     * The standard List next-page token.
+     * 
    
+     *
+     * string next_page_token = 2;
+     *
+     * @return The nextPageToken.
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The standard List next-page token.
+     * 
    
+     *
+     * string next_page_token = 2;
+     *
+     * @return The bytes for nextPageToken.
+     */
+    public com.google.protobuf.ByteString getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The standard List next-page token.
+     * 
    
+     *
+     * string next_page_token = 2;
+     *
+     * @param value The nextPageToken to set.
+     * @return This builder for chaining.
+     */
+    public Builder setNextPageToken(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The standard List next-page token.
+     * 
    
+     *
+     * string next_page_token = 2;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearNextPageToken() {
+
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The standard List next-page token.
+     * 
    
+     *
+     * string next_page_token = 2;
+     *
+     * @param value The bytes for nextPageToken to set.
+     * @return This builder for chaining.
+     */
+    public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.ListIndexesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.ListIndexesResponse)
+  private static final com.google.datastore.admin.v1.ListIndexesResponse DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.ListIndexesResponse();
+  }
+
+  public static com.google.datastore.admin.v1.ListIndexesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ListIndexesResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new ListIndexesResponse(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.ListIndexesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
new file mode 100644
index 000000000000..e3fb1989eabf
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ListIndexesResponseOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.ListIndexesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  java.util.List getIndexesList();
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  com.google.datastore.admin.v1.Index getIndexes(int index);
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  int getIndexesCount();
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  java.util.List getIndexesOrBuilderList();
+  /**
+   *
+   *
+   * 
    +   * The indexes.
+   * 
    
+   *
+   * repeated .google.datastore.admin.v1.Index indexes = 1;
+   */
+  com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int index);
+
+  /**
+   *
+   *
+   * 
    +   * The standard List next-page token.
+   * 
    
+   *
+   * string next_page_token = 2;
+   *
+   * @return The nextPageToken.
+   */
+  java.lang.String getNextPageToken();
+  /**
+   *
+   *
+   * 
    +   * The standard List next-page token.
+   * 
    
+   *
+   * string next_page_token = 2;
+   *
+   * @return The bytes for nextPageToken.
+   */
+  com.google.protobuf.ByteString getNextPageTokenBytes();
+}
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
new file mode 100644
index 000000000000..1dc1db1f84fe
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java
@@ -0,0 +1,2963 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/migration.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * An event signifying the start of a new step in a [migration from Cloud
+ * Datastore to Cloud Firestore in Datastore
+ * mode](https://cloud.google.com/datastore/docs/upgrade-to-firestore).
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.MigrationProgressEvent}
+ */
+public final class MigrationProgressEvent extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent)
+    MigrationProgressEventOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use MigrationProgressEvent.newBuilder() to construct.
+  private MigrationProgressEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private MigrationProgressEvent() {
+    step_ = 0;
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new MigrationProgressEvent();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private MigrationProgressEvent(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              step_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder
+                  subBuilder = null;
+              if (stepDetailsCase_ == 2) {
+                subBuilder =
+                    ((com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+                            stepDetails_)
+                        .toBuilder();
+              }
+              stepDetails_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+                          .parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(
+                    (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+                        stepDetails_);
+                stepDetails_ = subBuilder.buildPartial();
+              }
+              stepDetailsCase_ = 2;
+              break;
+            }
+          case 26:
+            {
+              com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder
+                  subBuilder = null;
+              if (stepDetailsCase_ == 3) {
+                subBuilder =
+                    ((com.google.datastore.admin.v1.MigrationProgressEvent
+                                .RedirectWritesStepDetails)
+                            stepDetails_)
+                        .toBuilder();
+              }
+              stepDetails_ =
+                  input.readMessage(
+                      com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                          .parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(
+                    (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+                        stepDetails_);
+                stepDetails_ = subBuilder.buildPartial();
+              }
+              stepDetailsCase_ = 3;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.MigrationProto
+        .internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.MigrationProto
+        .internal_static_google_datastore_admin_v1_MigrationProgressEvent_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.MigrationProgressEvent.class,
+            com.google.datastore.admin.v1.MigrationProgressEvent.Builder.class);
+  }
+
+  /**
+   *
+   *
+   * 
    +   * Concurrency modes for transactions in Cloud Firestore.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode}
+   */
+  public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * Unspecified.
+     * 
    
+     *
+     * CONCURRENCY_MODE_UNSPECIFIED = 0;
+     */
+    CONCURRENCY_MODE_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * Pessimistic concurrency.
+     * 
    
+     *
+     * PESSIMISTIC = 1;
+     */
+    PESSIMISTIC(1),
+    /**
+     *
+     *
+     * 
    +     * Optimistic concurrency.
+     * 
    
+     *
+     * OPTIMISTIC = 2;
+     */
+    OPTIMISTIC(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * Unspecified.
+     * 
    
+     *
+     * CONCURRENCY_MODE_UNSPECIFIED = 0;
+     */
+    public static final int CONCURRENCY_MODE_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * Pessimistic concurrency.
+     * 
    
+     *
+     * PESSIMISTIC = 1;
+     */
+    public static final int PESSIMISTIC_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * Optimistic concurrency.
+     * 
    
+     *
+     * OPTIMISTIC = 2;
+     */
+    public static final int OPTIMISTIC_VALUE = 2;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ConcurrencyMode valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ConcurrencyMode forNumber(int value) {
+      switch (value) {
+        case 0:
+          return CONCURRENCY_MODE_UNSPECIFIED;
+        case 1:
+          return PESSIMISTIC;
+        case 2:
+          return OPTIMISTIC;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap
+        internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public ConcurrencyMode findValueByNumber(int number) {
+                return ConcurrencyMode.forNumber(number);
+              }
+            };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.admin.v1.MigrationProgressEvent.getDescriptor()
+          .getEnumTypes()
+          .get(0);
+    }
+
+    private static final ConcurrencyMode[] VALUES = values();
+
+    public static ConcurrencyMode valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ConcurrencyMode(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode)
+  }
+
+  public interface PrepareStepDetailsOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     *
+     *
+     * 
    +     * The concurrency mode this database will use when it reaches the
+     * `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The enum numeric value on the wire for concurrencyMode.
+     */
+    int getConcurrencyModeValue();
+    /**
+     *
+     *
+     * 
    +     * The concurrency mode this database will use when it reaches the
+     * `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The concurrencyMode.
+     */
+    com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode getConcurrencyMode();
+  }
+  /**
+   *
+   *
+   * 
    +   * Details for the `PREPARE` step.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails}
+   */
+  public static final class PrepareStepDetails extends com.google.protobuf.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+      PrepareStepDetailsOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use PrepareStepDetails.newBuilder() to construct.
+    private PrepareStepDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private PrepareStepDetails() {
+      concurrencyMode_ = 0;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new PrepareStepDetails();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private PrepareStepDetails(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                int rawValue = input.readEnum();
+
+                concurrencyMode_ = rawValue;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    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;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.class,
+              com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder
+                  .class);
+    }
+
+    public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1;
+    private int concurrencyMode_;
+    /**
+     *
+     *
+     * 
    +     * The concurrency mode this database will use when it reaches the
+     * `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The enum numeric value on the wire for concurrencyMode.
+     */
+    @java.lang.Override
+    public int getConcurrencyModeValue() {
+      return concurrencyMode_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The concurrency mode this database will use when it reaches the
+     * `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The concurrencyMode.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+        getConcurrencyMode() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
+          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+              concurrencyMode_);
+      return result == null
+          ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
+          : result;
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (concurrencyMode_
+          != com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+              .CONCURRENCY_MODE_UNSPECIFIED
+              .getNumber()) {
+        output.writeEnum(1, concurrencyMode_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (concurrencyMode_
+          != com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+              .CONCURRENCY_MODE_UNSPECIFIED
+              .getNumber()) {
+        size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, concurrencyMode_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)) {
+        return super.equals(obj);
+      }
+      com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails other =
+          (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) obj;
+
+      if (concurrencyMode_ != other.concurrencyMode_) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CONCURRENCY_MODE_FIELD_NUMBER;
+      hash = (53 * hash) + concurrencyMode_;
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        parseDelimitedFrom(
+            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * Protobuf type {@code google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails}
+     */
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder {
+      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;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.admin.v1.MigrationProto
+            .internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.class,
+                com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder
+                    .class);
+      }
+
+      // Construct using
+      // com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        concurrencyMode_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.admin.v1.MigrationProto
+            .internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_descriptor;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+          getDefaultInstanceForType() {
+        return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails build() {
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+          buildPartial() {
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails result =
+            new com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails(this);
+        result.concurrencyMode_ = concurrencyMode_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other
+            instanceof com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) {
+          return mergeFrom(
+              (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails other) {
+        if (other
+            == com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+                .getDefaultInstance()) return this;
+        if (other.concurrencyMode_ != 0) {
+          setConcurrencyModeValue(other.getConcurrencyModeValue());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parsedMessage =
+            null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int concurrencyMode_ = 0;
+      /**
+       *
+       *
+       * 
    +       * The concurrency mode this database will use when it reaches the
+       * `REDIRECT_WRITES` step.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @return The enum numeric value on the wire for concurrencyMode.
+       */
+      @java.lang.Override
+      public int getConcurrencyModeValue() {
+        return concurrencyMode_;
+      }
+      /**
+       *
+       *
+       * 
    +       * The concurrency mode this database will use when it reaches the
+       * `REDIRECT_WRITES` step.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @param value The enum numeric value on the wire for concurrencyMode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConcurrencyModeValue(int value) {
+
+        concurrencyMode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * The concurrency mode this database will use when it reaches the
+       * `REDIRECT_WRITES` step.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @return The concurrencyMode.
+       */
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+          getConcurrencyMode() {
+        @SuppressWarnings("deprecation")
+        com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
+            com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+                concurrencyMode_);
+        return result == null
+            ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
+            : result;
+      }
+      /**
+       *
+       *
+       * 
    +       * The concurrency mode this database will use when it reaches the
+       * `REDIRECT_WRITES` step.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @param value The concurrencyMode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConcurrencyMode(
+          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+
+        concurrencyMode_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * The concurrency mode this database will use when it reaches the
+       * `REDIRECT_WRITES` step.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearConcurrencyMode() {
+
+        concurrencyMode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+    private static final com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails();
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser PARSER =
+        new com.google.protobuf.AbstractParser() {
+          @java.lang.Override
+          public PrepareStepDetails parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            return new PrepareStepDetails(input, extensionRegistry);
+          }
+        };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public interface RedirectWritesStepDetailsOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     *
+     *
+     * 
    +     * Ths concurrency mode for this database.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The enum numeric value on the wire for concurrencyMode.
+     */
+    int getConcurrencyModeValue();
+    /**
+     *
+     *
+     * 
    +     * Ths concurrency mode for this database.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The concurrencyMode.
+     */
+    com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode getConcurrencyMode();
+  }
+  /**
+   *
+   *
+   * 
    +   * Details for the `REDIRECT_WRITES` step.
+   * 
    
+   *
+   * Protobuf type {@code
+   * google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails}
+   */
+  public static final class RedirectWritesStepDetails extends com.google.protobuf.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+      RedirectWritesStepDetailsOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use RedirectWritesStepDetails.newBuilder() to construct.
+    private RedirectWritesStepDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private RedirectWritesStepDetails() {
+      concurrencyMode_ = 0;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+      return new RedirectWritesStepDetails();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private RedirectWritesStepDetails(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                int rawValue = input.readEnum();
+
+                concurrencyMode_ = rawValue;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    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;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.class,
+              com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder
+                  .class);
+    }
+
+    public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1;
+    private int concurrencyMode_;
+    /**
+     *
+     *
+     * 
    +     * Ths concurrency mode for this database.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The enum numeric value on the wire for concurrencyMode.
+     */
+    @java.lang.Override
+    public int getConcurrencyModeValue() {
+      return concurrencyMode_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Ths concurrency mode for this database.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+     * 
+     *
+     * @return The concurrencyMode.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+        getConcurrencyMode() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
+          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+              concurrencyMode_);
+      return result == null
+          ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
+          : result;
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (concurrencyMode_
+          != com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+              .CONCURRENCY_MODE_UNSPECIFIED
+              .getNumber()) {
+        output.writeEnum(1, concurrencyMode_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (concurrencyMode_
+          != com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+              .CONCURRENCY_MODE_UNSPECIFIED
+              .getNumber()) {
+        size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, concurrencyMode_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof
+          com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)) {
+        return super.equals(obj);
+      }
+      com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails other =
+          (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) obj;
+
+      if (concurrencyMode_ != other.concurrencyMode_) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CONCURRENCY_MODE_FIELD_NUMBER;
+      hash = (53 * hash) + concurrencyMode_;
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(java.nio.ByteBuffer data)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(
+            java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(com.google.protobuf.ByteString data)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(
+            com.google.protobuf.ByteString data,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(
+            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseDelimitedFrom(
+            java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        parseFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * Protobuf type {@code
+     * google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails}
+     */
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder {
+      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;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.admin.v1.MigrationProto
+            .internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                    .class,
+                com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                    .Builder.class);
+      }
+
+      // Construct using
+      // com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        concurrencyMode_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.admin.v1.MigrationProto
+            .internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_descriptor;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+          getDefaultInstanceForType() {
+        return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+          build() {
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+          buildPartial() {
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails result =
+            new com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails(
+                this);
+        result.concurrencyMode_ = concurrencyMode_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other
+            instanceof
+            com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) {
+          return mergeFrom(
+              (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+                  other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails other) {
+        if (other
+            == com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                .getDefaultInstance()) return this;
+        if (other.concurrencyMode_ != 0) {
+          setConcurrencyModeValue(other.getConcurrencyModeValue());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+            parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int concurrencyMode_ = 0;
+      /**
+       *
+       *
+       * 
    +       * Ths concurrency mode for this database.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @return The enum numeric value on the wire for concurrencyMode.
+       */
+      @java.lang.Override
+      public int getConcurrencyModeValue() {
+        return concurrencyMode_;
+      }
+      /**
+       *
+       *
+       * 
    +       * Ths concurrency mode for this database.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @param value The enum numeric value on the wire for concurrencyMode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConcurrencyModeValue(int value) {
+
+        concurrencyMode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Ths concurrency mode for this database.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @return The concurrencyMode.
+       */
+      @java.lang.Override
+      public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
+          getConcurrencyMode() {
+        @SuppressWarnings("deprecation")
+        com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
+            com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+                concurrencyMode_);
+        return result == null
+            ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
+            : result;
+      }
+      /**
+       *
+       *
+       * 
    +       * Ths concurrency mode for this database.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @param value The concurrencyMode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConcurrencyMode(
+          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+
+        concurrencyMode_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Ths concurrency mode for this database.
+       * 
    
+       *
+       * 
+       * .google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode concurrency_mode = 1;
+       * 
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearConcurrencyMode() {
+
+        concurrencyMode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+    private static final com.google.datastore.admin.v1.MigrationProgressEvent
+            .RedirectWritesStepDetails
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails();
+    }
+
+    public static com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser PARSER =
+        new com.google.protobuf.AbstractParser() {
+          @java.lang.Override
+          public RedirectWritesStepDetails parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            return new RedirectWritesStepDetails(input, extensionRegistry);
+          }
+        };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  private int stepDetailsCase_ = 0;
+  private java.lang.Object stepDetails_;
+
+  public enum StepDetailsCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+    PREPARE_STEP_DETAILS(2),
+    REDIRECT_WRITES_STEP_DETAILS(3),
+    STEPDETAILS_NOT_SET(0);
+    private final int value;
+
+    private StepDetailsCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static StepDetailsCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static StepDetailsCase forNumber(int value) {
+      switch (value) {
+        case 2:
+          return PREPARE_STEP_DETAILS;
+        case 3:
+          return REDIRECT_WRITES_STEP_DETAILS;
+        case 0:
+          return STEPDETAILS_NOT_SET;
+        default:
+          return null;
+      }
+    }
+
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public StepDetailsCase getStepDetailsCase() {
+    return StepDetailsCase.forNumber(stepDetailsCase_);
+  }
+
+  public static final int STEP_FIELD_NUMBER = 1;
+  private int step_;
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep step = 1;
+   *
+   * @return The enum numeric value on the wire for step.
+   */
+  @java.lang.Override
+  public int getStepValue() {
+    return step_;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep step = 1;
+   *
+   * @return The step.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationStep getStep() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.MigrationStep result =
+        com.google.datastore.admin.v1.MigrationStep.valueOf(step_);
+    return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
+  }
+
+  public static final int PREPARE_STEP_DETAILS_FIELD_NUMBER = 2;
+  /**
+   *
+   *
+   * 
    +   * Details for the `PREPARE` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+   * 
+   *
+   * @return Whether the prepareStepDetails field is set.
+   */
+  @java.lang.Override
+  public boolean hasPrepareStepDetails() {
+    return stepDetailsCase_ == 2;
+  }
+  /**
+   *
+   *
+   * 
    +   * Details for the `PREPARE` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+   * 
+   *
+   * @return The prepareStepDetails.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+      getPrepareStepDetails() {
+    if (stepDetailsCase_ == 2) {
+      return (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) stepDetails_;
+    }
+    return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        .getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Details for the `PREPARE` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder
+      getPrepareStepDetailsOrBuilder() {
+    if (stepDetailsCase_ == 2) {
+      return (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) stepDetails_;
+    }
+    return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        .getDefaultInstance();
+  }
+
+  public static final int REDIRECT_WRITES_STEP_DETAILS_FIELD_NUMBER = 3;
+  /**
+   *
+   *
+   * 
    +   * Details for the `REDIRECT_WRITES` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+   * 
+   *
+   * @return Whether the redirectWritesStepDetails field is set.
+   */
+  @java.lang.Override
+  public boolean hasRedirectWritesStepDetails() {
+    return stepDetailsCase_ == 3;
+  }
+  /**
+   *
+   *
+   * 
    +   * Details for the `REDIRECT_WRITES` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+   * 
+   *
+   * @return The redirectWritesStepDetails.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+      getRedirectWritesStepDetails() {
+    if (stepDetailsCase_ == 3) {
+      return (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+          stepDetails_;
+    }
+    return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        .getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Details for the `REDIRECT_WRITES` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder
+      getRedirectWritesStepDetailsOrBuilder() {
+    if (stepDetailsCase_ == 3) {
+      return (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+          stepDetails_;
+    }
+    return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        .getDefaultInstance();
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (step_
+        != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, step_);
+    }
+    if (stepDetailsCase_ == 2) {
+      output.writeMessage(
+          2,
+          (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) stepDetails_);
+    }
+    if (stepDetailsCase_ == 3) {
+      output.writeMessage(
+          3,
+          (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+              stepDetails_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (step_
+        != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, step_);
+    }
+    if (stepDetailsCase_ == 2) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              2,
+              (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+                  stepDetails_);
+    }
+    if (stepDetailsCase_ == 3) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              3,
+              (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+                  stepDetails_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.MigrationProgressEvent)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.MigrationProgressEvent other =
+        (com.google.datastore.admin.v1.MigrationProgressEvent) obj;
+
+    if (step_ != other.step_) return false;
+    if (!getStepDetailsCase().equals(other.getStepDetailsCase())) return false;
+    switch (stepDetailsCase_) {
+      case 2:
+        if (!getPrepareStepDetails().equals(other.getPrepareStepDetails())) return false;
+        break;
+      case 3:
+        if (!getRedirectWritesStepDetails().equals(other.getRedirectWritesStepDetails()))
+          return false;
+        break;
+      case 0:
+      default:
+    }
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + STEP_FIELD_NUMBER;
+    hash = (53 * hash) + step_;
+    switch (stepDetailsCase_) {
+      case 2:
+        hash = (37 * hash) + PREPARE_STEP_DETAILS_FIELD_NUMBER;
+        hash = (53 * hash) + getPrepareStepDetails().hashCode();
+        break;
+      case 3:
+        hash = (37 * hash) + REDIRECT_WRITES_STEP_DETAILS_FIELD_NUMBER;
+        hash = (53 * hash) + getRedirectWritesStepDetails().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.MigrationProgressEvent prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * An event signifying the start of a new step in a [migration from Cloud
+   * Datastore to Cloud Firestore in Datastore
+   * mode](https://cloud.google.com/datastore/docs/upgrade-to-firestore).
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.MigrationProgressEvent}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.MigrationProgressEvent)
+      com.google.datastore.admin.v1.MigrationProgressEventOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationProgressEvent_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.MigrationProgressEvent.class,
+              com.google.datastore.admin.v1.MigrationProgressEvent.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.MigrationProgressEvent.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      step_ = 0;
+
+      stepDetailsCase_ = 0;
+      stepDetails_ = null;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.MigrationProgressEvent.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent build() {
+      com.google.datastore.admin.v1.MigrationProgressEvent result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent buildPartial() {
+      com.google.datastore.admin.v1.MigrationProgressEvent result =
+          new com.google.datastore.admin.v1.MigrationProgressEvent(this);
+      result.step_ = step_;
+      if (stepDetailsCase_ == 2) {
+        if (prepareStepDetailsBuilder_ == null) {
+          result.stepDetails_ = stepDetails_;
+        } else {
+          result.stepDetails_ = prepareStepDetailsBuilder_.build();
+        }
+      }
+      if (stepDetailsCase_ == 3) {
+        if (redirectWritesStepDetailsBuilder_ == null) {
+          result.stepDetails_ = stepDetails_;
+        } else {
+          result.stepDetails_ = redirectWritesStepDetailsBuilder_.build();
+        }
+      }
+      result.stepDetailsCase_ = stepDetailsCase_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.MigrationProgressEvent) {
+        return mergeFrom((com.google.datastore.admin.v1.MigrationProgressEvent) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.MigrationProgressEvent other) {
+      if (other == com.google.datastore.admin.v1.MigrationProgressEvent.getDefaultInstance())
+        return this;
+      if (other.step_ != 0) {
+        setStepValue(other.getStepValue());
+      }
+      switch (other.getStepDetailsCase()) {
+        case PREPARE_STEP_DETAILS:
+          {
+            mergePrepareStepDetails(other.getPrepareStepDetails());
+            break;
+          }
+        case REDIRECT_WRITES_STEP_DETAILS:
+          {
+            mergeRedirectWritesStepDetails(other.getRedirectWritesStepDetails());
+            break;
+          }
+        case STEPDETAILS_NOT_SET:
+          {
+            break;
+          }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.MigrationProgressEvent parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.MigrationProgressEvent) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int stepDetailsCase_ = 0;
+    private java.lang.Object stepDetails_;
+
+    public StepDetailsCase getStepDetailsCase() {
+      return StepDetailsCase.forNumber(stepDetailsCase_);
+    }
+
+    public Builder clearStepDetails() {
+      stepDetailsCase_ = 0;
+      stepDetails_ = null;
+      onChanged();
+      return this;
+    }
+
+    private int step_ = 0;
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep step = 1;
+     *
+     * @return The enum numeric value on the wire for step.
+     */
+    @java.lang.Override
+    public int getStepValue() {
+      return step_;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep step = 1;
+     *
+     * @param value The enum numeric value on the wire for step to set.
+     * @return This builder for chaining.
+     */
+    public Builder setStepValue(int value) {
+
+      step_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep step = 1;
+     *
+     * @return The step.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationStep getStep() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.MigrationStep result =
+          com.google.datastore.admin.v1.MigrationStep.valueOf(step_);
+      return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep step = 1;
+     *
+     * @param value The step to set.
+     * @return This builder for chaining.
+     */
+    public Builder setStep(com.google.datastore.admin.v1.MigrationStep value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      step_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationStep step = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearStep() {
+
+      step_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails,
+            com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder,
+            com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder>
+        prepareStepDetailsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     *
+     * @return Whether the prepareStepDetails field is set.
+     */
+    @java.lang.Override
+    public boolean hasPrepareStepDetails() {
+      return stepDetailsCase_ == 2;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     *
+     * @return The prepareStepDetails.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+        getPrepareStepDetails() {
+      if (prepareStepDetailsBuilder_ == null) {
+        if (stepDetailsCase_ == 2) {
+          return (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+              stepDetails_;
+        }
+        return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+            .getDefaultInstance();
+      } else {
+        if (stepDetailsCase_ == 2) {
+          return prepareStepDetailsBuilder_.getMessage();
+        }
+        return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+            .getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     */
+    public Builder setPrepareStepDetails(
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails value) {
+      if (prepareStepDetailsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        stepDetails_ = value;
+        onChanged();
+      } else {
+        prepareStepDetailsBuilder_.setMessage(value);
+      }
+      stepDetailsCase_ = 2;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     */
+    public Builder setPrepareStepDetails(
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder
+            builderForValue) {
+      if (prepareStepDetailsBuilder_ == null) {
+        stepDetails_ = builderForValue.build();
+        onChanged();
+      } else {
+        prepareStepDetailsBuilder_.setMessage(builderForValue.build());
+      }
+      stepDetailsCase_ = 2;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     */
+    public Builder mergePrepareStepDetails(
+        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails value) {
+      if (prepareStepDetailsBuilder_ == null) {
+        if (stepDetailsCase_ == 2
+            && stepDetails_
+                != com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+                    .getDefaultInstance()) {
+          stepDetails_ =
+              com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.newBuilder(
+                      (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+                          stepDetails_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          stepDetails_ = value;
+        }
+        onChanged();
+      } else {
+        if (stepDetailsCase_ == 2) {
+          prepareStepDetailsBuilder_.mergeFrom(value);
+        }
+        prepareStepDetailsBuilder_.setMessage(value);
+      }
+      stepDetailsCase_ = 2;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     */
+    public Builder clearPrepareStepDetails() {
+      if (prepareStepDetailsBuilder_ == null) {
+        if (stepDetailsCase_ == 2) {
+          stepDetailsCase_ = 0;
+          stepDetails_ = null;
+          onChanged();
+        }
+      } else {
+        if (stepDetailsCase_ == 2) {
+          stepDetailsCase_ = 0;
+          stepDetails_ = null;
+        }
+        prepareStepDetailsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     */
+    public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder
+        getPrepareStepDetailsBuilder() {
+      return getPrepareStepDetailsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder
+        getPrepareStepDetailsOrBuilder() {
+      if ((stepDetailsCase_ == 2) && (prepareStepDetailsBuilder_ != null)) {
+        return prepareStepDetailsBuilder_.getMessageOrBuilder();
+      } else {
+        if (stepDetailsCase_ == 2) {
+          return (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+              stepDetails_;
+        }
+        return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+            .getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `PREPARE` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails,
+            com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder,
+            com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder>
+        getPrepareStepDetailsFieldBuilder() {
+      if (prepareStepDetailsBuilder_ == null) {
+        if (!(stepDetailsCase_ == 2)) {
+          stepDetails_ =
+              com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
+                  .getDefaultInstance();
+        }
+        prepareStepDetailsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails,
+                com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder,
+                com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder>(
+                (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
+                    stepDetails_,
+                getParentForChildren(),
+                isClean());
+        stepDetails_ = null;
+      }
+      stepDetailsCase_ = 2;
+      onChanged();
+      ;
+      return prepareStepDetailsBuilder_;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails,
+            com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder,
+            com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder>
+        redirectWritesStepDetailsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     *
+     * @return Whether the redirectWritesStepDetails field is set.
+     */
+    @java.lang.Override
+    public boolean hasRedirectWritesStepDetails() {
+      return stepDetailsCase_ == 3;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     *
+     * @return The redirectWritesStepDetails.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+        getRedirectWritesStepDetails() {
+      if (redirectWritesStepDetailsBuilder_ == null) {
+        if (stepDetailsCase_ == 3) {
+          return (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+              stepDetails_;
+        }
+        return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+            .getDefaultInstance();
+      } else {
+        if (stepDetailsCase_ == 3) {
+          return redirectWritesStepDetailsBuilder_.getMessage();
+        }
+        return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+            .getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     */
+    public Builder setRedirectWritesStepDetails(
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails value) {
+      if (redirectWritesStepDetailsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        stepDetails_ = value;
+        onChanged();
+      } else {
+        redirectWritesStepDetailsBuilder_.setMessage(value);
+      }
+      stepDetailsCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     */
+    public Builder setRedirectWritesStepDetails(
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder
+            builderForValue) {
+      if (redirectWritesStepDetailsBuilder_ == null) {
+        stepDetails_ = builderForValue.build();
+        onChanged();
+      } else {
+        redirectWritesStepDetailsBuilder_.setMessage(builderForValue.build());
+      }
+      stepDetailsCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     */
+    public Builder mergeRedirectWritesStepDetails(
+        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails value) {
+      if (redirectWritesStepDetailsBuilder_ == null) {
+        if (stepDetailsCase_ == 3
+            && stepDetails_
+                != com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                    .getDefaultInstance()) {
+          stepDetails_ =
+              com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                  .newBuilder(
+                      (com.google.datastore.admin.v1.MigrationProgressEvent
+                              .RedirectWritesStepDetails)
+                          stepDetails_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          stepDetails_ = value;
+        }
+        onChanged();
+      } else {
+        if (stepDetailsCase_ == 3) {
+          redirectWritesStepDetailsBuilder_.mergeFrom(value);
+        }
+        redirectWritesStepDetailsBuilder_.setMessage(value);
+      }
+      stepDetailsCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     */
+    public Builder clearRedirectWritesStepDetails() {
+      if (redirectWritesStepDetailsBuilder_ == null) {
+        if (stepDetailsCase_ == 3) {
+          stepDetailsCase_ = 0;
+          stepDetails_ = null;
+          onChanged();
+        }
+      } else {
+        if (stepDetailsCase_ == 3) {
+          stepDetailsCase_ = 0;
+          stepDetails_ = null;
+        }
+        redirectWritesStepDetailsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     */
+    public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder
+        getRedirectWritesStepDetailsBuilder() {
+      return getRedirectWritesStepDetailsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder
+        getRedirectWritesStepDetailsOrBuilder() {
+      if ((stepDetailsCase_ == 3) && (redirectWritesStepDetailsBuilder_ != null)) {
+        return redirectWritesStepDetailsBuilder_.getMessageOrBuilder();
+      } else {
+        if (stepDetailsCase_ == 3) {
+          return (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+              stepDetails_;
+        }
+        return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+            .getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Details for the `REDIRECT_WRITES` step.
+     * 
    
+     *
+     * 
+     * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails,
+            com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder,
+            com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder>
+        getRedirectWritesStepDetailsFieldBuilder() {
+      if (redirectWritesStepDetailsBuilder_ == null) {
+        if (!(stepDetailsCase_ == 3)) {
+          stepDetails_ =
+              com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                  .getDefaultInstance();
+        }
+        redirectWritesStepDetailsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails,
+                com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+                    .Builder,
+                com.google.datastore.admin.v1.MigrationProgressEvent
+                    .RedirectWritesStepDetailsOrBuilder>(
+                (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
+                    stepDetails_,
+                getParentForChildren(),
+                isClean());
+        stepDetails_ = null;
+      }
+      stepDetailsCase_ = 3;
+      onChanged();
+      ;
+      return redirectWritesStepDetailsBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.MigrationProgressEvent)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.MigrationProgressEvent)
+  private static final com.google.datastore.admin.v1.MigrationProgressEvent DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.MigrationProgressEvent();
+  }
+
+  public static com.google.datastore.admin.v1.MigrationProgressEvent getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public MigrationProgressEvent parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new MigrationProgressEvent(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationProgressEvent getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..4660304ea8f3
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/migration.proto
+
+package com.google.datastore.admin.v1;
+
+public interface MigrationProgressEventOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.MigrationProgressEvent)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep step = 1;
+   *
+   * @return The enum numeric value on the wire for step.
+   */
+  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.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationStep step = 1;
+   *
+   * @return The step.
+   */
+  com.google.datastore.admin.v1.MigrationStep getStep();
+
+  /**
+   *
+   *
+   * 
    +   * Details for the `PREPARE` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+   * 
+   *
+   * @return Whether the prepareStepDetails field is set.
+   */
+  boolean hasPrepareStepDetails();
+  /**
+   *
+   *
+   * 
    +   * Details for the `PREPARE` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+   * 
+   *
+   * @return The prepareStepDetails.
+   */
+  com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails getPrepareStepDetails();
+  /**
+   *
+   *
+   * 
    +   * Details for the `PREPARE` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails prepare_step_details = 2;
+   * 
+   */
+  com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder
+      getPrepareStepDetailsOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Details for the `REDIRECT_WRITES` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+   * 
+   *
+   * @return Whether the redirectWritesStepDetails field is set.
+   */
+  boolean hasRedirectWritesStepDetails();
+  /**
+   *
+   *
+   * 
    +   * Details for the `REDIRECT_WRITES` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+   * 
+   *
+   * @return The redirectWritesStepDetails.
+   */
+  com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
+      getRedirectWritesStepDetails();
+  /**
+   *
+   *
+   * 
    +   * Details for the `REDIRECT_WRITES` step.
+   * 
    
+   *
+   * 
+   * .google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails redirect_writes_step_details = 3;
+   * 
+   */
+  com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder
+      getRedirectWritesStepDetailsOrBuilder();
+
+  public 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/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
new file mode 100644
index 000000000000..b78108447040
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/migration.proto
+
+package com.google.datastore.admin.v1;
+
+public final class MigrationProto {
+  private MigrationProto() {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_MigrationStateEvent_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_MigrationProgressEvent_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+    return descriptor;
+  }
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+  static {
+    java.lang.String[] descriptorData = {
+      "\n)google/datastore/admin/v1/migration.pr"
+          + "oto\022\031google.datastore.admin.v1\032\034google/a"
+          + "pi/annotations.proto\"O\n\023MigrationStateEv"
+          + "ent\0228\n\005state\030\001 \001(\0162).google.datastore.ad"
+          + "min.v1.MigrationState\"\376\004\n\026MigrationProgr"
+          + "essEvent\0226\n\004step\030\001 \001(\0162(.google.datastor"
+          + "e.admin.v1.MigrationStep\022d\n\024prepare_step"
+          + "_details\030\002 \001(\0132D.google.datastore.admin."
+          + "v1.MigrationProgressEvent.PrepareStepDet"
+          + "ailsH\000\022s\n\034redirect_writes_step_details\030\003"
+          + " \001(\0132K.google.datastore.admin.v1.Migrati"
+          + "onProgressEvent.RedirectWritesStepDetail"
+          + "sH\000\032q\n\022PrepareStepDetails\022[\n\020concurrency"
+          + "_mode\030\001 \001(\0162A.google.datastore.admin.v1."
+          + "MigrationProgressEvent.ConcurrencyMode\032x"
+          + "\n\031RedirectWritesStepDetails\022[\n\020concurren"
+          + "cy_mode\030\001 \001(\0162A.google.datastore.admin.v"
+          + "1.MigrationProgressEvent.ConcurrencyMode"
+          + "\"T\n\017ConcurrencyMode\022 \n\034CONCURRENCY_MODE_"
+          + "UNSPECIFIED\020\000\022\017\n\013PESSIMISTIC\020\001\022\016\n\nOPTIMI"
+          + "STIC\020\002B\016\n\014step_details*X\n\016MigrationState"
+          + "\022\037\n\033MIGRATION_STATE_UNSPECIFIED\020\000\022\013\n\007RUN"
+          + "NING\020\001\022\n\n\006PAUSED\020\002\022\014\n\010COMPLETE\020\003*\343\001\n\rMig"
+          + "rationStep\022\036\n\032MIGRATION_STEP_UNSPECIFIED"
+          + "\020\000\022\013\n\007PREPARE\020\006\022\t\n\005START\020\001\022\036\n\032APPLY_WRIT"
+          + "ES_SYNCHRONOUSLY\020\007\022\023\n\017COPY_AND_VERIFY\020\002\022"
+          + "(\n$REDIRECT_EVENTUALLY_CONSISTENT_READS\020"
+          + "\003\022&\n\"REDIRECT_STRONGLY_CONSISTENT_READS\020"
+          + "\004\022\023\n\017REDIRECT_WRITES\020\005B\333\001\n\035com.google.da"
+          + "tastore.admin.v1B\016MigrationProtoP\001Z>goog"
+          + "le.golang.org/genproto/googleapis/datast"
+          + "ore/admin/v1;admin\252\002\037Google.Cloud.Datast"
+          + "ore.Admin.V1\312\002\037Google\\Cloud\\Datastore\\Ad"
+          + "min\\V1\352\002#Google::Cloud::Datastore::Admin"
+          + "::V1b\006proto3"
+    };
+    descriptor =
+        com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
+            descriptorData,
+            new com.google.protobuf.Descriptors.FileDescriptor[] {
+              com.google.api.AnnotationsProto.getDescriptor(),
+            });
+    internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor =
+        getDescriptor().getMessageTypes().get(0);
+    internal_static_google_datastore_admin_v1_MigrationStateEvent_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor,
+            new java.lang.String[] {
+              "State",
+            });
+    internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor =
+        getDescriptor().getMessageTypes().get(1);
+    internal_static_google_datastore_admin_v1_MigrationProgressEvent_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor,
+            new java.lang.String[] {
+              "Step", "PrepareStepDetails", "RedirectWritesStepDetails", "StepDetails",
+            });
+    internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_descriptor =
+        internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_descriptor,
+            new java.lang.String[] {
+              "ConcurrencyMode",
+            });
+    internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_descriptor =
+        internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor
+            .getNestedTypes()
+            .get(1);
+    internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_descriptor,
+            new java.lang.String[] {
+              "ConcurrencyMode",
+            });
+    com.google.api.AnnotationsProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
new file mode 100644
index 000000000000..40a2f72db559
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/migration.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * States for a migration.
+ * 
    
+ *
+ * Protobuf enum {@code google.datastore.admin.v1.MigrationState}
+ */
+public enum MigrationState implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   *
+   *
+   * 
    +   * Unspecified.
+   * 
    
+   *
+   * MIGRATION_STATE_UNSPECIFIED = 0;
+   */
+  MIGRATION_STATE_UNSPECIFIED(0),
+  /**
+   *
+   *
+   * 
    +   * The migration is running.
+   * 
    
+   *
+   * RUNNING = 1;
+   */
+  RUNNING(1),
+  /**
+   *
+   *
+   * 
    +   * The migration is paused.
+   * 
    
+   *
+   * PAUSED = 2;
+   */
+  PAUSED(2),
+  /**
+   *
+   *
+   * 
    +   * The migration is complete.
+   * 
    
+   *
+   * COMPLETE = 3;
+   */
+  COMPLETE(3),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   *
+   *
+   * 
    +   * Unspecified.
+   * 
    
+   *
+   * MIGRATION_STATE_UNSPECIFIED = 0;
+   */
+  public static final int MIGRATION_STATE_UNSPECIFIED_VALUE = 0;
+  /**
+   *
+   *
+   * 
    +   * The migration is running.
+   * 
    
+   *
+   * RUNNING = 1;
+   */
+  public static final int RUNNING_VALUE = 1;
+  /**
+   *
+   *
+   * 
    +   * The migration is paused.
+   * 
    
+   *
+   * PAUSED = 2;
+   */
+  public static final int PAUSED_VALUE = 2;
+  /**
+   *
+   *
+   * 
    +   * The migration is complete.
+   * 
    
+   *
+   * COMPLETE = 3;
+   */
+  public static final int COMPLETE_VALUE = 3;
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static MigrationState valueOf(int value) {
+    return forNumber(value);
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   */
+  public static MigrationState forNumber(int value) {
+    switch (value) {
+      case 0:
+        return MIGRATION_STATE_UNSPECIFIED;
+      case 1:
+        return RUNNING;
+      case 2:
+        return PAUSED;
+      case 3:
+        return COMPLETE;
+      default:
+        return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    return internalValueMap;
+  }
+
+  private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+      new com.google.protobuf.Internal.EnumLiteMap() {
+        public MigrationState findValueByNumber(int number) {
+          return MigrationState.forNumber(number);
+        }
+      };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalStateException(
+          "Can't get the descriptor of an unrecognized enum value.");
+    }
+    return getDescriptor().getValues().get(ordinal());
+  }
+
+  public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    return getDescriptor();
+  }
+
+  public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    return com.google.datastore.admin.v1.MigrationProto.getDescriptor().getEnumTypes().get(0);
+  }
+
+  private static final MigrationState[] VALUES = values();
+
+  public static MigrationState valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private MigrationState(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.MigrationState)
+}
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
new file mode 100644
index 000000000000..94213527280d
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java
@@ -0,0 +1,613 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/migration.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * An event signifying a change in state of a [migration from Cloud Datastore to
+ * Cloud Firestore in Datastore
+ * mode](https://cloud.google.com/datastore/docs/upgrade-to-firestore).
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.MigrationStateEvent}
+ */
+public final class MigrationStateEvent extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationStateEvent)
+    MigrationStateEventOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use MigrationStateEvent.newBuilder() to construct.
+  private MigrationStateEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private MigrationStateEvent() {
+    state_ = 0;
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new MigrationStateEvent();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private MigrationStateEvent(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              state_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.MigrationProto
+        .internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.MigrationProto
+        .internal_static_google_datastore_admin_v1_MigrationStateEvent_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.MigrationStateEvent.class,
+            com.google.datastore.admin.v1.MigrationStateEvent.Builder.class);
+  }
+
+  public static final int STATE_FIELD_NUMBER = 1;
+  private int state_;
+  /**
+   *
+   *
+   * 
    +   * The new state of the migration.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState state = 1;
+   *
+   * @return The enum numeric value on the wire for state.
+   */
+  @java.lang.Override
+  public int getStateValue() {
+    return state_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The new state of the migration.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState state = 1;
+   *
+   * @return The state.
+   */
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationState getState() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.admin.v1.MigrationState result =
+        com.google.datastore.admin.v1.MigrationState.valueOf(state_);
+    return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (state_
+        != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, state_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (state_
+        != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, state_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.MigrationStateEvent)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.MigrationStateEvent other =
+        (com.google.datastore.admin.v1.MigrationStateEvent) obj;
+
+    if (state_ != other.state_) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + STATE_FIELD_NUMBER;
+    hash = (53 * hash) + state_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.MigrationStateEvent prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * An event signifying a change in state of a [migration from Cloud Datastore to
+   * Cloud Firestore in Datastore
+   * mode](https://cloud.google.com/datastore/docs/upgrade-to-firestore).
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.MigrationStateEvent}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.MigrationStateEvent)
+      com.google.datastore.admin.v1.MigrationStateEventOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationStateEvent_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.MigrationStateEvent.class,
+              com.google.datastore.admin.v1.MigrationStateEvent.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.MigrationStateEvent.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      state_ = 0;
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.MigrationProto
+          .internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationStateEvent getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.MigrationStateEvent.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationStateEvent build() {
+      com.google.datastore.admin.v1.MigrationStateEvent result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationStateEvent buildPartial() {
+      com.google.datastore.admin.v1.MigrationStateEvent result =
+          new com.google.datastore.admin.v1.MigrationStateEvent(this);
+      result.state_ = state_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.MigrationStateEvent) {
+        return mergeFrom((com.google.datastore.admin.v1.MigrationStateEvent) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.MigrationStateEvent other) {
+      if (other == com.google.datastore.admin.v1.MigrationStateEvent.getDefaultInstance())
+        return this;
+      if (other.state_ != 0) {
+        setStateValue(other.getStateValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.MigrationStateEvent parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.datastore.admin.v1.MigrationStateEvent) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int state_ = 0;
+    /**
+     *
+     *
+     * 
    +     * The new state of the migration.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState state = 1;
+     *
+     * @return The enum numeric value on the wire for state.
+     */
+    @java.lang.Override
+    public int getStateValue() {
+      return state_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The new state of the migration.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState state = 1;
+     *
+     * @param value The enum numeric value on the wire for state to set.
+     * @return This builder for chaining.
+     */
+    public Builder setStateValue(int value) {
+
+      state_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The new state of the migration.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState state = 1;
+     *
+     * @return The state.
+     */
+    @java.lang.Override
+    public com.google.datastore.admin.v1.MigrationState getState() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.admin.v1.MigrationState result =
+          com.google.datastore.admin.v1.MigrationState.valueOf(state_);
+      return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * The new state of the migration.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState state = 1;
+     *
+     * @param value The state to set.
+     * @return This builder for chaining.
+     */
+    public Builder setState(com.google.datastore.admin.v1.MigrationState value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      state_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The new state of the migration.
+     * 
    
+     *
+     * .google.datastore.admin.v1.MigrationState state = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearState() {
+
+      state_ = 0;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.MigrationStateEvent)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.MigrationStateEvent)
+  private static final com.google.datastore.admin.v1.MigrationStateEvent DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.MigrationStateEvent();
+  }
+
+  public static com.google.datastore.admin.v1.MigrationStateEvent getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public MigrationStateEvent parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new MigrationStateEvent(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.MigrationStateEvent getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
new file mode 100644
index 000000000000..99444401bc16
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/migration.proto
+
+package com.google.datastore.admin.v1;
+
+public interface MigrationStateEventOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.MigrationStateEvent)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The new state of the migration.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState state = 1;
+   *
+   * @return The enum numeric value on the wire for state.
+   */
+  int getStateValue();
+  /**
+   *
+   *
+   * 
    +   * The new state of the migration.
+   * 
    
+   *
+   * .google.datastore.admin.v1.MigrationState state = 1;
+   *
+   * @return The state.
+   */
+  com.google.datastore.admin.v1.MigrationState getState();
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
new file mode 100644
index 000000000000..86f6eaed865d
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -0,0 +1,288 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/migration.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Steps in a migration.
+ * 
    
+ *
+ * Protobuf enum {@code google.datastore.admin.v1.MigrationStep}
+ */
+public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   *
+   *
+   * 
    +   * Unspecified.
+   * 
    
+   *
+   * MIGRATION_STEP_UNSPECIFIED = 0;
+   */
+  MIGRATION_STEP_UNSPECIFIED(0),
+  /**
+   *
+   *
+   * 
    +   * Pre-migration: the database is prepared for migration.
+   * 
    
+   *
+   * PREPARE = 6;
+   */
+  PREPARE(6),
+  /**
+   *
+   *
+   * 
    +   * Start of migration.
+   * 
    
+   *
+   * START = 1;
+   */
+  START(1),
+  /**
+   *
+   *
+   * 
    +   * Writes are applied synchronously to at least one replica.
+   * 
    
+   *
+   * APPLY_WRITES_SYNCHRONOUSLY = 7;
+   */
+  APPLY_WRITES_SYNCHRONOUSLY(7),
+  /**
+   *
+   *
+   * 
    +   * Data is copied to Cloud Firestore and then verified to match the data in
+   * Cloud Datastore.
+   * 
    
+   *
+   * COPY_AND_VERIFY = 2;
+   */
+  COPY_AND_VERIFY(2),
+  /**
+   *
+   *
+   * 
    +   * Eventually-consistent reads are redirected to Cloud Firestore.
+   * 
    
+   *
+   * REDIRECT_EVENTUALLY_CONSISTENT_READS = 3;
+   */
+  REDIRECT_EVENTUALLY_CONSISTENT_READS(3),
+  /**
+   *
+   *
+   * 
    +   * Strongly-consistent reads are redirected to Cloud Firestore.
+   * 
    
+   *
+   * REDIRECT_STRONGLY_CONSISTENT_READS = 4;
+   */
+  REDIRECT_STRONGLY_CONSISTENT_READS(4),
+  /**
+   *
+   *
+   * 
    +   * Writes are redirected to Cloud Firestore.
+   * 
    
+   *
+   * REDIRECT_WRITES = 5;
+   */
+  REDIRECT_WRITES(5),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   *
+   *
+   * 
    +   * Unspecified.
+   * 
    
+   *
+   * MIGRATION_STEP_UNSPECIFIED = 0;
+   */
+  public static final int MIGRATION_STEP_UNSPECIFIED_VALUE = 0;
+  /**
+   *
+   *
+   * 
    +   * Pre-migration: the database is prepared for migration.
+   * 
    
+   *
+   * PREPARE = 6;
+   */
+  public static final int PREPARE_VALUE = 6;
+  /**
+   *
+   *
+   * 
    +   * Start of migration.
+   * 
    
+   *
+   * START = 1;
+   */
+  public static final int START_VALUE = 1;
+  /**
+   *
+   *
+   * 
    +   * Writes are applied synchronously to at least one replica.
+   * 
    
+   *
+   * APPLY_WRITES_SYNCHRONOUSLY = 7;
+   */
+  public static final int APPLY_WRITES_SYNCHRONOUSLY_VALUE = 7;
+  /**
+   *
+   *
+   * 
    +   * Data is copied to Cloud Firestore and then verified to match the data in
+   * Cloud Datastore.
+   * 
    
+   *
+   * COPY_AND_VERIFY = 2;
+   */
+  public static final int COPY_AND_VERIFY_VALUE = 2;
+  /**
+   *
+   *
+   * 
    +   * Eventually-consistent reads are redirected to Cloud Firestore.
+   * 
    
+   *
+   * REDIRECT_EVENTUALLY_CONSISTENT_READS = 3;
+   */
+  public static final int REDIRECT_EVENTUALLY_CONSISTENT_READS_VALUE = 3;
+  /**
+   *
+   *
+   * 
    +   * Strongly-consistent reads are redirected to Cloud Firestore.
+   * 
    
+   *
+   * REDIRECT_STRONGLY_CONSISTENT_READS = 4;
+   */
+  public static final int REDIRECT_STRONGLY_CONSISTENT_READS_VALUE = 4;
+  /**
+   *
+   *
+   * 
    +   * Writes are redirected to Cloud Firestore.
+   * 
    
+   *
+   * REDIRECT_WRITES = 5;
+   */
+  public static final int REDIRECT_WRITES_VALUE = 5;
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static MigrationStep valueOf(int value) {
+    return forNumber(value);
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   */
+  public static MigrationStep forNumber(int value) {
+    switch (value) {
+      case 0:
+        return MIGRATION_STEP_UNSPECIFIED;
+      case 6:
+        return PREPARE;
+      case 1:
+        return START;
+      case 7:
+        return APPLY_WRITES_SYNCHRONOUSLY;
+      case 2:
+        return COPY_AND_VERIFY;
+      case 3:
+        return REDIRECT_EVENTUALLY_CONSISTENT_READS;
+      case 4:
+        return REDIRECT_STRONGLY_CONSISTENT_READS;
+      case 5:
+        return REDIRECT_WRITES;
+      default:
+        return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    return internalValueMap;
+  }
+
+  private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+      new com.google.protobuf.Internal.EnumLiteMap() {
+        public MigrationStep findValueByNumber(int number) {
+          return MigrationStep.forNumber(number);
+        }
+      };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalStateException(
+          "Can't get the descriptor of an unrecognized enum value.");
+    }
+    return getDescriptor().getValues().get(ordinal());
+  }
+
+  public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    return getDescriptor();
+  }
+
+  public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    return com.google.datastore.admin.v1.MigrationProto.getDescriptor().getEnumTypes().get(1);
+  }
+
+  private static final MigrationStep[] VALUES = values();
+
+  public static MigrationStep valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private MigrationStep(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.MigrationStep)
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
new file mode 100644
index 000000000000..d1ab497e06da
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Operation types.
+ * 
    
+ *
+ * Protobuf enum {@code google.datastore.admin.v1.OperationType}
+ */
+public enum OperationType implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   *
+   *
+   * 
    +   * Unspecified.
+   * 
    
+   *
+   * OPERATION_TYPE_UNSPECIFIED = 0;
+   */
+  OPERATION_TYPE_UNSPECIFIED(0),
+  /**
+   *
+   *
+   * 
    +   * ExportEntities.
+   * 
    
+   *
+   * EXPORT_ENTITIES = 1;
+   */
+  EXPORT_ENTITIES(1),
+  /**
+   *
+   *
+   * 
    +   * ImportEntities.
+   * 
    
+   *
+   * IMPORT_ENTITIES = 2;
+   */
+  IMPORT_ENTITIES(2),
+  /**
+   *
+   *
+   * 
    +   * CreateIndex.
+   * 
    
+   *
+   * CREATE_INDEX = 3;
+   */
+  CREATE_INDEX(3),
+  /**
+   *
+   *
+   * 
    +   * DeleteIndex.
+   * 
    
+   *
+   * DELETE_INDEX = 4;
+   */
+  DELETE_INDEX(4),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   *
+   *
+   * 
    +   * Unspecified.
+   * 
    
+   *
+   * OPERATION_TYPE_UNSPECIFIED = 0;
+   */
+  public static final int OPERATION_TYPE_UNSPECIFIED_VALUE = 0;
+  /**
+   *
+   *
+   * 
    +   * ExportEntities.
+   * 
    
+   *
+   * EXPORT_ENTITIES = 1;
+   */
+  public static final int EXPORT_ENTITIES_VALUE = 1;
+  /**
+   *
+   *
+   * 
    +   * ImportEntities.
+   * 
    
+   *
+   * IMPORT_ENTITIES = 2;
+   */
+  public static final int IMPORT_ENTITIES_VALUE = 2;
+  /**
+   *
+   *
+   * 
    +   * CreateIndex.
+   * 
    
+   *
+   * CREATE_INDEX = 3;
+   */
+  public static final int CREATE_INDEX_VALUE = 3;
+  /**
+   *
+   *
+   * 
    +   * DeleteIndex.
+   * 
    
+   *
+   * DELETE_INDEX = 4;
+   */
+  public static final int DELETE_INDEX_VALUE = 4;
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static OperationType valueOf(int value) {
+    return forNumber(value);
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   */
+  public static OperationType forNumber(int value) {
+    switch (value) {
+      case 0:
+        return OPERATION_TYPE_UNSPECIFIED;
+      case 1:
+        return EXPORT_ENTITIES;
+      case 2:
+        return IMPORT_ENTITIES;
+      case 3:
+        return CREATE_INDEX;
+      case 4:
+        return DELETE_INDEX;
+      default:
+        return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    return internalValueMap;
+  }
+
+  private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+      new com.google.protobuf.Internal.EnumLiteMap() {
+        public OperationType findValueByNumber(int number) {
+          return OperationType.forNumber(number);
+        }
+      };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalStateException(
+          "Can't get the descriptor of an unrecognized enum value.");
+    }
+    return getDescriptor().getValues().get(ordinal());
+  }
+
+  public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    return getDescriptor();
+  }
+
+  public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto.getDescriptor().getEnumTypes().get(0);
+  }
+
+  private static final OperationType[] VALUES = values();
+
+  public static OperationType valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private OperationType(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.OperationType)
+}
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
new file mode 100644
index 000000000000..84b235e20c06
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java
@@ -0,0 +1,641 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+/**
+ *
+ *
+ * 
    + * Measures the progress of a particular metric.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.admin.v1.Progress}
+ */
+public final class Progress extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Progress)
+    ProgressOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use Progress.newBuilder() to construct.
+  private Progress(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private Progress() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new Progress();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private Progress(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              workCompleted_ = input.readInt64();
+              break;
+            }
+          case 16:
+            {
+              workEstimated_ = input.readInt64();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_Progress_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.admin.v1.DatastoreAdminProto
+        .internal_static_google_datastore_admin_v1_Progress_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.admin.v1.Progress.class,
+            com.google.datastore.admin.v1.Progress.Builder.class);
+  }
+
+  public static final int WORK_COMPLETED_FIELD_NUMBER = 1;
+  private long workCompleted_;
+  /**
+   *
+   *
+   * 
    +   * The amount of work that has been completed. Note that this may be greater
+   * than work_estimated.
+   * 
    
+   *
+   * int64 work_completed = 1;
+   *
+   * @return The workCompleted.
+   */
+  @java.lang.Override
+  public long getWorkCompleted() {
+    return workCompleted_;
+  }
+
+  public static final int WORK_ESTIMATED_FIELD_NUMBER = 2;
+  private long workEstimated_;
+  /**
+   *
+   *
+   * 
    +   * An estimate of how much work needs to be performed. May be zero if the
+   * work estimate is unavailable.
+   * 
    
+   *
+   * int64 work_estimated = 2;
+   *
+   * @return The workEstimated.
+   */
+  @java.lang.Override
+  public long getWorkEstimated() {
+    return workEstimated_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (workCompleted_ != 0L) {
+      output.writeInt64(1, workCompleted_);
+    }
+    if (workEstimated_ != 0L) {
+      output.writeInt64(2, workEstimated_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (workCompleted_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(1, workCompleted_);
+    }
+    if (workEstimated_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, workEstimated_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.admin.v1.Progress)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.admin.v1.Progress other = (com.google.datastore.admin.v1.Progress) obj;
+
+    if (getWorkCompleted() != other.getWorkCompleted()) return false;
+    if (getWorkEstimated() != other.getWorkEstimated()) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + WORK_COMPLETED_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getWorkCompleted());
+    hash = (37 * hash) + WORK_ESTIMATED_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getWorkEstimated());
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.admin.v1.Progress parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.admin.v1.Progress prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Measures the progress of a particular metric.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.admin.v1.Progress}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.admin.v1.Progress)
+      com.google.datastore.admin.v1.ProgressOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_Progress_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_Progress_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.admin.v1.Progress.class,
+              com.google.datastore.admin.v1.Progress.Builder.class);
+    }
+
+    // Construct using com.google.datastore.admin.v1.Progress.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      workCompleted_ = 0L;
+
+      workEstimated_ = 0L;
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.admin.v1.DatastoreAdminProto
+          .internal_static_google_datastore_admin_v1_Progress_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Progress getDefaultInstanceForType() {
+      return com.google.datastore.admin.v1.Progress.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Progress build() {
+      com.google.datastore.admin.v1.Progress result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.admin.v1.Progress buildPartial() {
+      com.google.datastore.admin.v1.Progress result =
+          new com.google.datastore.admin.v1.Progress(this);
+      result.workCompleted_ = workCompleted_;
+      result.workEstimated_ = workEstimated_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.admin.v1.Progress) {
+        return mergeFrom((com.google.datastore.admin.v1.Progress) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.admin.v1.Progress other) {
+      if (other == com.google.datastore.admin.v1.Progress.getDefaultInstance()) return this;
+      if (other.getWorkCompleted() != 0L) {
+        setWorkCompleted(other.getWorkCompleted());
+      }
+      if (other.getWorkEstimated() != 0L) {
+        setWorkEstimated(other.getWorkEstimated());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.datastore.admin.v1.Progress parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.datastore.admin.v1.Progress) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private long workCompleted_;
+    /**
+     *
+     *
+     * 
    +     * The amount of work that has been completed. Note that this may be greater
+     * than work_estimated.
+     * 
    
+     *
+     * int64 work_completed = 1;
+     *
+     * @return The workCompleted.
+     */
+    @java.lang.Override
+    public long getWorkCompleted() {
+      return workCompleted_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The amount of work that has been completed. Note that this may be greater
+     * than work_estimated.
+     * 
    
+     *
+     * int64 work_completed = 1;
+     *
+     * @param value The workCompleted to set.
+     * @return This builder for chaining.
+     */
+    public Builder setWorkCompleted(long value) {
+
+      workCompleted_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The amount of work that has been completed. Note that this may be greater
+     * than work_estimated.
+     * 
    
+     *
+     * int64 work_completed = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearWorkCompleted() {
+
+      workCompleted_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private long workEstimated_;
+    /**
+     *
+     *
+     * 
    +     * An estimate of how much work needs to be performed. May be zero if the
+     * work estimate is unavailable.
+     * 
    
+     *
+     * int64 work_estimated = 2;
+     *
+     * @return The workEstimated.
+     */
+    @java.lang.Override
+    public long getWorkEstimated() {
+      return workEstimated_;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of how much work needs to be performed. May be zero if the
+     * work estimate is unavailable.
+     * 
    
+     *
+     * int64 work_estimated = 2;
+     *
+     * @param value The workEstimated to set.
+     * @return This builder for chaining.
+     */
+    public Builder setWorkEstimated(long value) {
+
+      workEstimated_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * An estimate of how much work needs to be performed. May be zero if the
+     * work estimate is unavailable.
+     * 
    
+     *
+     * int64 work_estimated = 2;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearWorkEstimated() {
+
+      workEstimated_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.admin.v1.Progress)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.admin.v1.Progress)
+  private static final com.google.datastore.admin.v1.Progress DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.admin.v1.Progress();
+  }
+
+  public static com.google.datastore.admin.v1.Progress getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public Progress parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new Progress(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.admin.v1.Progress getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
new file mode 100644
index 000000000000..68343d04fcab
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package com.google.datastore.admin.v1;
+
+public interface ProgressOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.admin.v1.Progress)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The amount of work that has been completed. Note that this may be greater
+   * than work_estimated.
+   * 
    
+   *
+   * int64 work_completed = 1;
+   *
+   * @return The workCompleted.
+   */
+  long getWorkCompleted();
+
+  /**
+   *
+   *
+   * 
    +   * An estimate of how much work needs to be performed. May be zero if the
+   * work estimate is unavailable.
+   * 
    
+   *
+   * int64 work_estimated = 2;
+   *
+   * @return The workEstimated.
+   */
+  long getWorkEstimated();
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
new file mode 100644
index 000000000000..3bd4f4c7278e
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
@@ -0,0 +1,511 @@
+// Copyright 2021 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.
+
+syntax = "proto3";
+
+package google.datastore.admin.v1;
+
+import "google/api/annotations.proto";
+import "google/api/client.proto";
+import "google/api/field_behavior.proto";
+import "google/datastore/admin/v1/index.proto";
+import "google/datastore/admin/v1/migration.proto";
+import "google/longrunning/operations.proto";
+import "google/protobuf/timestamp.proto";
+
+option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
+option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option java_multiple_files = true;
+option java_outer_classname = "DatastoreAdminProto";
+option java_package = "com.google.datastore.admin.v1";
+option php_namespace = "Google\\Cloud\\Datastore\\Admin\\V1";
+option ruby_package = "Google::Cloud::Datastore::Admin::V1";
+
+// Google Cloud Datastore Admin API
+//
+//
+// The Datastore Admin API provides several admin services for Cloud Datastore.
+//
+// -----------------------------------------------------------------------------
+// ## Concepts
+//
+// Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+// API.
+//
+// Operation: An Operation represents work being performed in the background.
+//
+// EntityFilter: Allows specifying a subset of entities in a project. This is
+// specified as a combination of kinds and namespaces (either or both of which
+// may be all).
+//
+// -----------------------------------------------------------------------------
+// ## Services
+//
+// # Export/Import
+//
+// The Export/Import service provides the ability to copy all or a subset of
+// entities to/from Google Cloud Storage.
+//
+// Exported data may be imported into Cloud Datastore for any Google Cloud
+// Platform project. It is not restricted to the export source project. It is
+// possible to export from one project and then import into another.
+//
+// Exported data can also be loaded into Google BigQuery for analysis.
+//
+// Exports and imports are performed asynchronously. An Operation resource is
+// created for each export/import. The state (including any errors encountered)
+// of the export/import may be queried via the Operation resource.
+//
+// # Index
+//
+// The index service manages Cloud Datastore composite indexes.
+//
+// Index creation and deletion are performed asynchronously.
+// An Operation resource is created for each such asynchronous operation.
+// The state of the operation (including any errors encountered)
+// may be queried via the Operation resource.
+//
+// # Operation
+//
+// The Operations collection provides a record of actions performed for the
+// specified project (including any operations in progress). Operations are not
+// created directly but through calls on other collections or resources.
+//
+// An operation that is not yet done may be cancelled. The request to cancel is
+// asynchronous and the operation may continue to run for some time after the
+// request to cancel is made.
+//
+// An operation that is done may be deleted so that it is no longer listed as
+// part of the Operation collection.
+//
+// ListOperations returns all pending operations, but not completed operations.
+//
+// Operations are created by service DatastoreAdmin,
+// but are accessed via service google.longrunning.Operations.
+service DatastoreAdmin {
+  option (google.api.default_host) = "datastore.googleapis.com";
+  option (google.api.oauth_scopes) =
+      "https://www.googleapis.com/auth/cloud-platform,"
+      "https://www.googleapis.com/auth/datastore";
+
+  // Exports a copy of all or a subset of entities from Google Cloud Datastore
+  // to another storage system, such as Google Cloud Storage. Recent updates to
+  // entities may not be reflected in the export. The export occurs in the
+  // background and its progress can be monitored and managed via the
+  // Operation resource that is created. The output of an export may only be
+  // used once the associated operation is done. If an export operation is
+  // cancelled before completion it may leave partial data behind in Google
+  // Cloud Storage.
+  rpc ExportEntities(ExportEntitiesRequest) returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      post: "/v1/projects/{project_id}:export"
+      body: "*"
+    };
+    option (google.api.method_signature) = "project_id,labels,entity_filter,output_url_prefix";
+    option (google.longrunning.operation_info) = {
+      response_type: "ExportEntitiesResponse"
+      metadata_type: "ExportEntitiesMetadata"
+    };
+  }
+
+  // Imports entities into Google Cloud Datastore. Existing entities with the
+  // same key are overwritten. The import occurs in the background and its
+  // progress can be monitored and managed via the Operation resource that is
+  // created. If an ImportEntities operation is cancelled, it is possible
+  // that a subset of the data has already been imported to Cloud Datastore.
+  rpc ImportEntities(ImportEntitiesRequest) returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      post: "/v1/projects/{project_id}:import"
+      body: "*"
+    };
+    option (google.api.method_signature) = "project_id,labels,input_url,entity_filter";
+    option (google.longrunning.operation_info) = {
+      response_type: "google.protobuf.Empty"
+      metadata_type: "ImportEntitiesMetadata"
+    };
+  }
+
+  // Creates the specified index.
+  // A newly created index's initial state is `CREATING`. On completion of the
+  // returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
+  // If the index already exists, the call will return an `ALREADY_EXISTS`
+  // status.
+  //
+  // During index creation, the process could result in an error, in which
+  // case the index will move to the `ERROR` state. The process can be recovered
+  // by fixing the data that caused the error, removing the index with
+  // [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then
+  // re-creating the index with [create]
+  // [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+  //
+  // Indexes with a single property cannot be created.
+  rpc CreateIndex(CreateIndexRequest) returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      post: "/v1/projects/{project_id}/indexes"
+      body: "index"
+    };
+    option (google.longrunning.operation_info) = {
+      response_type: "Index"
+      metadata_type: "IndexOperationMetadata"
+    };
+  }
+
+  // Deletes an existing index.
+  // An index can only be deleted if it is in a `READY` or `ERROR` state. On
+  // successful execution of the request, the index will be in a `DELETING`
+  // [state][google.datastore.admin.v1.Index.State]. And on completion of the
+  // returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+  //
+  // During index deletion, the process could result in an error, in which
+  // case the index will move to the `ERROR` state. The process can be recovered
+  // by fixing the data that caused the error, followed by calling
+  // [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
+  rpc DeleteIndex(DeleteIndexRequest) returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      delete: "/v1/projects/{project_id}/indexes/{index_id}"
+    };
+    option (google.longrunning.operation_info) = {
+      response_type: "Index"
+      metadata_type: "IndexOperationMetadata"
+    };
+  }
+
+  // Gets an index.
+  rpc GetIndex(GetIndexRequest) returns (Index) {
+    option (google.api.http) = {
+      get: "/v1/projects/{project_id}/indexes/{index_id}"
+    };
+  }
+
+  // Lists the indexes that match the specified filters.  Datastore uses an
+  // eventually consistent query to fetch the list of indexes and may
+  // occasionally return stale results.
+  rpc ListIndexes(ListIndexesRequest) returns (ListIndexesResponse) {
+    option (google.api.http) = {
+      get: "/v1/projects/{project_id}/indexes"
+    };
+  }
+}
+
+// Metadata common to all Datastore Admin operations.
+message CommonMetadata {
+  // The various possible states for an ongoing Operation.
+  enum State {
+    // Unspecified.
+    STATE_UNSPECIFIED = 0;
+
+    // Request is being prepared for processing.
+    INITIALIZING = 1;
+
+    // Request is actively being processed.
+    PROCESSING = 2;
+
+    // Request is in the process of being cancelled after user called
+    // google.longrunning.Operations.CancelOperation on the operation.
+    CANCELLING = 3;
+
+    // Request has been processed and is in its finalization stage.
+    FINALIZING = 4;
+
+    // Request has completed successfully.
+    SUCCESSFUL = 5;
+
+    // Request has finished being processed, but encountered an error.
+    FAILED = 6;
+
+    // Request has finished being cancelled after user called
+    // google.longrunning.Operations.CancelOperation.
+    CANCELLED = 7;
+  }
+
+  // The time that work began on the operation.
+  google.protobuf.Timestamp start_time = 1;
+
+  // The time the operation ended, either successfully or otherwise.
+  google.protobuf.Timestamp end_time = 2;
+
+  // The type of the operation. Can be used as a filter in
+  // ListOperationsRequest.
+  OperationType operation_type = 3;
+
+  // The client-assigned labels which were provided when the operation was
+  // created. May also include additional labels.
+  map labels = 4;
+
+  // The current state of the Operation.
+  State state = 5;
+}
+
+// Measures the progress of a particular metric.
+message Progress {
+  // The amount of work that has been completed. Note that this may be greater
+  // than work_estimated.
+  int64 work_completed = 1;
+
+  // An estimate of how much work needs to be performed. May be zero if the
+  // work estimate is unavailable.
+  int64 work_estimated = 2;
+}
+
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+message ExportEntitiesRequest {
+  // Required. Project ID against which to make the request.
+  string project_id = 1 [(google.api.field_behavior) = REQUIRED];
+
+  // Client-assigned labels.
+  map labels = 2;
+
+  // Description of what data from the project is included in the export.
+  EntityFilter entity_filter = 3;
+
+  // 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
+  // name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+  // Storage namespace path (this is not a Cloud Datastore namespace). For more
+  // 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.
+  string output_url_prefix = 4 [(google.api.field_behavior) = REQUIRED];
+}
+
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.ImportEntities][google.datastore.admin.v1.DatastoreAdmin.ImportEntities].
+message ImportEntitiesRequest {
+  // Required. Project ID against which to make the request.
+  string project_id = 1 [(google.api.field_behavior) = REQUIRED];
+
+  // Client-assigned labels.
+  map labels = 2;
+
+  // Required. The full resource URL of the external storage location. Currently, only
+  // Google Cloud Storage is supported. So input_url should be of the form:
+  // `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+  // `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+  // an optional Cloud Storage namespace path (this is not a Cloud Datastore
+  // namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+  // by the ExportEntities operation. For more information about Cloud Storage
+  // 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].
+  string input_url = 3 [(google.api.field_behavior) = REQUIRED];
+
+  // Optionally specify which kinds/namespaces are to be imported. If provided,
+  // the list must be a subset of the EntityFilter used in creating the export,
+  // otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+  // specified then all entities from the export are imported.
+  EntityFilter entity_filter = 4;
+}
+
+// The response for
+// [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+message ExportEntitiesResponse {
+  // Location of the output metadata file. This can be used to begin an import
+  // into Cloud Datastore (this project or another project). See
+  // [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+  // Only present if the operation completed successfully.
+  string output_url = 1;
+}
+
+// Metadata for ExportEntities operations.
+message ExportEntitiesMetadata {
+  // Metadata common to all Datastore Admin operations.
+  CommonMetadata common = 1;
+
+  // An estimate of the number of entities processed.
+  Progress progress_entities = 2;
+
+  // An estimate of the number of bytes processed.
+  Progress progress_bytes = 3;
+
+  // Description of which entities are being exported.
+  EntityFilter entity_filter = 4;
+
+  // Location for the export metadata and data files. This will be the same
+  // value as the
+  // [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+  // field. The final output location is provided in
+  // [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+  string output_url_prefix = 5;
+}
+
+// Metadata for ImportEntities operations.
+message ImportEntitiesMetadata {
+  // Metadata common to all Datastore Admin operations.
+  CommonMetadata common = 1;
+
+  // An estimate of the number of entities processed.
+  Progress progress_entities = 2;
+
+  // An estimate of the number of bytes processed.
+  Progress progress_bytes = 3;
+
+  // Description of which entities are being imported.
+  EntityFilter entity_filter = 4;
+
+  // The location of the import metadata file. This will be the same value as
+  // the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+  string input_url = 5;
+}
+
+// Identifies a subset of entities in a project. This is specified as
+// 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']
+message EntityFilter {
+  // If empty, then this represents all kinds.
+  repeated string kinds = 1;
+
+  // 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.
+  // Each namespace in this list must be unique.
+  repeated string namespace_ids = 2;
+}
+
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.CreateIndex][google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+message CreateIndexRequest {
+  // Project ID against which to make the request.
+  string project_id = 1;
+
+  // The index to create. The name and state fields are output only and will be
+  // ignored. Single property indexes cannot be created or deleted.
+  Index index = 3;
+}
+
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.DeleteIndex][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex].
+message DeleteIndexRequest {
+  // Project ID against which to make the request.
+  string project_id = 1;
+
+  // The resource ID of the index to delete.
+  string index_id = 3;
+}
+
+// The request for [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
+message GetIndexRequest {
+  // Project ID against which to make the request.
+  string project_id = 1;
+
+  // The resource ID of the index to get.
+  string index_id = 3;
+}
+
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.ListIndexes][google.datastore.admin.v1.DatastoreAdmin.ListIndexes].
+message ListIndexesRequest {
+  // Project ID against which to make the request.
+  string project_id = 1;
+
+  string filter = 3;
+
+  // The maximum number of items to return.  If zero, then all results will be
+  // returned.
+  int32 page_size = 4;
+
+  // The next_page_token value returned from a previous List request, if any.
+  string page_token = 5;
+}
+
+// The response for
+// [google.datastore.admin.v1.DatastoreAdmin.ListIndexes][google.datastore.admin.v1.DatastoreAdmin.ListIndexes].
+message ListIndexesResponse {
+  // The indexes.
+  repeated Index indexes = 1;
+
+  // The standard List next-page token.
+  string next_page_token = 2;
+}
+
+// Metadata for Index operations.
+message IndexOperationMetadata {
+  // Metadata common to all Datastore Admin operations.
+  CommonMetadata common = 1;
+
+  // An estimate of the number of entities processed.
+  Progress progress_entities = 2;
+
+  // The index resource ID that this operation is acting on.
+  string index_id = 3;
+}
+
+// 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}/datastore-firestore-migration`
+message DatastoreFirestoreMigrationMetadata {
+  // The current state of migration from Cloud Datastore to Cloud Firestore in
+  // Datastore mode.
+  MigrationState migration_state = 1;
+
+  // The current step of migration from Cloud Datastore to Cloud Firestore in
+  // Datastore mode.
+  MigrationStep migration_step = 2;
+}
+
+// Operation types.
+enum OperationType {
+  // Unspecified.
+  OPERATION_TYPE_UNSPECIFIED = 0;
+
+  // ExportEntities.
+  EXPORT_ENTITIES = 1;
+
+  // ImportEntities.
+  IMPORT_ENTITIES = 2;
+
+  // CreateIndex.
+  CREATE_INDEX = 3;
+
+  // DeleteIndex.
+  DELETE_INDEX = 4;
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
new file mode 100644
index 000000000000..a211e7c97a95
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
@@ -0,0 +1,116 @@
+// Copyright 2021 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.
+
+syntax = "proto3";
+
+package google.datastore.admin.v1;
+
+import "google/api/field_behavior.proto";
+import "google/api/annotations.proto";
+
+option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
+option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option java_multiple_files = true;
+option java_outer_classname = "IndexProto";
+option java_package = "com.google.datastore.admin.v1";
+option php_namespace = "Google\\Cloud\\Datastore\\Admin\\V1";
+option ruby_package = "Google::Cloud::Datastore::Admin::V1";
+
+// Datastore composite index definition.
+message Index {
+  // A property of an index.
+  message IndexedProperty {
+    // Required. The property name to index.
+    string name = 1 [(google.api.field_behavior) = REQUIRED];
+
+    // Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+    Direction direction = 2 [(google.api.field_behavior) = REQUIRED];
+  }
+
+  // For an ordered index, specifies whether each of the entity's ancestors
+  // will be included.
+  enum AncestorMode {
+    // The ancestor mode is unspecified.
+    ANCESTOR_MODE_UNSPECIFIED = 0;
+
+    // Do not include the entity's ancestors in the index.
+    NONE = 1;
+
+    // Include all the entity's ancestors in the index.
+    ALL_ANCESTORS = 2;
+  }
+
+  // The direction determines how a property is indexed.
+  enum Direction {
+    // The direction is unspecified.
+    DIRECTION_UNSPECIFIED = 0;
+
+    // The property's values are indexed so as to support sequencing in
+    // ascending order and also query by <, >, <=, >=, and =.
+    ASCENDING = 1;
+
+    // The property's values are indexed so as to support sequencing in
+    // descending order and also query by <, >, <=, >=, and =.
+    DESCENDING = 2;
+  }
+
+  // The possible set of states of an index.
+  enum State {
+    // The state is unspecified.
+    STATE_UNSPECIFIED = 0;
+
+    // The index is being created, and cannot be used by queries.
+    // There is an active long-running operation for the index.
+    // The index is updated when writing an entity.
+    // Some index data may exist.
+    CREATING = 1;
+
+    // The index is ready to be used.
+    // The index is updated when writing an entity.
+    // The index is fully populated from all stored entities it applies to.
+    READY = 2;
+
+    // The index is being deleted, and cannot be used by queries.
+    // There is an active long-running operation for the index.
+    // The index is not updated when writing an entity.
+    // Some index data may exist.
+    DELETING = 3;
+
+    // The index was being created or deleted, but something went wrong.
+    // The index cannot by used by queries.
+    // There is no active long-running operation for the index,
+    // and the most recently finished long-running operation failed.
+    // The index is not updated when writing an entity.
+    // Some index data may exist.
+    ERROR = 4;
+  }
+
+  // Output only. Project ID.
+  string project_id = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
+
+  // Output only. The resource ID of the index.
+  string index_id = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
+
+  // Required. The entity kind to which this index applies.
+  string kind = 4 [(google.api.field_behavior) = REQUIRED];
+
+  // Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+  AncestorMode ancestor = 5 [(google.api.field_behavior) = REQUIRED];
+
+  // Required. An ordered sequence of property names and their index attributes.
+  repeated IndexedProperty properties = 6 [(google.api.field_behavior) = REQUIRED];
+
+  // Output only. The state of the index.
+  State state = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
+}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
new file mode 100644
index 000000000000..aab41706fe58
--- /dev/null
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
@@ -0,0 +1,123 @@
+// Copyright 2021 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.
+
+syntax = "proto3";
+
+package google.datastore.admin.v1;
+
+import "google/api/annotations.proto";
+
+option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
+option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option java_multiple_files = true;
+option java_outer_classname = "MigrationProto";
+option java_package = "com.google.datastore.admin.v1";
+option php_namespace = "Google\\Cloud\\Datastore\\Admin\\V1";
+option ruby_package = "Google::Cloud::Datastore::Admin::V1";
+
+// An event signifying a change in state of a [migration from Cloud Datastore to
+// Cloud Firestore in Datastore
+// mode](https://cloud.google.com/datastore/docs/upgrade-to-firestore).
+message MigrationStateEvent {
+  // The new state of the migration.
+  MigrationState state = 1;
+}
+
+// An event signifying the start of a new step in a [migration from Cloud
+// Datastore to Cloud Firestore in Datastore
+// mode](https://cloud.google.com/datastore/docs/upgrade-to-firestore).
+message MigrationProgressEvent {
+  // Details for the `PREPARE` step.
+  message PrepareStepDetails {
+    // The concurrency mode this database will use when it reaches the
+    // `REDIRECT_WRITES` step.
+    ConcurrencyMode concurrency_mode = 1;
+  }
+
+  // Details for the `REDIRECT_WRITES` step.
+  message RedirectWritesStepDetails {
+    // Ths concurrency mode for this database.
+    ConcurrencyMode concurrency_mode = 1;
+  }
+
+  // Concurrency modes for transactions in Cloud Firestore.
+  enum ConcurrencyMode {
+    // Unspecified.
+    CONCURRENCY_MODE_UNSPECIFIED = 0;
+
+    // Pessimistic concurrency.
+    PESSIMISTIC = 1;
+
+    // Optimistic concurrency.
+    OPTIMISTIC = 2;
+  }
+
+  // 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.
+  MigrationStep step = 1;
+
+  // Details about this step.
+  oneof step_details {
+    // Details for the `PREPARE` step.
+    PrepareStepDetails prepare_step_details = 2;
+
+    // Details for the `REDIRECT_WRITES` step.
+    RedirectWritesStepDetails redirect_writes_step_details = 3;
+  }
+}
+
+// States for a migration.
+enum MigrationState {
+  // Unspecified.
+  MIGRATION_STATE_UNSPECIFIED = 0;
+
+  // The migration is running.
+  RUNNING = 1;
+
+  // The migration is paused.
+  PAUSED = 2;
+
+  // The migration is complete.
+  COMPLETE = 3;
+}
+
+// Steps in a migration.
+enum MigrationStep {
+  // Unspecified.
+  MIGRATION_STEP_UNSPECIFIED = 0;
+
+  // Pre-migration: the database is prepared for migration.
+  PREPARE = 6;
+
+  // Start of migration.
+  START = 1;
+
+  // Writes are applied synchronously to at least one replica.
+  APPLY_WRITES_SYNCHRONOUSLY = 7;
+
+  // Data is copied to Cloud Firestore and then verified to match the data in
+  // Cloud Datastore.
+  COPY_AND_VERIFY = 2;
+
+  // Eventually-consistent reads are redirected to Cloud Firestore.
+  REDIRECT_EVENTUALLY_CONSISTENT_READS = 3;
+
+  // Strongly-consistent reads are redirected to Cloud Firestore.
+  REDIRECT_STRONGLY_CONSISTENT_READS = 4;
+
+  // Writes are redirected to Cloud Firestore.
+  REDIRECT_WRITES = 5;
+}
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 f992eec2bd01..54a39945fb09 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
@@ -151,6 +151,9 @@ public interface PathElementOrBuilder
      * 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.
      * 
      *
      * string kind = 1;
@@ -166,6 +169,9 @@ public interface PathElementOrBuilder
      * 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.
      * 
      *
      * string kind = 1;
@@ -211,6 +217,9 @@ public interface PathElementOrBuilder
      * 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.
      * 
      *
      * string name = 3;
@@ -226,6 +235,9 @@ public interface PathElementOrBuilder
      * 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.
      * 
      *
      * string name = 3;
@@ -241,6 +253,9 @@ public interface PathElementOrBuilder
      * 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.
      * 
      *
      * string name = 3;
@@ -418,6 +433,9 @@ public IdTypeCase getIdTypeCase() {
      * 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.
      * 
      *
      * string kind = 1;
@@ -444,6 +462,9 @@ public java.lang.String getKind() {
      * 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.
      * 
      *
      * string kind = 1;
@@ -511,6 +532,9 @@ public long getId() {
      * 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.
      * 
      *
      * string name = 3;
@@ -528,6 +552,9 @@ public boolean hasName() {
      * 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.
      * 
      *
      * string name = 3;
@@ -558,6 +585,9 @@ public java.lang.String getName() {
      * 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.
      * 
      *
      * string name = 3;
@@ -989,6 +1019,9 @@ public Builder clearIdType() {
        * 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.
        * 
        *
        * string kind = 1;
@@ -1014,6 +1047,9 @@ public java.lang.String getKind() {
        * 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.
        * 
        *
        * string kind = 1;
@@ -1039,6 +1075,9 @@ public com.google.protobuf.ByteString getKindBytes() {
        * 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.
        * 
        *
        * string kind = 1;
@@ -1063,6 +1102,9 @@ public Builder setKind(java.lang.String value) {
        * 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.
        * 
        *
        * string kind = 1;
@@ -1083,6 +1125,9 @@ public Builder clearKind() {
        * 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.
        * 
        *
        * string kind = 1;
@@ -1186,6 +1231,9 @@ public Builder clearId() {
        * 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.
        * 
        *
        * string name = 3;
@@ -1204,6 +1252,9 @@ public boolean hasName() {
        * 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.
        * 
        *
        * string name = 3;
@@ -1235,6 +1286,9 @@ public java.lang.String getName() {
        * 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.
        * 
        *
        * string name = 3;
@@ -1266,6 +1320,9 @@ public com.google.protobuf.ByteString getNameBytes() {
        * 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.
        * 
        *
        * string name = 3;
@@ -1290,6 +1347,9 @@ public Builder setName(java.lang.String value) {
        * 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.
        * 
        *
        * string name = 3;
@@ -1312,6 +1372,9 @@ public Builder clearName() {
        * 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.
        * 
        *
        * string name = 3;
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 befbcd7b6578..55d7b64fe5f2 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
@@ -66,22 +66,33 @@ message Key {
   // If neither is set, the element is incomplete.
   message PathElement {
     // 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__` where `` is the base-64 encoding of the
+    // bytes.
     string kind = 1;
 
     // The type of ID.
     oneof id_type {
       // 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.
       int64 id = 2;
 
       // 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__` where `` is the base-64 encoding of the
+      // bytes.
       string name = 3;
     }
   }
diff --git a/versions.txt b/versions.txt
index 5896f28c077a..1588aaced2a5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -5,3 +5,5 @@ google-cloud-datastore:2.5.1:2.5.2-SNAPSHOT
 google-cloud-datastore-bom:2.5.1:2.5.2-SNAPSHOT
 proto-google-cloud-datastore-v1:0.96.1:0.96.2-SNAPSHOT
 datastore-v1-proto-client:2.5.1:2.5.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.5.1:2.5.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.5.1:2.5.2-SNAPSHOT

From b33363058fd87e529b59f05139355f16cc97cf39 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 31 May 2022 14:18:11 -0400
Subject: [PATCH 0861/1784] chore(fix): remove unused dependency (#755)

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 391e807f0aa1..53e6b22818ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,11 +161,6 @@
         proto-google-cloud-datastore-admin-v1
         2.5.2-SNAPSHOT
           
-      
-        com.google.api.grpc
-        grpc-google-cloud-datastore-v1
-        2.5.2-SNAPSHOT
-      
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1

From 6e6cd3f7db0dabfcf271bbd54354ae43c7d1f02e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 20:00:59 +0000
Subject: [PATCH 0862/1784] chore(main): release 2.6.0 (#756)

:robot: I have created a release *beep* *boop*
---


## [2.6.0](https://github.com/googleapis/java-datastore/compare/v2.5.1...v2.6.0) (2022-05-31)


### Features

* Expose Datastore Admin generated client ([#748](https://github.com/googleapis/java-datastore/issues/748)) ([3dd882a](https://github.com/googleapis/java-datastore/commit/3dd882a9ffe2a8828cdedcdc2e562c9354aebfbc))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3379e26c711c..b0a3dabb6fb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.6.0](https://github.com/googleapis/java-datastore/compare/v2.5.1...v2.6.0) (2022-05-31)
+
+
+### Features
+
+* Expose Datastore Admin generated client ([#748](https://github.com/googleapis/java-datastore/issues/748)) ([3dd882a](https://github.com/googleapis/java-datastore/commit/3dd882a9ffe2a8828cdedcdc2e562c9354aebfbc))
+
 ### [2.5.1](https://github.com/googleapis/java-datastore/compare/v2.5.0...v2.5.1) (2022-05-25)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3d35992b47d9..520fb0c4cc6c 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.5.2-SNAPSHOT
+  2.6.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.2-SNAPSHOT
+    2.6.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 61f5da040345..641162b1c47e 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.5.2-SNAPSHOT
+  2.6.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.5.2-SNAPSHOT
+        2.6.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.5.2-SNAPSHOT
+        2.6.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.2-SNAPSHOT
+        0.97.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.5.2-SNAPSHOT
+        2.6.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 53ebc76a0008..4da0e07d52de 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.5.2-SNAPSHOT
+  2.6.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.2-SNAPSHOT
+    2.6.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 170eea0c2aad..0ff807b3e537 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.5.2-SNAPSHOT
+  2.6.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.2-SNAPSHOT
+    2.6.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 53e6b22818ea..6f011506e83b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.5.2-SNAPSHOT
+  2.6.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.5.2-SNAPSHOT
+        2.6.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.5.2-SNAPSHOT
+        2.6.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.5.2-SNAPSHOT
+        2.6.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.96.2-SNAPSHOT
+        0.97.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.5.2-SNAPSHOT
+        2.6.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 ac1106424fbc..831a69581897 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.5.2-SNAPSHOT
+  2.6.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.2-SNAPSHOT
+    2.6.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8a5e446c27d6..3eec058fa380 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.96.2-SNAPSHOT
+  0.97.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.5.2-SNAPSHOT
+    2.6.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 1588aaced2a5..536443e9821c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.5.1:2.5.2-SNAPSHOT
-google-cloud-datastore-bom:2.5.1:2.5.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.96.1:0.96.2-SNAPSHOT
-datastore-v1-proto-client:2.5.1:2.5.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.5.1:2.5.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.5.1:2.5.2-SNAPSHOT
+google-cloud-datastore:2.6.0:2.6.0
+google-cloud-datastore-bom:2.6.0:2.6.0
+proto-google-cloud-datastore-v1:0.97.0:0.97.0
+datastore-v1-proto-client:2.6.0:2.6.0
+proto-google-cloud-datastore-admin-v1:2.6.0:2.6.0
+grpc-google-cloud-datastore-admin-v1:2.6.0:2.6.0

From 057b5b3d19ccfc35f72554ac3e0653a0ba9148fb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 20:08:19 +0000
Subject: [PATCH 0863/1784] chore(main): release 2.6.1-SNAPSHOT (#757)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 520fb0c4cc6c..e79c24863bf9 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.6.0
+  2.6.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.0
+    2.6.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 641162b1c47e..ac99b4ab7249 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.6.0
+  2.6.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.6.0
+        2.6.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.6.0
+        2.6.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.97.0
+        0.97.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.6.0
+        2.6.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4da0e07d52de..220ac4fa3027 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.6.0
+  2.6.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.0
+    2.6.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0ff807b3e537..07eacf76cb96 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.6.0
+  2.6.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.0
+    2.6.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 6f011506e83b..ecff13b02eeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.6.0
+  2.6.1-SNAPSHOT
   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.6.0
+        2.6.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.6.0
+        2.6.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.6.0
+        2.6.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.97.0
+        0.97.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.6.0
+        2.6.1-SNAPSHOT
         
           
             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 831a69581897..8ebd902122c4 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.6.0
+  2.6.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.0
+    2.6.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3eec058fa380..aeec7ee3ca18 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.97.0
+  0.97.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.0
+    2.6.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 536443e9821c..5f06c6bcc561 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.6.0:2.6.0
-google-cloud-datastore-bom:2.6.0:2.6.0
-proto-google-cloud-datastore-v1:0.97.0:0.97.0
-datastore-v1-proto-client:2.6.0:2.6.0
-proto-google-cloud-datastore-admin-v1:2.6.0:2.6.0
-grpc-google-cloud-datastore-admin-v1:2.6.0:2.6.0
+google-cloud-datastore:2.6.0:2.6.1-SNAPSHOT
+google-cloud-datastore-bom:2.6.0:2.6.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.97.0:0.97.1-SNAPSHOT
+datastore-v1-proto-client:2.6.0:2.6.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.6.0:2.6.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.6.0:2.6.1-SNAPSHOT

From df6b793cb66424ad470fe871f9a3868ae482e1a4 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 10:06:39 -0400
Subject: [PATCH 0864/1784] docs: clarifications for
 `DatastoreFirestoreMigraitonMetadata` (#759)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: clarifications for `DatastoreFirestoreMigraitonMetadata`
feat: new enum value `OPTIMISTIC_WITH_ENTITY_GROUPS` for `ConcurrencyMode`

PiperOrigin-RevId: 452220654

Source-Link: https://github.com/googleapis/googleapis/commit/454ad5ec43997b2b2fff15b2c0d86677fecdc60e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/45e72318c728b40c2131df1b5650965b68eb3bed
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDVlNzIzMThjNzI4YjQwYzIxMzFkZjFiNTY1MDk2NWI2OGViM2JlZCJ9

* 🦉 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                                     |  4 +-
 .../admin/v1/DatastoreAdminClient.java        | 50 +++++++++++--
 .../admin/v1/DatastoreAdminSettings.java      |  4 +-
 .../datastore/admin/v1/package-info.java      |  4 +-
 .../admin/v1/stub/DatastoreAdminStub.java     |  2 +-
 .../v1/stub/DatastoreAdminStubSettings.java   |  5 +-
 .../GrpcDatastoreAdminCallableFactory.java    |  2 +-
 .../admin/v1/stub/GrpcDatastoreAdminStub.java |  2 +-
 .../admin/v1/DatastoreAdminClientTest.java    |  2 +-
 .../admin/v1/MockDatastoreAdmin.java          |  2 +-
 .../admin/v1/MockDatastoreAdminImpl.java      |  2 +-
 .../datastore/admin/v1/CommonMetadata.java    | 21 +++---
 .../admin/v1/CommonMetadataOrBuilder.java     |  7 +-
 .../admin/v1/CreateIndexRequest.java          |  2 +
 .../DatastoreFirestoreMigrationMetadata.java  |  6 +-
 .../admin/v1/DeleteIndexRequest.java          |  2 +
 .../datastore/admin/v1/EntityFilter.java      |  2 +
 .../admin/v1/ExportEntitiesMetadata.java      |  2 +
 .../admin/v1/ExportEntitiesRequest.java       | 21 +++---
 .../v1/ExportEntitiesRequestOrBuilder.java    |  7 +-
 .../admin/v1/ExportEntitiesResponse.java      |  2 +
 .../datastore/admin/v1/GetIndexRequest.java   |  2 +
 .../admin/v1/ImportEntitiesMetadata.java      |  2 +
 .../admin/v1/ImportEntitiesRequest.java       | 21 +++---
 .../v1/ImportEntitiesRequestOrBuilder.java    |  7 +-
 .../com/google/datastore/admin/v1/Index.java  |  4 +
 .../admin/v1/IndexOperationMetadata.java      |  2 +
 .../google/datastore/admin/v1/IndexProto.java | 47 ++++++------
 .../admin/v1/ListIndexesRequest.java          |  2 +
 .../admin/v1/ListIndexesResponse.java         |  2 +
 .../admin/v1/MigrationProgressEvent.java      | 34 ++++++++-
 .../datastore/admin/v1/MigrationProto.java    | 74 +++++++++----------
 .../admin/v1/MigrationStateEvent.java         |  2 +
 .../google/datastore/admin/v1/Progress.java   |  2 +
 .../datastore/admin/v1/datastore_admin.proto  |  4 +-
 .../google/datastore/admin/v1/index.proto     | 21 +++---
 .../google/datastore/admin/v1/migration.proto | 31 ++++----
 37 files changed, 265 insertions(+), 143 deletions(-)

diff --git a/README.md b/README.md
index 8ef1502657c6..5718ca4e87b3 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.5.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.6.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.5.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.6.0"
 ```
 
 ## Authentication
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 5bbcc6a29331..f29717e5a87b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -18,7 +18,6 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
-import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
@@ -113,6 +112,8 @@
  * calls that map to API methods. Sample code to get started:
  *
  * 
    {@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
  * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
  *   GetIndexRequest request =
  *       GetIndexRequest.newBuilder()
@@ -152,6 +153,8 @@
  * 
    To customize credentials:
  *
  * 
    {@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
  * DatastoreAdminSettings datastoreAdminSettings =
  *     DatastoreAdminSettings.newBuilder()
  *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
@@ -162,6 +165,8 @@
  * 
    To customize the endpoint:
  *
  * 
    {@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
  * DatastoreAdminSettings datastoreAdminSettings =
  *     DatastoreAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
  * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings);
@@ -193,7 +198,6 @@ public static final DatastoreAdminClient create(DatastoreAdminSettings settings)
    * Constructs an instance of DatastoreAdminClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(DatastoreAdminSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final DatastoreAdminClient create(DatastoreAdminStub stub) {
     return new DatastoreAdminClient(stub);
   }
@@ -209,7 +213,6 @@ protected DatastoreAdminClient(DatastoreAdminSettings settings) throws IOExcepti
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected DatastoreAdminClient(DatastoreAdminStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -220,7 +223,6 @@ public final DatastoreAdminSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public DatastoreAdminStub getStub() {
     return stub;
   }
@@ -245,6 +247,8 @@ public final OperationsClient getOperationsClient() {
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   String projectId = "projectId-894832108";
    *   Map labels = new HashMap<>();
@@ -303,6 +307,8 @@ public final OperationFuture exp
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ExportEntitiesRequest request =
    *       ExportEntitiesRequest.newBuilder()
@@ -335,6 +341,8 @@ public final OperationFuture exp
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ExportEntitiesRequest request =
    *       ExportEntitiesRequest.newBuilder()
@@ -368,6 +376,8 @@ public final OperationFuture exp
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ExportEntitiesRequest request =
    *       ExportEntitiesRequest.newBuilder()
@@ -397,6 +407,8 @@ public final UnaryCallable exportEntitiesCalla
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   String projectId = "projectId-894832108";
    *   Map labels = new HashMap<>();
@@ -446,6 +458,8 @@ public final OperationFuture importEntitiesAsync(
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ImportEntitiesRequest request =
    *       ImportEntitiesRequest.newBuilder()
@@ -476,6 +490,8 @@ public final OperationFuture importEntitiesAsync(
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ImportEntitiesRequest request =
    *       ImportEntitiesRequest.newBuilder()
@@ -506,6 +522,8 @@ public final OperationFuture importEntitiesAsync(
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ImportEntitiesRequest request =
    *       ImportEntitiesRequest.newBuilder()
@@ -542,6 +560,8 @@ public final UnaryCallable importEntitiesCalla
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   CreateIndexRequest request =
    *       CreateIndexRequest.newBuilder()
@@ -577,6 +597,8 @@ public final OperationFuture createIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   CreateIndexRequest request =
    *       CreateIndexRequest.newBuilder()
@@ -612,6 +634,8 @@ public final OperationFuture createIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   CreateIndexRequest request =
    *       CreateIndexRequest.newBuilder()
@@ -643,6 +667,8 @@ public final UnaryCallable createIndexCallable()
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   DeleteIndexRequest request =
    *       DeleteIndexRequest.newBuilder()
@@ -676,6 +702,8 @@ public final OperationFuture deleteIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   DeleteIndexRequest request =
    *       DeleteIndexRequest.newBuilder()
@@ -709,6 +737,8 @@ public final OperationFuture deleteIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   DeleteIndexRequest request =
    *       DeleteIndexRequest.newBuilder()
@@ -732,6 +762,8 @@ public final UnaryCallable deleteIndexCallable()
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   GetIndexRequest request =
    *       GetIndexRequest.newBuilder()
@@ -756,6 +788,8 @@ public final Index getIndex(GetIndexRequest request) {
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   GetIndexRequest request =
    *       GetIndexRequest.newBuilder()
@@ -780,6 +814,8 @@ public final UnaryCallable getIndexCallable() {
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ListIndexesRequest request =
    *       ListIndexesRequest.newBuilder()
@@ -809,6 +845,8 @@ public final ListIndexesPagedResponse listIndexes(ListIndexesRequest request) {
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ListIndexesRequest request =
    *       ListIndexesRequest.newBuilder()
@@ -838,6 +876,8 @@ public final ListIndexesPagedResponse listIndexes(ListIndexesRequest request) {
    * 
    Sample code:
    *
    * 
    {@code
+   * // This snippet has been automatically generated for illustrative purposes only.
+   * // It may require modifications to work in your environment.
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ListIndexesRequest request =
    *       ListIndexesRequest.newBuilder()
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index ebb971f5034a..4c5934044d73 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -67,6 +67,8 @@
  * 
    For example, to set the total timeout of getIndex to 30 seconds:
  *
  * 
    {@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
  * DatastoreAdminSettings.Builder datastoreAdminSettingsBuilder =
  *     DatastoreAdminSettings.newBuilder();
  * datastoreAdminSettingsBuilder
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
index dd1642f615a0..4bb6f2eea484 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -79,6 +79,8 @@
  * 
    Sample for DatastoreAdminClient:
  *
  * 
    {@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
  * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
  *   GetIndexRequest request =
  *       GetIndexRequest.newBuilder()
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
index 8014b0192357..d32578ef4aae 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 682fe82f31f6..022f84095f73 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -85,6 +85,8 @@
  * 
    For example, to set the total timeout of getIndex to 30 seconds:
  *
  * 
    {@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
  * DatastoreAdminStubSettings.Builder datastoreAdminSettingsBuilder =
  *     DatastoreAdminStubSettings.newBuilder();
  * datastoreAdminSettingsBuilder
@@ -234,7 +236,6 @@ public UnaryCallSettings getIndexSettings() {
     return listIndexesSettings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public DatastoreAdminStub createStub() throws IOException {
     if (getTransportChannelProvider()
         .getTransportName()
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
index 6fa63fd35df1..c55ab938aa64 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
index 81e35b3a0bbf..be17f9ae0397 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
index 577037ec4527..03538b47e1b8 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
index ee0a0961b549..3c683fc8c33f 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
index 9536e69e260f..b27dcf28c92d 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 240290b300f2..f673a574dd9b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -140,6 +140,8 @@ private CommonMetadata(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -613,7 +615,7 @@ public int getLabelsCount() {
   @java.lang.Override
   public boolean containsLabels(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetLabels().getMap().containsKey(key);
   }
@@ -650,7 +652,7 @@ public java.util.Map getLabelsMap() {
   @java.lang.Override
   public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -668,7 +670,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
   @java.lang.Override
   public java.lang.String getLabelsOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map = internalGetLabels().getMap();
     if (!map.containsKey(key)) {
@@ -1641,7 +1643,7 @@ public int getLabelsCount() {
     @java.lang.Override
     public boolean containsLabels(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetLabels().getMap().containsKey(key);
     }
@@ -1679,7 +1681,7 @@ public java.util.Map getLabelsMap() {
     public java.lang.String getLabelsOrDefault(
         java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -1697,7 +1699,7 @@ public java.lang.String getLabelsOrDefault(
     @java.lang.Override
     public java.lang.String getLabelsOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map = internalGetLabels().getMap();
       if (!map.containsKey(key)) {
@@ -1722,7 +1724,7 @@ public Builder clearLabels() {
      */
     public Builder removeLabels(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
@@ -1744,11 +1746,12 @@ public java.util.Map getMutableLabels() {
      */
     public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableLabels().getMutableMap().put(key, value);
       return this;
     }
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 470d8c0400ac..a67d22e0fcf3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -166,7 +166,12 @@ public interface CommonMetadataOrBuilder
    *
    * map<string, string> labels = 4;
    */
-  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
+
+  /* nullable */
+  java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue);
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 49f3175234d1..9d73ec24d248 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -105,6 +105,8 @@ private CreateIndexRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index 911de0dae742..9520019141bb 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -27,7 +27,7 @@
  * an explicit "creation" method. This is an intentional deviation from the LRO
  * design pattern.
  * This singleton resource can be accessed at:
- * `projects/{project_id}/datastore-firestore-migration`
+ * "projects/{project_id}/operations/datastore-firestore-migration"
  * 
    
  *
  * Protobuf type {@code google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata}
@@ -103,6 +103,8 @@ private DatastoreFirestoreMigrationMetadata(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -385,7 +387,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * an explicit "creation" method. This is an intentional deviation from the LRO
    * design pattern.
    * This singleton resource can be accessed at:
-   * `projects/{project_id}/datastore-firestore-migration`
+   * "projects/{project_id}/operations/datastore-firestore-migration"
    * 
    
    *
    * Protobuf type {@code google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata}
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 f3b255d0e8e6..50e88951982a 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
@@ -97,6 +97,8 @@ private DeleteIndexRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 f67639cd1a01..d714b68b0d15 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
@@ -116,6 +116,8 @@ private EntityFilter(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 646fc6921b08..265c5dbec758 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
@@ -152,6 +152,8 @@ private ExportEntitiesMetadata(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 6921596739e3..945292d0232d 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
@@ -127,6 +127,8 @@ private ExportEntitiesRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -247,7 +249,7 @@ public int getLabelsCount() {
   @java.lang.Override
   public boolean containsLabels(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetLabels().getMap().containsKey(key);
   }
@@ -282,7 +284,7 @@ public java.util.Map getLabelsMap() {
   @java.lang.Override
   public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -299,7 +301,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
   @java.lang.Override
   public java.lang.String getLabelsOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map = internalGetLabels().getMap();
     if (!map.containsKey(key)) {
@@ -983,7 +985,7 @@ public int getLabelsCount() {
     @java.lang.Override
     public boolean containsLabels(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetLabels().getMap().containsKey(key);
     }
@@ -1019,7 +1021,7 @@ public java.util.Map getLabelsMap() {
     public java.lang.String getLabelsOrDefault(
         java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -1036,7 +1038,7 @@ public java.lang.String getLabelsOrDefault(
     @java.lang.Override
     public java.lang.String getLabelsOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map = internalGetLabels().getMap();
       if (!map.containsKey(key)) {
@@ -1060,7 +1062,7 @@ public Builder clearLabels() {
      */
     public Builder removeLabels(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
@@ -1081,11 +1083,12 @@ public java.util.Map getMutableLabels() {
      */
     public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableLabels().getMutableMap().put(key, value);
       return this;
     }
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 1e89f39dc38c..639802398220 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
@@ -90,7 +90,12 @@ public interface ExportEntitiesRequestOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
+
+  /* nullable */
+  java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue);
   /**
    *
    *
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 43e882659cfa..23ef5aa68eca 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
@@ -89,6 +89,8 @@ private ExportEntitiesResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 fa24ee2178a3..173eb97eb866 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
@@ -96,6 +96,8 @@ private GetIndexRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 b4925d13aef7..b1116dde902d 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
@@ -152,6 +152,8 @@ private ImportEntitiesMetadata(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 ecc1bcad757e..71ef341ac2eb 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
@@ -127,6 +127,8 @@ private ImportEntitiesRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -247,7 +249,7 @@ public int getLabelsCount() {
   @java.lang.Override
   public boolean containsLabels(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetLabels().getMap().containsKey(key);
   }
@@ -282,7 +284,7 @@ public java.util.Map getLabelsMap() {
   @java.lang.Override
   public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -299,7 +301,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
   @java.lang.Override
   public java.lang.String getLabelsOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map map = internalGetLabels().getMap();
     if (!map.containsKey(key)) {
@@ -986,7 +988,7 @@ public int getLabelsCount() {
     @java.lang.Override
     public boolean containsLabels(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetLabels().getMap().containsKey(key);
     }
@@ -1022,7 +1024,7 @@ public java.util.Map getLabelsMap() {
     public java.lang.String getLabelsOrDefault(
         java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -1039,7 +1041,7 @@ public java.lang.String getLabelsOrDefault(
     @java.lang.Override
     public java.lang.String getLabelsOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map map = internalGetLabels().getMap();
       if (!map.containsKey(key)) {
@@ -1063,7 +1065,7 @@ public Builder clearLabels() {
      */
     public Builder removeLabels(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
@@ -1084,11 +1086,12 @@ public java.util.Map getMutableLabels() {
      */
     public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableLabels().getMutableMap().put(key, value);
       return this;
     }
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 9d29365b46ff..e3d1d782f7df 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
@@ -90,7 +90,12 @@ public interface ImportEntitiesRequestOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
+
+  /* nullable */
+  java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue);
   /**
    *
    *
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 582005f9e884..74be6fcce616 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
@@ -135,6 +135,8 @@ private Index(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -844,6 +846,8 @@ private IndexedProperty(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
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 3ec19e57865c..d365164205e9 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
@@ -120,6 +120,8 @@ private IndexOperationMetadata(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 da3e67c5c229..d30a12ec7dbd 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,36 +46,34 @@ 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\032\034google/api/annotati"
-          + "ons.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-.google.datast"
-          + "ore.admin.v1.Index.AncestorModeB\003\340A\002\022I\n\n"
-          + "properties\030\006 \003(\01320.google.datastore.admi"
-          + "n.v1.Index.IndexedPropertyB\003\340A\002\022:\n\005state"
-          + "\030\007 \001(\0162&.google.datastore.admin.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.da"
-          + "tastore.admin.v1.Index.DirectionB\003\340A\002\"J\n"
-          + "\014AncestorMode\022\035\n\031ANCESTOR_MODE_UNSPECIFI"
-          + "ED\020\000\022\010\n\004NONE\020\001\022\021\n\rALL_ANCESTORS\020\002\"E\n\tDir"
-          + "ection\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASC"
-          + "ENDING\020\001\022\016\n\nDESCENDING\020\002\"P\n\005State\022\025\n\021STA"
-          + "TE_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\327\001\n\035com.googl"
-          + "e.datastore.admin.v1B\nIndexProtoP\001Z>goog"
-          + "le.golang.org/genproto/googleapis/datast"
-          + "ore/admin/v1;admin\252\002\037Google.Cloud.Datast"
-          + "ore.Admin.V1\312\002\037Google\\Cloud\\Datastore\\Ad"
-          + "min\\V1\352\002#Google::Cloud::Datastore::Admin"
-          + "::V1b\006proto3"
+          + "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\327\001\n"
+          + "\035com.google.datastore.admin.v1B\nIndexPro"
+          + "toP\001Z>google.golang.org/genproto/googlea"
+          + "pis/datastore/admin/v1;admin\252\002\037Google.Cl"
+          + "oud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Da"
+          + "tastore\\Admin\\V1\352\002#Google::Cloud::Datast"
+          + "ore::Admin::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.api.FieldBehaviorProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_datastore_admin_v1_Index_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -99,7 +97,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
         descriptor, registry);
     com.google.api.FieldBehaviorProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 e9cb9a2faa1b..b10fa04b472e 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
@@ -110,6 +110,8 @@ private ListIndexesRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 acf63df2cb29..02cacc41019b 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
@@ -102,6 +102,8 @@ private ListIndexesResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 1dc1db1f84fe..d2c8bb86ebc6 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
@@ -139,6 +139,8 @@ private MigrationProgressEvent(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -202,6 +204,16 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum {
      * OPTIMISTIC = 2;
      */
     OPTIMISTIC(2),
+    /**
+     *
+     *
+     * 
    +     * Optimistic concurrency with entity groups.
+     * 
    
+     *
+     * OPTIMISTIC_WITH_ENTITY_GROUPS = 3;
+     */
+    OPTIMISTIC_WITH_ENTITY_GROUPS(3),
     UNRECOGNIZED(-1),
     ;
 
@@ -235,6 +247,16 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum {
      * OPTIMISTIC = 2;
      */
     public static final int OPTIMISTIC_VALUE = 2;
+    /**
+     *
+     *
+     * 
    +     * Optimistic concurrency with entity groups.
+     * 
    
+     *
+     * OPTIMISTIC_WITH_ENTITY_GROUPS = 3;
+     */
+    public static final int OPTIMISTIC_WITH_ENTITY_GROUPS_VALUE = 3;
 
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
@@ -266,6 +288,8 @@ public static ConcurrencyMode forNumber(int value) {
           return PESSIMISTIC;
         case 2:
           return OPTIMISTIC;
+        case 3:
+          return OPTIMISTIC_WITH_ENTITY_GROUPS;
         default:
           return null;
       }
@@ -427,6 +451,8 @@ private PrepareStepDetails(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -1107,6 +1133,8 @@ private RedirectWritesStepDetails(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -2551,8 +2579,9 @@ public Builder mergePrepareStepDetails(
       } else {
         if (stepDetailsCase_ == 2) {
           prepareStepDetailsBuilder_.mergeFrom(value);
+        } else {
+          prepareStepDetailsBuilder_.setMessage(value);
         }
-        prepareStepDetailsBuilder_.setMessage(value);
       }
       stepDetailsCase_ = 2;
       return this;
@@ -2797,8 +2826,9 @@ public Builder mergeRedirectWritesStepDetails(
       } else {
         if (stepDetailsCase_ == 3) {
           redirectWritesStepDetailsBuilder_.mergeFrom(value);
+        } else {
+          redirectWritesStepDetailsBuilder_.setMessage(value);
         }
-        redirectWritesStepDetailsBuilder_.setMessage(value);
       }
       stepDetailsCase_ = 3;
       return this;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index b78108447040..97561eebde51 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -53,47 +53,44 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n)google/datastore/admin/v1/migration.pr"
-          + "oto\022\031google.datastore.admin.v1\032\034google/a"
-          + "pi/annotations.proto\"O\n\023MigrationStateEv"
-          + "ent\0228\n\005state\030\001 \001(\0162).google.datastore.ad"
-          + "min.v1.MigrationState\"\376\004\n\026MigrationProgr"
-          + "essEvent\0226\n\004step\030\001 \001(\0162(.google.datastor"
-          + "e.admin.v1.MigrationStep\022d\n\024prepare_step"
-          + "_details\030\002 \001(\0132D.google.datastore.admin."
-          + "v1.MigrationProgressEvent.PrepareStepDet"
-          + "ailsH\000\022s\n\034redirect_writes_step_details\030\003"
-          + " \001(\0132K.google.datastore.admin.v1.Migrati"
-          + "onProgressEvent.RedirectWritesStepDetail"
-          + "sH\000\032q\n\022PrepareStepDetails\022[\n\020concurrency"
-          + "_mode\030\001 \001(\0162A.google.datastore.admin.v1."
-          + "MigrationProgressEvent.ConcurrencyMode\032x"
-          + "\n\031RedirectWritesStepDetails\022[\n\020concurren"
-          + "cy_mode\030\001 \001(\0162A.google.datastore.admin.v"
-          + "1.MigrationProgressEvent.ConcurrencyMode"
-          + "\"T\n\017ConcurrencyMode\022 \n\034CONCURRENCY_MODE_"
-          + "UNSPECIFIED\020\000\022\017\n\013PESSIMISTIC\020\001\022\016\n\nOPTIMI"
-          + "STIC\020\002B\016\n\014step_details*X\n\016MigrationState"
-          + "\022\037\n\033MIGRATION_STATE_UNSPECIFIED\020\000\022\013\n\007RUN"
-          + "NING\020\001\022\n\n\006PAUSED\020\002\022\014\n\010COMPLETE\020\003*\343\001\n\rMig"
-          + "rationStep\022\036\n\032MIGRATION_STEP_UNSPECIFIED"
-          + "\020\000\022\013\n\007PREPARE\020\006\022\t\n\005START\020\001\022\036\n\032APPLY_WRIT"
-          + "ES_SYNCHRONOUSLY\020\007\022\023\n\017COPY_AND_VERIFY\020\002\022"
-          + "(\n$REDIRECT_EVENTUALLY_CONSISTENT_READS\020"
-          + "\003\022&\n\"REDIRECT_STRONGLY_CONSISTENT_READS\020"
-          + "\004\022\023\n\017REDIRECT_WRITES\020\005B\333\001\n\035com.google.da"
-          + "tastore.admin.v1B\016MigrationProtoP\001Z>goog"
-          + "le.golang.org/genproto/googleapis/datast"
-          + "ore/admin/v1;admin\252\002\037Google.Cloud.Datast"
-          + "ore.Admin.V1\312\002\037Google\\Cloud\\Datastore\\Ad"
-          + "min\\V1\352\002#Google::Cloud::Datastore::Admin"
-          + "::V1b\006proto3"
+          + "oto\022\031google.datastore.admin.v1\"O\n\023Migrat"
+          + "ionStateEvent\0228\n\005state\030\001 \001(\0162).google.da"
+          + "tastore.admin.v1.MigrationState\"\241\005\n\026Migr"
+          + "ationProgressEvent\0226\n\004step\030\001 \001(\0162(.googl"
+          + "e.datastore.admin.v1.MigrationStep\022d\n\024pr"
+          + "epare_step_details\030\002 \001(\0132D.google.datast"
+          + "ore.admin.v1.MigrationProgressEvent.Prep"
+          + "areStepDetailsH\000\022s\n\034redirect_writes_step"
+          + "_details\030\003 \001(\0132K.google.datastore.admin."
+          + "v1.MigrationProgressEvent.RedirectWrites"
+          + "StepDetailsH\000\032q\n\022PrepareStepDetails\022[\n\020c"
+          + "oncurrency_mode\030\001 \001(\0162A.google.datastore"
+          + ".admin.v1.MigrationProgressEvent.Concurr"
+          + "encyMode\032x\n\031RedirectWritesStepDetails\022[\n"
+          + "\020concurrency_mode\030\001 \001(\0162A.google.datasto"
+          + "re.admin.v1.MigrationProgressEvent.Concu"
+          + "rrencyMode\"w\n\017ConcurrencyMode\022 \n\034CONCURR"
+          + "ENCY_MODE_UNSPECIFIED\020\000\022\017\n\013PESSIMISTIC\020\001"
+          + "\022\016\n\nOPTIMISTIC\020\002\022!\n\035OPTIMISTIC_WITH_ENTI"
+          + "TY_GROUPS\020\003B\016\n\014step_details*X\n\016Migration"
+          + "State\022\037\n\033MIGRATION_STATE_UNSPECIFIED\020\000\022\013"
+          + "\n\007RUNNING\020\001\022\n\n\006PAUSED\020\002\022\014\n\010COMPLETE\020\003*\343\001"
+          + "\n\rMigrationStep\022\036\n\032MIGRATION_STEP_UNSPEC"
+          + "IFIED\020\000\022\013\n\007PREPARE\020\006\022\t\n\005START\020\001\022\036\n\032APPLY"
+          + "_WRITES_SYNCHRONOUSLY\020\007\022\023\n\017COPY_AND_VERI"
+          + "FY\020\002\022(\n$REDIRECT_EVENTUALLY_CONSISTENT_R"
+          + "EADS\020\003\022&\n\"REDIRECT_STRONGLY_CONSISTENT_R"
+          + "EADS\020\004\022\023\n\017REDIRECT_WRITES\020\005B\333\001\n\035com.goog"
+          + "le.datastore.admin.v1B\016MigrationProtoP\001Z"
+          + ">google.golang.org/genproto/googleapis/d"
+          + "atastore/admin/v1;admin\252\002\037Google.Cloud.D"
+          + "atastore.Admin.V1\312\002\037Google\\Cloud\\Datasto"
+          + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::"
+          + "Admin::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.AnnotationsProto.getDescriptor(),
-            });
+            descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
     internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_google_datastore_admin_v1_MigrationStateEvent_fieldAccessorTable =
@@ -130,7 +127,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "ConcurrencyMode",
             });
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 94213527280d..95e77a6fd72d 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
@@ -90,6 +90,8 @@ private MigrationStateEvent(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
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 84b235e20c06..2eeb86c5fbc9 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
@@ -89,6 +89,8 @@ private Progress(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
index 3bd4f4c7278e..0d624956e33d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// 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.
@@ -481,7 +481,7 @@ message IndexOperationMetadata {
 // design pattern.
 //
 // This singleton resource can be accessed at:
-// `projects/{project_id}/datastore-firestore-migration`
+// "projects/{project_id}/operations/datastore-firestore-migration"
 message DatastoreFirestoreMigrationMetadata {
   // The current state of migration from Cloud Datastore to Cloud Firestore in
   // Datastore mode.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
index a211e7c97a95..0162af52384d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// 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.
@@ -17,7 +17,6 @@ syntax = "proto3";
 package google.datastore.admin.v1;
 
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
 option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
@@ -29,15 +28,6 @@ option ruby_package = "Google::Cloud::Datastore::Admin::V1";
 
 // Datastore composite index definition.
 message Index {
-  // A property of an index.
-  message IndexedProperty {
-    // Required. The property name to index.
-    string name = 1 [(google.api.field_behavior) = REQUIRED];
-
-    // Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
-    Direction direction = 2 [(google.api.field_behavior) = REQUIRED];
-  }
-
   // For an ordered index, specifies whether each of the entity's ancestors
   // will be included.
   enum AncestorMode {
@@ -65,6 +55,15 @@ message Index {
     DESCENDING = 2;
   }
 
+  // A property of an index.
+  message IndexedProperty {
+    // Required. The property name to index.
+    string name = 1 [(google.api.field_behavior) = REQUIRED];
+
+    // Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+    Direction direction = 2 [(google.api.field_behavior) = REQUIRED];
+  }
+
   // The possible set of states of an index.
   enum State {
     // The state is unspecified.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
index aab41706fe58..dbbe473c9041 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// 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.
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.datastore.admin.v1;
 
-import "google/api/annotations.proto";
-
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
 option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
 option java_multiple_files = true;
@@ -38,6 +36,21 @@ message MigrationStateEvent {
 // Datastore to Cloud Firestore in Datastore
 // mode](https://cloud.google.com/datastore/docs/upgrade-to-firestore).
 message MigrationProgressEvent {
+  // Concurrency modes for transactions in Cloud Firestore.
+  enum ConcurrencyMode {
+    // Unspecified.
+    CONCURRENCY_MODE_UNSPECIFIED = 0;
+
+    // Pessimistic concurrency.
+    PESSIMISTIC = 1;
+
+    // Optimistic concurrency.
+    OPTIMISTIC = 2;
+
+    // Optimistic concurrency with entity groups.
+    OPTIMISTIC_WITH_ENTITY_GROUPS = 3;
+  }
+
   // Details for the `PREPARE` step.
   message PrepareStepDetails {
     // The concurrency mode this database will use when it reaches the
@@ -51,18 +64,6 @@ message MigrationProgressEvent {
     ConcurrencyMode concurrency_mode = 1;
   }
 
-  // Concurrency modes for transactions in Cloud Firestore.
-  enum ConcurrencyMode {
-    // Unspecified.
-    CONCURRENCY_MODE_UNSPECIFIED = 0;
-
-    // Pessimistic concurrency.
-    PESSIMISTIC = 1;
-
-    // Optimistic concurrency.
-    OPTIMISTIC = 2;
-  }
-
   // The step that is starting.
   //
   // An event with step set to `START` indicates that the migration

From 342f548ea163721558eb54651b5304c0feef7f85 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 2 Jun 2022 16:07:21 +0200
Subject: [PATCH 0865/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.6.0 (#758)
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.6.0

* 🦉 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 5718ca4e87b3..cc6f5854f45b 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.5.1
+  2.6.0
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index acc179dbc4ec..bd84bbd2882a 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.5.1
+      2.6.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d333543e6279..fa891d6347e8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.5.1
+      2.6.0
     
 
     

From 6ed244e0cab027007b566773ab8909a4d1152335 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:18:15 +0000
Subject: [PATCH 0866/1784] chore(main): release 2.7.0 (#760)

:robot: I have created a release *beep* *boop*
---


## [2.7.0](https://github.com/googleapis/java-datastore/compare/v2.6.0...v2.7.0) (2022-06-02)


### Features

* new enum value `OPTIMISTIC_WITH_ENTITY_GROUPS` for `ConcurrencyMode` ([df6b793](https://github.com/googleapis/java-datastore/commit/df6b793cb66424ad470fe871f9a3868ae482e1a4))


### Documentation

* clarifications for `DatastoreFirestoreMigraitonMetadata` ([df6b793](https://github.com/googleapis/java-datastore/commit/df6b793cb66424ad470fe871f9a3868ae482e1a4))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 12 ++++++++++++
 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, 39 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0a3dabb6fb5..0eeb11eb256a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.7.0](https://github.com/googleapis/java-datastore/compare/v2.6.0...v2.7.0) (2022-06-02)
+
+
+### Features
+
+* new enum value `OPTIMISTIC_WITH_ENTITY_GROUPS` for `ConcurrencyMode` ([df6b793](https://github.com/googleapis/java-datastore/commit/df6b793cb66424ad470fe871f9a3868ae482e1a4))
+
+
+### Documentation
+
+* clarifications for `DatastoreFirestoreMigraitonMetadata` ([df6b793](https://github.com/googleapis/java-datastore/commit/df6b793cb66424ad470fe871f9a3868ae482e1a4))
+
 ## [2.6.0](https://github.com/googleapis/java-datastore/compare/v2.5.1...v2.6.0) (2022-05-31)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index e79c24863bf9..d6dce089bfe7 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.6.1-SNAPSHOT
+  2.7.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.1-SNAPSHOT
+    2.7.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ac99b4ab7249..a1ec961091f8 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.6.1-SNAPSHOT
+  2.7.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.6.1-SNAPSHOT
+        2.7.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.6.1-SNAPSHOT
+        2.7.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.97.1-SNAPSHOT
+        0.98.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.6.1-SNAPSHOT
+        2.7.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 220ac4fa3027..47481a1a648e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.6.1-SNAPSHOT
+  2.7.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.1-SNAPSHOT
+    2.7.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 07eacf76cb96..e5b1ba8c1ea3 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.6.1-SNAPSHOT
+  2.7.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.1-SNAPSHOT
+    2.7.0
   
   
     
diff --git a/pom.xml b/pom.xml
index ecff13b02eeb..7cd990fd3a7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.6.1-SNAPSHOT
+  2.7.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.6.1-SNAPSHOT
+        2.7.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.6.1-SNAPSHOT
+        2.7.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.6.1-SNAPSHOT
+        2.7.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.97.1-SNAPSHOT
+        0.98.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.6.1-SNAPSHOT
+        2.7.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 8ebd902122c4..bc010fd3b113 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.6.1-SNAPSHOT
+  2.7.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.1-SNAPSHOT
+    2.7.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index aeec7ee3ca18..e88bf74b0074 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.97.1-SNAPSHOT
+  0.98.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.6.1-SNAPSHOT
+    2.7.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 5f06c6bcc561..9db4188a82d6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.6.0:2.6.1-SNAPSHOT
-google-cloud-datastore-bom:2.6.0:2.6.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.97.0:0.97.1-SNAPSHOT
-datastore-v1-proto-client:2.6.0:2.6.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.6.0:2.6.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.6.0:2.6.1-SNAPSHOT
+google-cloud-datastore:2.7.0:2.7.0
+google-cloud-datastore-bom:2.7.0:2.7.0
+proto-google-cloud-datastore-v1:0.98.0:0.98.0
+datastore-v1-proto-client:2.7.0:2.7.0
+proto-google-cloud-datastore-admin-v1:2.7.0:2.7.0
+grpc-google-cloud-datastore-admin-v1:2.7.0:2.7.0

From 837c03801e6358776dc032249be536ce34315139 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:26:18 +0000
Subject: [PATCH 0867/1784] chore(main): release 2.7.1-SNAPSHOT (#761)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d6dce089bfe7..4590adb72939 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.7.0
+  2.7.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.0
+    2.7.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a1ec961091f8..78ce77a0bc9b 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.7.0
+  2.7.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.7.0
+        2.7.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.7.0
+        2.7.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.98.0
+        0.98.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.7.0
+        2.7.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 47481a1a648e..5ae67926f9b6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.7.0
+  2.7.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.0
+    2.7.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index e5b1ba8c1ea3..2eec388f88f6 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.7.0
+  2.7.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.0
+    2.7.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 7cd990fd3a7c..9f9e562cc20d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.7.0
+  2.7.1-SNAPSHOT
   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.7.0
+        2.7.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.7.0
+        2.7.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.7.0
+        2.7.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.98.0
+        0.98.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.7.0
+        2.7.1-SNAPSHOT
         
           
             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 bc010fd3b113..2abfa3655b3a 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.7.0
+  2.7.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.0
+    2.7.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e88bf74b0074..c18d942eb1e8 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.98.0
+  0.98.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.0
+    2.7.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 9db4188a82d6..4feaaddcc38e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.7.0:2.7.0
-google-cloud-datastore-bom:2.7.0:2.7.0
-proto-google-cloud-datastore-v1:0.98.0:0.98.0
-datastore-v1-proto-client:2.7.0:2.7.0
-proto-google-cloud-datastore-admin-v1:2.7.0:2.7.0
-grpc-google-cloud-datastore-admin-v1:2.7.0:2.7.0
+google-cloud-datastore:2.7.0:2.7.1-SNAPSHOT
+google-cloud-datastore-bom:2.7.0:2.7.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.98.0:0.98.1-SNAPSHOT
+datastore-v1-proto-client:2.7.0:2.7.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.7.0:2.7.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.7.0:2.7.1-SNAPSHOT

From 5b9126cdea1a7607c7e8f9ba6b67a2ed180cd129 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 3 Jun 2022 20:38:24 +0200
Subject: [PATCH 0868/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v25.4.0 (#764)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java)) | `25.3.0` -> `25.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/compatibility-slim/25.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/confidence-slim/25.3.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).
---
 README.md                           | 8 ++++----
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index cc6f5854f45b..4ef4b55b98bd 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     
       com.google.cloud
       libraries-bom
-      25.3.0
+      25.4.0
       pom
       import
     
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:25.3.0')
+implementation platform('com.google.cloud:libraries-bom:25.4.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.6.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.7.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.6.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.7.0"
 ```
 
 ## Authentication
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 93eb45f2bf49..7e9801d03a4e 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        25.3.0
+        25.4.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 0df17e88b72b..720a81c880bd 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        25.3.0
+        25.4.0
         pom
         import
       

From 1fd764fd2602a6d2a764ec3752e293d1e0dc796a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 6 Jun 2022 19:28:18 +0200
Subject: [PATCH 0869/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.7.0 (#762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.6.0` -> `2.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.7.0/compatibility-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.7.0/confidence-slim/2.6.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).
---
 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 4ef4b55b98bd..3b3853f06e22 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.6.0
+  2.7.0
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index bd84bbd2882a..e410952e493f 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.6.0
+      2.7.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fa891d6347e8..0643927f1cf8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.6.0
+      2.7.0
     
 
     

From f8a84ffa6d743501f5cfb71ac271d8a9b764705c Mon Sep 17 00:00:00 2001
From: Han 
Date: Thu, 9 Jun 2022 16:27:32 +0000
Subject: [PATCH 0870/1784] feat: support IN/NOT_IN/NOT_EQUAL operators (#688)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: add support for IN/NOT_IN/NOT_EQUAL operator

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 
---
 .../cloud/datastore/StructuredQuery.java      | 43 +++++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   | 77 +++++++++++++++++++
 2 files changed, 120 insertions(+)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 63318a090612..8e50d08678cf 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -272,7 +272,10 @@ public Operator apply(String constant) {
       static final Operator GREATER_THAN = type.createAndRegister("GREATER_THAN");
       static final Operator GREATER_THAN_OR_EQUAL = type.createAndRegister("GREATER_THAN_OR_EQUAL");
       static final Operator EQUAL = type.createAndRegister("EQUAL");
+      static final Operator IN = type.createAndRegister("IN");
+      static final Operator NOT_EQUAL = type.createAndRegister("NOT_EQUAL");
       static final Operator HAS_ANCESTOR = type.createAndRegister("HAS_ANCESTOR");
+      static final Operator NOT_IN = type.createAndRegister("NOT_IN");
 
       com.google.datastore.v1.PropertyFilter.Operator toPb() {
         return com.google.datastore.v1.PropertyFilter.Operator.valueOf(name());
@@ -502,6 +505,46 @@ public static PropertyFilter eq(String property, Blob value) {
       return new PropertyFilter(property, Operator.EQUAL, of(value));
     }
 
+    public static PropertyFilter neq(String property, Value value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, value);
+    }
+
+    public static PropertyFilter neq(String property, String value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, of(value));
+    }
+
+    public static PropertyFilter neq(String property, long value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, of(value));
+    }
+
+    public static PropertyFilter neq(String property, double value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, of(value));
+    }
+
+    public static PropertyFilter neq(String property, boolean value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, of(value));
+    }
+
+    public static PropertyFilter neq(String property, Timestamp value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, of(value));
+    }
+
+    public static PropertyFilter neq(String property, Key value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, of(value));
+    }
+
+    public static PropertyFilter neq(String property, Blob value) {
+      return new PropertyFilter(property, Operator.NOT_EQUAL, of(value));
+    }
+
+    public static PropertyFilter in(String property, ListValue value) {
+      return new PropertyFilter(property, Operator.IN, value);
+    }
+
+    public static PropertyFilter not_in(String property, ListValue value) {
+      return new PropertyFilter(property, Operator.NOT_IN, value);
+    }
+
     public static PropertyFilter hasAncestor(Key key) {
       return new PropertyFilter(KEY_PROPERTY_NAME, Operator.HAS_ANCESTOR, of(key));
     }
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 21acf598c757..869984932e7d 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
@@ -583,6 +583,83 @@ public void testRunStructuredQuery() throws InterruptedException {
     assertFalse(results4.hasNext());
   }
 
+  @Test
+  public void testInNotInNeqFilters() throws InterruptedException {
+    Entity e1 =
+        Entity.newBuilder(ENTITY1)
+            .setKey(Key.newBuilder(INCOMPLETE_KEY1, "e1").build())
+            .set("v_int", 10)
+            .build();
+    Entity e2 =
+        Entity.newBuilder(ENTITY1)
+            .setKey(Key.newBuilder(INCOMPLETE_KEY1, "e2").build())
+            .set("v_int", 20)
+            .build();
+    DATASTORE.put(e1, e2);
+
+    Query queryIn =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND1)
+            .setFilter(PropertyFilter.in("v_int", ListValue.of(10, 20)))
+            .build();
+
+    Query scQueryIn =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND1)
+            .setFilter(PropertyFilter.hasAncestor(ROOT_KEY))
+            .setFilter(PropertyFilter.in("v_int", ListValue.of(10, 20)))
+            .build();
+
+    Iterator resultIn = getStronglyConsistentResults(scQueryIn, queryIn);
+
+    assertTrue(resultIn.hasNext());
+    assertEquals(e1, resultIn.next());
+    assertTrue(resultIn.hasNext());
+    assertEquals(e2, resultIn.next());
+    assertFalse(resultIn.hasNext());
+
+    Query queryNotIn =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND1)
+            .setFilter(PropertyFilter.not_in("v_int", ListValue.of(20, 30)))
+            .build();
+
+    Query scQueryNotIn =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND1)
+            .setFilter(PropertyFilter.hasAncestor(ROOT_KEY))
+            .setFilter(PropertyFilter.not_in("v_int", ListValue.of(20, 30)))
+            .build();
+
+    Iterator resultNotIn = getStronglyConsistentResults(scQueryNotIn, queryNotIn);
+
+    assertTrue(resultNotIn.hasNext());
+    assertEquals(e1, resultNotIn.next());
+    assertFalse(resultNotIn.hasNext());
+
+    Query queryNeq =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND1)
+            .setFilter(PropertyFilter.neq("v_int", 10))
+            .build();
+
+    Query scQueryNeq =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND1)
+            .setFilter(PropertyFilter.hasAncestor(ROOT_KEY))
+            .setFilter(PropertyFilter.neq("v_int", 10))
+            .build();
+
+    Iterator resultNeq = getStronglyConsistentResults(scQueryNeq, queryNeq);
+
+    assertTrue(resultNeq.hasNext());
+    assertEquals(e2, resultNeq.next());
+    assertFalse(resultNeq.hasNext());
+
+    DATASTORE.delete(e1.getKey());
+    DATASTORE.delete(e2.getKey());
+  }
+
   @Test
   public void testAllocateId() {
     KeyFactory keyFactory = DATASTORE.newKeyFactory().setKind(KIND1);

From 2662a8d0fcbd565e8d4492df3ea163abbf64ffbf Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 9 Jun 2022 11:35:07 -0600
Subject: [PATCH 0871/1784] chore(main): release 2.8.0 (#765)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0eeb11eb256a..74eff90d3aa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.8.0](https://github.com/googleapis/java-datastore/compare/v2.7.0...v2.8.0) (2022-06-09)
+
+
+### Features
+
+* support IN/NOT_IN/NOT_EQUAL operators ([#688](https://github.com/googleapis/java-datastore/issues/688)) ([f8a84ff](https://github.com/googleapis/java-datastore/commit/f8a84ffa6d743501f5cfb71ac271d8a9b764705c))
+
 ## [2.7.0](https://github.com/googleapis/java-datastore/compare/v2.6.0...v2.7.0) (2022-06-02)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4590adb72939..8dd942d71798 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.7.1-SNAPSHOT
+  2.8.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.1-SNAPSHOT
+    2.8.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 78ce77a0bc9b..f452f3022fed 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.7.1-SNAPSHOT
+  2.8.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.7.1-SNAPSHOT
+        2.8.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.7.1-SNAPSHOT
+        2.8.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.98.1-SNAPSHOT
+        0.99.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.7.1-SNAPSHOT
+        2.8.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5ae67926f9b6..49778e706616 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.7.1-SNAPSHOT
+  2.8.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.1-SNAPSHOT
+    2.8.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 2eec388f88f6..6e2eb88fd300 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.7.1-SNAPSHOT
+  2.8.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.1-SNAPSHOT
+    2.8.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 9f9e562cc20d..b10de96169e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.7.1-SNAPSHOT
+  2.8.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.7.1-SNAPSHOT
+        2.8.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.7.1-SNAPSHOT
+        2.8.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.7.1-SNAPSHOT
+        2.8.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.98.1-SNAPSHOT
+        0.99.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.7.1-SNAPSHOT
+        2.8.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 2abfa3655b3a..81fe706393cb 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.7.1-SNAPSHOT
+  2.8.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.1-SNAPSHOT
+    2.8.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c18d942eb1e8..2cd67b83c750 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.98.1-SNAPSHOT
+  0.99.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.7.1-SNAPSHOT
+    2.8.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 4feaaddcc38e..9e1dc1b27a50 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.7.0:2.7.1-SNAPSHOT
-google-cloud-datastore-bom:2.7.0:2.7.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.98.0:0.98.1-SNAPSHOT
-datastore-v1-proto-client:2.7.0:2.7.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.7.0:2.7.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.7.0:2.7.1-SNAPSHOT
+google-cloud-datastore:2.8.0:2.8.0
+google-cloud-datastore-bom:2.8.0:2.8.0
+proto-google-cloud-datastore-v1:0.99.0:0.99.0
+datastore-v1-proto-client:2.8.0:2.8.0
+proto-google-cloud-datastore-admin-v1:2.8.0:2.8.0
+grpc-google-cloud-datastore-admin-v1:2.8.0:2.8.0

From c1da7fac9b5a714df6b720780a9e3b9b3097f83f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 9 Jun 2022 17:44:11 +0000
Subject: [PATCH 0872/1784] chore(main): release 2.8.1-SNAPSHOT (#766)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8dd942d71798..cead29652719 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.8.0
+  2.8.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.0
+    2.8.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f452f3022fed..86057a7971fe 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.8.0
+  2.8.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.8.0
+        2.8.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.8.0
+        2.8.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.99.0
+        0.99.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.8.0
+        2.8.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 49778e706616..39d49942c621 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.8.0
+  2.8.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.0
+    2.8.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 6e2eb88fd300..2656eed2caae 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.8.0
+  2.8.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.0
+    2.8.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index b10de96169e9..b3ee4253ff36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.8.0
+  2.8.1-SNAPSHOT
   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.8.0
+        2.8.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.8.0
+        2.8.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.8.0
+        2.8.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.99.0
+        0.99.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.8.0
+        2.8.1-SNAPSHOT
         
           
             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 81fe706393cb..56a11c5d2eb6 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.8.0
+  2.8.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.0
+    2.8.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2cd67b83c750..29395ecdd957 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.99.0
+  0.99.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.0
+    2.8.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 9e1dc1b27a50..6946bf98fa38 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.8.0:2.8.0
-google-cloud-datastore-bom:2.8.0:2.8.0
-proto-google-cloud-datastore-v1:0.99.0:0.99.0
-datastore-v1-proto-client:2.8.0:2.8.0
-proto-google-cloud-datastore-admin-v1:2.8.0:2.8.0
-grpc-google-cloud-datastore-admin-v1:2.8.0:2.8.0
+google-cloud-datastore:2.8.0:2.8.1-SNAPSHOT
+google-cloud-datastore-bom:2.8.0:2.8.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.99.0:0.99.1-SNAPSHOT
+datastore-v1-proto-client:2.8.0:2.8.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.8.0:2.8.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.8.0:2.8.1-SNAPSHOT

From bdb3b6da6dbc607904d07a35889d9d2bc5da305c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 13 Jun 2022 17:42:42 +0200
Subject: [PATCH 0873/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.8.0 (#767)
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.8.0

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3b3853f06e22..7781708dd9bd 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.7.0
+  2.8.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.7.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.8.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.8.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e410952e493f..130b6d8caefa 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.7.0
+      2.8.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0643927f1cf8..cbfeb45e1008 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.7.0
+      2.8.0
     
 
     

From cfa4c12fa4088fe6d079ef458711e12158582f9b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 13 Jun 2022 17:43:02 +0200
Subject: [PATCH 0874/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.5.0 (#770)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.5.0

* 🦉 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 
---
 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 86057a7971fe..52ded046da48 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.4.0
+    1.5.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index b3ee4253ff36..c7ffbdb240f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.4.0
+    1.5.0
   
 
   

From cb710ef1fbff51d060614d093d6ceb95fa86e50e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 11:43:32 -0400
Subject: [PATCH 0875/1784] chore: Integrate new gapic-generator-java and
 rules_gapic (#768)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Integrate new gapic-generator-java and rules_gapic

PiperOrigin-RevId: 454027580

Source-Link: https://github.com/googleapis/googleapis/commit/1b222777baa702e7135610355706570ed2b56318

Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9

* 🦉 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 
---
 .../google/cloud/datastore/admin/v1/DatastoreAdminClient.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index f29717e5a87b..ec653b844547 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -888,7 +888,7 @@ public final ListIndexesPagedResponse listIndexes(ListIndexesRequest request) {
    *           .build();
    *   while (true) {
    *     ListIndexesResponse response = datastoreAdminClient.listIndexesCallable().call(request);
-   *     for (Index element : response.getResponsesList()) {
+   *     for (Index element : response.getIndexesList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();

From 9a779d2e9fa1793a09ad884ef7807ad0db599d4c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 11:43:48 -0400
Subject: [PATCH 0876/1784] chore: skip formatting generated samples (#1456)
 (#769)

Source-Link: https://github.com/googleapis/synthtool/commit/625c20e6b9e195986595e56f60cba04e99c1951a
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:58ccd4737212f64a7dd4b3063d447447acf71a2b9d409eab19fc7a00b18eadc0

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index a79f06271b60..68f2b159daba 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74
-# created: 2022-05-19T15:12:45.278246753Z
+  digest: sha256:58ccd4737212f64a7dd4b3063d447447acf71a2b9d409eab19fc7a00b18eadc0
+# created: 2022-06-10T19:20:11.004014696Z

From 3efd61c465b4ba566b9fd6f9023af3a2de19cbb5 Mon Sep 17 00:00:00 2001
From: Juan Lara 
Date: Tue, 14 Jun 2022 22:01:37 +0000
Subject: [PATCH 0877/1784] samples: Add sample snippets for IN, NOT_EQUALS,
 and NOT_IN (#749)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test: add samples for IN, NOT_IN, and NOT_EQUALS.

* Set up another Datastore client for tests that require a real backend.

* Add a method for setting up a test entity. Fix linting errors.

* 🦉 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 
---
 .../datastore/snippets/ConceptsTest.java      | 103 +++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 1d10f1f6d728..b22efc6fb34e 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -27,6 +27,7 @@
 import com.google.cloud.datastore.Cursor;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreException;
+import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.EntityQuery;
 import com.google.cloud.datastore.FullEntity;
@@ -83,6 +84,7 @@ public class ConceptsTest {
   private static final FullEntity TEST_FULL_ENTITY = FullEntity.newBuilder().build();
 
   private Datastore datastore;
+  private Datastore datastoreRealBackend;
   private KeyFactory keyFactory;
   private Key taskKey;
   private Entity testEntity;
@@ -123,6 +125,8 @@ public void setUp() {
     endDate = Timestamp.of(calendar.getTime());
     calendar.set(1999, DECEMBER, 31);
     includedDate = Timestamp.of(calendar.getTime());
+    // Create a client for tests that require a real backend
+    datastoreRealBackend = DatastoreOptions.getDefaultInstance().getService();
   }
 
   /**
@@ -384,7 +388,7 @@ private void setUpQueryTests() {
             .set(
                 "description",
                 StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
-            .set("tag", "fun", "l", "programming")
+            .set("tag", "fun", "l", "programming", "learn")
             .build());
   }
 
@@ -1044,4 +1048,101 @@ public void testPropertyFilteringRunQuery() {
         ImmutableMap.of("Task", ImmutableSet.of("priority", "tag"));
     assertEquals(expected, propertiesByKind);
   }
+
+  @Test
+  public void testEqQuerySorted() {
+    setUpQueryTests();
+    // [START datastore_eq_query_sorted]
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.eq("tag", "learn"))
+            .setOrderBy(OrderBy.asc("tag"))
+            .build();
+    // [END datastore_eq_query_sorted]
+    assertValidQuery(query);
+  }
+
+  /** Start tests using a real backend. */
+  private  V assertValidQueryRealBackend(Query query) {
+    QueryResults results = datastoreRealBackend.run(query);
+    V result = results.next();
+    // assertFalse(results.hasNext());
+    return result;
+  }
+
+  private void setUpQueryTestsRealBackend() {
+    Key taskKey =
+        datastoreRealBackend
+            .newKeyFactory()
+            .setKind("Task")
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .newKey("someTask");
+    datastoreRealBackend.put(
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("completed", false)
+            .set("priority", 4)
+            .set("created", includedDate)
+            .set("percent_complete", 10.0)
+            .set(
+                "description",
+                StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
+            .set("tag", "fun", "l", "programming", "learn")
+            .build());
+  }
+
+  @Test
+  public void testInQuery() {
+    setUpQueryTestsRealBackend();
+    // [START datastore_in_query]
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.in("tag", ListValue.of("learn", "study")))
+            .build();
+    // [END datastore_in_query]
+    assertValidQueryRealBackend(query);
+  }
+
+  @Test
+  public void testNotEqualsQuery() {
+    setUpQueryTestsRealBackend();
+    // [START datastore_not_equals_query]
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.neq("category", "Work"))
+            .build();
+    // [END datastore_not_equals_query]
+    assertValidQueryRealBackend(query);
+  }
+
+  @Test
+  public void testNotInQuery() {
+    setUpQueryTestsRealBackend();
+    // [START datastore_not_in_query]
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.not_in("category", ListValue.of("Work", "Chores", "School")))
+            .build();
+    // [END datastore_not_in_query]
+    assertValidQueryRealBackend(query);
+  }
+
+  @Test
+  public void testInQuerySorted() {
+    setUpQueryTestsRealBackend();
+    // [START datastore_in_query_sorted]
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("Task")
+            .setFilter(PropertyFilter.in("tag", ListValue.of("learn", "study")))
+            .setOrderBy(OrderBy.asc("tag"))
+            .build();
+    // [END datastore_in_query_sorted]
+    assertValidQueryRealBackend(query);
+  }
 }

From 7358aa34ec9d3d52aae3195fea718ef748ab22b1 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Wed, 15 Jun 2022 15:31:05 -0400
Subject: [PATCH 0878/1784] docs(sample): clean up README for native image
 sample (#771)

---
 samples/native-image-sample/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/native-image-sample/README.md b/samples/native-image-sample/README.md
index 94d053bdca21..5f2cfbd271a8 100644
--- a/samples/native-image-sample/README.md
+++ b/samples/native-image-sample/README.md
@@ -20,25 +20,25 @@ You will need to follow these prerequisite steps in order to run the samples:
 
    **Note:** Authenticating with Application Default Credentials is convenient to use during development, but we recommend [alternate methods of authentication](https://cloud.google.com/docs/authentication/production) during production use.
 
-3. Install the GraalVM compiler.
+3. Install the native image compiler.
 
-   You can follow the [official installation instructions](https://www.graalvm.org/docs/getting-started/#install-graalvm) from the GraalVM website.
+   You can follow the [installation instructions](https://www.graalvm.org/docs/getting-started/#install-graalvm).
    After following the instructions, ensure that you install the native image extension installed by running:
 
     ```
     gu install native-image
     ```
 
-   Once you finish following the instructions, verify that the default version of Java is set to the GraalVM version by running `java -version` in a terminal.
+   Once you finish following the instructions, verify that the default version of Java is set to the correct version by running `java -version` in a terminal.
 
    You will see something similar to the below output:
 
     ```
     $ java -version
    
-    openjdk version "11.0.7" 2020-04-14
-    OpenJDK Runtime Environment GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02)
-    OpenJDK 64-Bit Server VM GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02, mixed mode, sharing)
+    openjdk version "17.0.3" 2022-04-19
+    OpenJDK Runtime Environment GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06)
+    OpenJDK 64-Bit Server VM GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06, mixed mode, sharing)
     ```
 ## Sample
 1. **(Optional)** If you wish to run the application against the [Datastore emulator](https://cloud.google.com/sdk/gcloud/reference/beta/emulators/datastore), ensure that you have the [Google Cloud SDK](https://cloud.google.com/sdk) installed.

From 61758e02c30c8410dd397d0cc77c987332c4f11c Mon Sep 17 00:00:00 2001
From: yixiaoshen 
Date: Tue, 21 Jun 2022 07:02:12 -0700
Subject: [PATCH 0879/1784] feat: support readTime in Datastore query splitter.
 (#763)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 .../clirr-ignored-differences.xml             |   9 +
 datastore-v1-proto-client/pom.xml             |   5 +
 .../datastore/v1/client/QuerySplitter.java    |  14 +
 .../v1/client/QuerySplitterImpl.java          |  42 ++-
 .../v1/client/testing/MockCredential.java     |  36 ++
 .../client/testing/MockDatastoreFactory.java  | 137 ++++++++
 .../v1/client/DatastoreClientTest.java        | 121 +------
 .../v1/client/QuerySplitterTest.java          | 326 ++++++++++++++++++
 8 files changed, 568 insertions(+), 122 deletions(-)
 create mode 100644 datastore-v1-proto-client/clirr-ignored-differences.xml
 create mode 100644 datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java
 create mode 100644 datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java
 create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java

diff --git a/datastore-v1-proto-client/clirr-ignored-differences.xml b/datastore-v1-proto-client/clirr-ignored-differences.xml
new file mode 100644
index 000000000000..e8c0b27f4c54
--- /dev/null
+++ b/datastore-v1-proto-client/clirr-ignored-differences.xml
@@ -0,0 +1,9 @@
+
+
+
+  
+    com/google/datastore/v1/client/QuerySplitter
+    java.util.List getSplits(com.google.datastore.v1.Query, com.google.datastore.v1.PartitionId, int, com.google.datastore.v1.client.Datastore, com.google.protobuf.Timestamp)
+    7012
+  
+
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index cead29652719..f1bc4067e672 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -83,6 +83,11 @@
       protobuf-java
     
 
+    
+      com.google.api
+      api-common
+    
+
     
     
       junit
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
index 5286f7842e86..97268d38de76 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
@@ -15,8 +15,10 @@
  */
 package com.google.datastore.v1.client;
 
+import com.google.api.core.BetaApi;
 import com.google.datastore.v1.PartitionId;
 import com.google.datastore.v1.Query;
+import com.google.protobuf.Timestamp;
 import java.util.List;
 
 /** Provides the ability to split a query into multiple shards. */
@@ -39,4 +41,16 @@ public interface QuerySplitter {
    */
   List getSplits(Query query, PartitionId partition, int numSplits, Datastore datastore)
       throws DatastoreException;
+
+  /**
+   * Same as {@link #getSplits(Query, PartitionId, int, Datastore)} but the splits are based on
+   * {@code readTime}, and the returned sharded {@link Query}s should also be executed with {@code
+   * readTime}. Reading from a timestamp is currently a private preview feature in Datastore.
+   */
+  @BetaApi
+  default List getSplits(
+      Query query, PartitionId partition, int numSplits, Datastore datastore, Timestamp readTime)
+      throws DatastoreException {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
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 92fb384181ca..6143bdd59ba3 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
@@ -17,6 +17,7 @@
 
 import static com.google.datastore.v1.client.DatastoreHelper.makeAndFilter;
 
+import com.google.api.core.BetaApi;
 import com.google.datastore.v1.EntityResult;
 import com.google.datastore.v1.Filter;
 import com.google.datastore.v1.Key;
@@ -29,11 +30,14 @@
 import com.google.datastore.v1.Query;
 import com.google.datastore.v1.QueryResultBatch;
 import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
+import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.RunQueryRequest;
+import com.google.protobuf.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /**
  * Provides the ability to split a query into multiple shards using Cloud Datastore.
@@ -63,7 +67,24 @@ private QuerySplitterImpl() {
   public List getSplits(
       Query query, PartitionId partition, int numSplits, Datastore datastore)
       throws DatastoreException, IllegalArgumentException {
+    return getSplitsInternal(query, partition, numSplits, datastore, null);
+  }
 
+  @BetaApi
+  @Override
+  public List getSplits(
+      Query query, PartitionId partition, int numSplits, Datastore datastore, Timestamp readTime)
+      throws DatastoreException, IllegalArgumentException {
+    return getSplitsInternal(query, partition, numSplits, datastore, readTime);
+  }
+
+  private List getSplitsInternal(
+      Query query,
+      PartitionId partition,
+      int numSplits,
+      Datastore datastore,
+      @Nullable Timestamp readTime)
+      throws DatastoreException, IllegalArgumentException {
     List splits = new ArrayList(numSplits);
     if (numSplits == 1) {
       splits.add(query);
@@ -72,7 +93,7 @@ public List getSplits(
     validateQuery(query);
     validateSplitSize(numSplits);
 
-    List scatterKeys = getScatterKeys(numSplits, query, partition, datastore);
+    List scatterKeys = getScatterKeys(numSplits, query, partition, datastore, readTime);
     Key lastKey = null;
     for (Key nextKey : getSplitKey(scatterKeys, numSplits)) {
       splits.add(createSplit(lastKey, nextKey, query));
@@ -182,10 +203,15 @@ private Query createSplit(Key lastKey, Key nextKey, Query query) {
    * @param query the user query.
    * @param partition the partition to run the query in.
    * @param datastore the datastore containing the data.
+   * @param readTime read time at which to get the split keys from the datastore.
    * @throws DatastoreException if there was an error when executing the datastore query.
    */
   private List getScatterKeys(
-      int numSplits, Query query, PartitionId partition, Datastore datastore)
+      int numSplits,
+      Query query,
+      PartitionId partition,
+      Datastore datastore,
+      @Nullable Timestamp readTime)
       throws DatastoreException {
     Query.Builder scatterPointQuery = createScatterQuery(query, numSplits);
 
@@ -193,12 +219,12 @@ private List getScatterKeys(
 
     QueryResultBatch batch;
     do {
-      RunQueryRequest scatterRequest =
-          RunQueryRequest.newBuilder()
-              .setPartitionId(partition)
-              .setQuery(scatterPointQuery)
-              .build();
-      batch = datastore.runQuery(scatterRequest).getBatch();
+      RunQueryRequest.Builder scatterRequest =
+          RunQueryRequest.newBuilder().setPartitionId(partition).setQuery(scatterPointQuery);
+      if (readTime != null) {
+        scatterRequest.setReadOptions(ReadOptions.newBuilder().setReadTime(readTime).build());
+      }
+      batch = datastore.runQuery(scatterRequest.build()).getBatch();
       for (EntityResult result : batch.getEntityResultsList()) {
         keySplits.add(result.getEntity().getKey());
       }
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java
new file mode 100644
index 000000000000..7579f58b3bea
--- /dev/null
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java
@@ -0,0 +1,36 @@
+/*
+ * 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.testing;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.http.HttpRequest;
+import java.io.IOException;
+
+/** Fake credential used for testing purpose. */
+public class MockCredential extends Credential {
+  public MockCredential() {
+    super(
+        new AccessMethod() {
+          @Override
+          public void intercept(HttpRequest request, String accessToken) throws IOException {}
+
+          @Override
+          public String getAccessTokenFromRequest(HttpRequest request) {
+            return "MockAccessToken";
+          }
+        });
+  }
+}
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java
new file mode 100644
index 000000000000..6942a5d79a2b
--- /dev/null
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java
@@ -0,0 +1,137 @@
+/*
+ * 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.testing;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpStatusCodes;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.LowLevelHttpRequest;
+import com.google.api.client.http.LowLevelHttpResponse;
+import com.google.api.client.testing.http.MockHttpTransport;
+import com.google.api.client.testing.http.MockLowLevelHttpRequest;
+import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import com.google.api.client.testing.util.TestableByteArrayInputStream;
+import com.google.common.collect.Iterables;
+import com.google.datastore.v1.client.DatastoreFactory;
+import com.google.datastore.v1.client.DatastoreOptions;
+import com.google.protobuf.Message;
+import com.google.rpc.Code;
+import com.google.rpc.Status;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+/** Fake Datastore factory used for testing purposes when a true Datastore service is not needed. */
+public class MockDatastoreFactory extends DatastoreFactory {
+  private int nextStatus;
+  private Message nextResponse;
+  private Status nextError;
+  private IOException nextException;
+
+  private String lastPath;
+  private String lastMimeType;
+  private byte[] lastBody;
+  private List lastCookies;
+  private String lastApiFormatHeaderValue;
+
+  public void setNextResponse(Message response) {
+    nextStatus = HttpStatusCodes.STATUS_CODE_OK;
+    nextResponse = response;
+    nextError = null;
+    nextException = null;
+  }
+
+  public void setNextError(int status, Code code, String message) {
+    nextStatus = status;
+    nextResponse = null;
+    nextError = makeErrorContent(message, code);
+    nextException = null;
+  }
+
+  public void setNextException(IOException exception) {
+    nextStatus = 0;
+    nextResponse = null;
+    nextError = null;
+    nextException = exception;
+  }
+
+  @Override
+  public HttpRequestFactory makeClient(DatastoreOptions options) {
+    HttpTransport transport =
+        new MockHttpTransport() {
+          @Override
+          public LowLevelHttpRequest buildRequest(String method, String url) {
+            return new MockLowLevelHttpRequest(url) {
+              @Override
+              public LowLevelHttpResponse execute() throws IOException {
+                lastPath = new GenericUrl(getUrl()).getRawPath();
+                lastMimeType = getContentType();
+                lastCookies = getHeaderValues("Cookie");
+                lastApiFormatHeaderValue =
+                    Iterables.getOnlyElement(getHeaderValues("X-Goog-Api-Format-Version"));
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                getStreamingContent().writeTo(out);
+                lastBody = out.toByteArray();
+                if (nextException != null) {
+                  throw nextException;
+                }
+                MockLowLevelHttpResponse response =
+                    new MockLowLevelHttpResponse()
+                        .setStatusCode(nextStatus)
+                        .setContentType("application/x-protobuf");
+                if (nextError != null) {
+                  checkState(nextResponse == null);
+                  response.setContent(new TestableByteArrayInputStream(nextError.toByteArray()));
+                } else {
+                  response.setContent(new TestableByteArrayInputStream(nextResponse.toByteArray()));
+                }
+                return response;
+              }
+            };
+          }
+        };
+    Credential credential = options.getCredential();
+    return transport.createRequestFactory(credential);
+  }
+
+  public String getLastPath() {
+    return lastPath;
+  }
+
+  public String getLastMimeType() {
+    return lastMimeType;
+  }
+
+  public String getLastApiFormatHeaderValue() {
+    return lastApiFormatHeaderValue;
+  }
+
+  public byte[] getLastBody() {
+    return lastBody;
+  }
+
+  public List getLastCookies() {
+    return lastCookies;
+  }
+
+  private static Status makeErrorContent(String message, Code code) {
+    return Status.newBuilder().setCode(code.getNumber()).setMessage(message).build();
+  }
+}
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 d8376dc29905..2ab2c89f88ff 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
@@ -18,25 +18,12 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
-import com.google.api.client.auth.oauth2.Credential;
-import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpRequest;
-import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.HttpRequestInitializer;
-import com.google.api.client.http.HttpStatusCodes;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.LowLevelHttpRequest;
-import com.google.api.client.http.LowLevelHttpResponse;
-import com.google.api.client.testing.http.MockHttpTransport;
-import com.google.api.client.testing.http.MockLowLevelHttpRequest;
-import com.google.api.client.testing.http.MockLowLevelHttpResponse;
-import com.google.api.client.testing.util.TestableByteArrayInputStream;
-import com.google.common.collect.Iterables;
 import com.google.datastore.v1.AllocateIdsRequest;
 import com.google.datastore.v1.AllocateIdsResponse;
 import com.google.datastore.v1.BeginTransactionRequest;
@@ -53,16 +40,15 @@
 import com.google.datastore.v1.RollbackResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
+import com.google.datastore.v1.client.testing.MockCredential;
+import com.google.datastore.v1.client.testing.MockDatastoreFactory;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Message;
 import com.google.rpc.Code;
-import com.google.rpc.Status;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.SocketTimeoutException;
-import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -290,7 +276,7 @@ public void initialize(HttpRequest request) {
     AllocateIdsResponse response = AllocateIdsResponse.newBuilder().build();
     mockClient.setNextResponse(response);
     assertEquals(response, datastore.allocateIds(request));
-    assertEquals("magic", mockClient.lastCookies.get(0));
+    assertEquals("magic", mockClient.getLastCookies().get(0));
   }
 
   @Test
@@ -361,10 +347,10 @@ private void expectRpc(String methodName, Message request, Message response) thr
     Object[] callArgs = {request};
     assertEquals(response, call.invoke(datastore, callArgs));
 
-    assertEquals("/v1/projects/project-id:" + methodName, mockClient.lastPath);
-    assertEquals("application/x-protobuf", mockClient.lastMimeType);
-    assertEquals("2", mockClient.lastApiFormatHeaderValue);
-    assertArrayEquals(request.toByteArray(), mockClient.lastBody);
+    assertEquals("/v1/projects/project-id:" + methodName, mockClient.getLastPath());
+    assertEquals("application/x-protobuf", mockClient.getLastMimeType());
+    assertEquals("2", mockClient.getLastApiFormatHeaderValue());
+    assertArrayEquals(request.toByteArray(), mockClient.getLastBody());
     assertEquals(1, datastore.getRpcCount());
 
     datastore.resetRpcCount();
@@ -409,97 +395,4 @@ private void expectRpc(String methodName, Message request, Message response) thr
 
     assertEquals(3, datastore.getRpcCount());
   }
-
-  private static class MockCredential extends Credential {
-    MockCredential() {
-      super(
-          new AccessMethod() {
-            @Override
-            public void intercept(HttpRequest request, String accessToken) throws IOException {}
-
-            @Override
-            public String getAccessTokenFromRequest(HttpRequest request) {
-              return "MockAccessToken";
-            }
-          });
-    }
-  }
-
-  private static class MockDatastoreFactory extends DatastoreFactory {
-    int nextStatus;
-    Message nextResponse;
-    Status nextError;
-    IOException nextException;
-
-    String lastPath;
-    String lastMimeType;
-    byte[] lastBody;
-    List lastCookies;
-    String lastApiFormatHeaderValue;
-
-    void setNextResponse(Message response) {
-      nextStatus = HttpStatusCodes.STATUS_CODE_OK;
-      nextResponse = response;
-      nextError = null;
-      nextException = null;
-    }
-
-    void setNextError(int status, Code code, String message) {
-      nextStatus = status;
-      nextResponse = null;
-      nextError = makeErrorContent(message, code);
-      nextException = null;
-    }
-
-    void setNextException(IOException exception) {
-      nextStatus = 0;
-      nextResponse = null;
-      nextError = null;
-      nextException = exception;
-    }
-
-    @Override
-    public HttpRequestFactory makeClient(DatastoreOptions options) {
-      HttpTransport transport =
-          new MockHttpTransport() {
-            @Override
-            public LowLevelHttpRequest buildRequest(String method, String url) {
-              return new MockLowLevelHttpRequest(url) {
-                @Override
-                public LowLevelHttpResponse execute() throws IOException {
-                  lastPath = new GenericUrl(getUrl()).getRawPath();
-                  lastMimeType = getContentType();
-                  lastCookies = getHeaderValues("Cookie");
-                  lastApiFormatHeaderValue =
-                      Iterables.getOnlyElement(getHeaderValues("X-Goog-Api-Format-Version"));
-                  ByteArrayOutputStream out = new ByteArrayOutputStream();
-                  getStreamingContent().writeTo(out);
-                  lastBody = out.toByteArray();
-                  if (nextException != null) {
-                    throw nextException;
-                  }
-                  MockLowLevelHttpResponse response =
-                      new MockLowLevelHttpResponse()
-                          .setStatusCode(nextStatus)
-                          .setContentType("application/x-protobuf");
-                  if (nextError != null) {
-                    assertNull(nextResponse);
-                    response.setContent(new TestableByteArrayInputStream(nextError.toByteArray()));
-                  } else {
-                    response.setContent(
-                        new TestableByteArrayInputStream(nextResponse.toByteArray()));
-                  }
-                  return response;
-                }
-              };
-            }
-          };
-      Credential credential = options.getCredential();
-      return transport.createRequestFactory(credential);
-    }
-  }
-
-  private static Status makeErrorContent(String message, Code code) {
-    return Status.newBuilder().setCode(code.getNumber()).setMessage(message).build();
-  }
 }
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
new file mode 100644
index 000000000000..e869437243cd
--- /dev/null
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java
@@ -0,0 +1,326 @@
+/*
+ * 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;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.datastore.v1.client.DatastoreHelper.makeAndFilter;
+import static com.google.datastore.v1.client.DatastoreHelper.makeFilter;
+import static com.google.datastore.v1.client.DatastoreHelper.makeKey;
+import static com.google.datastore.v1.client.DatastoreHelper.makeOrder;
+import static com.google.datastore.v1.client.DatastoreHelper.makePropertyReference;
+import static com.google.datastore.v1.client.DatastoreHelper.makeValue;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThrows;
+
+import com.google.datastore.v1.Entity;
+import com.google.datastore.v1.EntityResult;
+import com.google.datastore.v1.EntityResult.ResultType;
+import com.google.datastore.v1.Filter;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.KindExpression;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.Projection;
+import com.google.datastore.v1.PropertyFilter.Operator;
+import com.google.datastore.v1.PropertyOrder.Direction;
+import com.google.datastore.v1.Query;
+import com.google.datastore.v1.QueryResultBatch;
+import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
+import com.google.datastore.v1.ReadOptions;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.datastore.v1.client.testing.MockCredential;
+import com.google.datastore.v1.client.testing.MockDatastoreFactory;
+import com.google.protobuf.Int32Value;
+import com.google.protobuf.Timestamp;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link QuerySplitterImpl}. */
+@RunWith(JUnit4.class)
+public class QuerySplitterTest {
+  private static final String PROJECT_ID = "project-id";
+  private static final PartitionId PARTITION =
+      PartitionId.newBuilder().setProjectId(PROJECT_ID).build();
+  private static final String KIND = "test-kind";
+
+  private DatastoreFactory factory = new MockDatastoreFactory();
+  private DatastoreOptions.Builder options =
+      new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(new MockCredential());
+
+  private Filter propertyFilter = makeFilter("foo", Operator.EQUAL, makeValue("value")).build();
+
+  private Query query =
+      Query.newBuilder()
+          .addKind(KindExpression.newBuilder().setName(KIND).build())
+          .setFilter(propertyFilter)
+          .build();
+
+  private Query splitQuery =
+      Query.newBuilder()
+          .addKind(KindExpression.newBuilder().setName(KIND).build())
+          .addOrder(makeOrder("__scatter__", Direction.ASCENDING))
+          .addProjection(Projection.newBuilder().setProperty(makePropertyReference("__key__")))
+          .build();
+
+  private Key splitKey0 = makeKey(KIND, String.format("%05d", 1)).setPartitionId(PARTITION).build();
+  private Key splitKey1 =
+      makeKey(KIND, String.format("%05d", 101)).setPartitionId(PARTITION).build();
+  private Key splitKey2 =
+      makeKey(KIND, String.format("%05d", 201)).setPartitionId(PARTITION).build();
+  private Key splitKey3 =
+      makeKey(KIND, String.format("%05d", 301)).setPartitionId(PARTITION).build();
+
+  @Test
+  public void disallowsSortOrder() {
+    Datastore datastore = factory.create(options.build());
+    Query queryWithOrder =
+        query.toBuilder().addOrder(makeOrder("bar", Direction.ASCENDING)).build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> QuerySplitterImpl.INSTANCE.getSplits(queryWithOrder, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query cannot have any sort orders.");
+  }
+
+  @Test
+  public void disallowsMultipleKinds() {
+    Datastore datastore = factory.create(options.build());
+    Query queryWithMultipleKinds =
+        query
+            .toBuilder()
+            .addKind(KindExpression.newBuilder().setName("another-kind").build())
+            .build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                QuerySplitterImpl.INSTANCE.getSplits(
+                    queryWithMultipleKinds, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query must have exactly one kind.");
+  }
+
+  @Test
+  public void disallowsKindlessQuery() {
+    Datastore datastore = factory.create(options.build());
+    Query kindlessQuery = query.toBuilder().clearKind().build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> QuerySplitterImpl.INSTANCE.getSplits(kindlessQuery, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query must have exactly one kind.");
+  }
+
+  @Test
+  public void disallowsInequalityFilter() {
+    Datastore datastore = factory.create(options.build());
+    Query queryWithInequality =
+        query
+            .toBuilder()
+            .setFilter(makeFilter("foo", Operator.GREATER_THAN, makeValue("value")))
+            .build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                QuerySplitterImpl.INSTANCE.getSplits(queryWithInequality, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query cannot have any inequality filters.");
+  }
+
+  @Test
+  public void splitsMustBePositive() {
+    Datastore datastore = factory.create(options.build());
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> QuerySplitterImpl.INSTANCE.getSplits(query, PARTITION, 0, datastore));
+    assertThat(exception).hasMessageThat().contains("The number of splits must be greater than 0.");
+  }
+
+  @Test
+  public void getSplits() throws Exception {
+    Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+    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 splittedQueries =
+        QuerySplitterImpl.INSTANCE.getSplits(query, PARTITION, 3, datastore);
+
+    assertThat(splittedQueries)
+        .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)
+            .setQuery(
+                splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build()))
+            .build();
+
+    assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+  }
+
+  @Test
+  public void notEnoughSplits() throws Exception {
+    Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+    RunQueryResponse splitQueryResponse =
+        RunQueryResponse.newBuilder()
+            .setQuery(splitQuery)
+            .setBatch(
+                QueryResultBatch.newBuilder()
+                    .setEntityResultType(ResultType.KEY_ONLY)
+                    .setMoreResults(MoreResultsType.NO_MORE_RESULTS)
+                    .addEntityResults(makeKeyOnlyEntity(splitKey0))
+                    .build())
+            .build();
+
+    mockClient.setNextResponse(splitQueryResponse);
+
+    List splittedQueries =
+        QuerySplitterImpl.INSTANCE.getSplits(query, PARTITION, 100, datastore);
+
+    assertThat(splittedQueries)
+        .containsExactly(
+            query
+                .toBuilder()
+                .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey0))
+                .build(),
+            query
+                .toBuilder()
+                .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey0, null))
+                .build());
+
+    RunQueryRequest expectedSplitQueryRequest =
+        RunQueryRequest.newBuilder()
+            .setPartitionId(PARTITION)
+            .setQuery(
+                splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(99 * 32).build()))
+            .build();
+
+    assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+  }
+
+  @Test
+  public void getSplits_withReadTime() throws Exception {
+    Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+    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);
+
+    Timestamp readTime = Timestamp.newBuilder().setSeconds(1654651341L).build();
+
+    List splittedQueries =
+        QuerySplitterImpl.INSTANCE.getSplits(query, PARTITION, 3, datastore, readTime);
+
+    assertThat(splittedQueries)
+        .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)
+            .setQuery(
+                splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build()))
+            .setReadOptions(ReadOptions.newBuilder().setReadTime(readTime))
+            .build();
+
+    assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+  }
+
+  private static EntityResult makeKeyOnlyEntity(Key key) {
+    return EntityResult.newBuilder().setEntity(Entity.newBuilder().setKey(key).build()).build();
+  }
+
+  private static Filter makeFilterWithKeyRange(Filter originalFilter, Key startKey, Key endKey) {
+    Filter startKeyFilter =
+        startKey == null
+            ? null
+            : makeFilter("__key__", Operator.GREATER_THAN_OR_EQUAL, makeValue(startKey)).build();
+
+    Filter endKeyFilter =
+        endKey == null
+            ? null
+            : makeFilter("__key__", Operator.LESS_THAN, makeValue(endKey)).build();
+
+    if (startKeyFilter == null && endKeyFilter == null) {
+      throw new IllegalArgumentException();
+    }
+
+    if (startKeyFilter != null && endKeyFilter == null) {
+      return makeAndFilter(originalFilter, startKeyFilter).build();
+    }
+
+    if (startKeyFilter == null && endKeyFilter != null) {
+      return makeAndFilter(originalFilter, endKeyFilter).build();
+    }
+
+    return makeAndFilter(originalFilter, startKeyFilter, endKeyFilter).build();
+  }
+}

From 496c1bcb4c7343fd8330629f82ca9f96fb1a9acc Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 22 Jun 2022 02:06:19 +0200
Subject: [PATCH 0880/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.12 (#774)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.11` -> `0.9.12` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/compatibility-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/confidence-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.12`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.12)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.11...0.9.12)

#### What's Changed

Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog).

-   Add Mockito / Byte Buddy support documentation by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/236](https://togithub.com/graalvm/native-build-tools/pull/236)
-   Prevent builds from failing if no test list is present by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/239](https://togithub.com/graalvm/native-build-tools/pull/239)
-   Support different agent modes in the native-image Gradle plugin by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/230](https://togithub.com/graalvm/native-build-tools/pull/230)
-   JVM Reachability Metadata support for Maven by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://github.com/graalvm/native-build-tools/pull/240](https://togithub.com/graalvm/native-build-tools/pull/240)
-   Warn about deprecated agent DSL by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/242](https://togithub.com/graalvm/native-build-tools/pull/242)
-   Rework Maven plugin by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/247](https://togithub.com/graalvm/native-build-tools/pull/247)
-   Add Gradle rich output support, configure default metadata URL on Maven by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/249](https://togithub.com/graalvm/native-build-tools/pull/249)
-   Fix wrong scope for test dependencies by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/251](https://togithub.com/graalvm/native-build-tools/pull/251)
-   Add documentation for alternative build systems. by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/248](https://togithub.com/graalvm/native-build-tools/pull/248)

**Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.11...0.9.12


    

---

### 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 7e9801d03a4e..b7e8cc234abf 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.11
+            0.9.12
             true
             
               com.example.datastore.NativeImageDatastoreSample

From cab7e54359a4fad5fca23b89a9cf52f95e53e19e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 22 Jun 2022 02:06:27 +0200
Subject: [PATCH 0881/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.12 (#773)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.11` -> `0.9.12` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/compatibility-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/confidence-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.12`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.12)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.11...0.9.12)

#### What's Changed

Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog).

-   Add Mockito / Byte Buddy support documentation by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/236](https://togithub.com/graalvm/native-build-tools/pull/236)
-   Prevent builds from failing if no test list is present by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/239](https://togithub.com/graalvm/native-build-tools/pull/239)
-   Support different agent modes in the native-image Gradle plugin by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/230](https://togithub.com/graalvm/native-build-tools/pull/230)
-   JVM Reachability Metadata support for Maven by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://github.com/graalvm/native-build-tools/pull/240](https://togithub.com/graalvm/native-build-tools/pull/240)
-   Warn about deprecated agent DSL by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/242](https://togithub.com/graalvm/native-build-tools/pull/242)
-   Rework Maven plugin by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/247](https://togithub.com/graalvm/native-build-tools/pull/247)
-   Add Gradle rich output support, configure default metadata URL on Maven by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/249](https://togithub.com/graalvm/native-build-tools/pull/249)
-   Fix wrong scope for test dependencies by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/251](https://togithub.com/graalvm/native-build-tools/pull/251)
-   Add documentation for alternative build systems. by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/248](https://togithub.com/graalvm/native-build-tools/pull/248)

**Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.11...0.9.12


    

---

### 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 b7e8cc234abf..f092add3de40 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.11
+          0.9.12
           test
         
           

From f29c5c92861e4a197e5b610edf6f27b2efb205d8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 22 Jun 2022 16:38:32 +0000
Subject: [PATCH 0882/1784] chore(main): release 2.9.0 (#772)

:robot: I have created a release *beep* *boop*
---


## [2.9.0](https://github.com/googleapis/java-datastore/compare/v2.8.0...v2.9.0) (2022-06-22)


### Features

* support readTime in Datastore query splitter. ([#763](https://github.com/googleapis/java-datastore/issues/763)) ([61758e0](https://github.com/googleapis/java-datastore/commit/61758e02c30c8410dd397d0cc77c987332c4f11c))


### Documentation

* **sample:** clean up README for native image sample ([#771](https://github.com/googleapis/java-datastore/issues/771)) ([7358aa3](https://github.com/googleapis/java-datastore/commit/7358aa34ec9d3d52aae3195fea718ef748ab22b1))


### Dependencies

* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.12 ([#773](https://github.com/googleapis/java-datastore/issues/773)) ([cab7e54](https://github.com/googleapis/java-datastore/commit/cab7e54359a4fad5fca23b89a9cf52f95e53e19e))
* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.12 ([#774](https://github.com/googleapis/java-datastore/issues/774)) ([496c1bc](https://github.com/googleapis/java-datastore/commit/496c1bcb4c7343fd8330629f82ca9f96fb1a9acc))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 18 ++++++++++++++++++
 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, 45 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74eff90d3aa5..7b827c74b859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.9.0](https://github.com/googleapis/java-datastore/compare/v2.8.0...v2.9.0) (2022-06-22)
+
+
+### Features
+
+* support readTime in Datastore query splitter. ([#763](https://github.com/googleapis/java-datastore/issues/763)) ([61758e0](https://github.com/googleapis/java-datastore/commit/61758e02c30c8410dd397d0cc77c987332c4f11c))
+
+
+### Documentation
+
+* **sample:** clean up README for native image sample ([#771](https://github.com/googleapis/java-datastore/issues/771)) ([7358aa3](https://github.com/googleapis/java-datastore/commit/7358aa34ec9d3d52aae3195fea718ef748ab22b1))
+
+
+### Dependencies
+
+* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.12 ([#773](https://github.com/googleapis/java-datastore/issues/773)) ([cab7e54](https://github.com/googleapis/java-datastore/commit/cab7e54359a4fad5fca23b89a9cf52f95e53e19e))
+* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.12 ([#774](https://github.com/googleapis/java-datastore/issues/774)) ([496c1bc](https://github.com/googleapis/java-datastore/commit/496c1bcb4c7343fd8330629f82ca9f96fb1a9acc))
+
 ## [2.8.0](https://github.com/googleapis/java-datastore/compare/v2.7.0...v2.8.0) (2022-06-09)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f1bc4067e672..01fd0ee6b1f0 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.8.1-SNAPSHOT
+  2.9.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.1-SNAPSHOT
+    2.9.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 52ded046da48..0e88ee71e95b 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.8.1-SNAPSHOT
+  2.9.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.8.1-SNAPSHOT
+        2.9.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.8.1-SNAPSHOT
+        2.9.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.99.1-SNAPSHOT
+        0.100.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.8.1-SNAPSHOT
+        2.9.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 39d49942c621..c2fc5f54703f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.8.1-SNAPSHOT
+  2.9.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.1-SNAPSHOT
+    2.9.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 2656eed2caae..333ed662ce39 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.8.1-SNAPSHOT
+  2.9.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.1-SNAPSHOT
+    2.9.0
   
   
     
diff --git a/pom.xml b/pom.xml
index c7ffbdb240f7..26982d78dc4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.8.1-SNAPSHOT
+  2.9.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.8.1-SNAPSHOT
+        2.9.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.8.1-SNAPSHOT
+        2.9.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.8.1-SNAPSHOT
+        2.9.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.99.1-SNAPSHOT
+        0.100.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.8.1-SNAPSHOT
+        2.9.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 56a11c5d2eb6..c61cc3e4d0a5 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.8.1-SNAPSHOT
+  2.9.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.1-SNAPSHOT
+    2.9.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 29395ecdd957..4de0ebb7ce2a 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.99.1-SNAPSHOT
+  0.100.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.8.1-SNAPSHOT
+    2.9.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 6946bf98fa38..1b29554de643 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.8.0:2.8.1-SNAPSHOT
-google-cloud-datastore-bom:2.8.0:2.8.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.99.0:0.99.1-SNAPSHOT
-datastore-v1-proto-client:2.8.0:2.8.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.8.0:2.8.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.8.0:2.8.1-SNAPSHOT
+google-cloud-datastore:2.9.0:2.9.0
+google-cloud-datastore-bom:2.9.0:2.9.0
+proto-google-cloud-datastore-v1:0.100.0:0.100.0
+datastore-v1-proto-client:2.9.0:2.9.0
+proto-google-cloud-datastore-admin-v1:2.9.0:2.9.0
+grpc-google-cloud-datastore-admin-v1:2.9.0:2.9.0

From c0ef1dc97d4192a75e00c645096d414776a04da8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 22 Jun 2022 16:54:11 +0000
Subject: [PATCH 0883/1784] chore(main): release 2.9.1-SNAPSHOT (#775)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 01fd0ee6b1f0..09079e7de7ac 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.9.0
+  2.9.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.0
+    2.9.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0e88ee71e95b..fbb7b7919877 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.9.0
+  2.9.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.9.0
+        2.9.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.0
+        2.9.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.0
+        0.100.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.9.0
+        2.9.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c2fc5f54703f..3fa795ca17cd 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.9.0
+  2.9.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.0
+    2.9.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 333ed662ce39..30a8d3fb697a 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.9.0
+  2.9.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.0
+    2.9.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 26982d78dc4a..f9672c802441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.9.0
+  2.9.1-SNAPSHOT
   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.9.0
+        2.9.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.0
+        2.9.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.9.0
+        2.9.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.0
+        0.100.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.9.0
+        2.9.1-SNAPSHOT
         
           
             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 c61cc3e4d0a5..f0b1f922fbaa 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.9.0
+  2.9.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.0
+    2.9.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4de0ebb7ce2a..1e469b514ab5 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.100.0
+  0.100.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.0
+    2.9.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 1b29554de643..2b4359b46a20 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.9.0:2.9.0
-google-cloud-datastore-bom:2.9.0:2.9.0
-proto-google-cloud-datastore-v1:0.100.0:0.100.0
-datastore-v1-proto-client:2.9.0:2.9.0
-proto-google-cloud-datastore-admin-v1:2.9.0:2.9.0
-grpc-google-cloud-datastore-admin-v1:2.9.0:2.9.0
+google-cloud-datastore:2.9.0:2.9.1-SNAPSHOT
+google-cloud-datastore-bom:2.9.0:2.9.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.100.0:0.100.1-SNAPSHOT
+datastore-v1-proto-client:2.9.0:2.9.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.9.0:2.9.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.9.0:2.9.1-SNAPSHOT

From 58136d64ca717c20c6b8058a07fc25fbac9a9125 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 23 Jun 2022 17:26:12 +0200
Subject: [PATCH 0884/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.13.0 (#777)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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.12.0` -> `2.13.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.13.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.13.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.13.0/compatibility-slim/2.12.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.13.0/confidence-slim/2.12.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).
---
 README.md | 4 ++--
 pom.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7781708dd9bd..38a6461b3c4f 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.8.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.9.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.8.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.9.0"
 ```
 
 ## Authentication
diff --git a/pom.xml b/pom.xml
index f9672c802441..76de32dd5b70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        2.12.0
+        2.13.0
         pom
         import
       

From f333438720116b51a1513739c11fe783dac85b75 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 15:40:16 +0000
Subject: [PATCH 0885/1784] chore(main): release 2.9.1 (#781)

:robot: I have created a release *beep* *boop*
---


## [2.9.1](https://github.com/googleapis/java-datastore/compare/v2.9.0...v2.9.1) (2022-06-23)


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.13.0 ([#777](https://github.com/googleapis/java-datastore/issues/777)) ([58136d6](https://github.com/googleapis/java-datastore/commit/58136d64ca717c20c6b8058a07fc25fbac9a9125))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b827c74b859..20302f0d1f4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.9.1](https://github.com/googleapis/java-datastore/compare/v2.9.0...v2.9.1) (2022-06-23)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.13.0 ([#777](https://github.com/googleapis/java-datastore/issues/777)) ([58136d6](https://github.com/googleapis/java-datastore/commit/58136d64ca717c20c6b8058a07fc25fbac9a9125))
+
 ## [2.9.0](https://github.com/googleapis/java-datastore/compare/v2.8.0...v2.9.0) (2022-06-22)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 09079e7de7ac..6a0d5e0f6eaa 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.9.1-SNAPSHOT
+  2.9.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1-SNAPSHOT
+    2.9.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index fbb7b7919877..65225e59d84a 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.9.1-SNAPSHOT
+  2.9.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.9.1-SNAPSHOT
+        2.9.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.1-SNAPSHOT
+        2.9.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.1-SNAPSHOT
+        0.100.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.9.1-SNAPSHOT
+        2.9.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3fa795ca17cd..acb57556887d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.9.1-SNAPSHOT
+  2.9.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1-SNAPSHOT
+    2.9.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 30a8d3fb697a..d6485787a444 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.9.1-SNAPSHOT
+  2.9.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1-SNAPSHOT
+    2.9.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 76de32dd5b70..5f12813970a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.9.1-SNAPSHOT
+  2.9.1
   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.9.1-SNAPSHOT
+        2.9.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.1-SNAPSHOT
+        2.9.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.9.1-SNAPSHOT
+        2.9.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.1-SNAPSHOT
+        0.100.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.9.1-SNAPSHOT
+        2.9.1
         
           
             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 f0b1f922fbaa..cd58450c698f 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.9.1-SNAPSHOT
+  2.9.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1-SNAPSHOT
+    2.9.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1e469b514ab5..dd6aa6a8da12 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.100.1-SNAPSHOT
+  0.100.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1-SNAPSHOT
+    2.9.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 2b4359b46a20..864d2d4e946c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.9.0:2.9.1-SNAPSHOT
-google-cloud-datastore-bom:2.9.0:2.9.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.100.0:0.100.1-SNAPSHOT
-datastore-v1-proto-client:2.9.0:2.9.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.9.0:2.9.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.9.0:2.9.1-SNAPSHOT
+google-cloud-datastore:2.9.1:2.9.1
+google-cloud-datastore-bom:2.9.1:2.9.1
+proto-google-cloud-datastore-v1:0.100.1:0.100.1
+datastore-v1-proto-client:2.9.1:2.9.1
+proto-google-cloud-datastore-admin-v1:2.9.1:2.9.1
+grpc-google-cloud-datastore-admin-v1:2.9.1:2.9.1

From 5031c761d94c553422dc4186b7b71bc80b48d308 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 16:02:13 +0000
Subject: [PATCH 0886/1784] chore(main): release 2.9.2-SNAPSHOT (#782)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6a0d5e0f6eaa..b44a7524a84e 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.9.1
+  2.9.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1
+    2.9.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 65225e59d84a..f5c398dbb456 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.9.1
+  2.9.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.9.1
+        2.9.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.1
+        2.9.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.1
+        0.100.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.9.1
+        2.9.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index acb57556887d..f51e6af468c1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.9.1
+  2.9.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1
+    2.9.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d6485787a444..d77d3f58a2e2 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.9.1
+  2.9.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1
+    2.9.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 5f12813970a2..79a034b910ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.9.1
+  2.9.2-SNAPSHOT
   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.9.1
+        2.9.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.1
+        2.9.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.9.1
+        2.9.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.1
+        0.100.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.9.1
+        2.9.2-SNAPSHOT
         
           
             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 cd58450c698f..affa53f8a5f6 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.9.1
+  2.9.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1
+    2.9.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index dd6aa6a8da12..e3c4f5d889e0 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.100.1
+  0.100.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.1
+    2.9.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 864d2d4e946c..147773b39ea2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.9.1:2.9.1
-google-cloud-datastore-bom:2.9.1:2.9.1
-proto-google-cloud-datastore-v1:0.100.1:0.100.1
-datastore-v1-proto-client:2.9.1:2.9.1
-proto-google-cloud-datastore-admin-v1:2.9.1:2.9.1
-grpc-google-cloud-datastore-admin-v1:2.9.1:2.9.1
+google-cloud-datastore:2.9.1:2.9.2-SNAPSHOT
+google-cloud-datastore-bom:2.9.1:2.9.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.100.1:0.100.2-SNAPSHOT
+datastore-v1-proto-client:2.9.1:2.9.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.9.1:2.9.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.9.1:2.9.2-SNAPSHOT

From d8e622f16005225e2e47c6db3242643a679c6d0b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 23 Jun 2022 18:16:23 +0200
Subject: [PATCH 0887/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.9.0 (#776)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.8.0` -> `2.9.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.9.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.9.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.9.0/compatibility-slim/2.8.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.9.0/confidence-slim/2.8.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).
---
 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 38a6461b3c4f..9fed2f3ffb8a 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.8.0
+  2.9.0
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 130b6d8caefa..13c7b9ed1eab 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.8.0
+      2.9.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index cbfeb45e1008..ca5261ffe416 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.8.0
+      2.9.0
     
 
     

From c3290e3e32a5309abc8e456bfd584c929d23628c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:57:16 -0400
Subject: [PATCH 0888/1784] feat: Enable REST transport for admin client (#778)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Enable REST transport for most of Java and Go clients

PiperOrigin-RevId: 456641589

Source-Link: https://github.com/googleapis/googleapis/commit/8a251f5225b789b2383207ffd978f6aa3d77fcf7

Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* deps: adding gax-httpjson

* 🦉 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 
Co-authored-by: Tomo Suzuki 
Co-authored-by: Neenu Shaji 
---
 README.md                                     |   4 +-
 google-cloud-datastore/pom.xml                |  16 +
 .../admin/v1/DatastoreAdminClient.java        |  37 +-
 .../admin/v1/DatastoreAdminSettings.java      |  23 +-
 .../admin/v1/stub/DatastoreAdminStub.java     |   6 +-
 .../v1/stub/DatastoreAdminStubSettings.java   |  53 +-
 ...HttpJsonDatastoreAdminCallableFactory.java | 105 ++++
 .../v1/stub/HttpJsonDatastoreAdminStub.java   | 554 ++++++++++++++++++
 .../v1/DatastoreAdminClientHttpJsonTest.java  | 434 ++++++++++++++
 9 files changed, 1219 insertions(+), 13 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java

diff --git a/README.md b/README.md
index 9fed2f3ffb8a..e3f70136a476 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.9.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.9.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.9.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.9.1"
 ```
 
 ## Authentication
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f51e6af468c1..620e4297160a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -70,6 +70,10 @@
       com.google.api
       gax-grpc
     
+    
+      com.google.api
+      gax-httpjson
+    
     
       com.google.guava
       guava
@@ -111,12 +115,24 @@
       test
     
     
+    
+      com.google.api
+      gax
+      testlib
+      test
+    
     
       com.google.api
       gax-grpc
       testlib
       test
     
+    
+      com.google.api
+      gax-httpjson
+      testlib
+      test
+    
     
       junit
       junit
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index ec653b844547..695fdad3e68e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -19,6 +19,7 @@
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.httpjson.longrunning.OperationsClient;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
 import com.google.api.gax.paging.AbstractPage;
@@ -43,7 +44,6 @@
 import com.google.datastore.admin.v1.ListIndexesRequest;
 import com.google.datastore.admin.v1.ListIndexesResponse;
 import com.google.longrunning.Operation;
-import com.google.longrunning.OperationsClient;
 import com.google.protobuf.Empty;
 import java.io.IOException;
 import java.util.List;
@@ -172,13 +172,28 @@
  * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings);
  * }
    
  *
+ * 
    To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
+ * the wire:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
+ * DatastoreAdminSettings datastoreAdminSettings =
+ *     DatastoreAdminSettings.newBuilder()
+ *         .setTransportChannelProvider(
+ *             DatastoreAdminSettings.defaultHttpJsonTransportProviderBuilder().build())
+ *         .build();
+ * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings);
+ * }
    
+ *
  * 
    Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")
 public class DatastoreAdminClient implements BackgroundResource {
   private final DatastoreAdminSettings settings;
   private final DatastoreAdminStub stub;
-  private final OperationsClient operationsClient;
+  private final OperationsClient httpJsonOperationsClient;
+  private final com.google.longrunning.OperationsClient operationsClient;
 
   /** Constructs an instance of DatastoreAdminClient with default settings. */
   public static final DatastoreAdminClient create() throws IOException {
@@ -210,13 +225,17 @@ public static final DatastoreAdminClient create(DatastoreAdminStub stub) {
   protected DatastoreAdminClient(DatastoreAdminSettings settings) throws IOException {
     this.settings = settings;
     this.stub = ((DatastoreAdminStubSettings) settings.getStubSettings()).createStub();
-    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+    this.operationsClient =
+        com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
+    this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
   }
 
   protected DatastoreAdminClient(DatastoreAdminStub stub) {
     this.settings = null;
     this.stub = stub;
-    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+    this.operationsClient =
+        com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
+    this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
   }
 
   public final DatastoreAdminSettings getSettings() {
@@ -231,10 +250,18 @@ public DatastoreAdminStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
-  public final OperationsClient getOperationsClient() {
+  public final com.google.longrunning.OperationsClient getOperationsClient() {
     return operationsClient;
   }
 
+  /**
+   * Returns the OperationsClient that can be used to query the status of a long-running operation
+   * returned by another API method call.
+   */
+  public final OperationsClient getHttpJsonOperationsClient() {
+    return httpJsonOperationsClient;
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Exports a copy of all or a subset of entities from Google Cloud Datastore to another storage
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 4c5934044d73..6d915b8022df 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -23,6 +23,7 @@
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
@@ -167,11 +168,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
     return DatastoreAdminStubSettings.defaultCredentialsProviderBuilder();
   }
 
-  /** Returns a builder for the default ChannelProvider for this service. */
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
     return DatastoreAdminStubSettings.defaultGrpcTransportProviderBuilder();
   }
 
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return DatastoreAdminStubSettings.defaultHttpJsonTransportProviderBuilder();
+  }
+
   public static TransportChannelProvider defaultTransportChannelProvider() {
     return DatastoreAdminStubSettings.defaultTransportChannelProvider();
   }
@@ -181,11 +189,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
     return DatastoreAdminStubSettings.defaultApiClientHeaderProviderBuilder();
   }
 
-  /** Returns a new builder for this class. */
+  /** Returns a new gRPC builder for this class. */
   public static Builder newBuilder() {
     return Builder.createDefault();
   }
 
+  /** Returns a new REST builder for this class. */
+  @BetaApi
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
   /** Returns a new builder for this class. */
   public static Builder newBuilder(ClientContext clientContext) {
     return new Builder(clientContext);
@@ -223,6 +237,11 @@ private static Builder createDefault() {
       return new Builder(DatastoreAdminStubSettings.newBuilder());
     }
 
+    @BetaApi
+    private static Builder createHttpJsonDefault() {
+      return new Builder(DatastoreAdminStubSettings.newHttpJsonBuilder());
+    }
+
     public DatastoreAdminStubSettings.Builder getStubSettingsBuilder() {
       return ((DatastoreAdminStubSettings.Builder) getStubSettings());
     }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
index d32578ef4aae..cc758842caf7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
@@ -48,7 +48,11 @@
 public abstract class DatastoreAdminStub implements BackgroundResource {
 
   public OperationsStub getOperationsStub() {
-    throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
+    return null;
+  }
+
+  public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() {
+    return null;
   }
 
   public OperationCallable
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 022f84095f73..2abc133c605a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -28,6 +28,9 @@
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 import com.google.api.gax.grpc.ProtoOperationTransformers;
+import com.google.api.gax.httpjson.GaxHttpJsonProperties;
+import com.google.api.gax.httpjson.HttpJsonTransportChannel;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.longrunning.OperationSnapshot;
 import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
 import com.google.api.gax.retrying.RetrySettings;
@@ -242,6 +245,11 @@ public DatastoreAdminStub createStub() throws IOException {
         .equals(GrpcTransportChannel.getGrpcTransportName())) {
       return GrpcDatastoreAdminStub.create(this);
     }
+    if (getTransportChannelProvider()
+        .getTransportName()
+        .equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
+      return HttpJsonDatastoreAdminStub.create(this);
+    }
     throw new UnsupportedOperationException(
         String.format(
             "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
@@ -274,18 +282,25 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
         .setUseJwtAccessWithScope(true);
   }
 
-  /** Returns a builder for the default ChannelProvider for this service. */
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
     return InstantiatingGrpcChannelProvider.newBuilder()
         .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return InstantiatingHttpJsonChannelProvider.newBuilder();
+  }
+
   public static TransportChannelProvider defaultTransportChannelProvider() {
     return defaultGrpcTransportProviderBuilder().build();
   }
 
   @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
-  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+  public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
     return ApiClientHeaderProvider.newBuilder()
         .setGeneratedLibToken(
             "gapic", GaxProperties.getLibraryVersion(DatastoreAdminStubSettings.class))
@@ -293,11 +308,30 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
             GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
   }
 
-  /** Returns a new builder for this class. */
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
+    return ApiClientHeaderProvider.newBuilder()
+        .setGeneratedLibToken(
+            "gapic", GaxProperties.getLibraryVersion(DatastoreAdminStubSettings.class))
+        .setTransportToken(
+            GaxHttpJsonProperties.getHttpJsonTokenName(),
+            GaxHttpJsonProperties.getHttpJsonVersion());
+  }
+
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return DatastoreAdminStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
+  }
+
+  /** Returns a new gRPC builder for this class. */
   public static Builder newBuilder() {
     return Builder.createDefault();
   }
 
+  /** Returns a new REST builder for this class. */
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
   /** Returns a new builder for this class. */
   public static Builder newBuilder(ClientContext clientContext) {
     return new Builder(clientContext);
@@ -455,6 +489,19 @@ private static Builder createDefault() {
       return initDefaults(builder);
     }
 
+    private static Builder createHttpJsonDefault() {
+      Builder builder = new Builder(((ClientContext) null));
+
+      builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
+      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+      builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
+      builder.setEndpoint(getDefaultEndpoint());
+      builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+      builder.setSwitchToMtlsEndpointAllowed(true);
+
+      return initDefaults(builder);
+    }
+
     private static Builder initDefaults(Builder builder) {
       builder
           .exportEntitiesSettings()
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
new file mode 100644
index 000000000000..792def7916a2
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
@@ -0,0 +1,105 @@
+/*
+ * 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
+ *
+ *      https://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.cloud.datastore.admin.v1.stub;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.httpjson.HttpJsonCallSettings;
+import com.google.api.gax.httpjson.HttpJsonCallableFactory;
+import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
+import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
+import com.google.api.gax.httpjson.longrunning.stub.OperationsStub;
+import com.google.api.gax.rpc.BatchingCallSettings;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.longrunning.Operation;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * REST callable factory implementation for the DatastoreAdmin service API.
+ *
+ * 
    This class is for advanced usage.
+ */
+@Generated("by gapic-generator-java")
+@BetaApi
+public class HttpJsonDatastoreAdminCallableFactory
+    implements HttpJsonStubCallableFactory {
+
+  @Override
+  public  UnaryCallable createUnaryCallable(
+      HttpJsonCallSettings httpJsonCallSettings,
+      UnaryCallSettings callSettings,
+      ClientContext clientContext) {
+    return HttpJsonCallableFactory.createUnaryCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      UnaryCallable createPagedCallable(
+          HttpJsonCallSettings httpJsonCallSettings,
+          PagedCallSettings callSettings,
+          ClientContext clientContext) {
+    return HttpJsonCallableFactory.createPagedCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public  UnaryCallable createBatchingCallable(
+      HttpJsonCallSettings httpJsonCallSettings,
+      BatchingCallSettings callSettings,
+      ClientContext clientContext) {
+    return HttpJsonCallableFactory.createBatchingCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  @Override
+  public 
+      OperationCallable createOperationCallable(
+          HttpJsonCallSettings httpJsonCallSettings,
+          OperationCallSettings callSettings,
+          ClientContext clientContext,
+          OperationsStub operationsStub) {
+    UnaryCallable innerCallable =
+        HttpJsonCallableFactory.createBaseUnaryCallable(
+            httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext);
+    HttpJsonOperationSnapshotCallable initialCallable =
+        new HttpJsonOperationSnapshotCallable(
+            innerCallable,
+            httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory());
+    return HttpJsonCallableFactory.createOperationCallable(
+        callSettings, clientContext, operationsStub.longRunningClient(), initialCallable);
+  }
+
+  @Override
+  public 
+      ServerStreamingCallable createServerStreamingCallable(
+          HttpJsonCallSettings httpJsonCallSettings,
+          ServerStreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return HttpJsonCallableFactory.createServerStreamingCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
new file mode 100644
index 000000000000..207ca1d45c38
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -0,0 +1,554 @@
+/*
+ * 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
+ *
+ *      https://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.cloud.datastore.admin.v1.stub;
+
+import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
+
+import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.BackgroundResourceAggregation;
+import com.google.api.gax.httpjson.ApiMethodDescriptor;
+import com.google.api.gax.httpjson.HttpJsonCallSettings;
+import com.google.api.gax.httpjson.HttpJsonOperationSnapshot;
+import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
+import com.google.api.gax.httpjson.ProtoMessageRequestFormatter;
+import com.google.api.gax.httpjson.ProtoMessageResponseParser;
+import com.google.api.gax.httpjson.ProtoRestSerializer;
+import com.google.api.gax.httpjson.longrunning.stub.HttpJsonOperationsStub;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.ExportEntitiesMetadata;
+import com.google.datastore.admin.v1.ExportEntitiesRequest;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.ImportEntitiesMetadata;
+import com.google.datastore.admin.v1.ImportEntitiesRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.IndexOperationMetadata;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.protobuf.Empty;
+import com.google.protobuf.TypeRegistry;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * REST stub implementation for the DatastoreAdmin service API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator-java")
+@BetaApi
+public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
+  private static final TypeRegistry typeRegistry =
+      TypeRegistry.newBuilder()
+          .add(Empty.getDescriptor())
+          .add(ExportEntitiesResponse.getDescriptor())
+          .add(IndexOperationMetadata.getDescriptor())
+          .add(Index.getDescriptor())
+          .add(ExportEntitiesMetadata.getDescriptor())
+          .add(ImportEntitiesMetadata.getDescriptor())
+          .build();
+
+  private static final ApiMethodDescriptor
+      exportEntitiesMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/ExportEntities")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:export",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build()))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(Operation.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .setOperationSnapshotFactory(
+                  (ExportEntitiesRequest request, Operation response) ->
+                      HttpJsonOperationSnapshot.create(response))
+              .build();
+
+  private static final ApiMethodDescriptor
+      importEntitiesMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/ImportEntities")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:import",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build()))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(Operation.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .setOperationSnapshotFactory(
+                  (ImportEntitiesRequest request, Operation response) ->
+                      HttpJsonOperationSnapshot.create(response))
+              .build();
+
+  private static final ApiMethodDescriptor
+      createIndexMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/CreateIndex")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}/indexes",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create().toBody("index", request.getIndex()))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(Operation.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .setOperationSnapshotFactory(
+                  (CreateIndexRequest request, Operation response) ->
+                      HttpJsonOperationSnapshot.create(response))
+              .build();
+
+  private static final ApiMethodDescriptor
+      deleteIndexMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/DeleteIndex")
+              .setHttpMethod("DELETE")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}/indexes/{indexId}",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "indexId", request.getIndexId());
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(request -> null)
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(Operation.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .setOperationSnapshotFactory(
+                  (DeleteIndexRequest request, Operation response) ->
+                      HttpJsonOperationSnapshot.create(response))
+              .build();
+
+  private static final ApiMethodDescriptor getIndexMethodDescriptor =
+      ApiMethodDescriptor.newBuilder()
+          .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/GetIndex")
+          .setHttpMethod("GET")
+          .setType(ApiMethodDescriptor.MethodType.UNARY)
+          .setRequestFormatter(
+              ProtoMessageRequestFormatter.newBuilder()
+                  .setPath(
+                      "/v1/projects/{projectId}/indexes/{indexId}",
+                      request -> {
+                        Map fields = new HashMap<>();
+                        ProtoRestSerializer serializer =
+                            ProtoRestSerializer.create();
+                        serializer.putPathParam(fields, "indexId", request.getIndexId());
+                        serializer.putPathParam(fields, "projectId", request.getProjectId());
+                        return fields;
+                      })
+                  .setQueryParamsExtractor(
+                      request -> {
+                        Map> fields = new HashMap<>();
+                        ProtoRestSerializer serializer =
+                            ProtoRestSerializer.create();
+                        return fields;
+                      })
+                  .setRequestBodyExtractor(request -> null)
+                  .build())
+          .setResponseParser(
+              ProtoMessageResponseParser.newBuilder()
+                  .setDefaultInstance(Index.getDefaultInstance())
+                  .setDefaultTypeRegistry(typeRegistry)
+                  .build())
+          .build();
+
+  private static final ApiMethodDescriptor
+      listIndexesMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/ListIndexes")
+              .setHttpMethod("GET")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}/indexes",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "filter", request.getFilter());
+                            serializer.putQueryParam(fields, "pageSize", request.getPageSize());
+                            serializer.putQueryParam(fields, "pageToken", request.getPageToken());
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(request -> null)
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(ListIndexesResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
+  private final UnaryCallable exportEntitiesCallable;
+  private final OperationCallable<
+          ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
+      exportEntitiesOperationCallable;
+  private final UnaryCallable importEntitiesCallable;
+  private final OperationCallable
+      importEntitiesOperationCallable;
+  private final UnaryCallable createIndexCallable;
+  private final OperationCallable
+      createIndexOperationCallable;
+  private final UnaryCallable deleteIndexCallable;
+  private final OperationCallable
+      deleteIndexOperationCallable;
+  private final UnaryCallable getIndexCallable;
+  private final UnaryCallable listIndexesCallable;
+  private final UnaryCallable
+      listIndexesPagedCallable;
+
+  private final BackgroundResource backgroundResources;
+  private final HttpJsonOperationsStub httpJsonOperationsStub;
+  private final HttpJsonStubCallableFactory callableFactory;
+
+  public static final HttpJsonDatastoreAdminStub create(DatastoreAdminStubSettings settings)
+      throws IOException {
+    return new HttpJsonDatastoreAdminStub(settings, ClientContext.create(settings));
+  }
+
+  public static final HttpJsonDatastoreAdminStub create(ClientContext clientContext)
+      throws IOException {
+    return new HttpJsonDatastoreAdminStub(
+        DatastoreAdminStubSettings.newHttpJsonBuilder().build(), clientContext);
+  }
+
+  public static final HttpJsonDatastoreAdminStub create(
+      ClientContext clientContext, HttpJsonStubCallableFactory callableFactory) throws IOException {
+    return new HttpJsonDatastoreAdminStub(
+        DatastoreAdminStubSettings.newHttpJsonBuilder().build(), clientContext, callableFactory);
+  }
+
+  /**
+   * Constructs an instance of HttpJsonDatastoreAdminStub, using the given settings. This is
+   * protected so that it is easy to make a subclass, but otherwise, the static factory methods
+   * should be preferred.
+   */
+  protected HttpJsonDatastoreAdminStub(
+      DatastoreAdminStubSettings settings, ClientContext clientContext) throws IOException {
+    this(settings, clientContext, new HttpJsonDatastoreAdminCallableFactory());
+  }
+
+  /**
+   * Constructs an instance of HttpJsonDatastoreAdminStub, using the given settings. This is
+   * protected so that it is easy to make a subclass, but otherwise, the static factory methods
+   * should be preferred.
+   */
+  protected HttpJsonDatastoreAdminStub(
+      DatastoreAdminStubSettings settings,
+      ClientContext clientContext,
+      HttpJsonStubCallableFactory callableFactory)
+      throws IOException {
+    this.callableFactory = callableFactory;
+    this.httpJsonOperationsStub =
+        HttpJsonOperationsStub.create(clientContext, callableFactory, typeRegistry);
+
+    HttpJsonCallSettings exportEntitiesTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(exportEntitiesMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .build();
+    HttpJsonCallSettings importEntitiesTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(importEntitiesMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .build();
+    HttpJsonCallSettings createIndexTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(createIndexMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .build();
+    HttpJsonCallSettings deleteIndexTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(deleteIndexMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .build();
+    HttpJsonCallSettings getIndexTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(getIndexMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .build();
+    HttpJsonCallSettings listIndexesTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(listIndexesMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .build();
+
+    this.exportEntitiesCallable =
+        callableFactory.createUnaryCallable(
+            exportEntitiesTransportSettings, settings.exportEntitiesSettings(), clientContext);
+    this.exportEntitiesOperationCallable =
+        callableFactory.createOperationCallable(
+            exportEntitiesTransportSettings,
+            settings.exportEntitiesOperationSettings(),
+            clientContext,
+            httpJsonOperationsStub);
+    this.importEntitiesCallable =
+        callableFactory.createUnaryCallable(
+            importEntitiesTransportSettings, settings.importEntitiesSettings(), clientContext);
+    this.importEntitiesOperationCallable =
+        callableFactory.createOperationCallable(
+            importEntitiesTransportSettings,
+            settings.importEntitiesOperationSettings(),
+            clientContext,
+            httpJsonOperationsStub);
+    this.createIndexCallable =
+        callableFactory.createUnaryCallable(
+            createIndexTransportSettings, settings.createIndexSettings(), clientContext);
+    this.createIndexOperationCallable =
+        callableFactory.createOperationCallable(
+            createIndexTransportSettings,
+            settings.createIndexOperationSettings(),
+            clientContext,
+            httpJsonOperationsStub);
+    this.deleteIndexCallable =
+        callableFactory.createUnaryCallable(
+            deleteIndexTransportSettings, settings.deleteIndexSettings(), clientContext);
+    this.deleteIndexOperationCallable =
+        callableFactory.createOperationCallable(
+            deleteIndexTransportSettings,
+            settings.deleteIndexOperationSettings(),
+            clientContext,
+            httpJsonOperationsStub);
+    this.getIndexCallable =
+        callableFactory.createUnaryCallable(
+            getIndexTransportSettings, settings.getIndexSettings(), clientContext);
+    this.listIndexesCallable =
+        callableFactory.createUnaryCallable(
+            listIndexesTransportSettings, settings.listIndexesSettings(), clientContext);
+    this.listIndexesPagedCallable =
+        callableFactory.createPagedCallable(
+            listIndexesTransportSettings, settings.listIndexesSettings(), clientContext);
+
+    this.backgroundResources =
+        new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+  }
+
+  @InternalApi
+  public static List getMethodDescriptors() {
+    List methodDescriptors = new ArrayList<>();
+    methodDescriptors.add(exportEntitiesMethodDescriptor);
+    methodDescriptors.add(importEntitiesMethodDescriptor);
+    methodDescriptors.add(createIndexMethodDescriptor);
+    methodDescriptors.add(deleteIndexMethodDescriptor);
+    methodDescriptors.add(getIndexMethodDescriptor);
+    methodDescriptors.add(listIndexesMethodDescriptor);
+    return methodDescriptors;
+  }
+
+  public HttpJsonOperationsStub getHttpJsonOperationsStub() {
+    return httpJsonOperationsStub;
+  }
+
+  @Override
+  public UnaryCallable exportEntitiesCallable() {
+    return exportEntitiesCallable;
+  }
+
+  @Override
+  public OperationCallable
+      exportEntitiesOperationCallable() {
+    return exportEntitiesOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable importEntitiesCallable() {
+    return importEntitiesCallable;
+  }
+
+  @Override
+  public OperationCallable
+      importEntitiesOperationCallable() {
+    return importEntitiesOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable createIndexCallable() {
+    return createIndexCallable;
+  }
+
+  @Override
+  public OperationCallable
+      createIndexOperationCallable() {
+    return createIndexOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable deleteIndexCallable() {
+    return deleteIndexCallable;
+  }
+
+  @Override
+  public OperationCallable
+      deleteIndexOperationCallable() {
+    return deleteIndexOperationCallable;
+  }
+
+  @Override
+  public UnaryCallable getIndexCallable() {
+    return getIndexCallable;
+  }
+
+  @Override
+  public UnaryCallable listIndexesCallable() {
+    return listIndexesCallable;
+  }
+
+  @Override
+  public UnaryCallable listIndexesPagedCallable() {
+    return listIndexesPagedCallable;
+  }
+
+  @Override
+  public final void close() {
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundResources.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return backgroundResources.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return backgroundResources.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    backgroundResources.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return backgroundResources.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
new file mode 100644
index 000000000000..73732535df9c
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
@@ -0,0 +1,434 @@
+/*
+ * 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
+ *
+ *      https://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.cloud.datastore.admin.v1;
+
+import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.httpjson.GaxHttpJsonProperties;
+import com.google.api.gax.httpjson.testing.MockHttpService;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ApiException;
+import com.google.api.gax.rpc.ApiExceptionFactory;
+import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.testing.FakeStatusCode;
+import com.google.cloud.datastore.admin.v1.stub.HttpJsonDatastoreAdminStub;
+import com.google.common.collect.Lists;
+import com.google.datastore.admin.v1.CreateIndexRequest;
+import com.google.datastore.admin.v1.DeleteIndexRequest;
+import com.google.datastore.admin.v1.EntityFilter;
+import com.google.datastore.admin.v1.ExportEntitiesResponse;
+import com.google.datastore.admin.v1.GetIndexRequest;
+import com.google.datastore.admin.v1.Index;
+import com.google.datastore.admin.v1.ListIndexesRequest;
+import com.google.datastore.admin.v1.ListIndexesResponse;
+import com.google.longrunning.Operation;
+import com.google.protobuf.Any;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Generated;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@Generated("by gapic-generator-java")
+public class DatastoreAdminClientHttpJsonTest {
+  private static MockHttpService mockService;
+  private static DatastoreAdminClient client;
+
+  @BeforeClass
+  public static void startStaticServer() throws IOException {
+    mockService =
+        new MockHttpService(
+            HttpJsonDatastoreAdminStub.getMethodDescriptors(),
+            DatastoreAdminSettings.getDefaultEndpoint());
+    DatastoreAdminSettings settings =
+        DatastoreAdminSettings.newHttpJsonBuilder()
+            .setTransportChannelProvider(
+                DatastoreAdminSettings.defaultHttpJsonTransportProviderBuilder()
+                    .setHttpTransport(mockService)
+                    .build())
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .build();
+    client = DatastoreAdminClient.create(settings);
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    client.close();
+  }
+
+  @Before
+  public void setUp() {}
+
+  @After
+  public void tearDown() throws Exception {
+    mockService.reset();
+  }
+
+  @Test
+  public void exportEntitiesTest() throws Exception {
+    ExportEntitiesResponse expectedResponse =
+        ExportEntitiesResponse.newBuilder().setOutputUrl("outputUrl-2119300946").build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("exportEntitiesTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockService.addResponse(resultOperation);
+
+    String projectId = "projectId-1530";
+    Map labels = new HashMap<>();
+    EntityFilter entityFilter = EntityFilter.newBuilder().build();
+    String outputUrlPrefix = "outputUrlPrefix-1132598048";
+
+    ExportEntitiesResponse actualResponse =
+        client.exportEntitiesAsync(projectId, labels, entityFilter, outputUrlPrefix).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void exportEntitiesExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      Map labels = new HashMap<>();
+      EntityFilter entityFilter = EntityFilter.newBuilder().build();
+      String outputUrlPrefix = "outputUrlPrefix-1132598048";
+      client.exportEntitiesAsync(projectId, labels, entityFilter, outputUrlPrefix).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+    }
+  }
+
+  @Test
+  public void importEntitiesTest() throws Exception {
+    Empty expectedResponse = Empty.newBuilder().build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("importEntitiesTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockService.addResponse(resultOperation);
+
+    String projectId = "projectId-1530";
+    Map labels = new HashMap<>();
+    String inputUrl = "inputUrl470706501";
+    EntityFilter entityFilter = EntityFilter.newBuilder().build();
+
+    client.importEntitiesAsync(projectId, labels, inputUrl, entityFilter).get();
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void importEntitiesExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      Map labels = new HashMap<>();
+      String inputUrl = "inputUrl470706501";
+      EntityFilter entityFilter = EntityFilter.newBuilder().build();
+      client.importEntitiesAsync(projectId, labels, inputUrl, entityFilter).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+    }
+  }
+
+  @Test
+  public void createIndexTest() throws Exception {
+    Index expectedResponse =
+        Index.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .setKind("kind3292052")
+            .addAllProperties(new ArrayList())
+            .build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("createIndexTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockService.addResponse(resultOperation);
+
+    CreateIndexRequest request =
+        CreateIndexRequest.newBuilder()
+            .setProjectId("projectId-1530")
+            .setIndex(Index.newBuilder().build())
+            .build();
+
+    Index actualResponse = client.createIndexAsync(request).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void createIndexExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      CreateIndexRequest request =
+          CreateIndexRequest.newBuilder()
+              .setProjectId("projectId-1530")
+              .setIndex(Index.newBuilder().build())
+              .build();
+      client.createIndexAsync(request).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+    }
+  }
+
+  @Test
+  public void deleteIndexTest() throws Exception {
+    Index expectedResponse =
+        Index.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .setKind("kind3292052")
+            .addAllProperties(new ArrayList())
+            .build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("deleteIndexTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockService.addResponse(resultOperation);
+
+    DeleteIndexRequest request =
+        DeleteIndexRequest.newBuilder()
+            .setProjectId("projectId-1530")
+            .setIndexId("indexId-7485")
+            .build();
+
+    Index actualResponse = client.deleteIndexAsync(request).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void deleteIndexExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      DeleteIndexRequest request =
+          DeleteIndexRequest.newBuilder()
+              .setProjectId("projectId-1530")
+              .setIndexId("indexId-7485")
+              .build();
+      client.deleteIndexAsync(request).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+    }
+  }
+
+  @Test
+  public void getIndexTest() throws Exception {
+    Index expectedResponse =
+        Index.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setIndexId("indexId1943291277")
+            .setKind("kind3292052")
+            .addAllProperties(new ArrayList())
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    GetIndexRequest request =
+        GetIndexRequest.newBuilder()
+            .setProjectId("projectId-1530")
+            .setIndexId("indexId-7485")
+            .build();
+
+    Index actualResponse = client.getIndex(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void getIndexExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      GetIndexRequest request =
+          GetIndexRequest.newBuilder()
+              .setProjectId("projectId-1530")
+              .setIndexId("indexId-7485")
+              .build();
+      client.getIndex(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void listIndexesTest() throws Exception {
+    Index responsesElement = Index.newBuilder().build();
+    ListIndexesResponse expectedResponse =
+        ListIndexesResponse.newBuilder()
+            .setNextPageToken("")
+            .addAllIndexes(Arrays.asList(responsesElement))
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    ListIndexesRequest request =
+        ListIndexesRequest.newBuilder()
+            .setProjectId("projectId-1530")
+            .setFilter("filter-1274492040")
+            .setPageSize(883849137)
+            .setPageToken("pageToken873572522")
+            .build();
+
+    ListIndexesPagedResponse pagedListResponse = client.listIndexes(request);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getIndexesList().get(0), resources.get(0));
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void listIndexesExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      ListIndexesRequest request =
+          ListIndexesRequest.newBuilder()
+              .setProjectId("projectId-1530")
+              .setFilter("filter-1274492040")
+              .setPageSize(883849137)
+              .setPageToken("pageToken873572522")
+              .build();
+      client.listIndexes(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+}

From a515970e1cfd304387c2534a9a9ec9c6aff69211 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 19:22:27 +0000
Subject: [PATCH 0889/1784] chore: update dependencies for regapic (#1467)
 (#784)

* chore: update dependencies for regapic

* add more dependencies and trigger comment

* update goldens

* fix indentation

* remove duplicate gax-httpjson dependency

* remove duplicated dependencies
Source-Link: https://github.com/googleapis/synthtool/commit/fa54eb2a78c6ee48613fd33152e2130e949dcbd9
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:1ec28a46062b19135b11178ceee60231e5f5a92dab454e23ae0aab72cd875906
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .kokoro/common.sh         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 68f2b159daba..f0625e4d9459 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:58ccd4737212f64a7dd4b3063d447447acf71a2b9d409eab19fc7a00b18eadc0
-# created: 2022-06-10T19:20:11.004014696Z
+  digest: sha256:1ec28a46062b19135b11178ceee60231e5f5a92dab454e23ae0aab72cd875906
+# created: 2022-06-27T15:01:06.405564326Z
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index ace89f45a9de..f8f957af1112 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -55,4 +55,6 @@ function retry_with_backoff {
 ## Helper functionss
 function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
 function msg() { println "$*" >&2; }
-function println() { printf '%s\n' "$(now) $*"; }
\ No newline at end of file
+function println() { printf '%s\n' "$(now) $*"; }
+
+## Helper comment to trigger updated repo dependency release
\ No newline at end of file

From 8a12f25ece95429a10c1bcae220a678a7c2e3ff1 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 11:57:39 -0400
Subject: [PATCH 0890/1784] fix: update gapic-generator-java with mock service
 generation fixes (#785)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: update gapic-generator-java with mock service generation fixes

PiperOrigin-RevId: 457524730

Source-Link: https://github.com/googleapis/googleapis/commit/917e7f21cb1dc062744c6694437cdd46219f28cb

Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9

* 🦉 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 
---
 .../google/cloud/datastore/admin/v1/DatastoreAdminClient.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 695fdad3e68e..81374b331a84 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -18,6 +18,7 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
+import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.httpjson.longrunning.OperationsClient;
 import com.google.api.gax.longrunning.OperationFuture;
@@ -258,6 +259,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi
   public final OperationsClient getHttpJsonOperationsClient() {
     return httpJsonOperationsClient;
   }

From 9365fb08cb018a3cbbeb169f0f4592ca0ed1cc64 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 02:20:25 +0000
Subject: [PATCH 0891/1784] chore: Disable CLIRR checks on releas (#1474)
 (#787)

Source-Link: https://github.com/googleapis/synthtool/commit/7a220e27993a25ab3cda26510d5619d97b6952a9
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6d4e3a15c62cfdcb823d60e16da7521e7c6fc00eba07c8ff12e4de9924a57d28
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .kokoro/release/stage.sh  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index f0625e4d9459..a454a61e8dc2 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:1ec28a46062b19135b11178ceee60231e5f5a92dab454e23ae0aab72cd875906
-# created: 2022-06-27T15:01:06.405564326Z
+  digest: sha256:6d4e3a15c62cfdcb823d60e16da7521e7c6fc00eba07c8ff12e4de9924a57d28
+# created: 2022-06-29T23:17:33.110417661Z
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 77dc4e8f0f3a..1dba8de10857 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -32,6 +32,7 @@ retry_with_backoff 3 10 \
   mvn clean deploy -B \
     --settings ${MAVEN_SETTINGS_FILE} \
     -DskipTests=true \
+    -Dclirr.skip=true \
     -DperformRelease=true \
     -Dgpg.executable=gpg \
     -Dgpg.passphrase=${GPG_PASSPHRASE} \
@@ -42,4 +43,4 @@ then
   mvn nexus-staging:release -B \
     -DperformRelease=true \
     --settings=settings.xml
-fi
\ No newline at end of file
+fi

From 027f6cd00b547e0eb59f15feb2e484455ebb2e00 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 17:32:11 +0000
Subject: [PATCH 0892/1784] chore(main): release 2.10.0 (#783)

:robot: I have created a release *beep* *boop*
---


## [2.10.0](https://github.com/googleapis/java-datastore/compare/v2.9.1...v2.10.0) (2022-06-30)


### Features

* Enable REST transport for admin client ([#778](https://github.com/googleapis/java-datastore/issues/778)) ([c3290e3](https://github.com/googleapis/java-datastore/commit/c3290e3e32a5309abc8e456bfd584c929d23628c))


### Bug Fixes

* update gapic-generator-java with mock service generation fixes ([#785](https://github.com/googleapis/java-datastore/issues/785)) ([8a12f25](https://github.com/googleapis/java-datastore/commit/8a12f25ece95429a10c1bcae220a678a7c2e3ff1))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 12 ++++++++++++
 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, 39 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20302f0d1f4f..e1c8c4999bda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.10.0](https://github.com/googleapis/java-datastore/compare/v2.9.1...v2.10.0) (2022-06-30)
+
+
+### Features
+
+* Enable REST transport for admin client ([#778](https://github.com/googleapis/java-datastore/issues/778)) ([c3290e3](https://github.com/googleapis/java-datastore/commit/c3290e3e32a5309abc8e456bfd584c929d23628c))
+
+
+### Bug Fixes
+
+* update gapic-generator-java with mock service generation fixes ([#785](https://github.com/googleapis/java-datastore/issues/785)) ([8a12f25](https://github.com/googleapis/java-datastore/commit/8a12f25ece95429a10c1bcae220a678a7c2e3ff1))
+
 ## [2.9.1](https://github.com/googleapis/java-datastore/compare/v2.9.0...v2.9.1) (2022-06-23)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b44a7524a84e..964150d5964f 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.9.2-SNAPSHOT
+  2.10.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.2-SNAPSHOT
+    2.10.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f5c398dbb456..3366dd81827f 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.9.2-SNAPSHOT
+  2.10.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.9.2-SNAPSHOT
+        2.10.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.2-SNAPSHOT
+        2.10.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.2-SNAPSHOT
+        0.101.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.9.2-SNAPSHOT
+        2.10.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 620e4297160a..c0fc1cc99b89 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.9.2-SNAPSHOT
+  2.10.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.2-SNAPSHOT
+    2.10.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 d77d3f58a2e2..aa8c5403ab51 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.9.2-SNAPSHOT
+  2.10.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.2-SNAPSHOT
+    2.10.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 79a034b910ea..06217e844965 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.9.2-SNAPSHOT
+  2.10.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.9.2-SNAPSHOT
+        2.10.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.9.2-SNAPSHOT
+        2.10.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.9.2-SNAPSHOT
+        2.10.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.100.2-SNAPSHOT
+        0.101.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.9.2-SNAPSHOT
+        2.10.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 affa53f8a5f6..9b0586fc4c28 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.9.2-SNAPSHOT
+  2.10.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.2-SNAPSHOT
+    2.10.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e3c4f5d889e0..6415b0aa304a 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.100.2-SNAPSHOT
+  0.101.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.9.2-SNAPSHOT
+    2.10.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 147773b39ea2..18d5dffe650f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.9.1:2.9.2-SNAPSHOT
-google-cloud-datastore-bom:2.9.1:2.9.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.100.1:0.100.2-SNAPSHOT
-datastore-v1-proto-client:2.9.1:2.9.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.9.1:2.9.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.9.1:2.9.2-SNAPSHOT
+google-cloud-datastore:2.10.0:2.10.0
+google-cloud-datastore-bom:2.10.0:2.10.0
+proto-google-cloud-datastore-v1:0.101.0:0.101.0
+datastore-v1-proto-client:2.10.0:2.10.0
+proto-google-cloud-datastore-admin-v1:2.10.0:2.10.0
+grpc-google-cloud-datastore-admin-v1:2.10.0:2.10.0

From 39e65fef17326ec12dab420db2b6309361047206 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 17:46:32 +0000
Subject: [PATCH 0893/1784] chore(main): release 2.10.1-SNAPSHOT (#788)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 964150d5964f..95d4e35bb006 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.10.0
+  2.10.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.0
+    2.10.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3366dd81827f..6b0d93231b20 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.10.0
+  2.10.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.10.0
+        2.10.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.0
+        2.10.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.0
+        0.101.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.10.0
+        2.10.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c0fc1cc99b89..e8fff7c2598a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.10.0
+  2.10.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.0
+    2.10.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index aa8c5403ab51..10d70f6ec86e 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.10.0
+  2.10.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.0
+    2.10.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 06217e844965..ad2ff8b94250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.10.0
+  2.10.1-SNAPSHOT
   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.10.0
+        2.10.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.0
+        2.10.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.10.0
+        2.10.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.0
+        0.101.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.10.0
+        2.10.1-SNAPSHOT
         
           
             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 9b0586fc4c28..760f90d9d47d 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.10.0
+  2.10.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.0
+    2.10.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6415b0aa304a..61a976000f3c 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.101.0
+  0.101.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.0
+    2.10.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 18d5dffe650f..8bdeaa05a126 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.10.0:2.10.0
-google-cloud-datastore-bom:2.10.0:2.10.0
-proto-google-cloud-datastore-v1:0.101.0:0.101.0
-datastore-v1-proto-client:2.10.0:2.10.0
-proto-google-cloud-datastore-admin-v1:2.10.0:2.10.0
-grpc-google-cloud-datastore-admin-v1:2.10.0:2.10.0
+google-cloud-datastore:2.10.0:2.10.1-SNAPSHOT
+google-cloud-datastore-bom:2.10.0:2.10.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.101.0:0.101.1-SNAPSHOT
+datastore-v1-proto-client:2.10.0:2.10.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.10.0:2.10.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.10.0:2.10.1-SNAPSHOT

From c1c75b1ce3f90f26fc1d3a7c71b889783112c240 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:02:16 +0000
Subject: [PATCH 0894/1784] chore: fix minor typos in README and pom templates
 (#1479) (#791)

Source-Link: https://github.com/googleapis/synthtool/commit/18d4e9bb50d0dfb3291de18c51b96a2c835e2446
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:f8374176dc59291f05dd3fec927a9da2cda687a9ef4de32e77f699a2be12ab45
---
 .github/.OwlBot.lock.yaml |  4 ++--
 README.md                 | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index a454a61e8dc2..1b645c012914 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:6d4e3a15c62cfdcb823d60e16da7521e7c6fc00eba07c8ff12e4de9924a57d28
-# created: 2022-06-29T23:17:33.110417661Z
+  digest: sha256:f8374176dc59291f05dd3fec927a9da2cda687a9ef4de32e77f699a2be12ab45
+# created: 2022-07-07T14:26:11.880812641Z
diff --git a/README.md b/README.md
index e3f70136a476..451ebc94560c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Java idiomatic client for [Cloud Datastore][product-docs].
 
 ## Quickstart
 
-If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
+If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
 ```xml
 
@@ -46,23 +46,23 @@ If you are using Maven without BOM, add this to your dependencies:
 
 ```
 
-If you are using Gradle 5.x or later, add this to your dependencies
+If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
 implementation platform('com.google.cloud:libraries-bom:25.4.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
-If you are using Gradle without BOM, add this to your dependencies
+If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.9.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.10.0'
 ```
 
-If you are using SBT, add this to your dependencies
+If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.9.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.10.0"
 ```
 
 ## Authentication

From f5a703e059b5a27cec7a99229851d4d4fd01c828 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 11 Jul 2022 21:00:37 +0200
Subject: [PATCH 0895/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.5.1 (#789)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.5.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 
---
 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 6b0d93231b20..e3b1a2bbfd97 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.0
+    1.5.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index ad2ff8b94250..40df7aafe517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.5.0
+    1.5.1
   
 
   

From 5f7acd1a3c39345048a9cfe510bd7c6f7af246f6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 11 Jul 2022 21:00:51 +0200
Subject: [PATCH 0896/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26 (#792)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 451ebc94560c..c6d93b225ae0 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      25.4.0
+      26.0.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:25.4.0')
+implementation platform('com.google.cloud:libraries-bom:26.0.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index f092add3de40..77ce06756251 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        25.4.0
+        26.0.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 720a81c880bd..178930d1a24e 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        25.4.0
+        26.0.0
         pom
         import
       

From 8df8f508d5d39434ae8933855426a5d34be7f433 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Mon, 11 Jul 2022 15:04:17 -0400
Subject: [PATCH 0897/1784] chore: mark native image checks as required (#786)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: add native image checks as required

* 🦉 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 
---
 .github/sync-repo-settings.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 70afc52ae46f..27a5d5d74b32 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -17,6 +17,8 @@ branchProtectionRules:
       - 'Kokoro - Test: Integration'
       - cla/google
       - OwlBot Post Processor
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
   - pattern: 1.106.5-sp
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From fa3979a32dfb3cb84a593948f38ed27549355a55 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 13 Jul 2022 18:36:09 +0200
Subject: [PATCH 0898/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.13 (#794)

---
 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 77ce06756251..09711a4bcffd 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.12
+            0.9.13
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 0bd0199f22a4bc5b0b93e3bbeca5d2e990dde83f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 13 Jul 2022 18:36:27 +0200
Subject: [PATCH 0899/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.13 (#793)

---
 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 09711a4bcffd..e2ba60051770 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.12
+          0.9.13
           test
         
       

From 73e6419dcaa31e0b241f860c595475946ad91c48 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 09:42:04 -0700
Subject: [PATCH 0900/1784] build: enable longpaths support for windows test
 (#1485) (#795)

Source-Link: https://github.com/googleapis/synthtool/commit/73365620c41d96e97ff474b2c4d39b890ad51967
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:d4b80feffe1579818cdc39466152e9de95789a193408506cd4a1ffbe8804dc00

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .github/workflows/ci.yaml | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 1b645c012914..de9173d95efb 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:f8374176dc59291f05dd3fec927a9da2cda687a9ef4de32e77f699a2be12ab45
-# created: 2022-07-07T14:26:11.880812641Z
+  digest: sha256:d4b80feffe1579818cdc39466152e9de95789a193408506cd4a1ffbe8804dc00
+# created: 2022-07-13T13:53:17.676447481Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 83ef7f9c2cf3..e3bb26e37719 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -39,6 +39,8 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
+    - name: Support longpaths
+      run: git config --system core.longpaths true
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:

From dbd97a59e4b0dea9b31801212b81aa76538a9682 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 16:54:12 +0000
Subject: [PATCH 0901/1784] chore(main): release 2.10.1 (#796)

:robot: I have created a release *beep* *boop*
---


## [2.10.1](https://github.com/googleapis/java-datastore/compare/v2.10.0...v2.10.1) (2022-07-13)


### Dependencies

* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.13 ([#793](https://github.com/googleapis/java-datastore/issues/793)) ([0bd0199](https://github.com/googleapis/java-datastore/commit/0bd0199f22a4bc5b0b93e3bbeca5d2e990dde83f))
* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.13 ([#794](https://github.com/googleapis/java-datastore/issues/794)) ([fa3979a](https://github.com/googleapis/java-datastore/commit/fa3979a32dfb3cb84a593948f38ed27549355a55))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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, 35 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1c8c4999bda..94882bb592d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.10.1](https://github.com/googleapis/java-datastore/compare/v2.10.0...v2.10.1) (2022-07-13)
+
+
+### Dependencies
+
+* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.13 ([#793](https://github.com/googleapis/java-datastore/issues/793)) ([0bd0199](https://github.com/googleapis/java-datastore/commit/0bd0199f22a4bc5b0b93e3bbeca5d2e990dde83f))
+* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.13 ([#794](https://github.com/googleapis/java-datastore/issues/794)) ([fa3979a](https://github.com/googleapis/java-datastore/commit/fa3979a32dfb3cb84a593948f38ed27549355a55))
+
 ## [2.10.0](https://github.com/googleapis/java-datastore/compare/v2.9.1...v2.10.0) (2022-06-30)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 95d4e35bb006..60622ec18ae0 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.10.1-SNAPSHOT
+  2.10.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1-SNAPSHOT
+    2.10.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e3b1a2bbfd97..5a0fc86a8fb3 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.10.1-SNAPSHOT
+  2.10.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.10.1-SNAPSHOT
+        2.10.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.1-SNAPSHOT
+        2.10.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.1-SNAPSHOT
+        0.101.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.10.1-SNAPSHOT
+        2.10.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e8fff7c2598a..ca5919ba123b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.10.1-SNAPSHOT
+  2.10.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1-SNAPSHOT
+    2.10.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 10d70f6ec86e..0b2c2d5465d6 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.10.1-SNAPSHOT
+  2.10.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1-SNAPSHOT
+    2.10.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 40df7aafe517..f7b196208165 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.10.1-SNAPSHOT
+  2.10.1
   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.10.1-SNAPSHOT
+        2.10.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.1-SNAPSHOT
+        2.10.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.10.1-SNAPSHOT
+        2.10.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.1-SNAPSHOT
+        0.101.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.10.1-SNAPSHOT
+        2.10.1
         
           
             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 760f90d9d47d..6c26d1c8c6c1 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.10.1-SNAPSHOT
+  2.10.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1-SNAPSHOT
+    2.10.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 61a976000f3c..ae8c768cef90 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.101.1-SNAPSHOT
+  0.101.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1-SNAPSHOT
+    2.10.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 8bdeaa05a126..7978fc202016 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.10.0:2.10.1-SNAPSHOT
-google-cloud-datastore-bom:2.10.0:2.10.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.101.0:0.101.1-SNAPSHOT
-datastore-v1-proto-client:2.10.0:2.10.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.10.0:2.10.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.10.0:2.10.1-SNAPSHOT
+google-cloud-datastore:2.10.1:2.10.1
+google-cloud-datastore-bom:2.10.1:2.10.1
+proto-google-cloud-datastore-v1:0.101.1:0.101.1
+datastore-v1-proto-client:2.10.1:2.10.1
+proto-google-cloud-datastore-admin-v1:2.10.1:2.10.1
+grpc-google-cloud-datastore-admin-v1:2.10.1:2.10.1

From 2c983f19a5271ed5af45708e6951840af73ee01b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 17:16:11 +0000
Subject: [PATCH 0902/1784] chore(main): release 2.10.2-SNAPSHOT (#797)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 60622ec18ae0..edd0623765c3 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.10.1
+  2.10.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1
+    2.10.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5a0fc86a8fb3..b5734fc6cc4c 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.10.1
+  2.10.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.10.1
+        2.10.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.1
+        2.10.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.1
+        0.101.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.10.1
+        2.10.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ca5919ba123b..ca069aedc6a1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.10.1
+  2.10.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1
+    2.10.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0b2c2d5465d6..debd5b2517b2 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.10.1
+  2.10.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1
+    2.10.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index f7b196208165..6dd887209288 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.10.1
+  2.10.2-SNAPSHOT
   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.10.1
+        2.10.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.1
+        2.10.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.10.1
+        2.10.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.1
+        0.101.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.10.1
+        2.10.2-SNAPSHOT
         
           
             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 6c26d1c8c6c1..d8674beb12cd 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.10.1
+  2.10.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1
+    2.10.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ae8c768cef90..f7ed0ace366c 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.101.1
+  0.101.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.1
+    2.10.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 7978fc202016..9db1ce04fc75 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.10.1:2.10.1
-google-cloud-datastore-bom:2.10.1:2.10.1
-proto-google-cloud-datastore-v1:0.101.1:0.101.1
-datastore-v1-proto-client:2.10.1:2.10.1
-proto-google-cloud-datastore-admin-v1:2.10.1:2.10.1
-grpc-google-cloud-datastore-admin-v1:2.10.1:2.10.1
+google-cloud-datastore:2.10.1:2.10.2-SNAPSHOT
+google-cloud-datastore-bom:2.10.1:2.10.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.101.1:0.101.2-SNAPSHOT
+datastore-v1-proto-client:2.10.1:2.10.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.10.1:2.10.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.10.1:2.10.2-SNAPSHOT

From b08741a5ee7f60a10a2d09a3ef80ae42f7e5269f Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 13:36:20 +0000
Subject: [PATCH 0903/1784] ci: update template so GAPIC_AUTO repos do not
 require special approvers for Java code (#1494) (#799)

Source-Link: https://github.com/googleapis/synthtool/commit/da89e53878d92467eb648c610e64f94a614915cc
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:04f254abfe5f47fe73ae6f91d68d55c3b76e722a4943066c3bb0ce03573b4ad9
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .github/CODEOWNERS        | 3 +++
 README.md                 | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index de9173d95efb..6610882f836f 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:d4b80feffe1579818cdc39466152e9de95789a193408506cd4a1ffbe8804dc00
-# created: 2022-07-13T13:53:17.676447481Z
+  digest: sha256:04f254abfe5f47fe73ae6f91d68d55c3b76e722a4943066c3bb0ce03573b4ad9
+# created: 2022-07-18T21:44:23.94208526Z
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3f27438f2c5d..78f7f12f4b7c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,7 +6,10 @@
 
 # The @googleapis/cloud-native-db-dpes @googleapis/api-firestore is the default owner for changes in this repo
 *                       @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-firestore
+
+# for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
 **/*.java               @googleapis/cloud-native-db-dpes @googleapis/api-firestore
 
+
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/README.md b/README.md
index c6d93b225ae0..49dc759e101e 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.10.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.10.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.10.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.10.1"
 ```
 
 ## Authentication

From 86ca2447054f1e375e2decb1cf21a46b1a59229c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 14:04:16 +0000
Subject: [PATCH 0904/1784] build: marking dependencies (8) non-required
 (#1472) (#798)

Co-authored-by: Anthonios Partheniou 
Source-Link: https://github.com/googleapis/synthtool/commit/72c64b725262e1c7e5e28f3f07681afc77347dab
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:b2e8f445ca0e605d4bbefbfdbdf7335692d75cf1647af62243828dcc0ea4e690
---
 .github/.OwlBot.lock.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 6610882f836f..d99cbbc27f08 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -14,4 +14,4 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
   digest: sha256:04f254abfe5f47fe73ae6f91d68d55c3b76e722a4943066c3bb0ce03573b4ad9
-# created: 2022-07-18T21:44:23.94208526Z
+# created: 2022-07-18T21:44:23.94208526Z
\ No newline at end of file

From d3884dce1b04f3143190e8cfbb084dd22fa6df15 Mon Sep 17 00:00:00 2001
From: "Bob \"Wombat\" Hogg" 
Date: Tue, 19 Jul 2022 12:16:15 -0400
Subject: [PATCH 0905/1784] docs(sample): Add a top-level Datastore samples
 README (#790)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea. **Issue already existed**
- [x] Ensure the tests and linter pass **N/A**
- [x] Code coverage does not decrease (if any source code was changed) **N/A**
- [x] Appropriate docs were updated (if necessary) **Strictly a docs addition**

Fixes #745 ☕️

Note: I can confirm that the existing pom.xml works correctly.
---
 samples/README.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 samples/README.md

diff --git a/samples/README.md b/samples/README.md
new file mode 100644
index 000000000000..4416583fd88a
--- /dev/null
+++ b/samples/README.md
@@ -0,0 +1,30 @@
+# Getting Started with Datastore Samples
+
+## Running a sample using Cloud Shell
+
+The Google Cloud Shell has application default credentials from its compute instance which will allow you to run samples without having to obtain `GOOGLE_APPLICATION_CREDENTIALS`.
+Go to the [Datastore Client Readme](https://github.com/googleapis/java-datastore#samples) to run each sample in the Cloud Shell.
+
+## Running a sample at the command line
+
+1. First set up the `GOOGLE_CLOUD_PROJECT` environment variable.
+
+2. Obtain authentication credentials.
+
+    Create local credentials by running the following command and following the
+    oauth2 flow (read more about the command [here][auth_command]):
+
+        gcloud auth application-default login
+
+    Or manually set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable
+    to point to a service account key JSON file path.
+
+    Learn more at [Setting Up Authentication for Server to Server Production Applications][ADC].
+
+Now you can run a sample:
+
+1. `cd samples/snippets` - all samples are located in the `java-datastore/samples/snippets` directory.
+2. `mvn compile exec:java -Dexec.mainClass="com.google.datastore.snippets.TaskList"` - this runs the [TaskList sample](https://github.com/googleapis/java-datastore/blob/master/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java).
+
+[ADC]: https://developers.google.com/identity/protocols/application-default-credentials
+[auth_command]: https://cloud.google.com/sdk/gcloud/reference/beta/auth/application-default/login

From c91483ee83462e89afd78b24111ce7fcfd3368d3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 19 Jul 2022 19:30:35 +0200
Subject: [PATCH 0906/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-deploy-plugin to v3 (#800)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.apache.maven.plugins:maven-deploy-plugin](https://maven.apache.org/plugins/) | `2.8.2` -> `3.0.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/compatibility-slim/2.8.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/confidence-slim/2.8.2)](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/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 5fac88a65325..35ef75aa8e30 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -39,7 +39,7 @@
       
         org.apache.maven.plugins
         maven-deploy-plugin
-        2.8.2
+        3.0.0
         
           true
         

From 6ed09dd44865639922156c85a441b7c6bb751df9 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:14:50 -0400
Subject: [PATCH 0907/1784] feat: add database_id field (#802)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add "or" query support (only in the preview API surface)
docs: Clarify wording around default database_id usage

PiperOrigin-RevId: 462444231

Source-Link: https://github.com/googleapis/googleapis/commit/b9cbfce1714be863ce3e405fbc6b409105298206

Source-Link: https://github.com/googleapis/googleapis-gen/commit/934e426ab421006f20454568821b61bb30979b10
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTM0ZTQyNmFiNDIxMDA2ZjIwNDU0NTY4ODIxYjYxYmIzMDk3OWIxMCJ9

* 🦉 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 
---
 .../datastore/v1/AllocateIdsRequest.java      | 193 +++++++++++++++
 .../v1/AllocateIdsRequestOrBuilder.java       |  29 +++
 .../datastore/v1/BeginTransactionRequest.java | 193 +++++++++++++++
 .../v1/BeginTransactionRequestOrBuilder.java  |  29 +++
 .../google/datastore/v1/CommitRequest.java    | 193 +++++++++++++++
 .../datastore/v1/CommitRequestOrBuilder.java  |  29 +++
 .../google/datastore/v1/CompositeFilter.java  |  69 ++++--
 .../v1/CompositeFilterOrBuilder.java          |  15 +-
 .../google/datastore/v1/DatastoreProto.java   | 233 +++++++++---------
 .../com/google/datastore/v1/EntityProto.java  |  64 ++---
 .../google/datastore/v1/LookupRequest.java    | 193 +++++++++++++++
 .../datastore/v1/LookupRequestOrBuilder.java  |  29 +++
 .../com/google/datastore/v1/PartitionId.java  | 186 ++++++++++++++
 .../datastore/v1/PartitionIdOrBuilder.java    |  27 ++
 .../com/google/datastore/v1/QueryProto.java   | 148 +++++------
 .../datastore/v1/ReserveIdsRequest.java       |  28 ++-
 .../v1/ReserveIdsRequestOrBuilder.java        |   8 +-
 .../google/datastore/v1/RollbackRequest.java  | 193 +++++++++++++++
 .../v1/RollbackRequestOrBuilder.java          |  29 +++
 .../google/datastore/v1/RunQueryRequest.java  | 217 +++++++++++++++-
 .../v1/RunQueryRequestOrBuilder.java          |  35 ++-
 .../proto/google/datastore/v1/datastore.proto |  43 +++-
 .../proto/google/datastore/v1/entity.proto    |   4 +
 .../proto/google/datastore/v1/query.proto     |   6 +-
 24 files changed, 1921 insertions(+), 272 deletions(-)

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 6345bc13844d..6b41e9b6020f 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
@@ -39,6 +39,7 @@ private AllocateIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder bui
 
   private AllocateIdsRequest() {
     projectId_ = "";
+    databaseId_ = "";
     keys_ = java.util.Collections.emptyList();
   }
 
@@ -88,6 +89,13 @@ private AllocateIdsRequest(
               projectId_ = s;
               break;
             }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              databaseId_ = s;
+              break;
+            }
           default:
             {
               if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -176,6 +184,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 KEYS_FIELD_NUMBER = 1;
   private java.util.List keys_;
   /**
@@ -274,6 +335,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);
   }
 
@@ -289,6 +353,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;
@@ -306,6 +373,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.datastore.v1.AllocateIdsRequest) obj;
 
     if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (!getKeysList().equals(other.getKeysList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -320,6 +388,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 (getKeysCount() > 0) {
       hash = (37 * hash) + KEYS_FIELD_NUMBER;
       hash = (53 * hash) + getKeysList().hashCode();
@@ -473,6 +543,8 @@ public Builder clear() {
       super.clear();
       projectId_ = "";
 
+      databaseId_ = "";
+
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -508,6 +580,7 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
           new com.google.datastore.v1.AllocateIdsRequest(this);
       int from_bitField0_ = bitField0_;
       result.projectId_ = projectId_;
+      result.databaseId_ = databaseId_;
       if (keysBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -570,6 +643,10 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
         projectId_ = other.projectId_;
         onChanged();
       }
+      if (!other.getDatabaseId().isEmpty()) {
+        databaseId_ = other.databaseId_;
+        onChanged();
+      }
       if (keysBuilder_ == null) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
@@ -734,6 +811,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 java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
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 c348f5838105..665721ac634e 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
@@ -48,6 +48,35 @@ public interface AllocateIdsRequestOrBuilder
    */
   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/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
index f77301b9d6b0..55b17ae9ea38 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
@@ -39,6 +39,7 @@ private BeginTransactionRequest(com.google.protobuf.GeneratedMessageV3.Builder
+   * 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_OPTIONS_FIELD_NUMBER = 10;
   private com.google.datastore.v1.TransactionOptions transactionOptions_;
   /**
@@ -243,6 +304,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_);
+    }
     if (transactionOptions_ != null) {
       output.writeMessage(10, getTransactionOptions());
     }
@@ -258,6 +322,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_);
+    }
     if (transactionOptions_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getTransactionOptions());
     }
@@ -278,6 +345,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.datastore.v1.BeginTransactionRequest) obj;
 
     if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (hasTransactionOptions() != other.hasTransactionOptions()) return false;
     if (hasTransactionOptions()) {
       if (!getTransactionOptions().equals(other.getTransactionOptions())) return false;
@@ -295,6 +363,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 (hasTransactionOptions()) {
       hash = (37 * hash) + TRANSACTION_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getTransactionOptions().hashCode();
@@ -446,6 +516,8 @@ public Builder clear() {
       super.clear();
       projectId_ = "";
 
+      databaseId_ = "";
+
       if (transactionOptionsBuilder_ == null) {
         transactionOptions_ = null;
       } else {
@@ -480,6 +552,7 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
       com.google.datastore.v1.BeginTransactionRequest result =
           new com.google.datastore.v1.BeginTransactionRequest(this);
       result.projectId_ = projectId_;
+      result.databaseId_ = databaseId_;
       if (transactionOptionsBuilder_ == null) {
         result.transactionOptions_ = transactionOptions_;
       } else {
@@ -539,6 +612,10 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other)
         projectId_ = other.projectId_;
         onChanged();
       }
+      if (!other.getDatabaseId().isEmpty()) {
+        databaseId_ = other.databaseId_;
+        onChanged();
+      }
       if (other.hasTransactionOptions()) {
         mergeTransactionOptions(other.getTransactionOptions());
       }
@@ -677,6 +754,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.TransactionOptions transactionOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.TransactionOptions,
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 31bd754504fd..bfe6db93d7c8 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
@@ -48,6 +48,35 @@ public interface BeginTransactionRequestOrBuilder
    */
   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/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
index 1af1bc6c9be8..a52f58dd8b83 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
@@ -39,6 +39,7 @@ private CommitRequest(com.google.protobuf.GeneratedMessageV3.Builder builder)
 
   private CommitRequest() {
     projectId_ = "";
+    databaseId_ = "";
     mode_ = 0;
     mutations_ = java.util.Collections.emptyList();
   }
@@ -103,6 +104,13 @@ private CommitRequest(
               projectId_ = s;
               break;
             }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              databaseId_ = s;
+              break;
+            }
           default:
             {
               if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -396,6 +404,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 MODE_FIELD_NUMBER = 5;
   private int mode_;
   /**
@@ -611,6 +672,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);
   }
 
@@ -634,6 +698,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;
@@ -650,6 +717,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.CommitRequest other = (com.google.datastore.v1.CommitRequest) obj;
 
     if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (mode_ != other.mode_) return false;
     if (!getMutationsList().equals(other.getMutationsList())) return false;
     if (!getTransactionSelectorCase().equals(other.getTransactionSelectorCase())) return false;
@@ -673,6 +741,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) + MODE_FIELD_NUMBER;
     hash = (53 * hash) + mode_;
     if (getMutationsCount() > 0) {
@@ -835,6 +905,8 @@ public Builder clear() {
       super.clear();
       projectId_ = "";
 
+      databaseId_ = "";
+
       mode_ = 0;
 
       if (mutationsBuilder_ == null) {
@@ -874,6 +946,7 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
           new com.google.datastore.v1.CommitRequest(this);
       int from_bitField0_ = bitField0_;
       result.projectId_ = projectId_;
+      result.databaseId_ = databaseId_;
       result.mode_ = mode_;
       if (transactionSelectorCase_ == 1) {
         result.transactionSelector_ = transactionSelector_;
@@ -941,6 +1014,10 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
         projectId_ = other.projectId_;
         onChanged();
       }
+      if (!other.getDatabaseId().isEmpty()) {
+        databaseId_ = other.databaseId_;
+        onChanged();
+      }
       if (other.mode_ != 0) {
         setModeValue(other.getModeValue());
       }
@@ -1133,6 +1210,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 int mode_ = 0;
     /**
      *
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 db235efddcec..1b15f3408e17 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
@@ -48,6 +48,35 @@ public interface CommitRequestOrBuilder
    */
   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/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
index 72432f94482e..c67e8c36c560 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
@@ -306,7 +306,8 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -320,7 +321,8 @@ public java.util.List getFiltersList() {
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -335,7 +337,8 @@ public java.util.List getFiltersList() {
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -349,7 +352,8 @@ public int getFiltersCount() {
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -363,7 +367,8 @@ public com.google.datastore.v1.Filter getFilters(int index) {
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -859,7 +864,8 @@ private void ensureFiltersIsMutable() {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -876,7 +882,8 @@ public java.util.List getFiltersList() {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -893,7 +900,8 @@ public int getFiltersCount() {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -910,7 +918,8 @@ public com.google.datastore.v1.Filter getFilters(int index) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -933,7 +942,8 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -953,7 +963,8 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder buil
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -976,7 +987,8 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -999,7 +1011,8 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1019,7 +1032,8 @@ public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1039,7 +1053,8 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder buil
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1060,7 +1075,8 @@ public Builder addAllFilters(
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1080,7 +1096,8 @@ public Builder clearFilters() {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1100,7 +1117,8 @@ public Builder removeFilters(int index) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1113,7 +1131,8 @@ public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1130,7 +1149,8 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1148,7 +1168,8 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1162,7 +1183,8 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
@@ -1176,7 +1198,8 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) {
      *
      * 
          * The list of filters to combine.
-     * Must contain at least one filter.
+     * Requires:
+     * * At least one filter is present.
      * 
    
      *
      * repeated .google.datastore.v1.Filter filters = 2;
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 ad644173ed67..6dc33de5d26d 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,8 @@ public interface CompositeFilterOrBuilder
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -64,7 +65,8 @@ public interface CompositeFilterOrBuilder
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -75,7 +77,8 @@ public interface CompositeFilterOrBuilder
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -86,7 +89,8 @@ public interface CompositeFilterOrBuilder
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
@@ -97,7 +101,8 @@ public interface CompositeFilterOrBuilder
    *
    * 
        * The list of filters to combine.
-   * Must contain at least one filter.
+   * Requires:
+   * * At least one filter is present.
    * 
    
    *
    * repeated .google.datastore.v1.Filter filters = 2;
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 256f06c9a7d4..9c945ae1d1c6 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
@@ -122,112 +122,115 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "e/api/field_behavior.proto\032 google/datas"
           + "tore/v1/entity.proto\032\037google/datastore/v"
           + "1/query.proto\032\037google/protobuf/timestamp"
-          + ".proto\"\215\001\n\rLookupRequest\022\027\n\nproject_id\030\010"
-          + " \001(\tB\003\340A\002\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\"\321\001\n\016Looku"
-          + "pResponse\0220\n\005found\030\001 \003(\0132!.google.datast"
-          + "ore.v1.EntityResult\0222\n\007missing\030\002 \003(\0132!.g"
-          + "oogle.datastore.v1.EntityResult\022*\n\010defer"
-          + "red\030\003 \003(\0132\030.google.datastore.v1.Key\022-\n\tr"
-          + "ead_time\030\007 \001(\0132\032.google.protobuf.Timesta"
-          + "mp\"\211\002\n\017RunQueryRequest\022\027\n\nproject_id\030\010 \001"
-          + "(\tB\003\340A\002\0226\n\014partition_id\030\002 \001(\0132 .google.d"
-          + "atastore.v1.PartitionId\0226\n\014read_options\030"
-          + "\001 \001(\0132 .google.datastore.v1.ReadOptions\022"
-          + "+\n\005query\030\003 \001(\0132\032.google.datastore.v1.Que"
-          + "ryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.datasto"
-          + "re.v1.GqlQueryH\000B\014\n\nquery_type\"s\n\020RunQue"
-          + "ryResponse\0224\n\005batch\030\001 \001(\0132%.google.datas"
-          + "tore.v1.QueryResultBatch\022)\n\005query\030\002 \001(\0132"
-          + "\032.google.datastore.v1.Query\"x\n\027BeginTran"
-          + "sactionRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022"
-          + "D\n\023transaction_options\030\n \001(\0132\'.google.da"
-          + "tastore.v1.TransactionOptions\"/\n\030BeginTr"
-          + "ansactionResponse\022\023\n\013transaction\030\001 \001(\014\"D"
-          + "\n\017RollbackRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
-          + "A\002\022\030\n\013transaction\030\001 \001(\014B\003\340A\002\"\022\n\020Rollback"
-          + "Response\"\210\002\n\rCommitRequest\022\027\n\nproject_id"
-          + "\030\010 \001(\tB\003\340A\002\0225\n\004mode\030\005 \001(\0162\'.google.datas"
-          + "tore.v1.CommitRequest.Mode\022\025\n\013transactio"
-          + "n\030\001 \001(\014H\000\0220\n\tmutations\030\006 \003(\0132\035.google.da"
-          + "tastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_UNSP"
-          + "ECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_TRAN"
-          + "SACTIONAL\020\002B\026\n\024transaction_selector\"\227\001\n\016"
-          + "CommitResponse\022=\n\020mutation_results\030\003 \003(\013"
-          + "2#.google.datastore.v1.MutationResult\022\025\n"
-          + "\rindex_updates\030\004 \001(\005\022/\n\013commit_time\030\010 \001("
-          + "\0132\032.google.protobuf.Timestamp\"Z\n\022Allocat"
-          + "eIdsRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022+\n\004"
-          + "keys\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\021ReserveIdsRe"
-          + "quest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013databa"
-          + "se_id\030\t \001(\t\022+\n\004keys\030\001 \003(\0132\030.google.datas"
-          + "tore.v1.KeyB\003\340A\002\"\024\n\022ReserveIdsResponse\"\272"
-          + "\002\n\010Mutation\022-\n\006insert\030\004 \001(\0132\033.google.dat"
-          + "astore.v1.EntityH\000\022-\n\006update\030\005 \001(\0132\033.goo"
-          + "gle.datastore.v1.EntityH\000\022-\n\006upsert\030\006 \001("
-          + "\0132\033.google.datastore.v1.EntityH\000\022*\n\006dele"
-          + "te\030\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014"
-          + "base_version\030\010 \001(\003H\001\0221\n\013update_time\030\013 \001("
-          + "\0132\032.google.protobuf.TimestampH\001B\013\n\topera"
-          + "tionB\035\n\033conflict_detection_strategy\"\224\001\n\016"
-          + "MutationResult\022%\n\003key\030\003 \001(\0132\030.google.dat"
-          + "astore.v1.Key\022\017\n\007version\030\004 \001(\003\022/\n\013update"
-          + "_time\030\006 \001(\0132\032.google.protobuf.Timestamp\022"
-          + "\031\n\021conflict_detected\030\005 \001(\010\"\206\002\n\013ReadOptio"
-          + "ns\022L\n\020read_consistency\030\001 \001(\01620.google.da"
-          + "tastore.v1.ReadOptions.ReadConsistencyH\000"
-          + "\022\025\n\013transaction\030\002 \001(\014H\000\022/\n\tread_time\030\004 \001"
-          + "(\0132\032.google.protobuf.TimestampH\000\"M\n\017Read"
-          + "Consistency\022 \n\034READ_CONSISTENCY_UNSPECIF"
-          + "IED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consi"
-          + "stency_type\"\222\002\n\022TransactionOptions\022G\n\nre"
-          + "ad_write\030\001 \001(\01321.google.datastore.v1.Tra"
-          + "nsactionOptions.ReadWriteH\000\022E\n\tread_only"
-          + "\030\002 \001(\01320.google.datastore.v1.Transaction"
-          + "Options.ReadOnlyH\000\032)\n\tReadWrite\022\034\n\024previ"
-          + "ous_transaction\030\001 \001(\014\0329\n\010ReadOnly\022-\n\trea"
-          + "d_time\030\001 \001(\0132\032.google.protobuf.Timestamp"
-          + "B\006\n\004mode2\223\n\n\tDatastore\022\235\001\n\006Lookup\022\".goog"
-          + "le.datastore.v1.LookupRequest\032#.google.d"
-          + "atastore.v1.LookupResponse\"J\202\323\344\223\002%\" /v1/"
-          + "projects/{project_id}:lookup:\001*\332A\034projec"
-          + "t_id,read_options,keys\022\206\001\n\010RunQuery\022$.go"
-          + "ogle.datastore.v1.RunQueryRequest\032%.goog"
-          + "le.datastore.v1.RunQueryResponse\"-\202\323\344\223\002\'"
-          + "\"\"/v1/projects/{project_id}:runQuery:\001*\022"
-          + "\263\001\n\020BeginTransaction\022,.google.datastore."
-          + "v1.BeginTransactionRequest\032-.google.data"
-          + "store.v1.BeginTransactionResponse\"B\202\323\344\223\002"
-          + "/\"*/v1/projects/{project_id}:beginTransa"
-          + "ction:\001*\332A\nproject_id\022\302\001\n\006Commit\022\".googl"
-          + "e.datastore.v1.CommitRequest\032#.google.da"
-          + "tastore.v1.CommitResponse\"o\202\323\344\223\002%\" /v1/p"
-          + "rojects/{project_id}:commit:\001*\332A%project"
-          + "_id,mode,transaction,mutations\332A\031project"
-          + "_id,mode,mutations\022\237\001\n\010Rollback\022$.google"
-          + ".datastore.v1.RollbackRequest\032%.google.d"
-          + "atastore.v1.RollbackResponse\"F\202\323\344\223\002\'\"\"/v"
-          + "1/projects/{project_id}:rollback:\001*\332A\026pr"
-          + "oject_id,transaction\022\244\001\n\013AllocateIds\022\'.g"
-          + "oogle.datastore.v1.AllocateIdsRequest\032(."
-          + "google.datastore.v1.AllocateIdsResponse\""
-          + "B\202\323\344\223\002*\"%/v1/projects/{project_id}:alloc"
-          + "ateIds:\001*\332A\017project_id,keys\022\240\001\n\nReserveI"
-          + "ds\022&.google.datastore.v1.ReserveIdsReque"
-          + "st\032\'.google.datastore.v1.ReserveIdsRespo"
-          + "nse\"A\202\323\344\223\002)\"$/v1/projects/{project_id}:r"
-          + "eserveIds:\001*\332A\017project_id,keys\032v\312A\030datas"
-          + "tore.googleapis.com\322AXhttps://www.google"
-          + "apis.com/auth/cloud-platform,https://www"
-          + ".googleapis.com/auth/datastoreB\300\001\n\027com.g"
-          + "oogle.datastore.v1B\016DatastoreProtoP\001Z builder)
 
   private LookupRequest() {
     projectId_ = "";
+    databaseId_ = "";
     keys_ = java.util.Collections.emptyList();
   }
 
@@ -104,6 +105,13 @@ private LookupRequest(
               projectId_ = s;
               break;
             }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              databaseId_ = s;
+              break;
+            }
           default:
             {
               if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -192,6 +200,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 READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
   /**
@@ -336,6 +397,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);
   }
 
@@ -354,6 +418,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;
@@ -370,6 +437,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.LookupRequest other = (com.google.datastore.v1.LookupRequest) obj;
 
     if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (hasReadOptions() != other.hasReadOptions()) return false;
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
@@ -388,6 +456,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 (hasReadOptions()) {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
@@ -544,6 +614,8 @@ public Builder clear() {
       super.clear();
       projectId_ = "";
 
+      databaseId_ = "";
+
       if (readOptionsBuilder_ == null) {
         readOptions_ = null;
       } else {
@@ -585,6 +657,7 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
           new com.google.datastore.v1.LookupRequest(this);
       int from_bitField0_ = bitField0_;
       result.projectId_ = projectId_;
+      result.databaseId_ = databaseId_;
       if (readOptionsBuilder_ == null) {
         result.readOptions_ = readOptions_;
       } else {
@@ -652,6 +725,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
         projectId_ = other.projectId_;
         onChanged();
       }
+      if (!other.getDatabaseId().isEmpty()) {
+        databaseId_ = other.databaseId_;
+        onChanged();
+      }
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
@@ -819,6 +896,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.ReadOptions readOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.ReadOptions,
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 eb369b37e40f..0720a22562c9 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
@@ -48,6 +48,35 @@ public interface LookupRequestOrBuilder
    */
   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/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
index 7439b03adb6c..49784b939f4f 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
@@ -53,6 +53,7 @@ private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private PartitionId() {
     projectId_ = "";
+    databaseId_ = "";
     namespaceId_ = "";
   }
 
@@ -92,6 +93,13 @@ private PartitionId(
               projectId_ = s;
               break;
             }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              databaseId_ = s;
+              break;
+            }
           case 34:
             {
               java.lang.String s = input.readStringRequireUtf8();
@@ -184,6 +192,57 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
     }
   }
 
+  public static final int DATABASE_ID_FIELD_NUMBER = 3;
+  private volatile java.lang.Object databaseId_;
+  /**
+   *
+   *
+   * 
    +   * If not empty, the ID of the database to which the entities
+   * belong.
+   * 
    
+   *
+   * string database_id = 3;
+   *
+   * @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;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * If not empty, the ID of the database to which the entities
+   * belong.
+   * 
    
+   *
+   * string database_id = 3;
+   *
+   * @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 NAMESPACE_ID_FIELD_NUMBER = 4;
   private volatile java.lang.Object namespaceId_;
   /**
@@ -250,6 +309,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, 2, projectId_);
     }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, databaseId_);
+    }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_);
     }
@@ -265,6 +327,9 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectId_);
     }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, databaseId_);
+    }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_);
     }
@@ -284,6 +349,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.PartitionId other = (com.google.datastore.v1.PartitionId) obj;
 
     if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (!getNamespaceId().equals(other.getNamespaceId())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -298,6 +364,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) + NAMESPACE_ID_FIELD_NUMBER;
     hash = (53 * hash) + getNamespaceId().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -460,6 +528,8 @@ public Builder clear() {
       super.clear();
       projectId_ = "";
 
+      databaseId_ = "";
+
       namespaceId_ = "";
 
       return this;
@@ -489,6 +559,7 @@ public com.google.datastore.v1.PartitionId build() {
     public com.google.datastore.v1.PartitionId buildPartial() {
       com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this);
       result.projectId_ = projectId_;
+      result.databaseId_ = databaseId_;
       result.namespaceId_ = namespaceId_;
       onBuilt();
       return result;
@@ -543,6 +614,10 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) {
         projectId_ = other.projectId_;
         onChanged();
       }
+      if (!other.getDatabaseId().isEmpty()) {
+        databaseId_ = other.databaseId_;
+        onChanged();
+      }
       if (!other.getNamespaceId().isEmpty()) {
         namespaceId_ = other.namespaceId_;
         onChanged();
@@ -682,6 +757,117 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
+    private java.lang.Object databaseId_ = "";
+    /**
+     *
+     *
+     * 
    +     * If not empty, the ID of the database to which the entities
+     * belong.
+     * 
    
+     *
+     * string database_id = 3;
+     *
+     * @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;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * If not empty, the ID of the database to which the entities
+     * belong.
+     * 
    
+     *
+     * string database_id = 3;
+     *
+     * @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;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * If not empty, the ID of the database to which the entities
+     * belong.
+     * 
    
+     *
+     * string database_id = 3;
+     *
+     * @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;
+    }
+    /**
+     *
+     *
+     * 
    +     * If not empty, the ID of the database to which the entities
+     * belong.
+     * 
    
+     *
+     * string database_id = 3;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearDatabaseId() {
+
+      databaseId_ = getDefaultInstance().getDatabaseId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * If not empty, the ID of the database to which the entities
+     * belong.
+     * 
    
+     *
+     * string database_id = 3;
+     *
+     * @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 java.lang.Object namespaceId_ = "";
     /**
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 4d6a0cf4389f..e86fdaf8e1d4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -48,6 +48,33 @@ public interface PartitionIdOrBuilder
    */
   com.google.protobuf.ByteString getProjectIdBytes();
 
+  /**
+   *
+   *
+   * 
    +   * If not empty, the ID of the database to which the entities
+   * belong.
+   * 
    
+   *
+   * string database_id = 3;
+   *
+   * @return The databaseId.
+   */
+  java.lang.String getDatabaseId();
+  /**
+   *
+   *
+   * 
    +   * If not empty, the ID of the database to which the entities
+   * belong.
+   * 
    
+   *
+   * string database_id = 3;
+   *
+   * @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/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
index d96e6c2d9a39..53afbf41225b 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
@@ -89,84 +89,85 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n\037google/datastore/v1/query.proto\022\023googl"
-          + "e.datastore.v1\032 google/datastore/v1/enti"
-          + "ty.proto\032\037google/protobuf/timestamp.prot"
-          + "o\032\036google/protobuf/wrappers.proto\"\340\001\n\014En"
-          + "tityResult\022+\n\006entity\030\001 \001(\0132\033.google.data"
-          + "store.v1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013upda"
-          + "te_time\030\005 \001(\0132\032.google.protobuf.Timestam"
-          + "p\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESUL"
-          + "T_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJEC"
-          + "TION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojec"
-          + "tion\030\002 \003(\0132\037.google.datastore.v1.Project"
-          + "ion\0221\n\004kind\030\003 \003(\0132#.google.datastore.v1."
-          + "KindExpression\022+\n\006filter\030\004 \001(\0132\033.google."
-          + "datastore.v1.Filter\0221\n\005order\030\005 \003(\0132\".goo"
-          + "gle.datastore.v1.PropertyOrder\022;\n\013distin"
-          + "ct_on\030\006 \003(\0132&.google.datastore.v1.Proper"
-          + "tyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend"
-          + "_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit\030\014"
-          + " \001(\0132\033.google.protobuf.Int32Value\"\036\n\016Kin"
-          + "dExpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRef"
-          + "erence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010pr"
-          + "operty\030\001 \001(\0132&.google.datastore.v1.Prope"
-          + "rtyReference\"\321\001\n\rPropertyOrder\0228\n\010proper"
-          + "ty\030\001 \001(\0132&.google.datastore.v1.PropertyR"
-          + "eference\022?\n\tdirection\030\002 \001(\0162,.google.dat"
-          + "astore.v1.PropertyOrder.Direction\"E\n\tDir"
-          + "ection\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASC"
-          + "ENDING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020c"
-          + "omposite_filter\030\001 \001(\0132$.google.datastore"
-          + ".v1.CompositeFilterH\000\022>\n\017property_filter"
-          + "\030\002 \001(\0132#.google.datastore.v1.PropertyFil"
-          + "terH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter"
-          + "\0229\n\002op\030\001 \001(\0162-.google.datastore.v1.Compo"
-          + "siteFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.g"
-          + "oogle.datastore.v1.Filter\"-\n\010Operator\022\030\n"
-          + "\024OPERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016Pro"
-          + "pertyFilter\0228\n\010property\030\001 \001(\0132&.google.d"
-          + "atastore.v1.PropertyReference\0228\n\002op\030\002 \001("
-          + "\0162,.google.datastore.v1.PropertyFilter.O"
-          + "perator\022)\n\005value\030\003 \001(\0132\032.google.datastor"
-          + "e.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSP"
-          + "ECIFIED\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_TH"
-          + "AN_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\010GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allo"
-          + "w_literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\013"
-          + "20.google.datastore.v1.GqlQuery.NamedBin"
-          + "dingsEntry\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\005va"
-          + "lue\030\002 \001(\0132&.google.datastore.v1.GqlQuery"
-          + "Parameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005va"
-          + "lue\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\020"
-          + "QueryResultBatch\022\027\n\017skipped_results\030\006 \001("
-          + "\005\022\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_resu"
-          + "lt_type\030\001 \001(\0162,.google.datastore.v1.Enti"
-          + "tyResult.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(\016"
-          + "25.google.datastore.v1.QueryResultBatch."
-          + "MoreResultsType\022\030\n\020snapshot_version\030\007 \001("
-          + "\003\022-\n\tread_time\030\010 \001(\0132\032.google.protobuf.T"
-          + "imestamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RES"
-          + "ULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020"
-          + "\001\022\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_"
-          + "RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULT"
-          + "S\020\003B\274\001\n\027com.google.datastore.v1B\nQueryPr"
-          + "otoP\001Z\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 27a8ef8a663c..7a8ce32c360a 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 b410d83d6018..f48701f729f0 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 75c24d61648d..f964889bf831 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 86319d919d07..7f9bd4385675 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 6da75072dc8e..51999dba5bc4 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 3b54516e3e5c..3317e05ca382 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 22d930ad0d8f..6d243749978c 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 55d7b64fe5f2..010f1b3af839 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 00c020021fba..cbe44932d0ff 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 0908/1784] 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

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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` | [![age](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.0/compatibility-slim/5.8.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.0/confidence-slim/5.8.2)](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 e2ba60051770..9db6cb6550dc 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 0909/1784] 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 49dc759e101e..be42344791d6 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 13c7b9ed1eab..840f30dccb8e 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 ca5261ffe416..7f8da2959f83 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 0910/1784] 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 b5734fc6cc4c..74d066680d88 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 6dd887209288..f741c9a13e46 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 0911/1784] 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

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.1/compatibility-slim/2.13.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.1/confidence-slim/2.13.0)](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 f741c9a13e46..8acf79caeaf1 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 0912/1784] 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 0a8bba8c5ed3..da10978cd380 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 0913/1784] 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

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.15.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.15.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.15.0/compatibility-slim/2.14.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.15.0/confidence-slim/2.14.0)](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 8acf79caeaf1..6fc40841501c 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
   
 
   

From e271a1ca735399be2fb7fd0c630acb4341709ead Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 18:18:15 +0000
Subject: [PATCH 0914/1784] chore(main): release 2.11.0 (#801)

:robot: I have created a release *beep* *boop*
---


## [2.11.0](https://github.com/googleapis/java-datastore/compare/v2.10.1...v2.11.0) (2022-08-04)


### Features

* add database_id field ([#802](https://github.com/googleapis/java-datastore/issues/802)) ([6ed09dd](https://github.com/googleapis/java-datastore/commit/6ed09dd44865639922156c85a441b7c6bb751df9))


### Documentation

* **sample:** Add a top-level Datastore samples README ([#790](https://github.com/googleapis/java-datastore/issues/790)) ([d3884dc](https://github.com/googleapis/java-datastore/commit/d3884dce1b04f3143190e8cfbb084dd22fa6df15))


### Dependencies

* update dependency com.google.cloud:google-cloud-shared-dependencies to v3 ([#805](https://github.com/googleapis/java-datastore/issues/805)) ([ad467ef](https://github.com/googleapis/java-datastore/commit/ad467ef55696dcb9bb2b340916216000aff6bcc8))
* update dependency com.google.errorprone:error_prone_core to v2.15.0 ([#810](https://github.com/googleapis/java-datastore/issues/810)) ([fc8cd15](https://github.com/googleapis/java-datastore/commit/fc8cd15a72a80109a519b0dcc1236a2606b41264))
* update dependency org.junit.vintage:junit-vintage-engine to v5.9.0 ([#804](https://github.com/googleapis/java-datastore/issues/804)) ([6caafd8](https://github.com/googleapis/java-datastore/commit/6caafd854278953de937a4a07c8ef163850ab9b0))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 19 +++++++++++++++++++
 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, 46 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94882bb592d1..670a53686d2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [2.11.0](https://github.com/googleapis/java-datastore/compare/v2.10.1...v2.11.0) (2022-08-04)
+
+
+### Features
+
+* add database_id field ([#802](https://github.com/googleapis/java-datastore/issues/802)) ([6ed09dd](https://github.com/googleapis/java-datastore/commit/6ed09dd44865639922156c85a441b7c6bb751df9))
+
+
+### Documentation
+
+* **sample:** Add a top-level Datastore samples README ([#790](https://github.com/googleapis/java-datastore/issues/790)) ([d3884dc](https://github.com/googleapis/java-datastore/commit/d3884dce1b04f3143190e8cfbb084dd22fa6df15))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v3 ([#805](https://github.com/googleapis/java-datastore/issues/805)) ([ad467ef](https://github.com/googleapis/java-datastore/commit/ad467ef55696dcb9bb2b340916216000aff6bcc8))
+* update dependency com.google.errorprone:error_prone_core to v2.15.0 ([#810](https://github.com/googleapis/java-datastore/issues/810)) ([fc8cd15](https://github.com/googleapis/java-datastore/commit/fc8cd15a72a80109a519b0dcc1236a2606b41264))
+* update dependency org.junit.vintage:junit-vintage-engine to v5.9.0 ([#804](https://github.com/googleapis/java-datastore/issues/804)) ([6caafd8](https://github.com/googleapis/java-datastore/commit/6caafd854278953de937a4a07c8ef163850ab9b0))
+
 ## [2.10.1](https://github.com/googleapis/java-datastore/compare/v2.10.0...v2.10.1) (2022-07-13)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index edd0623765c3..84304407e39d 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.10.2-SNAPSHOT
+  2.11.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.2-SNAPSHOT
+    2.11.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 74d066680d88..ed85d690395a 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.10.2-SNAPSHOT
+  2.11.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.10.2-SNAPSHOT
+        2.11.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.2-SNAPSHOT
+        2.11.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.2-SNAPSHOT
+        0.102.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.10.2-SNAPSHOT
+        2.11.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ca069aedc6a1..ae9fb2296932 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.10.2-SNAPSHOT
+  2.11.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.2-SNAPSHOT
+    2.11.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 debd5b2517b2..bbad2ce23db8 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.10.2-SNAPSHOT
+  2.11.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.2-SNAPSHOT
+    2.11.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 6fc40841501c..d38bf62e8bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.10.2-SNAPSHOT
+  2.11.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.10.2-SNAPSHOT
+        2.11.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.10.2-SNAPSHOT
+        2.11.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.10.2-SNAPSHOT
+        2.11.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.101.2-SNAPSHOT
+        0.102.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.10.2-SNAPSHOT
+        2.11.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 d8674beb12cd..86c23430dd68 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.10.2-SNAPSHOT
+  2.11.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.2-SNAPSHOT
+    2.11.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f7ed0ace366c..5987dcddcf2f 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.101.2-SNAPSHOT
+  0.102.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.10.2-SNAPSHOT
+    2.11.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 9db1ce04fc75..470f045a886e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.10.1:2.10.2-SNAPSHOT
-google-cloud-datastore-bom:2.10.1:2.10.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.101.1:0.101.2-SNAPSHOT
-datastore-v1-proto-client:2.10.1:2.10.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.10.1:2.10.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.10.1:2.10.2-SNAPSHOT
+google-cloud-datastore:2.11.0:2.11.0
+google-cloud-datastore-bom:2.11.0:2.11.0
+proto-google-cloud-datastore-v1:0.102.0:0.102.0
+datastore-v1-proto-client:2.11.0:2.11.0
+proto-google-cloud-datastore-admin-v1:2.11.0:2.11.0
+grpc-google-cloud-datastore-admin-v1:2.11.0:2.11.0

From ee9cdfd3954941dda4708c4945514c5a710e1552 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 18:40:23 +0000
Subject: [PATCH 0915/1784] chore(main): release 2.11.1-SNAPSHOT (#811)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 84304407e39d..0e4b6c889b1d 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.11.0
+  2.11.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.0
+    2.11.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ed85d690395a..7b6bae21a58b 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.11.0
+  2.11.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.0
+        2.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.0
+        2.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.0
+        0.102.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.0
+        2.11.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ae9fb2296932..04e1ee43312c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.0
+  2.11.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.0
+    2.11.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index bbad2ce23db8..d9d39fee3f71 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.11.0
+  2.11.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.0
+    2.11.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index d38bf62e8bae..75c21cae1fe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.0
+  2.11.1-SNAPSHOT
   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.11.0
+        2.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.0
+        2.11.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.0
+        2.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.0
+        0.102.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.0
+        2.11.1-SNAPSHOT
         
           
             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 86c23430dd68..f75881508a59 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.11.0
+  2.11.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.0
+    2.11.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 5987dcddcf2f..328ce485c735 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.102.0
+  0.102.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.0
+    2.11.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 470f045a886e..79a218af810a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.0:2.11.0
-google-cloud-datastore-bom:2.11.0:2.11.0
-proto-google-cloud-datastore-v1:0.102.0:0.102.0
-datastore-v1-proto-client:2.11.0:2.11.0
-proto-google-cloud-datastore-admin-v1:2.11.0:2.11.0
-grpc-google-cloud-datastore-admin-v1:2.11.0:2.11.0
+google-cloud-datastore:2.11.0:2.11.1-SNAPSHOT
+google-cloud-datastore-bom:2.11.0:2.11.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.102.0:0.102.1-SNAPSHOT
+datastore-v1-proto-client:2.11.0:2.11.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.11.0:2.11.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.11.0:2.11.1-SNAPSHOT

From 948660898fe076016ea558997e9c87b7e8ae70d9 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 16 Aug 2022 17:50:15 +0200
Subject: [PATCH 0916/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.11.0 (#812)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.10.1` -> `2.11.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.0/compatibility-slim/2.10.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.0/confidence-slim/2.10.1)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index be42344791d6..3678bd182ffa 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.10.1
+  2.11.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.10.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.11.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.10.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 840f30dccb8e..edb220411b08 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.10.1
+      2.11.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7f8da2959f83..e11405b7b385 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.10.1
+      2.11.0
     
 
     

From 99d907a97a1bb87b62b6f270563e77a05c4aaf34 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 16 Aug 2022 18:32:12 +0200
Subject: [PATCH 0917/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.1.0 (#813)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.0.0` -> `26.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/compatibility-slim/26.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/confidence-slim/26.0.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3678bd182ffa..59089538cd74 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.0.0
+      26.1.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.0.0')
+implementation platform('com.google.cloud:libraries-bom:26.1.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 9db6cb6550dc..5ea65fc40bfc 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.0.0
+        26.1.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 178930d1a24e..226d9aeb4130 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.0.0
+        26.1.0
         pom
         import
       

From 34406051b05ed202767dc2dae378d5d449936508 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 11:29:37 -0400
Subject: [PATCH 0918/1784] chore: remove unused proto imports (#814)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: remove unused proto imports

PiperOrigin-RevId: 468735472

Source-Link: https://github.com/googleapis/googleapis/commit/cfa1b3782da7ccae31673d45401a0b79d2d4a84b

Source-Link: https://github.com/googleapis/googleapis-gen/commit/09b7666656510f5b00b893f003a0ba5766f9e250
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDliNzY2NjY1NjUxMGY1YjAwYjg5M2YwMDNhMGJhNTc2NmY5ZTI1MCJ9

* 🦉 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 
---
 .../com/google/datastore/v1/QueryProto.java   | 148 +++++++++---------
 .../proto/google/datastore/v1/query.proto     |   1 -
 2 files changed, 73 insertions(+), 76 deletions(-)

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 53afbf41225b..d96e6c2d9a39 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
@@ -89,85 +89,84 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n\037google/datastore/v1/query.proto\022\023googl"
-          + "e.datastore.v1\032\037google/api/field_behavio"
-          + "r.proto\032 google/datastore/v1/entity.prot"
-          + "o\032\037google/protobuf/timestamp.proto\032\036goog"
-          + "le/protobuf/wrappers.proto\"\340\001\n\014EntityRes"
-          + "ult\022+\n\006entity\030\001 \001(\0132\033.google.datastore.v"
-          + "1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013update_time"
-          + "\030\005 \001(\0132\032.google.protobuf.Timestamp\022\016\n\006cu"
-          + "rsor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESULT_TYPE_"
-          + "UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJECTION\020\002\022"
-          + "\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojection\030\002 "
-          + "\003(\0132\037.google.datastore.v1.Projection\0221\n\004"
-          + "kind\030\003 \003(\0132#.google.datastore.v1.KindExp"
-          + "ression\022+\n\006filter\030\004 \001(\0132\033.google.datasto"
-          + "re.v1.Filter\0221\n\005order\030\005 \003(\0132\".google.dat"
-          + "astore.v1.PropertyOrder\022;\n\013distinct_on\030\006"
-          + " \003(\0132&.google.datastore.v1.PropertyRefer"
-          + "ence\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend_cursor"
-          + "\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit\030\014 \001(\0132\033."
-          + "google.protobuf.Int32Value\"\036\n\016KindExpres"
-          + "sion\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022"
-          + "\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010property\030"
-          + "\001 \001(\0132&.google.datastore.v1.PropertyRefe"
-          + "rence\"\321\001\n\rPropertyOrder\0228\n\010property\030\001 \001("
-          + "\0132&.google.datastore.v1.PropertyReferenc"
-          + "e\022?\n\tdirection\030\002 \001(\0162,.google.datastore."
-          + "v1.PropertyOrder.Direction\"E\n\tDirection\022"
-          + "\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCENDING\020"
-          + "\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020composit"
-          + "e_filter\030\001 \001(\0132$.google.datastore.v1.Com"
-          + "positeFilterH\000\022>\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"
+          + "e.datastore.v1\032 google/datastore/v1/enti"
+          + "ty.proto\032\037google/protobuf/timestamp.prot"
+          + "o\032\036google/protobuf/wrappers.proto\"\340\001\n\014En"
+          + "tityResult\022+\n\006entity\030\001 \001(\0132\033.google.data"
+          + "store.v1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013upda"
+          + "te_time\030\005 \001(\0132\032.google.protobuf.Timestam"
+          + "p\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESUL"
+          + "T_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJEC"
+          + "TION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojec"
+          + "tion\030\002 \003(\0132\037.google.datastore.v1.Project"
+          + "ion\0221\n\004kind\030\003 \003(\0132#.google.datastore.v1."
+          + "KindExpression\022+\n\006filter\030\004 \001(\0132\033.google."
+          + "datastore.v1.Filter\0221\n\005order\030\005 \003(\0132\".goo"
+          + "gle.datastore.v1.PropertyOrder\022;\n\013distin"
+          + "ct_on\030\006 \003(\0132&.google.datastore.v1.Proper"
+          + "tyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend"
+          + "_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit\030\014"
+          + " \001(\0132\033.google.protobuf.Int32Value\"\036\n\016Kin"
+          + "dExpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRef"
+          + "erence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010pr"
+          + "operty\030\001 \001(\0132&.google.datastore.v1.Prope"
+          + "rtyReference\"\321\001\n\rPropertyOrder\0228\n\010proper"
+          + "ty\030\001 \001(\0132&.google.datastore.v1.PropertyR"
+          + "eference\022?\n\tdirection\030\002 \001(\0162,.google.dat"
+          + "astore.v1.PropertyOrder.Direction\"E\n\tDir"
+          + "ection\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASC"
+          + "ENDING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020c"
+          + "omposite_filter\030\001 \001(\0132$.google.datastore"
+          + ".v1.CompositeFilterH\000\022>\n\017property_filter"
+          + "\030\002 \001(\0132#.google.datastore.v1.PropertyFil"
+          + "terH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter"
+          + "\0229\n\002op\030\001 \001(\0162-.google.datastore.v1.Compo"
+          + "siteFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.g"
+          + "oogle.datastore.v1.Filter\"-\n\010Operator\022\030\n"
+          + "\024OPERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016Pro"
+          + "pertyFilter\0228\n\010property\030\001 \001(\0132&.google.d"
+          + "atastore.v1.PropertyReference\0228\n\002op\030\002 \001("
+          + "\0162,.google.datastore.v1.PropertyFilter.O"
+          + "perator\022)\n\005value\030\003 \001(\0132\032.google.datastor"
+          + "e.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSP"
+          + "ECIFIED\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_TH"
+          + "AN_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\010GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allo"
+          + "w_literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\013"
+          + "20.google.datastore.v1.GqlQuery.NamedBin"
+          + "dingsEntry\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\005va"
+          + "lue\030\002 \001(\0132&.google.datastore.v1.GqlQuery"
+          + "Parameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005va"
+          + "lue\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\020"
+          + "QueryResultBatch\022\027\n\017skipped_results\030\006 \001("
+          + "\005\022\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_resu"
+          + "lt_type\030\001 \001(\0162,.google.datastore.v1.Enti"
+          + "tyResult.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(\016"
+          + "25.google.datastore.v1.QueryResultBatch."
+          + "MoreResultsType\022\030\n\020snapshot_version\030\007 \001("
+          + "\003\022-\n\tread_time\030\010 \001(\0132\032.google.protobuf.T"
+          + "imestamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RES"
+          + "ULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020"
+          + "\001\022\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_"
+          + "RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULT"
+          + "S\020\003B\274\001\n\027com.google.datastore.v1B\nQueryPr"
+          + "otoP\001Z
Date: Thu, 25 Aug 2022 11:38:02 -0400
Subject: [PATCH 0919/1784] chore: comment updates (#815)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: update count up_to field type in aggregation queries

PiperOrigin-RevId: 469555077

Source-Link: https://github.com/googleapis/googleapis/commit/7c3a38d624bcb786a7258ab3878cbe5517ade414

Source-Link: https://github.com/googleapis/googleapis-gen/commit/cb40e6e892a9c33da0b2e6a6335d5f1e45a870da
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2I0MGU2ZTg5MmE5YzMzZGEwYjJlNmE2MzM1ZDVmMWU0NWE4NzBkYSJ9

* 🦉 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 
---
 .../com/google/datastore/v1/QueryProto.java   | 148 +++++++++---------
 .../com/google/datastore/v1/ReadOptions.java  |   9 --
 .../datastore/v1/ReadOptionsOrBuilder.java    |   3 -
 .../proto/google/datastore/v1/datastore.proto |   1 -
 .../proto/google/datastore/v1/query.proto     |   1 +
 5 files changed, 76 insertions(+), 86 deletions(-)

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 d96e6c2d9a39..53afbf41225b 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
@@ -89,84 +89,85 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n\037google/datastore/v1/query.proto\022\023googl"
-          + "e.datastore.v1\032 google/datastore/v1/enti"
-          + "ty.proto\032\037google/protobuf/timestamp.prot"
-          + "o\032\036google/protobuf/wrappers.proto\"\340\001\n\014En"
-          + "tityResult\022+\n\006entity\030\001 \001(\0132\033.google.data"
-          + "store.v1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013upda"
-          + "te_time\030\005 \001(\0132\032.google.protobuf.Timestam"
-          + "p\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESUL"
-          + "T_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJEC"
-          + "TION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojec"
-          + "tion\030\002 \003(\0132\037.google.datastore.v1.Project"
-          + "ion\0221\n\004kind\030\003 \003(\0132#.google.datastore.v1."
-          + "KindExpression\022+\n\006filter\030\004 \001(\0132\033.google."
-          + "datastore.v1.Filter\0221\n\005order\030\005 \003(\0132\".goo"
-          + "gle.datastore.v1.PropertyOrder\022;\n\013distin"
-          + "ct_on\030\006 \003(\0132&.google.datastore.v1.Proper"
-          + "tyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend"
-          + "_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit\030\014"
-          + " \001(\0132\033.google.protobuf.Int32Value\"\036\n\016Kin"
-          + "dExpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRef"
-          + "erence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010pr"
-          + "operty\030\001 \001(\0132&.google.datastore.v1.Prope"
-          + "rtyReference\"\321\001\n\rPropertyOrder\0228\n\010proper"
-          + "ty\030\001 \001(\0132&.google.datastore.v1.PropertyR"
-          + "eference\022?\n\tdirection\030\002 \001(\0162,.google.dat"
-          + "astore.v1.PropertyOrder.Direction\"E\n\tDir"
-          + "ection\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASC"
-          + "ENDING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020c"
-          + "omposite_filter\030\001 \001(\0132$.google.datastore"
-          + ".v1.CompositeFilterH\000\022>\n\017property_filter"
-          + "\030\002 \001(\0132#.google.datastore.v1.PropertyFil"
-          + "terH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter"
-          + "\0229\n\002op\030\001 \001(\0162-.google.datastore.v1.Compo"
-          + "siteFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.g"
-          + "oogle.datastore.v1.Filter\"-\n\010Operator\022\030\n"
-          + "\024OPERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016Pro"
-          + "pertyFilter\0228\n\010property\030\001 \001(\0132&.google.d"
-          + "atastore.v1.PropertyReference\0228\n\002op\030\002 \001("
-          + "\0162,.google.datastore.v1.PropertyFilter.O"
-          + "perator\022)\n\005value\030\003 \001(\0132\032.google.datastor"
-          + "e.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSP"
-          + "ECIFIED\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_TH"
-          + "AN_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\010GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allo"
-          + "w_literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\013"
-          + "20.google.datastore.v1.GqlQuery.NamedBin"
-          + "dingsEntry\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\005va"
-          + "lue\030\002 \001(\0132&.google.datastore.v1.GqlQuery"
-          + "Parameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005va"
-          + "lue\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\020"
-          + "QueryResultBatch\022\027\n\017skipped_results\030\006 \001("
-          + "\005\022\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_resu"
-          + "lt_type\030\001 \001(\0162,.google.datastore.v1.Enti"
-          + "tyResult.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(\016"
-          + "25.google.datastore.v1.QueryResultBatch."
-          + "MoreResultsType\022\030\n\020snapshot_version\030\007 \001("
-          + "\003\022-\n\tread_time\030\010 \001(\0132\032.google.protobuf.T"
-          + "imestamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RES"
-          + "ULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020"
-          + "\001\022\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_"
-          + "RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULT"
-          + "S\020\003B\274\001\n\027com.google.datastore.v1B\nQueryPr"
-          + "otoP\001Z\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/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index ea77f95e4cdb..4a0035eacc9c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -347,7 +347,6 @@ public ConsistencyTypeCase getConsistencyTypeCase() {
    *
    * 
        * The non-transactional read consistency to use.
-   * Cannot be set to `STRONG` for global queries.
    * 
    
    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -362,7 +361,6 @@ public boolean hasReadConsistency() {
    *
    * 
        * The non-transactional read consistency to use.
-   * Cannot be set to `STRONG` for global queries.
    * 
    
    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -380,7 +378,6 @@ public int getReadConsistencyValue() {
    *
    * 
        * The non-transactional read consistency to use.
-   * Cannot be set to `STRONG` for global queries.
    * 
    
    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -903,7 +900,6 @@ public Builder clearConsistencyType() {
      *
      * 
          * The non-transactional read consistency to use.
-     * Cannot be set to `STRONG` for global queries.
      * 
    
      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -919,7 +915,6 @@ public boolean hasReadConsistency() {
      *
      * 
          * The non-transactional read consistency to use.
-     * Cannot be set to `STRONG` for global queries.
      * 
    
      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -938,7 +933,6 @@ public int getReadConsistencyValue() {
      *
      * 
          * The non-transactional read consistency to use.
-     * Cannot be set to `STRONG` for global queries.
      * 
    
      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -957,7 +951,6 @@ public Builder setReadConsistencyValue(int value) {
      *
      * 
          * The non-transactional read consistency to use.
-     * Cannot be set to `STRONG` for global queries.
      * 
    
      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -982,7 +975,6 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
      *
      * 
          * The non-transactional read consistency to use.
-     * Cannot be set to `STRONG` for global queries.
      * 
    
      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -1004,7 +996,6 @@ public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsis
      *
      * 
          * The non-transactional read consistency to use.
-     * Cannot be set to `STRONG` for global queries.
      * 
    
      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
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 5f3c014023a5..f6ee892027e2 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
@@ -28,7 +28,6 @@ public interface ReadOptionsOrBuilder
    *
    * 
        * The non-transactional read consistency to use.
-   * Cannot be set to `STRONG` for global queries.
    * 
    
    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -41,7 +40,6 @@ public interface ReadOptionsOrBuilder
    *
    * 
        * The non-transactional read consistency to use.
-   * Cannot be set to `STRONG` for global queries.
    * 
    
    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
@@ -54,7 +52,6 @@ public interface ReadOptionsOrBuilder
    *
    * 
        * The non-transactional read consistency to use.
-   * Cannot be set to `STRONG` for global queries.
    * 
    
    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
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 6d243749978c..4c8ac7626291 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
@@ -436,7 +436,6 @@ message ReadOptions {
   // Datastore mode.
   oneof consistency_type {
     // The non-transactional read consistency to use.
-    // Cannot be set to `STRONG` for global queries.
     ReadConsistency read_consistency = 1;
 
     // The identifier of the transaction in which to read. A
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 5e9dd9158eb5..cbe44932d0ff 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";

From 660d803dbf73bf14be6263df3df3cc0b5adbdb15 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 31 Aug 2022 16:22:46 +0200
Subject: [PATCH 0920/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.1.1 (#816)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.1.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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 59089538cd74..7180c998b05f 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.1.0
+      26.1.1
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.0')
+implementation platform('com.google.cloud:libraries-bom:26.1.1')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 5ea65fc40bfc..7a4f13ef8b5d 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.0
+        26.1.1
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 226d9aeb4130..0ea195efeab1 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.0
+        26.1.1
         pom
         import
       

From 47780d652e5ac0977278059374aa3865548ec798 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 9 Sep 2022 06:02:25 +0200
Subject: [PATCH 0921/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.0.2 (#818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `3.0.1` -> `3.0.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.2/compatibility-slim/3.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.2/confidence-slim/3.0.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v3.0.2`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​302-httpsgithubcomgoogleapisjava-shared-dependenciescomparev301v302-2022-09-08)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.1...v3.0.2)

##### Dependencies

-   Update dependency com.fasterxml.jackson:jackson-bom to v2.13.4 ([#​789](https://togithub.com/googleapis/java-shared-dependencies/issues/789)) ([6cf91a9](https://togithub.com/googleapis/java-shared-dependencies/commit/6cf91a96b9ea6af0fb845b50582dac7aa2892cab))
-   Update dependency com.google.auth:google-auth-library-bom to v1.10.0 ([#​781](https://togithub.com/googleapis/java-shared-dependencies/issues/781)) ([8859e61](https://togithub.com/googleapis/java-shared-dependencies/commit/8859e61808bfc5cd9546e27e945fc855b36d2554))
-   Update dependency com.google.auth:google-auth-library-bom to v1.11.0 ([#​790](https://togithub.com/googleapis/java-shared-dependencies/issues/790)) ([3431a47](https://togithub.com/googleapis/java-shared-dependencies/commit/3431a471cbf874a67a4f1a42e31f0ed891dedc92))
-   Update dependency com.google.auth:google-auth-library-bom to v1.9.0 ([#​773](https://togithub.com/googleapis/java-shared-dependencies/issues/773)) ([27fc79f](https://togithub.com/googleapis/java-shared-dependencies/commit/27fc79f00ee70011df6a368bb8fcfad7f0ce41f0))
-   Update dependency com.google.errorprone:error_prone_annotations to v2.15.0 ([#​776](https://togithub.com/googleapis/java-shared-dependencies/issues/776)) ([bf333b8](https://togithub.com/googleapis/java-shared-dependencies/commit/bf333b8c88072d21cb959db4d3328bbb55d9ef5c))
-   Update dependency com.google.protobuf:protobuf-bom to v3.21.5 ([#​780](https://togithub.com/googleapis/java-shared-dependencies/issues/780)) ([da7f44d](https://togithub.com/googleapis/java-shared-dependencies/commit/da7f44d71d6d7f372b5313dab68ce220308614d4))
-   Update dependency io.grpc:grpc-bom to v1.48.1 ([#​768](https://togithub.com/googleapis/java-shared-dependencies/issues/768)) ([5c7768d](https://togithub.com/googleapis/java-shared-dependencies/commit/5c7768d3c9665dd356de6c39c0a6a5fa6e992f2e))
-   Update dependency io.grpc:grpc-bom to v1.49.0 ([#​786](https://togithub.com/googleapis/java-shared-dependencies/issues/786)) ([8734812](https://togithub.com/googleapis/java-shared-dependencies/commit/8734812f1b4e2faaa48caf41eff59a85892ae344))
-   Update dependency org.checkerframework:checker-qual to v3.24.0 ([#​775](https://togithub.com/googleapis/java-shared-dependencies/issues/775)) ([df74b7b](https://togithub.com/googleapis/java-shared-dependencies/commit/df74b7b0dd5dd592523f302d9fb36adb5991cb0b))
-   Update dependency org.checkerframework:checker-qual to v3.25.0 ([#​788](https://togithub.com/googleapis/java-shared-dependencies/issues/788)) ([207035b](https://togithub.com/googleapis/java-shared-dependencies/commit/207035bd04c9305899eea540acbefaf06a7b1ec9))
-   Update dependency org.threeten:threetenbp to v1.6.1 ([#​782](https://togithub.com/googleapis/java-shared-dependencies/issues/782)) ([0f218ae](https://togithub.com/googleapis/java-shared-dependencies/commit/0f218aeb6aa33cf1da4a8b1d6c82bbf87946dab9))
-   Update gax.version to v2.19.0 ([#​785](https://togithub.com/googleapis/java-shared-dependencies/issues/785)) ([4448331](https://togithub.com/googleapis/java-shared-dependencies/commit/4448331c4c6d88ea8076260776d1d47d24aa19fa))
-   Update google.core.version to v2.8.10 ([#​787](https://togithub.com/googleapis/java-shared-dependencies/issues/787)) ([3c344d5](https://togithub.com/googleapis/java-shared-dependencies/commit/3c344d515e3b9215db5a1f8ef550d800d974e558))
-   Update google.core.version to v2.8.7 ([#​774](https://togithub.com/googleapis/java-shared-dependencies/issues/774)) ([d0cd5e8](https://togithub.com/googleapis/java-shared-dependencies/commit/d0cd5e8f6ca88787fe0dbf7f30c849cb4c4fae5e))
-   Update google.core.version to v2.8.8 ([#​777](https://togithub.com/googleapis/java-shared-dependencies/issues/777)) ([f00571c](https://togithub.com/googleapis/java-shared-dependencies/commit/f00571cd1e9f1c4e011fba4a1e1674c1d8d60200))
-   Update google.core.version to v2.8.9 ([#​784](https://togithub.com/googleapis/java-shared-dependencies/issues/784)) ([aa8e505](https://togithub.com/googleapis/java-shared-dependencies/commit/aa8e505dbb1214b2239e55d5ac83b00c167d77e4))


    

---

### 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 75c21cae1fe6..eacf05467bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.0.1
+        3.0.2
         pom
         import
       

From e3734c5c8bfb86f747ac562a80f65fd0de61576f Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Sep 2022 02:14:16 +0000
Subject: [PATCH 0922/1784] chore: Generated snippets should not be owned by
 samples reviewers (#1575) (#820)

Source-Link: https://github.com/googleapis/synthtool/commit/2e9ac19d5b8181af77cdc5337cf922517813cc49
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93
---
 .github/.OwlBot.lock.yaml | 3 +--
 .github/CODEOWNERS        | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index d99cbbc27f08..6259292301cb 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:04f254abfe5f47fe73ae6f91d68d55c3b76e722a4943066c3bb0ce03573b4ad9
-# created: 2022-07-18T21:44:23.94208526Z
\ No newline at end of file
+  digest: sha256:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 78f7f12f4b7c..549b1955465b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,3 +13,6 @@
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
+
+# Generated snippets should not be owned by samples reviewers
+samples/snippets/generated/       @googleapis/yoshi-java

From 34b71a90c7a176fb6c67aa7bd542a3622e9650b8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Sat, 10 Sep 2022 02:34:18 +0000
Subject: [PATCH 0923/1784] chore(main): release 2.11.1 (#819)

:robot: I have created a release *beep* *boop*
---


## [2.11.1](https://github.com/googleapis/java-datastore/compare/v2.11.0...v2.11.1) (2022-09-10)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.2 ([#818](https://github.com/googleapis/java-datastore/issues/818)) ([47780d6](https://github.com/googleapis/java-datastore/commit/47780d652e5ac0977278059374aa3865548ec798))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 670a53686d2a..c163ec363e8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.11.1](https://github.com/googleapis/java-datastore/compare/v2.11.0...v2.11.1) (2022-09-10)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.2 ([#818](https://github.com/googleapis/java-datastore/issues/818)) ([47780d6](https://github.com/googleapis/java-datastore/commit/47780d652e5ac0977278059374aa3865548ec798))
+
 ## [2.11.0](https://github.com/googleapis/java-datastore/compare/v2.10.1...v2.11.0) (2022-08-04)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 0e4b6c889b1d..4c924bff53ee 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.11.1-SNAPSHOT
+  2.11.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1-SNAPSHOT
+    2.11.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7b6bae21a58b..ef47edb748fc 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.11.1-SNAPSHOT
+  2.11.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.1-SNAPSHOT
+        2.11.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.1-SNAPSHOT
+        2.11.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.1-SNAPSHOT
+        0.102.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.1-SNAPSHOT
+        2.11.1
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 04e1ee43312c..69c02c84acbb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.1-SNAPSHOT
+  2.11.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1-SNAPSHOT
+    2.11.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d9d39fee3f71..4d464bfb5b72 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.11.1-SNAPSHOT
+  2.11.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1-SNAPSHOT
+    2.11.1
   
   
     
diff --git a/pom.xml b/pom.xml
index eacf05467bf7..175e464543e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.1-SNAPSHOT
+  2.11.1
   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.11.1-SNAPSHOT
+        2.11.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.1-SNAPSHOT
+        2.11.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.1-SNAPSHOT
+        2.11.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.1-SNAPSHOT
+        0.102.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.1-SNAPSHOT
+        2.11.1
         
           
             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 f75881508a59..b60665a2a051 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.11.1-SNAPSHOT
+  2.11.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1-SNAPSHOT
+    2.11.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 328ce485c735..52cb20c416c4 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.102.1-SNAPSHOT
+  0.102.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1-SNAPSHOT
+    2.11.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 79a218af810a..25dcff9cbecf 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.0:2.11.1-SNAPSHOT
-google-cloud-datastore-bom:2.11.0:2.11.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.102.0:0.102.1-SNAPSHOT
-datastore-v1-proto-client:2.11.0:2.11.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.11.0:2.11.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.11.0:2.11.1-SNAPSHOT
+google-cloud-datastore:2.11.1:2.11.1
+google-cloud-datastore-bom:2.11.1:2.11.1
+proto-google-cloud-datastore-v1:0.102.1:0.102.1
+datastore-v1-proto-client:2.11.1:2.11.1
+proto-google-cloud-datastore-admin-v1:2.11.1:2.11.1
+grpc-google-cloud-datastore-admin-v1:2.11.1:2.11.1

From 123fff72943631bcb79724447a1857b70c3b7860 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Sat, 10 Sep 2022 02:54:16 +0000
Subject: [PATCH 0924/1784] chore(main): release 2.11.2-SNAPSHOT (#821)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4c924bff53ee..72f1a7abf329 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.11.1
+  2.11.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1
+    2.11.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ef47edb748fc..3f50acfabe27 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.11.1
+  2.11.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.1
+        2.11.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.1
+        2.11.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.1
+        0.102.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.1
+        2.11.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 69c02c84acbb..8d55a0b919aa 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.1
+  2.11.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1
+    2.11.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 4d464bfb5b72..01e138a7e0ed 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.11.1
+  2.11.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1
+    2.11.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 175e464543e2..ec1f7c9f8b2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.1
+  2.11.2-SNAPSHOT
   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.11.1
+        2.11.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.1
+        2.11.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.1
+        2.11.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.1
+        0.102.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.1
+        2.11.2-SNAPSHOT
         
           
             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 b60665a2a051..093e43a1f887 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.11.1
+  2.11.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1
+    2.11.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 52cb20c416c4..93108ab0e9f0 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.102.1
+  0.102.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.1
+    2.11.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 25dcff9cbecf..7ace4e35418f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.1:2.11.1
-google-cloud-datastore-bom:2.11.1:2.11.1
-proto-google-cloud-datastore-v1:0.102.1:0.102.1
-datastore-v1-proto-client:2.11.1:2.11.1
-proto-google-cloud-datastore-admin-v1:2.11.1:2.11.1
-grpc-google-cloud-datastore-admin-v1:2.11.1:2.11.1
+google-cloud-datastore:2.11.1:2.11.2-SNAPSHOT
+google-cloud-datastore-bom:2.11.1:2.11.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.102.1:0.102.2-SNAPSHOT
+datastore-v1-proto-client:2.11.1:2.11.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.11.1:2.11.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.11.1:2.11.2-SNAPSHOT

From 58b00627f0754feb91a34d5844319c2a8a7da024 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Sat, 10 Sep 2022 22:32:13 +0200
Subject: [PATCH 0925/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.11.1 (#822)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.11.0` -> `2.11.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.1/compatibility-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.1/confidence-slim/2.11.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7180c998b05f..8e46ceda849b 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.11.0
+  2.11.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.11.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.11.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.1"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index edb220411b08..c702bab885c0 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.11.0
+      2.11.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e11405b7b385..65be8d638c4c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.11.0
+      2.11.1
     
 
     

From e0a83af015e70101d5040e94788dbfd978152a31 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:39:53 -0400
Subject: [PATCH 0926/1784] chore(bazel): Update WORKSPACE files for
 rules_gapic, gax_java, generator_java versions (#817)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(bazel): Update WORKSPACE files for rules_gapic, gax_java, generator_java versions

PiperOrigin-RevId: 472750037

Source-Link: https://github.com/googleapis/googleapis/commit/88f2ea3f53b9712f2e04f28f06210f6f77fa7e24

Source-Link: https://github.com/googleapis/googleapis-gen/commit/230a5588306aae18fe8f2a57f14d4039ad72c901
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjMwYTU1ODgzMDZhYWUxOGZlOGYyYTU3ZjE0ZDQwMzlhZDcyYzkwMSJ9

* 🦉 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 
---
 .../admin/v1/DatastoreAdminClient.java        | 161 +++++++++++++-----
 .../admin/v1/DatastoreAdminSettings.java      |  12 +-
 .../datastore/admin/v1/package-info.java      |   7 +-
 .../v1/stub/DatastoreAdminStubSettings.java   |  12 +-
 .../v1/stub/HttpJsonDatastoreAdminStub.java   |   7 +-
 5 files changed, 136 insertions(+), 63 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 81374b331a84..30669e3382a0 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -113,8 +113,11 @@
  * calls that map to API methods. Sample code to get started:
  *
  * 
    {@code
- * // This snippet has been automatically generated for illustrative purposes only.
- * // It may require modifications to work in your environment.
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
  *   GetIndexRequest request =
  *       GetIndexRequest.newBuilder()
@@ -154,8 +157,11 @@
  * 
    To customize credentials:
  *
  * 
    {@code
- * // This snippet has been automatically generated for illustrative purposes only.
- * // It may require modifications to work in your environment.
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * DatastoreAdminSettings datastoreAdminSettings =
  *     DatastoreAdminSettings.newBuilder()
  *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
@@ -166,8 +172,11 @@
  * 
    To customize the endpoint:
  *
  * 
    {@code
- * // This snippet has been automatically generated for illustrative purposes only.
- * // It may require modifications to work in your environment.
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * DatastoreAdminSettings datastoreAdminSettings =
  *     DatastoreAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
  * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings);
@@ -177,8 +186,11 @@
  * the wire:
  *
  * 
    {@code
- * // This snippet has been automatically generated for illustrative purposes only.
- * // It may require modifications to work in your environment.
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * DatastoreAdminSettings datastoreAdminSettings =
  *     DatastoreAdminSettings.newBuilder()
  *         .setTransportChannelProvider(
@@ -276,8 +288,11 @@ public final OperationsClient getHttpJsonOperationsClient() {
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   String projectId = "projectId-894832108";
    *   Map labels = new HashMap<>();
@@ -336,8 +351,11 @@ public final OperationFuture exp
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ExportEntitiesRequest request =
    *       ExportEntitiesRequest.newBuilder()
@@ -370,8 +388,11 @@ public final OperationFuture exp
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ExportEntitiesRequest request =
    *       ExportEntitiesRequest.newBuilder()
@@ -405,8 +426,11 @@ public final OperationFuture exp
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ExportEntitiesRequest request =
    *       ExportEntitiesRequest.newBuilder()
@@ -436,8 +460,11 @@ public final UnaryCallable exportEntitiesCalla
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   String projectId = "projectId-894832108";
    *   Map labels = new HashMap<>();
@@ -487,8 +514,11 @@ public final OperationFuture importEntitiesAsync(
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ImportEntitiesRequest request =
    *       ImportEntitiesRequest.newBuilder()
@@ -519,8 +549,11 @@ public final OperationFuture importEntitiesAsync(
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ImportEntitiesRequest request =
    *       ImportEntitiesRequest.newBuilder()
@@ -551,8 +584,11 @@ public final OperationFuture importEntitiesAsync(
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ImportEntitiesRequest request =
    *       ImportEntitiesRequest.newBuilder()
@@ -589,8 +625,11 @@ public final UnaryCallable importEntitiesCalla
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   CreateIndexRequest request =
    *       CreateIndexRequest.newBuilder()
@@ -626,8 +665,11 @@ public final OperationFuture createIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   CreateIndexRequest request =
    *       CreateIndexRequest.newBuilder()
@@ -663,8 +705,11 @@ public final OperationFuture createIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   CreateIndexRequest request =
    *       CreateIndexRequest.newBuilder()
@@ -696,8 +741,11 @@ public final UnaryCallable createIndexCallable()
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   DeleteIndexRequest request =
    *       DeleteIndexRequest.newBuilder()
@@ -731,8 +779,11 @@ public final OperationFuture deleteIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   DeleteIndexRequest request =
    *       DeleteIndexRequest.newBuilder()
@@ -766,8 +817,11 @@ public final OperationFuture deleteIndexAsync(
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   DeleteIndexRequest request =
    *       DeleteIndexRequest.newBuilder()
@@ -791,8 +845,11 @@ public final UnaryCallable deleteIndexCallable()
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   GetIndexRequest request =
    *       GetIndexRequest.newBuilder()
@@ -817,8 +874,11 @@ public final Index getIndex(GetIndexRequest request) {
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   GetIndexRequest request =
    *       GetIndexRequest.newBuilder()
@@ -843,8 +903,11 @@ public final UnaryCallable getIndexCallable() {
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ListIndexesRequest request =
    *       ListIndexesRequest.newBuilder()
@@ -874,8 +937,11 @@ public final ListIndexesPagedResponse listIndexes(ListIndexesRequest request) {
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ListIndexesRequest request =
    *       ListIndexesRequest.newBuilder()
@@ -905,8 +971,11 @@ public final ListIndexesPagedResponse listIndexes(ListIndexesRequest request) {
    * 
    Sample code:
    *
    * 
    {@code
-   * // This snippet has been automatically generated for illustrative purposes only.
-   * // It may require modifications to work in your environment.
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
    *   ListIndexesRequest request =
    *       ListIndexesRequest.newBuilder()
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 6d915b8022df..2d5d1aeb21ca 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -68,17 +68,17 @@
  * 
    For example, to set the total timeout of getIndex to 30 seconds:
  *
  * 
    {@code
- * // This snippet has been automatically generated for illustrative purposes only.
- * // It may require modifications to work in your environment.
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * DatastoreAdminSettings.Builder datastoreAdminSettingsBuilder =
  *     DatastoreAdminSettings.newBuilder();
  * datastoreAdminSettingsBuilder
  *     .getIndexSettings()
  *     .setRetrySettings(
- *         datastoreAdminSettingsBuilder
- *             .getIndexSettings()
- *             .getRetrySettings()
- *             .toBuilder()
+ *         datastoreAdminSettingsBuilder.getIndexSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DatastoreAdminSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
index 4bb6f2eea484..b82ab22ea538 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -79,8 +79,11 @@
  * 
    Sample for DatastoreAdminClient:
  *
  * 
    {@code
- * // This snippet has been automatically generated for illustrative purposes only.
- * // It may require modifications to work in your environment.
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * try (DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create()) {
  *   GetIndexRequest request =
  *       GetIndexRequest.newBuilder()
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 2abc133c605a..d93cd65f6de7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -88,17 +88,17 @@
  * 
    For example, to set the total timeout of getIndex to 30 seconds:
  *
  * 
    {@code
- * // This snippet has been automatically generated for illustrative purposes only.
- * // It may require modifications to work in your environment.
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * DatastoreAdminStubSettings.Builder datastoreAdminSettingsBuilder =
  *     DatastoreAdminStubSettings.newBuilder();
  * datastoreAdminSettingsBuilder
  *     .getIndexSettings()
  *     .setRetrySettings(
- *         datastoreAdminSettingsBuilder
- *             .getIndexSettings()
- *             .getRetrySettings()
- *             .toBuilder()
+ *         datastoreAdminSettingsBuilder.getIndexSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DatastoreAdminStubSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index 207ca1d45c38..cbe5516bc00e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -102,7 +102,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                       .setRequestBodyExtractor(
                           request ->
                               ProtoRestSerializer.create()
-                                  .toBody("*", request.toBuilder().clearProjectId().build()))
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), false))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.newBuilder()
@@ -141,7 +141,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                       .setRequestBodyExtractor(
                           request ->
                               ProtoRestSerializer.create()
-                                  .toBody("*", request.toBuilder().clearProjectId().build()))
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), false))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.newBuilder()
@@ -179,7 +179,8 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                           })
                       .setRequestBodyExtractor(
                           request ->
-                              ProtoRestSerializer.create().toBody("index", request.getIndex()))
+                              ProtoRestSerializer.create()
+                                  .toBody("index", request.getIndex(), false))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.newBuilder()

From 819f79ff16389f75dc4fb8b439ab32aa0c61a4cd Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 15 Sep 2022 14:18:13 +0200
Subject: [PATCH 0927/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.0.3 (#824)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `3.0.2` -> `3.0.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/compatibility-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/confidence-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v3.0.3`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​303-httpsgithubcomgoogleapisjava-shared-dependenciescomparev302v303-2022-09-14)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.2...v3.0.3)

##### Dependencies

-   Google-cloud-core 2.8.12 ([#​799](https://togithub.com/googleapis/java-shared-dependencies/issues/799)) ([1b3db8d](https://togithub.com/googleapis/java-shared-dependencies/commit/1b3db8d1e17c49ebae79fc96164fa9058e1df6e3))
-   Moving gson to first-party-dependencies ([#​800](https://togithub.com/googleapis/java-shared-dependencies/issues/800)) ([a41fcc1](https://togithub.com/googleapis/java-shared-dependencies/commit/a41fcc11d32e02e5af2837561792e3919f6d4b3f))
-   Update dependency com.google.protobuf:protobuf-bom to v3.21.6 ([#​797](https://togithub.com/googleapis/java-shared-dependencies/issues/797)) ([bc5fdc9](https://togithub.com/googleapis/java-shared-dependencies/commit/bc5fdc9b3af7973c28f063a9ac156fe2af562814))
-   Update gax.version to v2.19.1 ([#​798](https://togithub.com/googleapis/java-shared-dependencies/issues/798)) ([84e5487](https://togithub.com/googleapis/java-shared-dependencies/commit/84e5487b2e3dce4bb60badecebde788c3cb702b8))
-   Update google.core.version to v2.8.11 ([#​793](https://togithub.com/googleapis/java-shared-dependencies/issues/793)) ([63c1297](https://togithub.com/googleapis/java-shared-dependencies/commit/63c129722aa0b821031ff5b4c11004adf7b12044))


    

---

### 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 ec1f7c9f8b2b..482dbb3b7eaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.0.2
+        3.0.3
         pom
         import
       

From e5e9a86868b462bf3b186ed0c5912a6df96543c4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 12:46:27 +0000
Subject: [PATCH 0928/1784] chore(main): release 2.11.2 (#825)

:robot: I have created a release *beep* *boop*
---


## [2.11.2](https://github.com/googleapis/java-datastore/compare/v2.11.1...v2.11.2) (2022-09-15)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#824](https://github.com/googleapis/java-datastore/issues/824)) ([819f79f](https://github.com/googleapis/java-datastore/commit/819f79ff16389f75dc4fb8b439ab32aa0c61a4cd))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c163ec363e8a..278b0003b1dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.11.2](https://github.com/googleapis/java-datastore/compare/v2.11.1...v2.11.2) (2022-09-15)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#824](https://github.com/googleapis/java-datastore/issues/824)) ([819f79f](https://github.com/googleapis/java-datastore/commit/819f79ff16389f75dc4fb8b439ab32aa0c61a4cd))
+
 ## [2.11.1](https://github.com/googleapis/java-datastore/compare/v2.11.0...v2.11.1) (2022-09-10)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 72f1a7abf329..01436ea5af2a 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.11.2-SNAPSHOT
+  2.11.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2-SNAPSHOT
+    2.11.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3f50acfabe27..187084a01d85 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.11.2-SNAPSHOT
+  2.11.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.2-SNAPSHOT
+        2.11.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.2-SNAPSHOT
+        2.11.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.2-SNAPSHOT
+        0.102.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.2-SNAPSHOT
+        2.11.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8d55a0b919aa..1bbbfb282b0f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.2-SNAPSHOT
+  2.11.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2-SNAPSHOT
+    2.11.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 01e138a7e0ed..c4d5d3909396 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.11.2-SNAPSHOT
+  2.11.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2-SNAPSHOT
+    2.11.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 482dbb3b7eaa..99fcb47296ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.2-SNAPSHOT
+  2.11.2
   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.11.2-SNAPSHOT
+        2.11.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.2-SNAPSHOT
+        2.11.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.2-SNAPSHOT
+        2.11.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.2-SNAPSHOT
+        0.102.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.2-SNAPSHOT
+        2.11.2
         
           
             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 093e43a1f887..16c88924b42e 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.11.2-SNAPSHOT
+  2.11.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2-SNAPSHOT
+    2.11.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 93108ab0e9f0..db2b36a7d277 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.102.2-SNAPSHOT
+  0.102.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2-SNAPSHOT
+    2.11.2
   
   
     
diff --git a/versions.txt b/versions.txt
index 7ace4e35418f..6d6d3ae7092c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.1:2.11.2-SNAPSHOT
-google-cloud-datastore-bom:2.11.1:2.11.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.102.1:0.102.2-SNAPSHOT
-datastore-v1-proto-client:2.11.1:2.11.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.11.1:2.11.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.11.1:2.11.2-SNAPSHOT
+google-cloud-datastore:2.11.2:2.11.2
+google-cloud-datastore-bom:2.11.2:2.11.2
+proto-google-cloud-datastore-v1:0.102.2:0.102.2
+datastore-v1-proto-client:2.11.2:2.11.2
+proto-google-cloud-datastore-admin-v1:2.11.2:2.11.2
+grpc-google-cloud-datastore-admin-v1:2.11.2:2.11.2

From 56a6e56c526c4b8d73080eb81e62311474e4aecc Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:06:15 +0000
Subject: [PATCH 0929/1784] chore(main): release 2.11.3-SNAPSHOT (#826)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 01436ea5af2a..215ce50a0a27 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.11.2
+  2.11.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2
+    2.11.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 187084a01d85..6318574cb38c 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.11.2
+  2.11.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.2
+        2.11.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.2
+        2.11.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.2
+        0.102.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.2
+        2.11.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1bbbfb282b0f..a55091691287 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.2
+  2.11.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2
+    2.11.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index c4d5d3909396..f6d390403b96 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.11.2
+  2.11.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2
+    2.11.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 99fcb47296ca..1d956a586061 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.2
+  2.11.3-SNAPSHOT
   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.11.2
+        2.11.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.2
+        2.11.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.2
+        2.11.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.2
+        0.102.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.2
+        2.11.3-SNAPSHOT
         
           
             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 16c88924b42e..11f58c764b69 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.11.2
+  2.11.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2
+    2.11.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index db2b36a7d277..96096261c1c2 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.102.2
+  0.102.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.2
+    2.11.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 6d6d3ae7092c..54a7e74db722 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.2:2.11.2
-google-cloud-datastore-bom:2.11.2:2.11.2
-proto-google-cloud-datastore-v1:0.102.2:0.102.2
-datastore-v1-proto-client:2.11.2:2.11.2
-proto-google-cloud-datastore-admin-v1:2.11.2:2.11.2
-grpc-google-cloud-datastore-admin-v1:2.11.2:2.11.2
+google-cloud-datastore:2.11.2:2.11.3-SNAPSHOT
+google-cloud-datastore-bom:2.11.2:2.11.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.102.2:0.102.3-SNAPSHOT
+datastore-v1-proto-client:2.11.2:2.11.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.11.2:2.11.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.11.2:2.11.3-SNAPSHOT

From eb93d44cf18db000027fcbaa83a6a78bec4610e1 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 16 Sep 2022 16:15:25 +0200
Subject: [PATCH 0930/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.11.2 (#827)
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.11.2

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8e46ceda849b..90e3fdb3f3bc 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.11.1
+  2.11.2
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.11.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.11.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.2"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index c702bab885c0..d424fd55721e 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.11.1
+      2.11.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 65be8d638c4c..2be2ffd3e712 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.11.1
+      2.11.2
     
 
     

From 5237650778b5cfe7853799da6bfbc38b333fb11b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 20 Sep 2022 17:28:15 +0200
Subject: [PATCH 0931/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.1.2 (#828)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.1.1` -> `26.1.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.2/compatibility-slim/26.1.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.2/confidence-slim/26.1.1)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 90e3fdb3f3bc..a9a48717e203 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.1.1
+      26.1.2
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.1')
+implementation platform('com.google.cloud:libraries-bom:26.1.2')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 7a4f13ef8b5d..5f61c4767acc 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.1
+        26.1.2
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 0ea195efeab1..b1e99e22a481 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.1
+        26.1.2
         pom
         import
       

From 2ab161e1b44475f46adc2fe0e7d9bfcfb813f50f Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 21 Sep 2022 16:22:13 +0200
Subject: [PATCH 0932/1784] deps: update dependency
 org.junit.vintage:junit-vintage-engine to v5.9.1 (#829)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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.9.0` -> `5.9.1` | [![age](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/compatibility-slim/5.9.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/confidence-slim/5.9.0)](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 5f61c4767acc..19ace1d84694 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.9.0
+          5.9.1
           test
         
         

From fe557d51c96b85cdd029155d7c6772d29475b2ca Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 14:54:16 +0000
Subject: [PATCH 0933/1784] chore(main): release 2.11.3 (#830)

:robot: I have created a release *beep* *boop*
---


## [2.11.3](https://github.com/googleapis/java-datastore/compare/v2.11.2...v2.11.3) (2022-09-21)


### Dependencies

* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.1 ([#829](https://github.com/googleapis/java-datastore/issues/829)) ([2ab161e](https://github.com/googleapis/java-datastore/commit/2ab161e1b44475f46adc2fe0e7d9bfcfb813f50f))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 278b0003b1dc..1f04dfbbe839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.11.3](https://github.com/googleapis/java-datastore/compare/v2.11.2...v2.11.3) (2022-09-21)
+
+
+### Dependencies
+
+* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.1 ([#829](https://github.com/googleapis/java-datastore/issues/829)) ([2ab161e](https://github.com/googleapis/java-datastore/commit/2ab161e1b44475f46adc2fe0e7d9bfcfb813f50f))
+
 ## [2.11.2](https://github.com/googleapis/java-datastore/compare/v2.11.1...v2.11.2) (2022-09-15)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 215ce50a0a27..55a31edbfae0 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.11.3-SNAPSHOT
+  2.11.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3-SNAPSHOT
+    2.11.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6318574cb38c..19f92126cf51 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.11.3-SNAPSHOT
+  2.11.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.3-SNAPSHOT
+        2.11.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.3-SNAPSHOT
+        2.11.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.3-SNAPSHOT
+        0.102.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.3-SNAPSHOT
+        2.11.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a55091691287..c671d2ff73e0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.3-SNAPSHOT
+  2.11.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3-SNAPSHOT
+    2.11.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f6d390403b96..a1f21a4507da 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.11.3-SNAPSHOT
+  2.11.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3-SNAPSHOT
+    2.11.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 1d956a586061..caa8edff6c5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.3-SNAPSHOT
+  2.11.3
   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.11.3-SNAPSHOT
+        2.11.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.3-SNAPSHOT
+        2.11.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.3-SNAPSHOT
+        2.11.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.3-SNAPSHOT
+        0.102.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.3-SNAPSHOT
+        2.11.3
         
           
             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 11f58c764b69..21efe3bf6f3a 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.11.3-SNAPSHOT
+  2.11.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3-SNAPSHOT
+    2.11.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 96096261c1c2..e5e3751bc3da 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.102.3-SNAPSHOT
+  0.102.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3-SNAPSHOT
+    2.11.3
   
   
     
diff --git a/versions.txt b/versions.txt
index 54a7e74db722..dd49c6a7baa2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.2:2.11.3-SNAPSHOT
-google-cloud-datastore-bom:2.11.2:2.11.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.102.2:0.102.3-SNAPSHOT
-datastore-v1-proto-client:2.11.2:2.11.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.11.2:2.11.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.11.2:2.11.3-SNAPSHOT
+google-cloud-datastore:2.11.3:2.11.3
+google-cloud-datastore-bom:2.11.3:2.11.3
+proto-google-cloud-datastore-v1:0.102.3:0.102.3
+datastore-v1-proto-client:2.11.3:2.11.3
+proto-google-cloud-datastore-admin-v1:2.11.3:2.11.3
+grpc-google-cloud-datastore-admin-v1:2.11.3:2.11.3

From 5ad15d77dc2d0bb7a48e13424a7198341f43ff47 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:34:22 +0000
Subject: [PATCH 0934/1784] chore(main): release 2.11.4-SNAPSHOT (#831)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 55a31edbfae0..c7576e1ed9e7 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.11.3
+  2.11.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3
+    2.11.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 19f92126cf51..e0acdfda8c59 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.11.3
+  2.11.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.3
+        2.11.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.3
+        2.11.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.3
+        0.102.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.3
+        2.11.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c671d2ff73e0..42eaa95e4282 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.3
+  2.11.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3
+    2.11.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index a1f21a4507da..aa1b25bb880f 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.11.3
+  2.11.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3
+    2.11.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index caa8edff6c5f..c2773e2f2d08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.3
+  2.11.4-SNAPSHOT
   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.11.3
+        2.11.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.3
+        2.11.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.3
+        2.11.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.3
+        0.102.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.3
+        2.11.4-SNAPSHOT
         
           
             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 21efe3bf6f3a..e47e54eb12aa 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.11.3
+  2.11.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3
+    2.11.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e5e3751bc3da..b2ae36a9117d 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.102.3
+  0.102.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.3
+    2.11.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index dd49c6a7baa2..520239ea597c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.3:2.11.3
-google-cloud-datastore-bom:2.11.3:2.11.3
-proto-google-cloud-datastore-v1:0.102.3:0.102.3
-datastore-v1-proto-client:2.11.3:2.11.3
-proto-google-cloud-datastore-admin-v1:2.11.3:2.11.3
-grpc-google-cloud-datastore-admin-v1:2.11.3:2.11.3
+google-cloud-datastore:2.11.3:2.11.4-SNAPSHOT
+google-cloud-datastore-bom:2.11.3:2.11.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.102.3:0.102.4-SNAPSHOT
+datastore-v1-proto-client:2.11.3:2.11.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.11.3:2.11.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.11.3:2.11.4-SNAPSHOT

From 4463f89567613ac2aa3f0fd572e973b45b6b9e97 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 22 Sep 2022 18:00:36 +0200
Subject: [PATCH 0935/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.14 (#833)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.13` -> `0.9.14` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/compatibility-slim/0.9.13)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/confidence-slim/0.9.13)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a9a48717e203..dca077844193 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.11.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.11.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.3"
 ```
 
 ## Authentication
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 19ace1d84694..6379d9910d18 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.13
+          0.9.14
           test
         
       

From 91c487399411ab71090f4f1210f75bdf46f8c173 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 22 Sep 2022 18:06:21 +0200
Subject: [PATCH 0936/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.11.3 (#832)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.11.2` -> `2.11.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.3/compatibility-slim/2.11.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.3/confidence-slim/2.11.2)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 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 dca077844193..73ec12b31f5d 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.11.2
+  2.11.3
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d424fd55721e..139f1173dfc3 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.11.2
+      2.11.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2be2ffd3e712..22f5dddd17ce 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.11.2
+      2.11.3
     
 
     

From 6e6b6094acc860036b864680bc8a625e6e4113e8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 22 Sep 2022 19:18:23 +0200
Subject: [PATCH 0937/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.14 (#834)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.13` -> `0.9.14` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/compatibility-slim/0.9.13)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/confidence-slim/0.9.13)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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 6379d9910d18..07a9283e4da4 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.13
+            0.9.14
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 7b718f87e05a6dfd4246910d0837e25b8af15804 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 17:38:20 +0000
Subject: [PATCH 0938/1784] chore(main): release 2.11.4 (#835)

:robot: I have created a release *beep* *boop*
---


## [2.11.4](https://github.com/googleapis/java-datastore/compare/v2.11.3...v2.11.4) (2022-09-22)


### Dependencies

* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.14 ([#833](https://github.com/googleapis/java-datastore/issues/833)) ([4463f89](https://github.com/googleapis/java-datastore/commit/4463f89567613ac2aa3f0fd572e973b45b6b9e97))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.14 ([#834](https://github.com/googleapis/java-datastore/issues/834)) ([6e6b609](https://github.com/googleapis/java-datastore/commit/6e6b6094acc860036b864680bc8a625e6e4113e8))

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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, 35 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f04dfbbe839..33c611ccd38c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.11.4](https://github.com/googleapis/java-datastore/compare/v2.11.3...v2.11.4) (2022-09-22)
+
+
+### Dependencies
+
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.14 ([#833](https://github.com/googleapis/java-datastore/issues/833)) ([4463f89](https://github.com/googleapis/java-datastore/commit/4463f89567613ac2aa3f0fd572e973b45b6b9e97))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.14 ([#834](https://github.com/googleapis/java-datastore/issues/834)) ([6e6b609](https://github.com/googleapis/java-datastore/commit/6e6b6094acc860036b864680bc8a625e6e4113e8))
+
 ## [2.11.3](https://github.com/googleapis/java-datastore/compare/v2.11.2...v2.11.3) (2022-09-21)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index c7576e1ed9e7..903cdd4f5f91 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.11.4-SNAPSHOT
+  2.11.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4-SNAPSHOT
+    2.11.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e0acdfda8c59..714e77d8c578 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.11.4-SNAPSHOT
+  2.11.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.4-SNAPSHOT
+        2.11.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.4-SNAPSHOT
+        2.11.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.4-SNAPSHOT
+        0.102.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.4-SNAPSHOT
+        2.11.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 42eaa95e4282..e187db12329f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.4-SNAPSHOT
+  2.11.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4-SNAPSHOT
+    2.11.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index aa1b25bb880f..385172589a39 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.11.4-SNAPSHOT
+  2.11.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4-SNAPSHOT
+    2.11.4
   
   
     
diff --git a/pom.xml b/pom.xml
index c2773e2f2d08..a8e4a43b83e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.4-SNAPSHOT
+  2.11.4
   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.11.4-SNAPSHOT
+        2.11.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.4-SNAPSHOT
+        2.11.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.4-SNAPSHOT
+        2.11.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.4-SNAPSHOT
+        0.102.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.4-SNAPSHOT
+        2.11.4
         
           
             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 e47e54eb12aa..5256e5f95627 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.11.4-SNAPSHOT
+  2.11.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4-SNAPSHOT
+    2.11.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b2ae36a9117d..771e05ed6f33 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.102.4-SNAPSHOT
+  0.102.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4-SNAPSHOT
+    2.11.4
   
   
     
diff --git a/versions.txt b/versions.txt
index 520239ea597c..8cc307de184b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.3:2.11.4-SNAPSHOT
-google-cloud-datastore-bom:2.11.3:2.11.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.102.3:0.102.4-SNAPSHOT
-datastore-v1-proto-client:2.11.3:2.11.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.11.3:2.11.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.11.3:2.11.4-SNAPSHOT
+google-cloud-datastore:2.11.4:2.11.4
+google-cloud-datastore-bom:2.11.4:2.11.4
+proto-google-cloud-datastore-v1:0.102.4:0.102.4
+datastore-v1-proto-client:2.11.4:2.11.4
+proto-google-cloud-datastore-admin-v1:2.11.4:2.11.4
+grpc-google-cloud-datastore-admin-v1:2.11.4:2.11.4

From 283d04e14684e3021e05930a7fbed8bd88f176d8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 18:02:15 +0000
Subject: [PATCH 0939/1784] chore(main): release 2.11.5-SNAPSHOT (#836)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 903cdd4f5f91..1d7be0791a7b 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.11.4
+  2.11.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4
+    2.11.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 714e77d8c578..2bd31e8fff60 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.11.4
+  2.11.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.4
+        2.11.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.4
+        2.11.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.4
+        0.102.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.4
+        2.11.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e187db12329f..879025ef5fb8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.4
+  2.11.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4
+    2.11.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 385172589a39..76dd5fc3d1f0 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.11.4
+  2.11.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4
+    2.11.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index a8e4a43b83e1..0e83cfbc6603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.4
+  2.11.5-SNAPSHOT
   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.11.4
+        2.11.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.4
+        2.11.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.4
+        2.11.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.4
+        0.102.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.4
+        2.11.5-SNAPSHOT
         
           
             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 5256e5f95627..7ade7904d0c1 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.11.4
+  2.11.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4
+    2.11.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 771e05ed6f33..8d3a577dde17 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.102.4
+  0.102.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.4
+    2.11.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 8cc307de184b..ff3a5f2d463b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.4:2.11.4
-google-cloud-datastore-bom:2.11.4:2.11.4
-proto-google-cloud-datastore-v1:0.102.4:0.102.4
-datastore-v1-proto-client:2.11.4:2.11.4
-proto-google-cloud-datastore-admin-v1:2.11.4:2.11.4
-grpc-google-cloud-datastore-admin-v1:2.11.4:2.11.4
+google-cloud-datastore:2.11.4:2.11.5-SNAPSHOT
+google-cloud-datastore-bom:2.11.4:2.11.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.102.4:0.102.5-SNAPSHOT
+datastore-v1-proto-client:2.11.4:2.11.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.11.4:2.11.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.11.4:2.11.5-SNAPSHOT

From 033affe49070065c958525df42adb99351a2177b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 23 Sep 2022 16:48:19 +0200
Subject: [PATCH 0940/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.11.4 (#837)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.11.3` -> `2.11.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.4/compatibility-slim/2.11.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.4/confidence-slim/2.11.3)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 73ec12b31f5d..65642fcfb2db 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.11.3
+  2.11.4
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.11.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.11.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.4"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 139f1173dfc3..0cfeca427c3a 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.11.3
+      2.11.4
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 22f5dddd17ce..05064b415ecf 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.11.3
+      2.11.4
     
 
     

From 8408882ec9031ef954981ad8ed9e7b8f0ca7549a Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 22:08:32 +0000
Subject: [PATCH 0941/1784] chore: pin versions of dependencies for
 compatibility with Python 3.6 (#1588) (#840)

* chore: pin versions of dependencies for compatibility with Python 3.6

* fix path of requirements file in synthtool
Source-Link: https://github.com/googleapis/synthtool/commit/69cdb47824170d0b02bf694649ce66613c889040
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6566dc8226f20993af18e5a4e7a2b1ba85a292b02dedb6a1634cf10e1b418fa5
---
 .github/.OwlBot.lock.yaml            |   2 +-
 .kokoro/release/publish_javadoc.sh   |   2 +-
 .kokoro/release/publish_javadoc11.sh |   2 +-
 .kokoro/release/stage.sh             |   3 +-
 .kokoro/requirements.in              |  31 ++
 .kokoro/requirements.txt             | 452 +++++++++++++++++++++++++++
 6 files changed, 488 insertions(+), 4 deletions(-)
 create mode 100644 .kokoro/requirements.in
 create mode 100644 .kokoro/requirements.txt

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 6259292301cb..791e842d2f88 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93
+  digest: sha256:6566dc8226f20993af18e5a4e7a2b1ba85a292b02dedb6a1634cf10e1b418fa5
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 89872968a4ec..62dfe548061e 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -28,7 +28,7 @@ fi
 pushd $(dirname "$0")/../../
 
 # install docuploader package
-python3 -m pip install gcp-docuploader
+python3 -m pip install --require-hashes -r .kokoro/requirements.txt
 
 # compile all packages
 mvn clean install -B -q -DskipTests=true
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 3f49b4ea0b11..04b076b91098 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -28,7 +28,7 @@ fi
 pushd $(dirname "$0")/../../
 
 # install docuploader package
-python3 -m pip install gcp-docuploader
+python3 -m pip install --require-hashes -r .kokoro/requirements.txt
 
 # compile all packages
 mvn clean install -B -q -DskipTests=true
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 1dba8de10857..61e714d6ba56 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -16,7 +16,8 @@
 set -eo pipefail
 
 # Start the releasetool reporter
-python3 -m pip install gcp-releasetool
+requirementsFile=$(realpath $(dirname "${BASH_SOURCE[0]}")/../requirements.txt)
+python3 -m pip install --require-hashes -r $requirementsFile
 python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
 
 source $(dirname "$0")/common.sh
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
new file mode 100644
index 000000000000..cfdc2e7ed955
--- /dev/null
+++ b/.kokoro/requirements.in
@@ -0,0 +1,31 @@
+gcp-docuploader==0.6.3
+google-crc32c==1.3.0
+googleapis-common-protos==1.56.3
+gcp-releasetool==1.8.7
+cachetools==4.2.4
+cffi==1.15.1
+jeepney==0.7.1
+jinja2==3.0.3
+markupsafe==2.0.1
+keyring==23.4.1
+packaging==21.3
+protobuf==3.19.5
+pyjwt==2.4.0
+pyparsing==3.0.9
+pycparser==2.21
+pyperclip==1.8.2
+python-dateutil==2.8.2
+requests==2.27.1
+importlib-metadata==4.8.3
+zipp==3.6.0
+google_api_core==2.8.2
+google-cloud-storage==2.0.0
+google-cloud-core==2.3.1
+typing-extensions==4.1.1
+urllib3==1.26.12
+zipp==3.6.0
+rsa==4.9
+six==1.16.0
+attrs==22.1.0
+google-auth==2.11.0
+idna==3.4
\ No newline at end of file
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
new file mode 100644
index 000000000000..170f1c63abb7
--- /dev/null
+++ b/.kokoro/requirements.txt
@@ -0,0 +1,452 @@
+#
+# This file is autogenerated by pip-compile with python 3.10
+# To update, run:
+#
+#    pip-compile --allow-unsafe --generate-hashes requirements.in
+#
+attrs==22.1.0 \
+    --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
+    --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+cachetools==4.2.4 \
+    --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \
+    --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1
+    # via
+    #   -r requirements.in
+    #   google-auth
+certifi==2022.9.14 \
+    --hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \
+    --hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516
+    # via requests
+cffi==1.15.1 \
+    --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
+    --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \
+    --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \
+    --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \
+    --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \
+    --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \
+    --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \
+    --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \
+    --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \
+    --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \
+    --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \
+    --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \
+    --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \
+    --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \
+    --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \
+    --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \
+    --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \
+    --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \
+    --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \
+    --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \
+    --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \
+    --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \
+    --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \
+    --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \
+    --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \
+    --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \
+    --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \
+    --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \
+    --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \
+    --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \
+    --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \
+    --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \
+    --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \
+    --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \
+    --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \
+    --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \
+    --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \
+    --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \
+    --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \
+    --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \
+    --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \
+    --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \
+    --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \
+    --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \
+    --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \
+    --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \
+    --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \
+    --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \
+    --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \
+    --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \
+    --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \
+    --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \
+    --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \
+    --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \
+    --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \
+    --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \
+    --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \
+    --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \
+    --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \
+    --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \
+    --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \
+    --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \
+    --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \
+    --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0
+    # via
+    #   -r requirements.in
+    #   cryptography
+charset-normalizer==2.0.12 \
+    --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \
+    --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df
+    # via requests
+click==8.0.4 \
+    --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \
+    --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb
+    # via
+    #   gcp-docuploader
+    #   gcp-releasetool
+colorlog==6.7.0 \
+    --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
+    --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
+    # via gcp-docuploader
+cryptography==38.0.1 \
+    --hash=sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a \
+    --hash=sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f \
+    --hash=sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0 \
+    --hash=sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 \
+    --hash=sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7 \
+    --hash=sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6 \
+    --hash=sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153 \
+    --hash=sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750 \
+    --hash=sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad \
+    --hash=sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6 \
+    --hash=sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b \
+    --hash=sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5 \
+    --hash=sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a \
+    --hash=sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d \
+    --hash=sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d \
+    --hash=sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294 \
+    --hash=sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0 \
+    --hash=sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a \
+    --hash=sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac \
+    --hash=sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61 \
+    --hash=sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013 \
+    --hash=sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e \
+    --hash=sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb \
+    --hash=sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9 \
+    --hash=sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd \
+    --hash=sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818
+    # via
+    #   gcp-releasetool
+    #   secretstorage
+gcp-docuploader==0.6.3 \
+    --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \
+    --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b
+    # via -r requirements.in
+gcp-releasetool==1.8.7 \
+    --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \
+    --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d
+    # via -r requirements.in
+google-api-core==2.8.2 \
+    --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
+    --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50
+    # via
+    #   -r requirements.in
+    #   google-cloud-core
+    #   google-cloud-storage
+google-auth==2.11.0 \
+    --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \
+    --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+    #   google-api-core
+    #   google-cloud-core
+    #   google-cloud-storage
+google-cloud-core==2.3.1 \
+    --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \
+    --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53
+    # via
+    #   -r requirements.in
+    #   google-cloud-storage
+google-cloud-storage==2.0.0 \
+    --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \
+    --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7
+    # via
+    #   -r requirements.in
+    #   gcp-docuploader
+google-crc32c==1.3.0 \
+    --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \
+    --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \
+    --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \
+    --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \
+    --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \
+    --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \
+    --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \
+    --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \
+    --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \
+    --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \
+    --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \
+    --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \
+    --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \
+    --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \
+    --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \
+    --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \
+    --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \
+    --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \
+    --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \
+    --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \
+    --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \
+    --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \
+    --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \
+    --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \
+    --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \
+    --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \
+    --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \
+    --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \
+    --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \
+    --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \
+    --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \
+    --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \
+    --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \
+    --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \
+    --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \
+    --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \
+    --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \
+    --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \
+    --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \
+    --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \
+    --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \
+    --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \
+    --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3
+    # via
+    #   -r requirements.in
+    #   google-resumable-media
+google-resumable-media==2.3.3 \
+    --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \
+    --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5
+    # via google-cloud-storage
+googleapis-common-protos==1.56.3 \
+    --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \
+    --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461
+    # via
+    #   -r requirements.in
+    #   google-api-core
+idna==3.4 \
+    --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
+    --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
+    # via
+    #   -r requirements.in
+    #   requests
+importlib-metadata==4.8.3 \
+    --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \
+    --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668
+    # via
+    #   -r requirements.in
+    #   keyring
+jeepney==0.7.1 \
+    --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \
+    --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f
+    # via
+    #   -r requirements.in
+    #   keyring
+    #   secretstorage
+jinja2==3.0.3 \
+    --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \
+    --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+keyring==23.4.1 \
+    --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \
+    --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+markupsafe==2.0.1 \
+    --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \
+    --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \
+    --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \
+    --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \
+    --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \
+    --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \
+    --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \
+    --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \
+    --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \
+    --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \
+    --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \
+    --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \
+    --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \
+    --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \
+    --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \
+    --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \
+    --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \
+    --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \
+    --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \
+    --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \
+    --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \
+    --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \
+    --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \
+    --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \
+    --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \
+    --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \
+    --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \
+    --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \
+    --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \
+    --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \
+    --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \
+    --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \
+    --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \
+    --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \
+    --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \
+    --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \
+    --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \
+    --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \
+    --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \
+    --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \
+    --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \
+    --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \
+    --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \
+    --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \
+    --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \
+    --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \
+    --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \
+    --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \
+    --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \
+    --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \
+    --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \
+    --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \
+    --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \
+    --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \
+    --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \
+    --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \
+    --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \
+    --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \
+    --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \
+    --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \
+    --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \
+    --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \
+    --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \
+    --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \
+    --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \
+    --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \
+    --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \
+    --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \
+    --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872
+    # via
+    #   -r requirements.in
+    #   jinja2
+packaging==21.3 \
+    --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
+    --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+protobuf==3.19.5 \
+    --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \
+    --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \
+    --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \
+    --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \
+    --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \
+    --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \
+    --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \
+    --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \
+    --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \
+    --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \
+    --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \
+    --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \
+    --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \
+    --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \
+    --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \
+    --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \
+    --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \
+    --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \
+    --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \
+    --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \
+    --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \
+    --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \
+    --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \
+    --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \
+    --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \
+    --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de
+    # via
+    #   -r requirements.in
+    #   gcp-docuploader
+    #   gcp-releasetool
+    #   google-api-core
+    #   google-cloud-storage
+    #   googleapis-common-protos
+pyasn1==0.4.8 \
+    --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \
+    --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
+    # via
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.2.8 \
+    --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \
+    --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74
+    # via google-auth
+pycparser==2.21 \
+    --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
+    --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
+    # via
+    #   -r requirements.in
+    #   cffi
+pyjwt==2.4.0 \
+    --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \
+    --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+pyparsing==3.0.9 \
+    --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \
+    --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc
+    # via
+    #   -r requirements.in
+    #   packaging
+pyperclip==1.8.2 \
+    --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+python-dateutil==2.8.2 \
+    --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
+    --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+requests==2.27.1 \
+    --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
+    --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
+    # via
+    #   -r requirements.in
+    #   gcp-releasetool
+    #   google-api-core
+    #   google-cloud-storage
+rsa==4.9 \
+    --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \
+    --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21
+    # via
+    #   -r requirements.in
+    #   google-auth
+secretstorage==3.3.3 \
+    --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \
+    --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99
+    # via keyring
+six==1.16.0 \
+    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
+    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
+    # via
+    #   -r requirements.in
+    #   gcp-docuploader
+    #   google-auth
+    #   python-dateutil
+typing-extensions==4.1.1 \
+    --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \
+    --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2
+    # via -r requirements.in
+urllib3==1.26.12 \
+    --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \
+    --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997
+    # via
+    #   -r requirements.in
+    #   requests
+zipp==3.6.0 \
+    --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \
+    --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc
+    # via
+    #   -r requirements.in
+    #   importlib-metadata

From e4edcd1e4c3079ab579d15c7b47e110fb99b6674 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:00:21 +0200
Subject: [PATCH 0942/1784] deps: update dependency pyjwt to v2.5.0 (#846)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [pyjwt](https://togithub.com/jpadilla/pyjwt) | `==2.4.0` -> `==2.5.0` | [![age](https://badges.renovateapi.com/packages/pypi/pyjwt/2.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/pyjwt/2.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/pyjwt/2.5.0/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/pyjwt/2.5.0/confidence-slim/2.4.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 8d64f16e20fa8c3e15d48fb44657b412bb55bdc1 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:00:30 +0200
Subject: [PATCH 0943/1784] deps: update dependency markupsafe to v2.1.1 (#844)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [markupsafe](https://palletsprojects.com/p/markupsafe/) ([changelog](https://markupsafe.palletsprojects.com/changes/)) | `==2.0.1` -> `==2.1.1` | [![age](https://badges.renovateapi.com/packages/pypi/markupsafe/2.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/markupsafe/2.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/markupsafe/2.1.1/compatibility-slim/2.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/markupsafe/2.1.1/confidence-slim/2.0.1)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 10b4e449ebdf238ad882842ca75ef5477a0d0292 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:00:38 +0200
Subject: [PATCH 0944/1784] deps: update dependency gcp-releasetool to v1.8.8
 (#843)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| gcp-releasetool | `==1.8.7` -> `==1.8.8` | [![age](https://badges.renovateapi.com/packages/pypi/gcp-releasetool/1.8.8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/gcp-releasetool/1.8.8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/gcp-releasetool/1.8.8/compatibility-slim/1.8.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/gcp-releasetool/1.8.8/confidence-slim/1.8.7)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 7b46721d8db483348decb27818de67feb19851c5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:10:29 +0200
Subject: [PATCH 0945/1784] deps: update dependency protobuf to v3.20.2 (#845)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [protobuf](https://developers.google.com/protocol-buffers/) | `==3.19.5` -> `==3.20.2` | [![age](https://badges.renovateapi.com/packages/pypi/protobuf/3.20.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/protobuf/3.20.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/protobuf/3.20.2/compatibility-slim/3.19.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/protobuf/3.20.2/confidence-slim/3.19.5)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 18db3030ad51ae0db6465717ee432460b67f696a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:10:33 +0200
Subject: [PATCH 0946/1784] deps: update dependency zipp to v3.8.1 (#849)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [zipp](https://togithub.com/jaraco/zipp) | `==3.6.0` -> `==3.8.1` | [![age](https://badges.renovateapi.com/packages/pypi/zipp/3.8.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/zipp/3.8.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/zipp/3.8.1/compatibility-slim/3.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/zipp/3.8.1/confidence-slim/3.6.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 1631a67d037f1b1e09a6653a4867d51a6412f6bb Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:12:38 +0200
Subject: [PATCH 0947/1784] deps: update dependency certifi to v2022.9.24
 (#842)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [certifi](https://togithub.com/certifi/python-certifi) | `==2022.9.14` -> `==2022.9.24` | [![age](https://badges.renovateapi.com/packages/pypi/certifi/2022.9.24/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/certifi/2022.9.24/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/certifi/2022.9.24/compatibility-slim/2022.9.14)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/certifi/2022.9.24/confidence-slim/2022.9.14)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 219787455d34a2667587f9577368c36811c0c58b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:18:14 +0200
Subject: [PATCH 0948/1784] deps: update dependency typing-extensions to v4.3.0
 (#848)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [typing-extensions](https://togithub.com/python/typing_extensions) ([changelog](https://togithub.com/python/typing_extensions/blob/main/CHANGELOG.md)) | `==4.1.1` -> `==4.3.0` | [![age](https://badges.renovateapi.com/packages/pypi/typing-extensions/4.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/typing-extensions/4.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/typing-extensions/4.3.0/compatibility-slim/4.1.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/typing-extensions/4.3.0/confidence-slim/4.1.1)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 08ca8e5af44a4b2b1cfae8996b2f7edfe7109204 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 27 Sep 2022 17:30:27 +0200
Subject: [PATCH 0949/1784] deps: update dependency requests to v2.28.1 (#847)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [requests](https://requests.readthedocs.io) ([source](https://togithub.com/psf/requests), [changelog](https://togithub.com/psf/requests/blob/master/HISTORY.md)) | `==2.27.1` -> `==2.28.1` | [![age](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/compatibility-slim/2.27.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/confidence-slim/2.27.1)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From d24cae20c2c69327b8f097cc56fcb48b5f61c358 Mon Sep 17 00:00:00 2001
From: Nathan Herring <1058384+Capstan@users.noreply.github.com>
Date: Tue, 27 Sep 2022 11:28:48 -0700
Subject: [PATCH 0950/1784] deps: Convert from `JacksonFactory` to
 `GsonFactory` (#780)

---
 datastore-v1-proto-client/pom.xml                             | 2 +-
 .../java/com/google/datastore/v1/client/DatastoreHelper.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 1d7be0791a7b..2df32989cdd2 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -50,7 +50,7 @@
 
     
       com.google.http-client
-      google-http-client-jackson2
+      google-http-client-gson
     
 
     
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 da10978cd380..23ac315b5895 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
@@ -22,7 +22,7 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.datastore.v1.ArrayValue;
 import com.google.datastore.v1.CompositeFilter;
 import com.google.datastore.v1.Entity;
@@ -138,7 +138,7 @@ private static HttpTransport newTransport() throws GeneralSecurityException, IOE
   }
 
   static JsonFactory newJsonFactory() {
-    return new JacksonFactory();
+    return new GsonFactory();
   }
 
   /**

From 14aad838b7edd572ca1df6f67cc1988722c3dee5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:38:24 +0200
Subject: [PATCH 0951/1784] deps: update dependency google-cloud-core to v2.3.2
 (#852)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [google-cloud-core](https://togithub.com/googleapis/python-cloud-core) | `==2.3.1` -> `==2.3.2` | [![age](https://badges.renovateapi.com/packages/pypi/google-cloud-core/2.3.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-cloud-core/2.3.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-cloud-core/2.3.2/compatibility-slim/2.3.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-cloud-core/2.3.2/confidence-slim/2.3.1)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From dd58916e895c6b9e5449a562a53ddca0c33cf530 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:38:29 +0200
Subject: [PATCH 0952/1784] deps: update dependency google-crc32c to v1.5.0
 (#859)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [google-crc32c](https://togithub.com/googleapis/python-crc32c) | `==1.3.0` -> `==1.5.0` | [![age](https://badges.renovateapi.com/packages/pypi/google-crc32c/1.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-crc32c/1.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-crc32c/1.5.0/compatibility-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-crc32c/1.5.0/confidence-slim/1.3.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 620e5f2ebc33a14ebf106bdc8e3731e1ce1bd449 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:40:18 +0200
Subject: [PATCH 0953/1784] deps: update dependency keyring to v23.9.3 (#862)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [keyring](https://togithub.com/jaraco/keyring) | `==23.4.1` -> `==23.9.3` | [![age](https://badges.renovateapi.com/packages/pypi/keyring/23.9.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/keyring/23.9.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/keyring/23.9.3/compatibility-slim/23.4.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/keyring/23.9.3/confidence-slim/23.4.1)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 17f47bcb368887291c41ac863743c46feae3c2cf Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:46:32 +0200
Subject: [PATCH 0954/1784] deps: update dependency google-cloud-storage to
 v2.5.0 (#858)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [google-cloud-storage](https://togithub.com/googleapis/python-storage) | `==2.0.0` -> `==2.5.0` | [![age](https://badges.renovateapi.com/packages/pypi/google-cloud-storage/2.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-cloud-storage/2.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-cloud-storage/2.5.0/compatibility-slim/2.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-cloud-storage/2.5.0/confidence-slim/2.0.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 9fc4af50bc7f69d080a29d4e772026f990e02fe8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:46:36 +0200
Subject: [PATCH 0955/1784] deps: update dependency jinja2 to v3.1.2 (#861)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [jinja2](https://palletsprojects.com/p/jinja/) ([changelog](https://jinja.palletsprojects.com/changes/)) | `==3.0.3` -> `==3.1.2` | [![age](https://badges.renovateapi.com/packages/pypi/jinja2/3.1.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/jinja2/3.1.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/jinja2/3.1.2/compatibility-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/jinja2/3.1.2/confidence-slim/3.0.3)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 0bf85e9355dff9321bd84038c1bad249b5a92531 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:48:14 +0200
Subject: [PATCH 0956/1784] deps: update dependency protobuf to v4 (#864)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [protobuf](https://developers.google.com/protocol-buffers/) | `==3.19.5` -> `==4.21.6` | [![age](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/compatibility-slim/3.19.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/confidence-slim/3.19.5)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 5935e6e871724965f05817a6739369e40b59809b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:50:37 +0200
Subject: [PATCH 0957/1784] deps: update dependency click to v8.1.3 (#855)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [click](https://palletsprojects.com/p/click/) ([changelog](https://click.palletsprojects.com/changes/)) | `==8.0.4` -> `==8.1.3` | [![age](https://badges.renovateapi.com/packages/pypi/click/8.1.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/click/8.1.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/click/8.1.3/compatibility-slim/8.0.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/click/8.1.3/confidence-slim/8.0.4)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 874166e9d2bff6c61f280494fc6b82845e66257b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:56:27 +0200
Subject: [PATCH 0958/1784] deps: update dependency google-api-core to v2.10.1
 (#856)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [google-api-core](https://togithub.com/googleapis/python-api-core) | `==2.8.2` -> `==2.10.1` | [![age](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.1/compatibility-slim/2.8.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.1/confidence-slim/2.8.2)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From d832df63ebbc259a9d86818d6dfdcbfe29dd27ce Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:56:38 +0200
Subject: [PATCH 0959/1784] deps: update dependency google-auth to v2.12.0
 (#857)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [google-auth](https://togithub.com/googleapis/google-auth-library-python) | `==2.11.0` -> `==2.12.0` | [![age](https://badges.renovateapi.com/packages/pypi/google-auth/2.12.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-auth/2.12.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-auth/2.12.0/compatibility-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-auth/2.12.0/confidence-slim/2.11.0)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 881408421e7c9cea5712e9c7c315ab4671c15d49 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:58:18 +0200
Subject: [PATCH 0960/1784] deps: update dependency charset-normalizer to
 v2.1.1 (#854)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [charset-normalizer](https://togithub.com/ousret/charset_normalizer) | `==2.0.12` -> `==2.1.1` | [![age](https://badges.renovateapi.com/packages/pypi/charset-normalizer/2.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/charset-normalizer/2.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/charset-normalizer/2.1.1/compatibility-slim/2.0.12)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/charset-normalizer/2.1.1/confidence-slim/2.0.12)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 74320c18bc9ad95fd366a1be5fc2d95105944833 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 16:58:22 +0200
Subject: [PATCH 0961/1784] deps: update dependency cachetools to v5 (#863)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [cachetools](https://togithub.com/tkem/cachetools) | `==4.2.4` -> `==5.2.0` | [![age](https://badges.renovateapi.com/packages/pypi/cachetools/5.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/cachetools/5.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/cachetools/5.2.0/compatibility-slim/4.2.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/cachetools/5.2.0/confidence-slim/4.2.4)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 416e157a51caaa11b21b0d43ac94a2bd76e4de14 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 17:14:37 +0200
Subject: [PATCH 0962/1784] deps: update dependency googleapis-common-protos to
 v1.56.4 (#853)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [googleapis-common-protos](https://togithub.com/googleapis/python-api-common-protos) | `==1.56.3` -> `==1.56.4` | [![age](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.56.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.56.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.56.4/compatibility-slim/1.56.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.56.4/confidence-slim/1.56.3)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From 0a15a3fc5294b5e8d7b0b86fcd6f65739eb700ca Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 28 Sep 2022 17:20:17 +0200
Subject: [PATCH 0963/1784] deps: update dependency importlib-metadata to
 v4.12.0 (#860)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [importlib-metadata](https://togithub.com/python/importlib_metadata) | `==4.8.3` -> `==4.12.0` | [![age](https://badges.renovateapi.com/packages/pypi/importlib-metadata/4.12.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/importlib-metadata/4.12.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/importlib-metadata/4.12.0/compatibility-slim/4.8.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/importlib-metadata/4.12.0/confidence-slim/4.8.3)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **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. ⚠ **Warning**: custom changes will be lost.

---

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).


From ea73051f34750de5183817be9e688721455990a6 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 13:44:48 -0400
Subject: [PATCH 0964/1784] chore: exclude requirements.txt file from
 renovate-bot (#1594) (#841)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: exclude requirements.txt file from renovate-bot (#1594)

Source-Link: https://github.com/googleapis/synthtool/commit/f58d3135a2fab20e225d98741dbc06d57459b816
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix sha

* 🦉 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 
Co-authored-by: Kristen O'Leary 
---
 .github/.OwlBot.lock.yaml | 2 +-
 renovate.json             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 791e842d2f88..42327db5e2e3 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:6566dc8226f20993af18e5a4e7a2b1ba85a292b02dedb6a1634cf10e1b418fa5
+  digest: sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3
diff --git a/renovate.json b/renovate.json
index 2f6e8a062004..f72fe4775f54 100644
--- a/renovate.json
+++ b/renovate.json
@@ -10,6 +10,7 @@
     ":maintainLockFilesDisabled",
     ":autodetectPinVersions"
   ],
+  "ignorePaths": [".kokoro/requirements.txt"],
   "packageRules": [
     {
       "packagePatterns": [

From af1d1eb3bc3dbbb6637ad6bc686ed9fc7c5b9bd5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 3 Oct 2022 15:44:17 +0200
Subject: [PATCH 0965/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.0.4 (#866)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `3.0.3` -> `3.0.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/compatibility-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/confidence-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v3.0.4`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​304-httpsgithubcomgoogleapisjava-shared-dependenciescomparev303v304-2022-10-03)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.3...v3.0.4)

##### Dependencies

-   Update dependency cachetools to v5 ([#​816](https://togithub.com/googleapis/java-shared-dependencies/issues/816)) ([3f6c408](https://togithub.com/googleapis/java-shared-dependencies/commit/3f6c408210c931c286235f61c7aadea5bf5cfe4d))
-   Update dependency certifi to v2022.9.24 ([#​818](https://togithub.com/googleapis/java-shared-dependencies/issues/818)) ([5f04b97](https://togithub.com/googleapis/java-shared-dependencies/commit/5f04b97c2343146600e8c9ee65afdeb58f5743a6))
-   Update dependency charset-normalizer to v2.1.1 ([#​822](https://togithub.com/googleapis/java-shared-dependencies/issues/822)) ([6997c5a](https://togithub.com/googleapis/java-shared-dependencies/commit/6997c5acad937ebe3594330de73261a424d42cf3))
-   Update dependency click to v8.1.3 ([#​823](https://togithub.com/googleapis/java-shared-dependencies/issues/823)) ([42bf9f8](https://togithub.com/googleapis/java-shared-dependencies/commit/42bf9f834fdafea60f2be7ccbf7d363e058cd7c2))
-   Update dependency com.google.protobuf:protobuf-bom to v3.21.7 ([#​837](https://togithub.com/googleapis/java-shared-dependencies/issues/837)) ([d31e507](https://togithub.com/googleapis/java-shared-dependencies/commit/d31e5077c7e036de5e238e9a611df7ced527574a))
-   Update dependency gcp-releasetool to v1.8.8 ([#​819](https://togithub.com/googleapis/java-shared-dependencies/issues/819)) ([8245d97](https://togithub.com/googleapis/java-shared-dependencies/commit/8245d975fb12e81454ec7664f9a7c9809bbac697))
-   Update dependency gcp-releasetool to v1.8.9 ([#​846](https://togithub.com/googleapis/java-shared-dependencies/issues/846)) ([04e3283](https://togithub.com/googleapis/java-shared-dependencies/commit/04e32831c6e87c372444901013a747d2d02ce38d))
-   Update dependency google-api-core to v2.10.1 ([#​824](https://togithub.com/googleapis/java-shared-dependencies/issues/824)) ([818b9aa](https://togithub.com/googleapis/java-shared-dependencies/commit/818b9aa2ac99d8b1f9b39a74b626122aed5f1d94))
-   Update dependency google-auth to v2.12.0 ([#​825](https://togithub.com/googleapis/java-shared-dependencies/issues/825)) ([07c544b](https://togithub.com/googleapis/java-shared-dependencies/commit/07c544b5e0fa9f7110bbc957570f7a405962072e))
-   Update dependency google-cloud-core to v2.3.2 ([#​820](https://togithub.com/googleapis/java-shared-dependencies/issues/820)) ([2a219e8](https://togithub.com/googleapis/java-shared-dependencies/commit/2a219e86f187ba5ad72f2570bd58ca6100128c43))
-   Update dependency google-cloud-storage to v2.5.0 ([#​826](https://togithub.com/googleapis/java-shared-dependencies/issues/826)) ([bb10d18](https://togithub.com/googleapis/java-shared-dependencies/commit/bb10d1858a515f09d365362ffa0110a5b362c96b))
-   Update dependency google-crc32c to v1.5.0 ([#​827](https://togithub.com/googleapis/java-shared-dependencies/issues/827)) ([7e5dae6](https://togithub.com/googleapis/java-shared-dependencies/commit/7e5dae60d667cb84b9ee4f6c977bdc35e79e4cf6))
-   Update dependency google-resumable-media to v2.4.0 ([#​838](https://togithub.com/googleapis/java-shared-dependencies/issues/838)) ([ad82d63](https://togithub.com/googleapis/java-shared-dependencies/commit/ad82d6378f64039da383509638fb4782908eb4bc))
-   Update dependency googleapis-common-protos to v1.56.4 ([#​821](https://togithub.com/googleapis/java-shared-dependencies/issues/821)) ([93d7745](https://togithub.com/googleapis/java-shared-dependencies/commit/93d77458c9bbf84ec367cdb4caaa41e6f71675c6))
-   Update dependency importlib-metadata to v4.12.0 ([#​832](https://togithub.com/googleapis/java-shared-dependencies/issues/832)) ([ee19fb1](https://togithub.com/googleapis/java-shared-dependencies/commit/ee19fb1ca5a2a2e1985297e3b72d44de68bc72e3))
-   Update dependency importlib-metadata to v4.13.0 ([#​843](https://togithub.com/googleapis/java-shared-dependencies/issues/843)) ([d2ede60](https://togithub.com/googleapis/java-shared-dependencies/commit/d2ede601eee8c875780c7eb5924623537480c509))
-   Update dependency importlib-metadata to v5 ([#​845](https://togithub.com/googleapis/java-shared-dependencies/issues/845)) ([03ac7e8](https://togithub.com/googleapis/java-shared-dependencies/commit/03ac7e800274c5f58d2bc4ddd0561bfcdea1bb27))
-   Update dependency io.grpc:grpc-bom to v1.49.1 ([#​802](https://togithub.com/googleapis/java-shared-dependencies/issues/802)) ([b8c54bf](https://togithub.com/googleapis/java-shared-dependencies/commit/b8c54bf8f1ddecc788cee151f8afe42de45bdc9d))
-   Update dependency io.grpc:grpc-bom to v1.49.2 ([#​842](https://togithub.com/googleapis/java-shared-dependencies/issues/842)) ([1b1cfa2](https://togithub.com/googleapis/java-shared-dependencies/commit/1b1cfa27d05f7732da12721305cf41dcbebda232))
-   Update dependency jeepney to v0.8.0 ([#​833](https://togithub.com/googleapis/java-shared-dependencies/issues/833)) ([15d2f9f](https://togithub.com/googleapis/java-shared-dependencies/commit/15d2f9f52b5a3259db0813df3d2424e256ccb372))
-   Update dependency jinja2 to v3.1.2 ([#​834](https://togithub.com/googleapis/java-shared-dependencies/issues/834)) ([c188f95](https://togithub.com/googleapis/java-shared-dependencies/commit/c188f95acdb3349f1c4b3ed56e5fffb75e8fbc8d))
-   Update dependency keyring to v23.9.3 ([#​828](https://togithub.com/googleapis/java-shared-dependencies/issues/828)) ([b185aaa](https://togithub.com/googleapis/java-shared-dependencies/commit/b185aaae716d4d97cb64f0426cac0e778f11223d))
-   Update dependency markupsafe to v2.1.1 ([#​829](https://togithub.com/googleapis/java-shared-dependencies/issues/829)) ([add2825](https://togithub.com/googleapis/java-shared-dependencies/commit/add2825bd34cd80f529dbe0dadb3c84219177916))
-   Update dependency org.threeten:threetenbp to v1.6.2 ([#​808](https://togithub.com/googleapis/java-shared-dependencies/issues/808)) ([2d2eabd](https://togithub.com/googleapis/java-shared-dependencies/commit/2d2eabd14d8150207885ea47280c0f7ff3d2962f))
-   Update dependency protobuf to v3.20.2 ([#​830](https://togithub.com/googleapis/java-shared-dependencies/issues/830)) ([5afa76f](https://togithub.com/googleapis/java-shared-dependencies/commit/5afa76f9ef4705aecba49abc7bb93982fb1ecf3e))
-   Update dependency protobuf to v3.20.3 ([#​839](https://togithub.com/googleapis/java-shared-dependencies/issues/839)) ([d9fc7dd](https://togithub.com/googleapis/java-shared-dependencies/commit/d9fc7ddd3e663458e6ea3f78a3c6241377df0319))
-   Update dependency protobuf to v4 ([#​817](https://togithub.com/googleapis/java-shared-dependencies/issues/817)) ([ee8d154](https://togithub.com/googleapis/java-shared-dependencies/commit/ee8d154287ccd256b4dcfa48f28f5ec61a91fe3e))
-   Update dependency pyjwt to v2.5.0 ([#​812](https://togithub.com/googleapis/java-shared-dependencies/issues/812)) ([4d4528e](https://togithub.com/googleapis/java-shared-dependencies/commit/4d4528e8ce269d49b99d2dbc4fcda2dc37a058cb))
-   Update dependency requests to v2.28.1 ([#​813](https://togithub.com/googleapis/java-shared-dependencies/issues/813)) ([a3a8d89](https://togithub.com/googleapis/java-shared-dependencies/commit/a3a8d89b0117007a7108553c70aa82dd289e1691))
-   Update dependency typing-extensions to v4.3.0 ([#​814](https://togithub.com/googleapis/java-shared-dependencies/issues/814)) ([da875e5](https://togithub.com/googleapis/java-shared-dependencies/commit/da875e5e91fa9d8c177e6c3afc9e34242eb914b7))
-   Update dependency zipp to v3.8.1 ([#​815](https://togithub.com/googleapis/java-shared-dependencies/issues/815)) ([15585fd](https://togithub.com/googleapis/java-shared-dependencies/commit/15585fd0216013fe93be011f93f391f6269aa777))
-   Update gax.version to v2.19.2 ([#​847](https://togithub.com/googleapis/java-shared-dependencies/issues/847)) ([c4afe1f](https://togithub.com/googleapis/java-shared-dependencies/commit/c4afe1fdc88af29ab039cea618d52c15c90e43e9))
-   Update google.common-protos.version to v2.9.3 ([#​803](https://togithub.com/googleapis/java-shared-dependencies/issues/803)) ([a3e8e5e](https://togithub.com/googleapis/java-shared-dependencies/commit/a3e8e5eb53a8da14abf3b8d81a4f34fbb2f3b8f9))
-   Update google.common-protos.version to v2.9.5 ([#​831](https://togithub.com/googleapis/java-shared-dependencies/issues/831)) ([1c901db](https://togithub.com/googleapis/java-shared-dependencies/commit/1c901db8a7740afaec3e809e51d4d369fbf469c4))
-   Update google.common-protos.version to v2.9.6 ([#​844](https://togithub.com/googleapis/java-shared-dependencies/issues/844)) ([9e156be](https://togithub.com/googleapis/java-shared-dependencies/commit/9e156be59bd89959f04252c3045b8cd7a8be8070))
-   Update google.core.version to v2.8.13 ([#​804](https://togithub.com/googleapis/java-shared-dependencies/issues/804)) ([45ae571](https://togithub.com/googleapis/java-shared-dependencies/commit/45ae57142bd6d5334eedd46243736b200a459795))
-   Update google.core.version to v2.8.14 ([#​805](https://togithub.com/googleapis/java-shared-dependencies/issues/805)) ([02c9397](https://togithub.com/googleapis/java-shared-dependencies/commit/02c9397a84bf3fcca8d04e4c9867cc47689abde2))
-   Update google.core.version to v2.8.15 ([#​807](https://togithub.com/googleapis/java-shared-dependencies/issues/807)) ([980856c](https://togithub.com/googleapis/java-shared-dependencies/commit/980856c43981992a3d08f69eac83aeada752d244))
-   Update google.core.version to v2.8.16 ([#​810](https://togithub.com/googleapis/java-shared-dependencies/issues/810)) ([c2b2c9a](https://togithub.com/googleapis/java-shared-dependencies/commit/c2b2c9a327fd588f69524bb93a17e5d4ae8f5a42))
-   Update google.core.version to v2.8.17 ([#​835](https://togithub.com/googleapis/java-shared-dependencies/issues/835)) ([3def21d](https://togithub.com/googleapis/java-shared-dependencies/commit/3def21df2e4253e3df0da064b6c4e472df079d2b))
-   Update google.core.version to v2.8.18 ([#​840](https://togithub.com/googleapis/java-shared-dependencies/issues/840)) ([46566dc](https://togithub.com/googleapis/java-shared-dependencies/commit/46566dc18c4b1ed41c482b4ce21b92651e2f9dc5))
-   Update google.core.version to v2.8.19 ([#​841](https://togithub.com/googleapis/java-shared-dependencies/issues/841)) ([99afde9](https://togithub.com/googleapis/java-shared-dependencies/commit/99afde97ea498f549eb75cc58c4ed88edf81b20d))
-   Update google.core.version to v2.8.20 ([#​848](https://togithub.com/googleapis/java-shared-dependencies/issues/848)) ([c980c4f](https://togithub.com/googleapis/java-shared-dependencies/commit/c980c4fdfc8890d812b4881ba5b87bfd21269a5f))
-   Update iam.version to v1.6.1 ([#​806](https://togithub.com/googleapis/java-shared-dependencies/issues/806)) ([a50158d](https://togithub.com/googleapis/java-shared-dependencies/commit/a50158d3b83cf8e02d8ee08c94e512b5669a927b))
-   Update iam.version to v1.6.2 ([#​849](https://togithub.com/googleapis/java-shared-dependencies/issues/849)) ([e43ac96](https://togithub.com/googleapis/java-shared-dependencies/commit/e43ac96bc189a096a9311c9b03e85c86bea07e99))


    

---

### 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 0e83cfbc6603..85ada822dbb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.0.3
+        3.0.4
         pom
         import
       

From a178ba25220aad2b5c92bdebd1cc22e16511462c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 19:52:24 +0000
Subject: [PATCH 0966/1784] chore(bazel): update protobuf to v3.21.7 (#865)

- [ ] Regenerate this pull request now.
BEGIN_COMMIT_OVERRIDE
chore(generated): add datastore aggregation query APIs
END_COMMIT_OVERRIDE
PiperOrigin-RevId: 477955264

Source-Link: https://togithub.com/googleapis/googleapis/commit/a724450af76d0001f23602684c49cd6a4b3a5654

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/4abcbcaec855e74a0b22a4988cf9e0eb61a83094
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGFiY2JjYWVjODU1ZTc0YTBiMjJhNDk4OGNmOWUwZWI2MWE4MzA5NCJ9

feat: add datastore aggregation query APIs

PiperOrigin-RevId: 477890345

Source-Link: https://togithub.com/googleapis/googleapis/commit/82bf6749a84d54a098092ae3a0ec135475b18c31

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/5fb8115161ea14a5c551885c681c3627c2f66630
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWZiODExNTE2MWVhMTRhNWM1NTE4ODVjNjgxYzM2MjdjMmY2NjYzMCJ9
---
 .../datastore/admin/v1/CommonMetadata.java    |  192 +-
 .../admin/v1/CreateIndexRequest.java          |  134 +-
 .../DatastoreFirestoreMigrationMetadata.java  |  127 +-
 .../admin/v1/DeleteIndexRequest.java          |  125 +-
 .../datastore/admin/v1/EntityFilter.java      |  140 +-
 .../admin/v1/ExportEntitiesMetadata.java      |  202 +-
 .../admin/v1/ExportEntitiesRequest.java       |  173 +-
 .../admin/v1/ExportEntitiesResponse.java      |  113 +-
 .../datastore/admin/v1/GetIndexRequest.java   |  125 +-
 .../admin/v1/ImportEntitiesMetadata.java      |  202 +-
 .../admin/v1/ImportEntitiesRequest.java       |  173 +-
 .../com/google/datastore/admin/v1/Index.java  |  327 +-
 .../admin/v1/IndexOperationMetadata.java      |  158 +-
 .../admin/v1/ListIndexesRequest.java          |  149 +-
 .../admin/v1/ListIndexesResponse.java         |  146 +-
 .../admin/v1/MigrationProgressEvent.java      |  414 +-
 .../admin/v1/MigrationStateEvent.java         |  113 +-
 .../google/datastore/admin/v1/Progress.java   |  121 +-
 .../google/datastore/v1/AggregationQuery.java | 3592 +++++++++++++++++
 .../v1/AggregationQueryOrBuilder.java         |  134 +
 .../datastore/v1/AggregationResult.java       |  822 ++++
 .../datastore/v1/AggregationResultBatch.java  | 1403 +++++++
 .../v1/AggregationResultBatchOrBuilder.java   |  150 +
 .../v1/AggregationResultOrBuilder.java        |   99 +
 .../datastore/v1/AggregationResultProto.java  |  111 +
 .../datastore/v1/AllocateIdsRequest.java      |  155 +-
 .../datastore/v1/AllocateIdsResponse.java     |  129 +-
 .../com/google/datastore/v1/ArrayValue.java   |  130 +-
 .../datastore/v1/BeginTransactionRequest.java |  148 +-
 .../v1/BeginTransactionResponse.java          |  110 +-
 .../google/datastore/v1/CommitRequest.java    |  181 +-
 .../google/datastore/v1/CommitResponse.java   |  165 +-
 .../google/datastore/v1/CompositeFilter.java  |  143 +-
 .../google/datastore/v1/DatastoreProto.java   |  302 +-
 .../java/com/google/datastore/v1/Entity.java  |  148 +-
 .../com/google/datastore/v1/EntityResult.java |  163 +-
 .../java/com/google/datastore/v1/Filter.java  |  149 +-
 .../com/google/datastore/v1/GqlQuery.java     |  189 +-
 .../datastore/v1/GqlQueryParameter.java       |  135 +-
 .../java/com/google/datastore/v1/Key.java     |  293 +-
 .../google/datastore/v1/KindExpression.java   |  112 +-
 .../google/datastore/v1/LookupRequest.java    |  177 +-
 .../google/datastore/v1/LookupResponse.java   |  213 +-
 .../com/google/datastore/v1/Mutation.java     |  232 +-
 .../google/datastore/v1/MutationResult.java   |  162 +-
 .../com/google/datastore/v1/PartitionId.java  |  138 +-
 .../com/google/datastore/v1/Projection.java   |  121 +-
 .../google/datastore/v1/PropertyFilter.java   |  154 +-
 .../google/datastore/v1/PropertyOrder.java    |  134 +-
 .../datastore/v1/PropertyReference.java       |  112 +-
 .../java/com/google/datastore/v1/Query.java   |  300 +-
 .../com/google/datastore/v1/QueryProto.java   |  182 +-
 .../google/datastore/v1/QueryResultBatch.java |  223 +-
 .../com/google/datastore/v1/ReadOptions.java  |  149 +-
 .../datastore/v1/ReserveIdsRequest.java       |  155 +-
 .../datastore/v1/ReserveIdsResponse.java      |   99 +-
 .../google/datastore/v1/RollbackRequest.java  |  136 +-
 .../google/datastore/v1/RollbackResponse.java |   99 +-
 .../v1/RunAggregationQueryRequest.java        | 2048 ++++++++++
 .../RunAggregationQueryRequestOrBuilder.java  |  230 ++
 .../v1/RunAggregationQueryResponse.java       |  969 +++++
 .../RunAggregationQueryResponseOrBuilder.java |   95 +
 .../google/datastore/v1/RunQueryRequest.java  |  217 +-
 .../google/datastore/v1/RunQueryResponse.java |  141 +-
 .../datastore/v1/TransactionOptions.java      |  387 +-
 .../java/com/google/datastore/v1/Value.java   |  316 +-
 .../datastore/v1/aggregation_result.proto     |   61 +
 .../proto/google/datastore/v1/datastore.proto |   48 +
 .../proto/google/datastore/v1/query.proto     |   87 +
 69 files changed, 13784 insertions(+), 5698 deletions(-)
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto

diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index f673a574dd9b..213d7ac3ac37 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -53,103 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private CommonMetadata(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (startTime_ != null) {
-                subBuilder = startTime_.toBuilder();
-              }
-              startTime_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(startTime_);
-                startTime_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 18:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (endTime_ != null) {
-                subBuilder = endTime_.toBuilder();
-              }
-              endTime_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(endTime_);
-                endTime_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 24:
-            {
-              int rawValue = input.readEnum();
-
-              operationType_ = rawValue;
-              break;
-            }
-          case 34:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                labels_ =
-                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry labels__ =
-                  input.readMessage(
-                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
-              break;
-            }
-          case 40:
-            {
-              int rawValue = input.readEnum();
-
-              state_ = rawValue;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_CommonMetadata_descriptor;
@@ -747,7 +650,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.datastore.admin.v1.CommonMetadata.State.STATE_UNSPECIFIED.getNumber()) {
       output.writeEnum(5, state_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -780,7 +683,7 @@ public int getSerializedSize() {
         != com.google.datastore.admin.v1.CommonMetadata.State.STATE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, state_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -807,7 +710,7 @@ public boolean equals(final java.lang.Object obj) {
     if (operationType_ != other.operationType_) return false;
     if (!internalGetLabels().equals(other.internalGetLabels())) return false;
     if (state_ != other.state_) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -834,7 +737,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + STATE_FIELD_NUMBER;
     hash = (53 * hash) + state_;
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -983,17 +886,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.admin.v1.CommonMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1120,7 +1016,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.CommonMetadata other) {
       if (other.state_ != 0) {
         setStateValue(other.getStateValue());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -1135,17 +1031,66 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.CommonMetadata parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            case 24:
+              {
+                operationType_ = input.readEnum();
+
+                break;
+              } // case 24
+            case 34:
+              {
+                com.google.protobuf.MapEntry labels__ =
+                    input.readMessage(
+                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                internalGetMutableLabels()
+                    .getMutableMap()
+                    .put(labels__.getKey(), labels__.getValue());
+                break;
+              } // case 34
+            case 40:
+              {
+                state_ = input.readEnum();
+
+                break;
+              } // case 40
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.CommonMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1895,7 +1840,18 @@ public CommonMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CommonMetadata(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 9d73ec24d248..e8d4a3e2915b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -53,68 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private CreateIndexRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 26:
-            {
-              com.google.datastore.admin.v1.Index.Builder subBuilder = null;
-              if (index_ != null) {
-                subBuilder = index_.toBuilder();
-              }
-              index_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Index.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(index_);
-                index_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor;
@@ -248,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (index_ != null) {
       output.writeMessage(3, getIndex());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -263,7 +201,7 @@ public int getSerializedSize() {
     if (index_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getIndex());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -284,7 +222,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasIndex()) {
       if (!getIndex().equals(other.getIndex())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -301,7 +239,7 @@ public int hashCode() {
       hash = (37 * hash) + INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getIndex().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -431,17 +369,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.CreateIndexRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -545,7 +476,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.CreateIndexRequest other)
       if (other.hasIndex()) {
         mergeIndex(other.getIndex());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -560,17 +491,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.CreateIndexRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 26:
+              {
+                input.readMessage(getIndexFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.CreateIndexRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -902,7 +859,18 @@ public CreateIndexRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CreateIndexRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index 9520019141bb..cdba4426d70d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -60,59 +60,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private DatastoreFirestoreMigrationMetadata(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
-
-              migrationState_ = rawValue;
-              break;
-            }
-          case 16:
-            {
-              int rawValue = input.readEnum();
-
-              migrationStep_ = rawValue;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor;
@@ -226,7 +173,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, migrationStep_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -243,7 +190,7 @@ public int getSerializedSize() {
         != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, migrationStep_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -261,7 +208,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (migrationState_ != other.migrationState_) return false;
     if (migrationStep_ != other.migrationStep_) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -276,7 +223,7 @@ public int hashCode() {
     hash = (53 * hash) + migrationState_;
     hash = (37 * hash) + MIGRATION_STEP_FIELD_NUMBER;
     hash = (53 * hash) + migrationStep_;
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -413,17 +360,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     // Construct using
     // com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -521,7 +461,7 @@ public Builder mergeFrom(
       if (other.migrationStep_ != 0) {
         setMigrationStepValue(other.getMigrationStepValue());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -536,19 +476,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                migrationState_ = input.readEnum();
+
+                break;
+              } // case 8
+            case 16:
+              {
+                migrationStep_ = input.readEnum();
+
+                break;
+              } // case 16
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
-                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -778,7 +742,18 @@ public DatastoreFirestoreMigrationMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new DatastoreFirestoreMigrationMetadata(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 50e88951982a..e619b5f68af4 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
@@ -54,59 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private DeleteIndexRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              indexId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor;
@@ -240,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -255,7 +202,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -273,7 +220,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getProjectId().equals(other.getProjectId())) return false;
     if (!getIndexId().equals(other.getIndexId())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -288,7 +235,7 @@ public int hashCode() {
     hash = (53 * hash) + getProjectId().hashCode();
     hash = (37 * hash) + INDEX_ID_FIELD_NUMBER;
     hash = (53 * hash) + getIndexId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -418,17 +365,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.DeleteIndexRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -525,7 +465,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.DeleteIndexRequest other)
         indexId_ = other.indexId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -540,17 +480,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.DeleteIndexRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 26:
+              {
+                indexId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.DeleteIndexRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -798,7 +764,18 @@ public DeleteIndexRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new DeleteIndexRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 d714b68b0d15..d4a5e39affe4 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
@@ -66,72 +66,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private EntityFilter(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                kinds_ = new com.google.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              kinds_.add(s);
-              break;
-            }
-          case 18:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                namespaceIds_ = new com.google.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              namespaceIds_.add(s);
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        kinds_ = kinds_.getUnmodifiableView();
-      }
-      if (((mutable_bitField0_ & 0x00000002) != 0)) {
-        namespaceIds_ = namespaceIds_.getUnmodifiableView();
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_EntityFilter_descriptor;
@@ -309,7 +243,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < namespaceIds_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, namespaceIds_.getRaw(i));
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -334,7 +268,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getNamespaceIdsList().size();
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -352,7 +286,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getKindsList().equals(other.getKindsList())) return false;
     if (!getNamespaceIdsList().equals(other.getNamespaceIdsList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -371,7 +305,7 @@ public int hashCode() {
       hash = (37 * hash) + NAMESPACE_IDS_FIELD_NUMBER;
       hash = (53 * hash) + getNamespaceIdsList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -513,17 +447,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.EntityFilter.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -640,7 +567,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.EntityFilter other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -655,17 +582,45 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.EntityFilter parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensureKindsIsMutable();
+                kinds_.add(s);
+                break;
+              } // case 10
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensureNamespaceIdsIsMutable();
+                namespaceIds_.add(s);
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.EntityFilter) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1084,7 +1039,18 @@ public EntityFilter parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new EntityFilter(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 265c5dbec758..75d4feb05396 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
@@ -52,116 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ExportEntitiesMetadata(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null;
-              if (common_ != null) {
-                subBuilder = common_.toBuilder();
-              }
-              common_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(common_);
-                common_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
-              if (progressEntities_ != null) {
-                subBuilder = progressEntities_.toBuilder();
-              }
-              progressEntities_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(progressEntities_);
-                progressEntities_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 26:
-            {
-              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
-              if (progressBytes_ != null) {
-                subBuilder = progressBytes_.toBuilder();
-              }
-              progressBytes_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(progressBytes_);
-                progressBytes_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 34:
-            {
-              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
-              if (entityFilter_ != null) {
-                subBuilder = entityFilter_.toBuilder();
-              }
-              entityFilter_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(entityFilter_);
-                entityFilter_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 42:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              outputUrlPrefix_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor;
@@ -455,7 +345,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, outputUrlPrefix_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -479,7 +369,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, outputUrlPrefix_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -512,7 +402,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getEntityFilter().equals(other.getEntityFilter())) return false;
     }
     if (!getOutputUrlPrefix().equals(other.getOutputUrlPrefix())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -541,7 +431,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + OUTPUT_URL_PREFIX_FIELD_NUMBER;
     hash = (53 * hash) + getOutputUrlPrefix().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -670,17 +560,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.ExportEntitiesMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -826,7 +709,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesMetadata ot
         outputUrlPrefix_ = other.outputUrlPrefix_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -841,18 +724,62 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.ExportEntitiesMetadata parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(
+                    getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            case 26:
+              {
+                input.readMessage(getProgressBytesFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 26
+            case 34:
+              {
+                input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 34
+            case 42:
+              {
+                outputUrlPrefix_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 42
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.ExportEntitiesMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1757,7 +1684,18 @@ public ExportEntitiesMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ExportEntitiesMetadata(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 945292d0232d..91a2af6401a2 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
@@ -54,89 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ExportEntitiesRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                labels_ =
-                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry labels__ =
-                  input.readMessage(
-                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
-              break;
-            }
-          case 26:
-            {
-              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
-              if (entityFilter_ != null) {
-                subBuilder = entityFilter_.toBuilder();
-              }
-              entityFilter_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(entityFilter_);
-                entityFilter_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 34:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              outputUrlPrefix_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor;
@@ -460,7 +377,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, outputUrlPrefix_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -488,7 +405,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, outputUrlPrefix_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -511,7 +428,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getEntityFilter().equals(other.getEntityFilter())) return false;
     }
     if (!getOutputUrlPrefix().equals(other.getOutputUrlPrefix())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -534,7 +451,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + OUTPUT_URL_PREFIX_FIELD_NUMBER;
     hash = (53 * hash) + getOutputUrlPrefix().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -684,17 +601,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.admin.v1.ExportEntitiesRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -810,7 +720,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesRequest oth
         outputUrlPrefix_ = other.outputUrlPrefix_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -825,18 +735,60 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.ExportEntitiesRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 18:
+              {
+                com.google.protobuf.MapEntry labels__ =
+                    input.readMessage(
+                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                internalGetMutableLabels()
+                    .getMutableMap()
+                    .put(labels__.getKey(), labels__.getValue());
+                break;
+              } // case 18
+            case 26:
+              {
+                input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 26
+            case 34:
+              {
+                outputUrlPrefix_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 34
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.ExportEntitiesRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1500,7 +1452,18 @@ public ExportEntitiesRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ExportEntitiesRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 23ef5aa68eca..a511b418a430 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
@@ -53,52 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ExportEntitiesResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              outputUrl_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor;
@@ -186,7 +140,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrl_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, outputUrl_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -198,7 +152,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrl_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, outputUrl_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -215,7 +169,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.datastore.admin.v1.ExportEntitiesResponse) obj;
 
     if (!getOutputUrl().equals(other.getOutputUrl())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -228,7 +182,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + OUTPUT_URL_FIELD_NUMBER;
     hash = (53 * hash) + getOutputUrl().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -358,17 +312,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.ExportEntitiesResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -458,7 +405,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesResponse ot
         outputUrl_ = other.outputUrl_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -473,18 +420,37 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.ExportEntitiesResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                outputUrl_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.ExportEntitiesResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -641,7 +607,18 @@ public ExportEntitiesResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ExportEntitiesResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 173eb97eb866..116b9bf41c62 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
@@ -53,59 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private GetIndexRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              indexId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor;
@@ -239,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -254,7 +201,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -272,7 +219,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getProjectId().equals(other.getProjectId())) return false;
     if (!getIndexId().equals(other.getIndexId())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -287,7 +234,7 @@ public int hashCode() {
     hash = (53 * hash) + getProjectId().hashCode();
     hash = (37 * hash) + INDEX_ID_FIELD_NUMBER;
     hash = (53 * hash) + getIndexId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -416,17 +363,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.GetIndexRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -522,7 +462,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.GetIndexRequest other) {
         indexId_ = other.indexId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -537,17 +477,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.GetIndexRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 26:
+              {
+                indexId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.GetIndexRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -795,7 +761,18 @@ public GetIndexRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new GetIndexRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 b1116dde902d..5ac3c9c68d91 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
@@ -52,116 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ImportEntitiesMetadata(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null;
-              if (common_ != null) {
-                subBuilder = common_.toBuilder();
-              }
-              common_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(common_);
-                common_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
-              if (progressEntities_ != null) {
-                subBuilder = progressEntities_.toBuilder();
-              }
-              progressEntities_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(progressEntities_);
-                progressEntities_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 26:
-            {
-              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
-              if (progressBytes_ != null) {
-                subBuilder = progressBytes_.toBuilder();
-              }
-              progressBytes_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(progressBytes_);
-                progressBytes_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 34:
-            {
-              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
-              if (entityFilter_ != null) {
-                subBuilder = entityFilter_.toBuilder();
-              }
-              entityFilter_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(entityFilter_);
-                entityFilter_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 42:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              inputUrl_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor;
@@ -449,7 +339,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, inputUrl_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -473,7 +363,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, inputUrl_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -506,7 +396,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getEntityFilter().equals(other.getEntityFilter())) return false;
     }
     if (!getInputUrl().equals(other.getInputUrl())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -535,7 +425,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + INPUT_URL_FIELD_NUMBER;
     hash = (53 * hash) + getInputUrl().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -664,17 +554,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.ImportEntitiesMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -820,7 +703,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesMetadata ot
         inputUrl_ = other.inputUrl_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -835,18 +718,62 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.ImportEntitiesMetadata parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(
+                    getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            case 26:
+              {
+                input.readMessage(getProgressBytesFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 26
+            case 34:
+              {
+                input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 34
+            case 42:
+              {
+                inputUrl_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 42
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.ImportEntitiesMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1736,7 +1663,18 @@ public ImportEntitiesMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ImportEntitiesMetadata(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 71ef341ac2eb..36151c04c0cd 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
@@ -54,89 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ImportEntitiesRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                labels_ =
-                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry labels__ =
-                  input.readMessage(
-                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
-              break;
-            }
-          case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              inputUrl_ = s;
-              break;
-            }
-          case 34:
-            {
-              com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null;
-              if (entityFilter_ != null) {
-                subBuilder = entityFilter_.toBuilder();
-              }
-              entityFilter_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(entityFilter_);
-                entityFilter_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor;
@@ -463,7 +380,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (entityFilter_ != null) {
       output.writeMessage(4, getEntityFilter());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -491,7 +408,7 @@ public int getSerializedSize() {
     if (entityFilter_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -514,7 +431,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasEntityFilter()) {
       if (!getEntityFilter().equals(other.getEntityFilter())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -537,7 +454,7 @@ public int hashCode() {
       hash = (37 * hash) + ENTITY_FILTER_FIELD_NUMBER;
       hash = (53 * hash) + getEntityFilter().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -687,17 +604,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.admin.v1.ImportEntitiesRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -813,7 +723,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesRequest oth
       if (other.hasEntityFilter()) {
         mergeEntityFilter(other.getEntityFilter());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -828,18 +738,60 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.ImportEntitiesRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 18:
+              {
+                com.google.protobuf.MapEntry labels__ =
+                    input.readMessage(
+                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                internalGetMutableLabels()
+                    .getMutableMap()
+                    .put(labels__.getKey(), labels__.getValue());
+                break;
+              } // case 18
+            case 26:
+              {
+                inputUrl_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 26
+            case 34:
+              {
+                input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 34
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.ImportEntitiesRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1515,7 +1467,18 @@ public ImportEntitiesRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ImportEntitiesRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 74be6fcce616..da7e169f9a28 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
@@ -57,97 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Index(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              indexId_ = s;
-              break;
-            }
-          case 34:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              kind_ = s;
-              break;
-            }
-          case 40:
-            {
-              int rawValue = input.readEnum();
-
-              ancestor_ = rawValue;
-              break;
-            }
-          case 50:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                properties_ =
-                    new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              properties_.add(
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Index.IndexedProperty.parser(),
-                      extensionRegistry));
-              break;
-            }
-          case 56:
-            {
-              int rawValue = input.readEnum();
-
-              state_ = rawValue;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        properties_ = java.util.Collections.unmodifiableList(properties_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.IndexProto
         .internal_static_google_datastore_admin_v1_Index_descriptor;
@@ -803,59 +712,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
-    private IndexedProperty(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-
-                name_ = s;
-                break;
-              }
-            case 16:
-              {
-                int rawValue = input.readEnum();
-
-                direction_ = rawValue;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     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;
@@ -981,7 +837,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
           != com.google.datastore.admin.v1.Index.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
         output.writeEnum(2, direction_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -997,7 +853,7 @@ public int getSerializedSize() {
           != com.google.datastore.admin.v1.Index.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
         size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1015,7 +871,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getName().equals(other.getName())) return false;
       if (direction_ != other.direction_) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1030,7 +886,7 @@ public int hashCode() {
       hash = (53 * hash) + getName().hashCode();
       hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
       hash = (53 * hash) + direction_;
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1162,17 +1018,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.datastore.admin.v1.Index.IndexedProperty.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1270,7 +1119,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index.IndexedProperty oth
         if (other.direction_ != 0) {
           setDirectionValue(other.getDirectionValue());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1285,18 +1134,43 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.datastore.admin.v1.Index.IndexedProperty parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  name_ = input.readStringRequireUtf8();
+
+                  break;
+                } // case 10
+              case 16:
+                {
+                  direction_ = input.readEnum();
+
+                  break;
+                } // case 16
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.datastore.admin.v1.Index.IndexedProperty) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -1540,7 +1414,19 @@ public IndexedProperty parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new IndexedProperty(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -1899,7 +1785,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (state_ != com.google.datastore.admin.v1.Index.State.STATE_UNSPECIFIED.getNumber()) {
       output.writeEnum(7, state_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -1927,7 +1813,7 @@ public int getSerializedSize() {
     if (state_ != com.google.datastore.admin.v1.Index.State.STATE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(7, state_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1948,7 +1834,7 @@ public boolean equals(final java.lang.Object obj) {
     if (ancestor_ != other.ancestor_) return false;
     if (!getPropertiesList().equals(other.getPropertiesList())) return false;
     if (state_ != other.state_) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -1973,7 +1859,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + STATE_FIELD_NUMBER;
     hash = (53 * hash) + state_;
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2101,19 +1987,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.Index.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPropertiesFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -2129,10 +2006,11 @@ public Builder clear() {
 
       if (propertiesBuilder_ == null) {
         properties_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        properties_ = null;
         propertiesBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       state_ = 0;
 
       return this;
@@ -2270,7 +2148,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index other) {
       if (other.state_ != 0) {
         setStateValue(other.getStateValue());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -2285,17 +2163,75 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.Index parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 26:
+              {
+                indexId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 26
+            case 34:
+              {
+                kind_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 34
+            case 40:
+              {
+                ancestor_ = input.readEnum();
+
+                break;
+              } // case 40
+            case 50:
+              {
+                com.google.datastore.admin.v1.Index.IndexedProperty m =
+                    input.readMessage(
+                        com.google.datastore.admin.v1.Index.IndexedProperty.parser(),
+                        extensionRegistry);
+                if (propertiesBuilder_ == null) {
+                  ensurePropertiesIsMutable();
+                  properties_.add(m);
+                } else {
+                  propertiesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 50
+            case 56:
+              {
+                state_ = input.readEnum();
+
+                break;
+              } // case 56
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.Index) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -3249,7 +3185,18 @@ public Index parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Index(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 d365164205e9..57d04e97ac73 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
@@ -52,84 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private IndexOperationMetadata(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null;
-              if (common_ != null) {
-                subBuilder = common_.toBuilder();
-              }
-              common_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(common_);
-                common_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.admin.v1.Progress.Builder subBuilder = null;
-              if (progressEntities_ != null) {
-                subBuilder = progressEntities_.toBuilder();
-              }
-              progressEntities_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Progress.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(progressEntities_);
-                progressEntities_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              indexId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor;
@@ -313,7 +235,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -331,7 +253,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -356,7 +278,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getProgressEntities().equals(other.getProgressEntities())) return false;
     }
     if (!getIndexId().equals(other.getIndexId())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -377,7 +299,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + INDEX_ID_FIELD_NUMBER;
     hash = (53 * hash) + getIndexId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -506,17 +428,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.IndexOperationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -634,7 +549,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.IndexOperationMetadata ot
         indexId_ = other.indexId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -649,18 +564,50 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.IndexOperationMetadata parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(
+                    getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            case 26:
+              {
+                indexId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.IndexOperationMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1173,7 +1120,18 @@ public IndexOperationMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new IndexOperationMetadata(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 b10fa04b472e..39cc4d909980 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
@@ -55,71 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ListIndexesRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              filter_ = s;
-              break;
-            }
-          case 32:
-            {
-              pageSize_ = input.readInt32();
-              break;
-            }
-          case 42:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              pageToken_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor;
@@ -315,7 +250,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, pageToken_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -336,7 +271,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, pageToken_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -356,7 +291,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getFilter().equals(other.getFilter())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -375,7 +310,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -505,17 +440,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.ListIndexesRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -625,7 +553,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesRequest other)
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -640,17 +568,55 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.ListIndexesRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 26:
+              {
+                filter_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 26
+            case 32:
+              {
+                pageSize_ = input.readInt32();
+
+                break;
+              } // case 32
+            case 42:
+              {
+                pageToken_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 42
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.ListIndexesRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1029,7 +995,18 @@ public ListIndexesRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ListIndexesRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 02cacc41019b..e565bc21874c 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
@@ -54,67 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ListIndexesResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                indexes_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              indexes_.add(
-                  input.readMessage(
-                      com.google.datastore.admin.v1.Index.parser(), extensionRegistry));
-              break;
-            }
-          case 18:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              nextPageToken_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        indexes_ = java.util.Collections.unmodifiableList(indexes_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor;
@@ -268,7 +207,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -283,7 +222,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -301,7 +240,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getIndexesList().equals(other.getIndexesList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -318,7 +257,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -448,19 +387,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.ListIndexesResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getIndexesFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -468,10 +398,11 @@ public Builder clear() {
       super.clear();
       if (indexesBuilder_ == null) {
         indexes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        indexes_ = null;
         indexesBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -593,7 +524,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesResponse other
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -608,18 +539,50 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.ListIndexesResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.datastore.admin.v1.Index m =
+                    input.readMessage(
+                        com.google.datastore.admin.v1.Index.parser(), extensionRegistry);
+                if (indexesBuilder_ == null) {
+                  ensureIndexesIsMutable();
+                  indexes_.add(m);
+                } else {
+                  indexesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            case 18:
+              {
+                nextPageToken_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.ListIndexesResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1111,7 +1074,18 @@ public ListIndexesResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ListIndexesResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 d2c8bb86ebc6..1bca6fdec524 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
@@ -54,101 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private MigrationProgressEvent(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
-
-              step_ = rawValue;
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder
-                  subBuilder = null;
-              if (stepDetailsCase_ == 2) {
-                subBuilder =
-                    ((com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
-                            stepDetails_)
-                        .toBuilder();
-              }
-              stepDetails_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
-                          .parser(),
-                      extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(
-                    (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
-                        stepDetails_);
-                stepDetails_ = subBuilder.buildPartial();
-              }
-              stepDetailsCase_ = 2;
-              break;
-            }
-          case 26:
-            {
-              com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder
-                  subBuilder = null;
-              if (stepDetailsCase_ == 3) {
-                subBuilder =
-                    ((com.google.datastore.admin.v1.MigrationProgressEvent
-                                .RedirectWritesStepDetails)
-                            stepDetails_)
-                        .toBuilder();
-              }
-              stepDetails_ =
-                  input.readMessage(
-                      com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
-                          .parser(),
-                      extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(
-                    (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
-                        stepDetails_);
-                stepDetails_ = subBuilder.buildPartial();
-              }
-              stepDetailsCase_ = 3;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.MigrationProto
         .internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor;
@@ -415,52 +320,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
-    private PrepareStepDetails(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                int rawValue = input.readEnum();
-
-                concurrencyMode_ = rawValue;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     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;
@@ -541,7 +400,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
               .getNumber()) {
         output.writeEnum(1, concurrencyMode_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -556,7 +415,7 @@ public int getSerializedSize() {
               .getNumber()) {
         size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, concurrencyMode_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -574,7 +433,7 @@ public boolean equals(final java.lang.Object obj) {
           (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) obj;
 
       if (concurrencyMode_ != other.concurrencyMode_) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -587,7 +446,7 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + CONCURRENCY_MODE_FIELD_NUMBER;
       hash = (53 * hash) + concurrencyMode_;
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -722,17 +581,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -831,7 +683,7 @@ public Builder mergeFrom(
         if (other.concurrencyMode_ != 0) {
           setConcurrencyModeValue(other.getConcurrencyModeValue());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -846,20 +698,37 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parsedMessage =
-            null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8:
+                {
+                  concurrencyMode_ = input.readEnum();
+
+                  break;
+                } // case 8
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -1010,7 +879,19 @@ public PrepareStepDetails parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new PrepareStepDetails(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -1097,52 +978,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
-    private RedirectWritesStepDetails(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                int rawValue = input.readEnum();
-
-                concurrencyMode_ = rawValue;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     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;
@@ -1221,7 +1056,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
               .getNumber()) {
         output.writeEnum(1, concurrencyMode_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1236,7 +1071,7 @@ public int getSerializedSize() {
               .getNumber()) {
         size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, concurrencyMode_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1255,7 +1090,7 @@ public boolean equals(final java.lang.Object obj) {
           (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) obj;
 
       if (concurrencyMode_ != other.concurrencyMode_) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1268,7 +1103,7 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + CONCURRENCY_MODE_FIELD_NUMBER;
       hash = (53 * hash) + concurrencyMode_;
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1410,17 +1245,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1523,7 +1351,7 @@ public Builder mergeFrom(
         if (other.concurrencyMode_ != 0) {
           setConcurrencyModeValue(other.getConcurrencyModeValue());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1538,20 +1366,37 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8:
+                {
+                  concurrencyMode_ = input.readEnum();
+
+                  break;
+                } // case 8
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -1698,7 +1543,19 @@ public RedirectWritesStepDetails parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new RedirectWritesStepDetails(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -1958,7 +1815,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
           (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
               stepDetails_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -1985,7 +1842,7 @@ public int getSerializedSize() {
               (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
                   stepDetails_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2014,7 +1871,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -2039,7 +1896,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2170,17 +2027,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.MigrationProgressEvent.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -2188,6 +2038,12 @@ public Builder clear() {
       super.clear();
       step_ = 0;
 
+      if (prepareStepDetailsBuilder_ != null) {
+        prepareStepDetailsBuilder_.clear();
+      }
+      if (redirectWritesStepDetailsBuilder_ != null) {
+        redirectWritesStepDetailsBuilder_.clear();
+      }
       stepDetailsCase_ = 0;
       stepDetails_ = null;
       return this;
@@ -2302,7 +2158,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.MigrationProgressEvent ot
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -2317,18 +2173,51 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.MigrationProgressEvent parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                step_ = input.readEnum();
+
+                break;
+              } // case 8
+            case 18:
+              {
+                input.readMessage(
+                    getPrepareStepDetailsFieldBuilder().getBuilder(), extensionRegistry);
+                stepDetailsCase_ = 2;
+                break;
+              } // case 18
+            case 26:
+              {
+                input.readMessage(
+                    getRedirectWritesStepDetailsFieldBuilder().getBuilder(), extensionRegistry);
+                stepDetailsCase_ = 3;
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.MigrationProgressEvent) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2973,7 +2862,18 @@ public MigrationProgressEvent parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MigrationProgressEvent(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 95e77a6fd72d..af520c92223d 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
@@ -54,52 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private MigrationStateEvent(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
-
-              state_ = rawValue;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.MigrationProto
         .internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor;
@@ -169,7 +123,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, state_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -182,7 +136,7 @@ public int getSerializedSize() {
         != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, state_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -199,7 +153,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.datastore.admin.v1.MigrationStateEvent) obj;
 
     if (state_ != other.state_) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -212,7 +166,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + STATE_FIELD_NUMBER;
     hash = (53 * hash) + state_;
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -343,17 +297,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.MigrationStateEvent.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -442,7 +389,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.MigrationStateEvent other
       if (other.state_ != 0) {
         setStateValue(other.getStateValue());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -457,18 +404,37 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.MigrationStateEvent parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                state_ = input.readEnum();
+
+                break;
+              } // case 8
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage =
-            (com.google.datastore.admin.v1.MigrationStateEvent) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -595,7 +561,18 @@ public MigrationStateEvent parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MigrationStateEvent(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 2eeb86c5fbc9..05e298a58460 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
@@ -50,55 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Progress(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8:
-            {
-              workCompleted_ = input.readInt64();
-              break;
-            }
-          case 16:
-            {
-              workEstimated_ = input.readInt64();
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.admin.v1.DatastoreAdminProto
         .internal_static_google_datastore_admin_v1_Progress_descriptor;
@@ -172,7 +123,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (workEstimated_ != 0L) {
       output.writeInt64(2, workEstimated_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -187,7 +138,7 @@ public int getSerializedSize() {
     if (workEstimated_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, workEstimated_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -204,7 +155,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (getWorkCompleted() != other.getWorkCompleted()) return false;
     if (getWorkEstimated() != other.getWorkEstimated()) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -219,7 +170,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getWorkCompleted());
     hash = (37 * hash) + WORK_ESTIMATED_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getWorkEstimated());
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -348,17 +299,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.Progress.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -452,7 +396,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Progress other) {
       if (other.getWorkEstimated() != 0L) {
         setWorkEstimated(other.getWorkEstimated());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -467,17 +411,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.admin.v1.Progress parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                workCompleted_ = input.readInt64();
+
+                break;
+              } // case 8
+            case 16:
+              {
+                workEstimated_ = input.readInt64();
+
+                break;
+              } // case 16
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.admin.v1.Progress) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -623,7 +593,18 @@ public Progress parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Progress(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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
new file mode 100644
index 000000000000..56ba0a35f15e
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
@@ -0,0 +1,3592 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query.proto
+
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.AggregationQuery}
+ */
+public final class AggregationQuery extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery)
+    AggregationQueryOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use AggregationQuery.newBuilder() to construct.
+  private AggregationQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private AggregationQuery() {
+    aggregations_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  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;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_AggregationQuery_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.AggregationQuery.class,
+            com.google.datastore.v1.AggregationQuery.Builder.class);
+  }
+
+  public interface AggregationOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery.Aggregation)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     *
+     * @return Whether the count field is set.
+     */
+    boolean hasCount();
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     *
+     * @return The count.
+     */
+    com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount();
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     */
+    com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCountOrBuilder();
+
+    /**
+     *
+     *
+     * 
    +     * 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,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The alias.
+     */
+    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,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The bytes for alias.
+     */
+    com.google.protobuf.ByteString getAliasBytes();
+
+    public com.google.datastore.v1.AggregationQuery.Aggregation.OperatorCase getOperatorCase();
+  }
+  /**
+   *
+   *
+   * 
    +   * Defines a aggregation that produces a single result.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
+   */
+  public static final class Aggregation extends com.google.protobuf.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation)
+      AggregationOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use Aggregation.newBuilder() to construct.
+    private Aggregation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private Aggregation() {
+      alias_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    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;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.AggregationQuery.Aggregation.class,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Builder.class);
+    }
+
+    public interface CountOrBuilder
+        extends
+        // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery.Aggregation.Count)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       *
+       *
+       * 
    +       * 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.
+       * 
    
+       *
+       * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+       * 
+       *
+       * @return Whether the upTo field is set.
+       */
+      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.
+       * 
    
+       *
+       * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+       * 
+       *
+       * @return The upTo.
+       */
+      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.
+       * 
    
+       *
+       * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+       * 
+       */
+      com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Count of entities that match the query.
+     * The `COUNT(*)` aggregation function operates on the entire entity
+     * so it does not require a field reference.
+     * 
    
+     *
+     * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Count}
+     */
+    public static final class Count extends com.google.protobuf.GeneratedMessageV3
+        implements
+        // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Count)
+        CountOrBuilder {
+      private static final long serialVersionUID = 0L;
+      // Use Count.newBuilder() to construct.
+      private Count(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+        super(builder);
+      }
+
+      private Count() {}
+
+      @java.lang.Override
+      @SuppressWarnings({"unused"})
+      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;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.v1.AggregationQuery.Aggregation.Count.class,
+                com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder.class);
+      }
+
+      public static final int UP_TO_FIELD_NUMBER = 1;
+      private com.google.protobuf.Int64Value upTo_;
+      /**
+       *
+       *
+       * 
    +       * 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.
+       * 
    
+       *
+       * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+       * 
+       *
+       * @return Whether the upTo field is set.
+       */
+      @java.lang.Override
+      public boolean hasUpTo() {
+        return upTo_ != null;
+      }
+      /**
+       *
+       *
+       * 
    +       * 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.
+       * 
    
+       *
+       * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+       * 
+       *
+       * @return The upTo.
+       */
+      @java.lang.Override
+      public com.google.protobuf.Int64Value getUpTo() {
+        return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_;
+      }
+      /**
+       *
+       *
+       * 
    +       * 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.
+       * 
    
+       *
+       * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+       * 
+       */
+      @java.lang.Override
+      public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() {
+        return getUpTo();
+      }
+
+      private byte memoizedIsInitialized = -1;
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      @java.lang.Override
+      public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+        if (upTo_ != null) {
+          output.writeMessage(1, getUpTo());
+        }
+        getUnknownFields().writeTo(output);
+      }
+
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (upTo_ != null) {
+          size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getUpTo());
+        }
+        size += getUnknownFields().getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+          return true;
+        }
+        if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation.Count)) {
+          return super.equals(obj);
+        }
+        com.google.datastore.v1.AggregationQuery.Aggregation.Count other =
+            (com.google.datastore.v1.AggregationQuery.Aggregation.Count) obj;
+
+        if (hasUpTo() != other.hasUpTo()) return false;
+        if (hasUpTo()) {
+          if (!getUpTo().equals(other.getUpTo())) return false;
+        }
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        return true;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        if (hasUpTo()) {
+          hash = (37 * hash) + UP_TO_FIELD_NUMBER;
+          hash = (53 * hash) + getUpTo().hashCode();
+        }
+        hash = (29 * hash) + getUnknownFields().hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          java.io.InputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseDelimitedFrom(
+          java.io.InputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseDelimitedFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      @java.lang.Override
+      public Builder newBuilderForType() {
+        return newBuilder();
+      }
+
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+
+      public static Builder newBuilder(
+          com.google.datastore.v1.AggregationQuery.Aggregation.Count prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+
+      @java.lang.Override
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count of entities that match the query.
+       * The `COUNT(*)` aggregation function operates on the entire entity
+       * so it does not require a field reference.
+       * 
    
+       *
+       * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Count}
+       */
+      public static final class Builder
+          extends com.google.protobuf.GeneratedMessageV3.Builder
+          implements
+          // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation.Count)
+          com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor;
+        }
+
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Count.class,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder.class);
+        }
+
+        // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.Count.newBuilder()
+        private Builder() {}
+
+        private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          super(parent);
+        }
+
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          if (upToBuilder_ == null) {
+            upTo_ = null;
+          } else {
+            upTo_ = null;
+            upToBuilder_ = null;
+          }
+          return this;
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor;
+        }
+
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Count
+            getDefaultInstanceForType() {
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+        }
+
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Count build() {
+          com.google.datastore.v1.AggregationQuery.Aggregation.Count result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Count buildPartial() {
+          com.google.datastore.v1.AggregationQuery.Aggregation.Count result =
+              new com.google.datastore.v1.AggregationQuery.Aggregation.Count(this);
+          if (upToBuilder_ == null) {
+            result.upTo_ = upTo_;
+          } else {
+            result.upTo_ = upToBuilder_.build();
+          }
+          onBuilt();
+          return result;
+        }
+
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
+
+        @java.lang.Override
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.setField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+
+        @java.lang.Override
+        public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+
+        @java.lang.Override
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index,
+            java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+
+        @java.lang.Override
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof com.google.datastore.v1.AggregationQuery.Aggregation.Count) {
+            return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation.Count) other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation.Count other) {
+          if (other
+              == com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance())
+            return this;
+          if (other.hasUpTo()) {
+            mergeUpTo(other.getUpTo());
+          }
+          this.mergeUnknownFields(other.getUnknownFields());
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
+          try {
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10:
+                  {
+                    input.readMessage(getUpToFieldBuilder().getBuilder(), extensionRegistry);
+
+                    break;
+                  } // case 10
+                default:
+                  {
+                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                      done = true; // was an endgroup tag
+                    }
+                    break;
+                  } // default:
+              } // switch (tag)
+            } // while (!done)
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.unwrapIOException();
+          } finally {
+            onChanged();
+          } // finally
+          return this;
+        }
+
+        private com.google.protobuf.Int64Value upTo_;
+        private com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Int64Value,
+                com.google.protobuf.Int64Value.Builder,
+                com.google.protobuf.Int64ValueOrBuilder>
+            upToBuilder_;
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         *
+         * @return Whether the upTo field is set.
+         */
+        public boolean hasUpTo() {
+          return upToBuilder_ != null || upTo_ != null;
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         *
+         * @return The upTo.
+         */
+        public com.google.protobuf.Int64Value getUpTo() {
+          if (upToBuilder_ == null) {
+            return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_;
+          } else {
+            return upToBuilder_.getMessage();
+          }
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         */
+        public Builder setUpTo(com.google.protobuf.Int64Value value) {
+          if (upToBuilder_ == null) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            upTo_ = value;
+            onChanged();
+          } else {
+            upToBuilder_.setMessage(value);
+          }
+
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         */
+        public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) {
+          if (upToBuilder_ == null) {
+            upTo_ = builderForValue.build();
+            onChanged();
+          } else {
+            upToBuilder_.setMessage(builderForValue.build());
+          }
+
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         */
+        public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
+          if (upToBuilder_ == null) {
+            if (upTo_ != null) {
+              upTo_ =
+                  com.google.protobuf.Int64Value.newBuilder(upTo_).mergeFrom(value).buildPartial();
+            } else {
+              upTo_ = value;
+            }
+            onChanged();
+          } else {
+            upToBuilder_.mergeFrom(value);
+          }
+
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         */
+        public Builder clearUpTo() {
+          if (upToBuilder_ == null) {
+            upTo_ = null;
+            onChanged();
+          } else {
+            upTo_ = null;
+            upToBuilder_ = null;
+          }
+
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         */
+        public com.google.protobuf.Int64Value.Builder getUpToBuilder() {
+
+          onChanged();
+          return getUpToFieldBuilder().getBuilder();
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         */
+        public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() {
+          if (upToBuilder_ != null) {
+            return upToBuilder_.getMessageOrBuilder();
+          } else {
+            return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_;
+          }
+        }
+        /**
+         *
+         *
+         * 
    +         * 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.
+         * 
    
+         *
+         * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL];
+         * 
+         */
+        private com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Int64Value,
+                com.google.protobuf.Int64Value.Builder,
+                com.google.protobuf.Int64ValueOrBuilder>
+            getUpToFieldBuilder() {
+          if (upToBuilder_ == null) {
+            upToBuilder_ =
+                new com.google.protobuf.SingleFieldBuilderV3<
+                    com.google.protobuf.Int64Value,
+                    com.google.protobuf.Int64Value.Builder,
+                    com.google.protobuf.Int64ValueOrBuilder>(
+                    getUpTo(), getParentForChildren(), isClean());
+            upTo_ = null;
+          }
+          return upToBuilder_;
+        }
+
+        @java.lang.Override
+        public final Builder setUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.setUnknownFields(unknownFields);
+        }
+
+        @java.lang.Override
+        public final Builder mergeUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.mergeUnknownFields(unknownFields);
+        }
+
+        // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery.Aggregation.Count)
+      }
+
+      // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery.Aggregation.Count)
+      private static final com.google.datastore.v1.AggregationQuery.Aggregation.Count
+          DEFAULT_INSTANCE;
+
+      static {
+        DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery.Aggregation.Count();
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Count
+          getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser PARSER =
+          new com.google.protobuf.AbstractParser() {
+            @java.lang.Override
+            public Count parsePartialFrom(
+                com.google.protobuf.CodedInputStream input,
+                com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+              Builder builder = newBuilder();
+              try {
+                builder.mergeFrom(input, extensionRegistry);
+              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+                throw e.setUnfinishedMessage(builder.buildPartial());
+              } catch (com.google.protobuf.UninitializedMessageException e) {
+                throw e.asInvalidProtocolBufferException()
+                    .setUnfinishedMessage(builder.buildPartial());
+              } catch (java.io.IOException e) {
+                throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                    .setUnfinishedMessage(builder.buildPartial());
+              }
+              return builder.buildPartial();
+            }
+          };
+
+      public static com.google.protobuf.Parser parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Count
+          getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+    }
+
+    private int operatorCase_ = 0;
+    private java.lang.Object operator_;
+
+    public enum OperatorCase
+        implements
+            com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+      COUNT(1),
+      OPERATOR_NOT_SET(0);
+      private final int value;
+
+      private OperatorCase(int value) {
+        this.value = value;
+      }
+      /**
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static OperatorCase valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static OperatorCase forNumber(int value) {
+        switch (value) {
+          case 1:
+            return COUNT;
+          case 0:
+            return OPERATOR_NOT_SET;
+          default:
+            return null;
+        }
+      }
+
+      public int getNumber() {
+        return this.value;
+      }
+    };
+
+    public OperatorCase getOperatorCase() {
+      return OperatorCase.forNumber(operatorCase_);
+    }
+
+    public static final int COUNT_FIELD_NUMBER = 1;
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     *
+     * @return Whether the count field is set.
+     */
+    @java.lang.Override
+    public boolean hasCount() {
+      return operatorCase_ == 1;
+    }
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     *
+     * @return The count.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
+      if (operatorCase_ == 1) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+    }
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCountOrBuilder() {
+      if (operatorCase_ == 1) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+    }
+
+    public static final int ALIAS_FIELD_NUMBER = 7;
+    private volatile java.lang.Object alias_;
+    /**
+     *
+     *
+     * 
    +     * 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,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The alias.
+     */
+    @java.lang.Override
+    public java.lang.String getAlias() {
+      java.lang.Object ref = alias_;
+      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();
+        alias_ = s;
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The bytes for alias.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getAliasBytes() {
+      java.lang.Object ref = alias_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        alias_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (operatorCase_ == 1) {
+        output.writeMessage(
+            1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, alias_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (operatorCase_ == 1) {
+        size +=
+            com.google.protobuf.CodedOutputStream.computeMessageSize(
+                1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, alias_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation)) {
+        return super.equals(obj);
+      }
+      com.google.datastore.v1.AggregationQuery.Aggregation other =
+          (com.google.datastore.v1.AggregationQuery.Aggregation) obj;
+
+      if (!getAlias().equals(other.getAlias())) return false;
+      if (!getOperatorCase().equals(other.getOperatorCase())) return false;
+      switch (operatorCase_) {
+        case 1:
+          if (!getCount().equals(other.getCount())) return false;
+          break;
+        case 0:
+        default:
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ALIAS_FIELD_NUMBER;
+      hash = (53 * hash) + getAlias().hashCode();
+      switch (operatorCase_) {
+        case 1:
+          hash = (37 * hash) + COUNT_FIELD_NUMBER;
+          hash = (53 * hash) + getCount().hashCode();
+          break;
+        case 0:
+        default:
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom(
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        com.google.datastore.v1.AggregationQuery.Aggregation prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     *
+     *
+     * 
    +     * Defines a aggregation that produces a single result.
+     * 
    
+     *
+     * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
+     */
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation)
+        com.google.datastore.v1.AggregationQuery.AggregationOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.v1.AggregationQuery.Aggregation.class,
+                com.google.datastore.v1.AggregationQuery.Aggregation.Builder.class);
+      }
+
+      // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.newBuilder()
+      private Builder() {}
+
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (countBuilder_ != null) {
+          countBuilder_.clear();
+        }
+        alias_ = "";
+
+        operatorCase_ = 0;
+        operator_ = null;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstanceForType() {
+        return com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation build() {
+        com.google.datastore.v1.AggregationQuery.Aggregation result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation buildPartial() {
+        com.google.datastore.v1.AggregationQuery.Aggregation result =
+            new com.google.datastore.v1.AggregationQuery.Aggregation(this);
+        if (operatorCase_ == 1) {
+          if (countBuilder_ == null) {
+            result.operator_ = operator_;
+          } else {
+            result.operator_ = countBuilder_.build();
+          }
+        }
+        result.alias_ = alias_;
+        result.operatorCase_ = operatorCase_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.google.datastore.v1.AggregationQuery.Aggregation) {
+          return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation other) {
+        if (other == com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance())
+          return this;
+        if (!other.getAlias().isEmpty()) {
+          alias_ = other.alias_;
+          onChanged();
+        }
+        switch (other.getOperatorCase()) {
+          case COUNT:
+            {
+              mergeCount(other.getCount());
+              break;
+            }
+          case OPERATOR_NOT_SET:
+            {
+              break;
+            }
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  input.readMessage(getCountFieldBuilder().getBuilder(), extensionRegistry);
+                  operatorCase_ = 1;
+                  break;
+                } // case 10
+              case 58:
+                {
+                  alias_ = input.readStringRequireUtf8();
+
+                  break;
+                } // case 58
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+
+      private int operatorCase_ = 0;
+      private java.lang.Object operator_;
+
+      public OperatorCase getOperatorCase() {
+        return OperatorCase.forNumber(operatorCase_);
+      }
+
+      public Builder clearOperator() {
+        operatorCase_ = 0;
+        operator_ = null;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>
+          countBuilder_;
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       *
+       * @return Whether the count field is set.
+       */
+      @java.lang.Override
+      public boolean hasCount() {
+        return operatorCase_ == 1;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       *
+       * @return The count.
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
+        if (countBuilder_ == null) {
+          if (operatorCase_ == 1) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+        } else {
+          if (operatorCase_ == 1) {
+            return countBuilder_.getMessage();
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder setCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) {
+        if (countBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          operator_ = value;
+          onChanged();
+        } else {
+          countBuilder_.setMessage(value);
+        }
+        operatorCase_ = 1;
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder setCount(
+          com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder builderForValue) {
+        if (countBuilder_ == null) {
+          operator_ = builderForValue.build();
+          onChanged();
+        } else {
+          countBuilder_.setMessage(builderForValue.build());
+        }
+        operatorCase_ = 1;
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder mergeCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) {
+        if (countBuilder_ == null) {
+          if (operatorCase_ == 1
+              && operator_
+                  != com.google.datastore.v1.AggregationQuery.Aggregation.Count
+                      .getDefaultInstance()) {
+            operator_ =
+                com.google.datastore.v1.AggregationQuery.Aggregation.Count.newBuilder(
+                        (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_)
+                    .mergeFrom(value)
+                    .buildPartial();
+          } else {
+            operator_ = value;
+          }
+          onChanged();
+        } else {
+          if (operatorCase_ == 1) {
+            countBuilder_.mergeFrom(value);
+          } else {
+            countBuilder_.setMessage(value);
+          }
+        }
+        operatorCase_ = 1;
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder clearCount() {
+        if (countBuilder_ == null) {
+          if (operatorCase_ == 1) {
+            operatorCase_ = 0;
+            operator_ = null;
+            onChanged();
+          }
+        } else {
+          if (operatorCase_ == 1) {
+            operatorCase_ = 0;
+            operator_ = null;
+          }
+          countBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCountBuilder() {
+        return getCountFieldBuilder().getBuilder();
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder
+          getCountOrBuilder() {
+        if ((operatorCase_ == 1) && (countBuilder_ != null)) {
+          return countBuilder_.getMessageOrBuilder();
+        } else {
+          if (operatorCase_ == 1) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>
+          getCountFieldBuilder() {
+        if (countBuilder_ == null) {
+          if (!(operatorCase_ == 1)) {
+            operator_ =
+                com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+          }
+          countBuilder_ =
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Count,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>(
+                  (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_,
+                  getParentForChildren(),
+                  isClean());
+          operator_ = null;
+        }
+        operatorCase_ = 1;
+        onChanged();
+        ;
+        return countBuilder_;
+      }
+
+      private java.lang.Object alias_ = "";
+      /**
+       *
+       *
+       * 
    +       * 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,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       * 
    
+       *
+       * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+       *
+       * @return The alias.
+       */
+      public java.lang.String getAlias() {
+        java.lang.Object ref = alias_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          alias_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * 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,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       * 
    
+       *
+       * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+       *
+       * @return The bytes for alias.
+       */
+      public com.google.protobuf.ByteString getAliasBytes() {
+        java.lang.Object ref = alias_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          alias_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * 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,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       * 
    
+       *
+       * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+       *
+       * @param value The alias to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAlias(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+
+        alias_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * 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,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       * 
    
+       *
+       * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearAlias() {
+
+        alias_ = getDefaultInstance().getAlias();
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * 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,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       * 
    
+       *
+       * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+       *
+       * @param value The bytes for alias to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAliasBytes(com.google.protobuf.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        checkByteStringIsUtf8(value);
+
+        alias_ = value;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery.Aggregation)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery.Aggregation)
+    private static final com.google.datastore.v1.AggregationQuery.Aggregation DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery.Aggregation();
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser PARSER =
+        new com.google.protobuf.AbstractParser() {
+          @java.lang.Override
+          public Aggregation parsePartialFrom(
+              com.google.protobuf.CodedInputStream input,
+              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+              throws com.google.protobuf.InvalidProtocolBufferException {
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
+          }
+        };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  private int queryTypeCase_ = 0;
+  private java.lang.Object queryType_;
+
+  public enum QueryTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+    NESTED_QUERY(1),
+    QUERYTYPE_NOT_SET(0);
+    private final int value;
+
+    private QueryTypeCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static QueryTypeCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static QueryTypeCase forNumber(int value) {
+      switch (value) {
+        case 1:
+          return NESTED_QUERY;
+        case 0:
+          return QUERYTYPE_NOT_SET;
+        default:
+          return null;
+      }
+    }
+
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public QueryTypeCase getQueryTypeCase() {
+    return QueryTypeCase.forNumber(queryTypeCase_);
+  }
+
+  public static final int NESTED_QUERY_FIELD_NUMBER = 1;
+  /**
+   *
+   *
+   * 
    +   * Nested query for aggregation
+   * 
    
+   *
+   * .google.datastore.v1.Query nested_query = 1;
+   *
+   * @return Whether the nestedQuery field is set.
+   */
+  @java.lang.Override
+  public boolean hasNestedQuery() {
+    return queryTypeCase_ == 1;
+  }
+  /**
+   *
+   *
+   * 
    +   * Nested query for aggregation
+   * 
    
+   *
+   * .google.datastore.v1.Query nested_query = 1;
+   *
+   * @return The nestedQuery.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Query getNestedQuery() {
+    if (queryTypeCase_ == 1) {
+      return (com.google.datastore.v1.Query) queryType_;
+    }
+    return com.google.datastore.v1.Query.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Nested query for aggregation
+   * 
    
+   *
+   * .google.datastore.v1.Query nested_query = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
+    if (queryTypeCase_ == 1) {
+      return (com.google.datastore.v1.Query) queryType_;
+    }
+    return com.google.datastore.v1.Query.getDefaultInstance();
+  }
+
+  public static final int AGGREGATIONS_FIELD_NUMBER = 3;
+  private java.util.List aggregations_;
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public java.util.List
+      getAggregationsList() {
+    return aggregations_;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public java.util.List
+      getAggregationsOrBuilderList() {
+    return aggregations_;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public int getAggregationsCount() {
+    return aggregations_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index) {
+    return aggregations_.get(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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregationsOrBuilder(
+      int index) {
+    return aggregations_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (queryTypeCase_ == 1) {
+      output.writeMessage(1, (com.google.datastore.v1.Query) queryType_);
+    }
+    for (int i = 0; i < aggregations_.size(); i++) {
+      output.writeMessage(3, aggregations_.get(i));
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (queryTypeCase_ == 1) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              1, (com.google.datastore.v1.Query) queryType_);
+    }
+    for (int i = 0; i < aggregations_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, aggregations_.get(i));
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.AggregationQuery)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.AggregationQuery other = (com.google.datastore.v1.AggregationQuery) obj;
+
+    if (!getAggregationsList().equals(other.getAggregationsList())) return false;
+    if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
+    switch (queryTypeCase_) {
+      case 1:
+        if (!getNestedQuery().equals(other.getNestedQuery())) return false;
+        break;
+      case 0:
+      default:
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getAggregationsCount() > 0) {
+      hash = (37 * hash) + AGGREGATIONS_FIELD_NUMBER;
+      hash = (53 * hash) + getAggregationsList().hashCode();
+    }
+    switch (queryTypeCase_) {
+      case 1:
+        hash = (37 * hash) + NESTED_QUERY_FIELD_NUMBER;
+        hash = (53 * hash) + getNestedQuery().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationQuery parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.AggregationQuery prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.AggregationQuery}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery)
+      com.google.datastore.v1.AggregationQueryOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_AggregationQuery_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_AggregationQuery_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.AggregationQuery.class,
+              com.google.datastore.v1.AggregationQuery.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.AggregationQuery.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (nestedQueryBuilder_ != null) {
+        nestedQueryBuilder_.clear();
+      }
+      if (aggregationsBuilder_ == null) {
+        aggregations_ = java.util.Collections.emptyList();
+      } else {
+        aggregations_ = null;
+        aggregationsBuilder_.clear();
+      }
+      bitField0_ = (bitField0_ & ~0x00000001);
+      queryTypeCase_ = 0;
+      queryType_ = null;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_AggregationQuery_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery getDefaultInstanceForType() {
+      return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery build() {
+      com.google.datastore.v1.AggregationQuery result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery buildPartial() {
+      com.google.datastore.v1.AggregationQuery result =
+          new com.google.datastore.v1.AggregationQuery(this);
+      int from_bitField0_ = bitField0_;
+      if (queryTypeCase_ == 1) {
+        if (nestedQueryBuilder_ == null) {
+          result.queryType_ = queryType_;
+        } else {
+          result.queryType_ = nestedQueryBuilder_.build();
+        }
+      }
+      if (aggregationsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          aggregations_ = java.util.Collections.unmodifiableList(aggregations_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.aggregations_ = aggregations_;
+      } else {
+        result.aggregations_ = aggregationsBuilder_.build();
+      }
+      result.queryTypeCase_ = queryTypeCase_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.AggregationQuery) {
+        return mergeFrom((com.google.datastore.v1.AggregationQuery) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.AggregationQuery other) {
+      if (other == com.google.datastore.v1.AggregationQuery.getDefaultInstance()) return this;
+      if (aggregationsBuilder_ == null) {
+        if (!other.aggregations_.isEmpty()) {
+          if (aggregations_.isEmpty()) {
+            aggregations_ = other.aggregations_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureAggregationsIsMutable();
+            aggregations_.addAll(other.aggregations_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.aggregations_.isEmpty()) {
+          if (aggregationsBuilder_.isEmpty()) {
+            aggregationsBuilder_.dispose();
+            aggregationsBuilder_ = null;
+            aggregations_ = other.aggregations_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            aggregationsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getAggregationsFieldBuilder()
+                    : null;
+          } else {
+            aggregationsBuilder_.addAllMessages(other.aggregations_);
+          }
+        }
+      }
+      switch (other.getQueryTypeCase()) {
+        case NESTED_QUERY:
+          {
+            mergeNestedQuery(other.getNestedQuery());
+            break;
+          }
+        case QUERYTYPE_NOT_SET:
+          {
+            break;
+          }
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getNestedQueryFieldBuilder().getBuilder(), extensionRegistry);
+                queryTypeCase_ = 1;
+                break;
+              } // case 10
+            case 26:
+              {
+                com.google.datastore.v1.AggregationQuery.Aggregation m =
+                    input.readMessage(
+                        com.google.datastore.v1.AggregationQuery.Aggregation.parser(),
+                        extensionRegistry);
+                if (aggregationsBuilder_ == null) {
+                  ensureAggregationsIsMutable();
+                  aggregations_.add(m);
+                } else {
+                  aggregationsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int queryTypeCase_ = 0;
+    private java.lang.Object queryType_;
+
+    public QueryTypeCase getQueryTypeCase() {
+      return QueryTypeCase.forNumber(queryTypeCase_);
+    }
+
+    public Builder clearQueryType() {
+      queryTypeCase_ = 0;
+      queryType_ = null;
+      onChanged();
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Query,
+            com.google.datastore.v1.Query.Builder,
+            com.google.datastore.v1.QueryOrBuilder>
+        nestedQueryBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     *
+     * @return Whether the nestedQuery field is set.
+     */
+    @java.lang.Override
+    public boolean hasNestedQuery() {
+      return queryTypeCase_ == 1;
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     *
+     * @return The nestedQuery.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.Query getNestedQuery() {
+      if (nestedQueryBuilder_ == null) {
+        if (queryTypeCase_ == 1) {
+          return (com.google.datastore.v1.Query) queryType_;
+        }
+        return com.google.datastore.v1.Query.getDefaultInstance();
+      } else {
+        if (queryTypeCase_ == 1) {
+          return nestedQueryBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.Query.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     */
+    public Builder setNestedQuery(com.google.datastore.v1.Query value) {
+      if (nestedQueryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        queryType_ = value;
+        onChanged();
+      } else {
+        nestedQueryBuilder_.setMessage(value);
+      }
+      queryTypeCase_ = 1;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     */
+    public Builder setNestedQuery(com.google.datastore.v1.Query.Builder builderForValue) {
+      if (nestedQueryBuilder_ == null) {
+        queryType_ = builderForValue.build();
+        onChanged();
+      } else {
+        nestedQueryBuilder_.setMessage(builderForValue.build());
+      }
+      queryTypeCase_ = 1;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     */
+    public Builder mergeNestedQuery(com.google.datastore.v1.Query value) {
+      if (nestedQueryBuilder_ == null) {
+        if (queryTypeCase_ == 1
+            && queryType_ != com.google.datastore.v1.Query.getDefaultInstance()) {
+          queryType_ =
+              com.google.datastore.v1.Query.newBuilder((com.google.datastore.v1.Query) queryType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          queryType_ = value;
+        }
+        onChanged();
+      } else {
+        if (queryTypeCase_ == 1) {
+          nestedQueryBuilder_.mergeFrom(value);
+        } else {
+          nestedQueryBuilder_.setMessage(value);
+        }
+      }
+      queryTypeCase_ = 1;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     */
+    public Builder clearNestedQuery() {
+      if (nestedQueryBuilder_ == null) {
+        if (queryTypeCase_ == 1) {
+          queryTypeCase_ = 0;
+          queryType_ = null;
+          onChanged();
+        }
+      } else {
+        if (queryTypeCase_ == 1) {
+          queryTypeCase_ = 0;
+          queryType_ = null;
+        }
+        nestedQueryBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     */
+    public com.google.datastore.v1.Query.Builder getNestedQueryBuilder() {
+      return getNestedQueryFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
+      if ((queryTypeCase_ == 1) && (nestedQueryBuilder_ != null)) {
+        return nestedQueryBuilder_.getMessageOrBuilder();
+      } else {
+        if (queryTypeCase_ == 1) {
+          return (com.google.datastore.v1.Query) queryType_;
+        }
+        return com.google.datastore.v1.Query.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Nested query for aggregation
+     * 
    
+     *
+     * .google.datastore.v1.Query nested_query = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Query,
+            com.google.datastore.v1.Query.Builder,
+            com.google.datastore.v1.QueryOrBuilder>
+        getNestedQueryFieldBuilder() {
+      if (nestedQueryBuilder_ == null) {
+        if (!(queryTypeCase_ == 1)) {
+          queryType_ = com.google.datastore.v1.Query.getDefaultInstance();
+        }
+        nestedQueryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Query,
+                com.google.datastore.v1.Query.Builder,
+                com.google.datastore.v1.QueryOrBuilder>(
+                (com.google.datastore.v1.Query) queryType_, getParentForChildren(), isClean());
+        queryType_ = null;
+      }
+      queryTypeCase_ = 1;
+      onChanged();
+      ;
+      return nestedQueryBuilder_;
+    }
+
+    private java.util.List aggregations_ =
+        java.util.Collections.emptyList();
+
+    private void ensureAggregationsIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        aggregations_ =
+            new java.util.ArrayList(
+                aggregations_);
+        bitField0_ |= 0x00000001;
+      }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.AggregationQuery.Aggregation,
+            com.google.datastore.v1.AggregationQuery.Aggregation.Builder,
+            com.google.datastore.v1.AggregationQuery.AggregationOrBuilder>
+        aggregationsBuilder_;
+
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public java.util.List
+        getAggregationsList() {
+      if (aggregationsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(aggregations_);
+      } else {
+        return aggregationsBuilder_.getMessageList();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public int getAggregationsCount() {
+      if (aggregationsBuilder_ == null) {
+        return aggregations_.size();
+      } else {
+        return aggregationsBuilder_.getCount();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index) {
+      if (aggregationsBuilder_ == null) {
+        return aggregations_.get(index);
+      } else {
+        return aggregationsBuilder_.getMessage(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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setAggregations(
+        int index, com.google.datastore.v1.AggregationQuery.Aggregation value) {
+      if (aggregationsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAggregationsIsMutable();
+        aggregations_.set(index, value);
+        onChanged();
+      } else {
+        aggregationsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setAggregations(
+        int index, com.google.datastore.v1.AggregationQuery.Aggregation.Builder builderForValue) {
+      if (aggregationsBuilder_ == null) {
+        ensureAggregationsIsMutable();
+        aggregations_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        aggregationsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addAggregations(com.google.datastore.v1.AggregationQuery.Aggregation value) {
+      if (aggregationsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAggregationsIsMutable();
+        aggregations_.add(value);
+        onChanged();
+      } else {
+        aggregationsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addAggregations(
+        int index, com.google.datastore.v1.AggregationQuery.Aggregation value) {
+      if (aggregationsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAggregationsIsMutable();
+        aggregations_.add(index, value);
+        onChanged();
+      } else {
+        aggregationsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addAggregations(
+        com.google.datastore.v1.AggregationQuery.Aggregation.Builder builderForValue) {
+      if (aggregationsBuilder_ == null) {
+        ensureAggregationsIsMutable();
+        aggregations_.add(builderForValue.build());
+        onChanged();
+      } else {
+        aggregationsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addAggregations(
+        int index, com.google.datastore.v1.AggregationQuery.Aggregation.Builder builderForValue) {
+      if (aggregationsBuilder_ == null) {
+        ensureAggregationsIsMutable();
+        aggregations_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        aggregationsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addAllAggregations(
+        java.lang.Iterable values) {
+      if (aggregationsBuilder_ == null) {
+        ensureAggregationsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, aggregations_);
+        onChanged();
+      } else {
+        aggregationsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder clearAggregations() {
+      if (aggregationsBuilder_ == null) {
+        aggregations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        aggregationsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder removeAggregations(int index) {
+      if (aggregationsBuilder_ == null) {
+        ensureAggregationsIsMutable();
+        aggregations_.remove(index);
+        onChanged();
+      } else {
+        aggregationsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.AggregationQuery.Aggregation.Builder getAggregationsBuilder(
+        int index) {
+      return getAggregationsFieldBuilder().getBuilder(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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregationsOrBuilder(
+        int index) {
+      if (aggregationsBuilder_ == null) {
+        return aggregations_.get(index);
+      } else {
+        return aggregationsBuilder_.getMessageOrBuilder(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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public java.util.List
+        getAggregationsOrBuilderList() {
+      if (aggregationsBuilder_ != null) {
+        return aggregationsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(aggregations_);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregationsBuilder() {
+      return getAggregationsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregationsBuilder(
+        int index) {
+      return getAggregationsFieldBuilder()
+          .addBuilder(
+              index, com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public java.util.List
+        getAggregationsBuilderList() {
+      return getAggregationsFieldBuilder().getBuilderList();
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.AggregationQuery.Aggregation,
+            com.google.datastore.v1.AggregationQuery.Aggregation.Builder,
+            com.google.datastore.v1.AggregationQuery.AggregationOrBuilder>
+        getAggregationsFieldBuilder() {
+      if (aggregationsBuilder_ == null) {
+        aggregationsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.AggregationQuery.Aggregation,
+                com.google.datastore.v1.AggregationQuery.Aggregation.Builder,
+                com.google.datastore.v1.AggregationQuery.AggregationOrBuilder>(
+                aggregations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        aggregations_ = null;
+      }
+      return aggregationsBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery)
+  private static final com.google.datastore.v1.AggregationQuery DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery();
+  }
+
+  public static com.google.datastore.v1.AggregationQuery getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public AggregationQuery parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationQuery getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..457f963e9552
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query.proto
+
+package com.google.datastore.v1;
+
+public interface AggregationQueryOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Nested query for aggregation
+   * 
    
+   *
+   * .google.datastore.v1.Query nested_query = 1;
+   *
+   * @return Whether the nestedQuery field is set.
+   */
+  boolean hasNestedQuery();
+  /**
+   *
+   *
+   * 
    +   * Nested query for aggregation
+   * 
    
+   *
+   * .google.datastore.v1.Query nested_query = 1;
+   *
+   * @return The nestedQuery.
+   */
+  com.google.datastore.v1.Query getNestedQuery();
+  /**
+   *
+   *
+   * 
    +   * Nested query for aggregation
+   * 
    
+   *
+   * .google.datastore.v1.Query nested_query = 1;
+   */
+  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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  java.util.List getAggregationsList();
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  java.util.List
+      getAggregationsOrBuilderList();
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregationsOrBuilder(int index);
+
+  public 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
new file mode 100644
index 000000000000..9d32764990cc
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java
@@ -0,0 +1,822 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/aggregation_result.proto
+
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * 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.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.AggregationResult}
+ */
+public final class AggregationResult extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResult)
+    AggregationResultOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use AggregationResult.newBuilder() to construct.
+  private AggregationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private AggregationResult() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  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;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
+    switch (number) {
+      case 2:
+        return internalGetAggregateProperties();
+      default:
+        throw new RuntimeException("Invalid map field number: " + number);
+    }
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.AggregationResultProto
+        .internal_static_google_datastore_v1_AggregationResult_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.AggregationResult.class,
+            com.google.datastore.v1.AggregationResult.Builder.class);
+  }
+
+  public static final int AGGREGATE_PROPERTIES_FIELD_NUMBER = 2;
+
+  private static final class AggregatePropertiesDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry
+        defaultEntry =
+            com.google.protobuf.MapEntry
+                .newDefaultInstance(
+                    com.google.datastore.v1.AggregationResultProto
+                        .internal_static_google_datastore_v1_AggregationResult_AggregatePropertiesEntry_descriptor,
+                    com.google.protobuf.WireFormat.FieldType.STRING,
+                    "",
+                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                    com.google.datastore.v1.Value.getDefaultInstance());
+  }
+
+  private com.google.protobuf.MapField
+      aggregateProperties_;
+
+  private com.google.protobuf.MapField
+      internalGetAggregateProperties() {
+    if (aggregateProperties_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          AggregatePropertiesDefaultEntryHolder.defaultEntry);
+    }
+    return aggregateProperties_;
+  }
+
+  public int getAggregatePropertiesCount() {
+    return internalGetAggregateProperties().getMap().size();
+  }
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  @java.lang.Override
+  public boolean containsAggregateProperties(java.lang.String key) {
+    if (key == null) {
+      throw new NullPointerException("map key");
+    }
+    return internalGetAggregateProperties().getMap().containsKey(key);
+  }
+  /** Use {@link #getAggregatePropertiesMap()} instead. */
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getAggregateProperties() {
+    return getAggregatePropertiesMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  @java.lang.Override
+  public java.util.Map
+      getAggregatePropertiesMap() {
+    return internalGetAggregateProperties().getMap();
+  }
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
+      java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+    if (key == null) {
+      throw new NullPointerException("map key");
+    }
+    java.util.Map map =
+        internalGetAggregateProperties().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.String key) {
+    if (key == null) {
+      throw new NullPointerException("map key");
+    }
+    java.util.Map map =
+        internalGetAggregateProperties().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
+        output,
+        internalGetAggregateProperties(),
+        AggregatePropertiesDefaultEntryHolder.defaultEntry,
+        2);
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (java.util.Map.Entry entry :
+        internalGetAggregateProperties().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+          aggregateProperties__ =
+              AggregatePropertiesDefaultEntryHolder.defaultEntry
+                  .newBuilderForType()
+                  .setKey(entry.getKey())
+                  .setValue(entry.getValue())
+                  .build();
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, aggregateProperties__);
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.AggregationResult)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.AggregationResult other =
+        (com.google.datastore.v1.AggregationResult) obj;
+
+    if (!internalGetAggregateProperties().equals(other.internalGetAggregateProperties()))
+      return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (!internalGetAggregateProperties().getMap().isEmpty()) {
+      hash = (37 * hash) + AGGREGATE_PROPERTIES_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetAggregateProperties().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationResult parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.AggregationResult prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.AggregationResult}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationResult)
+      com.google.datastore.v1.AggregationResultOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.AggregationResultProto
+          .internal_static_google_datastore_v1_AggregationResult_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
+      switch (number) {
+        case 2:
+          return internalGetAggregateProperties();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+      switch (number) {
+        case 2:
+          return internalGetMutableAggregateProperties();
+        default:
+          throw new RuntimeException("Invalid map field number: " + number);
+      }
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.AggregationResultProto
+          .internal_static_google_datastore_v1_AggregationResult_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.AggregationResult.class,
+              com.google.datastore.v1.AggregationResult.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.AggregationResult.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      internalGetMutableAggregateProperties().clear();
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.AggregationResultProto
+          .internal_static_google_datastore_v1_AggregationResult_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationResult getDefaultInstanceForType() {
+      return com.google.datastore.v1.AggregationResult.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationResult build() {
+      com.google.datastore.v1.AggregationResult result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationResult buildPartial() {
+      com.google.datastore.v1.AggregationResult result =
+          new com.google.datastore.v1.AggregationResult(this);
+      int from_bitField0_ = bitField0_;
+      result.aggregateProperties_ = internalGetAggregateProperties();
+      result.aggregateProperties_.makeImmutable();
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.AggregationResult) {
+        return mergeFrom((com.google.datastore.v1.AggregationResult) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.AggregationResult other) {
+      if (other == com.google.datastore.v1.AggregationResult.getDefaultInstance()) return this;
+      internalGetMutableAggregateProperties().mergeFrom(other.internalGetAggregateProperties());
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 18:
+              {
+                com.google.protobuf.MapEntry
+                    aggregateProperties__ =
+                        input.readMessage(
+                            AggregatePropertiesDefaultEntryHolder.defaultEntry.getParserForType(),
+                            extensionRegistry);
+                internalGetMutableAggregateProperties()
+                    .getMutableMap()
+                    .put(aggregateProperties__.getKey(), aggregateProperties__.getValue());
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.protobuf.MapField
+        aggregateProperties_;
+
+    private com.google.protobuf.MapField
+        internalGetAggregateProperties() {
+      if (aggregateProperties_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            AggregatePropertiesDefaultEntryHolder.defaultEntry);
+      }
+      return aggregateProperties_;
+    }
+
+    private com.google.protobuf.MapField
+        internalGetMutableAggregateProperties() {
+      onChanged();
+      ;
+      if (aggregateProperties_ == null) {
+        aggregateProperties_ =
+            com.google.protobuf.MapField.newMapField(
+                AggregatePropertiesDefaultEntryHolder.defaultEntry);
+      }
+      if (!aggregateProperties_.isMutable()) {
+        aggregateProperties_ = aggregateProperties_.copy();
+      }
+      return aggregateProperties_;
+    }
+
+    public int getAggregatePropertiesCount() {
+      return internalGetAggregateProperties().getMap().size();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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 number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    @java.lang.Override
+    public boolean containsAggregateProperties(java.lang.String key) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      return internalGetAggregateProperties().getMap().containsKey(key);
+    }
+    /** Use {@link #getAggregatePropertiesMap()} instead. */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getAggregateProperties() {
+      return getAggregatePropertiesMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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 number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    @java.lang.Override
+    public java.util.Map
+        getAggregatePropertiesMap() {
+      return internalGetAggregateProperties().getMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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 number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
+        java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      java.util.Map map =
+          internalGetAggregateProperties().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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 number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.String key) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      java.util.Map map =
+          internalGetAggregateProperties().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearAggregateProperties() {
+      internalGetMutableAggregateProperties().getMutableMap().clear();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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 number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    public Builder removeAggregateProperties(java.lang.String key) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      internalGetMutableAggregateProperties().getMutableMap().remove(key);
+      return this;
+    }
+    /** Use alternate mutation accessors instead. */
+    @java.lang.Deprecated
+    public java.util.Map
+        getMutableAggregateProperties() {
+      return internalGetMutableAggregateProperties().getMutableMap();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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 number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    public Builder putAggregateProperties(
+        java.lang.String key, com.google.datastore.v1.Value value) {
+      if (key == null) {
+        throw new NullPointerException("map key");
+      }
+      if (value == null) {
+        throw new NullPointerException("map value");
+      }
+
+      internalGetMutableAggregateProperties().getMutableMap().put(key, value);
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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 number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    public Builder putAllAggregateProperties(
+        java.util.Map values) {
+      internalGetMutableAggregateProperties().getMutableMap().putAll(values);
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationResult)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationResult)
+  private static final com.google.datastore.v1.AggregationResult DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationResult();
+  }
+
+  public static com.google.datastore.v1.AggregationResult getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public AggregationResult parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationResult getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..c603e515f1c0
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java
@@ -0,0 +1,1403 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/aggregation_result.proto
+
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * A batch of aggregation results produced by an aggregation query.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.AggregationResultBatch}
+ */
+public final class AggregationResultBatch extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResultBatch)
+    AggregationResultBatchOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use AggregationResultBatch.newBuilder() to construct.
+  private AggregationResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private AggregationResultBatch() {
+    aggregationResults_ = java.util.Collections.emptyList();
+    moreResults_ = 0;
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  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;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.AggregationResultProto
+        .internal_static_google_datastore_v1_AggregationResultBatch_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.AggregationResultBatch.class,
+            com.google.datastore.v1.AggregationResultBatch.Builder.class);
+  }
+
+  public static final int AGGREGATION_RESULTS_FIELD_NUMBER = 1;
+  private java.util.List aggregationResults_;
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  @java.lang.Override
+  public java.util.List getAggregationResultsList() {
+    return aggregationResults_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  @java.lang.Override
+  public java.util.List
+      getAggregationResultsOrBuilderList() {
+    return aggregationResults_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  @java.lang.Override
+  public int getAggregationResultsCount() {
+    return aggregationResults_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationResult getAggregationResults(int index) {
+    return aggregationResults_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsOrBuilder(
+      int index) {
+    return aggregationResults_.get(index);
+  }
+
+  public static final int MORE_RESULTS_FIELD_NUMBER = 2;
+  private int moreResults_;
+  /**
+   *
+   *
+   * 
    +   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   * 
    
+   *
+   * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+   *
+   * @return The enum numeric value on the wire for moreResults.
+   */
+  @java.lang.Override
+  public int getMoreResultsValue() {
+    return moreResults_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   * 
    
+   *
+   * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+   *
+   * @return The moreResults.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
+    @SuppressWarnings("deprecation")
+    com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
+        com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+    return result == null
+        ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
+        : result;
+  }
+
+  public static final int READ_TIME_FIELD_NUMBER = 3;
+  private com.google.protobuf.Timestamp readTime_;
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 3;
+   *
+   * @return Whether the readTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasReadTime() {
+    return readTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 3;
+   *
+   * @return The readTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getReadTime() {
+    return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 3;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+    return getReadTime();
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    for (int i = 0; i < aggregationResults_.size(); i++) {
+      output.writeMessage(1, aggregationResults_.get(i));
+    }
+    if (moreResults_
+        != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED
+            .getNumber()) {
+      output.writeEnum(2, moreResults_);
+    }
+    if (readTime_ != null) {
+      output.writeMessage(3, getReadTime());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < aggregationResults_.size(); i++) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(1, aggregationResults_.get(i));
+    }
+    if (moreResults_
+        != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED
+            .getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, moreResults_);
+    }
+    if (readTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getReadTime());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.AggregationResultBatch)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.AggregationResultBatch other =
+        (com.google.datastore.v1.AggregationResultBatch) obj;
+
+    if (!getAggregationResultsList().equals(other.getAggregationResultsList())) return false;
+    if (moreResults_ != other.moreResults_) return false;
+    if (hasReadTime() != other.hasReadTime()) return false;
+    if (hasReadTime()) {
+      if (!getReadTime().equals(other.getReadTime())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getAggregationResultsCount() > 0) {
+      hash = (37 * hash) + AGGREGATION_RESULTS_FIELD_NUMBER;
+      hash = (53 * hash) + getAggregationResultsList().hashCode();
+    }
+    hash = (37 * hash) + MORE_RESULTS_FIELD_NUMBER;
+    hash = (53 * hash) + moreResults_;
+    if (hasReadTime()) {
+      hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getReadTime().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.AggregationResultBatch prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * A batch of aggregation results produced by an aggregation query.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.AggregationResultBatch}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationResultBatch)
+      com.google.datastore.v1.AggregationResultBatchOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.AggregationResultProto
+          .internal_static_google_datastore_v1_AggregationResultBatch_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.AggregationResultProto
+          .internal_static_google_datastore_v1_AggregationResultBatch_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.AggregationResultBatch.class,
+              com.google.datastore.v1.AggregationResultBatch.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.AggregationResultBatch.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (aggregationResultsBuilder_ == null) {
+        aggregationResults_ = java.util.Collections.emptyList();
+      } else {
+        aggregationResults_ = null;
+        aggregationResultsBuilder_.clear();
+      }
+      bitField0_ = (bitField0_ & ~0x00000001);
+      moreResults_ = 0;
+
+      if (readTimeBuilder_ == null) {
+        readTime_ = null;
+      } else {
+        readTime_ = null;
+        readTimeBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.AggregationResultProto
+          .internal_static_google_datastore_v1_AggregationResultBatch_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationResultBatch getDefaultInstanceForType() {
+      return com.google.datastore.v1.AggregationResultBatch.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationResultBatch build() {
+      com.google.datastore.v1.AggregationResultBatch result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationResultBatch buildPartial() {
+      com.google.datastore.v1.AggregationResultBatch result =
+          new com.google.datastore.v1.AggregationResultBatch(this);
+      int from_bitField0_ = bitField0_;
+      if (aggregationResultsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          aggregationResults_ = java.util.Collections.unmodifiableList(aggregationResults_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.aggregationResults_ = aggregationResults_;
+      } else {
+        result.aggregationResults_ = aggregationResultsBuilder_.build();
+      }
+      result.moreResults_ = moreResults_;
+      if (readTimeBuilder_ == null) {
+        result.readTime_ = readTime_;
+      } else {
+        result.readTime_ = readTimeBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.AggregationResultBatch) {
+        return mergeFrom((com.google.datastore.v1.AggregationResultBatch) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.AggregationResultBatch other) {
+      if (other == com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()) return this;
+      if (aggregationResultsBuilder_ == null) {
+        if (!other.aggregationResults_.isEmpty()) {
+          if (aggregationResults_.isEmpty()) {
+            aggregationResults_ = other.aggregationResults_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureAggregationResultsIsMutable();
+            aggregationResults_.addAll(other.aggregationResults_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.aggregationResults_.isEmpty()) {
+          if (aggregationResultsBuilder_.isEmpty()) {
+            aggregationResultsBuilder_.dispose();
+            aggregationResultsBuilder_ = null;
+            aggregationResults_ = other.aggregationResults_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            aggregationResultsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getAggregationResultsFieldBuilder()
+                    : null;
+          } else {
+            aggregationResultsBuilder_.addAllMessages(other.aggregationResults_);
+          }
+        }
+      }
+      if (other.moreResults_ != 0) {
+        setMoreResultsValue(other.getMoreResultsValue());
+      }
+      if (other.hasReadTime()) {
+        mergeReadTime(other.getReadTime());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.datastore.v1.AggregationResult m =
+                    input.readMessage(
+                        com.google.datastore.v1.AggregationResult.parser(), extensionRegistry);
+                if (aggregationResultsBuilder_ == null) {
+                  ensureAggregationResultsIsMutable();
+                  aggregationResults_.add(m);
+                } else {
+                  aggregationResultsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            case 16:
+              {
+                moreResults_ = input.readEnum();
+
+                break;
+              } // case 16
+            case 26:
+              {
+                input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.util.List aggregationResults_ =
+        java.util.Collections.emptyList();
+
+    private void ensureAggregationResultsIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        aggregationResults_ =
+            new java.util.ArrayList(aggregationResults_);
+        bitField0_ |= 0x00000001;
+      }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.AggregationResult,
+            com.google.datastore.v1.AggregationResult.Builder,
+            com.google.datastore.v1.AggregationResultOrBuilder>
+        aggregationResultsBuilder_;
+
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public java.util.List getAggregationResultsList() {
+      if (aggregationResultsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(aggregationResults_);
+      } else {
+        return aggregationResultsBuilder_.getMessageList();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public int getAggregationResultsCount() {
+      if (aggregationResultsBuilder_ == null) {
+        return aggregationResults_.size();
+      } else {
+        return aggregationResultsBuilder_.getCount();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public com.google.datastore.v1.AggregationResult getAggregationResults(int index) {
+      if (aggregationResultsBuilder_ == null) {
+        return aggregationResults_.get(index);
+      } else {
+        return aggregationResultsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder setAggregationResults(
+        int index, com.google.datastore.v1.AggregationResult value) {
+      if (aggregationResultsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAggregationResultsIsMutable();
+        aggregationResults_.set(index, value);
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder setAggregationResults(
+        int index, com.google.datastore.v1.AggregationResult.Builder builderForValue) {
+      if (aggregationResultsBuilder_ == null) {
+        ensureAggregationResultsIsMutable();
+        aggregationResults_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder addAggregationResults(com.google.datastore.v1.AggregationResult value) {
+      if (aggregationResultsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAggregationResultsIsMutable();
+        aggregationResults_.add(value);
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder addAggregationResults(
+        int index, com.google.datastore.v1.AggregationResult value) {
+      if (aggregationResultsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureAggregationResultsIsMutable();
+        aggregationResults_.add(index, value);
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder addAggregationResults(
+        com.google.datastore.v1.AggregationResult.Builder builderForValue) {
+      if (aggregationResultsBuilder_ == null) {
+        ensureAggregationResultsIsMutable();
+        aggregationResults_.add(builderForValue.build());
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder addAggregationResults(
+        int index, com.google.datastore.v1.AggregationResult.Builder builderForValue) {
+      if (aggregationResultsBuilder_ == null) {
+        ensureAggregationResultsIsMutable();
+        aggregationResults_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder addAllAggregationResults(
+        java.lang.Iterable values) {
+      if (aggregationResultsBuilder_ == null) {
+        ensureAggregationResultsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, aggregationResults_);
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder clearAggregationResults() {
+      if (aggregationResultsBuilder_ == null) {
+        aggregationResults_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public Builder removeAggregationResults(int index) {
+      if (aggregationResultsBuilder_ == null) {
+        ensureAggregationResultsIsMutable();
+        aggregationResults_.remove(index);
+        onChanged();
+      } else {
+        aggregationResultsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public com.google.datastore.v1.AggregationResult.Builder getAggregationResultsBuilder(
+        int index) {
+      return getAggregationResultsFieldBuilder().getBuilder(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsOrBuilder(
+        int index) {
+      if (aggregationResultsBuilder_ == null) {
+        return aggregationResults_.get(index);
+      } else {
+        return aggregationResultsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public java.util.List
+        getAggregationResultsOrBuilderList() {
+      if (aggregationResultsBuilder_ != null) {
+        return aggregationResultsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(aggregationResults_);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBuilder() {
+      return getAggregationResultsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.AggregationResult.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBuilder(
+        int index) {
+      return getAggregationResultsFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.AggregationResult.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The aggregation results for this batch.
+     * 
    
+     *
+     * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+     */
+    public java.util.List
+        getAggregationResultsBuilderList() {
+      return getAggregationResultsFieldBuilder().getBuilderList();
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.AggregationResult,
+            com.google.datastore.v1.AggregationResult.Builder,
+            com.google.datastore.v1.AggregationResultOrBuilder>
+        getAggregationResultsFieldBuilder() {
+      if (aggregationResultsBuilder_ == null) {
+        aggregationResultsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.AggregationResult,
+                com.google.datastore.v1.AggregationResult.Builder,
+                com.google.datastore.v1.AggregationResultOrBuilder>(
+                aggregationResults_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
+        aggregationResults_ = null;
+      }
+      return aggregationResultsBuilder_;
+    }
+
+    private int moreResults_ = 0;
+    /**
+     *
+     *
+     * 
    +     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     * 
    
+     *
+     * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+     *
+     * @return The enum numeric value on the wire for moreResults.
+     */
+    @java.lang.Override
+    public int getMoreResultsValue() {
+      return moreResults_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     * 
    
+     *
+     * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+     *
+     * @param value The enum numeric value on the wire for moreResults to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMoreResultsValue(int value) {
+
+      moreResults_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     * 
    
+     *
+     * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+     *
+     * @return The moreResults.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
+      @SuppressWarnings("deprecation")
+      com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
+          com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+      return result == null
+          ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
+          : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     * 
    
+     *
+     * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+     *
+     * @param value The moreResults to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResultsType value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      moreResults_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     * 
    
+     *
+     * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearMoreResults() {
+
+      moreResults_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp readTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        readTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     *
+     * @return Whether the readTime field is set.
+     */
+    public boolean hasReadTime() {
+      return readTimeBuilder_ != null || readTime_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     *
+     * @return The readTime.
+     */
+    public com.google.protobuf.Timestamp getReadTime() {
+      if (readTimeBuilder_ == null) {
+        return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+      } else {
+        return readTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        readTime_ = value;
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     */
+    public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (readTimeBuilder_ == null) {
+        readTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        readTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     */
+    public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
+      if (readTimeBuilder_ == null) {
+        if (readTime_ != null) {
+          readTime_ =
+              com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+        } else {
+          readTime_ = value;
+        }
+        onChanged();
+      } else {
+        readTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     */
+    public Builder clearReadTime() {
+      if (readTimeBuilder_ == null) {
+        readTime_ = null;
+        onChanged();
+      } else {
+        readTime_ = null;
+        readTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     */
+    public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
+
+      onChanged();
+      return getReadTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     */
+    public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
+      if (readTimeBuilder_ != null) {
+        return readTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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.
+     * 
    
+     *
+     * .google.protobuf.Timestamp read_time = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getReadTimeFieldBuilder() {
+      if (readTimeBuilder_ == null) {
+        readTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getReadTime(), getParentForChildren(), isClean());
+        readTime_ = null;
+      }
+      return readTimeBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationResultBatch)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationResultBatch)
+  private static final com.google.datastore.v1.AggregationResultBatch DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationResultBatch();
+  }
+
+  public static com.google.datastore.v1.AggregationResultBatch getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public AggregationResultBatch parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationResultBatch getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..e104e9556667
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/aggregation_result.proto
+
+package com.google.datastore.v1;
+
+public interface AggregationResultBatchOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationResultBatch)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  java.util.List getAggregationResultsList();
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  com.google.datastore.v1.AggregationResult getAggregationResults(int index);
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  int getAggregationResultsCount();
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  java.util.List
+      getAggregationResultsOrBuilderList();
+  /**
+   *
+   *
+   * 
    +   * The aggregation results for this batch.
+   * 
    
+   *
+   * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
+   */
+  com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsOrBuilder(int index);
+
+  /**
+   *
+   *
+   * 
    +   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   * 
    
+   *
+   * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+   *
+   * @return The enum numeric value on the wire for moreResults.
+   */
+  int getMoreResultsValue();
+  /**
+   *
+   *
+   * 
    +   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   * 
    
+   *
+   * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2;
+   *
+   * @return The moreResults.
+   */
+  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.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 3;
+   *
+   * @return Whether the readTime field is set.
+   */
+  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.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 3;
+   *
+   * @return The readTime.
+   */
+  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.
+   * 
    
+   *
+   * .google.protobuf.Timestamp read_time = 3;
+   */
+  com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder();
+}
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
new file mode 100644
index 000000000000..7d03c654bcb8
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/aggregation_result.proto
+
+package com.google.datastore.v1;
+
+public interface AggregationResultOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationResult)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  boolean containsAggregateProperties(java.lang.String key);
+  /** Use {@link #getAggregatePropertiesMap()} instead. */
+  @java.lang.Deprecated
+  java.util.Map getAggregateProperties();
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  java.util.Map getAggregatePropertiesMap();
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+
+  /* nullable */
+  com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
+      java.lang.String key,
+      /* nullable */
+      com.google.datastore.v1.Value defaultValue);
+  /**
+   *
+   *
+   * 
    +   * 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 number of aggregation functions in the query.
+   * 
    
+   *
+   * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+   */
+  com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.String key);
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
new file mode 100644
index 000000000000..5f055196fbcc
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/aggregation_result.proto
+
+package com.google.datastore.v1;
+
+public final class AggregationResultProto {
+  private AggregationResultProto() {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationResult_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationResult_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationResult_AggregatePropertiesEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationResult_AggregatePropertiesEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationResultBatch_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationResultBatch_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+    return descriptor;
+  }
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+  static {
+    java.lang.String[] descriptorData = {
+      "\n,google/datastore/v1/aggregation_result"
+          + ".proto\022\023google.datastore.v1\032 google/data"
+          + "store/v1/entity.proto\032\037google/datastore/"
+          + "v1/query.proto\032\037google/protobuf/timestam"
+          + "p.proto\"\312\001\n\021AggregationResult\022]\n\024aggrega"
+          + "te_properties\030\002 \003(\0132?.google.datastore.v"
+          + "1.AggregationResult.AggregatePropertiesE"
+          + "ntry\032V\n\030AggregatePropertiesEntry\022\013\n\003key\030"
+          + "\001 \001(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore."
+          + "v1.Value:\0028\001\"\331\001\n\026AggregationResultBatch\022"
+          + "C\n\023aggregation_results\030\001 \003(\0132&.google.da"
+          + "tastore.v1.AggregationResult\022K\n\014more_res"
+          + "ults\030\002 \001(\01625.google.datastore.v1.QueryRe"
+          + "sultBatch.MoreResultsType\022-\n\tread_time\030\003"
+          + " \001(\0132\032.google.protobuf.TimestampB\310\001\n\027com"
+          + ".google.datastore.v1B\026AggregationResultP"
+          + "rotoP\001Z();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
-            }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        keys_ = java.util.Collections.unmodifiableList(keys_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
@@ -338,7 +272,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -356,7 +290,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -375,7 +309,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getProjectId().equals(other.getProjectId())) return false;
     if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (!getKeysList().equals(other.getKeysList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -394,7 +328,7 @@ public int hashCode() {
       hash = (37 * hash) + KEYS_FIELD_NUMBER;
       hash = (53 * hash) + getKeysList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -523,19 +457,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.AllocateIdsRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getKeysFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -547,10 +472,11 @@ public Builder clear() {
 
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        keys_ = null;
         keysBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -674,7 +600,7 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -689,17 +615,55 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.AllocateIdsRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.datastore.v1.Key m =
+                    input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+                if (keysBuilder_ == null) {
+                  ensureKeysIsMutable();
+                  keys_.add(m);
+                } else {
+                  keysBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.AllocateIdsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1337,7 +1301,18 @@ public AllocateIdsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new AllocateIdsRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 a2e0dd89bd0e..68a8619b631a 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
@@ -52,58 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private AllocateIdsResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        keys_ = java.util.Collections.unmodifiableList(keys_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
@@ -209,7 +157,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -221,7 +169,7 @@ public int getSerializedSize() {
     for (int i = 0; i < keys_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -238,7 +186,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.datastore.v1.AllocateIdsResponse) obj;
 
     if (!getKeysList().equals(other.getKeysList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -253,7 +201,7 @@ public int hashCode() {
       hash = (37 * hash) + KEYS_FIELD_NUMBER;
       hash = (53 * hash) + getKeysList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -382,19 +330,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.AllocateIdsResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getKeysFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -402,10 +341,11 @@ public Builder clear() {
       super.clear();
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        keys_ = null;
         keysBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -519,7 +459,7 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -534,17 +474,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.AllocateIdsResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.datastore.v1.Key m =
+                    input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+                if (keysBuilder_ == null) {
+                  ensureKeysIsMutable();
+                  keys_.add(m);
+                } else {
+                  keysBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.AllocateIdsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -942,7 +908,18 @@ public AllocateIdsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new AllocateIdsResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 8485701c200c..955ce99f4b51 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
@@ -52,59 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ArrayValue(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                values_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              values_.add(
-                  input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry));
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        values_ = java.util.Collections.unmodifiableList(values_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.EntityProto
         .internal_static_google_datastore_v1_ArrayValue_descriptor;
@@ -215,7 +162,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < values_.size(); i++) {
       output.writeMessage(1, values_.get(i));
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -227,7 +174,7 @@ public int getSerializedSize() {
     for (int i = 0; i < values_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, values_.get(i));
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -243,7 +190,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.ArrayValue other = (com.google.datastore.v1.ArrayValue) obj;
 
     if (!getValuesList().equals(other.getValuesList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -258,7 +205,7 @@ public int hashCode() {
       hash = (37 * hash) + VALUES_FIELD_NUMBER;
       hash = (53 * hash) + getValuesList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -386,19 +333,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.ArrayValue.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getValuesFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -406,10 +344,11 @@ public Builder clear() {
       super.clear();
       if (valuesBuilder_ == null) {
         values_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        values_ = null;
         valuesBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -522,7 +461,7 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -537,17 +476,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.ArrayValue parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.datastore.v1.Value m =
+                    input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
+                if (valuesBuilder_ == null) {
+                  ensureValuesIsMutable();
+                  values_.add(m);
+                } else {
+                  valuesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.ArrayValue) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -966,7 +931,18 @@ public ArrayValue parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ArrayValue(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 55b17ae9ea38..4dcc56f2f086 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
@@ -53,75 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private BeginTransactionRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          case 82:
-            {
-              com.google.datastore.v1.TransactionOptions.Builder subBuilder = null;
-              if (transactionOptions_ != null) {
-                subBuilder = transactionOptions_.toBuilder();
-              }
-              transactionOptions_ =
-                  input.readMessage(
-                      com.google.datastore.v1.TransactionOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(transactionOptions_);
-                transactionOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
@@ -310,7 +241,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (transactionOptions_ != null) {
       output.writeMessage(10, getTransactionOptions());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -328,7 +259,7 @@ public int getSerializedSize() {
     if (transactionOptions_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getTransactionOptions());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -350,7 +281,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasTransactionOptions()) {
       if (!getTransactionOptions().equals(other.getTransactionOptions())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -369,7 +300,7 @@ public int hashCode() {
       hash = (37 * hash) + TRANSACTION_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getTransactionOptions().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -498,17 +429,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.BeginTransactionRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -619,7 +543,7 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other)
       if (other.hasTransactionOptions()) {
         mergeTransactionOptions(other.getTransactionOptions());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -634,17 +558,50 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.BeginTransactionRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            case 82:
+              {
+                input.readMessage(
+                    getTransactionOptionsFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 82
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.BeginTransactionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1088,7 +1045,18 @@ public BeginTransactionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BeginTransactionRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 a63b48ba7a38..94f557d6379e 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
@@ -52,50 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private BeginTransactionResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              transaction_ = input.readBytes();
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
@@ -146,7 +102,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(1, transaction_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -158,7 +114,7 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -175,7 +131,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.datastore.v1.BeginTransactionResponse) obj;
 
     if (!getTransaction().equals(other.getTransaction())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -188,7 +144,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -317,17 +273,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.BeginTransactionResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -416,7 +365,7 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other)
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -431,17 +380,37 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.BeginTransactionResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                transaction_ = input.readBytes();
+
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.BeginTransactionResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -532,7 +501,18 @@ public BeginTransactionResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BeginTransactionResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 a52f58dd8b83..0cfbb87f0041 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
@@ -55,86 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private CommitRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              transactionSelector_ = input.readBytes();
-              transactionSelectorCase_ = 1;
-              break;
-            }
-          case 40:
-            {
-              int rawValue = input.readEnum();
-
-              mode_ = rawValue;
-              break;
-            }
-          case 50:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                mutations_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              mutations_.add(
-                  input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry));
-              break;
-            }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        mutations_ = java.util.Collections.unmodifiableList(mutations_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_CommitRequest_descriptor;
@@ -675,7 +595,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -701,7 +621,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -728,7 +648,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -757,7 +677,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -885,19 +805,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.CommitRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getMutationsFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -911,10 +822,11 @@ public Builder clear() {
 
       if (mutationsBuilder_ == null) {
         mutations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        mutations_ = null;
         mutationsBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       transactionSelectorCase_ = 0;
       transactionSelector_ = null;
       return this;
@@ -1059,7 +971,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -1074,17 +986,67 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.CommitRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                transactionSelector_ = input.readBytes();
+                transactionSelectorCase_ = 1;
+                break;
+              } // case 10
+            case 40:
+              {
+                mode_ = input.readEnum();
+
+                break;
+              } // case 40
+            case 50:
+              {
+                com.google.datastore.v1.Mutation m =
+                    input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry);
+                if (mutationsBuilder_ == null) {
+                  ensureMutationsIsMutable();
+                  mutations_.add(m);
+                } else {
+                  mutationsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 50
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.CommitRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2039,7 +2001,18 @@ public CommitRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CommitRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 a11c8835772a..785c9d38da71 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
@@ -52,81 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private CommitResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                mutationResults_ =
-                    new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              mutationResults_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.MutationResult.parser(), extensionRegistry));
-              break;
-            }
-          case 32:
-            {
-              indexUpdates_ = input.readInt32();
-              break;
-            }
-          case 66:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (commitTime_ != null) {
-                subBuilder = commitTime_.toBuilder();
-              }
-              commitTime_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(commitTime_);
-                commitTime_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_CommitResponse_descriptor;
@@ -304,7 +229,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (commitTime_ != null) {
       output.writeMessage(8, getCommitTime());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -322,7 +247,7 @@ public int getSerializedSize() {
     if (commitTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCommitTime());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -343,7 +268,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCommitTime()) {
       if (!getCommitTime().equals(other.getCommitTime())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -364,7 +289,7 @@ public int hashCode() {
       hash = (37 * hash) + COMMIT_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getCommitTime().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -493,19 +418,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.CommitResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getMutationResultsFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -513,10 +429,11 @@ public Builder clear() {
       super.clear();
       if (mutationResultsBuilder_ == null) {
         mutationResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        mutationResults_ = null;
         mutationResultsBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       indexUpdates_ = 0;
 
       if (commitTimeBuilder_ == null) {
@@ -650,7 +567,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) {
       if (other.hasCommitTime()) {
         mergeCommitTime(other.getCommitTime());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -665,17 +582,56 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.CommitResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 26:
+              {
+                com.google.datastore.v1.MutationResult m =
+                    input.readMessage(
+                        com.google.datastore.v1.MutationResult.parser(), extensionRegistry);
+                if (mutationResultsBuilder_ == null) {
+                  ensureMutationResultsIsMutable();
+                  mutationResults_.add(m);
+                } else {
+                  mutationResultsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+            case 32:
+              {
+                indexUpdates_ = input.readInt32();
+
+                break;
+              } // case 32
+            case 66:
+              {
+                input.readMessage(getCommitTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 66
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.CommitResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1323,7 +1279,18 @@ public CommitResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CommitResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 c67e8c36c560..dda88803e21f 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
@@ -53,66 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private CompositeFilter(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
-
-              op_ = rawValue;
-              break;
-            }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                filters_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              filters_.add(
-                  input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry));
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        filters_ = java.util.Collections.unmodifiableList(filters_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_CompositeFilter_descriptor;
@@ -398,7 +338,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < filters_.size(); i++) {
       output.writeMessage(2, filters_.get(i));
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -413,7 +353,7 @@ public int getSerializedSize() {
     for (int i = 0; i < filters_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, filters_.get(i));
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -430,7 +370,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (op_ != other.op_) return false;
     if (!getFiltersList().equals(other.getFiltersList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -447,7 +387,7 @@ public int hashCode() {
       hash = (37 * hash) + FILTERS_FIELD_NUMBER;
       hash = (53 * hash) + getFiltersList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -576,19 +516,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.CompositeFilter.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getFiltersFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -598,10 +529,11 @@ public Builder clear() {
 
       if (filtersBuilder_ == null) {
         filters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        filters_ = null;
         filtersBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -719,7 +651,7 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -734,17 +666,49 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.CompositeFilter parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                op_ = input.readEnum();
+
+                break;
+              } // case 8
+            case 18:
+              {
+                com.google.datastore.v1.Filter m =
+                    input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry);
+                if (filtersBuilder_ == null) {
+                  ensureFiltersIsMutable();
+                  filters_.add(m);
+                } else {
+                  filtersBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.CompositeFilter) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1257,7 +1221,18 @@ public CompositeFilter parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CompositeFilter(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 9c945ae1d1c6..dee44ef43cfc 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
@@ -43,6 +43,14 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_datastore_v1_RunQueryResponse_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_RunAggregationQueryRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_RunAggregationQueryRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_RunAggregationQueryResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -119,118 +127,136 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
       "\n#google/datastore/v1/datastore.proto\022\023g"
           + "oogle.datastore.v1\032\034google/api/annotatio"
           + "ns.proto\032\027google/api/client.proto\032\037googl"
-          + "e/api/field_behavior.proto\032 google/datas"
-          + "tore/v1/entity.proto\032\037google/datastore/v"
-          + "1/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_o"
-          + "ptions\030\001 \001(\0132 .google.datastore.v1.ReadO"
-          + "ptions\022+\n\004keys\030\003 \003(\0132\030.google.datastore."
-          + "v1.KeyB\003\340A\002\"\321\001\n\016LookupResponse\0220\n\005found\030"
-          + "\001 \003(\0132!.google.datastore.v1.EntityResult"
-          + "\0222\n\007missing\030\002 \003(\0132!.google.datastore.v1."
-          + "EntityResult\022*\n\010deferred\030\003 \003(\0132\030.google."
-          + "datastore.v1.Key\022-\n\tread_time\030\007 \001(\0132\032.go"
-          + "ogle.protobuf.Timestamp\"\236\002\n\017RunQueryRequ"
-          + "est\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_option"
-          + "s\030\001 \001(\0132 .google.datastore.v1.ReadOption"
-          + "s\022+\n\005query\030\003 \001(\0132\032.google.datastore.v1.Q"
-          + "ueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.datas"
-          + "tore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n\020RunQ"
-          + "ueryResponse\0224\n\005batch\030\001 \001(\0132%.google.dat"
-          + "astore.v1.QueryResultBatch\022)\n\005query\030\002 \001("
-          + "\0132\032.google.datastore.v1.Query\"\215\001\n\027BeginT"
-          + "ransactionRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
-          + "A\002\022\023\n\013database_id\030\t \001(\t\022D\n\023transaction_o"
-          + "ptions\030\n \001(\0132\'.google.datastore.v1.Trans"
-          + "actionOptions\"/\n\030BeginTransactionRespons"
-          + "e\022\023\n\013transaction\030\001 \001(\014\"Y\n\017RollbackReques"
-          + "t\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_i"
-          + "d\030\t \001(\t\022\030\n\013transaction\030\001 \001(\014B\003\340A\002\"\022\n\020Rol"
-          + "lbackResponse\"\235\002\n\rCommitRequest\022\027\n\nproje"
-          + "ct_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.Commit"
-          + "Request.Mode\022\025\n\013transaction\030\001 \001(\014H\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\"\224\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"
-          + "\013update_time\030\006 \001(\0132\032.google.protobuf.Tim"
-          + "estamp\022\031\n\021conflict_detected\030\005 \001(\010\"\206\002\n\013Re"
-          + "adOptions\022L\n\020read_consistency\030\001 \001(\01620.go"
-          + "ogle.datastore.v1.ReadOptions.ReadConsis"
-          + "tencyH\000\022\025\n\013transaction\030\002 \001(\014H\000\022/\n\tread_t"
-          + "ime\030\004 \001(\0132\032.google.protobuf.TimestampH\000\""
-          + "M\n\017ReadConsistency\022 \n\034READ_CONSISTENCY_U"
-          + "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022"
-          + "\n\020consistency_type\"\222\002\n\022TransactionOption"
-          + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore"
-          + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre"
-          + "ad_only\030\002 \001(\01320.google.datastore.v1.Tran"
-          + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034"
-          + "\n\024previous_transaction\030\001 \001(\014\0329\n\010ReadOnly"
-          + "\022-\n\tread_time\030\001 \001(\0132\032.google.protobuf.Ti"
-          + "mestampB\006\n\004mode2\223\n\n\tDatastore\022\235\001\n\006Lookup"
-          + "\022\".google.datastore.v1.LookupRequest\032#.g"
-          + "oogle.datastore.v1.LookupResponse\"J\202\323\344\223\002"
-          + "%\" /v1/projects/{project_id}:lookup:\001*\332A"
-          + "\034project_id,read_options,keys\022\206\001\n\010RunQue"
-          + "ry\022$.google.datastore.v1.RunQueryRequest"
-          + "\032%.google.datastore.v1.RunQueryResponse\""
-          + "-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQu"
-          + "ery:\001*\022\263\001\n\020BeginTransaction\022,.google.dat"
-          + "astore.v1.BeginTransactionRequest\032-.goog"
-          + "le.datastore.v1.BeginTransactionResponse"
-          + "\"B\202\323\344\223\002/\"*/v1/projects/{project_id}:begi"
-          + "nTransaction:\001*\332A\nproject_id\022\302\001\n\006Commit\022"
-          + "\".google.datastore.v1.CommitRequest\032#.go"
-          + "ogle.datastore.v1.CommitResponse\"o\202\323\344\223\002%"
-          + "\" /v1/projects/{project_id}:commit:\001*\332A%"
-          + "project_id,mode,transaction,mutations\332A\031"
-          + "project_id,mode,mutations\022\237\001\n\010Rollback\022$"
-          + ".google.datastore.v1.RollbackRequest\032%.g"
-          + "oogle.datastore.v1.RollbackResponse\"F\202\323\344"
-          + "\223\002\'\"\"/v1/projects/{project_id}:rollback:"
-          + "\001*\332A\026project_id,transaction\022\244\001\n\013Allocate"
-          + "Ids\022\'.google.datastore.v1.AllocateIdsReq"
-          + "uest\032(.google.datastore.v1.AllocateIdsRe"
-          + "sponse\"B\202\323\344\223\002*\"%/v1/projects/{project_id"
-          + "}:allocateIds:\001*\332A\017project_id,keys\022\240\001\n\nR"
-          + "eserveIds\022&.google.datastore.v1.ReserveI"
-          + "dsRequest\032\'.google.datastore.v1.ReserveI"
-          + "dsResponse\"A\202\323\344\223\002)\"$/v1/projects/{projec"
-          + "t_id}:reserveIds:\001*\332A\017project_id,keys\032v\312"
-          + "A\030datastore.googleapis.com\322AXhttps://www"
-          + ".googleapis.com/auth/cloud-platform,http"
-          + "s://www.googleapis.com/auth/datastoreB\300\001"
-          + "\n\027com.google.datastore.v1B\016DatastoreProt"
-          + "oP\001Z
-                  properties__ =
-                      input.readMessage(
-                          PropertiesDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-              properties_.getMutableMap().put(properties__.getKey(), properties__.getValue());
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.EntityProto
         .internal_static_google_datastore_v1_Entity_descriptor;
@@ -349,7 +279,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetProperties(), PropertiesDefaultEntryHolder.defaultEntry, 3);
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -371,7 +301,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, properties__);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -391,7 +321,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getKey().equals(other.getKey())) return false;
     }
     if (!internalGetProperties().equals(other.internalGetProperties())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -410,7 +340,7 @@ public int hashCode() {
       hash = (37 * hash) + PROPERTIES_FIELD_NUMBER;
       hash = (53 * hash) + internalGetProperties().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -560,17 +490,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.v1.Entity.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -670,7 +593,7 @@ public Builder mergeFrom(com.google.datastore.v1.Entity other) {
         mergeKey(other.getKey());
       }
       internalGetMutableProperties().mergeFrom(other.internalGetProperties());
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -685,17 +608,49 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.Entity parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getKeyFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 26:
+              {
+                com.google.protobuf.MapEntry
+                    properties__ =
+                        input.readMessage(
+                            PropertiesDefaultEntryHolder.defaultEntry.getParserForType(),
+                            extensionRegistry);
+                internalGetMutableProperties()
+                    .getMutableMap()
+                    .put(properties__.getKey(), properties__.getValue());
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.Entity) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1146,7 +1101,18 @@ public Entity parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Entity(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 226d3c862c96..eef264477d2b 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
@@ -52,85 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private EntityResult(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (entity_ != null) {
-                subBuilder = entity_.toBuilder();
-              }
-              entity_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(entity_);
-                entity_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 26:
-            {
-              cursor_ = input.readBytes();
-              break;
-            }
-          case 32:
-            {
-              version_ = input.readInt64();
-              break;
-            }
-          case 42:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (updateTime_ != null) {
-                subBuilder = updateTime_.toBuilder();
-              }
-              updateTime_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(updateTime_);
-                updateTime_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_EntityResult_descriptor;
@@ -499,7 +420,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateTime_ != null) {
       output.writeMessage(5, getUpdateTime());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -520,7 +441,7 @@ public int getSerializedSize() {
     if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -545,7 +466,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
     }
     if (!getCursor().equals(other.getCursor())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -568,7 +489,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + CURSOR_FIELD_NUMBER;
     hash = (53 * hash) + getCursor().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -696,17 +617,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.EntityResult.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -827,7 +741,7 @@ public Builder mergeFrom(com.google.datastore.v1.EntityResult other) {
       if (other.getCursor() != com.google.protobuf.ByteString.EMPTY) {
         setCursor(other.getCursor());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -842,17 +756,55 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.EntityResult parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getEntityFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 26:
+              {
+                cursor_ = input.readBytes();
+
+                break;
+              } // case 26
+            case 32:
+              {
+                version_ = input.readInt64();
+
+                break;
+              } // case 32
+            case 42:
+              {
+                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 42
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.EntityResult) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1405,7 +1357,18 @@ public EntityResult parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new EntityResult(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 9d6a72de94c9..ec80c9d20b65 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
@@ -50,77 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Filter(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.CompositeFilter.Builder subBuilder = null;
-              if (filterTypeCase_ == 1) {
-                subBuilder = ((com.google.datastore.v1.CompositeFilter) filterType_).toBuilder();
-              }
-              filterType_ =
-                  input.readMessage(
-                      com.google.datastore.v1.CompositeFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.CompositeFilter) filterType_);
-                filterType_ = subBuilder.buildPartial();
-              }
-              filterTypeCase_ = 1;
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.v1.PropertyFilter.Builder subBuilder = null;
-              if (filterTypeCase_ == 2) {
-                subBuilder = ((com.google.datastore.v1.PropertyFilter) filterType_).toBuilder();
-              }
-              filterType_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.PropertyFilter) filterType_);
-                filterType_ = subBuilder.buildPartial();
-              }
-              filterTypeCase_ = 2;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
   }
@@ -303,7 +232,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (filterTypeCase_ == 2) {
       output.writeMessage(2, (com.google.datastore.v1.PropertyFilter) filterType_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -322,7 +251,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               2, (com.google.datastore.v1.PropertyFilter) filterType_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -348,7 +277,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -371,7 +300,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -498,22 +427,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Filter.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      if (compositeFilterBuilder_ != null) {
+        compositeFilterBuilder_.clear();
+      }
+      if (propertyFilterBuilder_ != null) {
+        propertyFilterBuilder_.clear();
+      }
       filterTypeCase_ = 0;
       filterType_ = null;
       return this;
@@ -622,7 +550,7 @@ public Builder mergeFrom(com.google.datastore.v1.Filter other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -637,17 +565,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.Filter parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getCompositeFilterFieldBuilder().getBuilder(), extensionRegistry);
+                filterTypeCase_ = 1;
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getPropertyFilterFieldBuilder().getBuilder(), extensionRegistry);
+                filterTypeCase_ = 2;
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.Filter) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1117,7 +1071,18 @@ public Filter parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Filter(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 e2026ea3dd4a..5ade457019f4 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
@@ -54,92 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private GqlQuery(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              queryString_ = s;
-              break;
-            }
-          case 16:
-            {
-              allowLiterals_ = input.readBool();
-              break;
-            }
-          case 34:
-            {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                positionalBindings_ =
-                    new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              positionalBindings_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry));
-              break;
-            }
-          case 42:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                namedBindings_ =
-                    com.google.protobuf.MapField.newMapField(
-                        NamedBindingsDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry<
-                      java.lang.String, com.google.datastore.v1.GqlQueryParameter>
-                  namedBindings__ =
-                      input.readMessage(
-                          NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-              namedBindings_
-                  .getMutableMap()
-                  .put(namedBindings__.getKey(), namedBindings__.getValue());
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000002) != 0)) {
-        positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_GqlQuery_descriptor;
@@ -468,7 +382,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetNamedBindings(), NamedBindingsDefaultEntryHolder.defaultEntry, 5);
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -498,7 +412,7 @@ public int getSerializedSize() {
                   .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, namedBindings__);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -517,7 +431,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getAllowLiterals() != other.getAllowLiterals()) return false;
     if (!internalGetNamedBindings().equals(other.internalGetNamedBindings())) return false;
     if (!getPositionalBindingsList().equals(other.getPositionalBindingsList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -540,7 +454,7 @@ public int hashCode() {
       hash = (37 * hash) + POSITIONAL_BINDINGS_FIELD_NUMBER;
       hash = (53 * hash) + getPositionalBindingsList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -689,19 +603,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.v1.GqlQuery.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPositionalBindingsFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -714,10 +619,11 @@ public Builder clear() {
       internalGetMutableNamedBindings().clear();
       if (positionalBindingsBuilder_ == null) {
         positionalBindings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
+        positionalBindings_ = null;
         positionalBindingsBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -842,7 +748,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -857,17 +763,69 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.GqlQuery parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                queryString_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            case 16:
+              {
+                allowLiterals_ = input.readBool();
+
+                break;
+              } // case 16
+            case 34:
+              {
+                com.google.datastore.v1.GqlQueryParameter m =
+                    input.readMessage(
+                        com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry);
+                if (positionalBindingsBuilder_ == null) {
+                  ensurePositionalBindingsIsMutable();
+                  positionalBindings_.add(m);
+                } else {
+                  positionalBindingsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 34
+            case 42:
+              {
+                com.google.protobuf.MapEntry<
+                        java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+                    namedBindings__ =
+                        input.readMessage(
+                            NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(),
+                            extensionRegistry);
+                internalGetMutableNamedBindings()
+                    .getMutableMap()
+                    .put(namedBindings__.getKey(), namedBindings__.getValue());
+                break;
+              } // case 42
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.GqlQuery) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1683,7 +1641,18 @@ public GqlQuery parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new GqlQuery(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 77f69f37ea7b..826d09f6da7d 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
@@ -50,66 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private GqlQueryParameter(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 18:
-            {
-              com.google.datastore.v1.Value.Builder subBuilder = null;
-              if (parameterTypeCase_ == 2) {
-                subBuilder = ((com.google.datastore.v1.Value) parameterType_).toBuilder();
-              }
-              parameterType_ =
-                  input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Value) parameterType_);
-                parameterType_ = subBuilder.buildPartial();
-              }
-              parameterTypeCase_ = 2;
-              break;
-            }
-          case 26:
-            {
-              parameterType_ = input.readBytes();
-              parameterTypeCase_ = 3;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
@@ -280,7 +220,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (parameterTypeCase_ == 3) {
       output.writeBytes(3, (com.google.protobuf.ByteString) parameterType_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -299,7 +239,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeBytesSize(
               3, (com.google.protobuf.ByteString) parameterType_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -326,7 +266,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -349,7 +289,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -478,22 +418,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.GqlQueryParameter.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      if (valueBuilder_ != null) {
+        valueBuilder_.clear();
+      }
       parameterTypeCase_ = 0;
       parameterType_ = null;
       return this;
@@ -599,7 +535,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -614,17 +550,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.GqlQueryParameter parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 18:
+              {
+                input.readMessage(getValueFieldBuilder().getBuilder(), extensionRegistry);
+                parameterTypeCase_ = 2;
+                break;
+              } // case 18
+            case 26:
+              {
+                parameterType_ = input.readBytes();
+                parameterTypeCase_ = 3;
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.GqlQueryParameter) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -957,7 +919,18 @@ public GqlQueryParameter parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new GqlQueryParameter(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 54a39945fb09..5a7013420c22 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
@@ -55,76 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Key(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.PartitionId.Builder subBuilder = null;
-              if (partitionId_ != null) {
-                subBuilder = partitionId_.toBuilder();
-              }
-              partitionId_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(partitionId_);
-                partitionId_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                path_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              path_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry));
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        path_ = java.util.Collections.unmodifiableList(path_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
   }
@@ -302,65 +232,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
-    private PathElement(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-
-                kind_ = s;
-                break;
-              }
-            case 16:
-              {
-                idType_ = input.readInt64();
-                idTypeCase_ = 2;
-                break;
-              }
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                idTypeCase_ = 3;
-                idType_ = s;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.datastore.v1.EntityProto
           .internal_static_google_datastore_v1_Key_PathElement_descriptor;
@@ -634,7 +505,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (idTypeCase_ == 3) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, idType_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -654,7 +525,7 @@ public int getSerializedSize() {
       if (idTypeCase_ == 3) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, idType_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -681,7 +552,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -706,7 +577,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -839,17 +710,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.datastore.v1.Key.PathElement.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -967,7 +831,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) {
               break;
             }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -982,17 +846,50 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.datastore.v1.Key.PathElement parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  kind_ = input.readStringRequireUtf8();
+
+                  break;
+                } // case 10
+              case 16:
+                {
+                  idType_ = input.readInt64();
+                  idTypeCase_ = 2;
+                  break;
+                } // case 16
+              case 26:
+                {
+                  java.lang.String s = input.readStringRequireUtf8();
+                  idTypeCase_ = 3;
+                  idType_ = s;
+                  break;
+                } // case 26
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.datastore.v1.Key.PathElement) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -1426,7 +1323,19 @@ public PathElement parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new PathElement(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -1653,7 +1562,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < path_.size(); i++) {
       output.writeMessage(2, path_.get(i));
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -1668,7 +1577,7 @@ public int getSerializedSize() {
     for (int i = 0; i < path_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, path_.get(i));
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1688,7 +1597,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getPartitionId().equals(other.getPartitionId())) return false;
     }
     if (!getPathList().equals(other.getPathList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -1707,7 +1616,7 @@ public int hashCode() {
       hash = (37 * hash) + PATH_FIELD_NUMBER;
       hash = (53 * hash) + getPathList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1836,19 +1745,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Key.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPathFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -1862,10 +1762,11 @@ public Builder clear() {
       }
       if (pathBuilder_ == null) {
         path_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        path_ = null;
         pathBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1985,7 +1886,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -2000,17 +1901,50 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.Key parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                com.google.datastore.v1.Key.PathElement m =
+                    input.readMessage(
+                        com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry);
+                if (pathBuilder_ == null) {
+                  ensurePathIsMutable();
+                  path_.add(m);
+                } else {
+                  pathBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.Key) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2833,7 +2767,18 @@ public Key parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Key(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 2c1af7333bb1..b99564aff4f7 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
@@ -52,52 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private KindExpression(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              name_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_KindExpression_descriptor;
@@ -179,7 +133,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -191,7 +145,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -207,7 +161,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.KindExpression other = (com.google.datastore.v1.KindExpression) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -220,7 +174,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -349,17 +303,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.KindExpression.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -448,7 +395,7 @@ public Builder mergeFrom(com.google.datastore.v1.KindExpression other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -463,17 +410,37 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.KindExpression parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                name_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.KindExpression) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -615,7 +582,18 @@ public KindExpression parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KindExpression(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 ebf3384807bb..5966f23c75ff 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
@@ -54,88 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private LookupRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
-              if (readOptions_ != null) {
-                subBuilder = readOptions_.toBuilder();
-              }
-              readOptions_ =
-                  input.readMessage(
-                      com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(readOptions_);
-                readOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
-            }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        keys_ = java.util.Collections.unmodifiableList(keys_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_LookupRequest_descriptor;
@@ -400,7 +318,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -421,7 +339,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -443,7 +361,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
     if (!getKeysList().equals(other.getKeysList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -466,7 +384,7 @@ public int hashCode() {
       hash = (37 * hash) + KEYS_FIELD_NUMBER;
       hash = (53 * hash) + getKeysList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -594,19 +512,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.LookupRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getKeysFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -624,10 +533,11 @@ public Builder clear() {
       }
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        keys_ = null;
         keysBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -759,7 +669,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -774,17 +684,61 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.LookupRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 26:
+              {
+                com.google.datastore.v1.Key m =
+                    input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+                if (keysBuilder_ == null) {
+                  ensureKeysIsMutable();
+                  keys_.add(m);
+                } else {
+                  keysBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.LookupRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1589,7 +1543,18 @@ public LookupRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LookupRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 f28afaa4017d..133242919a46 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
@@ -54,102 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private LookupResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                found_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              found_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-              break;
-            }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                missing_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              missing_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-              break;
-            }
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                deferred_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              deferred_.add(
-                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
-            }
-          case 58:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (readTime_ != null) {
-                subBuilder = readTime_.toBuilder();
-              }
-              readTime_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(readTime_);
-                readTime_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        found_ = java.util.Collections.unmodifiableList(found_);
-      }
-      if (((mutable_bitField0_ & 0x00000002) != 0)) {
-        missing_ = java.util.Collections.unmodifiableList(missing_);
-      }
-      if (((mutable_bitField0_ & 0x00000004) != 0)) {
-        deferred_ = java.util.Collections.unmodifiableList(deferred_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_LookupResponse_descriptor;
@@ -473,7 +377,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (readTime_ != null) {
       output.writeMessage(7, getReadTime());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -494,7 +398,7 @@ public int getSerializedSize() {
     if (readTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getReadTime());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -516,7 +420,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadTime()) {
       if (!getReadTime().equals(other.getReadTime())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -543,7 +447,7 @@ public int hashCode() {
       hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getReadTime().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -672,21 +576,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.LookupResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getFoundFieldBuilder();
-        getMissingFieldBuilder();
-        getDeferredFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -694,22 +587,25 @@ public Builder clear() {
       super.clear();
       if (foundBuilder_ == null) {
         found_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        found_ = null;
         foundBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (missingBuilder_ == null) {
         missing_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
+        missing_ = null;
         missingBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000002);
       if (deferredBuilder_ == null) {
         deferred_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
       } else {
+        deferred_ = null;
         deferredBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000004);
       if (readTimeBuilder_ == null) {
         readTime_ = null;
       } else {
@@ -909,7 +805,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
       if (other.hasReadTime()) {
         mergeReadTime(other.getReadTime());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -924,17 +820,75 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.LookupResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.datastore.v1.EntityResult m =
+                    input.readMessage(
+                        com.google.datastore.v1.EntityResult.parser(), extensionRegistry);
+                if (foundBuilder_ == null) {
+                  ensureFoundIsMutable();
+                  found_.add(m);
+                } else {
+                  foundBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            case 18:
+              {
+                com.google.datastore.v1.EntityResult m =
+                    input.readMessage(
+                        com.google.datastore.v1.EntityResult.parser(), extensionRegistry);
+                if (missingBuilder_ == null) {
+                  ensureMissingIsMutable();
+                  missing_.add(m);
+                } else {
+                  missingBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+            case 26:
+              {
+                com.google.datastore.v1.Key m =
+                    input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+                if (deferredBuilder_ == null) {
+                  ensureDeferredIsMutable();
+                  deferred_.add(m);
+                } else {
+                  deferredBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+            case 58:
+              {
+                input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 58
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.LookupResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2300,7 +2254,18 @@ public LookupResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LookupResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 aea812247d36..97fbd92d84d9 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
@@ -50,127 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Mutation(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 34:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (operationCase_ == 4) {
-                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 4;
-              break;
-            }
-          case 42:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (operationCase_ == 5) {
-                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 5;
-              break;
-            }
-          case 50:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (operationCase_ == 6) {
-                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 6;
-              break;
-            }
-          case 58:
-            {
-              com.google.datastore.v1.Key.Builder subBuilder = null;
-              if (operationCase_ == 7) {
-                subBuilder = ((com.google.datastore.v1.Key) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Key) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 7;
-              break;
-            }
-          case 64:
-            {
-              conflictDetectionStrategy_ = input.readInt64();
-              conflictDetectionStrategyCase_ = 8;
-              break;
-            }
-          case 90:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (conflictDetectionStrategyCase_ == 11) {
-                subBuilder =
-                    ((com.google.protobuf.Timestamp) conflictDetectionStrategy_).toBuilder();
-              }
-              conflictDetectionStrategy_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.protobuf.Timestamp) conflictDetectionStrategy_);
-                conflictDetectionStrategy_ = subBuilder.buildPartial();
-              }
-              conflictDetectionStrategyCase_ = 11;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_Mutation_descriptor;
@@ -629,7 +508,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (conflictDetectionStrategyCase_ == 11) {
       output.writeMessage(11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -668,7 +547,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -712,7 +591,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -755,7 +634,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -883,22 +762,30 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Mutation.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      if (insertBuilder_ != null) {
+        insertBuilder_.clear();
+      }
+      if (updateBuilder_ != null) {
+        updateBuilder_.clear();
+      }
+      if (upsertBuilder_ != null) {
+        upsertBuilder_.clear();
+      }
+      if (deleteBuilder_ != null) {
+        deleteBuilder_.clear();
+      }
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.clear();
+      }
       operationCase_ = 0;
       operation_ = null;
       conflictDetectionStrategyCase_ = 0;
@@ -1060,7 +947,7 @@ public Builder mergeFrom(com.google.datastore.v1.Mutation other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -1075,17 +962,67 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.Mutation parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 34:
+              {
+                input.readMessage(getInsertFieldBuilder().getBuilder(), extensionRegistry);
+                operationCase_ = 4;
+                break;
+              } // case 34
+            case 42:
+              {
+                input.readMessage(getUpdateFieldBuilder().getBuilder(), extensionRegistry);
+                operationCase_ = 5;
+                break;
+              } // case 42
+            case 50:
+              {
+                input.readMessage(getUpsertFieldBuilder().getBuilder(), extensionRegistry);
+                operationCase_ = 6;
+                break;
+              } // case 50
+            case 58:
+              {
+                input.readMessage(getDeleteFieldBuilder().getBuilder(), extensionRegistry);
+                operationCase_ = 7;
+                break;
+              } // case 58
+            case 64:
+              {
+                conflictDetectionStrategy_ = input.readInt64();
+                conflictDetectionStrategyCase_ = 8;
+                break;
+              } // case 64
+            case 90:
+              {
+                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
+                conflictDetectionStrategyCase_ = 11;
+                break;
+              } // case 90
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.Mutation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2312,7 +2249,18 @@ public Mutation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Mutation(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 3a36fee6bfe5..a5b6be766456 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
@@ -50,84 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private MutationResult(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 26:
-            {
-              com.google.datastore.v1.Key.Builder subBuilder = null;
-              if (key_ != null) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 32:
-            {
-              version_ = input.readInt64();
-              break;
-            }
-          case 40:
-            {
-              conflictDetected_ = input.readBool();
-              break;
-            }
-          case 50:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (updateTime_ != null) {
-                subBuilder = updateTime_.toBuilder();
-              }
-              updateTime_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(updateTime_);
-                updateTime_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_MutationResult_descriptor;
@@ -314,7 +236,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateTime_ != null) {
       output.writeMessage(6, getUpdateTime());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -335,7 +257,7 @@ public int getSerializedSize() {
     if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getUpdateTime());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -360,7 +282,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
     }
     if (getConflictDetected() != other.getConflictDetected()) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -383,7 +305,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConflictDetected());
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -512,17 +434,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.MutationResult.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -644,7 +559,7 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) {
       if (other.getConflictDetected() != false) {
         setConflictDetected(other.getConflictDetected());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -659,17 +574,55 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.MutationResult parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 26:
+              {
+                input.readMessage(getKeyFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 26
+            case 32:
+              {
+                version_ = input.readInt64();
+
+                break;
+              } // case 32
+            case 40:
+              {
+                conflictDetected_ = input.readBool();
+
+                break;
+              } // case 40
+            case 50:
+              {
+                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 50
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.MutationResult) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1220,7 +1173,18 @@ public MutationResult parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MutationResult(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 49784b939f4f..6f3c39a7b420 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
@@ -68,66 +68,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private PartitionId(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 18:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          case 34:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              namespaceId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.EntityProto
         .internal_static_google_datastore_v1_PartitionId_descriptor;
@@ -315,7 +255,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -333,7 +273,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -351,7 +291,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getProjectId().equals(other.getProjectId())) return false;
     if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (!getNamespaceId().equals(other.getNamespaceId())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -368,7 +308,7 @@ public int hashCode() {
     hash = (53 * hash) + getDatabaseId().hashCode();
     hash = (37 * hash) + NAMESPACE_ID_FIELD_NUMBER;
     hash = (53 * hash) + getNamespaceId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -510,17 +450,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.PartitionId.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -622,7 +555,7 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) {
         namespaceId_ = other.namespaceId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -637,17 +570,49 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.PartitionId parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 18:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 18
+            case 26:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 26
+            case 34:
+              {
+                namespaceId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 34
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.PartitionId) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1006,7 +971,18 @@ public PartitionId parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PartitionId(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 1d91086af446..649c178c78e4 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
@@ -50,61 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Projection(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-              if (property_ != null) {
-                subBuilder = property_.toBuilder();
-              }
-              property_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(property_);
-                property_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_Projection_descriptor;
@@ -185,7 +130,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (property_ != null) {
       output.writeMessage(1, getProperty());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -197,7 +142,7 @@ public int getSerializedSize() {
     if (property_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -216,7 +161,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasProperty()) {
       if (!getProperty().equals(other.getProperty())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -231,7 +176,7 @@ public int hashCode() {
       hash = (37 * hash) + PROPERTY_FIELD_NUMBER;
       hash = (53 * hash) + getProperty().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -359,17 +304,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Projection.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -464,7 +402,7 @@ public Builder mergeFrom(com.google.datastore.v1.Projection other) {
       if (other.hasProperty()) {
         mergeProperty(other.getProperty());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -479,17 +417,37 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.Projection parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.Projection) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -710,7 +668,18 @@ public Projection parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Projection(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 cfaa78f90603..8349299a7a95 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
@@ -52,82 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private PropertyFilter(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-              if (property_ != null) {
-                subBuilder = property_.toBuilder();
-              }
-              property_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(property_);
-                property_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 16:
-            {
-              int rawValue = input.readEnum();
-
-              op_ = rawValue;
-              break;
-            }
-          case 26:
-            {
-              com.google.datastore.v1.Value.Builder subBuilder = null;
-              if (value_ != null) {
-                subBuilder = value_.toBuilder();
-              }
-              value_ = input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(value_);
-                value_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_PropertyFilter_descriptor;
@@ -647,7 +571,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (value_ != null) {
       output.writeMessage(3, getValue());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -665,7 +589,7 @@ public int getSerializedSize() {
     if (value_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getValue());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -689,7 +613,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasValue()) {
       if (!getValue().equals(other.getValue())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -710,7 +634,7 @@ public int hashCode() {
       hash = (37 * hash) + VALUE_FIELD_NUMBER;
       hash = (53 * hash) + getValue().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -839,17 +763,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.PropertyFilter.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -965,7 +882,7 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyFilter other) {
       if (other.hasValue()) {
         mergeValue(other.getValue());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -980,17 +897,49 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.PropertyFilter parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 16:
+              {
+                op_ = input.readEnum();
+
+                break;
+              } // case 16
+            case 26:
+              {
+                input.readMessage(getValueFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 26
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.PropertyFilter) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1480,7 +1429,18 @@ public PropertyFilter parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PropertyFilter(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 4eff592cb966..64421fa0bb01 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
@@ -52,68 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private PropertyOrder(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-              if (property_ != null) {
-                subBuilder = property_.toBuilder();
-              }
-              property_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(property_);
-                property_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 16:
-            {
-              int rawValue = input.readEnum();
-
-              direction_ = rawValue;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_PropertyOrder_descriptor;
@@ -391,7 +329,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, direction_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -407,7 +345,7 @@ public int getSerializedSize() {
         != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -427,7 +365,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getProperty().equals(other.getProperty())) return false;
     }
     if (direction_ != other.direction_) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -444,7 +382,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
     hash = (53 * hash) + direction_;
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -572,17 +510,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.PropertyOrder.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -684,7 +615,7 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyOrder other) {
       if (other.direction_ != 0) {
         setDirectionValue(other.getDirectionValue());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -699,17 +630,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.PropertyOrder parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 16:
+              {
+                direction_ = input.readEnum();
+
+                break;
+              } // case 16
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.PropertyOrder) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1021,7 +978,18 @@ public PropertyOrder parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PropertyOrder(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 bc42d006471d..faf96096fee2 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
@@ -52,52 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private PropertyReference(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 18:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              name_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_PropertyReference_descriptor;
@@ -181,7 +135,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -193,7 +147,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -210,7 +164,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.datastore.v1.PropertyReference) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -223,7 +177,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -352,17 +306,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.PropertyReference.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -451,7 +398,7 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -466,17 +413,37 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.PropertyReference parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 18:
+              {
+                name_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.PropertyReference) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -623,7 +590,18 @@ public PropertyReference parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PropertyReference(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 781346c620e9..c0bba0ad96d8 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
@@ -57,147 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Query(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                projection_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              projection_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.Projection.parser(), extensionRegistry));
-              break;
-            }
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                kind_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              kind_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.KindExpression.parser(), extensionRegistry));
-              break;
-            }
-          case 34:
-            {
-              com.google.datastore.v1.Filter.Builder subBuilder = null;
-              if (filter_ != null) {
-                subBuilder = filter_.toBuilder();
-              }
-              filter_ =
-                  input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(filter_);
-                filter_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 42:
-            {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                order_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              order_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry));
-              break;
-            }
-          case 50:
-            {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                distinctOn_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              distinctOn_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry));
-              break;
-            }
-          case 58:
-            {
-              startCursor_ = input.readBytes();
-              break;
-            }
-          case 66:
-            {
-              endCursor_ = input.readBytes();
-              break;
-            }
-          case 80:
-            {
-              offset_ = input.readInt32();
-              break;
-            }
-          case 98:
-            {
-              com.google.protobuf.Int32Value.Builder subBuilder = null;
-              if (limit_ != null) {
-                subBuilder = limit_.toBuilder();
-              }
-              limit_ =
-                  input.readMessage(com.google.protobuf.Int32Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(limit_);
-                limit_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        projection_ = java.util.Collections.unmodifiableList(projection_);
-      }
-      if (((mutable_bitField0_ & 0x00000002) != 0)) {
-        kind_ = java.util.Collections.unmodifiableList(kind_);
-      }
-      if (((mutable_bitField0_ & 0x00000004) != 0)) {
-        order_ = java.util.Collections.unmodifiableList(order_);
-      }
-      if (((mutable_bitField0_ & 0x00000008) != 0)) {
-        distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
   }
@@ -705,7 +564,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (limit_ != null) {
       output.writeMessage(12, getLimit());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -741,7 +600,7 @@ public int getSerializedSize() {
     if (limit_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getLimit());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -771,7 +630,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasLimit()) {
       if (!getLimit().equals(other.getLimit())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -812,7 +671,7 @@ public int hashCode() {
       hash = (37 * hash) + LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getLimit().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -939,22 +798,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Query.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getProjectionFieldBuilder();
-        getKindFieldBuilder();
-        getOrderFieldBuilder();
-        getDistinctOnFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -962,16 +809,18 @@ public Builder clear() {
       super.clear();
       if (projectionBuilder_ == null) {
         projection_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        projection_ = null;
         projectionBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (kindBuilder_ == null) {
         kind_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
+        kind_ = null;
         kindBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000002);
       if (filterBuilder_ == null) {
         filter_ = null;
       } else {
@@ -980,16 +829,18 @@ public Builder clear() {
       }
       if (orderBuilder_ == null) {
         order_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
       } else {
+        order_ = null;
         orderBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000004);
       if (distinctOnBuilder_ == null) {
         distinctOn_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
       } else {
+        distinctOn_ = null;
         distinctOnBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000008);
       startCursor_ = com.google.protobuf.ByteString.EMPTY;
 
       endCursor_ = com.google.protobuf.ByteString.EMPTY;
@@ -1250,7 +1101,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
       if (other.hasLimit()) {
         mergeLimit(other.getLimit());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -1265,17 +1116,113 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.Query parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 18:
+              {
+                com.google.datastore.v1.Projection m =
+                    input.readMessage(
+                        com.google.datastore.v1.Projection.parser(), extensionRegistry);
+                if (projectionBuilder_ == null) {
+                  ensureProjectionIsMutable();
+                  projection_.add(m);
+                } else {
+                  projectionBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+            case 26:
+              {
+                com.google.datastore.v1.KindExpression m =
+                    input.readMessage(
+                        com.google.datastore.v1.KindExpression.parser(), extensionRegistry);
+                if (kindBuilder_ == null) {
+                  ensureKindIsMutable();
+                  kind_.add(m);
+                } else {
+                  kindBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+            case 34:
+              {
+                input.readMessage(getFilterFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 34
+            case 42:
+              {
+                com.google.datastore.v1.PropertyOrder m =
+                    input.readMessage(
+                        com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry);
+                if (orderBuilder_ == null) {
+                  ensureOrderIsMutable();
+                  order_.add(m);
+                } else {
+                  orderBuilder_.addMessage(m);
+                }
+                break;
+              } // case 42
+            case 50:
+              {
+                com.google.datastore.v1.PropertyReference m =
+                    input.readMessage(
+                        com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
+                if (distinctOnBuilder_ == null) {
+                  ensureDistinctOnIsMutable();
+                  distinctOn_.add(m);
+                } else {
+                  distinctOnBuilder_.addMessage(m);
+                }
+                break;
+              } // case 50
+            case 58:
+              {
+                startCursor_ = input.readBytes();
+
+                break;
+              } // case 58
+            case 66:
+              {
+                endCursor_ = input.readBytes();
+
+                break;
+              } // case 66
+            case 80:
+              {
+                offset_ = input.readInt32();
+
+                break;
+              } // case 80
+            case 98:
+              {
+                input.readMessage(getLimitFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 98
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.Query) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -3330,7 +3277,18 @@ public Query parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Query(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 53afbf41225b..f454c9226567 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
@@ -35,6 +35,18 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_datastore_v1_Query_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Query_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationQuery_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationQuery_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_datastore_v1_KindExpression_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -107,61 +119,70 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + " \003(\0132&.google.datastore.v1.PropertyRefer"
           + "ence\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend_cursor"
           + "\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit\030\014 \001(\0132\033."
-          + "google.protobuf.Int32Value\"\036\n\016KindExpres"
-          + "sion\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022"
-          + "\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010property\030"
-          + "\001 \001(\0132&.google.datastore.v1.PropertyRefe"
-          + "rence\"\321\001\n\rPropertyOrder\0228\n\010property\030\001 \001("
-          + "\0132&.google.datastore.v1.PropertyReferenc"
-          + "e\022?\n\tdirection\030\002 \001(\0162,.google.datastore."
-          + "v1.PropertyOrder.Direction\"E\n\tDirection\022"
-          + "\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCENDING\020"
-          + "\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020composit"
-          + "e_filter\030\001 \001(\0132$.google.datastore.v1.Com"
-          + "positeFilterH\000\022>\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"
+          + "google.protobuf.Int32Value\"\326\002\n\020Aggregati"
+          + "onQuery\0222\n\014nested_query\030\001 \001(\0132\032.google.d"
+          + "atastore.v1.QueryH\000\022L\n\014aggregations\030\003 \003("
+          + "\01321.google.datastore.v1.AggregationQuery"
+          + ".AggregationB\003\340A\001\032\261\001\n\013Aggregation\022H\n\005cou"
+          + "nt\030\001 \001(\01327.google.datastore.v1.Aggregati"
+          + "onQuery.Aggregation.CountH\000\022\022\n\005alias\030\007 \001"
+          + "(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001(\0132\033.google"
+          + ".protobuf.Int64ValueB\003\340A\001B\n\n\010operatorB\014\n"
+          + "\nquery_type\"\036\n\016KindExpression\022\014\n\004name\030\001 "
+          + "\001(\t\"!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F"
+          + "\n\nProjection\0228\n\010property\030\001 \001(\0132&.google."
+          + "datastore.v1.PropertyReference\"\321\001\n\rPrope"
+          + "rtyOrder\0228\n\010property\030\001 \001(\0132&.google.data"
+          + "store.v1.PropertyReference\022?\n\tdirection\030"
+          + "\002 \001(\0162,.google.datastore.v1.PropertyOrde"
+          + "r.Direction\"E\n\tDirection\022\031\n\025DIRECTION_UN"
+          + "SPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING"
+          + "\020\002\"\231\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132"
+          + "$.google.datastore.v1.CompositeFilterH\000\022"
+          + ">\n\017property_filter\030\002 \001(\0132#.google.datast"
+          + "ore.v1.PropertyFilterH\000B\r\n\013filter_type\"\251"
+          + "\001\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.google."
+          + "datastore.v1.CompositeFilter.Operator\022,\n"
+          + "\007filters\030\002 \003(\0132\033.google.datastore.v1.Fil"
+          + "ter\"-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020"
+          + "\000\022\007\n\003AND\020\001\"\352\002\n\016PropertyFilter\0228\n\010propert"
+          + "y\030\001 \001(\0132&.google.datastore.v1.PropertyRe"
+          + "ference\0228\n\002op\030\002 \001(\0162,.google.datastore.v"
+          + "1.PropertyFilter.Operator\022)\n\005value\030\003 \001(\013"
+          + "2\032.google.datastore.v1.Value\"\270\001\n\010Operato"
+          + "r\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_TH"
+          + "AN\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_ANCESTO"
+          + "R\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQuery\022\024\n\014query_st"
+          + "ring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016na"
+          + "med_bindings\030\005 \003(\01320.google.datastore.v1"
+          + ".GqlQuery.NamedBindingsEntry\022C\n\023position"
+          + "al_bindings\030\004 \003(\0132&.google.datastore.v1."
+          + "GqlQueryParameter\032\\\n\022NamedBindingsEntry\022"
+          + "\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.dat"
+          + "astore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQu"
+          + "eryParameter\022+\n\005value\030\002 \001(\0132\032.google.dat"
+          + "astore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016p"
+          + "arameter_type\"\215\004\n\020QueryResultBatch\022\027\n\017sk"
+          + "ipped_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.EntityResult.ResultType\0229\n"
+          + "\016entity_results\030\002 \003(\0132!.google.datastore"
+          + ".v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n\014"
+          + "more_results\030\005 \001(\01625.google.datastore.v1"
+          + ".QueryResultBatch.MoreResultsType\022\030\n\020sna"
+          + "pshot_version\030\007 \001(\003\022-\n\tread_time\030\010 \001(\0132\032"
+          + ".google.protobuf.Timestamp\"\230\001\n\017MoreResul"
+          + "tsType\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020"
+          + "\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTE"
+          + "R_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.dat"
+          + "astore.v1B\nQueryProtoP\001Z();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entityResults_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-              break;
-            }
-          case 26:
-            {
-              skippedCursor_ = input.readBytes();
-              break;
-            }
-          case 34:
-            {
-              endCursor_ = input.readBytes();
-              break;
-            }
-          case 40:
-            {
-              int rawValue = input.readEnum();
-
-              moreResults_ = rawValue;
-              break;
-            }
-          case 48:
-            {
-              skippedResults_ = input.readInt32();
-              break;
-            }
-          case 56:
-            {
-              snapshotVersion_ = input.readInt64();
-              break;
-            }
-          case 66:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (readTime_ != null) {
-                subBuilder = readTime_.toBuilder();
-              }
-              readTime_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(readTime_);
-                readTime_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.QueryProto
         .internal_static_google_datastore_v1_QueryResultBatch_descriptor;
@@ -713,7 +610,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (readTime_ != null) {
       output.writeMessage(8, getReadTime());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -749,7 +646,7 @@ public int getSerializedSize() {
     if (readTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getReadTime());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -775,7 +672,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadTime()) {
       if (!getReadTime().equals(other.getReadTime())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -806,7 +703,7 @@ public int hashCode() {
       hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getReadTime().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -935,19 +832,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.QueryResultBatch.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getEntityResultsFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -961,10 +849,11 @@ public Builder clear() {
 
       if (entityResultsBuilder_ == null) {
         entityResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        entityResults_ = null;
         entityResultsBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       endCursor_ = com.google.protobuf.ByteString.EMPTY;
 
       moreResults_ = 0;
@@ -1122,7 +1011,7 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
       if (other.hasReadTime()) {
         mergeReadTime(other.getReadTime());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -1137,17 +1026,86 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.QueryResultBatch parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                entityResultType_ = input.readEnum();
+
+                break;
+              } // case 8
+            case 18:
+              {
+                com.google.datastore.v1.EntityResult m =
+                    input.readMessage(
+                        com.google.datastore.v1.EntityResult.parser(), extensionRegistry);
+                if (entityResultsBuilder_ == null) {
+                  ensureEntityResultsIsMutable();
+                  entityResults_.add(m);
+                } else {
+                  entityResultsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+            case 26:
+              {
+                skippedCursor_ = input.readBytes();
+
+                break;
+              } // case 26
+            case 34:
+              {
+                endCursor_ = input.readBytes();
+
+                break;
+              } // case 34
+            case 40:
+              {
+                moreResults_ = input.readEnum();
+
+                break;
+              } // case 40
+            case 48:
+              {
+                skippedResults_ = input.readInt32();
+
+                break;
+              } // case 48
+            case 56:
+              {
+                snapshotVersion_ = input.readInt64();
+
+                break;
+              } // case 56
+            case 66:
+              {
+                input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 66
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.QueryResultBatch) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2211,7 +2169,18 @@ public QueryResultBatch parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new QueryResultBatch(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 4a0035eacc9c..6e3f179a6a58 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -50,73 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ReadOptions(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
-              consistencyTypeCase_ = 1;
-              consistencyType_ = rawValue;
-              break;
-            }
-          case 18:
-            {
-              consistencyType_ = input.readBytes();
-              consistencyTypeCase_ = 2;
-              break;
-            }
-          case 34:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (consistencyTypeCase_ == 4) {
-                subBuilder = ((com.google.protobuf.Timestamp) consistencyType_).toBuilder();
-              }
-              consistencyType_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.protobuf.Timestamp) consistencyType_);
-                consistencyType_ = subBuilder.buildPartial();
-              }
-              consistencyTypeCase_ = 4;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_ReadOptions_descriptor;
@@ -516,7 +449,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (consistencyTypeCase_ == 4) {
       output.writeMessage(4, (com.google.protobuf.Timestamp) consistencyType_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -540,7 +473,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               4, (com.google.protobuf.Timestamp) consistencyType_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -569,7 +502,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -596,7 +529,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -724,22 +657,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.ReadOptions.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      if (readTimeBuilder_ != null) {
+        readTimeBuilder_.clear();
+      }
       consistencyTypeCase_ = 0;
       consistencyType_ = null;
       return this;
@@ -852,7 +781,7 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -867,17 +796,50 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.ReadOptions parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                int rawValue = input.readEnum();
+                consistencyTypeCase_ = 1;
+                consistencyType_ = rawValue;
+                break;
+              } // case 8
+            case 18:
+              {
+                consistencyType_ = input.readBytes();
+                consistencyTypeCase_ = 2;
+                break;
+              } // case 18
+            case 34:
+              {
+                input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
+                consistencyTypeCase_ = 4;
+                break;
+              } // case 34
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.ReadOptions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1350,7 +1312,18 @@ public ReadOptions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReadOptions(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 7a8ce32c360a..06a6b146c268 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
@@ -54,72 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ReserveIdsRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
-            }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) != 0)) {
-        keys_ = java.util.Collections.unmodifiableList(keys_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
@@ -338,7 +272,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -356,7 +290,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -375,7 +309,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getProjectId().equals(other.getProjectId())) return false;
     if (!getDatabaseId().equals(other.getDatabaseId())) return false;
     if (!getKeysList().equals(other.getKeysList())) return false;
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -394,7 +328,7 @@ public int hashCode() {
       hash = (37 * hash) + KEYS_FIELD_NUMBER;
       hash = (53 * hash) + getKeysList().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -523,19 +457,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.ReserveIdsRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getKeysFieldBuilder();
-      }
     }
 
     @java.lang.Override
@@ -547,10 +472,11 @@ public Builder clear() {
 
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
+        keys_ = null;
         keysBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -674,7 +600,7 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -689,17 +615,55 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.ReserveIdsRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.datastore.v1.Key m =
+                    input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+                if (keysBuilder_ == null) {
+                  ensureKeysIsMutable();
+                  keys_.add(m);
+                } else {
+                  keysBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.ReserveIdsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -1337,7 +1301,18 @@ public ReserveIdsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReserveIdsRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 b889a46f1541..6a3398d4dae8 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
@@ -50,45 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private ReserveIdsResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
@@ -118,7 +79,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -127,7 +88,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -143,7 +104,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.ReserveIdsResponse other =
         (com.google.datastore.v1.ReserveIdsResponse) obj;
 
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -154,7 +115,7 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -283,17 +244,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.ReserveIdsResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -375,7 +329,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.datastore.v1.ReserveIdsResponse other) {
       if (other == com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -390,17 +344,31 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.ReserveIdsResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.ReserveIdsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -436,7 +404,18 @@ public ReserveIdsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReserveIdsResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 f964889bf831..91c084b4b3f8 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
@@ -54,64 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private RollbackRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              transaction_ = input.readBytes();
-              break;
-            }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_RollbackRequest_descriptor;
@@ -271,7 +213,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -289,7 +231,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -307,7 +249,7 @@ public boolean equals(final java.lang.Object 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;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -324,7 +266,7 @@ public int hashCode() {
     hash = (53 * hash) + getDatabaseId().hashCode();
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -453,17 +395,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RollbackRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -565,7 +500,7 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) {
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -580,17 +515,49 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.RollbackRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                transaction_ = input.readBytes();
+
+                break;
+              } // case 10
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.RollbackRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -906,7 +873,18 @@ public RollbackRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RollbackRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 0d96f1969501..43e61c469d6e 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
@@ -51,45 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private RollbackResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_RollbackResponse_descriptor;
@@ -119,7 +80,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -128,7 +89,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -143,7 +104,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.RollbackResponse other = (com.google.datastore.v1.RollbackResponse) obj;
 
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -154,7 +115,7 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -284,17 +245,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RollbackResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -376,7 +330,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.datastore.v1.RollbackResponse other) {
       if (other == com.google.datastore.v1.RollbackResponse.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -391,17 +345,31 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.RollbackResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.RollbackResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -437,7 +405,18 @@ public RollbackResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RollbackResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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
new file mode 100644
index 000000000000..690015e935e6
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
@@ -0,0 +1,2048 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.RunAggregationQueryRequest}
+ */
+public final class RunAggregationQueryRequest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryRequest)
+    RunAggregationQueryRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use RunAggregationQueryRequest.newBuilder() to construct.
+  private RunAggregationQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private RunAggregationQueryRequest() {
+    projectId_ = "";
+    databaseId_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  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;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RunAggregationQueryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.RunAggregationQueryRequest.class,
+            com.google.datastore.v1.RunAggregationQueryRequest.Builder.class);
+  }
+
+  private int queryTypeCase_ = 0;
+  private java.lang.Object queryType_;
+
+  public enum QueryTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+    AGGREGATION_QUERY(3),
+    GQL_QUERY(7),
+    QUERYTYPE_NOT_SET(0);
+    private final int value;
+
+    private QueryTypeCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static QueryTypeCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static QueryTypeCase forNumber(int value) {
+      switch (value) {
+        case 3:
+          return AGGREGATION_QUERY;
+        case 7:
+          return GQL_QUERY;
+        case 0:
+          return QUERYTYPE_NOT_SET;
+        default:
+          return null;
+      }
+    }
+
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public QueryTypeCase getQueryTypeCase() {
+    return QueryTypeCase.forNumber(queryTypeCase_);
+  }
+
+  public static final int PROJECT_ID_FIELD_NUMBER = 8;
+  private volatile java.lang.Object projectId_;
+  /**
+   *
+   *
+   * 
    +   * Required. The ID of the project against which to make the request.
+   * 
    
+   *
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
+   */
+  @java.lang.Override
+  public java.lang.String getProjectId() {
+    java.lang.Object ref = projectId_;
+    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();
+      projectId_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The ID of the project against which to make the request.
+   * 
    
+   *
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getProjectIdBytes() {
+    java.lang.Object ref = projectId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      projectId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  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_;
+  /**
+   *
+   *
+   * 
    +   * 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
+   * partition ID.
+   * 
    
+   *
+   * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return Whether the partitionId field is set.
+   */
+  @java.lang.Override
+  public boolean hasPartitionId() {
+    return partitionId_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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
+   * partition ID.
+   * 
    
+   *
+   * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return The partitionId.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PartitionId getPartitionId() {
+    return partitionId_ == null
+        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+        : partitionId_;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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
+   * partition ID.
+   * 
    
+   *
+   * .google.datastore.v1.PartitionId partition_id = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
+    return getPartitionId();
+  }
+
+  public static final int READ_OPTIONS_FIELD_NUMBER = 1;
+  private com.google.datastore.v1.ReadOptions readOptions_;
+  /**
+   *
+   *
+   * 
    +   * The options for this query.
+   * 
    
+   *
+   * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return Whether the readOptions field is set.
+   */
+  @java.lang.Override
+  public boolean hasReadOptions() {
+    return readOptions_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The options for this query.
+   * 
    
+   *
+   * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return The readOptions.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ReadOptions getReadOptions() {
+    return readOptions_ == null
+        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+        : readOptions_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The options for this query.
+   * 
    
+   *
+   * .google.datastore.v1.ReadOptions read_options = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
+    return getReadOptions();
+  }
+
+  public static final int AGGREGATION_QUERY_FIELD_NUMBER = 3;
+  /**
+   *
+   *
+   * 
    +   * The query to run.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+   *
+   * @return Whether the aggregationQuery field is set.
+   */
+  @java.lang.Override
+  public boolean hasAggregationQuery() {
+    return queryTypeCase_ == 3;
+  }
+  /**
+   *
+   *
+   * 
    +   * The query to run.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+   *
+   * @return The aggregationQuery.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationQuery getAggregationQuery() {
+    if (queryTypeCase_ == 3) {
+      return (com.google.datastore.v1.AggregationQuery) queryType_;
+    }
+    return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * The query to run.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBuilder() {
+    if (queryTypeCase_ == 3) {
+      return (com.google.datastore.v1.AggregationQuery) queryType_;
+    }
+    return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
+  }
+
+  public static final int GQL_QUERY_FIELD_NUMBER = 7;
+  /**
+   *
+   *
+   * 
    +   * The GQL query to run. This query must be an aggregation query.
+   * 
    
+   *
+   * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return Whether the gqlQuery field is set.
+   */
+  @java.lang.Override
+  public boolean hasGqlQuery() {
+    return queryTypeCase_ == 7;
+  }
+  /**
+   *
+   *
+   * 
    +   * The GQL query to run. This query must be an aggregation query.
+   * 
    
+   *
+   * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return The gqlQuery.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.GqlQuery getGqlQuery() {
+    if (queryTypeCase_ == 7) {
+      return (com.google.datastore.v1.GqlQuery) queryType_;
+    }
+    return com.google.datastore.v1.GqlQuery.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * The GQL query to run. This query must be an aggregation query.
+   * 
    
+   *
+   * .google.datastore.v1.GqlQuery gql_query = 7;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
+    if (queryTypeCase_ == 7) {
+      return (com.google.datastore.v1.GqlQuery) queryType_;
+    }
+    return com.google.datastore.v1.GqlQuery.getDefaultInstance();
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (readOptions_ != null) {
+      output.writeMessage(1, getReadOptions());
+    }
+    if (partitionId_ != null) {
+      output.writeMessage(2, getPartitionId());
+    }
+    if (queryTypeCase_ == 3) {
+      output.writeMessage(3, (com.google.datastore.v1.AggregationQuery) queryType_);
+    }
+    if (queryTypeCase_ == 7) {
+      output.writeMessage(7, (com.google.datastore.v1.GqlQuery) queryType_);
+    }
+    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_);
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (readOptions_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
+    }
+    if (partitionId_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId());
+    }
+    if (queryTypeCase_ == 3) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              3, (com.google.datastore.v1.AggregationQuery) queryType_);
+    }
+    if (queryTypeCase_ == 7) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              7, (com.google.datastore.v1.GqlQuery) queryType_);
+    }
+    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 += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.RunAggregationQueryRequest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.RunAggregationQueryRequest other =
+        (com.google.datastore.v1.RunAggregationQueryRequest) 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;
+    }
+    if (hasReadOptions() != other.hasReadOptions()) return false;
+    if (hasReadOptions()) {
+      if (!getReadOptions().equals(other.getReadOptions())) return false;
+    }
+    if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
+    switch (queryTypeCase_) {
+      case 3:
+        if (!getAggregationQuery().equals(other.getAggregationQuery())) return false;
+        break;
+      case 7:
+        if (!getGqlQuery().equals(other.getGqlQuery())) return false;
+        break;
+      case 0:
+      default:
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    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();
+    }
+    if (hasReadOptions()) {
+      hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
+      hash = (53 * hash) + getReadOptions().hashCode();
+    }
+    switch (queryTypeCase_) {
+      case 3:
+        hash = (37 * hash) + AGGREGATION_QUERY_FIELD_NUMBER;
+        hash = (53 * hash) + getAggregationQuery().hashCode();
+        break;
+      case 7:
+        hash = (37 * hash) + GQL_QUERY_FIELD_NUMBER;
+        hash = (53 * hash) + getGqlQuery().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.RunAggregationQueryRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.RunAggregationQueryRequest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunAggregationQueryRequest)
+      com.google.datastore.v1.RunAggregationQueryRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunAggregationQueryRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunAggregationQueryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.RunAggregationQueryRequest.class,
+              com.google.datastore.v1.RunAggregationQueryRequest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.RunAggregationQueryRequest.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      projectId_ = "";
+
+      databaseId_ = "";
+
+      if (partitionIdBuilder_ == null) {
+        partitionId_ = null;
+      } else {
+        partitionId_ = null;
+        partitionIdBuilder_ = null;
+      }
+      if (readOptionsBuilder_ == null) {
+        readOptions_ = null;
+      } else {
+        readOptions_ = null;
+        readOptionsBuilder_ = null;
+      }
+      if (aggregationQueryBuilder_ != null) {
+        aggregationQueryBuilder_.clear();
+      }
+      if (gqlQueryBuilder_ != null) {
+        gqlQueryBuilder_.clear();
+      }
+      queryTypeCase_ = 0;
+      queryType_ = null;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunAggregationQueryRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.RunAggregationQueryRequest getDefaultInstanceForType() {
+      return com.google.datastore.v1.RunAggregationQueryRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.RunAggregationQueryRequest build() {
+      com.google.datastore.v1.RunAggregationQueryRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.RunAggregationQueryRequest buildPartial() {
+      com.google.datastore.v1.RunAggregationQueryRequest result =
+          new com.google.datastore.v1.RunAggregationQueryRequest(this);
+      result.projectId_ = projectId_;
+      result.databaseId_ = databaseId_;
+      if (partitionIdBuilder_ == null) {
+        result.partitionId_ = partitionId_;
+      } else {
+        result.partitionId_ = partitionIdBuilder_.build();
+      }
+      if (readOptionsBuilder_ == null) {
+        result.readOptions_ = readOptions_;
+      } else {
+        result.readOptions_ = readOptionsBuilder_.build();
+      }
+      if (queryTypeCase_ == 3) {
+        if (aggregationQueryBuilder_ == null) {
+          result.queryType_ = queryType_;
+        } else {
+          result.queryType_ = aggregationQueryBuilder_.build();
+        }
+      }
+      if (queryTypeCase_ == 7) {
+        if (gqlQueryBuilder_ == null) {
+          result.queryType_ = queryType_;
+        } else {
+          result.queryType_ = gqlQueryBuilder_.build();
+        }
+      }
+      result.queryTypeCase_ = queryTypeCase_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.RunAggregationQueryRequest) {
+        return mergeFrom((com.google.datastore.v1.RunAggregationQueryRequest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryRequest other) {
+      if (other == com.google.datastore.v1.RunAggregationQueryRequest.getDefaultInstance())
+        return this;
+      if (!other.getProjectId().isEmpty()) {
+        projectId_ = other.projectId_;
+        onChanged();
+      }
+      if (!other.getDatabaseId().isEmpty()) {
+        databaseId_ = other.databaseId_;
+        onChanged();
+      }
+      if (other.hasPartitionId()) {
+        mergePartitionId(other.getPartitionId());
+      }
+      if (other.hasReadOptions()) {
+        mergeReadOptions(other.getReadOptions());
+      }
+      switch (other.getQueryTypeCase()) {
+        case AGGREGATION_QUERY:
+          {
+            mergeAggregationQuery(other.getAggregationQuery());
+            break;
+          }
+        case GQL_QUERY:
+          {
+            mergeGqlQuery(other.getGqlQuery());
+            break;
+          }
+        case QUERYTYPE_NOT_SET:
+          {
+            break;
+          }
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            case 26:
+              {
+                input.readMessage(
+                    getAggregationQueryFieldBuilder().getBuilder(), extensionRegistry);
+                queryTypeCase_ = 3;
+                break;
+              } // case 26
+            case 58:
+              {
+                input.readMessage(getGqlQueryFieldBuilder().getBuilder(), extensionRegistry);
+                queryTypeCase_ = 7;
+                break;
+              } // case 58
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int queryTypeCase_ = 0;
+    private java.lang.Object queryType_;
+
+    public QueryTypeCase getQueryTypeCase() {
+      return QueryTypeCase.forNumber(queryTypeCase_);
+    }
+
+    public Builder clearQueryType() {
+      queryTypeCase_ = 0;
+      queryType_ = null;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object projectId_ = "";
+    /**
+     *
+     *
+     * 
    +     * Required. The ID of the project against which to make the request.
+     * 
    
+     *
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The projectId.
+     */
+    public java.lang.String getProjectId() {
+      java.lang.Object ref = projectId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        projectId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The ID of the project against which to make the request.
+     * 
    
+     *
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The bytes for projectId.
+     */
+    public com.google.protobuf.ByteString getProjectIdBytes() {
+      java.lang.Object ref = projectId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        projectId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The ID of the project against which to make the request.
+     * 
    
+     *
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectId(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+
+      projectId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The ID of the project against which to make the request.
+     * 
    
+     *
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProjectId() {
+
+      projectId_ = getDefaultInstance().getProjectId();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The ID of the project against which to make the request.
+     * 
    
+     *
+     * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @param value The bytes for projectId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+
+      projectId_ = value;
+      onChanged();
+      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,
+            com.google.datastore.v1.PartitionId.Builder,
+            com.google.datastore.v1.PartitionIdOrBuilder>
+        partitionIdBuilder_;
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     *
+     * @return Whether the partitionId field is set.
+     */
+    public boolean hasPartitionId() {
+      return partitionIdBuilder_ != null || partitionId_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     *
+     * @return The partitionId.
+     */
+    public com.google.datastore.v1.PartitionId getPartitionId() {
+      if (partitionIdBuilder_ == null) {
+        return partitionId_ == null
+            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+            : partitionId_;
+      } else {
+        return partitionIdBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     */
+    public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
+      if (partitionIdBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        partitionId_ = value;
+        onChanged();
+      } else {
+        partitionIdBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     */
+    public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
+      if (partitionIdBuilder_ == null) {
+        partitionId_ = builderForValue.build();
+        onChanged();
+      } else {
+        partitionIdBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     */
+    public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
+      if (partitionIdBuilder_ == null) {
+        if (partitionId_ != null) {
+          partitionId_ =
+              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          partitionId_ = value;
+        }
+        onChanged();
+      } else {
+        partitionIdBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     */
+    public Builder clearPartitionId() {
+      if (partitionIdBuilder_ == null) {
+        partitionId_ = null;
+        onChanged();
+      } else {
+        partitionId_ = null;
+        partitionIdBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     */
+    public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
+
+      onChanged();
+      return getPartitionIdFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     */
+    public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
+      if (partitionIdBuilder_ != null) {
+        return partitionIdBuilder_.getMessageOrBuilder();
+      } else {
+        return partitionId_ == null
+            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+            : partitionId_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * partition ID.
+     * 
    
+     *
+     * .google.datastore.v1.PartitionId partition_id = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PartitionId,
+            com.google.datastore.v1.PartitionId.Builder,
+            com.google.datastore.v1.PartitionIdOrBuilder>
+        getPartitionIdFieldBuilder() {
+      if (partitionIdBuilder_ == null) {
+        partitionIdBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PartitionId,
+                com.google.datastore.v1.PartitionId.Builder,
+                com.google.datastore.v1.PartitionIdOrBuilder>(
+                getPartitionId(), getParentForChildren(), isClean());
+        partitionId_ = null;
+      }
+      return partitionIdBuilder_;
+    }
+
+    private com.google.datastore.v1.ReadOptions readOptions_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ReadOptions,
+            com.google.datastore.v1.ReadOptions.Builder,
+            com.google.datastore.v1.ReadOptionsOrBuilder>
+        readOptionsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     *
+     * @return Whether the readOptions field is set.
+     */
+    public boolean hasReadOptions() {
+      return readOptionsBuilder_ != null || readOptions_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     *
+     * @return The readOptions.
+     */
+    public com.google.datastore.v1.ReadOptions getReadOptions() {
+      if (readOptionsBuilder_ == null) {
+        return readOptions_ == null
+            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+            : readOptions_;
+      } else {
+        return readOptionsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     */
+    public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
+      if (readOptionsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        readOptions_ = value;
+        onChanged();
+      } else {
+        readOptionsBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     */
+    public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
+      if (readOptionsBuilder_ == null) {
+        readOptions_ = builderForValue.build();
+        onChanged();
+      } else {
+        readOptionsBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     */
+    public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
+      if (readOptionsBuilder_ == null) {
+        if (readOptions_ != null) {
+          readOptions_ =
+              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          readOptions_ = value;
+        }
+        onChanged();
+      } else {
+        readOptionsBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     */
+    public Builder clearReadOptions() {
+      if (readOptionsBuilder_ == null) {
+        readOptions_ = null;
+        onChanged();
+      } else {
+        readOptions_ = null;
+        readOptionsBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     */
+    public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
+
+      onChanged();
+      return getReadOptionsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     */
+    public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
+      if (readOptionsBuilder_ != null) {
+        return readOptionsBuilder_.getMessageOrBuilder();
+      } else {
+        return readOptions_ == null
+            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+            : readOptions_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The options for this query.
+     * 
    
+     *
+     * .google.datastore.v1.ReadOptions read_options = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ReadOptions,
+            com.google.datastore.v1.ReadOptions.Builder,
+            com.google.datastore.v1.ReadOptionsOrBuilder>
+        getReadOptionsFieldBuilder() {
+      if (readOptionsBuilder_ == null) {
+        readOptionsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ReadOptions,
+                com.google.datastore.v1.ReadOptions.Builder,
+                com.google.datastore.v1.ReadOptionsOrBuilder>(
+                getReadOptions(), getParentForChildren(), isClean());
+        readOptions_ = null;
+      }
+      return readOptionsBuilder_;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.AggregationQuery,
+            com.google.datastore.v1.AggregationQuery.Builder,
+            com.google.datastore.v1.AggregationQueryOrBuilder>
+        aggregationQueryBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     *
+     * @return Whether the aggregationQuery field is set.
+     */
+    @java.lang.Override
+    public boolean hasAggregationQuery() {
+      return queryTypeCase_ == 3;
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     *
+     * @return The aggregationQuery.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery getAggregationQuery() {
+      if (aggregationQueryBuilder_ == null) {
+        if (queryTypeCase_ == 3) {
+          return (com.google.datastore.v1.AggregationQuery) queryType_;
+        }
+        return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
+      } else {
+        if (queryTypeCase_ == 3) {
+          return aggregationQueryBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     */
+    public Builder setAggregationQuery(com.google.datastore.v1.AggregationQuery value) {
+      if (aggregationQueryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        queryType_ = value;
+        onChanged();
+      } else {
+        aggregationQueryBuilder_.setMessage(value);
+      }
+      queryTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     */
+    public Builder setAggregationQuery(
+        com.google.datastore.v1.AggregationQuery.Builder builderForValue) {
+      if (aggregationQueryBuilder_ == null) {
+        queryType_ = builderForValue.build();
+        onChanged();
+      } else {
+        aggregationQueryBuilder_.setMessage(builderForValue.build());
+      }
+      queryTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     */
+    public Builder mergeAggregationQuery(com.google.datastore.v1.AggregationQuery value) {
+      if (aggregationQueryBuilder_ == null) {
+        if (queryTypeCase_ == 3
+            && queryType_ != com.google.datastore.v1.AggregationQuery.getDefaultInstance()) {
+          queryType_ =
+              com.google.datastore.v1.AggregationQuery.newBuilder(
+                      (com.google.datastore.v1.AggregationQuery) queryType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          queryType_ = value;
+        }
+        onChanged();
+      } else {
+        if (queryTypeCase_ == 3) {
+          aggregationQueryBuilder_.mergeFrom(value);
+        } else {
+          aggregationQueryBuilder_.setMessage(value);
+        }
+      }
+      queryTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     */
+    public Builder clearAggregationQuery() {
+      if (aggregationQueryBuilder_ == null) {
+        if (queryTypeCase_ == 3) {
+          queryTypeCase_ = 0;
+          queryType_ = null;
+          onChanged();
+        }
+      } else {
+        if (queryTypeCase_ == 3) {
+          queryTypeCase_ = 0;
+          queryType_ = null;
+        }
+        aggregationQueryBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     */
+    public com.google.datastore.v1.AggregationQuery.Builder getAggregationQueryBuilder() {
+      return getAggregationQueryFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBuilder() {
+      if ((queryTypeCase_ == 3) && (aggregationQueryBuilder_ != null)) {
+        return aggregationQueryBuilder_.getMessageOrBuilder();
+      } else {
+        if (queryTypeCase_ == 3) {
+          return (com.google.datastore.v1.AggregationQuery) queryType_;
+        }
+        return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The query to run.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.AggregationQuery,
+            com.google.datastore.v1.AggregationQuery.Builder,
+            com.google.datastore.v1.AggregationQueryOrBuilder>
+        getAggregationQueryFieldBuilder() {
+      if (aggregationQueryBuilder_ == null) {
+        if (!(queryTypeCase_ == 3)) {
+          queryType_ = com.google.datastore.v1.AggregationQuery.getDefaultInstance();
+        }
+        aggregationQueryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.AggregationQuery,
+                com.google.datastore.v1.AggregationQuery.Builder,
+                com.google.datastore.v1.AggregationQueryOrBuilder>(
+                (com.google.datastore.v1.AggregationQuery) queryType_,
+                getParentForChildren(),
+                isClean());
+        queryType_ = null;
+      }
+      queryTypeCase_ = 3;
+      onChanged();
+      ;
+      return aggregationQueryBuilder_;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.GqlQuery,
+            com.google.datastore.v1.GqlQuery.Builder,
+            com.google.datastore.v1.GqlQueryOrBuilder>
+        gqlQueryBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     *
+     * @return Whether the gqlQuery field is set.
+     */
+    @java.lang.Override
+    public boolean hasGqlQuery() {
+      return queryTypeCase_ == 7;
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     *
+     * @return The gqlQuery.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.GqlQuery getGqlQuery() {
+      if (gqlQueryBuilder_ == null) {
+        if (queryTypeCase_ == 7) {
+          return (com.google.datastore.v1.GqlQuery) queryType_;
+        }
+        return com.google.datastore.v1.GqlQuery.getDefaultInstance();
+      } else {
+        if (queryTypeCase_ == 7) {
+          return gqlQueryBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.GqlQuery.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     */
+    public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) {
+      if (gqlQueryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        queryType_ = value;
+        onChanged();
+      } else {
+        gqlQueryBuilder_.setMessage(value);
+      }
+      queryTypeCase_ = 7;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     */
+    public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForValue) {
+      if (gqlQueryBuilder_ == null) {
+        queryType_ = builderForValue.build();
+        onChanged();
+      } else {
+        gqlQueryBuilder_.setMessage(builderForValue.build());
+      }
+      queryTypeCase_ = 7;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     */
+    public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
+      if (gqlQueryBuilder_ == null) {
+        if (queryTypeCase_ == 7
+            && queryType_ != com.google.datastore.v1.GqlQuery.getDefaultInstance()) {
+          queryType_ =
+              com.google.datastore.v1.GqlQuery.newBuilder(
+                      (com.google.datastore.v1.GqlQuery) queryType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          queryType_ = value;
+        }
+        onChanged();
+      } else {
+        if (queryTypeCase_ == 7) {
+          gqlQueryBuilder_.mergeFrom(value);
+        } else {
+          gqlQueryBuilder_.setMessage(value);
+        }
+      }
+      queryTypeCase_ = 7;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     */
+    public Builder clearGqlQuery() {
+      if (gqlQueryBuilder_ == null) {
+        if (queryTypeCase_ == 7) {
+          queryTypeCase_ = 0;
+          queryType_ = null;
+          onChanged();
+        }
+      } else {
+        if (queryTypeCase_ == 7) {
+          queryTypeCase_ = 0;
+          queryType_ = null;
+        }
+        gqlQueryBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     */
+    public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
+      return getGqlQueryFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
+      if ((queryTypeCase_ == 7) && (gqlQueryBuilder_ != null)) {
+        return gqlQueryBuilder_.getMessageOrBuilder();
+      } else {
+        if (queryTypeCase_ == 7) {
+          return (com.google.datastore.v1.GqlQuery) queryType_;
+        }
+        return com.google.datastore.v1.GqlQuery.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The GQL query to run. This query must be an aggregation query.
+     * 
    
+     *
+     * .google.datastore.v1.GqlQuery gql_query = 7;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.GqlQuery,
+            com.google.datastore.v1.GqlQuery.Builder,
+            com.google.datastore.v1.GqlQueryOrBuilder>
+        getGqlQueryFieldBuilder() {
+      if (gqlQueryBuilder_ == null) {
+        if (!(queryTypeCase_ == 7)) {
+          queryType_ = com.google.datastore.v1.GqlQuery.getDefaultInstance();
+        }
+        gqlQueryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.GqlQuery,
+                com.google.datastore.v1.GqlQuery.Builder,
+                com.google.datastore.v1.GqlQueryOrBuilder>(
+                (com.google.datastore.v1.GqlQuery) queryType_, getParentForChildren(), isClean());
+        queryType_ = null;
+      }
+      queryTypeCase_ = 7;
+      onChanged();
+      ;
+      return gqlQueryBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunAggregationQueryRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.RunAggregationQueryRequest)
+  private static final com.google.datastore.v1.RunAggregationQueryRequest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.RunAggregationQueryRequest();
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public RunAggregationQueryRequest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.RunAggregationQueryRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..63ace7ed3a36
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+package com.google.datastore.v1;
+
+public interface RunAggregationQueryRequestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunAggregationQueryRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Required. The ID of the project against which to make the request.
+   * 
    
+   *
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The projectId.
+   */
+  java.lang.String getProjectId();
+  /**
+   *
+   *
+   * 
    +   * Required. The ID of the project against which to make the request.
+   * 
    
+   *
+   * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The bytes for projectId.
+   */
+  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();
+
+  /**
+   *
+   *
+   * 
    +   * 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
+   * partition ID.
+   * 
    
+   *
+   * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return Whether the partitionId field is set.
+   */
+  boolean hasPartitionId();
+  /**
+   *
+   *
+   * 
    +   * 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
+   * partition ID.
+   * 
    
+   *
+   * .google.datastore.v1.PartitionId partition_id = 2;
+   *
+   * @return The partitionId.
+   */
+  com.google.datastore.v1.PartitionId getPartitionId();
+  /**
+   *
+   *
+   * 
    +   * 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
+   * partition ID.
+   * 
    
+   *
+   * .google.datastore.v1.PartitionId partition_id = 2;
+   */
+  com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The options for this query.
+   * 
    
+   *
+   * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return Whether the readOptions field is set.
+   */
+  boolean hasReadOptions();
+  /**
+   *
+   *
+   * 
    +   * The options for this query.
+   * 
    
+   *
+   * .google.datastore.v1.ReadOptions read_options = 1;
+   *
+   * @return The readOptions.
+   */
+  com.google.datastore.v1.ReadOptions getReadOptions();
+  /**
+   *
+   *
+   * 
    +   * The options for this query.
+   * 
    
+   *
+   * .google.datastore.v1.ReadOptions read_options = 1;
+   */
+  com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The query to run.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+   *
+   * @return Whether the aggregationQuery field is set.
+   */
+  boolean hasAggregationQuery();
+  /**
+   *
+   *
+   * 
    +   * The query to run.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+   *
+   * @return The aggregationQuery.
+   */
+  com.google.datastore.v1.AggregationQuery getAggregationQuery();
+  /**
+   *
+   *
+   * 
    +   * The query to run.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery aggregation_query = 3;
+   */
+  com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The GQL query to run. This query must be an aggregation query.
+   * 
    
+   *
+   * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return Whether the gqlQuery field is set.
+   */
+  boolean hasGqlQuery();
+  /**
+   *
+   *
+   * 
    +   * The GQL query to run. This query must be an aggregation query.
+   * 
    
+   *
+   * .google.datastore.v1.GqlQuery gql_query = 7;
+   *
+   * @return The gqlQuery.
+   */
+  com.google.datastore.v1.GqlQuery getGqlQuery();
+  /**
+   *
+   *
+   * 
    +   * The GQL query to run. This query must be an aggregation query.
+   * 
    
+   *
+   * .google.datastore.v1.GqlQuery gql_query = 7;
+   */
+  com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
+
+  public 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
new file mode 100644
index 000000000000..230d90f47a28
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
@@ -0,0 +1,969 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.RunAggregationQueryResponse}
+ */
+public final class RunAggregationQueryResponse extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryResponse)
+    RunAggregationQueryResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use RunAggregationQueryResponse.newBuilder() to construct.
+  private RunAggregationQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private RunAggregationQueryResponse() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  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;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_RunAggregationQueryResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.RunAggregationQueryResponse.class,
+            com.google.datastore.v1.RunAggregationQueryResponse.Builder.class);
+  }
+
+  public static final int BATCH_FIELD_NUMBER = 1;
+  private com.google.datastore.v1.AggregationResultBatch batch_;
+  /**
+   *
+   *
+   * 
    +   * A batch of aggregation results. Always present.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationResultBatch batch = 1;
+   *
+   * @return Whether the batch field is set.
+   */
+  @java.lang.Override
+  public boolean hasBatch() {
+    return batch_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * A batch of aggregation results. Always present.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationResultBatch batch = 1;
+   *
+   * @return The batch.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationResultBatch getBatch() {
+    return batch_ == null
+        ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()
+        : batch_;
+  }
+  /**
+   *
+   *
+   * 
    +   * A batch of aggregation results. Always present.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationResultBatch batch = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder() {
+    return getBatch();
+  }
+
+  public static final int QUERY_FIELD_NUMBER = 2;
+  private com.google.datastore.v1.AggregationQuery query_;
+  /**
+   *
+   *
+   * 
    +   * The parsed form of the `GqlQuery` from the request, if it was set.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery query = 2;
+   *
+   * @return Whether the query field is set.
+   */
+  @java.lang.Override
+  public boolean hasQuery() {
+    return query_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The parsed form of the `GqlQuery` from the request, if it was set.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery query = 2;
+   *
+   * @return The query.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationQuery getQuery() {
+    return query_ == null ? com.google.datastore.v1.AggregationQuery.getDefaultInstance() : query_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The parsed form of the `GqlQuery` from the request, if it was set.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery query = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
+    return getQuery();
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (batch_ != null) {
+      output.writeMessage(1, getBatch());
+    }
+    if (query_ != null) {
+      output.writeMessage(2, getQuery());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (batch_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch());
+    }
+    if (query_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.RunAggregationQueryResponse)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.RunAggregationQueryResponse other =
+        (com.google.datastore.v1.RunAggregationQueryResponse) obj;
+
+    if (hasBatch() != other.hasBatch()) return false;
+    if (hasBatch()) {
+      if (!getBatch().equals(other.getBatch())) return false;
+    }
+    if (hasQuery() != other.hasQuery()) return false;
+    if (hasQuery()) {
+      if (!getQuery().equals(other.getQuery())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasBatch()) {
+      hash = (37 * hash) + BATCH_FIELD_NUMBER;
+      hash = (53 * hash) + getBatch().hashCode();
+    }
+    if (hasQuery()) {
+      hash = (37 * hash) + QUERY_FIELD_NUMBER;
+      hash = (53 * hash) + getQuery().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.RunAggregationQueryResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.RunAggregationQueryResponse}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunAggregationQueryResponse)
+      com.google.datastore.v1.RunAggregationQueryResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunAggregationQueryResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.RunAggregationQueryResponse.class,
+              com.google.datastore.v1.RunAggregationQueryResponse.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.RunAggregationQueryResponse.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (batchBuilder_ == null) {
+        batch_ = null;
+      } else {
+        batch_ = null;
+        batchBuilder_ = null;
+      }
+      if (queryBuilder_ == null) {
+        query_ = null;
+      } else {
+        query_ = null;
+        queryBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.RunAggregationQueryResponse getDefaultInstanceForType() {
+      return com.google.datastore.v1.RunAggregationQueryResponse.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.RunAggregationQueryResponse build() {
+      com.google.datastore.v1.RunAggregationQueryResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.RunAggregationQueryResponse buildPartial() {
+      com.google.datastore.v1.RunAggregationQueryResponse result =
+          new com.google.datastore.v1.RunAggregationQueryResponse(this);
+      if (batchBuilder_ == null) {
+        result.batch_ = batch_;
+      } else {
+        result.batch_ = batchBuilder_.build();
+      }
+      if (queryBuilder_ == null) {
+        result.query_ = query_;
+      } else {
+        result.query_ = queryBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.RunAggregationQueryResponse) {
+        return mergeFrom((com.google.datastore.v1.RunAggregationQueryResponse) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryResponse other) {
+      if (other == com.google.datastore.v1.RunAggregationQueryResponse.getDefaultInstance())
+        return this;
+      if (other.hasBatch()) {
+        mergeBatch(other.getBatch());
+      }
+      if (other.hasQuery()) {
+        mergeQuery(other.getQuery());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getBatchFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private com.google.datastore.v1.AggregationResultBatch batch_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.AggregationResultBatch,
+            com.google.datastore.v1.AggregationResultBatch.Builder,
+            com.google.datastore.v1.AggregationResultBatchOrBuilder>
+        batchBuilder_;
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     *
+     * @return Whether the batch field is set.
+     */
+    public boolean hasBatch() {
+      return batchBuilder_ != null || batch_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     *
+     * @return The batch.
+     */
+    public com.google.datastore.v1.AggregationResultBatch getBatch() {
+      if (batchBuilder_ == null) {
+        return batch_ == null
+            ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()
+            : batch_;
+      } else {
+        return batchBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     */
+    public Builder setBatch(com.google.datastore.v1.AggregationResultBatch value) {
+      if (batchBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        batch_ = value;
+        onChanged();
+      } else {
+        batchBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     */
+    public Builder setBatch(
+        com.google.datastore.v1.AggregationResultBatch.Builder builderForValue) {
+      if (batchBuilder_ == null) {
+        batch_ = builderForValue.build();
+        onChanged();
+      } else {
+        batchBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     */
+    public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value) {
+      if (batchBuilder_ == null) {
+        if (batch_ != null) {
+          batch_ =
+              com.google.datastore.v1.AggregationResultBatch.newBuilder(batch_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          batch_ = value;
+        }
+        onChanged();
+      } else {
+        batchBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     */
+    public Builder clearBatch() {
+      if (batchBuilder_ == null) {
+        batch_ = null;
+        onChanged();
+      } else {
+        batch_ = null;
+        batchBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     */
+    public com.google.datastore.v1.AggregationResultBatch.Builder getBatchBuilder() {
+
+      onChanged();
+      return getBatchFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     */
+    public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder() {
+      if (batchBuilder_ != null) {
+        return batchBuilder_.getMessageOrBuilder();
+      } else {
+        return batch_ == null
+            ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()
+            : batch_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * A batch of aggregation results. Always present.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationResultBatch batch = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.AggregationResultBatch,
+            com.google.datastore.v1.AggregationResultBatch.Builder,
+            com.google.datastore.v1.AggregationResultBatchOrBuilder>
+        getBatchFieldBuilder() {
+      if (batchBuilder_ == null) {
+        batchBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.AggregationResultBatch,
+                com.google.datastore.v1.AggregationResultBatch.Builder,
+                com.google.datastore.v1.AggregationResultBatchOrBuilder>(
+                getBatch(), getParentForChildren(), isClean());
+        batch_ = null;
+      }
+      return batchBuilder_;
+    }
+
+    private com.google.datastore.v1.AggregationQuery query_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.AggregationQuery,
+            com.google.datastore.v1.AggregationQuery.Builder,
+            com.google.datastore.v1.AggregationQueryOrBuilder>
+        queryBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     *
+     * @return Whether the query field is set.
+     */
+    public boolean hasQuery() {
+      return queryBuilder_ != null || query_ != null;
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     *
+     * @return The query.
+     */
+    public com.google.datastore.v1.AggregationQuery getQuery() {
+      if (queryBuilder_ == null) {
+        return query_ == null
+            ? com.google.datastore.v1.AggregationQuery.getDefaultInstance()
+            : query_;
+      } else {
+        return queryBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     */
+    public Builder setQuery(com.google.datastore.v1.AggregationQuery value) {
+      if (queryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        query_ = value;
+        onChanged();
+      } else {
+        queryBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     */
+    public Builder setQuery(com.google.datastore.v1.AggregationQuery.Builder builderForValue) {
+      if (queryBuilder_ == null) {
+        query_ = builderForValue.build();
+        onChanged();
+      } else {
+        queryBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     */
+    public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) {
+      if (queryBuilder_ == null) {
+        if (query_ != null) {
+          query_ =
+              com.google.datastore.v1.AggregationQuery.newBuilder(query_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          query_ = value;
+        }
+        onChanged();
+      } else {
+        queryBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     */
+    public Builder clearQuery() {
+      if (queryBuilder_ == null) {
+        query_ = null;
+        onChanged();
+      } else {
+        query_ = null;
+        queryBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     */
+    public com.google.datastore.v1.AggregationQuery.Builder getQueryBuilder() {
+
+      onChanged();
+      return getQueryFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     */
+    public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
+      if (queryBuilder_ != null) {
+        return queryBuilder_.getMessageOrBuilder();
+      } else {
+        return query_ == null
+            ? com.google.datastore.v1.AggregationQuery.getDefaultInstance()
+            : query_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The parsed form of the `GqlQuery` from the request, if it was set.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery query = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.AggregationQuery,
+            com.google.datastore.v1.AggregationQuery.Builder,
+            com.google.datastore.v1.AggregationQueryOrBuilder>
+        getQueryFieldBuilder() {
+      if (queryBuilder_ == null) {
+        queryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.AggregationQuery,
+                com.google.datastore.v1.AggregationQuery.Builder,
+                com.google.datastore.v1.AggregationQueryOrBuilder>(
+                getQuery(), getParentForChildren(), isClean());
+        query_ = null;
+      }
+      return queryBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunAggregationQueryResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.RunAggregationQueryResponse)
+  private static final com.google.datastore.v1.RunAggregationQueryResponse DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.RunAggregationQueryResponse();
+  }
+
+  public static com.google.datastore.v1.RunAggregationQueryResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public RunAggregationQueryResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.RunAggregationQueryResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
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
new file mode 100644
index 000000000000..d4fcaf245d2e
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2020 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+package com.google.datastore.v1;
+
+public interface RunAggregationQueryResponseOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunAggregationQueryResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * A batch of aggregation results. Always present.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationResultBatch batch = 1;
+   *
+   * @return Whether the batch field is set.
+   */
+  boolean hasBatch();
+  /**
+   *
+   *
+   * 
    +   * A batch of aggregation results. Always present.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationResultBatch batch = 1;
+   *
+   * @return The batch.
+   */
+  com.google.datastore.v1.AggregationResultBatch getBatch();
+  /**
+   *
+   *
+   * 
    +   * A batch of aggregation results. Always present.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationResultBatch batch = 1;
+   */
+  com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The parsed form of the `GqlQuery` from the request, if it was set.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery query = 2;
+   *
+   * @return Whether the query field is set.
+   */
+  boolean hasQuery();
+  /**
+   *
+   *
+   * 
    +   * The parsed form of the `GqlQuery` from the request, if it was set.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery query = 2;
+   *
+   * @return The query.
+   */
+  com.google.datastore.v1.AggregationQuery getQuery();
+  /**
+   *
+   *
+   * 
    +   * The parsed form of the `GqlQuery` from the request, if it was set.
+   * 
    
+   *
+   * .google.datastore.v1.AggregationQuery query = 2;
+   */
+  com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder();
+}
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 51999dba5bc4..5b30e3bac5ee 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
@@ -53,121 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private RunQueryRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
-              if (readOptions_ != null) {
-                subBuilder = readOptions_.toBuilder();
-              }
-              readOptions_ =
-                  input.readMessage(
-                      com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(readOptions_);
-                readOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.v1.PartitionId.Builder subBuilder = null;
-              if (partitionId_ != null) {
-                subBuilder = partitionId_.toBuilder();
-              }
-              partitionId_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(partitionId_);
-                partitionId_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 26:
-            {
-              com.google.datastore.v1.Query.Builder subBuilder = null;
-              if (queryTypeCase_ == 3) {
-                subBuilder = ((com.google.datastore.v1.Query) queryType_).toBuilder();
-              }
-              queryType_ =
-                  input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Query) queryType_);
-                queryType_ = subBuilder.buildPartial();
-              }
-              queryTypeCase_ = 3;
-              break;
-            }
-          case 58:
-            {
-              com.google.datastore.v1.GqlQuery.Builder subBuilder = null;
-              if (queryTypeCase_ == 7) {
-                subBuilder = ((com.google.datastore.v1.GqlQuery) queryType_).toBuilder();
-              }
-              queryType_ =
-                  input.readMessage(com.google.datastore.v1.GqlQuery.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.GqlQuery) queryType_);
-                queryType_ = subBuilder.buildPartial();
-              }
-              queryTypeCase_ = 7;
-              break;
-            }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              databaseId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_RunQueryRequest_descriptor;
@@ -571,7 +456,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -602,7 +487,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -638,7 +523,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -673,7 +558,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -802,17 +687,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RunQueryRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -834,6 +712,12 @@ public Builder clear() {
         readOptions_ = null;
         readOptionsBuilder_ = null;
       }
+      if (queryBuilder_ != null) {
+        queryBuilder_.clear();
+      }
+      if (gqlQueryBuilder_ != null) {
+        gqlQueryBuilder_.clear();
+      }
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -969,7 +853,7 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -984,17 +868,67 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.RunQueryRequest parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            case 26:
+              {
+                input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry);
+                queryTypeCase_ = 3;
+                break;
+              } // case 26
+            case 58:
+              {
+                input.readMessage(getGqlQueryFieldBuilder().getBuilder(), extensionRegistry);
+                queryTypeCase_ = 7;
+                break;
+              } // case 58
+            case 66:
+              {
+                projectId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 66
+            case 74:
+              {
+                databaseId_ = input.readStringRequireUtf8();
+
+                break;
+              } // case 74
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.RunQueryRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2076,7 +2010,18 @@ public RunQueryRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RunQueryRequest(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 cc025af6b02a..0eb1eb818d42 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
@@ -50,75 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private RunQueryResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null;
-              if (batch_ != null) {
-                subBuilder = batch_.toBuilder();
-              }
-              batch_ =
-                  input.readMessage(
-                      com.google.datastore.v1.QueryResultBatch.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(batch_);
-                batch_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.v1.Query.Builder subBuilder = null;
-              if (query_ != null) {
-                subBuilder = query_.toBuilder();
-              }
-              query_ = input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(query_);
-                query_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_RunQueryResponse_descriptor;
@@ -246,7 +177,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (query_ != null) {
       output.writeMessage(2, getQuery());
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -261,7 +192,7 @@ public int getSerializedSize() {
     if (query_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -284,7 +215,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasQuery()) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -303,7 +234,7 @@ public int hashCode() {
       hash = (37 * hash) + QUERY_FIELD_NUMBER;
       hash = (53 * hash) + getQuery().hashCode();
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -432,17 +363,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RunQueryResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -552,7 +476,7 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) {
       if (other.hasQuery()) {
         mergeQuery(other.getQuery());
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -567,17 +491,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.RunQueryResponse parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getBatchFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry);
+
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.RunQueryResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -976,7 +926,18 @@ public RunQueryResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RunQueryResponse(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 27a3efa73e54..fc965df9dd2b 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
@@ -53,81 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private TransactionOptions(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 10:
-            {
-              com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
-              if (modeCase_ == 1) {
-                subBuilder =
-                    ((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_).toBuilder();
-              }
-              mode_ =
-                  input.readMessage(
-                      com.google.datastore.v1.TransactionOptions.ReadWrite.parser(),
-                      extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
-                mode_ = subBuilder.buildPartial();
-              }
-              modeCase_ = 1;
-              break;
-            }
-          case 18:
-            {
-              com.google.datastore.v1.TransactionOptions.ReadOnly.Builder subBuilder = null;
-              if (modeCase_ == 2) {
-                subBuilder =
-                    ((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_).toBuilder();
-              }
-              mode_ =
-                  input.readMessage(
-                      com.google.datastore.v1.TransactionOptions.ReadOnly.parser(),
-                      extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
-                mode_ = subBuilder.buildPartial();
-              }
-              modeCase_ = 2;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.DatastoreProto
         .internal_static_google_datastore_v1_TransactionOptions_descriptor;
@@ -195,50 +120,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
-    private ReadWrite(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                previousTransaction_ = input.readBytes();
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.datastore.v1.DatastoreProto
           .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
@@ -289,7 +170,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!previousTransaction_.isEmpty()) {
         output.writeBytes(1, previousTransaction_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -301,7 +182,7 @@ public int getSerializedSize() {
       if (!previousTransaction_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, previousTransaction_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -318,7 +199,7 @@ public boolean equals(final java.lang.Object obj) {
           (com.google.datastore.v1.TransactionOptions.ReadWrite) obj;
 
       if (!getPreviousTransaction().equals(other.getPreviousTransaction())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -331,7 +212,7 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + PREVIOUS_TRANSACTION_FIELD_NUMBER;
       hash = (53 * hash) + getPreviousTransaction().hashCode();
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -463,17 +344,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -564,7 +438,7 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite ot
         if (other.getPreviousTransaction() != com.google.protobuf.ByteString.EMPTY) {
           setPreviousTransaction(other.getPreviousTransaction());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -579,18 +453,37 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.datastore.v1.TransactionOptions.ReadWrite parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  previousTransaction_ = input.readBytes();
+
+                  break;
+                } // case 10
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.datastore.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -683,7 +576,19 @@ public ReadWrite parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new ReadWrite(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -777,60 +682,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
-    private ReadOnly(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.protobuf.Timestamp.Builder subBuilder = null;
-                if (readTime_ != null) {
-                  subBuilder = readTime_.toBuilder();
-                }
-                readTime_ =
-                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(readTime_);
-                  readTime_ = subBuilder.buildPartial();
-                }
-
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.datastore.v1.DatastoreProto
           .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
@@ -912,7 +763,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (readTime_ != null) {
         output.writeMessage(1, getReadTime());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -924,7 +775,7 @@ public int getSerializedSize() {
       if (readTime_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadTime());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -944,7 +795,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasReadTime()) {
         if (!getReadTime().equals(other.getReadTime())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -959,7 +810,7 @@ public int hashCode() {
         hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
         hash = (53 * hash) + getReadTime().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1091,17 +942,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1200,7 +1044,7 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly oth
         if (other.hasReadTime()) {
           mergeReadTime(other.getReadTime());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1215,18 +1059,37 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.datastore.v1.TransactionOptions.ReadOnly parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
+
+                  break;
+                } // case 10
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.datastore.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -1451,7 +1314,19 @@ public ReadOnly parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new ReadOnly(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (com.google.protobuf.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -1639,7 +1514,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (modeCase_ == 2) {
       output.writeMessage(2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -1658,7 +1533,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1685,7 +1560,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -1708,7 +1583,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1840,22 +1715,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.TransactionOptions.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      if (readWriteBuilder_ != null) {
+        readWriteBuilder_.clear();
+      }
+      if (readOnlyBuilder_ != null) {
+        readOnlyBuilder_.clear();
+      }
       modeCase_ = 0;
       mode_ = null;
       return this;
@@ -1965,7 +1839,7 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -1980,17 +1854,43 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.TransactionOptions parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getReadWriteFieldBuilder().getBuilder(), extensionRegistry);
+                modeCase_ = 1;
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getReadOnlyFieldBuilder().getBuilder(), extensionRegistry);
+                modeCase_ = 2;
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.TransactionOptions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -2460,7 +2360,18 @@ public TransactionOptions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new TransactionOptions(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
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 9c1dc9ae8ef1..e4168166a125 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
@@ -51,167 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
-  private Value(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8:
-            {
-              valueType_ = input.readBool();
-              valueTypeCase_ = 1;
-              break;
-            }
-          case 16:
-            {
-              valueType_ = input.readInt64();
-              valueTypeCase_ = 2;
-              break;
-            }
-          case 25:
-            {
-              valueType_ = input.readDouble();
-              valueTypeCase_ = 3;
-              break;
-            }
-          case 42:
-            {
-              com.google.datastore.v1.Key.Builder subBuilder = null;
-              if (valueTypeCase_ == 5) {
-                subBuilder = ((com.google.datastore.v1.Key) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Key) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 5;
-              break;
-            }
-          case 50:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (valueTypeCase_ == 6) {
-                subBuilder = ((com.google.datastore.v1.Entity) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 6;
-              break;
-            }
-          case 66:
-            {
-              com.google.type.LatLng.Builder subBuilder = null;
-              if (valueTypeCase_ == 8) {
-                subBuilder = ((com.google.type.LatLng) valueType_).toBuilder();
-              }
-              valueType_ = input.readMessage(com.google.type.LatLng.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.type.LatLng) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 8;
-              break;
-            }
-          case 74:
-            {
-              com.google.datastore.v1.ArrayValue.Builder subBuilder = null;
-              if (valueTypeCase_ == 9) {
-                subBuilder = ((com.google.datastore.v1.ArrayValue) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.datastore.v1.ArrayValue.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.ArrayValue) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 9;
-              break;
-            }
-          case 82:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (valueTypeCase_ == 10) {
-                subBuilder = ((com.google.protobuf.Timestamp) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.protobuf.Timestamp) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 10;
-              break;
-            }
-          case 88:
-            {
-              int rawValue = input.readEnum();
-              valueTypeCase_ = 11;
-              valueType_ = rawValue;
-              break;
-            }
-          case 112:
-            {
-              meaning_ = input.readInt32();
-              break;
-            }
-          case 138:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-              valueTypeCase_ = 17;
-              valueType_ = s;
-              break;
-            }
-          case 146:
-            {
-              valueType_ = input.readBytes();
-              valueTypeCase_ = 18;
-              break;
-            }
-          case 152:
-            {
-              excludeFromIndexes_ = input.readBool();
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (com.google.protobuf.UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
   }
@@ -943,7 +782,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (excludeFromIndexes_ != false) {
       output.writeBool(19, excludeFromIndexes_);
     }
-    unknownFields.writeTo(output);
+    getUnknownFields().writeTo(output);
   }
 
   @java.lang.Override
@@ -1011,7 +850,7 @@ public int getSerializedSize() {
     if (excludeFromIndexes_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(19, excludeFromIndexes_);
     }
-    size += unknownFields.getSerializedSize();
+    size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1067,7 +906,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!unknownFields.equals(other.unknownFields)) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
 
@@ -1133,7 +972,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + unknownFields.hashCode();
+    hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1261,22 +1100,30 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Value.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      if (timestampValueBuilder_ != null) {
+        timestampValueBuilder_.clear();
+      }
+      if (keyValueBuilder_ != null) {
+        keyValueBuilder_.clear();
+      }
+      if (geoPointValueBuilder_ != null) {
+        geoPointValueBuilder_.clear();
+      }
+      if (entityValueBuilder_ != null) {
+        entityValueBuilder_.clear();
+      }
+      if (arrayValueBuilder_ != null) {
+        arrayValueBuilder_.clear();
+      }
       meaning_ = 0;
 
       excludeFromIndexes_ = false;
@@ -1483,7 +1330,7 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.unknownFields);
+      this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
     }
@@ -1498,17 +1345,111 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.datastore.v1.Value parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                valueType_ = input.readBool();
+                valueTypeCase_ = 1;
+                break;
+              } // case 8
+            case 16:
+              {
+                valueType_ = input.readInt64();
+                valueTypeCase_ = 2;
+                break;
+              } // case 16
+            case 25:
+              {
+                valueType_ = input.readDouble();
+                valueTypeCase_ = 3;
+                break;
+              } // case 25
+            case 42:
+              {
+                input.readMessage(getKeyValueFieldBuilder().getBuilder(), extensionRegistry);
+                valueTypeCase_ = 5;
+                break;
+              } // case 42
+            case 50:
+              {
+                input.readMessage(getEntityValueFieldBuilder().getBuilder(), extensionRegistry);
+                valueTypeCase_ = 6;
+                break;
+              } // case 50
+            case 66:
+              {
+                input.readMessage(getGeoPointValueFieldBuilder().getBuilder(), extensionRegistry);
+                valueTypeCase_ = 8;
+                break;
+              } // case 66
+            case 74:
+              {
+                input.readMessage(getArrayValueFieldBuilder().getBuilder(), extensionRegistry);
+                valueTypeCase_ = 9;
+                break;
+              } // case 74
+            case 82:
+              {
+                input.readMessage(getTimestampValueFieldBuilder().getBuilder(), extensionRegistry);
+                valueTypeCase_ = 10;
+                break;
+              } // case 82
+            case 88:
+              {
+                int rawValue = input.readEnum();
+                valueTypeCase_ = 11;
+                valueType_ = rawValue;
+                break;
+              } // case 88
+            case 112:
+              {
+                meaning_ = input.readInt32();
+
+                break;
+              } // case 112
+            case 138:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                valueTypeCase_ = 17;
+                valueType_ = s;
+                break;
+              } // case 138
+            case 146:
+              {
+                valueType_ = input.readBytes();
+                valueTypeCase_ = 18;
+                break;
+              } // case 146
+            case 152:
+              {
+                excludeFromIndexes_ = input.readBool();
+
+                break;
+              } // case 152
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.datastore.v1.Value) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
+        onChanged();
+      } // finally
       return this;
     }
 
@@ -3312,7 +3253,18 @@ public Value parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Value(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
new file mode 100644
index 000000000000..e9c1d49400ee
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
@@ -0,0 +1,61 @@
+// 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.
+
+syntax = "proto3";
+
+package google.datastore.v1;
+
+import "google/datastore/v1/entity.proto";
+import "google/datastore/v1/query.proto";
+import "google/protobuf/timestamp.proto";
+
+option csharp_namespace = "Google.Cloud.Datastore.V1";
+option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore";
+option java_multiple_files = true;
+option java_outer_classname = "AggregationResultProto";
+option java_package = "com.google.datastore.v1";
+option php_namespace = "Google\\Cloud\\Datastore\\V1";
+option ruby_package = "Google::Cloud::Datastore::V1";
+
+// 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.
+message AggregationResult {
+  // 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 number of aggregation functions in the query.
+  map aggregate_properties = 2;
+}
+
+// A batch of aggregation results produced by an aggregation query.
+message AggregationResultBatch {
+  // The aggregation results for this batch.
+  repeated AggregationResult aggregation_results = 1;
+
+  // The state of the query after the current batch.
+  // Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+  // expected result type is limited to `NO_MORE_RESULTS`.
+  QueryResultBatch.MoreResultsType more_results = 2;
+
+  // 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.
+  google.protobuf.Timestamp read_time = 3;
+}
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 4c8ac7626291..e891e058f819 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
@@ -19,6 +19,7 @@ package google.datastore.v1;
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
+import "google/datastore/v1/aggregation_result.proto";
 import "google/datastore/v1/entity.proto";
 import "google/datastore/v1/query.proto";
 import "google/protobuf/timestamp.proto";
@@ -61,6 +62,14 @@ service Datastore {
     };
   }
 
+  // Runs an aggregation query.
+  rpc RunAggregationQuery(RunAggregationQueryRequest) returns (RunAggregationQueryResponse) {
+    option (google.api.http) = {
+      post: "/v1/projects/{project_id}:runAggregationQuery"
+      body: "*"
+    };
+  }
+
   // Begins a new transaction.
   rpc BeginTransaction(BeginTransactionRequest) returns (BeginTransactionResponse) {
     option (google.api.http) = {
@@ -189,6 +198,45 @@ message RunQueryResponse {
   Query query = 2;
 }
 
+// The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+message RunAggregationQueryRequest {
+  // 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
+  // partition ID.
+  PartitionId partition_id = 2;
+
+  // The options for this query.
+  ReadOptions read_options = 1;
+
+  // The type of query.
+  oneof query_type {
+    // The query to run.
+    AggregationQuery aggregation_query = 3;
+
+    // The GQL query to run. This query must be an aggregation query.
+    GqlQuery gql_query = 7;
+  }
+}
+
+// The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+message RunAggregationQueryResponse {
+  // A batch of aggregation results. Always present.
+  AggregationResultBatch batch = 1;
+
+  // The parsed form of the `GqlQuery` from the request, if it was set.
+  AggregationQuery query = 2;
+}
+
 // The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 message BeginTransactionRequest {
   // Required. The ID of the project against which to make the request.
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 cbe44932d0ff..b16806ef26d6 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
@@ -118,6 +118,93 @@ message Query {
   google.protobuf.Int32Value limit = 12;
 }
 
+// Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+message AggregationQuery {
+  // Defines a aggregation that produces a single result.
+  message Aggregation {
+    // Count of entities that match the query.
+    //
+    // The `COUNT(*)` aggregation function operates on the entire entity
+    // so it does not require a field reference.
+    message Count {
+      // 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.
+      google.protobuf.Int64Value up_to = 1 [(google.api.field_behavior) = OPTIONAL];
+    }
+
+    // The type of aggregation to perform, required.
+    oneof operator {
+      // Count aggregator.
+      Count count = 1;
+    }
+
+    // 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_`. For example:
+    //
+    // ```
+    // AGGREGATE
+    //   COUNT_UP_TO(1) AS count_up_to_1,
+    //   COUNT_UP_TO(2),
+    //   COUNT_UP_TO(3) AS count_up_to_3,
+    //   COUNT_UP_TO(4)
+    // OVER (
+    //   ...
+    // );
+    // ```
+    //
+    // becomes:
+    //
+    // ```
+    // AGGREGATE
+    //   COUNT_UP_TO(1) AS count_up_to_1,
+    //   COUNT_UP_TO(2) AS property_1,
+    //   COUNT_UP_TO(3) AS count_up_to_3,
+    //   COUNT_UP_TO(4) AS property_2
+    // OVER (
+    //   ...
+    // );
+    // ```
+    //
+    // Requires:
+    //
+    // * Must be unique across all aggregation aliases.
+    // * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+    string alias = 7 [(google.api.field_behavior) = OPTIONAL];
+  }
+
+  // The base query to aggregate over.
+  oneof query_type {
+    // Nested query for aggregation
+    Query nested_query = 1;
+  }
+
+  // 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.
+  repeated Aggregation aggregations = 3 [(google.api.field_behavior) = OPTIONAL];
+}
+
 // A representation of a kind.
 message KindExpression {
   // The name of the kind.

From d4a95f1d5dcd31cde271d71869efedb964dee639 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 20:28:32 +0000
Subject: [PATCH 0967/1784] chore(main): release 2.11.5 (#867)

:robot: I have created a release *beep* *boop*
---


## [2.11.5](https://togithub.com/googleapis/java-datastore/compare/v2.11.4...v2.11.5) (2022-10-03)


### Dependencies

* Convert from `JacksonFactory` to `GsonFactory` ([#780](https://togithub.com/googleapis/java-datastore/issues/780)) ([d24cae2](https://togithub.com/googleapis/java-datastore/commit/d24cae20c2c69327b8f097cc56fcb48b5f61c358))
* Update dependency cachetools to v5 ([#863](https://togithub.com/googleapis/java-datastore/issues/863)) ([74320c1](https://togithub.com/googleapis/java-datastore/commit/74320c18bc9ad95fd366a1be5fc2d95105944833))
* Update dependency certifi to v2022.9.24 ([#842](https://togithub.com/googleapis/java-datastore/issues/842)) ([1631a67](https://togithub.com/googleapis/java-datastore/commit/1631a67d037f1b1e09a6653a4867d51a6412f6bb))
* Update dependency charset-normalizer to v2.1.1 ([#854](https://togithub.com/googleapis/java-datastore/issues/854)) ([8814084](https://togithub.com/googleapis/java-datastore/commit/881408421e7c9cea5712e9c7c315ab4671c15d49))
* Update dependency click to v8.1.3 ([#855](https://togithub.com/googleapis/java-datastore/issues/855)) ([5935e6e](https://togithub.com/googleapis/java-datastore/commit/5935e6e871724965f05817a6739369e40b59809b))
* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#866](https://togithub.com/googleapis/java-datastore/issues/866)) ([af1d1eb](https://togithub.com/googleapis/java-datastore/commit/af1d1eb3bc3dbbb6637ad6bc686ed9fc7c5b9bd5))
* Update dependency gcp-releasetool to v1.8.8 ([#843](https://togithub.com/googleapis/java-datastore/issues/843)) ([10b4e44](https://togithub.com/googleapis/java-datastore/commit/10b4e449ebdf238ad882842ca75ef5477a0d0292))
* Update dependency google-api-core to v2.10.1 ([#856](https://togithub.com/googleapis/java-datastore/issues/856)) ([874166e](https://togithub.com/googleapis/java-datastore/commit/874166e9d2bff6c61f280494fc6b82845e66257b))
* Update dependency google-auth to v2.12.0 ([#857](https://togithub.com/googleapis/java-datastore/issues/857)) ([d832df6](https://togithub.com/googleapis/java-datastore/commit/d832df63ebbc259a9d86818d6dfdcbfe29dd27ce))
* Update dependency google-cloud-core to v2.3.2 ([#852](https://togithub.com/googleapis/java-datastore/issues/852)) ([14aad83](https://togithub.com/googleapis/java-datastore/commit/14aad838b7edd572ca1df6f67cc1988722c3dee5))
* Update dependency google-cloud-storage to v2.5.0 ([#858](https://togithub.com/googleapis/java-datastore/issues/858)) ([17f47bc](https://togithub.com/googleapis/java-datastore/commit/17f47bcb368887291c41ac863743c46feae3c2cf))
* Update dependency google-crc32c to v1.5.0 ([#859](https://togithub.com/googleapis/java-datastore/issues/859)) ([dd58916](https://togithub.com/googleapis/java-datastore/commit/dd58916e895c6b9e5449a562a53ddca0c33cf530))
* Update dependency googleapis-common-protos to v1.56.4 ([#853](https://togithub.com/googleapis/java-datastore/issues/853)) ([416e157](https://togithub.com/googleapis/java-datastore/commit/416e157a51caaa11b21b0d43ac94a2bd76e4de14))
* Update dependency importlib-metadata to v4.12.0 ([#860](https://togithub.com/googleapis/java-datastore/issues/860)) ([0a15a3f](https://togithub.com/googleapis/java-datastore/commit/0a15a3fc5294b5e8d7b0b86fcd6f65739eb700ca))
* Update dependency jinja2 to v3.1.2 ([#861](https://togithub.com/googleapis/java-datastore/issues/861)) ([9fc4af5](https://togithub.com/googleapis/java-datastore/commit/9fc4af50bc7f69d080a29d4e772026f990e02fe8))
* Update dependency keyring to v23.9.3 ([#862](https://togithub.com/googleapis/java-datastore/issues/862)) ([620e5f2](https://togithub.com/googleapis/java-datastore/commit/620e5f2ebc33a14ebf106bdc8e3731e1ce1bd449))
* Update dependency markupsafe to v2.1.1 ([#844](https://togithub.com/googleapis/java-datastore/issues/844)) ([8d64f16](https://togithub.com/googleapis/java-datastore/commit/8d64f16e20fa8c3e15d48fb44657b412bb55bdc1))
* Update dependency protobuf to v3.20.2 ([#845](https://togithub.com/googleapis/java-datastore/issues/845)) ([7b46721](https://togithub.com/googleapis/java-datastore/commit/7b46721d8db483348decb27818de67feb19851c5))
* Update dependency protobuf to v4 ([#864](https://togithub.com/googleapis/java-datastore/issues/864)) ([0bf85e9](https://togithub.com/googleapis/java-datastore/commit/0bf85e9355dff9321bd84038c1bad249b5a92531))
* Update dependency pyjwt to v2.5.0 ([#846](https://togithub.com/googleapis/java-datastore/issues/846)) ([e4edcd1](https://togithub.com/googleapis/java-datastore/commit/e4edcd1e4c3079ab579d15c7b47e110fb99b6674))
* Update dependency requests to v2.28.1 ([#847](https://togithub.com/googleapis/java-datastore/issues/847)) ([08ca8e5](https://togithub.com/googleapis/java-datastore/commit/08ca8e5af44a4b2b1cfae8996b2f7edfe7109204))
* Update dependency typing-extensions to v4.3.0 ([#848](https://togithub.com/googleapis/java-datastore/issues/848)) ([2197874](https://togithub.com/googleapis/java-datastore/commit/219787455d34a2667587f9577368c36811c0c58b))
* Update dependency zipp to v3.8.1 ([#849](https://togithub.com/googleapis/java-datastore/issues/849)) ([18db303](https://togithub.com/googleapis/java-datastore/commit/18db3030ad51ae0db6465717ee432460b67f696a))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 29 +++++++++++++++++++
 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, 56 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c611ccd38c..3746743edf53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## [2.11.5](https://github.com/googleapis/java-datastore/compare/v2.11.4...v2.11.5) (2022-10-03)
+
+
+### Dependencies
+
+* Convert from `JacksonFactory` to `GsonFactory` ([#780](https://github.com/googleapis/java-datastore/issues/780)) ([d24cae2](https://github.com/googleapis/java-datastore/commit/d24cae20c2c69327b8f097cc56fcb48b5f61c358))
+* Update dependency cachetools to v5 ([#863](https://github.com/googleapis/java-datastore/issues/863)) ([74320c1](https://github.com/googleapis/java-datastore/commit/74320c18bc9ad95fd366a1be5fc2d95105944833))
+* Update dependency certifi to v2022.9.24 ([#842](https://github.com/googleapis/java-datastore/issues/842)) ([1631a67](https://github.com/googleapis/java-datastore/commit/1631a67d037f1b1e09a6653a4867d51a6412f6bb))
+* Update dependency charset-normalizer to v2.1.1 ([#854](https://github.com/googleapis/java-datastore/issues/854)) ([8814084](https://github.com/googleapis/java-datastore/commit/881408421e7c9cea5712e9c7c315ab4671c15d49))
+* Update dependency click to v8.1.3 ([#855](https://github.com/googleapis/java-datastore/issues/855)) ([5935e6e](https://github.com/googleapis/java-datastore/commit/5935e6e871724965f05817a6739369e40b59809b))
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#866](https://github.com/googleapis/java-datastore/issues/866)) ([af1d1eb](https://github.com/googleapis/java-datastore/commit/af1d1eb3bc3dbbb6637ad6bc686ed9fc7c5b9bd5))
+* Update dependency gcp-releasetool to v1.8.8 ([#843](https://github.com/googleapis/java-datastore/issues/843)) ([10b4e44](https://github.com/googleapis/java-datastore/commit/10b4e449ebdf238ad882842ca75ef5477a0d0292))
+* Update dependency google-api-core to v2.10.1 ([#856](https://github.com/googleapis/java-datastore/issues/856)) ([874166e](https://github.com/googleapis/java-datastore/commit/874166e9d2bff6c61f280494fc6b82845e66257b))
+* Update dependency google-auth to v2.12.0 ([#857](https://github.com/googleapis/java-datastore/issues/857)) ([d832df6](https://github.com/googleapis/java-datastore/commit/d832df63ebbc259a9d86818d6dfdcbfe29dd27ce))
+* Update dependency google-cloud-core to v2.3.2 ([#852](https://github.com/googleapis/java-datastore/issues/852)) ([14aad83](https://github.com/googleapis/java-datastore/commit/14aad838b7edd572ca1df6f67cc1988722c3dee5))
+* Update dependency google-cloud-storage to v2.5.0 ([#858](https://github.com/googleapis/java-datastore/issues/858)) ([17f47bc](https://github.com/googleapis/java-datastore/commit/17f47bcb368887291c41ac863743c46feae3c2cf))
+* Update dependency google-crc32c to v1.5.0 ([#859](https://github.com/googleapis/java-datastore/issues/859)) ([dd58916](https://github.com/googleapis/java-datastore/commit/dd58916e895c6b9e5449a562a53ddca0c33cf530))
+* Update dependency googleapis-common-protos to v1.56.4 ([#853](https://github.com/googleapis/java-datastore/issues/853)) ([416e157](https://github.com/googleapis/java-datastore/commit/416e157a51caaa11b21b0d43ac94a2bd76e4de14))
+* Update dependency importlib-metadata to v4.12.0 ([#860](https://github.com/googleapis/java-datastore/issues/860)) ([0a15a3f](https://github.com/googleapis/java-datastore/commit/0a15a3fc5294b5e8d7b0b86fcd6f65739eb700ca))
+* Update dependency jinja2 to v3.1.2 ([#861](https://github.com/googleapis/java-datastore/issues/861)) ([9fc4af5](https://github.com/googleapis/java-datastore/commit/9fc4af50bc7f69d080a29d4e772026f990e02fe8))
+* Update dependency keyring to v23.9.3 ([#862](https://github.com/googleapis/java-datastore/issues/862)) ([620e5f2](https://github.com/googleapis/java-datastore/commit/620e5f2ebc33a14ebf106bdc8e3731e1ce1bd449))
+* Update dependency markupsafe to v2.1.1 ([#844](https://github.com/googleapis/java-datastore/issues/844)) ([8d64f16](https://github.com/googleapis/java-datastore/commit/8d64f16e20fa8c3e15d48fb44657b412bb55bdc1))
+* Update dependency protobuf to v3.20.2 ([#845](https://github.com/googleapis/java-datastore/issues/845)) ([7b46721](https://github.com/googleapis/java-datastore/commit/7b46721d8db483348decb27818de67feb19851c5))
+* Update dependency protobuf to v4 ([#864](https://github.com/googleapis/java-datastore/issues/864)) ([0bf85e9](https://github.com/googleapis/java-datastore/commit/0bf85e9355dff9321bd84038c1bad249b5a92531))
+* Update dependency pyjwt to v2.5.0 ([#846](https://github.com/googleapis/java-datastore/issues/846)) ([e4edcd1](https://github.com/googleapis/java-datastore/commit/e4edcd1e4c3079ab579d15c7b47e110fb99b6674))
+* Update dependency requests to v2.28.1 ([#847](https://github.com/googleapis/java-datastore/issues/847)) ([08ca8e5](https://github.com/googleapis/java-datastore/commit/08ca8e5af44a4b2b1cfae8996b2f7edfe7109204))
+* Update dependency typing-extensions to v4.3.0 ([#848](https://github.com/googleapis/java-datastore/issues/848)) ([2197874](https://github.com/googleapis/java-datastore/commit/219787455d34a2667587f9577368c36811c0c58b))
+* Update dependency zipp to v3.8.1 ([#849](https://github.com/googleapis/java-datastore/issues/849)) ([18db303](https://github.com/googleapis/java-datastore/commit/18db3030ad51ae0db6465717ee432460b67f696a))
+
 ## [2.11.4](https://github.com/googleapis/java-datastore/compare/v2.11.3...v2.11.4) (2022-09-22)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2df32989cdd2..d8662ff57052 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.11.5-SNAPSHOT
+  2.11.5
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5-SNAPSHOT
+    2.11.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2bd31e8fff60..9c5186304e35 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.11.5-SNAPSHOT
+  2.11.5
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.5-SNAPSHOT
+        2.11.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.5-SNAPSHOT
+        2.11.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.5-SNAPSHOT
+        0.102.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.5-SNAPSHOT
+        2.11.5
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 879025ef5fb8..d5a22486e84c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.5-SNAPSHOT
+  2.11.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5-SNAPSHOT
+    2.11.5
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 76dd5fc3d1f0..4da271bb8cf2 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.11.5-SNAPSHOT
+  2.11.5
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5-SNAPSHOT
+    2.11.5
   
   
     
diff --git a/pom.xml b/pom.xml
index 85ada822dbb1..ef3df4089de0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.5-SNAPSHOT
+  2.11.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.5-SNAPSHOT
+        2.11.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.5-SNAPSHOT
+        2.11.5
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.5-SNAPSHOT
+        2.11.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.5-SNAPSHOT
+        0.102.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.5-SNAPSHOT
+        2.11.5
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index 7ade7904d0c1..2bbfb1874bfb 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.11.5-SNAPSHOT
+  2.11.5
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5-SNAPSHOT
+    2.11.5
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8d3a577dde17..17edc539eb02 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.102.5-SNAPSHOT
+  0.102.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5-SNAPSHOT
+    2.11.5
   
   
     
diff --git a/versions.txt b/versions.txt
index ff3a5f2d463b..fac256bee192 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.4:2.11.5-SNAPSHOT
-google-cloud-datastore-bom:2.11.4:2.11.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.102.4:0.102.5-SNAPSHOT
-datastore-v1-proto-client:2.11.4:2.11.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.11.4:2.11.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.11.4:2.11.5-SNAPSHOT
+google-cloud-datastore:2.11.5:2.11.5
+google-cloud-datastore-bom:2.11.5:2.11.5
+proto-google-cloud-datastore-v1:0.102.5:0.102.5
+datastore-v1-proto-client:2.11.5:2.11.5
+proto-google-cloud-datastore-admin-v1:2.11.5:2.11.5
+grpc-google-cloud-datastore-admin-v1:2.11.5:2.11.5

From 9b48326a19109644404445c7c50ea0ed6860c4d6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 20:50:17 +0000
Subject: [PATCH 0968/1784] chore(main): release 2.11.6-SNAPSHOT (#868)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d8662ff57052..028c2d459f8c 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.11.5
+  2.11.6-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5
+    2.11.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 9c5186304e35..74d2a04e1669 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.11.5
+  2.11.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.5
+        2.11.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.5
+        2.11.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.5
+        0.102.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.5
+        2.11.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d5a22486e84c..81698ae6631c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.5
+  2.11.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5
+    2.11.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 4da271bb8cf2..b6805ba68438 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.11.5
+  2.11.6-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5
+    2.11.6-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index ef3df4089de0..2c53584b3354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.5
+  2.11.6-SNAPSHOT
   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.11.5
+        2.11.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.5
+        2.11.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.5
+        2.11.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.5
+        0.102.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.5
+        2.11.6-SNAPSHOT
         
           
             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 2bbfb1874bfb..684d38fdfc1f 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.11.5
+  2.11.6-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5
+    2.11.6-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 17edc539eb02..47a2cc7b97fa 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.102.5
+  0.102.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.5
+    2.11.6-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index fac256bee192..be559a86e0aa 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.5:2.11.5
-google-cloud-datastore-bom:2.11.5:2.11.5
-proto-google-cloud-datastore-v1:0.102.5:0.102.5
-datastore-v1-proto-client:2.11.5:2.11.5
-proto-google-cloud-datastore-admin-v1:2.11.5:2.11.5
-grpc-google-cloud-datastore-admin-v1:2.11.5:2.11.5
+google-cloud-datastore:2.11.5:2.11.6-SNAPSHOT
+google-cloud-datastore-bom:2.11.5:2.11.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.102.5:0.102.6-SNAPSHOT
+datastore-v1-proto-client:2.11.5:2.11.6-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.11.5:2.11.6-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.11.5:2.11.6-SNAPSHOT

From 15eddd98d4468445b9e989a027f8a842b50d5ec3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 4 Oct 2022 18:54:15 +0200
Subject: [PATCH 0969/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.11.5 (#869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.11.4` -> `2.11.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.5/compatibility-slim/2.11.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.11.5/confidence-slim/2.11.4)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.

---

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).

---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 65642fcfb2db..95360cb59c4e 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.11.4
+  2.11.5
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.11.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.11.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.5"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 0cfeca427c3a..1fbcaff7736f 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.11.4
+      2.11.5
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 05064b415ecf..fb1e20988b70 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.11.4
+      2.11.5
     
 
     

From 4a8da722d5a5c1614b11f80a84fbf1754f47d5df Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 7 Oct 2022 17:46:29 +0200
Subject: [PATCH 0970/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.1.3 (#870)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.1.3

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 95360cb59c4e..fca5470e0b38 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.1.2
+      26.1.3
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.2')
+implementation platform('com.google.cloud:libraries-bom:26.1.3')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 07a9283e4da4..aab2b917496a 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.2
+        26.1.3
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b1e99e22a481..995c8800b038 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.2
+        26.1.3
         pom
         import
       

From b2a72ca407b1fa168c18b136e73932c8716fbdf6 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 11 Oct 2022 21:57:34 +0200
Subject: [PATCH 0971/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.16 (#872)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2c53584b3354..3ed672f27660 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.15.0
+    2.16
   
 
   

From 0e4ab63f04b97df62d59420d0009ded11610ad2d Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Fri, 14 Oct 2022 18:22:19 +0530
Subject: [PATCH 0972/1784] refactor: making query class generic  (#875)

* Making query generic and moving all the entity records related concerns to an internal RecordQuery interface

* fixing lint

* Making getType an internal function
---
 .../google/cloud/datastore/DatastoreImpl.java |  4 ++-
 .../com/google/cloud/datastore/GqlQuery.java  | 22 ++++++++++---
 .../com/google/cloud/datastore/Query.java     | 16 ++-------
 .../cloud/datastore/QueryResultsImpl.java     | 11 ++++---
 .../google/cloud/datastore/RecordQuery.java   | 33 +++++++++++++++++++
 .../cloud/datastore/StructuredQuery.java      | 19 ++++++++---
 .../google/cloud/datastore/DatastoreTest.java |  4 +--
 7 files changed, 79 insertions(+), 30 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java

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 9892e151752c..2d68a2294780 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
@@ -180,8 +180,10 @@ public  QueryResults run(Query query, ReadOption... options) {
     return run(toReadOptionsPb(options), query);
   }
 
+  @SuppressWarnings("unchecked")
    QueryResults run(com.google.datastore.v1.ReadOptions readOptionsPb, Query query) {
-    return new QueryResultsImpl<>(this, readOptionsPb, query);
+    return new QueryResultsImpl<>(
+        this, readOptionsPb, (RecordQuery) query, query.getNamespace());
   }
 
   com.google.datastore.v1.RunQueryResponse runQuery(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index 2b99fd0a9d79..bebb4df9f7b7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -19,6 +19,7 @@
 import static com.google.cloud.datastore.Validator.validateNamespace;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.core.InternalApi;
 import com.google.cloud.Timestamp;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
@@ -71,7 +72,7 @@
  * @param  the type of the result values this query will produce
  * @see GQL Reference
  */
-public final class GqlQuery extends Query {
+public final class GqlQuery extends Query implements RecordQuery {
 
   private static final long serialVersionUID = -5514894742849230793L;
 
@@ -80,6 +81,8 @@ public final class GqlQuery extends Query {
   private final ImmutableMap namedBindings;
   private final ImmutableList positionalBindings;
 
+  private final ResultType resultType;
+
   static final class Binding implements Serializable {
 
     private static final long serialVersionUID = 2344746877591371548L;
@@ -423,7 +426,8 @@ private static  Binding toBinding(
   }
 
   private GqlQuery(Builder builder) {
-    super(builder.resultType, builder.namespace);
+    super(builder.namespace);
+    resultType = checkNotNull(builder.resultType);
     queryString = builder.queryString;
     allowLiteral = builder.allowLiteral;
     namedBindings = ImmutableMap.copyOf(builder.namedBindings);
@@ -461,9 +465,15 @@ public List getNumberArgs() {
     return builder.build();
   }
 
+  @Override
+  public ResultType getType() {
+    return resultType;
+  }
+
   @Override
   public String toString() {
-    return super.toStringHelper()
+    return toStringHelper()
+        .add("type", getType())
         .add("queryString", queryString)
         .add("allowLiteral", allowLiteral)
         .add("namedBindings", namedBindings)
@@ -507,13 +517,15 @@ com.google.datastore.v1.GqlQuery toPb() {
     return queryPb.build();
   }
 
+  @InternalApi
   @Override
-  void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) {
+  public void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) {
     requestPb.setGqlQuery(toPb());
   }
 
+  @InternalApi
   @Override
-  Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) {
+  public RecordQuery nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) {
     return StructuredQuery.fromPb(getType(), getNamespace(), responsePb.getQuery())
         .nextQuery(responsePb);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
index 00aa6f17c3c1..a0bed5984c84 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
@@ -16,8 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.Maps;
@@ -39,7 +37,6 @@ public abstract class Query implements Serializable {
 
   private static final long serialVersionUID = 7967659059395653941L;
 
-  private final ResultType resultType;
   private final String namespace;
 
   /**
@@ -156,27 +153,18 @@ static ResultType fromPb(com.google.datastore.v1.EntityResult.ResultType type
     }
   }
 
-  Query(ResultType resultType, String namespace) {
-    this.resultType = checkNotNull(resultType);
+  Query(String namespace) {
     this.namespace = namespace;
   }
 
-  ResultType getType() {
-    return resultType;
-  }
-
   public String getNamespace() {
     return namespace;
   }
 
   ToStringHelper toStringHelper() {
-    return MoreObjects.toStringHelper(this).add("type", resultType).add("namespace", namespace);
+    return MoreObjects.toStringHelper(this).add("namespace", namespace);
   }
 
-  abstract void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb);
-
-  abstract Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb);
-
   /**
    * Returns a new {@link GqlQuery} builder.
    *
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 9ed822985002..222efa3b8898 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
@@ -30,7 +30,7 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
   private final com.google.datastore.v1.ReadOptions readOptionsPb;
   private final com.google.datastore.v1.PartitionId partitionIdPb;
   private final ResultType queryResultType;
-  private Query query;
+  private RecordQuery query;
   private ResultType actualResultType;
   private com.google.datastore.v1.RunQueryResponse runQueryResponsePb;
   private com.google.datastore.v1.Query mostRecentQueryPb;
@@ -40,7 +40,10 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
   private MoreResultsType moreResults;
 
   QueryResultsImpl(
-      DatastoreImpl datastore, com.google.datastore.v1.ReadOptions readOptionsPb, Query query) {
+      DatastoreImpl datastore,
+      com.google.datastore.v1.ReadOptions readOptionsPb,
+      RecordQuery query,
+      String namespace) {
     this.datastore = datastore;
     this.readOptionsPb = readOptionsPb;
     this.query = query;
@@ -48,8 +51,8 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
     com.google.datastore.v1.PartitionId.Builder pbBuilder =
         com.google.datastore.v1.PartitionId.newBuilder();
     pbBuilder.setProjectId(datastore.getOptions().getProjectId());
-    if (query.getNamespace() != null) {
-      pbBuilder.setNamespaceId(query.getNamespace());
+    if (namespace != null) {
+      pbBuilder.setNamespaceId(namespace);
     } else if (datastore.getOptions().getNamespace() != null) {
       pbBuilder.setNamespaceId(datastore.getOptions().getNamespace());
     }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java
new file mode 100644
index 000000000000..9dc9664578da
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java
@@ -0,0 +1,33 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.Query.ResultType;
+
+/** An internal marker interface to represent {@link Query} that returns the entity records. */
+@InternalApi
+public interface RecordQuery {
+
+  @InternalApi
+  ResultType getType();
+
+  @InternalApi
+  void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb);
+
+  @InternalApi
+  RecordQuery nextQuery(com.google.datastore.v1.RunQueryResponse responsePb);
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 8e50d08678cf..8d2974c15fea 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -26,6 +26,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.InternalApi;
 import com.google.cloud.StringEnumType;
 import com.google.cloud.StringEnumValue;
 import com.google.cloud.Timestamp;
@@ -85,7 +86,7 @@
  * @see Datastore
  *     queries
  */
-public abstract class StructuredQuery extends Query {
+public abstract class StructuredQuery extends Query implements RecordQuery {
 
   private static final long serialVersionUID = 546838955624019594L;
   static final String KEY_PROPERTY_NAME = "__key__";
@@ -100,6 +101,8 @@ public abstract class StructuredQuery extends Query {
   private final int offset;
   private final Integer limit;
 
+  private final ResultType resultType;
+
   public abstract static class Filter implements Serializable {
 
     private static final long serialVersionUID = -6443285436239990860L;
@@ -899,7 +902,8 @@ B mergeFrom(com.google.datastore.v1.Query queryPb) {
   }
 
   StructuredQuery(BuilderImpl builder) {
-    super(builder.resultType, builder.namespace);
+    super(builder.namespace);
+    resultType = checkNotNull(builder.resultType);
     kind = builder.kind;
     projection = ImmutableList.copyOf(builder.projection);
     filter = builder.filter;
@@ -914,6 +918,7 @@ B mergeFrom(com.google.datastore.v1.Query queryPb) {
   @Override
   public String toString() {
     return toStringHelper()
+        .add("type", getType())
         .add("kind", kind)
         .add("startCursor", startCursor)
         .add("endCursor", endCursor)
@@ -1013,13 +1018,19 @@ public Integer getLimit() {
 
   public abstract Builder toBuilder();
 
+  public ResultType getType() {
+    return resultType;
+  }
+
+  @InternalApi
   @Override
-  void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) {
+  public void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) {
     requestPb.setQuery(toPb());
   }
 
+  @InternalApi
   @Override
-  StructuredQuery nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) {
+  public StructuredQuery nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) {
     Builder builder = toBuilder();
     builder.setStartCursor(new Cursor(responsePb.getBatch().getEndCursor()));
     if (offset > 0 && responsePb.getBatch().getSkippedResults() < offset) {
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 fa077bc61e38..72067fd20415 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
@@ -613,7 +613,7 @@ private List buildResponsesForQueryPagination() {
     Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build();
     datastore.add(ENTITY3, entity4, entity5);
     List responses = new ArrayList<>();
-    Query query = Query.newKeyQueryBuilder().build();
+    RecordQuery query = Query.newKeyQueryBuilder().build();
     RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
     query.populatePb(requestPb);
     QueryResultBatch queryResultBatchPb =
@@ -722,7 +722,7 @@ private List buildResponsesForQueryPaginationWithLimit() {
     datastore.add(ENTITY3, entity4, entity5);
     DatastoreRpc datastoreRpc = datastore.getOptions().getDatastoreRpcV1();
     List responses = new ArrayList<>();
-    Query query = Query.newEntityQueryBuilder().build();
+    RecordQuery query = Query.newEntityQueryBuilder().build();
     RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
     query.populatePb(requestPb);
     QueryResultBatch queryResultBatchPb =

From 4641306b1df99b7b637bb146af03e6bcb5ebf59f Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Fri, 14 Oct 2022 19:16:13 +0530
Subject: [PATCH 0973/1784] refactor: Extracting out Proto preparation logic to
 encourage reusability (#876)

This change introduces a component called ProtoPreparer which will be used to populate the protos from the domain objects. In the upcoming count aggregation feature, aggregation query will be acting upon StructuredQuery and GqlQuery and hence need to populate the protos of those queries **again**.  For that reason _ProtoPreparer_ component will have the responsibility to populate the protos and be reused in multiple usecases.

_Note: This PR is intended to trim down the changes done as part of #823 ._
---
 google-cloud-datastore/pom.xml                |   6 +
 .../google/cloud/datastore/DatastoreImpl.java |  52 +++-----
 .../com/google/cloud/datastore/GqlQuery.java  |  23 ++--
 .../datastore/GqlQueryProtoPreparer.java      |  43 +++++++
 .../cloud/datastore/QueryResultsImpl.java     |  10 +-
 .../google/cloud/datastore/ReadOption.java    |  44 +++++++
 .../datastore/ReadOptionProtoPreparer.java    |  77 ++++++++++++
 .../cloud/datastore/StructuredQuery.java      |  36 +-----
 .../StructuredQueryProtoPreparer.java         |  66 ++++++++++
 .../cloud/datastore/TransactionImpl.java      |  22 ++--
 .../execution/request/ProtoPreparer.java      |  30 +++++
 .../datastore/GqlQueryProtoPreparerTest.java  |  74 +++++++++++
 .../google/cloud/datastore/ProtoTestData.java |  76 +++++++++++
 .../ReadOptionProtoPreparerTest.java          |  97 ++++++++++++++
 .../StructuredQueryProtoPreparerTest.java     | 118 ++++++++++++++++++
 15 files changed, 679 insertions(+), 95 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 81698ae6631c..27ca86ab55d9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -143,6 +143,12 @@
       easymock
       test
     
+    
+      com.google.truth
+      truth
+      1.1.3
+      test
+    
   
 
   
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 2d68a2294780..f6a96c2a4fe0 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
@@ -22,8 +22,6 @@
 import com.google.cloud.RetryHelper;
 import com.google.cloud.RetryHelper.RetryHelperException;
 import com.google.cloud.ServiceOptions;
-import com.google.cloud.datastore.ReadOption.EventualConsistency;
-import com.google.cloud.datastore.ReadOption.ReadTime;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
@@ -31,7 +29,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
-import com.google.datastore.v1.ReadOptions.ReadConsistency;
+import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.ReserveIdsRequest;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.protobuf.ByteString;
@@ -46,6 +44,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
@@ -57,13 +56,16 @@ final class DatastoreImpl extends BaseService implements Datas
       TransactionExceptionHandler.build();
   private static final ExceptionHandler TRANSACTION_OPERATION_EXCEPTION_HANDLER =
       TransactionOperationExceptionHandler.build();
-  private final TraceUtil traceUtil = TraceUtil.getInstance();;
+  private final TraceUtil traceUtil = TraceUtil.getInstance();
+
+  private final ReadOptionProtoPreparer readOptionProtoPreparer;
 
   DatastoreImpl(DatastoreOptions options) {
     super(options);
     this.datastoreRpc = options.getDatastoreRpcV1();
     retrySettings =
         MoreObjects.firstNonNull(options.getRetrySettings(), ServiceOptions.getNoRetrySettings());
+    readOptionProtoPreparer = new ReadOptionProtoPreparer();
   }
 
   @Override
@@ -172,7 +174,7 @@ public  T runInTransaction(
 
   @Override
   public  QueryResults run(Query query) {
-    return run(null, query);
+    return run(Optional.empty(), query);
   }
 
   @Override
@@ -181,7 +183,7 @@ public  QueryResults run(Query query, ReadOption... options) {
   }
 
   @SuppressWarnings("unchecked")
-   QueryResults run(com.google.datastore.v1.ReadOptions readOptionsPb, Query query) {
+   QueryResults run(Optional readOptionsPb, Query query) {
     return new QueryResultsImpl<>(
         this, readOptionsPb, (RecordQuery) query, query.getNamespace());
   }
@@ -331,7 +333,7 @@ public Entity get(Key key, ReadOption... options) {
 
   @Override
   public Iterator get(Key... keys) {
-    return get(null, keys);
+    return get(Optional.empty(), keys);
   }
 
   @Override
@@ -339,33 +341,11 @@ public Iterator get(Iterable keys, ReadOption... options) {
     return get(toReadOptionsPb(options), Iterables.toArray(keys, Key.class));
   }
 
-  private static com.google.datastore.v1.ReadOptions toReadOptionsPb(ReadOption... options) {
-    com.google.datastore.v1.ReadOptions readOptionsPb = null;
-    if (options != null) {
-      Map, ReadOption> optionsByType =
-          ReadOption.asImmutableMap(options);
-
-      if (optionsByType.containsKey(EventualConsistency.class)
-          && optionsByType.containsKey(ReadTime.class)) {
-        throw DatastoreException.throwInvalidRequest(
-            "Can not use eventual consistency read with read time.");
-      }
-
-      if (optionsByType.containsKey(EventualConsistency.class)) {
-        readOptionsPb =
-            com.google.datastore.v1.ReadOptions.newBuilder()
-                .setReadConsistency(ReadConsistency.EVENTUAL)
-                .build();
-      }
-
-      if (optionsByType.containsKey(ReadTime.class)) {
-        readOptionsPb =
-            com.google.datastore.v1.ReadOptions.newBuilder()
-                .setReadTime(((ReadTime) optionsByType.get(ReadTime.class)).time().toProto())
-                .build();
-      }
+  private Optional toReadOptionsPb(ReadOption... options) {
+    if (options == null) {
+      return Optional.empty();
     }
-    return readOptionsPb;
+    return this.readOptionProtoPreparer.prepare(Arrays.asList(options));
   }
 
   @Override
@@ -378,15 +358,13 @@ public List fetch(Iterable keys, ReadOption... options) {
     return DatastoreHelper.fetch(this, Iterables.toArray(keys, Key.class), options);
   }
 
-  Iterator get(com.google.datastore.v1.ReadOptions readOptionsPb, final Key... keys) {
+  Iterator get(Optional readOptionsPb, final Key... keys) {
     if (keys.length == 0) {
       return Collections.emptyIterator();
     }
     com.google.datastore.v1.LookupRequest.Builder requestPb =
         com.google.datastore.v1.LookupRequest.newBuilder();
-    if (readOptionsPb != null) {
-      requestPb.setReadOptions(readOptionsPb);
-    }
+    readOptionsPb.ifPresent(requestPb::setReadOptions);
     for (Key k : Sets.newLinkedHashSet(Arrays.asList(keys))) {
       requestPb.addKeys(k.toPb());
     }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index bebb4df9f7b7..d4f9f3534973 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -456,6 +456,16 @@ public Map getNamedBindings() {
     return builder.buildOrThrow();
   }
 
+  @InternalApi
+  public Map getNamedBindingsMap() {
+    return namedBindings;
+  }
+
+  @InternalApi
+  public List getPositionalBindingsMap() {
+    return positionalBindings;
+  }
+
   /** Returns an immutable list of positional bindings (using original order). */
   public List getNumberArgs() {
     ImmutableList.Builder builder = ImmutableList.builder();
@@ -504,17 +514,8 @@ public boolean equals(Object obj) {
   }
 
   com.google.datastore.v1.GqlQuery toPb() {
-    com.google.datastore.v1.GqlQuery.Builder queryPb =
-        com.google.datastore.v1.GqlQuery.newBuilder();
-    queryPb.setQueryString(queryString);
-    queryPb.setAllowLiterals(allowLiteral);
-    for (Map.Entry entry : namedBindings.entrySet()) {
-      queryPb.putNamedBindings(entry.getKey(), entry.getValue().toPb());
-    }
-    for (Binding argument : positionalBindings) {
-      queryPb.addPositionalBindings(argument.toPb());
-    }
-    return queryPb.build();
+    GqlQueryProtoPreparer protoPreparer = new GqlQueryProtoPreparer();
+    return protoPreparer.prepare(this);
   }
 
   @InternalApi
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java
new file mode 100644
index 000000000000..5269740f7e2a
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java
@@ -0,0 +1,43 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.GqlQuery.Binding;
+import com.google.cloud.datastore.execution.request.ProtoPreparer;
+import java.util.Map;
+
+@InternalApi
+public class GqlQueryProtoPreparer
+    implements ProtoPreparer, com.google.datastore.v1.GqlQuery> {
+
+  @Override
+  public com.google.datastore.v1.GqlQuery prepare(GqlQuery gqlQuery) {
+    com.google.datastore.v1.GqlQuery.Builder queryPb =
+        com.google.datastore.v1.GqlQuery.newBuilder();
+
+    queryPb.setQueryString(gqlQuery.getQueryString());
+    queryPb.setAllowLiterals(gqlQuery.allowLiteral());
+    for (Map.Entry entry : gqlQuery.getNamedBindingsMap().entrySet()) {
+      queryPb.putNamedBindings(entry.getKey(), entry.getValue().toPb());
+    }
+    for (Binding argument : gqlQuery.getPositionalBindingsMap()) {
+      queryPb.addPositionalBindings(argument.toPb());
+    }
+
+    return queryPb.build();
+  }
+}
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 222efa3b8898..6170c0b8b377 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
@@ -20,14 +20,16 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.AbstractIterator;
 import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
+import com.google.datastore.v1.ReadOptions;
 import com.google.protobuf.ByteString;
 import java.util.Iterator;
 import java.util.Objects;
+import java.util.Optional;
 
 class QueryResultsImpl extends AbstractIterator implements QueryResults {
 
   private final DatastoreImpl datastore;
-  private final com.google.datastore.v1.ReadOptions readOptionsPb;
+  private final Optional readOptionsPb;
   private final com.google.datastore.v1.PartitionId partitionIdPb;
   private final ResultType queryResultType;
   private RecordQuery query;
@@ -41,7 +43,7 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
 
   QueryResultsImpl(
       DatastoreImpl datastore,
-      com.google.datastore.v1.ReadOptions readOptionsPb,
+      Optional readOptionsPb,
       RecordQuery query,
       String namespace) {
     this.datastore = datastore;
@@ -68,9 +70,7 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
   private void sendRequest() {
     com.google.datastore.v1.RunQueryRequest.Builder requestPb =
         com.google.datastore.v1.RunQueryRequest.newBuilder();
-    if (readOptionsPb != null) {
-      requestPb.setReadOptions(readOptionsPb);
-    }
+    readOptionsPb.ifPresent(requestPb::setReadOptions);
     requestPb.setPartitionId(partitionIdPb);
     query.populatePb(requestPb);
     runQueryResponsePb = datastore.runQuery(requestPb.build());
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index a30533e2d07b..30234f1d34cc 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -17,9 +17,12 @@
 package com.google.cloud.datastore;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.cloud.Timestamp;
 import com.google.common.collect.ImmutableMap;
+import com.google.protobuf.ByteString;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -68,6 +71,21 @@ public Timestamp time() {
     }
   }
 
+  /** Specifies transaction to be used when running a {@link Query}. */
+  @InternalApi
+  static class TransactionId extends ReadOption {
+
+    private final ByteString transactionId;
+
+    TransactionId(ByteString transactionId) {
+      this.transactionId = transactionId;
+    }
+
+    public ByteString getTransactionId() {
+      return transactionId;
+    }
+  }
+
   private ReadOption() {}
 
   /**
@@ -88,6 +106,24 @@ public static ReadTime readTime(Timestamp time) {
     return new ReadTime(time);
   }
 
+  /**
+   * Returns a {@code ReadOption} that specifies transaction id, allowing Datastore to execute a
+   * {@link Query} in this transaction.
+   */
+  @InternalApi
+  public static ReadOption transactionId(String transactionId) {
+    return new TransactionId(ByteString.copyFrom(transactionId.getBytes()));
+  }
+
+  /**
+   * Returns a {@code ReadOption} that specifies transaction id, allowing Datastore to execute a
+   * {@link Query} in this transaction.
+   */
+  @InternalApi
+  public static ReadOption transactionId(ByteString transactionId) {
+    return new TransactionId(transactionId);
+  }
+
   static Map, ReadOption> asImmutableMap(ReadOption... options) {
     ImmutableMap.Builder, ReadOption> builder = ImmutableMap.builder();
     for (ReadOption option : options) {
@@ -95,4 +131,12 @@ static Map, ReadOption> asImmutableMap(ReadOption...
     }
     return builder.buildOrThrow();
   }
+
+  static Map, ReadOption> asImmutableMap(List options) {
+    ImmutableMap.Builder, ReadOption> builder = ImmutableMap.builder();
+    for (ReadOption option : options) {
+      builder.put(option.getClass(), option);
+    }
+    return builder.buildOrThrow();
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java
new file mode 100644
index 000000000000..15713b02fe0f
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java
@@ -0,0 +1,77 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.ReadOption.EventualConsistency;
+import com.google.cloud.datastore.ReadOption.ReadTime;
+import com.google.cloud.datastore.ReadOption.TransactionId;
+import com.google.cloud.datastore.execution.request.ProtoPreparer;
+import com.google.datastore.v1.ReadOptions;
+import com.google.datastore.v1.ReadOptions.ReadConsistency;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@InternalApi
+public class ReadOptionProtoPreparer
+    implements ProtoPreparer, Optional> {
+
+  @Override
+  public Optional prepare(List options) {
+    if (options == null || options.isEmpty()) {
+      return Optional.empty();
+    }
+    com.google.datastore.v1.ReadOptions readOptionsPb = null;
+    Map, ReadOption> optionsByType = ReadOption.asImmutableMap(options);
+
+    boolean moreThanOneReadOption = optionsByType.keySet().size() > 1;
+    if (moreThanOneReadOption) {
+      throw DatastoreException.throwInvalidRequest(
+          String.format("Can not use %s together.", getInvalidOptions(optionsByType)));
+    }
+
+    if (optionsByType.containsKey(EventualConsistency.class)) {
+      readOptionsPb = ReadOptions.newBuilder().setReadConsistency(ReadConsistency.EVENTUAL).build();
+    }
+
+    if (optionsByType.containsKey(ReadTime.class)) {
+      readOptionsPb =
+          ReadOptions.newBuilder()
+              .setReadTime(((ReadTime) optionsByType.get(ReadTime.class)).time().toProto())
+              .build();
+    }
+
+    if (optionsByType.containsKey(TransactionId.class)) {
+      readOptionsPb =
+          ReadOptions.newBuilder()
+              .setTransaction(
+                  ((TransactionId) optionsByType.get(TransactionId.class)).getTransactionId())
+              .build();
+    }
+    return Optional.ofNullable(readOptionsPb);
+  }
+
+  private String getInvalidOptions(Map, ReadOption> optionsByType) {
+    String regex = "([a-z])([A-Z]+)";
+    String replacement = "$1 $2";
+    return optionsByType.keySet().stream()
+        .map(Class::getSimpleName)
+        .map(s -> s.replaceAll(regex, replacement).toLowerCase())
+        .collect(Collectors.joining(", "));
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 8d2974c15fea..93f70aeadd0d 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -1045,40 +1045,8 @@ public StructuredQuery nextQuery(com.google.datastore.v1.RunQueryResponse res
   }
 
   com.google.datastore.v1.Query toPb() {
-    com.google.datastore.v1.Query.Builder queryPb = com.google.datastore.v1.Query.newBuilder();
-    if (kind != null) {
-      queryPb.addKindBuilder().setName(kind);
-    }
-    if (startCursor != null) {
-      queryPb.setStartCursor(startCursor.getByteString());
-    }
-    if (endCursor != null) {
-      queryPb.setEndCursor(endCursor.getByteString());
-    }
-    if (offset > 0) {
-      queryPb.setOffset(offset);
-    }
-    if (limit != null) {
-      queryPb.setLimit(com.google.protobuf.Int32Value.newBuilder().setValue(limit));
-    }
-    if (filter != null) {
-      queryPb.setFilter(filter.toPb());
-    }
-    for (OrderBy value : orderBy) {
-      queryPb.addOrder(value.toPb());
-    }
-    for (String value : distinctOn) {
-      queryPb.addDistinctOn(
-          com.google.datastore.v1.PropertyReference.newBuilder().setName(value).build());
-    }
-    for (String value : projection) {
-      com.google.datastore.v1.Projection.Builder expressionPb =
-          com.google.datastore.v1.Projection.newBuilder();
-      expressionPb.setProperty(
-          com.google.datastore.v1.PropertyReference.newBuilder().setName(value).build());
-      queryPb.addProjection(expressionPb.build());
-    }
-    return queryPb.build();
+    StructuredQueryProtoPreparer protoPreparer = new StructuredQueryProtoPreparer();
+    return protoPreparer.prepare(this);
   }
 
   @SuppressWarnings("unchecked")
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java
new file mode 100644
index 000000000000..fda6f8f4acb5
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java
@@ -0,0 +1,66 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.StructuredQuery.OrderBy;
+import com.google.cloud.datastore.execution.request.ProtoPreparer;
+import com.google.datastore.v1.Query;
+import com.google.protobuf.Int32Value;
+
+@InternalApi
+public class StructuredQueryProtoPreparer implements ProtoPreparer, Query> {
+
+  @Override
+  public Query prepare(StructuredQuery query) {
+    com.google.datastore.v1.Query.Builder queryPb = com.google.datastore.v1.Query.newBuilder();
+    if (query.getKind() != null) {
+      queryPb.addKindBuilder().setName(query.getKind());
+    }
+    if (query.getStartCursor() != null) {
+      queryPb.setStartCursor(query.getStartCursor().getByteString());
+    }
+    if (query.getEndCursor() != null) {
+      queryPb.setEndCursor(query.getEndCursor().getByteString());
+    }
+    if (query.getOffset() > 0) {
+      queryPb.setOffset(query.getOffset());
+    }
+    if (query.getLimit() != null) {
+      queryPb.setLimit(Int32Value.of(query.getLimit()));
+    }
+    if (query.getFilter() != null) {
+      queryPb.setFilter(query.getFilter().toPb());
+    }
+    for (OrderBy value : query.getOrderBy()) {
+      queryPb.addOrder(value.toPb());
+    }
+    for (String value : query.getDistinctOn()) {
+      queryPb.addDistinctOn(
+          com.google.datastore.v1.PropertyReference.newBuilder().setName(value).build());
+    }
+    for (String value : query.getProjection()) {
+      com.google.datastore.v1.Projection expressionPb =
+          com.google.datastore.v1.Projection.newBuilder()
+              .setProperty(
+                  com.google.datastore.v1.PropertyReference.newBuilder().setName(value).build())
+              .build();
+      queryPb.addProjection(expressionPb);
+    }
+
+    return queryPb.build();
+  }
+}
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 3318ec866c44..94edc22165e5 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
@@ -16,11 +16,14 @@
 
 package com.google.cloud.datastore;
 
+import com.google.common.collect.ImmutableList;
+import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
 final class TransactionImpl extends BaseDatastoreBatchWriter implements Transaction {
 
@@ -28,6 +31,8 @@ final class TransactionImpl extends BaseDatastoreBatchWriter implements Transact
   private final ByteString transactionId;
   private boolean rolledback;
 
+  private final ReadOptionProtoPreparer readOptionProtoPreparer;
+
   static class ResponseImpl implements Transaction.Response {
 
     private final com.google.datastore.v1.CommitResponse response;
@@ -65,6 +70,7 @@ public List getGeneratedKeys() {
     }
 
     transactionId = datastore.requestTransactionId(requestPb);
+    this.readOptionProtoPreparer = new ReadOptionProtoPreparer();
   }
 
   @Override
@@ -75,10 +81,10 @@ public Entity get(Key key) {
   @Override
   public Iterator get(Key... keys) {
     validateActive();
-    com.google.datastore.v1.ReadOptions.Builder readOptionsPb =
-        com.google.datastore.v1.ReadOptions.newBuilder();
-    readOptionsPb.setTransaction(transactionId);
-    return datastore.get(readOptionsPb.build(), keys);
+    Optional readOptions =
+        this.readOptionProtoPreparer.prepare(
+            ImmutableList.of(ReadOption.transactionId(transactionId)));
+    return datastore.get(readOptions, keys);
   }
 
   @Override
@@ -90,10 +96,10 @@ public List fetch(Key... keys) {
   @Override
   public  QueryResults run(Query query) {
     validateActive();
-    com.google.datastore.v1.ReadOptions.Builder readOptionsPb =
-        com.google.datastore.v1.ReadOptions.newBuilder();
-    readOptionsPb.setTransaction(transactionId);
-    return datastore.run(readOptionsPb.build(), query);
+    Optional readOptions =
+        this.readOptionProtoPreparer.prepare(
+            ImmutableList.of(ReadOption.transactionId(transactionId)));
+    return datastore.run(readOptions, query);
   }
 
   @Override
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java
new file mode 100644
index 000000000000..2701699651c2
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java
@@ -0,0 +1,30 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution.request;
+
+import com.google.api.core.InternalApi;
+
+/**
+ * An internal functional interface whose implementation has the responsibility to populate a Proto
+ * object from a domain object.
+ *
+ * @param  the type of domain object.
+ * @param  the type of proto object
+ */
+@InternalApi
+public interface ProtoPreparer {
+  OUTPUT prepare(INPUT input);
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java
new file mode 100644
index 000000000000..0d2e0ede7c6d
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.cloud.datastore.ProtoTestData.gqlQueryParameter;
+import static com.google.cloud.datastore.ProtoTestData.intValue;
+import static com.google.cloud.datastore.ProtoTestData.stringValue;
+import static com.google.cloud.datastore.Query.newGqlQueryBuilder;
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+import org.junit.Test;
+
+public class GqlQueryProtoPreparerTest {
+
+  private final GqlQueryProtoPreparer protoPreparer = new GqlQueryProtoPreparer();
+  private final GqlQuery.Builder gqlQueryBuilder = newGqlQueryBuilder("SELECT * from Character");
+
+  @Test
+  public void testQueryString() {
+    com.google.datastore.v1.GqlQuery gqlQuery = protoPreparer.prepare(gqlQueryBuilder.build());
+
+    assertThat(gqlQuery.getQueryString()).isEqualTo("SELECT * from Character");
+  }
+
+  @Test
+  public void testAllowLiteral() {
+    assertTrue(
+        protoPreparer.prepare(gqlQueryBuilder.setAllowLiteral(true).build()).getAllowLiterals());
+    assertFalse(
+        protoPreparer.prepare(gqlQueryBuilder.setAllowLiteral(false).build()).getAllowLiterals());
+  }
+
+  @Test
+  public void testNamedBinding() {
+    com.google.datastore.v1.GqlQuery gqlQuery =
+        protoPreparer.prepare(
+            gqlQueryBuilder.setBinding("name", "John Doe").setBinding("age", 27).build());
+
+    assertThat(gqlQuery.getNamedBindingsMap())
+        .isEqualTo(
+            new HashMap<>(
+                ImmutableMap.of(
+                    "name", gqlQueryParameter(stringValue("John Doe")),
+                    "age", gqlQueryParameter(intValue(27)))));
+  }
+
+  @Test
+  public void testPositionalBinding() {
+    com.google.datastore.v1.GqlQuery gqlQuery =
+        protoPreparer.prepare(gqlQueryBuilder.addBinding("John Doe").addBinding(27).build());
+
+    assertThat(gqlQuery.getPositionalBindingsList())
+        .isEqualTo(
+            asList(gqlQueryParameter(stringValue("John Doe")), gqlQueryParameter(intValue(27))));
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
new file mode 100644
index 000000000000..a923b618b3e2
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
@@ -0,0 +1,76 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.datastore.v1.PropertyOrder.Direction.ASCENDING;
+
+import com.google.datastore.v1.Filter;
+import com.google.datastore.v1.GqlQueryParameter;
+import com.google.datastore.v1.KindExpression;
+import com.google.datastore.v1.Projection;
+import com.google.datastore.v1.PropertyFilter.Operator;
+import com.google.datastore.v1.PropertyOrder;
+import com.google.datastore.v1.PropertyReference;
+import com.google.datastore.v1.Value;
+
+public class ProtoTestData {
+
+  public static Value booleanValue(boolean value) {
+    return Value.newBuilder().setBooleanValue(value).build();
+  }
+
+  public static Value stringValue(String value) {
+    return Value.newBuilder().setStringValue(value).build();
+  }
+
+  public static Value intValue(long value) {
+    return Value.newBuilder().setIntegerValue(value).build();
+  }
+
+  public static GqlQueryParameter gqlQueryParameter(Value value) {
+    return GqlQueryParameter.newBuilder().setValue(value).build();
+  }
+
+  public static KindExpression kind(String kind) {
+    return KindExpression.newBuilder().setName(kind).build();
+  }
+
+  public static Filter propertyFilter(String propertyName, Operator operator, Value value) {
+    return Filter.newBuilder()
+        .setPropertyFilter(
+            com.google.datastore.v1.PropertyFilter.newBuilder()
+                .setProperty(propertyReference(propertyName))
+                .setOp(operator)
+                .setValue(value)
+                .build())
+        .build();
+  }
+
+  public static PropertyReference propertyReference(String value) {
+    return PropertyReference.newBuilder().setName(value).build();
+  }
+
+  public static PropertyOrder propertyOrder(String value) {
+    return PropertyOrder.newBuilder()
+        .setProperty(propertyReference(value))
+        .setDirection(ASCENDING)
+        .build();
+  }
+
+  public static Projection projection(String value) {
+    return Projection.newBuilder().setProperty(propertyReference(value)).build();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
new file mode 100644
index 000000000000..bda5de3b5836
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.cloud.datastore.ReadOption.eventualConsistency;
+import static com.google.cloud.datastore.ReadOption.readTime;
+import static com.google.cloud.datastore.ReadOption.transactionId;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.datastore.v1.ReadOptions.ReadConsistency.EVENTUAL;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+
+import com.google.cloud.Timestamp;
+import com.google.common.collect.ImmutableList;
+import com.google.datastore.v1.ReadOptions;
+import java.util.Arrays;
+import java.util.Optional;
+import org.junit.Test;
+
+public class ReadOptionProtoPreparerTest {
+
+  private final ReadOptionProtoPreparer protoPreparer = new ReadOptionProtoPreparer();
+
+  @Test
+  public void shouldThrowErrorWhenUsingMultipleReadOptions() {
+    assertThrows(
+        DatastoreException.class,
+        () ->
+            protoPreparer.prepare(Arrays.asList(eventualConsistency(), readTime(Timestamp.now()))));
+    assertThrows(
+        DatastoreException.class,
+        () ->
+            protoPreparer.prepare(
+                Arrays.asList(eventualConsistency(), transactionId("transaction-id"))));
+    assertThrows(
+        DatastoreException.class,
+        () ->
+            protoPreparer.prepare(
+                Arrays.asList(transactionId("transaction-id"), readTime(Timestamp.now()))));
+    assertThrows(
+        DatastoreException.class,
+        () ->
+            protoPreparer.prepare(
+                Arrays.asList(
+                    eventualConsistency(),
+                    readTime(Timestamp.now()),
+                    transactionId("transaction-id"))));
+  }
+
+  @Test
+  public void shouldPrepareReadOptionsWithEventualConsistency() {
+    Optional readOptions = protoPreparer.prepare(singletonList(eventualConsistency()));
+
+    assertThat(readOptions.get().getReadConsistency()).isEqualTo(EVENTUAL);
+  }
+
+  @Test
+  public void shouldPrepareReadOptionsWithReadTime() {
+    Timestamp timestamp = Timestamp.now();
+    Optional readOptions = protoPreparer.prepare(singletonList(readTime(timestamp)));
+
+    assertThat(Timestamp.fromProto(readOptions.get().getReadTime())).isEqualTo(timestamp);
+  }
+
+  @Test
+  public void shouldPrepareReadOptionsWithTransactionId() {
+    String dummyTransactionId = "transaction-id";
+    Optional readOptions =
+        protoPreparer.prepare(singletonList(transactionId(dummyTransactionId)));
+
+    assertThat(readOptions.get().getTransaction().toStringUtf8()).isEqualTo(dummyTransactionId);
+  }
+
+  @Test
+  public void shouldReturnNullWhenReadOptionsIsNull() {
+    assertFalse(protoPreparer.prepare(null).isPresent());
+  }
+
+  @Test
+  public void shouldReturnNullWhenReadOptionsIsAnEmptyList() {
+    assertFalse(protoPreparer.prepare(ImmutableList.of()).isPresent());
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java
new file mode 100644
index 000000000000..60937fc28cda
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java
@@ -0,0 +1,118 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.cloud.datastore.ProtoTestData.booleanValue;
+import static com.google.cloud.datastore.ProtoTestData.projection;
+import static com.google.cloud.datastore.ProtoTestData.propertyFilter;
+import static com.google.cloud.datastore.ProtoTestData.propertyOrder;
+import static com.google.cloud.datastore.ProtoTestData.propertyReference;
+import static com.google.cloud.datastore.Query.newEntityQueryBuilder;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.datastore.v1.PropertyFilter.Operator.EQUAL;
+
+import com.google.cloud.datastore.StructuredQuery.OrderBy;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.datastore.v1.KindExpression;
+import com.google.datastore.v1.Query;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Int32Value;
+import org.junit.Test;
+
+public class StructuredQueryProtoPreparerTest {
+
+  private final StructuredQueryProtoPreparer protoPreparer = new StructuredQueryProtoPreparer();
+
+  @Test
+  public void testKind() {
+    Query queryProto = protoPreparer.prepare(newEntityQueryBuilder().setKind("kind").build());
+
+    assertThat(queryProto.getKind(0))
+        .isEqualTo(KindExpression.newBuilder().setName("kind").build());
+  }
+
+  @Test
+  public void testStartCursor() {
+    byte[] bytes = {1, 2};
+    Query queryProto =
+        protoPreparer.prepare(
+            newEntityQueryBuilder().setStartCursor(Cursor.copyFrom(bytes)).build());
+
+    assertThat(queryProto.getStartCursor()).isEqualTo(ByteString.copyFrom(bytes));
+  }
+
+  @Test
+  public void testEndCursor() {
+    byte[] bytes = {1, 2};
+    Query queryProto =
+        protoPreparer.prepare(newEntityQueryBuilder().setEndCursor(Cursor.copyFrom(bytes)).build());
+
+    assertThat(queryProto.getEndCursor()).isEqualTo(ByteString.copyFrom(bytes));
+  }
+
+  @Test
+  public void testOffset() {
+    Query queryProto = protoPreparer.prepare(newEntityQueryBuilder().setOffset(5).build());
+
+    assertThat(queryProto.getOffset()).isEqualTo(5);
+  }
+
+  @Test
+  public void testLimit() {
+    Query queryProto = protoPreparer.prepare(newEntityQueryBuilder().setLimit(5).build());
+
+    assertThat(queryProto.getLimit()).isEqualTo(Int32Value.of(5));
+  }
+
+  @Test
+  public void testFilter() {
+    Query queryProto =
+        protoPreparer.prepare(
+            newEntityQueryBuilder().setFilter(PropertyFilter.eq("done", true)).build());
+
+    assertThat(queryProto.getFilter()).isEqualTo(propertyFilter("done", EQUAL, booleanValue(true)));
+  }
+
+  @Test
+  public void testOrderBy() {
+    Query queryProto =
+        protoPreparer.prepare(
+            newEntityQueryBuilder()
+                .setOrderBy(OrderBy.asc("dept-id"), OrderBy.asc("rank"))
+                .build());
+
+    assertThat(queryProto.getOrder(0)).isEqualTo(propertyOrder("dept-id"));
+    assertThat(queryProto.getOrder(1)).isEqualTo(propertyOrder("rank"));
+  }
+
+  @Test
+  public void testDistinctOn() {
+    Query queryProto =
+        protoPreparer.prepare(newEntityQueryBuilder().setDistinctOn("dept-id", "rank").build());
+
+    assertThat(queryProto.getDistinctOn(0)).isEqualTo(propertyReference("dept-id"));
+    assertThat(queryProto.getDistinctOn(1)).isEqualTo(propertyReference("rank"));
+  }
+
+  @Test
+  public void testProjections() {
+    Query queryProto =
+        protoPreparer.prepare(newEntityQueryBuilder().setProjection("dept-id", "rank").build());
+
+    assertThat(queryProto.getProjection(0)).isEqualTo(projection("dept-id"));
+    assertThat(queryProto.getProjection(1)).isEqualTo(projection("rank"));
+  }
+}

From 8c22e61f8a0307a59301259f83a16c8324fa1b6f Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Mon, 17 Oct 2022 21:05:31 +0530
Subject: [PATCH 0974/1784] feat: Count API  (#823)

* Add method in Datastore client to invoke rpc for aggregation query

* Creating count aggregation and using it to populate Aggregation proto

* Moving aggregation builder method to root level aggregation class

* Introducing RecordQuery to represent queries which returns entity records when executed

* Updating gitignore with patch extension

* Setting up structure of Aggregation query and its builder

* Introducing ProtoPreparer to populate the request protos

* Delegating responsibility of preparing query proto to QueryPreparer

* Populating aggregation query with nested structured query

* Delegating responsibility of preparing query proto in GqlQuery to QueryPreparer

* Removing RecordQuery from the query hierarchy and making it a standalone interface for now

* Populating aggregation query with nested gql query

* Removing deprecation warning by using assertThrows instead of ExpectedException rule

* Making DatastoreRpc call aggregation query method on client

* Creating response transformer to transform aggregation query response into domain objects

* Implementing aggregation query executor to execute AggergationQuery

* Adding missing assertion statements

* Creating RetryExecutor to inject it as a dependency in other components

* Making RetryExecutor accept RetrySettings when creating it

* Revert "Making RetryExecutor accept RetrySettings when creating it"

This reverts commit 1dfafb7f8adcdd4ec566ac6fc712d2233623d33b.

* Revert "Creating RetryExecutor to inject it as a dependency in other components"

This reverts commit 8872a55cd1b1e22643222aa62a17049169dee71f.

* Introducing RetryAndTraceDatastoreRpcDecorator to have retry and traceability logic on top of another DatastoreRpc

* Extracting out the responsibility of preparing ReadOption in it's own ProtoPreparer

* Making QueryExecutor to execute query with provided ReadOptions

* Exposing readTime to the user

* Ignoring runAggregationQuery method from clirr check

* Making readTime final

* Allowing namespace to be optional in AggregationQuery

* Add capability to fetch aggregation result by passing alias

* Implementing User facing datastore.runAggrgation method to run aggregation query

* Add integration test for count aggregation

* Add transaction Id support in ReadOptionsProtoPreparer

* Supporting aggregation query with transactions

* Allowing user to create Aggregation directly without involving its builder

* Preventing creating duplicated aggregation when creating an aggregation query

* Marking RecordQuery implemented method as InternalApi

* Writing comments and JavaDoc for aggregation query related class

* Adding a default implementation in the public interfaces to avoid compile time failures

* covering a scenario to maintain consistent snapshot when executing aggregation query in a transaction

* Creating emulator proxy to simulate AggregationQuery response from emulator

* Integration test to execute an aggregation query in a read only transaction

* Getting rid off limit operation on count aggregation as same behaviour can be achieved by using 'limit' operation on the underlying query

* Removing import statement from javadoc and undo changes in .gitignore file

* Using Optional instead of returning null from ReadOptionsProtoPreparer

* using assertThat from Truth library

* fixing unit test

* Getting rid off Double braces initialization syntax

* Fixing lint

* Getting rid off emulator proxy and using easy mock to check the aggregationQuery triggered

* Deleting a entity created locally in other test which is causing failure in other test

* Deleting all keys in datastore in integration test so that new test can start fresh

* Executing two read write transaction simultaneously and verifying their behaviour

* Removing tests to verify serializability as it's an underlying implementation detail

* Fixing lint

* Adding runAggregationQuery method to reflect config so that it's available and accessible in native image through reflection

* Fixing equals of CountAggregation

* Fixing lint

* Adding an integration test of using limit option with aggregation query

* Adding BetaApi annotation to public surface to indicate that aggregation query / count is in preview

* Fixing lint

* Removing unused functiona and fixing javadoc

* fixing variable name
---
 .../google/datastore/v1/client/Datastore.java |  11 +
 .../META-INF/native-image/reflect-config.json |   3 +-
 .../v1/client/DatastoreClientTest.java        |   9 +
 .../clirr-ignored-differences.xml             |  15 +
 .../cloud/datastore/AggregationQuery.java     | 176 ++++++++
 .../cloud/datastore/AggregationResult.java    |  71 ++++
 .../cloud/datastore/AggregationResults.java   |  82 ++++
 .../com/google/cloud/datastore/Datastore.java |  49 +++
 .../google/cloud/datastore/DatastoreImpl.java |  23 +-
 .../cloud/datastore/DatastoreReader.java      |  11 +
 .../com/google/cloud/datastore/Query.java     |  42 +-
 .../google/cloud/datastore/ReadOption.java    |  35 ++
 .../RetryAndTraceDatastoreRpcDecorator.java   | 124 ++++++
 .../cloud/datastore/StructuredQuery.java      |   3 +
 .../com/google/cloud/datastore/TraceUtil.java |   2 +
 .../cloud/datastore/TransactionImpl.java      |  13 +-
 .../datastore/aggregation/Aggregation.java    |  47 +++
 .../aggregation/AggregationBuilder.java       |  31 ++
 .../aggregation/CountAggregation.java         |  83 ++++
 .../execution/AggregationQueryExecutor.java   |  66 +++
 .../datastore/execution/QueryExecutor.java    |  40 ++
 .../AggregationQueryRequestProtoPreparer.java | 100 +++++
 .../AggregationQueryResponseTransformer.java  |  58 +++
 .../response/ResponseTransformer.java         |  30 ++
 .../cloud/datastore/spi/v1/DatastoreRpc.java  |  11 +
 .../datastore/spi/v1/HttpDatastoreRpc.java    |  11 +
 .../cloud/datastore/AggregationQueryTest.java | 153 +++++++
 .../datastore/AggregationResultTest.java      |  36 ++
 .../google/cloud/datastore/DatastoreTest.java |  57 +++
 .../google/cloud/datastore/ProtoTestData.java |   6 +
 .../ReadOptionProtoPreparerTest.java          |   6 +-
 ...etryAndTraceDatastoreRpcDecoratorTest.java |  84 ++++
 .../com/google/cloud/datastore/TestUtils.java |  39 ++
 .../aggregation/CountAggregationTest.java     |  68 ++++
 .../AggregationQueryExecutorTest.java         | 177 ++++++++
 ...regationQueryRequestProtoPreparerTest.java | 179 +++++++++
 ...gregationQueryResponseTransformerTest.java |  91 +++++
 .../cloud/datastore/it/ITDatastoreTest.java   | 380 +++++++++++++++++-
 38 files changed, 2410 insertions(+), 12 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java

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 db117142fb79..09101c94b8fe 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
@@ -27,6 +27,8 @@
 import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
 import com.google.rpc.Code;
@@ -120,4 +122,13 @@ public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreExcept
       throw invalidResponseException("runQuery", exception);
     }
   }
+
+  public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request)
+      throws DatastoreException {
+    try (InputStream is = remoteRpc.call("runAggregationQuery", request)) {
+      return RunAggregationQueryResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("runAggregationQuery", exception);
+    }
+  }
 }
diff --git a/datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json b/datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json
index 32b27f5d9eed..17876ff433eb 100644
--- a/datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json
@@ -8,7 +8,8 @@
       {"name":"lookup","parameterTypes":["com.google.datastore.v1.LookupRequest"] },
       {"name":"reserveIds","parameterTypes":["com.google.datastore.v1.ReserveIdsRequest"] },
       {"name":"rollback","parameterTypes":["com.google.datastore.v1.RollbackRequest"] },
-      {"name":"runQuery","parameterTypes":["com.google.datastore.v1.RunQueryRequest"] }
+      {"name":"runQuery","parameterTypes":["com.google.datastore.v1.RunQueryRequest"] },
+      {"name":"runAggregationQuery","parameterTypes":["com.google.datastore.v1.RunAggregationQueryRequest"] }
     ]
   },
   {
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 2ab2c89f88ff..16a6303bb2d7 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
@@ -38,6 +38,8 @@
 import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
 import com.google.datastore.v1.client.testing.MockCredential;
@@ -336,6 +338,13 @@ public void runQuery() throws Exception {
     expectRpc("runQuery", request.build(), response.build());
   }
 
+  @Test
+  public void runAggregationQuery() throws Exception {
+    RunAggregationQueryRequest.Builder request = RunAggregationQueryRequest.newBuilder();
+    RunAggregationQueryResponse.Builder response = RunAggregationQueryResponse.newBuilder();
+    expectRpc("runAggregationQuery", request.build(), response.build());
+  }
+
   private void expectRpc(String methodName, Message request, Message response) throws Exception {
     Datastore datastore = factory.create(options.build());
     MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
index 110f22f737f0..018afb17ea5a 100644
--- a/google-cloud-datastore/clirr-ignored-differences.xml
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -11,4 +11,19 @@
         com.google.datastore.v1.ReserveIdsResponse reserveIds(com.google.datastore.v1.ReserveIdsRequest)
         7012
     
+    
+        com/google/cloud/datastore/spi/v1/DatastoreRpc
+        com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery(com.google.datastore.v1.RunAggregationQueryRequest)
+        7012
+    
+    
+        com/google/cloud/datastore/Datastore
+        com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.ReadOption[])
+        7012
+    
+    
+        com/google/cloud/datastore/DatastoreReader
+        com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery)
+        7012
+    
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
new file mode 100644
index 000000000000..05f48a6c68bd
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
@@ -0,0 +1,176 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.cloud.datastore.AggregationQuery.Mode.GQL;
+import static com.google.cloud.datastore.AggregationQuery.Mode.STRUCTURED;
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.api.core.BetaApi;
+import com.google.cloud.datastore.aggregation.Aggregation;
+import com.google.cloud.datastore.aggregation.AggregationBuilder;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * An implementation of a Google Cloud Datastore Query that returns {@link AggregationResults}, It
+ * can be constructed by providing a nested query ({@link StructuredQuery} or {@link GqlQuery}) to
+ * run the aggregations on and a set of {@link Aggregation}.
+ *
+ * 
    {@link StructuredQuery} example:
+ *
+ * 
    {@code
+ * EntityQuery selectAllQuery = Query.newEntityQueryBuilder()
+ *    .setKind("Task")
+ *    .build();
+ * AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder()
+ *    .addAggregation(count().as("total_count"))
+ *    .over(selectAllQuery)
+ *    .build();
+ * AggregationResults aggregationResults = datastore.runAggregation(aggregationQuery);
+ * for (AggregationResult aggregationResult : aggregationResults) {
+ *     System.out.println(aggregationResult.get("total_count"));
+ * }
+ * }
    
+ *
+ * 
    {@link GqlQuery} example:
    
+ *
+ * 
    {@code
+ * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
+ *         "AGGREGATE COUNT(*) AS total_count, COUNT_UP_TO(100) AS count_upto_100 OVER(SELECT * FROM Task)"
+ *     )
+ *     .setAllowLiteral(true)
+ *     .build();
+ * AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder()
+ *     .over(selectAllGqlQuery)
+ *     .build();
+ * AggregationResults aggregationResults = datastore.runAggregation(aggregationQuery);
+ * for (AggregationResult aggregationResult : aggregationResults) {
+ *   System.out.println(aggregationResult.get("total_count"));
+ *   System.out.println(aggregationResult.get("count_upto_100"));
+ * }
+ * }
    
+ *
+ * @see Datastore
+ *     queries
+ */
+@BetaApi
+public class AggregationQuery extends Query {
+
+  private Set aggregations;
+  private StructuredQuery nestedStructuredQuery;
+  private final Mode mode;
+  private GqlQuery nestedGqlQuery;
+
+  AggregationQuery(
+      String namespace, Set aggregations, StructuredQuery nestedQuery) {
+    super(namespace);
+    checkArgument(
+        !aggregations.isEmpty(),
+        "At least one aggregation is required for an aggregation query to run");
+    this.aggregations = aggregations;
+    this.nestedStructuredQuery = nestedQuery;
+    this.mode = STRUCTURED;
+  }
+
+  AggregationQuery(String namespace, GqlQuery gqlQuery) {
+    super(namespace);
+    this.nestedGqlQuery = gqlQuery;
+    this.mode = GQL;
+  }
+
+  /** Returns the {@link Aggregation}(s) for this Query. */
+  public Set getAggregations() {
+    return aggregations;
+  }
+
+  /**
+   * Returns the underlying {@link StructuredQuery for this Query}. Returns null if created with
+   * {@link GqlQuery}
+   */
+  public StructuredQuery getNestedStructuredQuery() {
+    return nestedStructuredQuery;
+  }
+
+  /**
+   * Returns the underlying {@link GqlQuery for this Query}. Returns null if created with {@link
+   * StructuredQuery}
+   */
+  public GqlQuery getNestedGqlQuery() {
+    return nestedGqlQuery;
+  }
+
+  /** Returns the {@link Mode} for this query. */
+  public Mode getMode() {
+    return mode;
+  }
+
+  public static class Builder {
+
+    private String namespace;
+    private Mode mode;
+    private final Set aggregations;
+    private StructuredQuery nestedStructuredQuery;
+    private GqlQuery nestedGqlQuery;
+
+    public Builder() {
+      this.aggregations = new HashSet<>();
+    }
+
+    public Builder setNamespace(String namespace) {
+      this.namespace = namespace;
+      return this;
+    }
+
+    public Builder addAggregation(AggregationBuilder aggregationBuilder) {
+      this.aggregations.add(aggregationBuilder.build());
+      return this;
+    }
+
+    public Builder addAggregation(Aggregation aggregation) {
+      this.aggregations.add(aggregation);
+      return this;
+    }
+
+    public Builder over(StructuredQuery nestedQuery) {
+      this.nestedStructuredQuery = nestedQuery;
+      this.mode = STRUCTURED;
+      return this;
+    }
+
+    public Builder over(GqlQuery nestedQuery) {
+      this.nestedGqlQuery = nestedQuery;
+      this.mode = GQL;
+      return this;
+    }
+
+    public AggregationQuery build() {
+      boolean nestedQueryProvided = nestedGqlQuery != null || nestedStructuredQuery != null;
+      checkArgument(
+          nestedQueryProvided, "Nested query is required for an aggregation query to run");
+
+      if (mode == GQL) {
+        return new AggregationQuery(namespace, nestedGqlQuery);
+      }
+      return new AggregationQuery(namespace, aggregations, nestedStructuredQuery);
+    }
+  }
+
+  public enum Mode {
+    STRUCTURED,
+    GQL,
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
new file mode 100644
index 000000000000..928997ee7a64
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
@@ -0,0 +1,71 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import com.google.api.core.BetaApi;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+
+/** Represents a result of an {@link AggregationQuery} query submission. */
+@BetaApi
+public class AggregationResult {
+
+  private final Map properties;
+
+  public AggregationResult(Map properties) {
+    this.properties = properties;
+  }
+
+  /**
+   * Returns a result value for the given alias.
+   *
+   * @param alias A custom alias provided in the query or an autogenerated alias in the form of
+   *     'property_\d'
+   * @return An aggregation result value for the given alias.
+   */
+  public Long get(String alias) {
+    return properties.get(alias).get();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AggregationResult that = (AggregationResult) o;
+    return properties.equals(that.properties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(properties);
+  }
+
+  @Override
+  public String toString() {
+    ToStringHelper toStringHelper = MoreObjects.toStringHelper(this);
+    for (Entry entry : properties.entrySet()) {
+      toStringHelper.add(entry.getKey(), entry.getValue().get());
+    }
+    return toStringHelper.toString();
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
new file mode 100644
index 000000000000..feff5b805778
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
@@ -0,0 +1,82 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.api.client.util.Preconditions.checkNotNull;
+
+import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
+import com.google.cloud.Timestamp;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * The result of an {@link AggregationQuery} query submission. Contains a {@link
+ * List} and readTime {@link Timestamp} in it.
+ *
+ * 
    This can be used to iterate over an underlying {@link List} directly.
+ */
+@BetaApi
+public class AggregationResults implements Iterable {
+
+  private final List aggregationResults;
+  private final Timestamp readTime;
+
+  public AggregationResults(List aggregationResults, Timestamp readTime) {
+    checkNotNull(aggregationResults, "Aggregation results cannot be null");
+    checkNotNull(readTime, "readTime cannot be null");
+    this.aggregationResults = aggregationResults;
+    this.readTime = readTime;
+  }
+
+  /** Returns {@link Iterator} for underlying {@link List}. */
+  @Override
+  public Iterator iterator() {
+    return this.aggregationResults.iterator();
+  }
+
+  public int size() {
+    return this.aggregationResults.size();
+  }
+
+  @InternalApi
+  public AggregationResult get(int index) {
+    return this.aggregationResults.get(index);
+  }
+
+  /** Returns read timestamp this result batch was returned from. */
+  public Timestamp getReadTime() {
+    return this.readTime;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AggregationResults that = (AggregationResults) o;
+    return Objects.equals(aggregationResults, that.aggregationResults);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(aggregationResults);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index bb115995e384..9d0a21b8dc10 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import com.google.cloud.Service;
 import com.google.datastore.v1.TransactionOptions;
 import java.util.Iterator;
@@ -461,4 +462,52 @@ interface TransactionCallable {
    * @throws DatastoreException upon failure
    */
    QueryResults run(Query query, ReadOption... options);
+
+  /**
+   * Submits a {@link AggregationQuery} and returns {@link AggregationResults}. {@link ReadOption}s
+   * can be specified if desired.
+   *
+   * 
    Example of running an {@link AggregationQuery} to find the count of entities of one kind.
+   *
+   * 
    {@link StructuredQuery} example:
+   *
+   * 
    {@code
+   * EntityQuery selectAllQuery = Query.newEntityQueryBuilder()
+   *    .setKind("Task")
+   *    .build();
+   * AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder()
+   *    .addAggregation(count().as("total_count"))
+   *    .over(selectAllQuery)
+   *    .build();
+   * AggregationResults aggregationResults = datastore.runAggregation(aggregationQuery);
+   * for (AggregationResult aggregationResult : aggregationResults) {
+   *     System.out.println(aggregationResult.get("total_count"));
+   * }
+   * }
    
+   *
+   * 
    {@link GqlQuery} example:
    
+   *
+   * 
    {@code
+   * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
+   *         "AGGREGATE COUNT(*) AS total_count, COUNT_UP_TO(100) AS count_upto_100 OVER(SELECT * FROM Task)"
+   *     )
+   *     .setAllowLiteral(true)
+   *     .build();
+   * AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder()
+   *     .over(selectAllGqlQuery)
+   *     .build();
+   * AggregationResults aggregationResults = datastore.runAggregation(aggregationQuery);
+   * for (AggregationResult aggregationResult : aggregationResults) {
+   *   System.out.println(aggregationResult.get("total_count"));
+   *   System.out.println(aggregationResult.get("count_upto_100"));
+   * }
+   * }
    
+   *
+   * @throws DatastoreException upon failure
+   * @return {@link AggregationResults}
+   */
+  @BetaApi
+  default AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
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 f6a96c2a4fe0..4f6533ecab16 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
@@ -16,12 +16,14 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.BaseService;
 import com.google.cloud.ExceptionHandler;
 import com.google.cloud.RetryHelper;
 import com.google.cloud.RetryHelper.RetryHelperException;
 import com.google.cloud.ServiceOptions;
+import com.google.cloud.datastore.execution.AggregationQueryExecutor;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
@@ -59,13 +61,19 @@ final class DatastoreImpl extends BaseService implements Datas
   private final TraceUtil traceUtil = TraceUtil.getInstance();
 
   private final ReadOptionProtoPreparer readOptionProtoPreparer;
+  private final AggregationQueryExecutor aggregationQueryExecutor;
 
   DatastoreImpl(DatastoreOptions options) {
     super(options);
     this.datastoreRpc = options.getDatastoreRpcV1();
     retrySettings =
         MoreObjects.firstNonNull(options.getRetrySettings(), ServiceOptions.getNoRetrySettings());
+
     readOptionProtoPreparer = new ReadOptionProtoPreparer();
+    aggregationQueryExecutor =
+        new AggregationQueryExecutor(
+            new RetryAndTraceDatastoreRpcDecorator(datastoreRpc, traceUtil, retrySettings, options),
+            options);
   }
 
   @Override
@@ -84,6 +92,7 @@ public Transaction newTransaction() {
   }
 
   static class ReadWriteTransactionCallable implements Callable {
+
     private final Datastore datastore;
     private final TransactionCallable callable;
     private volatile TransactionOptions options;
@@ -184,10 +193,22 @@ public  QueryResults run(Query query, ReadOption... options) {
 
   @SuppressWarnings("unchecked")
    QueryResults run(Optional readOptionsPb, Query query) {
-    return new QueryResultsImpl<>(
+    return new QueryResultsImpl(
         this, readOptionsPb, (RecordQuery) query, query.getNamespace());
   }
 
+  @Override
+  @BetaApi
+  public AggregationResults runAggregation(AggregationQuery query) {
+    return aggregationQueryExecutor.execute(query);
+  }
+
+  @Override
+  @BetaApi
+  public AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
+    return aggregationQueryExecutor.execute(query, options);
+  }
+
   com.google.datastore.v1.RunQueryResponse runQuery(
       final com.google.datastore.v1.RunQueryRequest requestPb) {
     Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RUNQUERY);
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
index 3d5b7cd3e90c..751f99566e08 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import java.util.Iterator;
 import java.util.List;
 
@@ -53,4 +54,14 @@ public interface DatastoreReader {
    * @throws DatastoreException upon failure
    */
    QueryResults run(Query query);
+
+  /**
+   * Submits a {@link AggregationQuery} and returns {@link AggregationResults}.
+   *
+   * @throws DatastoreException upon failure
+   */
+  @BetaApi
+  default AggregationResults runAggregation(AggregationQuery query) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
index a0bed5984c84..8870cf520c22 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
@@ -23,8 +23,8 @@
 import java.util.Map;
 
 /**
- * A Google Cloud Datastore query. For usage examples see {@link GqlQuery} and {@link
- * StructuredQuery}.
+ * A Google Cloud Datastore query. For usage examples see {@link GqlQuery}, {@link StructuredQuery}
+ * and {@link AggregationQuery}.
  *
  * 
    Note that queries require proper indexing. See Cloud Datastore Index
@@ -254,4 +254,42 @@ public static KeyQuery.Builder newKeyQueryBuilder() {
   public static ProjectionEntityQuery.Builder newProjectionEntityQueryBuilder() {
     return new ProjectionEntityQuery.Builder();
   }
+
+  /**
+   * Returns a new {@link AggregationQuery} builder.
+   *
+   * 
    Example of creating and running an {@link AggregationQuery}.
+   *
+   * 
    {@link StructuredQuery} example:
+   *
+   * 
    {@code
+   * EntityQuery selectAllQuery = Query.newEntityQueryBuilder()
+   *    .setKind("Task")
+   *    .build();
+   * AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder()
+   *    .addAggregation(count().as("total_count"))
+   *    .over(selectAllQuery)
+   *    .build();
+   * AggregationResults aggregationResults = datastore.runAggregation(aggregationQuery);
+   * // Use aggregationResults
+   * }
    
+   *
+   * 
    {@link GqlQuery} example:
    
+   *
+   * 
    {@code
+   * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
+   *         "AGGREGATE COUNT(*) AS total_count OVER(SELECT * FROM Task)"
+   *     )
+   *     .setAllowLiteral(true)
+   *     .build();
+   * AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder()
+   *     .over(selectAllGqlQuery)
+   *     .build();
+   * AggregationResults aggregationResults = datastore.runAggregation(aggregationQuery);
+   * // Use aggregationResults
+   * }
    
+   */
+  public static AggregationQuery.Builder newAggregationQueryBuilder() {
+    return new AggregationQuery.Builder();
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index 30234f1d34cc..be5644da0bf5 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.protobuf.ByteString;
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -139,4 +140,38 @@ static Map, ReadOption> asImmutableMap(List> {
+
+    Q query;
+    List readOptions;
+
+    private QueryAndReadOptions(Q query, List readOptions) {
+      this.query = query;
+      this.readOptions = readOptions;
+    }
+
+    private QueryAndReadOptions(Q query) {
+      this.query = query;
+      this.readOptions = Collections.emptyList();
+    }
+
+    public Q getQuery() {
+      return query;
+    }
+
+    public List getReadOptions() {
+      return readOptions;
+    }
+
+    public static > QueryAndReadOptions create(Q query) {
+      return new QueryAndReadOptions<>(query);
+    }
+
+    public static > QueryAndReadOptions create(
+        Q query, List readOptions) {
+      return new QueryAndReadOptions<>(query, readOptions);
+    }
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
new file mode 100644
index 000000000000..c4a85caabbc5
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
@@ -0,0 +1,124 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.cloud.BaseService.EXCEPTION_HANDLER;
+import static com.google.cloud.datastore.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY;
+
+import com.google.api.core.InternalApi;
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.cloud.RetryHelper;
+import com.google.cloud.RetryHelper.RetryHelperException;
+import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import io.opencensus.common.Scope;
+import io.opencensus.trace.Span;
+import io.opencensus.trace.Status;
+import java.util.concurrent.Callable;
+
+/**
+ * An implementation of {@link DatastoreRpc} which acts as a Decorator and decorates the underlying
+ * {@link DatastoreRpc} with the logic of retry and Traceability.
+ */
+@InternalApi
+public class RetryAndTraceDatastoreRpcDecorator implements DatastoreRpc {
+
+  private final DatastoreRpc datastoreRpc;
+  private final TraceUtil traceUtil;
+  private final RetrySettings retrySettings;
+  private final DatastoreOptions datastoreOptions;
+
+  public RetryAndTraceDatastoreRpcDecorator(
+      DatastoreRpc datastoreRpc,
+      TraceUtil traceUtil,
+      RetrySettings retrySettings,
+      DatastoreOptions datastoreOptions) {
+    this.datastoreRpc = datastoreRpc;
+    this.traceUtil = traceUtil;
+    this.retrySettings = retrySettings;
+    this.datastoreOptions = datastoreOptions;
+  }
+
+  @Override
+  public AllocateIdsResponse allocateIds(AllocateIdsRequest request) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
+      throws DatastoreException {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public CommitResponse commit(CommitRequest request) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public LookupResponse lookup(LookupRequest request) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public ReserveIdsResponse reserveIds(ReserveIdsRequest request) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public RollbackResponse rollback(RollbackRequest request) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public RunQueryResponse runQuery(RunQueryRequest request) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) {
+    return invokeRpc(
+        () -> datastoreRpc.runAggregationQuery(request), SPAN_NAME_RUN_AGGREGATION_QUERY);
+  }
+
+  public  O invokeRpc(Callable block, String startSpan) {
+    Span span = traceUtil.startSpan(startSpan);
+    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+      return RetryHelper.runWithRetries(
+          block, this.retrySettings, EXCEPTION_HANDLER, this.datastoreOptions.getClock());
+    } catch (RetryHelperException e) {
+      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      throw DatastoreException.translateAndThrow(e);
+    } finally {
+      span.end(TraceUtil.END_SPAN_OPTIONS);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 93f70aeadd0d..b394dcd973d3 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -30,6 +30,7 @@
 import com.google.cloud.StringEnumType;
 import com.google.cloud.StringEnumValue;
 import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.Query.ResultType;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Preconditions;
@@ -1018,6 +1019,8 @@ public Integer getLimit() {
 
   public abstract Builder toBuilder();
 
+  @InternalApi
+  @Override
   public ResultType getType() {
     return resultType;
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
index 1f28b2e80833..57525d15d769 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
@@ -39,6 +39,8 @@ public class TraceUtil {
   static final String SPAN_NAME_RESERVEIDS = "CloudDatastoreOperation.reserveIds";
   static final String SPAN_NAME_ROLLBACK = "CloudDatastoreOperation.rollback";
   static final String SPAN_NAME_RUNQUERY = "CloudDatastoreOperation.runQuery";
+  static final String SPAN_NAME_RUN_AGGREGATION_QUERY =
+      "CloudDatastoreOperation.runAggregationQuery";
   static final EndSpanOptions END_SPAN_OPTIONS =
       EndSpanOptions.builder().setSampleToLocalSpanStore(true).build();
 
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 94edc22165e5..fc6c5e944a9b 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
@@ -16,6 +16,8 @@
 
 package com.google.cloud.datastore;
 
+import static com.google.cloud.datastore.ReadOption.transactionId;
+
 import com.google.common.collect.ImmutableList;
 import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.TransactionOptions;
@@ -82,8 +84,7 @@ public Entity get(Key key) {
   public Iterator get(Key... keys) {
     validateActive();
     Optional readOptions =
-        this.readOptionProtoPreparer.prepare(
-            ImmutableList.of(ReadOption.transactionId(transactionId)));
+        this.readOptionProtoPreparer.prepare(ImmutableList.of(transactionId(transactionId)));
     return datastore.get(readOptions, keys);
   }
 
@@ -97,11 +98,15 @@ public List fetch(Key... keys) {
   public  QueryResults run(Query query) {
     validateActive();
     Optional readOptions =
-        this.readOptionProtoPreparer.prepare(
-            ImmutableList.of(ReadOption.transactionId(transactionId)));
+        this.readOptionProtoPreparer.prepare(ImmutableList.of(transactionId(transactionId)));
     return datastore.run(readOptions, query);
   }
 
+  @Override
+  public AggregationResults runAggregation(AggregationQuery query) {
+    return datastore.runAggregation(query, transactionId(transactionId));
+  }
+
   @Override
   public Transaction.Response commit() {
     validateActive();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
new file mode 100644
index 000000000000..8a8e8cc183c9
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
@@ -0,0 +1,47 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
+import com.google.datastore.v1.AggregationQuery;
+
+/**
+ * Represents a Google Cloud Datastore Aggregation which is used with an {@link AggregationQuery}.
+ */
+@BetaApi
+public abstract class Aggregation {
+
+  private final String alias;
+
+  public Aggregation(String alias) {
+    this.alias = alias;
+  }
+
+  /** Returns the alias for this aggregation. */
+  public String getAlias() {
+    return alias;
+  }
+
+  @InternalApi
+  public abstract AggregationQuery.Aggregation toPb();
+
+  /** Returns a {@link CountAggregation} builder. */
+  public static CountAggregation.Builder count() {
+    return new CountAggregation.Builder();
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
new file mode 100644
index 000000000000..5e90b86aa485
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
@@ -0,0 +1,31 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import com.google.api.core.BetaApi;
+
+/**
+ * An interface to represent the builders which build and customize {@link Aggregation} for {@link
+ * com.google.cloud.datastore.AggregationQuery}.
+ *
+ * 
    Used by {@link
+ * com.google.cloud.datastore.AggregationQuery.Builder#addAggregation(AggregationBuilder)}.
+ */
+@BetaApi
+public interface AggregationBuilder {
+  A build();
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
new file mode 100644
index 000000000000..a5295addf102
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
@@ -0,0 +1,83 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import com.google.api.core.BetaApi;
+import com.google.datastore.v1.AggregationQuery;
+import com.google.datastore.v1.AggregationQuery.Aggregation.Count;
+import java.util.Objects;
+
+/** Represents an {@link Aggregation} which returns count. */
+@BetaApi
+public class CountAggregation extends Aggregation {
+
+  /** @param alias Alias to used when running this aggregation. */
+  public CountAggregation(String alias) {
+    super(alias);
+  }
+
+  @Override
+  public AggregationQuery.Aggregation toPb() {
+    Count.Builder countBuilder = Count.newBuilder();
+
+    AggregationQuery.Aggregation.Builder aggregationBuilder =
+        AggregationQuery.Aggregation.newBuilder().setCount(countBuilder);
+    if (this.getAlias() != null) {
+      aggregationBuilder.setAlias(this.getAlias());
+    }
+    return aggregationBuilder.build();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CountAggregation that = (CountAggregation) o;
+    boolean bothAliasAreNull = getAlias() == null && that.getAlias() == null;
+    if (bothAliasAreNull) {
+      return true;
+    } else {
+      boolean bothArePresent = getAlias() != null && that.getAlias() != null;
+      return bothArePresent && getAlias().equals(that.getAlias());
+    }
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getAlias());
+  }
+
+  /** A builder class to create and customize a {@link CountAggregation}. */
+  public static class Builder implements AggregationBuilder {
+
+    private String alias;
+
+    public Builder as(String alias) {
+      this.alias = alias;
+      return this;
+    }
+
+    @Override
+    public CountAggregation build() {
+      return new CountAggregation(alias);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
new file mode 100644
index 000000000000..14e425845f7c
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
@@ -0,0 +1,66 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.ReadOption;
+import com.google.cloud.datastore.ReadOption.QueryAndReadOptions;
+import com.google.cloud.datastore.execution.request.AggregationQueryRequestProtoPreparer;
+import com.google.cloud.datastore.execution.response.AggregationQueryResponseTransformer;
+import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import java.util.Arrays;
+
+/**
+ * An implementation of {@link QueryExecutor} which executes {@link AggregationQuery} and returns
+ * {@link AggregationResults}.
+ */
+@InternalApi
+public class AggregationQueryExecutor
+    implements QueryExecutor {
+
+  private final DatastoreRpc datastoreRpc;
+  private final AggregationQueryRequestProtoPreparer protoPreparer;
+  private final AggregationQueryResponseTransformer responseTransformer;
+
+  public AggregationQueryExecutor(DatastoreRpc datastoreRpc, DatastoreOptions datastoreOptions) {
+    this.datastoreRpc = datastoreRpc;
+    this.protoPreparer = new AggregationQueryRequestProtoPreparer(datastoreOptions);
+    this.responseTransformer = new AggregationQueryResponseTransformer();
+  }
+
+  @Override
+  public AggregationResults execute(AggregationQuery query, ReadOption... readOptions) {
+    RunAggregationQueryRequest runAggregationQueryRequest =
+        getRunAggregationQueryRequest(query, readOptions);
+    RunAggregationQueryResponse runAggregationQueryResponse =
+        this.datastoreRpc.runAggregationQuery(runAggregationQueryRequest);
+    return this.responseTransformer.transform(runAggregationQueryResponse);
+  }
+
+  private RunAggregationQueryRequest getRunAggregationQueryRequest(
+      AggregationQuery query, ReadOption... readOptions) {
+    QueryAndReadOptions queryAndReadOptions =
+        readOptions == null
+            ? QueryAndReadOptions.create(query)
+            : QueryAndReadOptions.create(query, Arrays.asList(readOptions));
+    return this.protoPreparer.prepare(queryAndReadOptions);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
new file mode 100644
index 000000000000..856c64a0201d
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
@@ -0,0 +1,40 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.ReadOption;
+
+/**
+ * An internal functional interface whose implementation has the responsibility to execute a {@link
+ * Query} and returns the result. This class will have the responsibility to orchestrate between
+ * {@link com.google.cloud.datastore.execution.request.ProtoPreparer}, {@link
+ * com.google.cloud.datastore.spi.v1.DatastoreRpc} and {@link
+ * com.google.cloud.datastore.execution.response.ResponseTransformer} layers.
+ *
+ * @param  A {@link Query} to execute.
+ * @param  the type of result produced by Query.
+ */
+@InternalApi
+public interface QueryExecutor, OUTPUT> {
+
+  /**
+   * @param query A {@link Query} to execute.
+   * @param readOptions Optional {@link ReadOption}s to be used when executing {@link Query}.
+   */
+  OUTPUT execute(INPUT query, ReadOption... readOptions);
+}
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
new file mode 100644
index 000000000000..b5da8d9fef56
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
@@ -0,0 +1,100 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution.request;
+
+import static com.google.cloud.datastore.AggregationQuery.Mode.GQL;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.GqlQueryProtoPreparer;
+import com.google.cloud.datastore.ReadOption;
+import com.google.cloud.datastore.ReadOption.QueryAndReadOptions;
+import com.google.cloud.datastore.ReadOptionProtoPreparer;
+import com.google.cloud.datastore.StructuredQueryProtoPreparer;
+import com.google.cloud.datastore.aggregation.Aggregation;
+import com.google.datastore.v1.GqlQuery;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.Query;
+import com.google.datastore.v1.ReadOptions;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import java.util.List;
+import java.util.Optional;
+
+@InternalApi
+public class AggregationQueryRequestProtoPreparer
+    implements ProtoPreparer, RunAggregationQueryRequest> {
+
+  private final DatastoreOptions datastoreOptions;
+  private final StructuredQueryProtoPreparer structuredQueryProtoPreparer;
+  private final GqlQueryProtoPreparer gqlQueryProtoPreparer;
+  private final ReadOptionProtoPreparer readOptionProtoPreparer;
+
+  public AggregationQueryRequestProtoPreparer(DatastoreOptions datastoreOptions) {
+    this.datastoreOptions = datastoreOptions;
+    this.structuredQueryProtoPreparer = new StructuredQueryProtoPreparer();
+    this.gqlQueryProtoPreparer = new GqlQueryProtoPreparer();
+    this.readOptionProtoPreparer = new ReadOptionProtoPreparer();
+  }
+
+  @Override
+  public RunAggregationQueryRequest prepare(
+      QueryAndReadOptions aggregationQueryAndReadOptions) {
+    AggregationQuery aggregationQuery = aggregationQueryAndReadOptions.getQuery();
+    List readOptions = aggregationQueryAndReadOptions.getReadOptions();
+    PartitionId partitionId = getPartitionId(aggregationQuery);
+    RunAggregationQueryRequest.Builder aggregationQueryRequestBuilder =
+        RunAggregationQueryRequest.newBuilder()
+            .setPartitionId(partitionId)
+            .setProjectId(datastoreOptions.getProjectId());
+
+    if (aggregationQuery.getMode() == GQL) {
+      aggregationQueryRequestBuilder.setGqlQuery(buildGqlQuery(aggregationQuery));
+    } else {
+      aggregationQueryRequestBuilder.setAggregationQuery(getAggregationQuery(aggregationQuery));
+    }
+
+    Optional readOptionsPb = readOptionProtoPreparer.prepare(readOptions);
+    readOptionsPb.ifPresent(aggregationQueryRequestBuilder::setReadOptions);
+    return aggregationQueryRequestBuilder.build();
+  }
+
+  private GqlQuery buildGqlQuery(AggregationQuery aggregationQuery) {
+    return gqlQueryProtoPreparer.prepare(aggregationQuery.getNestedGqlQuery());
+  }
+
+  private com.google.datastore.v1.AggregationQuery getAggregationQuery(
+      AggregationQuery aggregationQuery) {
+    Query nestedQueryProto =
+        structuredQueryProtoPreparer.prepare(aggregationQuery.getNestedStructuredQuery());
+
+    com.google.datastore.v1.AggregationQuery.Builder aggregationQueryProtoBuilder =
+        com.google.datastore.v1.AggregationQuery.newBuilder().setNestedQuery(nestedQueryProto);
+    for (Aggregation aggregation : aggregationQuery.getAggregations()) {
+      aggregationQueryProtoBuilder.addAggregations(aggregation.toPb());
+    }
+    return aggregationQueryProtoBuilder.build();
+  }
+
+  private PartitionId getPartitionId(AggregationQuery aggregationQuery) {
+    PartitionId.Builder builder =
+        PartitionId.newBuilder().setProjectId(datastoreOptions.getProjectId());
+    if (aggregationQuery.getNamespace() != null) {
+      builder.setNamespaceId(aggregationQuery.getNamespace());
+    }
+    return builder.build();
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
new file mode 100644
index 000000000000..1515a11476ff
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution.response;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.LongValue;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.Value;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@InternalApi
+public class AggregationQueryResponseTransformer
+    implements ResponseTransformer {
+
+  @Override
+  public AggregationResults transform(RunAggregationQueryResponse response) {
+    Timestamp readTime = Timestamp.fromProto(response.getBatch().getReadTime());
+    List aggregationResults =
+        response.getBatch().getAggregationResultsList().stream()
+            .map(
+                aggregationResult -> new AggregationResult(resultWithLongValues(aggregationResult)))
+            .collect(Collectors.toCollection(LinkedList::new));
+    return new AggregationResults(aggregationResults, readTime);
+  }
+
+  private Map resultWithLongValues(
+      com.google.datastore.v1.AggregationResult aggregationResult) {
+    return aggregationResult.getAggregatePropertiesMap().entrySet().stream()
+        .map(
+            (Function, Entry>)
+                entry ->
+                    new SimpleEntry<>(
+                        entry.getKey(), (LongValue) LongValue.fromPb(entry.getValue())))
+        .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java
new file mode 100644
index 000000000000..b17da3f79992
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java
@@ -0,0 +1,30 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution.response;
+
+import com.google.api.core.InternalApi;
+
+/**
+ * An internal functional interface whose implementation has the responsibility to populate a Domain
+ * object from a proto response.
+ *
+ * @param  the type of proto response object.
+ * @param  the type of domain object.
+ */
+@InternalApi
+public interface ResponseTransformer {
+  OUTPUT transform(INPUT response);
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
index 5e64c92552ed..33b8e11eacef 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
@@ -30,6 +30,8 @@
 import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
 
@@ -85,4 +87,13 @@ BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
    * @throws DatastoreException upon failure
    */
   RunQueryResponse runQuery(RunQueryRequest request);
+
+  /**
+   * Sends a request to run an aggregation query.
+   *
+   * @throws DatastoreException upon failure
+   */
+  default RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
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 4f13b4600488..fd3cdc658a8a 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
@@ -36,6 +36,8 @@
 import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
 import java.io.IOException;
@@ -200,4 +202,13 @@ public RunQueryResponse runQuery(RunQueryRequest request) {
       throw translate(ex);
     }
   }
+
+  @Override
+  public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) {
+    try {
+      return client.runAggregationQuery(request);
+    } catch (com.google.datastore.v1.client.DatastoreException ex) {
+      throw translate(ex);
+    }
+  }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
new file mode 100644
index 000000000000..840d23bca66f
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
@@ -0,0 +1,153 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.cloud.datastore.AggregationQuery.Mode.GQL;
+import static com.google.cloud.datastore.AggregationQuery.Mode.STRUCTURED;
+import static com.google.cloud.datastore.StructuredQuery.PropertyFilter.eq;
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+
+import com.google.cloud.datastore.aggregation.CountAggregation;
+import com.google.common.collect.ImmutableSet;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class AggregationQueryTest {
+
+  private static final String KIND = "Task";
+  private static final String NAMESPACE = "ns";
+  private static final EntityQuery COMPLETED_TASK_QUERY =
+      Query.newEntityQueryBuilder()
+          .setNamespace(NAMESPACE)
+          .setKind(KIND)
+          .setFilter(eq("done", true))
+          .setLimit(100)
+          .build();
+
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void testAggregations() {
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregation(new CountAggregation("total"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
+
+    assertThat(aggregationQuery.getNamespace()).isEqualTo(NAMESPACE);
+    assertThat(aggregationQuery.getAggregations())
+        .isEqualTo(ImmutableSet.of(count().as("total").build()));
+    assertThat(aggregationQuery.getNestedStructuredQuery()).isEqualTo(COMPLETED_TASK_QUERY);
+    assertThat(aggregationQuery.getMode()).isEqualTo(STRUCTURED);
+  }
+
+  @Test
+  public void testAggregationBuilderWithMoreThanOneAggregations() {
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregation(count().as("total"))
+            .addAggregation(count().as("new_total"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
+
+    assertThat(aggregationQuery.getNamespace()).isEqualTo(NAMESPACE);
+    assertThat(aggregationQuery.getAggregations())
+        .isEqualTo(ImmutableSet.of(count().as("total").build(), count().as("new_total").build()));
+    assertThat(aggregationQuery.getNestedStructuredQuery()).isEqualTo(COMPLETED_TASK_QUERY);
+    assertThat(aggregationQuery.getMode()).isEqualTo(STRUCTURED);
+  }
+
+  @Test
+  public void testAggregationBuilderWithDuplicateAggregations() {
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregation(count().as("total"))
+            .addAggregation(count().as("total"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
+
+    assertThat(aggregationQuery.getNamespace()).isEqualTo(NAMESPACE);
+    assertThat(aggregationQuery.getAggregations())
+        .isEqualTo(ImmutableSet.of(count().as("total").build()));
+    assertThat(aggregationQuery.getNestedStructuredQuery()).isEqualTo(COMPLETED_TASK_QUERY);
+    assertThat(aggregationQuery.getMode()).isEqualTo(STRUCTURED);
+  }
+
+  @Test
+  public void testAggregationQueryBuilderWithoutNamespace() {
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .addAggregation(count().as("total"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
+
+    assertNull(aggregationQuery.getNamespace());
+    assertThat(aggregationQuery.getAggregations())
+        .isEqualTo(ImmutableSet.of(count().as("total").build()));
+    assertThat(aggregationQuery.getNestedStructuredQuery()).isEqualTo(COMPLETED_TASK_QUERY);
+    assertThat(aggregationQuery.getMode()).isEqualTo(STRUCTURED);
+  }
+
+  @Test
+  public void testAggregationQueryBuilderWithoutNestedQuery() {
+    assertThrows(
+        "Nested query is required for an aggregation query to run",
+        IllegalArgumentException.class,
+        () ->
+            Query.newAggregationQueryBuilder()
+                .setNamespace(NAMESPACE)
+                .addAggregation(count().as("total"))
+                .build());
+  }
+
+  @Test
+  public void testAggregationQueryBuilderWithoutAggregation() {
+    assertThrows(
+        "At least one aggregation is required for an aggregation query to run",
+        IllegalArgumentException.class,
+        () ->
+            Query.newAggregationQueryBuilder()
+                .setNamespace(NAMESPACE)
+                .over(COMPLETED_TASK_QUERY)
+                .build());
+  }
+
+  @Test
+  public void testAggregationQueryBuilderWithGqlQuery() {
+    GqlQuery gqlQuery = Query.newGqlQueryBuilder("SELECT * FROM Task WHERE done = true").build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder().setNamespace(NAMESPACE).over(gqlQuery).build();
+
+    assertThat(aggregationQuery.getNestedGqlQuery()).isEqualTo(gqlQuery);
+    assertThat(aggregationQuery.getMode()).isEqualTo(GQL);
+  }
+
+  @Test
+  public void testAggregationQueryBuilderWithoutProvidingAnyNestedQuery() {
+    assertThrows(
+        "Nested query is required for an aggregation query to run",
+        IllegalArgumentException.class,
+        () -> Query.newAggregationQueryBuilder().setNamespace(NAMESPACE).build());
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
new file mode 100644
index 000000000000..06a5cb5f73ec
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.Test;
+
+public class AggregationResultTest {
+
+  @Test
+  public void shouldGetAggregationResultValueByAlias() {
+    AggregationResult aggregationResult =
+        new AggregationResult(
+            ImmutableMap.of(
+                "count", LongValue.of(45),
+                "property_2", LongValue.of(30)));
+
+    assertThat(aggregationResult.get("count")).isEqualTo(45L);
+    assertThat(aggregationResult.get("property_2")).isEqualTo(30L);
+  }
+}
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 72067fd20415..7dc625bad1df 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
@@ -16,6 +16,11 @@
 
 package com.google.cloud.datastore;
 
+import static com.google.cloud.datastore.ProtoTestData.intValue;
+import static com.google.cloud.datastore.TestUtils.matches;
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.truth.Truth.assertThat;
 import static org.easymock.EasyMock.createStrictMock;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
@@ -37,8 +42,10 @@
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.cloud.datastore.testing.LocalDatastoreHelper;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
+import com.google.datastore.v1.AggregationResultBatch;
 import com.google.datastore.v1.BeginTransactionRequest;
 import com.google.datastore.v1.BeginTransactionResponse;
 import com.google.datastore.v1.CommitRequest;
@@ -54,6 +61,8 @@
 import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
 import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
 import com.google.datastore.v1.TransactionOptions;
@@ -62,11 +71,14 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
 import org.easymock.EasyMock;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -526,6 +538,27 @@ public void testGqlQueryPagination() throws DatastoreException {
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
+  @Test
+  public void testRunAggregationQuery() {
+    RunAggregationQueryResponse aggregationQueryResponse = placeholderAggregationQueryResponse();
+    EasyMock.expect(rpcMock.runAggregationQuery(matches(aggregationQueryWithAlias("total_count"))))
+        .andReturn(aggregationQueryResponse);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+
+    Datastore mockDatastore = rpcMockOptions.getService();
+
+    EntityQuery selectAllQuery = Query.newEntityQueryBuilder().build();
+    AggregationQuery getCountQuery =
+        Query.newAggregationQueryBuilder()
+            .addAggregation(count().as("total_count"))
+            .over(selectAllQuery)
+            .build();
+    AggregationResult result = getOnlyElement(mockDatastore.runAggregation(getCountQuery));
+
+    assertThat(result.get("total_count")).isEqualTo(209L);
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
   @Test
   public void testRunStructuredQuery() {
     Query query =
@@ -1311,4 +1344,28 @@ public void testQueryWithStartCursor() {
     assertEquals(cursor2, cursor1);
     datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
   }
+
+  private RunAggregationQueryResponse placeholderAggregationQueryResponse() {
+    Map result1 =
+        new HashMap<>(ImmutableMap.of("total_count", intValue(209)));
+
+    AggregationResultBatch resultBatch =
+        AggregationResultBatch.newBuilder()
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result1)
+                    .build())
+            .build();
+    return RunAggregationQueryResponse.newBuilder().setBatch(resultBatch).build();
+  }
+
+  private Predicate aggregationQueryWithAlias(String alias) {
+    return runAggregationQueryRequest ->
+        alias.equals(
+            runAggregationQueryRequest
+                .getAggregationQuery()
+                .getAggregationsList()
+                .get(0)
+                .getAlias());
+  }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
index a923b618b3e2..25b902fd4604 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
@@ -17,6 +17,8 @@
 
 import static com.google.datastore.v1.PropertyOrder.Direction.ASCENDING;
 
+import com.google.datastore.v1.AggregationQuery.Aggregation;
+import com.google.datastore.v1.AggregationQuery.Aggregation.Count;
 import com.google.datastore.v1.Filter;
 import com.google.datastore.v1.GqlQueryParameter;
 import com.google.datastore.v1.KindExpression;
@@ -63,6 +65,10 @@ public static PropertyReference propertyReference(String value) {
     return PropertyReference.newBuilder().setName(value).build();
   }
 
+  public static Aggregation countAggregation(String alias) {
+    return Aggregation.newBuilder().setAlias(alias).setCount(Count.newBuilder().build()).build();
+  }
+
   public static PropertyOrder propertyOrder(String value) {
     return PropertyOrder.newBuilder()
         .setProperty(propertyReference(value))
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
index bda5de3b5836..b16fdf100746 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
@@ -78,11 +78,11 @@ public void shouldPrepareReadOptionsWithReadTime() {
 
   @Test
   public void shouldPrepareReadOptionsWithTransactionId() {
-    String dummyTransactionId = "transaction-id";
+    String transactionId = "transaction-id";
     Optional readOptions =
-        protoPreparer.prepare(singletonList(transactionId(dummyTransactionId)));
+        protoPreparer.prepare(singletonList(transactionId(transactionId)));
 
-    assertThat(readOptions.get().getTransaction().toStringUtf8()).isEqualTo(dummyTransactionId);
+    assertThat(readOptions.get().getTransaction().toStringUtf8()).isEqualTo(transactionId);
   }
 
   @Test
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java
new file mode 100644
index 000000000000..b86355afab93
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import static com.google.cloud.datastore.TraceUtil.END_SPAN_OPTIONS;
+import static com.google.cloud.datastore.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.rpc.Code.UNAVAILABLE;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import io.opencensus.trace.Span;
+import io.opencensus.trace.Tracer;
+import org.junit.Before;
+import org.junit.Test;
+
+public class RetryAndTraceDatastoreRpcDecoratorTest {
+
+  public static final int MAX_ATTEMPTS = 3;
+  private DatastoreRpc mockDatastoreRpc;
+  private TraceUtil mockTraceUtil;
+  private DatastoreOptions datastoreOptions =
+      DatastoreOptions.newBuilder().setProjectId("project-id").build();
+  private RetrySettings retrySettings =
+      RetrySettings.newBuilder().setMaxAttempts(MAX_ATTEMPTS).build();
+
+  private RetryAndTraceDatastoreRpcDecorator datastoreRpcDecorator;
+
+  @Before
+  public void setUp() throws Exception {
+    mockDatastoreRpc = createStrictMock(DatastoreRpc.class);
+    mockTraceUtil = createStrictMock(TraceUtil.class);
+    datastoreRpcDecorator =
+        new RetryAndTraceDatastoreRpcDecorator(
+            mockDatastoreRpc, mockTraceUtil, retrySettings, datastoreOptions);
+  }
+
+  @Test
+  public void testRunAggregationQuery() {
+    Span mockSpan = createStrictMock(Span.class);
+    RunAggregationQueryRequest aggregationQueryRequest =
+        RunAggregationQueryRequest.getDefaultInstance();
+    RunAggregationQueryResponse aggregationQueryResponse =
+        RunAggregationQueryResponse.getDefaultInstance();
+
+    expect(mockDatastoreRpc.runAggregationQuery(aggregationQueryRequest))
+        .andThrow(
+            new DatastoreException(
+                UNAVAILABLE.getNumber(), "API not accessible currently", UNAVAILABLE.name()))
+        .times(2)
+        .andReturn(aggregationQueryResponse);
+    expect(mockTraceUtil.startSpan(SPAN_NAME_RUN_AGGREGATION_QUERY)).andReturn(mockSpan);
+    expect(mockTraceUtil.getTracer()).andReturn(createNiceMock(Tracer.class));
+    mockSpan.end(END_SPAN_OPTIONS);
+
+    replay(mockDatastoreRpc, mockTraceUtil, mockSpan);
+
+    RunAggregationQueryResponse actualAggregationQueryResponse =
+        datastoreRpcDecorator.runAggregationQuery(aggregationQueryRequest);
+
+    assertThat(actualAggregationQueryResponse).isSameInstanceAs(aggregationQueryResponse);
+    verify(mockDatastoreRpc, mockTraceUtil, mockSpan);
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java
new file mode 100644
index 000000000000..3a3fcfaea721
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java
@@ -0,0 +1,39 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore;
+
+import java.util.function.Predicate;
+import org.easymock.EasyMock;
+import org.easymock.IArgumentMatcher;
+
+public class TestUtils {
+
+  public static  T matches(Predicate predicate) {
+    EasyMock.reportMatcher(
+        new IArgumentMatcher() {
+          @Override
+          public boolean matches(Object argument) {
+            return predicate.test(((T) argument));
+          }
+
+          @Override
+          public void appendTo(StringBuffer buffer) {
+            buffer.append("matches(\"").append(predicate).append("\")");
+          }
+        });
+    return null;
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java
new file mode 100644
index 000000000000..a8b3bc945c50
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.datastore.v1.AggregationQuery;
+import org.junit.Test;
+
+public class CountAggregationTest {
+
+  @Test
+  public void testCountAggregationWithDefaultValues() {
+    AggregationQuery.Aggregation countAggregationPb = count().build().toPb();
+
+    assertThat(countAggregationPb.getCount().getUpTo().getValue()).isEqualTo(0L);
+    assertThat(countAggregationPb.getAlias()).isEqualTo("");
+  }
+
+  @Test
+  public void testCountAggregationWithAlias() {
+    AggregationQuery.Aggregation countAggregationPb = count().as("column_1").build().toPb();
+
+    assertThat(countAggregationPb.getCount().getUpTo().getValue()).isEqualTo(0L);
+    assertThat(countAggregationPb.getAlias()).isEqualTo("column_1");
+  }
+
+  @Test
+  public void testEquals() {
+    CountAggregation.Builder aggregationWithAlias1 = count().as("total");
+    CountAggregation.Builder aggregationWithAlias2 = count().as("total");
+    CountAggregation.Builder aggregationWithoutAlias1 = count();
+    CountAggregation.Builder aggregationWithoutAlias2 = count();
+
+    // same aliases
+    assertThat(aggregationWithAlias1.build()).isEqualTo(aggregationWithAlias2.build());
+    assertThat(aggregationWithAlias2.build()).isEqualTo(aggregationWithAlias1.build());
+
+    // with and without aliases
+    assertThat(aggregationWithAlias1.build()).isNotEqualTo(aggregationWithoutAlias1.build());
+    assertThat(aggregationWithoutAlias1.build()).isNotEqualTo(aggregationWithAlias1.build());
+
+    // no aliases
+    assertThat(aggregationWithoutAlias1.build()).isEqualTo(aggregationWithoutAlias2.build());
+    assertThat(aggregationWithoutAlias2.build()).isEqualTo(aggregationWithoutAlias1.build());
+
+    // different aliases
+    assertThat(aggregationWithAlias1.as("new-alias").build())
+        .isNotEqualTo(aggregationWithAlias2.build());
+    assertThat(aggregationWithAlias2.build())
+        .isNotEqualTo(aggregationWithAlias1.as("new-alias").build());
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
new file mode 100644
index 000000000000..f9f23261dbc3
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
@@ -0,0 +1,177 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution;
+
+import static com.google.cloud.datastore.ProtoTestData.intValue;
+import static com.google.cloud.datastore.ReadOption.eventualConsistency;
+import static com.google.cloud.datastore.StructuredQuery.PropertyFilter.eq;
+import static com.google.cloud.datastore.TestUtils.matches;
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.datastore.v1.ReadOptions.ReadConsistency.EVENTUAL;
+import static java.util.Arrays.asList;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
+import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.LongValue;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.common.collect.ImmutableMap;
+import com.google.datastore.v1.AggregationResultBatch;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.Value;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AggregationQueryExecutorTest {
+
+  private static final String KIND = "Task";
+  private static final String NAMESPACE = "ns";
+
+  private DatastoreRpc mockRpc;
+  private AggregationQueryExecutor queryExecutor;
+  private DatastoreOptions datastoreOptions;
+
+  @Before
+  public void setUp() throws Exception {
+    mockRpc = EasyMock.createStrictMock(DatastoreRpc.class);
+    datastoreOptions =
+        DatastoreOptions.newBuilder().setProjectId("project-id").setNamespace(NAMESPACE).build();
+    queryExecutor = new AggregationQueryExecutor(mockRpc, datastoreOptions);
+  }
+
+  @Test
+  public void shouldExecuteAggregationQuery() {
+    EntityQuery nestedQuery =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setKind(KIND)
+            .setFilter(eq("done", true))
+            .build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregation(count().as("total"))
+            .over(nestedQuery)
+            .build();
+
+    RunAggregationQueryResponse runAggregationQueryResponse = placeholderAggregationQueryResponse();
+    expect(mockRpc.runAggregationQuery(anyObject(RunAggregationQueryRequest.class)))
+        .andReturn(runAggregationQueryResponse);
+
+    replay(mockRpc);
+
+    AggregationResults aggregationResults = queryExecutor.execute(aggregationQuery);
+
+    verify(mockRpc);
+    assertThat(aggregationResults)
+        .isEqualTo(
+            new AggregationResults(
+                asList(
+                    new AggregationResult(
+                        ImmutableMap.of(
+                            "count", LongValue.of(209), "property_2", LongValue.of(100))),
+                    new AggregationResult(
+                        ImmutableMap.of(
+                            "count", LongValue.of(509), "property_2", LongValue.of(100)))),
+                Timestamp.fromProto(runAggregationQueryResponse.getBatch().getReadTime())));
+  }
+
+  @Test
+  public void shouldExecuteAggregationQueryWithReadOptions() {
+    EntityQuery nestedQuery =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setKind(KIND)
+            .setFilter(eq("done", true))
+            .build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregation(count().as("total"))
+            .over(nestedQuery)
+            .build();
+
+    RunAggregationQueryResponse runAggregationQueryResponse = placeholderAggregationQueryResponse();
+    expect(mockRpc.runAggregationQuery(matches(runAggregationRequestWithEventualConsistency())))
+        .andReturn(runAggregationQueryResponse);
+
+    replay(mockRpc);
+
+    AggregationResults aggregationResults =
+        queryExecutor.execute(aggregationQuery, eventualConsistency());
+
+    verify(mockRpc);
+    assertThat(aggregationResults)
+        .isEqualTo(
+            new AggregationResults(
+                asList(
+                    new AggregationResult(
+                        ImmutableMap.of(
+                            "count", LongValue.of(209), "property_2", LongValue.of(100))),
+                    new AggregationResult(
+                        ImmutableMap.of(
+                            "count", LongValue.of(509), "property_2", LongValue.of(100)))),
+                Timestamp.fromProto(runAggregationQueryResponse.getBatch().getReadTime())));
+  }
+
+  private RunAggregationQueryResponse placeholderAggregationQueryResponse() {
+    Map result1 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", intValue(209),
+                "property_2", intValue(100)));
+
+    Map result2 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", intValue(509),
+                "property_2", intValue(100)));
+
+    AggregationResultBatch resultBatch =
+        AggregationResultBatch.newBuilder()
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result1)
+                    .build())
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result2)
+                    .build())
+            .build();
+    return RunAggregationQueryResponse.newBuilder().setBatch(resultBatch).build();
+  }
+
+  private Predicate runAggregationRequestWithEventualConsistency() {
+    return runAggregationQueryRequest ->
+        runAggregationQueryRequest.getReadOptions().getReadConsistency() == EVENTUAL;
+  }
+}
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
new file mode 100644
index 000000000000..6301ebeff500
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution.request;
+
+import static com.google.cloud.datastore.ProtoTestData.booleanValue;
+import static com.google.cloud.datastore.ProtoTestData.countAggregation;
+import static com.google.cloud.datastore.ProtoTestData.gqlQueryParameter;
+import static com.google.cloud.datastore.ProtoTestData.intValue;
+import static com.google.cloud.datastore.ProtoTestData.kind;
+import static com.google.cloud.datastore.ProtoTestData.propertyFilter;
+import static com.google.cloud.datastore.ProtoTestData.stringValue;
+import static com.google.cloud.datastore.ReadOption.eventualConsistency;
+import static com.google.cloud.datastore.StructuredQuery.PropertyFilter.eq;
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.datastore.v1.PropertyFilter.Operator.EQUAL;
+import static com.google.datastore.v1.ReadOptions.ReadConsistency.EVENTUAL;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+
+import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.GqlQuery;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.ReadOption;
+import com.google.cloud.datastore.ReadOption.QueryAndReadOptions;
+import com.google.common.collect.ImmutableMap;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import java.util.HashMap;
+import org.junit.Test;
+
+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 DatastoreOptions DATASTORE_OPTIONS =
+      DatastoreOptions.newBuilder().setProjectId(PROJECT_ID).setNamespace(NAMESPACE).build();
+  private static final EntityQuery COMPLETED_TASK_STRUCTURED_QUERY =
+      Query.newEntityQueryBuilder()
+          .setNamespace(NAMESPACE)
+          .setKind(KIND)
+          .setFilter(eq("done", true))
+          .build();
+
+  private static final GqlQuery COMPLETED_TASK_GQL_QUERY =
+      Query.newGqlQueryBuilder(
+              "AGGREGATE COUNT AS total_characters OVER ("
+                  + "SELECT * FROM Character WHERE name = @name and age > @1"
+                  + ")")
+          .setBinding("name", "John Doe")
+          .addBinding(27)
+          .build();
+
+  private final AggregationQuery AGGREGATION_OVER_STRUCTURED_QUERY =
+      Query.newAggregationQueryBuilder()
+          .setNamespace(NAMESPACE)
+          .addAggregation(count().as("total"))
+          .over(COMPLETED_TASK_STRUCTURED_QUERY)
+          .build();
+
+  private final AggregationQuery AGGREGATION_OVER_GQL_QUERY =
+      Query.newAggregationQueryBuilder()
+          .setNamespace(NAMESPACE)
+          .over(COMPLETED_TASK_GQL_QUERY)
+          .build();
+
+  private final AggregationQueryRequestProtoPreparer protoPreparer =
+      new AggregationQueryRequestProtoPreparer(DATASTORE_OPTIONS);
+
+  @Test
+  public void shouldPrepareAggregationQueryRequestWithGivenStructuredQuery() {
+    RunAggregationQueryRequest runAggregationQueryRequest =
+        protoPreparer.prepare(QueryAndReadOptions.create(AGGREGATION_OVER_STRUCTURED_QUERY));
+
+    assertThat(runAggregationQueryRequest.getProjectId()).isEqualTo(PROJECT_ID);
+
+    assertThat(runAggregationQueryRequest.getPartitionId().getProjectId()).isEqualTo(PROJECT_ID);
+    assertThat(runAggregationQueryRequest.getPartitionId().getNamespaceId()).isEqualTo(NAMESPACE);
+
+    com.google.datastore.v1.AggregationQuery aggregationQueryProto =
+        runAggregationQueryRequest.getAggregationQuery();
+    assertThat(aggregationQueryProto.getNestedQuery())
+        .isEqualTo(
+            com.google.datastore.v1.Query.newBuilder()
+                .addKind(kind(KIND))
+                .setFilter(propertyFilter("done", EQUAL, booleanValue(true)))
+                .build());
+    assertThat(aggregationQueryProto.getAggregationsList())
+        .isEqualTo(singletonList(countAggregation("total")));
+  }
+
+  @Test
+  public void shouldPrepareAggregationQueryRequestWithGivenGqlQuery() {
+    RunAggregationQueryRequest runAggregationQueryRequest =
+        protoPreparer.prepare(QueryAndReadOptions.create(AGGREGATION_OVER_GQL_QUERY));
+
+    assertThat(runAggregationQueryRequest.getProjectId()).isEqualTo(PROJECT_ID);
+
+    assertThat(runAggregationQueryRequest.getPartitionId().getProjectId()).isEqualTo(PROJECT_ID);
+    assertThat(runAggregationQueryRequest.getPartitionId().getNamespaceId()).isEqualTo(NAMESPACE);
+
+    com.google.datastore.v1.GqlQuery gqlQueryProto = runAggregationQueryRequest.getGqlQuery();
+
+    assertThat(gqlQueryProto.getQueryString()).isEqualTo(COMPLETED_TASK_GQL_QUERY.getQueryString());
+    assertThat(gqlQueryProto.getNamedBindingsMap())
+        .isEqualTo(
+            new HashMap<>(ImmutableMap.of("name", gqlQueryParameter(stringValue("John Doe")))));
+    assertThat(gqlQueryProto.getPositionalBindingsList())
+        .isEqualTo(asList(gqlQueryParameter(intValue(27))));
+  }
+
+  @Test
+  public void shouldPrepareReadOptionsWithGivenStructuredQuery() {
+    RunAggregationQueryRequest eventualConsistencyAggregationRequest =
+        prepareQuery(AGGREGATION_OVER_STRUCTURED_QUERY, eventualConsistency());
+    assertThat(eventualConsistencyAggregationRequest.getReadOptions().getReadConsistency())
+        .isEqualTo(EVENTUAL);
+
+    Timestamp now = Timestamp.now();
+    RunAggregationQueryRequest readTimeAggregationRequest =
+        prepareQuery(AGGREGATION_OVER_STRUCTURED_QUERY, ReadOption.readTime(now));
+    assertThat(Timestamp.fromProto(readTimeAggregationRequest.getReadOptions().getReadTime()))
+        .isEqualTo(now);
+  }
+
+  @Test
+  public void shouldPrepareReadOptionsWithGivenGqlQuery() {
+    RunAggregationQueryRequest eventualConsistencyAggregationRequest =
+        prepareQuery(AGGREGATION_OVER_GQL_QUERY, eventualConsistency());
+    assertThat(eventualConsistencyAggregationRequest.getReadOptions().getReadConsistency())
+        .isEqualTo(EVENTUAL);
+
+    Timestamp now = Timestamp.now();
+    RunAggregationQueryRequest readTimeAggregationRequest =
+        prepareQuery(AGGREGATION_OVER_GQL_QUERY, ReadOption.readTime(now));
+    assertThat(Timestamp.fromProto(readTimeAggregationRequest.getReadOptions().getReadTime()))
+        .isEqualTo(now);
+  }
+
+  @Test
+  public void shouldPrepareAggregationQueryWithoutNamespace() {
+    AggregationQuery structuredQueryWithoutNamespace =
+        Query.newAggregationQueryBuilder()
+            .addAggregation(count().as("total"))
+            .over(COMPLETED_TASK_STRUCTURED_QUERY)
+            .build();
+    AggregationQuery gqlQueryWithoutNamespace =
+        Query.newAggregationQueryBuilder().over(COMPLETED_TASK_GQL_QUERY).build();
+
+    RunAggregationQueryRequest runAggregationQueryFromStructuredQuery =
+        protoPreparer.prepare(QueryAndReadOptions.create(structuredQueryWithoutNamespace));
+    RunAggregationQueryRequest runAggregationQueryFromGqlQuery =
+        protoPreparer.prepare(QueryAndReadOptions.create(gqlQueryWithoutNamespace));
+
+    assertThat(runAggregationQueryFromStructuredQuery.getPartitionId().getNamespaceId())
+        .isEqualTo("");
+    assertThat(runAggregationQueryFromGqlQuery.getPartitionId().getNamespaceId()).isEqualTo("");
+  }
+
+  private RunAggregationQueryRequest prepareQuery(AggregationQuery query, ReadOption readOption) {
+    return protoPreparer.prepare(QueryAndReadOptions.create(query, singletonList(readOption)));
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
new file mode 100644
index 000000000000..8776d4221951
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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
+ *
+ *     https://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.cloud.datastore.execution.response;
+
+import static com.google.cloud.datastore.ProtoTestData.intValue;
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.LongValue;
+import com.google.common.collect.ImmutableMap;
+import com.google.datastore.v1.AggregationResultBatch;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.Value;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.junit.Test;
+
+public class AggregationQueryResponseTransformerTest {
+
+  private final AggregationQueryResponseTransformer responseTransformer =
+      new AggregationQueryResponseTransformer();
+
+  @Test
+  public void shouldTransformAggregationQueryResponse() {
+    Map result1 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", intValue(209),
+                "property_2", intValue(100)));
+
+    Map result2 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", intValue(509),
+                "property_2", intValue(100)));
+    Timestamp readTime = Timestamp.now();
+
+    AggregationResultBatch resultBatch =
+        AggregationResultBatch.newBuilder()
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result1)
+                    .build())
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result2)
+                    .build())
+            .setReadTime(readTime.toProto())
+            .build();
+    RunAggregationQueryResponse runAggregationQueryResponse =
+        RunAggregationQueryResponse.newBuilder().setBatch(resultBatch).build();
+
+    AggregationResults aggregationResults =
+        responseTransformer.transform(runAggregationQueryResponse);
+
+    assertThat(aggregationResults.size()).isEqualTo(2);
+    assertThat(aggregationResults.get(0)).isEqualTo(new AggregationResult(toDomainValues(result1)));
+    assertThat(aggregationResults.get(1)).isEqualTo(new AggregationResult(toDomainValues(result2)));
+    assertThat(aggregationResults.getReadTime()).isEqualTo(readTime);
+  }
+
+  private Map toDomainValues(Map map) {
+
+    return map.entrySet().stream()
+        .map(
+            (Function, Entry>)
+                entry ->
+                    new SimpleEntry<>(
+                        entry.getKey(), (LongValue) LongValue.fromPb(entry.getValue())))
+        .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+  }
+}
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 869984932e7d..b8c3bb4b6f29 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
@@ -16,6 +16,9 @@
 
 package com.google.cloud.datastore.it;
 
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -26,14 +29,17 @@
 import static org.junit.Assert.fail;
 
 import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.AggregationQuery;
 import com.google.cloud.datastore.Batch;
 import com.google.cloud.datastore.BooleanValue;
 import com.google.cloud.datastore.Cursor;
 import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.Datastore.TransactionCallable;
 import com.google.cloud.datastore.DatastoreException;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.DatastoreReaderWriter;
 import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
 import com.google.cloud.datastore.EntityValue;
 import com.google.cloud.datastore.FullEntity;
 import com.google.cloud.datastore.GqlQuery;
@@ -61,13 +67,20 @@
 import com.google.cloud.datastore.ValueType;
 import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import com.google.datastore.v1.TransactionOptions;
+import com.google.datastore.v1.TransactionOptions.ReadOnly;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -170,7 +183,11 @@ public void setUp() {
 
   @After
   public void tearDown() {
-    DATASTORE.delete(KEY1, KEY2, KEY3);
+    EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build();
+    QueryResults allEntities = DATASTORE.run(allEntitiesQuery);
+    Key[] keysToDelete =
+        ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new);
+    DATASTORE.delete(keysToDelete);
   }
 
   private  Iterator getStronglyConsistentResults(Query scQuery, Query query)
@@ -506,6 +523,279 @@ public void testRunGqlQueryWithCasting() throws InterruptedException {
     assertFalse(results3.hasNext());
   }
 
+  @Test
+  public void testRunAggregationQuery() {
+    // verifying aggregation with an entity query
+    testCountAggregationWith(
+        builder ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(
+                    Query.newEntityQueryBuilder().setNamespace(NAMESPACE).setKind(KIND1).build()));
+
+    // verifying aggregation with a projection query
+    testCountAggregationWith(
+        builder ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(
+                    Query.newProjectionEntityQueryBuilder()
+                        .setProjection("str")
+                        .setNamespace(NAMESPACE)
+                        .setKind(KIND1)
+                        .build()));
+
+    // verifying aggregation with a key query
+    testCountAggregationWith(
+        builder ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(Query.newKeyQueryBuilder().setNamespace(NAMESPACE).setKind(KIND1).build()));
+
+    // verifying aggregation with a GQL query
+    testCountAggregationWith(
+        builder ->
+            builder.over(
+                Query.newGqlQueryBuilder(
+                        "AGGREGATE COUNT(*) AS total_count OVER (SELECT * FROM kind1)")
+                    .setNamespace(NAMESPACE)
+                    .build()));
+  }
+
+  @Test
+  public void testRunAggregationQueryWithLimit() {
+    // verifying aggregation with an entity query
+    testCountAggregationWithLimit(
+        builder ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(Query.newEntityQueryBuilder().setNamespace(NAMESPACE).setKind(KIND1).build()),
+        ((builder, limit) ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(
+                    Query.newEntityQueryBuilder()
+                        .setNamespace(NAMESPACE)
+                        .setKind(KIND1)
+                        .setLimit(limit.intValue())
+                        .build())));
+
+    // verifying aggregation with a projection query
+    testCountAggregationWithLimit(
+        builder ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(
+                    Query.newProjectionEntityQueryBuilder()
+                        .setProjection("str")
+                        .setNamespace(NAMESPACE)
+                        .setKind(KIND1)
+                        .build()),
+        ((builder, limit) ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(
+                    Query.newProjectionEntityQueryBuilder()
+                        .setProjection("str")
+                        .setNamespace(NAMESPACE)
+                        .setKind(KIND1)
+                        .setLimit(limit.intValue())
+                        .build())));
+
+    // verifying aggregation with a key query
+    testCountAggregationWithLimit(
+        builder ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(Query.newKeyQueryBuilder().setNamespace(NAMESPACE).setKind(KIND1).build()),
+        (builder, limit) ->
+            builder
+                .addAggregation(count().as("total_count"))
+                .over(
+                    Query.newKeyQueryBuilder()
+                        .setNamespace(NAMESPACE)
+                        .setKind(KIND1)
+                        .setLimit(limit.intValue())
+                        .build()));
+
+    // verifying aggregation with a GQL query
+    testCountAggregationWithLimit(
+        builder ->
+            builder.over(
+                Query.newGqlQueryBuilder(
+                        "AGGREGATE COUNT(*) AS total_count OVER (SELECT * FROM kind1)")
+                    .setNamespace(NAMESPACE)
+                    .build()),
+        (builder, limit) ->
+            builder.over(
+                Query.newGqlQueryBuilder(
+                        "AGGREGATE COUNT(*) AS total_count OVER (SELECT * FROM kind1 LIMIT @limit)")
+                    .setNamespace(NAMESPACE)
+                    .setBinding("limit", limit)
+                    .build()));
+  }
+
+  /**
+   * if an entity is modified or deleted within a transaction, a query or lookup returns the
+   * original version of the entity as of the beginning of the transaction, or nothing if the entity
+   * did not exist then.
+   *
+   * @see 
+   *     Source
+   */
+  @Test
+  public void testRunAggregationQueryInTransactionShouldReturnAConsistentSnapshot() {
+    Key newEntityKey = Key.newBuilder(KEY1, "newKind", "name-01").build();
+    EntityQuery entityQuery =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setFilter(PropertyFilter.hasAncestor(KEY1))
+            .build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .over(entityQuery)
+            .addAggregation(count().as("count"))
+            .build();
+
+    // original entity count is 2
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+        .isEqualTo(2L);
+
+    // FIRST TRANSACTION
+    DATASTORE.runInTransaction(
+        (TransactionCallable)
+            inFirstTransaction -> {
+              // creating a new entity
+              Entity aNewEntity =
+                  Entity.newBuilder(ENTITY2).setKey(newEntityKey).set("v_int", 10).build();
+              inFirstTransaction.put(aNewEntity);
+
+              // count remains 2
+              assertThat(
+                      getOnlyElement(inFirstTransaction.runAggregation(aggregationQuery))
+                          .get("count"))
+                  .isEqualTo(2L);
+              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"))
+        .isEqualTo(3L);
+
+    // SECOND TRANSACTION
+    DATASTORE.runInTransaction(
+        (TransactionCallable)
+            inSecondTransaction -> {
+              // deleting ENTITY2
+              inSecondTransaction.delete(ENTITY2.getKey());
+
+              // count remains 3
+              assertThat(
+                      getOnlyElement(inSecondTransaction.runAggregation(aggregationQuery))
+                          .get("count"))
+                  .isEqualTo(3L);
+              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"))
+        .isEqualTo(2L);
+    DATASTORE.delete(newEntityKey);
+  }
+
+  @Test
+  public void testRunAggregationQueryInAReadOnlyTransactionShouldNotLockTheCountedDocuments()
+      throws Exception {
+    ExecutorService executor = Executors.newSingleThreadExecutor();
+    EntityQuery entityQuery =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setFilter(PropertyFilter.hasAncestor(KEY1))
+            .build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .over(entityQuery)
+            .addAggregation(count().as("count"))
+            .build();
+
+    TransactionOptions transactionOptions =
+        TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build();
+    Transaction readOnlyTransaction = DATASTORE.newTransaction(transactionOptions);
+
+    // Executing query in transaction
+    assertThat(getOnlyElement(readOnlyTransaction.runAggregation(aggregationQuery)).get("count"))
+        .isEqualTo(2L);
+
+    // Concurrent write task.
+    Future addNewEntityTaskOutsideTransaction =
+        executor.submit(
+            () -> {
+              Entity aNewEntity =
+                  Entity.newBuilder(ENTITY2)
+                      .setKey(Key.newBuilder(KEY1, "newKind", "name-01").build())
+                      .set("v_int", 10)
+                      .build();
+              DATASTORE.put(aNewEntity);
+              return null;
+            });
+
+    // should not throw exception and complete successfully as the ongoing transaction is read-only.
+    addNewEntityTaskOutsideTransaction.get();
+
+    // cleanup
+    readOnlyTransaction.commit();
+    executor.shutdownNow();
+
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+        .isEqualTo(3L);
+  }
+
+  @Test
+  public void testRunAggregationQueryWithReadTime() throws InterruptedException {
+    String alias = "total_count";
+
+    // verifying aggregation readTime with an entity query
+    testCountAggregationReadTimeWith(
+        builder ->
+            builder
+                .over(Query.newEntityQueryBuilder().setKind("new_kind").build())
+                .addAggregation(count().as(alias)));
+
+    // verifying aggregation readTime with a projection query
+    testCountAggregationReadTimeWith(
+        builder ->
+            builder
+                .over(
+                    Query.newProjectionEntityQueryBuilder()
+                        .setProjection("name")
+                        .setKind("new_kind")
+                        .build())
+                .addAggregation(count().as(alias)));
+
+    // verifying aggregation readTime with a key query
+    testCountAggregationReadTimeWith(
+        builder ->
+            builder
+                .over(Query.newKeyQueryBuilder().setKind("new_kind").build())
+                .addAggregation(count().as(alias)));
+
+    // verifying aggregation readTime with a GQL query
+    testCountAggregationReadTimeWith(
+        builder ->
+            builder
+                .over(
+                    Query.newGqlQueryBuilder(
+                            "AGGREGATE COUNT(*) AS total_count OVER (SELECT * FROM new_kind)")
+                        .build())
+                .addAggregation(count().as(alias)));
+  }
+
   @Test
   public void testRunStructuredQuery() throws InterruptedException {
     Query query =
@@ -1067,4 +1357,92 @@ public void testQueryWithReadTime() throws InterruptedException {
       DATASTORE.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
     }
   }
+
+  private void testCountAggregationWith(Consumer configurer) {
+    AggregationQuery.Builder builder = Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+    configurer.accept(builder);
+    AggregationQuery aggregationQuery = builder.build();
+    String alias = "total_count";
+
+    Long countBeforeAdd = getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get(alias);
+    long expectedCount = countBeforeAdd + 1;
+
+    Entity newEntity =
+        Entity.newBuilder(ENTITY1)
+            .setKey(Key.newBuilder(KEY3, KIND1, 1).build())
+            .set("null", NULL_VALUE)
+            .set("partial1", PARTIAL_ENTITY2)
+            .set("partial2", ENTITY2)
+            .build();
+    DATASTORE.put(newEntity);
+
+    Long countAfterAdd = getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get(alias);
+    assertThat(countAfterAdd).isEqualTo(expectedCount);
+
+    DATASTORE.delete(newEntity.getKey());
+  }
+
+  private void testCountAggregationWithLimit(
+      Consumer withoutLimitConfigurer,
+      BiConsumer withLimitConfigurer) {
+    String alias = "total_count";
+
+    AggregationQuery.Builder withoutLimitBuilder =
+        Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+    withoutLimitConfigurer.accept(withoutLimitBuilder);
+
+    Long currentCount =
+        getOnlyElement(DATASTORE.runAggregation(withoutLimitBuilder.build())).get(alias);
+    long limit = currentCount - 1;
+
+    AggregationQuery.Builder withLimitBuilder =
+        Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+    withLimitConfigurer.accept(withLimitBuilder, limit);
+
+    Long countWithLimit =
+        getOnlyElement(DATASTORE.runAggregation(withLimitBuilder.build())).get(alias);
+    assertThat(countWithLimit).isEqualTo(limit);
+  }
+
+  private void testCountAggregationReadTimeWith(Consumer configurer)
+      throws InterruptedException {
+    Entity entity1 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-01").setNamespace(NAMESPACE).build())
+            .set("name", "Tyrion Lannister")
+            .build();
+    Entity entity2 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-02").setNamespace(NAMESPACE).build())
+            .set("name", "Jaime Lannister")
+            .build();
+    Entity entity3 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-03").setNamespace(NAMESPACE).build())
+            .set("name", "Cersei Lannister")
+            .build();
+
+    DATASTORE.put(entity1, entity2);
+    Thread.sleep(1000);
+    Timestamp now = Timestamp.now();
+    Thread.sleep(1000);
+    DATASTORE.put(entity3);
+
+    try {
+      AggregationQuery.Builder builder = Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+      configurer.accept(builder);
+      AggregationQuery countAggregationQuery = builder.build();
+
+      Long latestCount =
+          getOnlyElement(DATASTORE.runAggregation(countAggregationQuery)).get("total_count");
+      assertThat(latestCount).isEqualTo(3L);
+
+      Long oldCount =
+          getOnlyElement(DATASTORE.runAggregation(countAggregationQuery, ReadOption.readTime(now)))
+              .get("total_count");
+      assertThat(oldCount).isEqualTo(2L);
+    } finally {
+      DATASTORE.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
+    }
+  }
 }

From 76a187a48cdc8d40fa233123894a36e11c590ca9 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 17 Oct 2022 17:37:42 +0200
Subject: [PATCH 0975/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.15 (#879)

---
 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 aab2b917496a..fdaa21a287f3 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.14
+            0.9.15
             true
             
               com.example.datastore.NativeImageDatastoreSample

From ed816e20b605882a9cf2c637145597fdcd95f324 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 17 Oct 2022 17:39:46 +0200
Subject: [PATCH 0976/1784] deps: update dependency org.easymock:easymock to v5
 (#877)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ed672f27660..3324a2f52fcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
       
         org.easymock
         easymock
-        4.3
+        5.0.0
         test
       
     

From 831a92bdc1d3f81fb44ae8d17cad236a50234ea5 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 17 Oct 2022 17:41:54 +0200
Subject: [PATCH 0977/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.15 (#878)

---
 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 fdaa21a287f3..24d9d49f0e99 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.14
+          0.9.15
           test
         
       

From 1f2dec1e7f79768dbb1bd3aacaff27675a9c21f5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 12:15:44 -0400
Subject: [PATCH 0978/1784] chore(main): release 2.12.0 (#874)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  | 15 +++++++++++++++
 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, 42 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3746743edf53..52908cfb928d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.12.0](https://github.com/googleapis/java-datastore/compare/v2.11.5...v2.12.0) (2022-10-17)
+
+
+### Features
+
+* Count API  ([#823](https://github.com/googleapis/java-datastore/issues/823)) ([8c22e61](https://github.com/googleapis/java-datastore/commit/8c22e61f8a0307a59301259f83a16c8324fa1b6f))
+
+
+### Dependencies
+
+* Update dependency com.google.errorprone:error_prone_core to v2.16 ([#872](https://github.com/googleapis/java-datastore/issues/872)) ([b2a72ca](https://github.com/googleapis/java-datastore/commit/b2a72ca407b1fa168c18b136e73932c8716fbdf6))
+* Update dependency org.easymock:easymock to v5 ([#877](https://github.com/googleapis/java-datastore/issues/877)) ([ed816e2](https://github.com/googleapis/java-datastore/commit/ed816e20b605882a9cf2c637145597fdcd95f324))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.15 ([#878](https://github.com/googleapis/java-datastore/issues/878)) ([831a92b](https://github.com/googleapis/java-datastore/commit/831a92bdc1d3f81fb44ae8d17cad236a50234ea5))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.15 ([#879](https://github.com/googleapis/java-datastore/issues/879)) ([76a187a](https://github.com/googleapis/java-datastore/commit/76a187a48cdc8d40fa233123894a36e11c590ca9))
+
 ## [2.11.5](https://github.com/googleapis/java-datastore/compare/v2.11.4...v2.11.5) (2022-10-03)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 028c2d459f8c..36e26b874570 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.11.6-SNAPSHOT
+  2.12.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.6-SNAPSHOT
+    2.12.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 74d2a04e1669..e9c9428a0be5 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.11.6-SNAPSHOT
+  2.12.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.11.6-SNAPSHOT
+        2.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.6-SNAPSHOT
+        2.12.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.6-SNAPSHOT
+        0.103.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.11.6-SNAPSHOT
+        2.12.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 27ca86ab55d9..9a61ffba0a85 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.11.6-SNAPSHOT
+  2.12.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.6-SNAPSHOT
+    2.12.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 b6805ba68438..21ca6f04774e 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.11.6-SNAPSHOT
+  2.12.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.6-SNAPSHOT
+    2.12.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 3324a2f52fcb..e00b22d1f23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.11.6-SNAPSHOT
+  2.12.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.11.6-SNAPSHOT
+        2.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.11.6-SNAPSHOT
+        2.12.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.11.6-SNAPSHOT
+        2.12.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.102.6-SNAPSHOT
+        0.103.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.11.6-SNAPSHOT
+        2.12.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 684d38fdfc1f..2d84b01d68c5 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.11.6-SNAPSHOT
+  2.12.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.6-SNAPSHOT
+    2.12.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 47a2cc7b97fa..9d78b20540c3 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.102.6-SNAPSHOT
+  0.103.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.11.6-SNAPSHOT
+    2.12.0
   
   
     
diff --git a/versions.txt b/versions.txt
index be559a86e0aa..6c14878b5546 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.11.5:2.11.6-SNAPSHOT
-google-cloud-datastore-bom:2.11.5:2.11.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.102.5:0.102.6-SNAPSHOT
-datastore-v1-proto-client:2.11.5:2.11.6-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.11.5:2.11.6-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.11.5:2.11.6-SNAPSHOT
+google-cloud-datastore:2.12.0:2.12.0
+google-cloud-datastore-bom:2.12.0:2.12.0
+proto-google-cloud-datastore-v1:0.103.0:0.103.0
+datastore-v1-proto-client:2.12.0:2.12.0
+proto-google-cloud-datastore-admin-v1:2.12.0:2.12.0
+grpc-google-cloud-datastore-admin-v1:2.12.0:2.12.0

From 44468ee1a941890947e93995db5bf4a04b6359ba Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 16:36:13 +0000
Subject: [PATCH 0979/1784] chore(main): release 2.12.1-SNAPSHOT (#880)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 36e26b874570..4319dff24fc3 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.12.0
+  2.12.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.0
+    2.12.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e9c9428a0be5..67fb29c0793e 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.12.0
+  2.12.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.0
+        2.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.0
+        2.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.0
+        0.103.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.0
+        2.12.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9a61ffba0a85..4947ce8cb147 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.0
+  2.12.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.0
+    2.12.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 21ca6f04774e..7f762a68b79c 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.12.0
+  2.12.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.0
+    2.12.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index e00b22d1f23e..6074c2a63bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.0
+  2.12.1-SNAPSHOT
   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.12.0
+        2.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.0
+        2.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.0
+        2.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.0
+        0.103.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.0
+        2.12.1-SNAPSHOT
         
           
             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 2d84b01d68c5..670d454a724a 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.12.0
+  2.12.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.0
+    2.12.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9d78b20540c3..2c6cfedfa780 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.103.0
+  0.103.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.0
+    2.12.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 6c14878b5546..bb3258d71b69 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.0:2.12.0
-google-cloud-datastore-bom:2.12.0:2.12.0
-proto-google-cloud-datastore-v1:0.103.0:0.103.0
-datastore-v1-proto-client:2.12.0:2.12.0
-proto-google-cloud-datastore-admin-v1:2.12.0:2.12.0
-grpc-google-cloud-datastore-admin-v1:2.12.0:2.12.0
+google-cloud-datastore:2.12.0:2.12.1-SNAPSHOT
+google-cloud-datastore-bom:2.12.0:2.12.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.103.0:0.103.1-SNAPSHOT
+datastore-v1-proto-client:2.12.0:2.12.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.12.0:2.12.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.12.0:2.12.1-SNAPSHOT

From e4f99ce7f8c549edc3eaffec3fba7170ccaee1fa Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 17 Oct 2022 21:28:45 +0200
Subject: [PATCH 0980/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.12.0 (#881)
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.12.0

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index fca5470e0b38..3516bc787013 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.11.5
+  2.12.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.11.5'
+implementation 'com.google.cloud:google-cloud-datastore:2.12.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1fbcaff7736f..e5203d6807bc 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.11.5
+      2.12.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fb1e20988b70..8c0c4d807700 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.11.5
+      2.12.0
     
 
     

From fb45daea8885ed149b33552d239fb76c9542a202 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 16:54:21 -0400
Subject: [PATCH 0981/1784] chore: pin versions of certifi and
 google-resumable-media  (#1660) (#884)

chore: pin versions of certifi and google-resumable-media
Source-Link: https://github.com/googleapis/synthtool/commit/09c4fcd0c6a0a880cf73662e118a8e8019da947c
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml |  2 +-
 .kokoro/requirements.in   |  2 ++
 .kokoro/requirements.txt  | 14 +++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 42327db5e2e3..7649651ccd4b 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3
+  digest: sha256:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index cfdc2e7ed955..6aa7cf2b55ee 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -16,10 +16,12 @@ pycparser==2.21
 pyperclip==1.8.2
 python-dateutil==2.8.2
 requests==2.27.1
+certifi==2022.9.24
 importlib-metadata==4.8.3
 zipp==3.6.0
 google_api_core==2.8.2
 google-cloud-storage==2.0.0
+google-resumable-media==2.3.3
 google-cloud-core==2.3.1
 typing-extensions==4.1.1
 urllib3==1.26.12
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 170f1c63abb7..02ae42bb4039 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -16,10 +16,12 @@ cachetools==4.2.4 \
     # via
     #   -r requirements.in
     #   google-auth
-certifi==2022.9.14 \
-    --hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \
-    --hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516
-    # via requests
+certifi==2022.9.24 \
+    --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
+    --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
+    # via
+    #   -r requirements.in
+    #   requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
     --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \
@@ -218,7 +220,9 @@ google-crc32c==1.3.0 \
 google-resumable-media==2.3.3 \
     --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \
     --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5
-    # via google-cloud-storage
+    # via
+    #   -r requirements.in
+    #   google-cloud-storage
 googleapis-common-protos==1.56.3 \
     --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \
     --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461

From c8b75595e74a33d29d972af8c463cf33c41ac02b Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 19 Oct 2022 22:54:34 +0200
Subject: [PATCH 0982/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.16 (#885)

---
 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 24d9d49f0e99..c3231ffb64c5 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.15
+          0.9.16
           test
         
       

From 76df7eaadf1d27e1669a557039ac790a11c110b3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Wed, 19 Oct 2022 22:54:48 +0200
Subject: [PATCH 0983/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.16 (#886)

---
 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 c3231ffb64c5..e923607217d1 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.15
+            0.9.16
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 1770d70aabff753e760a7d666325d4de649b188f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:16:15 +0000
Subject: [PATCH 0984/1784] chore(main): release 2.12.1 (#888)

:robot: I have created a release *beep* *boop*
---


## [2.12.1](https://togithub.com/googleapis/java-datastore/compare/v2.12.0...v2.12.1) (2022-10-19)


### Dependencies

* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.16 ([#885](https://togithub.com/googleapis/java-datastore/issues/885)) ([c8b7559](https://togithub.com/googleapis/java-datastore/commit/c8b75595e74a33d29d972af8c463cf33c41ac02b))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.16 ([#886](https://togithub.com/googleapis/java-datastore/issues/886)) ([76df7ea](https://togithub.com/googleapis/java-datastore/commit/76df7eaadf1d27e1669a557039ac790a11c110b3))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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, 35 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52908cfb928d..a41b81017e72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.12.1](https://github.com/googleapis/java-datastore/compare/v2.12.0...v2.12.1) (2022-10-19)
+
+
+### Dependencies
+
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.16 ([#885](https://github.com/googleapis/java-datastore/issues/885)) ([c8b7559](https://github.com/googleapis/java-datastore/commit/c8b75595e74a33d29d972af8c463cf33c41ac02b))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.16 ([#886](https://github.com/googleapis/java-datastore/issues/886)) ([76df7ea](https://github.com/googleapis/java-datastore/commit/76df7eaadf1d27e1669a557039ac790a11c110b3))
+
 ## [2.12.0](https://github.com/googleapis/java-datastore/compare/v2.11.5...v2.12.0) (2022-10-17)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4319dff24fc3..3323352b71c8 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.12.1-SNAPSHOT
+  2.12.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1-SNAPSHOT
+    2.12.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 67fb29c0793e..23110518cbdc 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.12.1-SNAPSHOT
+  2.12.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.1-SNAPSHOT
+        2.12.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.1-SNAPSHOT
+        2.12.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.1-SNAPSHOT
+        0.103.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.1-SNAPSHOT
+        2.12.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4947ce8cb147..fe77b68f979b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.1-SNAPSHOT
+  2.12.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1-SNAPSHOT
+    2.12.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 7f762a68b79c..a146c2f658e3 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.12.1-SNAPSHOT
+  2.12.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1-SNAPSHOT
+    2.12.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 6074c2a63bbd..57bea056b1f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.1-SNAPSHOT
+  2.12.1
   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.12.1-SNAPSHOT
+        2.12.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.1-SNAPSHOT
+        2.12.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.1-SNAPSHOT
+        2.12.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.1-SNAPSHOT
+        0.103.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.1-SNAPSHOT
+        2.12.1
         
           
             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 670d454a724a..ee1bcf706e7a 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.12.1-SNAPSHOT
+  2.12.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1-SNAPSHOT
+    2.12.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2c6cfedfa780..4f61599a5d49 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.103.1-SNAPSHOT
+  0.103.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1-SNAPSHOT
+    2.12.1
   
   
     
diff --git a/versions.txt b/versions.txt
index bb3258d71b69..28843a8aad58 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.0:2.12.1-SNAPSHOT
-google-cloud-datastore-bom:2.12.0:2.12.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.103.0:0.103.1-SNAPSHOT
-datastore-v1-proto-client:2.12.0:2.12.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.12.0:2.12.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.12.0:2.12.1-SNAPSHOT
+google-cloud-datastore:2.12.1:2.12.1
+google-cloud-datastore-bom:2.12.1:2.12.1
+proto-google-cloud-datastore-v1:0.103.1:0.103.1
+datastore-v1-proto-client:2.12.1:2.12.1
+proto-google-cloud-datastore-admin-v1:2.12.1:2.12.1
+grpc-google-cloud-datastore-admin-v1:2.12.1:2.12.1

From 6f0ccd6e30277202b2041ac5354e60a39c239d01 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:36:13 +0000
Subject: [PATCH 0985/1784] chore(main): release 2.12.2-SNAPSHOT (#889)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3323352b71c8..2de394949f3d 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.12.1
+  2.12.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1
+    2.12.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 23110518cbdc..2c0d573301c0 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.12.1
+  2.12.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.1
+        2.12.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.1
+        2.12.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.1
+        0.103.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.1
+        2.12.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index fe77b68f979b..1740ddf78702 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.1
+  2.12.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1
+    2.12.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index a146c2f658e3..a3272ca59b1e 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.12.1
+  2.12.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1
+    2.12.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 57bea056b1f1..5158adb54433 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.1
+  2.12.2-SNAPSHOT
   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.12.1
+        2.12.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.1
+        2.12.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.1
+        2.12.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.1
+        0.103.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.1
+        2.12.2-SNAPSHOT
         
           
             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 ee1bcf706e7a..dbc161ae069a 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.12.1
+  2.12.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1
+    2.12.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4f61599a5d49..c9f718cff8c0 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.103.1
+  0.103.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.1
+    2.12.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 28843a8aad58..eeed63e24980 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.1:2.12.1
-google-cloud-datastore-bom:2.12.1:2.12.1
-proto-google-cloud-datastore-v1:0.103.1:0.103.1
-datastore-v1-proto-client:2.12.1:2.12.1
-proto-google-cloud-datastore-admin-v1:2.12.1:2.12.1
-grpc-google-cloud-datastore-admin-v1:2.12.1:2.12.1
+google-cloud-datastore:2.12.1:2.12.2-SNAPSHOT
+google-cloud-datastore-bom:2.12.1:2.12.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.103.1:0.103.2-SNAPSHOT
+datastore-v1-proto-client:2.12.1:2.12.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.12.1:2.12.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.12.1:2.12.2-SNAPSHOT

From 0957af31c1aa09d5a59fb1a9956cec638d7931de Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 20 Oct 2022 16:17:57 +0200
Subject: [PATCH 0986/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.5.4 (#887)

---
 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 2c0d573301c0..19219bcd796a 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.3
+    1.5.4
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 5158adb54433..1014890f1d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.5.3
+    1.5.4
   
 
   

From 0b5fea57f1922379a3a5e4652dca0756cf123c2d Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 20 Oct 2022 16:22:53 +0200
Subject: [PATCH 0987/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.12.1 (#890)
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.12.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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3516bc787013..1e4971f86fc1 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.12.0
+  2.12.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.12.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.12.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.1"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e5203d6807bc..dd883c592d7f 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.12.0
+      2.12.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8c0c4d807700..c00f576d5bba 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.12.0
+      2.12.1
     
 
     

From 1f3217607b491db594cde2e7e767c8e50aa26eb1 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Fri, 21 Oct 2022 16:16:14 +0200
Subject: [PATCH 0988/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.0.5 (#891)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `3.0.4` -> `3.0.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.5/compatibility-slim/3.0.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.5/confidence-slim/3.0.4)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-dependencies

### [`v3.0.5`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​305-httpsgithubcomgoogleapisjava-shared-dependenciescomparev304v305-2022-10-20)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.4...v3.0.5)

##### Dependencies

-   Update dependency com.fasterxml.jackson:jackson-bom to v2.13.4.20221013 ([#​868](https://togithub.com/googleapis/java-shared-dependencies/issues/868)) ([ffa7272](https://togithub.com/googleapis/java-shared-dependencies/commit/ffa7272e6d4775905e64173b3617555ee355019d))
-   Update dependency com.google.auth:google-auth-library-bom to v1.12.0 ([#​870](https://togithub.com/googleapis/java-shared-dependencies/issues/870)) ([6e76f19](https://togithub.com/googleapis/java-shared-dependencies/commit/6e76f19133515b755b78185ce0135943e878a368))
-   Update dependency com.google.auth:google-auth-library-bom to v1.12.1 ([#​871](https://togithub.com/googleapis/java-shared-dependencies/issues/871)) ([f7f5dc2](https://togithub.com/googleapis/java-shared-dependencies/commit/f7f5dc26dd54f33954bdf5d43314020de58e055b))
-   Update dependency com.google.cloud:grpc-gcp to v1.3.0 ([#​867](https://togithub.com/googleapis/java-shared-dependencies/issues/867)) ([1927a92](https://togithub.com/googleapis/java-shared-dependencies/commit/1927a926c615eabbf0e7377c65232e0e5268220e))
-   Update dependency com.google.errorprone:error_prone_annotations to v2.16 ([#​865](https://togithub.com/googleapis/java-shared-dependencies/issues/865)) ([b1734ec](https://togithub.com/googleapis/java-shared-dependencies/commit/b1734ec1c20e7bdf2582b31fde4648aa9f8de2fe))
-   Update dependency com.google.protobuf:protobuf-bom to v3.21.8 ([#​872](https://togithub.com/googleapis/java-shared-dependencies/issues/872)) ([1c303f2](https://togithub.com/googleapis/java-shared-dependencies/commit/1c303f2aa5145da4c93605a2d1088e8a3884de81))
-   Update dependency gcp-releasetool to v1.8.10 ([#​853](https://togithub.com/googleapis/java-shared-dependencies/issues/853)) ([c815a59](https://togithub.com/googleapis/java-shared-dependencies/commit/c815a5996d28676de015d5dd41e2b0405f4bb9dc))
-   Update dependency google-api-core to v2.10.2 ([#​858](https://togithub.com/googleapis/java-shared-dependencies/issues/858)) ([387a156](https://togithub.com/googleapis/java-shared-dependencies/commit/387a15662db0b20e72fe5bf961c02eb2bc4e75d9))
-   Update dependency io.grpc:grpc-bom to v1.50.0 ([#​866](https://togithub.com/googleapis/java-shared-dependencies/issues/866)) ([3d3d443](https://togithub.com/googleapis/java-shared-dependencies/commit/3d3d4434636e605f47082641e8e495bbce8f9515))
-   Update dependency io.grpc:grpc-bom to v1.50.1 ([#​873](https://togithub.com/googleapis/java-shared-dependencies/issues/873)) ([956309d](https://togithub.com/googleapis/java-shared-dependencies/commit/956309d76c9de46885711a77afbfce0d28971096))
-   Update dependency org.checkerframework:checker-qual to v3.26.0 ([#​852](https://togithub.com/googleapis/java-shared-dependencies/issues/852)) ([6926b33](https://togithub.com/googleapis/java-shared-dependencies/commit/6926b33b83d1aa63e0c78b7b8c72cd1d80e28ef3))
-   Update dependency org.threeten:threetenbp to v1.6.3 ([#​869](https://togithub.com/googleapis/java-shared-dependencies/issues/869)) ([fa4999b](https://togithub.com/googleapis/java-shared-dependencies/commit/fa4999b6310940e62456e83dad3ec76a7406a218))
-   Update dependency typing-extensions to v4.4.0 ([#​854](https://togithub.com/googleapis/java-shared-dependencies/issues/854)) ([43bd31b](https://togithub.com/googleapis/java-shared-dependencies/commit/43bd31b66eef50d82ecf8a692053f10eb385d5c1))
-   Update dependency zipp to v3.9.0 ([#​859](https://togithub.com/googleapis/java-shared-dependencies/issues/859)) ([a070ad0](https://togithub.com/googleapis/java-shared-dependencies/commit/a070ad04ef1bab5690487ba13dd4060827851edf))
-   Update gax.version to v2.19.4 ([#​875](https://togithub.com/googleapis/java-shared-dependencies/issues/875)) ([227bdd8](https://togithub.com/googleapis/java-shared-dependencies/commit/227bdd86f368b89309814c615828544c29871a5d))
-   Update google.core.version to v2.8.21 ([#​861](https://togithub.com/googleapis/java-shared-dependencies/issues/861)) ([8b502bd](https://togithub.com/googleapis/java-shared-dependencies/commit/8b502bd43760a2e52cf107567011d9c5132e74bd))
-   Update google.core.version to v2.8.22 ([#​879](https://togithub.com/googleapis/java-shared-dependencies/issues/879)) ([0360e93](https://togithub.com/googleapis/java-shared-dependencies/commit/0360e931dc45034d3c3c554f2c29ad7ea4a0a9bb))
-   Update iam.version to v1.6.3 ([#​857](https://togithub.com/googleapis/java-shared-dependencies/issues/857)) ([b39e683](https://togithub.com/googleapis/java-shared-dependencies/commit/b39e6838c3f3f6ef2b350efe8aec1b622893421a))
-   Update iam.version to v1.6.4 ([#​862](https://togithub.com/googleapis/java-shared-dependencies/issues/862)) ([85c9794](https://togithub.com/googleapis/java-shared-dependencies/commit/85c979401c34454b2d5681eed9d8b3b3679413be))


    

---

### 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 1014890f1d5c..4c0557cbebbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.0.4
+        3.0.5
         pom
         import
       

From 6689f508101a89e67f2b530a40a74b8b36648ffc Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:34:32 +0000
Subject: [PATCH 0989/1784] chore(main): release 2.12.2 (#893)

:robot: I have created a release *beep* *boop*
---


## [2.12.2](https://togithub.com/googleapis/java-datastore/compare/v2.12.1...v2.12.2) (2022-10-21)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 ([#891](https://togithub.com/googleapis/java-datastore/issues/891)) ([1f32176](https://togithub.com/googleapis/java-datastore/commit/1f3217607b491db594cde2e7e767c8e50aa26eb1))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a41b81017e72..d4eefc0e2818 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.12.2](https://github.com/googleapis/java-datastore/compare/v2.12.1...v2.12.2) (2022-10-21)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 ([#891](https://github.com/googleapis/java-datastore/issues/891)) ([1f32176](https://github.com/googleapis/java-datastore/commit/1f3217607b491db594cde2e7e767c8e50aa26eb1))
+
 ## [2.12.1](https://github.com/googleapis/java-datastore/compare/v2.12.0...v2.12.1) (2022-10-19)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2de394949f3d..6384e19b1bb1 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.12.2-SNAPSHOT
+  2.12.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2-SNAPSHOT
+    2.12.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 19219bcd796a..4d887f01f5ca 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.12.2-SNAPSHOT
+  2.12.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.2-SNAPSHOT
+        2.12.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.2-SNAPSHOT
+        2.12.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.2-SNAPSHOT
+        0.103.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.2-SNAPSHOT
+        2.12.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1740ddf78702..cadf38274f55 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.2-SNAPSHOT
+  2.12.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2-SNAPSHOT
+    2.12.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index a3272ca59b1e..ef0630cf5f68 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.12.2-SNAPSHOT
+  2.12.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2-SNAPSHOT
+    2.12.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 4c0557cbebbd..bbd35d1f948e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.2-SNAPSHOT
+  2.12.2
   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.12.2-SNAPSHOT
+        2.12.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.2-SNAPSHOT
+        2.12.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.2-SNAPSHOT
+        2.12.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.2-SNAPSHOT
+        0.103.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.2-SNAPSHOT
+        2.12.2
         
           
             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 dbc161ae069a..e7a54ec7f4c3 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.12.2-SNAPSHOT
+  2.12.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2-SNAPSHOT
+    2.12.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c9f718cff8c0..3fbef4a96c7f 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.103.2-SNAPSHOT
+  0.103.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2-SNAPSHOT
+    2.12.2
   
   
     
diff --git a/versions.txt b/versions.txt
index eeed63e24980..abf449415798 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.1:2.12.2-SNAPSHOT
-google-cloud-datastore-bom:2.12.1:2.12.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.103.1:0.103.2-SNAPSHOT
-datastore-v1-proto-client:2.12.1:2.12.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.12.1:2.12.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.12.1:2.12.2-SNAPSHOT
+google-cloud-datastore:2.12.2:2.12.2
+google-cloud-datastore-bom:2.12.2:2.12.2
+proto-google-cloud-datastore-v1:0.103.2:0.103.2
+datastore-v1-proto-client:2.12.2:2.12.2
+proto-google-cloud-datastore-admin-v1:2.12.2:2.12.2
+grpc-google-cloud-datastore-admin-v1:2.12.2:2.12.2

From e48e7fcb3393896b6efa8d991b6c04d5614c47e6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:52:13 +0000
Subject: [PATCH 0990/1784] chore(main): release 2.12.3-SNAPSHOT (#894)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6384e19b1bb1..d646a57f396d 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.12.2
+  2.12.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2
+    2.12.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4d887f01f5ca..20a386fdd8d7 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.12.2
+  2.12.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.2
+        2.12.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.2
+        2.12.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.2
+        0.103.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.2
+        2.12.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cadf38274f55..7b46e70c102f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.2
+  2.12.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2
+    2.12.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index ef0630cf5f68..885cadb61a04 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.12.2
+  2.12.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2
+    2.12.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index bbd35d1f948e..3c7dd0d83206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.2
+  2.12.3-SNAPSHOT
   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.12.2
+        2.12.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.2
+        2.12.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.2
+        2.12.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.2
+        0.103.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.2
+        2.12.3-SNAPSHOT
         
           
             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 e7a54ec7f4c3..4d96ca4ba943 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.12.2
+  2.12.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2
+    2.12.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3fbef4a96c7f..91566d665b40 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.103.2
+  0.103.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.2
+    2.12.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index abf449415798..f1e200e07082 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.2:2.12.2
-google-cloud-datastore-bom:2.12.2:2.12.2
-proto-google-cloud-datastore-v1:0.103.2:0.103.2
-datastore-v1-proto-client:2.12.2:2.12.2
-proto-google-cloud-datastore-admin-v1:2.12.2:2.12.2
-grpc-google-cloud-datastore-admin-v1:2.12.2:2.12.2
+google-cloud-datastore:2.12.2:2.12.3-SNAPSHOT
+google-cloud-datastore-bom:2.12.2:2.12.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.103.2:0.103.3-SNAPSHOT
+datastore-v1-proto-client:2.12.2:2.12.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.12.2:2.12.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.12.2:2.12.3-SNAPSHOT

From cf9983d5dd5f2982dd659429e478f1ff76055344 Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Fri, 21 Oct 2022 20:24:04 +0530
Subject: [PATCH 0991/1784] samples: Add sample snippets for count aggregations
 (#871)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add method in Datastore client to invoke rpc for aggregation query

* Creating count aggregation and using it to populate Aggregation proto

* Moving aggregation builder method to root level aggregation class

* Introducing RecordQuery to represent queries which returns entity records when executed

* Updating gitignore with patch extension

* Setting up structure of Aggregation query and its builder

* Introducing ProtoPreparer to populate the request protos

* Delegating responsibility of preparing query proto to QueryPreparer

* Populating aggregation query with nested structured query

* Delegating responsibility of preparing query proto in GqlQuery to QueryPreparer

* Removing RecordQuery from the query hierarchy and making it a standalone interface for now

* Populating aggregation query with nested gql query

* Removing deprecation warning by using assertThrows instead of ExpectedException rule

* Making DatastoreRpc call aggregation query method on client

* Creating response transformer to transform aggregation query response into domain objects

* Implementing aggregation query executor to execute AggergationQuery

* Adding missing assertion statements

* Creating RetryExecutor to inject it as a dependency in other components

* Making RetryExecutor accept RetrySettings when creating it

* Revert "Making RetryExecutor accept RetrySettings when creating it"

This reverts commit 1dfafb7f8adcdd4ec566ac6fc712d2233623d33b.

* Revert "Creating RetryExecutor to inject it as a dependency in other components"

This reverts commit 8872a55cd1b1e22643222aa62a17049169dee71f.

* Introducing RetryAndTraceDatastoreRpcDecorator to have retry and traceability logic on top of another DatastoreRpc

* Extracting out the responsibility of preparing ReadOption in it's own ProtoPreparer

* Making QueryExecutor to execute query with provided ReadOptions

* Exposing readTime to the user

* Ignoring runAggregationQuery method from clirr check

* Making readTime final

* Allowing namespace to be optional in AggregationQuery

* Add capability to fetch aggregation result by passing alias

* Implementing User facing datastore.runAggrgation method to run aggregation query

* Add integration test for count aggregation

* Add transaction Id support in ReadOptionsProtoPreparer

* Supporting aggregation query with transactions

* Allowing user to create Aggregation directly without involving its builder

* Preventing creating duplicated aggregation when creating an aggregation query

* Marking RecordQuery implemented method as InternalApi

* Writing comments and JavaDoc for aggregation query related class

* Adding a default implementation in the public interfaces to avoid compile time failures

* covering a scenario to maintain consistent snapshot when executing aggregation query in a transaction

* Creating emulator proxy to simulate AggregationQuery response from emulator

* Integration test to execute an aggregation query in a read only transaction

* Count aggregation samples with structuredQuery and gql query

* Count aggregation samples to demonstrate stale read

* Getting rid off limit operation on count aggregation as same behaviour can be achieved by using 'limit' operation on the underlying query

* Removing import statement from javadoc and undo changes in .gitignore file

* Using Optional instead of returning null from ReadOptionsProtoPreparer

* using assertThat from Truth library

* Removing 'limit' api from count query samples

* fixing unit test

* Getting rid off Double braces initialization syntax

* Fixing lint

* Getting rid off emulator proxy and using easy mock to check the aggregationQuery triggered

* Deleting a entity created locally in other test which is causing failure in other test

* Deleting all keys in datastore in integration test so that new test can start fresh

* Executing two read write transaction simultaneously and verifying their behaviour

* Removing tests to verify serializability as it's an underlying implementation detail

* Fixing lint

* Adding runAggregationQuery method to reflect config so that it's available and accessible in native image through reflection

* Aggregation query samples with limit and order by option

* Aggregation query samples with transactions

* fixing lint and reusing sysoutRule

* correcting region tag

* simplifying tearDown method

* Reverting back to using Task domain for aggregation query samples

* Limiting tearDown method to delete only Task entities

* Splitting count aggregation query samples into individual java files

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Adding missing header

* Sticking to the practise of deleting the old created data in setUp of test

* Moving comment to the top of statement.

Co-authored-by: Sita Lakshmi Sangameswaran 

* Making builder syntax multiline

Co-authored-by: Sita Lakshmi Sangameswaran 

* Adding comment describing the purpose of GQL query

Co-authored-by: Sita Lakshmi Sangameswaran 

* Rephrasing the comment

Co-authored-by: Sita Lakshmi Sangameswaran 

* Adding a comment describing the purpose of the GQL query

Co-authored-by: Sita Lakshmi Sangameswaran 

* Rephrasing the comment

Co-authored-by: Sita Lakshmi Sangameswaran 

* Relocating region tags to include import statments

* Few styling and comment fixes

* Adding comment in the transaction block

* Adding fullstop to the comment lines

* Showcasing with/without alias usage separately

* Importing static methods are we are now including import statements in samples

* 🦉 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 
Co-authored-by: Sita Lakshmi Sangameswaran 
---
 README.md                                     |   7 ++
 .../CountAggregationInTransaction.java        |  85 +++++++++++++++
 .../aggregation/CountAggregationOnKind.java   |  90 ++++++++++++++++
 .../CountAggregationWithGqlQuery.java         |  87 +++++++++++++++
 .../CountAggregationWithLimit.java            |  65 +++++++++++
 .../CountAggregationWithOrderBy.java          |  70 ++++++++++++
 .../CountAggregationWithPropertyFilter.java   |  90 ++++++++++++++++
 .../CountAggregationWithStaleRead.java        |  80 ++++++++++++++
 .../AggregationQuerySampleTestIT.java         | 101 ++++++++++++++++++
 .../example/datastore/QuickstartSampleIT.java |  19 ++--
 .../test/java/com/rule/SystemsOutRule.java    |  53 +++++++++
 11 files changed, 734 insertions(+), 13 deletions(-)
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java
 create mode 100644 samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
 create mode 100644 samples/snippets/src/test/java/com/rule/SystemsOutRule.java

diff --git a/README.md b/README.md
index 1e4971f86fc1..e6b5f5fea634 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,13 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 | --------------------------- | --------------------------------- | ------ |
 | Native Image Datastore Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) |
 | Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
+| Count Aggregation In Transaction | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) |
+| Count Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) |
+| Count Aggregation With Gql Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) |
+| Count Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java) |
+| Count Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) |
+| Count Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) |
+| Count Aggregation With Stale Read | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) |
 | Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
 
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java
new file mode 100644
index 000000000000..ca62e2cabba0
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java
@@ -0,0 +1,85 @@
+/*
+ * 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.example.datastore.aggregation;
+
+// [START datastore_count_aggregation_query_in_transaction]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.Datastore.TransactionCallable;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.common.collect.Iterables;
+
+public class CountAggregationInTransaction {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Task";
+
+    Key task1Key = datastore.newKeyFactory().setKind(kind).newKey("task1");
+    Key task2Key = datastore.newKeyFactory().setKind(kind).newKey("task2");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(task1Key).set("owner", "john").build(),
+        Entity.newBuilder(task2Key).set("owner", "john").build());
+
+    // Using transactions to maintain consistent application state.
+    datastore.runInTransaction(
+        (TransactionCallable)
+            transaction -> {
+              // Create a query to get the count of all tasks of owner 'John'.
+              EntityQuery tasksOfJohn =
+                  Query.newEntityQueryBuilder()
+                      .setKind(kind)
+                      .setFilter(PropertyFilter.eq("owner", "john"))
+                      .build();
+              AggregationQuery totalTasksQuery =
+                  Query.newAggregationQueryBuilder()
+                      .over(tasksOfJohn)
+                      .addAggregation(count().as("tasks_count"))
+                      .build();
+
+              // Executing aggregation query in the ongoing transaction.
+              Long tasksCount =
+                  Iterables.getOnlyElement(transaction.runAggregation(totalTasksQuery))
+                      .get("tasks_count");
+
+              if (tasksCount < 2) {
+                Key newTaskKey = datastore.newKeyFactory().setKind(kind).newKey("task3");
+                Entity newTask = Entity.newBuilder(newTaskKey).set("owner", "john").build();
+                // Inserting a new entity in the transaction.
+                transaction.put(newTask);
+              } else {
+                System.out.printf("Found existing %d tasks, rolling back", tasksCount);
+                throw new Exception("User 'John' cannot have more than 2 tasks");
+              }
+              return null;
+            });
+  }
+}
+// [END datastore_count_aggregation_query_in_transaction]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java
new file mode 100644
index 000000000000..b2673653a50d
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java
@@ -0,0 +1,90 @@
+/*
+ * 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.example.datastore.aggregation;
+
+// [START datastore_count_aggregation_query_on_kind]
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class CountAggregationOnKind {
+  // Instantiates a client.
+  private static final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+  // The kind for the new entity.
+  private static final String kind = "Task";
+
+  // Setting up Tasks in database
+  private static void setUpTasks() {
+    Key task1Key = datastore.newKeyFactory().setKind(kind).newKey("task1");
+    Key task2Key = datastore.newKeyFactory().setKind(kind).newKey("task2");
+    Key task3Key = datastore.newKeyFactory().setKind(kind).newKey("task3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(task1Key).set("done", true).build(),
+        Entity.newBuilder(task2Key).set("done", false).build(),
+        Entity.newBuilder(task3Key).set("done", true).build());
+  }
+
+  // Accessing aggregation result by the generated alias.
+  private static void usageWithGeneratedAlias() {
+    EntityQuery selectAllTasks = Query.newEntityQueryBuilder().setKind(kind).build();
+    // Creating an aggregation query to get the count of all tasks.
+    AggregationQuery allTasksCountQuery =
+        Query.newAggregationQueryBuilder().over(selectAllTasks).addAggregation(count()).build();
+    // Executing aggregation query.
+    AggregationResult aggregationResult =
+        Iterables.getOnlyElement(datastore.runAggregation(allTasksCountQuery));
+
+    System.out.printf(
+        "Total tasks (accessible from default alias) is %d",
+        aggregationResult.get("property_1")); // 3
+  }
+
+  // Accessing aggregation result by the provided custom alias.
+  private static void usageWithCustomAlias() {
+    EntityQuery selectAllTasks = Query.newEntityQueryBuilder().setKind(kind).build();
+    // Creating an aggregation query to get the count of all tasks.
+    AggregationQuery allTasksCountQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllTasks)
+            // passing 'total_count' as alias in the aggregation query.
+            .addAggregation(count().as("total_count"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult aggregationResult =
+        Iterables.getOnlyElement(datastore.runAggregation(allTasksCountQuery));
+
+    System.out.printf("Total tasks count is %d", aggregationResult.get("total_count")); // 3
+  }
+
+  public static void invoke() {
+    setUpTasks();
+    usageWithGeneratedAlias();
+    usageWithCustomAlias();
+  }
+}
+// [END datastore_count_aggregation_query_on_kind]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java
new file mode 100644
index 000000000000..fd2bf8cc4d68
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java
@@ -0,0 +1,87 @@
+/*
+ * 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.example.datastore.aggregation;
+
+// [START datastore_count_aggregation_query_gql]
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.GqlQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class CountAggregationWithGqlQuery {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Task";
+
+    Key task1Key = datastore.newKeyFactory().setKind(kind).newKey("task1");
+    Key task2Key = datastore.newKeyFactory().setKind(kind).newKey("task2");
+    Key task3Key = datastore.newKeyFactory().setKind(kind).newKey("task3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(task1Key).set("done", true).build(),
+        Entity.newBuilder(task2Key).set("done", false).build(),
+        Entity.newBuilder(task3Key).set("done", true).build());
+
+    // Create a GQL query to get the count of all tasks.
+    GqlQuery selectAllTasks =
+        Query.newGqlQueryBuilder(
+                "AGGREGATE COUNT(*) AS total_count, COUNT_UP_TO(2) AS count_with_limit "
+                    + "OVER (SELECT * FROM Task)")
+            .setAllowLiteral(true)
+            .build();
+    // Create the aggregation query builder and set the query.
+    AggregationQuery allTasksCountQuery =
+        Query.newAggregationQueryBuilder().over(selectAllTasks).build();
+    // Executing aggregation query.
+    AggregationResult allTasksCountQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(allTasksCountQuery));
+
+    System.out.printf(
+        "We have at least %d tasks", allTasksCountQueryResult.get("count_with_limit")); // 2
+    System.out.printf("Total tasks count is %d", allTasksCountQueryResult.get("total_count")); // 3
+
+    // Create a query to get the count of all completed tasks.
+    GqlQuery completedTasks =
+        Query.newGqlQueryBuilder(
+                "AGGREGATE COUNT(*) AS total_completed_count "
+                    + "OVER (SELECT * FROM Task WHERE done = true)")
+            .setAllowLiteral(true)
+            .build();
+    // Create the aggregation query builder and set the query.
+    AggregationQuery completedTasksCountQuery =
+        Query.newAggregationQueryBuilder().over(completedTasks).build();
+
+    // Executing aggregation query.
+    AggregationResult completedTasksCountQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(completedTasksCountQuery));
+
+    System.out.printf(
+        "Total completed tasks count is %d",
+        completedTasksCountQueryResult.get("total_completed_count")); // 2
+  }
+}
+// [END datastore_count_aggregation_query_gql]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java
new file mode 100644
index 000000000000..a6a1a4c554a7
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java
@@ -0,0 +1,65 @@
+/*
+ * 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.example.datastore.aggregation;
+
+// [START datastore_count_aggregation_query_with_limit]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class CountAggregationWithLimit {
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Task";
+
+    Key task1Key = datastore.newKeyFactory().setKind(kind).newKey("task1");
+    Key task2Key = datastore.newKeyFactory().setKind(kind).newKey("task2");
+    Key task3Key = datastore.newKeyFactory().setKind(kind).newKey("task3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(task1Key).set("done", true).build(),
+        Entity.newBuilder(task2Key).set("done", false).build(),
+        Entity.newBuilder(task3Key).set("done", true).build());
+
+    EntityQuery selectAllTasks = Query.newEntityQueryBuilder().setKind(kind).setLimit(2).build();
+    // Creating an aggregation query to get the count of all tasks.
+    AggregationQuery allTasksCountQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllTasks)
+            .addAggregation(count().as("at_least"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult limitQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(allTasksCountQuery));
+
+    System.out.printf("We have at least %d tasks", limitQueryResult.get("at_least")); // 2
+  }
+}
+// [END datastore_count_aggregation_query_with_limit]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java
new file mode 100644
index 000000000000..247bbdefe3a4
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java
@@ -0,0 +1,70 @@
+/*
+ * 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.example.datastore.aggregation;
+
+// [START datastore_count_aggregation_query_with_order_by]
+
+import static com.google.cloud.datastore.StructuredQuery.OrderBy.asc;
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class CountAggregationWithOrderBy {
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Task";
+
+    Key task1Key = datastore.newKeyFactory().setKind(kind).newKey("task1");
+    Key task2Key = datastore.newKeyFactory().setKind(kind).newKey("task2");
+    Key task3Key = datastore.newKeyFactory().setKind(kind).newKey("task3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(task1Key).set("done", true).set("priority", 1).build(),
+        // Priority not specified.
+        Entity.newBuilder(task2Key).set("done", false).build(),
+        Entity.newBuilder(task3Key).set("done", true).set("priority", 2).build());
+
+    // OrderBy acts as an existence filter.
+    EntityQuery selectAllTasks =
+        Query.newEntityQueryBuilder().setKind(kind).addOrderBy(asc("priority")).build();
+    // Creating an aggregation query to get the count of all tasks.
+    AggregationQuery allTasksCountQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllTasks)
+            .addAggregation(count().as("count"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult limitQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(allTasksCountQuery));
+
+    System.out.printf(
+        "Total %d tasks found with priority field", limitQueryResult.get("count")); // 2
+  }
+}
+// [END datastore_count_aggregation_query_with_order_by]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java
new file mode 100644
index 000000000000..ecc53b496850
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java
@@ -0,0 +1,90 @@
+/*
+ * 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.example.datastore.aggregation;
+
+// [START datastore_count_aggregation_query_with_filters]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.common.collect.Iterables;
+
+public class CountAggregationWithPropertyFilter {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Task";
+
+    Key task1Key = datastore.newKeyFactory().setKind(kind).newKey("task1");
+    Key task2Key = datastore.newKeyFactory().setKind(kind).newKey("task2");
+    Key task3Key = datastore.newKeyFactory().setKind(kind).newKey("task3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(task1Key).set("done", true).build(),
+        Entity.newBuilder(task2Key).set("done", false).build(),
+        Entity.newBuilder(task3Key).set("done", true).build());
+
+    EntityQuery completedTasks =
+        Query.newEntityQueryBuilder()
+            .setKind(kind)
+            .setFilter(PropertyFilter.eq("done", true))
+            .build();
+    EntityQuery remainingTasks =
+        Query.newEntityQueryBuilder()
+            .setKind(kind)
+            .setFilter(PropertyFilter.eq("done", false))
+            .build();
+    // Creating an aggregation query to get the count of all completed tasks.
+    AggregationQuery completedTasksCountQuery =
+        Query.newAggregationQueryBuilder()
+            .over(completedTasks)
+            .addAggregation(count().as("total_completed_count"))
+            .build();
+    // Creating an aggregation query to get the count of all remaining tasks.
+    AggregationQuery remainingTasksCountQuery =
+        Query.newAggregationQueryBuilder()
+            .over(remainingTasks)
+            .addAggregation(count().as("total_remaining_count"))
+            .build();
+
+    // Executing aggregation query.
+    AggregationResult completedTasksCountQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(completedTasksCountQuery));
+    AggregationResult remainingTasksCountQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(remainingTasksCountQuery));
+
+    System.out.printf(
+        "Total completed tasks count is %d",
+        completedTasksCountQueryResult.get("total_completed_count")); // 2
+    System.out.printf(
+        "Total remaining tasks count is %d",
+        remainingTasksCountQueryResult.get("total_remaining_count")); // 1
+  }
+}
+// [END datastore_count_aggregation_query_with_filters]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java
new file mode 100644
index 000000000000..e46670b986b6
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java
@@ -0,0 +1,80 @@
+/*
+ * 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.example.datastore.aggregation;
+
+// [START datastore_count_aggregation_query_stale_read]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.ReadOption;
+import com.google.common.collect.Iterables;
+
+public class CountAggregationWithStaleRead {
+
+  public static void invoke() throws InterruptedException {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Task";
+
+    Key task1Key = datastore.newKeyFactory().setKind(kind).newKey("task1");
+    Key task2Key = datastore.newKeyFactory().setKind(kind).newKey("task2");
+
+    // Saving only two tasks.
+    datastore.put(
+        Entity.newBuilder(task1Key).set("done", true).build(),
+        Entity.newBuilder(task2Key).set("done", false).build());
+    Thread.sleep(1000);
+    final Timestamp pastTimestamp = Timestamp.now(); // we have two tasks in database at this time.
+
+    Thread.sleep(1000);
+    // Saving third tasks.
+    Key task3Key = datastore.newKeyFactory().setKind(kind).newKey("task3");
+    datastore.put(Entity.newBuilder(task3Key).set("done", false).build());
+
+    EntityQuery selectAllTasks = Query.newEntityQueryBuilder().setKind(kind).build();
+
+    // Creating an aggregation query to get the count of all tasks.
+    AggregationQuery allTasksCountQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllTasks)
+            .addAggregation(count().as("total_count"))
+            .build();
+
+    // Executing aggregation query.
+    AggregationResult tasksCountLatest =
+        Iterables.getOnlyElement(datastore.runAggregation(allTasksCountQuery));
+    System.out.printf("Latest tasks count is %d", tasksCountLatest.get("total_count")); // 3
+
+    // Executing aggregation query with past timestamp.
+    AggregationResult tasksCountInPast =
+        Iterables.getOnlyElement(
+            datastore.runAggregation(allTasksCountQuery, ReadOption.readTime(pastTimestamp)));
+    System.out.printf("Stale tasks count is %d", tasksCountInPast.get("total_count")); // 2
+  }
+}
+// [END datastore_count_aggregation_query_stale_read]
diff --git a/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java b/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
new file mode 100644
index 000000000000..662802e51af4
--- /dev/null
+++ b/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
@@ -0,0 +1,101 @@
+/*
+ * 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.example.datastore;
+
+import static org.junit.Assert.assertThrows;
+
+import com.example.datastore.aggregation.CountAggregationInTransaction;
+import com.example.datastore.aggregation.CountAggregationOnKind;
+import com.example.datastore.aggregation.CountAggregationWithGqlQuery;
+import com.example.datastore.aggregation.CountAggregationWithLimit;
+import com.example.datastore.aggregation.CountAggregationWithOrderBy;
+import com.example.datastore.aggregation.CountAggregationWithPropertyFilter;
+import com.example.datastore.aggregation.CountAggregationWithStaleRead;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.KeyQuery;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.common.collect.ImmutableList;
+import com.rule.SystemsOutRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class AggregationQuerySampleTestIT {
+
+  private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+  @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule();
+
+  @Before
+  public void setUp() throws Exception {
+    // Retrieving and deleting all the 'Task' entities.
+    KeyQuery allKeysQuery = Query.newKeyQueryBuilder().setKind("Task").build();
+    QueryResults allKeys = datastore.run(allKeysQuery);
+    Key[] keysToDelete = ImmutableList.copyOf(allKeys).toArray(new Key[0]);
+    datastore.delete(keysToDelete);
+  }
+
+  @Test
+  public void testAggregationQueryAndCountAggregationSample() {
+    CountAggregationOnKind.invoke();
+    systemsOutRule.assertContains("Total tasks count is 3");
+    systemsOutRule.assertContains("Total tasks (accessible from default alias) is 3");
+  }
+
+  @Test
+  public void testAggregationQueryAndCountAggregationWithLimitSample() {
+    CountAggregationWithLimit.invoke();
+    systemsOutRule.assertContains("We have at least 2 tasks");
+  }
+
+  @Test
+  public void testAggregationQueryAndCountAggregationWithOrderBySample() {
+    CountAggregationWithOrderBy.invoke();
+    systemsOutRule.assertContains("Total 2 tasks found with priority field");
+  }
+
+  @Test
+  public void testAggregationQueryAndCountAggregationWithPropertyFilterSample() {
+    CountAggregationWithPropertyFilter.invoke();
+    systemsOutRule.assertContains("Total completed tasks count is 2");
+    systemsOutRule.assertContains("Total remaining tasks count is 1");
+  }
+
+  @Test
+  public void testAggregationQueryAndCountAggregationSampleWithGqlQuery() {
+    CountAggregationWithGqlQuery.invoke();
+    systemsOutRule.assertContains("We have at least 2 tasks");
+    systemsOutRule.assertContains("Total tasks count is 3");
+    systemsOutRule.assertContains("Total completed tasks count is 2");
+  }
+
+  @Test
+  public void testAggregationQueryAndCountWithStaleRead() throws InterruptedException {
+    CountAggregationWithStaleRead.invoke();
+    systemsOutRule.assertContains("Latest tasks count is 3");
+    systemsOutRule.assertContains("Stale tasks count is 2");
+  }
+
+  @Test
+  public void testAggregationQueryAndCountWithTransaction() throws InterruptedException {
+    assertThrows(Exception.class, CountAggregationInTransaction::invoke);
+    systemsOutRule.assertContains("Found existing 2 tasks, rolling back");
+  }
+}
diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
index 1d46f20a443e..09823479f83c 100644
--- a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
+++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
@@ -16,15 +16,13 @@
 
 package com.example.datastore;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Key;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
+import com.rule.SystemsOutRule;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -33,8 +31,8 @@
 @RunWith(JUnit4.class)
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
 public class QuickstartSampleIT {
-  private ByteArrayOutputStream bout;
-  private PrintStream out;
+
+  @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule();
 
   private static final void deleteTestEntity() {
     Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
@@ -47,10 +45,6 @@ private static final void deleteTestEntity() {
   @Before
   public void setUp() {
     deleteTestEntity();
-
-    bout = new ByteArrayOutputStream();
-    out = new PrintStream(bout);
-    System.setOut(out);
   }
 
   @After
@@ -62,8 +56,7 @@ public void tearDown() {
   @Test
   public void testQuickstart() throws Exception {
     QuickstartSample.main();
-    String got = bout.toString();
-    assertThat(got).contains("Saved sampletask1: Buy milk");
-    assertThat(got).contains("Retrieved sampletask1: Buy milk");
+    systemsOutRule.assertContains("Saved sampletask1: Buy milk");
+    systemsOutRule.assertContains("Retrieved sampletask1: Buy milk");
   }
 }
diff --git a/samples/snippets/src/test/java/com/rule/SystemsOutRule.java b/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
new file mode 100644
index 000000000000..9cdb2744e166
--- /dev/null
+++ b/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
@@ -0,0 +1,53 @@
+/*
+ * 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.rule;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+public class SystemsOutRule implements TestRule {
+  private ByteArrayOutputStream currentOut;
+
+  @Override
+  public Statement apply(Statement statement, Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        // Setting up customized PrintStream
+        final PrintStream originalOut = System.out;
+        currentOut = new ByteArrayOutputStream();
+        System.setOut(new PrintStream(currentOut));
+
+        // Running tests
+        statement.evaluate();
+
+        // Restoring original PrintStream
+        System.setOut(originalOut);
+        currentOut = null;
+      }
+    };
+  }
+
+  public void assertContains(String content) {
+    assertThat(currentOut.toString()).contains(content);
+  }
+}

From 0382c3ddfcf13192e483e371ab470f2dd83607aa Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 24 Oct 2022 18:57:21 +0200
Subject: [PATCH 0992/1784] deps: update dependency org.easymock:easymock to
 v5.0.1 (#896)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: update dependency org.easymock:easymock to v5.0.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 | 4 ++--
 pom.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e6b5f5fea634..a2b026bb6d89 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.12.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.12.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.2"
 ```
 
 ## Authentication
diff --git a/pom.xml b/pom.xml
index 3c7dd0d83206..666c1f936bc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
       
         org.easymock
         easymock
-        5.0.0
+        5.0.1
         test
       
     

From cf15491abc289fd781becad7e8d8e244d20b13b5 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 12:57:37 -0400
Subject: [PATCH 0993/1784] chore: [java] remove flatten plugin dependency
 check (#1663) (#897)

chore: remove check for flatten plugin

We have had the check for the flatten-maven-plugin in each
Cloud Java client repository. However, the behavior of the plugin
has been stable and its not each repository's responsibility to
assert the plugin's behavior. A new check is going to be added at
the googleapis/java-shared-config repository to assert the
plugin's behavior when we upgrade its version.
Source-Link: https://github.com/googleapis/synthtool/commit/9266ddc3b17fc15f34d2fb88ce8c5f1a4bfe64b0
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml |  2 +-
 .kokoro/dependencies.sh   | 51 ---------------------------------------
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 7649651ccd4b..459487d38827 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8
+  digest: sha256:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index d7476cfe9727..bd8960246f66 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -57,54 +57,3 @@ retry_with_backoff 3 10 \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
-
-echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
-## Run dependency list completeness check
-function completenessCheck() {
-  # Output dep list with compile scope generated using the original pom
-  # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
-  # This is stripped from the output as it is not present in the flattened pom.
-  # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
-  msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
-
-  # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
-  msg "Generating dependency list using flattened pom..."
-  mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
-
-  # Compare two dependency lists
-  msg "Comparing dependency lists..."
-  diff .org-list.txt .new-list.txt >.diff.txt
-  if [[ $? == 0 ]]
-    then
-      msg "Success. No diff!"
-  else
-    msg "Diff found. See below: "
-    msg "You can also check .diff.txt file located in $1."
-    cat .diff.txt
-    return 1
-  fi
-}
-
-# Allow failures to continue running the script
-set +e
-
-error_count=0
-for path in **/.flattened-pom.xml
-do
-  # Check flattened pom in each dir that contains it for completeness
-  dir=$(dirname "$path")
-  pushd "$dir"
-  completenessCheck "$dir"
-  error_count=$(($error_count + $?))
-  popd
-done
-
-if [[ $error_count == 0 ]]
-then
-  msg "All checks passed."
-  exit 0
-else
-  msg "Errors found. See log statements above."
-  exit 1
-fi

From 36b09468b96ce09db33df31955724c8000f5ce8c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 24 Oct 2022 18:57:52 +0200
Subject: [PATCH 0994/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.12.2 (#895)
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.12.2

* 🦉 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 a2b026bb6d89..93e5228dba71 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.12.1
+  2.12.2
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index dd883c592d7f..d26ea36f1b3c 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.12.1
+      2.12.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c00f576d5bba..ee9799e83813 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.12.1
+      2.12.2
     
 
     

From da5d62c7f435ef5b8894a4f28499e65ca8b5102c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:18:41 +0000
Subject: [PATCH 0995/1784] chore(main): release 2.12.3 (#898)

:robot: I have created a release *beep* *boop*
---


## [2.12.3](https://togithub.com/googleapis/java-datastore/compare/v2.12.2...v2.12.3) (2022-10-24)


### Dependencies

* Update dependency org.easymock:easymock to v5.0.1 ([#896](https://togithub.com/googleapis/java-datastore/issues/896)) ([0382c3d](https://togithub.com/googleapis/java-datastore/commit/0382c3ddfcf13192e483e371ab470f2dd83607aa))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  2 +-
 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 ++--
 samples/install-without-bom/pom.xml           |  2 +-
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 12 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4eefc0e2818..d9b3bc40cfa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.12.3](https://github.com/googleapis/java-datastore/compare/v2.12.2...v2.12.3) (2022-10-24)
+
+
+### Dependencies
+
+* Update dependency org.easymock:easymock to v5.0.1 ([#896](https://github.com/googleapis/java-datastore/issues/896)) ([0382c3d](https://github.com/googleapis/java-datastore/commit/0382c3ddfcf13192e483e371ab470f2dd83607aa))
+
 ## [2.12.2](https://github.com/googleapis/java-datastore/compare/v2.12.1...v2.12.2) (2022-10-21)
 
 
diff --git a/README.md b/README.md
index 93e5228dba71..a2b026bb6d89 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.12.2
+  2.12.1
 
 
 ```
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d646a57f396d..58ac1e7726d2 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.12.3-SNAPSHOT
+  2.12.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3-SNAPSHOT
+    2.12.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 20a386fdd8d7..7f94e2b5b30a 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.12.3-SNAPSHOT
+  2.12.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.3-SNAPSHOT
+        2.12.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.3-SNAPSHOT
+        2.12.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.3-SNAPSHOT
+        0.103.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.3-SNAPSHOT
+        2.12.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7b46e70c102f..f0d6425ba0fa 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.3-SNAPSHOT
+  2.12.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3-SNAPSHOT
+    2.12.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 885cadb61a04..7f8643198575 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.12.3-SNAPSHOT
+  2.12.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3-SNAPSHOT
+    2.12.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 666c1f936bc3..31656d64c53c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.3-SNAPSHOT
+  2.12.3
   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.12.3-SNAPSHOT
+        2.12.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.3-SNAPSHOT
+        2.12.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.3-SNAPSHOT
+        2.12.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.3-SNAPSHOT
+        0.103.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.3-SNAPSHOT
+        2.12.3
         
           
             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 4d96ca4ba943..a5dce64ad43a 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.12.3-SNAPSHOT
+  2.12.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3-SNAPSHOT
+    2.12.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 91566d665b40..06db222b0e86 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.103.3-SNAPSHOT
+  0.103.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3-SNAPSHOT
+    2.12.3
   
   
     
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d26ea36f1b3c..dd883c592d7f 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.12.2
+      2.12.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ee9799e83813..c00f576d5bba 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.12.2
+      2.12.1
     
 
     
diff --git a/versions.txt b/versions.txt
index f1e200e07082..cd8731ba8cf2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.2:2.12.3-SNAPSHOT
-google-cloud-datastore-bom:2.12.2:2.12.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.103.2:0.103.3-SNAPSHOT
-datastore-v1-proto-client:2.12.2:2.12.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.12.2:2.12.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.12.2:2.12.3-SNAPSHOT
+google-cloud-datastore:2.12.3:2.12.3
+google-cloud-datastore-bom:2.12.3:2.12.3
+proto-google-cloud-datastore-v1:0.103.3:0.103.3
+datastore-v1-proto-client:2.12.3:2.12.3
+proto-google-cloud-datastore-admin-v1:2.12.3:2.12.3
+grpc-google-cloud-datastore-admin-v1:2.12.3:2.12.3

From 913d0e029eb46f18b85f9b38fda6ae3dba8417cd Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:36:16 +0000
Subject: [PATCH 0996/1784] chore(main): release 2.12.4-SNAPSHOT (#899)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 58ac1e7726d2..881e7b641938 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.12.3
+  2.12.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3
+    2.12.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7f94e2b5b30a..bea66d916b05 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.12.3
+  2.12.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.3
+        2.12.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.3
+        2.12.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.3
+        0.103.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.3
+        2.12.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f0d6425ba0fa..4c01a4e7f767 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.3
+  2.12.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3
+    2.12.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 7f8643198575..d611d8051924 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.12.3
+  2.12.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3
+    2.12.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 31656d64c53c..cc31f236024b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.3
+  2.12.4-SNAPSHOT
   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.12.3
+        2.12.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.3
+        2.12.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.3
+        2.12.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.3
+        0.103.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.3
+        2.12.4-SNAPSHOT
         
           
             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 a5dce64ad43a..c4da43f992d2 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.12.3
+  2.12.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3
+    2.12.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 06db222b0e86..f62df5793890 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.103.3
+  0.103.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.3
+    2.12.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index cd8731ba8cf2..295d9e6b6f57 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.3:2.12.3
-google-cloud-datastore-bom:2.12.3:2.12.3
-proto-google-cloud-datastore-v1:0.103.3:0.103.3
-datastore-v1-proto-client:2.12.3:2.12.3
-proto-google-cloud-datastore-admin-v1:2.12.3:2.12.3
-grpc-google-cloud-datastore-admin-v1:2.12.3:2.12.3
+google-cloud-datastore:2.12.3:2.12.4-SNAPSHOT
+google-cloud-datastore-bom:2.12.3:2.12.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.103.3:0.103.4-SNAPSHOT
+datastore-v1-proto-client:2.12.3:2.12.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.12.3:2.12.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.12.3:2.12.4-SNAPSHOT

From a45940880d18218f58dc68252a9730e63139093a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 24 Oct 2022 23:08:21 +0200
Subject: [PATCH 0997/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.12.3 (#900)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.12.1` -> `2.12.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.12.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.12.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.12.3/compatibility-slim/2.12.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.12.3/confidence-slim/2.12.1)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.12.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​2123-httpsgithubcomgoogleapisjava-datastorecomparev2122v2123-2022-10-24)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.12.2...v2.12.3)

##### Dependencies

-   Update dependency org.easymock:easymock to v5.0.1 ([#​896](https://togithub.com/googleapis/java-datastore/issues/896)) ([0382c3d](https://togithub.com/googleapis/java-datastore/commit/0382c3ddfcf13192e483e371ab470f2dd83607aa))

### [`v2.12.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​2122-httpsgithubcomgoogleapisjava-datastorecomparev2121v2122-2022-10-21)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.12.1...v2.12.2)

##### Dependencies

-   Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 ([#​891](https://togithub.com/googleapis/java-datastore/issues/891)) ([1f32176](https://togithub.com/googleapis/java-datastore/commit/1f3217607b491db594cde2e7e767c8e50aa26eb1))


    

---

### 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).

---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a2b026bb6d89..0cc472e81a30 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.12.1
+  2.12.3
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.12.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.12.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.3"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index dd883c592d7f..218386b7d02f 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.12.1
+      2.12.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c00f576d5bba..8932b2941ada 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.12.1
+      2.12.3
     
 
     

From 921496776a58a4e8cd19d2390fbf9d2242b43f06 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 15:40:44 +0000
Subject: [PATCH 0998/1784] chore(deps): update dependency protobuf to v3.20.2
 (#1659) (#901)

Co-authored-by: Jeffrey Rennie 
Co-authored-by: Tomo Suzuki 
Source-Link: https://togithub.com/googleapis/synthtool/commit/b59cf7b5a91ecab29e21fdfbb7e3b81066229be4
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:894d56f45fc3f4f0d5f3bcf790846419ee2d8e44715eae8917d6a1bba2b7283d
---
 .github/.OwlBot.lock.yaml |  2 +-
 .kokoro/requirements.txt  | 50 ++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 459487d38827..82b5a1a2e2e1 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa
+  digest: sha256:894d56f45fc3f4f0d5f3bcf790846419ee2d8e44715eae8917d6a1bba2b7283d
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 02ae42bb4039..4a16dfadf82a 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -339,33 +339,29 @@ packaging==21.3 \
     # via
     #   -r requirements.in
     #   gcp-releasetool
-protobuf==3.19.5 \
-    --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \
-    --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \
-    --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \
-    --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \
-    --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \
-    --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \
-    --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \
-    --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \
-    --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \
-    --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \
-    --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \
-    --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \
-    --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \
-    --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \
-    --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \
-    --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \
-    --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \
-    --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \
-    --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \
-    --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \
-    --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \
-    --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \
-    --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \
-    --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \
-    --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \
-    --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de
+protobuf==3.20.2 \
+    --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \
+    --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \
+    --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \
+    --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \
+    --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \
+    --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \
+    --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \
+    --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \
+    --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \
+    --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \
+    --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \
+    --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \
+    --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \
+    --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \
+    --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \
+    --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \
+    --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \
+    --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \
+    --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \
+    --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \
+    --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \
+    --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0
     # via
     #   -r requirements.in
     #   gcp-docuploader

From 1402eb13b05d26eb41c7571aeeafa859a722b657 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 31 Oct 2022 10:34:00 -0400
Subject: [PATCH 0999/1784] Revert "chore(deps): update dependency protobuf to
 v3.20.2" (#1674) (#902)

Revert "chore(deps): update dependency protobuf to v3.20.2 (#1659)"

This reverts commit b59cf7b5a91ecab29e21fdfbb7e3b81066229be4.
Source-Link: https://github.com/googleapis/synthtool/commit/a66e34625d760ad299627f6613a1bd438c1b62a9
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:bd316b9a591c45264775ecaba72e37d65905925c323b68e51a08c4126e4b6d0a

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml |  2 +-
 .kokoro/requirements.txt  | 50 +++++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 82b5a1a2e2e1..cb4ea018ec23 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:894d56f45fc3f4f0d5f3bcf790846419ee2d8e44715eae8917d6a1bba2b7283d
+  digest: sha256:bd316b9a591c45264775ecaba72e37d65905925c323b68e51a08c4126e4b6d0a
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 4a16dfadf82a..02ae42bb4039 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -339,29 +339,33 @@ packaging==21.3 \
     # via
     #   -r requirements.in
     #   gcp-releasetool
-protobuf==3.20.2 \
-    --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \
-    --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \
-    --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \
-    --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \
-    --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \
-    --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \
-    --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \
-    --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \
-    --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \
-    --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \
-    --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \
-    --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \
-    --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \
-    --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \
-    --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \
-    --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \
-    --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \
-    --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \
-    --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \
-    --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \
-    --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \
-    --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0
+protobuf==3.19.5 \
+    --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \
+    --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \
+    --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \
+    --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \
+    --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \
+    --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \
+    --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \
+    --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \
+    --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \
+    --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \
+    --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \
+    --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \
+    --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \
+    --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \
+    --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \
+    --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \
+    --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \
+    --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \
+    --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \
+    --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \
+    --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \
+    --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \
+    --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \
+    --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \
+    --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \
+    --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de
     # via
     #   -r requirements.in
     #   gcp-docuploader

From 141d68bee345f449f111126e1238f10bb11b30a0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Tue, 1 Nov 2022 18:33:05 +0100
Subject: [PATCH 1000/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.1.4 (#903)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.1.4

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0cc472e81a30..79d0d0170174 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.1.3
+      26.1.4
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.3')
+implementation platform('com.google.cloud:libraries-bom:26.1.4')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index e923607217d1..775bac4bd09e 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.3
+        26.1.4
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 995c8800b038..c8d008cfdd6e 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.3
+        26.1.4
         pom
         import
       

From eb1e714943061858e230587f6874c0d149dde233 Mon Sep 17 00:00:00 2001
From: Juan Lara 
Date: Thu, 3 Nov 2022 05:55:00 +0000
Subject: [PATCH 1001/1784] samples: Add example snippet for snapshot reads
 (#809)

* Add sample snippet for snapshot reads

* Fix linting error

* Change readtime to 15 seconds ago. Incorporate feedback.
---
 .../datastore/snippets/ConceptsTest.java      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index b22efc6fb34e..4013dbe04fda 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -1145,4 +1145,31 @@ public void testInQuerySorted() {
     // [END datastore_in_query_sorted]
     assertValidQueryRealBackend(query);
   }
+
+  @Test
+  public void testStaleReads() {
+    setUpQueryTestsRealBackend();
+    Datastore datastoreClient = datastoreRealBackend;
+    // [START datastore_stale_read]
+    Key taskKey =
+        datastoreClient
+            .newKeyFactory()
+            .setKind("Task")
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .newKey("someTask");
+
+    Timestamp fifteenSecondsAgo =
+        Timestamp.ofTimeSecondsAndNanos(Timestamp.now().getSeconds() - 15L, 0);
+    // Create a readOption with read time fifteenSecondsAgo
+    ReadOption readOption = ReadOption.readTime(fifteenSecondsAgo);
+    // Use the readOption to Fetch entity
+    Entity entity = datastoreClient.get(taskKey, readOption);
+
+    // Use the readOption to Query kind Task
+    Query query = Query.newEntityQueryBuilder().setKind("Task").setLimit(10).build();
+    QueryResults results = datastoreClient.run(query, readOption);
+    Entity result = results.next();
+    // [END datastore_stale_read]
+    assertValidQueryRealBackend(query);
+  }
 }

From 05aa0b1062993fb848e572eaceae3b717263e863 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 3 Nov 2022 13:31:59 -0400
Subject: [PATCH 1002/1784] chore: Set `rest_numeric_enums = False` for all
 gapic rules explicitly (#904)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Set `rest_numeric_enums = False` for all gapic rules explicitly

PiperOrigin-RevId: 485623855

Source-Link: https://github.com/googleapis/googleapis/commit/807125e7953e32535710924fe4bf0362ac93754d

Source-Link: https://github.com/googleapis/googleapis-gen/commit/c4ddd6d651da69658a4762c5eafff5cd8f0e25c5
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzRkZGQ2ZDY1MWRhNjk2NThhNDc2MmM1ZWFmZmY1Y2Q4ZjBlMjVjNSJ9

* 🦉 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 
---
 .../cloud/datastore/admin/v1/DatastoreAdminClient.java       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 30669e3382a0..ce6c39face4e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -192,10 +192,7 @@
  * // - It may require specifying regional endpoints when creating the service client as shown in
  * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * DatastoreAdminSettings datastoreAdminSettings =
- *     DatastoreAdminSettings.newBuilder()
- *         .setTransportChannelProvider(
- *             DatastoreAdminSettings.defaultHttpJsonTransportProviderBuilder().build())
- *         .build();
+ *     DatastoreAdminSettings.newHttpJsonBuilder().build();
  * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings);
  * }
  *

From 6f8a5184c04e9499c02e5589d73fc492bc980213 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 7 Nov 2022 15:32:32 +0100
Subject: [PATCH 1003/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.17 (#907)

---
 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 775bac4bd09e..9469b3bc3a1d 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.16
+            0.9.17
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 294e6a86ff653d6f3f77369f408c970c4a236f96 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 7 Nov 2022 15:36:16 +0100
Subject: [PATCH 1004/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.17 (#906)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.16` -> `0.9.17` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/compatibility-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/confidence-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.17`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.17)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17)

#### What's Changed

Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog).

-   Make GraalVM installation check lazy by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/345](https://togithub.com/graalvm/native-build-tools/pull/345)
-   Add a check for the minimal GraalVM version by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/353](https://togithub.com/graalvm/native-build-tools/pull/353)
-   Bump metadata repo version to 0.2.4 by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/356](https://togithub.com/graalvm/native-build-tools/pull/356)

**Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17


    

---

### 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, check this box

---

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 9469b3bc3a1d..b9f22b24e143 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.16
+          0.9.17
           test
         
           

From 02699cf04f0ad3d0b747f9490696c3a955dd7cfa Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 14:54:15 +0000
Subject: [PATCH 1005/1784] chore(main): release 2.12.4 (#908)

:robot: I have created a release *beep* *boop*
---


## [2.12.4](https://togithub.com/googleapis/java-datastore/compare/v2.12.3...v2.12.4) (2022-11-07)


### Dependencies

* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.17 ([#906](https://togithub.com/googleapis/java-datastore/issues/906)) ([294e6a8](https://togithub.com/googleapis/java-datastore/commit/294e6a86ff653d6f3f77369f408c970c4a236f96))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.17 ([#907](https://togithub.com/googleapis/java-datastore/issues/907)) ([6f8a518](https://togithub.com/googleapis/java-datastore/commit/6f8a5184c04e9499c02e5589d73fc492bc980213))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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, 35 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9b3bc40cfa6..1bbdd25233d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.12.4](https://github.com/googleapis/java-datastore/compare/v2.12.3...v2.12.4) (2022-11-07)
+
+
+### Dependencies
+
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.17 ([#906](https://github.com/googleapis/java-datastore/issues/906)) ([294e6a8](https://github.com/googleapis/java-datastore/commit/294e6a86ff653d6f3f77369f408c970c4a236f96))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.17 ([#907](https://github.com/googleapis/java-datastore/issues/907)) ([6f8a518](https://github.com/googleapis/java-datastore/commit/6f8a5184c04e9499c02e5589d73fc492bc980213))
+
 ## [2.12.3](https://github.com/googleapis/java-datastore/compare/v2.12.2...v2.12.3) (2022-10-24)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 881e7b641938..30a138cc34fe 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.12.4-SNAPSHOT
+  2.12.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4-SNAPSHOT
+    2.12.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index bea66d916b05..ee7e1a56c89e 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.12.4-SNAPSHOT
+  2.12.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.4-SNAPSHOT
+        2.12.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.4-SNAPSHOT
+        2.12.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.4-SNAPSHOT
+        0.103.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.4-SNAPSHOT
+        2.12.4
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4c01a4e7f767..537a0214c939 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.4-SNAPSHOT
+  2.12.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4-SNAPSHOT
+    2.12.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d611d8051924..5b1a25205f7d 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.12.4-SNAPSHOT
+  2.12.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4-SNAPSHOT
+    2.12.4
   
   
     
diff --git a/pom.xml b/pom.xml
index cc31f236024b..cf3c16146641 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.4-SNAPSHOT
+  2.12.4
   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.12.4-SNAPSHOT
+        2.12.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.4-SNAPSHOT
+        2.12.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.4-SNAPSHOT
+        2.12.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.4-SNAPSHOT
+        0.103.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.4-SNAPSHOT
+        2.12.4
         
           
             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 c4da43f992d2..29d3514534aa 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.12.4-SNAPSHOT
+  2.12.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4-SNAPSHOT
+    2.12.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f62df5793890..f4ef6c20e7a4 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.103.4-SNAPSHOT
+  0.103.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4-SNAPSHOT
+    2.12.4
   
   
     
diff --git a/versions.txt b/versions.txt
index 295d9e6b6f57..22f2d207b727 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.3:2.12.4-SNAPSHOT
-google-cloud-datastore-bom:2.12.3:2.12.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.103.3:0.103.4-SNAPSHOT
-datastore-v1-proto-client:2.12.3:2.12.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.12.3:2.12.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.12.3:2.12.4-SNAPSHOT
+google-cloud-datastore:2.12.4:2.12.4
+google-cloud-datastore-bom:2.12.4:2.12.4
+proto-google-cloud-datastore-v1:0.103.4:0.103.4
+datastore-v1-proto-client:2.12.4:2.12.4
+proto-google-cloud-datastore-admin-v1:2.12.4:2.12.4
+grpc-google-cloud-datastore-admin-v1:2.12.4:2.12.4

From 1eb1e38c25656a301cee3efe43300824176863f1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:12:15 +0000
Subject: [PATCH 1006/1784] chore(main): release 2.12.5-SNAPSHOT (#909)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 30a138cc34fe..487631f8c76b 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.12.4
+  2.12.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4
+    2.12.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ee7e1a56c89e..387fb1bd2400 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.12.4
+  2.12.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.4
+        2.12.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.4
+        2.12.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.4
+        0.103.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.4
+        2.12.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 537a0214c939..551ea8f07afc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.4
+  2.12.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4
+    2.12.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 5b1a25205f7d..201bff7c7bcd 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.12.4
+  2.12.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4
+    2.12.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index cf3c16146641..e1aad132255a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.4
+  2.12.5-SNAPSHOT
   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.12.4
+        2.12.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.4
+        2.12.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.4
+        2.12.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.4
+        0.103.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.4
+        2.12.5-SNAPSHOT
         
           
             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 29d3514534aa..0374789ad752 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.12.4
+  2.12.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4
+    2.12.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f4ef6c20e7a4..d424439ef905 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.103.4
+  0.103.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.4
+    2.12.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 22f2d207b727..bb66e01029a3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.4:2.12.4
-google-cloud-datastore-bom:2.12.4:2.12.4
-proto-google-cloud-datastore-v1:0.103.4:0.103.4
-datastore-v1-proto-client:2.12.4:2.12.4
-proto-google-cloud-datastore-admin-v1:2.12.4:2.12.4
-grpc-google-cloud-datastore-admin-v1:2.12.4:2.12.4
+google-cloud-datastore:2.12.4:2.12.5-SNAPSHOT
+google-cloud-datastore-bom:2.12.4:2.12.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.103.4:0.103.5-SNAPSHOT
+datastore-v1-proto-client:2.12.4:2.12.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.12.4:2.12.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.12.4:2.12.5-SNAPSHOT

From 896823a3e8ffda8ca94d98e051427675c23bd96d Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 13:58:56 -0500
Subject: [PATCH 1007/1784] chore(java): update dependencies in java
 requirements file (#1695) (#910)

* chore(java): update gcp-releasetool and cryptography in java requirements file
Source-Link: https://github.com/googleapis/synthtool/commit/74d0956884c1bb9dc901b52de35ca2bca025a74e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml |  2 +-
 .kokoro/requirements.in   |  7 ++--
 .kokoro/requirements.txt  | 75 ++++++++++++++++++++-------------------
 README.md                 |  4 +--
 4 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index cb4ea018ec23..c8316751ebd3 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:bd316b9a591c45264775ecaba72e37d65905925c323b68e51a08c4126e4b6d0a
+  digest: sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index 6aa7cf2b55ee..9cc4a1baae11 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -1,7 +1,8 @@
-gcp-docuploader==0.6.3
+gcp-docuploader==0.6.4
 google-crc32c==1.3.0
 googleapis-common-protos==1.56.3
-gcp-releasetool==1.8.7
+gcp-releasetool==1.9.1
+cryptography==38.0.3
 cachetools==4.2.4
 cffi==1.15.1
 jeepney==0.7.1
@@ -29,5 +30,5 @@ zipp==3.6.0
 rsa==4.9
 six==1.16.0
 attrs==22.1.0
-google-auth==2.11.0
+google-auth==2.14.0
 idna==3.4
\ No newline at end of file
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 02ae42bb4039..2dce197bf45a 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    pip-compile --allow-unsafe --generate-hashes requirements.in
+#    pip-compile --generate-hashes requirements.in
 #
 attrs==22.1.0 \
     --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
@@ -104,43 +104,44 @@ colorlog==6.7.0 \
     --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
     --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
     # via gcp-docuploader
-cryptography==38.0.1 \
-    --hash=sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a \
-    --hash=sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f \
-    --hash=sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0 \
-    --hash=sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 \
-    --hash=sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7 \
-    --hash=sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6 \
-    --hash=sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153 \
-    --hash=sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750 \
-    --hash=sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad \
-    --hash=sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6 \
-    --hash=sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b \
-    --hash=sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5 \
-    --hash=sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a \
-    --hash=sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d \
-    --hash=sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d \
-    --hash=sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294 \
-    --hash=sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0 \
-    --hash=sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a \
-    --hash=sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac \
-    --hash=sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61 \
-    --hash=sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013 \
-    --hash=sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e \
-    --hash=sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb \
-    --hash=sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9 \
-    --hash=sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd \
-    --hash=sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818
+cryptography==38.0.3 \
+    --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \
+    --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \
+    --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \
+    --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \
+    --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \
+    --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \
+    --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \
+    --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \
+    --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \
+    --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \
+    --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \
+    --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \
+    --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \
+    --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \
+    --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \
+    --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \
+    --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \
+    --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \
+    --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \
+    --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \
+    --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \
+    --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \
+    --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \
+    --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \
+    --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \
+    --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722
     # via
+    #   -r requirements.in
     #   gcp-releasetool
     #   secretstorage
-gcp-docuploader==0.6.3 \
-    --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \
-    --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b
+gcp-docuploader==0.6.4 \
+    --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \
+    --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf
     # via -r requirements.in
-gcp-releasetool==1.8.7 \
-    --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \
-    --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d
+gcp-releasetool==1.9.1 \
+    --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \
+    --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b
     # via -r requirements.in
 google-api-core==2.8.2 \
     --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
@@ -149,9 +150,9 @@ google-api-core==2.8.2 \
     #   -r requirements.in
     #   google-cloud-core
     #   google-cloud-storage
-google-auth==2.11.0 \
-    --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \
-    --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb
+google-auth==2.14.0 \
+    --hash=sha256:1ad5b0e6eba5f69645971abb3d2c197537d5914070a8c6d30299dfdb07c5c700 \
+    --hash=sha256:cf24817855d874ede2efd071aa22125445f555de1685b739a9782fcf408c2a3d
     # via
     #   -r requirements.in
     #   gcp-releasetool
diff --git a/README.md b/README.md
index 79d0d0170174..4beb2ed6ce07 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.12.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.12.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.4"
 ```
 
 ## Authentication

From 5e57e57b954cde3ce349bcfb6bf7a10dc61c6c3e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 7 Nov 2022 19:59:12 +0100
Subject: [PATCH 1008/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.12.4 (#911)
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.12.4

* 🦉 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 4beb2ed6ce07..5d4d7fe16309 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.12.3
+  2.12.4
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 218386b7d02f..00ce6c9651b7 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.12.3
+      2.12.4
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8932b2941ada..4834370115c7 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.12.3
+      2.12.4
     
 
     

From 360c7909a673bbd180e69e31ad830376be11ecf4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 8 Nov 2022 16:40:21 +0100
Subject: [PATCH 1009/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.0.6 (#912)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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) | `3.0.5` -> `3.0.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/compatibility-slim/3.0.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/confidence-slim/3.0.5)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

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 e1aad132255a..05045156afb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.0.5
+        3.0.6
         pom
         import
       

From 5560164af49348c95fe5a512b2713997db2334f5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 15:58:17 +0000
Subject: [PATCH 1010/1784] chore(main): release 2.12.5 (#913)

:robot: I have created a release *beep* *boop*
---


## [2.12.5](https://togithub.com/googleapis/java-datastore/compare/v2.12.4...v2.12.5) (2022-11-08)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.6 ([#912](https://togithub.com/googleapis/java-datastore/issues/912)) ([360c790](https://togithub.com/googleapis/java-datastore/commit/360c7909a673bbd180e69e31ad830376be11ecf4))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bbdd25233d4..bf663540a064 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.12.5](https://github.com/googleapis/java-datastore/compare/v2.12.4...v2.12.5) (2022-11-08)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.6 ([#912](https://github.com/googleapis/java-datastore/issues/912)) ([360c790](https://github.com/googleapis/java-datastore/commit/360c7909a673bbd180e69e31ad830376be11ecf4))
+
 ## [2.12.4](https://github.com/googleapis/java-datastore/compare/v2.12.3...v2.12.4) (2022-11-07)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 487631f8c76b..f909616f5f16 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.12.5-SNAPSHOT
+  2.12.5
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5-SNAPSHOT
+    2.12.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 387fb1bd2400..b6292bc92cf7 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.12.5-SNAPSHOT
+  2.12.5
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.5-SNAPSHOT
+        2.12.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.5-SNAPSHOT
+        2.12.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.5-SNAPSHOT
+        0.103.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.5-SNAPSHOT
+        2.12.5
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 551ea8f07afc..14c618faaa21 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.5-SNAPSHOT
+  2.12.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5-SNAPSHOT
+    2.12.5
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 201bff7c7bcd..bb0cd8a3e312 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.12.5-SNAPSHOT
+  2.12.5
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5-SNAPSHOT
+    2.12.5
   
   
     
diff --git a/pom.xml b/pom.xml
index 05045156afb4..47f172d039b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.5-SNAPSHOT
+  2.12.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.5-SNAPSHOT
+        2.12.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.5-SNAPSHOT
+        2.12.5
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.5-SNAPSHOT
+        2.12.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.5-SNAPSHOT
+        0.103.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.5-SNAPSHOT
+        2.12.5
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index 0374789ad752..a1946f6ec210 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.12.5-SNAPSHOT
+  2.12.5
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5-SNAPSHOT
+    2.12.5
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d424439ef905..4e16e09abf50 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.103.5-SNAPSHOT
+  0.103.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5-SNAPSHOT
+    2.12.5
   
   
     
diff --git a/versions.txt b/versions.txt
index bb66e01029a3..891b0a35e1c7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.4:2.12.5-SNAPSHOT
-google-cloud-datastore-bom:2.12.4:2.12.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.103.4:0.103.5-SNAPSHOT
-datastore-v1-proto-client:2.12.4:2.12.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.12.4:2.12.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.12.4:2.12.5-SNAPSHOT
+google-cloud-datastore:2.12.5:2.12.5
+google-cloud-datastore-bom:2.12.5:2.12.5
+proto-google-cloud-datastore-v1:0.103.5:0.103.5
+datastore-v1-proto-client:2.12.5:2.12.5
+proto-google-cloud-datastore-admin-v1:2.12.5:2.12.5
+grpc-google-cloud-datastore-admin-v1:2.12.5:2.12.5

From a99552f9d26be67376a2a9bcaa0c66c6474ac549 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:20:23 +0000
Subject: [PATCH 1011/1784] chore(main): release 2.12.6-SNAPSHOT (#914)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f909616f5f16..6de9a5cee312 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.12.5
+  2.12.6-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5
+    2.12.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b6292bc92cf7..6e3ee3b74011 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.12.5
+  2.12.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.5
+        2.12.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.5
+        2.12.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.5
+        0.103.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.5
+        2.12.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 14c618faaa21..7ee7ce004ad2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.5
+  2.12.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5
+    2.12.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index bb0cd8a3e312..b50659d89040 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.12.5
+  2.12.6-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5
+    2.12.6-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 47f172d039b4..d73c2dc8e4df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.5
+  2.12.6-SNAPSHOT
   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.12.5
+        2.12.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.5
+        2.12.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.5
+        2.12.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.5
+        0.103.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.5
+        2.12.6-SNAPSHOT
         
           
             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 a1946f6ec210..46be69fa1e69 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.12.5
+  2.12.6-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5
+    2.12.6-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4e16e09abf50..62b641087896 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.103.5
+  0.103.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.5
+    2.12.6-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 891b0a35e1c7..e809433990dd 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.5:2.12.5
-google-cloud-datastore-bom:2.12.5:2.12.5
-proto-google-cloud-datastore-v1:0.103.5:0.103.5
-datastore-v1-proto-client:2.12.5:2.12.5
-proto-google-cloud-datastore-admin-v1:2.12.5:2.12.5
-grpc-google-cloud-datastore-admin-v1:2.12.5:2.12.5
+google-cloud-datastore:2.12.5:2.12.6-SNAPSHOT
+google-cloud-datastore-bom:2.12.5:2.12.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.103.5:0.103.6-SNAPSHOT
+datastore-v1-proto-client:2.12.5:2.12.6-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.12.5:2.12.6-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.12.5:2.12.6-SNAPSHOT

From d69950969568a3522709c6776254bee6b67fc724 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 9 Nov 2022 06:17:31 +0100
Subject: [PATCH 1012/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.12.5 (#915)
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.12.5

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5d4d7fe16309..5a73d850d7f0 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.12.4
+  2.12.5
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.12.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.12.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.5"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 00ce6c9651b7..d63fc5ae8834 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.12.4
+      2.12.5
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4834370115c7..0a0f05b0ed32 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.12.4
+      2.12.5
     
 
     

From dde29e50b9b7ee50ea3c886a156358d2de35c057 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 9 Nov 2022 13:40:50 -0500
Subject: [PATCH 1013/1784] chore: update google-auth to 2.14.1 (#1703) (#919)

Co-authored-by: Anthonios Partheniou 
Source-Link: https://github.com/googleapis/synthtool/commit/9457e69470097f8e71b6b497ceece5bc423eaf3a
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a

Co-authored-by: Owl Bot 
Co-authored-by: Anthonios Partheniou 
---
 .github/.OwlBot.lock.yaml | 2 +-
 .kokoro/requirements.in   | 2 +-
 .kokoro/requirements.txt  | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index c8316751ebd3..676aaea0c74d 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0
+  digest: sha256:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index 9cc4a1baae11..ae1d92e68084 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -30,5 +30,5 @@ zipp==3.6.0
 rsa==4.9
 six==1.16.0
 attrs==22.1.0
-google-auth==2.14.0
+google-auth==2.14.1
 idna==3.4
\ No newline at end of file
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 2dce197bf45a..9c82529c84ff 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -150,9 +150,8 @@ google-api-core==2.8.2 \
     #   -r requirements.in
     #   google-cloud-core
     #   google-cloud-storage
-google-auth==2.14.0 \
-    --hash=sha256:1ad5b0e6eba5f69645971abb3d2c197537d5914070a8c6d30299dfdb07c5c700 \
-    --hash=sha256:cf24817855d874ede2efd071aa22125445f555de1685b739a9782fcf408c2a3d
+google-auth==2.14.1 \
+    --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016
     # via
     #   -r requirements.in
     #   gcp-releasetool

From e57775ebe0892d4c629647a72fed4e27ddd65851 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 11 Nov 2022 17:56:13 +0000
Subject: [PATCH 1014/1784] chore: use gcp-docuploader 0.6.3 (#1708) (#920)

Source-Link: https://togithub.com/googleapis/synthtool/commit/fbc8bfe364d70c38fbffbf68ebe1cfdae54d3447
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb
---
 .github/.OwlBot.lock.yaml | 2 +-
 .kokoro/requirements.in   | 2 +-
 .kokoro/requirements.txt  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 676aaea0c74d..0f0647b00ef2 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a
+  digest: sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index ae1d92e68084..924f94ae6fa1 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -1,4 +1,4 @@
-gcp-docuploader==0.6.4
+gcp-docuploader==0.6.3
 google-crc32c==1.3.0
 googleapis-common-protos==1.56.3
 gcp-releasetool==1.9.1
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 9c82529c84ff..71fcafc70316 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -135,9 +135,9 @@ cryptography==38.0.3 \
     #   -r requirements.in
     #   gcp-releasetool
     #   secretstorage
-gcp-docuploader==0.6.4 \
-    --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \
-    --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf
+gcp-docuploader==0.6.3 \
+    --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \
+    --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b
     # via -r requirements.in
 gcp-releasetool==1.9.1 \
     --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \

From 1f1243577cbdc206b6a0bfcde818411eb1b806ad Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Mon, 14 Nov 2022 19:45:47 +0530
Subject: [PATCH 1015/1784] feat: next release from main branch is 2.13.0
 (#917)

---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index a9897a66f307..c1c26322e492 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -18,3 +18,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.2.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.12.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 27a5d5d74b32..fee74e90419c 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -78,6 +78,23 @@ branchProtectionRules:
       - 'Kokoro - Test: Integration'
       - cla/google
       - OwlBot Post Processor
+  - pattern: 2.12.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - OwlBot Post Processor
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
 permissionRules:
   - team: yoshi-admins
     permission: admin

From ed3d0ace98cd268e3dad145c01b9c83a6bf72510 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 18 Nov 2022 23:12:14 +0100
Subject: [PATCH 1016/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.1.5 (#922)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.1.4` -> `26.1.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/compatibility-slim/26.1.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/confidence-slim/26.1.4)](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**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

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).

---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5a73d850d7f0..d6e6c4828089 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.1.4
+      26.1.5
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.4')
+implementation platform('com.google.cloud:libraries-bom:26.1.5')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index b9f22b24e143..6add4755881f 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.4
+        26.1.5
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c8d008cfdd6e..e18fedbe378d 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.4
+        26.1.5
         pom
         import
       

From 0c7539d736ec993d7bb0531d7cd4dab1b08487a0 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 21 Nov 2022 22:08:22 +0100
Subject: [PATCH 1017/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.18 (#925)

---
 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 6add4755881f..6910bc9b90d8 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.17
+            0.9.18
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 625e89685172ae546a813f5f7184223d01fbb0ac Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 21 Nov 2022 22:08:46 +0100
Subject: [PATCH 1018/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.18 (#924)

---
 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 6910bc9b90d8..fa4078a4d845 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.17
+          0.9.18
           test
         
       

From 9f2721824f7033c471ee70a2d2edfe2f615c1045 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 29 Nov 2022 10:34:49 -0500
Subject: [PATCH 1019/1784] chore: upgrade native image checks to
 graalvm-22.3.0  (#1718) (#926)

chore: upgrade native image checks to graalvm-22.3.0
Source-Link: https://github.com/googleapis/synthtool/commit/5e52896b69b145a3fac6827e4e75e617abdc9dd8
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml               | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 0f0647b00ef2..4ca0036da327 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb
+  digest: sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index a3f7fb9d4943..e20330c3ca60 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 4c7225ec924e..0fd6ba2fa0ce 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
 }
 
 env_vars: {

From 1e7a0a9226428dd6f876281575dd0951d64da6a2 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 29 Nov 2022 11:42:14 -0500
Subject: [PATCH 1020/1784] chore: add new branch to sync-repo-settings (#927)

---
 .github/sync-repo-settings.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index fee74e90419c..286bab3237c5 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -95,6 +95,23 @@ branchProtectionRules:
       - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+  - pattern: multi-db
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - OwlBot Post Processor
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
 permissionRules:
   - team: yoshi-admins
     permission: admin

From ef4065d233b968f58a34673aa53d39f60a013e2d Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Thu, 1 Dec 2022 10:06:57 +0530
Subject: [PATCH 1021/1784] fix: #355 Explicitly passing --project argument
 when starting emulator (#923)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Running gcloud datastore emulator with --project argument

* Allow user to pass a custom project id when creating a new LocalDatastoreHelper instance

* Creating a local variable to increase the readability and emphasizing on the fact that project id not nullable now

* 🦉 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 
---
 .../datastore/testing/LocalDatastoreHelper.java    | 14 +++++++++++++-
 .../testing/ITLocalDatastoreHelperTest.java        |  8 ++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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 e586f7e55805..db4bd112eebc 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
@@ -16,6 +16,8 @@
 
 package com.google.cloud.datastore.testing;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
+
 import com.google.api.core.InternalApi;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
@@ -68,7 +70,9 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
 
   // Common settings
   private static final String CONSISTENCY_FLAG = "--consistency=";
+  private static final String PROJECT_FLAG = "--project=";
   private static final double DEFAULT_CONSISTENCY = 0.9;
+  private static final String DEFAULT_PROJECT_ID = PROJECT_ID_PREFIX + UUID.randomUUID();
 
   private static final Logger LOGGER = Logger.getLogger(LocalDatastoreHelper.class.getName());
 
@@ -90,6 +94,7 @@ public static class Builder {
     private int port;
     private Path dataDir;
     private boolean storeOnDisk = true;
+    private String projectId;
 
     private Builder() {}
 
@@ -109,6 +114,11 @@ public Builder setPort(int port) {
       return this;
     }
 
+    public Builder setProjectId(String projectId) {
+      this.projectId = projectId;
+      return this;
+    }
+
     public Builder setDataDir(Path dataDir) {
       this.dataDir = dataDir;
       return this;
@@ -129,7 +139,8 @@ private LocalDatastoreHelper(Builder builder) {
     super(
         "datastore",
         builder.port > 0 ? builder.port : BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
-        PROJECT_ID_PREFIX + UUID.randomUUID().toString());
+        firstNonNull(builder.projectId, DEFAULT_PROJECT_ID));
+    String projectId = firstNonNull(builder.projectId, DEFAULT_PROJECT_ID);
     this.consistency = builder.consistency > 0 ? builder.consistency : DEFAULT_CONSISTENCY;
     this.gcdPath = builder.dataDir;
     this.storeOnDisk = builder.storeOnDisk;
@@ -140,6 +151,7 @@ private LocalDatastoreHelper(Builder builder) {
     List gcloudCommand = new ArrayList<>(Arrays.asList(GCLOUD_CMD_TEXT.split(" ")));
     gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + "localhost:" + getPort());
     gcloudCommand.add(CONSISTENCY_FLAG + builder.consistency);
+    gcloudCommand.add(PROJECT_FLAG + projectId);
     if (!builder.storeOnDisk) {
       gcloudCommand.add("--no-store-on-disk");
     }
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 6cc236a8b37e..8a7fd88b086a 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
@@ -88,6 +88,14 @@ public void testCreateWithBuilder() {
     assertTrue(incompleteHelper.getProjectId().startsWith(PROJECT_ID_PREFIX));
   }
 
+  @Test
+  public void testCreateWithCustomProjectId() {
+    String customProjectId = "custom-project-id";
+    LocalDatastoreHelper helper =
+        LocalDatastoreHelper.newBuilder().setProjectId(customProjectId).build();
+    assertEquals(customProjectId, helper.getProjectId());
+  }
+
   @Test
   public void testCreateWithToBuilder() throws IOException {
     LocalDatastoreHelper helper =

From d1d5e3b3cee32856e72953b83596efe5e855fce2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 1 Dec 2022 05:42:19 +0100
Subject: [PATCH 1022/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.5.5 (#929)

---
 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 6e3ee3b74011..a65e02881506 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.4
+    1.5.5
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index d73c2dc8e4df..ecf0dbe41fc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.5.4
+    1.5.5
   
 
   

From 40b4011e3a826a91e33541efdecb05f0e129f87c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 2 Dec 2022 21:33:22 +0100
Subject: [PATCH 1023/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.19 (#931)

---
 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 fa4078a4d845..524d91d683be 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.18
+            0.9.19
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 77285be97fbd6bca1ada35202842238e306dd8dc Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 2 Dec 2022 21:38:46 +0100
Subject: [PATCH 1024/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.19 (#930)

---
 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 524d91d683be..fee00f2420f8 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.18
+          0.9.19
           test
         
       

From 1dbcea73827961148800c1ec8e87065dbceb6c88 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 6 Dec 2022 16:03:58 +0100
Subject: [PATCH 1025/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.1.0 (#932)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ecf0dbe41fc9..7f8d478f9457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.0.6
+        3.1.0
         pom
         import
       

From 34868fe8e8181d89c90bd1840de4b83fe923d02e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 15:46:14 +0000
Subject: [PATCH 1026/1784] chore(main): release 2.13.0 (#921)

:robot: I have created a release *beep* *boop*
---


## [2.13.0](https://togithub.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0) (2022-12-06)


### Features

* Next release from main branch is 2.13.0 ([#917](https://togithub.com/googleapis/java-datastore/issues/917)) ([1f12435](https://togithub.com/googleapis/java-datastore/commit/1f1243577cbdc206b6a0bfcde818411eb1b806ad))


### Bug Fixes

* [#355](https://togithub.com/googleapis/java-datastore/issues/355) Explicitly passing --project argument when starting emulator ([#923](https://togithub.com/googleapis/java-datastore/issues/923)) ([ef4065d](https://togithub.com/googleapis/java-datastore/commit/ef4065d233b968f58a34673aa53d39f60a013e2d))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 ([#932](https://togithub.com/googleapis/java-datastore/issues/932)) ([1dbcea7](https://togithub.com/googleapis/java-datastore/commit/1dbcea73827961148800c1ec8e87065dbceb6c88))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#924](https://togithub.com/googleapis/java-datastore/issues/924)) ([625e896](https://togithub.com/googleapis/java-datastore/commit/625e89685172ae546a813f5f7184223d01fbb0ac))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 ([#930](https://togithub.com/googleapis/java-datastore/issues/930)) ([77285be](https://togithub.com/googleapis/java-datastore/commit/77285be97fbd6bca1ada35202842238e306dd8dc))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#925](https://togithub.com/googleapis/java-datastore/issues/925)) ([0c7539d](https://togithub.com/googleapis/java-datastore/commit/0c7539d736ec993d7bb0531d7cd4dab1b08487a0))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 ([#931](https://togithub.com/googleapis/java-datastore/issues/931)) ([40b4011](https://togithub.com/googleapis/java-datastore/commit/40b4011e3a826a91e33541efdecb05f0e129f87c))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 21 +++++++++++++++++++
 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, 48 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf663540a064..e98141d6a0cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## [2.13.0](https://github.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0) (2022-12-06)
+
+
+### Features
+
+* Next release from main branch is 2.13.0 ([#917](https://github.com/googleapis/java-datastore/issues/917)) ([1f12435](https://github.com/googleapis/java-datastore/commit/1f1243577cbdc206b6a0bfcde818411eb1b806ad))
+
+
+### Bug Fixes
+
+* [#355](https://github.com/googleapis/java-datastore/issues/355) Explicitly passing --project argument when starting emulator ([#923](https://github.com/googleapis/java-datastore/issues/923)) ([ef4065d](https://github.com/googleapis/java-datastore/commit/ef4065d233b968f58a34673aa53d39f60a013e2d))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 ([#932](https://github.com/googleapis/java-datastore/issues/932)) ([1dbcea7](https://github.com/googleapis/java-datastore/commit/1dbcea73827961148800c1ec8e87065dbceb6c88))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#924](https://github.com/googleapis/java-datastore/issues/924)) ([625e896](https://github.com/googleapis/java-datastore/commit/625e89685172ae546a813f5f7184223d01fbb0ac))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 ([#930](https://github.com/googleapis/java-datastore/issues/930)) ([77285be](https://github.com/googleapis/java-datastore/commit/77285be97fbd6bca1ada35202842238e306dd8dc))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#925](https://github.com/googleapis/java-datastore/issues/925)) ([0c7539d](https://github.com/googleapis/java-datastore/commit/0c7539d736ec993d7bb0531d7cd4dab1b08487a0))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 ([#931](https://github.com/googleapis/java-datastore/issues/931)) ([40b4011](https://github.com/googleapis/java-datastore/commit/40b4011e3a826a91e33541efdecb05f0e129f87c))
+
 ## [2.12.5](https://github.com/googleapis/java-datastore/compare/v2.12.4...v2.12.5) (2022-11-08)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6de9a5cee312..208088f763ec 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.12.6-SNAPSHOT
+  2.13.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.6-SNAPSHOT
+    2.13.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a65e02881506..61561d70e7a8 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.12.6-SNAPSHOT
+  2.13.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.12.6-SNAPSHOT
+        2.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.6-SNAPSHOT
+        2.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.6-SNAPSHOT
+        0.104.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.12.6-SNAPSHOT
+        2.13.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7ee7ce004ad2..26270a95dfb5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.12.6-SNAPSHOT
+  2.13.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.6-SNAPSHOT
+    2.13.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 b50659d89040..e0baae231e2c 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.12.6-SNAPSHOT
+  2.13.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.6-SNAPSHOT
+    2.13.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 7f8d478f9457..6a90eeeafc90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.12.6-SNAPSHOT
+  2.13.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.12.6-SNAPSHOT
+        2.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.12.6-SNAPSHOT
+        2.13.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.12.6-SNAPSHOT
+        2.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.103.6-SNAPSHOT
+        0.104.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.12.6-SNAPSHOT
+        2.13.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 46be69fa1e69..e554eaed2da2 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.12.6-SNAPSHOT
+  2.13.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.6-SNAPSHOT
+    2.13.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 62b641087896..b5eb4e0387e4 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.103.6-SNAPSHOT
+  0.104.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.12.6-SNAPSHOT
+    2.13.0
   
   
     
diff --git a/versions.txt b/versions.txt
index e809433990dd..0c953d167b6d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.12.5:2.12.6-SNAPSHOT
-google-cloud-datastore-bom:2.12.5:2.12.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.103.5:0.103.6-SNAPSHOT
-datastore-v1-proto-client:2.12.5:2.12.6-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.12.5:2.12.6-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.12.5:2.12.6-SNAPSHOT
+google-cloud-datastore:2.13.0:2.13.0
+google-cloud-datastore-bom:2.13.0:2.13.0
+proto-google-cloud-datastore-v1:0.104.0:0.104.0
+datastore-v1-proto-client:2.13.0:2.13.0
+proto-google-cloud-datastore-admin-v1:2.13.0:2.13.0
+grpc-google-cloud-datastore-admin-v1:2.13.0:2.13.0

From dc38b069f1d36f24146bbfcdb53bd3bfc409f797 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 6 Dec 2022 19:36:15 +0100
Subject: [PATCH 1027/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.13.0 (#935)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.12.5` -> `2.13.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/compatibility-slim/2.12.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/confidence-slim/2.12.5)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.13.0`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​2130-httpsgithubcomgoogleapisjava-datastorecomparev2125v2130-2022-12-06)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0)

##### Features

-   Next release from main branch is 2.13.0 ([#​917](https://togithub.com/googleapis/java-datastore/issues/917)) ([1f12435](https://togithub.com/googleapis/java-datastore/commit/1f1243577cbdc206b6a0bfcde818411eb1b806ad))

##### Bug Fixes

-   [#​355](https://togithub.com/googleapis/java-datastore/issues/355) Explicitly passing --project argument when starting emulator ([#​923](https://togithub.com/googleapis/java-datastore/issues/923)) ([ef4065d](https://togithub.com/googleapis/java-datastore/commit/ef4065d233b968f58a34673aa53d39f60a013e2d))

##### Dependencies

-   Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 ([#​932](https://togithub.com/googleapis/java-datastore/issues/932)) ([1dbcea7](https://togithub.com/googleapis/java-datastore/commit/1dbcea73827961148800c1ec8e87065dbceb6c88))
-   Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#​924](https://togithub.com/googleapis/java-datastore/issues/924)) ([625e896](https://togithub.com/googleapis/java-datastore/commit/625e89685172ae546a813f5f7184223d01fbb0ac))
-   Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 ([#​930](https://togithub.com/googleapis/java-datastore/issues/930)) ([77285be](https://togithub.com/googleapis/java-datastore/commit/77285be97fbd6bca1ada35202842238e306dd8dc))
-   Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#​925](https://togithub.com/googleapis/java-datastore/issues/925)) ([0c7539d](https://togithub.com/googleapis/java-datastore/commit/0c7539d736ec993d7bb0531d7cd4dab1b08487a0))
-   Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 ([#​931](https://togithub.com/googleapis/java-datastore/issues/931)) ([40b4011](https://togithub.com/googleapis/java-datastore/commit/40b4011e3a826a91e33541efdecb05f0e129f87c))


    

---

### 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, check this box

---

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).

---
 README.md                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d6e6c4828089..148eb3c9117f 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.12.5
+  2.13.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.12.5'
+implementation 'com.google.cloud:google-cloud-datastore:2.13.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d63fc5ae8834..2c2f5f5cf17a 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.12.5
+      2.13.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0a0f05b0ed32..9c995df7c3c0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.12.5
+      2.13.0
     
 
     

From 212d4e895392a1b1fc5873549f8ec356cd341f5f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 18:56:14 +0000
Subject: [PATCH 1028/1784] chore(main): release 2.13.1-SNAPSHOT (#934)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 208088f763ec..5a528d121e55 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.13.0
+  2.13.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.0
+    2.13.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 61561d70e7a8..4f88423bd2c0 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.13.0
+  2.13.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.0
+        2.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.0
+        2.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.0
+        0.104.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.0
+        2.13.1-SNAPSHOT
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 26270a95dfb5..1d61495ade87 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.0
+  2.13.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.0
+    2.13.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index e0baae231e2c..f4a1aa205759 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.13.0
+  2.13.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.0
+    2.13.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 6a90eeeafc90..1c9cfaeeacaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.0
+  2.13.1-SNAPSHOT
   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.13.0
+        2.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.0
+        2.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.0
+        2.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.0
+        0.104.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.0
+        2.13.1-SNAPSHOT
         
           
             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 e554eaed2da2..40b6939ccda8 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.13.0
+  2.13.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.0
+    2.13.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b5eb4e0387e4..6ae876eae6a8 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.104.0
+  0.104.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.0
+    2.13.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 0c953d167b6d..28ad9af6d820 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.0:2.13.0
-google-cloud-datastore-bom:2.13.0:2.13.0
-proto-google-cloud-datastore-v1:0.104.0:0.104.0
-datastore-v1-proto-client:2.13.0:2.13.0
-proto-google-cloud-datastore-admin-v1:2.13.0:2.13.0
-grpc-google-cloud-datastore-admin-v1:2.13.0:2.13.0
+google-cloud-datastore:2.13.0:2.13.1-SNAPSHOT
+google-cloud-datastore-bom:2.13.0:2.13.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.104.0:0.104.1-SNAPSHOT
+datastore-v1-proto-client:2.13.0:2.13.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.13.0:2.13.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.13.0:2.13.1-SNAPSHOT

From 72773c25852f942cee026df6bdc04043ebb08db6 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 10:13:01 -0500
Subject: [PATCH 1029/1784] chore: Enable requesting numeric enums in
 "transport=rest" responses for services supporting this (Java, Go, Python,
 PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST
 transport (#933)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport

chore: disallow "transport=rest" for services where numeric enums are not confirmed to be supported (except in PHP and Java)
PiperOrigin-RevId: 493113566

Source-Link: https://github.com/googleapis/googleapis/commit/758f0d1217d9c7fe398aa5efb1057ce4b6409e55

Source-Link: https://github.com/googleapis/googleapis-gen/commit/78bd8f05e1276363eb14eae70e91fe4bc20703ab
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhiZDhmMDVlMTI3NjM2M2ViMTRlYWU3MGU5MWZlNGJjMjA3MDNhYiJ9

* 🦉 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 
---
 .../admin/v1/stub/HttpJsonDatastoreAdminStub.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index cbe5516bc00e..131c12763875 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -97,12 +97,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                             Map> fields = new HashMap<>();
                             ProtoRestSerializer serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                             return fields;
                           })
                       .setRequestBodyExtractor(
                           request ->
                               ProtoRestSerializer.create()
-                                  .toBody("*", request.toBuilder().clearProjectId().build(), false))
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.newBuilder()
@@ -136,12 +137,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                             Map> fields = new HashMap<>();
                             ProtoRestSerializer serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                             return fields;
                           })
                       .setRequestBodyExtractor(
                           request ->
                               ProtoRestSerializer.create()
-                                  .toBody("*", request.toBuilder().clearProjectId().build(), false))
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.newBuilder()
@@ -175,12 +177,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                             Map> fields = new HashMap<>();
                             ProtoRestSerializer serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                             return fields;
                           })
                       .setRequestBodyExtractor(
                           request ->
                               ProtoRestSerializer.create()
-                                  .toBody("index", request.getIndex(), false))
+                                  .toBody("index", request.getIndex(), true))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.newBuilder()
@@ -215,6 +218,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                             Map> fields = new HashMap<>();
                             ProtoRestSerializer serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                             return fields;
                           })
                       .setRequestBodyExtractor(request -> null)
@@ -251,6 +255,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                         Map> fields = new HashMap<>();
                         ProtoRestSerializer serializer =
                             ProtoRestSerializer.create();
+                        serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                         return fields;
                       })
                   .setRequestBodyExtractor(request -> null)
@@ -287,6 +292,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
                             serializer.putQueryParam(fields, "filter", request.getFilter());
                             serializer.putQueryParam(fields, "pageSize", request.getPageSize());
                             serializer.putQueryParam(fields, "pageToken", request.getPageToken());
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                             return fields;
                           })
                       .setRequestBodyExtractor(request -> null)

From b90025d8bcb72e5c7fa00d938452af5a1a20dc25 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 15:36:15 +0000
Subject: [PATCH 1030/1784] build(deps): bump certifi from 2022.9.24 to
 2022.12.7 in /synthtool/gcp/templates/java_library/.kokoro (#1732) (#937)

build(deps): bump certifi

Bumps [certifi](https://togithub.com/certifi/python-certifi) from 2022.9.24 to 2022.12.7.
- [Release notes](https://togithub.com/certifi/python-certifi/releases)
- [Commits](https://togithub.com/certifi/python-certifi/compare/2022.09.24...2022.12.07)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jeff Ching 
Source-Link: https://togithub.com/googleapis/synthtool/commit/ae0d43e5f17972981fe501ecf5a5d20055128bea
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c
---
 .github/.OwlBot.lock.yaml | 2 +-
 .kokoro/requirements.in   | 2 +-
 .kokoro/requirements.txt  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 4ca0036da327..288e394897e6 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd
+  digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index 924f94ae6fa1..a5010f77d413 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -17,7 +17,7 @@ pycparser==2.21
 pyperclip==1.8.2
 python-dateutil==2.8.2
 requests==2.27.1
-certifi==2022.9.24
+certifi==2022.12.7
 importlib-metadata==4.8.3
 zipp==3.6.0
 google_api_core==2.8.2
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 71fcafc70316..15c404aa5a8c 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -16,9 +16,9 @@ cachetools==4.2.4 \
     # via
     #   -r requirements.in
     #   google-auth
-certifi==2022.9.24 \
-    --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
-    --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
+certifi==2022.12.7 \
+    --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
+    --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
     # via
     #   -r requirements.in
     #   requests

From 73ca625c68c28dbe538f41725540d2808a3aec69 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 16 Dec 2022 16:36:38 +0100
Subject: [PATCH 1031/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.2.0 (#938)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.2.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 148eb3c9117f..cd73ad4f6938 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.1.5
+      26.2.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.5')
+implementation platform('com.google.cloud:libraries-bom:26.2.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index fee00f2420f8..5c771d935c71 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.5
+        26.2.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e18fedbe378d..041e90bd76dd 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.1.5
+        26.2.0
         pom
         import
       

From 7774aaca4bb99bd5114002a511981dc6992b00f4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 3 Jan 2023 16:07:54 +0100
Subject: [PATCH 1032/1784] deps: update dependency org.easymock:easymock to
 v5.1.0 (#945)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1c9cfaeeacaa..d8a224818ac0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
       
         org.easymock
         easymock
-        5.0.1
+        5.1.0
         test
       
     

From b0fd082f34d642f450d51e0c732daa3023fc57a4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 3 Jan 2023 16:08:13 +0100
Subject: [PATCH 1033/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.17.0 (#944)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d8a224818ac0..42ee3a458710 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.16
+    2.17.0
   
 
   

From 4297081e33174b0c6758abbf85de2a70ffa038a6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 3 Jan 2023 15:26:14 +0000
Subject: [PATCH 1034/1784] chore(main): release 2.13.1 (#946)

:robot: I have created a release *beep* *boop*
---


## [2.13.1](https://togithub.com/googleapis/java-datastore/compare/v2.13.0...v2.13.1) (2023-01-03)


### Dependencies

* Update dependency com.google.errorprone:error_prone_core to v2.17.0 ([#944](https://togithub.com/googleapis/java-datastore/issues/944)) ([b0fd082](https://togithub.com/googleapis/java-datastore/commit/b0fd082f34d642f450d51e0c732daa3023fc57a4))
* Update dependency org.easymock:easymock to v5.1.0 ([#945](https://togithub.com/googleapis/java-datastore/issues/945)) ([7774aac](https://togithub.com/googleapis/java-datastore/commit/7774aaca4bb99bd5114002a511981dc6992b00f4))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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, 35 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e98141d6a0cf..e6e06d67ceb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.13.1](https://github.com/googleapis/java-datastore/compare/v2.13.0...v2.13.1) (2023-01-03)
+
+
+### Dependencies
+
+* Update dependency com.google.errorprone:error_prone_core to v2.17.0 ([#944](https://github.com/googleapis/java-datastore/issues/944)) ([b0fd082](https://github.com/googleapis/java-datastore/commit/b0fd082f34d642f450d51e0c732daa3023fc57a4))
+* Update dependency org.easymock:easymock to v5.1.0 ([#945](https://github.com/googleapis/java-datastore/issues/945)) ([7774aac](https://github.com/googleapis/java-datastore/commit/7774aaca4bb99bd5114002a511981dc6992b00f4))
+
 ## [2.13.0](https://github.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0) (2022-12-06)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 5a528d121e55..be3d366fa8c1 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.13.1-SNAPSHOT
+  2.13.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1-SNAPSHOT
+    2.13.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4f88423bd2c0..7e5c5e4a963f 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.13.1-SNAPSHOT
+  2.13.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.1-SNAPSHOT
+        2.13.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.1-SNAPSHOT
+        2.13.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.1-SNAPSHOT
+        0.104.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.1-SNAPSHOT
+        2.13.1
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1d61495ade87..a573ac330447 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.1-SNAPSHOT
+  2.13.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1-SNAPSHOT
+    2.13.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f4a1aa205759..1e6c10293bd7 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.13.1-SNAPSHOT
+  2.13.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1-SNAPSHOT
+    2.13.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 42ee3a458710..7e9b05caaee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.1-SNAPSHOT
+  2.13.1
   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.13.1-SNAPSHOT
+        2.13.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.1-SNAPSHOT
+        2.13.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.1-SNAPSHOT
+        2.13.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.1-SNAPSHOT
+        0.104.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.1-SNAPSHOT
+        2.13.1
         
           
             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 40b6939ccda8..8863593ca230 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.13.1-SNAPSHOT
+  2.13.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1-SNAPSHOT
+    2.13.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6ae876eae6a8..3f2bdafe73c0 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.104.1-SNAPSHOT
+  0.104.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1-SNAPSHOT
+    2.13.1
   
   
     
diff --git a/versions.txt b/versions.txt
index 28ad9af6d820..c949ca000838 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.0:2.13.1-SNAPSHOT
-google-cloud-datastore-bom:2.13.0:2.13.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.104.0:0.104.1-SNAPSHOT
-datastore-v1-proto-client:2.13.0:2.13.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.13.0:2.13.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.13.0:2.13.1-SNAPSHOT
+google-cloud-datastore:2.13.1:2.13.1
+google-cloud-datastore-bom:2.13.1:2.13.1
+proto-google-cloud-datastore-v1:0.104.1:0.104.1
+datastore-v1-proto-client:2.13.1:2.13.1
+proto-google-cloud-datastore-admin-v1:2.13.1:2.13.1
+grpc-google-cloud-datastore-admin-v1:2.13.1:2.13.1

From 5c8fef1565fcb98f3392f9fb0029af7a51f9e0af Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 3 Jan 2023 15:44:36 +0000
Subject: [PATCH 1035/1784] chore(main): release 2.13.2-SNAPSHOT (#947)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index be3d366fa8c1..890d0a9e9e03 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.13.1
+  2.13.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1
+    2.13.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7e5c5e4a963f..0c297f1daada 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.13.1
+  2.13.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.1
+        2.13.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.1
+        2.13.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.1
+        0.104.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.1
+        2.13.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a573ac330447..872821faff32 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.1
+  2.13.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1
+    2.13.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 1e6c10293bd7..db39f92c2a51 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.13.1
+  2.13.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1
+    2.13.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 7e9b05caaee2..6fbd17630076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.1
+  2.13.2-SNAPSHOT
   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.13.1
+        2.13.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.1
+        2.13.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.1
+        2.13.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.1
+        0.104.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.1
+        2.13.2-SNAPSHOT
         
           
             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 8863593ca230..5f3082b348c7 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.13.1
+  2.13.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1
+    2.13.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3f2bdafe73c0..25011f9ab099 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.104.1
+  0.104.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.1
+    2.13.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index c949ca000838..d4099f0eaf61 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.1:2.13.1
-google-cloud-datastore-bom:2.13.1:2.13.1
-proto-google-cloud-datastore-v1:0.104.1:0.104.1
-datastore-v1-proto-client:2.13.1:2.13.1
-proto-google-cloud-datastore-admin-v1:2.13.1:2.13.1
-grpc-google-cloud-datastore-admin-v1:2.13.1:2.13.1
+google-cloud-datastore:2.13.1:2.13.2-SNAPSHOT
+google-cloud-datastore-bom:2.13.1:2.13.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.104.1:0.104.2-SNAPSHOT
+datastore-v1-proto-client:2.13.1:2.13.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.13.1:2.13.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.13.1:2.13.2-SNAPSHOT

From 292a9ce4141a0152482a8405f71bb8ea6737b06a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 3 Jan 2023 17:59:39 +0100
Subject: [PATCH 1036/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.13.1 (#948)
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.13.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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index cd73ad4f6938..4224eecc1ad5 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.13.0
+  2.13.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.13.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.13.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.1"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 2c2f5f5cf17a..b62dd709c598 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.13.0
+      2.13.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 9c995df7c3c0..c1b6f4278f57 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.13.0
+      2.13.1
     
 
     

From 6e5fa17009c728afc5677ed05365921e4137b6e3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 5 Jan 2023 21:16:22 +0100
Subject: [PATCH 1037/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.3.0 (#950)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.3.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4224eecc1ad5..7cb5548a4a91 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.2.0
+      26.3.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.2.0')
+implementation platform('com.google.cloud:libraries-bom:26.3.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 5c771d935c71..25e46aeb17ec 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.2.0
+        26.3.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 041e90bd76dd..80143626871f 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.2.0
+        26.3.0
         pom
         import
       

From b0b72bb8ba3c6382f3d5883cd302a0d0756ccb71 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Jan 2023 15:27:58 +0000
Subject: [PATCH 1038/1784] deps: update dependency
 org.junit.vintage:junit-vintage-engine to v5.9.2 (#954)

---
 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 25e46aeb17ec..3a639d45983e 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.9.1
+          5.9.2
           test
         
         

From fdffe1e6b84fa58d7bf4210016d814642cbd45a2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Jan 2023 15:28:13 +0000
Subject: [PATCH 1039/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.1.1 (#953)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6fbd17630076..5235dc7cc43a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.1.0
+        3.1.1
         pom
         import
       

From 852529fced3b11979a0267941b6a83d00bbf7e59 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 10:29:40 -0500
Subject: [PATCH 1040/1784] chore: regenerate API index (#952)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: regenerate API index

Source-Link: https://github.com/googleapis/googleapis/commit/b84b4fe3d9ad3ef8c06aaa00114f53061169c531

Source-Link: https://github.com/googleapis/googleapis-gen/commit/916424c97215b12211037b5057b833447d073bbd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTE2NDI0Yzk3MjE1YjEyMjExMDM3YjUwNTdiODMzNDQ3ZDA3M2JiZCJ9

* 🦉 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 
---
 .../cloud/datastore/admin/v1/DatastoreAdminSettings.java     | 5 ++++-
 .../datastore/admin/v1/stub/DatastoreAdminStubSettings.java  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 2d5d1aeb21ca..64fdb6899e98 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -78,7 +78,10 @@
  * datastoreAdminSettingsBuilder
  *     .getIndexSettings()
  *     .setRetrySettings(
- *         datastoreAdminSettingsBuilder.getIndexSettings().getRetrySettings().toBuilder()
+ *         datastoreAdminSettingsBuilder
+ *             .getIndexSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DatastoreAdminSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index d93cd65f6de7..a5d39bb4a21f 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -98,7 +98,10 @@
  * datastoreAdminSettingsBuilder
  *     .getIndexSettings()
  *     .setRetrySettings(
- *         datastoreAdminSettingsBuilder.getIndexSettings().getRetrySettings().toBuilder()
+ *         datastoreAdminSettingsBuilder
+ *             .getIndexSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DatastoreAdminStubSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();

From ac5c83e03f3ea1ef6a66373b80858cd68dda0c80 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Jan 2023 15:29:56 +0000
Subject: [PATCH 1041/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.18.0 (#951)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5235dc7cc43a..97e5eec7ff32 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.17.0
+    2.18.0
   
 
   

From 3a284a1113287143b90e02843b49221c7f21bf4c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 16:18:18 +0000
Subject: [PATCH 1042/1784] chore(main): release 2.13.2 (#955)

:robot: I have created a release *beep* *boop*
---


## [2.13.2](https://togithub.com/googleapis/java-datastore/compare/v2.13.1...v2.13.2) (2023-01-10)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.1 ([#953](https://togithub.com/googleapis/java-datastore/issues/953)) ([fdffe1e](https://togithub.com/googleapis/java-datastore/commit/fdffe1e6b84fa58d7bf4210016d814642cbd45a2))
* Update dependency com.google.errorprone:error_prone_core to v2.18.0 ([#951](https://togithub.com/googleapis/java-datastore/issues/951)) ([ac5c83e](https://togithub.com/googleapis/java-datastore/commit/ac5c83e03f3ea1ef6a66373b80858cd68dda0c80))
* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.2 ([#954](https://togithub.com/googleapis/java-datastore/issues/954)) ([b0b72bb](https://togithub.com/googleapis/java-datastore/commit/b0b72bb8ba3c6382f3d5883cd302a0d0756ccb71))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  9 +++++++++
 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, 36 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6e06d67ceb2..89ac01b0fa4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [2.13.2](https://github.com/googleapis/java-datastore/compare/v2.13.1...v2.13.2) (2023-01-10)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.1 ([#953](https://github.com/googleapis/java-datastore/issues/953)) ([fdffe1e](https://github.com/googleapis/java-datastore/commit/fdffe1e6b84fa58d7bf4210016d814642cbd45a2))
+* Update dependency com.google.errorprone:error_prone_core to v2.18.0 ([#951](https://github.com/googleapis/java-datastore/issues/951)) ([ac5c83e](https://github.com/googleapis/java-datastore/commit/ac5c83e03f3ea1ef6a66373b80858cd68dda0c80))
+* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.2 ([#954](https://github.com/googleapis/java-datastore/issues/954)) ([b0b72bb](https://github.com/googleapis/java-datastore/commit/b0b72bb8ba3c6382f3d5883cd302a0d0756ccb71))
+
 ## [2.13.1](https://github.com/googleapis/java-datastore/compare/v2.13.0...v2.13.1) (2023-01-03)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 890d0a9e9e03..33f597182c3d 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.13.2-SNAPSHOT
+  2.13.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2-SNAPSHOT
+    2.13.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0c297f1daada..157fa471ae8a 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.13.2-SNAPSHOT
+  2.13.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.2-SNAPSHOT
+        2.13.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.2-SNAPSHOT
+        2.13.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.2-SNAPSHOT
+        0.104.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.2-SNAPSHOT
+        2.13.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 872821faff32..553104de2fa7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.2-SNAPSHOT
+  2.13.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2-SNAPSHOT
+    2.13.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index db39f92c2a51..8f83ec5f18cb 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.13.2-SNAPSHOT
+  2.13.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2-SNAPSHOT
+    2.13.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 97e5eec7ff32..3209a7bbfa23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.2-SNAPSHOT
+  2.13.2
   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.13.2-SNAPSHOT
+        2.13.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.2-SNAPSHOT
+        2.13.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.2-SNAPSHOT
+        2.13.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.2-SNAPSHOT
+        0.104.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.2-SNAPSHOT
+        2.13.2
         
           
             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 5f3082b348c7..768e545baef3 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.13.2-SNAPSHOT
+  2.13.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2-SNAPSHOT
+    2.13.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 25011f9ab099..20c5095b8f2f 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.104.2-SNAPSHOT
+  0.104.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2-SNAPSHOT
+    2.13.2
   
   
     
diff --git a/versions.txt b/versions.txt
index d4099f0eaf61..d42e25c0bd5c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.1:2.13.2-SNAPSHOT
-google-cloud-datastore-bom:2.13.1:2.13.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.104.1:0.104.2-SNAPSHOT
-datastore-v1-proto-client:2.13.1:2.13.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.13.1:2.13.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.13.1:2.13.2-SNAPSHOT
+google-cloud-datastore:2.13.2:2.13.2
+google-cloud-datastore-bom:2.13.2:2.13.2
+proto-google-cloud-datastore-v1:0.104.2:0.104.2
+datastore-v1-proto-client:2.13.2:2.13.2
+proto-google-cloud-datastore-admin-v1:2.13.2:2.13.2
+grpc-google-cloud-datastore-admin-v1:2.13.2:2.13.2

From f00c60af0f453809cbb881f09a2f3cb8e2d1a54b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 17:10:11 +0000
Subject: [PATCH 1043/1784] chore(main): release 2.13.3-SNAPSHOT (#956)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 33f597182c3d..14d903696af6 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.13.2
+  2.13.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2
+    2.13.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 157fa471ae8a..beff60e2e2df 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.13.2
+  2.13.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.2
+        2.13.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.2
+        2.13.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.2
+        0.104.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.2
+        2.13.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 553104de2fa7..c97352af8a28 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.2
+  2.13.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2
+    2.13.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 8f83ec5f18cb..0c7a119a1ad5 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.13.2
+  2.13.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2
+    2.13.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 3209a7bbfa23..65e9a460e8d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.2
+  2.13.3-SNAPSHOT
   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.13.2
+        2.13.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.2
+        2.13.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.2
+        2.13.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.2
+        0.104.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.2
+        2.13.3-SNAPSHOT
         
           
             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 768e545baef3..61aa5f135a5e 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.13.2
+  2.13.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2
+    2.13.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 20c5095b8f2f..801340479624 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.104.2
+  0.104.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.2
+    2.13.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index d42e25c0bd5c..7a33be977561 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.2:2.13.2
-google-cloud-datastore-bom:2.13.2:2.13.2
-proto-google-cloud-datastore-v1:0.104.2:0.104.2
-datastore-v1-proto-client:2.13.2:2.13.2
-proto-google-cloud-datastore-admin-v1:2.13.2:2.13.2
-grpc-google-cloud-datastore-admin-v1:2.13.2:2.13.2
+google-cloud-datastore:2.13.2:2.13.3-SNAPSHOT
+google-cloud-datastore-bom:2.13.2:2.13.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.104.2:0.104.3-SNAPSHOT
+datastore-v1-proto-client:2.13.2:2.13.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.13.2:2.13.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.13.2:2.13.3-SNAPSHOT

From 66c3591c2ea61b60e4fc92135d7796aa10503703 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Jan 2023 19:19:48 +0000
Subject: [PATCH 1044/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.13.2 (#957)
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.13.2

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7cb5548a4a91..e53994c08116 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.13.1
+  2.13.2
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.13.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.13.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.2"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index b62dd709c598..af7a4f8269a0 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.13.1
+      2.13.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c1b6f4278f57..a622d9b82417 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.13.1
+      2.13.2
     
 
     

From dedf91dc7892425dbc3d677892ba2fb44df31f9e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 15:32:50 -0500
Subject: [PATCH 1045/1784] chore: add dynamic routing header annotation to
 DatastoreV1 (#959)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: add dynamic routing header annotation to DatastoreV1

PiperOrigin-RevId: 501591105

Source-Link: https://github.com/googleapis/googleapis/commit/c4ebfff4f512a9cb0fc09eb6d82a2987a3524ae0

Source-Link: https://github.com/googleapis/googleapis-gen/commit/e2d6011df35c3b7b54ff39098be779c105408b1b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTJkNjAxMWRmMzVjM2I3YjU0ZmYzOTA5OGJlNzc5YzEwNTQwOGIxYiJ9

* 🦉 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 
---
 .../datastore/v1/AllocateIdsRequest.java      |  98 +++----
 .../v1/AllocateIdsRequestOrBuilder.java       |  20 +-
 .../datastore/v1/AllocateIdsResponse.java     |   6 +-
 .../datastore/v1/BeginTransactionRequest.java |   6 +-
 .../v1/BeginTransactionResponse.java          |   6 +-
 .../google/datastore/v1/DatastoreProto.java   | 271 +++++++++---------
 .../datastore/v1/ReserveIdsRequest.java       |  98 +++----
 .../v1/ReserveIdsRequestOrBuilder.java        |  20 +-
 .../datastore/v1/ReserveIdsResponse.java      |   6 +-
 .../google/datastore/v1/RollbackResponse.java |  10 +-
 .../v1/RunAggregationQueryRequest.java        |   6 +-
 .../v1/RunAggregationQueryResponse.java       |   6 +-
 .../google/datastore/v1/RunQueryResponse.java |   6 +-
 .../datastore/v1/TransactionOptions.java      |  12 +-
 .../proto/google/datastore/v1/datastore.proto |  96 +++++--
 15 files changed, 373 insertions(+), 294 deletions(-)

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 e44b329f7d86..c11a174073ab 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ * The request for
+ * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
@@ -177,8 +178,8 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -192,8 +193,8 @@ public java.util.List getKeysList() {
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -207,8 +208,8 @@ public java.util.List getKeysOrB
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -222,8 +223,8 @@ public int getKeysCount() {
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -237,8 +238,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -432,7 +433,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   * The request for
+   * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsRequest}
@@ -910,8 +912,8 @@ private void ensureKeysIsMutable() {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -928,8 +930,8 @@ public java.util.List getKeysList() {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -946,8 +948,8 @@ public int getKeysCount() {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -964,8 +966,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -988,8 +990,8 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1009,8 +1011,8 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1033,8 +1035,8 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1057,8 +1059,8 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1078,8 +1080,8 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1099,8 +1101,8 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1120,8 +1122,8 @@ public Builder addAllKeys(java.lang.Iterable
-     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1141,8 +1143,8 @@ public Builder clearKeys() {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1162,8 +1164,8 @@ public Builder removeKeys(int index) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1176,8 +1178,8 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1194,8 +1196,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1212,8 +1214,8 @@ public java.util.List getKeysOrB
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1226,8 +1228,8 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1241,8 +1243,8 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
      *
      *
      * 
    -     * Required. A list of keys with incomplete key paths for which to allocate IDs.
-     * No key may be reserved/read-only.
+     * Required. A list of keys with incomplete key paths for which to allocate
+     * IDs. No key may be reserved/read-only.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
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 665721ac634e..070e273c6592 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
@@ -81,8 +81,8 @@ public interface AllocateIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -93,8 +93,8 @@ public interface AllocateIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -105,8 +105,8 @@ public interface AllocateIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -117,8 +117,8 @@ public interface AllocateIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -129,8 +129,8 @@ public interface AllocateIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with incomplete key paths for which to allocate IDs.
-   * No key may be reserved/read-only.
+   * Required. A list of keys with incomplete key paths for which to allocate
+   * IDs. No key may be reserved/read-only.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
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 68a8619b631a..4d07606ac24e 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+ * The response for
+ * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
@@ -305,7 +306,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+   * The response for
+   * [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
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 4dcc56f2f086..6160b1ddf4b7 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ * The request for
+ * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
@@ -404,7 +405,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * The request for
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
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 94f557d6379e..8b940dbe268c 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+ * The response for
+ * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
@@ -248,7 +249,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * The response for
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
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 dee44ef43cfc..2631c9275d21 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
@@ -127,136 +127,144 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
       "\n#google/datastore/v1/datastore.proto\022\023g"
           + "oogle.datastore.v1\032\034google/api/annotatio"
           + "ns.proto\032\027google/api/client.proto\032\037googl"
-          + "e/api/field_behavior.proto\032,google/datas"
-          + "tore/v1/aggregation_result.proto\032 google"
-          + "/datastore/v1/entity.proto\032\037google/datas"
-          + "tore/v1/query.proto\032\037google/protobuf/tim"
-          + "estamp.proto\"\242\001\n\rLookupRequest\022\027\n\nprojec"
-          + "t_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014"
-          + "read_options\030\001 \001(\0132 .google.datastore.v1"
-          + ".ReadOptions\022+\n\004keys\030\003 \003(\0132\030.google.data"
-          + "store.v1.KeyB\003\340A\002\"\321\001\n\016LookupResponse\0220\n\005"
-          + "found\030\001 \003(\0132!.google.datastore.v1.Entity"
-          + "Result\0222\n\007missing\030\002 \003(\0132!.google.datasto"
-          + "re.v1.EntityResult\022*\n\010deferred\030\003 \003(\0132\030.g"
-          + "oogle.datastore.v1.Key\022-\n\tread_time\030\007 \001("
-          + "\0132\032.google.protobuf.Timestamp\"\236\002\n\017RunQue"
-          + "ryRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013da"
-          + "tabase_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.Read"
-          + "Options\022+\n\005query\030\003 \001(\0132\032.google.datastor"
-          + "e.v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google"
-          + ".datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s"
-          + "\n\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.goog"
-          + "le.datastore.v1.QueryResultBatch\022)\n\005quer"
-          + "y\030\002 \001(\0132\032.google.datastore.v1.Query\"\300\002\n\032"
-          + "RunAggregationQueryRequest\022\027\n\nproject_id"
-          + "\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014part"
-          + "ition_id\030\002 \001(\0132 .google.datastore.v1.Par"
-          + "titionId\0226\n\014read_options\030\001 \001(\0132 .google."
-          + "datastore.v1.ReadOptions\022B\n\021aggregation_"
-          + "query\030\003 \001(\0132%.google.datastore.v1.Aggreg"
-          + "ationQueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google"
-          + ".datastore.v1.GqlQueryH\000B\014\n\nquery_type\"\217"
-          + "\001\n\033RunAggregationQueryResponse\022:\n\005batch\030"
-          + "\001 \001(\0132+.google.datastore.v1.AggregationR"
-          + "esultBatch\0224\n\005query\030\002 \001(\0132%.google.datas"
-          + "tore.v1.AggregationQuery\"\215\001\n\027BeginTransa"
-          + "ctionRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n"
-          + "\013database_id\030\t \001(\t\022D\n\023transaction_option"
-          + "s\030\n \001(\0132\'.google.datastore.v1.Transactio"
-          + "nOptions\"/\n\030BeginTransactionResponse\022\023\n\013"
-          + "transaction\030\001 \001(\014\"Y\n\017RollbackRequest\022\027\n\n"
-          + "project_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001"
-          + "(\t\022\030\n\013transaction\030\001 \001(\014B\003\340A\002\"\022\n\020Rollback"
-          + "Response\"\235\002\n\rCommitRequest\022\027\n\nproject_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.CommitReque"
-          + "st.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\tmutati"
-          + "ons\030\006 \003(\0132\035.google.datastore.v1.Mutation"
-          + "\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\rTRANSA"
-          + "CTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026\n\024tran"
-          + "saction_selector\"\227\001\n\016CommitResponse\022=\n\020m"
-          + "utation_results\030\003 \003(\0132#.google.datastore"
-          + ".v1.MutationResult\022\025\n\rindex_updates\030\004 \001("
-          + "\005\022/\n\013commit_time\030\010 \001(\0132\032.google.protobuf"
-          + ".Timestamp\"o\n\022AllocateIdsRequest\022\027\n\nproj"
-          + "ect_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(\013"
-          + "2\030.google.datastore.v1.Key\"n\n\021ReserveIds"
-          + "Request\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013data"
-          + "base_id\030\t \001(\t\022+\n\004keys\030\001 \003(\0132\030.google.dat"
-          + "astore.v1.KeyB\003\340A\002\"\024\n\022ReserveIdsResponse"
-          + "\"\272\002\n\010Mutation\022-\n\006insert\030\004 \001(\0132\033.google.d"
-          + "atastore.v1.EntityH\000\022-\n\006update\030\005 \001(\0132\033.g"
-          + "oogle.datastore.v1.EntityH\000\022-\n\006upsert\030\006 "
-          + "\001(\0132\033.google.datastore.v1.EntityH\000\022*\n\006de"
-          + "lete\030\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026"
-          + "\n\014base_version\030\010 \001(\003H\001\0221\n\013update_time\030\013 "
-          + "\001(\0132\032.google.protobuf.TimestampH\001B\013\n\tope"
-          + "rationB\035\n\033conflict_detection_strategy\"\224\001"
-          + "\n\016MutationResult\022%\n\003key\030\003 \001(\0132\030.google.d"
-          + "atastore.v1.Key\022\017\n\007version\030\004 \001(\003\022/\n\013upda"
-          + "te_time\030\006 \001(\0132\032.google.protobuf.Timestam"
-          + "p\022\031\n\021conflict_detected\030\005 \001(\010\"\206\002\n\013ReadOpt"
-          + "ions\022L\n\020read_consistency\030\001 \001(\01620.google."
-          + "datastore.v1.ReadOptions.ReadConsistency"
-          + "H\000\022\025\n\013transaction\030\002 \001(\014H\000\022/\n\tread_time\030\004"
-          + " \001(\0132\032.google.protobuf.TimestampH\000\"M\n\017Re"
-          + "adConsistency\022 \n\034READ_CONSISTENCY_UNSPEC"
-          + "IFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020con"
-          + "sistency_type\"\222\002\n\022TransactionOptions\022G\n\n"
-          + "read_write\030\001 \001(\01321.google.datastore.v1.T"
-          + "ransactionOptions.ReadWriteH\000\022E\n\tread_on"
-          + "ly\030\002 \001(\01320.google.datastore.v1.Transacti"
-          + "onOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034\n\024pre"
-          + "vious_transaction\030\001 \001(\014\0329\n\010ReadOnly\022-\n\tr"
-          + "ead_time\030\001 \001(\0132\032.google.protobuf.Timesta"
-          + "mpB\006\n\004mode2\310\013\n\tDatastore\022\235\001\n\006Lookup\022\".go"
-          + "ogle.datastore.v1.LookupRequest\032#.google"
-          + ".datastore.v1.LookupResponse\"J\202\323\344\223\002%\" /v"
-          + "1/projects/{project_id}:lookup:\001*\332A\034proj"
-          + "ect_id,read_options,keys\022\206\001\n\010RunQuery\022$."
-          + "google.datastore.v1.RunQueryRequest\032%.go"
-          + "ogle.datastore.v1.RunQueryResponse\"-\202\323\344\223"
-          + "\002\'\"\"/v1/projects/{project_id}:runQuery:\001"
-          + "*\022\262\001\n\023RunAggregationQuery\022/.google.datas"
-          + "tore.v1.RunAggregationQueryRequest\0320.goo"
-          + "gle.datastore.v1.RunAggregationQueryResp"
-          + "onse\"8\202\323\344\223\0022\"-/v1/projects/{project_id}:"
-          + "runAggregationQuery:\001*\022\263\001\n\020BeginTransact"
-          + "ion\022,.google.datastore.v1.BeginTransacti"
-          + "onRequest\032-.google.datastore.v1.BeginTra"
-          + "nsactionResponse\"B\202\323\344\223\002/\"*/v1/projects/{"
-          + "project_id}:beginTransaction:\001*\332A\nprojec"
-          + "t_id\022\302\001\n\006Commit\022\".google.datastore.v1.Co"
-          + "mmitRequest\032#.google.datastore.v1.Commit"
-          + "Response\"o\202\323\344\223\002%\" /v1/projects/{project_"
-          + "id}:commit:\001*\332A%project_id,mode,transact"
-          + "ion,mutations\332A\031project_id,mode,mutation"
-          + "s\022\237\001\n\010Rollback\022$.google.datastore.v1.Rol"
-          + "lbackRequest\032%.google.datastore.v1.Rollb"
-          + "ackResponse\"F\202\323\344\223\002\'\"\"/v1/projects/{proje"
-          + "ct_id}:rollback:\001*\332A\026project_id,transact"
-          + "ion\022\244\001\n\013AllocateIds\022\'.google.datastore.v"
-          + "1.AllocateIdsRequest\032(.google.datastore."
-          + "v1.AllocateIdsResponse\"B\202\323\344\223\002*\"%/v1/proj"
-          + "ects/{project_id}:allocateIds:\001*\332A\017proje"
-          + "ct_id,keys\022\240\001\n\nReserveIds\022&.google.datas"
-          + "tore.v1.ReserveIdsRequest\032\'.google.datas"
-          + "tore.v1.ReserveIdsResponse\"A\202\323\344\223\002)\"$/v1/"
-          + "projects/{project_id}:reserveIds:\001*\332A\017pr"
-          + "oject_id,keys\032v\312A\030datastore.googleapis.c"
-          + "om\322AXhttps://www.googleapis.com/auth/clo"
-          + "ud-platform,https://www.googleapis.com/a"
-          + "uth/datastoreB\300\001\n\027com.google.datastore.v"
-          + "1B\016DatastoreProtoP\001Z
- * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ * The request for
+ * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 
  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
@@ -177,8 +178,8 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -192,8 +193,8 @@ public java.util.List getKeysList() {
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -207,8 +208,8 @@ public java.util.List getKeysOrB
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -222,8 +223,8 @@ public int getKeysCount() {
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -237,8 +238,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -432,7 +433,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   * The request for
+   * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
@@ -910,8 +912,8 @@ private void ensureKeysIsMutable() {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -928,8 +930,8 @@ public java.util.List getKeysList() {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -946,8 +948,8 @@ public int getKeysCount() {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -964,8 +966,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -988,8 +990,8 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1009,8 +1011,8 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1033,8 +1035,8 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1057,8 +1059,8 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1078,8 +1080,8 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1099,8 +1101,8 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1120,8 +1122,8 @@ public Builder addAllKeys(java.lang.Iterable
-     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1141,8 +1143,8 @@ public Builder clearKeys() {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1162,8 +1164,8 @@ public Builder removeKeys(int index) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1176,8 +1178,8 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1194,8 +1196,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1212,8 +1214,8 @@ public java.util.List getKeysOrB
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1226,8 +1228,8 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -1241,8 +1243,8 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
      *
      *
      * 
    -     * Required. A list of keys with complete key paths whose numeric IDs should not be
-     * auto-allocated.
+     * Required. A list of keys with complete key paths whose numeric IDs should
+     * not be auto-allocated.
      * 
    
      *
      * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
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 f48701f729f0..1fcfbaa39aa7 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
@@ -81,8 +81,8 @@ public interface ReserveIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -93,8 +93,8 @@ public interface ReserveIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -105,8 +105,8 @@ public interface ReserveIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -117,8 +117,8 @@ public interface ReserveIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -129,8 +129,8 @@ public interface ReserveIdsRequestOrBuilder
    *
    *
    * 
    -   * Required. A list of keys with complete key paths whose numeric IDs should not be
-   * auto-allocated.
+   * Required. A list of keys with complete key paths whose numeric IDs should
+   * not be auto-allocated.
    * 
    
    *
    * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
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 6a3398d4dae8..50b3ccd6994e 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+ * The response for
+ * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
@@ -219,7 +220,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+   * The response for
+   * [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
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 43e61c469d6e..e1d82c4bf123 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
@@ -22,8 +22,9 @@
  *
  *
  * 
    - * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
- * (an empty message).
+ * The response for
+ * [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
+ * message).
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.RollbackResponse}
@@ -219,8 +220,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
-   * (an empty message).
+   * The response for
+   * [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
+   * message).
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.RollbackResponse}
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 690015e935e6..7bbd7f12313e 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+ * The request for
+ * [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.RunAggregationQueryRequest}
@@ -663,7 +664,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+   * The request for
+   * [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.RunAggregationQueryRequest}
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 230d90f47a28..13810be9b956 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+ * The response for
+ * [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.RunAggregationQueryResponse}
@@ -341,7 +342,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+   * The response for
+   * [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.RunAggregationQueryResponse}
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 0eb1eb818d42..40c3e454c333 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+ * The response for
+ * [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.RunQueryResponse}
@@ -338,7 +339,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+   * The response for
+   * [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.RunQueryResponse}
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 fc965df9dd2b..238514301de0 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
@@ -24,8 +24,10 @@
  * 
      * 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
- * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+ * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
+ * or implicitly by setting
+ * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+ * in read requests.
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.TransactionOptions}
@@ -1689,8 +1691,10 @@ 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
-   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+   * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
+   * or implicitly by setting
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * in read requests.
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions}
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 e891e058f819..f064a642730e 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
@@ -19,6 +19,7 @@ package google.datastore.v1;
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
+import "google/api/routing.proto";
 import "google/datastore/v1/aggregation_result.proto";
 import "google/datastore/v1/entity.proto";
 import "google/datastore/v1/query.proto";
@@ -51,6 +52,10 @@ service Datastore {
       post: "/v1/projects/{project_id}:lookup"
       body: "*"
     };
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
     option (google.api.method_signature) = "project_id,read_options,keys";
   }
 
@@ -60,22 +65,36 @@ service Datastore {
       post: "/v1/projects/{project_id}:runQuery"
       body: "*"
     };
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
   }
 
   // Runs an aggregation query.
-  rpc RunAggregationQuery(RunAggregationQueryRequest) returns (RunAggregationQueryResponse) {
+  rpc RunAggregationQuery(RunAggregationQueryRequest)
+      returns (RunAggregationQueryResponse) {
     option (google.api.http) = {
       post: "/v1/projects/{project_id}:runAggregationQuery"
       body: "*"
     };
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
   }
 
   // Begins a new transaction.
-  rpc BeginTransaction(BeginTransactionRequest) returns (BeginTransactionResponse) {
+  rpc BeginTransaction(BeginTransactionRequest)
+      returns (BeginTransactionResponse) {
     option (google.api.http) = {
       post: "/v1/projects/{project_id}:beginTransaction"
       body: "*"
     };
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
     option (google.api.method_signature) = "project_id";
   }
 
@@ -86,7 +105,12 @@ service Datastore {
       post: "/v1/projects/{project_id}:commit"
       body: "*"
     };
-    option (google.api.method_signature) = "project_id,mode,transaction,mutations";
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
+    option (google.api.method_signature) =
+        "project_id,mode,transaction,mutations";
     option (google.api.method_signature) = "project_id,mode,mutations";
   }
 
@@ -96,6 +120,10 @@ service Datastore {
       post: "/v1/projects/{project_id}:rollback"
       body: "*"
     };
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
     option (google.api.method_signature) = "project_id,transaction";
   }
 
@@ -106,6 +134,10 @@ service Datastore {
       post: "/v1/projects/{project_id}:allocateIds"
       body: "*"
     };
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
     option (google.api.method_signature) = "project_id,keys";
   }
 
@@ -116,6 +148,10 @@ service Datastore {
       post: "/v1/projects/{project_id}:reserveIds"
       body: "*"
     };
+    option (google.api.routing) = {
+      routing_parameters { field: "project_id" }
+      routing_parameters { field: "database_id" }
+    };
     option (google.api.method_signature) = "project_id,keys";
   }
 }
@@ -189,7 +225,8 @@ message RunQueryRequest {
   }
 }
 
-// The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
+// The response for
+// [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
 message RunQueryResponse {
   // A batch of query results (always present).
   QueryResultBatch batch = 1;
@@ -198,7 +235,8 @@ message RunQueryResponse {
   Query query = 2;
 }
 
-// The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+// The request for
+// [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
 message RunAggregationQueryRequest {
   // Required. The ID of the project against which to make the request.
   string project_id = 8 [(google.api.field_behavior) = REQUIRED];
@@ -228,7 +266,8 @@ message RunAggregationQueryRequest {
   }
 }
 
-// The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+// The response for
+// [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
 message RunAggregationQueryResponse {
   // A batch of aggregation results. Always present.
   AggregationResultBatch batch = 1;
@@ -237,7 +276,8 @@ message RunAggregationQueryResponse {
   AggregationQuery query = 2;
 }
 
-// The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+// The request for
+// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 message BeginTransactionRequest {
   // Required. The ID of the project against which to make the request.
   string project_id = 8 [(google.api.field_behavior) = REQUIRED];
@@ -252,7 +292,8 @@ message BeginTransactionRequest {
   TransactionOptions transaction_options = 10;
 }
 
-// The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+// The response for
+// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 message BeginTransactionResponse {
   // The transaction identifier (always present).
   bytes transaction = 1;
@@ -274,11 +315,10 @@ message RollbackRequest {
   bytes transaction = 1 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
-// (an empty message).
-message RollbackResponse {
-
-}
+// The response for
+// [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. (an empty
+// message).
+message RollbackResponse {}
 
 // The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
 message CommitRequest {
@@ -346,7 +386,8 @@ message CommitResponse {
   google.protobuf.Timestamp commit_time = 8;
 }
 
-// The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+// The request for
+// [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
 message AllocateIdsRequest {
   // Required. The ID of the project against which to make the request.
   string project_id = 8 [(google.api.field_behavior) = REQUIRED];
@@ -357,19 +398,21 @@ message AllocateIdsRequest {
   // 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.
+  // 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];
 }
 
-// The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
+// The response for
+// [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
 message AllocateIdsResponse {
   // The keys specified in the request (in the same order), each with
   // its key path completed with a newly allocated ID.
   repeated Key keys = 1;
 }
 
-// The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+// The request for
+// [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
 message ReserveIdsRequest {
   // Required. The ID of the project against which to make the request.
   string project_id = 8 [(google.api.field_behavior) = REQUIRED];
@@ -380,15 +423,14 @@ message ReserveIdsRequest {
   // database.
   string database_id = 9;
 
-  // Required. A list of keys with complete key paths whose numeric IDs should not be
-  // auto-allocated.
+  // Required. A list of keys with complete key paths whose numeric IDs should
+  // not be auto-allocated.
   repeated Key keys = 1 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
-message ReserveIdsResponse {
-
-}
+// The response for
+// [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
+message ReserveIdsResponse {}
 
 // A mutation to apply to an entity.
 message Mutation {
@@ -501,8 +543,10 @@ message ReadOptions {
 // 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
-// [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction] in read requests.
+// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
+// or implicitly by setting
+// [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+// in read requests.
 message TransactionOptions {
   // Options specific to read / write transactions.
   message ReadWrite {

From 232162c1fc59f0d472627edda5f24c3aa34a985e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 20 Jan 2023 11:02:56 -0500
Subject: [PATCH 1046/1784] chore(bazel): update protobuf to v3.21.12 (#961)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: new transaction options for datastoreV1

PiperOrigin-RevId: 501960571

Source-Link: https://github.com/googleapis/googleapis/commit/d4599ad2c2374feb1b508096cbd89e6e3079eb24

Source-Link: https://github.com/googleapis/googleapis-gen/commit/02ff42cf030965b9006243c697e761fdcabb8ca1
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDJmZjQyY2YwMzA5NjViOTAwNjI0M2M2OTdlNzYxZmRjYWJiOGNhMSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore(bazel): update protobuf to v3.21.12

PiperOrigin-RevId: 503267695

Source-Link: https://github.com/googleapis/googleapis/commit/c79059008c6d2e66d4cc65a1a7d8bee7160e3f83

Source-Link: https://github.com/googleapis/googleapis-gen/commit/b98230b9e68a3828cf138296e9a20e03749ae0a0
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjk4MjMwYjllNjhhMzgyOGNmMTM4Mjk2ZTlhMjBlMDM3NDlhZTBhMCJ9

* 🦉 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 +-
 .../datastore/admin/v1/CommonMetadata.java    | 184 ++++----
 .../admin/v1/CommonMetadataOrBuilder.java     |   1 -
 .../admin/v1/CreateIndexRequest.java          |  81 ++--
 .../DatastoreFirestoreMigrationMetadata.java  |  53 ++-
 .../admin/v1/DeleteIndexRequest.java          |  46 +-
 .../datastore/admin/v1/EntityFilter.java      |  21 +-
 .../admin/v1/ExportEntitiesMetadata.java      | 255 +++++-----
 .../admin/v1/ExportEntitiesRequest.java       | 130 +++--
 .../v1/ExportEntitiesRequestOrBuilder.java    |   1 -
 .../admin/v1/ExportEntitiesResponse.java      |  28 +-
 .../datastore/admin/v1/GetIndexRequest.java   |  46 +-
 .../admin/v1/ImportEntitiesMetadata.java      | 255 +++++-----
 .../admin/v1/ImportEntitiesRequest.java       | 130 +++--
 .../v1/ImportEntitiesRequestOrBuilder.java    |   1 -
 .../com/google/datastore/admin/v1/Index.java  | 182 ++++---
 .../admin/v1/IndexOperationMetadata.java      | 141 +++---
 .../admin/v1/ListIndexesRequest.java          |  76 ++-
 .../admin/v1/ListIndexesResponse.java         |  38 +-
 .../admin/v1/MigrationProgressEvent.java      | 122 +++--
 .../admin/v1/MigrationStateEvent.java         |  31 +-
 .../google/datastore/admin/v1/Progress.java   |  34 +-
 .../google/datastore/v1/AggregationQuery.java | 157 +++---
 .../datastore/v1/AggregationResult.java       |  39 +-
 .../datastore/v1/AggregationResultBatch.java  |  91 ++--
 .../v1/AggregationResultOrBuilder.java        |   1 -
 .../datastore/v1/AllocateIdsRequest.java      |  73 ++-
 .../datastore/v1/AllocateIdsResponse.java     |  19 +-
 .../com/google/datastore/v1/ArrayValue.java   |  19 +-
 .../datastore/v1/BeginTransactionRequest.java | 105 +++--
 .../v1/BeginTransactionResponse.java          |  23 +-
 .../google/datastore/v1/CommitRequest.java    | 445 ++++++++++++++++--
 .../datastore/v1/CommitRequestOrBuilder.java  |  47 ++
 .../google/datastore/v1/CommitResponse.java   |  82 ++--
 .../google/datastore/v1/CompositeFilter.java  |  58 ++-
 .../google/datastore/v1/DatastoreProto.java   | 273 +++++------
 .../java/com/google/datastore/v1/Entity.java  |  89 ++--
 .../google/datastore/v1/EntityOrBuilder.java  |   1 -
 .../com/google/datastore/v1/EntityResult.java | 139 +++---
 .../java/com/google/datastore/v1/Filter.java  |  37 +-
 .../com/google/datastore/v1/GqlQuery.java     |  97 ++--
 .../datastore/v1/GqlQueryOrBuilder.java       |   1 -
 .../datastore/v1/GqlQueryParameter.java       |  29 +-
 .../java/com/google/datastore/v1/Key.java     | 133 +++---
 .../google/datastore/v1/KindExpression.java   |  28 +-
 .../google/datastore/v1/LookupRequest.java    | 129 ++---
 .../google/datastore/v1/LookupResponse.java   | 182 +++++--
 .../datastore/v1/LookupResponseOrBuilder.java |  16 +
 .../com/google/datastore/v1/Mutation.java     |  71 ++-
 .../google/datastore/v1/MutationResult.java   | 137 +++---
 .../com/google/datastore/v1/PartitionId.java  |  64 ++-
 .../com/google/datastore/v1/Projection.java   |  65 +--
 .../google/datastore/v1/PropertyFilter.java   | 138 +++---
 .../google/datastore/v1/PropertyOrder.java    |  86 ++--
 .../datastore/v1/PropertyReference.java       |  28 +-
 .../java/com/google/datastore/v1/Query.java   | 203 ++++----
 .../google/datastore/v1/QueryResultBatch.java | 180 +++----
 .../com/google/datastore/v1/ReadOptions.java  | 394 +++++++++++++++-
 .../datastore/v1/ReadOptionsOrBuilder.java    |  50 ++
 .../datastore/v1/ReserveIdsRequest.java       |  73 ++-
 .../google/datastore/v1/RollbackRequest.java  |  59 ++-
 .../v1/RunAggregationQueryRequest.java        | 185 ++++----
 .../v1/RunAggregationQueryResponse.java       | 231 ++++++---
 .../RunAggregationQueryResponseOrBuilder.java |  16 +
 .../google/datastore/v1/RunQueryRequest.java  | 185 ++++----
 .../google/datastore/v1/RunQueryResponse.java | 226 ++++++---
 .../v1/RunQueryResponseOrBuilder.java         |  16 +
 .../datastore/v1/TransactionOptions.java      | 122 +++--
 .../java/com/google/datastore/v1/Value.java   | 111 ++---
 .../proto/google/datastore/v1/datastore.proto |  37 ++
 70 files changed, 4413 insertions(+), 2435 deletions(-)

diff --git a/README.md b/README.md
index e53994c08116..575a44c4961b 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.3.0')
+implementation platform('com.google.cloud:libraries-bom:26.4.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 213d7ac3ac37..6ace69444c64 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -393,7 +393,7 @@ public com.google.protobuf.Timestamp getStartTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
-    return getStartTime();
+    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
   }
 
   public static final int END_TIME_FIELD_NUMBER = 2;
@@ -439,11 +439,11 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return getEndTime();
+    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
   }
 
   public static final int OPERATION_TYPE_FIELD_NUMBER = 3;
-  private int operationType_;
+  private int operationType_ = 0;
   /**
    *
    *
@@ -474,9 +474,8 @@ public int getOperationTypeValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.OperationType getOperationType() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.OperationType result =
-        com.google.datastore.admin.v1.OperationType.valueOf(operationType_);
+        com.google.datastore.admin.v1.OperationType.forNumber(operationType_);
     return result == null ? com.google.datastore.admin.v1.OperationType.UNRECOGNIZED : result;
   }
 
@@ -493,6 +492,7 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField labels_;
 
   private com.google.protobuf.MapField internalGetLabels() {
@@ -553,7 +553,10 @@ public java.util.Map getLabelsMap() {
    * map<string, string> labels = 4;
    */
   @java.lang.Override
-  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -583,7 +586,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
   }
 
   public static final int STATE_FIELD_NUMBER = 5;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -612,9 +615,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.CommonMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.CommonMetadata.State result =
-        com.google.datastore.admin.v1.CommonMetadata.State.valueOf(state_);
+        com.google.datastore.admin.v1.CommonMetadata.State.forNumber(state_);
     return result == null
         ? com.google.datastore.admin.v1.CommonMetadata.State.UNRECOGNIZED
         : result;
@@ -895,23 +897,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-      } else {
-        startTime_ = null;
+      bitField0_ = 0;
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-      } else {
-        endTime_ = null;
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
       operationType_ = 0;
-
       internalGetMutableLabels().clear();
       state_ = 0;
-
       return this;
     }
 
@@ -939,25 +938,33 @@ public com.google.datastore.admin.v1.CommonMetadata build() {
     public com.google.datastore.admin.v1.CommonMetadata buildPartial() {
       com.google.datastore.admin.v1.CommonMetadata result =
           new com.google.datastore.admin.v1.CommonMetadata(this);
-      int from_bitField0_ = bitField0_;
-      if (startTimeBuilder_ == null) {
-        result.startTime_ = startTime_;
-      } else {
-        result.startTime_ = startTimeBuilder_.build();
-      }
-      if (endTimeBuilder_ == null) {
-        result.endTime_ = endTime_;
-      } else {
-        result.endTime_ = endTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.operationType_ = operationType_;
-      result.labels_ = internalGetLabels();
-      result.labels_.makeImmutable();
-      result.state_ = state_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.CommonMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.operationType_ = operationType_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.labels_ = internalGetLabels();
+        result.labels_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.state_ = state_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1013,6 +1020,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.CommonMetadata other) {
         setOperationTypeValue(other.getOperationTypeValue());
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
+      bitField0_ |= 0x00000008;
       if (other.state_ != 0) {
         setStateValue(other.getStateValue());
       }
@@ -1045,19 +1053,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 24:
               {
                 operationType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 24
             case 34:
@@ -1069,12 +1077,13 @@ public Builder mergeFrom(
                 internalGetMutableLabels()
                     .getMutableMap()
                     .put(labels__.getKey(), labels__.getValue());
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 40:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 40
             default:
@@ -1114,7 +1123,7 @@ public Builder mergeFrom(
      * @return Whether the startTime field is set.
      */
     public boolean hasStartTime() {
-      return startTimeBuilder_ != null || startTime_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -1149,11 +1158,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         startTime_ = value;
-        onChanged();
       } else {
         startTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1168,11 +1177,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
     public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (startTimeBuilder_ == null) {
         startTime_ = builderForValue.build();
-        onChanged();
       } else {
         startTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1186,17 +1195,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
      */
     public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
       if (startTimeBuilder_ == null) {
-        if (startTime_ != null) {
-          startTime_ =
-              com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && startTime_ != null
+            && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getStartTimeBuilder().mergeFrom(value);
         } else {
           startTime_ = value;
         }
-        onChanged();
       } else {
         startTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1209,14 +1219,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp start_time = 1;
      */
     public Builder clearStartTime() {
-      if (startTimeBuilder_ == null) {
-        startTime_ = null;
-        onChanged();
-      } else {
-        startTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      startTime_ = null;
+      if (startTimeBuilder_ != null) {
+        startTimeBuilder_.dispose();
         startTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1229,7 +1238,7 @@ public Builder clearStartTime() {
      * .google.protobuf.Timestamp start_time = 1;
      */
     public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getStartTimeFieldBuilder().getBuilder();
     }
@@ -1293,7 +1302,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return endTimeBuilder_ != null || endTime_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1328,11 +1337,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
-        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1347,11 +1356,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (endTimeBuilder_ == null) {
         endTime_ = builderForValue.build();
-        onChanged();
       } else {
         endTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1365,17 +1374,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (endTime_ != null) {
-          endTime_ =
-              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && endTime_ != null
+            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getEndTimeBuilder().mergeFrom(value);
         } else {
           endTime_ = value;
         }
-        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1388,14 +1398,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp end_time = 2;
      */
     public Builder clearEndTime() {
-      if (endTimeBuilder_ == null) {
-        endTime_ = null;
-        onChanged();
-      } else {
-        endTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      endTime_ = null;
+      if (endTimeBuilder_ != null) {
+        endTimeBuilder_.dispose();
         endTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1408,7 +1417,7 @@ public Builder clearEndTime() {
      * .google.protobuf.Timestamp end_time = 2;
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
@@ -1485,8 +1494,8 @@ public int getOperationTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setOperationTypeValue(int value) {
-
       operationType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1504,9 +1513,8 @@ public Builder setOperationTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.OperationType getOperationType() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.OperationType result =
-          com.google.datastore.admin.v1.OperationType.valueOf(operationType_);
+          com.google.datastore.admin.v1.OperationType.forNumber(operationType_);
       return result == null ? com.google.datastore.admin.v1.OperationType.UNRECOGNIZED : result;
     }
     /**
@@ -1526,7 +1534,7 @@ public Builder setOperationType(com.google.datastore.admin.v1.OperationType valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       operationType_ = value.getNumber();
       onChanged();
       return this;
@@ -1544,7 +1552,7 @@ public Builder setOperationType(com.google.datastore.admin.v1.OperationType valu
      * @return This builder for chaining.
      */
     public Builder clearOperationType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       operationType_ = 0;
       onChanged();
       return this;
@@ -1561,14 +1569,14 @@ private com.google.protobuf.MapField interna
 
     private com.google.protobuf.MapField
         internalGetMutableLabels() {
-      onChanged();
-      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
+      bitField0_ |= 0x00000008;
+      onChanged();
       return labels_;
     }
 
@@ -1623,8 +1631,10 @@ public java.util.Map getLabelsMap() {
      * map<string, string> labels = 4;
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1654,6 +1664,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
+      bitField0_ = (bitField0_ & ~0x00000008);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -1677,6 +1688,7 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
+      bitField0_ |= 0x00000008;
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -1696,8 +1708,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableLabels().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000008;
       return this;
     }
     /**
@@ -1712,6 +1724,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000008;
       return this;
     }
 
@@ -1744,8 +1757,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1762,9 +1775,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.CommonMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.CommonMetadata.State result =
-          com.google.datastore.admin.v1.CommonMetadata.State.valueOf(state_);
+          com.google.datastore.admin.v1.CommonMetadata.State.forNumber(state_);
       return result == null
           ? com.google.datastore.admin.v1.CommonMetadata.State.UNRECOGNIZED
           : result;
@@ -1785,7 +1797,7 @@ public Builder setState(com.google.datastore.admin.v1.CommonMetadata.State value
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000010;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -1802,7 +1814,7 @@ public Builder setState(com.google.datastore.admin.v1.CommonMetadata.State value
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       state_ = 0;
       onChanged();
       return this;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index a67d22e0fcf3..85322a2ca68c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -166,7 +166,6 @@ public interface CommonMetadataOrBuilder
    *
    * map<string, string> labels = 4;
    */
-
   /* nullable */
   java.lang.String getLabelsOrDefault(
       java.lang.String key,
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index e8d4a3e2915b..065cbc7cdbdb 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -163,7 +165,7 @@ public com.google.datastore.admin.v1.Index getIndex() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.IndexOrBuilder getIndexOrBuilder() {
-    return getIndex();
+    return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -378,12 +380,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
-      if (indexBuilder_ == null) {
-        index_ = null;
-      } else {
-        index_ = null;
+      index_ = null;
+      if (indexBuilder_ != null) {
+        indexBuilder_.dispose();
         indexBuilder_ = null;
       }
       return this;
@@ -413,16 +414,23 @@ public com.google.datastore.admin.v1.CreateIndexRequest build() {
     public com.google.datastore.admin.v1.CreateIndexRequest buildPartial() {
       com.google.datastore.admin.v1.CreateIndexRequest result =
           new com.google.datastore.admin.v1.CreateIndexRequest(this);
-      result.projectId_ = projectId_;
-      if (indexBuilder_ == null) {
-        result.index_ = index_;
-      } else {
-        result.index_ = indexBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.CreateIndexRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.index_ = indexBuilder_ == null ? index_ : indexBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -471,6 +479,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.CreateIndexRequest other)
         return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasIndex()) {
@@ -505,13 +514,13 @@ public Builder mergeFrom(
             case 10:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 input.readMessage(getIndexFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -531,6 +540,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -592,8 +603,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -609,8 +620,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -631,8 +642,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -656,7 +667,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the index field is set.
      */
     public boolean hasIndex() {
-      return indexBuilder_ != null || index_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -693,11 +704,11 @@ public Builder setIndex(com.google.datastore.admin.v1.Index value) {
           throw new NullPointerException();
         }
         index_ = value;
-        onChanged();
       } else {
         indexBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -713,11 +724,11 @@ public Builder setIndex(com.google.datastore.admin.v1.Index value) {
     public Builder setIndex(com.google.datastore.admin.v1.Index.Builder builderForValue) {
       if (indexBuilder_ == null) {
         index_ = builderForValue.build();
-        onChanged();
       } else {
         indexBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -732,19 +743,18 @@ public Builder setIndex(com.google.datastore.admin.v1.Index.Builder builderForVa
      */
     public Builder mergeIndex(com.google.datastore.admin.v1.Index value) {
       if (indexBuilder_ == null) {
-        if (index_ != null) {
-          index_ =
-              com.google.datastore.admin.v1.Index.newBuilder(index_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && index_ != null
+            && index_ != com.google.datastore.admin.v1.Index.getDefaultInstance()) {
+          getIndexBuilder().mergeFrom(value);
         } else {
           index_ = value;
         }
-        onChanged();
       } else {
         indexBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -758,14 +768,13 @@ public Builder mergeIndex(com.google.datastore.admin.v1.Index value) {
      * .google.datastore.admin.v1.Index index = 3;
      */
     public Builder clearIndex() {
-      if (indexBuilder_ == null) {
-        index_ = null;
-        onChanged();
-      } else {
-        index_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      index_ = null;
+      if (indexBuilder_ != null) {
+        indexBuilder_.dispose();
         indexBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -779,7 +788,7 @@ public Builder clearIndex() {
      * .google.datastore.admin.v1.Index index = 3;
      */
     public com.google.datastore.admin.v1.Index.Builder getIndexBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getIndexFieldBuilder().getBuilder();
     }
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index cdba4426d70d..e3a90b214a97 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -76,7 +76,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int MIGRATION_STATE_FIELD_NUMBER = 1;
-  private int migrationState_;
+  private int migrationState_ = 0;
   /**
    *
    *
@@ -107,14 +107,13 @@ public int getMigrationStateValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.MigrationState getMigrationState() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.MigrationState result =
-        com.google.datastore.admin.v1.MigrationState.valueOf(migrationState_);
+        com.google.datastore.admin.v1.MigrationState.forNumber(migrationState_);
     return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
   }
 
   public static final int MIGRATION_STEP_FIELD_NUMBER = 2;
-  private int migrationStep_;
+  private int migrationStep_ = 0;
   /**
    *
    *
@@ -145,9 +144,8 @@ public int getMigrationStepValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.MigrationStep getMigrationStep() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.MigrationStep result =
-        com.google.datastore.admin.v1.MigrationStep.valueOf(migrationStep_);
+        com.google.datastore.admin.v1.MigrationStep.forNumber(migrationStep_);
     return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
   }
 
@@ -369,10 +367,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       migrationState_ = 0;
-
       migrationStep_ = 0;
-
       return this;
     }
 
@@ -401,12 +398,24 @@ public com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata build()
     public com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata buildPartial() {
       com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata result =
           new com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata(this);
-      result.migrationState_ = migrationState_;
-      result.migrationStep_ = migrationStep_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(
+        com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.migrationState_ = migrationState_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.migrationStep_ = migrationStep_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -490,13 +499,13 @@ public Builder mergeFrom(
             case 8:
               {
                 migrationState_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 migrationStep_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -516,6 +525,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int migrationState_ = 0;
     /**
      *
@@ -547,8 +558,8 @@ public int getMigrationStateValue() {
      * @return This builder for chaining.
      */
     public Builder setMigrationStateValue(int value) {
-
       migrationState_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -566,9 +577,8 @@ public Builder setMigrationStateValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.MigrationState getMigrationState() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.MigrationState result =
-          com.google.datastore.admin.v1.MigrationState.valueOf(migrationState_);
+          com.google.datastore.admin.v1.MigrationState.forNumber(migrationState_);
       return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
     }
     /**
@@ -588,7 +598,7 @@ public Builder setMigrationState(com.google.datastore.admin.v1.MigrationState va
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       migrationState_ = value.getNumber();
       onChanged();
       return this;
@@ -606,7 +616,7 @@ public Builder setMigrationState(com.google.datastore.admin.v1.MigrationState va
      * @return This builder for chaining.
      */
     public Builder clearMigrationState() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       migrationState_ = 0;
       onChanged();
       return this;
@@ -643,8 +653,8 @@ public int getMigrationStepValue() {
      * @return This builder for chaining.
      */
     public Builder setMigrationStepValue(int value) {
-
       migrationStep_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -662,9 +672,8 @@ public Builder setMigrationStepValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.MigrationStep getMigrationStep() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.MigrationStep result =
-          com.google.datastore.admin.v1.MigrationStep.valueOf(migrationStep_);
+          com.google.datastore.admin.v1.MigrationStep.forNumber(migrationStep_);
       return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
     }
     /**
@@ -684,7 +693,7 @@ public Builder setMigrationStep(com.google.datastore.admin.v1.MigrationStep valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       migrationStep_ = value.getNumber();
       onChanged();
       return this;
@@ -702,7 +711,7 @@ public Builder setMigrationStep(com.google.datastore.admin.v1.MigrationStep valu
      * @return This builder for chaining.
      */
     public Builder clearMigrationStep() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       migrationStep_ = 0;
       onChanged();
       return this;
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 e619b5f68af4..44a18f71447c 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
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int INDEX_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object indexId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object indexId_ = "";
   /**
    *
    *
@@ -374,10 +378,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       indexId_ = "";
-
       return this;
     }
 
@@ -405,12 +408,23 @@ public com.google.datastore.admin.v1.DeleteIndexRequest build() {
     public com.google.datastore.admin.v1.DeleteIndexRequest buildPartial() {
       com.google.datastore.admin.v1.DeleteIndexRequest result =
           new com.google.datastore.admin.v1.DeleteIndexRequest(this);
-      result.projectId_ = projectId_;
-      result.indexId_ = indexId_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.DeleteIndexRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.indexId_ = indexId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -459,10 +473,12 @@ public Builder mergeFrom(com.google.datastore.admin.v1.DeleteIndexRequest other)
         return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getIndexId().isEmpty()) {
         indexId_ = other.indexId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -494,13 +510,13 @@ public Builder mergeFrom(
             case 10:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 indexId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -520,6 +536,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -581,8 +599,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -598,8 +616,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -620,8 +638,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -687,8 +705,8 @@ public Builder setIndexId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       indexId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -704,8 +722,8 @@ public Builder setIndexId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearIndexId() {
-
       indexId_ = getDefaultInstance().getIndexId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -726,8 +744,8 @@ public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       indexId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 d4a5e39affe4..4dfe2cd4507f 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
@@ -82,6 +82,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_;
   /**
    *
@@ -143,6 +145,8 @@ 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_;
   /**
    *
@@ -456,6 +460,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       kinds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
       namespaceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -487,7 +492,15 @@ 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);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.admin.v1.EntityFilter result) {
       if (((bitField0_ & 0x00000001) != 0)) {
         kinds_ = kinds_.getUnmodifiableView();
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -498,8 +511,10 @@ public com.google.datastore.admin.v1.EntityFilter buildPartial() {
         bitField0_ = (bitField0_ & ~0x00000002);
       }
       result.namespaceIds_ = namespaceIds_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.admin.v1.EntityFilter result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 75d4feb05396..5982b68d17e9 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
@@ -112,7 +112,9 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null
+        ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+        : common_;
   }
 
   public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
@@ -160,7 +162,9 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
-    return getProgressEntities();
+    return progressEntities_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressEntities_;
   }
 
   public static final int PROGRESS_BYTES_FIELD_NUMBER = 3;
@@ -208,7 +212,9 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder() {
-    return getProgressBytes();
+    return progressBytes_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressBytes_;
   }
 
   public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
@@ -256,11 +262,15 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
-    return getEntityFilter();
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
   }
 
   public static final int OUTPUT_URL_PREFIX_FIELD_NUMBER = 5;
-  private volatile java.lang.Object outputUrlPrefix_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object outputUrlPrefix_ = "";
   /**
    *
    *
@@ -569,32 +579,28 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-      if (progressEntitiesBuilder_ == null) {
-        progressEntities_ = null;
-      } else {
-        progressEntities_ = null;
+      progressEntities_ = null;
+      if (progressEntitiesBuilder_ != null) {
+        progressEntitiesBuilder_.dispose();
         progressEntitiesBuilder_ = null;
       }
-      if (progressBytesBuilder_ == null) {
-        progressBytes_ = null;
-      } else {
-        progressBytes_ = null;
+      progressBytes_ = null;
+      if (progressBytesBuilder_ != null) {
+        progressBytesBuilder_.dispose();
         progressBytesBuilder_ = null;
       }
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-      } else {
-        entityFilter_ = null;
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
       outputUrlPrefix_ = "";
-
       return this;
     }
 
@@ -622,29 +628,33 @@ public com.google.datastore.admin.v1.ExportEntitiesMetadata build() {
     public com.google.datastore.admin.v1.ExportEntitiesMetadata buildPartial() {
       com.google.datastore.admin.v1.ExportEntitiesMetadata result =
           new com.google.datastore.admin.v1.ExportEntitiesMetadata(this);
-      if (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (progressEntitiesBuilder_ == null) {
-        result.progressEntities_ = progressEntities_;
-      } else {
-        result.progressEntities_ = progressEntitiesBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.admin.v1.ExportEntitiesMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
       }
-      if (progressBytesBuilder_ == null) {
-        result.progressBytes_ = progressBytes_;
-      } else {
-        result.progressBytes_ = progressBytesBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.progressEntities_ =
+            progressEntitiesBuilder_ == null ? progressEntities_ : progressEntitiesBuilder_.build();
       }
-      if (entityFilterBuilder_ == null) {
-        result.entityFilter_ = entityFilter_;
-      } else {
-        result.entityFilter_ = entityFilterBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.progressBytes_ =
+            progressBytesBuilder_ == null ? progressBytes_ : progressBytesBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.entityFilter_ =
+            entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.outputUrlPrefix_ = outputUrlPrefix_;
       }
-      result.outputUrlPrefix_ = outputUrlPrefix_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -707,6 +717,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesMetadata ot
       }
       if (!other.getOutputUrlPrefix().isEmpty()) {
         outputUrlPrefix_ = other.outputUrlPrefix_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -738,32 +749,32 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getProgressBytesFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 outputUrlPrefix_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             default:
@@ -783,6 +794,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.admin.v1.CommonMetadata common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.admin.v1.CommonMetadata,
@@ -801,7 +814,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -838,11 +851,11 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -857,11 +870,11 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
     public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
-        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -875,19 +888,18 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu
      */
     public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.datastore.admin.v1.CommonMetadata.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -900,14 +912,13 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
      * .google.datastore.admin.v1.CommonMetadata common = 1;
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -920,7 +931,7 @@ public Builder clearCommon() {
      * .google.datastore.admin.v1.CommonMetadata common = 1;
      */
     public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
@@ -986,7 +997,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
      * @return Whether the progressEntities field is set.
      */
     public boolean hasProgressEntities() {
-      return progressEntitiesBuilder_ != null || progressEntities_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1023,11 +1034,11 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value)
           throw new NullPointerException();
         }
         progressEntities_ = value;
-        onChanged();
       } else {
         progressEntitiesBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1043,11 +1054,11 @@ public Builder setProgressEntities(
         com.google.datastore.admin.v1.Progress.Builder builderForValue) {
       if (progressEntitiesBuilder_ == null) {
         progressEntities_ = builderForValue.build();
-        onChanged();
       } else {
         progressEntitiesBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1061,19 +1072,18 @@ public Builder setProgressEntities(
      */
     public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress value) {
       if (progressEntitiesBuilder_ == null) {
-        if (progressEntities_ != null) {
-          progressEntities_ =
-              com.google.datastore.admin.v1.Progress.newBuilder(progressEntities_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && progressEntities_ != null
+            && progressEntities_ != com.google.datastore.admin.v1.Progress.getDefaultInstance()) {
+          getProgressEntitiesBuilder().mergeFrom(value);
         } else {
           progressEntities_ = value;
         }
-        onChanged();
       } else {
         progressEntitiesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1086,14 +1096,13 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
      * .google.datastore.admin.v1.Progress progress_entities = 2;
      */
     public Builder clearProgressEntities() {
-      if (progressEntitiesBuilder_ == null) {
-        progressEntities_ = null;
-        onChanged();
-      } else {
-        progressEntities_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      progressEntities_ = null;
+      if (progressEntitiesBuilder_ != null) {
+        progressEntitiesBuilder_.dispose();
         progressEntitiesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1106,7 +1115,7 @@ public Builder clearProgressEntities() {
      * .google.datastore.admin.v1.Progress progress_entities = 2;
      */
     public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getProgressEntitiesFieldBuilder().getBuilder();
     }
@@ -1172,7 +1181,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
      * @return Whether the progressBytes field is set.
      */
     public boolean hasProgressBytes() {
-      return progressBytesBuilder_ != null || progressBytes_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1209,11 +1218,11 @@ public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) {
           throw new NullPointerException();
         }
         progressBytes_ = value;
-        onChanged();
       } else {
         progressBytesBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1229,11 +1238,11 @@ public Builder setProgressBytes(
         com.google.datastore.admin.v1.Progress.Builder builderForValue) {
       if (progressBytesBuilder_ == null) {
         progressBytes_ = builderForValue.build();
-        onChanged();
       } else {
         progressBytesBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1247,19 +1256,18 @@ public Builder setProgressBytes(
      */
     public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value) {
       if (progressBytesBuilder_ == null) {
-        if (progressBytes_ != null) {
-          progressBytes_ =
-              com.google.datastore.admin.v1.Progress.newBuilder(progressBytes_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && progressBytes_ != null
+            && progressBytes_ != com.google.datastore.admin.v1.Progress.getDefaultInstance()) {
+          getProgressBytesBuilder().mergeFrom(value);
         } else {
           progressBytes_ = value;
         }
-        onChanged();
       } else {
         progressBytesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1272,14 +1280,13 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value)
      * .google.datastore.admin.v1.Progress progress_bytes = 3;
      */
     public Builder clearProgressBytes() {
-      if (progressBytesBuilder_ == null) {
-        progressBytes_ = null;
-        onChanged();
-      } else {
-        progressBytes_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      progressBytes_ = null;
+      if (progressBytesBuilder_ != null) {
+        progressBytesBuilder_.dispose();
         progressBytesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1292,7 +1299,7 @@ public Builder clearProgressBytes() {
      * .google.datastore.admin.v1.Progress progress_bytes = 3;
      */
     public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getProgressBytesFieldBuilder().getBuilder();
     }
@@ -1358,7 +1365,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
      * @return Whether the entityFilter field is set.
      */
     public boolean hasEntityFilter() {
-      return entityFilterBuilder_ != null || entityFilter_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1395,11 +1402,11 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
           throw new NullPointerException();
         }
         entityFilter_ = value;
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1415,11 +1422,11 @@ public Builder setEntityFilter(
         com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
       if (entityFilterBuilder_ == null) {
         entityFilter_ = builderForValue.build();
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1433,19 +1440,18 @@ public Builder setEntityFilter(
      */
     public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
       if (entityFilterBuilder_ == null) {
-        if (entityFilter_ != null) {
-          entityFilter_ =
-              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && entityFilter_ != null
+            && entityFilter_ != com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()) {
+          getEntityFilterBuilder().mergeFrom(value);
         } else {
           entityFilter_ = value;
         }
-        onChanged();
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1458,14 +1464,13 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
      * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
      */
     public Builder clearEntityFilter() {
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-        onChanged();
-      } else {
-        entityFilter_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1478,7 +1483,7 @@ public Builder clearEntityFilter() {
      * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
      */
     public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
@@ -1599,8 +1604,8 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       outputUrlPrefix_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1620,8 +1625,8 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOutputUrlPrefix() {
-
       outputUrlPrefix_ = getDefaultInstance().getOutputUrlPrefix();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1646,8 +1651,8 @@ public Builder setOutputUrlPrefixBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       outputUrlPrefix_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
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 91a2af6401a2..c817e37d2534 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
@@ -81,7 +81,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -142,6 +144,7 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField labels_;
 
   private com.google.protobuf.MapField internalGetLabels() {
@@ -199,7 +202,10 @@ public java.util.Map getLabelsMap() {
    * map<string, string> labels = 2;
    */
   @java.lang.Override
-  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -272,11 +278,15 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
-    return getEntityFilter();
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
   }
 
   public static final int OUTPUT_URL_PREFIX_FIELD_NUMBER = 4;
-  private volatile java.lang.Object outputUrlPrefix_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object outputUrlPrefix_ = "";
   /**
    *
    *
@@ -610,17 +620,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       internalGetMutableLabels().clear();
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-      } else {
-        entityFilter_ = null;
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
       outputUrlPrefix_ = "";
-
       return this;
     }
 
@@ -648,20 +656,31 @@ public com.google.datastore.admin.v1.ExportEntitiesRequest build() {
     public com.google.datastore.admin.v1.ExportEntitiesRequest buildPartial() {
       com.google.datastore.admin.v1.ExportEntitiesRequest result =
           new com.google.datastore.admin.v1.ExportEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.projectId_ = projectId_;
-      result.labels_ = internalGetLabels();
-      result.labels_.makeImmutable();
-      if (entityFilterBuilder_ == null) {
-        result.entityFilter_ = entityFilter_;
-      } else {
-        result.entityFilter_ = entityFilterBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.outputUrlPrefix_ = outputUrlPrefix_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.ExportEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.labels_ = internalGetLabels();
+        result.labels_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.entityFilter_ =
+            entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.outputUrlPrefix_ = outputUrlPrefix_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -710,14 +729,17 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesRequest oth
         return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
+      bitField0_ |= 0x00000002;
       if (other.hasEntityFilter()) {
         mergeEntityFilter(other.getEntityFilter());
       }
       if (!other.getOutputUrlPrefix().isEmpty()) {
         outputUrlPrefix_ = other.outputUrlPrefix_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -749,7 +771,7 @@ public Builder mergeFrom(
             case 10:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -761,18 +783,19 @@ public Builder mergeFrom(
                 internalGetMutableLabels()
                     .getMutableMap()
                     .put(labels__.getKey(), labels__.getValue());
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 outputUrlPrefix_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -855,8 +878,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -872,8 +895,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -894,8 +917,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -911,14 +934,14 @@ private com.google.protobuf.MapField interna
 
     private com.google.protobuf.MapField
         internalGetMutableLabels() {
-      onChanged();
-      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return labels_;
     }
 
@@ -970,8 +993,10 @@ public java.util.Map getLabelsMap() {
      * map<string, string> labels = 2;
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1000,6 +1025,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -1022,6 +1048,7 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -1040,8 +1067,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableLabels().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000002;
       return this;
     }
     /**
@@ -1055,6 +1082,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1076,7 +1104,7 @@ public Builder putAllLabels(java.util.Map va
      * @return Whether the entityFilter field is set.
      */
     public boolean hasEntityFilter() {
-      return entityFilterBuilder_ != null || entityFilter_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1113,11 +1141,11 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
           throw new NullPointerException();
         }
         entityFilter_ = value;
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1133,11 +1161,11 @@ public Builder setEntityFilter(
         com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
       if (entityFilterBuilder_ == null) {
         entityFilter_ = builderForValue.build();
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1151,19 +1179,18 @@ public Builder setEntityFilter(
      */
     public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
       if (entityFilterBuilder_ == null) {
-        if (entityFilter_ != null) {
-          entityFilter_ =
-              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && entityFilter_ != null
+            && entityFilter_ != com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()) {
+          getEntityFilterBuilder().mergeFrom(value);
         } else {
           entityFilter_ = value;
         }
-        onChanged();
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1176,14 +1203,13 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
      * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
      */
     public Builder clearEntityFilter() {
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-        onChanged();
-      } else {
-        entityFilter_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1196,7 +1222,7 @@ public Builder clearEntityFilter() {
      * .google.datastore.admin.v1.EntityFilter entity_filter = 3;
      */
     public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
@@ -1347,8 +1373,8 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       outputUrlPrefix_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1378,8 +1404,8 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOutputUrlPrefix() {
-
       outputUrlPrefix_ = getDefaultInstance().getOutputUrlPrefix();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1414,8 +1440,8 @@ public Builder setOutputUrlPrefixBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       outputUrlPrefix_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
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 639802398220..4e57c8f09c55 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
@@ -90,7 +90,6 @@ public interface ExportEntitiesRequestOrBuilder
    *
    * map<string, string> labels = 2;
    */
-
   /* nullable */
   java.lang.String getLabelsOrDefault(
       java.lang.String key,
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 a511b418a430..6ddcdd71f552 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
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int OUTPUT_URL_FIELD_NUMBER = 1;
-  private volatile java.lang.Object outputUrl_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object outputUrl_ = "";
   /**
    *
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       outputUrl_ = "";
-
       return this;
     }
 
@@ -350,11 +352,20 @@ public com.google.datastore.admin.v1.ExportEntitiesResponse build() {
     public com.google.datastore.admin.v1.ExportEntitiesResponse buildPartial() {
       com.google.datastore.admin.v1.ExportEntitiesResponse result =
           new com.google.datastore.admin.v1.ExportEntitiesResponse(this);
-      result.outputUrl_ = outputUrl_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.ExportEntitiesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.outputUrl_ = outputUrl_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -403,6 +414,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesResponse ot
         return this;
       if (!other.getOutputUrl().isEmpty()) {
         outputUrl_ = other.outputUrl_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -434,7 +446,7 @@ public Builder mergeFrom(
             case 10:
               {
                 outputUrl_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -454,6 +466,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object outputUrl_ = "";
     /**
      *
@@ -524,8 +538,8 @@ public Builder setOutputUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       outputUrl_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -544,8 +558,8 @@ public Builder setOutputUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOutputUrl() {
-
       outputUrl_ = getDefaultInstance().getOutputUrl();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -569,8 +583,8 @@ public Builder setOutputUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       outputUrl_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
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 116b9bf41c62..6216d5e791dd 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
@@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -118,7 +120,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int INDEX_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object indexId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object indexId_ = "";
   /**
    *
    *
@@ -372,10 +376,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       indexId_ = "";
-
       return this;
     }
 
@@ -403,12 +406,23 @@ public com.google.datastore.admin.v1.GetIndexRequest build() {
     public com.google.datastore.admin.v1.GetIndexRequest buildPartial() {
       com.google.datastore.admin.v1.GetIndexRequest result =
           new com.google.datastore.admin.v1.GetIndexRequest(this);
-      result.projectId_ = projectId_;
-      result.indexId_ = indexId_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.GetIndexRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.indexId_ = indexId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -456,10 +470,12 @@ public Builder mergeFrom(com.google.datastore.admin.v1.GetIndexRequest other) {
       if (other == com.google.datastore.admin.v1.GetIndexRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getIndexId().isEmpty()) {
         indexId_ = other.indexId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -491,13 +507,13 @@ public Builder mergeFrom(
             case 10:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 indexId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -517,6 +533,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -578,8 +596,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -595,8 +613,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -617,8 +635,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -684,8 +702,8 @@ public Builder setIndexId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       indexId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -701,8 +719,8 @@ public Builder setIndexId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearIndexId() {
-
       indexId_ = getDefaultInstance().getIndexId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -723,8 +741,8 @@ public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       indexId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 5ac3c9c68d91..3d678697c3e2 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
@@ -112,7 +112,9 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null
+        ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+        : common_;
   }
 
   public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
@@ -160,7 +162,9 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
-    return getProgressEntities();
+    return progressEntities_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressEntities_;
   }
 
   public static final int PROGRESS_BYTES_FIELD_NUMBER = 3;
@@ -208,7 +212,9 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder() {
-    return getProgressBytes();
+    return progressBytes_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressBytes_;
   }
 
   public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
@@ -256,11 +262,15 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
-    return getEntityFilter();
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
   }
 
   public static final int INPUT_URL_FIELD_NUMBER = 5;
-  private volatile java.lang.Object inputUrl_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object inputUrl_ = "";
   /**
    *
    *
@@ -563,32 +573,28 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-      if (progressEntitiesBuilder_ == null) {
-        progressEntities_ = null;
-      } else {
-        progressEntities_ = null;
+      progressEntities_ = null;
+      if (progressEntitiesBuilder_ != null) {
+        progressEntitiesBuilder_.dispose();
         progressEntitiesBuilder_ = null;
       }
-      if (progressBytesBuilder_ == null) {
-        progressBytes_ = null;
-      } else {
-        progressBytes_ = null;
+      progressBytes_ = null;
+      if (progressBytesBuilder_ != null) {
+        progressBytesBuilder_.dispose();
         progressBytesBuilder_ = null;
       }
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-      } else {
-        entityFilter_ = null;
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
       inputUrl_ = "";
-
       return this;
     }
 
@@ -616,29 +622,33 @@ public com.google.datastore.admin.v1.ImportEntitiesMetadata build() {
     public com.google.datastore.admin.v1.ImportEntitiesMetadata buildPartial() {
       com.google.datastore.admin.v1.ImportEntitiesMetadata result =
           new com.google.datastore.admin.v1.ImportEntitiesMetadata(this);
-      if (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (progressEntitiesBuilder_ == null) {
-        result.progressEntities_ = progressEntities_;
-      } else {
-        result.progressEntities_ = progressEntitiesBuilder_.build();
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.admin.v1.ImportEntitiesMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
       }
-      if (progressBytesBuilder_ == null) {
-        result.progressBytes_ = progressBytes_;
-      } else {
-        result.progressBytes_ = progressBytesBuilder_.build();
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.progressEntities_ =
+            progressEntitiesBuilder_ == null ? progressEntities_ : progressEntitiesBuilder_.build();
       }
-      if (entityFilterBuilder_ == null) {
-        result.entityFilter_ = entityFilter_;
-      } else {
-        result.entityFilter_ = entityFilterBuilder_.build();
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.progressBytes_ =
+            progressBytesBuilder_ == null ? progressBytes_ : progressBytesBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.entityFilter_ =
+            entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.inputUrl_ = inputUrl_;
       }
-      result.inputUrl_ = inputUrl_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -701,6 +711,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesMetadata ot
       }
       if (!other.getInputUrl().isEmpty()) {
         inputUrl_ = other.inputUrl_;
+        bitField0_ |= 0x00000010;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -732,32 +743,32 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getProgressBytesFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             case 42:
               {
                 inputUrl_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             default:
@@ -777,6 +788,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.admin.v1.CommonMetadata common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.admin.v1.CommonMetadata,
@@ -795,7 +808,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -832,11 +845,11 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -851,11 +864,11 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
     public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
-        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -869,19 +882,18 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu
      */
     public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.datastore.admin.v1.CommonMetadata.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -894,14 +906,13 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
      * .google.datastore.admin.v1.CommonMetadata common = 1;
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -914,7 +925,7 @@ public Builder clearCommon() {
      * .google.datastore.admin.v1.CommonMetadata common = 1;
      */
     public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
@@ -980,7 +991,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
      * @return Whether the progressEntities field is set.
      */
     public boolean hasProgressEntities() {
-      return progressEntitiesBuilder_ != null || progressEntities_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -1017,11 +1028,11 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value)
           throw new NullPointerException();
         }
         progressEntities_ = value;
-        onChanged();
       } else {
         progressEntitiesBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1037,11 +1048,11 @@ public Builder setProgressEntities(
         com.google.datastore.admin.v1.Progress.Builder builderForValue) {
       if (progressEntitiesBuilder_ == null) {
         progressEntities_ = builderForValue.build();
-        onChanged();
       } else {
         progressEntitiesBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1055,19 +1066,18 @@ public Builder setProgressEntities(
      */
     public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress value) {
       if (progressEntitiesBuilder_ == null) {
-        if (progressEntities_ != null) {
-          progressEntities_ =
-              com.google.datastore.admin.v1.Progress.newBuilder(progressEntities_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && progressEntities_ != null
+            && progressEntities_ != com.google.datastore.admin.v1.Progress.getDefaultInstance()) {
+          getProgressEntitiesBuilder().mergeFrom(value);
         } else {
           progressEntities_ = value;
         }
-        onChanged();
       } else {
         progressEntitiesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -1080,14 +1090,13 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
      * .google.datastore.admin.v1.Progress progress_entities = 2;
      */
     public Builder clearProgressEntities() {
-      if (progressEntitiesBuilder_ == null) {
-        progressEntities_ = null;
-        onChanged();
-      } else {
-        progressEntities_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      progressEntities_ = null;
+      if (progressEntitiesBuilder_ != null) {
+        progressEntitiesBuilder_.dispose();
         progressEntitiesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1100,7 +1109,7 @@ public Builder clearProgressEntities() {
      * .google.datastore.admin.v1.Progress progress_entities = 2;
      */
     public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getProgressEntitiesFieldBuilder().getBuilder();
     }
@@ -1166,7 +1175,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
      * @return Whether the progressBytes field is set.
      */
     public boolean hasProgressBytes() {
-      return progressBytesBuilder_ != null || progressBytes_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1203,11 +1212,11 @@ public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) {
           throw new NullPointerException();
         }
         progressBytes_ = value;
-        onChanged();
       } else {
         progressBytesBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1223,11 +1232,11 @@ public Builder setProgressBytes(
         com.google.datastore.admin.v1.Progress.Builder builderForValue) {
       if (progressBytesBuilder_ == null) {
         progressBytes_ = builderForValue.build();
-        onChanged();
       } else {
         progressBytesBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1241,19 +1250,18 @@ public Builder setProgressBytes(
      */
     public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value) {
       if (progressBytesBuilder_ == null) {
-        if (progressBytes_ != null) {
-          progressBytes_ =
-              com.google.datastore.admin.v1.Progress.newBuilder(progressBytes_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && progressBytes_ != null
+            && progressBytes_ != com.google.datastore.admin.v1.Progress.getDefaultInstance()) {
+          getProgressBytesBuilder().mergeFrom(value);
         } else {
           progressBytes_ = value;
         }
-        onChanged();
       } else {
         progressBytesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1266,14 +1274,13 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value)
      * .google.datastore.admin.v1.Progress progress_bytes = 3;
      */
     public Builder clearProgressBytes() {
-      if (progressBytesBuilder_ == null) {
-        progressBytes_ = null;
-        onChanged();
-      } else {
-        progressBytes_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      progressBytes_ = null;
+      if (progressBytesBuilder_ != null) {
+        progressBytesBuilder_.dispose();
         progressBytesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1286,7 +1293,7 @@ public Builder clearProgressBytes() {
      * .google.datastore.admin.v1.Progress progress_bytes = 3;
      */
     public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getProgressBytesFieldBuilder().getBuilder();
     }
@@ -1352,7 +1359,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
      * @return Whether the entityFilter field is set.
      */
     public boolean hasEntityFilter() {
-      return entityFilterBuilder_ != null || entityFilter_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1389,11 +1396,11 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
           throw new NullPointerException();
         }
         entityFilter_ = value;
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1409,11 +1416,11 @@ public Builder setEntityFilter(
         com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
       if (entityFilterBuilder_ == null) {
         entityFilter_ = builderForValue.build();
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1427,19 +1434,18 @@ public Builder setEntityFilter(
      */
     public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
       if (entityFilterBuilder_ == null) {
-        if (entityFilter_ != null) {
-          entityFilter_ =
-              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && entityFilter_ != null
+            && entityFilter_ != com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()) {
+          getEntityFilterBuilder().mergeFrom(value);
         } else {
           entityFilter_ = value;
         }
-        onChanged();
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1452,14 +1458,13 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
      * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
      */
     public Builder clearEntityFilter() {
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-        onChanged();
-      } else {
-        entityFilter_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1472,7 +1477,7 @@ public Builder clearEntityFilter() {
      * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
      */
     public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
@@ -1584,8 +1589,8 @@ public Builder setInputUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       inputUrl_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1602,8 +1607,8 @@ public Builder setInputUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearInputUrl() {
-
       inputUrl_ = getDefaultInstance().getInputUrl();
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1625,8 +1630,8 @@ public Builder setInputUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       inputUrl_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
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 36151c04c0cd..0643500b66ff 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
@@ -81,7 +81,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -142,6 +144,7 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField labels_;
 
   private com.google.protobuf.MapField internalGetLabels() {
@@ -199,7 +202,10 @@ public java.util.Map getLabelsMap() {
    * map<string, string> labels = 2;
    */
   @java.lang.Override
-  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+  public /* nullable */ java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -228,7 +234,9 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
   }
 
   public static final int INPUT_URL_FIELD_NUMBER = 3;
-  private volatile java.lang.Object inputUrl_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object inputUrl_ = "";
   /**
    *
    *
@@ -352,7 +360,9 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuilder() {
-    return getEntityFilter();
+    return entityFilter_ == null
+        ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
+        : entityFilter_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -613,15 +623,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       internalGetMutableLabels().clear();
       inputUrl_ = "";
-
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-      } else {
-        entityFilter_ = null;
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
       return this;
@@ -651,20 +659,31 @@ public com.google.datastore.admin.v1.ImportEntitiesRequest build() {
     public com.google.datastore.admin.v1.ImportEntitiesRequest buildPartial() {
       com.google.datastore.admin.v1.ImportEntitiesRequest result =
           new com.google.datastore.admin.v1.ImportEntitiesRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.projectId_ = projectId_;
-      result.labels_ = internalGetLabels();
-      result.labels_.makeImmutable();
-      result.inputUrl_ = inputUrl_;
-      if (entityFilterBuilder_ == null) {
-        result.entityFilter_ = entityFilter_;
-      } else {
-        result.entityFilter_ = entityFilterBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.ImportEntitiesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.labels_ = internalGetLabels();
+        result.labels_.makeImmutable();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.inputUrl_ = inputUrl_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.entityFilter_ =
+            entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -713,11 +732,14 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesRequest oth
         return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
+      bitField0_ |= 0x00000002;
       if (!other.getInputUrl().isEmpty()) {
         inputUrl_ = other.inputUrl_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasEntityFilter()) {
@@ -752,7 +774,7 @@ public Builder mergeFrom(
             case 10:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -764,18 +786,19 @@ public Builder mergeFrom(
                 internalGetMutableLabels()
                     .getMutableMap()
                     .put(labels__.getKey(), labels__.getValue());
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 inputUrl_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 34
             default:
@@ -858,8 +881,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -875,8 +898,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -897,8 +920,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -914,14 +937,14 @@ private com.google.protobuf.MapField interna
 
     private com.google.protobuf.MapField
         internalGetMutableLabels() {
-      onChanged();
-      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return labels_;
     }
 
@@ -973,8 +996,10 @@ public java.util.Map getLabelsMap() {
      * map<string, string> labels = 2;
      */
     @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */ java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1003,6 +1028,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -1025,6 +1051,7 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -1043,8 +1070,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableLabels().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000002;
       return this;
     }
     /**
@@ -1058,6 +1085,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1155,8 +1183,8 @@ public Builder setInputUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       inputUrl_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1183,8 +1211,8 @@ public Builder setInputUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearInputUrl() {
-
       inputUrl_ = getDefaultInstance().getInputUrl();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1216,8 +1244,8 @@ public Builder setInputUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       inputUrl_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1243,7 +1271,7 @@ public Builder setInputUrlBytes(com.google.protobuf.ByteString value) {
      * @return Whether the entityFilter field is set.
      */
     public boolean hasEntityFilter() {
-      return entityFilterBuilder_ != null || entityFilter_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1286,11 +1314,11 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
           throw new NullPointerException();
         }
         entityFilter_ = value;
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1309,11 +1337,11 @@ public Builder setEntityFilter(
         com.google.datastore.admin.v1.EntityFilter.Builder builderForValue) {
       if (entityFilterBuilder_ == null) {
         entityFilter_ = builderForValue.build();
-        onChanged();
       } else {
         entityFilterBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1330,19 +1358,18 @@ public Builder setEntityFilter(
      */
     public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter value) {
       if (entityFilterBuilder_ == null) {
-        if (entityFilter_ != null) {
-          entityFilter_ =
-              com.google.datastore.admin.v1.EntityFilter.newBuilder(entityFilter_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && entityFilter_ != null
+            && entityFilter_ != com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()) {
+          getEntityFilterBuilder().mergeFrom(value);
         } else {
           entityFilter_ = value;
         }
-        onChanged();
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1358,14 +1385,13 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
      * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
      */
     public Builder clearEntityFilter() {
-      if (entityFilterBuilder_ == null) {
-        entityFilter_ = null;
-        onChanged();
-      } else {
-        entityFilter_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      entityFilter_ = null;
+      if (entityFilterBuilder_ != null) {
+        entityFilterBuilder_.dispose();
         entityFilterBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1381,7 +1407,7 @@ public Builder clearEntityFilter() {
      * .google.datastore.admin.v1.EntityFilter entity_filter = 4;
      */
     public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
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 e3d1d782f7df..500706047cf8 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
@@ -90,7 +90,6 @@ public interface ImportEntitiesRequestOrBuilder
    *
    * map<string, string> labels = 2;
    */
-
   /* nullable */
   java.lang.String getLabelsOrDefault(
       java.lang.String key,
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 da7e169f9a28..b9a123e56ab3 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
@@ -728,7 +728,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      *
      *
@@ -777,7 +779,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int DIRECTION_FIELD_NUMBER = 2;
-    private int direction_;
+    private int direction_ = 0;
     /**
      *
      *
@@ -810,9 +812,8 @@ public int getDirectionValue() {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.Index.Direction getDirection() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.Index.Direction result =
-          com.google.datastore.admin.v1.Index.Direction.valueOf(direction_);
+          com.google.datastore.admin.v1.Index.Direction.forNumber(direction_);
       return result == null ? com.google.datastore.admin.v1.Index.Direction.UNRECOGNIZED : result;
     }
 
@@ -1027,10 +1028,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-
         direction_ = 0;
-
         return this;
       }
 
@@ -1058,12 +1058,23 @@ public com.google.datastore.admin.v1.Index.IndexedProperty build() {
       public com.google.datastore.admin.v1.Index.IndexedProperty buildPartial() {
         com.google.datastore.admin.v1.Index.IndexedProperty result =
             new com.google.datastore.admin.v1.Index.IndexedProperty(this);
-        result.name_ = name_;
-        result.direction_ = direction_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.datastore.admin.v1.Index.IndexedProperty result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.direction_ = direction_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1114,6 +1125,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index.IndexedProperty oth
           return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.direction_ != 0) {
@@ -1148,13 +1160,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   name_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 16:
                 {
                   direction_ = input.readEnum();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 16
               default:
@@ -1174,6 +1186,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object name_ = "";
       /**
        *
@@ -1235,8 +1249,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1252,8 +1266,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
-
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1274,8 +1288,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1313,8 +1327,8 @@ public int getDirectionValue() {
        * @return This builder for chaining.
        */
       public Builder setDirectionValue(int value) {
-
         direction_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1333,9 +1347,8 @@ public Builder setDirectionValue(int value) {
        */
       @java.lang.Override
       public com.google.datastore.admin.v1.Index.Direction getDirection() {
-        @SuppressWarnings("deprecation")
         com.google.datastore.admin.v1.Index.Direction result =
-            com.google.datastore.admin.v1.Index.Direction.valueOf(direction_);
+            com.google.datastore.admin.v1.Index.Direction.forNumber(direction_);
         return result == null ? com.google.datastore.admin.v1.Index.Direction.UNRECOGNIZED : result;
       }
       /**
@@ -1356,7 +1369,7 @@ public Builder setDirection(com.google.datastore.admin.v1.Index.Direction value)
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000002;
         direction_ = value.getNumber();
         onChanged();
         return this;
@@ -1375,7 +1388,7 @@ public Builder setDirection(com.google.datastore.admin.v1.Index.Direction value)
        * @return This builder for chaining.
        */
       public Builder clearDirection() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         direction_ = 0;
         onChanged();
         return this;
@@ -1446,7 +1459,9 @@ public com.google.datastore.admin.v1.Index.IndexedProperty getDefaultInstanceFor
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -1495,7 +1510,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int INDEX_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object indexId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object indexId_ = "";
   /**
    *
    *
@@ -1544,7 +1561,9 @@ public com.google.protobuf.ByteString getIndexIdBytes() {
   }
 
   public static final int KIND_FIELD_NUMBER = 4;
-  private volatile java.lang.Object kind_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object kind_ = "";
   /**
    *
    *
@@ -1593,7 +1612,7 @@ public com.google.protobuf.ByteString getKindBytes() {
   }
 
   public static final int ANCESTOR_FIELD_NUMBER = 5;
-  private int ancestor_;
+  private int ancestor_ = 0;
   /**
    *
    *
@@ -1626,13 +1645,14 @@ public int getAncestorValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.Index.AncestorMode result =
-        com.google.datastore.admin.v1.Index.AncestorMode.valueOf(ancestor_);
+        com.google.datastore.admin.v1.Index.AncestorMode.forNumber(ancestor_);
     return result == null ? com.google.datastore.admin.v1.Index.AncestorMode.UNRECOGNIZED : result;
   }
 
   public static final int PROPERTIES_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List properties_;
   /**
    *
@@ -1713,7 +1733,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie
   }
 
   public static final int STATE_FIELD_NUMBER = 7;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -1746,9 +1766,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.Index.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.Index.State result =
-        com.google.datastore.admin.v1.Index.State.valueOf(state_);
+        com.google.datastore.admin.v1.Index.State.forNumber(state_);
     return result == null ? com.google.datastore.admin.v1.Index.State.UNRECOGNIZED : result;
   }
 
@@ -1996,23 +2015,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       indexId_ = "";
-
       kind_ = "";
-
       ancestor_ = 0;
-
       if (propertiesBuilder_ == null) {
         properties_ = java.util.Collections.emptyList();
       } else {
         properties_ = null;
         propertiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000010);
       state_ = 0;
-
       return this;
     }
 
@@ -2039,23 +2054,43 @@ public com.google.datastore.admin.v1.Index build() {
     @java.lang.Override
     public com.google.datastore.admin.v1.Index buildPartial() {
       com.google.datastore.admin.v1.Index result = new com.google.datastore.admin.v1.Index(this);
-      int from_bitField0_ = bitField0_;
-      result.projectId_ = projectId_;
-      result.indexId_ = indexId_;
-      result.kind_ = kind_;
-      result.ancestor_ = ancestor_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.admin.v1.Index result) {
       if (propertiesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           properties_ = java.util.Collections.unmodifiableList(properties_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.properties_ = properties_;
       } else {
         result.properties_ = propertiesBuilder_.build();
       }
-      result.state_ = state_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.admin.v1.Index result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.indexId_ = indexId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.kind_ = kind_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.ancestor_ = ancestor_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.state_ = state_;
+      }
     }
 
     @java.lang.Override
@@ -2105,14 +2140,17 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index other) {
       if (other == com.google.datastore.admin.v1.Index.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getIndexId().isEmpty()) {
         indexId_ = other.indexId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getKind().isEmpty()) {
         kind_ = other.kind_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.ancestor_ != 0) {
@@ -2122,7 +2160,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index other) {
         if (!other.properties_.isEmpty()) {
           if (properties_.isEmpty()) {
             properties_ = other.properties_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensurePropertiesIsMutable();
             properties_.addAll(other.properties_);
@@ -2135,7 +2173,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index other) {
             propertiesBuilder_.dispose();
             propertiesBuilder_ = null;
             properties_ = other.properties_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000010);
             propertiesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPropertiesFieldBuilder()
@@ -2177,25 +2215,25 @@ public Builder mergeFrom(
             case 10:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 indexId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
               {
                 kind_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             case 40:
               {
                 ancestor_ = input.readEnum();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 40
             case 50:
@@ -2215,7 +2253,7 @@ public Builder mergeFrom(
             case 56:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 56
             default:
@@ -2298,8 +2336,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2315,8 +2353,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2337,8 +2375,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2404,8 +2442,8 @@ public Builder setIndexId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       indexId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2421,8 +2459,8 @@ public Builder setIndexId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearIndexId() {
-
       indexId_ = getDefaultInstance().getIndexId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2443,8 +2481,8 @@ public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       indexId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2510,8 +2548,8 @@ public Builder setKind(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       kind_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2527,8 +2565,8 @@ public Builder setKind(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearKind() {
-
       kind_ = getDefaultInstance().getKind();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2549,8 +2587,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       kind_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2588,8 +2626,8 @@ public int getAncestorValue() {
      * @return This builder for chaining.
      */
     public Builder setAncestorValue(int value) {
-
       ancestor_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2608,9 +2646,8 @@ public Builder setAncestorValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.Index.AncestorMode result =
-          com.google.datastore.admin.v1.Index.AncestorMode.valueOf(ancestor_);
+          com.google.datastore.admin.v1.Index.AncestorMode.forNumber(ancestor_);
       return result == null
           ? com.google.datastore.admin.v1.Index.AncestorMode.UNRECOGNIZED
           : result;
@@ -2633,7 +2670,7 @@ public Builder setAncestor(com.google.datastore.admin.v1.Index.AncestorMode valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000008;
       ancestor_ = value.getNumber();
       onChanged();
       return this;
@@ -2652,7 +2689,7 @@ public Builder setAncestor(com.google.datastore.admin.v1.Index.AncestorMode valu
      * @return This builder for chaining.
      */
     public Builder clearAncestor() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       ancestor_ = 0;
       onChanged();
       return this;
@@ -2662,11 +2699,11 @@ public Builder clearAncestor() {
         java.util.Collections.emptyList();
 
     private void ensurePropertiesIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         properties_ =
             new java.util.ArrayList(
                 properties_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2906,7 +2943,7 @@ public Builder addAllProperties(
     public Builder clearProperties() {
       if (propertiesBuilder_ == null) {
         properties_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         propertiesBuilder_.clear();
@@ -3046,7 +3083,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties
                 com.google.datastore.admin.v1.Index.IndexedProperty,
                 com.google.datastore.admin.v1.Index.IndexedProperty.Builder,
                 com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder>(
-                properties_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                properties_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         properties_ = null;
       }
       return propertiesBuilder_;
@@ -3085,8 +3122,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -3105,9 +3142,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.Index.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.Index.State result =
-          com.google.datastore.admin.v1.Index.State.valueOf(state_);
+          com.google.datastore.admin.v1.Index.State.forNumber(state_);
       return result == null ? com.google.datastore.admin.v1.Index.State.UNRECOGNIZED : result;
     }
     /**
@@ -3128,7 +3164,7 @@ public Builder setState(com.google.datastore.admin.v1.Index.State value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000020;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -3147,7 +3183,7 @@ public Builder setState(com.google.datastore.admin.v1.Index.State value) {
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       state_ = 0;
       onChanged();
       return this;
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 57d04e97ac73..36464b158a73 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
@@ -112,7 +112,9 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder() {
-    return getCommon();
+    return common_ == null
+        ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
+        : common_;
   }
 
   public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
@@ -160,11 +162,15 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuilder() {
-    return getProgressEntities();
+    return progressEntities_ == null
+        ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
+        : progressEntities_;
   }
 
   public static final int INDEX_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object indexId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object indexId_ = "";
   /**
    *
    *
@@ -437,20 +443,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (commonBuilder_ == null) {
-        common_ = null;
-      } else {
-        common_ = null;
+      bitField0_ = 0;
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-      if (progressEntitiesBuilder_ == null) {
-        progressEntities_ = null;
-      } else {
-        progressEntities_ = null;
+      progressEntities_ = null;
+      if (progressEntitiesBuilder_ != null) {
+        progressEntitiesBuilder_.dispose();
         progressEntitiesBuilder_ = null;
       }
       indexId_ = "";
-
       return this;
     }
 
@@ -478,21 +482,27 @@ public com.google.datastore.admin.v1.IndexOperationMetadata build() {
     public com.google.datastore.admin.v1.IndexOperationMetadata buildPartial() {
       com.google.datastore.admin.v1.IndexOperationMetadata result =
           new com.google.datastore.admin.v1.IndexOperationMetadata(this);
-      if (commonBuilder_ == null) {
-        result.common_ = common_;
-      } else {
-        result.common_ = commonBuilder_.build();
-      }
-      if (progressEntitiesBuilder_ == null) {
-        result.progressEntities_ = progressEntities_;
-      } else {
-        result.progressEntities_ = progressEntitiesBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.indexId_ = indexId_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.IndexOperationMetadata result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.progressEntities_ =
+            progressEntitiesBuilder_ == null ? progressEntities_ : progressEntitiesBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.indexId_ = indexId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -547,6 +557,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.IndexOperationMetadata ot
       }
       if (!other.getIndexId().isEmpty()) {
         indexId_ = other.indexId_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -578,20 +589,20 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 indexId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -611,6 +622,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.admin.v1.CommonMetadata common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.admin.v1.CommonMetadata,
@@ -629,7 +642,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return commonBuilder_ != null || common_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -666,11 +679,11 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
           throw new NullPointerException();
         }
         common_ = value;
-        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -685,11 +698,11 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
     public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
-        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -703,19 +716,18 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu
      */
     public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       if (commonBuilder_ == null) {
-        if (common_ != null) {
-          common_ =
-              com.google.datastore.admin.v1.CommonMetadata.newBuilder(common_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && common_ != null
+            && common_ != com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()) {
+          getCommonBuilder().mergeFrom(value);
         } else {
           common_ = value;
         }
-        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -728,14 +740,13 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
      * .google.datastore.admin.v1.CommonMetadata common = 1;
      */
     public Builder clearCommon() {
-      if (commonBuilder_ == null) {
-        common_ = null;
-        onChanged();
-      } else {
-        common_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      common_ = null;
+      if (commonBuilder_ != null) {
+        commonBuilder_.dispose();
         commonBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -748,7 +759,7 @@ public Builder clearCommon() {
      * .google.datastore.admin.v1.CommonMetadata common = 1;
      */
     public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
@@ -814,7 +825,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
      * @return Whether the progressEntities field is set.
      */
     public boolean hasProgressEntities() {
-      return progressEntitiesBuilder_ != null || progressEntities_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -851,11 +862,11 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value)
           throw new NullPointerException();
         }
         progressEntities_ = value;
-        onChanged();
       } else {
         progressEntitiesBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -871,11 +882,11 @@ public Builder setProgressEntities(
         com.google.datastore.admin.v1.Progress.Builder builderForValue) {
       if (progressEntitiesBuilder_ == null) {
         progressEntities_ = builderForValue.build();
-        onChanged();
       } else {
         progressEntitiesBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -889,19 +900,18 @@ public Builder setProgressEntities(
      */
     public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress value) {
       if (progressEntitiesBuilder_ == null) {
-        if (progressEntities_ != null) {
-          progressEntities_ =
-              com.google.datastore.admin.v1.Progress.newBuilder(progressEntities_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && progressEntities_ != null
+            && progressEntities_ != com.google.datastore.admin.v1.Progress.getDefaultInstance()) {
+          getProgressEntitiesBuilder().mergeFrom(value);
         } else {
           progressEntities_ = value;
         }
-        onChanged();
       } else {
         progressEntitiesBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -914,14 +924,13 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
      * .google.datastore.admin.v1.Progress progress_entities = 2;
      */
     public Builder clearProgressEntities() {
-      if (progressEntitiesBuilder_ == null) {
-        progressEntities_ = null;
-        onChanged();
-      } else {
-        progressEntities_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      progressEntities_ = null;
+      if (progressEntitiesBuilder_ != null) {
+        progressEntitiesBuilder_.dispose();
         progressEntitiesBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -934,7 +943,7 @@ public Builder clearProgressEntities() {
      * .google.datastore.admin.v1.Progress progress_entities = 2;
      */
     public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getProgressEntitiesFieldBuilder().getBuilder();
     }
@@ -1043,8 +1052,8 @@ public Builder setIndexId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       indexId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1060,8 +1069,8 @@ public Builder setIndexId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearIndexId() {
-
       indexId_ = getDefaultInstance().getIndexId();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1082,8 +1091,8 @@ public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       indexId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
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 39cc4d909980..921c6b5f2331 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
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 3;
-  private volatile java.lang.Object filter_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object filter_ = "";
   /**
    * string filter = 3;
    *
@@ -157,7 +161,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 4;
-  private int pageSize_;
+  private int pageSize_ = 0;
   /**
    *
    *
@@ -176,7 +180,9 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 5;
-  private volatile java.lang.Object pageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object pageToken_ = "";
   /**
    *
    *
@@ -449,14 +455,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       filter_ = "";
-
       pageSize_ = 0;
-
       pageToken_ = "";
-
       return this;
     }
 
@@ -484,14 +487,29 @@ public com.google.datastore.admin.v1.ListIndexesRequest build() {
     public com.google.datastore.admin.v1.ListIndexesRequest buildPartial() {
       com.google.datastore.admin.v1.ListIndexesRequest result =
           new com.google.datastore.admin.v1.ListIndexesRequest(this);
-      result.projectId_ = projectId_;
-      result.filter_ = filter_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.ListIndexesRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.filter_ = filter_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pageSize_ = pageSize_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pageToken_ = pageToken_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -540,10 +558,12 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesRequest other)
         return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -551,6 +571,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesRequest other)
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
+        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -582,25 +603,25 @@ public Builder mergeFrom(
             case 10:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 filter_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 32:
               {
                 pageSize_ = input.readInt32();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 32
             case 42:
               {
                 pageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
             default:
@@ -620,6 +641,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -681,8 +704,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -698,8 +721,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -720,8 +743,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -769,8 +792,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -780,8 +803,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
-
       filter_ = getDefaultInstance().getFilter();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -796,8 +819,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       filter_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -835,6 +858,7 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -851,7 +875,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       pageSize_ = 0;
       onChanged();
       return this;
@@ -918,8 +942,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -935,8 +959,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
-
       pageToken_ = getDefaultInstance().getPageToken();
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -957,8 +981,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       pageToken_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
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 e565bc21874c..9c037599232a 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
@@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int INDEXES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List indexes_;
   /**
    *
@@ -139,7 +141,9 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int inde
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object nextPageToken_ = "";
   /**
    *
    *
@@ -396,6 +400,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (indexesBuilder_ == null) {
         indexes_ = java.util.Collections.emptyList();
       } else {
@@ -404,7 +409,6 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-
       return this;
     }
 
@@ -432,7 +436,16 @@ public com.google.datastore.admin.v1.ListIndexesResponse build() {
     public com.google.datastore.admin.v1.ListIndexesResponse buildPartial() {
       com.google.datastore.admin.v1.ListIndexesResponse result =
           new com.google.datastore.admin.v1.ListIndexesResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(
+        com.google.datastore.admin.v1.ListIndexesResponse result) {
       if (indexesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           indexes_ = java.util.Collections.unmodifiableList(indexes_);
@@ -442,9 +455,13 @@ public com.google.datastore.admin.v1.ListIndexesResponse buildPartial() {
       } else {
         result.indexes_ = indexesBuilder_.build();
       }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.admin.v1.ListIndexesResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.nextPageToken_ = nextPageToken_;
+      }
     }
 
     @java.lang.Override
@@ -522,6 +539,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesResponse other
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -566,7 +584,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -997,8 +1015,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1014,8 +1032,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
-
       nextPageToken_ = getDefaultInstance().getNextPageToken();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1036,8 +1054,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       nextPageToken_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 1bca6fdec524..611d90c948f0 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
@@ -337,7 +337,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1;
-    private int concurrencyMode_;
+    private int concurrencyMode_ = 0;
     /**
      *
      *
@@ -371,9 +371,8 @@ public int getConcurrencyModeValue() {
     @java.lang.Override
     public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
         getConcurrencyMode() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
-          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.forNumber(
               concurrencyMode_);
       return result == null
           ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
@@ -590,8 +589,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         concurrencyMode_ = 0;
-
         return this;
       }
 
@@ -623,11 +622,21 @@ public com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails b
           buildPartial() {
         com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails result =
             new com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails(this);
-        result.concurrencyMode_ = concurrencyMode_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.concurrencyMode_ = concurrencyMode_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -712,7 +721,7 @@ public Builder mergeFrom(
               case 8:
                 {
                   concurrencyMode_ = input.readEnum();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 8
               default:
@@ -732,6 +741,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int concurrencyMode_ = 0;
       /**
        *
@@ -767,8 +778,8 @@ public int getConcurrencyModeValue() {
        * @return This builder for chaining.
        */
       public Builder setConcurrencyModeValue(int value) {
-
         concurrencyMode_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -789,9 +800,8 @@ public Builder setConcurrencyModeValue(int value) {
       @java.lang.Override
       public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
           getConcurrencyMode() {
-        @SuppressWarnings("deprecation")
         com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
-            com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+            com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.forNumber(
                 concurrencyMode_);
         return result == null
             ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
@@ -817,7 +827,7 @@ public Builder setConcurrencyMode(
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000001;
         concurrencyMode_ = value.getNumber();
         onChanged();
         return this;
@@ -837,7 +847,7 @@ public Builder setConcurrencyMode(
        * @return This builder for chaining.
        */
       public Builder clearConcurrencyMode() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         concurrencyMode_ = 0;
         onChanged();
         return this;
@@ -995,7 +1005,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1;
-    private int concurrencyMode_;
+    private int concurrencyMode_ = 0;
     /**
      *
      *
@@ -1027,9 +1037,8 @@ public int getConcurrencyModeValue() {
     @java.lang.Override
     public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
         getConcurrencyMode() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
-          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+          com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.forNumber(
               concurrencyMode_);
       return result == null
           ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
@@ -1254,8 +1263,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         concurrencyMode_ = 0;
-
         return this;
       }
 
@@ -1289,11 +1298,21 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails result =
             new com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails(
                 this);
-        result.concurrencyMode_ = concurrencyMode_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.concurrencyMode_ = concurrencyMode_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1380,7 +1399,7 @@ public Builder mergeFrom(
               case 8:
                 {
                   concurrencyMode_ = input.readEnum();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 8
               default:
@@ -1400,6 +1419,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private int concurrencyMode_ = 0;
       /**
        *
@@ -1433,8 +1454,8 @@ public int getConcurrencyModeValue() {
        * @return This builder for chaining.
        */
       public Builder setConcurrencyModeValue(int value) {
-
         concurrencyMode_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1454,9 +1475,8 @@ public Builder setConcurrencyModeValue(int value) {
       @java.lang.Override
       public com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode
           getConcurrencyMode() {
-        @SuppressWarnings("deprecation")
         com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode result =
-            com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.valueOf(
+            com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.forNumber(
                 concurrencyMode_);
         return result == null
             ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
@@ -1481,7 +1501,7 @@ public Builder setConcurrencyMode(
         if (value == null) {
           throw new NullPointerException();
         }
-
+        bitField0_ |= 0x00000001;
         concurrencyMode_ = value.getNumber();
         onChanged();
         return this;
@@ -1500,7 +1520,7 @@ public Builder setConcurrencyMode(
        * @return This builder for chaining.
        */
       public Builder clearConcurrencyMode() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         concurrencyMode_ = 0;
         onChanged();
         return this;
@@ -1623,7 +1643,7 @@ public StepDetailsCase getStepDetailsCase() {
   }
 
   public static final int STEP_FIELD_NUMBER = 1;
-  private int step_;
+  private int step_ = 0;
   /**
    *
    *
@@ -1656,9 +1676,8 @@ public int getStepValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.MigrationStep getStep() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.MigrationStep result =
-        com.google.datastore.admin.v1.MigrationStep.valueOf(step_);
+        com.google.datastore.admin.v1.MigrationStep.forNumber(step_);
     return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
   }
 
@@ -2036,8 +2055,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       step_ = 0;
-
       if (prepareStepDetailsBuilder_ != null) {
         prepareStepDetailsBuilder_.clear();
       }
@@ -2073,26 +2092,32 @@ public com.google.datastore.admin.v1.MigrationProgressEvent build() {
     public com.google.datastore.admin.v1.MigrationProgressEvent buildPartial() {
       com.google.datastore.admin.v1.MigrationProgressEvent result =
           new com.google.datastore.admin.v1.MigrationProgressEvent(this);
-      result.step_ = step_;
-      if (stepDetailsCase_ == 2) {
-        if (prepareStepDetailsBuilder_ == null) {
-          result.stepDetails_ = stepDetails_;
-        } else {
-          result.stepDetails_ = prepareStepDetailsBuilder_.build();
-        }
-      }
-      if (stepDetailsCase_ == 3) {
-        if (redirectWritesStepDetailsBuilder_ == null) {
-          result.stepDetails_ = stepDetails_;
-        } else {
-          result.stepDetails_ = redirectWritesStepDetailsBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.stepDetailsCase_ = stepDetailsCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.MigrationProgressEvent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.step_ = step_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.datastore.admin.v1.MigrationProgressEvent result) {
+      result.stepDetailsCase_ = stepDetailsCase_;
+      result.stepDetails_ = this.stepDetails_;
+      if (stepDetailsCase_ == 2 && prepareStepDetailsBuilder_ != null) {
+        result.stepDetails_ = prepareStepDetailsBuilder_.build();
+      }
+      if (stepDetailsCase_ == 3 && redirectWritesStepDetailsBuilder_ != null) {
+        result.stepDetails_ = redirectWritesStepDetailsBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -2187,7 +2212,7 @@ public Builder mergeFrom(
             case 8:
               {
                 step_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
@@ -2235,6 +2260,8 @@ public Builder clearStepDetails() {
       return this;
     }
 
+    private int bitField0_;
+
     private int step_ = 0;
     /**
      *
@@ -2268,8 +2295,8 @@ public int getStepValue() {
      * @return This builder for chaining.
      */
     public Builder setStepValue(int value) {
-
       step_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2288,9 +2315,8 @@ public Builder setStepValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.MigrationStep getStep() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.MigrationStep result =
-          com.google.datastore.admin.v1.MigrationStep.valueOf(step_);
+          com.google.datastore.admin.v1.MigrationStep.forNumber(step_);
       return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
     }
     /**
@@ -2311,7 +2337,7 @@ public Builder setStep(com.google.datastore.admin.v1.MigrationStep value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       step_ = value.getNumber();
       onChanged();
       return this;
@@ -2330,7 +2356,7 @@ public Builder setStep(com.google.datastore.admin.v1.MigrationStep value) {
      * @return This builder for chaining.
      */
     public Builder clearStep() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       step_ = 0;
       onChanged();
       return this;
@@ -2577,7 +2603,6 @@ public Builder clearPrepareStepDetails() {
       }
       stepDetailsCase_ = 2;
       onChanged();
-      ;
       return prepareStepDetailsBuilder_;
     }
 
@@ -2826,7 +2851,6 @@ public Builder clearRedirectWritesStepDetails() {
       }
       stepDetailsCase_ = 3;
       onChanged();
-      ;
       return redirectWritesStepDetailsBuilder_;
     }
 
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 af520c92223d..e39101f4cf76 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
@@ -70,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int STATE_FIELD_NUMBER = 1;
-  private int state_;
+  private int state_ = 0;
   /**
    *
    *
@@ -99,9 +99,8 @@ public int getStateValue() {
    */
   @java.lang.Override
   public com.google.datastore.admin.v1.MigrationState getState() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.admin.v1.MigrationState result =
-        com.google.datastore.admin.v1.MigrationState.valueOf(state_);
+        com.google.datastore.admin.v1.MigrationState.forNumber(state_);
     return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
   }
 
@@ -306,8 +305,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       state_ = 0;
-
       return this;
     }
 
@@ -335,11 +334,20 @@ public com.google.datastore.admin.v1.MigrationStateEvent build() {
     public com.google.datastore.admin.v1.MigrationStateEvent buildPartial() {
       com.google.datastore.admin.v1.MigrationStateEvent result =
           new com.google.datastore.admin.v1.MigrationStateEvent(this);
-      result.state_ = state_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.MigrationStateEvent result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.state_ = state_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -418,7 +426,7 @@ public Builder mergeFrom(
             case 8:
               {
                 state_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             default:
@@ -438,6 +446,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private int state_ = 0;
     /**
      *
@@ -467,8 +477,8 @@ public int getStateValue() {
      * @return This builder for chaining.
      */
     public Builder setStateValue(int value) {
-
       state_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -485,9 +495,8 @@ public Builder setStateValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.admin.v1.MigrationState getState() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.admin.v1.MigrationState result =
-          com.google.datastore.admin.v1.MigrationState.valueOf(state_);
+          com.google.datastore.admin.v1.MigrationState.forNumber(state_);
       return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
     }
     /**
@@ -506,7 +515,7 @@ public Builder setState(com.google.datastore.admin.v1.MigrationState value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       state_ = value.getNumber();
       onChanged();
       return this;
@@ -523,7 +532,7 @@ public Builder setState(com.google.datastore.admin.v1.MigrationState value) {
      * @return This builder for chaining.
      */
     public Builder clearState() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       state_ = 0;
       onChanged();
       return this;
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 05e298a58460..1b70d7be3c52 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
@@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int WORK_COMPLETED_FIELD_NUMBER = 1;
-  private long workCompleted_;
+  private long workCompleted_ = 0L;
   /**
    *
    *
@@ -85,7 +85,7 @@ public long getWorkCompleted() {
   }
 
   public static final int WORK_ESTIMATED_FIELD_NUMBER = 2;
-  private long workEstimated_;
+  private long workEstimated_ = 0L;
   /**
    *
    *
@@ -308,10 +308,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       workCompleted_ = 0L;
-
       workEstimated_ = 0L;
-
       return this;
     }
 
@@ -339,12 +338,23 @@ public com.google.datastore.admin.v1.Progress build() {
     public com.google.datastore.admin.v1.Progress buildPartial() {
       com.google.datastore.admin.v1.Progress result =
           new com.google.datastore.admin.v1.Progress(this);
-      result.workCompleted_ = workCompleted_;
-      result.workEstimated_ = workEstimated_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.admin.v1.Progress result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.workCompleted_ = workCompleted_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.workEstimated_ = workEstimated_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -425,13 +435,13 @@ public Builder mergeFrom(
             case 8:
               {
                 workCompleted_ = input.readInt64();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 16:
               {
                 workEstimated_ = input.readInt64();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -451,6 +461,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private long workCompleted_;
     /**
      *
@@ -484,6 +496,7 @@ public long getWorkCompleted() {
     public Builder setWorkCompleted(long value) {
 
       workCompleted_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -500,7 +513,7 @@ public Builder setWorkCompleted(long value) {
      * @return This builder for chaining.
      */
     public Builder clearWorkCompleted() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       workCompleted_ = 0L;
       onChanged();
       return this;
@@ -539,6 +552,7 @@ public long getWorkEstimated() {
     public Builder setWorkEstimated(long value) {
 
       workEstimated_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -555,7 +569,7 @@ public Builder setWorkEstimated(long value) {
      * @return This builder for chaining.
      */
     public Builder clearWorkEstimated() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       workEstimated_ = 0L;
       onChanged();
       return this;
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 56ba0a35f15e..3cf3b5abc802 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
@@ -439,7 +439,7 @@ public com.google.protobuf.Int64Value getUpTo() {
        */
       @java.lang.Override
       public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() {
-        return getUpTo();
+        return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -649,10 +649,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          if (upToBuilder_ == null) {
-            upTo_ = null;
-          } else {
-            upTo_ = null;
+          bitField0_ = 0;
+          upTo_ = null;
+          if (upToBuilder_ != null) {
+            upToBuilder_.dispose();
             upToBuilder_ = null;
           }
           return this;
@@ -683,15 +683,21 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count build() {
         public com.google.datastore.v1.AggregationQuery.Aggregation.Count buildPartial() {
           com.google.datastore.v1.AggregationQuery.Aggregation.Count result =
               new com.google.datastore.v1.AggregationQuery.Aggregation.Count(this);
-          if (upToBuilder_ == null) {
-            result.upTo_ = upTo_;
-          } else {
-            result.upTo_ = upToBuilder_.build();
+          if (bitField0_ != 0) {
+            buildPartial0(result);
           }
           onBuilt();
           return result;
         }
 
+        private void buildPartial0(
+            com.google.datastore.v1.AggregationQuery.Aggregation.Count result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.upTo_ = upToBuilder_ == null ? upTo_ : upToBuilder_.build();
+          }
+        }
+
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -773,7 +779,7 @@ public Builder mergeFrom(
                 case 10:
                   {
                     input.readMessage(getUpToFieldBuilder().getBuilder(), extensionRegistry);
-
+                    bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                 default:
@@ -793,6 +799,8 @@ public Builder mergeFrom(
           return this;
         }
 
+        private int bitField0_;
+
         private com.google.protobuf.Int64Value upTo_;
         private com.google.protobuf.SingleFieldBuilderV3<
                 com.google.protobuf.Int64Value,
@@ -823,7 +831,7 @@ public Builder mergeFrom(
          * @return Whether the upTo field is set.
          */
         public boolean hasUpTo() {
-          return upToBuilder_ != null || upTo_ != null;
+          return ((bitField0_ & 0x00000001) != 0);
         }
         /**
          *
@@ -882,11 +890,11 @@ public Builder setUpTo(com.google.protobuf.Int64Value value) {
               throw new NullPointerException();
             }
             upTo_ = value;
-            onChanged();
           } else {
             upToBuilder_.setMessage(value);
           }
-
+          bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -913,11 +921,11 @@ public Builder setUpTo(com.google.protobuf.Int64Value value) {
         public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) {
           if (upToBuilder_ == null) {
             upTo_ = builderForValue.build();
-            onChanged();
           } else {
             upToBuilder_.setMessage(builderForValue.build());
           }
-
+          bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -943,17 +951,18 @@ public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) {
          */
         public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
           if (upToBuilder_ == null) {
-            if (upTo_ != null) {
-              upTo_ =
-                  com.google.protobuf.Int64Value.newBuilder(upTo_).mergeFrom(value).buildPartial();
+            if (((bitField0_ & 0x00000001) != 0)
+                && upTo_ != null
+                && upTo_ != com.google.protobuf.Int64Value.getDefaultInstance()) {
+              getUpToBuilder().mergeFrom(value);
             } else {
               upTo_ = value;
             }
-            onChanged();
           } else {
             upToBuilder_.mergeFrom(value);
           }
-
+          bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -978,14 +987,13 @@ public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
          *     
          */
         public Builder clearUpTo() {
-          if (upToBuilder_ == null) {
-            upTo_ = null;
-            onChanged();
-          } else {
-            upTo_ = null;
+          bitField0_ = (bitField0_ & ~0x00000001);
+          upTo_ = null;
+          if (upToBuilder_ != null) {
+            upToBuilder_.dispose();
             upToBuilder_ = null;
           }
-
+          onChanged();
           return this;
         }
         /**
@@ -1010,7 +1018,7 @@ public Builder clearUpTo() {
          *     
          */
         public com.google.protobuf.Int64Value.Builder getUpToBuilder() {
-
+          bitField0_ |= 0x00000001;
           onChanged();
           return getUpToFieldBuilder().getBuilder();
         }
@@ -1243,7 +1251,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
     }
 
     public static final int ALIAS_FIELD_NUMBER = 7;
-    private volatile java.lang.Object alias_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object alias_ = "";
     /**
      *
      *
@@ -1568,11 +1578,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (countBuilder_ != null) {
           countBuilder_.clear();
         }
         alias_ = "";
-
         operatorCase_ = 0;
         operator_ = null;
         return this;
@@ -1602,19 +1612,29 @@ public com.google.datastore.v1.AggregationQuery.Aggregation build() {
       public com.google.datastore.v1.AggregationQuery.Aggregation buildPartial() {
         com.google.datastore.v1.AggregationQuery.Aggregation result =
             new com.google.datastore.v1.AggregationQuery.Aggregation(this);
-        if (operatorCase_ == 1) {
-          if (countBuilder_ == null) {
-            result.operator_ = operator_;
-          } else {
-            result.operator_ = countBuilder_.build();
-          }
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.alias_ = alias_;
-        result.operatorCase_ = operatorCase_;
+        buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.datastore.v1.AggregationQuery.Aggregation result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.alias_ = alias_;
+        }
+      }
+
+      private void buildPartialOneofs(com.google.datastore.v1.AggregationQuery.Aggregation result) {
+        result.operatorCase_ = operatorCase_;
+        result.operator_ = this.operator_;
+        if (operatorCase_ == 1 && countBuilder_ != null) {
+          result.operator_ = countBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1665,6 +1685,7 @@ public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation ot
           return this;
         if (!other.getAlias().isEmpty()) {
           alias_ = other.alias_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         switch (other.getOperatorCase()) {
@@ -1713,7 +1734,7 @@ public Builder mergeFrom(
               case 58:
                 {
                   alias_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 58
               default:
@@ -1747,6 +1768,8 @@ public Builder clearOperator() {
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.datastore.v1.AggregationQuery.Aggregation.Count,
               com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
@@ -1957,7 +1980,6 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
         }
         operatorCase_ = 1;
         onChanged();
-        ;
         return countBuilder_;
       }
 
@@ -2100,8 +2122,8 @@ public Builder setAlias(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         alias_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2143,8 +2165,8 @@ public Builder setAlias(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearAlias() {
-
         alias_ = getDefaultInstance().getAlias();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -2191,8 +2213,8 @@ public Builder setAliasBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         alias_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2357,6 +2379,8 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
   }
 
   public static final int AGGREGATIONS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List aggregations_;
   /**
    *
@@ -2669,6 +2693,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (nestedQueryBuilder_ != null) {
         nestedQueryBuilder_.clear();
       }
@@ -2678,7 +2703,7 @@ public Builder clear() {
         aggregations_ = null;
         aggregationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -2708,26 +2733,37 @@ public com.google.datastore.v1.AggregationQuery build() {
     public com.google.datastore.v1.AggregationQuery buildPartial() {
       com.google.datastore.v1.AggregationQuery result =
           new com.google.datastore.v1.AggregationQuery(this);
-      int from_bitField0_ = bitField0_;
-      if (queryTypeCase_ == 1) {
-        if (nestedQueryBuilder_ == null) {
-          result.queryType_ = queryType_;
-        } else {
-          result.queryType_ = nestedQueryBuilder_.build();
-        }
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.AggregationQuery result) {
       if (aggregationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           aggregations_ = java.util.Collections.unmodifiableList(aggregations_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.aggregations_ = aggregations_;
       } else {
         result.aggregations_ = aggregationsBuilder_.build();
       }
+    }
+
+    private void buildPartial0(com.google.datastore.v1.AggregationQuery result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.AggregationQuery result) {
       result.queryTypeCase_ = queryTypeCase_;
-      onBuilt();
-      return result;
+      result.queryType_ = this.queryType_;
+      if (queryTypeCase_ == 1 && nestedQueryBuilder_ != null) {
+        result.queryType_ = nestedQueryBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -2779,7 +2815,7 @@ public Builder mergeFrom(com.google.datastore.v1.AggregationQuery other) {
         if (!other.aggregations_.isEmpty()) {
           if (aggregations_.isEmpty()) {
             aggregations_ = other.aggregations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureAggregationsIsMutable();
             aggregations_.addAll(other.aggregations_);
@@ -2792,7 +2828,7 @@ public Builder mergeFrom(com.google.datastore.v1.AggregationQuery other) {
             aggregationsBuilder_.dispose();
             aggregationsBuilder_ = null;
             aggregations_ = other.aggregations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             aggregationsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAggregationsFieldBuilder()
@@ -3094,7 +3130,6 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
       }
       queryTypeCase_ = 1;
       onChanged();
-      ;
       return nestedQueryBuilder_;
     }
 
@@ -3102,11 +3137,11 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureAggregationsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         aggregations_ =
             new java.util.ArrayList(
                 aggregations_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -3369,7 +3404,7 @@ public Builder addAllAggregations(
     public Builder clearAggregations() {
       if (aggregationsBuilder_ == null) {
         aggregations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         aggregationsBuilder_.clear();
@@ -3523,7 +3558,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati
                 com.google.datastore.v1.AggregationQuery.Aggregation,
                 com.google.datastore.v1.AggregationQuery.Aggregation.Builder,
                 com.google.datastore.v1.AggregationQuery.AggregationOrBuilder>(
-                aggregations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                aggregations_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         aggregations_ = null;
       }
       return aggregationsBuilder_;
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 9d32764990cc..b84dc5c41c35 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
@@ -94,6 +94,7 @@ private static final class AggregatePropertiesDefaultEntryHolder {
                     com.google.datastore.v1.Value.getDefaultInstance());
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField
       aggregateProperties_;
 
@@ -164,8 +165,10 @@ public java.util.Map getAggrega
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
    */
   @java.lang.Override
-  public com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
-      java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+  public /* nullable */ com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
+      java.lang.String key,
+      /* nullable */
+      com.google.datastore.v1.Value defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -431,6 +434,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       internalGetMutableAggregateProperties().clear();
       return this;
     }
@@ -459,13 +463,21 @@ public com.google.datastore.v1.AggregationResult build() {
     public com.google.datastore.v1.AggregationResult buildPartial() {
       com.google.datastore.v1.AggregationResult result =
           new com.google.datastore.v1.AggregationResult(this);
-      int from_bitField0_ = bitField0_;
-      result.aggregateProperties_ = internalGetAggregateProperties();
-      result.aggregateProperties_.makeImmutable();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.AggregationResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.aggregateProperties_ = internalGetAggregateProperties();
+        result.aggregateProperties_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -512,6 +524,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.AggregationResult other) {
       if (other == com.google.datastore.v1.AggregationResult.getDefaultInstance()) return this;
       internalGetMutableAggregateProperties().mergeFrom(other.internalGetAggregateProperties());
+      bitField0_ |= 0x00000001;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -548,6 +561,7 @@ public Builder mergeFrom(
                 internalGetMutableAggregateProperties()
                     .getMutableMap()
                     .put(aggregateProperties__.getKey(), aggregateProperties__.getValue());
+                bitField0_ |= 0x00000001;
                 break;
               } // case 18
             default:
@@ -583,8 +597,6 @@ public Builder mergeFrom(
 
     private com.google.protobuf.MapField
         internalGetMutableAggregateProperties() {
-      onChanged();
-      ;
       if (aggregateProperties_ == null) {
         aggregateProperties_ =
             com.google.protobuf.MapField.newMapField(
@@ -593,6 +605,8 @@ public Builder mergeFrom(
       if (!aggregateProperties_.isMutable()) {
         aggregateProperties_ = aggregateProperties_.copy();
       }
+      bitField0_ |= 0x00000001;
+      onChanged();
       return aggregateProperties_;
     }
 
@@ -654,8 +668,10 @@ public java.util.Map getAggrega
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
      */
     @java.lang.Override
-    public com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
-        java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+    public /* nullable */ com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
+        java.lang.String key,
+        /* nullable */
+        com.google.datastore.v1.Value defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -689,6 +705,7 @@ public com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.Str
     }
 
     public Builder clearAggregateProperties() {
+      bitField0_ = (bitField0_ & ~0x00000001);
       internalGetMutableAggregateProperties().getMutableMap().clear();
       return this;
     }
@@ -715,6 +732,7 @@ public Builder removeAggregateProperties(java.lang.String key) {
     @java.lang.Deprecated
     public java.util.Map
         getMutableAggregateProperties() {
+      bitField0_ |= 0x00000001;
       return internalGetMutableAggregateProperties().getMutableMap();
     }
     /**
@@ -737,8 +755,8 @@ public Builder putAggregateProperties(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableAggregateProperties().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000001;
       return this;
     }
     /**
@@ -756,6 +774,7 @@ public Builder putAggregateProperties(
     public Builder putAllAggregateProperties(
         java.util.Map values) {
       internalGetMutableAggregateProperties().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000001;
       return this;
     }
 
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 c603e515f1c0..e041913ca6fd 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
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int AGGREGATION_RESULTS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List aggregationResults_;
   /**
    *
@@ -139,7 +141,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO
   }
 
   public static final int MORE_RESULTS_FIELD_NUMBER = 2;
-  private int moreResults_;
+  private int moreResults_ = 0;
   /**
    *
    *
@@ -172,9 +174,8 @@ public int getMoreResultsValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
-        com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+        com.google.datastore.v1.QueryResultBatch.MoreResultsType.forNumber(moreResults_);
     return result == null
         ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
         : result;
@@ -232,7 +233,7 @@ public com.google.protobuf.Timestamp getReadTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
-    return getReadTime();
+    return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -462,6 +463,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (aggregationResultsBuilder_ == null) {
         aggregationResults_ = java.util.Collections.emptyList();
       } else {
@@ -470,11 +472,9 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       moreResults_ = 0;
-
-      if (readTimeBuilder_ == null) {
-        readTime_ = null;
-      } else {
-        readTime_ = null;
+      readTime_ = null;
+      if (readTimeBuilder_ != null) {
+        readTimeBuilder_.dispose();
         readTimeBuilder_ = null;
       }
       return this;
@@ -504,7 +504,15 @@ public com.google.datastore.v1.AggregationResultBatch build() {
     public com.google.datastore.v1.AggregationResultBatch buildPartial() {
       com.google.datastore.v1.AggregationResultBatch result =
           new com.google.datastore.v1.AggregationResultBatch(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.AggregationResultBatch result) {
       if (aggregationResultsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           aggregationResults_ = java.util.Collections.unmodifiableList(aggregationResults_);
@@ -514,14 +522,16 @@ public com.google.datastore.v1.AggregationResultBatch buildPartial() {
       } else {
         result.aggregationResults_ = aggregationResultsBuilder_.build();
       }
-      result.moreResults_ = moreResults_;
-      if (readTimeBuilder_ == null) {
-        result.readTime_ = readTime_;
-      } else {
-        result.readTime_ = readTimeBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.datastore.v1.AggregationResultBatch result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.moreResults_ = moreResults_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -644,13 +654,13 @@ public Builder mergeFrom(
             case 16:
               {
                 moreResults_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -1064,8 +1074,8 @@ public int getMoreResultsValue() {
      * @return This builder for chaining.
      */
     public Builder setMoreResultsValue(int value) {
-
       moreResults_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1084,9 +1094,8 @@ public Builder setMoreResultsValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
-          com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+          com.google.datastore.v1.QueryResultBatch.MoreResultsType.forNumber(moreResults_);
       return result == null
           ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
           : result;
@@ -1109,7 +1118,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       moreResults_ = value.getNumber();
       onChanged();
       return this;
@@ -1128,7 +1137,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
      * @return This builder for chaining.
      */
     public Builder clearMoreResults() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       moreResults_ = 0;
       onChanged();
       return this;
@@ -1155,7 +1164,7 @@ public Builder clearMoreResults() {
      * @return Whether the readTime field is set.
      */
     public boolean hasReadTime() {
-      return readTimeBuilder_ != null || readTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1196,11 +1205,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         readTime_ = value;
-        onChanged();
       } else {
         readTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1218,11 +1227,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
     public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (readTimeBuilder_ == null) {
         readTime_ = builderForValue.build();
-        onChanged();
       } else {
         readTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1239,17 +1248,18 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
      */
     public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       if (readTimeBuilder_ == null) {
-        if (readTime_ != null) {
-          readTime_ =
-              com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && readTime_ != null
+            && readTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getReadTimeBuilder().mergeFrom(value);
         } else {
           readTime_ = value;
         }
-        onChanged();
       } else {
         readTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1265,14 +1275,13 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp read_time = 3;
      */
     public Builder clearReadTime() {
-      if (readTimeBuilder_ == null) {
-        readTime_ = null;
-        onChanged();
-      } else {
-        readTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      readTime_ = null;
+      if (readTimeBuilder_ != null) {
+        readTimeBuilder_.dispose();
         readTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1288,7 +1297,7 @@ public Builder clearReadTime() {
      * .google.protobuf.Timestamp read_time = 3;
      */
     public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getReadTimeFieldBuilder().getBuilder();
     }
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 7d03c654bcb8..6f622580ff0f 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
@@ -77,7 +77,6 @@ public interface AggregationResultOrBuilder
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
    */
-
   /* nullable */
   com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
       java.lang.String key,
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 c11a174073ab..206fd62ffd4c 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
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -173,6 +177,8 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   }
 
   public static final int KEYS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List keys_;
   /**
    *
@@ -468,17 +474,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
       } else {
         keys_ = null;
         keysBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -506,20 +511,34 @@ public com.google.datastore.v1.AllocateIdsRequest build() {
     public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
       com.google.datastore.v1.AllocateIdsRequest result =
           new com.google.datastore.v1.AllocateIdsRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.projectId_ = projectId_;
-      result.databaseId_ = databaseId_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.AllocateIdsRequest result) {
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.keys_ = keys_;
       } else {
         result.keys_ = keysBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.AllocateIdsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
+      }
     }
 
     @java.lang.Override
@@ -569,17 +588,19 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
       if (other == com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (keysBuilder_ == null) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureKeysIsMutable();
             keys_.addAll(other.keys_);
@@ -592,7 +613,7 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
             keysBuilder_.dispose();
             keysBuilder_ = null;
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             keysBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getKeysFieldBuilder()
@@ -643,13 +664,13 @@ public Builder mergeFrom(
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
             default:
@@ -732,8 +753,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -749,8 +770,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -771,8 +792,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -844,8 +865,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -863,8 +884,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -887,8 +908,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -896,9 +917,9 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1132,7 +1153,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
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 4d07606ac24e..6178966318f4 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
@@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int KEYS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List keys_;
   /**
    *
@@ -341,6 +343,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
       } else {
@@ -375,7 +378,15 @@ public com.google.datastore.v1.AllocateIdsResponse build() {
     public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
       com.google.datastore.v1.AllocateIdsResponse result =
           new com.google.datastore.v1.AllocateIdsResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.AllocateIdsResponse result) {
       if (keysBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -385,8 +396,10 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
       } else {
         result.keys_ = keysBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.AllocateIdsResponse result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 955ce99f4b51..c8ca14ce3c6b 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
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VALUES_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List values_;
   /**
    *
@@ -342,6 +344,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (valuesBuilder_ == null) {
         values_ = java.util.Collections.emptyList();
       } else {
@@ -375,7 +378,15 @@ public com.google.datastore.v1.ArrayValue build() {
     @java.lang.Override
     public com.google.datastore.v1.ArrayValue buildPartial() {
       com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.ArrayValue result) {
       if (valuesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           values_ = java.util.Collections.unmodifiableList(values_);
@@ -385,8 +396,10 @@ public com.google.datastore.v1.ArrayValue buildPartial() {
       } else {
         result.values_ = valuesBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.ArrayValue result) {
+      int from_bitField0_ = bitField0_;
     }
 
     @java.lang.Override
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 6160b1ddf4b7..e194f4bc1843 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
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -216,7 +220,9 @@ public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
    */
   @java.lang.Override
   public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptionsOrBuilder() {
-    return getTransactionOptions();
+    return transactionOptions_ == null
+        ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
+        : transactionOptions_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -440,14 +446,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
-      if (transactionOptionsBuilder_ == null) {
-        transactionOptions_ = null;
-      } else {
-        transactionOptions_ = null;
+      transactionOptions_ = null;
+      if (transactionOptionsBuilder_ != null) {
+        transactionOptionsBuilder_.dispose();
         transactionOptionsBuilder_ = null;
       }
       return this;
@@ -477,17 +481,29 @@ public com.google.datastore.v1.BeginTransactionRequest build() {
     public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
       com.google.datastore.v1.BeginTransactionRequest result =
           new com.google.datastore.v1.BeginTransactionRequest(this);
-      result.projectId_ = projectId_;
-      result.databaseId_ = databaseId_;
-      if (transactionOptionsBuilder_ == null) {
-        result.transactionOptions_ = transactionOptions_;
-      } else {
-        result.transactionOptions_ = transactionOptionsBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.BeginTransactionRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.transactionOptions_ =
+            transactionOptionsBuilder_ == null
+                ? transactionOptions_
+                : transactionOptionsBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -536,10 +552,12 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other)
         return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasTransactionOptions()) {
@@ -574,20 +592,20 @@ public Builder mergeFrom(
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
             case 82:
               {
                 input.readMessage(
                     getTransactionOptionsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 82
             default:
@@ -607,6 +625,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -668,8 +688,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -685,8 +705,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -707,8 +727,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -780,8 +800,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -799,8 +819,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -823,8 +843,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -847,7 +867,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the transactionOptions field is set.
      */
     public boolean hasTransactionOptions() {
-      return transactionOptionsBuilder_ != null || transactionOptions_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -884,11 +904,11 @@ public Builder setTransactionOptions(com.google.datastore.v1.TransactionOptions
           throw new NullPointerException();
         }
         transactionOptions_ = value;
-        onChanged();
       } else {
         transactionOptionsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -904,11 +924,11 @@ public Builder setTransactionOptions(
         com.google.datastore.v1.TransactionOptions.Builder builderForValue) {
       if (transactionOptionsBuilder_ == null) {
         transactionOptions_ = builderForValue.build();
-        onChanged();
       } else {
         transactionOptionsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -922,19 +942,19 @@ public Builder setTransactionOptions(
      */
     public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOptions value) {
       if (transactionOptionsBuilder_ == null) {
-        if (transactionOptions_ != null) {
-          transactionOptions_ =
-              com.google.datastore.v1.TransactionOptions.newBuilder(transactionOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && transactionOptions_ != null
+            && transactionOptions_
+                != com.google.datastore.v1.TransactionOptions.getDefaultInstance()) {
+          getTransactionOptionsBuilder().mergeFrom(value);
         } else {
           transactionOptions_ = value;
         }
-        onChanged();
       } else {
         transactionOptionsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -947,14 +967,13 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
      */
     public Builder clearTransactionOptions() {
-      if (transactionOptionsBuilder_ == null) {
-        transactionOptions_ = null;
-        onChanged();
-      } else {
-        transactionOptions_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      transactionOptions_ = null;
+      if (transactionOptionsBuilder_ != null) {
+        transactionOptionsBuilder_.dispose();
         transactionOptionsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -967,7 +986,7 @@ public Builder clearTransactionOptions() {
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
      */
     public com.google.datastore.v1.TransactionOptions.Builder getTransactionOptionsBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getTransactionOptionsFieldBuilder().getBuilder();
     }
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 8b940dbe268c..04be1060dcbe 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
@@ -69,7 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
-  private com.google.protobuf.ByteString transaction_;
+  private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -284,8 +284,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       transaction_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -313,11 +313,20 @@ public com.google.datastore.v1.BeginTransactionResponse build() {
     public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
       com.google.datastore.v1.BeginTransactionResponse result =
           new com.google.datastore.v1.BeginTransactionResponse(this);
-      result.transaction_ = transaction_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.BeginTransactionResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.transaction_ = transaction_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -396,7 +405,7 @@ public Builder mergeFrom(
             case 10:
               {
                 transaction_ = input.readBytes();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -416,6 +425,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
     /**
      *
@@ -448,8 +459,8 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       transaction_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -465,7 +476,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearTransaction() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       transaction_ = getDefaultInstance().getTransaction();
       onChanged();
       return this;
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 0cfbb87f0041..88570ade673b 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
@@ -239,6 +239,7 @@ public enum TransactionSelectorCase
           com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     TRANSACTION(1),
+    SINGLE_USE_TRANSACTION(10),
     TRANSACTIONSELECTOR_NOT_SET(0);
     private final int value;
 
@@ -259,6 +260,8 @@ public static TransactionSelectorCase forNumber(int value) {
       switch (value) {
         case 1:
           return TRANSACTION;
+        case 10:
+          return SINGLE_USE_TRANSACTION;
         case 0:
           return TRANSACTIONSELECTOR_NOT_SET;
         default:
@@ -276,7 +279,9 @@ public TransactionSelectorCase getTransactionSelectorCase() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -325,7 +330,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -378,7 +385,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   }
 
   public static final int MODE_FIELD_NUMBER = 5;
-  private int mode_;
+  private int mode_ = 0;
   /**
    *
    *
@@ -407,9 +414,8 @@ public int getModeValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.CommitRequest.Mode getMode() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.CommitRequest.Mode result =
-        com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
+        com.google.datastore.v1.CommitRequest.Mode.forNumber(mode_);
     return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
   }
 
@@ -452,7 +458,72 @@ public com.google.protobuf.ByteString getTransaction() {
     return com.google.protobuf.ByteString.EMPTY;
   }
 
+  public static final int SINGLE_USE_TRANSACTION_FIELD_NUMBER = 10;
+  /**
+   *
+   *
+   * 
    +   * Options for beginning a new transaction for this request.
+   * The transaction is committed when the request completes. If specified,
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+   * must be
+   * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+   *
+   * @return Whether the singleUseTransaction field is set.
+   */
+  @java.lang.Override
+  public boolean hasSingleUseTransaction() {
+    return transactionSelectorCase_ == 10;
+  }
+  /**
+   *
+   *
+   * 
    +   * Options for beginning a new transaction for this request.
+   * The transaction is committed when the request completes. If specified,
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+   * must be
+   * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+   *
+   * @return The singleUseTransaction.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() {
+    if (transactionSelectorCase_ == 10) {
+      return (com.google.datastore.v1.TransactionOptions) transactionSelector_;
+    }
+    return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Options for beginning a new transaction for this request.
+   * The transaction is committed when the request completes. If specified,
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+   * must be
+   * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransactionOrBuilder() {
+    if (transactionSelectorCase_ == 10) {
+      return (com.google.datastore.v1.TransactionOptions) transactionSelector_;
+    }
+    return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+  }
+
   public static final int MUTATIONS_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List mutations_;
   /**
    *
@@ -595,6 +666,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
+    if (transactionSelectorCase_ == 10) {
+      output.writeMessage(10, (com.google.datastore.v1.TransactionOptions) transactionSelector_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -621,6 +695,11 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
+    if (transactionSelectorCase_ == 10) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              10, (com.google.datastore.v1.TransactionOptions) transactionSelector_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -645,6 +724,9 @@ public boolean equals(final java.lang.Object obj) {
       case 1:
         if (!getTransaction().equals(other.getTransaction())) return false;
         break;
+      case 10:
+        if (!getSingleUseTransaction().equals(other.getSingleUseTransaction())) return false;
+        break;
       case 0:
       default:
     }
@@ -674,6 +756,10 @@ public int hashCode() {
         hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
         hash = (53 * hash) + getTransaction().hashCode();
         break;
+      case 10:
+        hash = (37 * hash) + SINGLE_USE_TRANSACTION_FIELD_NUMBER;
+        hash = (53 * hash) + getSingleUseTransaction().hashCode();
+        break;
       case 0:
       default:
     }
@@ -814,19 +900,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
       mode_ = 0;
-
+      if (singleUseTransactionBuilder_ != null) {
+        singleUseTransactionBuilder_.clear();
+      }
       if (mutationsBuilder_ == null) {
         mutations_ = java.util.Collections.emptyList();
       } else {
         mutations_ = null;
         mutationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000020);
       transactionSelectorCase_ = 0;
       transactionSelector_ = null;
       return this;
@@ -856,25 +943,46 @@ public com.google.datastore.v1.CommitRequest build() {
     public com.google.datastore.v1.CommitRequest buildPartial() {
       com.google.datastore.v1.CommitRequest result =
           new com.google.datastore.v1.CommitRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.projectId_ = projectId_;
-      result.databaseId_ = databaseId_;
-      result.mode_ = mode_;
-      if (transactionSelectorCase_ == 1) {
-        result.transactionSelector_ = transactionSelector_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.CommitRequest result) {
       if (mutationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           mutations_ = java.util.Collections.unmodifiableList(mutations_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.mutations_ = mutations_;
       } else {
         result.mutations_ = mutationsBuilder_.build();
       }
+    }
+
+    private void buildPartial0(com.google.datastore.v1.CommitRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.mode_ = mode_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.CommitRequest result) {
       result.transactionSelectorCase_ = transactionSelectorCase_;
-      onBuilt();
-      return result;
+      result.transactionSelector_ = this.transactionSelector_;
+      if (transactionSelectorCase_ == 10 && singleUseTransactionBuilder_ != null) {
+        result.transactionSelector_ = singleUseTransactionBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -924,10 +1032,12 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
       if (other == com.google.datastore.v1.CommitRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.mode_ != 0) {
@@ -937,7 +1047,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
         if (!other.mutations_.isEmpty()) {
           if (mutations_.isEmpty()) {
             mutations_ = other.mutations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureMutationsIsMutable();
             mutations_.addAll(other.mutations_);
@@ -950,7 +1060,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
             mutationsBuilder_.dispose();
             mutationsBuilder_ = null;
             mutations_ = other.mutations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
             mutationsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMutationsFieldBuilder()
@@ -966,6 +1076,11 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
             setTransaction(other.getTransaction());
             break;
           }
+        case SINGLE_USE_TRANSACTION:
+          {
+            mergeSingleUseTransaction(other.getSingleUseTransaction());
+            break;
+          }
         case TRANSACTIONSELECTOR_NOT_SET:
           {
             break;
@@ -1006,7 +1121,7 @@ public Builder mergeFrom(
             case 40:
               {
                 mode_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 40
             case 50:
@@ -1024,15 +1139,22 @@ public Builder mergeFrom(
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
+            case 82:
+              {
+                input.readMessage(
+                    getSingleUseTransactionFieldBuilder().getBuilder(), extensionRegistry);
+                transactionSelectorCase_ = 10;
+                break;
+              } // case 82
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1127,8 +1249,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1144,8 +1266,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1166,8 +1288,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1239,8 +1361,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1258,8 +1380,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1282,8 +1404,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1317,8 +1439,8 @@ public int getModeValue() {
      * @return This builder for chaining.
      */
     public Builder setModeValue(int value) {
-
       mode_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1335,9 +1457,8 @@ public Builder setModeValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.v1.CommitRequest.Mode getMode() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.CommitRequest.Mode result =
-          com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
+          com.google.datastore.v1.CommitRequest.Mode.forNumber(mode_);
       return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
     }
     /**
@@ -1356,7 +1477,7 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       mode_ = value.getNumber();
       onChanged();
       return this;
@@ -1373,7 +1494,7 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
      * @return This builder for chaining.
      */
     public Builder clearMode() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       mode_ = 0;
       onChanged();
       return this;
@@ -1459,13 +1580,259 @@ public Builder clearTransaction() {
       return this;
     }
 
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.TransactionOptions,
+            com.google.datastore.v1.TransactionOptions.Builder,
+            com.google.datastore.v1.TransactionOptionsOrBuilder>
+        singleUseTransactionBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     *
+     * @return Whether the singleUseTransaction field is set.
+     */
+    @java.lang.Override
+    public boolean hasSingleUseTransaction() {
+      return transactionSelectorCase_ == 10;
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     *
+     * @return The singleUseTransaction.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() {
+      if (singleUseTransactionBuilder_ == null) {
+        if (transactionSelectorCase_ == 10) {
+          return (com.google.datastore.v1.TransactionOptions) transactionSelector_;
+        }
+        return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+      } else {
+        if (transactionSelectorCase_ == 10) {
+          return singleUseTransactionBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     */
+    public Builder setSingleUseTransaction(com.google.datastore.v1.TransactionOptions value) {
+      if (singleUseTransactionBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        transactionSelector_ = value;
+        onChanged();
+      } else {
+        singleUseTransactionBuilder_.setMessage(value);
+      }
+      transactionSelectorCase_ = 10;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     */
+    public Builder setSingleUseTransaction(
+        com.google.datastore.v1.TransactionOptions.Builder builderForValue) {
+      if (singleUseTransactionBuilder_ == null) {
+        transactionSelector_ = builderForValue.build();
+        onChanged();
+      } else {
+        singleUseTransactionBuilder_.setMessage(builderForValue.build());
+      }
+      transactionSelectorCase_ = 10;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     */
+    public Builder mergeSingleUseTransaction(com.google.datastore.v1.TransactionOptions value) {
+      if (singleUseTransactionBuilder_ == null) {
+        if (transactionSelectorCase_ == 10
+            && transactionSelector_
+                != com.google.datastore.v1.TransactionOptions.getDefaultInstance()) {
+          transactionSelector_ =
+              com.google.datastore.v1.TransactionOptions.newBuilder(
+                      (com.google.datastore.v1.TransactionOptions) transactionSelector_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          transactionSelector_ = value;
+        }
+        onChanged();
+      } else {
+        if (transactionSelectorCase_ == 10) {
+          singleUseTransactionBuilder_.mergeFrom(value);
+        } else {
+          singleUseTransactionBuilder_.setMessage(value);
+        }
+      }
+      transactionSelectorCase_ = 10;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     */
+    public Builder clearSingleUseTransaction() {
+      if (singleUseTransactionBuilder_ == null) {
+        if (transactionSelectorCase_ == 10) {
+          transactionSelectorCase_ = 0;
+          transactionSelector_ = null;
+          onChanged();
+        }
+      } else {
+        if (transactionSelectorCase_ == 10) {
+          transactionSelectorCase_ = 0;
+          transactionSelector_ = null;
+        }
+        singleUseTransactionBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     */
+    public com.google.datastore.v1.TransactionOptions.Builder getSingleUseTransactionBuilder() {
+      return getSingleUseTransactionFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransactionOrBuilder() {
+      if ((transactionSelectorCase_ == 10) && (singleUseTransactionBuilder_ != null)) {
+        return singleUseTransactionBuilder_.getMessageOrBuilder();
+      } else {
+        if (transactionSelectorCase_ == 10) {
+          return (com.google.datastore.v1.TransactionOptions) transactionSelector_;
+        }
+        return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Options for beginning a new transaction for this request.
+     * The transaction is committed when the request completes. If specified,
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+     * must be
+     * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.TransactionOptions,
+            com.google.datastore.v1.TransactionOptions.Builder,
+            com.google.datastore.v1.TransactionOptionsOrBuilder>
+        getSingleUseTransactionFieldBuilder() {
+      if (singleUseTransactionBuilder_ == null) {
+        if (!(transactionSelectorCase_ == 10)) {
+          transactionSelector_ = com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+        }
+        singleUseTransactionBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.TransactionOptions,
+                com.google.datastore.v1.TransactionOptions.Builder,
+                com.google.datastore.v1.TransactionOptionsOrBuilder>(
+                (com.google.datastore.v1.TransactionOptions) transactionSelector_,
+                getParentForChildren(),
+                isClean());
+        transactionSelector_ = null;
+      }
+      transactionSelectorCase_ = 10;
+      onChanged();
+      return singleUseTransactionBuilder_;
+    }
+
     private java.util.List mutations_ =
         java.util.Collections.emptyList();
 
     private void ensureMutationsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         mutations_ = new java.util.ArrayList(mutations_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -1779,7 +2146,7 @@ public Builder addAllMutations(
     public Builder clearMutations() {
       if (mutationsBuilder_ == null) {
         mutations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         mutationsBuilder_.clear();
@@ -1963,7 +2330,7 @@ public java.util.List getMutationsBuil
                 com.google.datastore.v1.Mutation,
                 com.google.datastore.v1.Mutation.Builder,
                 com.google.datastore.v1.MutationOrBuilder>(
-                mutations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                mutations_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
         mutations_ = null;
       }
       return mutationsBuilder_;
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 1b15f3408e17..b0e1f7a2a3ef 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
@@ -131,6 +131,53 @@ public interface CommitRequestOrBuilder
    */
   com.google.protobuf.ByteString getTransaction();
 
+  /**
+   *
+   *
+   * 
    +   * Options for beginning a new transaction for this request.
+   * The transaction is committed when the request completes. If specified,
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+   * must be
+   * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+   *
+   * @return Whether the singleUseTransaction field is set.
+   */
+  boolean hasSingleUseTransaction();
+  /**
+   *
+   *
+   * 
    +   * Options for beginning a new transaction for this request.
+   * The transaction is committed when the request completes. If specified,
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+   * must be
+   * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+   *
+   * @return The singleUseTransaction.
+   */
+  com.google.datastore.v1.TransactionOptions getSingleUseTransaction();
+  /**
+   *
+   *
+   * 
    +   * Options for beginning a new transaction for this request.
+   * The transaction is committed when the request completes. If specified,
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+   * must be
+   * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions single_use_transaction = 10;
+   */
+  com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransactionOrBuilder();
+
   /**
    *
    *
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 785c9d38da71..9c58e7843baa 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
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int MUTATION_RESULTS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List mutationResults_;
   /**
    *
@@ -142,7 +144,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
   }
 
   public static final int INDEX_UPDATES_FIELD_NUMBER = 4;
-  private int indexUpdates_;
+  private int indexUpdates_ = 0;
   /**
    *
    *
@@ -203,7 +205,7 @@ public com.google.protobuf.Timestamp getCommitTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
-    return getCommitTime();
+    return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -427,6 +429,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (mutationResultsBuilder_ == null) {
         mutationResults_ = java.util.Collections.emptyList();
       } else {
@@ -435,11 +438,9 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       indexUpdates_ = 0;
-
-      if (commitTimeBuilder_ == null) {
-        commitTime_ = null;
-      } else {
-        commitTime_ = null;
+      commitTime_ = null;
+      if (commitTimeBuilder_ != null) {
+        commitTimeBuilder_.dispose();
         commitTimeBuilder_ = null;
       }
       return this;
@@ -469,7 +470,15 @@ public com.google.datastore.v1.CommitResponse build() {
     public com.google.datastore.v1.CommitResponse buildPartial() {
       com.google.datastore.v1.CommitResponse result =
           new com.google.datastore.v1.CommitResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.CommitResponse result) {
       if (mutationResultsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_);
@@ -479,14 +488,16 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
       } else {
         result.mutationResults_ = mutationResultsBuilder_.build();
       }
-      result.indexUpdates_ = indexUpdates_;
-      if (commitTimeBuilder_ == null) {
-        result.commitTime_ = commitTime_;
-      } else {
-        result.commitTime_ = commitTimeBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.datastore.v1.CommitResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.indexUpdates_ = indexUpdates_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.commitTime_ = commitTimeBuilder_ == null ? commitTime_ : commitTimeBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -609,13 +620,13 @@ public Builder mergeFrom(
             case 32:
               {
                 indexUpdates_ = input.readInt32();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 32
             case 66:
               {
                 input.readMessage(getCommitTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 66
             default:
@@ -1042,6 +1053,7 @@ public int getIndexUpdates() {
     public Builder setIndexUpdates(int value) {
 
       indexUpdates_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1058,7 +1070,7 @@ public Builder setIndexUpdates(int value) {
      * @return This builder for chaining.
      */
     public Builder clearIndexUpdates() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       indexUpdates_ = 0;
       onChanged();
       return this;
@@ -1082,7 +1094,7 @@ public Builder clearIndexUpdates() {
      * @return Whether the commitTime field is set.
      */
     public boolean hasCommitTime() {
-      return commitTimeBuilder_ != null || commitTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1119,11 +1131,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         commitTime_ = value;
-        onChanged();
       } else {
         commitTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1138,11 +1150,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) {
     public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (commitTimeBuilder_ == null) {
         commitTime_ = builderForValue.build();
-        onChanged();
       } else {
         commitTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1156,17 +1168,18 @@ public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCommitTime(com.google.protobuf.Timestamp value) {
       if (commitTimeBuilder_ == null) {
-        if (commitTime_ != null) {
-          commitTime_ =
-              com.google.protobuf.Timestamp.newBuilder(commitTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && commitTime_ != null
+            && commitTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCommitTimeBuilder().mergeFrom(value);
         } else {
           commitTime_ = value;
         }
-        onChanged();
       } else {
         commitTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1179,14 +1192,13 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp commit_time = 8;
      */
     public Builder clearCommitTime() {
-      if (commitTimeBuilder_ == null) {
-        commitTime_ = null;
-        onChanged();
-      } else {
-        commitTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      commitTime_ = null;
+      if (commitTimeBuilder_ != null) {
+        commitTimeBuilder_.dispose();
         commitTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1199,7 +1211,7 @@ public Builder clearCommitTime() {
      * .google.protobuf.Timestamp commit_time = 8;
      */
     public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getCommitTimeFieldBuilder().getBuilder();
     }
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 dda88803e21f..d845c7c50304 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
@@ -204,7 +204,7 @@ private Operator(int value) {
   }
 
   public static final int OP_FIELD_NUMBER = 1;
-  private int op_;
+  private int op_ = 0;
   /**
    *
    *
@@ -233,13 +233,14 @@ public int getOpValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.CompositeFilter.Operator getOp() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.CompositeFilter.Operator result =
-        com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
+        com.google.datastore.v1.CompositeFilter.Operator.forNumber(op_);
     return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result;
   }
 
   public static final int FILTERS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List filters_;
   /**
    *
@@ -525,15 +526,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       op_ = 0;
-
       if (filtersBuilder_ == null) {
         filters_ = java.util.Collections.emptyList();
       } else {
         filters_ = null;
         filtersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -561,19 +562,31 @@ public com.google.datastore.v1.CompositeFilter build() {
     public com.google.datastore.v1.CompositeFilter buildPartial() {
       com.google.datastore.v1.CompositeFilter result =
           new com.google.datastore.v1.CompositeFilter(this);
-      int from_bitField0_ = bitField0_;
-      result.op_ = op_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.CompositeFilter result) {
       if (filtersBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           filters_ = java.util.Collections.unmodifiableList(filters_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.filters_ = filters_;
       } else {
         result.filters_ = filtersBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.CompositeFilter result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.op_ = op_;
+      }
     }
 
     @java.lang.Override
@@ -628,7 +641,7 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
         if (!other.filters_.isEmpty()) {
           if (filters_.isEmpty()) {
             filters_ = other.filters_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureFiltersIsMutable();
             filters_.addAll(other.filters_);
@@ -641,7 +654,7 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
             filtersBuilder_.dispose();
             filtersBuilder_ = null;
             filters_ = other.filters_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             filtersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getFiltersFieldBuilder()
@@ -680,7 +693,7 @@ public Builder mergeFrom(
             case 8:
               {
                 op_ = input.readEnum();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 8
             case 18:
@@ -743,8 +756,8 @@ public int getOpValue() {
      * @return This builder for chaining.
      */
     public Builder setOpValue(int value) {
-
       op_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -761,9 +774,8 @@ public Builder setOpValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.v1.CompositeFilter.Operator getOp() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.CompositeFilter.Operator result =
-          com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
+          com.google.datastore.v1.CompositeFilter.Operator.forNumber(op_);
       return result == null
           ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED
           : result;
@@ -784,7 +796,7 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000001;
       op_ = value.getNumber();
       onChanged();
       return this;
@@ -801,7 +813,7 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
      * @return This builder for chaining.
      */
     public Builder clearOp() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       op_ = 0;
       onChanged();
       return this;
@@ -811,9 +823,9 @@ public Builder clearOp() {
         java.util.Collections.emptyList();
 
     private void ensureFiltersIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         filters_ = new java.util.ArrayList(filters_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1048,7 +1060,7 @@ public Builder addAllFilters(
     public Builder clearFilters() {
       if (filtersBuilder_ == null) {
         filters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         filtersBuilder_.clear();
@@ -1183,7 +1195,7 @@ public java.util.List getFiltersBuilderL
                 com.google.datastore.v1.Filter,
                 com.google.datastore.v1.Filter.Builder,
                 com.google.datastore.v1.FilterOrBuilder>(
-                filters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                filters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         filters_ = null;
       }
       return filtersBuilder_;
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 2631c9275d21..0d29f99fe7dd 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
@@ -136,135 +136,140 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\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\"\321\001\n\016LookupResponse\0220\n\005found\030\001 \003(\0132!."
+          + "\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-\n\tread_time\030\007 \001(\0132\032.google.pro"
-          + "tobuf.Timestamp\"\236\002\n\017RunQueryRequest\022\027\n\np"
-          + "roject_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.datasto"
-          + "re.v1.PartitionId\0226\n\014read_options\030\001 \001(\0132"
-          + " .google.datastore.v1.ReadOptions\022+\n\005que"
-          + "ry\030\003 \001(\0132\032.google.datastore.v1.QueryH\000\0222"
-          + "\n\tgql_query\030\007 \001(\0132\035.google.datastore.v1."
-          + "GqlQueryH\000B\014\n\nquery_type\"s\n\020RunQueryResp"
-          + "onse\0224\n\005batch\030\001 \001(\0132%.google.datastore.v"
-          + "1.QueryResultBatch\022)\n\005query\030\002 \001(\0132\032.goog"
-          + "le.datastore.v1.Query\"\300\002\n\032RunAggregation"
-          + "QueryRequest\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(\013"
-          + "2 .google.datastore.v1.PartitionId\0226\n\014re"
-          + "ad_options\030\001 \001(\0132 .google.datastore.v1.R"
-          + "eadOptions\022B\n\021aggregation_query\030\003 \001(\0132%."
-          + "google.datastore.v1.AggregationQueryH\000\0222"
-          + "\n\tgql_query\030\007 \001(\0132\035.google.datastore.v1."
-          + "GqlQueryH\000B\014\n\nquery_type\"\217\001\n\033RunAggregat"
-          + "ionQueryResponse\022:\n\005batch\030\001 \001(\0132+.google"
-          + ".datastore.v1.AggregationResultBatch\0224\n\005"
-          + "query\030\002 \001(\0132%.google.datastore.v1.Aggreg"
-          + "ationQuery\"\215\001\n\027BeginTransactionRequest\022\027"
-          + "\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t"
-          + " \001(\t\022D\n\023transaction_options\030\n \001(\0132\'.goog"
-          + "le.datastore.v1.TransactionOptions\"/\n\030Be"
-          + "ginTransactionResponse\022\023\n\013transaction\030\001 "
-          + "\001(\014\"Y\n\017RollbackRequest\022\027\n\nproject_id\030\010 \001"
-          + "(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022\030\n\013transact"
-          + "ion\030\001 \001(\014B\003\340A\002\"\022\n\020RollbackResponse\"\235\002\n\rC"
-          + "ommitRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n"
-          + "\013database_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.googl"
-          + "e.datastore.v1.CommitRequest.Mode\022\025\n\013tra"
-          + "nsaction\030\001 \001(\014H\000\0220\n\tmutations\030\006 \003(\0132\035.go"
-          + "ogle.datastore.v1.Mutation\"F\n\004Mode\022\024\n\020MO"
-          + "DE_UNSPECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021N"
-          + "ON_TRANSACTIONAL\020\002B\026\n\024transaction_select"
-          + "or\"\227\001\n\016CommitResponse\022=\n\020mutation_result"
-          + "s\030\003 \003(\0132#.google.datastore.v1.MutationRe"
-          + "sult\022\025\n\rindex_updates\030\004 \001(\005\022/\n\013commit_ti"
-          + "me\030\010 \001(\0132\032.google.protobuf.Timestamp\"o\n\022"
-          + "AllocateIdsRequest\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\023Allocat"
-          + "eIdsResponse\022&\n\004keys\030\001 \003(\0132\030.google.data"
-          + "store.v1.Key\"n\n\021ReserveIdsRequest\022\027\n\npro"
-          + "ject_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\"\024\n\022ReserveIdsResponse\"\272\002\n\010Mutation\022"
-          + "-\n\006insert\030\004 \001(\0132\033.google.datastore.v1.En"
-          + "tityH\000\022-\n\006update\030\005 \001(\0132\033.google.datastor"
-          + "e.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.d"
-          + "atastore.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.g"
-          + "oogle.datastore.v1.KeyH\000\022\026\n\014base_version"
-          + "\030\010 \001(\003H\001\0221\n\013update_time\030\013 \001(\0132\032.google.p"
-          + "rotobuf.TimestampH\001B\013\n\toperationB\035\n\033conf"
-          + "lict_detection_strategy\"\224\001\n\016MutationResu"
-          + "lt\022%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Ke"
-          + "y\022\017\n\007version\030\004 \001(\003\022/\n\013update_time\030\006 \001(\0132"
-          + "\032.google.protobuf.Timestamp\022\031\n\021conflict_"
-          + "detected\030\005 \001(\010\"\206\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\022/\n\tread_time\030\004 \001(\0132\032.google."
-          + "protobuf.TimestampH\000\"M\n\017ReadConsistency\022"
-          + " \n\034READ_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STR"
-          + "ONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\""
-          + "\222\002\n\022TransactionOptions\022G\n\nread_write\030\001 \001"
-          + "(\01321.google.datastore.v1.TransactionOpti"
-          + "ons.ReadWriteH\000\022E\n\tread_only\030\002 \001(\01320.goo"
-          + "gle.datastore.v1.TransactionOptions.Read"
-          + "OnlyH\000\032)\n\tReadWrite\022\034\n\024previous_transact"
-          + "ion\030\001 \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\013"
-          + "2\032.google.protobuf.TimestampB\006\n\004mode2\341\r\n"
-          + "\tDatastore\022\300\001\n\006Lookup\022\".google.datastore"
-          + ".v1.LookupRequest\032#.google.datastore.v1."
-          + "LookupResponse\"m\202\323\344\223\002%\" /v1/projects/{pr"
-          + "oject_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$.google.datastore.v1"
-          + ".RunQueryRequest\032%.google.datastore.v1.R"
-          + "unQueryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{p"
-          + "roject_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_"
-          + "id\022\r\n\013database_id\022\325\001\n\023RunAggregationQuer"
-          + "y\022/.google.datastore.v1.RunAggregationQu"
-          + "eryRequest\0320.google.datastore.v1.RunAggr"
-          + "egationQueryResponse\"[\202\323\344\223\0022\"-/v1/projec"
-          + "ts/{project_id}:runAggregationQuery:\001*\212\323"
-          + "\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020Be"
-          + "ginTransaction\022,.google.datastore.v1.Beg"
-          + "inTransactionRequest\032-.google.datastore."
-          + "v1.BeginTransactionResponse\"e\202\323\344\223\002/\"*/v1"
-          + "/projects/{project_id}:beginTransaction:"
-          + "\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\332A\n"
-          + "project_id\022\346\001\n\006Commit\022\".google.datastore"
-          + ".v1.CommitRequest\032#.google.datastore.v1."
-          + "CommitResponse\"\222\001\202\323\344\223\002%\" /v1/projects/{p"
-          + "roject_id}:commit:\001*\212\323\344\223\002\035\022\014\n\nproject_id"
-          + "\022\r\n\013database_id\332A%project_id,mode,transa"
-          + "ction,mutations\332A\031project_id,mode,mutati"
-          + "ons\022\302\001\n\010Rollback\022$.google.datastore.v1.R"
-          + "ollbackRequest\032%.google.datastore.v1.Rol"
-          + "lbackResponse\"i\202\323\344\223\002\'\"\"/v1/projects/{pro"
-          + "ject_id}:rollback:\001*\212\323\344\223\002\035\022\014\n\nproject_id"
-          + "\022\r\n\013database_id\332A\026project_id,transaction"
-          + "\022\307\001\n\013AllocateIds\022\'.google.datastore.v1.A"
-          + "llocateIdsRequest\032(.google.datastore.v1."
-          + "AllocateIdsResponse\"e\202\323\344\223\002*\"%/v1/project"
-          + "s/{project_id}:allocateIds:\001*\212\323\344\223\002\035\022\014\n\np"
-          + "roject_id\022\r\n\013database_id\332A\017project_id,ke"
-          + "ys\022\303\001\n\nReserveIds\022&.google.datastore.v1."
-          + "ReserveIdsRequest\032\'.google.datastore.v1."
-          + "ReserveIdsResponse\"d\202\323\344\223\002)\"$/v1/projects"
-          + "/{project_id}:reserveIds:\001*\212\323\344\223\002\035\022\014\n\npro"
-          + "ject_id\022\r\n\013database_id\332A\017project_id,keys"
-          + "\032v\312A\030datastore.googleapis.com\322AXhttps://"
-          + "www.googleapis.com/auth/cloud-platform,h"
-          + "ttps://www.googleapis.com/auth/datastore"
-          + "B\300\001\n\027com.google.datastore.v1B\016DatastoreP"
-          + "rotoP\001Z properties_;
 
   private com.google.protobuf.MapField
@@ -224,8 +225,10 @@ public java.util.Map getPropert
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
   @java.lang.Override
-  public com.google.datastore.v1.Value getPropertiesOrDefault(
-      java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+  public /* nullable */ com.google.datastore.v1.Value getPropertiesOrDefault(
+      java.lang.String key,
+      /* nullable */
+      com.google.datastore.v1.Value defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -499,10 +502,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (keyBuilder_ == null) {
-        key_ = null;
-      } else {
-        key_ = null;
+      bitField0_ = 0;
+      key_ = null;
+      if (keyBuilder_ != null) {
+        keyBuilder_.dispose();
         keyBuilder_ = null;
       }
       internalGetMutableProperties().clear();
@@ -532,18 +535,24 @@ public com.google.datastore.v1.Entity build() {
     @java.lang.Override
     public com.google.datastore.v1.Entity buildPartial() {
       com.google.datastore.v1.Entity result = new com.google.datastore.v1.Entity(this);
-      int from_bitField0_ = bitField0_;
-      if (keyBuilder_ == null) {
-        result.key_ = key_;
-      } else {
-        result.key_ = keyBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.properties_ = internalGetProperties();
-      result.properties_.makeImmutable();
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.Entity result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.key_ = keyBuilder_ == null ? key_ : keyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.properties_ = internalGetProperties();
+        result.properties_.makeImmutable();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -593,6 +602,7 @@ public Builder mergeFrom(com.google.datastore.v1.Entity other) {
         mergeKey(other.getKey());
       }
       internalGetMutableProperties().mergeFrom(other.internalGetProperties());
+      bitField0_ |= 0x00000002;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -622,7 +632,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getKeyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
@@ -635,6 +645,7 @@ public Builder mergeFrom(
                 internalGetMutableProperties()
                     .getMutableMap()
                     .put(properties__.getKey(), properties__.getValue());
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             default:
@@ -678,7 +689,7 @@ public Builder mergeFrom(
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
-      return keyBuilder_ != null || key_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -721,11 +732,11 @@ public Builder setKey(com.google.datastore.v1.Key value) {
           throw new NullPointerException();
         }
         key_ = value;
-        onChanged();
       } else {
         keyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -744,11 +755,11 @@ public Builder setKey(com.google.datastore.v1.Key value) {
     public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyBuilder_ == null) {
         key_ = builderForValue.build();
-        onChanged();
       } else {
         keyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -766,16 +777,18 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
      */
     public Builder mergeKey(com.google.datastore.v1.Key value) {
       if (keyBuilder_ == null) {
-        if (key_ != null) {
-          key_ = com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && key_ != null
+            && key_ != com.google.datastore.v1.Key.getDefaultInstance()) {
+          getKeyBuilder().mergeFrom(value);
         } else {
           key_ = value;
         }
-        onChanged();
       } else {
         keyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -792,14 +805,13 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
      * .google.datastore.v1.Key key = 1;
      */
     public Builder clearKey() {
-      if (keyBuilder_ == null) {
-        key_ = null;
-        onChanged();
-      } else {
-        key_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      key_ = null;
+      if (keyBuilder_ != null) {
+        keyBuilder_.dispose();
         keyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -816,7 +828,7 @@ public Builder clearKey() {
      * .google.datastore.v1.Key key = 1;
      */
     public com.google.datastore.v1.Key.Builder getKeyBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
@@ -883,8 +895,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
 
     private com.google.protobuf.MapField
         internalGetMutableProperties() {
-      onChanged();
-      ;
       if (properties_ == null) {
         properties_ =
             com.google.protobuf.MapField.newMapField(PropertiesDefaultEntryHolder.defaultEntry);
@@ -892,6 +902,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
       if (!properties_.isMutable()) {
         properties_ = properties_.copy();
       }
+      bitField0_ |= 0x00000002;
+      onChanged();
       return properties_;
     }
 
@@ -958,8 +970,10 @@ public java.util.Map getPropert
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
     @java.lang.Override
-    public com.google.datastore.v1.Value getPropertiesOrDefault(
-        java.lang.String key, com.google.datastore.v1.Value defaultValue) {
+    public /* nullable */ com.google.datastore.v1.Value getPropertiesOrDefault(
+        java.lang.String key,
+        /* nullable */
+        com.google.datastore.v1.Value defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -995,6 +1009,7 @@ public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key)
     }
 
     public Builder clearProperties() {
+      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableProperties().getMutableMap().clear();
       return this;
     }
@@ -1022,6 +1037,7 @@ public Builder removeProperties(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableProperties() {
+      bitField0_ |= 0x00000002;
       return internalGetMutableProperties().getMutableMap();
     }
     /**
@@ -1045,8 +1061,8 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableProperties().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000002;
       return this;
     }
     /**
@@ -1066,6 +1082,7 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
     public Builder putAllProperties(
         java.util.Map values) {
       internalGetMutableProperties().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000002;
       return this;
     }
 
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 23abf4c0a890..19f935612a09 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
@@ -132,7 +132,6 @@ public interface EntityOrBuilder
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-
   /* nullable */
   com.google.datastore.v1.Value getPropertiesOrDefault(
       java.lang.String key,
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 eef264477d2b..95981d10ee2c 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
@@ -293,11 +293,11 @@ public com.google.datastore.v1.Entity getEntity() {
    */
   @java.lang.Override
   public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
-    return getEntity();
+    return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
   }
 
   public static final int VERSION_FIELD_NUMBER = 4;
-  private long version_;
+  private long version_ = 0L;
   /**
    *
    *
@@ -372,11 +372,11 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return getUpdateTime();
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
 
   public static final int CURSOR_FIELD_NUMBER = 3;
-  private com.google.protobuf.ByteString cursor_;
+  private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -626,22 +626,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (entityBuilder_ == null) {
-        entity_ = null;
-      } else {
-        entity_ = null;
+      bitField0_ = 0;
+      entity_ = null;
+      if (entityBuilder_ != null) {
+        entityBuilder_.dispose();
         entityBuilder_ = null;
       }
       version_ = 0L;
-
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-      } else {
-        updateTime_ = null;
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
       cursor_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -668,22 +665,29 @@ public com.google.datastore.v1.EntityResult build() {
     @java.lang.Override
     public com.google.datastore.v1.EntityResult buildPartial() {
       com.google.datastore.v1.EntityResult result = new com.google.datastore.v1.EntityResult(this);
-      if (entityBuilder_ == null) {
-        result.entity_ = entity_;
-      } else {
-        result.entity_ = entityBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.version_ = version_;
-      if (updateTimeBuilder_ == null) {
-        result.updateTime_ = updateTime_;
-      } else {
-        result.updateTime_ = updateTimeBuilder_.build();
-      }
-      result.cursor_ = cursor_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.EntityResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.entity_ = entityBuilder_ == null ? entity_ : entityBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.version_ = version_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.cursor_ = cursor_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -770,25 +774,25 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getEntityFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 26:
               {
                 cursor_ = input.readBytes();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 26
             case 32:
               {
                 version_ = input.readInt64();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 42
             default:
@@ -808,6 +812,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.v1.Entity entity_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Entity,
@@ -826,7 +832,7 @@ public Builder mergeFrom(
      * @return Whether the entity field is set.
      */
     public boolean hasEntity() {
-      return entityBuilder_ != null || entity_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -861,11 +867,11 @@ public Builder setEntity(com.google.datastore.v1.Entity value) {
           throw new NullPointerException();
         }
         entity_ = value;
-        onChanged();
       } else {
         entityBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -880,11 +886,11 @@ public Builder setEntity(com.google.datastore.v1.Entity value) {
     public Builder setEntity(com.google.datastore.v1.Entity.Builder builderForValue) {
       if (entityBuilder_ == null) {
         entity_ = builderForValue.build();
-        onChanged();
       } else {
         entityBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -898,17 +904,18 @@ public Builder setEntity(com.google.datastore.v1.Entity.Builder builderForValue)
      */
     public Builder mergeEntity(com.google.datastore.v1.Entity value) {
       if (entityBuilder_ == null) {
-        if (entity_ != null) {
-          entity_ =
-              com.google.datastore.v1.Entity.newBuilder(entity_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && entity_ != null
+            && entity_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          getEntityBuilder().mergeFrom(value);
         } else {
           entity_ = value;
         }
-        onChanged();
       } else {
         entityBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -921,14 +928,13 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) {
      * .google.datastore.v1.Entity entity = 1;
      */
     public Builder clearEntity() {
-      if (entityBuilder_ == null) {
-        entity_ = null;
-        onChanged();
-      } else {
-        entity_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      entity_ = null;
+      if (entityBuilder_ != null) {
+        entityBuilder_.dispose();
         entityBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -941,7 +947,7 @@ public Builder clearEntity() {
      * .google.datastore.v1.Entity entity = 1;
      */
     public com.google.datastore.v1.Entity.Builder getEntityBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getEntityFieldBuilder().getBuilder();
     }
@@ -1030,6 +1036,7 @@ public long getVersion() {
     public Builder setVersion(long value) {
 
       version_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1051,7 +1058,7 @@ public Builder setVersion(long value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       version_ = 0L;
       onChanged();
       return this;
@@ -1078,7 +1085,7 @@ public Builder clearVersion() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return updateTimeBuilder_ != null || updateTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1121,11 +1128,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1143,11 +1150,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1164,17 +1171,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (updateTime_ != null) {
-          updateTime_ =
-              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && updateTime_ != null
+            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getUpdateTimeBuilder().mergeFrom(value);
         } else {
           updateTime_ = value;
         }
-        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1190,14 +1198,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp update_time = 5;
      */
     public Builder clearUpdateTime() {
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-        onChanged();
-      } else {
-        updateTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1213,7 +1220,7 @@ public Builder clearUpdateTime() {
      * .google.protobuf.Timestamp update_time = 5;
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -1301,8 +1308,8 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       cursor_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1319,7 +1326,7 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearCursor() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       cursor_ = getDefaultInstance().getCursor();
       onChanged();
       return this;
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 ec80c9d20b65..af143908f12f 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
@@ -436,6 +436,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (compositeFilterBuilder_ != null) {
         compositeFilterBuilder_.clear();
       }
@@ -470,25 +471,29 @@ public com.google.datastore.v1.Filter build() {
     @java.lang.Override
     public com.google.datastore.v1.Filter buildPartial() {
       com.google.datastore.v1.Filter result = new com.google.datastore.v1.Filter(this);
-      if (filterTypeCase_ == 1) {
-        if (compositeFilterBuilder_ == null) {
-          result.filterType_ = filterType_;
-        } else {
-          result.filterType_ = compositeFilterBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (filterTypeCase_ == 2) {
-        if (propertyFilterBuilder_ == null) {
-          result.filterType_ = filterType_;
-        } else {
-          result.filterType_ = propertyFilterBuilder_.build();
-        }
-      }
-      result.filterTypeCase_ = filterTypeCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.Filter result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.Filter result) {
+      result.filterTypeCase_ = filterTypeCase_;
+      result.filterType_ = this.filterType_;
+      if (filterTypeCase_ == 1 && compositeFilterBuilder_ != null) {
+        result.filterType_ = compositeFilterBuilder_.build();
+      }
+      if (filterTypeCase_ == 2 && propertyFilterBuilder_ != null) {
+        result.filterType_ = propertyFilterBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -619,6 +624,8 @@ public Builder clearFilterType() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.CompositeFilter,
             com.google.datastore.v1.CompositeFilter.Builder,
@@ -825,7 +832,6 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
       }
       filterTypeCase_ = 1;
       onChanged();
-      ;
       return compositeFilterBuilder_;
     }
 
@@ -1035,7 +1041,6 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
       }
       filterTypeCase_ = 2;
       onChanged();
-      ;
       return propertyFilterBuilder_;
     }
 
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 5ade457019f4..fe30bb669190 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
@@ -80,7 +80,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   }
 
   public static final int QUERY_STRING_FIELD_NUMBER = 1;
-  private volatile java.lang.Object queryString_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object queryString_ = "";
   /**
    *
    *
@@ -131,7 +133,7 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
   }
 
   public static final int ALLOW_LITERALS_FIELD_NUMBER = 2;
-  private boolean allowLiterals_;
+  private boolean allowLiterals_ = false;
   /**
    *
    *
@@ -167,6 +169,7 @@ private static final class NamedBindingsDefaultEntryHolder {
                     com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
   }
 
+  @SuppressWarnings("serial")
   private com.google.protobuf.MapField
       namedBindings_;
 
@@ -238,8 +241,10 @@ public boolean containsNamedBindings(java.lang.String key) {
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
   @java.lang.Override
-  public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-      java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
+  public /* nullable */ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
+      java.lang.String key,
+      /* nullable */
+      com.google.datastore.v1.GqlQueryParameter defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -273,6 +278,8 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
   }
 
   public static final int POSITIONAL_BINDINGS_FIELD_NUMBER = 4;
+
+  @SuppressWarnings("serial")
   private java.util.List positionalBindings_;
   /**
    *
@@ -612,10 +619,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       queryString_ = "";
-
       allowLiterals_ = false;
-
       internalGetMutableNamedBindings().clear();
       if (positionalBindingsBuilder_ == null) {
         positionalBindings_ = java.util.Collections.emptyList();
@@ -623,7 +629,7 @@ public Builder clear() {
         positionalBindings_ = null;
         positionalBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000008);
       return this;
     }
 
@@ -650,22 +656,38 @@ public com.google.datastore.v1.GqlQuery build() {
     @java.lang.Override
     public com.google.datastore.v1.GqlQuery buildPartial() {
       com.google.datastore.v1.GqlQuery result = new com.google.datastore.v1.GqlQuery(this);
-      int from_bitField0_ = bitField0_;
-      result.queryString_ = queryString_;
-      result.allowLiterals_ = allowLiterals_;
-      result.namedBindings_ = internalGetNamedBindings();
-      result.namedBindings_.makeImmutable();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.GqlQuery result) {
       if (positionalBindingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.positionalBindings_ = positionalBindings_;
       } else {
         result.positionalBindings_ = positionalBindingsBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.GqlQuery result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.queryString_ = queryString_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.allowLiterals_ = allowLiterals_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.namedBindings_ = internalGetNamedBindings();
+        result.namedBindings_.makeImmutable();
+      }
     }
 
     @java.lang.Override
@@ -715,17 +737,19 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
       if (other == com.google.datastore.v1.GqlQuery.getDefaultInstance()) return this;
       if (!other.getQueryString().isEmpty()) {
         queryString_ = other.queryString_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getAllowLiterals() != false) {
         setAllowLiterals(other.getAllowLiterals());
       }
       internalGetMutableNamedBindings().mergeFrom(other.internalGetNamedBindings());
+      bitField0_ |= 0x00000004;
       if (positionalBindingsBuilder_ == null) {
         if (!other.positionalBindings_.isEmpty()) {
           if (positionalBindings_.isEmpty()) {
             positionalBindings_ = other.positionalBindings_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensurePositionalBindingsIsMutable();
             positionalBindings_.addAll(other.positionalBindings_);
@@ -738,7 +762,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
             positionalBindingsBuilder_.dispose();
             positionalBindingsBuilder_ = null;
             positionalBindings_ = other.positionalBindings_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000008);
             positionalBindingsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPositionalBindingsFieldBuilder()
@@ -777,13 +801,13 @@ public Builder mergeFrom(
             case 10:
               {
                 queryString_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 allowLiterals_ = input.readBool();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 34:
@@ -810,6 +834,7 @@ public Builder mergeFrom(
                 internalGetMutableNamedBindings()
                     .getMutableMap()
                     .put(namedBindings__.getKey(), namedBindings__.getValue());
+                bitField0_ |= 0x00000004;
                 break;
               } // case 42
             default:
@@ -895,8 +920,8 @@ public Builder setQueryString(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       queryString_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -913,8 +938,8 @@ public Builder setQueryString(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearQueryString() {
-
       queryString_ = getDefaultInstance().getQueryString();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -936,8 +961,8 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       queryString_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -979,6 +1004,7 @@ public boolean getAllowLiterals() {
     public Builder setAllowLiterals(boolean value) {
 
       allowLiterals_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -997,7 +1023,7 @@ public Builder setAllowLiterals(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowLiterals() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       allowLiterals_ = false;
       onChanged();
       return this;
@@ -1020,8 +1046,6 @@ public Builder clearAllowLiterals() {
     private com.google.protobuf.MapField<
             java.lang.String, com.google.datastore.v1.GqlQueryParameter>
         internalGetMutableNamedBindings() {
-      onChanged();
-      ;
       if (namedBindings_ == null) {
         namedBindings_ =
             com.google.protobuf.MapField.newMapField(NamedBindingsDefaultEntryHolder.defaultEntry);
@@ -1029,6 +1053,8 @@ public Builder clearAllowLiterals() {
       if (!namedBindings_.isMutable()) {
         namedBindings_ = namedBindings_.copy();
       }
+      bitField0_ |= 0x00000004;
+      onChanged();
       return namedBindings_;
     }
 
@@ -1091,8 +1117,10 @@ public boolean containsNamedBindings(java.lang.String key) {
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
     @java.lang.Override
-    public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-        java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
+    public /* nullable */ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
+        java.lang.String key,
+        /* nullable */
+        com.google.datastore.v1.GqlQueryParameter defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1126,6 +1154,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
     }
 
     public Builder clearNamedBindings() {
+      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableNamedBindings().getMutableMap().clear();
       return this;
     }
@@ -1152,6 +1181,7 @@ public Builder removeNamedBindings(java.lang.String key) {
     @java.lang.Deprecated
     public java.util.Map
         getMutableNamedBindings() {
+      bitField0_ |= 0x00000004;
       return internalGetMutableNamedBindings().getMutableMap();
     }
     /**
@@ -1174,8 +1204,8 @@ public Builder putNamedBindings(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-
       internalGetMutableNamedBindings().getMutableMap().put(key, value);
+      bitField0_ |= 0x00000004;
       return this;
     }
     /**
@@ -1193,6 +1223,7 @@ public Builder putNamedBindings(
     public Builder putAllNamedBindings(
         java.util.Map values) {
       internalGetMutableNamedBindings().getMutableMap().putAll(values);
+      bitField0_ |= 0x00000004;
       return this;
     }
 
@@ -1200,10 +1231,10 @@ public Builder putAllNamedBindings(
         java.util.Collections.emptyList();
 
     private void ensurePositionalBindingsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         positionalBindings_ =
             new java.util.ArrayList(positionalBindings_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -1454,7 +1485,7 @@ public Builder addAllPositionalBindings(
     public Builder clearPositionalBindings() {
       if (positionalBindingsBuilder_ == null) {
         positionalBindings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         positionalBindingsBuilder_.clear();
@@ -1601,7 +1632,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
                 com.google.datastore.v1.GqlQueryParameter.Builder,
                 com.google.datastore.v1.GqlQueryParameterOrBuilder>(
                 positionalBindings_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000008) != 0),
                 getParentForChildren(),
                 isClean());
         positionalBindings_ = null;
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 c53417b8c640..8af39544f18c 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
@@ -120,7 +120,6 @@ public interface GqlQueryOrBuilder
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-
   /* nullable */
   com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
       java.lang.String key,
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 826d09f6da7d..3394490f17f2 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
@@ -427,6 +427,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (valueBuilder_ != null) {
         valueBuilder_.clear();
       }
@@ -459,21 +460,26 @@ public com.google.datastore.v1.GqlQueryParameter build() {
     public com.google.datastore.v1.GqlQueryParameter buildPartial() {
       com.google.datastore.v1.GqlQueryParameter result =
           new com.google.datastore.v1.GqlQueryParameter(this);
-      if (parameterTypeCase_ == 2) {
-        if (valueBuilder_ == null) {
-          result.parameterType_ = parameterType_;
-        } else {
-          result.parameterType_ = valueBuilder_.build();
-        }
-      }
-      if (parameterTypeCase_ == 3) {
-        result.parameterType_ = parameterType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.parameterTypeCase_ = parameterTypeCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.GqlQueryParameter result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.GqlQueryParameter result) {
+      result.parameterTypeCase_ = parameterTypeCase_;
+      result.parameterType_ = this.parameterType_;
+      if (parameterTypeCase_ == 2 && valueBuilder_ != null) {
+        result.parameterType_ = valueBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -604,6 +610,8 @@ public Builder clearParameterType() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Value,
             com.google.datastore.v1.Value.Builder,
@@ -807,7 +815,6 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       }
       parameterTypeCase_ = 2;
       onChanged();
-      ;
       return valueBuilder_;
     }
 
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 5a7013420c22..29f9502c6f69 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
@@ -295,7 +295,9 @@ public IdTypeCase getIdTypeCase() {
     }
 
     public static final int KIND_FIELD_NUMBER = 1;
-    private volatile java.lang.Object kind_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object kind_ = "";
     /**
      *
      *
@@ -719,8 +721,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         kind_ = "";
-
         idTypeCase_ = 0;
         idType_ = null;
         return this;
@@ -750,18 +752,26 @@ public com.google.datastore.v1.Key.PathElement build() {
       public com.google.datastore.v1.Key.PathElement buildPartial() {
         com.google.datastore.v1.Key.PathElement result =
             new com.google.datastore.v1.Key.PathElement(this);
-        result.kind_ = kind_;
-        if (idTypeCase_ == 2) {
-          result.idType_ = idType_;
-        }
-        if (idTypeCase_ == 3) {
-          result.idType_ = idType_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
-        result.idTypeCase_ = idTypeCase_;
+        buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.datastore.v1.Key.PathElement result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.kind_ = kind_;
+        }
+      }
+
+      private void buildPartialOneofs(com.google.datastore.v1.Key.PathElement result) {
+        result.idTypeCase_ = idTypeCase_;
+        result.idType_ = this.idType_;
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -811,6 +821,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) {
         if (other == com.google.datastore.v1.Key.PathElement.getDefaultInstance()) return this;
         if (!other.getKind().isEmpty()) {
           kind_ = other.kind_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         switch (other.getIdTypeCase()) {
@@ -860,7 +871,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   kind_ = input.readStringRequireUtf8();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               case 16:
@@ -907,6 +918,8 @@ public Builder clearIdType() {
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object kind_ = "";
       /**
        *
@@ -986,8 +999,8 @@ public Builder setKind(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         kind_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1009,8 +1022,8 @@ public Builder setKind(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearKind() {
-
         kind_ = getDefaultInstance().getKind();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1037,8 +1050,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         kind_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1093,6 +1106,7 @@ public long getId() {
        * @return This builder for chaining.
        */
       public Builder setId(long value) {
+
         idTypeCase_ = 2;
         idType_ = value;
         onChanged();
@@ -1405,10 +1419,14 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
-    return getPartitionId();
+    return partitionId_ == null
+        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+        : partitionId_;
   }
 
   public static final int PATH_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List path_;
   /**
    *
@@ -1754,10 +1772,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-      } else {
-        partitionId_ = null;
+      bitField0_ = 0;
+      partitionId_ = null;
+      if (partitionIdBuilder_ != null) {
+        partitionIdBuilder_.dispose();
         partitionIdBuilder_ = null;
       }
       if (pathBuilder_ == null) {
@@ -1766,7 +1784,7 @@ public Builder clear() {
         path_ = null;
         pathBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -1792,23 +1810,32 @@ public com.google.datastore.v1.Key build() {
     @java.lang.Override
     public com.google.datastore.v1.Key buildPartial() {
       com.google.datastore.v1.Key result = new com.google.datastore.v1.Key(this);
-      int from_bitField0_ = bitField0_;
-      if (partitionIdBuilder_ == null) {
-        result.partitionId_ = partitionId_;
-      } else {
-        result.partitionId_ = partitionIdBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.Key result) {
       if (pathBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           path_ = java.util.Collections.unmodifiableList(path_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.path_ = path_;
       } else {
         result.path_ = pathBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.Key result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.partitionId_ =
+            partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1863,7 +1890,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
         if (!other.path_.isEmpty()) {
           if (path_.isEmpty()) {
             path_ = other.path_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensurePathIsMutable();
             path_.addAll(other.path_);
@@ -1876,7 +1903,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
             pathBuilder_.dispose();
             pathBuilder_ = null;
             path_ = other.path_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
             pathBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPathFieldBuilder()
@@ -1915,7 +1942,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
@@ -1970,7 +1997,7 @@ public Builder mergeFrom(
      * @return Whether the partitionId field is set.
      */
     public boolean hasPartitionId() {
-      return partitionIdBuilder_ != null || partitionId_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -2011,11 +2038,11 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
           throw new NullPointerException();
         }
         partitionId_ = value;
-        onChanged();
       } else {
         partitionIdBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -2032,11 +2059,11 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
     public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
       if (partitionIdBuilder_ == null) {
         partitionId_ = builderForValue.build();
-        onChanged();
       } else {
         partitionIdBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -2052,19 +2079,18 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
      */
     public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       if (partitionIdBuilder_ == null) {
-        if (partitionId_ != null) {
-          partitionId_ =
-              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && partitionId_ != null
+            && partitionId_ != com.google.datastore.v1.PartitionId.getDefaultInstance()) {
+          getPartitionIdBuilder().mergeFrom(value);
         } else {
           partitionId_ = value;
         }
-        onChanged();
       } else {
         partitionIdBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -2079,14 +2105,13 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
     public Builder clearPartitionId() {
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-        onChanged();
-      } else {
-        partitionId_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      partitionId_ = null;
+      if (partitionIdBuilder_ != null) {
+        partitionIdBuilder_.dispose();
         partitionIdBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2101,7 +2126,7 @@ public Builder clearPartitionId() {
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
     public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
@@ -2157,9 +2182,9 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensurePathIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         path_ = new java.util.ArrayList(path_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -2517,7 +2542,7 @@ public Builder addAllPath(
     public Builder clearPath() {
       if (pathBuilder_ == null) {
         path_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         pathBuilder_.clear();
@@ -2729,7 +2754,7 @@ public java.util.List getPathBu
                 com.google.datastore.v1.Key.PathElement,
                 com.google.datastore.v1.Key.PathElement.Builder,
                 com.google.datastore.v1.Key.PathElementOrBuilder>(
-                path_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                path_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         path_ = null;
       }
       return pathBuilder_;
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 b99564aff4f7..a6644c9db479 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
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -312,8 +314,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -341,11 +343,20 @@ public com.google.datastore.v1.KindExpression build() {
     public com.google.datastore.v1.KindExpression buildPartial() {
       com.google.datastore.v1.KindExpression result =
           new com.google.datastore.v1.KindExpression(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.KindExpression result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -393,6 +404,7 @@ public Builder mergeFrom(com.google.datastore.v1.KindExpression other) {
       if (other == com.google.datastore.v1.KindExpression.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -424,7 +436,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -444,6 +456,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -505,8 +519,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -522,8 +536,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -544,8 +558,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
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 5966f23c75ff..1f9a03c54536 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
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -216,10 +220,14 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
    */
   @java.lang.Override
   public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
-    return getReadOptions();
+    return readOptions_ == null
+        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+        : readOptions_;
   }
 
   public static final int KEYS_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List keys_;
   /**
    *
@@ -521,14 +529,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
-      if (readOptionsBuilder_ == null) {
-        readOptions_ = null;
-      } else {
-        readOptions_ = null;
+      readOptions_ = null;
+      if (readOptionsBuilder_ != null) {
+        readOptionsBuilder_.dispose();
         readOptionsBuilder_ = null;
       }
       if (keysBuilder_ == null) {
@@ -537,7 +543,7 @@ public Builder clear() {
         keys_ = null;
         keysBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       return this;
     }
 
@@ -565,25 +571,38 @@ public com.google.datastore.v1.LookupRequest build() {
     public com.google.datastore.v1.LookupRequest buildPartial() {
       com.google.datastore.v1.LookupRequest result =
           new com.google.datastore.v1.LookupRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.projectId_ = projectId_;
-      result.databaseId_ = databaseId_;
-      if (readOptionsBuilder_ == null) {
-        result.readOptions_ = readOptions_;
-      } else {
-        result.readOptions_ = readOptionsBuilder_.build();
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.LookupRequest result) {
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.keys_ = keys_;
       } else {
         result.keys_ = keysBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.LookupRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.readOptions_ =
+            readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -633,10 +652,12 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
       if (other == com.google.datastore.v1.LookupRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasReadOptions()) {
@@ -646,7 +667,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureKeysIsMutable();
             keys_.addAll(other.keys_);
@@ -659,7 +680,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
             keysBuilder_.dispose();
             keysBuilder_ = null;
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             keysBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getKeysFieldBuilder()
@@ -698,7 +719,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 10
             case 26:
@@ -716,13 +737,13 @@ public Builder mergeFrom(
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
             default:
@@ -805,8 +826,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -822,8 +843,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -844,8 +865,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -917,8 +938,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -936,8 +957,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -960,8 +981,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -984,7 +1005,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the readOptions field is set.
      */
     public boolean hasReadOptions() {
-      return readOptionsBuilder_ != null || readOptions_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1021,11 +1042,11 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
           throw new NullPointerException();
         }
         readOptions_ = value;
-        onChanged();
       } else {
         readOptionsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1040,11 +1061,11 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
     public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
       if (readOptionsBuilder_ == null) {
         readOptions_ = builderForValue.build();
-        onChanged();
       } else {
         readOptionsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1058,19 +1079,18 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
      */
     public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       if (readOptionsBuilder_ == null) {
-        if (readOptions_ != null) {
-          readOptions_ =
-              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && readOptions_ != null
+            && readOptions_ != com.google.datastore.v1.ReadOptions.getDefaultInstance()) {
+          getReadOptionsBuilder().mergeFrom(value);
         } else {
           readOptions_ = value;
         }
-        onChanged();
       } else {
         readOptionsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1083,14 +1103,13 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public Builder clearReadOptions() {
-      if (readOptionsBuilder_ == null) {
-        readOptions_ = null;
-        onChanged();
-      } else {
-        readOptions_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      readOptions_ = null;
+      if (readOptionsBuilder_ != null) {
+        readOptionsBuilder_.dispose();
         readOptionsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1103,7 +1122,7 @@ public Builder clearReadOptions() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
@@ -1154,9 +1173,9 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -1379,7 +1398,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                keys_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
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 133242919a46..805f20b729e4 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
@@ -41,6 +41,7 @@ private LookupResponse() {
     found_ = java.util.Collections.emptyList();
     missing_ = java.util.Collections.emptyList();
     deferred_ = java.util.Collections.emptyList();
+    transaction_ = com.google.protobuf.ByteString.EMPTY;
   }
 
   @java.lang.Override
@@ -70,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int FOUND_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List found_;
   /**
    *
@@ -149,6 +152,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
   }
 
   public static final int MISSING_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List missing_;
   /**
    *
@@ -228,6 +233,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
   }
 
   public static final int DEFERRED_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List deferred_;
   /**
    *
@@ -305,6 +312,27 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
     return deferred_.get(index);
   }
 
+  public static final int TRANSACTION_FIELD_NUMBER = 5;
+  private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+  /**
+   *
+   *
+   * 
    +   * The identifier of the transaction that was started as part of this Lookup
+   * request.
+   * Set only when [ReadOptions.begin_transaction][] was set in
+   * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
+   * 
    
+   *
+   * bytes transaction = 5;
+   *
+   * @return The transaction.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getTransaction() {
+    return transaction_;
+  }
+
   public static final int READ_TIME_FIELD_NUMBER = 7;
   private com.google.protobuf.Timestamp readTime_;
   /**
@@ -348,7 +376,7 @@ public com.google.protobuf.Timestamp getReadTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
-    return getReadTime();
+    return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -374,6 +402,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < deferred_.size(); i++) {
       output.writeMessage(3, deferred_.get(i));
     }
+    if (!transaction_.isEmpty()) {
+      output.writeBytes(5, transaction_);
+    }
     if (readTime_ != null) {
       output.writeMessage(7, getReadTime());
     }
@@ -395,6 +426,9 @@ public int getSerializedSize() {
     for (int i = 0; i < deferred_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, deferred_.get(i));
     }
+    if (!transaction_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
+    }
     if (readTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getReadTime());
     }
@@ -416,6 +450,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getFoundList().equals(other.getFoundList())) return false;
     if (!getMissingList().equals(other.getMissingList())) return false;
     if (!getDeferredList().equals(other.getDeferredList())) return false;
+    if (!getTransaction().equals(other.getTransaction())) return false;
     if (hasReadTime() != other.hasReadTime()) return false;
     if (hasReadTime()) {
       if (!getReadTime().equals(other.getReadTime())) return false;
@@ -443,6 +478,8 @@ public int hashCode() {
       hash = (37 * hash) + DEFERRED_FIELD_NUMBER;
       hash = (53 * hash) + getDeferredList().hashCode();
     }
+    hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
+    hash = (53 * hash) + getTransaction().hashCode();
     if (hasReadTime()) {
       hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getReadTime().hashCode();
@@ -585,6 +622,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (foundBuilder_ == null) {
         found_ = java.util.Collections.emptyList();
       } else {
@@ -606,10 +644,10 @@ public Builder clear() {
         deferredBuilder_.clear();
       }
       bitField0_ = (bitField0_ & ~0x00000004);
-      if (readTimeBuilder_ == null) {
-        readTime_ = null;
-      } else {
-        readTime_ = null;
+      transaction_ = com.google.protobuf.ByteString.EMPTY;
+      readTime_ = null;
+      if (readTimeBuilder_ != null) {
+        readTimeBuilder_.dispose();
         readTimeBuilder_ = null;
       }
       return this;
@@ -639,7 +677,15 @@ public com.google.datastore.v1.LookupResponse build() {
     public com.google.datastore.v1.LookupResponse buildPartial() {
       com.google.datastore.v1.LookupResponse result =
           new com.google.datastore.v1.LookupResponse(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.LookupResponse result) {
       if (foundBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           found_ = java.util.Collections.unmodifiableList(found_);
@@ -667,13 +713,16 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
       } else {
         result.deferred_ = deferredBuilder_.build();
       }
-      if (readTimeBuilder_ == null) {
-        result.readTime_ = readTime_;
-      } else {
-        result.readTime_ = readTimeBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.datastore.v1.LookupResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.transaction_ = transaction_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -802,6 +851,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
           }
         }
       }
+      if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
+        setTransaction(other.getTransaction());
+      }
       if (other.hasReadTime()) {
         mergeReadTime(other.getReadTime());
       }
@@ -869,10 +921,16 @@ public Builder mergeFrom(
                 }
                 break;
               } // case 26
+            case 42:
+              {
+                transaction_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 42
             case 58:
               {
                 input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 58
             default:
@@ -2043,6 +2101,70 @@ public java.util.List getDeferredBuilderLis
       return deferredBuilder_;
     }
 
+    private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this Lookup
+     * request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @return The transaction.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getTransaction() {
+      return transaction_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this Lookup
+     * request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @param value The transaction to set.
+     * @return This builder for chaining.
+     */
+    public Builder setTransaction(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      transaction_ = value;
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this Lookup
+     * request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearTransaction() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      transaction_ = getDefaultInstance().getTransaction();
+      onChanged();
+      return this;
+    }
+
     private com.google.protobuf.Timestamp readTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -2061,7 +2183,7 @@ public java.util.List getDeferredBuilderLis
      * @return Whether the readTime field is set.
      */
     public boolean hasReadTime() {
-      return readTimeBuilder_ != null || readTime_ != null;
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      *
@@ -2096,11 +2218,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         readTime_ = value;
-        onChanged();
       } else {
         readTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2115,11 +2237,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
     public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (readTimeBuilder_ == null) {
         readTime_ = builderForValue.build();
-        onChanged();
       } else {
         readTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2133,17 +2255,18 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
      */
     public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       if (readTimeBuilder_ == null) {
-        if (readTime_ != null) {
-          readTime_ =
-              com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000010) != 0)
+            && readTime_ != null
+            && readTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getReadTimeBuilder().mergeFrom(value);
         } else {
           readTime_ = value;
         }
-        onChanged();
       } else {
         readTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000010;
+      onChanged();
       return this;
     }
     /**
@@ -2156,14 +2279,13 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp read_time = 7;
      */
     public Builder clearReadTime() {
-      if (readTimeBuilder_ == null) {
-        readTime_ = null;
-        onChanged();
-      } else {
-        readTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      readTime_ = null;
+      if (readTimeBuilder_ != null) {
+        readTimeBuilder_.dispose();
         readTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2176,7 +2298,7 @@ public Builder clearReadTime() {
      * .google.protobuf.Timestamp read_time = 7;
      */
     public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
-
+      bitField0_ |= 0x00000010;
       onChanged();
       return getReadTimeFieldBuilder().getBuilder();
     }
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 5d89e1b335da..8a0228282d04 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
@@ -206,6 +206,22 @@ public interface LookupResponseOrBuilder
    */
   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.begin_transaction][] was set in
+   * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
+   * 
    
+   *
+   * bytes transaction = 5;
+   *
+   * @return The transaction.
+   */
+  com.google.protobuf.ByteString getTransaction();
+
   /**
    *
    *
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 97fbd92d84d9..5b9ce0d3dd0b 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
@@ -771,6 +771,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (insertBuilder_ != null) {
         insertBuilder_.clear();
       }
@@ -816,48 +817,38 @@ public com.google.datastore.v1.Mutation build() {
     @java.lang.Override
     public com.google.datastore.v1.Mutation buildPartial() {
       com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this);
-      if (operationCase_ == 4) {
-        if (insertBuilder_ == null) {
-          result.operation_ = operation_;
-        } else {
-          result.operation_ = insertBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (operationCase_ == 5) {
-        if (updateBuilder_ == null) {
-          result.operation_ = operation_;
-        } else {
-          result.operation_ = updateBuilder_.build();
-        }
-      }
-      if (operationCase_ == 6) {
-        if (upsertBuilder_ == null) {
-          result.operation_ = operation_;
-        } else {
-          result.operation_ = upsertBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.Mutation result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.Mutation result) {
+      result.operationCase_ = operationCase_;
+      result.operation_ = this.operation_;
+      if (operationCase_ == 4 && insertBuilder_ != null) {
+        result.operation_ = insertBuilder_.build();
       }
-      if (operationCase_ == 7) {
-        if (deleteBuilder_ == null) {
-          result.operation_ = operation_;
-        } else {
-          result.operation_ = deleteBuilder_.build();
-        }
+      if (operationCase_ == 5 && updateBuilder_ != null) {
+        result.operation_ = updateBuilder_.build();
       }
-      if (conflictDetectionStrategyCase_ == 8) {
-        result.conflictDetectionStrategy_ = conflictDetectionStrategy_;
+      if (operationCase_ == 6 && upsertBuilder_ != null) {
+        result.operation_ = upsertBuilder_.build();
       }
-      if (conflictDetectionStrategyCase_ == 11) {
-        if (updateTimeBuilder_ == null) {
-          result.conflictDetectionStrategy_ = conflictDetectionStrategy_;
-        } else {
-          result.conflictDetectionStrategy_ = updateTimeBuilder_.build();
-        }
+      if (operationCase_ == 7 && deleteBuilder_ != null) {
+        result.operation_ = deleteBuilder_.build();
       }
-      result.operationCase_ = operationCase_;
       result.conflictDetectionStrategyCase_ = conflictDetectionStrategyCase_;
-      onBuilt();
-      return result;
+      result.conflictDetectionStrategy_ = this.conflictDetectionStrategy_;
+      if (conflictDetectionStrategyCase_ == 11 && updateTimeBuilder_ != null) {
+        result.conflictDetectionStrategy_ = updateTimeBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -1054,6 +1045,8 @@ public Builder clearConflictDetectionStrategy() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Entity,
             com.google.datastore.v1.Entity.Builder,
@@ -1265,7 +1258,6 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
       }
       operationCase_ = 4;
       onChanged();
-      ;
       return insertBuilder_;
     }
 
@@ -1480,7 +1472,6 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
       }
       operationCase_ = 5;
       onChanged();
-      ;
       return updateBuilder_;
     }
 
@@ -1695,7 +1686,6 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
       }
       operationCase_ = 6;
       onChanged();
-      ;
       return upsertBuilder_;
     }
 
@@ -1909,7 +1899,6 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
       }
       operationCase_ = 7;
       onChanged();
-      ;
       return deleteBuilder_;
     }
 
@@ -1963,6 +1952,7 @@ public long getBaseVersion() {
      * @return This builder for chaining.
      */
     public Builder setBaseVersion(long value) {
+
       conflictDetectionStrategyCase_ = 8;
       conflictDetectionStrategy_ = value;
       onChanged();
@@ -2213,7 +2203,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       conflictDetectionStrategyCase_ = 11;
       onChanged();
-      ;
       return updateTimeBuilder_;
     }
 
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 a5b6be766456..2155b3647be8 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
@@ -111,11 +111,11 @@ public com.google.datastore.v1.Key getKey() {
    */
   @java.lang.Override
   public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
-    return getKey();
+    return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
 
   public static final int VERSION_FIELD_NUMBER = 4;
-  private long version_;
+  private long version_ = 0L;
   /**
    *
    *
@@ -188,11 +188,11 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return getUpdateTime();
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
 
   public static final int CONFLICT_DETECTED_FIELD_NUMBER = 5;
-  private boolean conflictDetected_;
+  private boolean conflictDetected_ = false;
   /**
    *
    *
@@ -443,22 +443,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (keyBuilder_ == null) {
-        key_ = null;
-      } else {
-        key_ = null;
+      bitField0_ = 0;
+      key_ = null;
+      if (keyBuilder_ != null) {
+        keyBuilder_.dispose();
         keyBuilder_ = null;
       }
       version_ = 0L;
-
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-      } else {
-        updateTime_ = null;
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
       conflictDetected_ = false;
-
       return this;
     }
 
@@ -486,22 +483,29 @@ public com.google.datastore.v1.MutationResult build() {
     public com.google.datastore.v1.MutationResult buildPartial() {
       com.google.datastore.v1.MutationResult result =
           new com.google.datastore.v1.MutationResult(this);
-      if (keyBuilder_ == null) {
-        result.key_ = key_;
-      } else {
-        result.key_ = keyBuilder_.build();
-      }
-      result.version_ = version_;
-      if (updateTimeBuilder_ == null) {
-        result.updateTime_ = updateTime_;
-      } else {
-        result.updateTime_ = updateTimeBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.conflictDetected_ = conflictDetected_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.MutationResult result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.key_ = keyBuilder_ == null ? key_ : keyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.version_ = version_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.conflictDetected_ = conflictDetected_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -588,25 +592,25 @@ public Builder mergeFrom(
             case 26:
               {
                 input.readMessage(getKeyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 26
             case 32:
               {
                 version_ = input.readInt64();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 32
             case 40:
               {
                 conflictDetected_ = input.readBool();
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 40
             case 50:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 50
             default:
@@ -626,6 +630,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.v1.Key key_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.Key,
@@ -645,7 +651,7 @@ public Builder mergeFrom(
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
-      return keyBuilder_ != null || key_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -682,11 +688,11 @@ public Builder setKey(com.google.datastore.v1.Key value) {
           throw new NullPointerException();
         }
         key_ = value;
-        onChanged();
       } else {
         keyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -702,11 +708,11 @@ public Builder setKey(com.google.datastore.v1.Key value) {
     public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyBuilder_ == null) {
         key_ = builderForValue.build();
-        onChanged();
       } else {
         keyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -721,16 +727,18 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
      */
     public Builder mergeKey(com.google.datastore.v1.Key value) {
       if (keyBuilder_ == null) {
-        if (key_ != null) {
-          key_ = com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && key_ != null
+            && key_ != com.google.datastore.v1.Key.getDefaultInstance()) {
+          getKeyBuilder().mergeFrom(value);
         } else {
           key_ = value;
         }
-        onChanged();
       } else {
         keyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -744,14 +752,13 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
      * .google.datastore.v1.Key key = 3;
      */
     public Builder clearKey() {
-      if (keyBuilder_ == null) {
-        key_ = null;
-        onChanged();
-      } else {
-        key_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      key_ = null;
+      if (keyBuilder_ != null) {
+        keyBuilder_.dispose();
         keyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -765,7 +772,7 @@ public Builder clearKey() {
      * .google.datastore.v1.Key key = 3;
      */
     public com.google.datastore.v1.Key.Builder getKeyBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
@@ -851,6 +858,7 @@ public long getVersion() {
     public Builder setVersion(long value) {
 
       version_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -870,7 +878,7 @@ public Builder setVersion(long value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       version_ = 0L;
       onChanged();
       return this;
@@ -897,7 +905,7 @@ public Builder clearVersion() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return updateTimeBuilder_ != null || updateTime_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -940,11 +948,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -962,11 +970,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
-        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -983,17 +991,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (updateTime_ != null) {
-          updateTime_ =
-              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && updateTime_ != null
+            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getUpdateTimeBuilder().mergeFrom(value);
         } else {
           updateTime_ = value;
         }
-        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1009,14 +1018,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp update_time = 6;
      */
     public Builder clearUpdateTime() {
-      if (updateTimeBuilder_ == null) {
-        updateTime_ = null;
-        onChanged();
-      } else {
-        updateTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      updateTime_ = null;
+      if (updateTimeBuilder_ != null) {
+        updateTimeBuilder_.dispose();
         updateTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1032,7 +1040,7 @@ public Builder clearUpdateTime() {
      * .google.protobuf.Timestamp update_time = 6;
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -1119,6 +1127,7 @@ public boolean getConflictDetected() {
     public Builder setConflictDetected(boolean value) {
 
       conflictDetected_ = value;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1135,7 +1144,7 @@ public Builder setConflictDetected(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearConflictDetected() {
-
+      bitField0_ = (bitField0_ & ~0x00000008);
       conflictDetected_ = false;
       onChanged();
       return this;
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 6f3c39a7b420..63000bf290cd 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
@@ -84,7 +84,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 2;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -133,7 +135,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -184,7 +188,9 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   }
 
   public static final int NAMESPACE_ID_FIELD_NUMBER = 4;
-  private volatile java.lang.Object namespaceId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object namespaceId_ = "";
   /**
    *
    *
@@ -459,12 +465,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
       namespaceId_ = "";
-
       return this;
     }
 
@@ -491,13 +495,26 @@ public com.google.datastore.v1.PartitionId build() {
     @java.lang.Override
     public com.google.datastore.v1.PartitionId buildPartial() {
       com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this);
-      result.projectId_ = projectId_;
-      result.databaseId_ = databaseId_;
-      result.namespaceId_ = namespaceId_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.PartitionId result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.namespaceId_ = namespaceId_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -545,14 +562,17 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) {
       if (other == com.google.datastore.v1.PartitionId.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getNamespaceId().isEmpty()) {
         namespaceId_ = other.namespaceId_;
+        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -584,19 +604,19 @@ public Builder mergeFrom(
             case 18:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 18
             case 26:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
               {
                 namespaceId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             default:
@@ -616,6 +636,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -677,8 +699,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -694,8 +716,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -716,8 +738,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -786,8 +808,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -804,8 +826,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -827,8 +849,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -894,8 +916,8 @@ public Builder setNamespaceId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       namespaceId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -911,8 +933,8 @@ public Builder setNamespaceId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNamespaceId() {
-
       namespaceId_ = getDefaultInstance().getNamespaceId();
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -933,8 +955,8 @@ public Builder setNamespaceIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       namespaceId_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
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 649c178c78e4..f39f017bd6bf 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
@@ -110,7 +110,9 @@ public com.google.datastore.v1.PropertyReference getProperty() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
-    return getProperty();
+    return property_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : property_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -313,10 +315,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (propertyBuilder_ == null) {
-        property_ = null;
-      } else {
-        property_ = null;
+      bitField0_ = 0;
+      property_ = null;
+      if (propertyBuilder_ != null) {
+        propertyBuilder_.dispose();
         propertyBuilder_ = null;
       }
       return this;
@@ -345,15 +347,20 @@ public com.google.datastore.v1.Projection build() {
     @java.lang.Override
     public com.google.datastore.v1.Projection buildPartial() {
       com.google.datastore.v1.Projection result = new com.google.datastore.v1.Projection(this);
-      if (propertyBuilder_ == null) {
-        result.property_ = property_;
-      } else {
-        result.property_ = propertyBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.Projection result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -431,7 +438,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             default:
@@ -451,6 +458,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PropertyReference,
@@ -469,7 +478,7 @@ public Builder mergeFrom(
      * @return Whether the property field is set.
      */
     public boolean hasProperty() {
-      return propertyBuilder_ != null || property_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -506,11 +515,11 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
           throw new NullPointerException();
         }
         property_ = value;
-        onChanged();
       } else {
         propertyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -525,11 +534,11 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
     public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
-        onChanged();
       } else {
         propertyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -543,19 +552,18 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
      */
     public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
-        if (property_ != null) {
-          property_ =
-              com.google.datastore.v1.PropertyReference.newBuilder(property_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && property_ != null
+            && property_ != com.google.datastore.v1.PropertyReference.getDefaultInstance()) {
+          getPropertyBuilder().mergeFrom(value);
         } else {
           property_ = value;
         }
-        onChanged();
       } else {
         propertyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -568,14 +576,13 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public Builder clearProperty() {
-      if (propertyBuilder_ == null) {
-        property_ = null;
-        onChanged();
-      } else {
-        property_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      property_ = null;
+      if (propertyBuilder_ != null) {
+        propertyBuilder_.dispose();
         propertyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -588,7 +595,7 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
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 8349299a7a95..6274b8ba0952 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
@@ -463,11 +463,13 @@ public com.google.datastore.v1.PropertyReference getProperty() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
-    return getProperty();
+    return property_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : property_;
   }
 
   public static final int OP_FIELD_NUMBER = 2;
-  private int op_;
+  private int op_ = 0;
   /**
    *
    *
@@ -496,9 +498,8 @@ public int getOpValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PropertyFilter.Operator getOp() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.PropertyFilter.Operator result =
-        com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
+        com.google.datastore.v1.PropertyFilter.Operator.forNumber(op_);
     return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
   }
 
@@ -545,7 +546,7 @@ public com.google.datastore.v1.Value getValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
-    return getValue();
+    return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -772,18 +773,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (propertyBuilder_ == null) {
-        property_ = null;
-      } else {
-        property_ = null;
+      bitField0_ = 0;
+      property_ = null;
+      if (propertyBuilder_ != null) {
+        propertyBuilder_.dispose();
         propertyBuilder_ = null;
       }
       op_ = 0;
-
-      if (valueBuilder_ == null) {
-        value_ = null;
-      } else {
-        value_ = null;
+      value_ = null;
+      if (valueBuilder_ != null) {
+        valueBuilder_.dispose();
         valueBuilder_ = null;
       }
       return this;
@@ -813,21 +812,26 @@ public com.google.datastore.v1.PropertyFilter build() {
     public com.google.datastore.v1.PropertyFilter buildPartial() {
       com.google.datastore.v1.PropertyFilter result =
           new com.google.datastore.v1.PropertyFilter(this);
-      if (propertyBuilder_ == null) {
-        result.property_ = property_;
-      } else {
-        result.property_ = propertyBuilder_.build();
-      }
-      result.op_ = op_;
-      if (valueBuilder_ == null) {
-        result.value_ = value_;
-      } else {
-        result.value_ = valueBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.PropertyFilter result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.op_ = op_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.value_ = valueBuilder_ == null ? value_ : valueBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -911,19 +915,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 op_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getValueFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -943,6 +947,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PropertyReference,
@@ -961,7 +967,7 @@ public Builder mergeFrom(
      * @return Whether the property field is set.
      */
     public boolean hasProperty() {
-      return propertyBuilder_ != null || property_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -998,11 +1004,11 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
           throw new NullPointerException();
         }
         property_ = value;
-        onChanged();
       } else {
         propertyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1017,11 +1023,11 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
     public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
-        onChanged();
       } else {
         propertyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1035,19 +1041,18 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
      */
     public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
-        if (property_ != null) {
-          property_ =
-              com.google.datastore.v1.PropertyReference.newBuilder(property_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && property_ != null
+            && property_ != com.google.datastore.v1.PropertyReference.getDefaultInstance()) {
+          getPropertyBuilder().mergeFrom(value);
         } else {
           property_ = value;
         }
-        onChanged();
       } else {
         propertyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -1060,14 +1065,13 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public Builder clearProperty() {
-      if (propertyBuilder_ == null) {
-        property_ = null;
-        onChanged();
-      } else {
-        property_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      property_ = null;
+      if (propertyBuilder_ != null) {
+        propertyBuilder_.dispose();
         propertyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1080,7 +1084,7 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
@@ -1157,8 +1161,8 @@ public int getOpValue() {
      * @return This builder for chaining.
      */
     public Builder setOpValue(int value) {
-
       op_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1175,9 +1179,8 @@ public Builder setOpValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.v1.PropertyFilter.Operator getOp() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.PropertyFilter.Operator result =
-          com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
+          com.google.datastore.v1.PropertyFilter.Operator.forNumber(op_);
       return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
     }
     /**
@@ -1196,7 +1199,7 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       op_ = value.getNumber();
       onChanged();
       return this;
@@ -1213,7 +1216,7 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
      * @return This builder for chaining.
      */
     public Builder clearOp() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       op_ = 0;
       onChanged();
       return this;
@@ -1237,7 +1240,7 @@ public Builder clearOp() {
      * @return Whether the value field is set.
      */
     public boolean hasValue() {
-      return valueBuilder_ != null || value_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1272,11 +1275,11 @@ public Builder setValue(com.google.datastore.v1.Value value) {
           throw new NullPointerException();
         }
         value_ = value;
-        onChanged();
       } else {
         valueBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1291,11 +1294,11 @@ public Builder setValue(com.google.datastore.v1.Value value) {
     public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
       if (valueBuilder_ == null) {
         value_ = builderForValue.build();
-        onChanged();
       } else {
         valueBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1309,16 +1312,18 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
      */
     public Builder mergeValue(com.google.datastore.v1.Value value) {
       if (valueBuilder_ == null) {
-        if (value_ != null) {
-          value_ = com.google.datastore.v1.Value.newBuilder(value_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && value_ != null
+            && value_ != com.google.datastore.v1.Value.getDefaultInstance()) {
+          getValueBuilder().mergeFrom(value);
         } else {
           value_ = value;
         }
-        onChanged();
       } else {
         valueBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1331,14 +1336,13 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
      * .google.datastore.v1.Value value = 3;
      */
     public Builder clearValue() {
-      if (valueBuilder_ == null) {
-        value_ = null;
-        onChanged();
-      } else {
-        value_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      value_ = null;
+      if (valueBuilder_ != null) {
+        valueBuilder_.dispose();
         valueBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1351,7 +1355,7 @@ public Builder clearValue() {
      * .google.datastore.v1.Value value = 3;
      */
     public com.google.datastore.v1.Value.Builder getValueBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getValueFieldBuilder().getBuilder();
     }
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 64421fa0bb01..fb9a0965a463 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
@@ -269,11 +269,13 @@ public com.google.datastore.v1.PropertyReference getProperty() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
-    return getProperty();
+    return property_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : property_;
   }
 
   public static final int DIRECTION_FIELD_NUMBER = 2;
-  private int direction_;
+  private int direction_ = 0;
   /**
    *
    *
@@ -302,9 +304,8 @@ public int getDirectionValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.PropertyOrder.Direction result =
-        com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
+        com.google.datastore.v1.PropertyOrder.Direction.forNumber(direction_);
     return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
   }
 
@@ -519,14 +520,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (propertyBuilder_ == null) {
-        property_ = null;
-      } else {
-        property_ = null;
+      bitField0_ = 0;
+      property_ = null;
+      if (propertyBuilder_ != null) {
+        propertyBuilder_.dispose();
         propertyBuilder_ = null;
       }
       direction_ = 0;
-
       return this;
     }
 
@@ -554,16 +554,23 @@ public com.google.datastore.v1.PropertyOrder build() {
     public com.google.datastore.v1.PropertyOrder buildPartial() {
       com.google.datastore.v1.PropertyOrder result =
           new com.google.datastore.v1.PropertyOrder(this);
-      if (propertyBuilder_ == null) {
-        result.property_ = property_;
-      } else {
-        result.property_ = propertyBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.direction_ = direction_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.PropertyOrder result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.direction_ = direction_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -644,13 +651,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 16:
               {
                 direction_ = input.readEnum();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 16
             default:
@@ -670,6 +677,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PropertyReference,
@@ -688,7 +697,7 @@ public Builder mergeFrom(
      * @return Whether the property field is set.
      */
     public boolean hasProperty() {
-      return propertyBuilder_ != null || property_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -725,11 +734,11 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
           throw new NullPointerException();
         }
         property_ = value;
-        onChanged();
       } else {
         propertyBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -744,11 +753,11 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
     public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
-        onChanged();
       } else {
         propertyBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -762,19 +771,18 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
      */
     public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
-        if (property_ != null) {
-          property_ =
-              com.google.datastore.v1.PropertyReference.newBuilder(property_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && property_ != null
+            && property_ != com.google.datastore.v1.PropertyReference.getDefaultInstance()) {
+          getPropertyBuilder().mergeFrom(value);
         } else {
           property_ = value;
         }
-        onChanged();
       } else {
         propertyBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -787,14 +795,13 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public Builder clearProperty() {
-      if (propertyBuilder_ == null) {
-        property_ = null;
-        onChanged();
-      } else {
-        property_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      property_ = null;
+      if (propertyBuilder_ != null) {
+        propertyBuilder_.dispose();
         propertyBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -807,7 +814,7 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
@@ -884,8 +891,8 @@ public int getDirectionValue() {
      * @return This builder for chaining.
      */
     public Builder setDirectionValue(int value) {
-
       direction_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -902,9 +909,8 @@ public Builder setDirectionValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.PropertyOrder.Direction result =
-          com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
+          com.google.datastore.v1.PropertyOrder.Direction.forNumber(direction_);
       return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
     }
     /**
@@ -923,7 +929,7 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000002;
       direction_ = value.getNumber();
       onChanged();
       return this;
@@ -940,7 +946,7 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu
      * @return This builder for chaining.
      */
     public Builder clearDirection() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       direction_ = 0;
       onChanged();
       return this;
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 faf96096fee2..2b1cd280fd3c 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
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object name_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object name_ = "";
   /**
    *
    *
@@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       name_ = "";
-
       return this;
     }
 
@@ -344,11 +346,20 @@ public com.google.datastore.v1.PropertyReference build() {
     public com.google.datastore.v1.PropertyReference buildPartial() {
       com.google.datastore.v1.PropertyReference result =
           new com.google.datastore.v1.PropertyReference(this);
-      result.name_ = name_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.PropertyReference result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.name_ = name_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -396,6 +407,7 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) {
       if (other == com.google.datastore.v1.PropertyReference.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -427,7 +439,7 @@ public Builder mergeFrom(
             case 18:
               {
                 name_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 18
             default:
@@ -447,6 +459,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object name_ = "";
     /**
      *
@@ -511,8 +525,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -529,8 +543,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
       name_ = getDefaultInstance().getName();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -552,8 +566,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       name_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
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 c0bba0ad96d8..475a261770ef 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
@@ -71,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECTION_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List projection_;
   /**
    *
@@ -140,6 +142,8 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
   }
 
   public static final int KIND_FIELD_NUMBER = 3;
+
+  @SuppressWarnings("serial")
   private java.util.List kind_;
   /**
    *
@@ -256,10 +260,12 @@ public com.google.datastore.v1.Filter getFilter() {
    */
   @java.lang.Override
   public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
-    return getFilter();
+    return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
   }
 
   public static final int ORDER_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
   private java.util.List order_;
   /**
    *
@@ -329,6 +335,8 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
   }
 
   public static final int DISTINCT_ON_FIELD_NUMBER = 6;
+
+  @SuppressWarnings("serial")
   private java.util.List distinctOn_;
   /**
    *
@@ -408,7 +416,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
   }
 
   public static final int START_CURSOR_FIELD_NUMBER = 7;
-  private com.google.protobuf.ByteString startCursor_;
+  private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -429,7 +437,7 @@ public com.google.protobuf.ByteString getStartCursor() {
   }
 
   public static final int END_CURSOR_FIELD_NUMBER = 8;
-  private com.google.protobuf.ByteString endCursor_;
+  private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -450,7 +458,7 @@ public com.google.protobuf.ByteString getEndCursor() {
   }
 
   public static final int OFFSET_FIELD_NUMBER = 10;
-  private int offset_;
+  private int offset_ = 0;
   /**
    *
    *
@@ -520,7 +528,7 @@ public com.google.protobuf.Int32Value getLimit() {
    */
   @java.lang.Override
   public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
-    return getLimit();
+    return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -807,6 +815,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (projectionBuilder_ == null) {
         projection_ = java.util.Collections.emptyList();
       } else {
@@ -821,10 +830,9 @@ public Builder clear() {
         kindBuilder_.clear();
       }
       bitField0_ = (bitField0_ & ~0x00000002);
-      if (filterBuilder_ == null) {
-        filter_ = null;
-      } else {
-        filter_ = null;
+      filter_ = null;
+      if (filterBuilder_ != null) {
+        filterBuilder_.dispose();
         filterBuilder_ = null;
       }
       if (orderBuilder_ == null) {
@@ -833,24 +841,20 @@ public Builder clear() {
         order_ = null;
         orderBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000008);
       if (distinctOnBuilder_ == null) {
         distinctOn_ = java.util.Collections.emptyList();
       } else {
         distinctOn_ = null;
         distinctOnBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000010);
       startCursor_ = com.google.protobuf.ByteString.EMPTY;
-
       endCursor_ = com.google.protobuf.ByteString.EMPTY;
-
       offset_ = 0;
-
-      if (limitBuilder_ == null) {
-        limit_ = null;
-      } else {
-        limit_ = null;
+      limit_ = null;
+      if (limitBuilder_ != null) {
+        limitBuilder_.dispose();
         limitBuilder_ = null;
       }
       return this;
@@ -879,7 +883,15 @@ public com.google.datastore.v1.Query build() {
     @java.lang.Override
     public com.google.datastore.v1.Query buildPartial() {
       com.google.datastore.v1.Query result = new com.google.datastore.v1.Query(this);
-      int from_bitField0_ = bitField0_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.Query result) {
       if (projectionBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           projection_ = java.util.Collections.unmodifiableList(projection_);
@@ -898,39 +910,43 @@ public com.google.datastore.v1.Query buildPartial() {
       } else {
         result.kind_ = kindBuilder_.build();
       }
-      if (filterBuilder_ == null) {
-        result.filter_ = filter_;
-      } else {
-        result.filter_ = filterBuilder_.build();
-      }
       if (orderBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           order_ = java.util.Collections.unmodifiableList(order_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.order_ = order_;
       } else {
         result.order_ = orderBuilder_.build();
       }
       if (distinctOnBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.distinctOn_ = distinctOn_;
       } else {
         result.distinctOn_ = distinctOnBuilder_.build();
       }
-      result.startCursor_ = startCursor_;
-      result.endCursor_ = endCursor_;
-      result.offset_ = offset_;
-      if (limitBuilder_ == null) {
-        result.limit_ = limit_;
-      } else {
-        result.limit_ = limitBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.datastore.v1.Query result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.filter_ = filterBuilder_ == null ? filter_ : filterBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.startCursor_ = startCursor_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.endCursor_ = endCursor_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.offset_ = offset_;
+      }
+      if (((from_bitField0_ & 0x00000100) != 0)) {
+        result.limit_ = limitBuilder_ == null ? limit_ : limitBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1039,7 +1055,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
         if (!other.order_.isEmpty()) {
           if (order_.isEmpty()) {
             order_ = other.order_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureOrderIsMutable();
             order_.addAll(other.order_);
@@ -1052,7 +1068,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             orderBuilder_.dispose();
             orderBuilder_ = null;
             order_ = other.order_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000008);
             orderBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getOrderFieldBuilder()
@@ -1066,7 +1082,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
         if (!other.distinctOn_.isEmpty()) {
           if (distinctOn_.isEmpty()) {
             distinctOn_ = other.distinctOn_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureDistinctOnIsMutable();
             distinctOn_.addAll(other.distinctOn_);
@@ -1079,7 +1095,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             distinctOnBuilder_.dispose();
             distinctOnBuilder_ = null;
             distinctOn_ = other.distinctOn_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000010);
             distinctOnBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getDistinctOnFieldBuilder()
@@ -1156,7 +1172,7 @@ public Builder mergeFrom(
             case 34:
               {
                 input.readMessage(getFilterFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 34
             case 42:
@@ -1188,25 +1204,25 @@ public Builder mergeFrom(
             case 58:
               {
                 startCursor_ = input.readBytes();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 58
             case 66:
               {
                 endCursor_ = input.readBytes();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 66
             case 80:
               {
                 offset_ = input.readInt32();
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 80
             case 98:
               {
                 input.readMessage(getLimitFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000100;
                 break;
               } // case 98
             default:
@@ -1960,7 +1976,7 @@ public java.util.List getKindBui
      * @return Whether the filter field is set.
      */
     public boolean hasFilter() {
-      return filterBuilder_ != null || filter_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1995,11 +2011,11 @@ public Builder setFilter(com.google.datastore.v1.Filter value) {
           throw new NullPointerException();
         }
         filter_ = value;
-        onChanged();
       } else {
         filterBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -2014,11 +2030,11 @@ public Builder setFilter(com.google.datastore.v1.Filter value) {
     public Builder setFilter(com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filterBuilder_ == null) {
         filter_ = builderForValue.build();
-        onChanged();
       } else {
         filterBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -2032,17 +2048,18 @@ public Builder setFilter(com.google.datastore.v1.Filter.Builder builderForValue)
      */
     public Builder mergeFilter(com.google.datastore.v1.Filter value) {
       if (filterBuilder_ == null) {
-        if (filter_ != null) {
-          filter_ =
-              com.google.datastore.v1.Filter.newBuilder(filter_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && filter_ != null
+            && filter_ != com.google.datastore.v1.Filter.getDefaultInstance()) {
+          getFilterBuilder().mergeFrom(value);
         } else {
           filter_ = value;
         }
-        onChanged();
       } else {
         filterBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -2055,14 +2072,13 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) {
      * .google.datastore.v1.Filter filter = 4;
      */
     public Builder clearFilter() {
-      if (filterBuilder_ == null) {
-        filter_ = null;
-        onChanged();
-      } else {
-        filter_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      filter_ = null;
+      if (filterBuilder_ != null) {
+        filterBuilder_.dispose();
         filterBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2075,7 +2091,7 @@ public Builder clearFilter() {
      * .google.datastore.v1.Filter filter = 4;
      */
     public com.google.datastore.v1.Filter.Builder getFilterBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getFilterFieldBuilder().getBuilder();
     }
@@ -2125,9 +2141,9 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureOrderIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         order_ = new java.util.ArrayList(order_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -2342,7 +2358,7 @@ public Builder addAllOrder(
     public Builder clearOrder() {
       if (orderBuilder_ == null) {
         order_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         orderBuilder_.clear();
@@ -2463,7 +2479,7 @@ public java.util.List getOrderBui
                 com.google.datastore.v1.PropertyOrder,
                 com.google.datastore.v1.PropertyOrder.Builder,
                 com.google.datastore.v1.PropertyOrderOrBuilder>(
-                order_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                order_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         order_ = null;
       }
       return orderBuilder_;
@@ -2473,10 +2489,10 @@ public java.util.List getOrderBui
         java.util.Collections.emptyList();
 
     private void ensureDistinctOnIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         distinctOn_ =
             new java.util.ArrayList(distinctOn_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -2714,7 +2730,7 @@ public Builder addAllDistinctOn(
     public Builder clearDistinctOn() {
       if (distinctOnBuilder_ == null) {
         distinctOn_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
       } else {
         distinctOnBuilder_.clear();
@@ -2850,7 +2866,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
                 com.google.datastore.v1.PropertyReference,
                 com.google.datastore.v1.PropertyReference.Builder,
                 com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                distinctOn_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                distinctOn_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         distinctOn_ = null;
       }
       return distinctOnBuilder_;
@@ -2894,8 +2910,8 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       startCursor_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2914,7 +2930,7 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearStartCursor() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       startCursor_ = getDefaultInstance().getStartCursor();
       onChanged();
       return this;
@@ -2958,8 +2974,8 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       endCursor_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2978,7 +2994,7 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearEndCursor() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       endCursor_ = getDefaultInstance().getEndCursor();
       onChanged();
       return this;
@@ -3017,6 +3033,7 @@ public int getOffset() {
     public Builder setOffset(int value) {
 
       offset_ = value;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -3033,7 +3050,7 @@ public Builder setOffset(int value) {
      * @return This builder for chaining.
      */
     public Builder clearOffset() {
-
+      bitField0_ = (bitField0_ & ~0x00000080);
       offset_ = 0;
       onChanged();
       return this;
@@ -3060,7 +3077,7 @@ public Builder clearOffset() {
      * @return Whether the limit field is set.
      */
     public boolean hasLimit() {
-      return limitBuilder_ != null || limit_ != null;
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      *
@@ -3101,11 +3118,11 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
           throw new NullPointerException();
         }
         limit_ = value;
-        onChanged();
       } else {
         limitBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3123,11 +3140,11 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
     public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue) {
       if (limitBuilder_ == null) {
         limit_ = builderForValue.build();
-        onChanged();
       } else {
         limitBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3144,17 +3161,18 @@ public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue)
      */
     public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       if (limitBuilder_ == null) {
-        if (limit_ != null) {
-          limit_ =
-              com.google.protobuf.Int32Value.newBuilder(limit_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000100) != 0)
+            && limit_ != null
+            && limit_ != com.google.protobuf.Int32Value.getDefaultInstance()) {
+          getLimitBuilder().mergeFrom(value);
         } else {
           limit_ = value;
         }
-        onChanged();
       } else {
         limitBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000100;
+      onChanged();
       return this;
     }
     /**
@@ -3170,14 +3188,13 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
      * .google.protobuf.Int32Value limit = 12;
      */
     public Builder clearLimit() {
-      if (limitBuilder_ == null) {
-        limit_ = null;
-        onChanged();
-      } else {
-        limit_ = null;
+      bitField0_ = (bitField0_ & ~0x00000100);
+      limit_ = null;
+      if (limitBuilder_ != null) {
+        limitBuilder_.dispose();
         limitBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -3193,7 +3210,7 @@ public Builder clearLimit() {
      * .google.protobuf.Int32Value limit = 12;
      */
     public com.google.protobuf.Int32Value.Builder getLimitBuilder() {
-
+      bitField0_ |= 0x00000100;
       onChanged();
       return getLimitFieldBuilder().getBuilder();
     }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 3e72bbdd2505..9a64bac76a8a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -277,7 +277,7 @@ private MoreResultsType(int value) {
   }
 
   public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6;
-  private int skippedResults_;
+  private int skippedResults_ = 0;
   /**
    *
    *
@@ -295,7 +295,7 @@ public int getSkippedResults() {
   }
 
   public static final int SKIPPED_CURSOR_FIELD_NUMBER = 3;
-  private com.google.protobuf.ByteString skippedCursor_;
+  private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -314,7 +314,7 @@ public com.google.protobuf.ByteString getSkippedCursor() {
   }
 
   public static final int ENTITY_RESULT_TYPE_FIELD_NUMBER = 1;
-  private int entityResultType_;
+  private int entityResultType_ = 0;
   /**
    *
    *
@@ -343,13 +343,14 @@ public int getEntityResultTypeValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.EntityResult.ResultType result =
-        com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
+        com.google.datastore.v1.EntityResult.ResultType.forNumber(entityResultType_);
     return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
   }
 
   public static final int ENTITY_RESULTS_FIELD_NUMBER = 2;
+
+  @SuppressWarnings("serial")
   private java.util.List entityResults_;
   /**
    *
@@ -419,7 +420,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
   }
 
   public static final int END_CURSOR_FIELD_NUMBER = 4;
-  private com.google.protobuf.ByteString endCursor_;
+  private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -437,7 +438,7 @@ public com.google.protobuf.ByteString getEndCursor() {
   }
 
   public static final int MORE_RESULTS_FIELD_NUMBER = 5;
-  private int moreResults_;
+  private int moreResults_ = 0;
   /**
    *
    *
@@ -466,16 +467,15 @@ public int getMoreResultsValue() {
    */
   @java.lang.Override
   public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
-        com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+        com.google.datastore.v1.QueryResultBatch.MoreResultsType.forNumber(moreResults_);
     return result == null
         ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
         : result;
   }
 
   public static final int SNAPSHOT_VERSION_FIELD_NUMBER = 7;
-  private long snapshotVersion_;
+  private long snapshotVersion_ = 0L;
   /**
    *
    *
@@ -566,7 +566,7 @@ public com.google.protobuf.Timestamp getReadTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
-    return getReadTime();
+    return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -841,29 +841,23 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       skippedResults_ = 0;
-
       skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
-
       entityResultType_ = 0;
-
       if (entityResultsBuilder_ == null) {
         entityResults_ = java.util.Collections.emptyList();
       } else {
         entityResults_ = null;
         entityResultsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000008);
       endCursor_ = com.google.protobuf.ByteString.EMPTY;
-
       moreResults_ = 0;
-
       snapshotVersion_ = 0L;
-
-      if (readTimeBuilder_ == null) {
-        readTime_ = null;
-      } else {
-        readTime_ = null;
+      readTime_ = null;
+      if (readTimeBuilder_ != null) {
+        readTimeBuilder_.dispose();
         readTimeBuilder_ = null;
       }
       return this;
@@ -893,29 +887,49 @@ public com.google.datastore.v1.QueryResultBatch build() {
     public com.google.datastore.v1.QueryResultBatch buildPartial() {
       com.google.datastore.v1.QueryResultBatch result =
           new com.google.datastore.v1.QueryResultBatch(this);
-      int from_bitField0_ = bitField0_;
-      result.skippedResults_ = skippedResults_;
-      result.skippedCursor_ = skippedCursor_;
-      result.entityResultType_ = entityResultType_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.QueryResultBatch result) {
       if (entityResultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.entityResults_ = entityResults_;
       } else {
         result.entityResults_ = entityResultsBuilder_.build();
       }
-      result.endCursor_ = endCursor_;
-      result.moreResults_ = moreResults_;
-      result.snapshotVersion_ = snapshotVersion_;
-      if (readTimeBuilder_ == null) {
-        result.readTime_ = readTime_;
-      } else {
-        result.readTime_ = readTimeBuilder_.build();
+    }
+
+    private void buildPartial0(com.google.datastore.v1.QueryResultBatch result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.skippedResults_ = skippedResults_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.skippedCursor_ = skippedCursor_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.entityResultType_ = entityResultType_;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.endCursor_ = endCursor_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.moreResults_ = moreResults_;
+      }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.snapshotVersion_ = snapshotVersion_;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
       }
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -976,7 +990,7 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
         if (!other.entityResults_.isEmpty()) {
           if (entityResults_.isEmpty()) {
             entityResults_ = other.entityResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureEntityResultsIsMutable();
             entityResults_.addAll(other.entityResults_);
@@ -989,7 +1003,7 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
             entityResultsBuilder_.dispose();
             entityResultsBuilder_ = null;
             entityResults_ = other.entityResults_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
             entityResultsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEntityResultsFieldBuilder()
@@ -1040,7 +1054,7 @@ public Builder mergeFrom(
             case 8:
               {
                 entityResultType_ = input.readEnum();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 8
             case 18:
@@ -1059,37 +1073,37 @@ public Builder mergeFrom(
             case 26:
               {
                 skippedCursor_ = input.readBytes();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 26
             case 34:
               {
                 endCursor_ = input.readBytes();
-
+                bitField0_ |= 0x00000010;
                 break;
               } // case 34
             case 40:
               {
                 moreResults_ = input.readEnum();
-
+                bitField0_ |= 0x00000020;
                 break;
               } // case 40
             case 48:
               {
                 skippedResults_ = input.readInt32();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 48
             case 56:
               {
                 snapshotVersion_ = input.readInt64();
-
+                bitField0_ |= 0x00000040;
                 break;
               } // case 56
             case 66:
               {
                 input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000080;
                 break;
               } // case 66
             default:
@@ -1142,6 +1156,7 @@ public int getSkippedResults() {
     public Builder setSkippedResults(int value) {
 
       skippedResults_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1157,7 +1172,7 @@ public Builder setSkippedResults(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSkippedResults() {
-
+      bitField0_ = (bitField0_ & ~0x00000001);
       skippedResults_ = 0;
       onChanged();
       return this;
@@ -1197,8 +1212,8 @@ public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       skippedCursor_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1215,7 +1230,7 @@ public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearSkippedCursor() {
-
+      bitField0_ = (bitField0_ & ~0x00000002);
       skippedCursor_ = getDefaultInstance().getSkippedCursor();
       onChanged();
       return this;
@@ -1250,8 +1265,8 @@ public int getEntityResultTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setEntityResultTypeValue(int value) {
-
       entityResultType_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1268,9 +1283,8 @@ public Builder setEntityResultTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.EntityResult.ResultType result =
-          com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
+          com.google.datastore.v1.EntityResult.ResultType.forNumber(entityResultType_);
       return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
     }
     /**
@@ -1289,7 +1303,7 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000004;
       entityResultType_ = value.getNumber();
       onChanged();
       return this;
@@ -1306,7 +1320,7 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy
      * @return This builder for chaining.
      */
     public Builder clearEntityResultType() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       entityResultType_ = 0;
       onChanged();
       return this;
@@ -1316,10 +1330,10 @@ public Builder clearEntityResultType() {
         java.util.Collections.emptyList();
 
     private void ensureEntityResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         entityResults_ =
             new java.util.ArrayList(entityResults_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -1534,7 +1548,7 @@ public Builder addAllEntityResults(
     public Builder clearEntityResults() {
       if (entityResultsBuilder_ == null) {
         entityResults_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
       } else {
         entityResultsBuilder_.clear();
@@ -1657,7 +1671,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
                 com.google.datastore.v1.EntityResult.Builder,
                 com.google.datastore.v1.EntityResultOrBuilder>(
                 entityResults_,
-                ((bitField0_ & 0x00000001) != 0),
+                ((bitField0_ & 0x00000008) != 0),
                 getParentForChildren(),
                 isClean());
         entityResults_ = null;
@@ -1697,8 +1711,8 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       endCursor_ = value;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1714,7 +1728,7 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearEndCursor() {
-
+      bitField0_ = (bitField0_ & ~0x00000010);
       endCursor_ = getDefaultInstance().getEndCursor();
       onChanged();
       return this;
@@ -1749,8 +1763,8 @@ public int getMoreResultsValue() {
      * @return This builder for chaining.
      */
     public Builder setMoreResultsValue(int value) {
-
       moreResults_ = value;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1767,9 +1781,8 @@ public Builder setMoreResultsValue(int value) {
      */
     @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
-          com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+          com.google.datastore.v1.QueryResultBatch.MoreResultsType.forNumber(moreResults_);
       return result == null
           ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
           : result;
@@ -1790,7 +1803,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
       if (value == null) {
         throw new NullPointerException();
       }
-
+      bitField0_ |= 0x00000020;
       moreResults_ = value.getNumber();
       onChanged();
       return this;
@@ -1807,7 +1820,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
      * @return This builder for chaining.
      */
     public Builder clearMoreResults() {
-
+      bitField0_ = (bitField0_ & ~0x00000020);
       moreResults_ = 0;
       onChanged();
       return this;
@@ -1858,6 +1871,7 @@ public long getSnapshotVersion() {
     public Builder setSnapshotVersion(long value) {
 
       snapshotVersion_ = value;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1880,7 +1894,7 @@ public Builder setSnapshotVersion(long value) {
      * @return This builder for chaining.
      */
     public Builder clearSnapshotVersion() {
-
+      bitField0_ = (bitField0_ & ~0x00000040);
       snapshotVersion_ = 0L;
       onChanged();
       return this;
@@ -1912,7 +1926,7 @@ public Builder clearSnapshotVersion() {
      * @return Whether the readTime field is set.
      */
     public boolean hasReadTime() {
-      return readTimeBuilder_ != null || readTime_ != null;
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -1963,11 +1977,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         readTime_ = value;
-        onChanged();
       } else {
         readTimeBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -1990,11 +2004,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
     public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (readTimeBuilder_ == null) {
         readTime_ = builderForValue.build();
-        onChanged();
       } else {
         readTimeBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2016,17 +2030,18 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
      */
     public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       if (readTimeBuilder_ == null) {
-        if (readTime_ != null) {
-          readTime_ =
-              com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000080) != 0)
+            && readTime_ != null
+            && readTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getReadTimeBuilder().mergeFrom(value);
         } else {
           readTime_ = value;
         }
-        onChanged();
       } else {
         readTimeBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000080;
+      onChanged();
       return this;
     }
     /**
@@ -2047,14 +2062,13 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp read_time = 8;
      */
     public Builder clearReadTime() {
-      if (readTimeBuilder_ == null) {
-        readTime_ = null;
-        onChanged();
-      } else {
-        readTime_ = null;
+      bitField0_ = (bitField0_ & ~0x00000080);
+      readTime_ = null;
+      if (readTimeBuilder_ != null) {
+        readTimeBuilder_.dispose();
         readTimeBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -2075,7 +2089,7 @@ public Builder clearReadTime() {
      * .google.protobuf.Timestamp read_time = 8;
      */
     public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
-
+      bitField0_ |= 0x00000080;
       onChanged();
       return getReadTimeFieldBuilder().getBuilder();
     }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 6e3f179a6a58..759d7ce388c8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -233,6 +233,7 @@ public enum ConsistencyTypeCase
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     READ_CONSISTENCY(1),
     TRANSACTION(2),
+    NEW_TRANSACTION(3),
     READ_TIME(4),
     CONSISTENCYTYPE_NOT_SET(0);
     private final int value;
@@ -256,6 +257,8 @@ public static ConsistencyTypeCase forNumber(int value) {
           return READ_CONSISTENCY;
         case 2:
           return TRANSACTION;
+        case 3:
+          return NEW_TRANSACTION;
         case 4:
           return READ_TIME;
         case 0:
@@ -319,9 +322,8 @@ public int getReadConsistencyValue() {
    */
   public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
     if (consistencyTypeCase_ == 1) {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.ReadOptions.ReadConsistency result =
-          com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
+          com.google.datastore.v1.ReadOptions.ReadConsistency.forNumber(
               (java.lang.Integer) consistencyType_);
       return result == null
           ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED
@@ -369,6 +371,72 @@ public com.google.protobuf.ByteString getTransaction() {
     return com.google.protobuf.ByteString.EMPTY;
   }
 
+  public static final int NEW_TRANSACTION_FIELD_NUMBER = 3;
+  /**
+   *
+   *
+   * 
    +   * 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]
+   * or
+   * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions new_transaction = 3;
+   *
+   * @return Whether the newTransaction field is set.
+   */
+  @java.lang.Override
+  public boolean hasNewTransaction() {
+    return consistencyTypeCase_ == 3;
+  }
+  /**
+   *
+   *
+   * 
    +   * 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]
+   * or
+   * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions new_transaction = 3;
+   *
+   * @return The newTransaction.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.TransactionOptions getNewTransaction() {
+    if (consistencyTypeCase_ == 3) {
+      return (com.google.datastore.v1.TransactionOptions) consistencyType_;
+    }
+    return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * 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]
+   * or
+   * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions new_transaction = 3;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBuilder() {
+    if (consistencyTypeCase_ == 3) {
+      return (com.google.datastore.v1.TransactionOptions) consistencyType_;
+    }
+    return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+  }
+
   public static final int READ_TIME_FIELD_NUMBER = 4;
   /**
    *
@@ -446,6 +514,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (consistencyTypeCase_ == 2) {
       output.writeBytes(2, (com.google.protobuf.ByteString) consistencyType_);
     }
+    if (consistencyTypeCase_ == 3) {
+      output.writeMessage(3, (com.google.datastore.v1.TransactionOptions) consistencyType_);
+    }
     if (consistencyTypeCase_ == 4) {
       output.writeMessage(4, (com.google.protobuf.Timestamp) consistencyType_);
     }
@@ -468,6 +539,11 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeBytesSize(
               2, (com.google.protobuf.ByteString) consistencyType_);
     }
+    if (consistencyTypeCase_ == 3) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              3, (com.google.datastore.v1.TransactionOptions) consistencyType_);
+    }
     if (consistencyTypeCase_ == 4) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
@@ -496,6 +572,9 @@ public boolean equals(final java.lang.Object obj) {
       case 2:
         if (!getTransaction().equals(other.getTransaction())) return false;
         break;
+      case 3:
+        if (!getNewTransaction().equals(other.getNewTransaction())) return false;
+        break;
       case 4:
         if (!getReadTime().equals(other.getReadTime())) return false;
         break;
@@ -522,6 +601,10 @@ public int hashCode() {
         hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
         hash = (53 * hash) + getTransaction().hashCode();
         break;
+      case 3:
+        hash = (37 * hash) + NEW_TRANSACTION_FIELD_NUMBER;
+        hash = (53 * hash) + getNewTransaction().hashCode();
+        break;
       case 4:
         hash = (37 * hash) + READ_TIME_FIELD_NUMBER;
         hash = (53 * hash) + getReadTime().hashCode();
@@ -666,6 +749,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
+      if (newTransactionBuilder_ != null) {
+        newTransactionBuilder_.clear();
+      }
       if (readTimeBuilder_ != null) {
         readTimeBuilder_.clear();
       }
@@ -697,24 +784,29 @@ public com.google.datastore.v1.ReadOptions build() {
     @java.lang.Override
     public com.google.datastore.v1.ReadOptions buildPartial() {
       com.google.datastore.v1.ReadOptions result = new com.google.datastore.v1.ReadOptions(this);
-      if (consistencyTypeCase_ == 1) {
-        result.consistencyType_ = consistencyType_;
-      }
-      if (consistencyTypeCase_ == 2) {
-        result.consistencyType_ = consistencyType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (consistencyTypeCase_ == 4) {
-        if (readTimeBuilder_ == null) {
-          result.consistencyType_ = consistencyType_;
-        } else {
-          result.consistencyType_ = readTimeBuilder_.build();
-        }
-      }
-      result.consistencyTypeCase_ = consistencyTypeCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.ReadOptions result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.ReadOptions result) {
+      result.consistencyTypeCase_ = consistencyTypeCase_;
+      result.consistencyType_ = this.consistencyType_;
+      if (consistencyTypeCase_ == 3 && newTransactionBuilder_ != null) {
+        result.consistencyType_ = newTransactionBuilder_.build();
+      }
+      if (consistencyTypeCase_ == 4 && readTimeBuilder_ != null) {
+        result.consistencyType_ = readTimeBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -771,6 +863,11 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) {
             setTransaction(other.getTransaction());
             break;
           }
+        case NEW_TRANSACTION:
+          {
+            mergeNewTransaction(other.getNewTransaction());
+            break;
+          }
         case READ_TIME:
           {
             mergeReadTime(other.getReadTime());
@@ -820,6 +917,12 @@ public Builder mergeFrom(
                 consistencyTypeCase_ = 2;
                 break;
               } // case 18
+            case 26:
+              {
+                input.readMessage(getNewTransactionFieldBuilder().getBuilder(), extensionRegistry);
+                consistencyTypeCase_ = 3;
+                break;
+              } // case 26
             case 34:
               {
                 input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
@@ -857,6 +960,8 @@ public Builder clearConsistencyType() {
       return this;
     }
 
+    private int bitField0_;
+
     /**
      *
      *
@@ -922,9 +1027,8 @@ public Builder setReadConsistencyValue(int value) {
     @java.lang.Override
     public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
       if (consistencyTypeCase_ == 1) {
-        @SuppressWarnings("deprecation")
         com.google.datastore.v1.ReadOptions.ReadConsistency result =
-            com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
+            com.google.datastore.v1.ReadOptions.ReadConsistency.forNumber(
                 (java.lang.Integer) consistencyType_);
         return result == null
             ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED
@@ -1053,6 +1157,261 @@ public Builder clearTransaction() {
       return this;
     }
 
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.TransactionOptions,
+            com.google.datastore.v1.TransactionOptions.Builder,
+            com.google.datastore.v1.TransactionOptionsOrBuilder>
+        newTransactionBuilder_;
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     *
+     * @return Whether the newTransaction field is set.
+     */
+    @java.lang.Override
+    public boolean hasNewTransaction() {
+      return consistencyTypeCase_ == 3;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     *
+     * @return The newTransaction.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.TransactionOptions getNewTransaction() {
+      if (newTransactionBuilder_ == null) {
+        if (consistencyTypeCase_ == 3) {
+          return (com.google.datastore.v1.TransactionOptions) consistencyType_;
+        }
+        return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+      } else {
+        if (consistencyTypeCase_ == 3) {
+          return newTransactionBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     */
+    public Builder setNewTransaction(com.google.datastore.v1.TransactionOptions value) {
+      if (newTransactionBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        consistencyType_ = value;
+        onChanged();
+      } else {
+        newTransactionBuilder_.setMessage(value);
+      }
+      consistencyTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     */
+    public Builder setNewTransaction(
+        com.google.datastore.v1.TransactionOptions.Builder builderForValue) {
+      if (newTransactionBuilder_ == null) {
+        consistencyType_ = builderForValue.build();
+        onChanged();
+      } else {
+        newTransactionBuilder_.setMessage(builderForValue.build());
+      }
+      consistencyTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     */
+    public Builder mergeNewTransaction(com.google.datastore.v1.TransactionOptions value) {
+      if (newTransactionBuilder_ == null) {
+        if (consistencyTypeCase_ == 3
+            && consistencyType_
+                != com.google.datastore.v1.TransactionOptions.getDefaultInstance()) {
+          consistencyType_ =
+              com.google.datastore.v1.TransactionOptions.newBuilder(
+                      (com.google.datastore.v1.TransactionOptions) consistencyType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          consistencyType_ = value;
+        }
+        onChanged();
+      } else {
+        if (consistencyTypeCase_ == 3) {
+          newTransactionBuilder_.mergeFrom(value);
+        } else {
+          newTransactionBuilder_.setMessage(value);
+        }
+      }
+      consistencyTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     */
+    public Builder clearNewTransaction() {
+      if (newTransactionBuilder_ == null) {
+        if (consistencyTypeCase_ == 3) {
+          consistencyTypeCase_ = 0;
+          consistencyType_ = null;
+          onChanged();
+        }
+      } else {
+        if (consistencyTypeCase_ == 3) {
+          consistencyTypeCase_ = 0;
+          consistencyType_ = null;
+        }
+        newTransactionBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     */
+    public com.google.datastore.v1.TransactionOptions.Builder getNewTransactionBuilder() {
+      return getNewTransactionFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBuilder() {
+      if ((consistencyTypeCase_ == 3) && (newTransactionBuilder_ != null)) {
+        return newTransactionBuilder_.getMessageOrBuilder();
+      } else {
+        if (consistencyTypeCase_ == 3) {
+          return (com.google.datastore.v1.TransactionOptions) consistencyType_;
+        }
+        return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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]
+     * or
+     * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+     * 
    
+     *
+     * .google.datastore.v1.TransactionOptions new_transaction = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.TransactionOptions,
+            com.google.datastore.v1.TransactionOptions.Builder,
+            com.google.datastore.v1.TransactionOptionsOrBuilder>
+        getNewTransactionFieldBuilder() {
+      if (newTransactionBuilder_ == null) {
+        if (!(consistencyTypeCase_ == 3)) {
+          consistencyType_ = com.google.datastore.v1.TransactionOptions.getDefaultInstance();
+        }
+        newTransactionBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.TransactionOptions,
+                com.google.datastore.v1.TransactionOptions.Builder,
+                com.google.datastore.v1.TransactionOptionsOrBuilder>(
+                (com.google.datastore.v1.TransactionOptions) consistencyType_,
+                getParentForChildren(),
+                isClean());
+        consistencyType_ = null;
+      }
+      consistencyTypeCase_ = 3;
+      onChanged();
+      return newTransactionBuilder_;
+    }
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
             com.google.protobuf.Timestamp.Builder,
@@ -1276,7 +1635,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       }
       consistencyTypeCase_ = 4;
       onChanged();
-      ;
       return readTimeBuilder_;
     }
 
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 f6ee892027e2..c5294cc4a6ea 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
@@ -89,6 +89,56 @@ public interface ReadOptionsOrBuilder
    */
   com.google.protobuf.ByteString getTransaction();
 
+  /**
+   *
+   *
+   * 
    +   * 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]
+   * or
+   * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions new_transaction = 3;
+   *
+   * @return Whether the newTransaction field is set.
+   */
+  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]
+   * or
+   * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions new_transaction = 3;
+   *
+   * @return The newTransaction.
+   */
+  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]
+   * or
+   * [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+   * 
    
+   *
+   * .google.datastore.v1.TransactionOptions new_transaction = 3;
+   */
+  com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBuilder();
+
   /**
    *
    *
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 bf89a6e83f7c..2636e5e56a25 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
@@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -173,6 +177,8 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   }
 
   public static final int KEYS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
   private java.util.List keys_;
   /**
    *
@@ -468,17 +474,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
       if (keysBuilder_ == null) {
         keys_ = java.util.Collections.emptyList();
       } else {
         keys_ = null;
         keysBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
+      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -506,20 +511,34 @@ public com.google.datastore.v1.ReserveIdsRequest build() {
     public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
       com.google.datastore.v1.ReserveIdsRequest result =
           new com.google.datastore.v1.ReserveIdsRequest(this);
-      int from_bitField0_ = bitField0_;
-      result.projectId_ = projectId_;
-      result.databaseId_ = databaseId_;
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.ReserveIdsRequest result) {
       if (keysBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           keys_ = java.util.Collections.unmodifiableList(keys_);
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.keys_ = keys_;
       } else {
         result.keys_ = keysBuilder_.build();
       }
-      onBuilt();
-      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.ReserveIdsRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
+      }
     }
 
     @java.lang.Override
@@ -569,17 +588,19 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
       if (other == com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (keysBuilder_ == null) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureKeysIsMutable();
             keys_.addAll(other.keys_);
@@ -592,7 +613,7 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
             keysBuilder_.dispose();
             keysBuilder_ = null;
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
             keysBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getKeysFieldBuilder()
@@ -643,13 +664,13 @@ public Builder mergeFrom(
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
             default:
@@ -732,8 +753,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -749,8 +770,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -771,8 +792,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -844,8 +865,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -863,8 +884,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -887,8 +908,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -896,9 +917,9 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List keys_ = java.util.Collections.emptyList();
 
     private void ensureKeysIsMutable() {
-      if (!((bitField0_ & 0x00000001) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
-        bitField0_ |= 0x00000001;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -1132,7 +1153,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysBuilderList()
                 com.google.datastore.v1.Key,
                 com.google.datastore.v1.Key.Builder,
                 com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         keys_ = null;
       }
       return keysBuilder_;
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 91c084b4b3f8..77b52387140c 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
@@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -172,7 +176,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
-  private com.google.protobuf.ByteString transaction_;
+  private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
   /**
    *
    *
@@ -404,12 +408,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
       transaction_ = com.google.protobuf.ByteString.EMPTY;
-
       return this;
     }
 
@@ -437,13 +439,26 @@ public com.google.datastore.v1.RollbackRequest build() {
     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_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.RollbackRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.transaction_ = transaction_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -491,10 +506,12 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) {
       if (other == com.google.datastore.v1.RollbackRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
@@ -529,19 +546,19 @@ public Builder mergeFrom(
             case 10:
               {
                 transaction_ = input.readBytes();
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 10
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
             default:
@@ -561,6 +578,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -622,8 +641,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -639,8 +658,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -661,8 +680,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -734,8 +753,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -753,8 +772,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -777,8 +796,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -817,8 +836,8 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       transaction_ = value;
+      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -835,7 +854,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearTransaction() {
-
+      bitField0_ = (bitField0_ & ~0x00000004);
       transaction_ = getDefaultInstance().getTransaction();
       onChanged();
       return this;
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 7bbd7f12313e..88fd4fdc43a5 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
@@ -117,7 +117,9 @@ public QueryTypeCase getQueryTypeCase() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -166,7 +168,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -272,7 +276,9 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
-    return getPartitionId();
+    return partitionId_ == null
+        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+        : partitionId_;
   }
 
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
@@ -320,7 +326,9 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
    */
   @java.lang.Override
   public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
-    return getReadOptions();
+    return readOptions_ == null
+        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+        : readOptions_;
   }
 
   public static final int AGGREGATION_QUERY_FIELD_NUMBER = 3;
@@ -699,20 +707,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-      } else {
-        partitionId_ = null;
+      partitionId_ = null;
+      if (partitionIdBuilder_ != null) {
+        partitionIdBuilder_.dispose();
         partitionIdBuilder_ = null;
       }
-      if (readOptionsBuilder_ == null) {
-        readOptions_ = null;
-      } else {
-        readOptions_ = null;
+      readOptions_ = null;
+      if (readOptionsBuilder_ != null) {
+        readOptionsBuilder_.dispose();
         readOptionsBuilder_ = null;
       }
       if (aggregationQueryBuilder_ != null) {
@@ -750,35 +755,41 @@ public com.google.datastore.v1.RunAggregationQueryRequest build() {
     public com.google.datastore.v1.RunAggregationQueryRequest buildPartial() {
       com.google.datastore.v1.RunAggregationQueryRequest result =
           new com.google.datastore.v1.RunAggregationQueryRequest(this);
-      result.projectId_ = projectId_;
-      result.databaseId_ = databaseId_;
-      if (partitionIdBuilder_ == null) {
-        result.partitionId_ = partitionId_;
-      } else {
-        result.partitionId_ = partitionIdBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (readOptionsBuilder_ == null) {
-        result.readOptions_ = readOptions_;
-      } else {
-        result.readOptions_ = readOptionsBuilder_.build();
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.RunAggregationQueryRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
       }
-      if (queryTypeCase_ == 3) {
-        if (aggregationQueryBuilder_ == null) {
-          result.queryType_ = queryType_;
-        } else {
-          result.queryType_ = aggregationQueryBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
       }
-      if (queryTypeCase_ == 7) {
-        if (gqlQueryBuilder_ == null) {
-          result.queryType_ = queryType_;
-        } else {
-          result.queryType_ = gqlQueryBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.partitionId_ =
+            partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.readOptions_ =
+            readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.RunAggregationQueryRequest result) {
       result.queryTypeCase_ = queryTypeCase_;
-      onBuilt();
-      return result;
+      result.queryType_ = this.queryType_;
+      if (queryTypeCase_ == 3 && aggregationQueryBuilder_ != null) {
+        result.queryType_ = aggregationQueryBuilder_.build();
+      }
+      if (queryTypeCase_ == 7 && gqlQueryBuilder_ != null) {
+        result.queryType_ = gqlQueryBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -829,10 +840,12 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryRequest othe
         return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPartitionId()) {
@@ -886,13 +899,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 26:
@@ -911,13 +924,13 @@ public Builder mergeFrom(
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
             default:
@@ -951,6 +964,8 @@ public Builder clearQueryType() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -1012,8 +1027,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1029,8 +1044,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1051,8 +1066,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1124,8 +1139,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1143,8 +1158,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1167,8 +1182,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1194,7 +1209,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the partitionId field is set.
      */
     public boolean hasPartitionId() {
-      return partitionIdBuilder_ != null || partitionId_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1237,11 +1252,11 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
           throw new NullPointerException();
         }
         partitionId_ = value;
-        onChanged();
       } else {
         partitionIdBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1259,11 +1274,11 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
     public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
       if (partitionIdBuilder_ == null) {
         partitionId_ = builderForValue.build();
-        onChanged();
       } else {
         partitionIdBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1280,19 +1295,18 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
      */
     public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       if (partitionIdBuilder_ == null) {
-        if (partitionId_ != null) {
-          partitionId_ =
-              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && partitionId_ != null
+            && partitionId_ != com.google.datastore.v1.PartitionId.getDefaultInstance()) {
+          getPartitionIdBuilder().mergeFrom(value);
         } else {
           partitionId_ = value;
         }
-        onChanged();
       } else {
         partitionIdBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1308,14 +1322,13 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     public Builder clearPartitionId() {
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-        onChanged();
-      } else {
-        partitionId_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      partitionId_ = null;
+      if (partitionIdBuilder_ != null) {
+        partitionIdBuilder_.dispose();
         partitionIdBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1331,7 +1344,7 @@ public Builder clearPartitionId() {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
@@ -1403,7 +1416,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
      * @return Whether the readOptions field is set.
      */
     public boolean hasReadOptions() {
-      return readOptionsBuilder_ != null || readOptions_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1440,11 +1453,11 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
           throw new NullPointerException();
         }
         readOptions_ = value;
-        onChanged();
       } else {
         readOptionsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1459,11 +1472,11 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
     public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
       if (readOptionsBuilder_ == null) {
         readOptions_ = builderForValue.build();
-        onChanged();
       } else {
         readOptionsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1477,19 +1490,18 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
      */
     public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       if (readOptionsBuilder_ == null) {
-        if (readOptions_ != null) {
-          readOptions_ =
-              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && readOptions_ != null
+            && readOptions_ != com.google.datastore.v1.ReadOptions.getDefaultInstance()) {
+          getReadOptionsBuilder().mergeFrom(value);
         } else {
           readOptions_ = value;
         }
-        onChanged();
       } else {
         readOptionsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1502,14 +1514,13 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public Builder clearReadOptions() {
-      if (readOptionsBuilder_ == null) {
-        readOptions_ = null;
-        onChanged();
-      } else {
-        readOptions_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      readOptions_ = null;
+      if (readOptionsBuilder_ != null) {
+        readOptionsBuilder_.dispose();
         readOptionsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1522,7 +1533,7 @@ public Builder clearReadOptions() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
@@ -1776,7 +1787,6 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu
       }
       queryTypeCase_ = 3;
       onChanged();
-      ;
       return aggregationQueryBuilder_;
     }
 
@@ -1983,7 +1993,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       }
       queryTypeCase_ = 7;
       onChanged();
-      ;
       return gqlQueryBuilder_;
     }
 
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 13810be9b956..4e5076030d50 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
@@ -38,7 +38,9 @@ private RunAggregationQueryResponse(com.google.protobuf.GeneratedMessageV3.Build
     super(builder);
   }
 
-  private RunAggregationQueryResponse() {}
+  private RunAggregationQueryResponse() {
+    transaction_ = com.google.protobuf.ByteString.EMPTY;
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
@@ -111,7 +113,9 @@ public com.google.datastore.v1.AggregationResultBatch getBatch() {
    */
   @java.lang.Override
   public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder() {
-    return getBatch();
+    return batch_ == null
+        ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()
+        : batch_;
   }
 
   public static final int QUERY_FIELD_NUMBER = 2;
@@ -157,7 +161,28 @@ public com.google.datastore.v1.AggregationQuery getQuery() {
    */
   @java.lang.Override
   public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
-    return getQuery();
+    return query_ == null ? com.google.datastore.v1.AggregationQuery.getDefaultInstance() : query_;
+  }
+
+  public static final int TRANSACTION_FIELD_NUMBER = 5;
+  private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+  /**
+   *
+   *
+   * 
    +   * The identifier of the transaction that was started as part of this
+   * RunAggregationQuery request.
+   * Set only when [ReadOptions.begin_transaction][] was set in
+   * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
+   * 
    
+   *
+   * bytes transaction = 5;
+   *
+   * @return The transaction.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getTransaction() {
+    return transaction_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -180,6 +205,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (query_ != null) {
       output.writeMessage(2, getQuery());
     }
+    if (!transaction_.isEmpty()) {
+      output.writeBytes(5, transaction_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -195,6 +223,9 @@ public int getSerializedSize() {
     if (query_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
     }
+    if (!transaction_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -219,6 +250,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasQuery()) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
+    if (!getTransaction().equals(other.getTransaction())) return false;
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -238,6 +270,8 @@ public int hashCode() {
       hash = (37 * hash) + QUERY_FIELD_NUMBER;
       hash = (53 * hash) + getQuery().hashCode();
     }
+    hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
+    hash = (53 * hash) + getTransaction().hashCode();
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -377,18 +411,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (batchBuilder_ == null) {
-        batch_ = null;
-      } else {
-        batch_ = null;
+      bitField0_ = 0;
+      batch_ = null;
+      if (batchBuilder_ != null) {
+        batchBuilder_.dispose();
         batchBuilder_ = null;
       }
-      if (queryBuilder_ == null) {
-        query_ = null;
-      } else {
-        query_ = null;
+      query_ = null;
+      if (queryBuilder_ != null) {
+        queryBuilder_.dispose();
         queryBuilder_ = null;
       }
+      transaction_ = com.google.protobuf.ByteString.EMPTY;
       return this;
     }
 
@@ -416,20 +450,26 @@ public com.google.datastore.v1.RunAggregationQueryResponse build() {
     public com.google.datastore.v1.RunAggregationQueryResponse buildPartial() {
       com.google.datastore.v1.RunAggregationQueryResponse result =
           new com.google.datastore.v1.RunAggregationQueryResponse(this);
-      if (batchBuilder_ == null) {
-        result.batch_ = batch_;
-      } else {
-        result.batch_ = batchBuilder_.build();
-      }
-      if (queryBuilder_ == null) {
-        result.query_ = query_;
-      } else {
-        result.query_ = queryBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.RunAggregationQueryResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.batch_ = batchBuilder_ == null ? batch_ : batchBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.query_ = queryBuilder_ == null ? query_ : queryBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.transaction_ = transaction_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -482,6 +522,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryResponse oth
       if (other.hasQuery()) {
         mergeQuery(other.getQuery());
       }
+      if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
+        setTransaction(other.getTransaction());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -511,15 +554,21 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getBatchFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
+            case 42:
+              {
+                transaction_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 42
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -537,6 +586,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.v1.AggregationResultBatch batch_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.AggregationResultBatch,
@@ -555,7 +606,7 @@ public Builder mergeFrom(
      * @return Whether the batch field is set.
      */
     public boolean hasBatch() {
-      return batchBuilder_ != null || batch_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -592,11 +643,11 @@ public Builder setBatch(com.google.datastore.v1.AggregationResultBatch value) {
           throw new NullPointerException();
         }
         batch_ = value;
-        onChanged();
       } else {
         batchBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -612,11 +663,11 @@ public Builder setBatch(
         com.google.datastore.v1.AggregationResultBatch.Builder builderForValue) {
       if (batchBuilder_ == null) {
         batch_ = builderForValue.build();
-        onChanged();
       } else {
         batchBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -630,19 +681,18 @@ public Builder setBatch(
      */
     public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value) {
       if (batchBuilder_ == null) {
-        if (batch_ != null) {
-          batch_ =
-              com.google.datastore.v1.AggregationResultBatch.newBuilder(batch_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && batch_ != null
+            && batch_ != com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()) {
+          getBatchBuilder().mergeFrom(value);
         } else {
           batch_ = value;
         }
-        onChanged();
       } else {
         batchBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -655,14 +705,13 @@ public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value)
      * .google.datastore.v1.AggregationResultBatch batch = 1;
      */
     public Builder clearBatch() {
-      if (batchBuilder_ == null) {
-        batch_ = null;
-        onChanged();
-      } else {
-        batch_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      batch_ = null;
+      if (batchBuilder_ != null) {
+        batchBuilder_.dispose();
         batchBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -675,7 +724,7 @@ public Builder clearBatch() {
      * .google.datastore.v1.AggregationResultBatch batch = 1;
      */
     public com.google.datastore.v1.AggregationResultBatch.Builder getBatchBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getBatchFieldBuilder().getBuilder();
     }
@@ -741,7 +790,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
      * @return Whether the query field is set.
      */
     public boolean hasQuery() {
-      return queryBuilder_ != null || query_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -778,11 +827,11 @@ public Builder setQuery(com.google.datastore.v1.AggregationQuery value) {
           throw new NullPointerException();
         }
         query_ = value;
-        onChanged();
       } else {
         queryBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -797,11 +846,11 @@ public Builder setQuery(com.google.datastore.v1.AggregationQuery value) {
     public Builder setQuery(com.google.datastore.v1.AggregationQuery.Builder builderForValue) {
       if (queryBuilder_ == null) {
         query_ = builderForValue.build();
-        onChanged();
       } else {
         queryBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -815,19 +864,18 @@ public Builder setQuery(com.google.datastore.v1.AggregationQuery.Builder builder
      */
     public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) {
       if (queryBuilder_ == null) {
-        if (query_ != null) {
-          query_ =
-              com.google.datastore.v1.AggregationQuery.newBuilder(query_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && query_ != null
+            && query_ != com.google.datastore.v1.AggregationQuery.getDefaultInstance()) {
+          getQueryBuilder().mergeFrom(value);
         } else {
           query_ = value;
         }
-        onChanged();
       } else {
         queryBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -840,14 +888,13 @@ public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) {
      * .google.datastore.v1.AggregationQuery query = 2;
      */
     public Builder clearQuery() {
-      if (queryBuilder_ == null) {
-        query_ = null;
-        onChanged();
-      } else {
-        query_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      query_ = null;
+      if (queryBuilder_ != null) {
+        queryBuilder_.dispose();
         queryBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -860,7 +907,7 @@ public Builder clearQuery() {
      * .google.datastore.v1.AggregationQuery query = 2;
      */
     public com.google.datastore.v1.AggregationQuery.Builder getQueryBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryFieldBuilder().getBuilder();
     }
@@ -908,6 +955,70 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
       return queryBuilder_;
     }
 
+    private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this
+     * RunAggregationQuery request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @return The transaction.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getTransaction() {
+      return transaction_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this
+     * RunAggregationQuery request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @param value The transaction to set.
+     * @return This builder for chaining.
+     */
+    public Builder setTransaction(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      transaction_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this
+     * RunAggregationQuery request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearTransaction() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      transaction_ = getDefaultInstance().getTransaction();
+      onChanged();
+      return this;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 d4fcaf245d2e..52a191db0c63 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
@@ -92,4 +92,20 @@ public interface RunAggregationQueryResponseOrBuilder
    * .google.datastore.v1.AggregationQuery query = 2;
    */
   com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The identifier of the transaction that was started as part of this
+   * RunAggregationQuery request.
+   * Set only when [ReadOptions.begin_transaction][] was set in
+   * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
+   * 
    
+   *
+   * bytes transaction = 5;
+   *
+   * @return The transaction.
+   */
+  com.google.protobuf.ByteString getTransaction();
 }
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 5b30e3bac5ee..b26ac26338ed 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
@@ -116,7 +116,9 @@ public QueryTypeCase getQueryTypeCase() {
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
-  private volatile java.lang.Object projectId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object projectId_ = "";
   /**
    *
    *
@@ -165,7 +167,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   }
 
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
-  private volatile java.lang.Object databaseId_;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object databaseId_ = "";
   /**
    *
    *
@@ -271,7 +275,9 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
    */
   @java.lang.Override
   public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
-    return getPartitionId();
+    return partitionId_ == null
+        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
+        : partitionId_;
   }
 
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
@@ -319,7 +325,9 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
    */
   @java.lang.Override
   public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
-    return getReadOptions();
+    return readOptions_ == null
+        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
+        : readOptions_;
   }
 
   public static final int QUERY_FIELD_NUMBER = 3;
@@ -696,20 +704,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       projectId_ = "";
-
       databaseId_ = "";
-
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-      } else {
-        partitionId_ = null;
+      partitionId_ = null;
+      if (partitionIdBuilder_ != null) {
+        partitionIdBuilder_.dispose();
         partitionIdBuilder_ = null;
       }
-      if (readOptionsBuilder_ == null) {
-        readOptions_ = null;
-      } else {
-        readOptions_ = null;
+      readOptions_ = null;
+      if (readOptionsBuilder_ != null) {
+        readOptionsBuilder_.dispose();
         readOptionsBuilder_ = null;
       }
       if (queryBuilder_ != null) {
@@ -747,35 +752,41 @@ public com.google.datastore.v1.RunQueryRequest build() {
     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 {
-        result.partitionId_ = partitionIdBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (readOptionsBuilder_ == null) {
-        result.readOptions_ = readOptions_;
-      } else {
-        result.readOptions_ = readOptionsBuilder_.build();
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.projectId_ = projectId_;
       }
-      if (queryTypeCase_ == 3) {
-        if (queryBuilder_ == null) {
-          result.queryType_ = queryType_;
-        } else {
-          result.queryType_ = queryBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.databaseId_ = databaseId_;
       }
-      if (queryTypeCase_ == 7) {
-        if (gqlQueryBuilder_ == null) {
-          result.queryType_ = queryType_;
-        } else {
-          result.queryType_ = gqlQueryBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.partitionId_ =
+            partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.readOptions_ =
+            readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+      }
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.RunQueryRequest result) {
       result.queryTypeCase_ = queryTypeCase_;
-      onBuilt();
-      return result;
+      result.queryType_ = this.queryType_;
+      if (queryTypeCase_ == 3 && queryBuilder_ != null) {
+        result.queryType_ = queryBuilder_.build();
+      }
+      if (queryTypeCase_ == 7 && gqlQueryBuilder_ != null) {
+        result.queryType_ = gqlQueryBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -825,10 +836,12 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
       if (other == com.google.datastore.v1.RunQueryRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDatabaseId().isEmpty()) {
         databaseId_ = other.databaseId_;
+        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPartitionId()) {
@@ -882,13 +895,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000008;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000004;
                 break;
               } // case 18
             case 26:
@@ -906,13 +919,13 @@ public Builder mergeFrom(
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             case 74:
               {
                 databaseId_ = input.readStringRequireUtf8();
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 74
             default:
@@ -946,6 +959,8 @@ public Builder clearQueryType() {
       return this;
     }
 
+    private int bitField0_;
+
     private java.lang.Object projectId_ = "";
     /**
      *
@@ -1007,8 +1022,8 @@ public Builder setProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1024,8 +1039,8 @@ public Builder setProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
       projectId_ = getDefaultInstance().getProjectId();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1046,8 +1061,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       projectId_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1119,8 +1134,8 @@ public Builder setDatabaseId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1138,8 +1153,8 @@ public Builder setDatabaseId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
       databaseId_ = getDefaultInstance().getDatabaseId();
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1162,8 +1177,8 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-
       databaseId_ = value;
+      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1189,7 +1204,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the partitionId field is set.
      */
     public boolean hasPartitionId() {
-      return partitionIdBuilder_ != null || partitionId_ != null;
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      *
@@ -1232,11 +1247,11 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
           throw new NullPointerException();
         }
         partitionId_ = value;
-        onChanged();
       } else {
         partitionIdBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1254,11 +1269,11 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
     public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
       if (partitionIdBuilder_ == null) {
         partitionId_ = builderForValue.build();
-        onChanged();
       } else {
         partitionIdBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1275,19 +1290,18 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
      */
     public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       if (partitionIdBuilder_ == null) {
-        if (partitionId_ != null) {
-          partitionId_ =
-              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000004) != 0)
+            && partitionId_ != null
+            && partitionId_ != com.google.datastore.v1.PartitionId.getDefaultInstance()) {
+          getPartitionIdBuilder().mergeFrom(value);
         } else {
           partitionId_ = value;
         }
-        onChanged();
       } else {
         partitionIdBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000004;
+      onChanged();
       return this;
     }
     /**
@@ -1303,14 +1317,13 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     public Builder clearPartitionId() {
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-        onChanged();
-      } else {
-        partitionId_ = null;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      partitionId_ = null;
+      if (partitionIdBuilder_ != null) {
+        partitionIdBuilder_.dispose();
         partitionIdBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1326,7 +1339,7 @@ public Builder clearPartitionId() {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
-
+      bitField0_ |= 0x00000004;
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
@@ -1398,7 +1411,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
      * @return Whether the readOptions field is set.
      */
     public boolean hasReadOptions() {
-      return readOptionsBuilder_ != null || readOptions_ != null;
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -1435,11 +1448,11 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
           throw new NullPointerException();
         }
         readOptions_ = value;
-        onChanged();
       } else {
         readOptionsBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1454,11 +1467,11 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
     public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
       if (readOptionsBuilder_ == null) {
         readOptions_ = builderForValue.build();
-        onChanged();
       } else {
         readOptionsBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1472,19 +1485,18 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
      */
     public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       if (readOptionsBuilder_ == null) {
-        if (readOptions_ != null) {
-          readOptions_ =
-              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000008) != 0)
+            && readOptions_ != null
+            && readOptions_ != com.google.datastore.v1.ReadOptions.getDefaultInstance()) {
+          getReadOptionsBuilder().mergeFrom(value);
         } else {
           readOptions_ = value;
         }
-        onChanged();
       } else {
         readOptionsBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000008;
+      onChanged();
       return this;
     }
     /**
@@ -1497,14 +1509,13 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public Builder clearReadOptions() {
-      if (readOptionsBuilder_ == null) {
-        readOptions_ = null;
-        onChanged();
-      } else {
-        readOptions_ = null;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      readOptions_ = null;
+      if (readOptionsBuilder_ != null) {
+        readOptionsBuilder_.dispose();
         readOptionsBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -1517,7 +1528,7 @@ public Builder clearReadOptions() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
-
+      bitField0_ |= 0x00000008;
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
@@ -1767,7 +1778,6 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       }
       queryTypeCase_ = 3;
       onChanged();
-      ;
       return queryBuilder_;
     }
 
@@ -1974,7 +1984,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       }
       queryTypeCase_ = 7;
       onChanged();
-      ;
       return gqlQueryBuilder_;
     }
 
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 40c3e454c333..b24767ce6640 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
@@ -38,7 +38,9 @@ private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder build
     super(builder);
   }
 
-  private RunQueryResponse() {}
+  private RunQueryResponse() {
+    transaction_ = com.google.protobuf.ByteString.EMPTY;
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
@@ -109,7 +111,7 @@ public com.google.datastore.v1.QueryResultBatch getBatch() {
    */
   @java.lang.Override
   public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
-    return getBatch();
+    return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
   }
 
   public static final int QUERY_FIELD_NUMBER = 2;
@@ -155,7 +157,28 @@ public com.google.datastore.v1.Query getQuery() {
    */
   @java.lang.Override
   public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
-    return getQuery();
+    return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
+  }
+
+  public static final int TRANSACTION_FIELD_NUMBER = 5;
+  private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+  /**
+   *
+   *
+   * 
    +   * The identifier of the transaction that was started as part of this
+   * RunQuery request.
+   * Set only when [ReadOptions.begin_transaction][] was set in
+   * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
+   * 
    
+   *
+   * bytes transaction = 5;
+   *
+   * @return The transaction.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getTransaction() {
+    return transaction_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -178,6 +201,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (query_ != null) {
       output.writeMessage(2, getQuery());
     }
+    if (!transaction_.isEmpty()) {
+      output.writeBytes(5, transaction_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -193,6 +219,9 @@ public int getSerializedSize() {
     if (query_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
     }
+    if (!transaction_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -216,6 +245,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasQuery()) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
+    if (!getTransaction().equals(other.getTransaction())) return false;
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -235,6 +265,8 @@ public int hashCode() {
       hash = (37 * hash) + QUERY_FIELD_NUMBER;
       hash = (53 * hash) + getQuery().hashCode();
     }
+    hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
+    hash = (53 * hash) + getTransaction().hashCode();
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -374,18 +406,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (batchBuilder_ == null) {
-        batch_ = null;
-      } else {
-        batch_ = null;
+      bitField0_ = 0;
+      batch_ = null;
+      if (batchBuilder_ != null) {
+        batchBuilder_.dispose();
         batchBuilder_ = null;
       }
-      if (queryBuilder_ == null) {
-        query_ = null;
-      } else {
-        query_ = null;
+      query_ = null;
+      if (queryBuilder_ != null) {
+        queryBuilder_.dispose();
         queryBuilder_ = null;
       }
+      transaction_ = com.google.protobuf.ByteString.EMPTY;
       return this;
     }
 
@@ -413,20 +445,26 @@ public com.google.datastore.v1.RunQueryResponse build() {
     public com.google.datastore.v1.RunQueryResponse buildPartial() {
       com.google.datastore.v1.RunQueryResponse result =
           new com.google.datastore.v1.RunQueryResponse(this);
-      if (batchBuilder_ == null) {
-        result.batch_ = batch_;
-      } else {
-        result.batch_ = batchBuilder_.build();
-      }
-      if (queryBuilder_ == null) {
-        result.query_ = query_;
-      } else {
-        result.query_ = queryBuilder_.build();
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.RunQueryResponse result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.batch_ = batchBuilder_ == null ? batch_ : batchBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.query_ = queryBuilder_ == null ? query_ : queryBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.transaction_ = transaction_;
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -478,6 +516,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) {
       if (other.hasQuery()) {
         mergeQuery(other.getQuery());
       }
+      if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
+        setTransaction(other.getTransaction());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -507,15 +548,21 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getBatchFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry);
-
+                bitField0_ |= 0x00000002;
                 break;
               } // case 18
+            case 42:
+              {
+                transaction_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 42
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -533,6 +580,8 @@ public Builder mergeFrom(
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.datastore.v1.QueryResultBatch batch_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.QueryResultBatch,
@@ -551,7 +600,7 @@ public Builder mergeFrom(
      * @return Whether the batch field is set.
      */
     public boolean hasBatch() {
-      return batchBuilder_ != null || batch_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -588,11 +637,11 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch value) {
           throw new NullPointerException();
         }
         batch_ = value;
-        onChanged();
       } else {
         batchBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -607,11 +656,11 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch value) {
     public Builder setBatch(com.google.datastore.v1.QueryResultBatch.Builder builderForValue) {
       if (batchBuilder_ == null) {
         batch_ = builderForValue.build();
-        onChanged();
       } else {
         batchBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -625,19 +674,18 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch.Builder builder
      */
     public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
       if (batchBuilder_ == null) {
-        if (batch_ != null) {
-          batch_ =
-              com.google.datastore.v1.QueryResultBatch.newBuilder(batch_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (((bitField0_ & 0x00000001) != 0)
+            && batch_ != null
+            && batch_ != com.google.datastore.v1.QueryResultBatch.getDefaultInstance()) {
+          getBatchBuilder().mergeFrom(value);
         } else {
           batch_ = value;
         }
-        onChanged();
       } else {
         batchBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000001;
+      onChanged();
       return this;
     }
     /**
@@ -650,14 +698,13 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
     public Builder clearBatch() {
-      if (batchBuilder_ == null) {
-        batch_ = null;
-        onChanged();
-      } else {
-        batch_ = null;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      batch_ = null;
+      if (batchBuilder_ != null) {
+        batchBuilder_.dispose();
         batchBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -670,7 +717,7 @@ public Builder clearBatch() {
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
     public com.google.datastore.v1.QueryResultBatch.Builder getBatchBuilder() {
-
+      bitField0_ |= 0x00000001;
       onChanged();
       return getBatchFieldBuilder().getBuilder();
     }
@@ -736,7 +783,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
      * @return Whether the query field is set.
      */
     public boolean hasQuery() {
-      return queryBuilder_ != null || query_ != null;
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      *
@@ -771,11 +818,11 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
           throw new NullPointerException();
         }
         query_ = value;
-        onChanged();
       } else {
         queryBuilder_.setMessage(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -790,11 +837,11 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
     public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
       if (queryBuilder_ == null) {
         query_ = builderForValue.build();
-        onChanged();
       } else {
         queryBuilder_.setMessage(builderForValue.build());
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -808,16 +855,18 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
      */
     public Builder mergeQuery(com.google.datastore.v1.Query value) {
       if (queryBuilder_ == null) {
-        if (query_ != null) {
-          query_ = com.google.datastore.v1.Query.newBuilder(query_).mergeFrom(value).buildPartial();
+        if (((bitField0_ & 0x00000002) != 0)
+            && query_ != null
+            && query_ != com.google.datastore.v1.Query.getDefaultInstance()) {
+          getQueryBuilder().mergeFrom(value);
         } else {
           query_ = value;
         }
-        onChanged();
       } else {
         queryBuilder_.mergeFrom(value);
       }
-
+      bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
@@ -830,14 +879,13 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
      * .google.datastore.v1.Query query = 2;
      */
     public Builder clearQuery() {
-      if (queryBuilder_ == null) {
-        query_ = null;
-        onChanged();
-      } else {
-        query_ = null;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      query_ = null;
+      if (queryBuilder_ != null) {
+        queryBuilder_.dispose();
         queryBuilder_ = null;
       }
-
+      onChanged();
       return this;
     }
     /**
@@ -850,7 +898,7 @@ public Builder clearQuery() {
      * .google.datastore.v1.Query query = 2;
      */
     public com.google.datastore.v1.Query.Builder getQueryBuilder() {
-
+      bitField0_ |= 0x00000002;
       onChanged();
       return getQueryFieldBuilder().getBuilder();
     }
@@ -896,6 +944,70 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       return queryBuilder_;
     }
 
+    private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this
+     * RunQuery request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @return The transaction.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getTransaction() {
+      return transaction_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this
+     * RunQuery request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @param value The transaction to set.
+     * @return This builder for chaining.
+     */
+    public Builder setTransaction(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      transaction_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The identifier of the transaction that was started as part of this
+     * RunQuery request.
+     * Set only when [ReadOptions.begin_transaction][] was set in
+     * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
+     * 
    
+     *
+     * bytes transaction = 5;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearTransaction() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      transaction_ = getDefaultInstance().getTransaction();
+      onChanged();
+      return this;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 849dc5c9875f..b1a6793e04f0 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
@@ -92,4 +92,20 @@ public interface RunQueryResponseOrBuilder
    * .google.datastore.v1.Query query = 2;
    */
   com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * The identifier of the transaction that was started as part of this
+   * RunQuery request.
+   * Set only when [ReadOptions.begin_transaction][] was set in
+   * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
+   * 
    
+   *
+   * bytes transaction = 5;
+   *
+   * @return The transaction.
+   */
+  com.google.protobuf.ByteString getTransaction();
 }
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 238514301de0..64f56408d41a 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
@@ -138,7 +138,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int PREVIOUS_TRANSACTION_FIELD_NUMBER = 1;
-    private com.google.protobuf.ByteString previousTransaction_;
+    private com.google.protobuf.ByteString previousTransaction_ =
+        com.google.protobuf.ByteString.EMPTY;
     /**
      *
      *
@@ -355,8 +356,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         previousTransaction_ = com.google.protobuf.ByteString.EMPTY;
-
         return this;
       }
 
@@ -384,11 +385,20 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite build() {
       public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
         com.google.datastore.v1.TransactionOptions.ReadWrite result =
             new com.google.datastore.v1.TransactionOptions.ReadWrite(this);
-        result.previousTransaction_ = previousTransaction_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.datastore.v1.TransactionOptions.ReadWrite result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.previousTransaction_ = previousTransaction_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -469,7 +479,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   previousTransaction_ = input.readBytes();
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -489,6 +499,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.ByteString previousTransaction_ =
           com.google.protobuf.ByteString.EMPTY;
       /**
@@ -522,8 +534,8 @@ public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         previousTransaction_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -539,7 +551,7 @@ public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
        * @return This builder for chaining.
        */
       public Builder clearPreviousTransaction() {
-
+        bitField0_ = (bitField0_ & ~0x00000001);
         previousTransaction_ = getDefaultInstance().getPreviousTransaction();
         onChanged();
         return this;
@@ -745,7 +757,7 @@ public com.google.protobuf.Timestamp getReadTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
-      return getReadTime();
+      return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -953,10 +965,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (readTimeBuilder_ == null) {
-          readTime_ = null;
-        } else {
-          readTime_ = null;
+        bitField0_ = 0;
+        readTime_ = null;
+        if (readTimeBuilder_ != null) {
+          readTimeBuilder_.dispose();
           readTimeBuilder_ = null;
         }
         return this;
@@ -986,15 +998,20 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() {
       public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
         com.google.datastore.v1.TransactionOptions.ReadOnly result =
             new com.google.datastore.v1.TransactionOptions.ReadOnly(this);
-        if (readTimeBuilder_ == null) {
-          result.readTime_ = readTime_;
-        } else {
-          result.readTime_ = readTimeBuilder_.build();
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(com.google.datastore.v1.TransactionOptions.ReadOnly result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1075,7 +1092,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                  bitField0_ |= 0x00000001;
                   break;
                 } // case 10
               default:
@@ -1095,6 +1112,8 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int bitField0_;
+
       private com.google.protobuf.Timestamp readTime_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Timestamp,
@@ -1114,7 +1133,7 @@ public Builder mergeFrom(
        * @return Whether the readTime field is set.
        */
       public boolean hasReadTime() {
-        return readTimeBuilder_ != null || readTime_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1151,11 +1170,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           readTime_ = value;
-          onChanged();
         } else {
           readTimeBuilder_.setMessage(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1171,11 +1190,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
       public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (readTimeBuilder_ == null) {
           readTime_ = builderForValue.build();
-          onChanged();
         } else {
           readTimeBuilder_.setMessage(builderForValue.build());
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1190,17 +1209,18 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
        */
       public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
         if (readTimeBuilder_ == null) {
-          if (readTime_ != null) {
-            readTime_ =
-                com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial();
+          if (((bitField0_ & 0x00000001) != 0)
+              && readTime_ != null
+              && readTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+            getReadTimeBuilder().mergeFrom(value);
           } else {
             readTime_ = value;
           }
-          onChanged();
         } else {
           readTimeBuilder_.mergeFrom(value);
         }
-
+        bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1214,14 +1234,13 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp read_time = 1;
        */
       public Builder clearReadTime() {
-        if (readTimeBuilder_ == null) {
-          readTime_ = null;
-          onChanged();
-        } else {
-          readTime_ = null;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        readTime_ = null;
+        if (readTimeBuilder_ != null) {
+          readTimeBuilder_.dispose();
           readTimeBuilder_ = null;
         }
-
+        onChanged();
         return this;
       }
       /**
@@ -1235,7 +1254,7 @@ public Builder clearReadTime() {
        * .google.protobuf.Timestamp read_time = 1;
        */
       public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
-
+        bitField0_ |= 0x00000001;
         onChanged();
         return getReadTimeFieldBuilder().getBuilder();
       }
@@ -1728,6 +1747,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (readWriteBuilder_ != null) {
         readWriteBuilder_.clear();
       }
@@ -1763,25 +1783,29 @@ public com.google.datastore.v1.TransactionOptions build() {
     public com.google.datastore.v1.TransactionOptions buildPartial() {
       com.google.datastore.v1.TransactionOptions result =
           new com.google.datastore.v1.TransactionOptions(this);
-      if (modeCase_ == 1) {
-        if (readWriteBuilder_ == null) {
-          result.mode_ = mode_;
-        } else {
-          result.mode_ = readWriteBuilder_.build();
-        }
-      }
-      if (modeCase_ == 2) {
-        if (readOnlyBuilder_ == null) {
-          result.mode_ = mode_;
-        } else {
-          result.mode_ = readOnlyBuilder_.build();
-        }
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      result.modeCase_ = modeCase_;
+      buildPartialOneofs(result);
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(com.google.datastore.v1.TransactionOptions result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.TransactionOptions result) {
+      result.modeCase_ = modeCase_;
+      result.mode_ = this.mode_;
+      if (modeCase_ == 1 && readWriteBuilder_ != null) {
+        result.mode_ = readWriteBuilder_.build();
+      }
+      if (modeCase_ == 2 && readOnlyBuilder_ != null) {
+        result.mode_ = readOnlyBuilder_.build();
+      }
+    }
+
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1912,6 +1936,8 @@ public Builder clearMode() {
       return this;
     }
 
+    private int bitField0_;
+
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.TransactionOptions.ReadWrite,
             com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
@@ -2118,7 +2144,6 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
       }
       modeCase_ = 1;
       onChanged();
-      ;
       return readWriteBuilder_;
     }
 
@@ -2328,7 +2353,6 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
       }
       modeCase_ = 2;
       onChanged();
-      ;
       return readOnlyBuilder_;
     }
 
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 e4168166a125..0f9046c72e2a 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
@@ -183,9 +183,8 @@ public int getNullValueValue() {
    */
   public com.google.protobuf.NullValue getNullValue() {
     if (valueTypeCase_ == 11) {
-      @SuppressWarnings("deprecation")
       com.google.protobuf.NullValue result =
-          com.google.protobuf.NullValue.valueOf((java.lang.Integer) valueType_);
+          com.google.protobuf.NullValue.forNumber((java.lang.Integer) valueType_);
       return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
     }
     return com.google.protobuf.NullValue.NULL_VALUE;
@@ -693,7 +692,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
   }
 
   public static final int MEANING_FIELD_NUMBER = 14;
-  private int meaning_;
+  private int meaning_ = 0;
   /**
    *
    *
@@ -711,7 +710,7 @@ public int getMeaning() {
   }
 
   public static final int EXCLUDE_FROM_INDEXES_FIELD_NUMBER = 19;
-  private boolean excludeFromIndexes_;
+  private boolean excludeFromIndexes_ = false;
   /**
    *
    *
@@ -1109,6 +1108,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       if (timestampValueBuilder_ != null) {
         timestampValueBuilder_.clear();
       }
@@ -1125,9 +1125,7 @@ public Builder clear() {
         arrayValueBuilder_.clear();
       }
       meaning_ = 0;
-
       excludeFromIndexes_ = false;
-
       valueTypeCase_ = 0;
       valueType_ = null;
       return this;
@@ -1156,64 +1154,42 @@ public com.google.datastore.v1.Value build() {
     @java.lang.Override
     public com.google.datastore.v1.Value buildPartial() {
       com.google.datastore.v1.Value result = new com.google.datastore.v1.Value(this);
-      if (valueTypeCase_ == 11) {
-        result.valueType_ = valueType_;
-      }
-      if (valueTypeCase_ == 1) {
-        result.valueType_ = valueType_;
+      if (bitField0_ != 0) {
+        buildPartial0(result);
       }
-      if (valueTypeCase_ == 2) {
-        result.valueType_ = valueType_;
-      }
-      if (valueTypeCase_ == 3) {
-        result.valueType_ = valueType_;
-      }
-      if (valueTypeCase_ == 10) {
-        if (timestampValueBuilder_ == null) {
-          result.valueType_ = valueType_;
-        } else {
-          result.valueType_ = timestampValueBuilder_.build();
-        }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.Value result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        result.meaning_ = meaning_;
       }
-      if (valueTypeCase_ == 5) {
-        if (keyValueBuilder_ == null) {
-          result.valueType_ = valueType_;
-        } else {
-          result.valueType_ = keyValueBuilder_.build();
-        }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        result.excludeFromIndexes_ = excludeFromIndexes_;
       }
-      if (valueTypeCase_ == 17) {
-        result.valueType_ = valueType_;
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.Value result) {
+      result.valueTypeCase_ = valueTypeCase_;
+      result.valueType_ = this.valueType_;
+      if (valueTypeCase_ == 10 && timestampValueBuilder_ != null) {
+        result.valueType_ = timestampValueBuilder_.build();
       }
-      if (valueTypeCase_ == 18) {
-        result.valueType_ = valueType_;
+      if (valueTypeCase_ == 5 && keyValueBuilder_ != null) {
+        result.valueType_ = keyValueBuilder_.build();
       }
-      if (valueTypeCase_ == 8) {
-        if (geoPointValueBuilder_ == null) {
-          result.valueType_ = valueType_;
-        } else {
-          result.valueType_ = geoPointValueBuilder_.build();
-        }
+      if (valueTypeCase_ == 8 && geoPointValueBuilder_ != null) {
+        result.valueType_ = geoPointValueBuilder_.build();
       }
-      if (valueTypeCase_ == 6) {
-        if (entityValueBuilder_ == null) {
-          result.valueType_ = valueType_;
-        } else {
-          result.valueType_ = entityValueBuilder_.build();
-        }
+      if (valueTypeCase_ == 6 && entityValueBuilder_ != null) {
+        result.valueType_ = entityValueBuilder_.build();
       }
-      if (valueTypeCase_ == 9) {
-        if (arrayValueBuilder_ == null) {
-          result.valueType_ = valueType_;
-        } else {
-          result.valueType_ = arrayValueBuilder_.build();
-        }
+      if (valueTypeCase_ == 9 && arrayValueBuilder_ != null) {
+        result.valueType_ = arrayValueBuilder_.build();
       }
-      result.meaning_ = meaning_;
-      result.excludeFromIndexes_ = excludeFromIndexes_;
-      result.valueTypeCase_ = valueTypeCase_;
-      onBuilt();
-      return result;
     }
 
     @java.lang.Override
@@ -1414,7 +1390,7 @@ public Builder mergeFrom(
             case 112:
               {
                 meaning_ = input.readInt32();
-
+                bitField0_ |= 0x00000800;
                 break;
               } // case 112
             case 138:
@@ -1433,7 +1409,7 @@ public Builder mergeFrom(
             case 152:
               {
                 excludeFromIndexes_ = input.readBool();
-
+                bitField0_ |= 0x00001000;
                 break;
               } // case 152
             default:
@@ -1467,6 +1443,8 @@ public Builder clearValueType() {
       return this;
     }
 
+    private int bitField0_;
+
     /**
      *
      *
@@ -1532,9 +1510,8 @@ public Builder setNullValueValue(int value) {
     @java.lang.Override
     public com.google.protobuf.NullValue getNullValue() {
       if (valueTypeCase_ == 11) {
-        @SuppressWarnings("deprecation")
         com.google.protobuf.NullValue result =
-            com.google.protobuf.NullValue.valueOf((java.lang.Integer) valueType_);
+            com.google.protobuf.NullValue.forNumber((java.lang.Integer) valueType_);
         return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
       }
       return com.google.protobuf.NullValue.NULL_VALUE;
@@ -1624,6 +1601,7 @@ public boolean getBooleanValue() {
      * @return This builder for chaining.
      */
     public Builder setBooleanValue(boolean value) {
+
       valueTypeCase_ = 1;
       valueType_ = value;
       onChanged();
@@ -1693,6 +1671,7 @@ public long getIntegerValue() {
      * @return This builder for chaining.
      */
     public Builder setIntegerValue(long value) {
+
       valueTypeCase_ = 2;
       valueType_ = value;
       onChanged();
@@ -1762,6 +1741,7 @@ public double getDoubleValue() {
      * @return This builder for chaining.
      */
     public Builder setDoubleValue(double value) {
+
       valueTypeCase_ = 3;
       valueType_ = value;
       onChanged();
@@ -2007,7 +1987,6 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
       }
       valueTypeCase_ = 10;
       onChanged();
-      ;
       return timestampValueBuilder_;
     }
 
@@ -2212,7 +2191,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
       }
       valueTypeCase_ = 5;
       onChanged();
-      ;
       return keyValueBuilder_;
     }
 
@@ -2643,7 +2621,6 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
       }
       valueTypeCase_ = 8;
       onChanged();
-      ;
       return geoPointValueBuilder_;
     }
 
@@ -2876,7 +2853,6 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
       }
       valueTypeCase_ = 6;
       onChanged();
-      ;
       return entityValueBuilder_;
     }
 
@@ -3110,7 +3086,6 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
       }
       valueTypeCase_ = 9;
       onChanged();
-      ;
       return arrayValueBuilder_;
     }
 
@@ -3145,6 +3120,7 @@ public int getMeaning() {
     public Builder setMeaning(int value) {
 
       meaning_ = value;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -3160,7 +3136,7 @@ public Builder setMeaning(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMeaning() {
-
+      bitField0_ = (bitField0_ & ~0x00000800);
       meaning_ = 0;
       onChanged();
       return this;
@@ -3199,6 +3175,7 @@ public boolean getExcludeFromIndexes() {
     public Builder setExcludeFromIndexes(boolean value) {
 
       excludeFromIndexes_ = value;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -3215,7 +3192,7 @@ public Builder setExcludeFromIndexes(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearExcludeFromIndexes() {
-
+      bitField0_ = (bitField0_ & ~0x00001000);
       excludeFromIndexes_ = false;
       onChanged();
       return this;
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 f064a642730e..23a740ae4f25 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
@@ -191,6 +191,13 @@ message LookupResponse {
   // order of the keys in the input.
   repeated Key deferred = 3;
 
+  // The identifier of the transaction that was started as part of this Lookup
+  // request.
+  //
+  // Set only when [ReadOptions.begin_transaction][] was set in
+  // [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
+  bytes transaction = 5;
+
   // The time at which these entities were read or found missing.
   google.protobuf.Timestamp read_time = 7;
 }
@@ -233,6 +240,13 @@ message RunQueryResponse {
 
   // The parsed form of the `GqlQuery` from the request, if it was set.
   Query query = 2;
+
+  // The identifier of the transaction that was started as part of this
+  // RunQuery request.
+  //
+  // Set only when [ReadOptions.begin_transaction][] was set in
+  // [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
+  bytes transaction = 5;
 }
 
 // The request for
@@ -274,6 +288,13 @@ message RunAggregationQueryResponse {
 
   // The parsed form of the `GqlQuery` from the request, if it was set.
   AggregationQuery query = 2;
+
+  // The identifier of the transaction that was started as part of this
+  // RunAggregationQuery request.
+  //
+  // Set only when [ReadOptions.begin_transaction][] was set in
+  // [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
+  bytes transaction = 5;
 }
 
 // The request for
@@ -354,6 +375,13 @@ message CommitRequest {
     // transaction identifier is returned by a call to
     // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
     bytes transaction = 1;
+
+    // Options for beginning a new transaction for this request.
+    // The transaction is committed when the request completes. If specified,
+    // [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
+    // must be
+    // [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
+    TransactionOptions single_use_transaction = 10;
   }
 
   // The mutations to perform.
@@ -533,6 +561,15 @@ message ReadOptions {
     // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
     bytes transaction = 2;
 
+    // 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]
+    // or
+    // [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
+    TransactionOptions new_transaction = 3;
+
     // Reads entities as they were at the given time. This may not be older
     // than 270 seconds.  This value is only supported for Cloud Firestore in
     // Datastore mode.

From 2d1b51b9d39884d1c5b604077fd5f72280d5db61 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 20 Jan 2023 16:22:11 +0000
Subject: [PATCH 1047/1784] chore: Upgrade to later version of gcp-uploader and
 protobuf (#1741) (#962)

* chore: Upgrade to later version of gcp-uploader and protobuf

* chore: Add secretstorage version

* chore: Use python 3.9.13

* chore: Unpin all python versions

* chore: Rerun pipcompile tool

* chore: Rerun pipcompile tool with --allow-unsafe

* chore: Add --require-hashes

* chore: Update requirements file

* chore: Remove --require-hashes

* chore: Print python version

* chore: Add new generated hashes for requirements.txt

* chore: Remove python version check in cloud build

* chore: Allow synthtool to update python dependencies

* chore: Add typing-extensions into requirements

* chore: Unpin docker requirements.in file

* chore: Add java synthtool validation

* chore: Add check to import java synthtool python package
Source-Link: https://togithub.com/googleapis/synthtool/commit/91904bfb986c51516389fb591c67053cdf4de104
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:4566cf7fcd0eece77705330267b2b61a70165711c7829d049b60bc2f1bbcd74e
---
 .github/.OwlBot.lock.yaml |   4 +-
 .kokoro/requirements.in   |  40 ++------
 .kokoro/requirements.txt  | 186 ++++++++++++++------------------------
 3 files changed, 78 insertions(+), 152 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 288e394897e6..2b48c81e3722 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c
+  digest: sha256:4566cf7fcd0eece77705330267b2b61a70165711c7829d049b60bc2f1bbcd74e
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index a5010f77d413..b19a8dbfdd5e 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -1,34 +1,6 @@
-gcp-docuploader==0.6.3
-google-crc32c==1.3.0
-googleapis-common-protos==1.56.3
-gcp-releasetool==1.9.1
-cryptography==38.0.3
-cachetools==4.2.4
-cffi==1.15.1
-jeepney==0.7.1
-jinja2==3.0.3
-markupsafe==2.0.1
-keyring==23.4.1
-packaging==21.3
-protobuf==3.19.5
-pyjwt==2.4.0
-pyparsing==3.0.9
-pycparser==2.21
-pyperclip==1.8.2
-python-dateutil==2.8.2
-requests==2.27.1
-certifi==2022.12.7
-importlib-metadata==4.8.3
-zipp==3.6.0
-google_api_core==2.8.2
-google-cloud-storage==2.0.0
-google-resumable-media==2.3.3
-google-cloud-core==2.3.1
-typing-extensions==4.1.1
-urllib3==1.26.12
-zipp==3.6.0
-rsa==4.9
-six==1.16.0
-attrs==22.1.0
-google-auth==2.14.1
-idna==3.4
\ No newline at end of file
+gcp-docuploader
+gcp-releasetool
+wheel
+setuptools
+typing-extensions
+click<8.1.0
\ No newline at end of file
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 15c404aa5a8c..1dfe630412d9 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -1,27 +1,21 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
-#    pip-compile --generate-hashes requirements.in
+#    pip-compile --allow-unsafe --generate-hashes requirements.in
 #
 attrs==22.1.0 \
     --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
     --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c
-    # via
-    #   -r requirements.in
-    #   gcp-releasetool
+    # via gcp-releasetool
 cachetools==4.2.4 \
     --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \
     --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1
-    # via
-    #   -r requirements.in
-    #   google-auth
+    # via google-auth
 certifi==2022.12.7 \
     --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
     --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
-    # via
-    #   -r requirements.in
-    #   requests
+    # via requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
     --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \
@@ -87,9 +81,7 @@ cffi==1.15.1 \
     --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \
     --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \
     --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0
-    # via
-    #   -r requirements.in
-    #   cryptography
+    # via cryptography
 charset-normalizer==2.0.12 \
     --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \
     --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df
@@ -98,6 +90,7 @@ click==8.0.4 \
     --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \
     --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb
     # via
+    #   -r requirements.in
     #   gcp-docuploader
     #   gcp-releasetool
 colorlog==6.7.0 \
@@ -132,12 +125,11 @@ cryptography==38.0.3 \
     --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \
     --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722
     # via
-    #   -r requirements.in
     #   gcp-releasetool
     #   secretstorage
-gcp-docuploader==0.6.3 \
-    --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \
-    --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b
+gcp-docuploader==0.6.4 \
+    --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \
+    --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf
     # via -r requirements.in
 gcp-releasetool==1.9.1 \
     --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \
@@ -147,13 +139,12 @@ google-api-core==2.8.2 \
     --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
     --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50
     # via
-    #   -r requirements.in
     #   google-cloud-core
     #   google-cloud-storage
 google-auth==2.14.1 \
+    --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \
     --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016
     # via
-    #   -r requirements.in
     #   gcp-releasetool
     #   google-api-core
     #   google-cloud-core
@@ -161,15 +152,11 @@ google-auth==2.14.1 \
 google-cloud-core==2.3.1 \
     --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \
     --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53
-    # via
-    #   -r requirements.in
-    #   google-cloud-storage
+    # via google-cloud-storage
 google-cloud-storage==2.0.0 \
     --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \
     --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7
-    # via
-    #   -r requirements.in
-    #   gcp-docuploader
+    # via gcp-docuploader
 google-crc32c==1.3.0 \
     --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \
     --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \
@@ -214,52 +201,37 @@ google-crc32c==1.3.0 \
     --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \
     --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \
     --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3
-    # via
-    #   -r requirements.in
-    #   google-resumable-media
+    # via google-resumable-media
 google-resumable-media==2.3.3 \
     --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \
     --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5
-    # via
-    #   -r requirements.in
-    #   google-cloud-storage
+    # via google-cloud-storage
 googleapis-common-protos==1.56.3 \
     --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \
     --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461
-    # via
-    #   -r requirements.in
-    #   google-api-core
+    # via google-api-core
 idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
     --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
-    # via
-    #   -r requirements.in
-    #   requests
+    # via requests
 importlib-metadata==4.8.3 \
     --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \
     --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668
+    # via keyring
+jeepney==0.8.0 \
+    --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \
+    --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755
     # via
-    #   -r requirements.in
-    #   keyring
-jeepney==0.7.1 \
-    --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \
-    --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f
-    # via
-    #   -r requirements.in
     #   keyring
     #   secretstorage
 jinja2==3.0.3 \
     --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \
     --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
-    # via
-    #   -r requirements.in
-    #   gcp-releasetool
+    # via gcp-releasetool
 keyring==23.4.1 \
     --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \
     --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55
-    # via
-    #   -r requirements.in
-    #   gcp-releasetool
+    # via gcp-releasetool
 markupsafe==2.0.1 \
     --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \
     --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \
@@ -330,49 +302,41 @@ markupsafe==2.0.1 \
     --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \
     --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \
     --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872
-    # via
-    #   -r requirements.in
-    #   jinja2
+    # via jinja2
 packaging==21.3 \
     --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
     --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
+    # via gcp-releasetool
+protobuf==3.20.1 \
+    --hash=sha256:06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf \
+    --hash=sha256:097c5d8a9808302fb0da7e20edf0b8d4703274d140fd25c5edabddcde43e081f \
+    --hash=sha256:284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f \
+    --hash=sha256:32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7 \
+    --hash=sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996 \
+    --hash=sha256:62f1b5c4cd6c5402b4e2d63804ba49a327e0c386c99b1675c8a0fefda23b2067 \
+    --hash=sha256:69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c \
+    --hash=sha256:6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7 \
+    --hash=sha256:7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9 \
+    --hash=sha256:755f3aee41354ae395e104d62119cb223339a8f3276a0cd009ffabfcdd46bb0c \
+    --hash=sha256:77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739 \
+    --hash=sha256:7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91 \
+    --hash=sha256:9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c \
+    --hash=sha256:9be73ad47579abc26c12024239d3540e6b765182a91dbc88e23658ab71767153 \
+    --hash=sha256:adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9 \
+    --hash=sha256:adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388 \
+    --hash=sha256:af0ebadc74e281a517141daad9d0f2c5d93ab78e9d455113719a45a49da9db4e \
+    --hash=sha256:cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab \
+    --hash=sha256:cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde \
+    --hash=sha256:cdee09140e1cd184ba9324ec1df410e7147242b94b5f8b0c64fc89e38a8ba531 \
+    --hash=sha256:db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8 \
+    --hash=sha256:dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7 \
+    --hash=sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20 \
+    --hash=sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3
     # via
-    #   -r requirements.in
-    #   gcp-releasetool
-protobuf==3.19.5 \
-    --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \
-    --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \
-    --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \
-    --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \
-    --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \
-    --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \
-    --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \
-    --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \
-    --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \
-    --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \
-    --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \
-    --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \
-    --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \
-    --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \
-    --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \
-    --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \
-    --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \
-    --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \
-    --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \
-    --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \
-    --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \
-    --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \
-    --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \
-    --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \
-    --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \
-    --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de
-    # via
-    #   -r requirements.in
     #   gcp-docuploader
     #   gcp-releasetool
     #   google-api-core
     #   google-cloud-storage
-    #   googleapis-common-protos
 pyasn1==0.4.8 \
     --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \
     --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
@@ -386,71 +350,61 @@ pyasn1-modules==0.2.8 \
 pycparser==2.21 \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
     --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-    # via
-    #   -r requirements.in
-    #   cffi
+    # via cffi
 pyjwt==2.4.0 \
     --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \
     --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba
-    # via
-    #   -r requirements.in
-    #   gcp-releasetool
+    # via gcp-releasetool
 pyparsing==3.0.9 \
     --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \
     --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc
-    # via
-    #   -r requirements.in
-    #   packaging
+    # via packaging
 pyperclip==1.8.2 \
     --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57
-    # via
-    #   -r requirements.in
-    #   gcp-releasetool
+    # via gcp-releasetool
 python-dateutil==2.8.2 \
     --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
     --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
-    # via
-    #   -r requirements.in
-    #   gcp-releasetool
+    # via gcp-releasetool
 requests==2.27.1 \
     --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
     --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
     # via
-    #   -r requirements.in
     #   gcp-releasetool
     #   google-api-core
     #   google-cloud-storage
 rsa==4.9 \
     --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \
     --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21
-    # via
-    #   -r requirements.in
-    #   google-auth
+    # via google-auth
 secretstorage==3.3.3 \
     --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \
     --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99
     # via keyring
+setuptools==65.6.3 \
+    --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \
+    --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75
+    # via -r requirements.in
 six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via
-    #   -r requirements.in
     #   gcp-docuploader
     #   google-auth
     #   python-dateutil
-typing-extensions==4.1.1 \
-    --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \
-    --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2
+typing-extensions==4.4.0 \
+    --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \
+    --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e
     # via -r requirements.in
 urllib3==1.26.12 \
     --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \
     --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997
-    # via
-    #   -r requirements.in
-    #   requests
+    # via requests
+wheel==0.38.4 \
+    --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \
+    --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8
+    # via -r requirements.in
 zipp==3.6.0 \
     --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \
     --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc
-    # via
-    #   -r requirements.in
-    #   importlib-metadata
+    # via importlib-metadata

From 78e9e8e74163f4c8bd7e1d42540e609a86a99769 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 20 Jan 2023 17:16:23 +0000
Subject: [PATCH 1048/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.1.2 (#966)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 65e9a460e8d9..e7426aaec6c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.1.1
+        3.1.2
         pom
         import
       

From 6ccd657cebda0a4f185909e88c5a2757241481e1 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 20 Jan 2023 17:16:43 +0000
Subject: [PATCH 1049/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.4.0 (#965)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.4.0

* 🦉 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/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 575a44c4961b..8b7cfe011a09 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.3.0
+      26.4.0
       pom
       import
     
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 3a639d45983e..ffc0f274bb0d 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.3.0
+        26.4.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 80143626871f..46e7b468a7a2 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.3.0
+        26.4.0
         pom
         import
       

From c89b27ac6a7791312f61558515d89baffde40bdf Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 13:44:13 -0500
Subject: [PATCH 1050/1784] fix(java): skip fixing poms for special modules
 (#1744) (#964)

fix(java): handle empty modules

Fixes https://github.com/googleapis/synthtool/issues/1743
Source-Link: https://github.com/googleapis/synthtool/commit/482d649d5d705c18028076985f64b214f6b6c14e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1

Co-authored-by: Owl Bot 
Co-authored-by: kolea2 <45548808+kolea2@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml |  2 +-
 .kokoro/requirements.txt  | 48 +++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 2b48c81e3722..f8a8575314cc 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:4566cf7fcd0eece77705330267b2b61a70165711c7829d049b60bc2f1bbcd74e
+  digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 1dfe630412d9..4895c9631fd8 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -307,31 +307,29 @@ packaging==21.3 \
     --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
     --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
     # via gcp-releasetool
-protobuf==3.20.1 \
-    --hash=sha256:06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf \
-    --hash=sha256:097c5d8a9808302fb0da7e20edf0b8d4703274d140fd25c5edabddcde43e081f \
-    --hash=sha256:284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f \
-    --hash=sha256:32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7 \
-    --hash=sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996 \
-    --hash=sha256:62f1b5c4cd6c5402b4e2d63804ba49a327e0c386c99b1675c8a0fefda23b2067 \
-    --hash=sha256:69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c \
-    --hash=sha256:6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7 \
-    --hash=sha256:7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9 \
-    --hash=sha256:755f3aee41354ae395e104d62119cb223339a8f3276a0cd009ffabfcdd46bb0c \
-    --hash=sha256:77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739 \
-    --hash=sha256:7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91 \
-    --hash=sha256:9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c \
-    --hash=sha256:9be73ad47579abc26c12024239d3540e6b765182a91dbc88e23658ab71767153 \
-    --hash=sha256:adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9 \
-    --hash=sha256:adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388 \
-    --hash=sha256:af0ebadc74e281a517141daad9d0f2c5d93ab78e9d455113719a45a49da9db4e \
-    --hash=sha256:cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab \
-    --hash=sha256:cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde \
-    --hash=sha256:cdee09140e1cd184ba9324ec1df410e7147242b94b5f8b0c64fc89e38a8ba531 \
-    --hash=sha256:db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8 \
-    --hash=sha256:dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7 \
-    --hash=sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20 \
-    --hash=sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3
+protobuf==3.20.2 \
+    --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \
+    --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \
+    --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \
+    --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \
+    --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \
+    --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \
+    --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \
+    --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \
+    --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \
+    --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \
+    --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \
+    --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \
+    --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \
+    --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \
+    --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \
+    --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \
+    --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \
+    --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \
+    --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \
+    --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \
+    --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \
+    --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0
     # via
     #   gcp-docuploader
     #   gcp-releasetool

From 1bdcffa0607e4ba1e81cfb8d2af9e469c1836590 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 19:50:13 +0000
Subject: [PATCH 1051/1784] chore(main): release 2.13.3 (#968)

:robot: I have created a release *beep* *boop*
---


## [2.13.3](https://togithub.com/googleapis/java-datastore/compare/v2.13.2...v2.13.3) (2023-01-23)


### Bug Fixes

* **java:** Skip fixing poms for special modules ([#1744](https://togithub.com/googleapis/java-datastore/issues/1744)) ([#964](https://togithub.com/googleapis/java-datastore/issues/964)) ([c89b27a](https://togithub.com/googleapis/java-datastore/commit/c89b27ac6a7791312f61558515d89baffde40bdf))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.2 ([#966](https://togithub.com/googleapis/java-datastore/issues/966)) ([78e9e8e](https://togithub.com/googleapis/java-datastore/commit/78e9e8e74163f4c8bd7e1d42540e609a86a99769))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 12 ++++++++++++
 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, 39 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89ac01b0fa4d..9fa23530b4eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.13.3](https://github.com/googleapis/java-datastore/compare/v2.13.2...v2.13.3) (2023-01-23)
+
+
+### Bug Fixes
+
+* **java:** Skip fixing poms for special modules ([#1744](https://github.com/googleapis/java-datastore/issues/1744)) ([#964](https://github.com/googleapis/java-datastore/issues/964)) ([c89b27a](https://github.com/googleapis/java-datastore/commit/c89b27ac6a7791312f61558515d89baffde40bdf))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.2 ([#966](https://github.com/googleapis/java-datastore/issues/966)) ([78e9e8e](https://github.com/googleapis/java-datastore/commit/78e9e8e74163f4c8bd7e1d42540e609a86a99769))
+
 ## [2.13.2](https://github.com/googleapis/java-datastore/compare/v2.13.1...v2.13.2) (2023-01-10)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 14d903696af6..2acbf467fda6 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.13.3-SNAPSHOT
+  2.13.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3-SNAPSHOT
+    2.13.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index beff60e2e2df..9422f12e0037 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.13.3-SNAPSHOT
+  2.13.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.3-SNAPSHOT
+        2.13.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.3-SNAPSHOT
+        2.13.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.3-SNAPSHOT
+        0.104.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.3-SNAPSHOT
+        2.13.3
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c97352af8a28..49a0194073cf 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.3-SNAPSHOT
+  2.13.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3-SNAPSHOT
+    2.13.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0c7a119a1ad5..2c7d16b18a6d 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.13.3-SNAPSHOT
+  2.13.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3-SNAPSHOT
+    2.13.3
   
   
     
diff --git a/pom.xml b/pom.xml
index e7426aaec6c8..eabcf9233d1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.3-SNAPSHOT
+  2.13.3
   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.13.3-SNAPSHOT
+        2.13.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.3-SNAPSHOT
+        2.13.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.3-SNAPSHOT
+        2.13.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.3-SNAPSHOT
+        0.104.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.3-SNAPSHOT
+        2.13.3
         
           
             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 61aa5f135a5e..838a858dcf79 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.13.3-SNAPSHOT
+  2.13.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3-SNAPSHOT
+    2.13.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 801340479624..270a25498141 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.104.3-SNAPSHOT
+  0.104.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3-SNAPSHOT
+    2.13.3
   
   
     
diff --git a/versions.txt b/versions.txt
index 7a33be977561..f026b1ebc6a4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.2:2.13.3-SNAPSHOT
-google-cloud-datastore-bom:2.13.2:2.13.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.104.2:0.104.3-SNAPSHOT
-datastore-v1-proto-client:2.13.2:2.13.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.13.2:2.13.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.13.2:2.13.3-SNAPSHOT
+google-cloud-datastore:2.13.3:2.13.3
+google-cloud-datastore-bom:2.13.3:2.13.3
+proto-google-cloud-datastore-v1:0.104.3:0.104.3
+datastore-v1-proto-client:2.13.3:2.13.3
+proto-google-cloud-datastore-admin-v1:2.13.3:2.13.3
+grpc-google-cloud-datastore-admin-v1:2.13.3:2.13.3

From 8bd2af75186e0b55b65ab91c9a6bceafa743fdea Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 15:19:53 -0500
Subject: [PATCH 1052/1784] chore(main): release 2.13.4-SNAPSHOT (#969)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2acbf467fda6..8efa5cb31259 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.13.3
+  2.13.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3
+    2.13.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 9422f12e0037..51ddc64637fb 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.13.3
+  2.13.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.3
+        2.13.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.3
+        2.13.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.3
+        0.104.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.3
+        2.13.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 49a0194073cf..60295e734e35 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.3
+  2.13.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3
+    2.13.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 2c7d16b18a6d..ed1e651db198 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.13.3
+  2.13.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3
+    2.13.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index eabcf9233d1e..9a9e15d9d006 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.3
+  2.13.4-SNAPSHOT
   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.13.3
+        2.13.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.3
+        2.13.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.3
+        2.13.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.3
+        0.104.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.3
+        2.13.4-SNAPSHOT
         
           
             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 838a858dcf79..371574f8756f 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.13.3
+  2.13.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3
+    2.13.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 270a25498141..4b300ab29522 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.104.3
+  0.104.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.3
+    2.13.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index f026b1ebc6a4..974e16a49332 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.3:2.13.3
-google-cloud-datastore-bom:2.13.3:2.13.3
-proto-google-cloud-datastore-v1:0.104.3:0.104.3
-datastore-v1-proto-client:2.13.3:2.13.3
-proto-google-cloud-datastore-admin-v1:2.13.3:2.13.3
-grpc-google-cloud-datastore-admin-v1:2.13.3:2.13.3
+google-cloud-datastore:2.13.3:2.13.4-SNAPSHOT
+google-cloud-datastore-bom:2.13.3:2.13.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.104.3:0.104.4-SNAPSHOT
+datastore-v1-proto-client:2.13.3:2.13.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.13.3:2.13.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.13.3:2.13.4-SNAPSHOT

From 54b43bede68f58b4f7735dc1d1bfc1cac0821f27 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 24 Jan 2023 18:53:55 +0000
Subject: [PATCH 1053/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.13.3 (#970)
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.13.3

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8b7cfe011a09..7ec8a2f881d1 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.13.2
+  2.13.3
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.13.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.13.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.3"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index af7a4f8269a0..4d3377ecbd51 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.13.2
+      2.13.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index a622d9b82417..2bed78c7c084 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.13.2
+      2.13.3
     
 
     

From 4ffe0cd5dd37e9f4026c7edf585b35d143c60468 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 1 Feb 2023 20:49:28 +0000
Subject: [PATCH 1054/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.5.0 (#971)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.5.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7ec8a2f881d1..9c0743d7563c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.4.0
+      26.5.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.4.0')
+implementation platform('com.google.cloud:libraries-bom:26.5.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index ffc0f274bb0d..33ddca65fda8 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.4.0
+        26.5.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 46e7b468a7a2..ecde033699ce 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.4.0
+        26.5.0
         pom
         import
       

From f94bd3784686fc98fe90af4e74ea0afd040c7db4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 6 Feb 2023 15:21:25 +0000
Subject: [PATCH 1055/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.2.0 (#975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.2.0

* 🦉 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 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9c0743d7563c..7e3a27384646 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.5.0')
+implementation platform('com.google.cloud:libraries-bom:26.6.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/pom.xml b/pom.xml
index 9a9e15d9d006..75953566e999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.1.2
+        3.2.0
         pom
         import
       

From 6a908f966ede636729d651aeacc16aa02406bbf5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 6 Feb 2023 15:21:44 +0000
Subject: [PATCH 1056/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.6.0 (#974)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.6.0

* 🦉 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/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7e3a27384646..72fe221bca7d 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.5.0
+      26.6.0
       pom
       import
     
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 33ddca65fda8..470441418259 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.5.0
+        26.6.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index ecde033699ce..e93da5c4c126 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.5.0
+        26.6.0
         pom
         import
       

From 05b0ed03c94ee822e43fc51ea4ff9fd21eec72d0 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 10:22:02 -0500
Subject: [PATCH 1057/1784] chore(java): omit `-Penable-integration-tests`
 parameter from native image test run command (#1757) (#972)

Source-Link: https://github.com/googleapis/synthtool/commit/df311d1a70b53e86cfeaf0fccf4ded8202deaa6d
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ff1a5832623e1b694203b89253dbfe4c2d4a33aae1baf60d323b1245672331eb

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 2 +-
 .kokoro/build.sh          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index f8a8575314cc..31923bd133a8 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1
+  digest: sha256:ff1a5832623e1b694203b89253dbfe4c2d4a33aae1baf60d323b1245672331eb
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 048db943b50b..902e9dac7841 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -71,12 +71,12 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
 graalvm17)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
 samples)

From 1c7bda33e4d0b3a23c1ae66eb05b8d4ab7b694a0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 15:40:44 +0000
Subject: [PATCH 1058/1784] chore(main): release 2.13.4 (#976)

:robot: I have created a release *beep* *boop*
---


## [2.13.4](https://togithub.com/googleapis/java-datastore/compare/v2.13.3...v2.13.4) (2023-02-06)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.2.0 ([#975](https://togithub.com/googleapis/java-datastore/issues/975)) ([f94bd37](https://togithub.com/googleapis/java-datastore/commit/f94bd3784686fc98fe90af4e74ea0afd040c7db4))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fa23530b4eb..cf95ecc528ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.13.4](https://github.com/googleapis/java-datastore/compare/v2.13.3...v2.13.4) (2023-02-06)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.2.0 ([#975](https://github.com/googleapis/java-datastore/issues/975)) ([f94bd37](https://github.com/googleapis/java-datastore/commit/f94bd3784686fc98fe90af4e74ea0afd040c7db4))
+
 ## [2.13.3](https://github.com/googleapis/java-datastore/compare/v2.13.2...v2.13.3) (2023-01-23)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8efa5cb31259..578d76890e9f 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.13.4-SNAPSHOT
+  2.13.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4-SNAPSHOT
+    2.13.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 51ddc64637fb..3df607a0f0f9 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.13.4-SNAPSHOT
+  2.13.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.4-SNAPSHOT
+        2.13.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.4-SNAPSHOT
+        2.13.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.4-SNAPSHOT
+        0.104.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.4-SNAPSHOT
+        2.13.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 60295e734e35..227464fe4589 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.4-SNAPSHOT
+  2.13.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4-SNAPSHOT
+    2.13.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index ed1e651db198..681769b61d09 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.13.4-SNAPSHOT
+  2.13.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4-SNAPSHOT
+    2.13.4
   
   
     
diff --git a/pom.xml b/pom.xml
index 75953566e999..a3fe4ac9e8fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.4-SNAPSHOT
+  2.13.4
   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.13.4-SNAPSHOT
+        2.13.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.4-SNAPSHOT
+        2.13.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.4-SNAPSHOT
+        2.13.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.4-SNAPSHOT
+        0.104.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.4-SNAPSHOT
+        2.13.4
         
           
             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 371574f8756f..8e7231c48c0c 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.13.4-SNAPSHOT
+  2.13.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4-SNAPSHOT
+    2.13.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4b300ab29522..6fd22d52486a 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.104.4-SNAPSHOT
+  0.104.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4-SNAPSHOT
+    2.13.4
   
   
     
diff --git a/versions.txt b/versions.txt
index 974e16a49332..6fddf1b26040 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.3:2.13.4-SNAPSHOT
-google-cloud-datastore-bom:2.13.3:2.13.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.104.3:0.104.4-SNAPSHOT
-datastore-v1-proto-client:2.13.3:2.13.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.13.3:2.13.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.13.3:2.13.4-SNAPSHOT
+google-cloud-datastore:2.13.4:2.13.4
+google-cloud-datastore-bom:2.13.4:2.13.4
+proto-google-cloud-datastore-v1:0.104.4:0.104.4
+datastore-v1-proto-client:2.13.4:2.13.4
+proto-google-cloud-datastore-admin-v1:2.13.4:2.13.4
+grpc-google-cloud-datastore-admin-v1:2.13.4:2.13.4

From 32f6a6b3df04c9aa96ff99d1b0040eccaa1ce5ae Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 16:00:19 +0000
Subject: [PATCH 1059/1784] chore(main): release 2.13.5-SNAPSHOT (#977)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 578d76890e9f..83e64d8b691d 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.13.4
+  2.13.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4
+    2.13.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3df607a0f0f9..3a3a13196d23 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.13.4
+  2.13.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.4
+        2.13.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.4
+        2.13.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.4
+        0.104.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.4
+        2.13.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 227464fe4589..5a8bd005735d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.4
+  2.13.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4
+    2.13.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 681769b61d09..b6e6dd511099 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.13.4
+  2.13.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4
+    2.13.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index a3fe4ac9e8fc..efe99f308c93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.4
+  2.13.5-SNAPSHOT
   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.13.4
+        2.13.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.4
+        2.13.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.4
+        2.13.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.4
+        0.104.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.4
+        2.13.5-SNAPSHOT
         
           
             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 8e7231c48c0c..e5c7a2b8c79a 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.13.4
+  2.13.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4
+    2.13.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6fd22d52486a..2f693d9413f2 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.104.4
+  0.104.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.4
+    2.13.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 6fddf1b26040..484ba6f4965a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.4:2.13.4
-google-cloud-datastore-bom:2.13.4:2.13.4
-proto-google-cloud-datastore-v1:0.104.4:0.104.4
-datastore-v1-proto-client:2.13.4:2.13.4
-proto-google-cloud-datastore-admin-v1:2.13.4:2.13.4
-grpc-google-cloud-datastore-admin-v1:2.13.4:2.13.4
+google-cloud-datastore:2.13.4:2.13.5-SNAPSHOT
+google-cloud-datastore-bom:2.13.4:2.13.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.104.4:0.104.5-SNAPSHOT
+datastore-v1-proto-client:2.13.4:2.13.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.13.4:2.13.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.13.4:2.13.5-SNAPSHOT

From ed91306b8e4662ae5dab885049d397c585ead65c Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:46:07 -0500
Subject: [PATCH 1060/1784] chore: turn off yoshi-approver (#979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: turn off yoshi-approver

* 🦉 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 
---
 .github/workflows/auto-release.yaml | 103 ----------------------------
 README.md                           |   4 +-
 2 files changed, 2 insertions(+), 105 deletions(-)
 delete mode 100644 .github/workflows/auto-release.yaml

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
deleted file mode 100644
index 7a106d007edf..000000000000
--- a/.github/workflows/auto-release.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.
-# Github action job to test core java library features on
-# downstream client libraries before they are released.
-on:
-  pull_request:
-name: auto-release
-jobs:
-  approve:
-    runs-on: ubuntu-latest
-    if: contains(github.head_ref, 'release-please')
-    steps:
-    - uses: actions/github-script@v6
-      with:
-        github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
-        debug: true
-        script: |
-          // only approve PRs from release-please[bot]
-          if (context.payload.pull_request.user.login !== "release-please[bot]") {
-            return;
-          }
-
-          // only approve PRs like "chore(main): release "
-          if (  !context.payload.pull_request.title.startsWith("chore(main): release") ) {
-            return;
-          }
-
-          // only approve PRs with pom.xml and versions.txt changes
-          const filesPromise = github.rest.pulls.listFiles.endpoint({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            pull_number: context.payload.pull_request.number,
-          });
-          const changed_files = await github.paginate(filesPromise)
-
-          if ( changed_files.length < 1 ) {
-            console.log( "Not proceeding since PR is empty!" )
-            return;
-          }
-
-          if ( !changed_files.some(v => v.filename.includes("pom")) || !changed_files.some(v => v.filename.includes("versions.txt")) ) {
-            console.log( "PR file changes do not have pom.xml or versions.txt -- something is wrong. PTAL!" )
-            return;
-          }
-
-          // trigger auto-release when
-          // 1) it is a SNAPSHOT release (auto-generated post regular release)
-          // 2) there are dependency updates only
-          // 3) there are no open dependency update PRs in this repo (to avoid multiple releases)
-          if (
-            context.payload.pull_request.body.includes("Fix") ||
-            context.payload.pull_request.body.includes("Build") ||
-            context.payload.pull_request.body.includes("Documentation") ||
-            context.payload.pull_request.body.includes("BREAKING CHANGES") ||
-            context.payload.pull_request.body.includes("Features")
-          ) {
-            console.log( "Not auto-releasing since it is not a dependency-update-only release." );
-            return;
-          }
-
-          const promise = github.rest.pulls.list.endpoint({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            state: 'open'
-          });
-          const open_pulls = await github.paginate(promise)
-
-          if ( open_pulls.length > 1 && !context.payload.pull_request.title.includes("SNAPSHOT") ) {
-            for ( const pull of open_pulls ) {
-              if ( pull.title.startsWith("deps: update dependency") ) {
-                console.log( "Not auto-releasing yet since there are dependency update PRs open in this repo." );
-                return;
-              }
-            }
-          }
-
-          // approve release PR
-          await github.rest.pulls.createReview({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: 'Rubber stamped release!',
-            pull_number: context.payload.pull_request.number,
-            event: 'APPROVE'
-          });
-
-          // attach kokoro:force-run and automerge labels
-          await github.rest.issues.addLabels({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            issue_number: context.payload.pull_request.number,
-            labels: ['kokoro:force-run', 'automerge']
-          });
diff --git a/README.md b/README.md
index 72fe221bca7d..fce2dce26a63 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.13.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.13.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.4"
 ```
 
 ## Authentication

From fdce6b55dc147374c94446f6e99ae6f3d2e8cd3f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 6 Feb 2023 22:46:26 +0000
Subject: [PATCH 1061/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.13.4 (#978)
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.13.4

* 🦉 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 fce2dce26a63..088d877651fc 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.13.3
+  2.13.4
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4d3377ecbd51..46a6c52a33d0 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.13.3
+      2.13.4
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2bed78c7c084..7ab5a9f748fb 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.13.3
+      2.13.4
     
 
     

From 6b2e7317ab29d569463f0b3a99474f8dd4bb4d4b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 9 Feb 2023 16:32:05 +0000
Subject: [PATCH 1062/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-deploy-plugin to v3.1.0 (#981)

---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 35ef75aa8e30..7d846eb1b026 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -39,7 +39,7 @@
       
         org.apache.maven.plugins
         maven-deploy-plugin
-        3.0.0
+        3.1.0
         
           true
         

From 99f2a2d780cb42932ebfbffc236bad9816573921 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 10:20:58 -0500
Subject: [PATCH 1063/1784] build(deps): bump cryptography from 38.0.3 to
 39.0.1 in /synthtool/gcp/templates/java_library/.kokoro (#1761) (#985)

* build(deps): bump cryptography

Bumps [cryptography](https://github.com/pyca/cryptography) from 38.0.3 to 39.0.1.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/38.0.3...39.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...



* chore: disabling dependabot

---------





Source-Link: https://github.com/googleapis/synthtool/commit/0c6f8d4ac5358553ee734e26574f390bc43a736e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1

Signed-off-by: dependabot[bot] 
Co-authored-by: Owl Bot 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tomo Suzuki 
Co-authored-by: ddixit14 
---
 .github/.OwlBot.lock.yaml |  2 +-
 .github/dependabot.yml    | 14 +++++++++++
 .kokoro/requirements.txt  | 53 ++++++++++++++++-----------------------
 README.md                 |  2 +-
 4 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 31923bd133a8..090264303f34 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:ff1a5832623e1b694203b89253dbfe4c2d4a33aae1baf60d323b1245672331eb
+  digest: sha256:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000000..c8f413b0da30
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    # Disable version updates for Maven dependencies
+    open-pull-requests-limit: 0
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    # Disable version updates for pip dependencies
+    open-pull-requests-limit: 0
\ No newline at end of file
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 4895c9631fd8..cfadd22ce9b9 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -97,33 +97,28 @@ colorlog==6.7.0 \
     --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
     --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
     # via gcp-docuploader
-cryptography==38.0.3 \
-    --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \
-    --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \
-    --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \
-    --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \
-    --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \
-    --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \
-    --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \
-    --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \
-    --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \
-    --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \
-    --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \
-    --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \
-    --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \
-    --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \
-    --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \
-    --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \
-    --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \
-    --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \
-    --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \
-    --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \
-    --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \
-    --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \
-    --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \
-    --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \
-    --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \
-    --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722
+cryptography==39.0.1 \
+    --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \
+    --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \
+    --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \
+    --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \
+    --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \
+    --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \
+    --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \
+    --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \
+    --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \
+    --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \
+    --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \
+    --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \
+    --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \
+    --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \
+    --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \
+    --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \
+    --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \
+    --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \
+    --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \
+    --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \
+    --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8
     # via
     #   gcp-releasetool
     #   secretstorage
@@ -379,10 +374,6 @@ secretstorage==3.3.3 \
     --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \
     --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99
     # via keyring
-setuptools==65.6.3 \
-    --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \
-    --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75
-    # via -r requirements.in
 six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
diff --git a/README.md b/README.md
index 088d877651fc..bcbb00b20a68 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.6.0')
+implementation platform('com.google.cloud:libraries-bom:26.7.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```

From 64630e16f91b5a6e78ad9e09e0471f4c0f998bd2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 13 Feb 2023 15:21:16 +0000
Subject: [PATCH 1064/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.7.0 (#983)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.7.0

* 🦉 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/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bcbb00b20a68..2bbbad178c7b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.6.0
+      26.7.0
       pom
       import
     
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 470441418259..9854307e7926 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.6.0
+        26.7.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e93da5c4c126..c9a740b4a783 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.6.0
+        26.7.0
         pom
         import
       

From 58c9138397ed4ccb67cfdc239bb1577fa27030f1 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 14 Feb 2023 19:14:37 +0000
Subject: [PATCH 1065/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.8.0 (#986)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.8.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2bbbad178c7b..e47a300bbc97 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.7.0
+      26.8.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.7.0')
+implementation platform('com.google.cloud:libraries-bom:26.8.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 9854307e7926..a0fe414bd163 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.7.0
+        26.8.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c9a740b4a783..3497fa5c3e71 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.7.0
+        26.8.0
         pom
         import
       

From 7e6f911338b0ec6c45b568fcc44b38a8ebfb1d21 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 14 Feb 2023 16:00:18 -0500
Subject: [PATCH 1066/1784] chore: update CODEOWNERS (#988)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 .github/CODEOWNERS  | 6 +++---
 .repo-metadata.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 549b1955465b..17fe1884dea1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,11 +4,11 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/cloud-native-db-dpes @googleapis/api-firestore is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-firestore
+# The @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk is the default owner for changes in this repo
+*                       @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/cloud-native-db-dpes @googleapis/api-firestore
+**/*.java               @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk
 
 
 # The java-samples-reviewers team is the default owner for samples changes
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 6e452200e920..1d382e4ed0a5 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -9,7 +9,7 @@
   "repo": "googleapis/java-datastore",
   "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
-  "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-firestore",
+  "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk",
   "api_id": "datastore.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.",

From 5e984c87fc95e18fb9a43ebd8d5dbafe7090c1cf Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 15 Feb 2023 15:24:11 +0000
Subject: [PATCH 1067/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.20 (#990)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.19` -> `0.9.20` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/compatibility-slim/0.9.19)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/confidence-slim/0.9.19)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
graalvm/native-build-tools

### [`v0.9.20`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.20)

[Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.19...0.9.20)

#### What's Changed

-   Introduce a `showPublications` task by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/375](https://togithub.com/graalvm/native-build-tools/pull/375)
-   Quickstart guides for Native Image Build Tools Maven/Gradle plugins. by [@​olyagpl](https://togithub.com/olyagpl) in [https://togithub.com/graalvm/native-build-tools/pull/381](https://togithub.com/graalvm/native-build-tools/pull/381)
-   Fix `NativeImageUtils#checkVersion` by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/386](https://togithub.com/graalvm/native-build-tools/pull/386)
-   Clarify bug report templates by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/392](https://togithub.com/graalvm/native-build-tools/pull/392)
-   Fix deadlock when collecting metadata by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/391](https://togithub.com/graalvm/native-build-tools/pull/391)
-   Add maven support for agent by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/343](https://togithub.com/graalvm/native-build-tools/pull/343)
-   Update metadataRepository version by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/394](https://togithub.com/graalvm/native-build-tools/pull/394)
-   Make max parallel native image builds configurable by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/395](https://togithub.com/graalvm/native-build-tools/pull/395)
-   Set regex to accept both GraalVM and native-image as version names by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/396](https://togithub.com/graalvm/native-build-tools/pull/396)
-   Add missing notes in index by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/399](https://togithub.com/graalvm/native-build-tools/pull/399)

#### New Contributors

-   [@​olyagpl](https://togithub.com/olyagpl) made their first contribution in [https://togithub.com/graalvm/native-build-tools/pull/381](https://togithub.com/graalvm/native-build-tools/pull/381)

**Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.19...0.9.20


    

---

### 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, check this box

---

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 a0fe414bd163..308d27ff5d9a 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.19
+            0.9.20
             true
             
               com.example.datastore.NativeImageDatastoreSample

From f71ccd94c5ed7c01f388d31dda17387d13496547 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 15 Feb 2023 15:27:11 +0000
Subject: [PATCH 1068/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.20 (#989)

---
 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 308d27ff5d9a..58c46644567a 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.19
+          0.9.20
           test
         
           

From 94ab2e4de079d5d54748827c17bb7ae4449f63e6 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:26:11 -0500
Subject: [PATCH 1069/1784] chore: Add `OR` query support (#992)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add `OR` query support
docs: Minor documentation formatting and cleanup

PiperOrigin-RevId: 509848726

Source-Link: https://github.com/googleapis/googleapis/commit/b9351b4bf998332ed831fb82e9d9b02d9b3fa21f

Source-Link: https://github.com/googleapis/googleapis-gen/commit/99317db6827185e8cae8eeb46137cd81cd2d6a54
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTkzMTdkYjY4MjcxODVlOGNhZThlZWI0NjEzN2NkODFjZDJkNmE1NCJ9

* 🦉 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 
---
 .../google/datastore/v1/AggregationQuery.java | 174 +++++---
 .../v1/AggregationQueryOrBuilder.java         |  15 +-
 .../datastore/v1/AggregationResult.java       |  77 ++--
 .../v1/AggregationResultOrBuilder.java        |  35 +-
 .../google/datastore/v1/CommitRequest.java    |  36 +-
 .../datastore/v1/CommitRequestOrBuilder.java  |   9 +-
 .../google/datastore/v1/CompositeFilter.java  |  22 +
 .../google/datastore/v1/DatastoreProto.java   | 139 +++---
 .../com/google/datastore/v1/EntityResult.java | 408 +++++++++++++++---
 .../datastore/v1/EntityResultOrBuilder.java   |  66 ++-
 .../google/datastore/v1/LookupResponse.java   |  16 +-
 .../datastore/v1/LookupResponseOrBuilder.java |   4 +-
 .../google/datastore/v1/MutationResult.java   | 284 +++++++++++-
 .../datastore/v1/MutationResultOrBuilder.java |  35 ++
 .../com/google/datastore/v1/PartitionId.java  |   6 +-
 .../google/datastore/v1/PropertyFilter.java   |   2 +
 .../com/google/datastore/v1/QueryProto.java   | 159 +++----
 .../v1/RunAggregationQueryResponse.java       |  16 +-
 .../RunAggregationQueryResponseOrBuilder.java |   4 +-
 .../google/datastore/v1/RunQueryResponse.java |  16 +-
 .../v1/RunQueryResponseOrBuilder.java         |   4 +-
 .../java/com/google/datastore/v1/Value.java   |  36 +-
 .../google/datastore/v1/ValueOrBuilder.java   |  12 +-
 .../datastore/v1/aggregation_result.proto     |   7 +-
 .../proto/google/datastore/v1/datastore.proto |  18 +-
 .../proto/google/datastore/v1/entity.proto    |   7 +-
 .../proto/google/datastore/v1/query.proto     |  45 +-
 27 files changed, 1218 insertions(+), 434 deletions(-)

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 3cf3b5abc802..91aa55f7dd25 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+ * Datastore query for running an aggregation over a
+ * [Query][google.datastore.v1.Query].
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.AggregationQuery}
@@ -111,7 +112,8 @@ public interface AggregationOrBuilder
      *
      *
      * 
    -     * Optional. Optional name of the property to store the result of the aggregation.
+     * 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:
      * ```
@@ -137,7 +139,8 @@ public interface AggregationOrBuilder
      * ```
      * Requires:
      * * Must be unique across all aggregation aliases.
-     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     * * Conform to [entity property
+     * name][google.datastore.v1.Entity.properties] limitations.
      * 
    
      *
      * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -149,7 +152,8 @@ public interface AggregationOrBuilder
      *
      *
      * 
    -     * Optional. Optional name of the property to store the result of the aggregation.
+     * 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:
      * ```
@@ -175,7 +179,8 @@ public interface AggregationOrBuilder
      * ```
      * Requires:
      * * Must be unique across all aggregation aliases.
-     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     * * Conform to [entity property
+     * name][google.datastore.v1.Entity.properties] limitations.
      * 
    
      *
      * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -244,7 +249,8 @@ public interface CountOrBuilder
        *
        *
        * 
    -       * Optional. Optional constraint on the maximum number of entities to count.
+       * 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.
@@ -268,7 +274,8 @@ public interface CountOrBuilder
        *
        *
        * 
    -       * Optional. Optional constraint on the maximum number of entities to count.
+       * 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.
@@ -292,7 +299,8 @@ public interface CountOrBuilder
        *
        *
        * 
    -       * Optional. Optional constraint on the maximum number of entities to count.
+       * 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.
@@ -366,7 +374,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        *
        *
        * 
    -       * Optional. Optional constraint on the maximum number of entities to count.
+       * 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.
@@ -393,7 +402,8 @@ public boolean hasUpTo() {
        *
        *
        * 
    -       * Optional. Optional constraint on the maximum number of entities to count.
+       * 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.
@@ -420,7 +430,8 @@ public com.google.protobuf.Int64Value getUpTo() {
        *
        *
        * 
    -       * Optional. Optional constraint on the maximum number of entities to count.
+       * 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.
@@ -811,7 +822,8 @@ public Builder mergeFrom(
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -837,7 +849,8 @@ public boolean hasUpTo() {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -867,7 +880,8 @@ public com.google.protobuf.Int64Value getUpTo() {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -901,7 +915,8 @@ public Builder setUpTo(com.google.protobuf.Int64Value value) {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -932,7 +947,8 @@ public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -969,7 +985,8 @@ public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -1000,7 +1017,8 @@ public Builder clearUpTo() {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -1026,7 +1044,8 @@ public com.google.protobuf.Int64Value.Builder getUpToBuilder() {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -1054,7 +1073,8 @@ public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() {
          *
          *
          * 
    -         * Optional. Optional constraint on the maximum number of entities to count.
+         * 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.
@@ -1258,7 +1278,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
      *
      *
      * 
    -     * Optional. Optional name of the property to store the result of the aggregation.
+     * 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:
      * ```
@@ -1284,7 +1305,8 @@ 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.
+     * * Conform to [entity property
+     * name][google.datastore.v1.Entity.properties] limitations.
      * 
    
      *
      * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -1307,7 +1329,8 @@ public java.lang.String getAlias() {
      *
      *
      * 
    -     * Optional. Optional name of the property to store the result of the aggregation.
+     * 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:
      * ```
@@ -1333,7 +1356,8 @@ public java.lang.String getAlias() {
      * ```
      * Requires:
      * * Must be unique across all aggregation aliases.
-     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     * * Conform to [entity property
+     * name][google.datastore.v1.Entity.properties] limitations.
      * 
    
      *
      * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -1988,7 +2012,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
        *
        *
        * 
    -       * Optional. Optional name of the property to store the result of the aggregation.
+       * 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:
        * ```
@@ -2014,7 +2039,8 @@ 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.
+       * * Conform to [entity property
+       * name][google.datastore.v1.Entity.properties] limitations.
        * 
    
        *
        * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -2036,7 +2062,8 @@ public java.lang.String getAlias() {
        *
        *
        * 
    -       * Optional. Optional name of the property to store the result of the aggregation.
+       * 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:
        * ```
@@ -2062,7 +2089,8 @@ public java.lang.String getAlias() {
        * ```
        * Requires:
        * * Must be unique across all aggregation aliases.
-       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       * * Conform to [entity property
+       * name][google.datastore.v1.Entity.properties] limitations.
        * 
    
        *
        * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -2084,7 +2112,8 @@ public com.google.protobuf.ByteString getAliasBytes() {
        *
        *
        * 
    -       * Optional. Optional name of the property to store the result of the aggregation.
+       * 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:
        * ```
@@ -2110,7 +2139,8 @@ 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.
+       * * Conform to [entity property
+       * name][google.datastore.v1.Entity.properties] limitations.
        * 
    
        *
        * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -2131,7 +2161,8 @@ public Builder setAlias(java.lang.String value) {
        *
        *
        * 
    -       * Optional. Optional name of the property to store the result of the aggregation.
+       * 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:
        * ```
@@ -2157,7 +2188,8 @@ 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.
+       * * Conform to [entity property
+       * name][google.datastore.v1.Entity.properties] limitations.
        * 
    
        *
        * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -2174,7 +2206,8 @@ public Builder clearAlias() {
        *
        *
        * 
    -       * Optional. Optional name of the property to store the result of the aggregation.
+       * 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:
        * ```
@@ -2200,7 +2233,8 @@ public Builder clearAlias() {
        * ```
        * Requires:
        * * Must be unique across all aggregation aliases.
-       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       * * Conform to [entity property
+       * name][google.datastore.v1.Entity.properties] limitations.
        * 
    
        *
        * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
@@ -2386,7 +2420,8 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -2404,7 +2439,8 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -2422,7 +2458,8 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -2439,7 +2476,8 @@ public int getAggregationsCount() {
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -2456,7 +2494,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -2659,7 +2698,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+   * Datastore query for running an aggregation over a
+   * [Query][google.datastore.v1.Query].
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.AggregationQuery}
@@ -3155,7 +3195,8 @@ private void ensureAggregationsIsMutable() {
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3176,7 +3217,8 @@ private void ensureAggregationsIsMutable() {
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3196,7 +3238,8 @@ public int getAggregationsCount() {
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3216,7 +3259,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3243,7 +3287,8 @@ public Builder setAggregations(
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3267,7 +3312,8 @@ public Builder setAggregations(
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3293,7 +3339,8 @@ public Builder addAggregations(com.google.datastore.v1.AggregationQuery.Aggregat
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3320,7 +3367,8 @@ public Builder addAggregations(
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3344,7 +3392,8 @@ public Builder addAggregations(
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3368,7 +3417,8 @@ public Builder addAggregations(
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3392,7 +3442,8 @@ public Builder addAllAggregations(
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3415,7 +3466,8 @@ public Builder clearAggregations() {
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3438,7 +3490,8 @@ public Builder removeAggregations(int index) {
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3455,7 +3508,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder getAggregati
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3476,7 +3530,8 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3497,7 +3552,8 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3514,7 +3570,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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.
      * 
    
@@ -3533,7 +3590,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati
      *
      *
      * 
    -     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * 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 457f963e9552..675424777304 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
@@ -62,7 +62,8 @@ public interface AggregationQueryOrBuilder
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -76,7 +77,8 @@ public interface AggregationQueryOrBuilder
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -90,7 +92,8 @@ public interface AggregationQueryOrBuilder
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -104,7 +107,8 @@ public interface AggregationQueryOrBuilder
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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.
    * 
    
@@ -119,7 +123,8 @@ public interface AggregationQueryOrBuilder
    *
    *
    * 
    -   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * 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/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java
index b84dc5c41c35..cb3969718b95 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
@@ -115,9 +115,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -140,9 +141,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -157,9 +159,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -181,9 +184,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -618,9 +622,10 @@ 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 number of aggregation functions in the query.
+     * 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
+     * number of aggregation functions in the query.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -643,9 +648,10 @@ 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 number of aggregation functions in the query.
+     * 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
+     * number of aggregation functions in the query.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -660,9 +666,10 @@ 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 number of aggregation functions in the query.
+     * 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
+     * number of aggregation functions in the query.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -684,9 +691,10 @@ 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 number of aggregation functions in the query.
+     * 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
+     * number of aggregation functions in the query.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -714,9 +722,10 @@ 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 number of aggregation functions in the query.
+     * 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
+     * number of aggregation functions in the query.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -740,9 +749,10 @@ 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 number of aggregation functions in the query.
+     * 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
+     * number of aggregation functions in the query.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -764,9 +774,10 @@ 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 number of aggregation functions in the query.
+     * 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
+     * number of aggregation functions in the query.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
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 6f622580ff0f..fc9f0ab9a55e 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,9 +28,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -41,9 +42,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -57,9 +59,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -70,9 +73,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
@@ -87,9 +91,10 @@ 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 number of aggregation functions in the query.
+   * 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
+   * number of aggregation functions in the query.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
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 88570ade673b..fd493327298f 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
@@ -465,8 +465,7 @@ public com.google.protobuf.ByteString getTransaction() {
    * 
        * Options for beginning a new transaction for this request.
    * The transaction is committed when the request completes. If specified,
-   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-   * must be
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
    * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
    * 
    
    *
@@ -484,8 +483,7 @@ public boolean hasSingleUseTransaction() {
    * 
        * Options for beginning a new transaction for this request.
    * The transaction is committed when the request completes. If specified,
-   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-   * must be
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
    * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
    * 
    
    *
@@ -506,8 +504,7 @@ public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() {
    * 
        * Options for beginning a new transaction for this request.
    * The transaction is committed when the request completes. If specified,
-   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-   * must be
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
    * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
    * 
    
    *
@@ -1591,8 +1588,7 @@ public Builder clearTransaction() {
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1610,8 +1606,7 @@ public boolean hasSingleUseTransaction() {
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1639,8 +1634,7 @@ public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() {
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1665,8 +1659,7 @@ public Builder setSingleUseTransaction(com.google.datastore.v1.TransactionOption
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1689,8 +1682,7 @@ public Builder setSingleUseTransaction(
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1726,8 +1718,7 @@ public Builder mergeSingleUseTransaction(com.google.datastore.v1.TransactionOpti
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1755,8 +1746,7 @@ public Builder clearSingleUseTransaction() {
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1771,8 +1761,7 @@ public com.google.datastore.v1.TransactionOptions.Builder getSingleUseTransactio
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
@@ -1795,8 +1784,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti
      * 
          * Options for beginning a new transaction for this request.
      * The transaction is committed when the request completes. If specified,
-     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-     * must be
+     * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
      * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
      * 
    
      *
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 b0e1f7a2a3ef..3e4dcb9f434f 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
@@ -137,8 +137,7 @@ public interface CommitRequestOrBuilder
    * 
        * Options for beginning a new transaction for this request.
    * The transaction is committed when the request completes. If specified,
-   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-   * must be
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
    * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
    * 
    
    *
@@ -153,8 +152,7 @@ public interface CommitRequestOrBuilder
    * 
        * Options for beginning a new transaction for this request.
    * The transaction is committed when the request completes. If specified,
-   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-   * must be
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
    * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
    * 
    
    *
@@ -169,8 +167,7 @@ public interface CommitRequestOrBuilder
    * 
        * Options for beginning a new transaction for this request.
    * The transaction is committed when the request completes. If specified,
-   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-   * must be
+   * [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
    * [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
    * 
    
    *
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 d845c7c50304..9393d2440f99 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
@@ -98,6 +98,16 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * AND = 1;
      */
     AND(1),
+    /**
+     *
+     *
+     * 
    +     * Documents are required to satisfy at least one of the combined filters.
+     * 
    
+     *
+     * OR = 2;
+     */
+    OR(2),
     UNRECOGNIZED(-1),
     ;
 
@@ -121,6 +131,16 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * AND = 1;
      */
     public static final int AND_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * Documents are required to satisfy at least one of the combined filters.
+     * 
    
+     *
+     * OR = 2;
+     */
+    public static final int OR_VALUE = 2;
 
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
@@ -150,6 +170,8 @@ public static Operator forNumber(int value) {
           return OPERATOR_UNSPECIFIED;
         case 1:
           return AND;
+        case 2:
+          return OR;
         default:
           return null;
       }
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 0d29f99fe7dd..e1286f3ebfc1 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
@@ -201,75 +201,76 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "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\"\224\001\n\016MutationResult\022%\n\003key\030\003 \001(\0132\030.goo"
+          + "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"
-          + "\013update_time\030\006 \001(\0132\032.google.protobuf.Tim"
-          + "estamp\022\031\n\021conflict_detected\030\005 \001(\010\"\312\002\n\013Re"
-          + "adOptions\022L\n\020read_consistency\030\001 \001(\01620.go"
-          + "ogle.datastore.v1.ReadOptions.ReadConsis"
-          + "tencyH\000\022\025\n\013transaction\030\002 \001(\014H\000\022B\n\017new_tr"
-          + "ansaction\030\003 \001(\0132\'.google.datastore.v1.Tr"
-          + "ansactionOptionsH\000\022/\n\tread_time\030\004 \001(\0132\032."
-          + "google.protobuf.TimestampH\000\"M\n\017ReadConsi"
-          + "stency\022 \n\034READ_CONSISTENCY_UNSPECIFIED\020\000"
-          + "\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consistenc"
-          + "y_type\"\222\002\n\022TransactionOptions\022G\n\nread_wr"
-          + "ite\030\001 \001(\01321.google.datastore.v1.Transact"
-          + "ionOptions.ReadWriteH\000\022E\n\tread_only\030\002 \001("
-          + "\01320.google.datastore.v1.TransactionOptio"
-          + "ns.ReadOnlyH\000\032)\n\tReadWrite\022\034\n\024previous_t"
-          + "ransaction\030\001 \001(\014\0329\n\010ReadOnly\022-\n\tread_tim"
-          + "e\030\001 \001(\0132\032.google.protobuf.TimestampB\006\n\004m"
-          + "ode2\341\r\n\tDatastore\022\300\001\n\006Lookup\022\".google.da"
-          + "tastore.v1.LookupRequest\032#.google.datast"
-          + "ore.v1.LookupResponse\"m\202\323\344\223\002%\" /v1/proje"
-          + "cts/{project_id}:lookup:\001*\212\323\344\223\002\035\022\014\n\nproj"
-          + "ect_id\022\r\n\013database_id\332A\034project_id,read_"
-          + "options,keys\022\251\001\n\010RunQuery\022$.google.datas"
-          + "tore.v1.RunQueryRequest\032%.google.datasto"
-          + "re.v1.RunQueryResponse\"P\202\323\344\223\002\'\"\"/v1/proj"
-          + "ects/{project_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\np"
-          + "roject_id\022\r\n\013database_id\022\325\001\n\023RunAggregat"
-          + "ionQuery\022/.google.datastore.v1.RunAggreg"
-          + "ationQueryRequest\0320.google.datastore.v1."
-          + "RunAggregationQueryResponse\"[\202\323\344\223\0022\"-/v1"
-          + "/projects/{project_id}:runAggregationQue"
-          + "ry:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
-          + "\022\326\001\n\020BeginTransaction\022,.google.datastore"
-          + ".v1.BeginTransactionRequest\032-.google.dat"
-          + "astore.v1.BeginTransactionResponse\"e\202\323\344\223"
-          + "\002/\"*/v1/projects/{project_id}:beginTrans"
-          + "action:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databas"
-          + "e_id\332A\nproject_id\022\346\001\n\006Commit\022\".google.da"
-          + "tastore.v1.CommitRequest\032#.google.datast"
-          + "ore.v1.CommitResponse\"\222\001\202\323\344\223\002%\" /v1/proj"
-          + "ects/{project_id}:commit:\001*\212\323\344\223\002\035\022\014\n\npro"
-          + "ject_id\022\r\n\013database_id\332A%project_id,mode"
-          + ",transaction,mutations\332A\031project_id,mode"
-          + ",mutations\022\302\001\n\010Rollback\022$.google.datasto"
-          + "re.v1.RollbackRequest\032%.google.datastore"
-          + ".v1.RollbackResponse\"i\202\323\344\223\002\'\"\"/v1/projec"
-          + "ts/{project_id}:rollback:\001*\212\323\344\223\002\035\022\014\n\npro"
-          + "ject_id\022\r\n\013database_id\332A\026project_id,tran"
-          + "saction\022\307\001\n\013AllocateIds\022\'.google.datasto"
-          + "re.v1.AllocateIdsRequest\032(.google.datast"
-          + "ore.v1.AllocateIdsResponse\"e\202\323\344\223\002*\"%/v1/"
-          + "projects/{project_id}:allocateIds:\001*\212\323\344\223"
-          + "\002\035\022\014\n\nproject_id\022\r\n\013database_id\332A\017projec"
-          + "t_id,keys\022\303\001\n\nReserveIds\022&.google.datast"
-          + "ore.v1.ReserveIdsRequest\032\'.google.datast"
-          + "ore.v1.ReserveIdsResponse\"d\202\323\344\223\002)\"$/v1/p"
-          + "rojects/{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.googleapis.com\322AXh"
-          + "ttps://www.googleapis.com/auth/cloud-pla"
-          + "tform,https://www.googleapis.com/auth/da"
-          + "tastoreB\300\001\n\027com.google.datastore.v1B\016Dat"
-          + "astoreProtoP\001Z
    * 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.
+   * 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.
    * 
    
    *
    * int64 version = 4;
@@ -320,6 +320,61 @@ public long getVersion() {
     return version_;
   }
 
+  public static final int CREATE_TIME_FIELD_NUMBER = 6;
+  private com.google.protobuf.Timestamp createTime_;
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was created.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 6;
+   *
+   * @return Whether the createTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasCreateTime() {
+    return createTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was created.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 6;
+   *
+   * @return The createTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getCreateTime() {
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was created.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 6;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+  }
+
   public static final int UPDATE_TIME_FIELD_NUMBER = 5;
   private com.google.protobuf.Timestamp updateTime_;
   /**
@@ -327,8 +382,8 @@ public long getVersion() {
    *
    * 
        * The time at which the entity was last changed.
-   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-   * results.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
    * If this entity is missing, this field will not be set.
    * 
    
    *
@@ -345,8 +400,8 @@ public boolean hasUpdateTime() {
    *
    * 
        * The time at which the entity was last changed.
-   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-   * results.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
    * If this entity is missing, this field will not be set.
    * 
    
    *
@@ -363,8 +418,8 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    *
    * 
        * The time at which the entity was last changed.
-   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-   * results.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
    * If this entity is missing, this field will not be set.
    * 
    
    *
@@ -420,6 +475,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateTime_ != null) {
       output.writeMessage(5, getUpdateTime());
     }
+    if (createTime_ != null) {
+      output.writeMessage(6, getCreateTime());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -441,6 +499,9 @@ public int getSerializedSize() {
     if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime());
     }
+    if (createTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getCreateTime());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -461,6 +522,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getEntity().equals(other.getEntity())) return false;
     }
     if (getVersion() != other.getVersion()) return false;
+    if (hasCreateTime() != other.hasCreateTime()) return false;
+    if (hasCreateTime()) {
+      if (!getCreateTime().equals(other.getCreateTime())) return false;
+    }
     if (hasUpdateTime() != other.hasUpdateTime()) return false;
     if (hasUpdateTime()) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
@@ -483,6 +548,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
+    if (hasCreateTime()) {
+      hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCreateTime().hashCode();
+    }
     if (hasUpdateTime()) {
       hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateTime().hashCode();
@@ -633,6 +702,11 @@ public Builder clear() {
         entityBuilder_ = null;
       }
       version_ = 0L;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
+        createTimeBuilder_ = null;
+      }
       updateTime_ = null;
       if (updateTimeBuilder_ != null) {
         updateTimeBuilder_.dispose();
@@ -681,9 +755,12 @@ private void buildPartial0(com.google.datastore.v1.EntityResult result) {
         result.version_ = version_;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
         result.cursor_ = cursor_;
       }
     }
@@ -739,6 +816,9 @@ public Builder mergeFrom(com.google.datastore.v1.EntityResult other) {
       if (other.getVersion() != 0L) {
         setVersion(other.getVersion());
       }
+      if (other.hasCreateTime()) {
+        mergeCreateTime(other.getCreateTime());
+      }
       if (other.hasUpdateTime()) {
         mergeUpdateTime(other.getUpdateTime());
       }
@@ -780,7 +860,7 @@ public Builder mergeFrom(
             case 26:
               {
                 cursor_ = input.readBytes();
-                bitField0_ |= 0x00000008;
+                bitField0_ |= 0x00000010;
                 break;
               } // case 26
             case 32:
@@ -792,9 +872,15 @@ public Builder mergeFrom(
             case 42:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+                bitField0_ |= 0x00000008;
                 break;
               } // case 42
+            case 50:
+              {
+                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 50
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1000,11 +1086,11 @@ 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.
+     * 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.
      * 
    
      *
      * int64 version = 4;
@@ -1021,11 +1107,11 @@ 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.
+     * 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.
      * 
    
      *
      * int64 version = 4;
@@ -1046,11 +1132,11 @@ 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.
+     * 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.
      * 
    
      *
      * int64 version = 4;
@@ -1064,6 +1150,216 @@ public Builder clearVersion() {
       return this;
     }
 
+    private com.google.protobuf.Timestamp createTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        createTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     *
+     * @return Whether the createTime field is set.
+     */
+    public boolean hasCreateTime() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     *
+     * @return The createTime.
+     */
+    public com.google.protobuf.Timestamp getCreateTime() {
+      if (createTimeBuilder_ == null) {
+        return createTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : createTime_;
+      } else {
+        return createTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     */
+    public Builder setCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        createTime_ = value;
+      } else {
+        createTimeBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     */
+    public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (createTimeBuilder_ == null) {
+        createTime_ = builderForValue.build();
+      } else {
+        createTimeBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     */
+    public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (((bitField0_ & 0x00000004) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
+        } else {
+          createTime_ = value;
+        }
+      } else {
+        createTimeBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     */
+    public Builder clearCreateTime() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
+        createTimeBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     */
+    public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return getCreateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     */
+    public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+      if (createTimeBuilder_ != null) {
+        return createTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return createTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : createTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The time at which the entity was created.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+     * If this entity is missing, this field will not be set.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 6;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getCreateTimeFieldBuilder() {
+      if (createTimeBuilder_ == null) {
+        createTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getCreateTime(), getParentForChildren(), isClean());
+        createTime_ = null;
+      }
+      return createTimeBuilder_;
+    }
+
     private com.google.protobuf.Timestamp updateTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -1075,8 +1371,8 @@ public Builder clearVersion() {
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
@@ -1085,15 +1381,15 @@ public Builder clearVersion() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
@@ -1115,8 +1411,8 @@ public com.google.protobuf.Timestamp getUpdateTime() {
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
@@ -1131,7 +1427,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1140,8 +1436,8 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
@@ -1153,7 +1449,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1162,8 +1458,8 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
@@ -1171,7 +1467,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
+        if (((bitField0_ & 0x00000008) != 0)
             && updateTime_ != null
             && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getUpdateTimeBuilder().mergeFrom(value);
@@ -1181,7 +1477,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1190,15 +1486,15 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
      * .google.protobuf.Timestamp update_time = 5;
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000008);
       updateTime_ = null;
       if (updateTimeBuilder_ != null) {
         updateTimeBuilder_.dispose();
@@ -1212,15 +1508,15 @@ public Builder clearUpdateTime() {
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
      * .google.protobuf.Timestamp update_time = 5;
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -1229,8 +1525,8 @@ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
@@ -1250,8 +1546,8 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      *
      * 
          * The time at which the entity was last changed.
-     * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-     * results.
+     * This field is set for
+     * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
      * If this entity is missing, this field will not be set.
      * 
    
      *
@@ -1309,7 +1605,7 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       cursor_ = value;
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1326,7 +1622,7 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearCursor() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000010);
       cursor_ = getDefaultInstance().getCursor();
       onChanged();
       return this;
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 6be5b8e1adaa..6b0fc7e3acdf 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,11 +64,11 @@ 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.
+   * 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.
    * 
    
    *
    * int64 version = 4;
@@ -77,13 +77,57 @@ public interface EntityResultOrBuilder
    */
   long getVersion();
 
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was created.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 6;
+   *
+   * @return Whether the createTime field is set.
+   */
+  boolean hasCreateTime();
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was created.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 6;
+   *
+   * @return The createTime.
+   */
+  com.google.protobuf.Timestamp getCreateTime();
+  /**
+   *
+   *
+   * 
    +   * The time at which the entity was created.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+   * If this entity is missing, this field will not be set.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 6;
+   */
+  com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder();
+
   /**
    *
    *
    * 
        * The time at which the entity was last changed.
-   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-   * results.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
    * If this entity is missing, this field will not be set.
    * 
    
    *
@@ -97,8 +141,8 @@ public interface EntityResultOrBuilder
    *
    * 
        * The time at which the entity was last changed.
-   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-   * results.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
    * If this entity is missing, this field will not be set.
    * 
    
    *
@@ -112,8 +156,8 @@ public interface EntityResultOrBuilder
    *
    * 
        * The time at which the entity was last changed.
-   * This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-   * results.
+   * This field is set for
+   * [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
    * If this entity is missing, this field will not be set.
    * 
    
    *
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 805f20b729e4..074cf7ce971c 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
@@ -320,7 +320,9 @@ 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.begin_transaction][] was set in
+   * Set only when
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * was set in
    * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
    * 
    
    *
@@ -2108,7 +2110,9 @@ public java.util.List getDeferredBuilderLis
      * 
          * The identifier of the transaction that was started as part of this Lookup
      * request.
-     * Set only when [ReadOptions.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
      * 
    
      *
@@ -2126,7 +2130,9 @@ public com.google.protobuf.ByteString getTransaction() {
      * 
          * The identifier of the transaction that was started as part of this Lookup
      * request.
-     * Set only when [ReadOptions.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
      * 
    
      *
@@ -2150,7 +2156,9 @@ 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.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
      * 
    
      *
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 8a0228282d04..d9ac2be8a0c9 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,7 +212,9 @@ public interface LookupResponseOrBuilder
    * 
        * The identifier of the transaction that was started as part of this Lookup
    * request.
-   * Set only when [ReadOptions.begin_transaction][] was set in
+   * Set only when
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * was set in
    * [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
    * 
    
    *
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 2155b3647be8..a9048026a37b 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
@@ -136,6 +136,52 @@ public long getVersion() {
     return version_;
   }
 
+  public static final int CREATE_TIME_FIELD_NUMBER = 7;
+  private com.google.protobuf.Timestamp createTime_;
+  /**
+   *
+   *
+   * 
    +   * The create time of the entity. This field will not be set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 7;
+   *
+   * @return Whether the createTime field is set.
+   */
+  @java.lang.Override
+  public boolean hasCreateTime() {
+    return createTime_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * The create time of the entity. This field will not be set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 7;
+   *
+   * @return The createTime.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Timestamp getCreateTime() {
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The create time of the entity. This field will not be set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 7;
+   */
+  @java.lang.Override
+  public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+  }
+
   public static final int UPDATE_TIME_FIELD_NUMBER = 6;
   private com.google.protobuf.Timestamp updateTime_;
   /**
@@ -236,6 +282,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateTime_ != null) {
       output.writeMessage(6, getUpdateTime());
     }
+    if (createTime_ != null) {
+      output.writeMessage(7, getCreateTime());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -257,6 +306,9 @@ public int getSerializedSize() {
     if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getUpdateTime());
     }
+    if (createTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getCreateTime());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -277,6 +329,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getKey().equals(other.getKey())) return false;
     }
     if (getVersion() != other.getVersion()) return false;
+    if (hasCreateTime() != other.hasCreateTime()) return false;
+    if (hasCreateTime()) {
+      if (!getCreateTime().equals(other.getCreateTime())) return false;
+    }
     if (hasUpdateTime() != other.hasUpdateTime()) return false;
     if (hasUpdateTime()) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
@@ -299,6 +355,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
+    if (hasCreateTime()) {
+      hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCreateTime().hashCode();
+    }
     if (hasUpdateTime()) {
       hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateTime().hashCode();
@@ -450,6 +510,11 @@ public Builder clear() {
         keyBuilder_ = null;
       }
       version_ = 0L;
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
+        createTimeBuilder_ = null;
+      }
       updateTime_ = null;
       if (updateTimeBuilder_ != null) {
         updateTimeBuilder_.dispose();
@@ -499,9 +564,12 @@ private void buildPartial0(com.google.datastore.v1.MutationResult result) {
         result.version_ = version_;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
         result.conflictDetected_ = conflictDetected_;
       }
     }
@@ -557,6 +625,9 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) {
       if (other.getVersion() != 0L) {
         setVersion(other.getVersion());
       }
+      if (other.hasCreateTime()) {
+        mergeCreateTime(other.getCreateTime());
+      }
       if (other.hasUpdateTime()) {
         mergeUpdateTime(other.getUpdateTime());
       }
@@ -604,15 +675,21 @@ public Builder mergeFrom(
             case 40:
               {
                 conflictDetected_ = input.readBool();
-                bitField0_ |= 0x00000008;
+                bitField0_ |= 0x00000010;
                 break;
               } // case 40
             case 50:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+                bitField0_ |= 0x00000008;
                 break;
               } // case 50
+            case 58:
+              {
+                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 58
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -884,6 +961,189 @@ public Builder clearVersion() {
       return this;
     }
 
+    private com.google.protobuf.Timestamp createTime_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        createTimeBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     *
+     * @return Whether the createTime field is set.
+     */
+    public boolean hasCreateTime() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     *
+     * @return The createTime.
+     */
+    public com.google.protobuf.Timestamp getCreateTime() {
+      if (createTimeBuilder_ == null) {
+        return createTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : createTime_;
+      } else {
+        return createTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     */
+    public Builder setCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        createTime_ = value;
+      } else {
+        createTimeBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     */
+    public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (createTimeBuilder_ == null) {
+        createTime_ = builderForValue.build();
+      } else {
+        createTimeBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     */
+    public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (((bitField0_ & 0x00000004) != 0)
+            && createTime_ != null
+            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          getCreateTimeBuilder().mergeFrom(value);
+        } else {
+          createTime_ = value;
+        }
+      } else {
+        createTimeBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     */
+    public Builder clearCreateTime() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      createTime_ = null;
+      if (createTimeBuilder_ != null) {
+        createTimeBuilder_.dispose();
+        createTimeBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     */
+    public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return getCreateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     */
+    public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+      if (createTimeBuilder_ != null) {
+        return createTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return createTime_ == null
+            ? com.google.protobuf.Timestamp.getDefaultInstance()
+            : createTime_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The create time of the entity. This field will not be set after a 'delete'.
+     * 
    
+     *
+     * .google.protobuf.Timestamp create_time = 7;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getCreateTimeFieldBuilder() {
+      if (createTimeBuilder_ == null) {
+        createTimeBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Timestamp,
+                com.google.protobuf.Timestamp.Builder,
+                com.google.protobuf.TimestampOrBuilder>(
+                getCreateTime(), getParentForChildren(), isClean());
+        createTime_ = null;
+      }
+      return createTimeBuilder_;
+    }
+
     private com.google.protobuf.Timestamp updateTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -905,7 +1165,7 @@ public Builder clearVersion() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      *
@@ -951,7 +1211,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -973,7 +1233,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -991,7 +1251,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
+        if (((bitField0_ & 0x00000008) != 0)
             && updateTime_ != null
             && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getUpdateTimeBuilder().mergeFrom(value);
@@ -1001,7 +1261,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1018,7 +1278,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp update_time = 6;
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000008);
       updateTime_ = null;
       if (updateTimeBuilder_ != null) {
         updateTimeBuilder_.dispose();
@@ -1040,7 +1300,7 @@ public Builder clearUpdateTime() {
      * .google.protobuf.Timestamp update_time = 6;
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -1127,7 +1387,7 @@ public boolean getConflictDetected() {
     public Builder setConflictDetected(boolean value) {
 
       conflictDetected_ = value;
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1144,7 +1404,7 @@ public Builder setConflictDetected(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearConflictDetected() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000010);
       conflictDetected_ = false;
       onChanged();
       return this;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 03f686a2cb28..948e91c0c8b9 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -78,6 +78,41 @@ public interface MutationResultOrBuilder
    */
   long getVersion();
 
+  /**
+   *
+   *
+   * 
    +   * The create time of the entity. This field will not be set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 7;
+   *
+   * @return Whether the createTime field is set.
+   */
+  boolean hasCreateTime();
+  /**
+   *
+   *
+   * 
    +   * The create time of the entity. This field will not be set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 7;
+   *
+   * @return The createTime.
+   */
+  com.google.protobuf.Timestamp getCreateTime();
+  /**
+   *
+   *
+   * 
    +   * The create time of the entity. This field will not be set after a 'delete'.
+   * 
    
+   *
+   * .google.protobuf.Timestamp create_time = 7;
+   */
+  com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder();
+
   /**
    *
    *
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 63000bf290cd..dd0daeac4bcb 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
@@ -36,7 +36,8 @@
  * 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 an active state.
+ * Reads and writes of foreign partition IDs may fail if the project is not in
+ * an active state.
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.PartitionId}
@@ -431,7 +432,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 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 an active state.
+   * Reads and writes of foreign partition IDs may fail if the project is not in
+   * an active state.
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.PartitionId}
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 6274b8ba0952..042d0487fe13 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
@@ -178,6 +178,7 @@ 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.
      * 
    
      *
      * HAS_ANCESTOR = 11;
@@ -301,6 +302,7 @@ 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.
      * 
    
      *
      * HAS_ANCESTOR = 11;
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 f454c9226567..d86241bc7462 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
@@ -104,85 +104,86 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "e.datastore.v1\032\037google/api/field_behavio"
           + "r.proto\032 google/datastore/v1/entity.prot"
           + "o\032\037google/protobuf/timestamp.proto\032\036goog"
-          + "le/protobuf/wrappers.proto\"\340\001\n\014EntityRes"
+          + "le/protobuf/wrappers.proto\"\221\002\n\014EntityRes"
           + "ult\022+\n\006entity\030\001 \001(\0132\033.google.datastore.v"
-          + "1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013update_time"
-          + "\030\005 \001(\0132\032.google.protobuf.Timestamp\022\016\n\006cu"
-          + "rsor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESULT_TYPE_"
-          + "UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJECTION\020\002\022"
-          + "\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojection\030\002 "
-          + "\003(\0132\037.google.datastore.v1.Projection\0221\n\004"
-          + "kind\030\003 \003(\0132#.google.datastore.v1.KindExp"
-          + "ression\022+\n\006filter\030\004 \001(\0132\033.google.datasto"
-          + "re.v1.Filter\0221\n\005order\030\005 \003(\0132\".google.dat"
-          + "astore.v1.PropertyOrder\022;\n\013distinct_on\030\006"
-          + " \003(\0132&.google.datastore.v1.PropertyRefer"
-          + "ence\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend_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\020Aggregati"
-          + "onQuery\0222\n\014nested_query\030\001 \001(\0132\032.google.d"
-          + "atastore.v1.QueryH\000\022L\n\014aggregations\030\003 \003("
-          + "\01321.google.datastore.v1.AggregationQuery"
-          + ".AggregationB\003\340A\001\032\261\001\n\013Aggregation\022H\n\005cou"
-          + "nt\030\001 \001(\01327.google.datastore.v1.Aggregati"
-          + "onQuery.Aggregation.CountH\000\022\022\n\005alias\030\007 \001"
-          + "(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001(\0132\033.google"
-          + ".protobuf.Int64ValueB\003\340A\001B\n\n\010operatorB\014\n"
-          + "\nquery_type\"\036\n\016KindExpression\022\014\n\004name\030\001 "
-          + "\001(\t\"!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F"
-          + "\n\nProjection\0228\n\010property\030\001 \001(\0132&.google."
-          + "datastore.v1.PropertyReference\"\321\001\n\rPrope"
-          + "rtyOrder\0228\n\010property\030\001 \001(\0132&.google.data"
-          + "store.v1.PropertyReference\022?\n\tdirection\030"
-          + "\002 \001(\0162,.google.datastore.v1.PropertyOrde"
-          + "r.Direction\"E\n\tDirection\022\031\n\025DIRECTION_UN"
-          + "SPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING"
-          + "\020\002\"\231\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132"
-          + "$.google.datastore.v1.CompositeFilterH\000\022"
-          + ">\n\017property_filter\030\002 \001(\0132#.google.datast"
-          + "ore.v1.PropertyFilterH\000B\r\n\013filter_type\"\251"
-          + "\001\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.google."
-          + "datastore.v1.CompositeFilter.Operator\022,\n"
-          + "\007filters\030\002 \003(\0132\033.google.datastore.v1.Fil"
-          + "ter\"-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020"
-          + "\000\022\007\n\003AND\020\001\"\352\002\n\016PropertyFilter\0228\n\010propert"
-          + "y\030\001 \001(\0132&.google.datastore.v1.PropertyRe"
-          + "ference\0228\n\002op\030\002 \001(\0162,.google.datastore.v"
-          + "1.PropertyFilter.Operator\022)\n\005value\030\003 \001(\013"
-          + "2\032.google.datastore.v1.Value\"\270\001\n\010Operato"
-          + "r\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_TH"
-          + "AN\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_ANCESTO"
-          + "R\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQuery\022\024\n\014query_st"
-          + "ring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016na"
-          + "med_bindings\030\005 \003(\01320.google.datastore.v1"
-          + ".GqlQuery.NamedBindingsEntry\022C\n\023position"
-          + "al_bindings\030\004 \003(\0132&.google.datastore.v1."
-          + "GqlQueryParameter\032\\\n\022NamedBindingsEntry\022"
-          + "\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.dat"
-          + "astore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQu"
-          + "eryParameter\022+\n\005value\030\002 \001(\0132\032.google.dat"
-          + "astore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016p"
-          + "arameter_type\"\215\004\n\020QueryResultBatch\022\027\n\017sk"
-          + "ipped_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.EntityResult.ResultType\0229\n"
-          + "\016entity_results\030\002 \003(\0132!.google.datastore"
-          + ".v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n\014"
-          + "more_results\030\005 \001(\01625.google.datastore.v1"
-          + ".QueryResultBatch.MoreResultsType\022\030\n\020sna"
-          + "pshot_version\030\007 \001(\003\022-\n\tread_time\030\010 \001(\0132\032"
-          + ".google.protobuf.Timestamp\"\230\001\n\017MoreResul"
-          + "tsType\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020"
-          + "\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTE"
-          + "R_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.dat"
-          + "astore.v1B\nQueryProtoP\001Z\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
    * The identifier of the transaction that was started as part of this
    * RunAggregationQuery request.
-   * Set only when [ReadOptions.begin_transaction][] was set in
+   * Set only when
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * was set in
    * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
    * 
    
    *
@@ -962,7 +964,9 @@ 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.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
      * 
    
      *
@@ -980,7 +984,9 @@ public com.google.protobuf.ByteString getTransaction() {
      * 
          * The identifier of the transaction that was started as part of this
      * RunAggregationQuery request.
-     * Set only when [ReadOptions.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
      * 
    
      *
@@ -1004,7 +1010,9 @@ 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.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
      * 
    
      *
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 52a191db0c63..4cd5e5a6d4c2 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,7 +99,9 @@ public interface RunAggregationQueryResponseOrBuilder
    * 
        * The identifier of the transaction that was started as part of this
    * RunAggregationQuery request.
-   * Set only when [ReadOptions.begin_transaction][] was set in
+   * Set only when
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * was set in
    * [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
    * 
    
    *
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 b24767ce6640..7104cd3aea99 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
@@ -168,7 +168,9 @@ 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.begin_transaction][] was set in
+   * Set only when
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * was set in
    * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
    * 
    
    *
@@ -951,7 +953,9 @@ 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.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
      * 
    
      *
@@ -969,7 +973,9 @@ public com.google.protobuf.ByteString getTransaction() {
      * 
          * The identifier of the transaction that was started as part of this
      * RunQuery request.
-     * Set only when [ReadOptions.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
      * 
    
      *
@@ -993,7 +999,9 @@ 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.begin_transaction][] was set in
+     * Set only when
+     * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+     * was set in
      * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
      * 
    
      *
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 b1a6793e04f0..4486a75a0577 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,7 +99,9 @@ public interface RunQueryResponseOrBuilder
    * 
        * The identifier of the transaction that was started as part of this
    * RunQuery request.
-   * Set only when [ReadOptions.begin_transaction][] was set in
+   * Set only when
+   * [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+   * was set in
    * [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
    * 
    
    *
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 0f9046c72e2a..4d2b24215bf9 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
@@ -409,8 +409,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
    *
    * 
        * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 
    
    *
    * string string_value = 17;
@@ -425,8 +425,8 @@ public boolean hasStringValue() {
    *
    * 
        * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 
    
    *
    * string string_value = 17;
@@ -454,8 +454,8 @@ public java.lang.String getStringValue() {
    *
    * 
        * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 
    
    *
    * string string_value = 17;
@@ -2199,8 +2199,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      *
      * 
          * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 
    
      *
      * string string_value = 17;
@@ -2216,8 +2216,8 @@ public boolean hasStringValue() {
      *
      * 
          * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 
    
      *
      * string string_value = 17;
@@ -2246,8 +2246,8 @@ public java.lang.String getStringValue() {
      *
      * 
          * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 
    
      *
      * string string_value = 17;
@@ -2276,8 +2276,8 @@ public com.google.protobuf.ByteString getStringValueBytes() {
      *
      * 
          * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 
    
      *
      * string string_value = 17;
@@ -2299,8 +2299,8 @@ public Builder setStringValue(java.lang.String value) {
      *
      * 
          * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 
    
      *
      * string string_value = 17;
@@ -2320,8 +2320,8 @@ public Builder clearStringValue() {
      *
      * 
          * A UTF-8 encoded string value.
-     * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-     * Otherwise, may be set to at most 1,000,000 bytes.
+     * When `exclude_from_indexes` is false (it is indexed) , may have at most
+     * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
      * 
    
      *
      * string string_value = 17;
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 340dd566221e..9cd695209eba 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
@@ -216,8 +216,8 @@ public interface ValueOrBuilder
    *
    * 
        * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 
    
    *
    * string string_value = 17;
@@ -230,8 +230,8 @@ public interface ValueOrBuilder
    *
    * 
        * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 
    
    *
    * string string_value = 17;
@@ -244,8 +244,8 @@ public interface ValueOrBuilder
    *
    * 
        * A UTF-8 encoded string value.
-   * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-   * Otherwise, may be set to at most 1,000,000 bytes.
+   * When `exclude_from_indexes` is false (it is indexed) , may have at most
+   * 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
    * 
    
    *
    * string string_value = 17;
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
index e9c1d49400ee..bbb5989e58c0 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
@@ -36,9 +36,10 @@ option ruby_package = "Google::Cloud::Datastore::V1";
 message AggregationResult {
   // 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 number of aggregation functions in the query.
+  // 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
+  // number of aggregation functions in the query.
   map aggregate_properties = 2;
 }
 
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 23a740ae4f25..2f9c7142771e 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
@@ -194,7 +194,9 @@ message LookupResponse {
   // The identifier of the transaction that was started as part of this Lookup
   // request.
   //
-  // Set only when [ReadOptions.begin_transaction][] was set in
+  // Set only when
+  // [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+  // was set in
   // [LookupRequest.read_options][google.datastore.v1.LookupRequest.read_options].
   bytes transaction = 5;
 
@@ -244,7 +246,9 @@ message RunQueryResponse {
   // The identifier of the transaction that was started as part of this
   // RunQuery request.
   //
-  // Set only when [ReadOptions.begin_transaction][] was set in
+  // Set only when
+  // [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+  // was set in
   // [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
   bytes transaction = 5;
 }
@@ -292,7 +296,9 @@ message RunAggregationQueryResponse {
   // The identifier of the transaction that was started as part of this
   // RunAggregationQuery request.
   //
-  // Set only when [ReadOptions.begin_transaction][] was set in
+  // Set only when
+  // [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
+  // was set in
   // [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
   bytes transaction = 5;
 }
@@ -378,8 +384,7 @@ message CommitRequest {
 
     // Options for beginning a new transaction for this request.
     // The transaction is committed when the request completes. If specified,
-    // [TransactionOptions.mode][google.datastore.v1.TransactionOptions.mode]
-    // must be
+    // [TransactionOptions.mode][google.datastore.v1.TransactionOptions] must be
     // [TransactionOptions.ReadWrite][google.datastore.v1.TransactionOptions.ReadWrite].
     TransactionOptions single_use_transaction = 10;
   }
@@ -517,6 +522,9 @@ message MutationResult {
   // than the version of any possible future entity.
   int64 version = 4;
 
+  // The create time of the entity. This field will not be set after a 'delete'.
+  google.protobuf.Timestamp create_time = 7;
+
   // The update time of the entity on the server after processing the mutation.
   // If the mutation doesn't change anything on the server, then the timestamp
   // will be the update timestamp of the current entity. This field will 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 010f1b3af839..ddf22e0322ae 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
@@ -46,7 +46,8 @@ option ruby_package = "Google::Cloud::Datastore::V1";
 //
 // 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 an active state.
+// Reads and writes of foreign partition IDs may fail if the project is not in
+// an active state.
 message PartitionId {
   // The ID of the project to which the entities belong.
   string project_id = 2;
@@ -159,8 +160,8 @@ message Value {
     Key key_value = 5;
 
     // A UTF-8 encoded string value.
-    // When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
-    // Otherwise, may be set to at most 1,000,000 bytes.
+    // When `exclude_from_indexes` is false (it is indexed) , may have at most
+    // 1500 bytes. Otherwise, may be set to at most 1,000,000 bytes.
     string string_value = 17;
 
     // A blob value.
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 b16806ef26d6..169af880185c 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
@@ -56,17 +56,23 @@ message EntityResult {
   // 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.
+  // 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.
+  // 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.
   int64 version = 4;
 
+  // The time at which the entity was created.
+  // This field is set for
+  // [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+  // If this entity is missing, this field will not be set.
+  google.protobuf.Timestamp create_time = 6;
+
   // The time at which the entity was last changed.
-  // This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity
-  // results.
+  // This field is set for
+  // [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
   // If this entity is missing, this field will not be set.
   google.protobuf.Timestamp update_time = 5;
 
@@ -118,7 +124,8 @@ message Query {
   google.protobuf.Int32Value limit = 12;
 }
 
-// Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+// Datastore query for running an aggregation over a
+// [Query][google.datastore.v1.Query].
 message AggregationQuery {
   // Defines a aggregation that produces a single result.
   message Aggregation {
@@ -127,7 +134,8 @@ message AggregationQuery {
     // The `COUNT(*)` aggregation function operates on the entire entity
     // so it does not require a field reference.
     message Count {
-      // Optional. Optional constraint on the maximum number of entities to count.
+      // 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.
@@ -146,7 +154,8 @@ message AggregationQuery {
       // Requires:
       //
       // * Must be non-negative when present.
-      google.protobuf.Int64Value up_to = 1 [(google.api.field_behavior) = OPTIONAL];
+      google.protobuf.Int64Value up_to = 1
+          [(google.api.field_behavior) = OPTIONAL];
     }
 
     // The type of aggregation to perform, required.
@@ -155,7 +164,8 @@ message AggregationQuery {
       Count count = 1;
     }
 
-    // Optional. Optional name of the property to store the result of the aggregation.
+    // 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_`. For example:
@@ -187,7 +197,8 @@ message AggregationQuery {
     // Requires:
     //
     // * Must be unique across all aggregation aliases.
-    // * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+    // * Conform to [entity property
+    // name][google.datastore.v1.Entity.properties] limitations.
     string alias = 7 [(google.api.field_behavior) = OPTIONAL];
   }
 
@@ -197,12 +208,14 @@ message AggregationQuery {
     Query nested_query = 1;
   }
 
-  // Optional. Series of aggregations to apply over the results of the `nested_query`.
+  // 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.
-  repeated Aggregation aggregations = 3 [(google.api.field_behavior) = OPTIONAL];
+  repeated Aggregation aggregations = 3
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
 // A representation of a kind.
@@ -266,6 +279,9 @@ message CompositeFilter {
 
     // The results are required to satisfy each of the combined filters.
     AND = 1;
+
+    // Documents are required to satisfy at least one of the combined filters.
+    OR = 2;
   }
 
   // The operator for combining multiple filters.
@@ -338,6 +354,7 @@ message PropertyFilter {
     // Requires:
     //
     // * That `value` is an entity key.
+    // * No other `HAS_ANCESTOR` is in the same query.
     HAS_ANCESTOR = 11;
 
     // The value of the `property` is not in the given array.

From ce8df48ca03e561642e996f9a022b5edd5cb76d9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 17 Feb 2023 15:38:07 +0000
Subject: [PATCH 1070/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.3.0 (#994)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index efe99f308c93..f85e2190cb7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.2.0
+        3.3.0
         pom
         import
       

From 619ef741be9258eaf981972b9a0ba385b7bcc857 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:30:12 +0000
Subject: [PATCH 1071/1784] chore(main): release 2.13.5 (#991)

:robot: I have created a release *beep* *boop*
---


## [2.13.5](https://togithub.com/googleapis/java-datastore/compare/v2.13.4...v2.13.5) (2023-02-17)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.3.0 ([#994](https://togithub.com/googleapis/java-datastore/issues/994)) ([ce8df48](https://togithub.com/googleapis/java-datastore/commit/ce8df48ca03e561642e996f9a022b5edd5cb76d9))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.20 ([#989](https://togithub.com/googleapis/java-datastore/issues/989)) ([f71ccd9](https://togithub.com/googleapis/java-datastore/commit/f71ccd94c5ed7c01f388d31dda17387d13496547))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.20 ([#990](https://togithub.com/googleapis/java-datastore/issues/990)) ([5e984c8](https://togithub.com/googleapis/java-datastore/commit/5e984c87fc95e18fb9a43ebd8d5dbafe7090c1cf))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  9 +++++++++
 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, 36 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf95ecc528ef..4e7b78853d9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [2.13.5](https://github.com/googleapis/java-datastore/compare/v2.13.4...v2.13.5) (2023-02-17)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.3.0 ([#994](https://github.com/googleapis/java-datastore/issues/994)) ([ce8df48](https://github.com/googleapis/java-datastore/commit/ce8df48ca03e561642e996f9a022b5edd5cb76d9))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.20 ([#989](https://github.com/googleapis/java-datastore/issues/989)) ([f71ccd9](https://github.com/googleapis/java-datastore/commit/f71ccd94c5ed7c01f388d31dda17387d13496547))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.20 ([#990](https://github.com/googleapis/java-datastore/issues/990)) ([5e984c8](https://github.com/googleapis/java-datastore/commit/5e984c87fc95e18fb9a43ebd8d5dbafe7090c1cf))
+
 ## [2.13.4](https://github.com/googleapis/java-datastore/compare/v2.13.3...v2.13.4) (2023-02-06)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 83e64d8b691d..0bd73168cd1d 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.13.5-SNAPSHOT
+  2.13.5
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5-SNAPSHOT
+    2.13.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3a3a13196d23..4b27cbcddb25 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.13.5-SNAPSHOT
+  2.13.5
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.5-SNAPSHOT
+        2.13.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.5-SNAPSHOT
+        2.13.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.5-SNAPSHOT
+        0.104.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.5-SNAPSHOT
+        2.13.5
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5a8bd005735d..3f3b4c325f22 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.5-SNAPSHOT
+  2.13.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5-SNAPSHOT
+    2.13.5
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index b6e6dd511099..49fee5cf0b4f 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.13.5-SNAPSHOT
+  2.13.5
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5-SNAPSHOT
+    2.13.5
   
   
     
diff --git a/pom.xml b/pom.xml
index f85e2190cb7c..5183f87e419a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.5-SNAPSHOT
+  2.13.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.5-SNAPSHOT
+        2.13.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.5-SNAPSHOT
+        2.13.5
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.5-SNAPSHOT
+        2.13.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.5-SNAPSHOT
+        0.104.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.5-SNAPSHOT
+        2.13.5
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index e5c7a2b8c79a..0df47ea36658 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.13.5-SNAPSHOT
+  2.13.5
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5-SNAPSHOT
+    2.13.5
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2f693d9413f2..5595c4c4512f 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.104.5-SNAPSHOT
+  0.104.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5-SNAPSHOT
+    2.13.5
   
   
     
diff --git a/versions.txt b/versions.txt
index 484ba6f4965a..45de4563eea9 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.4:2.13.5-SNAPSHOT
-google-cloud-datastore-bom:2.13.4:2.13.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.104.4:0.104.5-SNAPSHOT
-datastore-v1-proto-client:2.13.4:2.13.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.13.4:2.13.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.13.4:2.13.5-SNAPSHOT
+google-cloud-datastore:2.13.5:2.13.5
+google-cloud-datastore-bom:2.13.5:2.13.5
+proto-google-cloud-datastore-v1:0.104.5:0.104.5
+datastore-v1-proto-client:2.13.5:2.13.5
+proto-google-cloud-datastore-admin-v1:2.13.5:2.13.5
+grpc-google-cloud-datastore-admin-v1:2.13.5:2.13.5

From a0e2597775da2338231f83e23902e4274a36612f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:32:15 +0000
Subject: [PATCH 1072/1784] chore(main): release 2.13.6-SNAPSHOT (#995)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 0bd73168cd1d..1fe3c5cf5409 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.13.5
+  2.13.6-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5
+    2.13.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4b27cbcddb25..567f3508ed2d 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.13.5
+  2.13.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.5
+        2.13.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.5
+        2.13.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.5
+        0.104.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.5
+        2.13.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3f3b4c325f22..3bf40003c90f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.5
+  2.13.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5
+    2.13.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 49fee5cf0b4f..6b3b5080c6c8 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.13.5
+  2.13.6-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5
+    2.13.6-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 5183f87e419a..5387ed468b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.5
+  2.13.6-SNAPSHOT
   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.13.5
+        2.13.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.5
+        2.13.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.5
+        2.13.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.5
+        0.104.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.5
+        2.13.6-SNAPSHOT
         
           
             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 0df47ea36658..9debae484104 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.13.5
+  2.13.6-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5
+    2.13.6-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 5595c4c4512f..2c257b5d0d73 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.104.5
+  0.104.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.5
+    2.13.6-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 45de4563eea9..fed5e976941d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.5:2.13.5
-google-cloud-datastore-bom:2.13.5:2.13.5
-proto-google-cloud-datastore-v1:0.104.5:0.104.5
-datastore-v1-proto-client:2.13.5:2.13.5
-proto-google-cloud-datastore-admin-v1:2.13.5:2.13.5
-grpc-google-cloud-datastore-admin-v1:2.13.5:2.13.5
+google-cloud-datastore:2.13.5:2.13.6-SNAPSHOT
+google-cloud-datastore-bom:2.13.5:2.13.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.104.5:0.104.6-SNAPSHOT
+datastore-v1-proto-client:2.13.5:2.13.6-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.13.5:2.13.6-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.13.5:2.13.6-SNAPSHOT

From d4402fff54891fe1cd4a338d2f3b946dd391cbba Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 22 Feb 2023 12:52:46 -0500
Subject: [PATCH 1073/1784] build(deps): update releasetool version for release
 scripts (#1768) (#997)

This should fix release script reporting back to the release PRs
Source-Link: https://github.com/googleapis/synthtool/commit/4c15ec0960687db8e6da43535fa1ee0e92fbb817
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e62f3ea524b11c1cd6ff7f80362736d86c0056631346b5b106a421686fce2726

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml |  2 +-
 .kokoro/requirements.in   |  2 +-
 .kokoro/requirements.txt  | 12 ++++++++----
 README.md                 |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 090264303f34..a5361a30a366 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1
+  digest: sha256:e62f3ea524b11c1cd6ff7f80362736d86c0056631346b5b106a421686fce2726
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index b19a8dbfdd5e..2092cc741d9c 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -1,5 +1,5 @@
 gcp-docuploader
-gcp-releasetool
+gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x
 wheel
 setuptools
 typing-extensions
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index cfadd22ce9b9..c80f0a87cc53 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes requirements.in
@@ -126,9 +126,9 @@ gcp-docuploader==0.6.4 \
     --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \
     --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf
     # via -r requirements.in
-gcp-releasetool==1.9.1 \
-    --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \
-    --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b
+gcp-releasetool==1.10.5 \
+    --hash=sha256:174b7b102d704b254f2a26a3eda2c684fd3543320ec239baf771542a2e58e109 \
+    --hash=sha256:e29d29927fe2ca493105a82958c6873bb2b90d503acac56be2c229e74de0eec9
     # via -r requirements.in
 google-api-core==2.8.2 \
     --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
@@ -374,6 +374,10 @@ secretstorage==3.3.3 \
     --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \
     --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99
     # via keyring
+setuptools==67.3.2 \
+    --hash=sha256:95f00380ef2ffa41d9bba85d95b27689d923c93dfbafed4aecd7cf988a25e012 \
+    --hash=sha256:bb6d8e508de562768f2027902929f8523932fcd1fb784e6d573d2cafac995a48
+    # via -r requirements.in
 six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
diff --git a/README.md b/README.md
index e47a300bbc97..cff601465f5a 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.13.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.13.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.5"
 ```
 
 ## Authentication

From b1fe7fb158faa3c53588e0350fd2b05cb8b2bbb8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 22 Feb 2023 17:53:04 +0000
Subject: [PATCH 1074/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.13.5 (#996)
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.13.5

* 🦉 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 cff601465f5a..31ad750385db 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.13.4
+  2.13.5
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 46a6c52a33d0..a381705d11ef 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.13.4
+      2.13.5
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7ab5a9f748fb..fa69d98ab6ce 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.13.4
+      2.13.5
     
 
     

From 413d3e386190fcb264d5a4e247849af601952c26 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 23 Feb 2023 22:24:25 +0000
Subject: [PATCH 1075/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.9.0 (#998)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.9.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 31ad750385db..89f92fb3f248 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.8.0
+      26.9.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.8.0')
+implementation platform('com.google.cloud:libraries-bom:26.9.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 58c46644567a..4b6a7c1268f2 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.8.0
+        26.9.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 3497fa5c3e71..dd85dbe7103e 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.8.0
+        26.9.0
         pom
         import
       

From 38c118a4ebf6066344e9ca31f6e51818a12aa4bc Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 27 Feb 2023 17:33:45 +0000
Subject: [PATCH 1076/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-compiler-plugin to v3.11.0 (#999)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5387ed468b54..34c565f54eb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,7 +232,7 @@
           
             org.apache.maven.plugins
             maven-compiler-plugin
-            3.10.1
+            3.11.0
             
               UTF-8
               true

From a230e030fadc11c72f6ced51e566d59439bc1c6e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 2 Mar 2023 14:49:04 +0000
Subject: [PATCH 1077/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.4.0 (#1001)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34c565f54eb5..456d88b71fcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.3.0
+        3.4.0
         pom
         import
       

From d1f44622c130ef442a6cabbe8856ccee29b1f3fb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 15:08:12 +0000
Subject: [PATCH 1078/1784] chore(main): release 2.13.6 (#1003)

:robot: I have created a release *beep* *boop*
---


## [2.13.6](https://togithub.com/googleapis/java-datastore/compare/v2.13.5...v2.13.6) (2023-03-02)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.4.0 ([#1001](https://togithub.com/googleapis/java-datastore/issues/1001)) ([a230e03](https://togithub.com/googleapis/java-datastore/commit/a230e030fadc11c72f6ced51e566d59439bc1c6e))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e7b78853d9d..c0983091f27a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.13.6](https://github.com/googleapis/java-datastore/compare/v2.13.5...v2.13.6) (2023-03-02)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.4.0 ([#1001](https://github.com/googleapis/java-datastore/issues/1001)) ([a230e03](https://github.com/googleapis/java-datastore/commit/a230e030fadc11c72f6ced51e566d59439bc1c6e))
+
 ## [2.13.5](https://github.com/googleapis/java-datastore/compare/v2.13.4...v2.13.5) (2023-02-17)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 1fe3c5cf5409..4d221dc94b36 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.13.6-SNAPSHOT
+  2.13.6
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6-SNAPSHOT
+    2.13.6
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 567f3508ed2d..4def934af36b 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.13.6-SNAPSHOT
+  2.13.6
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.6-SNAPSHOT
+        2.13.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.6-SNAPSHOT
+        2.13.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.6-SNAPSHOT
+        0.104.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.6-SNAPSHOT
+        2.13.6
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3bf40003c90f..07bc24261c7a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.6-SNAPSHOT
+  2.13.6
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6-SNAPSHOT
+    2.13.6
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 6b3b5080c6c8..5760f1fb4729 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.13.6-SNAPSHOT
+  2.13.6
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6-SNAPSHOT
+    2.13.6
   
   
     
diff --git a/pom.xml b/pom.xml
index 456d88b71fcf..a28b90efb2c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.6-SNAPSHOT
+  2.13.6
   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.13.6-SNAPSHOT
+        2.13.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.6-SNAPSHOT
+        2.13.6
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.6-SNAPSHOT
+        2.13.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.6-SNAPSHOT
+        0.104.6
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.6-SNAPSHOT
+        2.13.6
         
           
             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 9debae484104..3af47a555aec 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.13.6-SNAPSHOT
+  2.13.6
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6-SNAPSHOT
+    2.13.6
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2c257b5d0d73..7eaf52e968b2 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.104.6-SNAPSHOT
+  0.104.6
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6-SNAPSHOT
+    2.13.6
   
   
     
diff --git a/versions.txt b/versions.txt
index fed5e976941d..5da972877de6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.5:2.13.6-SNAPSHOT
-google-cloud-datastore-bom:2.13.5:2.13.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.104.5:0.104.6-SNAPSHOT
-datastore-v1-proto-client:2.13.5:2.13.6-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.13.5:2.13.6-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.13.5:2.13.6-SNAPSHOT
+google-cloud-datastore:2.13.6:2.13.6
+google-cloud-datastore-bom:2.13.6:2.13.6
+proto-google-cloud-datastore-v1:0.104.6:0.104.6
+datastore-v1-proto-client:2.13.6:2.13.6
+proto-google-cloud-datastore-admin-v1:2.13.6:2.13.6
+grpc-google-cloud-datastore-admin-v1:2.13.6:2.13.6

From aa57b712f7b9b5043f17ecedc6b92446ec632c81 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 15:58:12 +0000
Subject: [PATCH 1079/1784] chore(main): release 2.13.7-SNAPSHOT (#1004)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4d221dc94b36..43f0e064bb5d 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.13.6
+  2.13.7-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6
+    2.13.7-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4def934af36b..887ec025f5c4 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.13.6
+  2.13.7-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.6
+        2.13.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.6
+        2.13.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.6
+        0.104.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.6
+        2.13.7-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 07bc24261c7a..4b850a79fc02 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.6
+  2.13.7-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6
+    2.13.7-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 5760f1fb4729..4c333844965e 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.13.6
+  2.13.7-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6
+    2.13.7-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index a28b90efb2c1..f288f7dba84d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.6
+  2.13.7-SNAPSHOT
   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.13.6
+        2.13.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.6
+        2.13.7-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.6
+        2.13.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.6
+        0.104.7-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.6
+        2.13.7-SNAPSHOT
         
           
             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 3af47a555aec..f408d15b9d4a 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.13.6
+  2.13.7-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6
+    2.13.7-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7eaf52e968b2..7e1e7f3454d9 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.104.6
+  0.104.7-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.6
+    2.13.7-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 5da972877de6..afff0e279348 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.6:2.13.6
-google-cloud-datastore-bom:2.13.6:2.13.6
-proto-google-cloud-datastore-v1:0.104.6:0.104.6
-datastore-v1-proto-client:2.13.6:2.13.6
-proto-google-cloud-datastore-admin-v1:2.13.6:2.13.6
-grpc-google-cloud-datastore-admin-v1:2.13.6:2.13.6
+google-cloud-datastore:2.13.6:2.13.7-SNAPSHOT
+google-cloud-datastore-bom:2.13.6:2.13.7-SNAPSHOT
+proto-google-cloud-datastore-v1:0.104.6:0.104.7-SNAPSHOT
+datastore-v1-proto-client:2.13.6:2.13.7-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.13.6:2.13.7-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.13.6:2.13.7-SNAPSHOT

From 3e155e60b6ce697fda6e31abc1b243c71e24b876 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 7 Mar 2023 14:47:23 +0000
Subject: [PATCH 1080/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.13.6 (#1005)
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.13.6

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 89f92fb3f248..3c41abbdc793 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.13.5
+  2.13.6
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.13.5'
+implementation 'com.google.cloud:google-cloud-datastore:2.13.6'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.6"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a381705d11ef..bcfc25e97c84 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.13.5
+      2.13.6
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fa69d98ab6ce..a17839a06788 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.13.5
+      2.13.6
     
 
     

From 99b784332919ccc813a94ba17beaaa11b02b1c8e Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 8 Mar 2023 10:48:12 -0500
Subject: [PATCH 1081/1784] feat: OR query support (#993)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 README.md                                     |  2 +-
 .../cloud/datastore/StructuredQuery.java      |  8 ++
 .../cloud/datastore/SerializationTest.java    | 14 +++
 .../cloud/datastore/StructuredQueryTest.java  | 21 ++--
 .../cloud/datastore/it/ITDatastoreTest.java   | 95 +++++++++++++++++++
 5 files changed, 133 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3c41abbdc793..650f21f7c9ea 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.9.0')
+implementation platform('com.google.cloud:libraries-bom:26.10.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index b394dcd973d3..a6195ad272b4 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -26,6 +26,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.cloud.StringEnumType;
 import com.google.cloud.StringEnumValue;
@@ -151,6 +152,8 @@ public Operator apply(String constant) {
 
       static final Operator AND = type.createAndRegister("AND");
 
+      static final Operator OR = type.createAndRegister("OR");
+
       com.google.datastore.v1.CompositeFilter.Operator toPb() {
         return com.google.datastore.v1.CompositeFilter.Operator.valueOf(name());
       }
@@ -231,6 +234,11 @@ public static CompositeFilter and(Filter first, Filter... other) {
       return new CompositeFilter(Operator.AND, first, other);
     }
 
+    @BetaApi
+    public static CompositeFilter or(Filter first, Filter... other) {
+      return new CompositeFilter(Operator.OR, first, other);
+    }
+
     @Override
     com.google.datastore.v1.Filter toPb() {
       com.google.datastore.v1.Filter.Builder filterPb = com.google.datastore.v1.Filter.newBuilder();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
index 105386515781..1b8186a5482c 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
@@ -69,6 +69,19 @@ public class SerializationTest extends BaseSerializationTest {
           .addDistinctOn("p")
           .addOrderBy(OrderBy.asc("p"))
           .build();
+  private static final Query QUERY4 =
+      Query.newProjectionEntityQueryBuilder()
+          .setKind("k")
+          .setNamespace("ns1")
+          .addProjection("p")
+          .setLimit(100)
+          .setOffset(5)
+          .setStartCursor(CURSOR1)
+          .setEndCursor(CURSOR2)
+          .setFilter(CompositeFilter.or(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v")))
+          .addDistinctOn("p")
+          .addOrderBy(OrderBy.asc("p"))
+          .build();
   private static final KeyValue KEY_VALUE = KeyValue.of(KEY1);
   private static final NullValue NULL_VALUE =
       NullValue.newBuilder().setExcludeFromIndexes(true).build();
@@ -136,6 +149,7 @@ protected java.io.Serializable[] serializableObjects() {
       QUERY1,
       QUERY2,
       QUERY3,
+      QUERY4,
       NULL_VALUE,
       KEY_VALUE,
       STRING_VALUE,
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
index b3f4b944ad39..c593375868d3 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
@@ -37,8 +37,10 @@ public class StructuredQueryTest {
   private static final Cursor END_CURSOR = Cursor.copyFrom(new byte[] {10});
   private static final int OFFSET = 42;
   private static final Integer LIMIT = 43;
-  private static final Filter FILTER =
+  private static final Filter AND_FILTER =
       CompositeFilter.and(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v"));
+  private static final Filter OR_FILTER =
+      CompositeFilter.or(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v"));
   private static final OrderBy ORDER_BY_1 = OrderBy.asc("p2");
   private static final OrderBy ORDER_BY_2 = OrderBy.desc("p3");
   private static final List ORDER_BY = ImmutableList.of(ORDER_BY_1, ORDER_BY_2);
@@ -56,7 +58,7 @@ public class StructuredQueryTest {
           .setEndCursor(END_CURSOR)
           .setOffset(OFFSET)
           .setLimit(LIMIT)
-          .setFilter(FILTER)
+          .setFilter(AND_FILTER)
           .setOrderBy(ORDER_BY_1, ORDER_BY_2)
           .build();
   private static final KeyQuery KEY_QUERY =
@@ -67,7 +69,7 @@ public class StructuredQueryTest {
           .setEndCursor(END_CURSOR)
           .setOffset(OFFSET)
           .setLimit(LIMIT)
-          .setFilter(FILTER)
+          .setFilter(OR_FILTER)
           .setOrderBy(ORDER_BY_1, ORDER_BY_2)
           .build();
   private static final ProjectionEntityQuery PROJECTION_QUERY =
@@ -78,7 +80,7 @@ public class StructuredQueryTest {
           .setEndCursor(END_CURSOR)
           .setOffset(OFFSET)
           .setLimit(LIMIT)
-          .setFilter(FILTER)
+          .setFilter(AND_FILTER)
           .setOrderBy(ORDER_BY_1, ORDER_BY_2)
           .setProjection(PROJECTION1, PROJECTION2)
           .setDistinctOn(DISTINCT_ON1, DISTINCT_ON2)
@@ -93,7 +95,14 @@ public void testEntityQueryBuilder() {
 
   @Test
   public void testKeyQueryBuilder() {
-    compareBaseBuilderFields(KEY_QUERY);
+    assertEquals(NAMESPACE, KEY_QUERY.getNamespace());
+    assertEquals(KIND, KEY_QUERY.getKind());
+    assertEquals(START_CURSOR, KEY_QUERY.getStartCursor());
+    assertEquals(END_CURSOR, KEY_QUERY.getEndCursor());
+    assertEquals(OFFSET, KEY_QUERY.getOffset());
+    assertEquals(LIMIT, KEY_QUERY.getLimit());
+    assertEquals(OR_FILTER, KEY_QUERY.getFilter());
+    assertEquals(ORDER_BY, KEY_QUERY.getOrderBy());
     assertEquals(ImmutableList.of(StructuredQuery.KEY_PROPERTY_NAME), KEY_QUERY.getProjection());
     assertTrue(KEY_QUERY.getDistinctOn().isEmpty());
   }
@@ -112,7 +121,7 @@ private void compareBaseBuilderFields(StructuredQuery query) {
     assertEquals(END_CURSOR, query.getEndCursor());
     assertEquals(OFFSET, query.getOffset());
     assertEquals(LIMIT, query.getLimit());
-    assertEquals(FILTER, query.getFilter());
+    assertEquals(AND_FILTER, query.getFilter());
     assertEquals(ORDER_BY, query.getOrderBy());
   }
 
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 b8c3bb4b6f29..f010d8135f93 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
@@ -59,6 +59,7 @@
 import com.google.cloud.datastore.ReadOption;
 import com.google.cloud.datastore.StringValue;
 import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
 import com.google.cloud.datastore.StructuredQuery.OrderBy;
 import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.cloud.datastore.TimestampValue;
@@ -223,6 +224,85 @@ private  List makeResultsCopy(QueryResults scResults) {
     return results;
   }
 
+  @Test
+  public void orQuery() {
+    Key key = Key.newBuilder(KEY1, KIND2, 2).build();
+    Entity entity3 =
+        Entity.newBuilder(ENTITY1)
+            .setKey(key)
+            .remove("str")
+            .set("name", "Dan")
+            .setNull("null")
+            .set("age", 19)
+            .build();
+    DATASTORE.put(entity3);
+
+    // age == 19 || age == 20
+    CompositeFilter orFilter =
+        CompositeFilter.or(PropertyFilter.eq("age", 19), PropertyFilter.eq("age", 20));
+    Query simpleOrQuery =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setKind(KIND2)
+            .setFilter(orFilter)
+            .build();
+    QueryResults results = DATASTORE.run(simpleOrQuery);
+    assertTrue(results.hasNext());
+    assertEquals(ENTITY2, results.next());
+    assertTrue(results.hasNext());
+    assertEquals(entity3, results.next());
+    assertFalse(results.hasNext());
+
+    // age == 19 || age == 20 with limit of 1
+    Query simpleOrQueryLimit =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setKind(KIND2)
+            .setFilter(orFilter)
+            .setLimit(1)
+            .build();
+    QueryResults results2 = DATASTORE.run(simpleOrQueryLimit);
+    assertTrue(results2.hasNext());
+    assertEquals(ENTITY2, results2.next());
+    assertFalse(results2.hasNext());
+
+    // (age == 18 && name == Dan) || (age == 20 && name == Dan)
+    CompositeFilter nestedOr =
+        CompositeFilter.or(
+            CompositeFilter.and(PropertyFilter.eq("age", 18), PropertyFilter.eq("name", "Dan")),
+            CompositeFilter.and(PropertyFilter.eq("age", 20), PropertyFilter.eq("name", "Dan")));
+    CompositeFilter compositeFilter =
+        CompositeFilter.and(PropertyFilter.hasAncestor(ROOT_KEY), nestedOr);
+    Query orQueryNested =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setKind(KIND2)
+            .setFilter(compositeFilter)
+            .build();
+    QueryResults results3 = DATASTORE.run(orQueryNested);
+    assertTrue(results3.hasNext());
+    assertEquals(ENTITY2, results3.next());
+    assertFalse(results3.hasNext());
+
+    // age == 20 && (name == Bob || name == Dan)
+    CompositeFilter nestedOr2 =
+        CompositeFilter.or(PropertyFilter.eq("name", "Dan"), PropertyFilter.eq("name", "Bob"));
+    CompositeFilter andFilter = CompositeFilter.and(PropertyFilter.eq("age", 20), nestedOr2);
+    CompositeFilter ancestorAndFilter =
+        CompositeFilter.and(PropertyFilter.hasAncestor(ROOT_KEY), andFilter);
+    Query orQueryNested2 =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setKind(KIND2)
+            .setFilter(ancestorAndFilter)
+            .setLimit(1)
+            .build();
+    QueryResults results4 = DATASTORE.run(orQueryNested2);
+    assertTrue(results4.hasNext());
+    assertEquals(ENTITY2, results4.next());
+    assertFalse(results4.hasNext());
+  }
+
   @Test
   public void testNewTransactionCommit() {
     Transaction transaction = DATASTORE.newTransaction();
@@ -946,6 +1026,21 @@ public void testInNotInNeqFilters() throws InterruptedException {
     assertEquals(e2, resultNeq.next());
     assertFalse(resultNeq.hasNext());
 
+    Query scQueryInEqOr =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND1)
+            .setFilter(
+                CompositeFilter.or(
+                    PropertyFilter.in("v_int", ListValue.of(10, 50000)),
+                    PropertyFilter.eq("v_int", 10000)))
+            .build();
+
+    QueryResults run = DATASTORE.run(scQueryInEqOr);
+
+    assertTrue(run.hasNext());
+    assertEquals(e1, run.next());
+    assertFalse(run.hasNext());
+
     DATASTORE.delete(e1.getKey());
     DATASTORE.delete(e2.getKey());
   }

From a999a660af232a8a78b192d6219aeb7ebd928cff Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 8 Mar 2023 16:12:13 +0000
Subject: [PATCH 1082/1784] chore(main): release 2.14.0 (#1014)

:robot: I have created a release *beep* *boop*
---


## [2.14.0](https://togithub.com/googleapis/java-datastore/compare/v2.13.6...v2.14.0) (2023-03-08)


### Features

* OR query support ([#993](https://togithub.com/googleapis/java-datastore/issues/993)) ([99b7843](https://togithub.com/googleapis/java-datastore/commit/99b784332919ccc813a94ba17beaaa11b02b1c8e))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0983091f27a..8c27d2c2c8ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.14.0](https://github.com/googleapis/java-datastore/compare/v2.13.6...v2.14.0) (2023-03-08)
+
+
+### Features
+
+* OR query support ([#993](https://github.com/googleapis/java-datastore/issues/993)) ([99b7843](https://github.com/googleapis/java-datastore/commit/99b784332919ccc813a94ba17beaaa11b02b1c8e))
+
 ## [2.13.6](https://github.com/googleapis/java-datastore/compare/v2.13.5...v2.13.6) (2023-03-02)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 43f0e064bb5d..fb4b87dfa19e 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.13.7-SNAPSHOT
+  2.14.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.7-SNAPSHOT
+    2.14.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 887ec025f5c4..d98acb0f63ca 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.13.7-SNAPSHOT
+  2.14.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.13.7-SNAPSHOT
+        2.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.7-SNAPSHOT
+        2.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.7-SNAPSHOT
+        0.105.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.13.7-SNAPSHOT
+        2.14.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4b850a79fc02..f12a5adffdc3 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.13.7-SNAPSHOT
+  2.14.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.7-SNAPSHOT
+    2.14.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 4c333844965e..723047e682bd 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.13.7-SNAPSHOT
+  2.14.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.7-SNAPSHOT
+    2.14.0
   
   
     
diff --git a/pom.xml b/pom.xml
index f288f7dba84d..d37c756823b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.13.7-SNAPSHOT
+  2.14.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.13.7-SNAPSHOT
+        2.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.13.7-SNAPSHOT
+        2.14.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.13.7-SNAPSHOT
+        2.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.104.7-SNAPSHOT
+        0.105.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.13.7-SNAPSHOT
+        2.14.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 f408d15b9d4a..a3de14a2974d 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.13.7-SNAPSHOT
+  2.14.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.7-SNAPSHOT
+    2.14.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7e1e7f3454d9..31d143ac2771 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.104.7-SNAPSHOT
+  0.105.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.13.7-SNAPSHOT
+    2.14.0
   
   
     
diff --git a/versions.txt b/versions.txt
index afff0e279348..c7c7341079e6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.13.6:2.13.7-SNAPSHOT
-google-cloud-datastore-bom:2.13.6:2.13.7-SNAPSHOT
-proto-google-cloud-datastore-v1:0.104.6:0.104.7-SNAPSHOT
-datastore-v1-proto-client:2.13.6:2.13.7-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.13.6:2.13.7-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.13.6:2.13.7-SNAPSHOT
+google-cloud-datastore:2.14.0:2.14.0
+google-cloud-datastore-bom:2.14.0:2.14.0
+proto-google-cloud-datastore-v1:0.105.0:0.105.0
+datastore-v1-proto-client:2.14.0:2.14.0
+proto-google-cloud-datastore-admin-v1:2.14.0:2.14.0
+grpc-google-cloud-datastore-admin-v1:2.14.0:2.14.0

From fc66d58d4a277149bc3b72147f419e0de3a6b735 Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Wed, 8 Mar 2023 22:08:13 +0530
Subject: [PATCH 1083/1784] =?UTF-8?q?fix:=20flaky=20test=20com.google.data?=
 =?UTF-8?q?store.snippets.ConceptsTest:=20testStale=E2=80=A6=20(#1012)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #905  ☕️

Please follow the explanation in comment https://togithub.com/googleapis/java-datastore/issues/905#issuecomment-1460077763.
---
 .../datastore/snippets/ConceptsTest.java      | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 4013dbe04fda..1397728ba719 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -34,6 +34,7 @@
 import com.google.cloud.datastore.IncompleteKey;
 import com.google.cloud.datastore.Key;
 import com.google.cloud.datastore.KeyFactory;
+import com.google.cloud.datastore.KeyQuery;
 import com.google.cloud.datastore.ListValue;
 import com.google.cloud.datastore.PathElement;
 import com.google.cloud.datastore.ProjectionEntity;
@@ -65,7 +66,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -129,6 +132,13 @@ public void setUp() {
     datastoreRealBackend = DatastoreOptions.getDefaultInstance().getService();
   }
 
+  @After
+  public void tearDown() throws Exception {
+    KeyQuery taskQuery = Query.newKeyQueryBuilder().setKind("Task").build();
+    Key[] taskKeysToDelete = Iterators.toArray(datastoreRealBackend.run(taskQuery), Key.class);
+    datastoreRealBackend.delete(taskKeysToDelete);
+  }
+
   /**
    * Stops the local Datastore emulator.
    *
@@ -1147,8 +1157,10 @@ public void testInQuerySorted() {
   }
 
   @Test
-  public void testStaleReads() {
+  public void testStaleReads() throws InterruptedException {
     setUpQueryTestsRealBackend();
+    // waiting for 6 seconds, so that we can query with read time of 5 seconds ago
+    TimeUnit.SECONDS.sleep(6);
     Datastore datastoreClient = datastoreRealBackend;
     // [START datastore_stale_read]
     Key taskKey =
@@ -1158,10 +1170,10 @@ public void testStaleReads() {
             .addAncestors(PathElement.of("TaskList", "default"))
             .newKey("someTask");
 
-    Timestamp fifteenSecondsAgo =
-        Timestamp.ofTimeSecondsAndNanos(Timestamp.now().getSeconds() - 15L, 0);
-    // Create a readOption with read time fifteenSecondsAgo
-    ReadOption readOption = ReadOption.readTime(fifteenSecondsAgo);
+    Timestamp fiveSecondsAgo =
+        Timestamp.ofTimeSecondsAndNanos(Timestamp.now().getSeconds() - 5L, 0);
+    // Create a readOption with read time fiveSecondsAgo
+    ReadOption readOption = ReadOption.readTime(fiveSecondsAgo);
     // Use the readOption to Fetch entity
     Entity entity = datastoreClient.get(taskKey, readOption);
 

From 544a4b22493118244209cf822a6bbcde50ec18c4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 8 Mar 2023 17:30:12 +0000
Subject: [PATCH 1084/1784] chore(main): release 2.14.1-SNAPSHOT (#1015)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index fb4b87dfa19e..6800c188acae 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.0
+  2.14.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.0
+    2.14.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d98acb0f63ca..b62a71667533 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.0
+  2.14.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.0
+        2.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.0
+        2.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.0
+        0.105.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.0
+        2.14.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f12a5adffdc3..f4f252252066 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.0
+  2.14.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.0
+    2.14.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 723047e682bd..d1d691aaabaf 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.0
+  2.14.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.0
+    2.14.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index d37c756823b3..20ada40481f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.0
+  2.14.1-SNAPSHOT
   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.0
+        2.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.0
+        2.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.0
+        2.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.0
+        0.105.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.0
+        2.14.1-SNAPSHOT
         
           
             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 a3de14a2974d..02d62015d264 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.0
+  2.14.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.0
+    2.14.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 31d143ac2771..a6a5160015eb 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.0
+  0.105.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.0
+    2.14.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index c7c7341079e6..c8e599aa52e7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.0:2.14.0
-google-cloud-datastore-bom:2.14.0:2.14.0
-proto-google-cloud-datastore-v1:0.105.0:0.105.0
-datastore-v1-proto-client:2.14.0:2.14.0
-proto-google-cloud-datastore-admin-v1:2.14.0:2.14.0
-grpc-google-cloud-datastore-admin-v1:2.14.0:2.14.0
+google-cloud-datastore:2.14.0:2.14.1-SNAPSHOT
+google-cloud-datastore-bom:2.14.0:2.14.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.105.0:0.105.1-SNAPSHOT
+datastore-v1-proto-client:2.14.0:2.14.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.14.0:2.14.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.14.0:2.14.1-SNAPSHOT

From 1d68872250afba12a899a06160b9015da044e5f0 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 8 Mar 2023 18:35:53 +0000
Subject: [PATCH 1085/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.0 (#1016)
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.14.0

* 🦉 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                           | 6 +++---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 650f21f7c9ea..35041a891e71 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.13.6
+  2.14.0
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.13.6'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.13.6"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.0"
 ```
 
 ## Authentication
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index bcfc25e97c84..55263138e454 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.13.6
+      2.14.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index a17839a06788..023a84abed22 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.13.6
+      2.14.0
     
 
     

From 019e1e439688d0280f05c81b51c34b840ffdd95c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 8 Mar 2023 18:36:11 +0000
Subject: [PATCH 1086/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.10.0 (#1013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.10.0

* 🦉 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/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 35041a891e71..052cc70706b8 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.9.0
+      26.10.0
       pom
       import
     
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 4b6a7c1268f2..4bf5bf100ef3 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.9.0
+        26.10.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index dd85dbe7103e..1929a106a4ad 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.9.0
+        26.10.0
         pom
         import
       

From 276174e26ff92be2bdeb24f733278d2042519cfd Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 8 Mar 2023 14:32:16 -0500
Subject: [PATCH 1087/1784] docs: fix broken README links (#1011)

Fixes #1000

update links, inline TESTING.md content (used to be located in google-cloud-java, the file has since been removed)
---
 .readme-partials.yaml | 34 ++++++++++++++++++++++++++++++----
 README.md             | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/.readme-partials.yaml b/.readme-partials.yaml
index 971616778001..9823b5c70187 100644
--- a/.readme-partials.yaml
+++ b/.readme-partials.yaml
@@ -81,7 +81,7 @@ custom_content: |
   #### Updating data
   Another thing you'll probably want to do is update your data. The following snippet shows how to update a Datastore entity if it exists.
 
-  ``` java
+  ```java
   KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
   Key key = keyFactory.newKey("keyName");
   Entity entity = datastore.get(key);
@@ -95,12 +95,12 @@ custom_content: |
   ```
 
   The complete source code can be found at
-  [UpdateEntity.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
+  [UpdateEntity.java](https://github.com/googleapis/google-cloud-java/blob/2c1850d4f82f3fbd7b4a50582384c008085aa1a8/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
 
   #### Complete source code
 
   In
-  [AddEntitiesAndRunQuery.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
+  [AddEntitiesAndRunQuery.java](https://github.com/googleapis/google-cloud-java/blob/2c1850d4f82f3fbd7b4a50582384c008085aa1a8/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
   we put together all the code to store data and run queries into one program. The program assumes that you are
   running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
   the code from the main method to your application's servlet class and change the print statements to
@@ -110,8 +110,34 @@ custom_content: |
   -------
 
   This library has tools to help write tests for code that uses the Datastore.
+  
+  #### On your machine
+
+  You can test against a temporary local Datastore by following these steps:
 
-  See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/main/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
+  1. [Install Cloud SDK and start the emulator](https://cloud.google.com/datastore/docs/tools/datastore-emulator)
+
+  To determine which host/port the emulator is running on:
+  
+  ```
+  $ gcloud beta emulators datastore env-init
+  
+  # Sample output:
+  #   export DATASTORE_EMULATOR_HOST=localhost:8759
+  ```
+  
+  3. Point your client to the emulator
+  
+  ```java
+  DatastoreOptions options = DatastoreOptions.newBuilder()
+  .setProjectId(DatastoreOptions.getDefaultProjectId())
+  .setHost(System.getenv("DATASTORE_EMULATOR_HOST"))
+  .setCredentials(NoCredentials.getInstance())
+  .setRetrySettings(ServiceOptions.getNoRetrySettings())
+  .build();
+  Datastore datastore = options.getService();
+  ```
+  4. Run your tests
 
   Example Applications
   --------------------
diff --git a/README.md b/README.md
index 052cc70706b8..dbd8a58304fb 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ Cloud Datastore relies on indexing to run queries. Indexing is turned on by defa
 #### Updating data
 Another thing you'll probably want to do is update your data. The following snippet shows how to update a Datastore entity if it exists.
 
-``` java
+```java
 KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
 Key key = keyFactory.newKey("keyName");
 Entity entity = datastore.get(key);
@@ -197,12 +197,12 @@ if (entity != null) {
 ```
 
 The complete source code can be found at
-[UpdateEntity.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
+[UpdateEntity.java](https://github.com/googleapis/google-cloud-java/blob/2c1850d4f82f3fbd7b4a50582384c008085aa1a8/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
 
 #### Complete source code
 
 In
-[AddEntitiesAndRunQuery.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
+[AddEntitiesAndRunQuery.java](https://github.com/googleapis/google-cloud-java/blob/2c1850d4f82f3fbd7b4a50582384c008085aa1a8/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
 we put together all the code to store data and run queries into one program. The program assumes that you are
 running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
 the code from the main method to your application's servlet class and change the print statements to
@@ -213,7 +213,33 @@ Testing
 
 This library has tools to help write tests for code that uses the Datastore.
 
-See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/main/TESTING.md#testing-code-that-uses-datastore) to read more about testing.
+#### On your machine
+
+You can test against a temporary local Datastore by following these steps:
+
+1. [Install Cloud SDK and start the emulator](https://cloud.google.com/datastore/docs/tools/datastore-emulator)
+
+To determine which host/port the emulator is running on:
+
+```
+$ gcloud beta emulators datastore env-init
+
+# Sample output:
+#   export DATASTORE_EMULATOR_HOST=localhost:8759
+```
+
+3. Point your client to the emulator
+
+```java
+DatastoreOptions options = DatastoreOptions.newBuilder()
+.setProjectId(DatastoreOptions.getDefaultProjectId())
+.setHost(System.getenv("DATASTORE_EMULATOR_HOST"))
+.setCredentials(NoCredentials.getInstance())
+.setRetrySettings(ServiceOptions.getNoRetrySettings())
+.build();
+Datastore datastore = options.getService();
+```
+4. Run your tests
 
 Example Applications
 --------------------

From b753b6c9ce210136e2616c94c07b46389a1a0523 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 14 Mar 2023 18:35:44 +0000
Subject: [PATCH 1088/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3 (#1018)

---
 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 4bf5bf100ef3..057a2e4725bd 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -97,7 +97,7 @@
             org.apache.maven.plugins
             maven-surefire-plugin
              
-            2.22.2
+            3.0.0
             
               
                 **/IT*

From 6880604b6b88caf8e03449349d0815d388cfb1a3 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 16 Mar 2023 15:06:13 -0400
Subject: [PATCH 1089/1784] docs: fix broken link to UpdateEntity snippet
 (#1022)

Fixes #1010
---
 .../src/main/java/com/google/cloud/datastore/package-info.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
index f0f35511fe30..735b8c35ace1 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
@@ -36,7 +36,7 @@
  *
  * 
    This second example shows how to get and update a Datastore entity if it exists. For the
  * complete source code see 
+ * href="https://github.com/googleapis/google-cloud-java/blob/4f9e98b21264028901878b8a11204868eca858ce/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java">
  * UpdateEntity.java.
  *
  * 
    {@code

From 8abd90f2b00a80224d7585847ff1b1cdee10bec8 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 17 Mar 2023 10:13:54 -0400
Subject: [PATCH 1090/1784] chore: update readme links (#1023)

Source-Link: https://github.com/googleapis/synthtool/commit/3c19c3314ccdff81c1d02b7665cb48de46ae5928
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:5df8b62e8da534f7604daef347698f6701e34b3f61713712a3384ac88fc32088

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 2 +-
 README.md                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index a5361a30a366..0c1ba9694d9b 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:e62f3ea524b11c1cd6ff7f80362736d86c0056631346b5b106a421686fce2726
+  digest: sha256:5df8b62e8da534f7604daef347698f6701e34b3f61713712a3384ac88fc32088
diff --git a/README.md b/README.md
index dbd8a58304fb..147dde50312a 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ The client application making API calls must be granted [authorization scopes][a
 You will need a [Google Cloud Platform Console][developer-console] project with the Cloud Datastore [API enabled][enable-api].
 
 [Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by
-[installing the Google Cloud SDK][cloud-sdk] and running the following commands in command line:
+[installing the Google Cloud Command Line Interface][cloud-cli] and running the following commands in command line:
 `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
 
 ### Installation and setup
@@ -367,14 +367,14 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-datastore&core=gav
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
 [iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
-[cloud-sdk]: https://cloud.google.com/sdk/
+[cloud-cli]: https://cloud.google.com/cli
 [troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
 [contributing]: https://github.com/googleapis/java-datastore/blob/main/CONTRIBUTING.md
 [code-of-conduct]: https://github.com/googleapis/java-datastore/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct

From 4a57e959dbac14d395ff202fd479f776c84b25e5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 20 Mar 2023 14:28:53 +0000
Subject: [PATCH 1091/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.5.0 (#1024)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 20ada40481f0..b4196d5826d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.4.0
+        3.5.0
         pom
         import
       

From 1c1268a0ef63b926ab5635a3b7915f4d8279f98c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 14:38:19 +0000
Subject: [PATCH 1092/1784] chore: Adding release-please annotations to readme
 files (#1781) (#1025)

* chore: Adding release-please annotations to readme files
Source-Link: https://togithub.com/googleapis/synthtool/commit/327d46fbfc2c02ff9237c3107513bfa682a94da0
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:bf5639d265d70f6137d57d42ae781a6f4e26d4085ff4e018e71350480f9b3996
---
 .github/.OwlBot.lock.yaml | 2 +-
 README.md                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 0c1ba9694d9b..91bb69e63cac 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:5df8b62e8da534f7604daef347698f6701e34b3f61713712a3384ac88fc32088
+  digest: sha256:bf5639d265d70f6137d57d42ae781a6f4e26d4085ff4e018e71350480f9b3996
diff --git a/README.md b/README.md
index 147dde50312a..681f95beace7 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ If you are using SBT, add this to your dependencies:
 ```Scala
 libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.0"
 ```
+
 
 ## Authentication
 

From 091d1976c24c1bec7a7974bcffb246d2a16d790c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 14:26:57 -0400
Subject: [PATCH 1093/1784] chore(deps): Update gapic-generator-java to 2.15.3
 (#1019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): Update gapic-generator-java to 2.15.3

PiperOrigin-RevId: 516900470

Source-Link: https://github.com/googleapis/googleapis/commit/42ba7e6302f5e0f10ac2b9b17f5b6d568ecae02d

Source-Link: https://github.com/googleapis/googleapis-gen/commit/21abfad42a1f2edae64130bbf897283221cd66d7
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjFhYmZhZDQyYTFmMmVkYWU2NDEzMGJiZjg5NzI4MzIyMWNkNjZkNyJ9

* 🦉 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 
---
 .../v1/stub/HttpJsonDatastoreAdminStub.java   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index 131c12763875..fda56e1e8f77 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -18,6 +18,7 @@
 
 import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
 
+import com.google.api.HttpRule;
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
@@ -33,6 +34,7 @@
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
+import com.google.common.collect.ImmutableMap;
 import com.google.datastore.admin.v1.CreateIndexRequest;
 import com.google.datastore.admin.v1.DeleteIndexRequest;
 import com.google.datastore.admin.v1.ExportEntitiesMetadata;
@@ -365,7 +367,26 @@ protected HttpJsonDatastoreAdminStub(
       throws IOException {
     this.callableFactory = callableFactory;
     this.httpJsonOperationsStub =
-        HttpJsonOperationsStub.create(clientContext, callableFactory, typeRegistry);
+        HttpJsonOperationsStub.create(
+            clientContext,
+            callableFactory,
+            typeRegistry,
+            ImmutableMap.builder()
+                .put(
+                    "google.longrunning.Operations.CancelOperation",
+                    HttpRule.newBuilder()
+                        .setPost("/v1/{name=projects/*/operations/*}:cancel")
+                        .build())
+                .put(
+                    "google.longrunning.Operations.DeleteOperation",
+                    HttpRule.newBuilder().setDelete("/v1/{name=projects/*/operations/*}").build())
+                .put(
+                    "google.longrunning.Operations.GetOperation",
+                    HttpRule.newBuilder().setGet("/v1/{name=projects/*/operations/*}").build())
+                .put(
+                    "google.longrunning.Operations.ListOperations",
+                    HttpRule.newBuilder().setGet("/v1/{name=projects/*}/operations").build())
+                .build());
 
     HttpJsonCallSettings exportEntitiesTransportSettings =
         HttpJsonCallSettings.newBuilder()

From 4e84334184ee6a47c186324161d25dc283d2a373 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:02:17 +0000
Subject: [PATCH 1094/1784] chore(main): release 2.14.1 (#1017)

:robot: I have created a release *beep* *boop*
---


## [2.14.1](https://togithub.com/googleapis/java-datastore/compare/v2.14.0...v2.14.1) (2023-03-20)


### Documentation

* Fix broken link to UpdateEntity snippet ([#1022](https://togithub.com/googleapis/java-datastore/issues/1022)) ([6880604](https://togithub.com/googleapis/java-datastore/commit/6880604b6b88caf8e03449349d0815d388cfb1a3)), closes [#1010](https://togithub.com/googleapis/java-datastore/issues/1010)
* Fix broken README links ([#1011](https://togithub.com/googleapis/java-datastore/issues/1011)) ([276174e](https://togithub.com/googleapis/java-datastore/commit/276174e26ff92be2bdeb24f733278d2042519cfd))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.5.0 ([#1024](https://togithub.com/googleapis/java-datastore/issues/1024)) ([4a57e95](https://togithub.com/googleapis/java-datastore/commit/4a57e959dbac14d395ff202fd479f776c84b25e5))
* Upgrade gapic-generator-java to 2.15.3 ([091d197](https://togithub.com/googleapis/java-datastore/commit/091d1976c24c1bec7a7974bcffb246d2a16d790c))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 14 ++++++++++++++
 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, 41 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c27d2c2c8ed..6c7f24cf7ce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.14.1](https://github.com/googleapis/java-datastore/compare/v2.14.0...v2.14.1) (2023-03-20)
+
+
+### Documentation
+
+* Fix broken link to UpdateEntity snippet ([#1022](https://github.com/googleapis/java-datastore/issues/1022)) ([6880604](https://github.com/googleapis/java-datastore/commit/6880604b6b88caf8e03449349d0815d388cfb1a3)), closes [#1010](https://github.com/googleapis/java-datastore/issues/1010)
+* Fix broken README links ([#1011](https://github.com/googleapis/java-datastore/issues/1011)) ([276174e](https://github.com/googleapis/java-datastore/commit/276174e26ff92be2bdeb24f733278d2042519cfd))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.5.0 ([#1024](https://github.com/googleapis/java-datastore/issues/1024)) ([4a57e95](https://github.com/googleapis/java-datastore/commit/4a57e959dbac14d395ff202fd479f776c84b25e5))
+* Upgrade gapic-generator-java to 2.15.3 ([091d197](https://github.com/googleapis/java-datastore/commit/091d1976c24c1bec7a7974bcffb246d2a16d790c))
+
 ## [2.14.0](https://github.com/googleapis/java-datastore/compare/v2.13.6...v2.14.0) (2023-03-08)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6800c188acae..04313448863c 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.1-SNAPSHOT
+  2.14.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1-SNAPSHOT
+    2.14.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b62a71667533..4480914eed9f 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.1-SNAPSHOT
+  2.14.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.1-SNAPSHOT
+        2.14.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.1-SNAPSHOT
+        2.14.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.1-SNAPSHOT
+        0.105.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.1-SNAPSHOT
+        2.14.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f4f252252066..c39c37cb4366 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.1-SNAPSHOT
+  2.14.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1-SNAPSHOT
+    2.14.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d1d691aaabaf..1b321111af85 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.1-SNAPSHOT
+  2.14.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1-SNAPSHOT
+    2.14.1
   
   
     
diff --git a/pom.xml b/pom.xml
index b4196d5826d3..061acf53a5cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.1-SNAPSHOT
+  2.14.1
   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.1-SNAPSHOT
+        2.14.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.1-SNAPSHOT
+        2.14.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.1-SNAPSHOT
+        2.14.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.1-SNAPSHOT
+        0.105.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.1-SNAPSHOT
+        2.14.1
         
           
             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 02d62015d264..c53f5bbf8829 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.1-SNAPSHOT
+  2.14.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1-SNAPSHOT
+    2.14.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a6a5160015eb..f313978ecee8 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.1-SNAPSHOT
+  0.105.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1-SNAPSHOT
+    2.14.1
   
   
     
diff --git a/versions.txt b/versions.txt
index c8e599aa52e7..1cb3f44359bc 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.0:2.14.1-SNAPSHOT
-google-cloud-datastore-bom:2.14.0:2.14.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.0:0.105.1-SNAPSHOT
-datastore-v1-proto-client:2.14.0:2.14.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.0:2.14.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.0:2.14.1-SNAPSHOT
+google-cloud-datastore:2.14.1:2.14.1
+google-cloud-datastore-bom:2.14.1:2.14.1
+proto-google-cloud-datastore-v1:0.105.1:0.105.1
+datastore-v1-proto-client:2.14.1:2.14.1
+proto-google-cloud-datastore-admin-v1:2.14.1:2.14.1
+grpc-google-cloud-datastore-admin-v1:2.14.1:2.14.1

From bc4b767ae513f4bd4872098559e989bb3a927402 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 21 Mar 2023 18:46:35 +0000
Subject: [PATCH 1095/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.1 (#1027)
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.14.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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 681f95beace7..17a8fb76a639 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.14.0
+  2.14.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.1"
 ```
 
 
@@ -368,7 +368,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 55263138e454..a6e7d8d9d248 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.0
+      2.14.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 023a84abed22..71b11d7ec569 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.0
+      2.14.1
     
 
     

From ef2c74cf3a4eabb8d85061a271b360368c1288a8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 21 Mar 2023 19:06:11 +0000
Subject: [PATCH 1096/1784] chore(main): release 2.14.2-SNAPSHOT (#1026)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 04313448863c..80d89688a9da 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.1
+  2.14.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1
+    2.14.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4480914eed9f..0535b4ab4587 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.1
+  2.14.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.1
+        2.14.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.1
+        2.14.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.1
+        0.105.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.1
+        2.14.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c39c37cb4366..f796e8ac7d1c 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.1
+  2.14.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1
+    2.14.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 1b321111af85..6a64b191ccbb 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.1
+  2.14.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1
+    2.14.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 061acf53a5cd..b9d6fc2e8069 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.1
+  2.14.2-SNAPSHOT
   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.1
+        2.14.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.1
+        2.14.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.1
+        2.14.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.1
+        0.105.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.1
+        2.14.2-SNAPSHOT
         
           
             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 c53f5bbf8829..8585e8bc1e22 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.1
+  2.14.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1
+    2.14.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f313978ecee8..a17739e2da0d 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.1
+  0.105.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.1
+    2.14.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 1cb3f44359bc..19a9c5faf5ee 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.1:2.14.1
-google-cloud-datastore-bom:2.14.1:2.14.1
-proto-google-cloud-datastore-v1:0.105.1:0.105.1
-datastore-v1-proto-client:2.14.1:2.14.1
-proto-google-cloud-datastore-admin-v1:2.14.1:2.14.1
-grpc-google-cloud-datastore-admin-v1:2.14.1:2.14.1
+google-cloud-datastore:2.14.1:2.14.2-SNAPSHOT
+google-cloud-datastore-bom:2.14.1:2.14.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.105.1:0.105.2-SNAPSHOT
+datastore-v1-proto-client:2.14.1:2.14.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.14.1:2.14.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.14.1:2.14.2-SNAPSHOT

From fcb8b9079a04098d029bf23e04fb78a308bd8518 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 24 Mar 2023 18:57:50 +0000
Subject: [PATCH 1097/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.11.0 (#1030)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.11.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 17a8fb76a639..b7d4cc52d104 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.10.0
+      26.11.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.10.0')
+implementation platform('com.google.cloud:libraries-bom:26.11.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 057a2e4725bd..f8dd32fe8205 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.10.0
+        26.11.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 1929a106a4ad..637698e64457 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.10.0
+        26.11.0
         pom
         import
       

From 592ba034773678e2b0f122577d712168f78dd6b4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 24 Mar 2023 18:58:11 +0000
Subject: [PATCH 1098/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-deploy-plugin to v3.1.1 (#1031)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.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 
---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 7d846eb1b026..a24801164023 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -39,7 +39,7 @@
       
         org.apache.maven.plugins
         maven-deploy-plugin
-        3.1.0
+        3.1.1
         
           true
         

From 13a48f4c67275fec493c5b6f8106b9a6b2c6e053 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 24 Mar 2023 14:58:45 -0400
Subject: [PATCH 1099/1784] chore: improve query API documentation (#1029)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add SUM/AVG aggregation query support in the preview branch and improve query API documentation

PiperOrigin-RevId: 518940761

Source-Link: https://github.com/googleapis/googleapis/commit/b1efb3270a3639831c35ccd7552c2bced807279c

Source-Link: https://github.com/googleapis/googleapis-gen/commit/f7c205414a5c6579438b5806d3dc5f20d09ef83c
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjdjMjA1NDE0YTVjNjU3OTQzOGI1ODA2ZDNkYzVmMjBkMDllZjgzYyJ9

* 🦉 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 
---
 .../google/datastore/v1/AggregationQuery.java | 70 +++++++++----------
 .../java/com/google/datastore/v1/Entity.java  | 44 ++++++------
 .../google/datastore/v1/EntityOrBuilder.java  | 20 +++---
 .../java/com/google/datastore/v1/Query.java   | 69 ++++++++++++++++++
 .../google/datastore/v1/QueryOrBuilder.java   | 15 ++++
 .../datastore/v1/aggregation_result.proto     |  2 +-
 .../proto/google/datastore/v1/datastore.proto |  2 +-
 .../proto/google/datastore/v1/entity.proto    |  6 +-
 .../proto/google/datastore/v1/query.proto     | 15 ++--
 9 files changed, 166 insertions(+), 77 deletions(-)

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 91aa55f7dd25..5311d1a45075 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
@@ -121,7 +121,7 @@ public interface AggregationOrBuilder
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2),
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4)
+     *   COUNT(*)
      * OVER (
      *   ...
      * );
@@ -132,7 +132,7 @@ public interface AggregationOrBuilder
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2) AS property_1,
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4) AS property_2
+     *   COUNT(*) AS property_2
      * OVER (
      *   ...
      * );
@@ -161,7 +161,7 @@ public interface AggregationOrBuilder
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2),
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4)
+     *   COUNT(*)
      * OVER (
      *   ...
      * );
@@ -172,7 +172,7 @@ public interface AggregationOrBuilder
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2) AS property_1,
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4) AS property_2
+     *   COUNT(*) AS property_2
      * OVER (
      *   ...
      * );
@@ -195,7 +195,7 @@ public interface AggregationOrBuilder
    *
    *
    * 
    -   * Defines a aggregation that produces a single result.
+   * Defines an aggregation that produces a single result.
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
@@ -252,7 +252,7 @@ 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.
+       * 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.
@@ -277,7 +277,7 @@ 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.
+       * 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.
@@ -302,7 +302,7 @@ 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.
+       * 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.
@@ -377,7 +377,7 @@ 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.
+       * 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.
@@ -405,7 +405,7 @@ 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.
+       * 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.
@@ -433,7 +433,7 @@ 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.
+       * 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.
@@ -825,7 +825,7 @@ 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.
+         * 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.
@@ -852,7 +852,7 @@ 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.
+         * 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.
@@ -883,7 +883,7 @@ 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.
+         * 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.
@@ -918,7 +918,7 @@ 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.
+         * 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.
@@ -950,7 +950,7 @@ 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.
+         * 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.
@@ -988,7 +988,7 @@ 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.
+         * 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.
@@ -1020,7 +1020,7 @@ 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.
+         * 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.
@@ -1047,7 +1047,7 @@ 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.
+         * 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.
@@ -1076,7 +1076,7 @@ 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.
+         * 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.
@@ -1287,7 +1287,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2),
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4)
+     *   COUNT(*)
      * OVER (
      *   ...
      * );
@@ -1298,7 +1298,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2) AS property_1,
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4) AS property_2
+     *   COUNT(*) AS property_2
      * OVER (
      *   ...
      * );
@@ -1338,7 +1338,7 @@ public java.lang.String getAlias() {
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2),
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4)
+     *   COUNT(*)
      * OVER (
      *   ...
      * );
@@ -1349,7 +1349,7 @@ public java.lang.String getAlias() {
      *   COUNT_UP_TO(1) AS count_up_to_1,
      *   COUNT_UP_TO(2) AS property_1,
      *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT_UP_TO(4) AS property_2
+     *   COUNT(*) AS property_2
      * OVER (
      *   ...
      * );
@@ -1567,7 +1567,7 @@ protected Builder newBuilderForType(
      *
      *
      * 
    -     * Defines a aggregation that produces a single result.
+     * Defines an aggregation that produces a single result.
      * 
    
      *
      * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
@@ -2021,7 +2021,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2),
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4)
+       *   COUNT(*)
        * OVER (
        *   ...
        * );
@@ -2032,7 +2032,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2) AS property_1,
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4) AS property_2
+       *   COUNT(*) AS property_2
        * OVER (
        *   ...
        * );
@@ -2071,7 +2071,7 @@ public java.lang.String getAlias() {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2),
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4)
+       *   COUNT(*)
        * OVER (
        *   ...
        * );
@@ -2082,7 +2082,7 @@ public java.lang.String getAlias() {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2) AS property_1,
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4) AS property_2
+       *   COUNT(*) AS property_2
        * OVER (
        *   ...
        * );
@@ -2121,7 +2121,7 @@ public com.google.protobuf.ByteString getAliasBytes() {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2),
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4)
+       *   COUNT(*)
        * OVER (
        *   ...
        * );
@@ -2132,7 +2132,7 @@ public com.google.protobuf.ByteString getAliasBytes() {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2) AS property_1,
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4) AS property_2
+       *   COUNT(*) AS property_2
        * OVER (
        *   ...
        * );
@@ -2170,7 +2170,7 @@ public Builder setAlias(java.lang.String value) {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2),
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4)
+       *   COUNT(*)
        * OVER (
        *   ...
        * );
@@ -2181,7 +2181,7 @@ public Builder setAlias(java.lang.String value) {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2) AS property_1,
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4) AS property_2
+       *   COUNT(*) AS property_2
        * OVER (
        *   ...
        * );
@@ -2215,7 +2215,7 @@ public Builder clearAlias() {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2),
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4)
+       *   COUNT(*)
        * OVER (
        *   ...
        * );
@@ -2226,7 +2226,7 @@ public Builder clearAlias() {
        *   COUNT_UP_TO(1) AS count_up_to_1,
        *   COUNT_UP_TO(2) AS property_1,
        *   COUNT_UP_TO(3) AS count_up_to_3,
-       *   COUNT_UP_TO(4) AS property_2
+       *   COUNT(*) AS property_2
        * OVER (
        *   ...
        * );
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 39432e877776..d6f7c3c6abad 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -173,8 +173,8 @@ public int getPropertiesCount() {
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -200,8 +200,8 @@ public java.util.Map getPropert
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -218,8 +218,8 @@ public java.util.Map getPropert
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -244,8 +244,8 @@ public java.util.Map getPropert
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -918,8 +918,8 @@ public int getPropertiesCount() {
      * The map's keys are property names.
      * A property name matching regex `__.*__` is reserved.
      * A reserved property name is forbidden in certain documented contexts.
-     * The name must not contain more than 500 characters.
-     * The name cannot be `""`.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
@@ -945,8 +945,8 @@ public java.util.Map getPropert
      * The map's keys are property names.
      * A property name matching regex `__.*__` is reserved.
      * A reserved property name is forbidden in certain documented contexts.
-     * The name must not contain more than 500 characters.
-     * The name cannot be `""`.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
@@ -963,8 +963,8 @@ public java.util.Map getPropert
      * The map's keys are property names.
      * A property name matching regex `__.*__` is reserved.
      * A reserved property name is forbidden in certain documented contexts.
-     * The name must not contain more than 500 characters.
-     * The name cannot be `""`.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
@@ -989,8 +989,8 @@ public java.util.Map getPropert
      * The map's keys are property names.
      * A property name matching regex `__.*__` is reserved.
      * A reserved property name is forbidden in certain documented contexts.
-     * The name must not contain more than 500 characters.
-     * The name cannot be `""`.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
@@ -1021,8 +1021,8 @@ public Builder clearProperties() {
      * The map's keys are property names.
      * A property name matching regex `__.*__` is reserved.
      * A reserved property name is forbidden in certain documented contexts.
-     * The name must not contain more than 500 characters.
-     * The name cannot be `""`.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
@@ -1048,8 +1048,8 @@ public java.util.Map getMutable
      * The map's keys are property names.
      * A property name matching regex `__.*__` is reserved.
      * A reserved property name is forbidden in certain documented contexts.
-     * The name must not contain more than 500 characters.
-     * The name cannot be `""`.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
      * 
    
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
@@ -1073,8 +1073,8 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
      * The map's keys are property names.
      * A property name matching regex `__.*__` is reserved.
      * A reserved property name is forbidden in certain documented contexts.
-     * The name must not contain more than 500 characters.
-     * The name cannot be `""`.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
      * 
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
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 19f935612a09..d3651082596f 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
@@ -78,8 +78,8 @@ public interface EntityOrBuilder
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -93,8 +93,8 @@ public interface EntityOrBuilder
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -111,8 +111,8 @@ public interface EntityOrBuilder
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -126,8 +126,8 @@ public interface EntityOrBuilder
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
@@ -145,8 +145,8 @@ com.google.datastore.v1.Value getPropertiesOrDefault(
    * The map's keys are property names.
    * A property name matching regex `__.*__` is reserved.
    * A reserved property name is forbidden in certain documented contexts.
-   * The name must not contain more than 500 characters.
-   * The name cannot be `""`.
+   * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+   * be empty.
    * 
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
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 475a261770ef..2b23df9f88e2 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
@@ -345,6 +345,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -360,6 +363,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -376,6 +382,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -391,6 +400,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -406,6 +418,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2509,6 +2524,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2527,6 +2545,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2545,6 +2566,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2563,6 +2587,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2587,6 +2614,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2609,6 +2639,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2633,6 +2666,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2657,6 +2693,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2679,6 +2718,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2701,6 +2743,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2723,6 +2768,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2744,6 +2792,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2765,6 +2816,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2779,6 +2833,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2797,6 +2854,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2816,6 +2876,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2831,6 +2894,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2846,6 +2912,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`.
      * 
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
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 f06b1b616ace..1b200969913b 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,6 +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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -236,6 +239,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -248,6 +254,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -260,6 +269,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -273,6 +285,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`.
    * 
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
index bbb5989e58c0..91c521716e8e 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 2f9c7142771e..4822048b6191 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
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 ddf22e0322ae..2d22853f5ca3 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
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -213,7 +213,7 @@ message Entity {
   // The map's keys are property names.
   // A property name matching regex `__.*__` is reserved.
   // A reserved property name is forbidden in certain documented contexts.
-  // The name must not contain more than 500 characters.
-  // The name cannot be `""`.
+  // The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+  // be empty.
   map properties = 3;
 }
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 169af880185c..812bfbf05780 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
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -99,6 +99,11 @@ message Query {
   // 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`.
   repeated PropertyReference distinct_on = 6;
 
   // A starting point for the query results. Query cursors are
@@ -127,7 +132,7 @@ message Query {
 // Datastore query for running an aggregation over a
 // [Query][google.datastore.v1.Query].
 message AggregationQuery {
-  // Defines a aggregation that produces a single result.
+  // Defines an aggregation that produces a single result.
   message Aggregation {
     // Count of entities that match the query.
     //
@@ -138,7 +143,7 @@ message AggregationQuery {
       // count.
       //
       // This provides a way to set an upper bound on the number of entities
-      // to scan, limiting latency and cost.
+      // to scan, limiting latency, and cost.
       //
       // Unspecified is interpreted as no bound.
       //
@@ -175,7 +180,7 @@ message AggregationQuery {
     //   COUNT_UP_TO(1) AS count_up_to_1,
     //   COUNT_UP_TO(2),
     //   COUNT_UP_TO(3) AS count_up_to_3,
-    //   COUNT_UP_TO(4)
+    //   COUNT(*)
     // OVER (
     //   ...
     // );
@@ -188,7 +193,7 @@ message AggregationQuery {
     //   COUNT_UP_TO(1) AS count_up_to_1,
     //   COUNT_UP_TO(2) AS property_1,
     //   COUNT_UP_TO(3) AS count_up_to_3,
-    //   COUNT_UP_TO(4) AS property_2
+    //   COUNT(*) AS property_2
     // OVER (
     //   ...
     // );

From e319efa402539f0297179d270aa8c8f50e6e3e93 Mon Sep 17 00:00:00 2001
From: Eric Schmidt 
Date: Tue, 28 Mar 2023 08:58:45 -0700
Subject: [PATCH 1100/1784] docs: adds OR filter sample (#1032)

* docs: adds OR filter sample
---
 README.md                                     |  1 +
 .../datastore/filters/OrFilterQuery.java      | 62 ++++++++++++++++
 .../datastore/OrFilterQuerySampleIT.java      | 70 +++++++++++++++++++
 3 files changed, 133 insertions(+)
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
 create mode 100644 samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java

diff --git a/README.md b/README.md
index b7d4cc52d104..e0563a10b321 100644
--- a/README.md
+++ b/README.md
@@ -268,6 +268,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 | Count Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) |
 | Count Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) |
 | Count Aggregation With Stale Read | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) |
+| Create a union between two filters | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) |
 | Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
 
diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
new file mode 100644
index 000000000000..1fa1d40de4f8
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 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.example.datastore.filters;
+
+// sample-metadata:
+//   title: Create a union between two filters
+//   description: Create a union between two filters (logical OR operator)
+
+// [START datastore_query_filter_or]
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
+import com.google.cloud.datastore.StructuredQuery.Filter;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+
+public class OrFilterQuery {
+  public static void invoke() throws Exception {
+
+    // Instantiates a client
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+    String propertyName = "description";
+
+    // Create the two filters
+    Filter orFilter =
+        CompositeFilter.or(
+            PropertyFilter.eq(propertyName, "Feed cats"),
+            PropertyFilter.eq(propertyName, "Buy milk"));
+
+    // Build the query
+    Query query = Query.newEntityQueryBuilder().setKind("Task").setFilter(orFilter).build();
+
+    // Get the results back from Datastore
+    QueryResults results = datastore.run(query);
+
+    if (!results.hasNext()) {
+      throw new Exception("query yielded no results");
+    }
+
+    while (results.hasNext()) {
+      Entity entity = results.next();
+      System.out.printf("Entity: %s%n", entity);
+    }
+  }
+}
+// [END datastore_query_filter_or]
diff --git a/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java b/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java
new file mode 100644
index 000000000000..7e6cc8fa8612
--- /dev/null
+++ b/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 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.example.datastore;
+
+import com.example.datastore.filters.OrFilterQuery;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Key;
+import com.rule.SystemsOutRule;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+@SuppressWarnings("checkstyle:abbreviationaswordinname")
+public class OrFilterQuerySampleIT {
+
+  private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+  private final String fieldName = "description";
+
+  private Key taskKey1;
+  private Key taskKey2;
+
+  @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule();
+
+  @Before
+  public void setUp() {
+    taskKey1 = datastore.newKeyFactory().setKind("Task").newKey("sampleTask");
+    Entity task1 = Entity.newBuilder(taskKey1).set(fieldName, "Buy milk").build();
+
+    taskKey2 = datastore.newKeyFactory().setKind("Task").newKey("sampleTask2");
+    Entity task2 = Entity.newBuilder(taskKey2).set(fieldName, "Feed cats").build();
+
+    datastore.put(task1);
+    datastore.put(task2);
+  }
+
+  @After
+  public void tearDown() {
+    datastore.delete(taskKey1);
+    datastore.delete(taskKey2);
+  }
+
+  @Test
+  public void testOrFilterQuery() throws Exception {
+    // Act
+    OrFilterQuery.invoke();
+
+    // Assert
+    systemsOutRule.assertContains("Entity");
+  }
+}

From b2f4cb361afb1398b10edc0fcfe744b414926e07 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 29 Mar 2023 16:48:13 +0100
Subject: [PATCH 1101/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.6.0 (#1035)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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/gapic-generator-java) | `3.5.0` -> `3.6.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.6.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.6.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.6.0/compatibility-slim/3.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.6.0/confidence-slim/3.5.0)](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, check this box

---

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 b9d6fc2e8069..e557c150c0a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.5.0
+        3.6.0
         pom
         import
       

From 8c96c555159d48f1dc6d53616f0412f60e3095d7 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 11:49:53 -0400
Subject: [PATCH 1102/1784] chore(deps): Update gapic-generator-java to 2.16.0
 (#1034)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): Update gapic-generator-java to 2.16.0

PiperOrigin-RevId: 520153493

Source-Link: https://github.com/googleapis/googleapis/commit/26a424a2e4190c3103ab6f5d00c3144c89161b20

Source-Link: https://github.com/googleapis/googleapis-gen/commit/78f1567661df07bea7425e4341012e7b77c11254
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhmMTU2NzY2MWRmMDdiZWE3NDI1ZTQzNDEwMTJlN2I3N2MxMTI1NCJ9

* 🦉 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 
---
 .../admin/v1/DatastoreAdminGrpc.java          | 156 ++++++++++++------
 1 file changed, 105 insertions(+), 51 deletions(-)

diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index 29fc8fcdcfae..59052f146681 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -421,7 +421,7 @@ public DatastoreAdminFutureStub newStub(
    * but are accessed via service google.longrunning.Operations.
    * 
    */
-  public abstract static class DatastoreAdminImplBase implements io.grpc.BindableService {
+  public interface AsyncService {
 
     /**
      *
@@ -437,7 +437,7 @@ public abstract static class DatastoreAdminImplBase implements io.grpc.BindableS
      * Cloud Storage.
      * 
      */
-    public void exportEntities(
+    default void exportEntities(
         com.google.datastore.admin.v1.ExportEntitiesRequest request,
         io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -455,7 +455,7 @@ public void exportEntities(
      * that a subset of the data has already been imported to Cloud Datastore.
      * 
      */
-    public void importEntities(
+    default void importEntities(
         com.google.datastore.admin.v1.ImportEntitiesRequest request,
         io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -480,7 +480,7 @@ public void importEntities(
      * Indexes with a single property cannot be created.
      * 
      */
-    public void createIndex(
+    default void createIndex(
         com.google.datastore.admin.v1.CreateIndexRequest request,
         io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -502,7 +502,7 @@ public void createIndex(
      * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
      * 
      */
-    public void deleteIndex(
+    default void deleteIndex(
         com.google.datastore.admin.v1.DeleteIndexRequest request,
         io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -516,7 +516,7 @@ public void deleteIndex(
      * Gets an index.
      * 
      */
-    public void getIndex(
+    default void getIndex(
         com.google.datastore.admin.v1.GetIndexRequest request,
         io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetIndexMethod(), responseObserver);
@@ -531,60 +531,72 @@ public void getIndex(
      * occasionally return stale results.
      * 
      */
-    public void listIndexes(
+    default void listIndexes(
         com.google.datastore.admin.v1.ListIndexesRequest request,
         io.grpc.stub.StreamObserver
             responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
           getListIndexesMethod(), responseObserver);
     }
+  }
+
+  /**
+   * Base class for the server implementation of the service DatastoreAdmin.
+   *
+   * 
    +   * Google Cloud Datastore Admin API
+   * The Datastore Admin API provides several admin services for Cloud Datastore.
+   * -----------------------------------------------------------------------------
+   * ## Concepts
+   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+   * API.
+   * Operation: An Operation represents work being performed in the background.
+   * EntityFilter: Allows specifying a subset of entities in a project. This is
+   * specified as a combination of kinds and namespaces (either or both of which
+   * may be all).
+   * -----------------------------------------------------------------------------
+   * ## Services
+   * # Export/Import
+   * The Export/Import service provides the ability to copy all or a subset of
+   * entities to/from Google Cloud Storage.
+   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * Platform project. It is not restricted to the export source project. It is
+   * possible to export from one project and then import into another.
+   * Exported data can also be loaded into Google BigQuery for analysis.
+   * Exports and imports are performed asynchronously. An Operation resource is
+   * created for each export/import. The state (including any errors encountered)
+   * of the export/import may be queried via the Operation resource.
+   * # Index
+   * The index service manages Cloud Datastore composite indexes.
+   * Index creation and deletion are performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * # Operation
+   * The Operations collection provides a record of actions performed for the
+   * specified project (including any operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * An operation that is not yet done may be cancelled. The request to cancel is
+   * asynchronous and the operation may continue to run for some time after the
+   * request to cancel is made.
+   * An operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection.
+   * ListOperations returns all pending operations, but not completed operations.
+   * Operations are created by service DatastoreAdmin,
+   * but are accessed via service google.longrunning.Operations.
+   * 
    
+   */
+  public abstract static class DatastoreAdminImplBase
+      implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override
     public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-              getExportEntitiesMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.datastore.admin.v1.ExportEntitiesRequest,
-                      com.google.longrunning.Operation>(this, METHODID_EXPORT_ENTITIES)))
-          .addMethod(
-              getImportEntitiesMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.datastore.admin.v1.ImportEntitiesRequest,
-                      com.google.longrunning.Operation>(this, METHODID_IMPORT_ENTITIES)))
-          .addMethod(
-              getCreateIndexMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.datastore.admin.v1.CreateIndexRequest,
-                      com.google.longrunning.Operation>(this, METHODID_CREATE_INDEX)))
-          .addMethod(
-              getDeleteIndexMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.datastore.admin.v1.DeleteIndexRequest,
-                      com.google.longrunning.Operation>(this, METHODID_DELETE_INDEX)))
-          .addMethod(
-              getGetIndexMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.datastore.admin.v1.GetIndexRequest,
-                      com.google.datastore.admin.v1.Index>(this, METHODID_GET_INDEX)))
-          .addMethod(
-              getListIndexesMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.datastore.admin.v1.ListIndexesRequest,
-                      com.google.datastore.admin.v1.ListIndexesResponse>(
-                      this, METHODID_LIST_INDEXES)))
-          .build();
+      return DatastoreAdminGrpc.bindService(this);
     }
   }
 
   /**
-   *
+   * A stub to allow clients to do asynchronous rpc calls to service DatastoreAdmin.
    *
    * 
        * Google Cloud Datastore Admin API
@@ -769,7 +781,7 @@ public void listIndexes(
   }
 
   /**
-   *
+   * A stub to allow clients to do synchronous rpc calls to service DatastoreAdmin.
    *
    * 
        * Google Cloud Datastore Admin API
@@ -938,7 +950,7 @@ public com.google.datastore.admin.v1.ListIndexesResponse listIndexes(
   }
 
   /**
-   *
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service DatastoreAdmin.
    *
    * 
        * Google Cloud Datastore Admin API
@@ -1119,10 +1131,10 @@ private static final class MethodHandlers
           io.grpc.stub.ServerCalls.ServerStreamingMethod,
           io.grpc.stub.ServerCalls.ClientStreamingMethod,
           io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final DatastoreAdminImplBase serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(DatastoreAdminImplBase serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -1178,6 +1190,48 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
+    return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+        .addMethod(
+            getExportEntitiesMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.admin.v1.ExportEntitiesRequest,
+                    com.google.longrunning.Operation>(service, METHODID_EXPORT_ENTITIES)))
+        .addMethod(
+            getImportEntitiesMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.admin.v1.ImportEntitiesRequest,
+                    com.google.longrunning.Operation>(service, METHODID_IMPORT_ENTITIES)))
+        .addMethod(
+            getCreateIndexMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.admin.v1.CreateIndexRequest,
+                    com.google.longrunning.Operation>(service, METHODID_CREATE_INDEX)))
+        .addMethod(
+            getDeleteIndexMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.admin.v1.DeleteIndexRequest,
+                    com.google.longrunning.Operation>(service, METHODID_DELETE_INDEX)))
+        .addMethod(
+            getGetIndexMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.admin.v1.GetIndexRequest,
+                    com.google.datastore.admin.v1.Index>(service, METHODID_GET_INDEX)))
+        .addMethod(
+            getListIndexesMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.admin.v1.ListIndexesRequest,
+                    com.google.datastore.admin.v1.ListIndexesResponse>(
+                    service, METHODID_LIST_INDEXES)))
+        .build();
+  }
+
   private abstract static class DatastoreAdminBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoFileDescriptorSupplier,
           io.grpc.protobuf.ProtoServiceDescriptorSupplier {

From ed25a7f2e358ba2b282e3b2fc76d001b73eee6c6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 30 Mar 2023 14:46:13 +0000
Subject: [PATCH 1103/1784] chore(main): release 2.14.2 (#1033)

:robot: I have created a release *beep* *boop*
---


## [2.14.2](https://togithub.com/googleapis/java-datastore/compare/v2.14.1...v2.14.2) (2023-03-29)


### Documentation

* Adds OR filter sample ([#1032](https://togithub.com/googleapis/java-datastore/issues/1032)) ([e319efa](https://togithub.com/googleapis/java-datastore/commit/e319efa402539f0297179d270aa8c8f50e6e3e93))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.6.0 ([#1035](https://togithub.com/googleapis/java-datastore/issues/1035)) ([b2f4cb3](https://togithub.com/googleapis/java-datastore/commit/b2f4cb361afb1398b10edc0fcfe744b414926e07))
* Update gapic-generator-java to 2.16.0 ([8c96c55](https://togithub.com/googleapis/java-datastore/commit/8c96c555159d48f1dc6d53616f0412f60e3095d7))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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, 40 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c7f24cf7ce2..4ef27c5ed8a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.14.2](https://github.com/googleapis/java-datastore/compare/v2.14.1...v2.14.2) (2023-03-29)
+
+
+### Documentation
+
+* Adds OR filter sample ([#1032](https://github.com/googleapis/java-datastore/issues/1032)) ([e319efa](https://github.com/googleapis/java-datastore/commit/e319efa402539f0297179d270aa8c8f50e6e3e93))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.6.0 ([#1035](https://github.com/googleapis/java-datastore/issues/1035)) ([b2f4cb3](https://github.com/googleapis/java-datastore/commit/b2f4cb361afb1398b10edc0fcfe744b414926e07))
+* Update gapic-generator-java to 2.16.0 ([8c96c55](https://github.com/googleapis/java-datastore/commit/8c96c555159d48f1dc6d53616f0412f60e3095d7))
+
 ## [2.14.1](https://github.com/googleapis/java-datastore/compare/v2.14.0...v2.14.1) (2023-03-20)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 80d89688a9da..7a23346d350c 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.2-SNAPSHOT
+  2.14.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2-SNAPSHOT
+    2.14.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0535b4ab4587..76f5e406458f 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.2-SNAPSHOT
+  2.14.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.2-SNAPSHOT
+        2.14.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.2-SNAPSHOT
+        2.14.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.2-SNAPSHOT
+        0.105.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.2-SNAPSHOT
+        2.14.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f796e8ac7d1c..26b0ce227979 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.2-SNAPSHOT
+  2.14.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2-SNAPSHOT
+    2.14.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 6a64b191ccbb..f92d982b4f2c 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.2-SNAPSHOT
+  2.14.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2-SNAPSHOT
+    2.14.2
   
   
     
diff --git a/pom.xml b/pom.xml
index e557c150c0a9..eabf1c94a368 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.2-SNAPSHOT
+  2.14.2
   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.2-SNAPSHOT
+        2.14.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.2-SNAPSHOT
+        2.14.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.2-SNAPSHOT
+        2.14.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.2-SNAPSHOT
+        0.105.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.2-SNAPSHOT
+        2.14.2
         
           
             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 8585e8bc1e22..5a13251a4051 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.2-SNAPSHOT
+  2.14.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2-SNAPSHOT
+    2.14.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a17739e2da0d..33adffc1f68c 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.2-SNAPSHOT
+  0.105.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2-SNAPSHOT
+    2.14.2
   
   
     
diff --git a/versions.txt b/versions.txt
index 19a9c5faf5ee..3f355a15f529 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.1:2.14.2-SNAPSHOT
-google-cloud-datastore-bom:2.14.1:2.14.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.1:0.105.2-SNAPSHOT
-datastore-v1-proto-client:2.14.1:2.14.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.1:2.14.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.1:2.14.2-SNAPSHOT
+google-cloud-datastore:2.14.2:2.14.2
+google-cloud-datastore-bom:2.14.2:2.14.2
+proto-google-cloud-datastore-v1:0.105.2:0.105.2
+datastore-v1-proto-client:2.14.2:2.14.2
+proto-google-cloud-datastore-admin-v1:2.14.2:2.14.2
+grpc-google-cloud-datastore-admin-v1:2.14.2:2.14.2

From e69c628350ec353197fd6da77d6b30ea97d8dd13 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:38:13 +0000
Subject: [PATCH 1104/1784] chore(main): release 2.14.3-SNAPSHOT (#1037)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7a23346d350c..887f6c386db8 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.2
+  2.14.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2
+    2.14.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 76f5e406458f..961024b8448e 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.2
+  2.14.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.2
+        2.14.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.2
+        2.14.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.2
+        0.105.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.2
+        2.14.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 26b0ce227979..1a14874541bb 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.2
+  2.14.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2
+    2.14.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f92d982b4f2c..054c142435bb 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.2
+  2.14.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2
+    2.14.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index eabf1c94a368..9a8b21f52f25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.2
+  2.14.3-SNAPSHOT
   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.2
+        2.14.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.2
+        2.14.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.2
+        2.14.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.2
+        0.105.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.2
+        2.14.3-SNAPSHOT
         
           
             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 5a13251a4051..147ef27dc9d0 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.2
+  2.14.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2
+    2.14.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 33adffc1f68c..a7afc323f49a 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.2
+  0.105.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.2
+    2.14.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 3f355a15f529..c820056ef41c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.2:2.14.2
-google-cloud-datastore-bom:2.14.2:2.14.2
-proto-google-cloud-datastore-v1:0.105.2:0.105.2
-datastore-v1-proto-client:2.14.2:2.14.2
-proto-google-cloud-datastore-admin-v1:2.14.2:2.14.2
-grpc-google-cloud-datastore-admin-v1:2.14.2:2.14.2
+google-cloud-datastore:2.14.2:2.14.3-SNAPSHOT
+google-cloud-datastore-bom:2.14.2:2.14.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.105.2:0.105.3-SNAPSHOT
+datastore-v1-proto-client:2.14.2:2.14.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.14.2:2.14.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.14.2:2.14.3-SNAPSHOT

From bd4ba2e7885b55dfe86453f0c69b066ecf1aa6c9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 30 Mar 2023 20:46:43 +0100
Subject: [PATCH 1105/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.2 (#1038)
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.14.2

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e0563a10b321..0ff14cd00346 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.14.1
+  2.14.2
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.2"
 ```
 
 
@@ -369,7 +369,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a6e7d8d9d248..f9765fca2e36 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.1
+      2.14.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 71b11d7ec569..3afc0f2c9764 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.1
+      2.14.2
     
 
     

From c2157ee6d19f76cbbb4f09a25b6d7fd14dfafac8 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:56:25 -0400
Subject: [PATCH 1106/1784] chore: update import paths for Go targets to match
 open source location (#1039)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: update import paths for Go targets to match open source location
chore: update go_package in protos to match open source location
chore: add explicit release levels to Go gapic targets

PiperOrigin-RevId: 520705454

Source-Link: https://github.com/googleapis/googleapis/commit/1cfcea4fbef317c44cc13d73017a0b0462c4737d

Source-Link: https://github.com/googleapis/googleapis-gen/commit/15732ab75211b0255433d6f87415e8a3ce466826
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTU3MzJhYjc1MjExYjAyNTU0MzNkNmY4NzQxNWU4YTNjZTQ2NjgyNiJ9

* 🦉 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 
---
 .../datastore/admin/v1/DatastoreAdminProto.java      | 12 ++++++------
 .../com/google/datastore/admin/v1/IndexProto.java    | 12 ++++++------
 .../google/datastore/admin/v1/MigrationProto.java    | 12 ++++++------
 .../google/datastore/admin/v1/datastore_admin.proto  |  2 +-
 .../main/proto/google/datastore/admin/v1/index.proto |  2 +-
 .../proto/google/datastore/admin/v1/migration.proto  |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 810e65ae7cbb..1bb28e54ff32 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -214,13 +214,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "1/projects/{project_id}/indexes\032v\312A\030data"
           + "store.googleapis.com\322AXhttps://www.googl"
           + "eapis.com/auth/cloud-platform,https://ww"
-          + "w.googleapis.com/auth/datastoreB\340\001\n\035com."
+          + "w.googleapis.com/auth/datastoreB\333\001\n\035com."
           + "google.datastore.admin.v1B\023DatastoreAdmi"
-          + "nProtoP\001Z>google.golang.org/genproto/goo"
-          + "gleapis/datastore/admin/v1;admin\252\002\037Googl"
-          + "e.Cloud.Datastore.Admin.V1\312\002\037Google\\Clou"
-          + "d\\Datastore\\Admin\\V1\352\002#Google::Cloud::Da"
-          + "tastore::Admin::V1b\006proto3"
+          + "nProtoP\001Z9cloud.google.com/go/datastore/"
+          + "admin/apiv1/adminpb;adminpb\252\002\037Google.Clo"
+          + "ud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Dat"
+          + "astore\\Admin\\V1\352\002#Google::Cloud::Datasto"
+          + "re::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/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
index d30a12ec7dbd..ff612c3e22b3 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
@@ -61,13 +61,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "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\327\001\n"
+          + "\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\001Z>google.golang.org/genproto/googlea"
-          + "pis/datastore/admin/v1;admin\252\002\037Google.Cl"
-          + "oud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Da"
-          + "tastore\\Admin\\V1\352\002#Google::Cloud::Datast"
-          + "ore::Admin::V1b\006proto3"
+          + "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"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 97561eebde51..6d8f2dca9c2d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -80,13 +80,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "_WRITES_SYNCHRONOUSLY\020\007\022\023\n\017COPY_AND_VERI"
           + "FY\020\002\022(\n$REDIRECT_EVENTUALLY_CONSISTENT_R"
           + "EADS\020\003\022&\n\"REDIRECT_STRONGLY_CONSISTENT_R"
-          + "EADS\020\004\022\023\n\017REDIRECT_WRITES\020\005B\333\001\n\035com.goog"
+          + "EADS\020\004\022\023\n\017REDIRECT_WRITES\020\005B\326\001\n\035com.goog"
           + "le.datastore.admin.v1B\016MigrationProtoP\001Z"
-          + ">google.golang.org/genproto/googleapis/d"
-          + "atastore/admin/v1;admin\252\002\037Google.Cloud.D"
-          + "atastore.Admin.V1\312\002\037Google\\Cloud\\Datasto"
-          + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::"
-          + "Admin::V1b\006proto3"
+          + "9cloud.google.com/go/datastore/admin/api"
+          + "v1/adminpb;adminpb\252\002\037Google.Cloud.Datast"
+          + "ore.Admin.V1\312\002\037Google\\Cloud\\Datastore\\Ad"
+          + "min\\V1\352\002#Google::Cloud::Datastore::Admin"
+          + "::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
index 0d624956e33d..744d97df7e62 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
@@ -25,7 +25,7 @@ import "google/longrunning/operations.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option go_package = "cloud.google.com/go/datastore/admin/apiv1/adminpb;adminpb";
 option java_multiple_files = true;
 option java_outer_classname = "DatastoreAdminProto";
 option java_package = "com.google.datastore.admin.v1";
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
index 0162af52384d..4eeffc7e4127 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
@@ -19,7 +19,7 @@ package google.datastore.admin.v1;
 import "google/api/field_behavior.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option go_package = "cloud.google.com/go/datastore/admin/apiv1/adminpb;adminpb";
 option java_multiple_files = true;
 option java_outer_classname = "IndexProto";
 option java_package = "com.google.datastore.admin.v1";
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
index dbbe473c9041..f47cb70e1adb 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
@@ -17,7 +17,7 @@ syntax = "proto3";
 package google.datastore.admin.v1;
 
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option go_package = "cloud.google.com/go/datastore/admin/apiv1/adminpb;adminpb";
 option java_multiple_files = true;
 option java_outer_classname = "MigrationProto";
 option java_package = "com.google.datastore.admin.v1";

From b5a21a461fc29f9c923b8a51521f35ee2fbf6287 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 16:12:13 +0000
Subject: [PATCH 1107/1784] chore: README template fix in google-cloud-java
 (#1785) (#1040)

Source-Link: https://togithub.com/googleapis/synthtool/commit/43c709a188a1aaaf3778e77e25332b10ff9413e0
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30
---
 .github/.OwlBot.lock.yaml | 2 +-
 README.md                 | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 91bb69e63cac..d7abbc602ed0 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:bf5639d265d70f6137d57d42ae781a6f4e26d4085ff4e018e71350480f9b3996
+  digest: sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30
diff --git a/README.md b/README.md
index 0ff14cd00346..220fda15832f 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,9 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
 ```
 
-If you are using Maven without BOM, add this to your dependencies:
+If you are using Maven without the BOM, add this to your dependencies:
 
+
 
 ```xml
 
@@ -377,7 +378,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-cli]: https://cloud.google.com/cli
-[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
+[troubleshooting]: https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md
 [contributing]: https://github.com/googleapis/java-datastore/blob/main/CONTRIBUTING.md
 [code-of-conduct]: https://github.com/googleapis/java-datastore/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [license]: https://github.com/googleapis/java-datastore/blob/main/LICENSE

From 6c34efd2094b9092cb23e35456a6ccc65f0fee2a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 6 Apr 2023 15:40:21 +0100
Subject: [PATCH 1108/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.12.0 (#1042)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.12.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 220fda15832f..8a3a3bbb2daa 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.11.0
+      26.12.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.11.0')
+implementation platform('com.google.cloud:libraries-bom:26.12.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index f8dd32fe8205..7bfcec43cc84 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.11.0
+        26.12.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 637698e64457..4872e3fcc586 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.11.0
+        26.12.0
         pom
         import
       

From 3ecd20a1c8575855dfb6c7b70d9f4a98a8e92591 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 13 Apr 2023 15:02:31 +0100
Subject: [PATCH 1109/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.7.0 (#1044)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9a8b21f52f25..a87b9c0c6954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.6.0
+        3.7.0
         pom
         import
       

From 0d3f78ec05f8a4a6f6d3a89917e1d417740bb883 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 13 Apr 2023 15:03:28 +0100
Subject: [PATCH 1110/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.21 (#1046)

---
 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 7bfcec43cc84..25a9ee2d8c1a 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.20
+            0.9.21
             true
             
               com.example.datastore.NativeImageDatastoreSample

From d18ff7c4738efe3cc7d43966fb1f3ec8733af3b6 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 13 Apr 2023 15:04:15 +0100
Subject: [PATCH 1111/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.21 (#1045)

---
 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 25a9ee2d8c1a..fd10cea234cb 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.20
+          0.9.21
           test
         
       

From e52df5d16908720fecfdcf634cbc420e25783f2c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:28:12 +0000
Subject: [PATCH 1112/1784] chore(main): release 2.14.3 (#1047)

:robot: I have created a release *beep* *boop*
---


## [2.14.3](https://togithub.com/googleapis/java-datastore/compare/v2.14.2...v2.14.3) (2023-04-13)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.7.0 ([#1044](https://togithub.com/googleapis/java-datastore/issues/1044)) ([3ecd20a](https://togithub.com/googleapis/java-datastore/commit/3ecd20a1c8575855dfb6c7b70d9f4a98a8e92591))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.21 ([#1045](https://togithub.com/googleapis/java-datastore/issues/1045)) ([d18ff7c](https://togithub.com/googleapis/java-datastore/commit/d18ff7c4738efe3cc7d43966fb1f3ec8733af3b6))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 ([#1046](https://togithub.com/googleapis/java-datastore/issues/1046)) ([0d3f78e](https://togithub.com/googleapis/java-datastore/commit/0d3f78ec05f8a4a6f6d3a89917e1d417740bb883))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  9 +++++++++
 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, 36 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ef27c5ed8a6..08897730cc92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [2.14.3](https://github.com/googleapis/java-datastore/compare/v2.14.2...v2.14.3) (2023-04-13)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.7.0 ([#1044](https://github.com/googleapis/java-datastore/issues/1044)) ([3ecd20a](https://github.com/googleapis/java-datastore/commit/3ecd20a1c8575855dfb6c7b70d9f4a98a8e92591))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.21 ([#1045](https://github.com/googleapis/java-datastore/issues/1045)) ([d18ff7c](https://github.com/googleapis/java-datastore/commit/d18ff7c4738efe3cc7d43966fb1f3ec8733af3b6))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 ([#1046](https://github.com/googleapis/java-datastore/issues/1046)) ([0d3f78e](https://github.com/googleapis/java-datastore/commit/0d3f78ec05f8a4a6f6d3a89917e1d417740bb883))
+
 ## [2.14.2](https://github.com/googleapis/java-datastore/compare/v2.14.1...v2.14.2) (2023-03-29)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 887f6c386db8..dee3c1d61702 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.3-SNAPSHOT
+  2.14.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3-SNAPSHOT
+    2.14.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 961024b8448e..48a2bcda8d23 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.3-SNAPSHOT
+  2.14.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.3-SNAPSHOT
+        2.14.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.3-SNAPSHOT
+        2.14.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.3-SNAPSHOT
+        0.105.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.3-SNAPSHOT
+        2.14.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1a14874541bb..3836dd150bef 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.3-SNAPSHOT
+  2.14.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3-SNAPSHOT
+    2.14.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 054c142435bb..82d7306658fb 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.3-SNAPSHOT
+  2.14.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3-SNAPSHOT
+    2.14.3
   
   
     
diff --git a/pom.xml b/pom.xml
index a87b9c0c6954..5065cd8fafd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.3-SNAPSHOT
+  2.14.3
   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.3-SNAPSHOT
+        2.14.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.3-SNAPSHOT
+        2.14.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.3-SNAPSHOT
+        2.14.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.3-SNAPSHOT
+        0.105.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.3-SNAPSHOT
+        2.14.3
         
           
             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 147ef27dc9d0..9ece6335209c 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.3-SNAPSHOT
+  2.14.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3-SNAPSHOT
+    2.14.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a7afc323f49a..360a6b787021 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.3-SNAPSHOT
+  0.105.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3-SNAPSHOT
+    2.14.3
   
   
     
diff --git a/versions.txt b/versions.txt
index c820056ef41c..5a7314922f4c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.2:2.14.3-SNAPSHOT
-google-cloud-datastore-bom:2.14.2:2.14.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.2:0.105.3-SNAPSHOT
-datastore-v1-proto-client:2.14.2:2.14.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.2:2.14.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.2:2.14.3-SNAPSHOT
+google-cloud-datastore:2.14.3:2.14.3
+google-cloud-datastore-bom:2.14.3:2.14.3
+proto-google-cloud-datastore-v1:0.105.3:0.105.3
+datastore-v1-proto-client:2.14.3:2.14.3
+proto-google-cloud-datastore-admin-v1:2.14.3:2.14.3
+grpc-google-cloud-datastore-admin-v1:2.14.3:2.14.3

From 5c52c8e4e3c60154655d01b0dfacaa4633c6071c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 06:16:12 +0000
Subject: [PATCH 1113/1784] chore(main): release 2.14.4-SNAPSHOT (#1048)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index dee3c1d61702..6f609945e294 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.3
+  2.14.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3
+    2.14.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 48a2bcda8d23..815bd1559dc2 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.3
+  2.14.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.3
+        2.14.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.3
+        2.14.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.3
+        0.105.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.3
+        2.14.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3836dd150bef..2c9c20d342e9 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.3
+  2.14.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3
+    2.14.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 82d7306658fb..e5e363bff416 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.3
+  2.14.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3
+    2.14.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 5065cd8fafd1..b2b308da036d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.3
+  2.14.4-SNAPSHOT
   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.3
+        2.14.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.3
+        2.14.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.3
+        2.14.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.3
+        0.105.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.3
+        2.14.4-SNAPSHOT
         
           
             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 9ece6335209c..669f8eda5ecd 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.3
+  2.14.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3
+    2.14.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 360a6b787021..904da3c1d461 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.3
+  0.105.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.3
+    2.14.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 5a7314922f4c..e26489edda4d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.3:2.14.3
-google-cloud-datastore-bom:2.14.3:2.14.3
-proto-google-cloud-datastore-v1:0.105.3:0.105.3
-datastore-v1-proto-client:2.14.3:2.14.3
-proto-google-cloud-datastore-admin-v1:2.14.3:2.14.3
-grpc-google-cloud-datastore-admin-v1:2.14.3:2.14.3
+google-cloud-datastore:2.14.3:2.14.4-SNAPSHOT
+google-cloud-datastore-bom:2.14.3:2.14.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.105.3:0.105.4-SNAPSHOT
+datastore-v1-proto-client:2.14.3:2.14.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.14.3:2.14.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.14.3:2.14.4-SNAPSHOT

From 115303cef56a38b854e9aff8aa45522e7f07b98b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 14 Apr 2023 07:17:22 +0100
Subject: [PATCH 1114/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.3 (#1049)
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.14.3

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8a3a3bbb2daa..fc1c1c7118b7 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.14.2
+  2.14.3
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.3"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index f9765fca2e36..f2714fa75637 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.2
+      2.14.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3afc0f2c9764..21bcd42bdf6b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.2
+      2.14.3
     
 
     

From 5f132956c898fb8906ef159823133d67c7ad53ae Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 21 Apr 2023 07:04:19 +0200
Subject: [PATCH 1115/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.13.0 (#1050)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.13.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fc1c1c7118b7..6b61cb06fa00 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.12.0
+      26.13.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.12.0')
+implementation platform('com.google.cloud:libraries-bom:26.13.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index fd10cea234cb..7069981e777b 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.12.0
+        26.13.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 4872e3fcc586..be2faf6de482 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.12.0
+        26.13.0
         pom
         import
       

From 412be617db28a97d38883bd6e26ddbc7d1c434fa Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 25 Apr 2023 22:16:13 +0200
Subject: [PATCH 1116/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.8.0 (#1052)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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/gapic-generator-java) | `3.7.0` -> `3.8.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.8.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.8.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.8.0/compatibility-slim/3.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.8.0/confidence-slim/3.7.0)](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, check this box

---

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 b2b308da036d..34607343b919 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.7.0
+        3.8.0
         pom
         import
       

From 2a871e25436a8812bc2f691c6462675b88976afc Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 26 Apr 2023 12:24:10 +0200
Subject: [PATCH 1117/1784] deps: update dependency
 org.junit.vintage:junit-vintage-engine to v5.9.3 (#1056)

---
 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 7069981e777b..b5f8bad75433 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.9.2
+          5.9.3
           test
         
         

From b8bdaa23f165f6bcb5a891ef2437ffdd7ce8aa4c Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 26 Apr 2023 09:50:13 -0400
Subject: [PATCH 1118/1784] docs: remove `@BetaApi` annotations for count
 aggregations (#1051)

---
 .../main/java/com/google/cloud/datastore/AggregationQuery.java | 2 --
 .../java/com/google/cloud/datastore/AggregationResult.java     | 2 --
 .../java/com/google/cloud/datastore/AggregationResults.java    | 2 --
 .../src/main/java/com/google/cloud/datastore/Datastore.java    | 2 --
 .../main/java/com/google/cloud/datastore/DatastoreImpl.java    | 3 ---
 .../main/java/com/google/cloud/datastore/DatastoreReader.java  | 2 --
 .../com/google/cloud/datastore/aggregation/Aggregation.java    | 2 --
 .../google/cloud/datastore/aggregation/AggregationBuilder.java | 3 ---
 .../google/cloud/datastore/aggregation/CountAggregation.java   | 2 --
 9 files changed, 20 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
index 05f48a6c68bd..8e7e7cdc9681 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
@@ -19,7 +19,6 @@
 import static com.google.cloud.datastore.AggregationQuery.Mode.STRUCTURED;
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.api.core.BetaApi;
 import com.google.cloud.datastore.aggregation.Aggregation;
 import com.google.cloud.datastore.aggregation.AggregationBuilder;
 import java.util.HashSet;
@@ -67,7 +66,6 @@
  * @see Datastore
  *     queries
  */
-@BetaApi
 public class AggregationQuery extends Query {
 
   private Set aggregations;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
index 928997ee7a64..6e086c30bc69 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
@@ -15,7 +15,6 @@
  */
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import java.util.Map;
@@ -23,7 +22,6 @@
 import java.util.Objects;
 
 /** Represents a result of an {@link AggregationQuery} query submission. */
-@BetaApi
 public class AggregationResult {
 
   private final Map properties;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
index feff5b805778..f0106886a334 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
@@ -17,7 +17,6 @@
 
 import static com.google.api.client.util.Preconditions.checkNotNull;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.cloud.Timestamp;
 import java.util.Iterator;
@@ -30,7 +29,6 @@
  *
  * 
    This can be used to iterate over an underlying {@link List} directly.
  */
-@BetaApi
 public class AggregationResults implements Iterable {
 
   private final List aggregationResults;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index 9d0a21b8dc10..d58c001b1d28 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import com.google.cloud.Service;
 import com.google.datastore.v1.TransactionOptions;
 import java.util.Iterator;
@@ -506,7 +505,6 @@ interface TransactionCallable {
    * @throws DatastoreException upon failure
    * @return {@link AggregationResults}
    */
-  @BetaApi
   default AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
     throw new UnsupportedOperationException("Not implemented.");
   }
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 4f6533ecab16..2483231507e5 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
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.BaseService;
 import com.google.cloud.ExceptionHandler;
@@ -198,13 +197,11 @@  QueryResults run(Optional readOptionsPb, Query query) {
   }
 
   @Override
-  @BetaApi
   public AggregationResults runAggregation(AggregationQuery query) {
     return aggregationQueryExecutor.execute(query);
   }
 
   @Override
-  @BetaApi
   public AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
     return aggregationQueryExecutor.execute(query, options);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
index 751f99566e08..2a3071f3c5c8 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import java.util.Iterator;
 import java.util.List;
 
@@ -60,7 +59,6 @@ public interface DatastoreReader {
    *
    * @throws DatastoreException upon failure
    */
-  @BetaApi
   default AggregationResults runAggregation(AggregationQuery query) {
     throw new UnsupportedOperationException("Not implemented.");
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
index 8a8e8cc183c9..7bd2bbb386da 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
@@ -16,14 +16,12 @@
 
 package com.google.cloud.datastore.aggregation;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.datastore.v1.AggregationQuery;
 
 /**
  * Represents a Google Cloud Datastore Aggregation which is used with an {@link AggregationQuery}.
  */
-@BetaApi
 public abstract class Aggregation {
 
   private final String alias;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
index 5e90b86aa485..ce23edcf0a54 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
@@ -16,8 +16,6 @@
 
 package com.google.cloud.datastore.aggregation;
 
-import com.google.api.core.BetaApi;
-
 /**
  * An interface to represent the builders which build and customize {@link Aggregation} for {@link
  * com.google.cloud.datastore.AggregationQuery}.
@@ -25,7 +23,6 @@
  * 
    Used by {@link
  * com.google.cloud.datastore.AggregationQuery.Builder#addAggregation(AggregationBuilder)}.
  */
-@BetaApi
 public interface AggregationBuilder {
   A build();
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
index a5295addf102..4f7eb23d6d5d 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
@@ -16,13 +16,11 @@
 
 package com.google.cloud.datastore.aggregation;
 
-import com.google.api.core.BetaApi;
 import com.google.datastore.v1.AggregationQuery;
 import com.google.datastore.v1.AggregationQuery.Aggregation.Count;
 import java.util.Objects;
 
 /** Represents an {@link Aggregation} which returns count. */
-@BetaApi
 public class CountAggregation extends Aggregation {
 
   /** @param alias Alias to used when running this aggregation. */

From b01bbc2108da1e859fd712e3b7c153db160f897c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 26 Apr 2023 14:10:13 +0000
Subject: [PATCH 1119/1784] chore(main): release 2.14.4 (#1053)

:robot: I have created a release *beep* *boop*
---


## [2.14.4](https://togithub.com/googleapis/java-datastore/compare/v2.14.3...v2.14.4) (2023-04-26)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.8.0 ([#1052](https://togithub.com/googleapis/java-datastore/issues/1052)) ([412be61](https://togithub.com/googleapis/java-datastore/commit/412be617db28a97d38883bd6e26ddbc7d1c434fa))
* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 ([#1056](https://togithub.com/googleapis/java-datastore/issues/1056)) ([2a871e2](https://togithub.com/googleapis/java-datastore/commit/2a871e25436a8812bc2f691c6462675b88976afc))


### Documentation

* Remove `@BetaApi` annotations for count aggregations ([#1051](https://togithub.com/googleapis/java-datastore/issues/1051)) ([b8bdaa2](https://togithub.com/googleapis/java-datastore/commit/b8bdaa23f165f6bcb5a891ef2437ffdd7ce8aa4c))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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, 40 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08897730cc92..a67e99388b0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.14.4](https://github.com/googleapis/java-datastore/compare/v2.14.3...v2.14.4) (2023-04-26)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.8.0 ([#1052](https://github.com/googleapis/java-datastore/issues/1052)) ([412be61](https://github.com/googleapis/java-datastore/commit/412be617db28a97d38883bd6e26ddbc7d1c434fa))
+* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 ([#1056](https://github.com/googleapis/java-datastore/issues/1056)) ([2a871e2](https://github.com/googleapis/java-datastore/commit/2a871e25436a8812bc2f691c6462675b88976afc))
+
+
+### Documentation
+
+* Remove `@BetaApi` annotations for count aggregations ([#1051](https://github.com/googleapis/java-datastore/issues/1051)) ([b8bdaa2](https://github.com/googleapis/java-datastore/commit/b8bdaa23f165f6bcb5a891ef2437ffdd7ce8aa4c))
+
 ## [2.14.3](https://github.com/googleapis/java-datastore/compare/v2.14.2...v2.14.3) (2023-04-13)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6f609945e294..e2dd4f8c8880 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -19,12 +19,12 @@
   4.0.0
   com.google.cloud.datastore
   datastore-v1-proto-client
-  2.14.4-SNAPSHOT
+  2.14.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4-SNAPSHOT
+    2.14.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 815bd1559dc2..0a3870c069d8 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-datastore-bom
-  2.14.4-SNAPSHOT
+  2.14.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.4-SNAPSHOT
+        2.14.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.4-SNAPSHOT
+        2.14.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.4-SNAPSHOT
+        0.105.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.4-SNAPSHOT
+        2.14.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2c9c20d342e9..9727c3f75b4b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.14.4-SNAPSHOT
+  2.14.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4-SNAPSHOT
+    2.14.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index e5e363bff416..8ef18c2d162c 100644
--- a/grpc-google-cloud-datastore-admin-v1/pom.xml
+++ b/grpc-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-admin-v1
-  2.14.4-SNAPSHOT
+  2.14.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4-SNAPSHOT
+    2.14.4
   
   
     
diff --git a/pom.xml b/pom.xml
index 34607343b919..1239c79e4ec0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.4-SNAPSHOT
+  2.14.4
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.4-SNAPSHOT
+        2.14.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.4-SNAPSHOT
+        2.14.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.4-SNAPSHOT
+        2.14.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.4-SNAPSHOT
+        0.105.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.4-SNAPSHOT
+        2.14.4
         
           
             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 669f8eda5ecd..2a7e48bed173 100644
--- a/proto-google-cloud-datastore-admin-v1/pom.xml
+++ b/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-admin-v1
-  2.14.4-SNAPSHOT
+  2.14.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4-SNAPSHOT
+    2.14.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 904da3c1d461..442dea9755ad 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-v1
-  0.105.4-SNAPSHOT
+  0.105.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4-SNAPSHOT
+    2.14.4
   
   
     
diff --git a/versions.txt b/versions.txt
index e26489edda4d..92b496b15490 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.3:2.14.4-SNAPSHOT
-google-cloud-datastore-bom:2.14.3:2.14.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.3:0.105.4-SNAPSHOT
-datastore-v1-proto-client:2.14.3:2.14.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.3:2.14.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.3:2.14.4-SNAPSHOT
+google-cloud-datastore:2.14.4:2.14.4
+google-cloud-datastore-bom:2.14.4:2.14.4
+proto-google-cloud-datastore-v1:0.105.4:0.105.4
+datastore-v1-proto-client:2.14.4:2.14.4
+proto-google-cloud-datastore-admin-v1:2.14.4:2.14.4
+grpc-google-cloud-datastore-admin-v1:2.14.4:2.14.4

From 4aaa89116bf070ac31173d1548d6a0d5a7b0e4e3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 26 Apr 2023 16:10:12 +0000
Subject: [PATCH 1120/1784] chore(main): release 2.14.5-SNAPSHOT (#1057)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index e2dd4f8c8880..11f58530152a 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -19,12 +19,12 @@
   4.0.0
   com.google.cloud.datastore
   datastore-v1-proto-client
-  2.14.4
+  2.14.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4
+    2.14.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0a3870c069d8..321f3211fa68 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-datastore-bom
-  2.14.4
+  2.14.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.4
+        2.14.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.4
+        2.14.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.4
+        0.105.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.4
+        2.14.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9727c3f75b4b..21e55fbea55f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.14.4
+  2.14.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4
+    2.14.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 8ef18c2d162c..1c20f4244775 100644
--- a/grpc-google-cloud-datastore-admin-v1/pom.xml
+++ b/grpc-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-admin-v1
-  2.14.4
+  2.14.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4
+    2.14.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 1239c79e4ec0..e018caf4382a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.4
+  2.14.5-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.4
+        2.14.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.4
+        2.14.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.4
+        2.14.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.4
+        0.105.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.4
+        2.14.5-SNAPSHOT
         
           
             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 2a7e48bed173..21f130372846 100644
--- a/proto-google-cloud-datastore-admin-v1/pom.xml
+++ b/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-admin-v1
-  2.14.4
+  2.14.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4
+    2.14.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 442dea9755ad..cb8ae4abfd50 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-v1
-  0.105.4
+  0.105.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.4
+    2.14.5-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 92b496b15490..5de179becd08 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.4:2.14.4
-google-cloud-datastore-bom:2.14.4:2.14.4
-proto-google-cloud-datastore-v1:0.105.4:0.105.4
-datastore-v1-proto-client:2.14.4:2.14.4
-proto-google-cloud-datastore-admin-v1:2.14.4:2.14.4
-grpc-google-cloud-datastore-admin-v1:2.14.4:2.14.4
+google-cloud-datastore:2.14.4:2.14.5-SNAPSHOT
+google-cloud-datastore-bom:2.14.4:2.14.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.105.4:0.105.5-SNAPSHOT
+datastore-v1-proto-client:2.14.4:2.14.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.14.4:2.14.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.14.4:2.14.5-SNAPSHOT

From 207a04efa73bc0d2ffbe10b52d2ec2ba931c65a4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 27 Apr 2023 06:16:15 +0200
Subject: [PATCH 1121/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.4 (#1058)
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.14.4

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6b61cb06fa00..de738f5ac0d0 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.14.3
+  2.14.4
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.4"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.4
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index f2714fa75637..60c4f8c4cf31 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.3
+      2.14.4
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 21bcd42bdf6b..f9a103611b38 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.3
+      2.14.4
     
 
     

From ac21ef6cff5308fb17990a768100d1b2ee4c3654 Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Thu, 27 Apr 2023 10:12:37 +0530
Subject: [PATCH 1122/1784] fix: Using namespace from DatastoreOptions if
 aggregation query is not configured with one. (#1055)

fix #1054
---
 .../request/AggregationQueryRequestProtoPreparer.java      | 7 ++++---
 .../request/AggregationQueryRequestProtoPreparerTest.java  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

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 b5da8d9fef56..8f4e51d6e56c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
@@ -26,6 +26,7 @@
 import com.google.cloud.datastore.ReadOptionProtoPreparer;
 import com.google.cloud.datastore.StructuredQueryProtoPreparer;
 import com.google.cloud.datastore.aggregation.Aggregation;
+import com.google.common.base.MoreObjects;
 import com.google.datastore.v1.GqlQuery;
 import com.google.datastore.v1.PartitionId;
 import com.google.datastore.v1.Query;
@@ -92,9 +93,9 @@ private com.google.datastore.v1.AggregationQuery getAggregationQuery(
   private PartitionId getPartitionId(AggregationQuery aggregationQuery) {
     PartitionId.Builder builder =
         PartitionId.newBuilder().setProjectId(datastoreOptions.getProjectId());
-    if (aggregationQuery.getNamespace() != null) {
-      builder.setNamespaceId(aggregationQuery.getNamespace());
-    }
+    String namespace =
+        MoreObjects.firstNonNull(aggregationQuery.getNamespace(), datastoreOptions.getNamespace());
+    builder.setNamespaceId(namespace);
     return builder.build();
   }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
index 6301ebeff500..934e3a4c7f50 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
@@ -154,7 +154,7 @@ public void shouldPrepareReadOptionsWithGivenGqlQuery() {
   }
 
   @Test
-  public void shouldPrepareAggregationQueryWithoutNamespace() {
+  public void shouldPrepareAggregationQueryWithNamespaceFromDatastoreOptions() {
     AggregationQuery structuredQueryWithoutNamespace =
         Query.newAggregationQueryBuilder()
             .addAggregation(count().as("total"))
@@ -169,8 +169,9 @@ public void shouldPrepareAggregationQueryWithoutNamespace() {
         protoPreparer.prepare(QueryAndReadOptions.create(gqlQueryWithoutNamespace));
 
     assertThat(runAggregationQueryFromStructuredQuery.getPartitionId().getNamespaceId())
-        .isEqualTo("");
-    assertThat(runAggregationQueryFromGqlQuery.getPartitionId().getNamespaceId()).isEqualTo("");
+        .isEqualTo(NAMESPACE);
+    assertThat(runAggregationQueryFromGqlQuery.getPartitionId().getNamespaceId())
+        .isEqualTo(NAMESPACE);
   }
 
   private RunAggregationQueryRequest prepareQuery(AggregationQuery query, ReadOption readOption) {

From 1d486cf3198e406449a96fb68e0245e153d85da6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 05:54:13 +0000
Subject: [PATCH 1123/1784] chore(main): release 2.14.5 (#1059)

:robot: I have created a release *beep* *boop*
---


## [2.14.5](https://togithub.com/googleapis/java-datastore/compare/v2.14.4...v2.14.5) (2023-04-27)


### Bug Fixes

* Using namespace from DatastoreOptions if aggregation query is not configured with one. ([#1055](https://togithub.com/googleapis/java-datastore/issues/1055)) ([ac21ef6](https://togithub.com/googleapis/java-datastore/commit/ac21ef6cff5308fb17990a768100d1b2ee4c3654)), closes [#1054](https://togithub.com/googleapis/java-datastore/issues/1054)

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a67e99388b0c..025ff011ebd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.14.5](https://github.com/googleapis/java-datastore/compare/v2.14.4...v2.14.5) (2023-04-27)
+
+
+### Bug Fixes
+
+* Using namespace from DatastoreOptions if aggregation query is not configured with one. ([#1055](https://github.com/googleapis/java-datastore/issues/1055)) ([ac21ef6](https://github.com/googleapis/java-datastore/commit/ac21ef6cff5308fb17990a768100d1b2ee4c3654)), closes [#1054](https://github.com/googleapis/java-datastore/issues/1054)
+
 ## [2.14.4](https://github.com/googleapis/java-datastore/compare/v2.14.3...v2.14.4) (2023-04-26)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 11f58530152a..a9baa799f405 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.5-SNAPSHOT
+  2.14.5
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5-SNAPSHOT
+    2.14.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 321f3211fa68..817aa3fc2ed0 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.5-SNAPSHOT
+  2.14.5
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.5-SNAPSHOT
+        2.14.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.5-SNAPSHOT
+        2.14.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.5-SNAPSHOT
+        0.105.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.5-SNAPSHOT
+        2.14.5
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 21e55fbea55f..57c8aad651db 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.5-SNAPSHOT
+  2.14.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5-SNAPSHOT
+    2.14.5
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 1c20f4244775..cb7a0f106a2b 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.5-SNAPSHOT
+  2.14.5
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5-SNAPSHOT
+    2.14.5
   
   
     
diff --git a/pom.xml b/pom.xml
index e018caf4382a..8d79f932ee67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.5-SNAPSHOT
+  2.14.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.5-SNAPSHOT
+        2.14.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.5-SNAPSHOT
+        2.14.5
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.5-SNAPSHOT
+        2.14.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.5-SNAPSHOT
+        0.105.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.5-SNAPSHOT
+        2.14.5
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index 21f130372846..d8068d89a9e8 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.5-SNAPSHOT
+  2.14.5
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5-SNAPSHOT
+    2.14.5
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cb8ae4abfd50..8d4fd2ea8529 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.5-SNAPSHOT
+  0.105.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5-SNAPSHOT
+    2.14.5
   
   
     
diff --git a/versions.txt b/versions.txt
index 5de179becd08..e16e306bbb5b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.4:2.14.5-SNAPSHOT
-google-cloud-datastore-bom:2.14.4:2.14.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.4:0.105.5-SNAPSHOT
-datastore-v1-proto-client:2.14.4:2.14.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.4:2.14.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.4:2.14.5-SNAPSHOT
+google-cloud-datastore:2.14.5:2.14.5
+google-cloud-datastore-bom:2.14.5:2.14.5
+proto-google-cloud-datastore-v1:0.105.5:0.105.5
+datastore-v1-proto-client:2.14.5:2.14.5
+proto-google-cloud-datastore-admin-v1:2.14.5:2.14.5
+grpc-google-cloud-datastore-admin-v1:2.14.5:2.14.5

From 63d1d4a218ffd5c3851f21ee02b63108c6e0757d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 08:16:13 +0000
Subject: [PATCH 1124/1784] chore(main): release 2.14.6-SNAPSHOT (#1060)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 README.md                                     |  6 +++---
 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, 30 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index de738f5ac0d0..5004417a7c80 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.5"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.4
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.5
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a9baa799f405..b8e78a31c27c 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.5
+  2.14.6-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5
+    2.14.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 817aa3fc2ed0..e9592b6576ec 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.5
+  2.14.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.5
+        2.14.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.5
+        2.14.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.5
+        0.105.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.5
+        2.14.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 57c8aad651db..3db1f7d19285 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.5
+  2.14.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5
+    2.14.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index cb7a0f106a2b..b22629a81726 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.5
+  2.14.6-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5
+    2.14.6-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 8d79f932ee67..acb82c662758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.5
+  2.14.6-SNAPSHOT
   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.5
+        2.14.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.5
+        2.14.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.5
+        2.14.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.5
+        0.105.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.5
+        2.14.6-SNAPSHOT
         
           
             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 d8068d89a9e8..7292742e4066 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.5
+  2.14.6-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5
+    2.14.6-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8d4fd2ea8529..c1de7ecf151a 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.5
+  0.105.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.5
+    2.14.6-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index e16e306bbb5b..14224b56d6f2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.5:2.14.5
-google-cloud-datastore-bom:2.14.5:2.14.5
-proto-google-cloud-datastore-v1:0.105.5:0.105.5
-datastore-v1-proto-client:2.14.5:2.14.5
-proto-google-cloud-datastore-admin-v1:2.14.5:2.14.5
-grpc-google-cloud-datastore-admin-v1:2.14.5:2.14.5
+google-cloud-datastore:2.14.5:2.14.6-SNAPSHOT
+google-cloud-datastore-bom:2.14.5:2.14.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.105.5:0.105.6-SNAPSHOT
+datastore-v1-proto-client:2.14.5:2.14.6-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.14.5:2.14.6-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.14.5:2.14.6-SNAPSHOT

From e1f67e55b51e1cd148711f862f8a0964848ff5fd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 27 Apr 2023 10:55:08 +0200
Subject: [PATCH 1125/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.5 (#1061)
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.14.5

* 🦉 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 5004417a7c80..6827d905ccc4 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.14.4
+  2.14.5
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 60c4f8c4cf31..c5147926b3dc 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.4
+      2.14.5
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f9a103611b38..a71ad69abe6a 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.4
+      2.14.5
     
 
     

From 52f8c274b9972fd0e672ee05bebd5b17543fca85 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 3 May 2023 09:50:03 -0400
Subject: [PATCH 1126/1784] docs: minor comment update for Entity message
 (#1063)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: minor comment update for Entity message

PiperOrigin-RevId: 528936266

Source-Link: https://github.com/googleapis/googleapis/commit/4f9e1a058e186df999eb85d7abec8fb092b7a145

Source-Link: https://github.com/googleapis/googleapis-gen/commit/14fce92515a1ae05b89ce2b28d9bc57ec12dcba6
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTRmY2U5MjUxNWExYWUwNWI4OWNlMmIyOGQ5YmM1N2VjMTJkY2JhNiJ9

* 🦉 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 
---
 .../src/main/java/com/google/datastore/v1/Entity.java     | 8 ++------
 .../src/main/proto/google/datastore/v1/entity.proto       | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index d6f7c3c6abad..2d0c9564ab67 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -23,9 +23,7 @@
  *
  * 
      * A Datastore data object.
- * An entity is limited to 1 megabyte when stored. That _roughly_
- * corresponds to a limit of 1 megabyte for the serialized form of this
- * message.
+ * Must not exceed 1 MiB - 4 bytes.
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.Entity}
@@ -447,9 +445,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
        * A Datastore data object.
-   * An entity is limited to 1 megabyte when stored. That _roughly_
-   * corresponds to a limit of 1 megabyte for the serialized form of this
-   * message.
+   * Must not exceed 1 MiB - 4 bytes.
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.Entity}
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 2d22853f5ca3..d80dd9093dfb 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
@@ -197,9 +197,7 @@ message Value {
 
 // A Datastore data object.
 //
-// An entity is limited to 1 megabyte when stored. That _roughly_
-// corresponds to a limit of 1 megabyte for the serialized form of this
-// message.
+// Must not exceed 1 MiB - 4 bytes.
 message Entity {
   // The entity's key.
   //

From 11cef9ffb4737886aa24a70e8fc2577330f3e50a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 3 May 2023 17:34:10 +0200
Subject: [PATCH 1127/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.14.0 (#1065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.14.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6827d905ccc4..dc40e92f8f37 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.13.0
+      26.14.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.13.0')
+implementation platform('com.google.cloud:libraries-bom:26.14.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index b5f8bad75433..22ae63601f0c 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.13.0
+        26.14.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index be2faf6de482..315ff268abe6 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.13.0
+        26.14.0
         pom
         import
       

From e9e7242bd0f5e52234d064648475d3aeef19590d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 8 May 2023 17:06:19 +0200
Subject: [PATCH 1128/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3.1.0 (#1066)

---
 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 22ae63601f0c..e865b2bb576c 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -97,7 +97,7 @@
             org.apache.maven.plugins
             maven-surefire-plugin
              
-            3.0.0
+            3.1.0
             
               
                 **/IT*

From e98290918e355ade533bdbd6089081d361db8603 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 9 May 2023 10:04:53 -0400
Subject: [PATCH 1129/1784] chore(deps): update ghcr.io/graalvm/graalvm-ce
 docker tag to v22.3.2 (#1793) (#1068)

Source-Link: https://github.com/googleapis/synthtool/commit/99ad07938fb6bcddcc7b1b586be699d72440758b
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:8dd8395defb6a5069b0b10c435058bf13980606ba1967e2b3925ed50fc3cb22f

Co-authored-by: Owl Bot 
Co-authored-by: Mridula <66699525+mpeddada1@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml               | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index d7abbc602ed0..35478afe3fdd 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30
+  digest: sha256:8dd8395defb6a5069b0b10c435058bf13980606ba1967e2b3925ed50fc3cb22f
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index e20330c3ca60..f52533545896 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 0fd6ba2fa0ce..44b1004875b6 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2"
 }
 
 env_vars: {

From 6bd4dfeeecfa0ce9ee9e705f4390c7686e233bd8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 9 May 2023 22:42:00 +0200
Subject: [PATCH 1130/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.9.0 (#1071)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index acb82c662758..a1170d90d642 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.8.0
+        3.9.0
         pom
         import
       

From 40215665871e829b04ec5c1e08814f3408bed317 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 9 May 2023 21:00:24 +0000
Subject: [PATCH 1131/1784] chore(main): release 2.14.6 (#1064)

:robot: I have created a release *beep* *boop*
---


## [2.14.6](https://togithub.com/googleapis/java-datastore/compare/v2.14.5...v2.14.6) (2023-05-09)


### Documentation

* Minor comment update for Entity message ([#1063](https://togithub.com/googleapis/java-datastore/issues/1063)) ([52f8c27](https://togithub.com/googleapis/java-datastore/commit/52f8c274b9972fd0e672ee05bebd5b17543fca85))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.9.0 ([#1071](https://togithub.com/googleapis/java-datastore/issues/1071)) ([6bd4dfe](https://togithub.com/googleapis/java-datastore/commit/6bd4dfeeecfa0ce9ee9e705f4390c7686e233bd8))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 12 ++++++++++++
 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, 39 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 025ff011ebd9..da08db8f7539 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.14.6](https://github.com/googleapis/java-datastore/compare/v2.14.5...v2.14.6) (2023-05-09)
+
+
+### Documentation
+
+* Minor comment update for Entity message ([#1063](https://github.com/googleapis/java-datastore/issues/1063)) ([52f8c27](https://github.com/googleapis/java-datastore/commit/52f8c274b9972fd0e672ee05bebd5b17543fca85))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.9.0 ([#1071](https://github.com/googleapis/java-datastore/issues/1071)) ([6bd4dfe](https://github.com/googleapis/java-datastore/commit/6bd4dfeeecfa0ce9ee9e705f4390c7686e233bd8))
+
 ## [2.14.5](https://github.com/googleapis/java-datastore/compare/v2.14.4...v2.14.5) (2023-04-27)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b8e78a31c27c..79b0d7499134 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.6-SNAPSHOT
+  2.14.6
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6-SNAPSHOT
+    2.14.6
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e9592b6576ec..59c6e3d68d30 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.6-SNAPSHOT
+  2.14.6
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.6-SNAPSHOT
+        2.14.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.6-SNAPSHOT
+        2.14.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.6-SNAPSHOT
+        0.105.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.6-SNAPSHOT
+        2.14.6
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3db1f7d19285..4b90a148c1ad 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.6-SNAPSHOT
+  2.14.6
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6-SNAPSHOT
+    2.14.6
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index b22629a81726..04c30c10be3b 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.6-SNAPSHOT
+  2.14.6
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6-SNAPSHOT
+    2.14.6
   
   
     
diff --git a/pom.xml b/pom.xml
index a1170d90d642..3c0825dca3ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.6-SNAPSHOT
+  2.14.6
   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.6-SNAPSHOT
+        2.14.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.6-SNAPSHOT
+        2.14.6
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.6-SNAPSHOT
+        2.14.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.6-SNAPSHOT
+        0.105.6
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.6-SNAPSHOT
+        2.14.6
         
           
             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 7292742e4066..ef5aacc99c39 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.6-SNAPSHOT
+  2.14.6
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6-SNAPSHOT
+    2.14.6
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c1de7ecf151a..e4f046394f49 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.6-SNAPSHOT
+  0.105.6
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6-SNAPSHOT
+    2.14.6
   
   
     
diff --git a/versions.txt b/versions.txt
index 14224b56d6f2..063513c96650 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.5:2.14.6-SNAPSHOT
-google-cloud-datastore-bom:2.14.5:2.14.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.5:0.105.6-SNAPSHOT
-datastore-v1-proto-client:2.14.5:2.14.6-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.5:2.14.6-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.5:2.14.6-SNAPSHOT
+google-cloud-datastore:2.14.6:2.14.6
+google-cloud-datastore-bom:2.14.6:2.14.6
+proto-google-cloud-datastore-v1:0.105.6:0.105.6
+datastore-v1-proto-client:2.14.6:2.14.6
+proto-google-cloud-datastore-admin-v1:2.14.6:2.14.6
+grpc-google-cloud-datastore-admin-v1:2.14.6:2.14.6

From 28217fda00893af68a0792a75f073e9b4e971533 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 10 May 2023 14:56:13 +0000
Subject: [PATCH 1132/1784] chore(main): release 2.14.7-SNAPSHOT (#1072)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 79b0d7499134..e2bcefbc259f 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.6
+  2.14.7-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6
+    2.14.7-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 59c6e3d68d30..6dae71644428 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.6
+  2.14.7-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.6
+        2.14.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.6
+        2.14.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.6
+        0.105.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.6
+        2.14.7-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4b90a148c1ad..c56273e38987 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.6
+  2.14.7-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6
+    2.14.7-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 04c30c10be3b..268b3ab78d82 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.6
+  2.14.7-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6
+    2.14.7-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 3c0825dca3ae..80c391ec0f4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.6
+  2.14.7-SNAPSHOT
   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.6
+        2.14.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.6
+        2.14.7-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.6
+        2.14.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.6
+        0.105.7-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.6
+        2.14.7-SNAPSHOT
         
           
             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 ef5aacc99c39..5c1b10653c56 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.6
+  2.14.7-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6
+    2.14.7-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e4f046394f49..336513bb7193 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.6
+  0.105.7-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.6
+    2.14.7-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 063513c96650..7614b37a64fc 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.6:2.14.6
-google-cloud-datastore-bom:2.14.6:2.14.6
-proto-google-cloud-datastore-v1:0.105.6:0.105.6
-datastore-v1-proto-client:2.14.6:2.14.6
-proto-google-cloud-datastore-admin-v1:2.14.6:2.14.6
-grpc-google-cloud-datastore-admin-v1:2.14.6:2.14.6
+google-cloud-datastore:2.14.6:2.14.7-SNAPSHOT
+google-cloud-datastore-bom:2.14.6:2.14.7-SNAPSHOT
+proto-google-cloud-datastore-v1:0.105.6:0.105.7-SNAPSHOT
+datastore-v1-proto-client:2.14.6:2.14.7-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.14.6:2.14.7-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.14.6:2.14.7-SNAPSHOT

From 239001682bd1284be39d4646ce0594274070c143 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 11 May 2023 16:06:13 +0200
Subject: [PATCH 1133/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.19.1 (#1069)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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.18.0` -> `2.19.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.19.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.19.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.19.1/compatibility-slim/2.18.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_core/2.19.1/confidence-slim/2.18.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone

### [`v2.19.1`](https://togithub.com/google/error-prone/releases/tag/v2.19.1): Error Prone 2.19.1

This release fixes a binary compatibility issue when running on JDK 11, see [#​3895](https://togithub.com/google/error-prone/issues/3895)

**Full Changelog**: https://togithub.com/google/error-prone/compare/v2.19.0...v2.19.1

### [`v2.19.0`](https://togithub.com/google/error-prone/releases/tag/v2.19.0): Error Prone 2.19.0

New Checkers:

-   [`NotJavadoc`](https://errorprone.info/bugpattern/NotJavadoc)
-   [`StringCaseLocaleUsage`](https://errorprone.info/bugpattern/StringCaseLocaleUsage)
-   [`UnnecessaryTestMethodPrefix`](https://errorprone.info/bugpattern/UnnecessaryTestMethodPrefix)

Fixes issues:  [#​956](https://togithub.com/google/error-prone/issues/956), [#​3504](https://togithub.com/google/error-prone/issues/3504), [#​3654](https://togithub.com/google/error-prone/issues/3654), [#​3703](https://togithub.com/google/error-prone/issues/3703), [#​3731](https://togithub.com/google/error-prone/issues/3731), [#​3737](https://togithub.com/google/error-prone/issues/3737), [#​3760](https://togithub.com/google/error-prone/issues/3760), [#​3779](https://togithub.com/google/error-prone/issues/3779), [#​3796](https://togithub.com/google/error-prone/issues/3796), [#​3809](https://togithub.com/google/error-prone/issues/3809), [#​3813](https://togithub.com/google/error-prone/issues/3813)

**Full Changelog**: https://togithub.com/google/error-prone/compare/v2.18.0...v2.19.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, check this box

---

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).

---
 README.md | 6 +++---
 pom.xml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index dc40e92f8f37..1e3c8bc1ebd3 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.5'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.6'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.6"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.5
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.6
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/pom.xml b/pom.xml
index 80c391ec0f4a..71b78eec7d53 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.18.0
+    2.19.1
       
 
   

From a4db89502e9611bf5f9760bfceb1025cc99a9830 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 11 May 2023 16:29:22 +0200
Subject: [PATCH 1134/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.22 (#1075)

---
 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 e865b2bb576c..90fddce85508 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.21
+            0.9.22
             true
             
               com.example.datastore.NativeImageDatastoreSample

From c0cc4565cc0e34098f5bc97c031ae671af44fcf3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 11 May 2023 16:29:36 +0200
Subject: [PATCH 1135/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.22 (#1074)

---
 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 90fddce85508..b03cced94500 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.21
+          0.9.22
           test
         
           

From 1dab7646f7c381f0239f12dffd29f7782d54a689 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 11 May 2023 16:29:50 +0200
Subject: [PATCH 1136/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.6 (#1073)
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.14.6

* 🦉 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 1e3c8bc1ebd3..77ab9010b3af 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.14.5
+  2.14.6
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index c5147926b3dc..a55e19cd0c6e 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.5
+      2.14.6
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index a71ad69abe6a..b10c3629d44a 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.5
+      2.14.6
     
 
     

From 79c7b241002025d4c1338806948ef54874881237 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 12 May 2023 11:54:37 +0200
Subject: [PATCH 1137/1784] build(deps): update dependency
 org.codehaus.mojo:build-helper-maven-plugin to v3.4.0 (#1077)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a55e19cd0c6e..5a68aec6a03f 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -53,7 +53,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.3.0
+        3.4.0
         
           
             add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b10c3629d44a..6421d6f95c96 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -52,7 +52,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.3.0
+        3.4.0
         
           
             add-snippets-source

From 2fca5c80857118ffc22c5b247c51b2fc9cd70653 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 17 May 2023 10:36:35 +0200
Subject: [PATCH 1138/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.15.0 (#1078)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.15.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 77ab9010b3af..b05e0716c9f3 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.14.0
+      26.15.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.14.0')
+implementation platform('com.google.cloud:libraries-bom:26.15.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index b03cced94500..4db871c2beef 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.14.0
+        26.15.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 315ff268abe6..cde13ac88e65 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.14.0
+        26.15.0
         pom
         import
       

From 6f03fab493bca84638a322ab8c72e5cda57c07dc Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Fri, 19 May 2023 11:22:12 +0530
Subject: [PATCH 1139/1784] test(fix): testing the serializability behaviour
 without relying  on the underlying concurrency  (#1079)

fix #497

Since we are testing the behaviour _(i.e. if two transactions conflict with each other, the database guarantees that only one can commit successfully at a time)_ now, both of the tests are now agnostic of underlying concurrency mechanism. This makes sure that both of the tests continue to pass in any gcloud project .
---
 .../cloud/datastore/it/ITDatastoreTest.java   | 102 +++++++++++-------
 .../cloud/datastore/it/StatementExecutor.java |  91 ++++++++++++++++
 2 files changed, 155 insertions(+), 38 deletions(-)
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java

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 f010d8135f93..3a5ccabac751 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
@@ -29,6 +29,7 @@
 import static org.junit.Assert.fail;
 
 import com.google.cloud.Timestamp;
+import com.google.cloud.Tuple;
 import com.google.cloud.datastore.AggregationQuery;
 import com.google.cloud.datastore.Batch;
 import com.google.cloud.datastore.BooleanValue;
@@ -335,57 +336,82 @@ public void testNewTransactionCommit() {
   }
 
   @Test
-  public void testTransactionWithRead() {
-    Transaction transaction = DATASTORE.newTransaction();
-    assertNull(transaction.get(KEY3));
-    transaction.add(ENTITY3);
-    transaction.commit();
+  public void testTransactionWithRead() throws Exception {
+    StatementExecutor statementExecutor = new StatementExecutor();
+    Transaction baseTransaction = DATASTORE.newTransaction();
+    assertNull(baseTransaction.get(KEY3));
+    baseTransaction.add(ENTITY3);
+    baseTransaction.commit();
     assertEquals(ENTITY3, DATASTORE.get(KEY3));
 
-    transaction = DATASTORE.newTransaction();
-    assertEquals(ENTITY3, transaction.get(KEY3));
-    // update entity3 during the transaction
-    DATASTORE.put(Entity.newBuilder(ENTITY2).clear().set("from", "datastore").build());
-    transaction.update(Entity.newBuilder(ENTITY2).clear().set("from", "transaction").build());
-    try {
-      transaction.commit();
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertEquals("ABORTED", expected.getReason());
-    }
+    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())),
+        Tuple.of(
+            "T1",
+            () ->
+                transaction.update(
+                    Entity.newBuilder(ENTITY3).clear().set("from", "transaction").build())),
+        Tuple.of("T1", transaction::commit) // T1 will throw error in case of optimistic concurrency
+        );
+
+    boolean t1AllPassed = statementExecutor.didAllPass("T1");
+    boolean t2AllPassed = statementExecutor.didAllPass("T2");
+    // If two transactions conflict with each other, the database guarantees that only
+    // one can commit successfully at a time. Please refer to StatementExecutor class for more info.
+    // Using XOR to ensure that only one of transaction group is successful,
+    boolean onlyOneTransactionIsSuccessful = t1AllPassed ^ t2AllPassed;
+
+    assertThat(onlyOneTransactionIsSuccessful).isTrue();
   }
 
   @Test
-  public void testTransactionWithQuery() {
+  public void testTransactionWithQuery() throws Exception {
+    StatementExecutor statementExecutor = new StatementExecutor();
     Query query =
         Query.newEntityQueryBuilder()
             .setKind(KIND2)
             .setFilter(PropertyFilter.hasAncestor(KEY2))
             .setNamespace(NAMESPACE)
             .build();
-    Transaction transaction = DATASTORE.newTransaction();
-    QueryResults results = transaction.run(query);
-    assertTrue(results.hasNext());
-    assertEquals(ENTITY2, results.next());
-    assertFalse(results.hasNext());
-    transaction.add(ENTITY3);
-    transaction.commit();
+    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));
 
-    transaction = DATASTORE.newTransaction();
-    results = transaction.run(query);
-    assertTrue(results.hasNext());
-    assertEquals(ENTITY2, results.next());
-    assertFalse(results.hasNext());
-    transaction.delete(ENTITY3.getKey());
-    // update entity2 during the transaction
-    DATASTORE.put(Entity.newBuilder(ENTITY2).clear().build());
-    try {
-      transaction.commit();
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertEquals("ABORTED", expected.getReason());
-    }
+    Transaction transaction = DATASTORE.newTransaction();
+    statementExecutor.execute(
+        Tuple.of(
+            "T1",
+            () -> {
+              QueryResults results = transaction.run(query);
+              assertTrue(results.hasNext());
+              assertEquals(ENTITY2, results.next());
+              assertFalse(results.hasNext());
+            }),
+        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("T1", transaction::commit) // T1 will throw error in case of optimistic concurrency
+        );
+
+    boolean t1AllPassed = statementExecutor.didAllPass("T1");
+    boolean t2AllPassed = statementExecutor.didAllPass("T2");
+    // If two transactions conflict with each other, the database guarantees that only
+    // one can commit successfully at a time. Please refer to StatementExecutor class for more info.
+    // Using XOR to ensure that only one of transaction group is successful,
+    boolean onlyOneTransactionIsSuccessful = t1AllPassed ^ t2AllPassed;
+
+    assertThat(onlyOneTransactionIsSuccessful).isTrue();
   }
 
   @Test
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
new file mode 100644
index 000000000000..c8ded3d89b2c
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.cloud.datastore.it;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import com.google.cloud.Tuple;
+import com.google.cloud.datastore.DatastoreException;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * An executor class to handle interleaved transactions.
+ *
+ * 
    It executes statements (under multiple transactions) and record their failures under a groupId
+ * provided by users.
+ */
+class StatementExecutor {
+
+  private final Multimap failures = ArrayListMultimap.create();
+
+  /**
+   * Executes a list of {@link Statement} one by one and record their failures under the groupId. In
+   * case of pessimistic concurrency, a statement will be blocked and cause delay until another
+   * transaction which was started earlier is committed. In case of optimistic concurrency, both
+   * transaction can perform their operation simultaneously, but the one which commits first will be
+   * a winner and other one will get an error on commit operation indicating a need for retry.
+   *
+   * @param tuples A {@link Statement(String, String) Tuple(<String, Statement>)} has a
+   *     groupId of {@link String} type and a {@link Statement} to execute.
+   */
+  @SafeVarargs
+  final void execute(Tuple... tuples) throws Exception {
+    ExecutorService executorService = Executors.newSingleThreadExecutor();
+    for (Tuple tuple : tuples) {
+      String groupId = tuple.x();
+      Statement statement = tuple.y();
+      Future future = executorService.submit(statement::execute);
+      try {
+        // waiting for statement to execute
+        future.get(10, SECONDS);
+      } catch (Exception exception) {
+        future.cancel(true);
+        if (transactionConflict(exception)) {
+          failures.put(groupId, exception);
+        } else {
+          throw exception;
+        }
+      }
+    }
+    executorService.shutdown();
+  }
+
+  boolean didAllPass(String groupId) {
+    return failures.get(groupId).isEmpty();
+  }
+
+  private boolean transactionConflict(Exception exception) {
+    if (exception instanceof TimeoutException) { // timed out coz of pessimistic concurrency delay
+      return true;
+    }
+    return exception instanceof ExecutionException
+        && exception.getCause().getClass() == DatastoreException.class
+        && exception
+            .getMessage()
+            .contains("contention"); // exception raise coz of optimistic concurrency
+  }
+
+  interface Statement {
+    void execute();
+  }
+}

From 58c8585e224a883e62503ad4f8cd83266e45cef5 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 19 May 2023 12:02:03 -0400
Subject: [PATCH 1140/1784] build: migrate release scripts (#1799) (#1080)

Source-Link: https://github.com/googleapis/synthtool/commit/1fd6dff029bb3d873a4780e616388f802f086907
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ad9cabee4c022f1aab04a71332369e0c23841062124818a4490f73337f790337

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml   | 2 +-
 .github/release-trigger.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 35478afe3fdd..aadf54f6438e 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:8dd8395defb6a5069b0b10c435058bf13980606ba1967e2b3925ed50fc3cb22f
+  digest: sha256:ad9cabee4c022f1aab04a71332369e0c23841062124818a4490f73337f790337
diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
index d4ca94189e16..4d7c5dc5794c 100644
--- a/.github/release-trigger.yml
+++ b/.github/release-trigger.yml
@@ -1 +1,2 @@
 enabled: true
+multiScmName: java-datastore

From 47df1b8a4b54eae0bb42e261e02d64aee7b95e7a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 25 May 2023 15:58:07 +0200
Subject: [PATCH 1141/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.10.0 (#1085)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 71b78eec7d53..ad5d03f664a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.9.0
+        3.10.0
         pom
         import
       

From 95455e064f158371c5304732b9f7f542f7cb1a1a Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 25 May 2023 17:29:06 +0000
Subject: [PATCH 1142/1784] test: use ITDatastoreConceptsTest for graalvm
 testing (#1083)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test: use ITDatastoreConceptsTest for graalvm testing

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* add comment to index.yaml

* add header

---------

Co-authored-by: Owl Bot 
---
 datastore-v1-proto-client/pom.xml             |  10 +
 google-cloud-datastore/pom.xml                |  12 +
 .../datastore/it/ITDatastoreConceptsTest.java | 996 ++++++++++++++++++
 .../src/test/resources/index.yaml             |  48 +
 4 files changed, 1066 insertions(+)
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
 create mode 100644 google-cloud-datastore/src/test/resources/index.yaml

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index e2bcefbc259f..755bb5b0d880 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -121,4 +121,14 @@
     
   
 
+  
+    
+      native
+      
+        
+        true
+      
+    
+  
+
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c56273e38987..14a3007f93d9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -159,4 +159,16 @@
       
     
   
+  
+    
+      native
+      
+        
+        com.google.cloud.datastore.it.ITDatastoreConceptsTest
+      
+    
+  
 
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
new file mode 100644
index 000000000000..b8ebd277acba
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
@@ -0,0 +1,996 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.cloud.datastore.it;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.Cursor;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreException;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.FullEntity;
+import com.google.cloud.datastore.IncompleteKey;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.KeyFactory;
+import com.google.cloud.datastore.KeyQuery;
+import com.google.cloud.datastore.ListValue;
+import com.google.cloud.datastore.PathElement;
+import com.google.cloud.datastore.ProjectionEntity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.ReadOption;
+import com.google.cloud.datastore.StringValue;
+import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
+import com.google.cloud.datastore.StructuredQuery.OrderBy;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.cloud.datastore.Transaction;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterators;
+import com.google.datastore.v1.TransactionOptions;
+import com.google.datastore.v1.TransactionOptions.ReadOnly;
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/*
+ * Test created based on ConceptsTest to run against GraalVM checks
+ */
+public class ITDatastoreConceptsTest {
+  private static final RemoteDatastoreHelper HELPER = RemoteDatastoreHelper.create();
+  private static final DatastoreOptions OPTIONS = HELPER.getOptions();
+  private static final FullEntity TEST_FULL_ENTITY = FullEntity.newBuilder().build();
+  private Datastore datastore;
+  private KeyFactory keyFactory;
+  private Key taskKey;
+  private Entity testEntity;
+  private Timestamp startDate;
+  private Timestamp endDate;
+  private Timestamp includedDate;
+
+  private static final String TASK_CONCEPTS = "TaskConcepts";
+
+  /**
+   * Initializes Datastore and cleans out any residual values. Also initializes global variables
+   * used for testing.
+   */
+  @Before
+  public void setUp() {
+    datastore = OPTIONS.getService();
+    StructuredQuery query = Query.newKeyQueryBuilder().build();
+    QueryResults result = datastore.run(query);
+    datastore.delete(Iterators.toArray(result, Key.class));
+    keyFactory = datastore.newKeyFactory().setKind(TASK_CONCEPTS);
+    taskKey = keyFactory.newKey("some-arbitrary-key");
+    testEntity = Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build();
+    startDate =
+        Timestamp.ofTimeSecondsAndNanos(
+            LocalDateTime.of(1990, Month.JANUARY, 1, 1, 1, 1)
+                .toInstant(ZoneOffset.UTC)
+                .getEpochSecond(),
+            0);
+    endDate =
+        Timestamp.ofTimeSecondsAndNanos(
+            LocalDateTime.of(2000, Month.JANUARY, 1, 1, 1, 1)
+                .toInstant(ZoneOffset.UTC)
+                .getEpochSecond(),
+            0);
+    includedDate =
+        Timestamp.ofTimeSecondsAndNanos(
+            LocalDateTime.of(1999, Month.DECEMBER, 31, 1, 1, 1)
+                .toInstant(ZoneOffset.UTC)
+                .getEpochSecond(),
+            0);
+    setUpQueryTests();
+  }
+
+  @After
+  public void tearDown() {
+    KeyQuery taskQuery = Query.newKeyQueryBuilder().setKind(TASK_CONCEPTS).build();
+    Key[] taskKeysToDelete = Iterators.toArray(datastore.run(taskQuery), Key.class);
+    datastore.delete(taskKeysToDelete);
+  }
+
+  private void assertValidKey(Key taskKey) {
+    datastore.put(Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build());
+  }
+
+  private void assertValidEntity(Entity original) {
+    datastore.put(original);
+    assertEquals(original, datastore.get(original.getKey()));
+  }
+
+  private List setUpBatchTests(Key taskKey1, Key taskKey2) {
+    Entity task1 =
+        Entity.newBuilder(taskKey1)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
+    Entity task2 =
+        Entity.newBuilder(taskKey2)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 5)
+            .set("description", "Integrate Cloud Datastore")
+            .build();
+    datastore.put(task1, task2);
+    return ImmutableList.of(task1, task2);
+  }
+
+  private void setUpQueryTests() {
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .setKind(TASK_CONCEPTS)
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .newKey("someTask");
+    datastore.put(
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("completed", false)
+            .set("priority", 4)
+            .set("created", includedDate)
+            .set("percent_complete", 10.0)
+            .set(
+                "description",
+                StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
+            .set("tag", "fun", "l", "programming", "learn")
+            .build());
+  }
+
+  private void assertValidQuery(Query query) {
+    QueryResults results = datastore.run(query);
+    assertTrue(results.hasNext());
+    results.next();
+    assertFalse(results.hasNext());
+  }
+
+  private  void assertInvalidQuery(Query query) {
+    try {
+      datastore.run(query);
+      fail("should not reach here");
+    } catch (DatastoreException ignored) {
+    }
+  }
+
+  private List setUpTransferTests() {
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind("People");
+    Key from = keyFactory.newKey("from");
+    Key to = keyFactory.newKey("to");
+    datastore.put(Entity.newBuilder(from).set("balance", 100).build());
+    datastore.put(Entity.newBuilder(to).set("balance", 0).build());
+    return ImmutableList.of(from, to);
+  }
+
+  private void assertSuccessfulTransfer(Key from, Key to) {
+    assertEquals(90, datastore.get(from).getLong("balance"));
+    assertEquals(10, datastore.get(to).getLong("balance"));
+  }
+
+  @Test
+  public void testIncompleteKey() {
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind(TASK_CONCEPTS);
+    Key taskKey = datastore.allocateId(keyFactory.newKey());
+    assertValidKey(taskKey);
+  }
+
+  @Test
+  public void testNamedKey() {
+    Key taskKey = datastore.newKeyFactory().setKind(TASK_CONCEPTS).newKey("sampleTask");
+    assertValidKey(taskKey);
+  }
+
+  @Test
+  public void testKeyWithParent() {
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .setKind(TASK_CONCEPTS)
+            .newKey("sampleTask");
+    assertValidKey(taskKey);
+  }
+
+  @Test
+  public void testKeyWithMultilevelParent() {
+    KeyFactory keyFactory =
+        datastore
+            .newKeyFactory()
+            .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default"))
+            .setKind(TASK_CONCEPTS);
+    Key taskKey = keyFactory.newKey("sampleTask");
+    assertValidKey(taskKey);
+  }
+
+  @Test
+  public void testEntityWithParent() {
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .setKind(TASK_CONCEPTS)
+            .newKey("sampleTask");
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
+    assertValidEntity(task);
+  }
+
+  @Test
+  public void testProperties() {
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("created", Timestamp.now())
+            .set("done", false)
+            .set("priority", 4)
+            .set("percent_complete", 10.0)
+            .set(
+                "description",
+                StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
+            .build();
+    assertValidEntity(task);
+  }
+
+  @Test
+  public void testArrayValue() {
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("tags", "fun", "programming")
+            .set("collaborators", ListValue.of("alice", "bob"))
+            .build();
+    assertValidEntity(task);
+  }
+
+  @Test
+  public void testBasicEntity() {
+    Key taskKey = datastore.newKeyFactory().setKind(TASK_CONCEPTS).newKey("sampleTask");
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
+    assertValidEntity(task);
+  }
+
+  @Test
+  public void testUpsert() {
+    Entity task = Entity.newBuilder(keyFactory.newKey("sampleTask")).build();
+    datastore.put(task);
+    assertEquals(task, datastore.get(task.getKey()));
+  }
+
+  @Test
+  public void testInsert() {
+    Key taskKey = datastore.add(FullEntity.newBuilder(keyFactory.newKey()).build()).getKey();
+    assertEquals(FullEntity.newBuilder(taskKey).build(), datastore.get(taskKey));
+  }
+
+  @Test
+  public void testLookup() {
+    datastore.put(testEntity);
+    Entity task = datastore.get(taskKey);
+    assertEquals(testEntity, task);
+  }
+
+  @Test
+  public void testUpdate() {
+    datastore.put(testEntity);
+    Entity task = Entity.newBuilder(datastore.get(taskKey)).set("priority", 5).build();
+    datastore.update(task);
+    assertEquals(task, datastore.get(taskKey));
+  }
+
+  @Test
+  public void testDelete() {
+    datastore.put(testEntity);
+    datastore.delete(taskKey);
+    assertNull(datastore.get(taskKey));
+  }
+
+  @Test
+  public void testBatchUpsert() {
+    FullEntity task1 =
+        FullEntity.newBuilder(keyFactory.newKey())
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 4)
+            .set("description", "Learn Cloud Datastore")
+            .build();
+    FullEntity task2 =
+        Entity.newBuilder(keyFactory.newKey())
+            .set("category", "Personal")
+            .set("done", false)
+            .set("priority", 5)
+            .set("description", "Integrate Cloud Datastore")
+            .build();
+    List tasks = datastore.add(task1, task2);
+    Key taskKey1 = tasks.get(0).getKey();
+    Key taskKey2 = tasks.get(1).getKey();
+    assertEquals(Entity.newBuilder(taskKey1, task1).build(), datastore.get(taskKey1));
+    assertEquals(Entity.newBuilder(taskKey2, task2).build(), datastore.get(taskKey2));
+  }
+
+  @Test
+  public void testBatchLookup() {
+    Key taskKey1 = keyFactory.newKey(1);
+    Key taskKey2 = keyFactory.newKey(2);
+    List expectedTasks = setUpBatchTests(taskKey1, taskKey2);
+    Iterator tasks = datastore.get(taskKey1, taskKey2);
+    assertEquals(expectedTasks.get(0), tasks.next());
+    assertEquals(expectedTasks.get(1), tasks.next());
+  }
+
+  @Test
+  public void testBatchDelete() {
+    Key taskKey1 = keyFactory.newKey(1);
+    Key taskKey2 = keyFactory.newKey(2);
+    setUpBatchTests(taskKey1, taskKey2);
+    datastore.delete(taskKey1, taskKey2);
+    assertNull(datastore.get(taskKey1));
+    assertNull(datastore.get(taskKey2));
+  }
+
+  @Test
+  public void testBasicQuery() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4)))
+            .setOrderBy(OrderBy.desc("priority"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testRunQuery() {
+    Query query = Query.newEntityQueryBuilder().setKind(TASK_CONCEPTS).build();
+    QueryResults tasks = datastore.run(query);
+    assertNotNull(tasks.next());
+    assertFalse(tasks.hasNext());
+  }
+
+  @Test
+  public void testPropertyFilter() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.eq("done", false))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testCompositeFilter() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4)))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testKeyFilter() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(StructuredQuery.PropertyFilter.gt("__key__", keyFactory.newKey("someTask")))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testAscendingSort() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setOrderBy(OrderBy.asc("created"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testDescendingSort() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setOrderBy(OrderBy.desc("created"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testMultiSort() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testKindlessQuery() {
+    Key lastSeenKey = keyFactory.newKey("a");
+
+    Query query =
+        Query.newEntityQueryBuilder().setFilter(PropertyFilter.gt("__key__", lastSeenKey)).build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testAncestorQuery() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                PropertyFilter.hasAncestor(
+                    datastore.newKeyFactory().setKind("TaskList").newKey("default")))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testProjectionQuery() {
+    Query query =
+        Query.newProjectionEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setProjection("priority", "percent_complete")
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testRunProjectionQuery() {
+    Query query =
+        Query.newProjectionEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setProjection("priority", "percent_complete")
+            .build();
+    List priorities = new LinkedList<>();
+    List percentCompletes = new LinkedList<>();
+    QueryResults tasks = datastore.run(query);
+    while (tasks.hasNext()) {
+      ProjectionEntity task = tasks.next();
+      priorities.add(task.getLong("priority"));
+      percentCompletes.add(task.getDouble("percent_complete"));
+    }
+    assertEquals(ImmutableList.of(4L), priorities);
+    assertEquals(ImmutableList.of(10.0), percentCompletes);
+  }
+
+  @Test
+  public void testKeysOnlyQuery() {
+    Query query = Query.newKeyQueryBuilder().setKind(TASK_CONCEPTS).build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testDistinctOnQuery() {
+    Query query =
+        Query.newProjectionEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setProjection("category", "priority")
+            .setDistinctOn("category")
+            .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testArrayValueInequalityRange() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math")))
+            .build();
+    QueryResults results = datastore.run(query);
+    assertFalse(results.hasNext());
+  }
+
+  @Test
+  public void testArrayValueEquality() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming")))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testInequalityRange() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testInequalityInvalid() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3)))
+            .build();
+    assertInvalidQuery(query);
+  }
+
+  @Test
+  public void testEqualAndInequalityRange() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.eq("priority", 4),
+                    PropertyFilter.gt("created", startDate),
+                    PropertyFilter.lt("created", endDate)))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testInequalitySort() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.gt("priority", 3))
+            .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testInequalitySortInvalidNotSame() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.gt("priority", 3))
+            .setOrderBy(OrderBy.asc("created"))
+            .build();
+    assertInvalidQuery(query);
+  }
+
+  @Test
+  public void testInequalitySortInvalidNotFirst() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.gt("priority", 3))
+            .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority"))
+            .build();
+    assertInvalidQuery(query);
+  }
+
+  @Test
+  public void testLimit() {
+    Query query = Query.newEntityQueryBuilder().setKind(TASK_CONCEPTS).setLimit(5).build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testCursorPaging() {
+    datastore.put(testEntity);
+    Cursor nextPageCursor = cursorPaging(1, null);
+    assertNotNull(nextPageCursor);
+    nextPageCursor = cursorPaging(1, nextPageCursor);
+    assertNotNull(nextPageCursor);
+  }
+
+  private Cursor cursorPaging(int pageSize, Cursor pageCursor) {
+    EntityQuery.Builder queryBuilder =
+        Query.newEntityQueryBuilder().setKind(TASK_CONCEPTS).setLimit(pageSize);
+    if (pageCursor != null) {
+      queryBuilder.setStartCursor(pageCursor);
+    }
+    QueryResults tasks = datastore.run(queryBuilder.build());
+    while (tasks.hasNext()) {
+      Entity task = tasks.next();
+      // do something with the task
+    }
+    Cursor nextPageCursor = tasks.getCursorAfter();
+    return nextPageCursor;
+  }
+
+  @Test
+  public void testEventualConsistentQuery() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(
+                PropertyFilter.hasAncestor(
+                    datastore.newKeyFactory().setKind("TaskList").newKey("default")))
+            .build();
+    datastore.run(query, ReadOption.eventualConsistency());
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testUnindexedPropertyQuery() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.eq("description", "A task description"))
+            .build();
+    QueryResults results = datastore.run(query);
+    assertFalse(results.hasNext());
+  }
+
+  @Test
+  public void testExplodingProperties() {
+    Entity task =
+        Entity.newBuilder(taskKey)
+            .set("tags", "fun", "programming", "learn")
+            .set("collaborators", "alice", "bob", "charlie")
+            .set("created", Timestamp.now())
+            .build();
+    assertValidEntity(task);
+  }
+
+  @Test
+  public void testTransactionalUpdate() {
+    List keys = setUpTransferTests();
+    transferFunds(keys.get(0), keys.get(1), 10);
+    assertSuccessfulTransfer(keys.get(0), keys.get(1));
+  }
+
+  void transferFunds(Key fromKey, Key toKey, long amount) {
+    Transaction txn = datastore.newTransaction();
+    try {
+      List entities = txn.fetch(fromKey, toKey);
+      Entity from = entities.get(0);
+      Entity updatedFrom =
+          Entity.newBuilder(from).set("balance", from.getLong("balance") - amount).build();
+      Entity to = entities.get(1);
+      Entity updatedTo =
+          Entity.newBuilder(to).set("balance", to.getLong("balance") + amount).build();
+      txn.put(updatedFrom, updatedTo);
+      txn.commit();
+    } finally {
+      if (txn.isActive()) {
+        txn.rollback();
+      }
+    }
+  }
+
+  @Test
+  public void testTransactionalRetry() {
+    List keys = setUpTransferTests();
+    Key fromKey = keys.get(0);
+    Key toKey = keys.get(1);
+    int retries = 5;
+    while (true) {
+      try {
+        transferFunds(fromKey, toKey, 10);
+        break;
+      } catch (DatastoreException e) {
+        if (retries == 0) {
+          throw e;
+        }
+        --retries;
+      }
+    }
+    assertSuccessfulTransfer(keys.get(0), keys.get(1));
+  }
+
+  @Test
+  public void testTransactionalGetOrCreate() {
+    Entity task;
+    Transaction txn = datastore.newTransaction();
+    try {
+      task = txn.get(taskKey);
+      if (task == null) {
+        task = Entity.newBuilder(taskKey).build();
+        txn.put(task);
+        txn.commit();
+      }
+    } finally {
+      if (txn.isActive()) {
+        txn.rollback();
+      }
+    }
+    assertEquals(task, datastore.get(taskKey));
+  }
+
+  @Test
+  public void testTransactionalSingleEntityGroupReadOnly() {
+
+    Key taskListKey = datastore.newKeyFactory().setKind("TaskList").newKey("default");
+    Entity taskListEntity = Entity.newBuilder(taskListKey).build();
+    datastore.put(taskListEntity);
+    Entity taskList;
+    QueryResults tasks;
+    Transaction txn =
+        datastore.newTransaction(
+            TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build());
+    try {
+      taskList = txn.get(taskListKey);
+      Query query =
+          Query.newEntityQueryBuilder()
+              .setKind(TASK_CONCEPTS)
+              .setFilter(PropertyFilter.hasAncestor(taskListKey))
+              .build();
+      tasks = txn.run(query);
+      txn.commit();
+    } finally {
+      if (txn.isActive()) {
+        txn.rollback();
+      }
+    }
+    assertEquals(taskListEntity, taskList);
+    assertNotNull(tasks.next());
+    assertFalse(tasks.hasNext());
+  }
+
+  @Test
+  public void testNamespaceRunQuery() {
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind("__namespace__");
+    Key namespaceKey = keyFactory.newKey(OPTIONS.getNamespace());
+    Query query =
+        Query.newKeyQueryBuilder()
+            .setKind("__namespace__")
+            .setFilter(CompositeFilter.and(PropertyFilter.eq("__key__", namespaceKey)))
+            .build();
+    List namespaces = new ArrayList<>();
+    QueryResults results = datastore.run(query);
+    while (results.hasNext()) {
+      namespaces.add(results.next().getName());
+    }
+    assertEquals(ImmutableList.of(OPTIONS.getNamespace()), namespaces);
+  }
+
+  @Test
+  public void testKindRunQuery() {
+    Query query = Query.newKeyQueryBuilder().setKind("__kind__").build();
+    List kinds = new ArrayList<>();
+    QueryResults results = datastore.run(query);
+    while (results.hasNext()) {
+      kinds.add(results.next().getName());
+    }
+    assertEquals(ImmutableList.of(TASK_CONCEPTS), kinds);
+  }
+
+  @Test
+  public void testPropertyRunQuery() {
+    Query query = Query.newKeyQueryBuilder().setKind("__property__").build();
+    QueryResults keys = datastore.run(query);
+    Map> propertiesByKind = new HashMap<>();
+    while (keys.hasNext()) {
+      Key key = keys.next();
+      String kind = key.getParent().getName();
+      String propertyName = key.getName();
+      Collection properties = propertiesByKind.computeIfAbsent(kind, k -> new HashSet<>());
+      properties.add(propertyName);
+    }
+    Map> expected =
+        ImmutableMap.of(
+            TASK_CONCEPTS,
+            ImmutableSet.of(
+                "done", "category", "completed", "priority", "created", "percent_complete", "tag"));
+    assertEquals(expected, propertiesByKind);
+  }
+
+  @Test
+  public void testPropertyByKindRunQuery() {
+    Key key = datastore.newKeyFactory().setKind("__kind__").newKey(TASK_CONCEPTS);
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind("__property__")
+            .setFilter(PropertyFilter.hasAncestor(key))
+            .build();
+    QueryResults results = datastore.run(query);
+    Map> representationsByProperty = new HashMap<>();
+    while (results.hasNext()) {
+      Entity result = results.next();
+      String propertyName = result.getKey().getName();
+      List representations = result.getList("property_representation");
+      Collection currentRepresentations =
+          representationsByProperty.computeIfAbsent(propertyName, k -> new HashSet<>());
+      for (StringValue value : representations) {
+        currentRepresentations.add(value.get());
+      }
+    }
+    Map> expected =
+        ImmutableMap.>builder()
+            .put("category", Collections.singleton("STRING"))
+            .put("done", Collections.singleton("BOOLEAN"))
+            .put("completed", Collections.singleton("BOOLEAN"))
+            .put("priority", Collections.singleton("INT64"))
+            .put("created", Collections.singleton("INT64"))
+            .put("percent_complete", Collections.singleton("DOUBLE"))
+            .put("tag", Collections.singleton("STRING"))
+            .build();
+    assertEquals(expected, representationsByProperty);
+  }
+
+  @Test
+  public void testPropertyFilteringRunQuery() {
+    Key startKey =
+        datastore
+            .newKeyFactory()
+            .setKind("__property__")
+            .addAncestors(PathElement.of("__kind__", TASK_CONCEPTS))
+            .newKey("priority");
+    Query query =
+        Query.newKeyQueryBuilder()
+            .setKind("__property__")
+            .setFilter(PropertyFilter.ge("__key__", startKey))
+            .build();
+    Map> propertiesByKind = new HashMap<>();
+    QueryResults keys = datastore.run(query);
+    while (keys.hasNext()) {
+      Key key = keys.next();
+      String kind = key.getParent().getName();
+      String propertyName = key.getName();
+      Collection properties = propertiesByKind.computeIfAbsent(kind, k -> new HashSet<>());
+      properties.add(propertyName);
+    }
+    Map> expected =
+        ImmutableMap.of(TASK_CONCEPTS, ImmutableSet.of("priority", "tag"));
+    assertEquals(expected, propertiesByKind);
+  }
+
+  @Test
+  public void testEqQuerySorted() {
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.eq("tag", "learn"))
+            .setOrderBy(OrderBy.asc("tag"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  private void setUpQueryTestsRealBackend() {
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .setKind(TASK_CONCEPTS)
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .newKey("someTask");
+    datastore.put(
+        Entity.newBuilder(taskKey)
+            .set("category", "Personal")
+            .set("done", false)
+            .set("completed", false)
+            .set("priority", 4)
+            .set("created", includedDate)
+            .set("percent_complete", 10.0)
+            .set(
+                "description",
+                StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
+            .set("tag", "fun", "l", "programming", "learn")
+            .build());
+  }
+
+  @Test
+  public void testInQuery() {
+    setUpQueryTestsRealBackend();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.in("tag", ListValue.of("learn", "study")))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testNotEqualsQuery() {
+    setUpQueryTestsRealBackend();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.neq("category", "Work"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testNotInQuery() {
+    setUpQueryTestsRealBackend();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.not_in("category", ListValue.of("Work", "Chores", "School")))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testInQuerySorted() {
+    setUpQueryTestsRealBackend();
+    Query query =
+        Query.newEntityQueryBuilder()
+            .setKind(TASK_CONCEPTS)
+            .setFilter(PropertyFilter.in("tag", ListValue.of("learn", "study")))
+            .setOrderBy(OrderBy.asc("tag"))
+            .build();
+    assertValidQuery(query);
+  }
+
+  @Test
+  public void testStaleReads() throws InterruptedException {
+    setUpQueryTestsRealBackend();
+    // waiting for 6 seconds, so that we can query with read time of 5 seconds ago
+    TimeUnit.SECONDS.sleep(6);
+    Key taskKey =
+        datastore
+            .newKeyFactory()
+            .setKind(TASK_CONCEPTS)
+            .addAncestors(PathElement.of("TaskList", "default"))
+            .newKey("someTask");
+
+    Timestamp fiveSecondsAgo =
+        Timestamp.ofTimeSecondsAndNanos(Timestamp.now().getSeconds() - 5L, 0);
+    // Create a readOption with read time fiveSecondsAgo
+    ReadOption readOption = ReadOption.readTime(fiveSecondsAgo);
+    // Use the readOption to Fetch entity
+    Entity entity = datastore.get(taskKey, readOption);
+
+    // Use the readOption to Query kind Task
+    Query query = Query.newEntityQueryBuilder().setKind(TASK_CONCEPTS).setLimit(10).build();
+    assertValidQuery(query);
+  }
+}
diff --git a/google-cloud-datastore/src/test/resources/index.yaml b/google-cloud-datastore/src/test/resources/index.yaml
new file mode 100644
index 000000000000..ff1b086267e4
--- /dev/null
+++ b/google-cloud-datastore/src/test/resources/index.yaml
@@ -0,0 +1,48 @@
+# Copyright 2023 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.
+
+# one time index creation is required to run ITDatastoreConceptsTest
+# see https://cloud.google.com/sdk/gcloud/reference/datastore/indexes/create for more details
+indexes:
+  - kind: TaskConcepts
+    properties:
+      - name: done
+      - name: priority
+        direction: desc
+  - kind: TaskConcepts
+    properties:
+      - name: tag
+      - name: tag
+  - kind: TaskConcepts
+    properties:
+      - name: priority
+      - name: created
+  - kind: TaskConcepts
+    properties:
+      - name: category
+      - name: priority
+  - kind: TaskConcepts
+    properties:
+      - name: priority
+        direction: desc
+      - name: created
+  - kind: TaskConcepts
+    properties:
+      - name: percent_complete
+      - name: priority
+  - kind: TaskConcepts
+    properties:
+      - name: done
+      - name: priority
+        direction: desc
\ No newline at end of file

From 9e966506c1e860f10e82d34bd6a705c1cae71764 Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Fri, 26 May 2023 10:06:19 +0530
Subject: [PATCH 1143/1784] docs: Marking Transaction, Batch and
 DatastoreBatchWriter class with 'NotThreadSafe' annotation (#1082)

* doc: Marking Transaction, Batch and DatastoreBatchWriter class with @NotThreadSafe annotation

* fix lint

* adding jsr dependency explicitly

* Empty commit

* fixing casing and punctuation.

* fix lint
---
 google-cloud-datastore/pom.xml                       |  4 ++++
 .../main/java/com/google/cloud/datastore/Batch.java  |  9 +++++++++
 .../google/cloud/datastore/DatastoreBatchWriter.java |  9 +++++++++
 .../java/com/google/cloud/datastore/Transaction.java | 12 ++++++++++--
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 14a3007f93d9..a086383bec60 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -106,6 +106,10 @@
       io.opencensus
       opencensus-api
     
+    
+      com.google.code.findbugs
+      jsr305
+    
 
     
     
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
index ee1c48db2827..eb4abd854bf1 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
@@ -17,6 +17,7 @@
 package com.google.cloud.datastore;
 
 import java.util.List;
+import javax.annotation.concurrent.NotThreadSafe;
 
 /**
  * An interface to represent a batch of write operations. Any write operation that is applied on a
@@ -32,7 +33,15 @@
  * batch.add(entity2, entity3);
  * batch.submit();
  * }
    
+ *
+ * 
     WARNING: This class maintains an internal state in terms of {@link
+ * java.util.LinkedHashMap} and {@link java.util.LinkedHashSet} which gets updated on every method
+ * call performing CRUD operations to record the mutations. Since {@link java.util.LinkedHashMap} is
+ * not thread safe as per its documentation,
+ * This class too should not be treated as a thread safe class. 
  */
+@NotThreadSafe
 public interface Batch extends DatastoreBatchWriter {
 
   interface Response {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
index d03d90af8253..db4bd3179628 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
@@ -17,11 +17,20 @@
 package com.google.cloud.datastore;
 
 import java.util.List;
+import javax.annotation.concurrent.NotThreadSafe;
 
 /**
  * An interface to represent a batch of write operations. All write operation for a batch writer
  * will be applied to the Datastore in one RPC call.
+ *
+ * 
     WARNING: This class maintains an internal state in terms of {@link
+ * java.util.LinkedHashMap} and {@link java.util.LinkedHashSet} which gets updated on every method
+ * call performing CRUD operations to record the mutations. Since {@link java.util.LinkedHashMap} is
+ * not thread safe as per its documentation,
+ * This class too should not be treated as a thread safe class. 
  */
+@NotThreadSafe
 public interface DatastoreBatchWriter extends DatastoreWriter {
 
   /**
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
index 9880b4748341..69c18d75c630 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
@@ -19,14 +19,15 @@
 import com.google.protobuf.ByteString;
 import java.util.Iterator;
 import java.util.List;
+import javax.annotation.concurrent.NotThreadSafe;
 
 /**
  * A Google cloud datastore transaction. Similar to {@link Batch} any write operation that is
  * applied on a transaction will only be sent to the Datastore upon {@link #commit}. A call to
  * {@link #rollback} will invalidate the transaction and discard the changes. Any read operation
  * that is done by a transaction will be part of it and therefore a {@code commit} is guaranteed to
- * fail if an entity was modified outside of the transaction after it was read. Write operation on
- * this transaction will not be reflected by read operation (as the changes are only sent to the
+ * fail if an entity was modified outside the transaction after it was read. Write operation on this
+ * transaction will not be reflected by read operation (as the changes are only sent to the
  * Datastore upon {@code commit}. A usage example:
  *
  * 
    {@code
@@ -52,7 +53,14 @@
  *
  * @see Google Cloud
  *     Datastore transactions
+ *     
     WARNING: This class maintains an internal state in terms of {@link
+ *     java.util.LinkedHashMap} and {@link java.util.LinkedHashSet} which gets updated on every
+ *     method call performing CRUD operations to record the mutations. Since {@link
+ *     java.util.LinkedHashMap} is not thread safe as per its documentation,
+ *     This class too should not be treated as a thread safe class. 
  */
+@NotThreadSafe
 public interface Transaction extends DatastoreBatchWriter, DatastoreReaderWriter {
 
   interface Response {

From e3ad86614a2462054bfb800613f2456f6f98102d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 29 May 2023 09:27:53 +0200
Subject: [PATCH 1144/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.10.1 (#1086)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ad5d03f664a8..d2158546b312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.10.0
+        3.10.1
         pom
         import
       

From 33dc935503fcdb69299d4f79aad5e4f5930bcad5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 14:20:33 +0530
Subject: [PATCH 1145/1784] chore(main): release 2.14.7 (#1076)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  | 16 ++++++++++++++++
 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, 43 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da08db8f7539..c29fa78713a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.14.7](https://github.com/googleapis/java-datastore/compare/v2.14.6...v2.14.7) (2023-05-29)
+
+
+### Documentation
+
+* Marking Transaction, Batch and DatastoreBatchWriter class with 'NotThreadSafe' annotation ([#1082](https://github.com/googleapis/java-datastore/issues/1082)) ([9e96650](https://github.com/googleapis/java-datastore/commit/9e966506c1e860f10e82d34bd6a705c1cae71764))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.10.0 ([#1085](https://github.com/googleapis/java-datastore/issues/1085)) ([47df1b8](https://github.com/googleapis/java-datastore/commit/47df1b8a4b54eae0bb42e261e02d64aee7b95e7a))
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.10.1 ([#1086](https://github.com/googleapis/java-datastore/issues/1086)) ([e3ad866](https://github.com/googleapis/java-datastore/commit/e3ad86614a2462054bfb800613f2456f6f98102d))
+* Update dependency com.google.errorprone:error_prone_core to v2.19.1 ([#1069](https://github.com/googleapis/java-datastore/issues/1069)) ([2390016](https://github.com/googleapis/java-datastore/commit/239001682bd1284be39d4646ce0594274070c143))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.22 ([#1074](https://github.com/googleapis/java-datastore/issues/1074)) ([c0cc456](https://github.com/googleapis/java-datastore/commit/c0cc4565cc0e34098f5bc97c031ae671af44fcf3))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.22 ([#1075](https://github.com/googleapis/java-datastore/issues/1075)) ([a4db895](https://github.com/googleapis/java-datastore/commit/a4db89502e9611bf5f9760bfceb1025cc99a9830))
+
 ## [2.14.6](https://github.com/googleapis/java-datastore/compare/v2.14.5...v2.14.6) (2023-05-09)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 755bb5b0d880..2856a0169687 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.7-SNAPSHOT
+  2.14.7
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7-SNAPSHOT
+    2.14.7
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6dae71644428..daa66d945126 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.7-SNAPSHOT
+  2.14.7
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.7-SNAPSHOT
+        2.14.7
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.7-SNAPSHOT
+        2.14.7
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.7-SNAPSHOT
+        0.105.7
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.7-SNAPSHOT
+        2.14.7
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a086383bec60..8196db8daa5f 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.7-SNAPSHOT
+  2.14.7
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7-SNAPSHOT
+    2.14.7
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 268b3ab78d82..142659867cd3 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.7-SNAPSHOT
+  2.14.7
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7-SNAPSHOT
+    2.14.7
   
   
     
diff --git a/pom.xml b/pom.xml
index d2158546b312..b0b6d9fbe55d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.7-SNAPSHOT
+  2.14.7
   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.7-SNAPSHOT
+        2.14.7
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.7-SNAPSHOT
+        2.14.7
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.7-SNAPSHOT
+        2.14.7
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.7-SNAPSHOT
+        0.105.7
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.7-SNAPSHOT
+        2.14.7
         
           
             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 5c1b10653c56..70bd9bb5fe47 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.7-SNAPSHOT
+  2.14.7
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7-SNAPSHOT
+    2.14.7
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 336513bb7193..e8c1b8b3de17 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.7-SNAPSHOT
+  0.105.7
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7-SNAPSHOT
+    2.14.7
   
   
     
diff --git a/versions.txt b/versions.txt
index 7614b37a64fc..bd1c2fa3e47e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.14.6:2.14.7-SNAPSHOT
-google-cloud-datastore-bom:2.14.6:2.14.7-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.6:0.105.7-SNAPSHOT
-datastore-v1-proto-client:2.14.6:2.14.7-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.6:2.14.7-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.6:2.14.7-SNAPSHOT
+google-cloud-datastore:2.14.7:2.14.7
+google-cloud-datastore-bom:2.14.7:2.14.7
+proto-google-cloud-datastore-v1:0.105.7:0.105.7
+datastore-v1-proto-client:2.14.7:2.14.7
+proto-google-cloud-datastore-admin-v1:2.14.7:2.14.7
+grpc-google-cloud-datastore-admin-v1:2.14.7:2.14.7

From f12a7d50451d1f8ec0de7dbf4160def80461c514 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 12:50:13 +0000
Subject: [PATCH 1146/1784] chore(main): release 2.14.8-SNAPSHOT (#1095)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2856a0169687..90f755aebc2f 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.7
+  2.14.8-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7
+    2.14.8-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index daa66d945126..53ed677c2b06 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.7
+  2.14.8-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.14.7
+        2.14.8-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.7
+        2.14.8-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.7
+        0.105.8-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.14.7
+        2.14.8-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8196db8daa5f..dfcab3d2d69b 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.7
+  2.14.8-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7
+    2.14.8-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 142659867cd3..f722628d9eb1 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.7
+  2.14.8-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7
+    2.14.8-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index b0b6d9fbe55d..0bc152111b26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.14.7
+  2.14.8-SNAPSHOT
   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.7
+        2.14.8-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.14.7
+        2.14.8-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.14.7
+        2.14.8-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.105.7
+        0.105.8-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.14.7
+        2.14.8-SNAPSHOT
         
           
             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 70bd9bb5fe47..c5558709551d 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.7
+  2.14.8-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7
+    2.14.8-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e8c1b8b3de17..cb02eeb8f09c 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.7
+  0.105.8-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.14.7
+    2.14.8-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index bd1c2fa3e47e..2d4adc2764a2 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.7
-google-cloud-datastore-bom:2.14.7:2.14.7
-proto-google-cloud-datastore-v1:0.105.7:0.105.7
-datastore-v1-proto-client:2.14.7:2.14.7
-proto-google-cloud-datastore-admin-v1:2.14.7:2.14.7
-grpc-google-cloud-datastore-admin-v1:2.14.7:2.14.7
+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

From 3c31d4938a8364b213ac9031b98b6452af6a10ff Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 29 May 2023 15:02:39 +0200
Subject: [PATCH 1147/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.14.7 (#1096)
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.14.7

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b05e0716c9f3..2156600c3143 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.14.6
+  2.14.7
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.6'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.7'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.6"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.7"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.6
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.7
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 5a68aec6a03f..01cdec3cff26 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.6
+      2.14.7
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 6421d6f95c96..fa23f4306130 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.6
+      2.14.7
     
 
     

From c6a6745655c8134ab8f06e4d343ce598dddaa4ab Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 31 May 2023 06:19:39 +0200
Subject: [PATCH 1148/1784] test(deps): update dependency
 com.google.truth:truth to v1.1.4 (#1097)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 90f755aebc2f..634f5dfbe598 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.1.3
+      1.1.4
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index dfcab3d2d69b..f326f4d62c6e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -150,7 +150,7 @@
     
       com.google.truth
       truth
-      1.1.3
+      1.1.4
       test
     
   
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 01cdec3cff26..f68818eb42aa 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.1.3
+      1.1.4
       test
     
   
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 4db871c2beef..efb6f4881f59 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.1.3
+      1.1.4
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fa23f4306130..9b1a7f206b2b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -40,7 +40,7 @@
     
       com.google.truth
       truth
-      1.1.3
+      1.1.4
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index cde13ac88e65..5116e7b8b880 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.1.3
+      1.1.4
       test
     
   

From dc9a9061d30ea60dcfdaf7bc45bf41c63c3f86b8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 5 Jun 2023 08:05:13 +0200
Subject: [PATCH 1149/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.16.0 (#1098)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.16.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2156600c3143..7290de40227c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.15.0
+      26.16.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.15.0')
+implementation platform('com.google.cloud:libraries-bom:26.16.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index efb6f4881f59..2340bdbd71f2 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.15.0
+        26.16.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 5116e7b8b880..4a06a941c97d 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.15.0
+        26.16.0
         pom
         import
       

From 1d772923b2b2edbfde9e92f666590fce79623c85 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 5 Jun 2023 08:16:36 +0200
Subject: [PATCH 1150/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.5.6 (#1100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.5.5` -> `1.5.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.6/compatibility-slim/1.5.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.6/confidence-slim/1.5.5)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-shared-config

### [`v1.5.6`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​156-httpsgithubcomgoogleapisjava-shared-configcomparev155v156-2023-06-02)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.5.5...v1.5.6)

##### Bug Fixes

-   Add junit-vintage dep to avoid skipping post-compilation native tests ([#​586](https://togithub.com/googleapis/java-shared-config/issues/586)) ([f6e6f69](https://togithub.com/googleapis/java-shared-config/commit/f6e6f690d58e2a86db721926049b0132310724bf))
-   **java:** Skip fixing poms for special modules ([#​1744](https://togithub.com/googleapis/java-shared-config/issues/1744)) ([#​556](https://togithub.com/googleapis/java-shared-config/issues/556)) ([cc433c2](https://togithub.com/googleapis/java-shared-config/commit/cc433c246f1b6edbc093e6af37aced652d884a65))
-   Remove java-trace checks ([#​612](https://togithub.com/googleapis/java-shared-config/issues/612)) ([cfcdba8](https://togithub.com/googleapis/java-shared-config/commit/cfcdba834f27b6bb03460cd09f076068f67a892b))

##### Dependencies

-   Update dependency com.google.auto.service:auto-service-annotations to v1.1.0 ([#​610](https://togithub.com/googleapis/java-shared-config/issues/610)) ([aeefcbe](https://togithub.com/googleapis/java-shared-config/commit/aeefcbec212dc102bd15027984895a4ba51d045f))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.10.0 ([#​598](https://togithub.com/googleapis/java-shared-config/issues/598)) ([29309c3](https://togithub.com/googleapis/java-shared-config/commit/29309c36cb6ffe2aea221d3cc8cde036441d21b1))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.11.0 ([#​602](https://togithub.com/googleapis/java-shared-config/issues/602)) ([61b9c5f](https://togithub.com/googleapis/java-shared-config/commit/61b9c5f04422bc8edf8a249e3dfb7290bd188a8d))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.12.0 ([#​614](https://togithub.com/googleapis/java-shared-config/issues/614)) ([8559d0d](https://togithub.com/googleapis/java-shared-config/commit/8559d0dc634e238ee640d68439839f50a938ce76))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.6.0 ([#​554](https://togithub.com/googleapis/java-shared-config/issues/554)) ([44a77b0](https://togithub.com/googleapis/java-shared-config/commit/44a77b0faf5b4f3f9208117ccab0a3717d059efd))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.7.0 ([#​563](https://togithub.com/googleapis/java-shared-config/issues/563)) ([5c51e07](https://togithub.com/googleapis/java-shared-config/commit/5c51e07af8e37019d462211d47307155c630adb9))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.8.1 ([#​573](https://togithub.com/googleapis/java-shared-config/issues/573)) ([e5c6e54](https://togithub.com/googleapis/java-shared-config/commit/e5c6e5406488c0a204ef2afcbe8582176fa373e4))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.9.2 ([#​579](https://togithub.com/googleapis/java-shared-config/issues/579)) ([a67a7c8](https://togithub.com/googleapis/java-shared-config/commit/a67a7c8d05bab4c8dbeaf5b5874170084e75abb7))
-   Update dependency com.puppycrawl.tools:checkstyle to v10.9.3 ([#​582](https://togithub.com/googleapis/java-shared-config/issues/582)) ([c87ff96](https://togithub.com/googleapis/java-shared-config/commit/c87ff962304efd82e2f79458976c627d1ff622d8))
-   Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 ([#​593](https://togithub.com/googleapis/java-shared-config/issues/593)) ([12ac165](https://togithub.com/googleapis/java-shared-config/commit/12ac165f36b6b5257f7928f8a2c21ae936af3794))
-   Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.22 ([#​603](https://togithub.com/googleapis/java-shared-config/issues/603)) ([9ea7833](https://togithub.com/googleapis/java-shared-config/commit/9ea783312cc9e136f8bdb6f4dae5591221e42773))
-   Update dependency org.junit.vintage:junit-vintage-engine to v5.9.2 ([#​560](https://togithub.com/googleapis/java-shared-config/issues/560)) ([60a80bd](https://togithub.com/googleapis/java-shared-config/commit/60a80bd272dd7483db8e4a5773125a9c57b9899e))
-   Update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 ([#​597](https://togithub.com/googleapis/java-shared-config/issues/597)) ([61064b9](https://togithub.com/googleapis/java-shared-config/commit/61064b9c767c528139b025e3d629d12fc64d7809))
-   Update doclet version to 1.9.0 ([#​611](https://togithub.com/googleapis/java-shared-config/issues/611)) ([cd8c762](https://togithub.com/googleapis/java-shared-config/commit/cd8c76208ab3d10ab451545a180474c6270368d3))
-   Update graalvm native-image dependencies to v0.9.19 ([#​550](https://togithub.com/googleapis/java-shared-config/issues/550)) ([3313229](https://togithub.com/googleapis/java-shared-config/commit/3313229155be704b50e499379936e16598a348a6))
-   Update graalvm native-image dependencies to v0.9.20 ([#​568](https://togithub.com/googleapis/java-shared-config/issues/568)) ([79d7b4b](https://togithub.com/googleapis/java-shared-config/commit/79d7b4be908cc9e24a48d89eeb97b0c6155493d1))


    

---

### 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, check this box

---

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).

---
 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 53ed677c2b06..50d74c73afc8 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.5
+    1.5.6
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 0bc152111b26..b09558ee5d9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.5.5
+    1.5.6
   
 
   

From dd9eb0b91e037210619c486b4b49d349e3372414 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 6 Jun 2023 22:59:15 +0200
Subject: [PATCH 1151/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3.1.2 (#1103)

---
 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 2340bdbd71f2..0e75229c56c6 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -97,7 +97,7 @@
             org.apache.maven.plugins
             maven-surefire-plugin
              
-            3.1.0
+            3.1.2
             
               
                 **/IT*

From fc9b09103a1bfbb238b22102dcf2b889292658ce Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 7 Jun 2023 18:03:34 +0200
Subject: [PATCH 1152/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.11.0 (#1104)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b09558ee5d9b..a96e9ff05dc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.10.1
+        3.11.0
         pom
         import
       

From c226997e5462f4b4eb4e8fd6a5363d66b2190916 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Jun 2023 13:54:19 -0400
Subject: [PATCH 1153/1784] chore(deps): Update gapic-generator-java to 2.21.0
 (#1084)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): Update gapic-generator-java to 2.21.0

PiperOrigin-RevId: 538365689

Source-Link: https://github.com/googleapis/googleapis/commit/7ac8a2479bd197e4d7533e1ae9bf1877823f0c26

Source-Link: https://github.com/googleapis/googleapis-gen/commit/e58eedb75d3c07878097cdfbfd3ffdb7646763a3
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTU4ZWVkYjc1ZDNjMDc4NzgwOTdjZGZiZmQzZmZkYjc2NDY3NjNhMyJ9

chore: upgrading protobuf to 23.2 for code generation

PiperOrigin-RevId: 537035741

Source-Link: https://github.com/googleapis/googleapis/commit/640f7439448629156b3ff30adc0332cc8b7ce52c

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ec02ed2022878f99c94c763060ff6a018896b6e
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWVjMDJlZDIwMjI4NzhmOTljOTRjNzYzMDYwZmY2YTAxODg5NmI2ZSJ9

chore: upgrading Protobuf to 23.1 and gRPC to 1.55.0 in code generation

PiperOrigin-RevId: 534084593

Source-Link: https://github.com/googleapis/googleapis/commit/aa4559a97f79225fc57c9f70b5f84fe620e8292e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/370325af8236732f5885f5940e0ef481fee83003
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzcwMzI1YWY4MjM2NzMyZjU4ODVmNTk0MGUwZWY0ODFmZWU4MzAwMyJ9

* 🦉 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 
---
 .../admin/v1/DatastoreAdminClient.java        |   2 +-
 .../admin/v1/DatastoreAdminSettings.java      |   2 +-
 .../datastore/admin/v1/package-info.java      |   2 +-
 .../admin/v1/stub/DatastoreAdminStub.java     |   2 +-
 .../v1/stub/DatastoreAdminStubSettings.java   |   2 +-
 .../GrpcDatastoreAdminCallableFactory.java    |   2 +-
 .../admin/v1/stub/GrpcDatastoreAdminStub.java |  44 +--
 ...HttpJsonDatastoreAdminCallableFactory.java |   2 +-
 .../v1/stub/HttpJsonDatastoreAdminStub.java   |  41 ++-
 .../v1/DatastoreAdminClientHttpJsonTest.java  |   2 +-
 .../admin/v1/DatastoreAdminClientTest.java    |   2 +-
 .../admin/v1/MockDatastoreAdmin.java          |   2 +-
 .../admin/v1/MockDatastoreAdminImpl.java      |   2 +-
 .../datastore/admin/v1/CommonMetadata.java    |   5 -
 .../admin/v1/CreateIndexRequest.java          |   5 -
 .../admin/v1/DatastoreAdminProto.java         | 182 ++++++------
 .../DatastoreFirestoreMigrationMetadata.java  |   9 +-
 .../admin/v1/DeleteIndexRequest.java          |   5 -
 .../datastore/admin/v1/EntityFilter.java      | 106 ++++---
 .../admin/v1/EntityFilterOrBuilder.java       |   4 +
 .../admin/v1/ExportEntitiesMetadata.java      |   5 -
 .../admin/v1/ExportEntitiesRequest.java       |  26 +-
 .../v1/ExportEntitiesRequestOrBuilder.java    |   6 +
 .../admin/v1/ExportEntitiesResponse.java      |   5 -
 .../datastore/admin/v1/GetIndexRequest.java   |   5 -
 .../admin/v1/ImportEntitiesMetadata.java      |   5 -
 .../admin/v1/ImportEntitiesRequest.java       |  12 +-
 .../v1/ImportEntitiesRequestOrBuilder.java    |   2 +
 .../com/google/datastore/admin/v1/Index.java  |  10 -
 .../admin/v1/IndexOperationMetadata.java      |   5 -
 .../google/datastore/admin/v1/IndexProto.java |  44 +--
 .../admin/v1/ListIndexesRequest.java          |   5 -
 .../admin/v1/ListIndexesResponse.java         |   5 -
 .../admin/v1/MigrationProgressEvent.java      |  24 +-
 .../v1/MigrationProgressEventOrBuilder.java   |   4 +-
 .../admin/v1/MigrationStateEvent.java         |   5 -
 .../google/datastore/admin/v1/Progress.java   |   5 -
 .../google/datastore/v1/AggregationQuery.java | 228 +++++++++++++-
 .../v1/AggregationQueryOrBuilder.java         |  12 +-
 .../datastore/v1/AggregationResult.java       |  18 +-
 .../datastore/v1/AggregationResultBatch.java  |  17 +-
 .../v1/AggregationResultBatchOrBuilder.java   |   3 +
 .../v1/AggregationResultOrBuilder.java        |   5 +
 .../datastore/v1/AllocateIdsRequest.java      |  12 +-
 .../v1/AllocateIdsRequestOrBuilder.java       |   2 +
 .../datastore/v1/AllocateIdsResponse.java     |   5 -
 .../com/google/datastore/v1/ArrayValue.java   |   5 -
 .../datastore/v1/BeginTransactionRequest.java |  12 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |   2 +
 .../v1/BeginTransactionResponse.java          |   5 -
 .../google/datastore/v1/CommitRequest.java    |  83 +++++-
 .../datastore/v1/CommitRequestOrBuilder.java  |  19 +-
 .../google/datastore/v1/CommitResponse.java   |   5 -
 .../google/datastore/v1/CompositeFilter.java  |  51 +++-
 .../v1/CompositeFilterOrBuilder.java          |  10 +
 .../google/datastore/v1/DatastoreProto.java   | 278 +++++++++---------
 .../java/com/google/datastore/v1/Entity.java  |  19 +-
 .../google/datastore/v1/EntityOrBuilder.java  |   3 +
 .../com/google/datastore/v1/EntityResult.java |  13 +-
 .../datastore/v1/EntityResultOrBuilder.java   |   2 +
 .../java/com/google/datastore/v1/Filter.java  |   7 +-
 .../google/datastore/v1/FilterOrBuilder.java  |   2 +-
 .../com/google/datastore/v1/GqlQuery.java     |  39 ++-
 .../datastore/v1/GqlQueryOrBuilder.java       |  10 +
 .../datastore/v1/GqlQueryParameter.java       |   7 +-
 .../v1/GqlQueryParameterOrBuilder.java        |   2 +-
 .../java/com/google/datastore/v1/Key.java     | 112 ++++++-
 .../com/google/datastore/v1/KeyOrBuilder.java |  10 +
 .../google/datastore/v1/KindExpression.java   |   5 -
 .../google/datastore/v1/LookupRequest.java    |  12 +-
 .../datastore/v1/LookupRequestOrBuilder.java  |   2 +
 .../google/datastore/v1/LookupResponse.java   |   9 +-
 .../datastore/v1/LookupResponseOrBuilder.java |   1 +
 .../com/google/datastore/v1/Mutation.java     |   9 +-
 .../datastore/v1/MutationOrBuilder.java       |   5 +-
 .../google/datastore/v1/MutationResult.java   |   5 -
 .../com/google/datastore/v1/PartitionId.java  |  13 +-
 .../com/google/datastore/v1/Projection.java   |   5 -
 .../google/datastore/v1/PropertyFilter.java   |  37 ++-
 .../google/datastore/v1/PropertyOrder.java    |   5 -
 .../datastore/v1/PropertyReference.java       |   5 -
 .../java/com/google/datastore/v1/Query.java   |  51 +++-
 .../google/datastore/v1/QueryOrBuilder.java   |  10 +
 .../com/google/datastore/v1/QueryProto.java   | 124 ++++----
 .../google/datastore/v1/QueryResultBatch.java |  21 +-
 .../v1/QueryResultBatchOrBuilder.java         |   4 +
 .../com/google/datastore/v1/ReadOptions.java  |  19 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |   5 +-
 .../datastore/v1/ReserveIdsRequest.java       |  12 +-
 .../v1/ReserveIdsRequestOrBuilder.java        |   2 +
 .../datastore/v1/ReserveIdsResponse.java      |   5 -
 .../google/datastore/v1/RollbackRequest.java  |  12 +-
 .../v1/RollbackRequestOrBuilder.java          |   2 +
 .../google/datastore/v1/RollbackResponse.java |   5 -
 .../v1/RunAggregationQueryRequest.java        |  14 +-
 .../RunAggregationQueryRequestOrBuilder.java  |   4 +-
 .../v1/RunAggregationQueryResponse.java       |   9 +-
 .../RunAggregationQueryResponseOrBuilder.java |   1 +
 .../google/datastore/v1/RunQueryRequest.java  |  14 +-
 .../v1/RunQueryRequestOrBuilder.java          |   4 +-
 .../google/datastore/v1/RunQueryResponse.java |   9 +-
 .../v1/RunQueryResponseOrBuilder.java         |   1 +
 .../datastore/v1/TransactionOptions.java      |  19 +-
 .../v1/TransactionOptionsOrBuilder.java       |   2 +-
 .../java/com/google/datastore/v1/Value.java   |  19 +-
 .../google/datastore/v1/ValueOrBuilder.java   |   5 +-
 106 files changed, 1351 insertions(+), 729 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index ce6c39face4e..7d4752fb9575 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 64fdb6899e98..a0249a24c4ed 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
index b82ab22ea538..b6dd28a5707e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
index cc758842caf7..0551bc2cbe05 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index a5d39bb4a21f..08d7b7179962 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
index c55ab938aa64..7bdea7acdd48 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
index be17f9ae0397..5ac8da1c3d26 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.RequestParamsBuilder;
 import com.google.api.gax.rpc.UnaryCallable;
-import com.google.common.collect.ImmutableMap;
 import com.google.datastore.admin.v1.CreateIndexRequest;
 import com.google.datastore.admin.v1.DeleteIndexRequest;
 import com.google.datastore.admin.v1.ExportEntitiesMetadata;
@@ -176,9 +176,9 @@ protected GrpcDatastoreAdminStub(
             .setMethodDescriptor(exportEntitiesMethodDescriptor)
             .setParamsExtractor(
                 request -> {
-                  ImmutableMap.Builder params = ImmutableMap.builder();
-                  params.put("project_id", String.valueOf(request.getProjectId()));
-                  return params.build();
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
                 })
             .build();
     GrpcCallSettings importEntitiesTransportSettings =
@@ -186,9 +186,9 @@ protected GrpcDatastoreAdminStub(
             .setMethodDescriptor(importEntitiesMethodDescriptor)
             .setParamsExtractor(
                 request -> {
-                  ImmutableMap.Builder params = ImmutableMap.builder();
-                  params.put("project_id", String.valueOf(request.getProjectId()));
-                  return params.build();
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
                 })
             .build();
     GrpcCallSettings createIndexTransportSettings =
@@ -196,9 +196,9 @@ protected GrpcDatastoreAdminStub(
             .setMethodDescriptor(createIndexMethodDescriptor)
             .setParamsExtractor(
                 request -> {
-                  ImmutableMap.Builder params = ImmutableMap.builder();
-                  params.put("project_id", String.valueOf(request.getProjectId()));
-                  return params.build();
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
                 })
             .build();
     GrpcCallSettings deleteIndexTransportSettings =
@@ -206,10 +206,10 @@ protected GrpcDatastoreAdminStub(
             .setMethodDescriptor(deleteIndexMethodDescriptor)
             .setParamsExtractor(
                 request -> {
-                  ImmutableMap.Builder params = ImmutableMap.builder();
-                  params.put("index_id", String.valueOf(request.getIndexId()));
-                  params.put("project_id", String.valueOf(request.getProjectId()));
-                  return params.build();
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("index_id", String.valueOf(request.getIndexId()));
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
                 })
             .build();
     GrpcCallSettings getIndexTransportSettings =
@@ -217,10 +217,10 @@ protected GrpcDatastoreAdminStub(
             .setMethodDescriptor(getIndexMethodDescriptor)
             .setParamsExtractor(
                 request -> {
-                  ImmutableMap.Builder params = ImmutableMap.builder();
-                  params.put("index_id", String.valueOf(request.getIndexId()));
-                  params.put("project_id", String.valueOf(request.getProjectId()));
-                  return params.build();
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("index_id", String.valueOf(request.getIndexId()));
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
                 })
             .build();
     GrpcCallSettings listIndexesTransportSettings =
@@ -228,9 +228,9 @@ protected GrpcDatastoreAdminStub(
             .setMethodDescriptor(listIndexesMethodDescriptor)
             .setParamsExtractor(
                 request -> {
-                  ImmutableMap.Builder params = ImmutableMap.builder();
-                  params.put("project_id", String.valueOf(request.getProjectId()));
-                  return params.build();
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
                 })
             .build();
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
index 792def7916a2..7f75461f8c9e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index fda56e1e8f77..4dd2028d24bb 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import com.google.api.gax.httpjson.longrunning.stub.HttpJsonOperationsStub;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.RequestParamsBuilder;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.common.collect.ImmutableMap;
 import com.google.datastore.admin.v1.CreateIndexRequest;
@@ -392,31 +393,69 @@ protected HttpJsonDatastoreAdminStub(
         HttpJsonCallSettings.newBuilder()
             .setMethodDescriptor(exportEntitiesMethodDescriptor)
             .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
+                })
             .build();
     HttpJsonCallSettings importEntitiesTransportSettings =
         HttpJsonCallSettings.newBuilder()
             .setMethodDescriptor(importEntitiesMethodDescriptor)
             .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
+                })
             .build();
     HttpJsonCallSettings createIndexTransportSettings =
         HttpJsonCallSettings.newBuilder()
             .setMethodDescriptor(createIndexMethodDescriptor)
             .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
+                })
             .build();
     HttpJsonCallSettings deleteIndexTransportSettings =
         HttpJsonCallSettings.newBuilder()
             .setMethodDescriptor(deleteIndexMethodDescriptor)
             .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("index_id", String.valueOf(request.getIndexId()));
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
+                })
             .build();
     HttpJsonCallSettings getIndexTransportSettings =
         HttpJsonCallSettings.newBuilder()
             .setMethodDescriptor(getIndexMethodDescriptor)
             .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("index_id", String.valueOf(request.getIndexId()));
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
+                })
             .build();
     HttpJsonCallSettings listIndexesTransportSettings =
         HttpJsonCallSettings.newBuilder()
             .setMethodDescriptor(listIndexesMethodDescriptor)
             .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("project_id", String.valueOf(request.getProjectId()));
+                  return builder.build();
+                })
             .build();
 
     this.exportEntitiesCallable =
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
index 73732535df9c..277919f2fbda 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
index 03538b47e1b8..d28269a1919f 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
index 3c683fc8c33f..a157fa5bed49 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
index b27dcf28c92d..5bfde0405a8b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 6ace69444c64..da6d17ac4788 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CommonMetadata();
   }
 
-  @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_CommonMetadata_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 065cbc7cdbdb..31d0c275d676 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateIndexRequest();
   }
 
-  @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_CreateIndexRequest_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 1bb28e54ff32..0d40a568c114 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -130,97 +130,97 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\022\016\n\nFINALIZING\020\004\022\016\n\nSUCCESSFUL\020\005\022\n\n\006FAIL"
           + "ED\020\006\022\r\n\tCANCELLED\020\007\":\n\010Progress\022\026\n\016work_"
           + "completed\030\001 \001(\003\022\026\n\016work_estimated\030\002 \001(\003\""
-          + "\215\002\n\025ExportEntitiesRequest\022\027\n\nproject_id\030"
-          + "\001 \001(\tB\003\340A\002\022L\n\006labels\030\002 \003(\0132<.google.data"
-          + "store.admin.v1.ExportEntitiesRequest.Lab"
-          + "elsEntry\022>\n\rentity_filter\030\003 \001(\0132\'.google"
-          + ".datastore.admin.v1.EntityFilter\022\036\n\021outp"
-          + "ut_url_prefix\030\004 \001(\tB\003\340A\002\032-\n\013LabelsEntry\022"
-          + "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\205\002\n\025Impo"
-          + "rtEntitiesRequest\022\027\n\nproject_id\030\001 \001(\tB\003\340"
-          + "A\002\022L\n\006labels\030\002 \003(\0132<.google.datastore.ad"
-          + "min.v1.ImportEntitiesRequest.LabelsEntry"
-          + "\022\026\n\tinput_url\030\003 \001(\tB\003\340A\002\022>\n\rentity_filte"
-          + "r\030\004 \001(\0132\'.google.datastore.admin.v1.Enti"
-          + "tyFilter\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005"
-          + "value\030\002 \001(\t:\0028\001\",\n\026ExportEntitiesRespons"
-          + "e\022\022\n\noutput_url\030\001 \001(\t\"\253\002\n\026ExportEntities"
-          + "Metadata\0229\n\006common\030\001 \001(\0132).google.datast"
-          + "ore.admin.v1.CommonMetadata\022>\n\021progress_"
-          + "entities\030\002 \001(\0132#.google.datastore.admin."
-          + "v1.Progress\022;\n\016progress_bytes\030\003 \001(\0132#.go"
-          + "ogle.datastore.admin.v1.Progress\022>\n\renti"
-          + "ty_filter\030\004 \001(\0132\'.google.datastore.admin"
-          + ".v1.EntityFilter\022\031\n\021output_url_prefix\030\005 "
-          + "\001(\t\"\243\002\n\026ImportEntitiesMetadata\0229\n\006common"
-          + "\030\001 \001(\0132).google.datastore.admin.v1.Commo"
-          + "nMetadata\022>\n\021progress_entities\030\002 \001(\0132#.g"
-          + "oogle.datastore.admin.v1.Progress\022;\n\016pro"
-          + "gress_bytes\030\003 \001(\0132#.google.datastore.adm"
-          + "in.v1.Progress\022>\n\rentity_filter\030\004 \001(\0132\'."
-          + "google.datastore.admin.v1.EntityFilter\022\021"
-          + "\n\tinput_url\030\005 \001(\t\"4\n\014EntityFilter\022\r\n\005kin"
-          + "ds\030\001 \003(\t\022\025\n\rnamespace_ids\030\002 \003(\t\"Y\n\022Creat"
-          + "eIndexRequest\022\022\n\nproject_id\030\001 \001(\t\022/\n\005ind"
-          + "ex\030\003 \001(\0132 .google.datastore.admin.v1.Ind"
-          + "ex\":\n\022DeleteIndexRequest\022\022\n\nproject_id\030\001"
-          + " \001(\t\022\020\n\010index_id\030\003 \001(\t\"7\n\017GetIndexReques"
-          + "t\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010index_id\030\003 \001(\t\""
-          + "_\n\022ListIndexesRequest\022\022\n\nproject_id\030\001 \001("
-          + "\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\022\022\n\n"
-          + "page_token\030\005 \001(\t\"a\n\023ListIndexesResponse\022"
-          + "1\n\007indexes\030\001 \003(\0132 .google.datastore.admi"
-          + "n.v1.Index\022\027\n\017next_page_token\030\002 \001(\t\"\245\001\n\026"
-          + "IndexOperationMetadata\0229\n\006common\030\001 \001(\0132)"
-          + ".google.datastore.admin.v1.CommonMetadat"
-          + "a\022>\n\021progress_entities\030\002 \001(\0132#.google.da"
-          + "tastore.admin.v1.Progress\022\020\n\010index_id\030\003 "
-          + "\001(\t\"\253\001\n#DatastoreFirestoreMigrationMetad"
-          + "ata\022B\n\017migration_state\030\001 \001(\0162).google.da"
-          + "tastore.admin.v1.MigrationState\022@\n\016migra"
-          + "tion_step\030\002 \001(\0162(.google.datastore.admin"
-          + ".v1.MigrationStep*}\n\rOperationType\022\036\n\032OP"
-          + "ERATION_TYPE_UNSPECIFIED\020\000\022\023\n\017EXPORT_ENT"
-          + "ITIES\020\001\022\023\n\017IMPORT_ENTITIES\020\002\022\020\n\014CREATE_I"
-          + "NDEX\020\003\022\020\n\014DELETE_INDEX\020\0042\204\n\n\016DatastoreAd"
-          + "min\022\366\001\n\016ExportEntities\0220.google.datastor"
-          + "e.admin.v1.ExportEntitiesRequest\032\035.googl"
-          + "e.longrunning.Operation\"\222\001\202\323\344\223\002%\" /v1/pr"
-          + "ojects/{project_id}:export:\001*\332A1project_"
-          + "id,labels,entity_filter,output_url_prefi"
-          + "x\312A0\n\026ExportEntitiesResponse\022\026ExportEnti"
-          + "tiesMetadata\022\355\001\n\016ImportEntities\0220.google"
-          + ".datastore.admin.v1.ImportEntitiesReques"
-          + "t\032\035.google.longrunning.Operation\"\211\001\202\323\344\223\002"
-          + "%\" /v1/projects/{project_id}:import:\001*\332A"
-          + ")project_id,labels,input_url,entity_filt"
-          + "er\312A/\n\025google.protobuf.Empty\022\026ImportEnti"
-          + "tiesMetadata\022\257\001\n\013CreateIndex\022-.google.da"
-          + "tastore.admin.v1.CreateIndexRequest\032\035.go"
-          + "ogle.longrunning.Operation\"R\202\323\344\223\002*\"!/v1/"
-          + "projects/{project_id}/indexes:\005index\312A\037\n"
-          + "\005Index\022\026IndexOperationMetadata\022\263\001\n\013Delet"
-          + "eIndex\022-.google.datastore.admin.v1.Delet"
-          + "eIndexRequest\032\035.google.longrunning.Opera"
-          + "tion\"V\202\323\344\223\002.*,/v1/projects/{project_id}/"
-          + "indexes/{index_id}\312A\037\n\005Index\022\026IndexOpera"
-          + "tionMetadata\022\216\001\n\010GetIndex\022*.google.datas"
-          + "tore.admin.v1.GetIndexRequest\032 .google.d"
-          + "atastore.admin.v1.Index\"4\202\323\344\223\002.\022,/v1/pro"
-          + "jects/{project_id}/indexes/{index_id}\022\227\001"
-          + "\n\013ListIndexes\022-.google.datastore.admin.v"
-          + "1.ListIndexesRequest\032..google.datastore."
-          + "admin.v1.ListIndexesResponse\")\202\323\344\223\002#\022!/v"
-          + "1/projects/{project_id}/indexes\032v\312A\030data"
-          + "store.googleapis.com\322AXhttps://www.googl"
-          + "eapis.com/auth/cloud-platform,https://ww"
-          + "w.googleapis.com/auth/datastoreB\333\001\n\035com."
-          + "google.datastore.admin.v1B\023DatastoreAdmi"
-          + "nProtoP\001Z9cloud.google.com/go/datastore/"
-          + "admin/apiv1/adminpb;adminpb\252\002\037Google.Clo"
-          + "ud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Dat"
-          + "astore\\Admin\\V1\352\002#Google::Cloud::Datasto"
-          + "re::Admin::V1b\006proto3"
+          + "\217\002\n\025ExportEntitiesRequest\022\030\n\nproject_id\030"
+          + "\001 \001(\tB\004\342A\001\002\022L\n\006labels\030\002 \003(\0132<.google.dat"
+          + "astore.admin.v1.ExportEntitiesRequest.La"
+          + "belsEntry\022>\n\rentity_filter\030\003 \001(\0132\'.googl"
+          + "e.datastore.admin.v1.EntityFilter\022\037\n\021out"
+          + "put_url_prefix\030\004 \001(\tB\004\342A\001\002\032-\n\013LabelsEntr"
+          + "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\207\002\n\025Im"
+          + "portEntitiesRequest\022\030\n\nproject_id\030\001 \001(\tB"
+          + "\004\342A\001\002\022L\n\006labels\030\002 \003(\0132<.google.datastore"
+          + ".admin.v1.ImportEntitiesRequest.LabelsEn"
+          + "try\022\027\n\tinput_url\030\003 \001(\tB\004\342A\001\002\022>\n\rentity_f"
+          + "ilter\030\004 \001(\0132\'.google.datastore.admin.v1."
+          + "EntityFilter\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t"
+          + "\022\r\n\005value\030\002 \001(\t:\0028\001\",\n\026ExportEntitiesRes"
+          + "ponse\022\022\n\noutput_url\030\001 \001(\t\"\253\002\n\026ExportEnti"
+          + "tiesMetadata\0229\n\006common\030\001 \001(\0132).google.da"
+          + "tastore.admin.v1.CommonMetadata\022>\n\021progr"
+          + "ess_entities\030\002 \001(\0132#.google.datastore.ad"
+          + "min.v1.Progress\022;\n\016progress_bytes\030\003 \001(\0132"
+          + "#.google.datastore.admin.v1.Progress\022>\n\r"
+          + "entity_filter\030\004 \001(\0132\'.google.datastore.a"
+          + "dmin.v1.EntityFilter\022\031\n\021output_url_prefi"
+          + "x\030\005 \001(\t\"\243\002\n\026ImportEntitiesMetadata\0229\n\006co"
+          + "mmon\030\001 \001(\0132).google.datastore.admin.v1.C"
+          + "ommonMetadata\022>\n\021progress_entities\030\002 \001(\013"
+          + "2#.google.datastore.admin.v1.Progress\022;\n"
+          + "\016progress_bytes\030\003 \001(\0132#.google.datastore"
+          + ".admin.v1.Progress\022>\n\rentity_filter\030\004 \001("
+          + "\0132\'.google.datastore.admin.v1.EntityFilt"
+          + "er\022\021\n\tinput_url\030\005 \001(\t\"4\n\014EntityFilter\022\r\n"
+          + "\005kinds\030\001 \003(\t\022\025\n\rnamespace_ids\030\002 \003(\t\"Y\n\022C"
+          + "reateIndexRequest\022\022\n\nproject_id\030\001 \001(\t\022/\n"
+          + "\005index\030\003 \001(\0132 .google.datastore.admin.v1"
+          + ".Index\":\n\022DeleteIndexRequest\022\022\n\nproject_"
+          + "id\030\001 \001(\t\022\020\n\010index_id\030\003 \001(\t\"7\n\017GetIndexRe"
+          + "quest\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010index_id\030\003 "
+          + "\001(\t\"_\n\022ListIndexesRequest\022\022\n\nproject_id\030"
+          + "\001 \001(\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005"
+          + "\022\022\n\npage_token\030\005 \001(\t\"a\n\023ListIndexesRespo"
+          + "nse\0221\n\007indexes\030\001 \003(\0132 .google.datastore."
+          + "admin.v1.Index\022\027\n\017next_page_token\030\002 \001(\t\""
+          + "\245\001\n\026IndexOperationMetadata\0229\n\006common\030\001 \001"
+          + "(\0132).google.datastore.admin.v1.CommonMet"
+          + "adata\022>\n\021progress_entities\030\002 \001(\0132#.googl"
+          + "e.datastore.admin.v1.Progress\022\020\n\010index_i"
+          + "d\030\003 \001(\t\"\253\001\n#DatastoreFirestoreMigrationM"
+          + "etadata\022B\n\017migration_state\030\001 \001(\0162).googl"
+          + "e.datastore.admin.v1.MigrationState\022@\n\016m"
+          + "igration_step\030\002 \001(\0162(.google.datastore.a"
+          + "dmin.v1.MigrationStep*}\n\rOperationType\022\036"
+          + "\n\032OPERATION_TYPE_UNSPECIFIED\020\000\022\023\n\017EXPORT"
+          + "_ENTITIES\020\001\022\023\n\017IMPORT_ENTITIES\020\002\022\020\n\014CREA"
+          + "TE_INDEX\020\003\022\020\n\014DELETE_INDEX\020\0042\204\n\n\016Datasto"
+          + "reAdmin\022\366\001\n\016ExportEntities\0220.google.data"
+          + "store.admin.v1.ExportEntitiesRequest\032\035.g"
+          + "oogle.longrunning.Operation\"\222\001\312A0\n\026Expor"
+          + "tEntitiesResponse\022\026ExportEntitiesMetadat"
+          + "a\332A1project_id,labels,entity_filter,outp"
+          + "ut_url_prefix\202\323\344\223\002%\" /v1/projects/{proje"
+          + "ct_id}:export:\001*\022\355\001\n\016ImportEntities\0220.go"
+          + "ogle.datastore.admin.v1.ImportEntitiesRe"
+          + "quest\032\035.google.longrunning.Operation\"\211\001\312"
+          + "A/\n\025google.protobuf.Empty\022\026ImportEntitie"
+          + "sMetadata\332A)project_id,labels,input_url,"
+          + "entity_filter\202\323\344\223\002%\" /v1/projects/{proje"
+          + "ct_id}:import:\001*\022\257\001\n\013CreateIndex\022-.googl"
+          + "e.datastore.admin.v1.CreateIndexRequest\032"
+          + "\035.google.longrunning.Operation\"R\312A\037\n\005Ind"
+          + "ex\022\026IndexOperationMetadata\202\323\344\223\002*\"!/v1/pr"
+          + "ojects/{project_id}/indexes:\005index\022\263\001\n\013D"
+          + "eleteIndex\022-.google.datastore.admin.v1.D"
+          + "eleteIndexRequest\032\035.google.longrunning.O"
+          + "peration\"V\312A\037\n\005Index\022\026IndexOperationMeta"
+          + "data\202\323\344\223\002.*,/v1/projects/{project_id}/in"
+          + "dexes/{index_id}\022\216\001\n\010GetIndex\022*.google.d"
+          + "atastore.admin.v1.GetIndexRequest\032 .goog"
+          + "le.datastore.admin.v1.Index\"4\202\323\344\223\002.\022,/v1"
+          + "/projects/{project_id}/indexes/{index_id"
+          + "}\022\227\001\n\013ListIndexes\022-.google.datastore.adm"
+          + "in.v1.ListIndexesRequest\032..google.datast"
+          + "ore.admin.v1.ListIndexesResponse\")\202\323\344\223\002#"
+          + "\022!/v1/projects/{project_id}/indexes\032v\312A\030"
+          + "datastore.googleapis.com\322AXhttps://www.g"
+          + "oogleapis.com/auth/cloud-platform,https:"
+          + "//www.googleapis.com/auth/datastoreB\333\001\n\035"
+          + "com.google.datastore.admin.v1B\023Datastore"
+          + "AdminProtoP\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/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index e3a90b214a97..589590c672e2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -23,9 +23,11 @@
  *
  * 
      * 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 44a18f71447c..a9362246b0d2 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 4dfe2cd4507f..cff74d17f1e2 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 b39e13297a61..3e80e0185ecf 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 5982b68d17e9..4836be0baad6 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 c817e37d2534..5de54a564c3d 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 4e57c8f09c55..93d655c76870 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 6ddcdd71f552..be5e66c5e261 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 6216d5e791dd..ca2b4846a8a0 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 3d678697c3e2..19302e6a5076 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 0643500b66ff..43319379bd45 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 500706047cf8..093f4c6e2e69 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 b9a123e56ab3..45d25cd444e7 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 36464b158a73..48e6b0fc52a7 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 ff612c3e22b3..cc0b3577b02a 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 921c6b5f2331..8e4891704097 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 9c037599232a..9ed672c16c5b 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 611d90c948f0..8a3e730c4510 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 4660304ea8f3..07b7d82a453b 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 e39101f4cf76..b2e653e4e0eb 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 1b70d7be3c52..4f5126203ba9 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 5311d1a45075..2f9f11739d78 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 675424777304..0530172031fa 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 cb3969718b95..b181d4f1226b 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 e041913ca6fd..194710d50e66 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 e104e9556667..818b32c1a173 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 fc9f0ab9a55e..fc6a3cddd7e4 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 206fd62ffd4c..f78c17c539a5 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 070e273c6592..5daea7f12437 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 6178966318f4..7fecd70bf264 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 c8ca14ce3c6b..742bbcd4f31b 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 e194f4bc1843..79260cf33c03 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 bfe6db93d7c8..e65a6c5c676a 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 04be1060dcbe..bf6116f00a69 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 fd493327298f..21a4502ab8e4 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 3e4dcb9f434f..9ccd59cee41a 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 9c58e7843baa..8b626e297294 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 9393d2440f99..6deeaa460199 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 6dc33de5d26d..0248e6d6aa49 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 e1286f3ebfc1..105929eb8c88 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 d3651082596f..62fce1317622 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 f6a3f3759674..d3faf6a4fcfe 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 6b0fc7e3acdf..29ae719a34d6 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 af143908f12f..757ef1b68bc6 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 5f51396a731e..69eae7c590ae 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 fe30bb669190..28dec0070fe3 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 8af39544f18c..2bdd43c55cca 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 3394490f17f2..eba9c908364f 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 6539bf2455e5..910eab7a2a3d 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 29f9502c6f69..5ab6658e39e6 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 37543f602ccd..beb7eefbd44e 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 a6644c9db479..a8add42c4200 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 1f9a03c54536..8078d725e0b5 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 0720a22562c9..6d55f6ccf94f 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 074cf7ce971c..dc8f4ffe65dd 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 d9ac2be8a0c9..37ad635e278c 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 5b9ce0d3dd0b..3076b9133ec7 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 3257d3d22458..7ef1b2e16fd2 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 a9048026a37b..1ea9eeac103c 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 dd0daeac4bcb..c160185ac1f3 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 f39f017bd6bf..81c1a5e67a86 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 042d0487fe13..610e6d182241 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 fb9a0965a463..abb0e9550e88 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 2b1cd280fd3c..0e15aaef52ed 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 2b23df9f88e2..b9faa09a0dd3 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 1b200969913b..d269dcf6dee2 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 d86241bc7462..806bd6837f41 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 c5294cc4a6ea..12701c6eb187 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 2636e5e56a25..e737bbf64fdd 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 1fcfbaa39aa7..a659711fb7d5 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 50b3ccd6994e..c1079132c9f0 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 77b52387140c..57e61ba2ed56 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 7f9bd4385675..c741d9f09342 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 e1d82c4bf123..c7d22d65a3cb 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 88fd4fdc43a5..552351a41a48 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 63ace7ed3a36..28d7ec6c6b8e 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 9dc65c46b2e2..36673a39ec36 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 4cd5e5a6d4c2..de184cdbe7ed 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 b26ac26338ed..e54e3199f1c8 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 3317e05ca382..a2daba8d377f 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 7104cd3aea99..90a858f1c1ac 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 4486a75a0577..401c3f93d3b1 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 64f56408d41a..031a46914348 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 a716d733f43b..1ffba1fbfc05 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 4d2b24215bf9..5a74da363c3c 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 9cd695209eba..29622ac515e3 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 1154/1784] 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 a2907a257b2b..418983013dbe 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 58049cc38f11..5929bb204e3b 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 f52533545896..798e390bd470 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 44b1004875b6..c85858306db9 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 dded67a9d54a..fd5cd6689afb 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 09101c94b8fe..6b886aef0fa3 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 8da86dc41707..e097dc7d7d7f 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 6143bdd59ba3..8952111ec592 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 321eea72ab59..b0b47c5056b9 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 16a6303bb2d7..3eb7a66de8c9 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 e869437243cd..b064e137ad5c 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 ebcb1239644f..281e92f04390 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 000000000000..3e6cf025e7f3
--- /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 553a12bb3ba2..8734efe3370c 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 5fc0bcd8a27e..f1647cac7cf7 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 985b76a7cb10..33e90a66e802 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 2483231507e5..a1b337c056ec 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 f754866a94c8..03621502c9ce 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 afabadba251c..c1f7118e55ff 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 785d3592fa5b..bfd9dd7d3af3 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 7c6b07347cd1..f8c3c93f62cd 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 6170c0b8b377..8fc731ace709 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 fc6c5e944a9b..3b5e5e4e88af 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 4a6d99d54d4c..f1c19d155166 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 8f4e51d6e56c..5c4fb3e5f3b1 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 fd3cdc658a8a..cfbbaa7df3c5 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 db4bd112eebc..26b892186932 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 803400ea18c7..d8b5ad9324d8 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 ffa54970da87..08b65bdc7544 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 576ad74cddf0..010a892ae3b5 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 aabdc7af329c..19dd3f0c0923 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 7dc625bad1df..d0f00d79b4df 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 c3396a286749..a1f8956b526e 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 26c922e5a6e4..37017c28e84e 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 d6e3b4d8f08c..cb3d13fdbf15 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 934e3a4c7f50..5fbb35b6e825 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 3a5ccabac751..e66e8d91cea1 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 8a7fd88b086a..3ebd3ef4a060 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 784f35a4093e..f96943ca5458 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 1155/1784] 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 e097dc7d7d7f..eefd629ec6a4 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 8734efe3370c..6a015e3886b7 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 03621502c9ce..d4f3be3c2324 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 19dd3f0c0923..a545580e2047 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 1156/1784] 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 c29fa78713a3..753e0efd98be 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 634f5dfbe598..f6ec5c3547e3 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 50d74c73afc8..4566b61d42b7 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 f326f4d62c6e..535843581b85 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 f722628d9eb1..05d25e35b0c8 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 a96e9ff05dc6..1ad70d16b4cd 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 c5558709551d..aa40b045ca84 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 cb02eeb8f09c..cdd0d8a83fad 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 2d4adc2764a2..b568d4eb9e78 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

From 46a3c6b79f726f6d66f77aac39c407b5c65b222f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 15:12:13 +0000
Subject: [PATCH 1157/1784] chore(main): release 2.15.1-SNAPSHOT (#1108)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f6ec5c3547e3..cc926e100dea 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.15.0
+  2.15.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.0
+    2.15.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4566b61d42b7..d4b1da3b50ae 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.15.0
+  2.15.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.15.0
+        2.15.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.15.0
+        2.15.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.106.0
+        0.106.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.15.0
+        2.15.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 535843581b85..d4bd961422d1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.15.0
+  2.15.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.0
+    2.15.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 05d25e35b0c8..45c1e229457e 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.15.0
+  2.15.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.0
+    2.15.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 1ad70d16b4cd..64b3f4d5253d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.15.0
+  2.15.1-SNAPSHOT
   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.15.0
+        2.15.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.15.0
+        2.15.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.15.0
+        2.15.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.106.0
+        0.106.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.15.0
+        2.15.1-SNAPSHOT
         
           
             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 aa40b045ca84..cf8fe1dae0f0 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.15.0
+  2.15.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.0
+    2.15.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cdd0d8a83fad..8b116cdd6785 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.106.0
+  0.106.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.0
+    2.15.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index b568d4eb9e78..175c603dece0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-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
+google-cloud-datastore:2.15.0:2.15.1-SNAPSHOT
+google-cloud-datastore-bom:2.15.0:2.15.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.106.0:0.106.1-SNAPSHOT
+datastore-v1-proto-client:2.15.0:2.15.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.15.0:2.15.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.15.0:2.15.1-SNAPSHOT

From 88d1b353f6a74a0cbdf322aea70285aa4d3850ea Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 12 Jun 2023 23:04:13 +0200
Subject: [PATCH 1158/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.15.0 (#1109)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.14.7` -> `2.15.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.15.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.15.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.15.0/compatibility-slim/2.14.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.15.0/confidence-slim/2.14.7)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore

### [`v2.15.0`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​2150-httpsgithubcomgoogleapisjava-datastorecomparev2147v2150-2023-06-09)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.14.7...v2.15.0)

##### Features

-   Multiple dbs support ([#​1102](https://togithub.com/googleapis/java-datastore/issues/1102)) ([7887f32](https://togithub.com/googleapis/java-datastore/commit/7887f3255cba4dedd7b4f369d77a3279d903127f))

##### Bug Fixes

-   Add some missing annotations and fix equals/hashcode for DatastoreOptions ([#​1106](https://togithub.com/googleapis/java-datastore/issues/1106)) ([c4a79ef](https://togithub.com/googleapis/java-datastore/commit/c4a79effa83c5fdb7ad8db15ae52e2c70db238bc))

##### Dependencies

-   Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.11.0 ([#​1104](https://togithub.com/googleapis/java-datastore/issues/1104)) ([fc9b091](https://togithub.com/googleapis/java-datastore/commit/fc9b09103a1bfbb238b22102dcf2b889292658ce))


    

---

### 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, check this box

---

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).

---
 README.md                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7290de40227c..2844a3e1b554 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.14.7
+  2.15.0
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.14.7'
+implementation 'com.google.cloud:google-cloud-datastore:2.15.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.7"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.15.0"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.7
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.15.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index f68818eb42aa..0098527d94b8 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.7
+      2.15.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 9b1a7f206b2b..797beef3912d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.14.7
+      2.15.0
     
 
     

From 0b3170ddd798992103d71e6a9f702037b1cf3515 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 15:16:21 -0700
Subject: [PATCH 1159/1784] build(deps): bump cryptography from 39.0.1 to
 41.0.0 in /.kokoro (#1099)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build(deps): bump cryptography from 39.0.1 to 41.0.0 in /.kokoro

Bumps [cryptography](https://github.com/pyca/cryptography) from 39.0.1 to 41.0.0.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/39.0.1...41.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Owl Bot 

From b1227dd96010a3c0a3ffe5e2f949f316a959b3d1 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 14 Jun 2023 11:48:47 -0400
Subject: [PATCH 1160/1784] test(fix): set namespace for entity (#1107)

---
 .../test/java/com/google/cloud/datastore/it/ITDatastoreTest.java | 1 +
 1 file changed, 1 insertion(+)

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 e66e8d91cea1..167d2898cc9d 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
@@ -194,6 +194,7 @@ public ITDatastoreTest(
         FullEntity.newBuilder(PARTIAL_ENTITY1)
             .setKey(
                 IncompleteKey.newBuilder(PROJECT_ID, KIND3)
+                    .setNamespace(NAMESPACE)
                     .setDatabaseId(options.getDatabaseId())
                     .build())
             .build();

From 6d0c3f82336d719551f00f83f352904ddcdff9aa Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 15 Jun 2023 20:52:06 +0200
Subject: [PATCH 1161/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.17.0 (#1111)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.17.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2844a3e1b554..88f3ba650946 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.16.0
+      26.17.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.16.0')
+implementation platform('com.google.cloud:libraries-bom:26.17.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 0e75229c56c6..ee1e1f63d0bf 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.16.0
+        26.17.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 4a06a941c97d..bfe76dab456b 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.16.0
+        26.17.0
         pom
         import
       

From 92c512f43bc0c66974ce56531a074fdfa6bfa097 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 10:53:11 -0400
Subject: [PATCH 1162/1784] chore: Update `dependabot.yml` template (#1813)
 (#1112)

* chore: Update `dependabot.yml` template not to touch pip dependencies
Source-Link: https://github.com/googleapis/synthtool/commit/f961eb0fe51109238128055897ccba1b70dbd804
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:af2eda87a54601ae7b7b2be5055c17b43ac98a7805b586772db314de8a7d4a1d

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 3 ++-
 .github/dependabot.yml    | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index aadf54f6438e..73568a1e998c 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:ad9cabee4c022f1aab04a71332369e0c23841062124818a4490f73337f790337
+  digest: sha256:af2eda87a54601ae7b7b2be5055c17b43ac98a7805b586772db314de8a7d4a1d
+# created: 2023-06-16T02:10:09.149325782Z
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c8f413b0da30..fde1ced49fb9 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,10 +5,13 @@ updates:
     schedule:
       interval: "daily"
     # Disable version updates for Maven dependencies
-    open-pull-requests-limit: 0
+    # we use renovate-bot as well as shared-dependencies BOM to update maven dependencies.
+    ignore: "*"
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
       interval: "daily"
     # Disable version updates for pip dependencies
-    open-pull-requests-limit: 0
\ No newline at end of file
+    # If a security vulnerability comes in, we will be notified about 
+    # it via template in the synthtool repository.
+    ignore: "*"

From 6e359fc694f8a3a2cca3a2eec446ea2527b14317 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 16 Jun 2023 16:53:33 +0200
Subject: [PATCH 1163/1784] test(deps): update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.23 (#1113)

---
 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 ee1e1f63d0bf..28ebe49362e4 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.22
+          0.9.23
           test
         
       

From 4906761a4f5c850b835ecc2bb6d836dc62e2c3ed Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 19 Jun 2023 05:42:46 +0200
Subject: [PATCH 1164/1784] test(deps): update dependency
 com.google.truth:truth to v1.1.5 (#1116)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index cc926e100dea..c327a8bb7b19 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.1.4
+      1.1.5
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d4bd961422d1..2705da58e608 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -150,7 +150,7 @@
     
       com.google.truth
       truth
-      1.1.4
+      1.1.5
       test
     
   
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 0098527d94b8..9b1d24d36b12 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.1.4
+      1.1.5
       test
     
   
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 28ebe49362e4..8f91c3d8a294 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.1.4
+      1.1.5
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 797beef3912d..dc95534d5f81 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -40,7 +40,7 @@
     
       com.google.truth
       truth
-      1.1.4
+      1.1.5
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index bfe76dab456b..c4711a9e0978 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.1.4
+      1.1.5
       test
     
   

From 381d76e3e079752f9f02d488603e3b89979018ea Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 19 Jun 2023 05:43:15 +0200
Subject: [PATCH 1165/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.20.0 (#1115)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 64b3f4d5253d..c68ae7b48b59 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.19.1
+    2.20.0
   
 
   

From 7f588682212e1a8f7e27d4cacb5995c0c129c090 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 19 Jun 2023 05:44:32 +0200
Subject: [PATCH 1166/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.23 (#1114)

---
 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 8f91c3d8a294..114504b3725e 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.22
+            0.9.23
             true
             
               com.example.datastore.NativeImageDatastoreSample

From b08dc9ac796bf066e447633644c4380aa2c26753 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 21 Jun 2023 09:48:16 -0400
Subject: [PATCH 1167/1784] feat: remove BetaApi annotation from OR query API
 (#1118)

---
 .../main/java/com/google/cloud/datastore/StructuredQuery.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index a6195ad272b4..9b98f063f445 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -26,7 +26,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.core.ApiFunction;
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.cloud.StringEnumType;
 import com.google.cloud.StringEnumValue;
@@ -234,7 +233,6 @@ public static CompositeFilter and(Filter first, Filter... other) {
       return new CompositeFilter(Operator.AND, first, other);
     }
 
-    @BetaApi
     public static CompositeFilter or(Filter first, Filter... other) {
       return new CompositeFilter(Operator.OR, first, other);
     }

From 21a9e53775e5b817426a124eaf3cd35d7c5bd853 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 22 Jun 2023 10:37:23 -0400
Subject: [PATCH 1168/1784] chore: Update dependabot.yml (#1814) (#1119)

* chore: Update dependabot.yml
Source-Link: https://github.com/googleapis/synthtool/commit/9ad18b66e75ca08d6a7779f56c7ee0595d3e1203
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .github/dependabot.yml    | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 73568a1e998c..b8ef92bef814 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:af2eda87a54601ae7b7b2be5055c17b43ac98a7805b586772db314de8a7d4a1d
-# created: 2023-06-16T02:10:09.149325782Z
+  digest: sha256:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f
+# created: 2023-06-21T18:48:32.287298785Z
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fde1ced49fb9..203f9eaccf13 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,7 +6,8 @@ updates:
       interval: "daily"
     # Disable version updates for Maven dependencies
     # we use renovate-bot as well as shared-dependencies BOM to update maven dependencies.
-    ignore: "*"
+    ignore:
+      - dependency-name: "*"
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
@@ -14,4 +15,5 @@ updates:
     # Disable version updates for pip dependencies
     # If a security vulnerability comes in, we will be notified about 
     # it via template in the synthtool repository.
-    ignore: "*"
+    ignore:
+      - dependency-name: "*"

From 65dd46d501de1360701146f4a9d7231dccd1e3c2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 22 Jun 2023 18:38:13 +0200
Subject: [PATCH 1169/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.12.0 (#1121)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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/sdk-platform-java) | `3.11.0` -> `3.12.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.12.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.12.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.12.0/compatibility-slim/3.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.12.0/confidence-slim/3.11.0)](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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c68ae7b48b59..77e5f82b1af3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.11.0
+        3.12.0
         pom
         import
       

From a0e9b3080e233807dc27ef0717dcd3b8a5ce62e3 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 22 Jun 2023 16:14:32 -0400
Subject: [PATCH 1170/1784] chore: Java 8 unit test to build code in Java 17
 and run tests on Java 8 (#1800) (#1120)

* chore: Java 8 unit test to build code in Java 17 and run tests on Java 8 (#1800)

* Our Java projects are configured to produce Java 8-compatible bytecode via https://github.com/googleapis/java-shared-config/blob/main/pom.xml#L848. This unit test change ensures this config is applied correctly.

* For the repositories that mark "dependencies (8)" and "dependencies (11)" as required, they should point to only "dependencies (17)" via `.github/sync-repo-settings.yaml` and repo's Settings tab.
Source-Link: https://github.com/googleapis/synthtool/commit/cbe010084fc59dc15730c86e9b8e03ddac1de050
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7

* dependencies (17)

---------

Co-authored-by: Owl Bot 
Co-authored-by: Tomo Suzuki 
---
 .github/.OwlBot.lock.yaml       |  4 ++--
 .github/sync-repo-settings.yaml |  3 +--
 .github/workflows/ci.yaml       | 26 ++++++++++++++++++++++++--
 .kokoro/build.sh                |  3 ++-
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index b8ef92bef814..47a70ea40cf3 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f
-# created: 2023-06-21T18:48:32.287298785Z
+  digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7
+# created: 2023-06-22T15:06:52.039318836Z
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 286bab3237c5..2af343e2c0a2 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -8,8 +8,7 @@ branchProtectionRules:
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: false
     requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
+      - dependencies (17)
       - lint
       - clirr
       - units (8)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e3bb26e37719..65436cde4190 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        java: [11, 17]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
@@ -36,6 +36,28 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
+  units-java8:
+    # Building using Java 17 and run the tests with Java 8 runtime
+    name: "units (8)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: zulu
+      - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
+        # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
+        # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
+        run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
+        shell: bash
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: zulu
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: test
   windows:
     runs-on: windows-latest
     steps:
@@ -54,7 +76,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [17]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 902e9dac7841..8a894939cfc4 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,7 +47,8 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
+    echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
+    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
     RETURN_CODE=$?
     ;;
 lint)

From 9b1b657bd39543c04fab1643c1b10010426f277b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 10:04:17 +0530
Subject: [PATCH 1171/1784] chore(main): release 2.16.0 (#1117)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  | 14 ++++++++++++++
 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, 41 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 753e0efd98be..40959a88067f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.16.0](https://github.com/googleapis/java-datastore/compare/v2.15.0...v2.16.0) (2023-06-22)
+
+
+### Features
+
+* Remove BetaApi annotation from OR query API ([#1118](https://github.com/googleapis/java-datastore/issues/1118)) ([b08dc9a](https://github.com/googleapis/java-datastore/commit/b08dc9ac796bf066e447633644c4380aa2c26753))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.12.0 ([#1121](https://github.com/googleapis/java-datastore/issues/1121)) ([65dd46d](https://github.com/googleapis/java-datastore/commit/65dd46d501de1360701146f4a9d7231dccd1e3c2))
+* Update dependency com.google.errorprone:error_prone_core to v2.20.0 ([#1115](https://github.com/googleapis/java-datastore/issues/1115)) ([381d76e](https://github.com/googleapis/java-datastore/commit/381d76e3e079752f9f02d488603e3b89979018ea))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.23 ([#1114](https://github.com/googleapis/java-datastore/issues/1114)) ([7f58868](https://github.com/googleapis/java-datastore/commit/7f588682212e1a8f7e27d4cacb5995c0c129c090))
+
 ## [2.15.0](https://github.com/googleapis/java-datastore/compare/v2.14.7...v2.15.0) (2023-06-09)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index c327a8bb7b19..aea9b3942429 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.15.1-SNAPSHOT
+  2.16.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.1-SNAPSHOT
+    2.16.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d4b1da3b50ae..f8717e8a5e88 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.15.1-SNAPSHOT
+  2.16.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.15.1-SNAPSHOT
+        2.16.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.15.1-SNAPSHOT
+        2.16.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.106.1-SNAPSHOT
+        0.107.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.15.1-SNAPSHOT
+        2.16.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2705da58e608..de1ddba01888 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.15.1-SNAPSHOT
+  2.16.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.1-SNAPSHOT
+    2.16.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 45c1e229457e..28f6a7759085 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.15.1-SNAPSHOT
+  2.16.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.1-SNAPSHOT
+    2.16.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 77e5f82b1af3..65a7231363bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.15.1-SNAPSHOT
+  2.16.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.15.1-SNAPSHOT
+        2.16.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.15.1-SNAPSHOT
+        2.16.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.15.1-SNAPSHOT
+        2.16.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.106.1-SNAPSHOT
+        0.107.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.15.1-SNAPSHOT
+        2.16.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 cf8fe1dae0f0..fd4b448e8df7 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.15.1-SNAPSHOT
+  2.16.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.1-SNAPSHOT
+    2.16.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8b116cdd6785..d448c6aaacd5 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.106.1-SNAPSHOT
+  0.107.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.15.1-SNAPSHOT
+    2.16.0
   
   
     
diff --git a/versions.txt b/versions.txt
index 175c603dece0..79047fac05dc 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.15.0:2.15.1-SNAPSHOT
-google-cloud-datastore-bom:2.15.0:2.15.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.106.0:0.106.1-SNAPSHOT
-datastore-v1-proto-client:2.15.0:2.15.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.15.0:2.15.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.15.0:2.15.1-SNAPSHOT
+google-cloud-datastore:2.16.0:2.16.0
+google-cloud-datastore-bom:2.16.0:2.16.0
+proto-google-cloud-datastore-v1:0.107.0:0.107.0
+datastore-v1-proto-client:2.16.0:2.16.0
+proto-google-cloud-datastore-admin-v1:2.16.0:2.16.0
+grpc-google-cloud-datastore-admin-v1:2.16.0:2.16.0

From e585c2d80b6169858790eb2993153be97a6041b5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 09:04:12 +0000
Subject: [PATCH 1172/1784] chore(main): release 2.16.1-SNAPSHOT (#1122)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index aea9b3942429..f3b3925b867e 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.16.0
+  2.16.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.0
+    2.16.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f8717e8a5e88..ede2d9a1b531 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.16.0
+  2.16.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.0
+        2.16.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.0
+        2.16.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.0
+        0.107.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.0
+        2.16.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index de1ddba01888..d3c9f39ba295 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.0
+  2.16.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.0
+    2.16.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 28f6a7759085..16787f07f163 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.16.0
+  2.16.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.0
+    2.16.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 65a7231363bd..565dae847663 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.0
+  2.16.1-SNAPSHOT
   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.16.0
+        2.16.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.0
+        2.16.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.0
+        2.16.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.0
+        0.107.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.0
+        2.16.1-SNAPSHOT
         
           
             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 fd4b448e8df7..6f9488579218 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.16.0
+  2.16.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.0
+    2.16.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d448c6aaacd5..6ff979912985 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.107.0
+  0.107.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.0
+    2.16.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 79047fac05dc..e0f485459a3e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.0:2.16.0
-google-cloud-datastore-bom:2.16.0:2.16.0
-proto-google-cloud-datastore-v1:0.107.0:0.107.0
-datastore-v1-proto-client:2.16.0:2.16.0
-proto-google-cloud-datastore-admin-v1:2.16.0:2.16.0
-grpc-google-cloud-datastore-admin-v1:2.16.0:2.16.0
+google-cloud-datastore:2.16.0:2.16.1-SNAPSHOT
+google-cloud-datastore-bom:2.16.0:2.16.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.107.0:0.107.1-SNAPSHOT
+datastore-v1-proto-client:2.16.0:2.16.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.16.0:2.16.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.16.0:2.16.1-SNAPSHOT

From 917e7c8f156b2e0a9ec28c9ec988e84e5e38a201 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 23 Jun 2023 13:41:48 +0200
Subject: [PATCH 1173/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.16.0 (#1123)
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.16.0

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 88f3ba650946..e06956f7b2ed 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.15.0
+  2.16.0
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.15.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.16.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.15.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.0"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.15.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 9b1d24d36b12..4e91142a4091 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.15.0
+      2.16.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index dc95534d5f81..b912ba568a52 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.15.0
+      2.16.0
     
 
     

From e1458cd69cca0f74d1d55ae5316a3656f304676b Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 12:25:33 -0400
Subject: [PATCH 1174/1784] ci: javadoc job (JDK 17) in ci.yaml (#1819) (#1125)

This also changes the JDK distribution from zulu to temurin
https://github.com/actions/setup-java#eclipse-temurin
Source-Link: https://github.com/googleapis/synthtool/commit/ef9fe2ef6d92c7ff967d9d4f704035b3f5c9051d
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml      |  4 ++--
 .github/workflows/ci.yaml      | 26 +++++++++++++++++++-------
 .github/workflows/samples.yaml |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 47a70ea40cf3..258389d1aa68 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7
-# created: 2023-06-22T15:06:52.039318836Z
+  digest: sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9
+# created: 2023-06-27T18:51:58.922150125Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 65436cde4190..e27b2c57563c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,7 +30,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/build.sh
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: 8
-          distribution: zulu
+          distribution: temurin
       - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
         # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
         # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: 17
-          distribution: zulu
+          distribution: temurin
       - run: .kokoro/build.sh
         env:
           JOB_TYPE: test
@@ -66,7 +66,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: 8
     - run: java -version
     - run: .kokoro/build.bat
@@ -81,17 +81,29 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
+  javadoc:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 17
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: javadoc
   lint:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: 11
     - run: java -version
     - run: .kokoro/build.sh
@@ -103,7 +115,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index 912ed8b2b027..10d252d77538 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          distribution: zulu
+          distribution: temurin
           java-version: 8
       - name: Run checkstyle
         run: mvn -P lint --quiet --batch-mode checkstyle:check

From d28c880ecb3f5d26b8aac9691a4b1978d0feaa02 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 29 Jun 2023 16:34:10 +0200
Subject: [PATCH 1175/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.18.0 (#1127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.18.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e06956f7b2ed..5a642a9e1366 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.17.0
+      26.18.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.17.0')
+implementation platform('com.google.cloud:libraries-bom:26.18.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 114504b3725e..f67b8be6d8fb 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.17.0
+        26.18.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c4711a9e0978..b50c00084775 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.17.0
+        26.18.0
         pom
         import
       

From d4b11bbf9198b446365b25617614434865d7e285 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 29 Jun 2023 11:05:17 -0400
Subject: [PATCH 1176/1784] docs: fix javadoc errors (#1126)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: fix javadoc errors

* fix

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* more fixes

---------

Co-authored-by: Owl Bot 
---
 .../java/com/google/cloud/datastore/AggregationQuery.java | 2 +-
 .../com/google/cloud/datastore/AggregationResults.java    | 8 ++++----
 .../main/java/com/google/cloud/datastore/Datastore.java   | 2 +-
 .../main/java/com/google/cloud/datastore/GqlQuery.java    | 2 +-
 .../src/main/java/com/google/cloud/datastore/Query.java   | 2 +-
 .../java/com/google/cloud/datastore/StructuredQuery.java  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
index 8e7e7cdc9681..210889b1efec 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
@@ -45,7 +45,7 @@
  * }
  * }
    
  *
- * 
    {@link GqlQuery} example:
    
+ * 
    {@link GqlQuery} example:
  *
  * 
    {@code
  * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
index f0106886a334..d85e8f8ae82b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
@@ -24,10 +24,10 @@
 import java.util.Objects;
 
 /**
- * The result of an {@link AggregationQuery} query submission. Contains a {@link
- * List} and readTime {@link Timestamp} in it.
+ * The result of an {@link AggregationQuery} query submission. Contains a List<{@link
+ * AggregationResult}> and readTime {@link Timestamp} in it.
  *
- * 
    This can be used to iterate over an underlying {@link List} directly.
+ * 
    This can be used to iterate over an underlying List<{@link AggregationResult}> directly.
  */
 public class AggregationResults implements Iterable {
 
@@ -41,7 +41,7 @@ public AggregationResults(List aggregationResults, Timestamp
     this.readTime = readTime;
   }
 
-  /** Returns {@link Iterator} for underlying {@link List}. */
+  /** Returns {@link Iterator} for underlying List<{@link AggregationResult}>. */
   @Override
   public Iterator iterator() {
     return this.aggregationResults.iterator();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index d58c001b1d28..d78bea9a2440 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -484,7 +484,7 @@ interface TransactionCallable {
    * }
    * }
    
    *
-   * 
    {@link GqlQuery} example:
    
+   * 
    {@link GqlQuery} example:
    *
    * 
    {@code
    * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index d4f9f3534973..de86a24a5fb5 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -41,7 +41,7 @@
 /**
  * A Google Cloud Datastore GQL query.
  *
- * 
    A usage example:
    
+ * 
    A usage example:
  *
  * 
    When the type of the results is known the preferred usage would be:
  *
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
index 8870cf520c22..89b8d8807b57 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
@@ -274,7 +274,7 @@ public static ProjectionEntityQuery.Builder newProjectionEntityQueryBuilder() {
    * // Use aggregationResults
    * }
    
    *
-   * 
    {@link GqlQuery} example:
    
+   * 
    {@link GqlQuery} example:
    *
    * 
    {@code
    * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 9b98f063f445..30cd05759fb7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -46,7 +46,7 @@
  * An implementation of a Google Cloud Datastore Query that can be constructed by providing all the
  * specific query elements.
  *
- * 
    A usage example:
    
+ * 
    A usage example:
  *
  * 
    A simple query that returns all entities for a specific kind
  *

From 2181847666bce403743677b06f90b34e5ae180a3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 10 Jul 2023 16:26:57 +0200
Subject: [PATCH 1177/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.13.0 (#1130)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 565dae847663..c71523316483 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.12.0
+        3.13.0
         pom
         import
       

From 5ca3bfad6af3f48e35f47f59852d9deefd162a5e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:40:36 +0000
Subject: [PATCH 1178/1784] chore(main): release 2.16.1 (#1128)

:robot: I have created a release *beep* *boop*
---


## [2.16.1](https://togithub.com/googleapis/java-datastore/compare/v2.16.0...v2.16.1) (2023-07-10)


### Documentation

* Fix javadoc errors ([#1126](https://togithub.com/googleapis/java-datastore/issues/1126)) ([d4b11bb](https://togithub.com/googleapis/java-datastore/commit/d4b11bbf9198b446365b25617614434865d7e285))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.13.0 ([#1130](https://togithub.com/googleapis/java-datastore/issues/1130)) ([2181847](https://togithub.com/googleapis/java-datastore/commit/2181847666bce403743677b06f90b34e5ae180a3))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 12 ++++++++++++
 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, 39 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40959a88067f..a819d868b09a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.16.1](https://github.com/googleapis/java-datastore/compare/v2.16.0...v2.16.1) (2023-07-10)
+
+
+### Documentation
+
+* Fix javadoc errors ([#1126](https://github.com/googleapis/java-datastore/issues/1126)) ([d4b11bb](https://github.com/googleapis/java-datastore/commit/d4b11bbf9198b446365b25617614434865d7e285))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.13.0 ([#1130](https://github.com/googleapis/java-datastore/issues/1130)) ([2181847](https://github.com/googleapis/java-datastore/commit/2181847666bce403743677b06f90b34e5ae180a3))
+
 ## [2.16.0](https://github.com/googleapis/java-datastore/compare/v2.15.0...v2.16.0) (2023-06-22)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f3b3925b867e..af8040ba2d76 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.16.1-SNAPSHOT
+  2.16.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1-SNAPSHOT
+    2.16.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ede2d9a1b531..848f8172c40c 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.16.1-SNAPSHOT
+  2.16.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.1-SNAPSHOT
+        2.16.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.1-SNAPSHOT
+        2.16.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.1-SNAPSHOT
+        0.107.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.1-SNAPSHOT
+        2.16.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d3c9f39ba295..7fbe0be27c2a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.1-SNAPSHOT
+  2.16.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1-SNAPSHOT
+    2.16.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 16787f07f163..021d7aad542f 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.16.1-SNAPSHOT
+  2.16.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1-SNAPSHOT
+    2.16.1
   
   
     
diff --git a/pom.xml b/pom.xml
index c71523316483..1b15be62f85e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.1-SNAPSHOT
+  2.16.1
   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.16.1-SNAPSHOT
+        2.16.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.1-SNAPSHOT
+        2.16.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.1-SNAPSHOT
+        2.16.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.1-SNAPSHOT
+        0.107.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.1-SNAPSHOT
+        2.16.1
         
           
             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 6f9488579218..53c74534bd94 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.16.1-SNAPSHOT
+  2.16.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1-SNAPSHOT
+    2.16.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6ff979912985..4dc8df080e39 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.107.1-SNAPSHOT
+  0.107.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1-SNAPSHOT
+    2.16.1
   
   
     
diff --git a/versions.txt b/versions.txt
index e0f485459a3e..e747b5914cce 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.0:2.16.1-SNAPSHOT
-google-cloud-datastore-bom:2.16.0:2.16.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.107.0:0.107.1-SNAPSHOT
-datastore-v1-proto-client:2.16.0:2.16.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.16.0:2.16.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.16.0:2.16.1-SNAPSHOT
+google-cloud-datastore:2.16.1:2.16.1
+google-cloud-datastore-bom:2.16.1:2.16.1
+proto-google-cloud-datastore-v1:0.107.1:0.107.1
+datastore-v1-proto-client:2.16.1:2.16.1
+proto-google-cloud-datastore-admin-v1:2.16.1:2.16.1
+grpc-google-cloud-datastore-admin-v1:2.16.1:2.16.1

From ad3cc86322c7e9ff4c8ced67e3db3bdf0bbe6b1c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:34:12 +0000
Subject: [PATCH 1179/1784] chore(main): release 2.16.2-SNAPSHOT (#1131)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index af8040ba2d76..cbed1e771039 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.16.1
+  2.16.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1
+    2.16.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 848f8172c40c..eb360456bc91 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.16.1
+  2.16.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.1
+        2.16.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.1
+        2.16.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.1
+        0.107.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.1
+        2.16.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7fbe0be27c2a..f2abc3281ae5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.1
+  2.16.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1
+    2.16.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 021d7aad542f..903c4e794f78 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.16.1
+  2.16.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1
+    2.16.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 1b15be62f85e..9a6aa2da67f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.1
+  2.16.2-SNAPSHOT
   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.16.1
+        2.16.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.1
+        2.16.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.1
+        2.16.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.1
+        0.107.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.1
+        2.16.2-SNAPSHOT
         
           
             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 53c74534bd94..07fc4d4405a0 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.16.1
+  2.16.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1
+    2.16.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4dc8df080e39..7353943e2996 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.107.1
+  0.107.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.1
+    2.16.2-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index e747b5914cce..c0b56fdb6d9b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.1:2.16.1
-google-cloud-datastore-bom:2.16.1:2.16.1
-proto-google-cloud-datastore-v1:0.107.1:0.107.1
-datastore-v1-proto-client:2.16.1:2.16.1
-proto-google-cloud-datastore-admin-v1:2.16.1:2.16.1
-grpc-google-cloud-datastore-admin-v1:2.16.1:2.16.1
+google-cloud-datastore:2.16.1:2.16.2-SNAPSHOT
+google-cloud-datastore-bom:2.16.1:2.16.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.107.1:0.107.2-SNAPSHOT
+datastore-v1-proto-client:2.16.1:2.16.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.16.1:2.16.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.16.1:2.16.2-SNAPSHOT

From a8918a43c7bf881af3cee3907632cd3cb0cabc8a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 10 Jul 2023 19:53:25 +0200
Subject: [PATCH 1180/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.16.1 (#1132)
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.16.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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5a642a9e1366..e6a2567b0a87 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.16.0
+  2.16.1
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.16.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.16.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.1"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4e91142a4091..fb1663dceedf 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.16.0
+      2.16.1
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b912ba568a52..0eb4b4f791ad 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.16.0
+      2.16.1
     
 
     

From 83a0018192cfd20d6c3648e1ada360a7a46f29aa Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 19 Jul 2023 16:19:13 +0200
Subject: [PATCH 1181/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.19.0 (#1134)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.19.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e6a2567b0a87..1d09f02257fb 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.18.0
+      26.19.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.18.0')
+implementation platform('com.google.cloud:libraries-bom:26.19.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index f67b8be6d8fb..2374cb760702 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.18.0
+        26.19.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b50c00084775..752ff9d3c1d1 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.18.0
+        26.19.0
         pom
         import
       

From de40743eab4fbe228d1c3adfbb66bb245d61f42f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 20 Jul 2023 16:35:31 +0200
Subject: [PATCH 1182/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.5.7 (#1135)

---
 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 eb360456bc91..49f93329ad76 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.6
+    1.5.7
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 9a6aa2da67f1..5e101fbd77c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.5.6
+    1.5.7
   
 
   

From f4d66aff3b86c656998443d12ff1eec301194cfd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 20 Jul 2023 21:21:00 +0200
Subject: [PATCH 1183/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.13.1 (#1136)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5e101fbd77c3..d57b37eed397 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.13.0
+        3.13.1
         pom
         import
       

From 8bc192bffb2ae149ad00ef0a3e92a9714980731e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 09:27:49 +0530
Subject: [PATCH 1184/1784] chore: Update the Java code generator
 (gapic-generator-java) to 2.23.1 (#1138)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update the Java code generator (gapic-generator-java) to 2.23.1

PiperOrigin-RevId: 549674836

Source-Link: https://github.com/googleapis/googleapis/commit/3b7a12146fed6cb648046439a2dad0b3ad56d202

Source-Link: https://github.com/googleapis/googleapis-gen/commit/2d643a4eff8c8ef4c9d5a2e59d2a0ca7c991eab6
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmQ2NDNhNGVmZjhjOGVmNGM5ZDVhMmU1OWQyYTBjYTdjOTkxZWFiNiJ9

* 🦉 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 
---
 .../reflect-config.json                       | 1658 +++++++++++++++++
 .../admin/v1/DatastoreAdminGrpc.java          |    2 +-
 .../datastore/admin/v1/CommonMetadata.java    |    2 +-
 .../admin/v1/CommonMetadataOrBuilder.java     |    2 +-
 .../admin/v1/CreateIndexRequest.java          |    2 +-
 .../admin/v1/CreateIndexRequestOrBuilder.java |    2 +-
 .../admin/v1/DatastoreAdminProto.java         |    2 +-
 .../DatastoreFirestoreMigrationMetadata.java  |    2 +-
 ...reFirestoreMigrationMetadataOrBuilder.java |    2 +-
 .../admin/v1/DeleteIndexRequest.java          |    2 +-
 .../admin/v1/DeleteIndexRequestOrBuilder.java |    2 +-
 .../datastore/admin/v1/EntityFilter.java      |    2 +-
 .../admin/v1/EntityFilterOrBuilder.java       |    2 +-
 .../admin/v1/ExportEntitiesMetadata.java      |    2 +-
 .../v1/ExportEntitiesMetadataOrBuilder.java   |    2 +-
 .../admin/v1/ExportEntitiesRequest.java       |    2 +-
 .../v1/ExportEntitiesRequestOrBuilder.java    |    2 +-
 .../admin/v1/ExportEntitiesResponse.java      |    2 +-
 .../v1/ExportEntitiesResponseOrBuilder.java   |    2 +-
 .../datastore/admin/v1/GetIndexRequest.java   |    2 +-
 .../admin/v1/GetIndexRequestOrBuilder.java    |    2 +-
 .../admin/v1/ImportEntitiesMetadata.java      |    2 +-
 .../v1/ImportEntitiesMetadataOrBuilder.java   |    2 +-
 .../admin/v1/ImportEntitiesRequest.java       |    2 +-
 .../v1/ImportEntitiesRequestOrBuilder.java    |    2 +-
 .../com/google/datastore/admin/v1/Index.java  |    2 +-
 .../admin/v1/IndexOperationMetadata.java      |    2 +-
 .../v1/IndexOperationMetadataOrBuilder.java   |    2 +-
 .../datastore/admin/v1/IndexOrBuilder.java    |    2 +-
 .../google/datastore/admin/v1/IndexProto.java |    2 +-
 .../admin/v1/ListIndexesRequest.java          |    2 +-
 .../admin/v1/ListIndexesRequestOrBuilder.java |    2 +-
 .../admin/v1/ListIndexesResponse.java         |    2 +-
 .../v1/ListIndexesResponseOrBuilder.java      |    2 +-
 .../admin/v1/MigrationProgressEvent.java      |    2 +-
 .../v1/MigrationProgressEventOrBuilder.java   |    2 +-
 .../datastore/admin/v1/MigrationProto.java    |    2 +-
 .../datastore/admin/v1/MigrationState.java    |    2 +-
 .../admin/v1/MigrationStateEvent.java         |    2 +-
 .../v1/MigrationStateEventOrBuilder.java      |    2 +-
 .../datastore/admin/v1/MigrationStep.java     |    2 +-
 .../datastore/admin/v1/OperationType.java     |    2 +-
 .../google/datastore/admin/v1/Progress.java   |    2 +-
 .../datastore/admin/v1/ProgressOrBuilder.java |    2 +-
 .../google/datastore/v1/AggregationQuery.java |    2 +-
 .../v1/AggregationQueryOrBuilder.java         |    2 +-
 .../datastore/v1/AggregationResult.java       |    2 +-
 .../datastore/v1/AggregationResultBatch.java  |    2 +-
 .../v1/AggregationResultBatchOrBuilder.java   |    2 +-
 .../v1/AggregationResultOrBuilder.java        |    2 +-
 .../datastore/v1/AggregationResultProto.java  |    2 +-
 .../datastore/v1/AllocateIdsRequest.java      |    2 +-
 .../v1/AllocateIdsRequestOrBuilder.java       |    2 +-
 .../datastore/v1/AllocateIdsResponse.java     |    2 +-
 .../v1/AllocateIdsResponseOrBuilder.java      |    2 +-
 .../com/google/datastore/v1/ArrayValue.java   |    2 +-
 .../datastore/v1/ArrayValueOrBuilder.java     |    2 +-
 .../datastore/v1/BeginTransactionRequest.java |    2 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |    2 +-
 .../v1/BeginTransactionResponse.java          |    2 +-
 .../v1/BeginTransactionResponseOrBuilder.java |    2 +-
 .../google/datastore/v1/CommitRequest.java    |    2 +-
 .../datastore/v1/CommitRequestOrBuilder.java  |    2 +-
 .../google/datastore/v1/CommitResponse.java   |    2 +-
 .../datastore/v1/CommitResponseOrBuilder.java |    2 +-
 .../google/datastore/v1/CompositeFilter.java  |    2 +-
 .../v1/CompositeFilterOrBuilder.java          |    2 +-
 .../google/datastore/v1/DatastoreProto.java   |    2 +-
 .../java/com/google/datastore/v1/Entity.java  |    2 +-
 .../google/datastore/v1/EntityOrBuilder.java  |    2 +-
 .../com/google/datastore/v1/EntityProto.java  |    2 +-
 .../com/google/datastore/v1/EntityResult.java |    2 +-
 .../datastore/v1/EntityResultOrBuilder.java   |    2 +-
 .../java/com/google/datastore/v1/Filter.java  |    2 +-
 .../google/datastore/v1/FilterOrBuilder.java  |    2 +-
 .../com/google/datastore/v1/GqlQuery.java     |    2 +-
 .../datastore/v1/GqlQueryOrBuilder.java       |    2 +-
 .../datastore/v1/GqlQueryParameter.java       |    2 +-
 .../v1/GqlQueryParameterOrBuilder.java        |    2 +-
 .../java/com/google/datastore/v1/Key.java     |    2 +-
 .../com/google/datastore/v1/KeyOrBuilder.java |    2 +-
 .../google/datastore/v1/KindExpression.java   |    2 +-
 .../datastore/v1/KindExpressionOrBuilder.java |    2 +-
 .../google/datastore/v1/LookupRequest.java    |    2 +-
 .../datastore/v1/LookupRequestOrBuilder.java  |    2 +-
 .../google/datastore/v1/LookupResponse.java   |    2 +-
 .../datastore/v1/LookupResponseOrBuilder.java |    2 +-
 .../com/google/datastore/v1/Mutation.java     |    2 +-
 .../datastore/v1/MutationOrBuilder.java       |    2 +-
 .../google/datastore/v1/MutationResult.java   |    2 +-
 .../datastore/v1/MutationResultOrBuilder.java |    2 +-
 .../com/google/datastore/v1/PartitionId.java  |    2 +-
 .../datastore/v1/PartitionIdOrBuilder.java    |    2 +-
 .../com/google/datastore/v1/Projection.java   |    2 +-
 .../datastore/v1/ProjectionOrBuilder.java     |    2 +-
 .../google/datastore/v1/PropertyFilter.java   |    2 +-
 .../datastore/v1/PropertyFilterOrBuilder.java |    2 +-
 .../google/datastore/v1/PropertyOrder.java    |    2 +-
 .../datastore/v1/PropertyOrderOrBuilder.java  |    2 +-
 .../datastore/v1/PropertyReference.java       |    2 +-
 .../v1/PropertyReferenceOrBuilder.java        |    2 +-
 .../java/com/google/datastore/v1/Query.java   |    2 +-
 .../google/datastore/v1/QueryOrBuilder.java   |    2 +-
 .../com/google/datastore/v1/QueryProto.java   |    2 +-
 .../google/datastore/v1/QueryResultBatch.java |    2 +-
 .../v1/QueryResultBatchOrBuilder.java         |    2 +-
 .../com/google/datastore/v1/ReadOptions.java  |    2 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |    2 +-
 .../datastore/v1/ReserveIdsRequest.java       |    2 +-
 .../v1/ReserveIdsRequestOrBuilder.java        |    2 +-
 .../datastore/v1/ReserveIdsResponse.java      |    2 +-
 .../v1/ReserveIdsResponseOrBuilder.java       |    2 +-
 .../google/datastore/v1/RollbackRequest.java  |    2 +-
 .../v1/RollbackRequestOrBuilder.java          |    2 +-
 .../google/datastore/v1/RollbackResponse.java |    2 +-
 .../v1/RollbackResponseOrBuilder.java         |    2 +-
 .../v1/RunAggregationQueryRequest.java        |    2 +-
 .../RunAggregationQueryRequestOrBuilder.java  |    2 +-
 .../v1/RunAggregationQueryResponse.java       |    2 +-
 .../RunAggregationQueryResponseOrBuilder.java |    2 +-
 .../google/datastore/v1/RunQueryRequest.java  |    2 +-
 .../v1/RunQueryRequestOrBuilder.java          |    2 +-
 .../google/datastore/v1/RunQueryResponse.java |    2 +-
 .../v1/RunQueryResponseOrBuilder.java         |    2 +-
 .../datastore/v1/TransactionOptions.java      |    2 +-
 .../v1/TransactionOptionsOrBuilder.java       |    2 +-
 .../java/com/google/datastore/v1/Value.java   |    2 +-
 .../google/datastore/v1/ValueOrBuilder.java   |    2 +-
 128 files changed, 1785 insertions(+), 127 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json

diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
new file mode 100644
index 000000000000..5103d81c4a64
--- /dev/null
+++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
@@ -0,0 +1,1658 @@
+[
+  {
+    "name": "com.google.api.ClientLibraryDestination",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ClientLibraryOrganization",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ClientLibrarySettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ClientLibrarySettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CommonLanguageSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CommonLanguageSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CppSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CppSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CustomHttpPattern",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CustomHttpPattern$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.DotnetSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.DotnetSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.FieldBehavior",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.GoSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.GoSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Http",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Http$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.HttpRule",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.HttpRule$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.JavaSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.JavaSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.LaunchStage",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings$LongRunning",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings$LongRunning$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.NodeSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.NodeSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PhpSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PhpSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Publishing",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Publishing$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor$History",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor$Style",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceReference",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceReference$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RubySettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RubySettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.CommonMetadata",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.CommonMetadata$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.CommonMetadata$State",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.CreateIndexRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.CreateIndexRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.DeleteIndexRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.DeleteIndexRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.EntityFilter",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.EntityFilter$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ExportEntitiesMetadata",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ExportEntitiesMetadata$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ExportEntitiesRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ExportEntitiesRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ExportEntitiesResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ExportEntitiesResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.GetIndexRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.GetIndexRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ImportEntitiesMetadata",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ImportEntitiesMetadata$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ImportEntitiesRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ImportEntitiesRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Index",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Index$AncestorMode",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Index$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Index$Direction",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Index$IndexedProperty",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Index$IndexedProperty$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Index$State",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.IndexOperationMetadata",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.IndexOperationMetadata$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ListIndexesRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ListIndexesRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ListIndexesResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.ListIndexesResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationProgressEvent",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationProgressEvent$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationProgressEvent$ConcurrencyMode",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationProgressEvent$PrepareStepDetails",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationProgressEvent$PrepareStepDetails$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationProgressEvent$RedirectWritesStepDetails",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationProgressEvent$RedirectWritesStepDetails$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationState",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationStateEvent",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationStateEvent$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.MigrationStep",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.OperationType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Progress",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.admin.v1.Progress$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.CancelOperationRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.CancelOperationRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.DeleteOperationRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.DeleteOperationRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.GetOperationRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.GetOperationRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.ListOperationsRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.ListOperationsRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.ListOperationsResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.ListOperationsResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.Operation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.Operation$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.OperationInfo",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.OperationInfo$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.WaitOperationRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.longrunning.WaitOperationRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Any",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Any$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$VerificationState",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$CType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionRetention",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionTargetType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation$Semantic",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MessageOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MessageOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodOptions$IdempotencyLevel",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Duration",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Duration$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Empty",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Empty$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Timestamp",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Timestamp$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.rpc.Status",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.rpc.Status$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  }
+]
\ No newline at end of file
diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index 59052f146681..6fe5618d7b8e 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index da6d17ac4788..3572223d1c1d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 85322a2ca68c..057b75e24ef0 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 31d0c275d676..80b758ca3ab9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index 5aa22c75bb28..9925cac17960 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 0d40a568c114..e82c10f34457 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index 589590c672e2..0687bd2d95a1 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index 5030636e500e..f4e5235e8e11 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a9362246b0d2..13d385d0c51a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index b33b297ede92..26a4a020b152 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 cff74d17f1e2..a76937b369c4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 3e80e0185ecf..35306e67ec0f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4836be0baad6..86d3fa228155 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index 408049d0c9f7..85665dbcec1b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5de54a564c3d..7e81988e7862 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 93d655c76870..d652ea7a7aed 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 be5e66c5e261..48620237540e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index 74b00e9cda7f..ddcbad38151e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 ca2b4846a8a0..c7f1e40e8345 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index 14e873eb6e01..38801c30f09f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 19302e6a5076..1b6d92aba12f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 6cfc8190a592..8dc5147ec7d7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 43319379bd45..9ca45ea1c206 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 093f4c6e2e69..6a5004067fff 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 45d25cd444e7..e03a585f4584 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 48e6b0fc52a7..cf2a7e510e2f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index 9d655f96734e..41074813626e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 37fca791f8b6..27e3847650e8 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 cc0b3577b02a..1f9c2b5e469c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8e4891704097..33825d2ddfae 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index 4fe56656a67f..68e7fa58ed0d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9ed672c16c5b..4a821cfbdb39 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index e3fb1989eabf..10d4bac43586 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8a3e730c4510..525963f0ace7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 07b7d82a453b..20442f9a6b84 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 6d8f2dca9c2d..8d96d3df98c9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index 40a2f72db559..1a30a4fb2bb9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b2e653e4e0eb..f8b58487c486 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 99444401bc16..970c9c8aabbb 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index 86f6eaed865d..f30bd8f8e688 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index d1ab497e06da..ddd45f78dfaf 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4f5126203ba9..a24f906ff13f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index 68343d04fcab..eb80ba52204f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 2f9f11739d78..391b9a2b929c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0530172031fa..cb14e67d7d5f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b181d4f1226b..e1737515e7f5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 194710d50e66..4792b0a9c88d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 818b32c1a173..67167caf2e0c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 fc6a3cddd7e4..436fba072250 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index 5f055196fbcc..3a2806e8644e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 f78c17c539a5..bcd0a649d279 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5daea7f12437..0a169d2612e1 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 7fecd70bf264..9301de743f35 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index af7bb209e580..612cb9407c06 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 742bbcd4f31b..66c8d0078d57 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index c9f60605fe94..4aa9cafc45be 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 79260cf33c03..a92900cd5092 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e65a6c5c676a..33c17bc1b765 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 bf6116f00a69..95976d70350a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index 950fac3fbe68..e04fdaaa78ea 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 21a4502ab8e4..ee3ab5f4a540 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9ccd59cee41a..842e268cb6e9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8b626e297294..903fd6a172b7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 9b1681cfa5c2..5a08d67f049f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6deeaa460199..9996cbdb7235 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0248e6d6aa49..6403eb13e30c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 105929eb8c88..7c87417353cf 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 5bfbc9f65d6e..f6ccf613615b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 62fce1317622..2ae1231ee8a6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 20271ddd8f5a..81653da9ffb8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d3faf6a4fcfe..aaad850f559e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 29ae719a34d6..dd67ea463ff1 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 757ef1b68bc6..e23164c06827 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 69eae7c590ae..84b83db6a97a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 28dec0070fe3..e4c6e591d535 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 2bdd43c55cca..cb819d7d626d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 eba9c908364f..cb882079e6ae 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 910eab7a2a3d..ed9ee2437c3f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5ab6658e39e6..44ecdcbfd417 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 beb7eefbd44e..b680b6b2784e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a8add42c4200..21a221f59315 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 2f4fcbb917c1..aa7b1153ae41 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8078d725e0b5..94f2f03c2d5a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6d55f6ccf94f..e7e3f8c4b078 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 dc8f4ffe65dd..d35bfdce136b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 37ad635e278c..79543e0b0adc 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 3076b9133ec7..72b9953da04c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 7ef1b2e16fd2..7ab269ed20de 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1ea9eeac103c..80498950a236 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 948e91c0c8b9..3be1d2d8aa7c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c160185ac1f3..d55e35215c09 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index e86fdaf8e1d4..64540831ade4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 81c1a5e67a86..27782acc27ea 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 5f3d6c3b2011..879921832d63 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 610e6d182241..bee06ffda364 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index f9d3ba4bfa3f..e624ab5f8dc5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 abb0e9550e88..47ba4a208541 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index 93cb3f926740..810497df9765 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0e15aaef52ed..a5d26ee0ea81 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 105bbe4d3833..d905a9244913 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b9faa09a0dd3..08a86379bf92 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d269dcf6dee2..91bbc88114bb 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 806bd6837f41..bce5821dff41 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index dc41aa10d0e6..bc0a11f8b969 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index c5998864a8b9..1c2c37086a29 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index f32dacd7909e..04a6041c66a0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 12701c6eb187..d0658b8e8ce5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e737bbf64fdd..63f553e056d7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a659711fb7d5..830044d1bb3e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c1079132c9f0..2dca0a7b0b7e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 0f3bab09129b..803f95afdd55 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 57e61ba2ed56..dad648429318 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c741d9f09342..874cda7b7d2c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c7d22d65a3cb..840b1bde3aab 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index 2d8b40090bef..f9dd7e00d391 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 552351a41a48..434acb2c32b8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 28d7ec6c6b8e..cd3bd4435ca9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 36673a39ec36..cb94cb231866 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 de184cdbe7ed..bb9a1b934778 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e54e3199f1c8..123ca51778e2 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a2daba8d377f..34f67c82216e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 90a858f1c1ac..ff387a929d1c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 401c3f93d3b1..5ec779273f52 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 031a46914348..3497680435a1 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1ffba1fbfc05..5ebbe3a91055 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5a74da363c3c..4b7e04978d87 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 29622ac515e3..d9102d3d3a03 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From a170611e824d6ca6ea14c0ee57c35e3a4ab1eab0 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 25 Jul 2023 06:02:07 +0200
Subject: [PATCH 1185/1784] deps: update dependency
 org.junit.vintage:junit-vintage-engine to v5.10.0 (#1139)

---
 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 2374cb760702..96ba88b8185e 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.9.3
+          5.10.0
           test
         
         

From e2cd7a7bfca25f6eddc131fcb1d8f8819a713fe5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 10:51:37 +0530
Subject: [PATCH 1186/1784] chore(main): release 2.16.2 (#1137)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  8 ++++++++
 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, 35 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a819d868b09a..04cb278e3caa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.16.2](https://github.com/googleapis/java-datastore/compare/v2.16.1...v2.16.2) (2023-07-25)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.13.1 ([#1136](https://github.com/googleapis/java-datastore/issues/1136)) ([f4d66af](https://github.com/googleapis/java-datastore/commit/f4d66aff3b86c656998443d12ff1eec301194cfd))
+* Update dependency org.junit.vintage:junit-vintage-engine to v5.10.0 ([#1139](https://github.com/googleapis/java-datastore/issues/1139)) ([a170611](https://github.com/googleapis/java-datastore/commit/a170611e824d6ca6ea14c0ee57c35e3a4ab1eab0))
+
 ## [2.16.1](https://github.com/googleapis/java-datastore/compare/v2.16.0...v2.16.1) (2023-07-10)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index cbed1e771039..1381f18a9bce 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.16.2-SNAPSHOT
+  2.16.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2-SNAPSHOT
+    2.16.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 49f93329ad76..aab8df9dedab 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.16.2-SNAPSHOT
+  2.16.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.2-SNAPSHOT
+        2.16.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.2-SNAPSHOT
+        2.16.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.2-SNAPSHOT
+        0.107.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.2-SNAPSHOT
+        2.16.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f2abc3281ae5..f14117bfdef8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.2-SNAPSHOT
+  2.16.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2-SNAPSHOT
+    2.16.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 903c4e794f78..bc89596a59b9 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.16.2-SNAPSHOT
+  2.16.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2-SNAPSHOT
+    2.16.2
   
   
     
diff --git a/pom.xml b/pom.xml
index d57b37eed397..a513c286a81f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.2-SNAPSHOT
+  2.16.2
   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.16.2-SNAPSHOT
+        2.16.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.2-SNAPSHOT
+        2.16.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.2-SNAPSHOT
+        2.16.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.2-SNAPSHOT
+        0.107.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.2-SNAPSHOT
+        2.16.2
         
           
             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 07fc4d4405a0..52bc5a585239 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.16.2-SNAPSHOT
+  2.16.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2-SNAPSHOT
+    2.16.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7353943e2996..b6de4ce64e8b 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.107.2-SNAPSHOT
+  0.107.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2-SNAPSHOT
+    2.16.2
   
   
     
diff --git a/versions.txt b/versions.txt
index c0b56fdb6d9b..8d228b4bb90a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.1:2.16.2-SNAPSHOT
-google-cloud-datastore-bom:2.16.1:2.16.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.107.1:0.107.2-SNAPSHOT
-datastore-v1-proto-client:2.16.1:2.16.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.16.1:2.16.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.16.1:2.16.2-SNAPSHOT
+google-cloud-datastore:2.16.2:2.16.2
+google-cloud-datastore-bom:2.16.2:2.16.2
+proto-google-cloud-datastore-v1:0.107.2:0.107.2
+datastore-v1-proto-client:2.16.2:2.16.2
+proto-google-cloud-datastore-admin-v1:2.16.2:2.16.2
+grpc-google-cloud-datastore-admin-v1:2.16.2:2.16.2

From 319fa4dae5354ff52d21fb0c2358a9891db9651a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 08:46:12 +0000
Subject: [PATCH 1187/1784] chore(main): release 2.16.3-SNAPSHOT (#1141)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 1381f18a9bce..4b523a0aa21f 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.16.2
+  2.16.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2
+    2.16.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index aab8df9dedab..3d340ccee8c7 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.16.2
+  2.16.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.2
+        2.16.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.2
+        2.16.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.2
+        0.107.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.2
+        2.16.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f14117bfdef8..242ed91d467c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.2
+  2.16.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2
+    2.16.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index bc89596a59b9..ac60f132fd89 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.16.2
+  2.16.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2
+    2.16.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index a513c286a81f..e7edc3899309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.2
+  2.16.3-SNAPSHOT
   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.16.2
+        2.16.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.2
+        2.16.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.2
+        2.16.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.2
+        0.107.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.2
+        2.16.3-SNAPSHOT
         
           
             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 52bc5a585239..bc1aebeddbdd 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.16.2
+  2.16.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2
+    2.16.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b6de4ce64e8b..b1d9c78f7c8a 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.107.2
+  0.107.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.2
+    2.16.3-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 8d228b4bb90a..28992e67421f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.2:2.16.2
-google-cloud-datastore-bom:2.16.2:2.16.2
-proto-google-cloud-datastore-v1:0.107.2:0.107.2
-datastore-v1-proto-client:2.16.2:2.16.2
-proto-google-cloud-datastore-admin-v1:2.16.2:2.16.2
-grpc-google-cloud-datastore-admin-v1:2.16.2:2.16.2
+google-cloud-datastore:2.16.2:2.16.3-SNAPSHOT
+google-cloud-datastore-bom:2.16.2:2.16.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.107.2:0.107.3-SNAPSHOT
+datastore-v1-proto-client:2.16.2:2.16.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.16.2:2.16.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.16.2:2.16.3-SNAPSHOT

From f8f7f853dfb913e5edac2b6441be7be47127d225 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 10:57:50 -0400
Subject: [PATCH 1188/1784] chore: update requirements.txt to address
 dependabot security alerts (#1829) (#1140)

* chore: update dependencies in requirements.txt to address dependabot security alerts

* update dependencies within gcp/templates

---------


Source-Link: https://github.com/googleapis/synthtool/commit/af76aa51249c5f6d8efb66e8ac390ec651f9f2f6
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:46d2d262cd285c638656c8bde468011b723dc0c7ffd6a5ecc2650fe639c82e8f

Co-authored-by: Owl Bot 
Co-authored-by: Anthonios Partheniou 
---
 .github/.OwlBot.lock.yaml |   4 +-
 .kokoro/requirements.txt  | 573 ++++++++++++++++++++++----------------
 2 files changed, 332 insertions(+), 245 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 258389d1aa68..d5500ef44246 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9
-# created: 2023-06-27T18:51:58.922150125Z
+  digest: sha256:46d2d262cd285c638656c8bde468011b723dc0c7ffd6a5ecc2650fe639c82e8f
+# created: 2023-07-24T14:21:17.707234503Z
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index c80f0a87cc53..32989051e7f9 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -1,20 +1,20 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --allow-unsafe --generate-hashes requirements.in
+#     pip-compile requirements.in --generate-hashes --upgrade
 #
-attrs==22.1.0 \
-    --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
-    --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c
+attrs==23.1.0 \
+    --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \
+    --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
     # via gcp-releasetool
-cachetools==4.2.4 \
-    --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \
-    --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1
+cachetools==5.3.1 \
+    --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \
+    --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b
     # via google-auth
-certifi==2022.12.7 \
-    --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
-    --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
+certifi==2023.5.7 \
+    --hash=sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7 \
+    --hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716
     # via requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
@@ -82,9 +82,82 @@ cffi==1.15.1 \
     --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \
     --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0
     # via cryptography
-charset-normalizer==2.0.12 \
-    --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \
-    --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df
+charset-normalizer==3.2.0 \
+    --hash=sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96 \
+    --hash=sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c \
+    --hash=sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710 \
+    --hash=sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706 \
+    --hash=sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020 \
+    --hash=sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252 \
+    --hash=sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad \
+    --hash=sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329 \
+    --hash=sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a \
+    --hash=sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f \
+    --hash=sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6 \
+    --hash=sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4 \
+    --hash=sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a \
+    --hash=sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46 \
+    --hash=sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2 \
+    --hash=sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23 \
+    --hash=sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace \
+    --hash=sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd \
+    --hash=sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982 \
+    --hash=sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10 \
+    --hash=sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2 \
+    --hash=sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea \
+    --hash=sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09 \
+    --hash=sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5 \
+    --hash=sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149 \
+    --hash=sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489 \
+    --hash=sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9 \
+    --hash=sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80 \
+    --hash=sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592 \
+    --hash=sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3 \
+    --hash=sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6 \
+    --hash=sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed \
+    --hash=sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c \
+    --hash=sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200 \
+    --hash=sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a \
+    --hash=sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e \
+    --hash=sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d \
+    --hash=sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6 \
+    --hash=sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623 \
+    --hash=sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669 \
+    --hash=sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3 \
+    --hash=sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa \
+    --hash=sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9 \
+    --hash=sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2 \
+    --hash=sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f \
+    --hash=sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1 \
+    --hash=sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4 \
+    --hash=sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a \
+    --hash=sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8 \
+    --hash=sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3 \
+    --hash=sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029 \
+    --hash=sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f \
+    --hash=sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959 \
+    --hash=sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22 \
+    --hash=sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7 \
+    --hash=sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952 \
+    --hash=sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346 \
+    --hash=sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e \
+    --hash=sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d \
+    --hash=sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299 \
+    --hash=sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd \
+    --hash=sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a \
+    --hash=sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3 \
+    --hash=sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037 \
+    --hash=sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94 \
+    --hash=sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c \
+    --hash=sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858 \
+    --hash=sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a \
+    --hash=sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449 \
+    --hash=sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c \
+    --hash=sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918 \
+    --hash=sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1 \
+    --hash=sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c \
+    --hash=sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac \
+    --hash=sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa
     # via requests
 click==8.0.4 \
     --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \
@@ -97,121 +170,152 @@ colorlog==6.7.0 \
     --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
     --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
     # via gcp-docuploader
-cryptography==39.0.1 \
-    --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \
-    --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \
-    --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \
-    --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \
-    --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \
-    --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \
-    --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \
-    --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \
-    --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \
-    --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \
-    --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \
-    --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \
-    --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \
-    --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \
-    --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \
-    --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \
-    --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \
-    --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \
-    --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \
-    --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \
-    --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8
+cryptography==41.0.2 \
+    --hash=sha256:01f1d9e537f9a15b037d5d9ee442b8c22e3ae11ce65ea1f3316a41c78756b711 \
+    --hash=sha256:079347de771f9282fbfe0e0236c716686950c19dee1b76240ab09ce1624d76d7 \
+    --hash=sha256:182be4171f9332b6741ee818ec27daff9fb00349f706629f5cbf417bd50e66fd \
+    --hash=sha256:192255f539d7a89f2102d07d7375b1e0a81f7478925b3bc2e0549ebf739dae0e \
+    --hash=sha256:2a034bf7d9ca894720f2ec1d8b7b5832d7e363571828037f9e0c4f18c1b58a58 \
+    --hash=sha256:342f3767e25876751e14f8459ad85e77e660537ca0a066e10e75df9c9e9099f0 \
+    --hash=sha256:439c3cc4c0d42fa999b83ded80a9a1fb54d53c58d6e59234cfe97f241e6c781d \
+    --hash=sha256:49c3222bb8f8e800aead2e376cbef687bc9e3cb9b58b29a261210456a7783d83 \
+    --hash=sha256:674b669d5daa64206c38e507808aae49904c988fa0a71c935e7006a3e1e83831 \
+    --hash=sha256:7a9a3bced53b7f09da251685224d6a260c3cb291768f54954e28f03ef14e3766 \
+    --hash=sha256:7af244b012711a26196450d34f483357e42aeddb04128885d95a69bd8b14b69b \
+    --hash=sha256:7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c \
+    --hash=sha256:84609ade00a6ec59a89729e87a503c6e36af98ddcd566d5f3be52e29ba993182 \
+    --hash=sha256:9a6673c1828db6270b76b22cc696f40cde9043eb90373da5c2f8f2158957f42f \
+    --hash=sha256:9b6d717393dbae53d4e52684ef4f022444fc1cce3c48c38cb74fca29e1f08eaa \
+    --hash=sha256:9c3fe6534d59d071ee82081ca3d71eed3210f76ebd0361798c74abc2bcf347d4 \
+    --hash=sha256:a719399b99377b218dac6cf547b6ec54e6ef20207b6165126a280b0ce97e0d2a \
+    --hash=sha256:b332cba64d99a70c1e0836902720887fb4529ea49ea7f5462cf6640e095e11d2 \
+    --hash=sha256:d124682c7a23c9764e54ca9ab5b308b14b18eba02722b8659fb238546de83a76 \
+    --hash=sha256:d73f419a56d74fef257955f51b18d046f3506270a5fd2ac5febbfa259d6c0fa5 \
+    --hash=sha256:f0dc40e6f7aa37af01aba07277d3d64d5a03dc66d682097541ec4da03cc140ee \
+    --hash=sha256:f14ad275364c8b4e525d018f6716537ae7b6d369c094805cae45300847e0894f \
+    --hash=sha256:f772610fe364372de33d76edcd313636a25684edb94cee53fd790195f5989d14
     # via
     #   gcp-releasetool
     #   secretstorage
-gcp-docuploader==0.6.4 \
-    --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \
-    --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf
+gcp-docuploader==0.6.5 \
+    --hash=sha256:30221d4ac3e5a2b9c69aa52fdbef68cc3f27d0e6d0d90e220fc024584b8d2318 \
+    --hash=sha256:b7458ef93f605b9d46a4bf3a8dc1755dad1f31d030c8679edf304e343b347eea
     # via -r requirements.in
-gcp-releasetool==1.10.5 \
-    --hash=sha256:174b7b102d704b254f2a26a3eda2c684fd3543320ec239baf771542a2e58e109 \
-    --hash=sha256:e29d29927fe2ca493105a82958c6873bb2b90d503acac56be2c229e74de0eec9
+gcp-releasetool==1.16.0 \
+    --hash=sha256:27bf19d2e87aaa884096ff941aa3c592c482be3d6a2bfe6f06afafa6af2353e3 \
+    --hash=sha256:a316b197a543fd036209d0caba7a8eb4d236d8e65381c80cbc6d7efaa7606d63
     # via -r requirements.in
-google-api-core==2.8.2 \
-    --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
-    --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50
+google-api-core==2.11.1 \
+    --hash=sha256:25d29e05a0058ed5f19c61c0a78b1b53adea4d9364b464d014fbda941f6d1c9a \
+    --hash=sha256:d92a5a92dc36dd4f4b9ee4e55528a90e432b059f93aee6ad857f9de8cc7ae94a
     # via
     #   google-cloud-core
     #   google-cloud-storage
-google-auth==2.14.1 \
-    --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \
-    --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016
+google-auth==2.22.0 \
+    --hash=sha256:164cba9af4e6e4e40c3a4f90a1a6c12ee56f14c0b4868d1ca91b32826ab334ce \
+    --hash=sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873
     # via
     #   gcp-releasetool
     #   google-api-core
     #   google-cloud-core
     #   google-cloud-storage
-google-cloud-core==2.3.1 \
-    --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \
-    --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53
+google-cloud-core==2.3.3 \
+    --hash=sha256:37b80273c8d7eee1ae816b3a20ae43585ea50506cb0e60f3cf5be5f87f1373cb \
+    --hash=sha256:fbd11cad3e98a7e5b0343dc07cb1039a5ffd7a5bb96e1f1e27cee4bda4a90863
     # via google-cloud-storage
-google-cloud-storage==2.0.0 \
-    --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \
-    --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7
+google-cloud-storage==2.10.0 \
+    --hash=sha256:934b31ead5f3994e5360f9ff5750982c5b6b11604dc072bc452c25965e076dc7 \
+    --hash=sha256:9433cf28801671de1c80434238fb1e7e4a1ba3087470e90f70c928ea77c2b9d7
     # via gcp-docuploader
-google-crc32c==1.3.0 \
-    --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \
-    --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \
-    --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \
-    --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \
-    --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \
-    --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \
-    --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \
-    --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \
-    --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \
-    --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \
-    --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \
-    --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \
-    --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \
-    --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \
-    --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \
-    --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \
-    --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \
-    --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \
-    --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \
-    --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \
-    --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \
-    --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \
-    --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \
-    --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \
-    --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \
-    --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \
-    --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \
-    --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \
-    --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \
-    --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \
-    --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \
-    --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \
-    --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \
-    --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \
-    --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \
-    --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \
-    --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \
-    --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \
-    --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \
-    --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \
-    --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \
-    --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \
-    --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3
+google-crc32c==1.5.0 \
+    --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \
+    --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \
+    --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \
+    --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \
+    --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \
+    --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \
+    --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \
+    --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \
+    --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \
+    --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \
+    --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \
+    --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \
+    --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \
+    --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \
+    --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \
+    --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \
+    --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \
+    --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \
+    --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \
+    --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \
+    --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \
+    --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \
+    --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \
+    --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \
+    --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \
+    --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \
+    --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \
+    --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \
+    --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \
+    --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \
+    --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \
+    --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \
+    --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \
+    --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \
+    --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \
+    --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \
+    --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \
+    --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \
+    --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \
+    --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \
+    --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \
+    --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \
+    --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \
+    --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \
+    --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \
+    --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \
+    --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \
+    --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \
+    --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \
+    --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \
+    --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \
+    --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \
+    --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \
+    --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \
+    --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \
+    --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \
+    --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \
+    --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \
+    --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \
+    --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \
+    --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \
+    --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \
+    --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \
+    --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \
+    --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \
+    --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \
+    --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \
+    --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4
     # via google-resumable-media
-google-resumable-media==2.3.3 \
-    --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \
-    --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5
+google-resumable-media==2.5.0 \
+    --hash=sha256:218931e8e2b2a73a58eb354a288e03a0fd5fb1c4583261ac6e4c078666468c93 \
+    --hash=sha256:da1bd943e2e114a56d85d6848497ebf9be6a14d3db23e9fc57581e7c3e8170ec
     # via google-cloud-storage
-googleapis-common-protos==1.56.3 \
-    --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \
-    --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461
+googleapis-common-protos==1.59.1 \
+    --hash=sha256:0cbedb6fb68f1c07e18eb4c48256320777707e7d0c55063ae56c15db3224a61e \
+    --hash=sha256:b35d530fe825fb4227857bc47ad84c33c809ac96f312e13182bdeaa2abe1178a
     # via google-api-core
 idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
     --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
     # via requests
-importlib-metadata==4.8.3 \
-    --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \
-    --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668
+importlib-metadata==6.8.0 \
+    --hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
+    --hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
+    # via keyring
+jaraco-classes==3.3.0 \
+    --hash=sha256:10afa92b6743f25c0cf5f37c6bb6e18e2c5bb84a16527ccfc0040ea377e7aaeb \
+    --hash=sha256:c063dd08e89217cee02c8d5e5ec560f2c8ce6cdc2fcdc2e68f7b2e5547ed3621
     # via keyring
 jeepney==0.8.0 \
     --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \
@@ -219,139 +323,119 @@ jeepney==0.8.0 \
     # via
     #   keyring
     #   secretstorage
-jinja2==3.0.3 \
-    --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \
-    --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+jinja2==3.1.2 \
+    --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \
+    --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61
     # via gcp-releasetool
-keyring==23.4.1 \
-    --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \
-    --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55
+keyring==24.2.0 \
+    --hash=sha256:4901caaf597bfd3bbd78c9a0c7c4c29fcd8310dab2cffefe749e916b6527acd6 \
+    --hash=sha256:ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509
     # via gcp-releasetool
-markupsafe==2.0.1 \
-    --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \
-    --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \
-    --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \
-    --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \
-    --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \
-    --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \
-    --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \
-    --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \
-    --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \
-    --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \
-    --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \
-    --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \
-    --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \
-    --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \
-    --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \
-    --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \
-    --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \
-    --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \
-    --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \
-    --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \
-    --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \
-    --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \
-    --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \
-    --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \
-    --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \
-    --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \
-    --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \
-    --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \
-    --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \
-    --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \
-    --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \
-    --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \
-    --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \
-    --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \
-    --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \
-    --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \
-    --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \
-    --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \
-    --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \
-    --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \
-    --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \
-    --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \
-    --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \
-    --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \
-    --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \
-    --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \
-    --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \
-    --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \
-    --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \
-    --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \
-    --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \
-    --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \
-    --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \
-    --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \
-    --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \
-    --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \
-    --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \
-    --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \
-    --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \
-    --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \
-    --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \
-    --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \
-    --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \
-    --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \
-    --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \
-    --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \
-    --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \
-    --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \
-    --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872
+markupsafe==2.1.3 \
+    --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \
+    --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \
+    --hash=sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431 \
+    --hash=sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686 \
+    --hash=sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559 \
+    --hash=sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc \
+    --hash=sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c \
+    --hash=sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0 \
+    --hash=sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4 \
+    --hash=sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9 \
+    --hash=sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575 \
+    --hash=sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba \
+    --hash=sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d \
+    --hash=sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3 \
+    --hash=sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00 \
+    --hash=sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155 \
+    --hash=sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac \
+    --hash=sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52 \
+    --hash=sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f \
+    --hash=sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8 \
+    --hash=sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b \
+    --hash=sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24 \
+    --hash=sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea \
+    --hash=sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198 \
+    --hash=sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0 \
+    --hash=sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee \
+    --hash=sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be \
+    --hash=sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2 \
+    --hash=sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707 \
+    --hash=sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6 \
+    --hash=sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58 \
+    --hash=sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779 \
+    --hash=sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636 \
+    --hash=sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c \
+    --hash=sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad \
+    --hash=sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee \
+    --hash=sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc \
+    --hash=sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2 \
+    --hash=sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48 \
+    --hash=sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7 \
+    --hash=sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e \
+    --hash=sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b \
+    --hash=sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa \
+    --hash=sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5 \
+    --hash=sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e \
+    --hash=sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb \
+    --hash=sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9 \
+    --hash=sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57 \
+    --hash=sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc \
+    --hash=sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2
     # via jinja2
-packaging==21.3 \
-    --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
-    --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
+more-itertools==9.1.0 \
+    --hash=sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d \
+    --hash=sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3
+    # via jaraco-classes
+packaging==23.1 \
+    --hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \
+    --hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f
     # via gcp-releasetool
-protobuf==3.20.2 \
-    --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \
-    --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \
-    --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \
-    --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \
-    --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \
-    --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \
-    --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \
-    --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \
-    --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \
-    --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \
-    --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \
-    --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \
-    --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \
-    --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \
-    --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \
-    --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \
-    --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \
-    --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \
-    --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \
-    --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \
-    --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \
-    --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0
+protobuf==3.20.3 \
+    --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \
+    --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \
+    --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \
+    --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \
+    --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \
+    --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \
+    --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \
+    --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \
+    --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \
+    --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \
+    --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \
+    --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \
+    --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \
+    --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \
+    --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \
+    --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \
+    --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \
+    --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \
+    --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \
+    --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \
+    --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \
+    --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee
     # via
     #   gcp-docuploader
     #   gcp-releasetool
     #   google-api-core
-    #   google-cloud-storage
-pyasn1==0.4.8 \
-    --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \
-    --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
+pyasn1==0.5.0 \
+    --hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \
+    --hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.2.8 \
-    --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \
-    --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74
+pyasn1-modules==0.3.0 \
+    --hash=sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c \
+    --hash=sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d
     # via google-auth
 pycparser==2.21 \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
     --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
     # via cffi
-pyjwt==2.4.0 \
-    --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \
-    --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba
+pyjwt==2.7.0 \
+    --hash=sha256:ba2b425b15ad5ef12f200dc67dd56af4e26de2331f965c5439994dad075876e1 \
+    --hash=sha256:bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074
     # via gcp-releasetool
-pyparsing==3.0.9 \
-    --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \
-    --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc
-    # via packaging
 pyperclip==1.8.2 \
     --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57
     # via gcp-releasetool
@@ -359,9 +443,9 @@ python-dateutil==2.8.2 \
     --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
     --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
     # via gcp-releasetool
-requests==2.27.1 \
-    --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
-    --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
+requests==2.31.0 \
+    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
+    --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
     # via
     #   gcp-releasetool
     #   google-api-core
@@ -374,10 +458,6 @@ secretstorage==3.3.3 \
     --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \
     --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99
     # via keyring
-setuptools==67.3.2 \
-    --hash=sha256:95f00380ef2ffa41d9bba85d95b27689d923c93dfbafed4aecd7cf988a25e012 \
-    --hash=sha256:bb6d8e508de562768f2027902929f8523932fcd1fb784e6d573d2cafac995a48
-    # via -r requirements.in
 six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
@@ -385,19 +465,26 @@ six==1.16.0 \
     #   gcp-docuploader
     #   google-auth
     #   python-dateutil
-typing-extensions==4.4.0 \
-    --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \
-    --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e
+typing-extensions==4.7.1 \
+    --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
+    --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
     # via -r requirements.in
-urllib3==1.26.12 \
-    --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \
-    --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997
-    # via requests
-wheel==0.38.4 \
-    --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \
-    --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8
+urllib3==1.26.16 \
+    --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \
+    --hash=sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14
+    # via
+    #   google-auth
+    #   requests
+wheel==0.40.0 \
+    --hash=sha256:cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873 \
+    --hash=sha256:d236b20e7cb522daf2390fa84c55eea81c5c30190f90f29ae2ca1ad8355bf247
     # via -r requirements.in
-zipp==3.6.0 \
-    --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \
-    --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc
+zipp==3.16.1 \
+    --hash=sha256:0b37c326d826d5ca35f2b9685cd750292740774ef16190008b00a0227c256fe0 \
+    --hash=sha256:857b158da2cbf427b376da1c24fd11faecbac5a4ac7523c3607f8a01f94c2ec0
     # via importlib-metadata
+
+# WARNING: The following packages were not pinned, but pip requires them to be
+# pinned when the requirements file includes hashes and the requirement is not
+# satisfied by a package already installed. Consider using the --allow-unsafe flag.
+# setuptools

From f3afbb6e19b0f341c766984ad2939c6a76f99f5f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 25 Jul 2023 16:58:07 +0200
Subject: [PATCH 1189/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.16.2 (#1142)
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.16.2

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1d09f02257fb..1e91e0a91e66 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.16.1
+  2.16.2
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.16.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.16.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.2"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index fb1663dceedf..b86bc132f30f 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.16.1
+      2.16.2
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0eb4b4f791ad..185ffb8ab6ac 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.16.1
+      2.16.2
     
 
     

From 4a4b01afd5e8e9a39adabdff3c3f8918f6251103 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 27 Jul 2023 16:44:06 -0400
Subject: [PATCH 1190/1784] build(deps): bump certifi from 2023.5.7 to
 2023.7.22 in /synthtool/gcp/templates/java_library/.kokoro (#1837) (#1147)

build(deps): bump certifi

Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.5.7 to 2023.7.22.
- [Commits](https://github.com/certifi/python-certifi/compare/2023.05.07...2023.07.22)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...



Source-Link: https://github.com/googleapis/synthtool/commit/d85e1d678a829da6f2f5664392a6cd8e95ba8341
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:3a95f1b9b1102865ca551b76be51d2bdb850900c4db2f6d79269e7af81ac8f84

Signed-off-by: dependabot[bot] 
Co-authored-by: Owl Bot 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .kokoro/requirements.txt  | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index d5500ef44246..fa335912bd92 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:46d2d262cd285c638656c8bde468011b723dc0c7ffd6a5ecc2650fe639c82e8f
-# created: 2023-07-24T14:21:17.707234503Z
+  digest: sha256:3a95f1b9b1102865ca551b76be51d2bdb850900c4db2f6d79269e7af81ac8f84
+# created: 2023-07-27T18:37:44.251188775Z
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 32989051e7f9..a73256ab80be 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -12,9 +12,9 @@ cachetools==5.3.1 \
     --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \
     --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b
     # via google-auth
-certifi==2023.5.7 \
-    --hash=sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7 \
-    --hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716
+certifi==2023.7.22 \
+    --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \
+    --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9
     # via requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
@@ -485,6 +485,5 @@ zipp==3.16.1 \
     # via importlib-metadata
 
 # WARNING: The following packages were not pinned, but pip requires them to be
-# pinned when the requirements file includes hashes and the requirement is not
-# satisfied by a package already installed. Consider using the --allow-unsafe flag.
+# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
 # setuptools

From 17002a28980a2bd82ede4053ec82638c17c70448 Mon Sep 17 00:00:00 2001
From: Burke Davison <40617934+burkedavison@users.noreply.github.com>
Date: Fri, 28 Jul 2023 18:52:57 +0000
Subject: [PATCH 1191/1784] chore: setup 2.15.x lts branch (#1144)

---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index c1c26322e492..2a97697b5487 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -22,3 +22,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.12.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.15.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 2af343e2c0a2..bd1c3a11d77e 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -111,6 +111,22 @@ branchProtectionRules:
       - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+  - pattern: 2.15.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - OwlBot Post Processor
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
 permissionRules:
   - team: yoshi-admins
     permission: admin

From 59c52153b7872fa5d8e969a319cd170f7c89b26e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 28 Jul 2023 20:54:31 +0200
Subject: [PATCH 1192/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.20.0 (#1148)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.20.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1e91e0a91e66..de469400faa7 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.19.0
+      26.20.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.19.0')
+implementation platform('com.google.cloud:libraries-bom:26.20.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 96ba88b8185e..02d6fb6f1cd4 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.19.0
+        26.20.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 752ff9d3c1d1..707f62a60dbe 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.19.0
+        26.20.0
         pom
         import
       

From 00a696d5e0fe2ffe6c9e02abd902d1b533265310 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 10:56:27 -0400
Subject: [PATCH 1193/1784] docs: Specify limit for `properties` in `Index`
 message in Datastore Admin API (#1149)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: Specify limit for `properties` in `Index` message in Datastore Admin API
docs: Minor formatting in Datastore Admin API

PiperOrigin-RevId: 551819875

Source-Link: https://github.com/googleapis/googleapis/commit/3db8b015f79d0d2b495c40ad6f0320e9d88c5275

Source-Link: https://github.com/googleapis/googleapis-gen/commit/7ebf1137639b93613e6a6206654a5ba8f21e9321
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiN2ViZjExMzc2MzliOTM2MTNlNmE2MjA2NjU0YTViYThmMjFlOTMyMSJ9

* 🦉 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 
---
 .../admin/v1/DatastoreAdminClient.java        |  60 ++--
 .../datastore/admin/v1/package-info.java      |  60 ++--
 .../admin/v1/DatastoreAdminGrpc.java          | 282 +++++++++---------
 .../admin/v1/ExportEntitiesRequest.java       |  28 +-
 .../v1/ExportEntitiesRequestOrBuilder.java    |   8 +-
 .../datastore/admin/v1/GetIndexRequest.java   |   6 +-
 .../admin/v1/ImportEntitiesMetadata.java      |  28 +-
 .../v1/ImportEntitiesMetadataOrBuilder.java   |   8 +-
 .../admin/v1/ImportEntitiesRequest.java       |  35 ++-
 .../v1/ImportEntitiesRequestOrBuilder.java    |  10 +-
 .../com/google/datastore/admin/v1/Index.java  | 140 ++++++++-
 .../datastore/admin/v1/IndexOrBuilder.java    |  26 +-
 .../datastore/admin/v1/datastore_admin.proto  |  91 +++---
 .../google/datastore/admin/v1/index.proto     |  15 +-
 .../google/datastore/admin/v1/migration.proto |   2 +-
 15 files changed, 457 insertions(+), 342 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 7d4752fb9575..399e61e01a3f 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -58,56 +58,40 @@
  *
  * 
    The Datastore Admin API provides several admin services for Cloud Datastore.
  *
- * 
    ----------------------------------------------------------------------------- ## Concepts
- *
- * 
    Project, namespace, kind, and entity as defined in the Google Cloud Datastore API.
+ * 
    Concepts: Project, namespace, kind, and entity as defined in the Google Cloud Datastore API.
  *
  * 
    Operation: An Operation represents work being performed in the background.
  *
  * 
    EntityFilter: Allows specifying a subset of entities in a project. This is specified as a
  * combination of kinds and namespaces (either or both of which may be all).
  *
- * 
    ----------------------------------------------------------------------------- ## Services
- *
- * 
    # Export/Import
- *
- * 
    The Export/Import service provides the ability to copy all or a subset of entities to/from
- * Google Cloud Storage.
- *
- * 
    Exported data may be imported into Cloud Datastore for any Google Cloud Platform project. It
- * is not restricted to the export source project. It is possible to export from one project and
- * then import into another.
- *
- * 
    Exported data can also be loaded into Google BigQuery for analysis.
+ * 
    Export/Import Service:
  *
- * 
    Exports and imports are performed asynchronously. An Operation resource is created for each
- * export/import. The state (including any errors encountered) of the export/import may be queried
- * via the Operation resource.
+ * 
    - The Export/Import service provides the ability to copy all or a subset of entities to/from
+ * Google Cloud Storage. - Exported data may be imported into Cloud Datastore for any Google Cloud
+ * Platform project. It is not restricted to the export source project. It is possible to export
+ * from one project and then import into another. - Exported data can also be loaded into Google
+ * BigQuery for analysis. - Exports and imports are performed asynchronously. An Operation resource
+ * is created for each export/import. The state (including any errors encountered) of the
+ * export/import may be queried via the Operation resource.
  *
- * 
    # Index
+ * 
    Index Service:
  *
- * 
    The index service manages Cloud Datastore composite indexes.
+ * 
    - The index service manages Cloud Datastore composite indexes. - Index creation and deletion
+ * are performed asynchronously. An Operation resource is created for each such asynchronous
+ * operation. The state of the operation (including any errors encountered) may be queried via the
+ * Operation resource.
  *
- * 
    Index creation and deletion are performed asynchronously. An Operation resource is created for
- * each such asynchronous operation. The state of the operation (including any errors encountered)
- * may be queried via the Operation resource.
+ * 
    Operation Service:
  *
- * 
    # Operation
- *
- * 
    The Operations collection provides a record of actions performed for the specified project
+ * 
    - The Operations collection provides a record of actions performed for the specified project
  * (including any operations in progress). Operations are not created directly but through calls on
- * other collections or resources.
- *
- * 
    An operation that is not yet done may be cancelled. The request to cancel is asynchronous and
- * the operation may continue to run for some time after the request to cancel is made.
- *
- * 
    An operation that is done may be deleted so that it is no longer listed as part of the
- * Operation collection.
- *
- * 
    ListOperations returns all pending operations, but not completed operations.
- *
- * 
    Operations are created by service DatastoreAdmin, but are accessed via service
- * google.longrunning.Operations.
+ * other collections or resources. - An operation that is not yet done may be cancelled. The request
+ * to cancel is asynchronous and the operation may continue to run for some time after the request
+ * to cancel is made. - An operation that is done may be deleted so that it is no longer listed as
+ * part of the Operation collection. - ListOperations returns all pending operations, but not
+ * completed operations. - Operations are created by service DatastoreAdmin, but are accessed via
+ * service google.longrunning.Operations.
  *
  * 
    This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
index b6dd28a5707e..3079a193a7cd 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -25,56 +25,40 @@
  *
  * 
    The Datastore Admin API provides several admin services for Cloud Datastore.
  *
- * 
    ----------------------------------------------------------------------------- ## Concepts
- *
- * 
    Project, namespace, kind, and entity as defined in the Google Cloud Datastore API.
+ * 
    Concepts: Project, namespace, kind, and entity as defined in the Google Cloud Datastore API.
  *
  * 
    Operation: An Operation represents work being performed in the background.
  *
  * 
    EntityFilter: Allows specifying a subset of entities in a project. This is specified as a
  * combination of kinds and namespaces (either or both of which may be all).
  *
- * 
    ----------------------------------------------------------------------------- ## Services
- *
- * 
    # Export/Import
- *
- * 
    The Export/Import service provides the ability to copy all or a subset of entities to/from
- * Google Cloud Storage.
- *
- * 
    Exported data may be imported into Cloud Datastore for any Google Cloud Platform project. It
- * is not restricted to the export source project. It is possible to export from one project and
- * then import into another.
- *
- * 
    Exported data can also be loaded into Google BigQuery for analysis.
+ * 
    Export/Import Service:
  *
- * 
    Exports and imports are performed asynchronously. An Operation resource is created for each
- * export/import. The state (including any errors encountered) of the export/import may be queried
- * via the Operation resource.
+ * 
    - The Export/Import service provides the ability to copy all or a subset of entities to/from
+ * Google Cloud Storage. - Exported data may be imported into Cloud Datastore for any Google Cloud
+ * Platform project. It is not restricted to the export source project. It is possible to export
+ * from one project and then import into another. - Exported data can also be loaded into Google
+ * BigQuery for analysis. - Exports and imports are performed asynchronously. An Operation resource
+ * is created for each export/import. The state (including any errors encountered) of the
+ * export/import may be queried via the Operation resource.
  *
- * 
    # Index
+ * 
    Index Service:
  *
- * 
    The index service manages Cloud Datastore composite indexes.
+ * 
    - The index service manages Cloud Datastore composite indexes. - Index creation and deletion
+ * are performed asynchronously. An Operation resource is created for each such asynchronous
+ * operation. The state of the operation (including any errors encountered) may be queried via the
+ * Operation resource.
  *
- * 
    Index creation and deletion are performed asynchronously. An Operation resource is created for
- * each such asynchronous operation. The state of the operation (including any errors encountered)
- * may be queried via the Operation resource.
+ * 
    Operation Service:
  *
- * 
    # Operation
- *
- * 
    The Operations collection provides a record of actions performed for the specified project
+ * 
    - The Operations collection provides a record of actions performed for the specified project
  * (including any operations in progress). Operations are not created directly but through calls on
- * other collections or resources.
- *
- * 
    An operation that is not yet done may be cancelled. The request to cancel is asynchronous and
- * the operation may continue to run for some time after the request to cancel is made.
- *
- * 
    An operation that is done may be deleted so that it is no longer listed as part of the
- * Operation collection.
- *
- * 
    ListOperations returns all pending operations, but not completed operations.
- *
- * 
    Operations are created by service DatastoreAdmin, but are accessed via service
- * google.longrunning.Operations.
+ * other collections or resources. - An operation that is not yet done may be cancelled. The request
+ * to cancel is asynchronous and the operation may continue to run for some time after the request
+ * to cancel is made. - An operation that is done may be deleted so that it is no longer listed as
+ * part of the Operation collection. - ListOperations returns all pending operations, but not
+ * completed operations. - Operations are created by service DatastoreAdmin, but are accessed via
+ * service google.longrunning.Operations.
  *
  * 
    Sample for DatastoreAdminClient:
  *
diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index 6fe5618d7b8e..1b1f7803f5b2 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -23,44 +23,41 @@
  * 
      * Google Cloud Datastore Admin API
  * The Datastore Admin API provides several admin services for Cloud Datastore.
- * -----------------------------------------------------------------------------
- * ## Concepts
- * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
- * API.
+ * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+ * Datastore API.
  * Operation: An Operation represents work being performed in the background.
  * EntityFilter: Allows specifying a subset of entities in a project. This is
  * specified as a combination of kinds and namespaces (either or both of which
  * may be all).
- * -----------------------------------------------------------------------------
- * ## Services
- * # Export/Import
- * The Export/Import service provides the ability to copy all or a subset of
+ * Export/Import Service:
+ * - The Export/Import service provides the ability to copy all or a subset of
  * entities to/from Google Cloud Storage.
- * Exported data may be imported into Cloud Datastore for any Google Cloud
+ * - Exported data may be imported into Cloud Datastore for any Google Cloud
  * Platform project. It is not restricted to the export source project. It is
  * possible to export from one project and then import into another.
- * Exported data can also be loaded into Google BigQuery for analysis.
- * Exports and imports are performed asynchronously. An Operation resource is
+ * - Exported data can also be loaded into Google BigQuery for analysis.
+ * - Exports and imports are performed asynchronously. An Operation resource is
  * created for each export/import. The state (including any errors encountered)
  * of the export/import may be queried via the Operation resource.
- * # Index
- * The index service manages Cloud Datastore composite indexes.
- * Index creation and deletion are performed asynchronously.
+ * Index Service:
+ * - The index service manages Cloud Datastore composite indexes.
+ * - Index creation and deletion are performed asynchronously.
  * An Operation resource is created for each such asynchronous operation.
  * The state of the operation (including any errors encountered)
  * may be queried via the Operation resource.
- * # Operation
- * The Operations collection provides a record of actions performed for the
+ * Operation Service:
+ * - The Operations collection provides a record of actions performed for the
  * specified project (including any operations in progress). Operations are not
  * created directly but through calls on other collections or resources.
- * An operation that is not yet done may be cancelled. The request to cancel is
- * asynchronous and the operation may continue to run for some time after the
+ * - An operation that is not yet done may be cancelled. The request to cancel
+ * is asynchronous and the operation may continue to run for some time after the
  * request to cancel is made.
- * An operation that is done may be deleted so that it is no longer listed as
+ * - An operation that is done may be deleted so that it is no longer listed as
  * part of the Operation collection.
- * ListOperations returns all pending operations, but not completed operations.
- * Operations are created by service DatastoreAdmin,
- * but are accessed via service google.longrunning.Operations.
+ * - ListOperations returns all pending operations, but not completed
+ * operations.
+ * - Operations are created by service DatastoreAdmin, but are accessed via
+ * service google.longrunning.Operations.
  * 
    
  */
 @javax.annotation.Generated(
@@ -381,44 +378,41 @@ public DatastoreAdminFutureStub newStub(
    * 
        * Google Cloud Datastore Admin API
    * The Datastore Admin API provides several admin services for Cloud Datastore.
-   * -----------------------------------------------------------------------------
-   * ## Concepts
-   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
-   * API.
+   * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+   * Datastore API.
    * Operation: An Operation represents work being performed in the background.
    * EntityFilter: Allows specifying a subset of entities in a project. This is
    * specified as a combination of kinds and namespaces (either or both of which
    * may be all).
-   * -----------------------------------------------------------------------------
-   * ## Services
-   * # Export/Import
-   * The Export/Import service provides the ability to copy all or a subset of
+   * Export/Import Service:
+   * - The Export/Import service provides the ability to copy all or a subset of
    * entities to/from Google Cloud Storage.
-   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * - Exported data may be imported into Cloud Datastore for any Google Cloud
    * Platform project. It is not restricted to the export source project. It is
    * possible to export from one project and then import into another.
-   * Exported data can also be loaded into Google BigQuery for analysis.
-   * Exports and imports are performed asynchronously. An Operation resource is
+   * - Exported data can also be loaded into Google BigQuery for analysis.
+   * - Exports and imports are performed asynchronously. An Operation resource is
    * created for each export/import. The state (including any errors encountered)
    * of the export/import may be queried via the Operation resource.
-   * # Index
-   * The index service manages Cloud Datastore composite indexes.
-   * Index creation and deletion are performed asynchronously.
+   * Index Service:
+   * - The index service manages Cloud Datastore composite indexes.
+   * - Index creation and deletion are performed asynchronously.
    * An Operation resource is created for each such asynchronous operation.
    * The state of the operation (including any errors encountered)
    * may be queried via the Operation resource.
-   * # Operation
-   * The Operations collection provides a record of actions performed for the
+   * Operation Service:
+   * - The Operations collection provides a record of actions performed for the
    * specified project (including any operations in progress). Operations are not
    * created directly but through calls on other collections or resources.
-   * An operation that is not yet done may be cancelled. The request to cancel is
-   * asynchronous and the operation may continue to run for some time after the
+   * - An operation that is not yet done may be cancelled. The request to cancel
+   * is asynchronous and the operation may continue to run for some time after the
    * request to cancel is made.
-   * An operation that is done may be deleted so that it is no longer listed as
+   * - An operation that is done may be deleted so that it is no longer listed as
    * part of the Operation collection.
-   * ListOperations returns all pending operations, but not completed operations.
-   * Operations are created by service DatastoreAdmin,
-   * but are accessed via service google.longrunning.Operations.
+   * - ListOperations returns all pending operations, but not completed
+   * operations.
+   * - Operations are created by service DatastoreAdmin, but are accessed via
+   * service google.longrunning.Operations.
    * 
    
    */
   public interface AsyncService {
@@ -468,9 +462,9 @@ default void importEntities(
      * 
          * Creates the specified index.
      * A newly created index's initial state is `CREATING`. On completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
-     * If the index already exists, the call will return an `ALREADY_EXISTS`
-     * status.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * state will be `READY`. If the index already exists, the call will return an
+     * `ALREADY_EXISTS` status.
      * During index creation, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, removing the index with
@@ -495,7 +489,8 @@ default void createIndex(
      * An index can only be deleted if it is in a `READY` or `ERROR` state. On
      * successful execution of the request, the index will be in a `DELETING`
      * [state][google.datastore.admin.v1.Index.State]. And on completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * index will be removed.
      * During index deletion, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, followed by calling
@@ -546,44 +541,41 @@ default void listIndexes(
    * 
        * Google Cloud Datastore Admin API
    * The Datastore Admin API provides several admin services for Cloud Datastore.
-   * -----------------------------------------------------------------------------
-   * ## Concepts
-   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
-   * API.
+   * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+   * Datastore API.
    * Operation: An Operation represents work being performed in the background.
    * EntityFilter: Allows specifying a subset of entities in a project. This is
    * specified as a combination of kinds and namespaces (either or both of which
    * may be all).
-   * -----------------------------------------------------------------------------
-   * ## Services
-   * # Export/Import
-   * The Export/Import service provides the ability to copy all or a subset of
+   * Export/Import Service:
+   * - The Export/Import service provides the ability to copy all or a subset of
    * entities to/from Google Cloud Storage.
-   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * - Exported data may be imported into Cloud Datastore for any Google Cloud
    * Platform project. It is not restricted to the export source project. It is
    * possible to export from one project and then import into another.
-   * Exported data can also be loaded into Google BigQuery for analysis.
-   * Exports and imports are performed asynchronously. An Operation resource is
+   * - Exported data can also be loaded into Google BigQuery for analysis.
+   * - Exports and imports are performed asynchronously. An Operation resource is
    * created for each export/import. The state (including any errors encountered)
    * of the export/import may be queried via the Operation resource.
-   * # Index
-   * The index service manages Cloud Datastore composite indexes.
-   * Index creation and deletion are performed asynchronously.
+   * Index Service:
+   * - The index service manages Cloud Datastore composite indexes.
+   * - Index creation and deletion are performed asynchronously.
    * An Operation resource is created for each such asynchronous operation.
    * The state of the operation (including any errors encountered)
    * may be queried via the Operation resource.
-   * # Operation
-   * The Operations collection provides a record of actions performed for the
+   * Operation Service:
+   * - The Operations collection provides a record of actions performed for the
    * specified project (including any operations in progress). Operations are not
    * created directly but through calls on other collections or resources.
-   * An operation that is not yet done may be cancelled. The request to cancel is
-   * asynchronous and the operation may continue to run for some time after the
+   * - An operation that is not yet done may be cancelled. The request to cancel
+   * is asynchronous and the operation may continue to run for some time after the
    * request to cancel is made.
-   * An operation that is done may be deleted so that it is no longer listed as
+   * - An operation that is done may be deleted so that it is no longer listed as
    * part of the Operation collection.
-   * ListOperations returns all pending operations, but not completed operations.
-   * Operations are created by service DatastoreAdmin,
-   * but are accessed via service google.longrunning.Operations.
+   * - ListOperations returns all pending operations, but not completed
+   * operations.
+   * - Operations are created by service DatastoreAdmin, but are accessed via
+   * service google.longrunning.Operations.
    * 
    
    */
   public abstract static class DatastoreAdminImplBase
@@ -601,44 +593,41 @@ public final io.grpc.ServerServiceDefinition bindService() {
    * 
        * Google Cloud Datastore Admin API
    * The Datastore Admin API provides several admin services for Cloud Datastore.
-   * -----------------------------------------------------------------------------
-   * ## Concepts
-   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
-   * API.
+   * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+   * Datastore API.
    * Operation: An Operation represents work being performed in the background.
    * EntityFilter: Allows specifying a subset of entities in a project. This is
    * specified as a combination of kinds and namespaces (either or both of which
    * may be all).
-   * -----------------------------------------------------------------------------
-   * ## Services
-   * # Export/Import
-   * The Export/Import service provides the ability to copy all or a subset of
+   * Export/Import Service:
+   * - The Export/Import service provides the ability to copy all or a subset of
    * entities to/from Google Cloud Storage.
-   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * - Exported data may be imported into Cloud Datastore for any Google Cloud
    * Platform project. It is not restricted to the export source project. It is
    * possible to export from one project and then import into another.
-   * Exported data can also be loaded into Google BigQuery for analysis.
-   * Exports and imports are performed asynchronously. An Operation resource is
+   * - Exported data can also be loaded into Google BigQuery for analysis.
+   * - Exports and imports are performed asynchronously. An Operation resource is
    * created for each export/import. The state (including any errors encountered)
    * of the export/import may be queried via the Operation resource.
-   * # Index
-   * The index service manages Cloud Datastore composite indexes.
-   * Index creation and deletion are performed asynchronously.
+   * Index Service:
+   * - The index service manages Cloud Datastore composite indexes.
+   * - Index creation and deletion are performed asynchronously.
    * An Operation resource is created for each such asynchronous operation.
    * The state of the operation (including any errors encountered)
    * may be queried via the Operation resource.
-   * # Operation
-   * The Operations collection provides a record of actions performed for the
+   * Operation Service:
+   * - The Operations collection provides a record of actions performed for the
    * specified project (including any operations in progress). Operations are not
    * created directly but through calls on other collections or resources.
-   * An operation that is not yet done may be cancelled. The request to cancel is
-   * asynchronous and the operation may continue to run for some time after the
+   * - An operation that is not yet done may be cancelled. The request to cancel
+   * is asynchronous and the operation may continue to run for some time after the
    * request to cancel is made.
-   * An operation that is done may be deleted so that it is no longer listed as
+   * - An operation that is done may be deleted so that it is no longer listed as
    * part of the Operation collection.
-   * ListOperations returns all pending operations, but not completed operations.
-   * Operations are created by service DatastoreAdmin,
-   * but are accessed via service google.longrunning.Operations.
+   * - ListOperations returns all pending operations, but not completed
+   * operations.
+   * - Operations are created by service DatastoreAdmin, but are accessed via
+   * service google.longrunning.Operations.
    * 
    
    */
   public static final class DatastoreAdminStub
@@ -701,9 +690,9 @@ public void importEntities(
      * 
          * Creates the specified index.
      * A newly created index's initial state is `CREATING`. On completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
-     * If the index already exists, the call will return an `ALREADY_EXISTS`
-     * status.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * state will be `READY`. If the index already exists, the call will return an
+     * `ALREADY_EXISTS` status.
      * During index creation, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, removing the index with
@@ -730,7 +719,8 @@ public void createIndex(
      * An index can only be deleted if it is in a `READY` or `ERROR` state. On
      * successful execution of the request, the index will be in a `DELETING`
      * [state][google.datastore.admin.v1.Index.State]. And on completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * index will be removed.
      * During index deletion, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, followed by calling
@@ -786,44 +776,41 @@ public void listIndexes(
    * 
        * Google Cloud Datastore Admin API
    * The Datastore Admin API provides several admin services for Cloud Datastore.
-   * -----------------------------------------------------------------------------
-   * ## Concepts
-   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
-   * API.
+   * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+   * Datastore API.
    * Operation: An Operation represents work being performed in the background.
    * EntityFilter: Allows specifying a subset of entities in a project. This is
    * specified as a combination of kinds and namespaces (either or both of which
    * may be all).
-   * -----------------------------------------------------------------------------
-   * ## Services
-   * # Export/Import
-   * The Export/Import service provides the ability to copy all or a subset of
+   * Export/Import Service:
+   * - The Export/Import service provides the ability to copy all or a subset of
    * entities to/from Google Cloud Storage.
-   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * - Exported data may be imported into Cloud Datastore for any Google Cloud
    * Platform project. It is not restricted to the export source project. It is
    * possible to export from one project and then import into another.
-   * Exported data can also be loaded into Google BigQuery for analysis.
-   * Exports and imports are performed asynchronously. An Operation resource is
+   * - Exported data can also be loaded into Google BigQuery for analysis.
+   * - Exports and imports are performed asynchronously. An Operation resource is
    * created for each export/import. The state (including any errors encountered)
    * of the export/import may be queried via the Operation resource.
-   * # Index
-   * The index service manages Cloud Datastore composite indexes.
-   * Index creation and deletion are performed asynchronously.
+   * Index Service:
+   * - The index service manages Cloud Datastore composite indexes.
+   * - Index creation and deletion are performed asynchronously.
    * An Operation resource is created for each such asynchronous operation.
    * The state of the operation (including any errors encountered)
    * may be queried via the Operation resource.
-   * # Operation
-   * The Operations collection provides a record of actions performed for the
+   * Operation Service:
+   * - The Operations collection provides a record of actions performed for the
    * specified project (including any operations in progress). Operations are not
    * created directly but through calls on other collections or resources.
-   * An operation that is not yet done may be cancelled. The request to cancel is
-   * asynchronous and the operation may continue to run for some time after the
+   * - An operation that is not yet done may be cancelled. The request to cancel
+   * is asynchronous and the operation may continue to run for some time after the
    * request to cancel is made.
-   * An operation that is done may be deleted so that it is no longer listed as
+   * - An operation that is done may be deleted so that it is no longer listed as
    * part of the Operation collection.
-   * ListOperations returns all pending operations, but not completed operations.
-   * Operations are created by service DatastoreAdmin,
-   * but are accessed via service google.longrunning.Operations.
+   * - ListOperations returns all pending operations, but not completed
+   * operations.
+   * - Operations are created by service DatastoreAdmin, but are accessed via
+   * service google.longrunning.Operations.
    * 
    
    */
   public static final class DatastoreAdminBlockingStub
@@ -881,9 +868,9 @@ public com.google.longrunning.Operation importEntities(
      * 
          * Creates the specified index.
      * A newly created index's initial state is `CREATING`. On completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
-     * If the index already exists, the call will return an `ALREADY_EXISTS`
-     * status.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * state will be `READY`. If the index already exists, the call will return an
+     * `ALREADY_EXISTS` status.
      * During index creation, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, removing the index with
@@ -907,7 +894,8 @@ public com.google.longrunning.Operation createIndex(
      * An index can only be deleted if it is in a `READY` or `ERROR` state. On
      * successful execution of the request, the index will be in a `DELETING`
      * [state][google.datastore.admin.v1.Index.State]. And on completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * index will be removed.
      * During index deletion, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, followed by calling
@@ -955,44 +943,41 @@ public com.google.datastore.admin.v1.ListIndexesResponse listIndexes(
    * 
        * Google Cloud Datastore Admin API
    * The Datastore Admin API provides several admin services for Cloud Datastore.
-   * -----------------------------------------------------------------------------
-   * ## Concepts
-   * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
-   * API.
+   * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+   * Datastore API.
    * Operation: An Operation represents work being performed in the background.
    * EntityFilter: Allows specifying a subset of entities in a project. This is
    * specified as a combination of kinds and namespaces (either or both of which
    * may be all).
-   * -----------------------------------------------------------------------------
-   * ## Services
-   * # Export/Import
-   * The Export/Import service provides the ability to copy all or a subset of
+   * Export/Import Service:
+   * - The Export/Import service provides the ability to copy all or a subset of
    * entities to/from Google Cloud Storage.
-   * Exported data may be imported into Cloud Datastore for any Google Cloud
+   * - Exported data may be imported into Cloud Datastore for any Google Cloud
    * Platform project. It is not restricted to the export source project. It is
    * possible to export from one project and then import into another.
-   * Exported data can also be loaded into Google BigQuery for analysis.
-   * Exports and imports are performed asynchronously. An Operation resource is
+   * - Exported data can also be loaded into Google BigQuery for analysis.
+   * - Exports and imports are performed asynchronously. An Operation resource is
    * created for each export/import. The state (including any errors encountered)
    * of the export/import may be queried via the Operation resource.
-   * # Index
-   * The index service manages Cloud Datastore composite indexes.
-   * Index creation and deletion are performed asynchronously.
+   * Index Service:
+   * - The index service manages Cloud Datastore composite indexes.
+   * - Index creation and deletion are performed asynchronously.
    * An Operation resource is created for each such asynchronous operation.
    * The state of the operation (including any errors encountered)
    * may be queried via the Operation resource.
-   * # Operation
-   * The Operations collection provides a record of actions performed for the
+   * Operation Service:
+   * - The Operations collection provides a record of actions performed for the
    * specified project (including any operations in progress). Operations are not
    * created directly but through calls on other collections or resources.
-   * An operation that is not yet done may be cancelled. The request to cancel is
-   * asynchronous and the operation may continue to run for some time after the
+   * - An operation that is not yet done may be cancelled. The request to cancel
+   * is asynchronous and the operation may continue to run for some time after the
    * request to cancel is made.
-   * An operation that is done may be deleted so that it is no longer listed as
+   * - An operation that is done may be deleted so that it is no longer listed as
    * part of the Operation collection.
-   * ListOperations returns all pending operations, but not completed operations.
-   * Operations are created by service DatastoreAdmin,
-   * but are accessed via service google.longrunning.Operations.
+   * - ListOperations returns all pending operations, but not completed
+   * operations.
+   * - Operations are created by service DatastoreAdmin, but are accessed via
+   * service google.longrunning.Operations.
    * 
    
    */
   public static final class DatastoreAdminFutureStub
@@ -1050,9 +1035,9 @@ protected DatastoreAdminFutureStub build(
      * 
          * Creates the specified index.
      * A newly created index's initial state is `CREATING`. On completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
-     * If the index already exists, the call will return an `ALREADY_EXISTS`
-     * status.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * state will be `READY`. If the index already exists, the call will return an
+     * `ALREADY_EXISTS` status.
      * During index creation, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, removing the index with
@@ -1076,7 +1061,8 @@ protected DatastoreAdminFutureStub build(
      * An index can only be deleted if it is in a `READY` or `ERROR` state. On
      * successful execution of the request, the index will be in a `DELETING`
      * [state][google.datastore.admin.v1.Index.State]. And on completion of the
-     * returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * index will be removed.
      * During index deletion, the process could result in an error, in which
      * case the index will move to the `ERROR` state. The process can be recovered
      * by fixing the data that caused the error, followed by calling
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 7e81988e7862..57d21e691cff 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
@@ -299,8 +299,8 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
    *
    * 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.
+   * [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.
@@ -339,8 +339,8 @@ public java.lang.String getOutputUrlPrefix() {
    *
    * 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.
+   * [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.
@@ -1289,8 +1289,8 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
      *
      * 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.
+     * [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.
@@ -1328,8 +1328,8 @@ public java.lang.String getOutputUrlPrefix() {
      *
      * 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.
+     * [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.
@@ -1367,8 +1367,8 @@ public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
      *
      * 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.
+     * [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.
@@ -1405,8 +1405,8 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
      *
      * 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.
+     * [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.
@@ -1439,8 +1439,8 @@ public Builder clearOutputUrlPrefix() {
      *
      * 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.
+     * [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 d652ea7a7aed..c542b562c1f0 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
@@ -158,8 +158,8 @@ java.lang.String getLabelsOrDefault(
    *
    * 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.
+   * [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.
@@ -187,8 +187,8 @@ java.lang.String getLabelsOrDefault(
    *
    * 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.
+   * [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/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java
index c7f1e40e8345..84cd35a266dc 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
@@ -22,7 +22,8 @@
  *
  *
  * 
    - * The request for [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
+ * The request for
+ * [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
  * 
    
  *
  * Protobuf type {@code google.datastore.admin.v1.GetIndexRequest}
@@ -337,7 +338,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
    -   * The request for [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
+   * The request for
+   * [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
    * 
    
    *
    * Protobuf type {@code google.datastore.admin.v1.GetIndexRequest}
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 1b6d92aba12f..0d1a82b8fe4b 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
@@ -271,7 +271,9 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
    *
    * 
        * The location of the import metadata file. This will be the same value as
-   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * the
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+   * field.
    * 
    
    *
    * string input_url = 5;
@@ -295,7 +297,9 @@ public java.lang.String getInputUrl() {
    *
    * 
        * The location of the import metadata file. This will be the same value as
-   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * the
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+   * field.
    * 
    
    *
    * string input_url = 5;
@@ -1526,7 +1530,9 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
      *
      * 
          * The location of the import metadata file. This will be the same value as
-     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * the
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+     * field.
      * 
    
      *
      * string input_url = 5;
@@ -1549,7 +1555,9 @@ public java.lang.String getInputUrl() {
      *
      * 
          * The location of the import metadata file. This will be the same value as
-     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * the
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+     * field.
      * 
    
      *
      * string input_url = 5;
@@ -1572,7 +1580,9 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
      *
      * 
          * The location of the import metadata file. This will be the same value as
-     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * the
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+     * field.
      * 
    
      *
      * string input_url = 5;
@@ -1594,7 +1604,9 @@ public Builder setInputUrl(java.lang.String value) {
      *
      * 
          * The location of the import metadata file. This will be the same value as
-     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * the
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+     * field.
      * 
    
      *
      * string input_url = 5;
@@ -1612,7 +1624,9 @@ public Builder clearInputUrl() {
      *
      * 
          * The location of the import metadata file. This will be the same value as
-     * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+     * the
+     * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+     * field.
      * 
    
      *
      * string input_url = 5;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 8dc5147ec7d7..8dbf67421ee6 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -168,7 +168,9 @@ public interface ImportEntitiesMetadataOrBuilder
    *
    * 
        * The location of the import metadata file. This will be the same value as
-   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * the
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+   * field.
    * 
    
    *
    * string input_url = 5;
@@ -181,7 +183,9 @@ public interface ImportEntitiesMetadataOrBuilder
    *
    * 
        * The location of the import metadata file. This will be the same value as
-   * the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+   * the
+   * [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+   * field.
    * 
    
    *
    * string input_url = 5;
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 9ca45ea1c206..ee9b39b566ef 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
@@ -236,8 +236,9 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
    *
    *
    * 
    -   * Required. The full resource URL of the external storage location. Currently, only
-   * Google Cloud Storage is supported. So input_url should be of the form:
+   * Required. The full resource URL of the external storage location.
+   * Currently, only Google Cloud Storage is supported. So input_url should be
+   * of the form:
    * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
    * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
    * an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -271,8 +272,9 @@ public java.lang.String getInputUrl() {
    *
    *
    * 
    -   * Required. The full resource URL of the external storage location. Currently, only
-   * Google Cloud Storage is supported. So input_url should be of the form:
+   * Required. The full resource URL of the external storage location.
+   * Currently, only Google Cloud Storage is supported. So input_url should be
+   * of the form:
    * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
    * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
    * an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -1091,8 +1093,9 @@ public Builder putAllLabels(java.util.Map va
      *
      *
      * 
    -     * Required. The full resource URL of the external storage location. Currently, only
-     * Google Cloud Storage is supported. So input_url should be of the form:
+     * Required. The full resource URL of the external storage location.
+     * Currently, only Google Cloud Storage is supported. So input_url should be
+     * of the form:
      * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
      * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
      * an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -1125,8 +1128,9 @@ public java.lang.String getInputUrl() {
      *
      *
      * 
    -     * Required. The full resource URL of the external storage location. Currently, only
-     * Google Cloud Storage is supported. So input_url should be of the form:
+     * Required. The full resource URL of the external storage location.
+     * Currently, only Google Cloud Storage is supported. So input_url should be
+     * of the form:
      * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
      * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
      * an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -1159,8 +1163,9 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
      *
      *
      * 
    -     * Required. The full resource URL of the external storage location. Currently, only
-     * Google Cloud Storage is supported. So input_url should be of the form:
+     * Required. The full resource URL of the external storage location.
+     * Currently, only Google Cloud Storage is supported. So input_url should be
+     * of the form:
      * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
      * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
      * an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -1192,8 +1197,9 @@ public Builder setInputUrl(java.lang.String value) {
      *
      *
      * 
    -     * Required. The full resource URL of the external storage location. Currently, only
-     * Google Cloud Storage is supported. So input_url should be of the form:
+     * Required. The full resource URL of the external storage location.
+     * Currently, only Google Cloud Storage is supported. So input_url should be
+     * of the form:
      * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
      * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
      * an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -1221,8 +1227,9 @@ public Builder clearInputUrl() {
      *
      *
      * 
    -     * Required. The full resource URL of the external storage location. Currently, only
-     * Google Cloud Storage is supported. So input_url should be of the form:
+     * Required. The full resource URL of the external storage location.
+     * Currently, only Google Cloud Storage is supported. So input_url should be
+     * of the form:
      * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
      * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
      * an optional Cloud Storage namespace path (this is not a Cloud Datastore
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 6a5004067fff..dcf83c997c0d 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
@@ -110,8 +110,9 @@ java.lang.String getLabelsOrDefault(
    *
    *
    * 
    -   * Required. The full resource URL of the external storage location. Currently, only
-   * Google Cloud Storage is supported. So input_url should be of the form:
+   * Required. The full resource URL of the external storage location.
+   * Currently, only Google Cloud Storage is supported. So input_url should be
+   * of the form:
    * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
    * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
    * an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -134,8 +135,9 @@ java.lang.String getLabelsOrDefault(
    *
    *
    * 
    -   * Required. The full resource URL of the external storage location. Currently, only
-   * Google Cloud Storage is supported. So input_url should be of the form:
+   * Required. The full resource URL of the external storage location.
+   * Currently, only Google Cloud Storage is supported. So input_url should be
+   * of the form:
    * `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
    * `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
    * an optional Cloud Storage namespace path (this is not a Cloud Datastore
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 e03a585f4584..57a41fc3ea14 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
@@ -647,7 +647,8 @@ public interface IndexedPropertyOrBuilder
      *
      *
      * 
    -     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * Required. The indexed property's direction.  Must not be
+     * DIRECTION_UNSPECIFIED.
      * 
    
      *
      * 
@@ -661,7 +662,8 @@ public interface IndexedPropertyOrBuilder
      *
      *
      * 
    -     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * Required. The indexed property's direction.  Must not be
+     * DIRECTION_UNSPECIFIED.
      * 
    
      *
      * 
@@ -774,7 +776,8 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      *
      * 
    -     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * Required. The indexed property's direction.  Must not be
+     * DIRECTION_UNSPECIFIED.
      * 
    
      *
      * 
@@ -791,7 +794,8 @@ public int getDirectionValue() {
      *
      *
      * 
    -     * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+     * Required. The indexed property's direction.  Must not be
+     * DIRECTION_UNSPECIFIED.
      * 
    
      *
      * 
@@ -1289,7 +1293,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
        *
        *
        * 
    -       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * Required. The indexed property's direction.  Must not be
+       * DIRECTION_UNSPECIFIED.
        * 
    
        *
        * 
@@ -1306,7 +1311,8 @@ public int getDirectionValue() {
        *
        *
        * 
    -       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * Required. The indexed property's direction.  Must not be
+       * DIRECTION_UNSPECIFIED.
        * 
    
        *
        * 
@@ -1326,7 +1332,8 @@ public Builder setDirectionValue(int value) {
        *
        *
        * 
    -       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * Required. The indexed property's direction.  Must not be
+       * DIRECTION_UNSPECIFIED.
        * 
    
        *
        * 
@@ -1345,7 +1352,8 @@ public com.google.datastore.admin.v1.Index.Direction getDirection() {
        *
        *
        * 
    -       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * Required. The indexed property's direction.  Must not be
+       * DIRECTION_UNSPECIFIED.
        * 
    
        *
        * 
@@ -1368,7 +1376,8 @@ public Builder setDirection(com.google.datastore.admin.v1.Index.Direction value)
        *
        *
        * 
    -       * Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+       * Required. The indexed property's direction.  Must not be
+       * DIRECTION_UNSPECIFIED.
        * 
    
        *
        * 
@@ -1607,7 +1616,8 @@ public com.google.protobuf.ByteString getKindBytes() {
    *
    *
    * 
    -   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * Required. The index's ancestor mode.  Must not be
+   * ANCESTOR_MODE_UNSPECIFIED.
    * 
    
    *
    * 
@@ -1624,7 +1634,8 @@ public int getAncestorValue() {
    *
    *
    * 
    -   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * Required. The index's ancestor mode.  Must not be
+   * ANCESTOR_MODE_UNSPECIFIED.
    * 
    
    *
    * 
@@ -1649,6 +1660,10 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -1664,6 +1679,10 @@ public java.util.List getPr
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -1680,6 +1699,10 @@ public java.util.List getPr
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -1695,6 +1718,10 @@ public int getPropertiesCount() {
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -1710,6 +1737,10 @@ public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int ind
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -2588,7 +2619,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
    -     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * Required. The index's ancestor mode.  Must not be
+     * ANCESTOR_MODE_UNSPECIFIED.
      * 
    
      *
      * 
@@ -2605,7 +2637,8 @@ public int getAncestorValue() {
      *
      *
      * 
    -     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * Required. The index's ancestor mode.  Must not be
+     * ANCESTOR_MODE_UNSPECIFIED.
      * 
    
      *
      * 
@@ -2625,7 +2658,8 @@ public Builder setAncestorValue(int value) {
      *
      *
      * 
    -     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * Required. The index's ancestor mode.  Must not be
+     * ANCESTOR_MODE_UNSPECIFIED.
      * 
    
      *
      * 
@@ -2646,7 +2680,8 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
      *
      *
      * 
    -     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * Required. The index's ancestor mode.  Must not be
+     * ANCESTOR_MODE_UNSPECIFIED.
      * 
    
      *
      * 
@@ -2669,7 +2704,8 @@ public Builder setAncestor(com.google.datastore.admin.v1.Index.AncestorMode valu
      *
      *
      * 
    -     * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+     * Required. The index's ancestor mode.  Must not be
+     * ANCESTOR_MODE_UNSPECIFIED.
      * 
    
      *
      * 
@@ -2708,6 +2744,10 @@ private void ensurePropertiesIsMutable() {
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2726,6 +2766,10 @@ public java.util.List getPr
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2744,6 +2788,10 @@ public int getPropertiesCount() {
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2762,6 +2810,10 @@ public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int ind
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2787,6 +2839,10 @@ public Builder setProperties(
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2809,6 +2865,10 @@ public Builder setProperties(
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2833,6 +2893,10 @@ public Builder addProperties(com.google.datastore.admin.v1.Index.IndexedProperty
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2858,6 +2922,10 @@ public Builder addProperties(
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2880,6 +2948,10 @@ public Builder addProperties(
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2902,6 +2974,10 @@ public Builder addProperties(
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2924,6 +3000,10 @@ public Builder addAllProperties(
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2945,6 +3025,10 @@ public Builder clearProperties() {
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2966,6 +3050,10 @@ public Builder removeProperties(int index) {
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -2981,6 +3069,10 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder getProperties
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -3000,6 +3092,10 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -3019,6 +3115,10 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -3034,6 +3134,10 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
@@ -3051,6 +3155,10 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties
      *
      * 
          * Required. An ordered sequence of property names and their index attributes.
+     *
+     * Requires:
+     *
+     * * A maximum of 100 properties.
      * 
    
      *
      * 
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 27e3847650e8..6445c073da09 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -102,7 +102,8 @@ public interface IndexOrBuilder
    *
    *
    * 
    -   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * Required. The index's ancestor mode.  Must not be
+   * ANCESTOR_MODE_UNSPECIFIED.
    * 
    
    *
    * 
@@ -116,7 +117,8 @@ public interface IndexOrBuilder
    *
    *
    * 
    -   * Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+   * Required. The index's ancestor mode.  Must not be
+   * ANCESTOR_MODE_UNSPECIFIED.
    * 
    
    *
    * 
@@ -132,6 +134,10 @@ public interface IndexOrBuilder
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -144,6 +150,10 @@ public interface IndexOrBuilder
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -156,6 +166,10 @@ public interface IndexOrBuilder
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -168,6 +182,10 @@ public interface IndexOrBuilder
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
@@ -181,6 +199,10 @@ public interface IndexOrBuilder
    *
    * 
        * Required. An ordered sequence of property names and their index attributes.
+   *
+   * Requires:
+   *
+   * * A maximum of 100 properties.
    * 
    
    *
    * 
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
index 744d97df7e62..79ca3df6880b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,14 +34,10 @@ option ruby_package = "Google::Cloud::Datastore::Admin::V1";
 
 // Google Cloud Datastore Admin API
 //
-//
 // The Datastore Admin API provides several admin services for Cloud Datastore.
 //
-// -----------------------------------------------------------------------------
-// ## Concepts
-//
-// Project, namespace, kind, and entity as defined in the Google Cloud Datastore
-// API.
+// Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+// Datastore API.
 //
 // Operation: An Operation represents work being performed in the background.
 //
@@ -49,50 +45,40 @@ option ruby_package = "Google::Cloud::Datastore::Admin::V1";
 // specified as a combination of kinds and namespaces (either or both of which
 // may be all).
 //
-// -----------------------------------------------------------------------------
-// ## Services
-//
-// # Export/Import
+// Export/Import Service:
 //
-// The Export/Import service provides the ability to copy all or a subset of
+// - The Export/Import service provides the ability to copy all or a subset of
 // entities to/from Google Cloud Storage.
-//
-// Exported data may be imported into Cloud Datastore for any Google Cloud
+// - Exported data may be imported into Cloud Datastore for any Google Cloud
 // Platform project. It is not restricted to the export source project. It is
 // possible to export from one project and then import into another.
-//
-// Exported data can also be loaded into Google BigQuery for analysis.
-//
-// Exports and imports are performed asynchronously. An Operation resource is
+// - Exported data can also be loaded into Google BigQuery for analysis.
+// - Exports and imports are performed asynchronously. An Operation resource is
 // created for each export/import. The state (including any errors encountered)
 // of the export/import may be queried via the Operation resource.
 //
-// # Index
+// Index Service:
 //
-// The index service manages Cloud Datastore composite indexes.
-//
-// Index creation and deletion are performed asynchronously.
+// - The index service manages Cloud Datastore composite indexes.
+// - Index creation and deletion are performed asynchronously.
 // An Operation resource is created for each such asynchronous operation.
 // The state of the operation (including any errors encountered)
 // may be queried via the Operation resource.
 //
-// # Operation
+// Operation Service:
 //
-// The Operations collection provides a record of actions performed for the
+// - The Operations collection provides a record of actions performed for the
 // specified project (including any operations in progress). Operations are not
 // created directly but through calls on other collections or resources.
-//
-// An operation that is not yet done may be cancelled. The request to cancel is
-// asynchronous and the operation may continue to run for some time after the
+// - An operation that is not yet done may be cancelled. The request to cancel
+// is asynchronous and the operation may continue to run for some time after the
 // request to cancel is made.
-//
-// An operation that is done may be deleted so that it is no longer listed as
+// - An operation that is done may be deleted so that it is no longer listed as
 // part of the Operation collection.
-//
-// ListOperations returns all pending operations, but not completed operations.
-//
-// Operations are created by service DatastoreAdmin,
-// but are accessed via service google.longrunning.Operations.
+// - ListOperations returns all pending operations, but not completed
+// operations.
+// - Operations are created by service DatastoreAdmin, but are accessed via
+// service google.longrunning.Operations.
 service DatastoreAdmin {
   option (google.api.default_host) = "datastore.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -107,12 +93,14 @@ service DatastoreAdmin {
   // used once the associated operation is done. If an export operation is
   // cancelled before completion it may leave partial data behind in Google
   // Cloud Storage.
-  rpc ExportEntities(ExportEntitiesRequest) returns (google.longrunning.Operation) {
+  rpc ExportEntities(ExportEntitiesRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1/projects/{project_id}:export"
       body: "*"
     };
-    option (google.api.method_signature) = "project_id,labels,entity_filter,output_url_prefix";
+    option (google.api.method_signature) =
+        "project_id,labels,entity_filter,output_url_prefix";
     option (google.longrunning.operation_info) = {
       response_type: "ExportEntitiesResponse"
       metadata_type: "ExportEntitiesMetadata"
@@ -124,12 +112,14 @@ service DatastoreAdmin {
   // progress can be monitored and managed via the Operation resource that is
   // created. If an ImportEntities operation is cancelled, it is possible
   // that a subset of the data has already been imported to Cloud Datastore.
-  rpc ImportEntities(ImportEntitiesRequest) returns (google.longrunning.Operation) {
+  rpc ImportEntities(ImportEntitiesRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1/projects/{project_id}:import"
       body: "*"
     };
-    option (google.api.method_signature) = "project_id,labels,input_url,entity_filter";
+    option (google.api.method_signature) =
+        "project_id,labels,input_url,entity_filter";
     option (google.longrunning.operation_info) = {
       response_type: "google.protobuf.Empty"
       metadata_type: "ImportEntitiesMetadata"
@@ -138,9 +128,9 @@ service DatastoreAdmin {
 
   // Creates the specified index.
   // A newly created index's initial state is `CREATING`. On completion of the
-  // returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`.
-  // If the index already exists, the call will return an `ALREADY_EXISTS`
-  // status.
+  // returned [google.longrunning.Operation][google.longrunning.Operation], the
+  // state will be `READY`. If the index already exists, the call will return an
+  // `ALREADY_EXISTS` status.
   //
   // During index creation, the process could result in an error, in which
   // case the index will move to the `ERROR` state. The process can be recovered
@@ -165,7 +155,8 @@ service DatastoreAdmin {
   // An index can only be deleted if it is in a `READY` or `ERROR` state. On
   // successful execution of the request, the index will be in a `DELETING`
   // [state][google.datastore.admin.v1.Index.State]. And on completion of the
-  // returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+  // returned [google.longrunning.Operation][google.longrunning.Operation], the
+  // index will be removed.
   //
   // During index deletion, the process could result in an error, in which
   // case the index will move to the `ERROR` state. The process can be recovered
@@ -283,8 +274,8 @@ message ExportEntitiesRequest {
   //
   // 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.
+  // [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.
@@ -300,8 +291,9 @@ message ImportEntitiesRequest {
   // Client-assigned labels.
   map labels = 2;
 
-  // Required. The full resource URL of the external storage location. Currently, only
-  // Google Cloud Storage is supported. So input_url should be of the form:
+  // Required. The full resource URL of the external storage location.
+  // Currently, only Google Cloud Storage is supported. So input_url should be
+  // of the form:
   // `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
   // `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
   // an optional Cloud Storage namespace path (this is not a Cloud Datastore
@@ -369,7 +361,9 @@ message ImportEntitiesMetadata {
   EntityFilter entity_filter = 4;
 
   // The location of the import metadata file. This will be the same value as
-  // the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+  // the
+  // [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url]
+  // field.
   string input_url = 5;
 }
 
@@ -427,7 +421,8 @@ message DeleteIndexRequest {
   string index_id = 3;
 }
 
-// The request for [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.GetIndex][google.datastore.admin.v1.DatastoreAdmin.GetIndex].
 message GetIndexRequest {
   // Project ID against which to make the request.
   string project_id = 1;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
index 4eeffc7e4127..60bb5af5f588 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -60,7 +60,8 @@ message Index {
     // Required. The property name to index.
     string name = 1 [(google.api.field_behavior) = REQUIRED];
 
-    // Required. The indexed property's direction.  Must not be DIRECTION_UNSPECIFIED.
+    // Required. The indexed property's direction.  Must not be
+    // DIRECTION_UNSPECIFIED.
     Direction direction = 2 [(google.api.field_behavior) = REQUIRED];
   }
 
@@ -104,11 +105,17 @@ message Index {
   // Required. The entity kind to which this index applies.
   string kind = 4 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The index's ancestor mode.  Must not be ANCESTOR_MODE_UNSPECIFIED.
+  // Required. The index's ancestor mode.  Must not be
+  // ANCESTOR_MODE_UNSPECIFIED.
   AncestorMode ancestor = 5 [(google.api.field_behavior) = REQUIRED];
 
   // Required. An ordered sequence of property names and their index attributes.
-  repeated IndexedProperty properties = 6 [(google.api.field_behavior) = REQUIRED];
+  //
+  // Requires:
+  //
+  // * A maximum of 100 properties.
+  repeated IndexedProperty properties = 6
+      [(google.api.field_behavior) = REQUIRED];
 
   // Output only. The state of the index.
   State state = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
index f47cb70e1adb..e5f7477da6e6 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

From b0d8e7201ee5718844e6d4b609d2fd9fd4f8dc2b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 1 Aug 2023 18:37:30 +0200
Subject: [PATCH 1194/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.21.0 (#1156)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.21.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index de469400faa7..dc2f829a0505 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.20.0
+      26.21.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.20.0')
+implementation platform('com.google.cloud:libraries-bom:26.21.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 02d6fb6f1cd4..27eb766cd9b8 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.20.0
+        26.21.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 707f62a60dbe..3cc8b54f5062 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.20.0
+        26.21.0
         pom
         import
       

From fcf07d4b5b1f949f1d6b46861406cef88a9a052b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 2 Aug 2023 16:06:04 +0200
Subject: [PATCH 1195/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.14.0 (#1159)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7edc3899309..bcd6a361b824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.13.1
+        3.14.0
         pom
         import
       

From 08dbb3ab98870f74b78caa7d160271fccc134ae9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 2 Aug 2023 16:06:35 +0200
Subject: [PATCH 1196/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.21.0 (#1158)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bcd6a361b824..12fa5daab46b 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.20.0
+    2.21.0
   
 
   

From 5fe575abb80cbb7cf6f38138b2d1de3cb0129171 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 14:20:15 +0000
Subject: [PATCH 1197/1784] chore(main): release 2.16.3 (#1155)

:robot: I have created a release *beep* *boop*
---


## [2.16.3](https://togithub.com/googleapis/java-datastore/compare/v2.16.2...v2.16.3) (2023-08-02)


### Documentation

* Specify limit for `properties` in `Index` message in Datastore Admin API ([#1149](https://togithub.com/googleapis/java-datastore/issues/1149)) ([00a696d](https://togithub.com/googleapis/java-datastore/commit/00a696d5e0fe2ffe6c9e02abd902d1b533265310))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.14.0 ([#1159](https://togithub.com/googleapis/java-datastore/issues/1159)) ([fcf07d4](https://togithub.com/googleapis/java-datastore/commit/fcf07d4b5b1f949f1d6b46861406cef88a9a052b))
* Update dependency com.google.errorprone:error_prone_core to v2.21.0 ([#1158](https://togithub.com/googleapis/java-datastore/issues/1158)) ([08dbb3a](https://togithub.com/googleapis/java-datastore/commit/08dbb3ab98870f74b78caa7d160271fccc134ae9))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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, 40 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04cb278e3caa..2e93a5bec505 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.16.3](https://github.com/googleapis/java-datastore/compare/v2.16.2...v2.16.3) (2023-08-02)
+
+
+### Documentation
+
+* Specify limit for `properties` in `Index` message in Datastore Admin API ([#1149](https://github.com/googleapis/java-datastore/issues/1149)) ([00a696d](https://github.com/googleapis/java-datastore/commit/00a696d5e0fe2ffe6c9e02abd902d1b533265310))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.14.0 ([#1159](https://github.com/googleapis/java-datastore/issues/1159)) ([fcf07d4](https://github.com/googleapis/java-datastore/commit/fcf07d4b5b1f949f1d6b46861406cef88a9a052b))
+* Update dependency com.google.errorprone:error_prone_core to v2.21.0 ([#1158](https://github.com/googleapis/java-datastore/issues/1158)) ([08dbb3a](https://github.com/googleapis/java-datastore/commit/08dbb3ab98870f74b78caa7d160271fccc134ae9))
+
 ## [2.16.2](https://github.com/googleapis/java-datastore/compare/v2.16.1...v2.16.2) (2023-07-25)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4b523a0aa21f..68cc9caab259 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.16.3-SNAPSHOT
+  2.16.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3-SNAPSHOT
+    2.16.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3d340ccee8c7..075a69690c04 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.16.3-SNAPSHOT
+  2.16.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.3-SNAPSHOT
+        2.16.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.3-SNAPSHOT
+        2.16.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.3-SNAPSHOT
+        0.107.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.3-SNAPSHOT
+        2.16.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 242ed91d467c..bd028efa1964 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.3-SNAPSHOT
+  2.16.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3-SNAPSHOT
+    2.16.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index ac60f132fd89..e366f10cf5e6 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.16.3-SNAPSHOT
+  2.16.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3-SNAPSHOT
+    2.16.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 12fa5daab46b..2f8538f255db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.3-SNAPSHOT
+  2.16.3
   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.16.3-SNAPSHOT
+        2.16.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.3-SNAPSHOT
+        2.16.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.3-SNAPSHOT
+        2.16.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.3-SNAPSHOT
+        0.107.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.3-SNAPSHOT
+        2.16.3
         
           
             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 bc1aebeddbdd..2acce5700c3b 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.16.3-SNAPSHOT
+  2.16.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3-SNAPSHOT
+    2.16.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b1d9c78f7c8a..d7cf86b20bfc 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.107.3-SNAPSHOT
+  0.107.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3-SNAPSHOT
+    2.16.3
   
   
     
diff --git a/versions.txt b/versions.txt
index 28992e67421f..89e0932a12af 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.2:2.16.3-SNAPSHOT
-google-cloud-datastore-bom:2.16.2:2.16.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.107.2:0.107.3-SNAPSHOT
-datastore-v1-proto-client:2.16.2:2.16.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.16.2:2.16.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.16.2:2.16.3-SNAPSHOT
+google-cloud-datastore:2.16.3:2.16.3
+google-cloud-datastore-bom:2.16.3:2.16.3
+proto-google-cloud-datastore-v1:0.107.3:0.107.3
+datastore-v1-proto-client:2.16.3:2.16.3
+proto-google-cloud-datastore-admin-v1:2.16.3:2.16.3
+grpc-google-cloud-datastore-admin-v1:2.16.3:2.16.3

From e9c28c745d0b67d5f8a13de8209c986b36705536 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 2 Aug 2023 18:34:40 +0200
Subject: [PATCH 1198/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.16.3 (#1162)
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.16.3

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index dc2f829a0505..3ce73b13c8a7 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.16.2
+  2.16.3
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.16.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.16.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.3"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index b86bc132f30f..0097db7b4680 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.16.2
+      2.16.3
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 185ffb8ab6ac..dbdadb49c5c1 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.16.2
+      2.16.3
     
 
     

From eb25599825899797a1458cb2eb133b7ce5a1ff48 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:56:13 +0000
Subject: [PATCH 1199/1784] chore(main): release 2.16.4-SNAPSHOT (#1161)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 68cc9caab259..b9164735f238 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.16.3
+  2.16.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3
+    2.16.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 075a69690c04..a8c083832789 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.16.3
+  2.16.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.3
+        2.16.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.3
+        2.16.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.3
+        0.107.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.3
+        2.16.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index bd028efa1964..ca6c1b18888b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.3
+  2.16.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3
+    2.16.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index e366f10cf5e6..e6a34928d200 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.16.3
+  2.16.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3
+    2.16.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 2f8538f255db..25ae9cc94a09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.3
+  2.16.4-SNAPSHOT
   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.16.3
+        2.16.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.3
+        2.16.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.3
+        2.16.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.3
+        0.107.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.3
+        2.16.4-SNAPSHOT
         
           
             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 2acce5700c3b..b81ca75c69e4 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.16.3
+  2.16.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3
+    2.16.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d7cf86b20bfc..86f9b3e5abf2 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.107.3
+  0.107.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.3
+    2.16.4-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index 89e0932a12af..d53b6fd27304 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.3:2.16.3
-google-cloud-datastore-bom:2.16.3:2.16.3
-proto-google-cloud-datastore-v1:0.107.3:0.107.3
-datastore-v1-proto-client:2.16.3:2.16.3
-proto-google-cloud-datastore-admin-v1:2.16.3:2.16.3
-grpc-google-cloud-datastore-admin-v1:2.16.3:2.16.3
+google-cloud-datastore:2.16.3:2.16.4-SNAPSHOT
+google-cloud-datastore-bom:2.16.3:2.16.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.107.3:0.107.4-SNAPSHOT
+datastore-v1-proto-client:2.16.3:2.16.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.16.3:2.16.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.16.3:2.16.4-SNAPSHOT

From 83158b6172a4a61b3e2a86dea6271ff7f9f84f6b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 7 Aug 2023 17:28:44 +0200
Subject: [PATCH 1200/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.21.1 (#1163)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 25ae9cc94a09..7fa465710da0 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.21.0
+    2.21.1
   
 
   

From 70cc371babd674000fe6f8d78a0f42e75deb5d99 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 8 Aug 2023 16:53:49 +0200
Subject: [PATCH 1201/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.24 (#1166)

---
 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 27eb766cd9b8..f69d63ba3494 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.23
+            0.9.24
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 4094c702982e4a005a36324892daee451bd16062 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 8 Aug 2023 16:54:06 +0200
Subject: [PATCH 1202/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.24 (#1165)

---
 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 f69d63ba3494..d29def59908c 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.23
+          0.9.24
           test
         
       

From c8cc09a557a9afe18ce8adbef10e58c68e472b41 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 14 Aug 2023 15:36:45 +0200
Subject: [PATCH 1203/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.22.0 (#1168)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.22.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3ce73b13c8a7..662c0b5e4a38 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.21.0
+      26.22.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.21.0')
+implementation platform('com.google.cloud:libraries-bom:26.22.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index d29def59908c..1269932bcf46 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.21.0
+        26.22.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 3cc8b54f5062..eb806662d44e 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.21.0
+        26.22.0
         pom
         import
       

From 954320aaefec249c77c757a1610727519a4029bd Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 12:07:17 +0530
Subject: [PATCH 1204/1784] feat: publish proto definitions for SUM/AVG in
 Datastore (#1157)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: publish proto definitions for SUM/AVG in Datastore

PiperOrigin-RevId: 552847139

Source-Link: https://github.com/googleapis/googleapis/commit/6148e5b6f91abc8d2f6e246e9608bf92ffb408bd

Source-Link: https://github.com/googleapis/googleapis-gen/commit/96be51b995047bfdef4825178539e238583101a9
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTZiZTUxYjk5NTA0N2JmZGVmNDgyNTE3ODUzOWUyMzg1ODMxMDFhOSJ9

* 🦉 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 
---
 .../google/datastore/v1/AggregationQuery.java | 3454 ++++++++++++++---
 .../google/datastore/v1/PropertyFilter.java   |   18 +-
 .../com/google/datastore/v1/QueryProto.java   |  155 +-
 .../com/google/datastore/v1/ReadOptions.java  |  108 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |   27 +-
 .../datastore/v1/TransactionOptions.java      |   75 +-
 .../proto/google/datastore/v1/datastore.proto |   14 +-
 .../proto/google/datastore/v1/query.proto     |   57 +-
 8 files changed, 3147 insertions(+), 761 deletions(-)

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 391b9a2b929c..762c9713ce56 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
@@ -103,6 +103,76 @@ public interface AggregationOrBuilder
      */
     com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCountOrBuilder();
 
+    /**
+     *
+     *
+     * 
    +     * Sum aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+     *
+     * @return Whether the sum field is set.
+     */
+    boolean hasSum();
+    /**
+     *
+     *
+     * 
    +     * Sum aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+     *
+     * @return The sum.
+     */
+    com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum();
+    /**
+     *
+     *
+     * 
    +     * Sum aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+     */
+    com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumOrBuilder();
+
+    /**
+     *
+     *
+     * 
    +     * Average aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
+     *
+     * @return Whether the avg field is set.
+     */
+    boolean hasAvg();
+    /**
+     *
+     *
+     * 
    +     * Average aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
+     *
+     * @return The avg.
+     */
+    com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg();
+    /**
+     *
+     *
+     * 
    +     * Average aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
+     */
+    com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgOrBuilder();
+
     /**
      *
      *
@@ -1279,744 +1349,2879 @@ public com.google.protobuf.Parser getParserForType() {
       }
     }
 
-    private int operatorCase_ = 0;
-
-    @SuppressWarnings("serial")
-    private java.lang.Object operator_;
-
-    public enum OperatorCase
-        implements
-            com.google.protobuf.Internal.EnumLite,
-            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      COUNT(1),
-      OPERATOR_NOT_SET(0);
-      private final int value;
+    public interface SumOrBuilder
+        extends
+        // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery.Aggregation.Sum)
+        com.google.protobuf.MessageOrBuilder {
 
-      private OperatorCase(int value) {
-        this.value = value;
-      }
       /**
-       * @param value The number of the enum to look for.
-       * @return The enum associated with the given number.
-       * @deprecated Use {@link #forNumber(int)} instead.
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return Whether the property field is set.
        */
-      @java.lang.Deprecated
-      public static OperatorCase valueOf(int value) {
-        return forNumber(value);
-      }
-
-      public static OperatorCase forNumber(int value) {
-        switch (value) {
-          case 1:
-            return COUNT;
-          case 0:
-            return OPERATOR_NOT_SET;
-          default:
-            return null;
-        }
-      }
-
-      public int getNumber() {
-        return this.value;
-      }
-    };
-
-    public OperatorCase getOperatorCase() {
-      return OperatorCase.forNumber(operatorCase_);
+      boolean hasProperty();
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return The property.
+       */
+      com.google.datastore.v1.PropertyReference getProperty();
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       */
+      com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
     }
-
-    public static final int COUNT_FIELD_NUMBER = 1;
     /**
      *
      *
      * 
    -     * Count aggregator.
-     * 
    
-     *
-     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
-     *
-     * @return Whether the count field is set.
-     */
-    @java.lang.Override
-    public boolean hasCount() {
-      return operatorCase_ == 1;
-    }
-    /**
+     * Sum of the values of the requested property.
      *
+     * * Only numeric values will be aggregated. All non-numeric values
+     * including `NULL` are skipped.
      *
-     * 
    -     * Count aggregator.
-     * 
    
-     *
-     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     * * If the aggregated values contain `NaN`, returns `NaN`. Infinity math
+     * follows IEEE-754 standards.
      *
-     * @return The count.
-     */
-    @java.lang.Override
-    public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
-      if (operatorCase_ == 1) {
-        return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
-      }
-      return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
-    }
-    /**
+     * * If the aggregated value set is empty, returns 0.
      *
+     * * Returns a 64-bit integer if all aggregated numbers are integers and the
+     * sum result does not overflow. Otherwise, the result is returned as a
+     * double. Note that even if all the aggregated values are integers, the
+     * result is returned as a double if it cannot fit within a 64-bit signed
+     * integer. When this occurs, the returned value will lose precision.
      *
-     * 
    -     * Count aggregator.
+     * * When underflow occurs, floating-point aggregation is non-deterministic.
+     * This means that running the same query repeatedly without any changes to
+     * the underlying values could produce slightly different results each
+     * time. In those cases, values should be stored as integers over
+     * floating-point numbers.
      * 
    
      *
-     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Sum}
      */
-    @java.lang.Override
-    public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCountOrBuilder() {
-      if (operatorCase_ == 1) {
-        return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+    public static final class Sum extends com.google.protobuf.GeneratedMessageV3
+        implements
+        // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Sum)
+        SumOrBuilder {
+      private static final long serialVersionUID = 0L;
+      // Use Sum.newBuilder() to construct.
+      private Sum(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+        super(builder);
       }
-      return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
-    }
 
-    public static final int ALIAS_FIELD_NUMBER = 7;
+      private Sum() {}
 
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object alias_ = "";
-    /**
-     *
-     *
-     * 
    -     * 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,
-     *   COUNT_UP_TO(2),
-     *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT(*)
-     * OVER (
-     *   ...
-     * );
-     * ```
-     *
-     * becomes:
-     *
-     * ```
-     * AGGREGATE
-     *   COUNT_UP_TO(1) AS count_up_to_1,
-     *   COUNT_UP_TO(2) AS property_1,
-     *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT(*) AS property_2
-     * OVER (
-     *   ...
-     * );
-     * ```
-     *
-     * Requires:
-     *
-     * * Must be unique across all aggregation aliases.
-     * * Conform to [entity property
-     * name][google.datastore.v1.Entity.properties] limitations.
-     * 
    
-     *
-     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
-     *
-     * @return The alias.
-     */
-    @java.lang.Override
-    public java.lang.String getAlias() {
-      java.lang.Object ref = alias_;
-      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();
-        alias_ = s;
-        return s;
+      @java.lang.Override
+      @SuppressWarnings({"unused"})
+      protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+        return new Sum();
       }
-    }
-    /**
-     *
-     *
-     * 
    -     * 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,
-     *   COUNT_UP_TO(2),
-     *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT(*)
-     * OVER (
-     *   ...
-     * );
-     * ```
-     *
-     * becomes:
-     *
-     * ```
-     * AGGREGATE
-     *   COUNT_UP_TO(1) AS count_up_to_1,
-     *   COUNT_UP_TO(2) AS property_1,
-     *   COUNT_UP_TO(3) AS count_up_to_3,
-     *   COUNT(*) AS property_2
-     * OVER (
-     *   ...
-     * );
-     * ```
-     *
-     * Requires:
-     *
-     * * Must be unique across all aggregation aliases.
-     * * Conform to [entity property
-     * name][google.datastore.v1.Entity.properties] limitations.
-     * 
    
-     *
-     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
-     *
-     * @return The bytes for alias.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getAliasBytes() {
-      java.lang.Object ref = alias_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-        alias_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
+
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_descriptor;
       }
-    }
 
-    private byte memoizedIsInitialized = -1;
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.v1.AggregationQuery.Aggregation.Sum.class,
+                com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder.class);
+      }
 
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      public static final int PROPERTY_FIELD_NUMBER = 1;
+      private com.google.datastore.v1.PropertyReference property_;
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return Whether the property field is set.
+       */
+      @java.lang.Override
+      public boolean hasProperty() {
+        return property_ != null;
+      }
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return The property.
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.PropertyReference getProperty() {
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
+      }
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
+      }
 
-      memoizedIsInitialized = 1;
-      return true;
-    }
+      private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (operatorCase_ == 1) {
-        output.writeMessage(
-            1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_);
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        memoizedIsInitialized = 1;
+        return true;
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, alias_);
+
+      @java.lang.Override
+      public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+        if (property_ != null) {
+          output.writeMessage(1, getProperty());
+        }
+        getUnknownFields().writeTo(output);
       }
-      getUnknownFields().writeTo(output);
-    }
 
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
 
-      size = 0;
-      if (operatorCase_ == 1) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeMessageSize(
-                1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, alias_);
+        size = 0;
+        if (property_ != null) {
+          size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
+        }
+        size += getUnknownFields().getSerializedSize();
+        memoizedSize = size;
+        return size;
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+          return true;
+        }
+        if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation.Sum)) {
+          return super.equals(obj);
+        }
+        com.google.datastore.v1.AggregationQuery.Aggregation.Sum other =
+            (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) obj;
+
+        if (hasProperty() != other.hasProperty()) return false;
+        if (hasProperty()) {
+          if (!getProperty().equals(other.getProperty())) return false;
+        }
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
-      if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation)) {
-        return super.equals(obj);
-      }
-      com.google.datastore.v1.AggregationQuery.Aggregation other =
-          (com.google.datastore.v1.AggregationQuery.Aggregation) obj;
 
-      if (!getAlias().equals(other.getAlias())) return false;
-      if (!getOperatorCase().equals(other.getOperatorCase())) return false;
-      switch (operatorCase_) {
-        case 1:
-          if (!getCount().equals(other.getCount())) return false;
-          break;
-        case 0:
-        default:
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        if (hasProperty()) {
+          hash = (37 * hash) + PROPERTY_FIELD_NUMBER;
+          hash = (53 * hash) + getProperty().hashCode();
+        }
+        hash = (29 * hash) + getUnknownFields().hashCode();
+        memoizedHashCode = hash;
+        return hash;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
-      return true;
-    }
 
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
       }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ALIAS_FIELD_NUMBER;
-      hash = (53 * hash) + getAlias().hashCode();
-      switch (operatorCase_) {
-        case 1:
-          hash = (37 * hash) + COUNT_FIELD_NUMBER;
-          hash = (53 * hash) + getCount().hashCode();
-          break;
-        case 0:
-        default:
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          java.io.InputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseDelimitedFrom(
+          java.io.InputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseDelimitedFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+            PARSER, input, extensionRegistry);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
-    }
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      }
 
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-
-    public static Builder newBuilder(
-        com.google.datastore.v1.AggregationQuery.Aggregation prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     *
-     *
-     * 
    -     * Defines an aggregation that produces a single result.
-     * 
    
-     *
-     * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
-     */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder
-        implements
-        // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation)
-        com.google.datastore.v1.AggregationQuery.AggregationOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.datastore.v1.QueryProto
-            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
       }
 
       @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.datastore.v1.QueryProto
-            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.datastore.v1.AggregationQuery.Aggregation.class,
-                com.google.datastore.v1.AggregationQuery.Aggregation.Builder.class);
+      public Builder newBuilderForType() {
+        return newBuilder();
       }
 
-      // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.newBuilder()
-      private Builder() {}
-
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
       }
 
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        bitField0_ = 0;
-        if (countBuilder_ != null) {
-          countBuilder_.clear();
-        }
-        alias_ = "";
-        operatorCase_ = 0;
-        operator_ = null;
-        return this;
+      public static Builder newBuilder(
+          com.google.datastore.v1.AggregationQuery.Aggregation.Sum prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.datastore.v1.QueryProto
-            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
       }
 
       @java.lang.Override
-      public com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstanceForType() {
-        return com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance();
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
       }
+      /**
+       *
+       *
+       * 
    +       * Sum of the values of the requested property.
+       *
+       * * Only numeric values will be aggregated. All non-numeric values
+       * including `NULL` are skipped.
+       *
+       * * If the aggregated values contain `NaN`, returns `NaN`. Infinity math
+       * follows IEEE-754 standards.
+       *
+       * * If the aggregated value set is empty, returns 0.
+       *
+       * * Returns a 64-bit integer if all aggregated numbers are integers and the
+       * sum result does not overflow. Otherwise, the result is returned as a
+       * double. Note that even if all the aggregated values are integers, the
+       * result is returned as a double if it cannot fit within a 64-bit signed
+       * integer. When this occurs, the returned value will lose precision.
+       *
+       * * When underflow occurs, floating-point aggregation is non-deterministic.
+       * This means that running the same query repeatedly without any changes to
+       * the underlying values could produce slightly different results each
+       * time. In those cases, values should be stored as integers over
+       * floating-point numbers.
+       * 
    
+       *
+       * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Sum}
+       */
+      public static final class Builder
+          extends com.google.protobuf.GeneratedMessageV3.Builder
+          implements
+          // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation.Sum)
+          com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_descriptor;
+        }
 
-      @java.lang.Override
-      public com.google.datastore.v1.AggregationQuery.Aggregation build() {
-        com.google.datastore.v1.AggregationQuery.Aggregation result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Sum.class,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder.class);
         }
-        return result;
-      }
 
-      @java.lang.Override
-      public com.google.datastore.v1.AggregationQuery.Aggregation buildPartial() {
-        com.google.datastore.v1.AggregationQuery.Aggregation result =
-            new com.google.datastore.v1.AggregationQuery.Aggregation(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.Sum.newBuilder()
+        private Builder() {}
+
+        private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          super(parent);
         }
-        buildPartialOneofs(result);
-        onBuilt();
-        return result;
-      }
 
-      private void buildPartial0(com.google.datastore.v1.AggregationQuery.Aggregation result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.alias_ = alias_;
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          bitField0_ = 0;
+          property_ = null;
+          if (propertyBuilder_ != null) {
+            propertyBuilder_.dispose();
+            propertyBuilder_ = null;
+          }
+          return this;
         }
-      }
 
-      private void buildPartialOneofs(com.google.datastore.v1.AggregationQuery.Aggregation result) {
-        result.operatorCase_ = operatorCase_;
-        result.operator_ = this.operator_;
-        if (operatorCase_ == 1 && countBuilder_ != null) {
-          result.operator_ = countBuilder_.build();
+        @java.lang.Override
+        public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_descriptor;
         }
-      }
 
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Sum
+            getDefaultInstanceForType() {
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
+        }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return super.setField(field, value);
-      }
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Sum build() {
+          com.google.datastore.v1.AggregationQuery.Aggregation.Sum result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
 
-      @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Sum buildPartial() {
+          com.google.datastore.v1.AggregationQuery.Aggregation.Sum result =
+              new com.google.datastore.v1.AggregationQuery.Aggregation.Sum(this);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
 
-      @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
+        private void buildPartial0(
+            com.google.datastore.v1.AggregationQuery.Aggregation.Sum result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+          }
+        }
 
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
 
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-        return super.addRepeatedField(field, value);
+        @java.lang.Override
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.setField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+
+        @java.lang.Override
+        public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+
+        @java.lang.Override
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index,
+            java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+
+        @java.lang.Override
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof com.google.datastore.v1.AggregationQuery.Aggregation.Sum) {
+            return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation.Sum) other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation.Sum other) {
+          if (other
+              == com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance())
+            return this;
+          if (other.hasProperty()) {
+            mergeProperty(other.getProperty());
+          }
+          this.mergeUnknownFields(other.getUnknownFields());
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
+          try {
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10:
+                  {
+                    input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
+                    bitField0_ |= 0x00000001;
+                    break;
+                  } // case 10
+                default:
+                  {
+                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                      done = true; // was an endgroup tag
+                    }
+                    break;
+                  } // default:
+              } // switch (tag)
+            } // while (!done)
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.unwrapIOException();
+          } finally {
+            onChanged();
+          } // finally
+          return this;
+        }
+
+        private int bitField0_;
+
+        private com.google.datastore.v1.PropertyReference property_;
+        private com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>
+            propertyBuilder_;
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         *
+         * @return Whether the property field is set.
+         */
+        public boolean hasProperty() {
+          return ((bitField0_ & 0x00000001) != 0);
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         *
+         * @return The property.
+         */
+        public com.google.datastore.v1.PropertyReference getProperty() {
+          if (propertyBuilder_ == null) {
+            return property_ == null
+                ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+                : property_;
+          } else {
+            return propertyBuilder_.getMessage();
+          }
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
+          if (propertyBuilder_ == null) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            property_ = value;
+          } else {
+            propertyBuilder_.setMessage(value);
+          }
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder setProperty(
+            com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+          if (propertyBuilder_ == null) {
+            property_ = builderForValue.build();
+          } else {
+            propertyBuilder_.setMessage(builderForValue.build());
+          }
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
+          if (propertyBuilder_ == null) {
+            if (((bitField0_ & 0x00000001) != 0)
+                && property_ != null
+                && property_ != com.google.datastore.v1.PropertyReference.getDefaultInstance()) {
+              getPropertyBuilder().mergeFrom(value);
+            } else {
+              property_ = value;
+            }
+          } else {
+            propertyBuilder_.mergeFrom(value);
+          }
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder clearProperty() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          property_ = null;
+          if (propertyBuilder_ != null) {
+            propertyBuilder_.dispose();
+            propertyBuilder_ = null;
+          }
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return getPropertyFieldBuilder().getBuilder();
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
+          if (propertyBuilder_ != null) {
+            return propertyBuilder_.getMessageOrBuilder();
+          } else {
+            return property_ == null
+                ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+                : property_;
+          }
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        private com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>
+            getPropertyFieldBuilder() {
+          if (propertyBuilder_ == null) {
+            propertyBuilder_ =
+                new com.google.protobuf.SingleFieldBuilderV3<
+                    com.google.datastore.v1.PropertyReference,
+                    com.google.datastore.v1.PropertyReference.Builder,
+                    com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                    getProperty(), getParentForChildren(), isClean());
+            property_ = null;
+          }
+          return propertyBuilder_;
+        }
+
+        @java.lang.Override
+        public final Builder setUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.setUnknownFields(unknownFields);
+        }
+
+        @java.lang.Override
+        public final Builder mergeUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.mergeUnknownFields(unknownFields);
+        }
+
+        // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery.Aggregation.Sum)
+      }
+
+      // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery.Aggregation.Sum)
+      private static final com.google.datastore.v1.AggregationQuery.Aggregation.Sum
+          DEFAULT_INSTANCE;
+
+      static {
+        DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery.Aggregation.Sum();
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Sum getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser PARSER =
+          new com.google.protobuf.AbstractParser() {
+            @java.lang.Override
+            public Sum parsePartialFrom(
+                com.google.protobuf.CodedInputStream input,
+                com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+              Builder builder = newBuilder();
+              try {
+                builder.mergeFrom(input, extensionRegistry);
+              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+                throw e.setUnfinishedMessage(builder.buildPartial());
+              } catch (com.google.protobuf.UninitializedMessageException e) {
+                throw e.asInvalidProtocolBufferException()
+                    .setUnfinishedMessage(builder.buildPartial());
+              } catch (java.io.IOException e) {
+                throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                    .setUnfinishedMessage(builder.buildPartial());
+              }
+              return builder.buildPartial();
+            }
+          };
+
+      public static com.google.protobuf.Parser parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Sum getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+    }
+
+    public interface AvgOrBuilder
+        extends
+        // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery.Aggregation.Avg)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return Whether the property field is set.
+       */
+      boolean hasProperty();
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return The property.
+       */
+      com.google.datastore.v1.PropertyReference getProperty();
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       */
+      com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Average of the values of the requested property.
+     *
+     * * Only numeric values will be aggregated. All non-numeric values
+     * including `NULL` are skipped.
+     *
+     * * If the aggregated values contain `NaN`, returns `NaN`. Infinity math
+     * follows IEEE-754 standards.
+     *
+     * * If the aggregated value set is empty, returns `NULL`.
+     *
+     * * Always returns the result as a double.
+     * 
    
+     *
+     * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Avg}
+     */
+    public static final class Avg extends com.google.protobuf.GeneratedMessageV3
+        implements
+        // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Avg)
+        AvgOrBuilder {
+      private static final long serialVersionUID = 0L;
+      // Use Avg.newBuilder() to construct.
+      private Avg(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+        super(builder);
+      }
+
+      private Avg() {}
+
+      @java.lang.Override
+      @SuppressWarnings({"unused"})
+      protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+        return new Avg();
+      }
+
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.v1.AggregationQuery.Aggregation.Avg.class,
+                com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder.class);
+      }
+
+      public static final int PROPERTY_FIELD_NUMBER = 1;
+      private com.google.datastore.v1.PropertyReference property_;
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return Whether the property field is set.
+       */
+      @java.lang.Override
+      public boolean hasProperty() {
+        return property_ != null;
+      }
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       *
+       * @return The property.
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.PropertyReference getProperty() {
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
+      }
+      /**
+       *
+       *
+       * 
    +       * The property to aggregate on.
+       * 
    
+       *
+       * .google.datastore.v1.PropertyReference property = 1;
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
+        return property_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : property_;
+      }
+
+      private byte memoizedIsInitialized = -1;
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      @java.lang.Override
+      public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+        if (property_ != null) {
+          output.writeMessage(1, getProperty());
+        }
+        getUnknownFields().writeTo(output);
+      }
+
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (property_ != null) {
+          size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
+        }
+        size += getUnknownFields().getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+          return true;
+        }
+        if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation.Avg)) {
+          return super.equals(obj);
+        }
+        com.google.datastore.v1.AggregationQuery.Aggregation.Avg other =
+            (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) obj;
+
+        if (hasProperty() != other.hasProperty()) return false;
+        if (hasProperty()) {
+          if (!getProperty().equals(other.getProperty())) return false;
+        }
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        return true;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        if (hasProperty()) {
+          hash = (37 * hash) + PROPERTY_FIELD_NUMBER;
+          hash = (53 * hash) + getProperty().hashCode();
+        }
+        hash = (29 * hash) + getUnknownFields().hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          java.io.InputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseDelimitedFrom(
+          java.io.InputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseDelimitedFrom(
+          java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      @java.lang.Override
+      public Builder newBuilderForType() {
+        return newBuilder();
+      }
+
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+
+      public static Builder newBuilder(
+          com.google.datastore.v1.AggregationQuery.Aggregation.Avg prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+
+      @java.lang.Override
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       *
+       *
+       * 
    +       * Average of the values of the requested property.
+       *
+       * * Only numeric values will be aggregated. All non-numeric values
+       * including `NULL` are skipped.
+       *
+       * * If the aggregated values contain `NaN`, returns `NaN`. Infinity math
+       * follows IEEE-754 standards.
+       *
+       * * If the aggregated value set is empty, returns `NULL`.
+       *
+       * * Always returns the result as a double.
+       * 
    
+       *
+       * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Avg}
+       */
+      public static final class Builder
+          extends com.google.protobuf.GeneratedMessageV3.Builder
+          implements
+          // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation.Avg)
+          com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_descriptor;
+        }
+
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Avg.class,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder.class);
+        }
+
+        // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.Avg.newBuilder()
+        private Builder() {}
+
+        private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          super(parent);
+        }
+
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          bitField0_ = 0;
+          property_ = null;
+          if (propertyBuilder_ != null) {
+            propertyBuilder_.dispose();
+            propertyBuilder_ = null;
+          }
+          return this;
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+          return com.google.datastore.v1.QueryProto
+              .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_descriptor;
+        }
+
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Avg
+            getDefaultInstanceForType() {
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
+        }
+
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Avg build() {
+          com.google.datastore.v1.AggregationQuery.Aggregation.Avg result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        @java.lang.Override
+        public com.google.datastore.v1.AggregationQuery.Aggregation.Avg buildPartial() {
+          com.google.datastore.v1.AggregationQuery.Aggregation.Avg result =
+              new com.google.datastore.v1.AggregationQuery.Aggregation.Avg(this);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(
+            com.google.datastore.v1.AggregationQuery.Aggregation.Avg result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+          }
+        }
+
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
+
+        @java.lang.Override
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.setField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+
+        @java.lang.Override
+        public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+
+        @java.lang.Override
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index,
+            java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+
+        @java.lang.Override
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof com.google.datastore.v1.AggregationQuery.Aggregation.Avg) {
+            return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation.Avg) other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation.Avg other) {
+          if (other
+              == com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance())
+            return this;
+          if (other.hasProperty()) {
+            mergeProperty(other.getProperty());
+          }
+          this.mergeUnknownFields(other.getUnknownFields());
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
+          try {
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10:
+                  {
+                    input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry);
+                    bitField0_ |= 0x00000001;
+                    break;
+                  } // case 10
+                default:
+                  {
+                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                      done = true; // was an endgroup tag
+                    }
+                    break;
+                  } // default:
+              } // switch (tag)
+            } // while (!done)
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.unwrapIOException();
+          } finally {
+            onChanged();
+          } // finally
+          return this;
+        }
+
+        private int bitField0_;
+
+        private com.google.datastore.v1.PropertyReference property_;
+        private com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>
+            propertyBuilder_;
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         *
+         * @return Whether the property field is set.
+         */
+        public boolean hasProperty() {
+          return ((bitField0_ & 0x00000001) != 0);
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         *
+         * @return The property.
+         */
+        public com.google.datastore.v1.PropertyReference getProperty() {
+          if (propertyBuilder_ == null) {
+            return property_ == null
+                ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+                : property_;
+          } else {
+            return propertyBuilder_.getMessage();
+          }
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
+          if (propertyBuilder_ == null) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            property_ = value;
+          } else {
+            propertyBuilder_.setMessage(value);
+          }
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder setProperty(
+            com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+          if (propertyBuilder_ == null) {
+            property_ = builderForValue.build();
+          } else {
+            propertyBuilder_.setMessage(builderForValue.build());
+          }
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
+          if (propertyBuilder_ == null) {
+            if (((bitField0_ & 0x00000001) != 0)
+                && property_ != null
+                && property_ != com.google.datastore.v1.PropertyReference.getDefaultInstance()) {
+              getPropertyBuilder().mergeFrom(value);
+            } else {
+              property_ = value;
+            }
+          } else {
+            propertyBuilder_.mergeFrom(value);
+          }
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public Builder clearProperty() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          property_ = null;
+          if (propertyBuilder_ != null) {
+            propertyBuilder_.dispose();
+            propertyBuilder_ = null;
+          }
+          onChanged();
+          return this;
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return getPropertyFieldBuilder().getBuilder();
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
+          if (propertyBuilder_ != null) {
+            return propertyBuilder_.getMessageOrBuilder();
+          } else {
+            return property_ == null
+                ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+                : property_;
+          }
+        }
+        /**
+         *
+         *
+         * 
    +         * The property to aggregate on.
+         * 
    
+         *
+         * .google.datastore.v1.PropertyReference property = 1;
+         */
+        private com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>
+            getPropertyFieldBuilder() {
+          if (propertyBuilder_ == null) {
+            propertyBuilder_ =
+                new com.google.protobuf.SingleFieldBuilderV3<
+                    com.google.datastore.v1.PropertyReference,
+                    com.google.datastore.v1.PropertyReference.Builder,
+                    com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                    getProperty(), getParentForChildren(), isClean());
+            property_ = null;
+          }
+          return propertyBuilder_;
+        }
+
+        @java.lang.Override
+        public final Builder setUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.setUnknownFields(unknownFields);
+        }
+
+        @java.lang.Override
+        public final Builder mergeUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.mergeUnknownFields(unknownFields);
+        }
+
+        // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery.Aggregation.Avg)
+      }
+
+      // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery.Aggregation.Avg)
+      private static final com.google.datastore.v1.AggregationQuery.Aggregation.Avg
+          DEFAULT_INSTANCE;
+
+      static {
+        DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery.Aggregation.Avg();
+      }
+
+      public static com.google.datastore.v1.AggregationQuery.Aggregation.Avg getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser PARSER =
+          new com.google.protobuf.AbstractParser() {
+            @java.lang.Override
+            public Avg parsePartialFrom(
+                com.google.protobuf.CodedInputStream input,
+                com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+                throws com.google.protobuf.InvalidProtocolBufferException {
+              Builder builder = newBuilder();
+              try {
+                builder.mergeFrom(input, extensionRegistry);
+              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+                throw e.setUnfinishedMessage(builder.buildPartial());
+              } catch (com.google.protobuf.UninitializedMessageException e) {
+                throw e.asInvalidProtocolBufferException()
+                    .setUnfinishedMessage(builder.buildPartial());
+              } catch (java.io.IOException e) {
+                throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                    .setUnfinishedMessage(builder.buildPartial());
+              }
+              return builder.buildPartial();
+            }
+          };
+
+      public static com.google.protobuf.Parser parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Avg getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+    }
+
+    private int operatorCase_ = 0;
+
+    @SuppressWarnings("serial")
+    private java.lang.Object operator_;
+
+    public enum OperatorCase
+        implements
+            com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+      COUNT(1),
+      SUM(2),
+      AVG(3),
+      OPERATOR_NOT_SET(0);
+      private final int value;
+
+      private OperatorCase(int value) {
+        this.value = value;
+      }
+      /**
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static OperatorCase valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static OperatorCase forNumber(int value) {
+        switch (value) {
+          case 1:
+            return COUNT;
+          case 2:
+            return SUM;
+          case 3:
+            return AVG;
+          case 0:
+            return OPERATOR_NOT_SET;
+          default:
+            return null;
+        }
+      }
+
+      public int getNumber() {
+        return this.value;
+      }
+    };
+
+    public OperatorCase getOperatorCase() {
+      return OperatorCase.forNumber(operatorCase_);
+    }
+
+    public static final int COUNT_FIELD_NUMBER = 1;
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     *
+     * @return Whether the count field is set.
+     */
+    @java.lang.Override
+    public boolean hasCount() {
+      return operatorCase_ == 1;
+    }
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     *
+     * @return The count.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
+      if (operatorCase_ == 1) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+    }
+    /**
+     *
+     *
+     * 
    +     * Count aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCountOrBuilder() {
+      if (operatorCase_ == 1) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+    }
+
+    public static final int SUM_FIELD_NUMBER = 2;
+    /**
+     *
+     *
+     * 
    +     * Sum aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+     *
+     * @return Whether the sum field is set.
+     */
+    @java.lang.Override
+    public boolean hasSum() {
+      return operatorCase_ == 2;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sum aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+     *
+     * @return The sum.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum() {
+      if (operatorCase_ == 2) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
+    }
+    /**
+     *
+     *
+     * 
    +     * Sum aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumOrBuilder() {
+      if (operatorCase_ == 2) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
+    }
+
+    public static final int AVG_FIELD_NUMBER = 3;
+    /**
+     *
+     *
+     * 
    +     * Average aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
+     *
+     * @return Whether the avg field is set.
+     */
+    @java.lang.Override
+    public boolean hasAvg() {
+      return operatorCase_ == 3;
+    }
+    /**
+     *
+     *
+     * 
    +     * Average aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
+     *
+     * @return The avg.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg() {
+      if (operatorCase_ == 3) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
+    }
+    /**
+     *
+     *
+     * 
    +     * Average aggregator.
+     * 
    
+     *
+     * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgOrBuilder() {
+      if (operatorCase_ == 3) {
+        return (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_;
+      }
+      return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
+    }
+
+    public static final int ALIAS_FIELD_NUMBER = 7;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object alias_ = "";
+    /**
+     *
+     *
+     * 
    +     * 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,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT(*)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     *
+     * becomes:
+     *
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT(*) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     *
+     * Requires:
+     *
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property
+     * name][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The alias.
+     */
+    @java.lang.Override
+    public java.lang.String getAlias() {
+      java.lang.Object ref = alias_;
+      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();
+        alias_ = s;
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * 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,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT(*)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     *
+     * becomes:
+     *
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT(*) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     *
+     * Requires:
+     *
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property
+     * name][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string alias = 7 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The bytes for alias.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getAliasBytes() {
+      java.lang.Object ref = alias_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        alias_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+      if (operatorCase_ == 1) {
+        output.writeMessage(
+            1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_);
+      }
+      if (operatorCase_ == 2) {
+        output.writeMessage(
+            2, (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_);
+      }
+      if (operatorCase_ == 3) {
+        output.writeMessage(
+            3, (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, alias_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (operatorCase_ == 1) {
+        size +=
+            com.google.protobuf.CodedOutputStream.computeMessageSize(
+                1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_);
+      }
+      if (operatorCase_ == 2) {
+        size +=
+            com.google.protobuf.CodedOutputStream.computeMessageSize(
+                2, (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_);
+      }
+      if (operatorCase_ == 3) {
+        size +=
+            com.google.protobuf.CodedOutputStream.computeMessageSize(
+                3, (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, alias_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation)) {
+        return super.equals(obj);
+      }
+      com.google.datastore.v1.AggregationQuery.Aggregation other =
+          (com.google.datastore.v1.AggregationQuery.Aggregation) obj;
+
+      if (!getAlias().equals(other.getAlias())) return false;
+      if (!getOperatorCase().equals(other.getOperatorCase())) return false;
+      switch (operatorCase_) {
+        case 1:
+          if (!getCount().equals(other.getCount())) return false;
+          break;
+        case 2:
+          if (!getSum().equals(other.getSum())) return false;
+          break;
+        case 3:
+          if (!getAvg().equals(other.getAvg())) return false;
+          break;
+        case 0:
+        default:
+      }
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ALIAS_FIELD_NUMBER;
+      hash = (53 * hash) + getAlias().hashCode();
+      switch (operatorCase_) {
+        case 1:
+          hash = (37 * hash) + COUNT_FIELD_NUMBER;
+          hash = (53 * hash) + getCount().hashCode();
+          break;
+        case 2:
+          hash = (37 * hash) + SUM_FIELD_NUMBER;
+          hash = (53 * hash) + getSum().hashCode();
+          break;
+        case 3:
+          hash = (37 * hash) + AVG_FIELD_NUMBER;
+          hash = (53 * hash) + getAvg().hashCode();
+          break;
+        case 0:
+        default:
+      }
+      hash = (29 * hash) + getUnknownFields().hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom(
+        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    }
+
+    public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        com.google.datastore.v1.AggregationQuery.Aggregation prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     *
+     *
+     * 
    +     * Defines an aggregation that produces a single result.
+     * 
    
+     *
+     * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
+     */
+    public static final class Builder
+        extends com.google.protobuf.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation)
+        com.google.datastore.v1.AggregationQuery.AggregationOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.datastore.v1.AggregationQuery.Aggregation.class,
+                com.google.datastore.v1.AggregationQuery.Aggregation.Builder.class);
+      }
+
+      // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.newBuilder()
+      private Builder() {}
+
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        if (countBuilder_ != null) {
+          countBuilder_.clear();
+        }
+        if (sumBuilder_ != null) {
+          sumBuilder_.clear();
+        }
+        if (avgBuilder_ != null) {
+          avgBuilder_.clear();
+        }
+        alias_ = "";
+        operatorCase_ = 0;
+        operator_ = null;
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+        return com.google.datastore.v1.QueryProto
+            .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstanceForType() {
+        return com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation build() {
+        com.google.datastore.v1.AggregationQuery.Aggregation result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation buildPartial() {
+        com.google.datastore.v1.AggregationQuery.Aggregation result =
+            new com.google.datastore.v1.AggregationQuery.Aggregation(this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        buildPartialOneofs(result);
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(com.google.datastore.v1.AggregationQuery.Aggregation result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.alias_ = alias_;
+        }
+      }
+
+      private void buildPartialOneofs(com.google.datastore.v1.AggregationQuery.Aggregation result) {
+        result.operatorCase_ = operatorCase_;
+        result.operator_ = this.operator_;
+        if (operatorCase_ == 1 && countBuilder_ != null) {
+          result.operator_ = countBuilder_.build();
+        }
+        if (operatorCase_ == 2 && sumBuilder_ != null) {
+          result.operator_ = sumBuilder_.build();
+        }
+        if (operatorCase_ == 3 && avgBuilder_ != null) {
+          result.operator_ = avgBuilder_.build();
+        }
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.google.datastore.v1.AggregationQuery.Aggregation) {
+          return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation other) {
+        if (other == com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance())
+          return this;
+        if (!other.getAlias().isEmpty()) {
+          alias_ = other.alias_;
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
+        switch (other.getOperatorCase()) {
+          case COUNT:
+            {
+              mergeCount(other.getCount());
+              break;
+            }
+          case SUM:
+            {
+              mergeSum(other.getSum());
+              break;
+            }
+          case AVG:
+            {
+              mergeAvg(other.getAvg());
+              break;
+            }
+          case OPERATOR_NOT_SET:
+            {
+              break;
+            }
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  input.readMessage(getCountFieldBuilder().getBuilder(), extensionRegistry);
+                  operatorCase_ = 1;
+                  break;
+                } // case 10
+              case 18:
+                {
+                  input.readMessage(getSumFieldBuilder().getBuilder(), extensionRegistry);
+                  operatorCase_ = 2;
+                  break;
+                } // case 18
+              case 26:
+                {
+                  input.readMessage(getAvgFieldBuilder().getBuilder(), extensionRegistry);
+                  operatorCase_ = 3;
+                  break;
+                } // case 26
+              case 58:
+                {
+                  alias_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 58
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+
+      private int operatorCase_ = 0;
+      private java.lang.Object operator_;
+
+      public OperatorCase getOperatorCase() {
+        return OperatorCase.forNumber(operatorCase_);
+      }
+
+      public Builder clearOperator() {
+        operatorCase_ = 0;
+        operator_ = null;
+        onChanged();
+        return this;
+      }
+
+      private int bitField0_;
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>
+          countBuilder_;
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       *
+       * @return Whether the count field is set.
+       */
+      @java.lang.Override
+      public boolean hasCount() {
+        return operatorCase_ == 1;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       *
+       * @return The count.
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
+        if (countBuilder_ == null) {
+          if (operatorCase_ == 1) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+        } else {
+          if (operatorCase_ == 1) {
+            return countBuilder_.getMessage();
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder setCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) {
+        if (countBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          operator_ = value;
+          onChanged();
+        } else {
+          countBuilder_.setMessage(value);
+        }
+        operatorCase_ = 1;
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder setCount(
+          com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder builderForValue) {
+        if (countBuilder_ == null) {
+          operator_ = builderForValue.build();
+          onChanged();
+        } else {
+          countBuilder_.setMessage(builderForValue.build());
+        }
+        operatorCase_ = 1;
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder mergeCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) {
+        if (countBuilder_ == null) {
+          if (operatorCase_ == 1
+              && operator_
+                  != com.google.datastore.v1.AggregationQuery.Aggregation.Count
+                      .getDefaultInstance()) {
+            operator_ =
+                com.google.datastore.v1.AggregationQuery.Aggregation.Count.newBuilder(
+                        (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_)
+                    .mergeFrom(value)
+                    .buildPartial();
+          } else {
+            operator_ = value;
+          }
+          onChanged();
+        } else {
+          if (operatorCase_ == 1) {
+            countBuilder_.mergeFrom(value);
+          } else {
+            countBuilder_.setMessage(value);
+          }
+        }
+        operatorCase_ = 1;
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public Builder clearCount() {
+        if (countBuilder_ == null) {
+          if (operatorCase_ == 1) {
+            operatorCase_ = 0;
+            operator_ = null;
+            onChanged();
+          }
+        } else {
+          if (operatorCase_ == 1) {
+            operatorCase_ = 0;
+            operator_ = null;
+          }
+          countBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCountBuilder() {
+        return getCountFieldBuilder().getBuilder();
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder
+          getCountOrBuilder() {
+        if ((operatorCase_ == 1) && (countBuilder_ != null)) {
+          return countBuilder_.getMessageOrBuilder();
+        } else {
+          if (operatorCase_ == 1) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Count aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>
+          getCountFieldBuilder() {
+        if (countBuilder_ == null) {
+          if (!(operatorCase_ == 1)) {
+            operator_ =
+                com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+          }
+          countBuilder_ =
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Count,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>(
+                  (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_,
+                  getParentForChildren(),
+                  isClean());
+          operator_ = null;
+        }
+        operatorCase_ = 1;
+        onChanged();
+        return countBuilder_;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.datastore.v1.AggregationQuery.Aggregation.Sum,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder>
+          sumBuilder_;
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       *
+       * @return Whether the sum field is set.
+       */
+      @java.lang.Override
+      public boolean hasSum() {
+        return operatorCase_ == 2;
+      }
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       *
+       * @return The sum.
+       */
+      @java.lang.Override
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum() {
+        if (sumBuilder_ == null) {
+          if (operatorCase_ == 2) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_;
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
+        } else {
+          if (operatorCase_ == 2) {
+            return sumBuilder_.getMessage();
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       */
+      public Builder setSum(com.google.datastore.v1.AggregationQuery.Aggregation.Sum value) {
+        if (sumBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          operator_ = value;
+          onChanged();
+        } else {
+          sumBuilder_.setMessage(value);
+        }
+        operatorCase_ = 2;
+        return this;
       }
-
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.datastore.v1.AggregationQuery.Aggregation) {
-          return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation) other);
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       */
+      public Builder setSum(
+          com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder builderForValue) {
+        if (sumBuilder_ == null) {
+          operator_ = builderForValue.build();
+          onChanged();
         } else {
-          super.mergeFrom(other);
-          return this;
+          sumBuilder_.setMessage(builderForValue.build());
         }
+        operatorCase_ = 2;
+        return this;
       }
-
-      public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation other) {
-        if (other == com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance())
-          return this;
-        if (!other.getAlias().isEmpty()) {
-          alias_ = other.alias_;
-          bitField0_ |= 0x00000002;
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       */
+      public Builder mergeSum(com.google.datastore.v1.AggregationQuery.Aggregation.Sum value) {
+        if (sumBuilder_ == null) {
+          if (operatorCase_ == 2
+              && operator_
+                  != com.google.datastore.v1.AggregationQuery.Aggregation.Sum
+                      .getDefaultInstance()) {
+            operator_ =
+                com.google.datastore.v1.AggregationQuery.Aggregation.Sum.newBuilder(
+                        (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_)
+                    .mergeFrom(value)
+                    .buildPartial();
+          } else {
+            operator_ = value;
+          }
           onChanged();
+        } else {
+          if (operatorCase_ == 2) {
+            sumBuilder_.mergeFrom(value);
+          } else {
+            sumBuilder_.setMessage(value);
+          }
         }
-        switch (other.getOperatorCase()) {
-          case COUNT:
-            {
-              mergeCount(other.getCount());
-              break;
-            }
-          case OPERATOR_NOT_SET:
-            {
-              break;
-            }
+        operatorCase_ = 2;
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       */
+      public Builder clearSum() {
+        if (sumBuilder_ == null) {
+          if (operatorCase_ == 2) {
+            operatorCase_ = 0;
+            operator_ = null;
+            onChanged();
+          }
+        } else {
+          if (operatorCase_ == 2) {
+            operatorCase_ = 0;
+            operator_ = null;
+          }
+          sumBuilder_.clear();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
-        onChanged();
         return this;
       }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       */
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder getSumBuilder() {
+        return getSumFieldBuilder().getBuilder();
       }
-
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       */
       @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
+      public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumOrBuilder() {
+        if ((operatorCase_ == 2) && (sumBuilder_ != null)) {
+          return sumBuilder_.getMessageOrBuilder();
+        } else {
+          if (operatorCase_ == 2) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_;
+          }
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
         }
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getCountFieldBuilder().getBuilder(), extensionRegistry);
-                  operatorCase_ = 1;
-                  break;
-                } // case 10
-              case 58:
-                {
-                  alias_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 58
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.unwrapIOException();
-        } finally {
-          onChanged();
-        } // finally
-        return this;
-      }
-
-      private int operatorCase_ = 0;
-      private java.lang.Object operator_;
-
-      public OperatorCase getOperatorCase() {
-        return OperatorCase.forNumber(operatorCase_);
       }
-
-      public Builder clearOperator() {
-        operatorCase_ = 0;
-        operator_ = null;
+      /**
+       *
+       *
+       * 
    +       * Sum aggregator.
+       * 
    
+       *
+       * .google.datastore.v1.AggregationQuery.Aggregation.Sum sum = 2;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.datastore.v1.AggregationQuery.Aggregation.Sum,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder>
+          getSumFieldBuilder() {
+        if (sumBuilder_ == null) {
+          if (!(operatorCase_ == 2)) {
+            operator_ =
+                com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
+          }
+          sumBuilder_ =
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Sum,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder>(
+                  (com.google.datastore.v1.AggregationQuery.Aggregation.Sum) operator_,
+                  getParentForChildren(),
+                  isClean());
+          operator_ = null;
+        }
+        operatorCase_ = 2;
         onChanged();
-        return this;
+        return sumBuilder_;
       }
 
-      private int bitField0_;
-
       private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.datastore.v1.AggregationQuery.Aggregation.Count,
-              com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
-              com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>
-          countBuilder_;
+              com.google.datastore.v1.AggregationQuery.Aggregation.Avg,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder>
+          avgBuilder_;
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        *
-       * @return Whether the count field is set.
+       * @return Whether the avg field is set.
        */
       @java.lang.Override
-      public boolean hasCount() {
-        return operatorCase_ == 1;
+      public boolean hasAvg() {
+        return operatorCase_ == 3;
       }
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        *
-       * @return The count.
+       * @return The avg.
        */
       @java.lang.Override
-      public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
-        if (countBuilder_ == null) {
-          if (operatorCase_ == 1) {
-            return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg() {
+        if (avgBuilder_ == null) {
+          if (operatorCase_ == 3) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_;
           }
-          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
         } else {
-          if (operatorCase_ == 1) {
-            return countBuilder_.getMessage();
+          if (operatorCase_ == 3) {
+            return avgBuilder_.getMessage();
           }
-          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
         }
       }
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        */
-      public Builder setCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) {
-        if (countBuilder_ == null) {
+      public Builder setAvg(com.google.datastore.v1.AggregationQuery.Aggregation.Avg value) {
+        if (avgBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
           operator_ = value;
           onChanged();
         } else {
-          countBuilder_.setMessage(value);
+          avgBuilder_.setMessage(value);
         }
-        operatorCase_ = 1;
+        operatorCase_ = 3;
         return this;
       }
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        */
-      public Builder setCount(
-          com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder builderForValue) {
-        if (countBuilder_ == null) {
+      public Builder setAvg(
+          com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder builderForValue) {
+        if (avgBuilder_ == null) {
           operator_ = builderForValue.build();
           onChanged();
         } else {
-          countBuilder_.setMessage(builderForValue.build());
+          avgBuilder_.setMessage(builderForValue.build());
         }
-        operatorCase_ = 1;
+        operatorCase_ = 3;
         return this;
       }
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        */
-      public Builder mergeCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) {
-        if (countBuilder_ == null) {
-          if (operatorCase_ == 1
+      public Builder mergeAvg(com.google.datastore.v1.AggregationQuery.Aggregation.Avg value) {
+        if (avgBuilder_ == null) {
+          if (operatorCase_ == 3
               && operator_
-                  != com.google.datastore.v1.AggregationQuery.Aggregation.Count
+                  != com.google.datastore.v1.AggregationQuery.Aggregation.Avg
                       .getDefaultInstance()) {
             operator_ =
-                com.google.datastore.v1.AggregationQuery.Aggregation.Count.newBuilder(
-                        (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_)
+                com.google.datastore.v1.AggregationQuery.Aggregation.Avg.newBuilder(
+                        (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -2024,37 +4229,37 @@ public Builder mergeCount(com.google.datastore.v1.AggregationQuery.Aggregation.C
           }
           onChanged();
         } else {
-          if (operatorCase_ == 1) {
-            countBuilder_.mergeFrom(value);
+          if (operatorCase_ == 3) {
+            avgBuilder_.mergeFrom(value);
           } else {
-            countBuilder_.setMessage(value);
+            avgBuilder_.setMessage(value);
           }
         }
-        operatorCase_ = 1;
+        operatorCase_ = 3;
         return this;
       }
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        */
-      public Builder clearCount() {
-        if (countBuilder_ == null) {
-          if (operatorCase_ == 1) {
+      public Builder clearAvg() {
+        if (avgBuilder_ == null) {
+          if (operatorCase_ == 3) {
             operatorCase_ = 0;
             operator_ = null;
             onChanged();
           }
         } else {
-          if (operatorCase_ == 1) {
+          if (operatorCase_ == 3) {
             operatorCase_ = 0;
             operator_ = null;
           }
-          countBuilder_.clear();
+          avgBuilder_.clear();
         }
         return this;
       }
@@ -2062,67 +4267,66 @@ public Builder clearCount() {
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        */
-      public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCountBuilder() {
-        return getCountFieldBuilder().getBuilder();
+      public com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder getAvgBuilder() {
+        return getAvgFieldBuilder().getBuilder();
       }
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        */
       @java.lang.Override
-      public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder
-          getCountOrBuilder() {
-        if ((operatorCase_ == 1) && (countBuilder_ != null)) {
-          return countBuilder_.getMessageOrBuilder();
+      public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgOrBuilder() {
+        if ((operatorCase_ == 3) && (avgBuilder_ != null)) {
+          return avgBuilder_.getMessageOrBuilder();
         } else {
-          if (operatorCase_ == 1) {
-            return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_;
+          if (operatorCase_ == 3) {
+            return (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_;
           }
-          return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+          return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
         }
       }
       /**
        *
        *
        * 
    -       * Count aggregator.
+       * Average aggregator.
        * 
    
        *
-       * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1;
+       * .google.datastore.v1.AggregationQuery.Aggregation.Avg avg = 3;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.datastore.v1.AggregationQuery.Aggregation.Count,
-              com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
-              com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>
-          getCountFieldBuilder() {
-        if (countBuilder_ == null) {
-          if (!(operatorCase_ == 1)) {
+              com.google.datastore.v1.AggregationQuery.Aggregation.Avg,
+              com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder,
+              com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder>
+          getAvgFieldBuilder() {
+        if (avgBuilder_ == null) {
+          if (!(operatorCase_ == 3)) {
             operator_ =
-                com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
+                com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
           }
-          countBuilder_ =
+          avgBuilder_ =
               new com.google.protobuf.SingleFieldBuilderV3<
-                  com.google.datastore.v1.AggregationQuery.Aggregation.Count,
-                  com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
-                  com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>(
-                  (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Avg,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder,
+                  com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder>(
+                  (com.google.datastore.v1.AggregationQuery.Aggregation.Avg) operator_,
                   getParentForChildren(),
                   isClean());
           operator_ = null;
         }
-        operatorCase_ = 1;
+        operatorCase_ = 3;
         onChanged();
-        return countBuilder_;
+        return avgBuilder_;
       }
 
       private java.lang.Object alias_ = "";
@@ -2289,7 +4493,7 @@ public Builder setAlias(java.lang.String value) {
           throw new NullPointerException();
         }
         alias_ = value;
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2340,7 +4544,7 @@ public Builder setAlias(java.lang.String value) {
        */
       public Builder clearAlias() {
         alias_ = getDefaultInstance().getAlias();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -2396,7 +4600,7 @@ public Builder setAliasBytes(com.google.protobuf.ByteString value) {
         }
         checkByteStringIsUtf8(value);
         alias_ = value;
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
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 bee06ffda364..45d9e144b8cf 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
@@ -156,8 +156,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      * Requires:
      *
-     * * That `value` is a non-empty `ArrayValue` with at most 10 values.
-     * * No other `IN` or `NOT_IN` is in the same query.
+     * * That `value` is a non-empty `ArrayValue`, subject to disjunction
+     *   limits.
+     * * No `NOT_IN` is in the same query.
      * 
    
      *
      * IN = 6;
@@ -187,7 +188,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * Requires:
      *
      * * That `value` is an entity key.
-     * * No other `HAS_ANCESTOR` is in the same query.
+     * * All evaluated disjunctions must have the same `HAS_ANCESTOR` filter.
      * 
    
      *
      * HAS_ANCESTOR = 11;
@@ -202,7 +203,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * 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.
+     * * No other `OR`, `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
      * * That `field` comes first in the `order_by`.
      * 
    
      *
@@ -296,8 +297,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      *
      * Requires:
      *
-     * * That `value` is a non-empty `ArrayValue` with at most 10 values.
-     * * No other `IN` or `NOT_IN` is in the same query.
+     * * That `value` is a non-empty `ArrayValue`, subject to disjunction
+     *   limits.
+     * * No `NOT_IN` is in the same query.
      * 
    
      *
      * IN = 6;
@@ -327,7 +329,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * Requires:
      *
      * * That `value` is an entity key.
-     * * No other `HAS_ANCESTOR` is in the same query.
+     * * All evaluated disjunctions must have the same `HAS_ANCESTOR` filter.
      * 
    
      *
      * HAS_ANCESTOR = 11;
@@ -342,7 +344,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * 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.
+     * * No other `OR`, `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/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
index bce5821dff41..63c146eb4e7e 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
@@ -47,6 +47,14 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_datastore_v1_KindExpression_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -120,70 +128,77 @@ 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\"\331\002\n\020"
+          + "\030\014 \001(\0132\033.google.protobuf.Int32Value\"\347\004\n\020"
           + "AggregationQuery\0222\n\014nested_query\030\001 \001(\0132\032"
           + ".google.datastore.v1.QueryH\000\022M\n\014aggregat"
           + "ions\030\003 \003(\01321.google.datastore.v1.Aggrega"
-          + "tionQuery.AggregationB\004\342A\001\001\032\263\001\n\013Aggregat"
+          + "tionQuery.AggregationB\004\342A\001\001\032\301\003\n\013Aggregat"
           + "ion\022H\n\005count\030\001 \001(\01327.google.datastore.v1"
-          + ".AggregationQuery.Aggregation.CountH\000\022\023\n"
-          + "\005alias\030\007 \001(\tB\004\342A\001\001\0329\n\005Count\0220\n\005up_to\030\001 \001"
-          + "(\0132\033.google.protobuf.Int64ValueB\004\342A\001\001B\n\n"
-          + "\010operatorB\014\n\nquery_type\"\036\n\016KindExpressio"
-          + "n\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022\014\n\004"
-          + "name\030\002 \001(\t\"F\n\nProjection\0228\n\010property\030\001 \001"
+          + ".AggregationQuery.Aggregation.CountH\000\022D\n"
+          + "\003sum\030\002 \001(\01325.google.datastore.v1.Aggrega"
+          + "tionQuery.Aggregation.SumH\000\022D\n\003avg\030\003 \001(\013"
+          + "25.google.datastore.v1.AggregationQuery."
+          + "Aggregation.AvgH\000\022\023\n\005alias\030\007 \001(\tB\004\342A\001\001\0329"
+          + "\n\005Count\0220\n\005up_to\030\001 \001(\0132\033.google.protobuf"
+          + ".Int64ValueB\004\342A\001\001\032?\n\003Sum\0228\n\010property\030\001 \001"
           + "(\0132&.google.datastore.v1.PropertyReferen"
-          + "ce\"\321\001\n\rPropertyOrder\0228\n\010property\030\001 \001(\0132&"
-          + ".google.datastore.v1.PropertyReference\022?"
-          + "\n\tdirection\030\002 \001(\0162,.google.datastore.v1."
-          + "PropertyOrder.Direction\"E\n\tDirection\022\031\n\025"
-          + "DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016"
-          + "\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020composite_f"
-          + "ilter\030\001 \001(\0132$.google.datastore.v1.Compos"
-          + "iteFilterH\000\022>\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\n\017property_filter\030\002 \001(\0132#.google.data"
+          + "store.v1.PropertyFilterH\000B\r\n\013filter_type"
+          + "\"\261\001\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.googl"
+          + "e.datastore.v1.CompositeFilter.Operator\022"
+          + ",\n\007filters\030\002 \003(\0132\033.google.datastore.v1.F"
+          + "ilter\"5\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIE"
+          + "D\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352\002\n\016PropertyFilter\022"
+          + "8\n\010property\030\001 \001(\0132&.google.datastore.v1."
+          + "PropertyReference\0228\n\002op\030\002 \001(\0162,.google.d"
+          + "atastore.v1.PropertyFilter.Operator\022)\n\005v"
+          + "alue\030\003 \001(\0132\032.google.datastore.v1.Value\"\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\014"
+          + "GREATER_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\014H"
+          + "AS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQuery\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.da"
+          + "tastore.v1.GqlQuery.NamedBindingsEntry\022C"
+          + "\n\023positional_bindings\030\004 \003(\0132&.google.dat"
+          + "astore.v1.GqlQueryParameter\032\\\n\022NamedBind"
+          + "ingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&."
+          + "google.datastore.v1.GqlQueryParameter:\0028"
+          + "\001\"d\n\021GqlQueryParameter\022+\n\005value\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\020QueryResultB"
+          + "atch\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.EntityResult.Res"
+          + "ultType\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.google.da"
+          + "tastore.v1.QueryResultBatch.MoreResultsT"
+          + "ype\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tread_ti"
+          + "me\030\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n"
+          + "\017MoreResultsType\022!\n\035MORE_RESULTS_TYPE_UN"
+          + "SPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RE"
+          + "SULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_AFTE"
+          + "R_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n\027com."
+          + "google.datastore.v1B\nQueryProtoP\001Z
-   * Reads entities as they were at the given time. This may not be older
-   * than 270 seconds.  This value is only supported for Cloud Firestore in
-   * Datastore mode.
+   * Reads entities as they were at the given time. This value is only
+   * supported for Cloud Firestore in Datastore mode.
+   *
+   * This must be a microsecond precision timestamp within the past one hour,
+   * or if Point-in-Time Recovery is enabled, can additionally be a whole
+   * minute timestamp within the past 7 days.
    * 
    
    *
    * .google.protobuf.Timestamp read_time = 4;
@@ -459,9 +462,12 @@ public boolean hasReadTime() {
    *
    *
    * 
    -   * Reads entities as they were at the given time. This may not be older
-   * than 270 seconds.  This value is only supported for Cloud Firestore in
-   * Datastore mode.
+   * Reads entities as they were at the given time. This value is only
+   * supported for Cloud Firestore in Datastore mode.
+   *
+   * This must be a microsecond precision timestamp within the past one hour,
+   * or if Point-in-Time Recovery is enabled, can additionally be a whole
+   * minute timestamp within the past 7 days.
    * 
    
    *
    * .google.protobuf.Timestamp read_time = 4;
@@ -479,9 +485,12 @@ public com.google.protobuf.Timestamp getReadTime() {
    *
    *
    * 
    -   * Reads entities as they were at the given time. This may not be older
-   * than 270 seconds.  This value is only supported for Cloud Firestore in
-   * Datastore mode.
+   * Reads entities as they were at the given time. This value is only
+   * supported for Cloud Firestore in Datastore mode.
+   *
+   * This must be a microsecond precision timestamp within the past one hour,
+   * or if Point-in-Time Recovery is enabled, can additionally be a whole
+   * minute timestamp within the past 7 days.
    * 
    
    *
    * .google.protobuf.Timestamp read_time = 4;
@@ -1430,9 +1439,12 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1447,9 +1459,12 @@ public boolean hasReadTime() {
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1474,9 +1489,12 @@ public com.google.protobuf.Timestamp getReadTime() {
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1498,9 +1516,12 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1519,9 +1540,12 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1553,9 +1577,12 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1580,9 +1607,12 @@ public Builder clearReadTime() {
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1594,9 +1624,12 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
@@ -1616,9 +1649,12 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
      *
      *
      * 
    -     * Reads entities as they were at the given time. This may not be older
-     * than 270 seconds.  This value is only supported for Cloud Firestore in
-     * Datastore mode.
+     * Reads entities as they were at the given time. This value is only
+     * supported for Cloud Firestore in Datastore mode.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 4;
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 d0658b8e8ce5..31eb6ad9d7ca 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
@@ -146,9 +146,12 @@ public interface ReadOptionsOrBuilder
    *
    *
    * 
    -   * Reads entities as they were at the given time. This may not be older
-   * than 270 seconds.  This value is only supported for Cloud Firestore in
-   * Datastore mode.
+   * Reads entities as they were at the given time. This value is only
+   * supported for Cloud Firestore in Datastore mode.
+   *
+   * This must be a microsecond precision timestamp within the past one hour,
+   * or if Point-in-Time Recovery is enabled, can additionally be a whole
+   * minute timestamp within the past 7 days.
    * 
    
    *
    * .google.protobuf.Timestamp read_time = 4;
@@ -160,9 +163,12 @@ public interface ReadOptionsOrBuilder
    *
    *
    * 
    -   * Reads entities as they were at the given time. This may not be older
-   * than 270 seconds.  This value is only supported for Cloud Firestore in
-   * Datastore mode.
+   * Reads entities as they were at the given time. This value is only
+   * supported for Cloud Firestore in Datastore mode.
+   *
+   * This must be a microsecond precision timestamp within the past one hour,
+   * or if Point-in-Time Recovery is enabled, can additionally be a whole
+   * minute timestamp within the past 7 days.
    * 
    
    *
    * .google.protobuf.Timestamp read_time = 4;
@@ -174,9 +180,12 @@ public interface ReadOptionsOrBuilder
    *
    *
    * 
    -   * Reads entities as they were at the given time. This may not be older
-   * than 270 seconds.  This value is only supported for Cloud Firestore in
-   * Datastore mode.
+   * Reads entities as they were at the given time. This value is only
+   * supported for Cloud Firestore in Datastore mode.
+   *
+   * This must be a microsecond precision timestamp within the past one hour,
+   * or if Point-in-Time Recovery is enabled, can additionally be a whole
+   * minute timestamp within the past 7 days.
    * 
    
    *
    * .google.protobuf.Timestamp read_time = 4;
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 3497680435a1..3f8f3209f205 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
@@ -622,7 +622,10 @@ public interface ReadOnlyOrBuilder
      *
      * 
          * Reads entities at the given time.
-     * This may not be older than 60 seconds.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -635,7 +638,10 @@ public interface ReadOnlyOrBuilder
      *
      * 
          * Reads entities at the given time.
-     * This may not be older than 60 seconds.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -648,7 +654,10 @@ public interface ReadOnlyOrBuilder
      *
      * 
          * Reads entities at the given time.
-     * This may not be older than 60 seconds.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -704,7 +713,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * 
          * Reads entities at the given time.
-     * This may not be older than 60 seconds.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -720,7 +732,10 @@ public boolean hasReadTime() {
      *
      * 
          * Reads entities at the given time.
-     * This may not be older than 60 seconds.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -736,7 +751,10 @@ public com.google.protobuf.Timestamp getReadTime() {
      *
      * 
          * Reads entities at the given time.
-     * This may not be older than 60 seconds.
+     *
+     * This must be a microsecond precision timestamp within the past one hour,
+     * or if Point-in-Time Recovery is enabled, can additionally be a whole
+     * minute timestamp within the past 7 days.
      * 
    
      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -1111,7 +1129,10 @@ public Builder mergeFrom(
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1126,7 +1147,10 @@ public boolean hasReadTime() {
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1145,7 +1169,10 @@ public com.google.protobuf.Timestamp getReadTime() {
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1168,7 +1195,10 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1188,7 +1218,10 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1214,7 +1247,10 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1234,7 +1270,10 @@ public Builder clearReadTime() {
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1249,7 +1288,10 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
@@ -1266,7 +1308,10 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
        *
        * 
            * Reads entities at the given time.
-       * This may not be older than 60 seconds.
+       *
+       * This must be a microsecond precision timestamp within the past one hour,
+       * or if Point-in-Time Recovery is enabled, can additionally be a whole
+       * minute timestamp within the past 7 days.
        * 
    
        *
        * .google.protobuf.Timestamp read_time = 1;
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 4822048b6191..533988d77765 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
@@ -578,9 +578,12 @@ message ReadOptions {
     // [RunQueryResponse.transaction][google.datastore.v1.RunQueryResponse.transaction].
     TransactionOptions new_transaction = 3;
 
-    // Reads entities as they were at the given time. This may not be older
-    // than 270 seconds.  This value is only supported for Cloud Firestore in
-    // Datastore mode.
+    // Reads entities as they were at the given time. This value is only
+    // supported for Cloud Firestore in Datastore mode.
+    //
+    // This must be a microsecond precision timestamp within the past one hour,
+    // or if Point-in-Time Recovery is enabled, can additionally be a whole
+    // minute timestamp within the past 7 days.
     google.protobuf.Timestamp read_time = 4;
   }
 }
@@ -602,7 +605,10 @@ message TransactionOptions {
   // Options specific to read-only transactions.
   message ReadOnly {
     // Reads entities at the given time.
-    // This may not be older than 60 seconds.
+    //
+    // This must be a microsecond precision timestamp within the past one hour,
+    // or if Point-in-Time Recovery is enabled, can additionally be a whole
+    // minute timestamp within the past 7 days.
     google.protobuf.Timestamp read_time = 1;
   }
 
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 812bfbf05780..40ade72a3ac9 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
@@ -163,10 +163,58 @@ message AggregationQuery {
           [(google.api.field_behavior) = OPTIONAL];
     }
 
+    // Sum of the values of the requested property.
+    //
+    // * Only numeric values will be aggregated. All non-numeric values
+    // including `NULL` are skipped.
+    //
+    // * If the aggregated values contain `NaN`, returns `NaN`. Infinity math
+    // follows IEEE-754 standards.
+    //
+    // * If the aggregated value set is empty, returns 0.
+    //
+    // * Returns a 64-bit integer if all aggregated numbers are integers and the
+    // sum result does not overflow. Otherwise, the result is returned as a
+    // double. Note that even if all the aggregated values are integers, the
+    // result is returned as a double if it cannot fit within a 64-bit signed
+    // integer. When this occurs, the returned value will lose precision.
+    //
+    // * When underflow occurs, floating-point aggregation is non-deterministic.
+    // This means that running the same query repeatedly without any changes to
+    // the underlying values could produce slightly different results each
+    // time. In those cases, values should be stored as integers over
+    // floating-point numbers.
+    message Sum {
+      // The property to aggregate on.
+      PropertyReference property = 1;
+    }
+
+    // Average of the values of the requested property.
+    //
+    // * Only numeric values will be aggregated. All non-numeric values
+    // including `NULL` are skipped.
+    //
+    // * If the aggregated values contain `NaN`, returns `NaN`. Infinity math
+    // follows IEEE-754 standards.
+    //
+    // * If the aggregated value set is empty, returns `NULL`.
+    //
+    // * Always returns the result as a double.
+    message Avg {
+      // The property to aggregate on.
+      PropertyReference property = 1;
+    }
+
     // The type of aggregation to perform, required.
     oneof operator {
       // Count aggregator.
       Count count = 1;
+
+      // Sum aggregator.
+      Sum sum = 2;
+
+      // Average aggregator.
+      Avg avg = 3;
     }
 
     // Optional. Optional name of the property to store the result of the
@@ -342,8 +390,9 @@ message PropertyFilter {
     //
     // Requires:
     //
-    // * That `value` is a non-empty `ArrayValue` with at most 10 values.
-    // * No other `IN` or `NOT_IN` is in the same query.
+    // * That `value` is a non-empty `ArrayValue`, subject to disjunction
+    //   limits.
+    // * No `NOT_IN` is in the same query.
     IN = 6;
 
     // The given `property` is not equal to the given `value`.
@@ -359,7 +408,7 @@ message PropertyFilter {
     // Requires:
     //
     // * That `value` is an entity key.
-    // * No other `HAS_ANCESTOR` is in the same query.
+    // * All evaluated disjunctions must have the same `HAS_ANCESTOR` filter.
     HAS_ANCESTOR = 11;
 
     // The value of the `property` is not in the given array.
@@ -367,7 +416,7 @@ message PropertyFilter {
     // 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.
+    // * No other `OR`, `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
     // * That `field` comes first in the `order_by`.
     NOT_IN = 13;
   }

From c908837ea953a5fdc87f9c83937646d309806e03 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 19:06:14 +0000
Subject: [PATCH 1205/1784] docs: Update property requirement specifications
 (#1169)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 557861399

Source-Link: https://togithub.com/googleapis/googleapis/commit/3303b93dc165b6a5b8efdaf30db292e9ed1f28e5

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/fb0d0a45385eb0be5842111af79af5d719d32168
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZmIwZDBhNDUzODVlYjBiZTU4NDIxMTFhZjc5YWY1ZDcxOWQzMjE2OCJ9
---
 .../datastore/v1/PropertyReference.java       | 63 ++++++++++++++-----
 .../v1/PropertyReferenceOrBuilder.java        | 18 ++++--
 .../proto/google/datastore/v1/query.proto     |  9 ++-
 3 files changed, 70 insertions(+), 20 deletions(-)

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 a5d26ee0ea81..f54857e184fc 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
@@ -70,8 +70,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
    -   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
+   * A reference to a property.
+   *
+   * Requires:
+   *
+   * * MUST be a dot-delimited (`.`) string of segments, where each segment
+   * conforms to [entity property name][google.datastore.v1.Entity.properties]
+   * limitations.
    * 
    
    *
    * string name = 2;
@@ -94,8 +99,13 @@ public java.lang.String getName() {
    *
    *
    * 
    -   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
+   * A reference to a property.
+   *
+   * Requires:
+   *
+   * * MUST be a dot-delimited (`.`) string of segments, where each segment
+   * conforms to [entity property name][google.datastore.v1.Entity.properties]
+   * limitations.
    * 
    
    *
    * string name = 2;
@@ -461,8 +471,13 @@ public Builder mergeFrom(
      *
      *
      * 
    -     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
+     * A reference to a property.
+     *
+     * Requires:
+     *
+     * * MUST be a dot-delimited (`.`) string of segments, where each segment
+     * conforms to [entity property name][google.datastore.v1.Entity.properties]
+     * limitations.
      * 
    
      *
      * string name = 2;
@@ -484,8 +499,13 @@ public java.lang.String getName() {
      *
      *
      * 
    -     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
+     * A reference to a property.
+     *
+     * Requires:
+     *
+     * * MUST be a dot-delimited (`.`) string of segments, where each segment
+     * conforms to [entity property name][google.datastore.v1.Entity.properties]
+     * limitations.
      * 
    
      *
      * string name = 2;
@@ -507,8 +527,13 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      *
      * 
    -     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
+     * A reference to a property.
+     *
+     * Requires:
+     *
+     * * MUST be a dot-delimited (`.`) string of segments, where each segment
+     * conforms to [entity property name][google.datastore.v1.Entity.properties]
+     * limitations.
      * 
    
      *
      * string name = 2;
@@ -529,8 +554,13 @@ public Builder setName(java.lang.String value) {
      *
      *
      * 
    -     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
+     * A reference to a property.
+     *
+     * Requires:
+     *
+     * * MUST be a dot-delimited (`.`) string of segments, where each segment
+     * conforms to [entity property name][google.datastore.v1.Entity.properties]
+     * limitations.
      * 
    
      *
      * string name = 2;
@@ -547,8 +577,13 @@ public Builder clearName() {
      *
      *
      * 
    -     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
+     * A reference to a property.
+     *
+     * Requires:
+     *
+     * * MUST be a dot-delimited (`.`) string of segments, where each segment
+     * conforms to [entity property name][google.datastore.v1.Entity.properties]
+     * limitations.
      * 
    
      *
      * string name = 2;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index d905a9244913..a64c2be96781 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -27,8 +27,13 @@ public interface PropertyReferenceOrBuilder
    *
    *
    * 
    -   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
+   * A reference to a property.
+   *
+   * Requires:
+   *
+   * * MUST be a dot-delimited (`.`) string of segments, where each segment
+   * conforms to [entity property name][google.datastore.v1.Entity.properties]
+   * limitations.
    * 
    
    *
    * string name = 2;
@@ -40,8 +45,13 @@ public interface PropertyReferenceOrBuilder
    *
    *
    * 
    -   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
+   * A reference to a property.
+   *
+   * Requires:
+   *
+   * * MUST be a dot-delimited (`.`) string of segments, where each segment
+   * conforms to [entity property name][google.datastore.v1.Entity.properties]
+   * limitations.
    * 
    
    *
    * string name = 2;
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 40ade72a3ac9..d1f0f8d07467 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
@@ -279,8 +279,13 @@ message KindExpression {
 
 // A reference to a property relative to the kind expressions.
 message PropertyReference {
-  // The name of the property.
-  // If name includes "."s, it may be interpreted as a property name path.
+  // A reference to a property.
+  //
+  // Requires:
+  //
+  // * MUST be a dot-delimited (`.`) string of segments, where each segment
+  // conforms to [entity property name][google.datastore.v1.Entity.properties]
+  // limitations.
   string name = 2;
 }
 

From 4dc4aa57c89366aa3fa24ee4da1793ed695d61d6 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki 
Date: Fri, 18 Aug 2023 12:50:14 -0400
Subject: [PATCH 1206/1784] ci: javadoc as a required check (#1171)

Manual configuration to the required check has been removed. Adding that back via sync-repo-settings.yaml.
---
 .github/sync-repo-settings.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index bd1c3a11d77e..5539fb82c6c4 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -18,6 +18,7 @@ branchProtectionRules:
       - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
   - pattern: 1.106.5-sp
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From 56d1001005cf7d52f8ba3e5258d6401be729bdbf Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Tue, 22 Aug 2023 19:06:51 +0530
Subject: [PATCH 1207/1784] feat: Sum and Avg aggregation feature (#1067)

* creating sum aggregation

* creating avg aggregation

* refactoring code to configure alias into an aggregation

* Add method in aggregation query builders to accept aggregation in var args form

* refactoring equals implementation

* changed visibility from public to protected

* Made aggregation result capable of returning double values

* clirr ignore new method

* Made transformer capable of parsing double values

* mock webserver simulating sum and avg aggregation response

* integration tests for sum and avg

* Marking sum and avg methods with @BetaApi annotation

* incorporating feedbacks

* fixing lint

* refactoring dispatcher code

* incorporating feedbacks

* cleaing up proxy code, as sum/avg now can be run against nightly

* remove deprecated annotation

* tests for sum and avg aggregations in GQL query

* removing the addaggregation variant accepting list of aggregations

* fix lint failures

* removed BetaApi annotation from sum and avg aggregation

* adding doc to AggregationResult#getDouble

* adding sum/avg aggreggation test with autogenerated alias

* adding a test to run sum and avg aggregation together

* testing sum and avg aggregations with transactions

* type check before returning the result from aggregation result class
---
 .../cloud/datastore/AggregationQuery.java     |  13 +
 .../cloud/datastore/AggregationResult.java    |  54 ++-
 .../datastore/aggregation/Aggregation.java    |  20 +
 .../datastore/aggregation/AvgAggregation.java |  86 +++++
 .../aggregation/CountAggregation.java         |  17 +-
 .../datastore/aggregation/SumAggregation.java |  86 +++++
 .../AggregationQueryResponseTransformer.java  |  10 +-
 .../cloud/datastore/AggregationQueryTest.java |  85 ++++-
 .../datastore/AggregationResultTest.java      |  51 ++-
 .../google/cloud/datastore/DatastoreTest.java |   2 +-
 .../google/cloud/datastore/ProtoTestData.java |   4 +
 .../aggregation/AvgAggregationTest.java       |  88 +++++
 .../aggregation/SumAggregationTest.java       |  88 +++++
 ...gregationQueryResponseTransformerTest.java |  52 ++-
 .../it/ITDatastoreAggregationsTest.java       | 361 ++++++++++++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   |  33 +-
 16 files changed, 984 insertions(+), 66 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
index 210889b1efec..f657d4aaeae7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
@@ -21,6 +21,7 @@
 
 import com.google.cloud.datastore.aggregation.Aggregation;
 import com.google.cloud.datastore.aggregation.AggregationBuilder;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -143,6 +144,18 @@ public Builder addAggregation(Aggregation aggregation) {
       return this;
     }
 
+    public Builder addAggregations(AggregationBuilder... aggregationBuilders) {
+      for (AggregationBuilder builder : aggregationBuilders) {
+        this.aggregations.add(builder.build());
+      }
+      return this;
+    }
+
+    public Builder addAggregations(Aggregation... aggregations) {
+      this.aggregations.addAll(Arrays.asList(aggregations));
+      return this;
+    }
+
     public Builder over(StructuredQuery nestedQuery) {
       this.nestedStructuredQuery = nestedQuery;
       this.mode = STRUCTURED;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
index 6e086c30bc69..75636c00434d 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
@@ -15,6 +15,9 @@
  */
 package com.google.cloud.datastore;
 
+import static com.google.cloud.datastore.ValueType.DOUBLE;
+import static com.google.cloud.datastore.ValueType.LONG;
+
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import java.util.Map;
@@ -24,21 +27,62 @@
 /** Represents a result of an {@link AggregationQuery} query submission. */
 public class AggregationResult {
 
-  private final Map properties;
+  private final Map> properties;
 
-  public AggregationResult(Map properties) {
+  public AggregationResult(Map> properties) {
     this.properties = properties;
   }
 
   /**
-   * Returns a result value for the given alias.
+   * Returns a result value for the given alias. {@link #getLong(String)} is preferred over this
+   * method, Use {@link #getLong(String)} wherever possible.
    *
    * @param alias A custom alias provided in the query or an autogenerated alias in the form of
    *     'property_\d'
    * @return An aggregation result value for the given alias.
    */
   public Long get(String alias) {
-    return properties.get(alias).get();
+    return getLong(alias);
+  }
+
+  /**
+   * Returns a result value for the given alias.
+   *
+   * @param alias A custom alias provided in the query or an autogenerated alias in the form of
+   *     'property_\d'
+   * @return An aggregation result value for the given alias.
+   */
+  public Long getLong(String alias) {
+    Value value = properties.get(alias);
+    switch (value.getType()) {
+      case DOUBLE:
+        return ((Double) value.get()).longValue();
+      case LONG:
+        return (Long) value.get();
+      default:
+        throw new RuntimeException(
+            String.format("Unsupported type %s received for alias '%s'.", value.getType(), alias));
+    }
+  }
+
+  /**
+   * Returns a result value for the given alias.
+   *
+   * @param alias A custom alias provided in the query or an autogenerated alias in the form of
+   *     'property_\d'
+   * @return An aggregation result value for the given alias.
+   */
+  public Double getDouble(String alias) {
+    Value value = properties.get(alias);
+    switch (value.getType()) {
+      case LONG:
+        return ((Long) value.get()).doubleValue();
+      case DOUBLE:
+        return (Double) value.get();
+      default:
+        throw new RuntimeException(
+            String.format("Unsupported type %s received for alias '%s'.", value.getType(), alias));
+    }
   }
 
   @Override
@@ -61,7 +105,7 @@ public int hashCode() {
   @Override
   public String toString() {
     ToStringHelper toStringHelper = MoreObjects.toStringHelper(this);
-    for (Entry entry : properties.entrySet()) {
+    for (Entry> entry : properties.entrySet()) {
       toStringHelper.add(entry.getKey(), entry.getValue().get());
     }
     return toStringHelper.toString();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
index 7bd2bbb386da..4baf9e9dcdab 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
@@ -38,8 +38,28 @@ public String getAlias() {
   @InternalApi
   public abstract AggregationQuery.Aggregation toPb();
 
+  @InternalApi
+  protected AggregationQuery.Aggregation.Builder aggregationBuilder() {
+    AggregationQuery.Aggregation.Builder aggregationBuilder =
+        AggregationQuery.Aggregation.newBuilder();
+    if (this.getAlias() != null) {
+      aggregationBuilder.setAlias(this.getAlias());
+    }
+    return aggregationBuilder;
+  }
+
   /** Returns a {@link CountAggregation} builder. */
   public static CountAggregation.Builder count() {
     return new CountAggregation.Builder();
   }
+
+  /** Returns a {@link SumAggregation} builder. */
+  public static SumAggregation.Builder sum(String propertyReference) {
+    return new SumAggregation.Builder().propertyReference(propertyReference);
+  }
+
+  /** Returns a {@link AvgAggregation} builder. */
+  public static AvgAggregation.Builder avg(String propertyReference) {
+    return new AvgAggregation.Builder().propertyReference(propertyReference);
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java
new file mode 100644
index 000000000000..31bd28ffa812
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.api.core.InternalApi;
+import com.google.datastore.v1.AggregationQuery;
+import com.google.datastore.v1.AggregationQuery.Aggregation.Avg;
+import com.google.datastore.v1.PropertyReference;
+import java.util.Objects;
+
+/** Represents an {@link Aggregation} which returns average of numerical values. */
+public class AvgAggregation extends Aggregation {
+
+  private final String propertyReference;
+
+  public AvgAggregation(String alias, String propertyReference) {
+    super(alias);
+    checkArgument(propertyReference != null, "Property reference can't be null");
+    this.propertyReference = propertyReference;
+  }
+
+  @InternalApi
+  @Override
+  public AggregationQuery.Aggregation toPb() {
+    PropertyReference reference =
+        PropertyReference.newBuilder().setName(this.propertyReference).build();
+    Avg avg = Avg.newBuilder().setProperty(reference).build();
+    return aggregationBuilder().setAvg(avg).build();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AvgAggregation that = (AvgAggregation) o;
+    return Objects.equals(this.propertyReference, that.propertyReference)
+        && Objects.equals(getAlias(), that.getAlias());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getAlias(), this.propertyReference);
+  }
+
+  /** A builder class to create and customize a {@link AvgAggregation}. */
+  public static class Builder implements AggregationBuilder {
+
+    private String alias;
+    private String propertyReference;
+
+    public AvgAggregation.Builder propertyReference(String propertyReference) {
+      this.propertyReference = propertyReference;
+      return this;
+    }
+
+    public AvgAggregation.Builder as(String alias) {
+      this.alias = alias;
+      return this;
+    }
+
+    @Override
+    public AvgAggregation build() {
+      return new AvgAggregation(alias, propertyReference);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
index 4f7eb23d6d5d..632b6633daf6 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
@@ -30,14 +30,7 @@ public CountAggregation(String alias) {
 
   @Override
   public AggregationQuery.Aggregation toPb() {
-    Count.Builder countBuilder = Count.newBuilder();
-
-    AggregationQuery.Aggregation.Builder aggregationBuilder =
-        AggregationQuery.Aggregation.newBuilder().setCount(countBuilder);
-    if (this.getAlias() != null) {
-      aggregationBuilder.setAlias(this.getAlias());
-    }
-    return aggregationBuilder.build();
+    return aggregationBuilder().setCount(Count.newBuilder()).build();
   }
 
   @Override
@@ -49,13 +42,7 @@ public boolean equals(Object o) {
       return false;
     }
     CountAggregation that = (CountAggregation) o;
-    boolean bothAliasAreNull = getAlias() == null && that.getAlias() == null;
-    if (bothAliasAreNull) {
-      return true;
-    } else {
-      boolean bothArePresent = getAlias() != null && that.getAlias() != null;
-      return bothArePresent && getAlias().equals(that.getAlias());
-    }
+    return Objects.equals(getAlias(), that.getAlias());
   }
 
   @Override
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java
new file mode 100644
index 000000000000..2e1dcd3d55e3
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.api.core.InternalApi;
+import com.google.datastore.v1.AggregationQuery;
+import com.google.datastore.v1.AggregationQuery.Aggregation.Sum;
+import com.google.datastore.v1.PropertyReference;
+import java.util.Objects;
+
+/** Represents an {@link Aggregation} which returns sum of numerical values. */
+public class SumAggregation extends Aggregation {
+
+  private final String propertyReference;
+
+  public SumAggregation(String alias, String propertyReference) {
+    super(alias);
+    checkArgument(propertyReference != null, "Property reference can't be null");
+    this.propertyReference = propertyReference;
+  }
+
+  @InternalApi
+  @Override
+  public AggregationQuery.Aggregation toPb() {
+    PropertyReference reference =
+        PropertyReference.newBuilder().setName(this.propertyReference).build();
+    Sum sum = Sum.newBuilder().setProperty(reference).build();
+    return aggregationBuilder().setSum(sum).build();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SumAggregation that = (SumAggregation) o;
+    return Objects.equals(this.propertyReference, that.propertyReference)
+        && Objects.equals(getAlias(), that.getAlias());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getAlias(), this.propertyReference);
+  }
+
+  /** A builder class to create and customize a {@link SumAggregation}. */
+  public static class Builder implements AggregationBuilder {
+
+    private String alias;
+    private String propertyReference;
+
+    public SumAggregation.Builder propertyReference(String propertyReference) {
+      this.propertyReference = propertyReference;
+      return this;
+    }
+
+    public SumAggregation.Builder as(String alias) {
+      this.alias = alias;
+      return this;
+    }
+
+    @Override
+    public SumAggregation build() {
+      return new SumAggregation(alias, propertyReference);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
index 1515a11476ff..8c99fcd41c18 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
@@ -19,7 +19,6 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.datastore.AggregationResult;
 import com.google.cloud.datastore.AggregationResults;
-import com.google.cloud.datastore.LongValue;
 import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.Value;
 import java.util.AbstractMap.SimpleEntry;
@@ -39,20 +38,19 @@ public AggregationResults transform(RunAggregationQueryResponse response) {
     Timestamp readTime = Timestamp.fromProto(response.getBatch().getReadTime());
     List aggregationResults =
         response.getBatch().getAggregationResultsList().stream()
-            .map(
-                aggregationResult -> new AggregationResult(resultWithLongValues(aggregationResult)))
+            .map(aggregationResult -> new AggregationResult(transformValues(aggregationResult)))
             .collect(Collectors.toCollection(LinkedList::new));
     return new AggregationResults(aggregationResults, readTime);
   }
 
-  private Map resultWithLongValues(
+  private Map> transformValues(
       com.google.datastore.v1.AggregationResult aggregationResult) {
     return aggregationResult.getAggregatePropertiesMap().entrySet().stream()
         .map(
-            (Function, Entry>)
+            (Function, Entry>>)
                 entry ->
                     new SimpleEntry<>(
-                        entry.getKey(), (LongValue) LongValue.fromPb(entry.getValue())))
+                        entry.getKey(), com.google.cloud.datastore.Value.fromPb(entry.getValue())))
         .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
   }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
index 840d23bca66f..fd037808c9e5 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
@@ -18,16 +18,18 @@
 import static com.google.cloud.datastore.AggregationQuery.Mode.GQL;
 import static com.google.cloud.datastore.AggregationQuery.Mode.STRUCTURED;
 import static com.google.cloud.datastore.StructuredQuery.PropertyFilter.eq;
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
 import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 
+import com.google.cloud.datastore.aggregation.AvgAggregation;
 import com.google.cloud.datastore.aggregation.CountAggregation;
+import com.google.cloud.datastore.aggregation.SumAggregation;
 import com.google.common.collect.ImmutableSet;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class AggregationQueryTest {
 
@@ -41,8 +43,6 @@ public class AggregationQueryTest {
           .setLimit(100)
           .build();
 
-  @Rule public ExpectedException exceptionRule = ExpectedException.none();
-
   @Test
   public void testAggregations() {
     AggregationQuery aggregationQuery =
@@ -60,37 +60,92 @@ public void testAggregations() {
   }
 
   @Test
-  public void testAggregationBuilderWithMoreThanOneAggregations() {
+  public void testAggregationBuilderWithMultipleAggregationsOneByOne() {
     AggregationQuery aggregationQuery =
         Query.newAggregationQueryBuilder()
             .setNamespace(NAMESPACE)
             .addAggregation(count().as("total"))
-            .addAggregation(count().as("new_total"))
+            .addAggregation(sum("marks").as("total_marks"))
+            .addAggregation(avg("marks").as("avg_marks"))
             .over(COMPLETED_TASK_QUERY)
             .build();
 
-    assertThat(aggregationQuery.getNamespace()).isEqualTo(NAMESPACE);
     assertThat(aggregationQuery.getAggregations())
-        .isEqualTo(ImmutableSet.of(count().as("total").build(), count().as("new_total").build()));
-    assertThat(aggregationQuery.getNestedStructuredQuery()).isEqualTo(COMPLETED_TASK_QUERY);
-    assertThat(aggregationQuery.getMode()).isEqualTo(STRUCTURED);
+        .isEqualTo(
+            ImmutableSet.of(
+                count().as("total").build(),
+                sum("marks").as("total_marks").build(),
+                avg("marks").as("avg_marks").build()));
   }
 
   @Test
-  public void testAggregationBuilderWithDuplicateAggregations() {
+  public void testAggregationBuilderWithMultipleAggregationsTogether() {
     AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregations(
+                count().as("total"), sum("marks").as("total_marks"), avg("marks").as("avg_marks"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
+
+    assertThat(aggregationQuery.getAggregations())
+        .isEqualTo(
+            ImmutableSet.of(
+                count().as("total").build(),
+                sum("marks").as("total_marks").build(),
+                avg("marks").as("avg_marks").build()));
+  }
+
+  @Test
+  public void testAggregationBuilderWithMultipleAggregationsConfiguredThroughConstructor() {
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregations(
+                new CountAggregation("total"),
+                new SumAggregation("total_marks", "marks"),
+                new AvgAggregation("avg_marks", "marks"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
+
+    assertThat(aggregationQuery.getAggregations())
+        .isEqualTo(
+            ImmutableSet.of(
+                count().as("total").build(),
+                sum("marks").as("total_marks").build(),
+                avg("marks").as("avg_marks").build()));
+  }
+
+  @Test
+  public void testAggregationBuilderWithDuplicateAggregations() {
+    AggregationQuery aggregationQueryWithDuplicateCounts =
         Query.newAggregationQueryBuilder()
             .setNamespace(NAMESPACE)
             .addAggregation(count().as("total"))
             .addAggregation(count().as("total"))
             .over(COMPLETED_TASK_QUERY)
             .build();
+    AggregationQuery aggregationQueryWithDuplicateSum =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregation(sum("marks").as("total"))
+            .addAggregation(sum("marks").as("total"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
+    AggregationQuery aggregationQueryWithDuplicateAvg =
+        Query.newAggregationQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .addAggregation(avg("marks").as("avg_marks"))
+            .addAggregation(avg("marks").as("avg_marks"))
+            .over(COMPLETED_TASK_QUERY)
+            .build();
 
-    assertThat(aggregationQuery.getNamespace()).isEqualTo(NAMESPACE);
-    assertThat(aggregationQuery.getAggregations())
+    assertThat(aggregationQueryWithDuplicateCounts.getAggregations())
         .isEqualTo(ImmutableSet.of(count().as("total").build()));
-    assertThat(aggregationQuery.getNestedStructuredQuery()).isEqualTo(COMPLETED_TASK_QUERY);
-    assertThat(aggregationQuery.getMode()).isEqualTo(STRUCTURED);
+    assertThat(aggregationQueryWithDuplicateSum.getAggregations())
+        .isEqualTo(ImmutableSet.of(sum("marks").as("total").build()));
+    assertThat(aggregationQueryWithDuplicateAvg.getAggregations())
+        .isEqualTo(ImmutableSet.of(avg("marks").as("avg_marks").build()));
   }
 
   @Test
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
index 06a5cb5f73ec..592bfb36863d 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
@@ -16,6 +16,7 @@
 package com.google.cloud.datastore;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
@@ -23,14 +24,58 @@
 public class AggregationResultTest {
 
   @Test
-  public void shouldGetAggregationResultValueByAlias() {
+  public void shouldGetLongAggregatedResultValueByAlias() {
     AggregationResult aggregationResult =
         new AggregationResult(
             ImmutableMap.of(
                 "count", LongValue.of(45),
                 "property_2", LongValue.of(30)));
 
-    assertThat(aggregationResult.get("count")).isEqualTo(45L);
-    assertThat(aggregationResult.get("property_2")).isEqualTo(30L);
+    assertThat(aggregationResult.getLong("count")).isEqualTo(45L);
+    assertThat(aggregationResult.getLong("property_2")).isEqualTo(30L);
+  }
+
+  @Test
+  public void shouldGetDoubleAggregatedResultValueByAlias() {
+    AggregationResult aggregationResult =
+        new AggregationResult(
+            ImmutableMap.of(
+                "qty_avg", DoubleValue.of(45.9322),
+                "qty_sum", DoubleValue.of(783.2134)));
+
+    assertThat(aggregationResult.getDouble("qty_avg")).isEqualTo(45.9322);
+    assertThat(aggregationResult.getDouble("qty_sum")).isEqualTo(783.2134);
+  }
+
+  @Test
+  public void shouldGetLongAggregatedResultValueAsDouble() {
+    AggregationResult aggregationResult =
+        new AggregationResult(ImmutableMap.of("count", LongValue.of(45)));
+
+    assertThat(aggregationResult.getDouble("count")).isEqualTo(45D);
+  }
+
+  @Test
+  public void shouldGetDoubleAggregatedResultValueAsLong() {
+    AggregationResult aggregationResult =
+        new AggregationResult(ImmutableMap.of("qty_avg", DoubleValue.of(45.9322)));
+
+    assertThat(aggregationResult.getLong("qty_avg")).isEqualTo(45L);
+  }
+
+  @Test
+  public void shouldThrowRuntimeExceptionOnUnknownTypes() {
+    AggregationResult aggregationResult =
+        new AggregationResult(
+            ImmutableMap.of(
+                "qty_avg", BooleanValue.of(true))); // only double and long types are supported
+
+    RuntimeException e1 =
+        assertThrows(RuntimeException.class, () -> aggregationResult.getLong("qty_avg"));
+    assertThat(e1.getMessage()).isEqualTo("Unsupported type BOOLEAN received for alias 'qty_avg'.");
+
+    RuntimeException e2 =
+        assertThrows(RuntimeException.class, () -> aggregationResult.getDouble("qty_avg"));
+    assertThat(e2.getMessage()).isEqualTo("Unsupported type BOOLEAN received for alias 'qty_avg'.");
   }
 }
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 d0f00d79b4df..cd768f9868e9 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
@@ -555,7 +555,7 @@ public void testRunAggregationQuery() {
             .build();
     AggregationResult result = getOnlyElement(mockDatastore.runAggregation(getCountQuery));
 
-    assertThat(result.get("total_count")).isEqualTo(209L);
+    assertThat(result.getLong("total_count")).isEqualTo(209L);
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
index 25b902fd4604..8e2ba890ab60 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
@@ -42,6 +42,10 @@ public static Value intValue(long value) {
     return Value.newBuilder().setIntegerValue(value).build();
   }
 
+  public static Value doubleValue(double value) {
+    return Value.newBuilder().setDoubleValue(value).build();
+  }
+
   public static GqlQueryParameter gqlQueryParameter(Value value) {
     return GqlQueryParameter.newBuilder().setValue(value).build();
   }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java
new file mode 100644
index 000000000000..ac785c8b3adb
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import com.google.datastore.v1.AggregationQuery;
+import org.junit.Test;
+
+public class AvgAggregationTest {
+
+  @Test
+  public void shouldThrowExceptionWhenPropertyReferenceIsNull() {
+    assertThrows(IllegalArgumentException.class, () -> avg(null).build());
+  }
+
+  @Test
+  public void testAvgAggregationWithDefaultValues() {
+    AggregationQuery.Aggregation avgAggregation = avg("marks").build().toPb();
+
+    assertThat(avgAggregation.getAvg().getProperty().getName()).isEqualTo("marks");
+    assertThat(avgAggregation.getAlias()).isEqualTo("");
+  }
+
+  @Test
+  public void testCountAggregationWithAlias() {
+    AggregationQuery.Aggregation avgAggregation = avg("marks").as("total_marks").build().toPb();
+
+    assertThat(avgAggregation.getAvg().getProperty().getName()).isEqualTo("marks");
+    assertThat(avgAggregation.getAlias()).isEqualTo("total_marks");
+  }
+
+  @Test
+  public void testEqualsWithAliasVariations() {
+    AvgAggregation.Builder aggregationWithAlias1 = avg("marks").as("total");
+    AvgAggregation.Builder aggregationWithAlias2 = avg("marks").as("total");
+    AvgAggregation.Builder aggregationWithoutAlias1 = avg("marks");
+    AvgAggregation.Builder aggregationWithoutAlias2 = avg("marks");
+
+    // same aliases
+    assertThat(aggregationWithAlias1.build()).isEqualTo(aggregationWithAlias2.build());
+    assertThat(aggregationWithAlias2.build()).isEqualTo(aggregationWithAlias1.build());
+
+    // with and without aliases
+    assertThat(aggregationWithAlias1.build()).isNotEqualTo(aggregationWithoutAlias1.build());
+    assertThat(aggregationWithoutAlias1.build()).isNotEqualTo(aggregationWithAlias1.build());
+
+    // no aliases
+    assertThat(aggregationWithoutAlias1.build()).isEqualTo(aggregationWithoutAlias2.build());
+    assertThat(aggregationWithoutAlias2.build()).isEqualTo(aggregationWithoutAlias1.build());
+
+    // different aliases
+    assertThat(aggregationWithAlias1.as("new-alias").build())
+        .isNotEqualTo(aggregationWithAlias2.build());
+    assertThat(aggregationWithAlias2.build())
+        .isNotEqualTo(aggregationWithAlias1.as("new-alias").build());
+  }
+
+  @Test
+  public void testEqualsWithPropertyReferenceVariations() {
+    AvgAggregation totalMarks1 = avg("marks").build();
+    AvgAggregation totalMarks2 = avg("marks").build();
+
+    AvgAggregation totalQuantities = avg("quantity").build();
+
+    assertThat(totalMarks1).isEqualTo(totalMarks2);
+    assertThat(totalMarks2).isEqualTo(totalMarks1);
+
+    assertThat(totalMarks1).isNotEqualTo(totalQuantities);
+    assertThat(totalQuantities).isNotEqualTo(totalMarks1);
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java
new file mode 100644
index 000000000000..e4f637af05c0
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.cloud.datastore.aggregation;
+
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import com.google.datastore.v1.AggregationQuery;
+import org.junit.Test;
+
+public class SumAggregationTest {
+
+  @Test
+  public void shouldThrowExceptionWhenPropertyReferenceIsNull() {
+    assertThrows(IllegalArgumentException.class, () -> sum(null).build());
+  }
+
+  @Test
+  public void testSumAggregationWithDefaultValues() {
+    AggregationQuery.Aggregation sumAggregation = sum("marks").build().toPb();
+
+    assertThat(sumAggregation.getSum().getProperty().getName()).isEqualTo("marks");
+    assertThat(sumAggregation.getAlias()).isEqualTo("");
+  }
+
+  @Test
+  public void testCountAggregationWithAlias() {
+    AggregationQuery.Aggregation sumAggregation = sum("marks").as("total_marks").build().toPb();
+
+    assertThat(sumAggregation.getSum().getProperty().getName()).isEqualTo("marks");
+    assertThat(sumAggregation.getAlias()).isEqualTo("total_marks");
+  }
+
+  @Test
+  public void testEqualsWithAliasVariations() {
+    SumAggregation.Builder aggregationWithAlias1 = sum("marks").as("total");
+    SumAggregation.Builder aggregationWithAlias2 = sum("marks").as("total");
+    SumAggregation.Builder aggregationWithoutAlias1 = sum("marks");
+    SumAggregation.Builder aggregationWithoutAlias2 = sum("marks");
+
+    // same aliases
+    assertThat(aggregationWithAlias1.build()).isEqualTo(aggregationWithAlias2.build());
+    assertThat(aggregationWithAlias2.build()).isEqualTo(aggregationWithAlias1.build());
+
+    // with and without aliases
+    assertThat(aggregationWithAlias1.build()).isNotEqualTo(aggregationWithoutAlias1.build());
+    assertThat(aggregationWithoutAlias1.build()).isNotEqualTo(aggregationWithAlias1.build());
+
+    // no aliases
+    assertThat(aggregationWithoutAlias1.build()).isEqualTo(aggregationWithoutAlias2.build());
+    assertThat(aggregationWithoutAlias2.build()).isEqualTo(aggregationWithoutAlias1.build());
+
+    // different aliases
+    assertThat(aggregationWithAlias1.as("new-alias").build())
+        .isNotEqualTo(aggregationWithAlias2.build());
+    assertThat(aggregationWithAlias2.build())
+        .isNotEqualTo(aggregationWithAlias1.as("new-alias").build());
+  }
+
+  @Test
+  public void testEqualsWithPropertyReferenceVariations() {
+    SumAggregation totalMarks1 = sum("marks").build();
+    SumAggregation totalMarks2 = sum("marks").build();
+
+    SumAggregation totalQuantities = sum("quantity").build();
+
+    assertThat(totalMarks1).isEqualTo(totalMarks2);
+    assertThat(totalMarks2).isEqualTo(totalMarks1);
+
+    assertThat(totalMarks1).isNotEqualTo(totalQuantities);
+    assertThat(totalQuantities).isNotEqualTo(totalMarks1);
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
index 8776d4221951..7ba57223fab2 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
@@ -15,13 +15,13 @@
  */
 package com.google.cloud.datastore.execution.response;
 
+import static com.google.cloud.datastore.ProtoTestData.doubleValue;
 import static com.google.cloud.datastore.ProtoTestData.intValue;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.cloud.Timestamp;
 import com.google.cloud.datastore.AggregationResult;
 import com.google.cloud.datastore.AggregationResults;
-import com.google.cloud.datastore.LongValue;
 import com.google.common.collect.ImmutableMap;
 import com.google.datastore.v1.AggregationResultBatch;
 import com.google.datastore.v1.RunAggregationQueryResponse;
@@ -40,7 +40,7 @@ public class AggregationQueryResponseTransformerTest {
       new AggregationQueryResponseTransformer();
 
   @Test
-  public void shouldTransformAggregationQueryResponse() {
+  public void shouldTransformAggregationQueryResponseWithIntValues() {
     Map result1 =
         new HashMap<>(
             ImmutableMap.of(
@@ -51,7 +51,46 @@ public void shouldTransformAggregationQueryResponse() {
         new HashMap<>(
             ImmutableMap.of(
                 "count", intValue(509),
-                "property_2", intValue(100)));
+                "property_2", intValue((100))));
+    Timestamp readTime = Timestamp.now();
+
+    AggregationResultBatch resultBatch =
+        AggregationResultBatch.newBuilder()
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result1)
+                    .build())
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result2)
+                    .build())
+            .setReadTime(readTime.toProto())
+            .build();
+    RunAggregationQueryResponse runAggregationQueryResponse =
+        RunAggregationQueryResponse.newBuilder().setBatch(resultBatch).build();
+
+    AggregationResults aggregationResults =
+        responseTransformer.transform(runAggregationQueryResponse);
+
+    assertThat(aggregationResults.size()).isEqualTo(2);
+    assertThat(aggregationResults.get(0)).isEqualTo(new AggregationResult(toDomainValues(result1)));
+    assertThat(aggregationResults.get(1)).isEqualTo(new AggregationResult(toDomainValues(result2)));
+    assertThat(aggregationResults.getReadTime()).isEqualTo(readTime);
+  }
+
+  @Test
+  public void shouldTransformAggregationQueryResponseWithDoubleValues() {
+    Map result1 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", doubleValue(209.678),
+                "property_2", doubleValue(100.678)));
+
+    Map result2 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", doubleValue(509.678),
+                "property_2", doubleValue((100.678))));
     Timestamp readTime = Timestamp.now();
 
     AggregationResultBatch resultBatch =
@@ -78,14 +117,15 @@ public void shouldTransformAggregationQueryResponse() {
     assertThat(aggregationResults.getReadTime()).isEqualTo(readTime);
   }
 
-  private Map toDomainValues(Map map) {
+  private Map> toDomainValues(
+      Map map) {
 
     return map.entrySet().stream()
         .map(
-            (Function, Entry>)
+            (Function, Entry>>)
                 entry ->
                     new SimpleEntry<>(
-                        entry.getKey(), (LongValue) LongValue.fromPb(entry.getValue())))
+                        entry.getKey(), com.google.cloud.datastore.Value.fromPb(entry.getValue())))
         .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
   }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java
new file mode 100644
index 000000000000..fd430095f34e
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.cloud.datastore.it;
+
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.Datastore.TransactionCallable;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.GqlQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.Transaction;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
+import com.google.common.collect.ImmutableList;
+import com.google.datastore.v1.TransactionOptions;
+import com.google.datastore.v1.TransactionOptions.ReadOnly;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import org.junit.After;
+import org.junit.Test;
+
+// TODO(jainsahab) Move all the aggregation related tests from ITDatastoreTest to this file
+public class ITDatastoreAggregationsTest {
+
+  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 KIND = "Marks";
+
+  @After
+  public void tearDown() {
+    EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build();
+    QueryResults allEntities = DATASTORE.run(allEntitiesQuery);
+    Key[] keysToDelete =
+        ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new);
+    DATASTORE.delete(keysToDelete);
+  }
+
+  Key key1 = DATASTORE.newKeyFactory().setKind(KIND).newKey(1);
+  Key key2 = DATASTORE.newKeyFactory().setKind(KIND).newKey(2);
+  Key key3 = DATASTORE.newKeyFactory().setKind(KIND).newKey(3);
+
+  Entity entity1 =
+      Entity.newBuilder(key1).set("name", "Jon Stark").set("marks", 89).set("cgpa", 7.34).build();
+  Entity entity2 =
+      Entity.newBuilder(key2).set("name", "Arya Stark").set("marks", 95).set("cgpa", 9.27).build();
+  Entity entity3 =
+      Entity.newBuilder(key3).set("name", "Night king").set("marks", 55).set("cgpa", 5.16).build();
+
+  @Test
+  public void testSumAggregation() {
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("marks").as("total_marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(184L);
+
+    // sum of 3 entities
+    DATASTORE.put(entity3);
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(239L);
+  }
+
+  @Test
+  public void testSumAggregationWithAutoGeneratedAlias() {
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("property_1"))
+        .isEqualTo(184L);
+
+    // sum of 3 entities
+    DATASTORE.put(entity3);
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("property_1"))
+        .isEqualTo(239L);
+  }
+
+  @Test
+  public void testSumAggregationInGqlQuery() {
+    DATASTORE.put(entity1, entity2);
+
+    GqlQuery gqlQuery =
+        GqlQuery.newGqlQueryBuilder(
+                "AGGREGATE SUM(marks) AS total_marks OVER (SELECT * FROM Marks)")
+            .build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(gqlQuery)
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(184L);
+
+    // sum of 3 entities
+    DATASTORE.put(entity3);
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(239L);
+  }
+
+  @Test
+  public void testSumAggregationWithResultOfDoubleType() {
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("cgpa").as("total_cgpa"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("total_cgpa"))
+        .isEqualTo(16.61);
+
+    // sum of 3 entities
+    DATASTORE.put(entity3);
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("total_cgpa"))
+        .isEqualTo(21.77);
+  }
+
+  @Test
+  public void testAvgAggregation() {
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // avg of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(92D);
+
+    // avg of 3 entities
+    DATASTORE.put(entity3);
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(79.66666666666667);
+  }
+
+  @Test
+  public void testAvgAggregationWithAutoGeneratedAlias() {
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(avg("marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // avg of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("property_1"))
+        .isEqualTo(92D);
+
+    // avg of 3 entities
+    DATASTORE.put(entity3);
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("property_1"))
+        .isEqualTo(79.66666666666667);
+  }
+
+  @Test
+  public void testAvgAggregationInGqlQuery() {
+    DATASTORE.put(entity1, entity2);
+
+    GqlQuery gqlQuery =
+        Query.newGqlQueryBuilder("AGGREGATE AVG(marks) AS avg_marks OVER (SELECT * FROM Marks)")
+            .build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(gqlQuery)
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // avg of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(92D);
+
+    // avg of 3 entities
+    DATASTORE.put(entity3);
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(79.66666666666667);
+  }
+
+  @Test
+  public void testSumAndAvgAggregationTogether() {
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("marks").as("total_marks"))
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(184L);
+    // avg of 2 entities
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(92D);
+  }
+
+  @Test
+  public void testTransactionShouldReturnAConsistentSnapshot() {
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregation(count().as("count"))
+            .addAggregations(sum("marks").as("total_marks"))
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    // original entity count is 2
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(2L);
+
+    // FIRST TRANSACTION
+    DATASTORE.runInTransaction(
+        (TransactionCallable)
+            inFirstTransaction -> {
+              // creating a new entity
+              inFirstTransaction.put(entity3);
+
+              // aggregation result consistently being produced for original 2 entities
+              AggregationResult aggregationResult =
+                  getOnlyElement(inFirstTransaction.runAggregation(aggregationQuery));
+              assertThat(aggregationResult.getLong("count")).isEqualTo(2L);
+              assertThat(aggregationResult.getLong("total_marks")).isEqualTo(184L);
+              assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(92D);
+              return null;
+            });
+
+    // after first transaction is committed, we have 3 entities now.
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(3L);
+
+    // SECOND TRANSACTION
+    DATASTORE.runInTransaction(
+        (TransactionCallable)
+            inSecondTransaction -> {
+              // deleting ENTITY3
+              inSecondTransaction.delete(entity3.getKey());
+
+              // aggregation result still coming for 3 entities
+              AggregationResult aggregationResult =
+                  getOnlyElement(inSecondTransaction.runAggregation(aggregationQuery));
+              assertThat(aggregationResult.getLong("count")).isEqualTo(3L);
+              assertThat(aggregationResult.getLong("total_marks")).isEqualTo(239L);
+              assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(79.66666666666667);
+              return null;
+            });
+
+    // after second transaction is committed, we are back to 2 entities now.
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(2L);
+  }
+
+  @Test
+  public void testReadOnlyTransactionShouldNotLockTheDocuments()
+      throws ExecutionException, InterruptedException {
+    ExecutorService executor = Executors.newSingleThreadExecutor();
+    DATASTORE.put(entity1, entity2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregation(count().as("count"))
+            .addAggregations(sum("marks").as("total_marks"))
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
+
+    TransactionOptions transactionOptions =
+        TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build();
+    Transaction readOnlyTransaction = DATASTORE.newTransaction(transactionOptions);
+
+    // Executing query in transaction, results for original 2 entities
+    AggregationResult aggregationResult =
+        getOnlyElement(readOnlyTransaction.runAggregation(aggregationQuery));
+    assertThat(aggregationResult.getLong("count")).isEqualTo(2L);
+    assertThat(aggregationResult.getLong("total_marks")).isEqualTo(184L);
+    assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(92D);
+
+    // Concurrent write task.
+    Future addNewEntityTaskOutsideTransaction =
+        executor.submit(
+            () -> {
+              DATASTORE.put(entity3);
+              return null;
+            });
+
+    // should not throw exception and complete successfully as the ongoing transaction is read-only.
+    addNewEntityTaskOutsideTransaction.get();
+
+    // cleanup
+    readOnlyTransaction.commit();
+    executor.shutdownNow();
+
+    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(3L);
+  }
+}
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 167d2898cc9d..7c68ffe325c7 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
@@ -821,7 +821,7 @@ public void testRunAggregationQueryInTransactionShouldReturnAConsistentSnapshot(
             .build();
 
     // original entity count is 2
-    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("count"))
         .isEqualTo(2L);
 
     // FIRST TRANSACTION
@@ -836,14 +836,15 @@ public void testRunAggregationQueryInTransactionShouldReturnAConsistentSnapshot(
               // count remains 2
               assertThat(
                       getOnlyElement(inFirstTransaction.runAggregation(aggregationQuery))
-                          .get("count"))
+                          .getLong("count"))
                   .isEqualTo(2L);
-              assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
+              assertThat(
+                      getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("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)).getLong("count"))
         .isEqualTo(3L);
 
     // SECOND TRANSACTION
@@ -856,14 +857,15 @@ public void testRunAggregationQueryInTransactionShouldReturnAConsistentSnapshot(
               // count remains 3
               assertThat(
                       getOnlyElement(inSecondTransaction.runAggregation(aggregationQuery))
-                          .get("count"))
+                          .getLong("count"))
                   .isEqualTo(3L);
-              assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
+              assertThat(
+                      getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("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)).getLong("count"))
         .isEqualTo(2L);
     datastore.delete(newEntityKey);
   }
@@ -889,7 +891,8 @@ public void testRunAggregationQueryInAReadOnlyTransactionShouldNotLockTheCounted
     Transaction readOnlyTransaction = datastore.newTransaction(transactionOptions);
 
     // Executing query in transaction
-    assertThat(getOnlyElement(readOnlyTransaction.runAggregation(aggregationQuery)).get("count"))
+    assertThat(
+            getOnlyElement(readOnlyTransaction.runAggregation(aggregationQuery)).getLong("count"))
         .isEqualTo(2L);
 
     // Concurrent write task.
@@ -912,7 +915,7 @@ public void testRunAggregationQueryInAReadOnlyTransactionShouldNotLockTheCounted
     readOnlyTransaction.commit();
     executor.shutdownNow();
 
-    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("count"))
         .isEqualTo(3L);
   }
 
@@ -1561,7 +1564,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)).getLong(alias);
     long expectedCount = countBeforeAdd + 1;
 
     Entity newEntity =
@@ -1573,7 +1576,7 @@ private void testCountAggregationWith(Consumer configu
             .build();
     datastore.put(newEntity);
 
-    Long countAfterAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).get(alias);
+    Long countAfterAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong(alias);
     assertThat(countAfterAdd).isEqualTo(expectedCount);
 
     datastore.delete(newEntity.getKey());
@@ -1589,7 +1592,7 @@ private void testCountAggregationWithLimit(
     withoutLimitConfigurer.accept(withoutLimitBuilder);
 
     Long currentCount =
-        getOnlyElement(datastore.runAggregation(withoutLimitBuilder.build())).get(alias);
+        getOnlyElement(datastore.runAggregation(withoutLimitBuilder.build())).getLong(alias);
     long limit = currentCount - 1;
 
     AggregationQuery.Builder withLimitBuilder =
@@ -1597,7 +1600,7 @@ private void testCountAggregationWithLimit(
     withLimitConfigurer.accept(withLimitBuilder, limit);
 
     Long countWithLimit =
-        getOnlyElement(datastore.runAggregation(withLimitBuilder.build())).get(alias);
+        getOnlyElement(datastore.runAggregation(withLimitBuilder.build())).getLong(alias);
     assertThat(countWithLimit).isEqualTo(limit);
   }
 
@@ -1640,12 +1643,12 @@ private void testCountAggregationReadTimeWith(Consumer
       AggregationQuery countAggregationQuery = builder.build();
 
       Long latestCount =
-          getOnlyElement(datastore.runAggregation(countAggregationQuery)).get("total_count");
+          getOnlyElement(datastore.runAggregation(countAggregationQuery)).getLong("total_count");
       assertThat(latestCount).isEqualTo(3L);
 
       Long oldCount =
           getOnlyElement(datastore.runAggregation(countAggregationQuery, ReadOption.readTime(now)))
-              .get("total_count");
+              .getLong("total_count");
       assertThat(oldCount).isEqualTo(2L);
     } finally {
       datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());

From eb25c716837cffee3ad07dd2b10bd2a044686481 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 13:44:14 -0400
Subject: [PATCH 1208/1784] chore(main): release 2.17.0 (#1164)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  | 20 +++++++++++++++++++
 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, 47 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e93a5bec505..b036ad58c79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [2.17.0](https://github.com/googleapis/java-datastore/compare/v2.16.3...v2.17.0) (2023-08-22)
+
+
+### Features
+
+* Publish proto definitions for SUM/AVG in Datastore ([#1157](https://github.com/googleapis/java-datastore/issues/1157)) ([954320a](https://github.com/googleapis/java-datastore/commit/954320aaefec249c77c757a1610727519a4029bd))
+* Sum and Avg aggregation feature ([#1067](https://github.com/googleapis/java-datastore/issues/1067)) ([56d1001](https://github.com/googleapis/java-datastore/commit/56d1001005cf7d52f8ba3e5258d6401be729bdbf))
+
+
+### Dependencies
+
+* Update dependency com.google.errorprone:error_prone_core to v2.21.1 ([#1163](https://github.com/googleapis/java-datastore/issues/1163)) ([83158b6](https://github.com/googleapis/java-datastore/commit/83158b6172a4a61b3e2a86dea6271ff7f9f84f6b))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.24 ([#1165](https://github.com/googleapis/java-datastore/issues/1165)) ([4094c70](https://github.com/googleapis/java-datastore/commit/4094c702982e4a005a36324892daee451bd16062))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.24 ([#1166](https://github.com/googleapis/java-datastore/issues/1166)) ([70cc371](https://github.com/googleapis/java-datastore/commit/70cc371babd674000fe6f8d78a0f42e75deb5d99))
+
+
+### Documentation
+
+* Update property requirement specifications ([#1169](https://github.com/googleapis/java-datastore/issues/1169)) ([c908837](https://github.com/googleapis/java-datastore/commit/c908837ea953a5fdc87f9c83937646d309806e03))
+
 ## [2.16.3](https://github.com/googleapis/java-datastore/compare/v2.16.2...v2.16.3) (2023-08-02)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index b9164735f238..634f8dd6ea02 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.16.4-SNAPSHOT
+  2.17.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.4-SNAPSHOT
+    2.17.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a8c083832789..a7b54e30509d 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.16.4-SNAPSHOT
+  2.17.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.16.4-SNAPSHOT
+        2.17.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.4-SNAPSHOT
+        2.17.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.4-SNAPSHOT
+        0.108.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.16.4-SNAPSHOT
+        2.17.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ca6c1b18888b..1d5f83046d2e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.16.4-SNAPSHOT
+  2.17.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.4-SNAPSHOT
+    2.17.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 e6a34928d200..83076f0de196 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.16.4-SNAPSHOT
+  2.17.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.4-SNAPSHOT
+    2.17.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 7fa465710da0..8fa45820ddb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.16.4-SNAPSHOT
+  2.17.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.16.4-SNAPSHOT
+        2.17.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.16.4-SNAPSHOT
+        2.17.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.16.4-SNAPSHOT
+        2.17.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.107.4-SNAPSHOT
+        0.108.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.16.4-SNAPSHOT
+        2.17.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 b81ca75c69e4..a0948a03d7a9 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.16.4-SNAPSHOT
+  2.17.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.4-SNAPSHOT
+    2.17.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 86f9b3e5abf2..cbb5d557e957 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.107.4-SNAPSHOT
+  0.108.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.16.4-SNAPSHOT
+    2.17.0
   
   
     
diff --git a/versions.txt b/versions.txt
index d53b6fd27304..eea775b525fc 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.16.3:2.16.4-SNAPSHOT
-google-cloud-datastore-bom:2.16.3:2.16.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.107.3:0.107.4-SNAPSHOT
-datastore-v1-proto-client:2.16.3:2.16.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.16.3:2.16.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.16.3:2.16.4-SNAPSHOT
+google-cloud-datastore:2.17.0:2.17.0
+google-cloud-datastore-bom:2.17.0:2.17.0
+proto-google-cloud-datastore-v1:0.108.0:0.108.0
+datastore-v1-proto-client:2.17.0:2.17.0
+proto-google-cloud-datastore-admin-v1:2.17.0:2.17.0
+grpc-google-cloud-datastore-admin-v1:2.17.0:2.17.0

From 034c5fd16d63a08c9f546792ff11bc265c4859f9 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 18:24:13 +0000
Subject: [PATCH 1209/1784] chore(main): release 2.17.1-SNAPSHOT (#1173)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 634f8dd6ea02..7563b33569f9 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.17.0
+  2.17.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.0
+    2.17.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a7b54e30509d..68c5f1d83167 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.17.0
+  2.17.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.0
+        2.17.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.0
+        2.17.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.0
+        0.108.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.0
+        2.17.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1d5f83046d2e..ed5e8557c7a9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.0
+  2.17.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.0
+    2.17.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 83076f0de196..f47c8d6ec048 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.17.0
+  2.17.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.0
+    2.17.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 8fa45820ddb8..a4d405aa6e98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.0
+  2.17.1-SNAPSHOT
   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.17.0
+        2.17.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.0
+        2.17.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.0
+        2.17.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.0
+        0.108.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.0
+        2.17.1-SNAPSHOT
         
           
             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 a0948a03d7a9..0d19ac6ce1df 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.17.0
+  2.17.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.0
+    2.17.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cbb5d557e957..4c8e36bf877d 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.108.0
+  0.108.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.0
+    2.17.1-SNAPSHOT
   
   
     
diff --git a/versions.txt b/versions.txt
index eea775b525fc..052c9072005e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.0:2.17.0
-google-cloud-datastore-bom:2.17.0:2.17.0
-proto-google-cloud-datastore-v1:0.108.0:0.108.0
-datastore-v1-proto-client:2.17.0:2.17.0
-proto-google-cloud-datastore-admin-v1:2.17.0:2.17.0
-grpc-google-cloud-datastore-admin-v1:2.17.0:2.17.0
+google-cloud-datastore:2.17.0:2.17.1-SNAPSHOT
+google-cloud-datastore-bom:2.17.0:2.17.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.108.0:0.108.1-SNAPSHOT
+datastore-v1-proto-client:2.17.0:2.17.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.17.0:2.17.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.17.0:2.17.1-SNAPSHOT

From c7031e8586f0a35fa874fc1bee1e8c40363688f0 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 22 Aug 2023 23:36:34 +0200
Subject: [PATCH 1210/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.17.0 (#1174)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.16.3` -> `2.17.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.16.3/2.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.16.3/2.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.17.0`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2170-2023-08-22)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.16.3...v2.17.0)

##### Features

-   Publish proto definitions for SUM/AVG in Datastore ([#​1157](https://togithub.com/googleapis/java-datastore/issues/1157)) ([954320a](https://togithub.com/googleapis/java-datastore/commit/954320aaefec249c77c757a1610727519a4029bd))
-   Sum and Avg aggregation feature ([#​1067](https://togithub.com/googleapis/java-datastore/issues/1067)) ([56d1001](https://togithub.com/googleapis/java-datastore/commit/56d1001005cf7d52f8ba3e5258d6401be729bdbf))

##### Dependencies

-   Update dependency com.google.errorprone:error_prone_core to v2.21.1 ([#​1163](https://togithub.com/googleapis/java-datastore/issues/1163)) ([83158b6](https://togithub.com/googleapis/java-datastore/commit/83158b6172a4a61b3e2a86dea6271ff7f9f84f6b))
-   Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.24 ([#​1165](https://togithub.com/googleapis/java-datastore/issues/1165)) ([4094c70](https://togithub.com/googleapis/java-datastore/commit/4094c702982e4a005a36324892daee451bd16062))
-   Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.24 ([#​1166](https://togithub.com/googleapis/java-datastore/issues/1166)) ([70cc371](https://togithub.com/googleapis/java-datastore/commit/70cc371babd674000fe6f8d78a0f42e75deb5d99))

##### Documentation

-   Update property requirement specifications ([#​1169](https://togithub.com/googleapis/java-datastore/issues/1169)) ([c908837](https://togithub.com/googleapis/java-datastore/commit/c908837ea953a5fdc87f9c83937646d309806e03))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 README.md                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 662c0b5e4a38..56cc0d604191 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.16.3
+  2.17.0
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.16.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.17.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.0"
 ```
 
 
@@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 0097db7b4680..d77507645e2f 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.16.3
+      2.17.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index dbdadb49c5c1..47fb6b3d55a4 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.16.3
+      2.17.0
     
 
     

From b16c0a7ad413b036b6f7a5478e1e427052b397ee Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Tue, 29 Aug 2023 00:32:31 +0530
Subject: [PATCH 1211/1784] samples: Add samples for sum and avg aggregations
 (#1101)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* samples: Add samples for sum/avg aggregations

* fixing lint

* fix snapshot version

* fixing snapshot version

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Kristen O'Leary 
Co-authored-by: Owl Bot 
---
 README.md                                     | 10 +++
 samples/snapshot/pom.xml                      |  6 +-
 .../aggregation/AvgAggregationOnKind.java     | 77 +++++++++++++++++++
 .../aggregation/AvgAggregationWithLimit.java  | 66 ++++++++++++++++
 .../AvgAggregationWithOrderBy.java            | 73 ++++++++++++++++++
 .../AvgAggregationWithPropertyFilter.java     | 74 ++++++++++++++++++
 .../MultipleAggregationsInGqlQuery.java       | 71 +++++++++++++++++
 ...MultipleAggregationsInStructuredQuery.java | 75 ++++++++++++++++++
 .../aggregation/SumAggregationOnKind.java     | 76 ++++++++++++++++++
 .../aggregation/SumAggregationWithLimit.java  | 67 ++++++++++++++++
 .../SumAggregationWithOrderBy.java            | 73 ++++++++++++++++++
 .../SumAggregationWithPropertyFilter.java     | 74 ++++++++++++++++++
 .../AggregationQuerySampleTestIT.java         | 74 ++++++++++++++++++
 .../snippets/src/test/resources/index.yaml    | 21 +++++
 14 files changed, 834 insertions(+), 3 deletions(-)
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java
 create mode 100644 samples/snippets/src/test/resources/index.yaml

diff --git a/README.md b/README.md
index 56cc0d604191..fd1b011ed7e0 100644
--- a/README.md
+++ b/README.md
@@ -262,6 +262,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 | --------------------------- | --------------------------------- | ------ |
 | Native Image Datastore Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) |
 | Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
+| Avg Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) |
+| Avg Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) |
+| Avg Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java) |
+| Avg Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java) |
 | Count Aggregation In Transaction | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) |
 | Count Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) |
 | Count Aggregation With Gql Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) |
@@ -269,6 +273,12 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 | Count Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) |
 | Count Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) |
 | Count Aggregation With Stale Read | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) |
+| Multiple Aggregations In Gql Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java) |
+| Multiple Aggregations In Structured Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java) |
+| Sum Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java) |
+| Sum Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) |
+| Sum Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) |
+| Sum Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) |
 | Create a union between two filters | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) |
 | Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 47fb6b3d55a4..689b85ccdb4c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -23,13 +23,14 @@
     UTF-8
       
 
-  
+  
   
     
       com.google.cloud
       google-cloud-datastore
-      2.17.0
+      2.17.1-SNAPSHOT
     
+    
 
     
       junit
@@ -44,7 +45,6 @@
       test
     
   
-  
 
   
   
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java
new file mode 100644
index 000000000000..367837da620c
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_avg_aggregation_query_on_kind]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class AvgAggregationOnKind {
+
+  // Instantiates a client.
+  private static final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+  // The kind for the new entity.
+  private static final String kind = "Sales";
+
+  // Setting up Sales in database
+  private static void setUpSales() {
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the sales.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).build());
+  }
+
+  // Accessing aggregation result by the provided custom alias.
+  private static void usageWithCustomAlias() {
+    EntityQuery selectAllSales = Query.newEntityQueryBuilder().setKind(kind).build();
+    // Creating an aggregation query to get the avg of all sales.
+    AggregationQuery avgOfSalesQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllSales)
+            // passing 'avg_sales_amount' as alias in the aggregation query.
+            .addAggregation(avg("amount").as("avg_sales_amount"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult aggregationResult =
+        Iterables.getOnlyElement(datastore.runAggregation(avgOfSalesQuery));
+
+    System.out.printf(
+        "Average sales is %.8f", aggregationResult.getDouble("avg_sales_amount")); // 79.66666667
+  }
+
+  public static void invoke() {
+    setUpSales();
+    usageWithCustomAlias();
+  }
+}
+// [END datastore_avg_aggregation_query_on_kind]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java
new file mode 100644
index 000000000000..a96ab9317d7a
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_avg_aggregation_query_with_limit]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class AvgAggregationWithLimit {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).build());
+
+    EntityQuery selectAllSales = Query.newEntityQueryBuilder().setKind(kind).setLimit(2).build();
+    // Creating an aggregation query to get the avg of all sales amount.
+    AggregationQuery avgOfSalesQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllSales)
+            .addAggregation(avg("amount").as("at_least"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult limitQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(avgOfSalesQuery));
+
+    System.out.printf("Average with limit 2 is %d.", limitQueryResult.getLong("at_least")); // 72
+  }
+}
+// [END datastore_avg_aggregation_query_with_limit]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java
new file mode 100644
index 000000000000..68875b23fccd
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_avg_aggregation_query_with_order_by]
+
+import static com.google.cloud.datastore.StructuredQuery.OrderBy.asc;
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class AvgAggregationWithOrderBy {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the sales.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).set("customerId", 1).build(),
+        // customerId not specified (orphan record).
+        Entity.newBuilder(sales2Key).set("amount", 95).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).set("customerId", 2).build());
+
+    // OrderBy acts as an existence filter.
+    EntityQuery selectAllSales =
+        Query.newEntityQueryBuilder().setKind(kind).addOrderBy(asc("customerId")).build();
+
+    // Creating an aggregation query to avg of all sales.
+    AggregationQuery avgOfSalesQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllSales)
+            .addAggregation(avg("amount").as("avg_of_sales"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult limitQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(avgOfSalesQuery));
+
+    System.out.printf(
+        "Total avg of %d with valid customerId field",
+        limitQueryResult.getLong("avg_of_sales")); // 72
+  }
+}
+// [END datastore_avg_aggregation_query_with_order_by]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
new file mode 100644
index 000000000000..f41b193bc39d
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_avg_aggregation_query_with_filters]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.common.collect.Iterables;
+
+public class AvgAggregationWithPropertyFilter {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).set("customerId", 1).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).set("customerId", 1).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).set("customerId", 2).build());
+
+    EntityQuery customer1Sales =
+        Query.newEntityQueryBuilder()
+            .setKind(kind)
+            .setFilter(PropertyFilter.eq("customerId", 1))
+            .build();
+
+    // Creating an aggregation query to get the avg of all sales for customerId 1.
+    AggregationQuery customer1SalesAvg =
+        Query.newAggregationQueryBuilder()
+            .over(customer1Sales)
+            .addAggregation(avg("amount").as("total_sales"))
+            .build();
+
+    // Executing aggregation query.
+    AggregationResult customer1SalesAvgQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(customer1SalesAvg));
+
+    System.out.printf(
+        "Customer 1 sales avg is %d", customer1SalesAvgQueryResult.getLong("total_sales")); // 184
+  }
+}
+// [END datastore_avg_aggregation_query_with_filters]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java
new file mode 100644
index 000000000000..40d152598032
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_multiple_aggregation_in_structured_query]
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.GqlQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class MultipleAggregationsInGqlQuery {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the sales.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).set("customerId", 1).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).set("customerId", 1).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).set("customerId", 2).build());
+
+    GqlQuery baseQuery =
+        Query.newGqlQueryBuilder(
+                "AGGREGATE COUNT(*) AS total_count,"
+                    + " SUM(amount) AS sales_sum,"
+                    + " AVG(amount) AS sales_avg "
+                    + "OVER (SELECT * FROM Sales)")
+            .build();
+
+    // Creating an aggregation query with COUNT, SUM and AVG aggregations.
+    AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder().over(baseQuery).build();
+
+    // Executing aggregation query.
+    AggregationResult aggregationResult =
+        Iterables.getOnlyElement(datastore.runAggregation(aggregationQuery));
+
+    System.out.printf("Total sales count: %d", aggregationResult.getLong("total_count")); // 3
+    System.out.printf("Sum of sales: %d", aggregationResult.getLong("sales_sum")); // 239
+    System.out.printf(
+        "Avg of sales: %.8f", aggregationResult.getDouble("sales_avg")); // 79.66666667
+  }
+}
+// [END datastore_multiple_aggregation_in_structured_query]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java
new file mode 100644
index 000000000000..1fc0e9edad26
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_multiple_aggregation_in_structured_query]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class MultipleAggregationsInStructuredQuery {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the sales.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).set("customerId", 1).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).set("customerId", 1).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).set("customerId", 2).build());
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(kind).build();
+
+    // Creating an aggregation query with COUNT, SUM and AVG aggregations.
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregation(count().as("total_count"))
+            .addAggregation(sum("amount").as("sales_sum"))
+            .addAggregation(avg("amount").as("sales_avg"))
+            .build();
+
+    // Executing aggregation query.
+    AggregationResult aggregationResult =
+        Iterables.getOnlyElement(datastore.runAggregation(aggregationQuery));
+
+    System.out.printf("Total sales count: %d", aggregationResult.getLong("total_count")); // 3
+    System.out.printf("Sum of sales: %d", aggregationResult.getLong("sales_sum")); // 239
+    System.out.printf(
+        "Avg of sales: %.8f", aggregationResult.getDouble("sales_avg")); // 79.66666667
+  }
+}
+// [END datastore_multiple_aggregation_in_structured_query]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java
new file mode 100644
index 000000000000..48ca2974d6bc
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_sum_aggregation_query_on_kind]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class SumAggregationOnKind {
+
+  // Instantiates a client.
+  private static final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+  // The kind for the new entity.
+  private static final String kind = "Sales";
+
+  // Setting up Sales in database
+  private static void setUpSales() {
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the sales.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).build());
+  }
+
+  // Accessing aggregation result by the provided custom alias.
+  private static void usageWithCustomAlias() {
+    EntityQuery selectAllSales = Query.newEntityQueryBuilder().setKind(kind).build();
+    // Creating an aggregation query to get the sum of all sales.
+    AggregationQuery sumOfSalesQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllSales)
+            // passing 'total_sales_amount' as alias in the aggregation query.
+            .addAggregation(sum("amount").as("total_sales_amount"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult aggregationResult =
+        Iterables.getOnlyElement(datastore.runAggregation(sumOfSalesQuery));
+
+    System.out.printf("Total sales is %d", aggregationResult.getLong("total_sales_amount")); // 239
+  }
+
+  public static void invoke() {
+    setUpSales();
+    usageWithCustomAlias();
+  }
+}
+// [END datastore_sum_aggregation_query_on_kind]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java
new file mode 100644
index 000000000000..6b94ade92370
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_sum_aggregation_query_with_limit]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class SumAggregationWithLimit {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).build());
+
+    EntityQuery selectAllSales = Query.newEntityQueryBuilder().setKind(kind).setLimit(2).build();
+    // Creating an aggregation query to get the sum of all sales amount.
+    AggregationQuery sumOfSalesQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllSales)
+            .addAggregation(sum("amount").as("at_least"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult limitQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(sumOfSalesQuery));
+
+    System.out.printf(
+        "We have a minimum sales sum of %d.", limitQueryResult.getLong("at_least")); // 144
+  }
+}
+// [END datastore_sum_aggregation_query_with_limit]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java
new file mode 100644
index 000000000000..151bdd1c7e28
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_sum_aggregation_query_with_order_by]
+
+import static com.google.cloud.datastore.StructuredQuery.OrderBy.asc;
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.common.collect.Iterables;
+
+public class SumAggregationWithOrderBy {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the sales.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).set("customerId", 1).build(),
+        // customerId not specified (orphan record).
+        Entity.newBuilder(sales2Key).set("amount", 95).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).set("customerId", 2).build());
+
+    // OrderBy acts as an existence filter.
+    EntityQuery selectAllSales =
+        Query.newEntityQueryBuilder().setKind(kind).addOrderBy(asc("customerId")).build();
+
+    // Creating an aggregation query to sum of all sales.
+    AggregationQuery sumOfSalesQuery =
+        Query.newAggregationQueryBuilder()
+            .over(selectAllSales)
+            .addAggregation(sum("amount").as("total_sales"))
+            .build();
+    // Executing aggregation query.
+    AggregationResult limitQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(sumOfSalesQuery));
+
+    System.out.printf(
+        "Total sum of %d with valid customerId field",
+        limitQueryResult.getLong("total_sales")); // 144
+  }
+}
+// [END datastore_sum_aggregation_query_with_order_by]
diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java
new file mode 100644
index 000000000000..39ba310ea3ad
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 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.example.datastore.aggregation;
+
+// [START datastore_sum_aggregation_query_with_filters]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.EntityQuery;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.common.collect.Iterables;
+
+public class SumAggregationWithPropertyFilter {
+
+  public static void invoke() {
+    // Instantiates a client.
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // The kind for the new entity.
+    String kind = "Sales";
+
+    Key sales1Key = datastore.newKeyFactory().setKind(kind).newKey("sales1");
+    Key sales2Key = datastore.newKeyFactory().setKind(kind).newKey("sales2");
+    Key sales3Key = datastore.newKeyFactory().setKind(kind).newKey("sales3");
+
+    // Save all the tasks.
+    datastore.put(
+        Entity.newBuilder(sales1Key).set("amount", 89).set("customerId", 1).build(),
+        Entity.newBuilder(sales2Key).set("amount", 95).set("customerId", 1).build(),
+        Entity.newBuilder(sales3Key).set("amount", 55).set("customerId", 2).build());
+
+    EntityQuery customer1Sales =
+        Query.newEntityQueryBuilder()
+            .setKind(kind)
+            .setFilter(PropertyFilter.eq("customerId", 1))
+            .build();
+
+    // Creating an aggregation query to get the sum of all sales for customerId 1.
+    AggregationQuery customer1SalesSum =
+        Query.newAggregationQueryBuilder()
+            .over(customer1Sales)
+            .addAggregation(sum("amount").as("total_sales"))
+            .build();
+
+    // Executing aggregation query.
+    AggregationResult customer1SalesSumQueryResult =
+        Iterables.getOnlyElement(datastore.runAggregation(customer1SalesSum));
+
+    System.out.printf(
+        "Customer 1 sales sum is %d", customer1SalesSumQueryResult.getLong("total_sales")); // 184
+  }
+}
+// [END datastore_sum_aggregation_query_with_filters]
diff --git a/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java b/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
index 662802e51af4..ab709f5753d9 100644
--- a/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
+++ b/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
@@ -18,6 +18,10 @@
 
 import static org.junit.Assert.assertThrows;
 
+import com.example.datastore.aggregation.AvgAggregationOnKind;
+import com.example.datastore.aggregation.AvgAggregationWithLimit;
+import com.example.datastore.aggregation.AvgAggregationWithOrderBy;
+import com.example.datastore.aggregation.AvgAggregationWithPropertyFilter;
 import com.example.datastore.aggregation.CountAggregationInTransaction;
 import com.example.datastore.aggregation.CountAggregationOnKind;
 import com.example.datastore.aggregation.CountAggregationWithGqlQuery;
@@ -25,6 +29,12 @@
 import com.example.datastore.aggregation.CountAggregationWithOrderBy;
 import com.example.datastore.aggregation.CountAggregationWithPropertyFilter;
 import com.example.datastore.aggregation.CountAggregationWithStaleRead;
+import com.example.datastore.aggregation.MultipleAggregationsInGqlQuery;
+import com.example.datastore.aggregation.MultipleAggregationsInStructuredQuery;
+import com.example.datastore.aggregation.SumAggregationOnKind;
+import com.example.datastore.aggregation.SumAggregationWithLimit;
+import com.example.datastore.aggregation.SumAggregationWithOrderBy;
+import com.example.datastore.aggregation.SumAggregationWithPropertyFilter;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Key;
@@ -98,4 +108,68 @@ public void testAggregationQueryAndCountWithTransaction() throws InterruptedExce
     assertThrows(Exception.class, CountAggregationInTransaction::invoke);
     systemsOutRule.assertContains("Found existing 2 tasks, rolling back");
   }
+
+  @Test
+  public void testSumAggregationWithKind() {
+    SumAggregationOnKind.invoke();
+    systemsOutRule.assertContains("Total sales is 239");
+  }
+
+  @Test
+  public void testAvgAggregationWithKind() {
+    AvgAggregationOnKind.invoke();
+    systemsOutRule.assertContains("Average sales is 79.66666667");
+  }
+
+  @Test
+  public void testSumAggregationWithPropertyFilter() {
+    SumAggregationWithPropertyFilter.invoke();
+    systemsOutRule.assertContains("Customer 1 sales sum is 184");
+  }
+
+  @Test
+  public void testAvgAggregationWithPropertyFilter() {
+    AvgAggregationWithPropertyFilter.invoke();
+    systemsOutRule.assertContains("Customer 1 sales avg is 92");
+  }
+
+  @Test
+  public void testSumAggregationWithLimit() {
+    SumAggregationWithLimit.invoke();
+    systemsOutRule.assertContains("We have a minimum sales sum of 144.");
+  }
+
+  @Test
+  public void testAvgAggregationWithLimit() {
+    AvgAggregationWithLimit.invoke();
+    systemsOutRule.assertContains("Average with limit 2 is 72.");
+  }
+
+  @Test
+  public void testSumAggregationWithOrderBy() {
+    SumAggregationWithOrderBy.invoke();
+    systemsOutRule.assertContains("Total sum of 144 with valid customerId field");
+  }
+
+  @Test
+  public void testAvgAggregationWithOrderBy() {
+    AvgAggregationWithOrderBy.invoke();
+    systemsOutRule.assertContains("Total avg of 72 with valid customerId field");
+  }
+
+  @Test
+  public void testMultipleAggregationsInStructuredQuery() {
+    MultipleAggregationsInStructuredQuery.invoke();
+    systemsOutRule.assertContains("Total sales count: 3");
+    systemsOutRule.assertContains("Sum of sales: 239");
+    systemsOutRule.assertContains("Avg of sales: 79.66666667");
+  }
+
+  @Test
+  public void testMultipleAggregationsInGQLQuery() {
+    MultipleAggregationsInGqlQuery.invoke();
+    systemsOutRule.assertContains("Total sales count: 3");
+    systemsOutRule.assertContains("Sum of sales: 239");
+    systemsOutRule.assertContains("Avg of sales: 79.66666667");
+  }
 }
diff --git a/samples/snippets/src/test/resources/index.yaml b/samples/snippets/src/test/resources/index.yaml
new file mode 100644
index 000000000000..50ab1ca0f68b
--- /dev/null
+++ b/samples/snippets/src/test/resources/index.yaml
@@ -0,0 +1,21 @@
+# Copyright 2023 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.
+
+# one time index creation is required to run AggregationQuerySampleTestIT
+# see https://cloud.google.com/sdk/gcloud/reference/datastore/indexes/create for more details
+indexes:
+- kind: Sales
+  properties:
+  - name: customerId
+  - name: amount

From 567697e8d5fdfd4516ed5f92f48a0a36c94d2646 Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Wed, 30 Aug 2023 02:17:57 +0530
Subject: [PATCH 1212/1784] samples(fix): correcting aggregation value in
 comment in Avg aggregation sample (#1179)

---
 .../datastore/aggregation/AvgAggregationWithPropertyFilter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
index f41b193bc39d..4fe2dd5326d1 100644
--- a/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
+++ b/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
@@ -68,7 +68,7 @@ public static void invoke() {
         Iterables.getOnlyElement(datastore.runAggregation(customer1SalesAvg));
 
     System.out.printf(
-        "Customer 1 sales avg is %d", customer1SalesAvgQueryResult.getLong("total_sales")); // 184
+        "Customer 1 sales avg is %d", customer1SalesAvgQueryResult.getLong("total_sales")); // 92
   }
 }
 // [END datastore_avg_aggregation_query_with_filters]

From 3e62380ae2793437aa9c4d21fa4484a8896cb49e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 30 Aug 2023 16:25:15 +0200
Subject: [PATCH 1213/1784] deps: update dependency org.easymock:easymock to
 v5.2.0 (#1180)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a4d405aa6e98..9692ca7f7b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
       
         org.easymock
         easymock
-        5.1.0
+        5.2.0
         test
       
         

From 6cbb79589e7eb8648c734bd02579a93423aa4e13 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 11 Sep 2023 06:41:00 +0200
Subject: [PATCH 1214/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.15.0 (#1184)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9692ca7f7b7d..58551e78fdfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.14.0
+        3.15.0
         pom
         import
       

From 252f8549895250ced3aecf5c082cb0b41ea12472 Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Mon, 11 Sep 2023 20:17:16 +0530
Subject: [PATCH 1215/1784] docs: Marking AggregationResult#get as Obsolete
 (#1185)

---
 .../java/com/google/cloud/datastore/AggregationResult.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
index 75636c00434d..a5071d8d84a1 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
@@ -15,9 +15,7 @@
  */
 package com.google.cloud.datastore;
 
-import static com.google.cloud.datastore.ValueType.DOUBLE;
-import static com.google.cloud.datastore.ValueType.LONG;
-
+import com.google.api.core.ObsoleteApi;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import java.util.Map;
@@ -41,6 +39,7 @@ public AggregationResult(Map> properties) {
    *     'property_\d'
    * @return An aggregation result value for the given alias.
    */
+  @ObsoleteApi("Please use getLong(String) instead, see Github issue #1175 for details.")
   public Long get(String alias) {
     return getLong(alias);
   }

From c294e111670bc85d0f297d035a304c83590753f5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 15:02:18 +0000
Subject: [PATCH 1216/1784] chore(main): release 2.17.1 (#1181)

:robot: I have created a release *beep* *boop*
---


## [2.17.1](https://togithub.com/googleapis/java-datastore/compare/v2.17.0...v2.17.1) (2023-09-11)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#1184](https://togithub.com/googleapis/java-datastore/issues/1184)) ([6cbb795](https://togithub.com/googleapis/java-datastore/commit/6cbb79589e7eb8648c734bd02579a93423aa4e13))
* Update dependency org.easymock:easymock to v5.2.0 ([#1180](https://togithub.com/googleapis/java-datastore/issues/1180)) ([3e62380](https://togithub.com/googleapis/java-datastore/commit/3e62380ae2793437aa9c4d21fa4484a8896cb49e))


### Documentation

* Marking AggregationResult#get as Obsolete ([#1185](https://togithub.com/googleapis/java-datastore/issues/1185)) ([252f854](https://togithub.com/googleapis/java-datastore/commit/252f8549895250ced3aecf5c082cb0b41ea12472))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b036ad58c79f..9f235cfe810d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.17.1](https://github.com/googleapis/java-datastore/compare/v2.17.0...v2.17.1) (2023-09-11)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#1184](https://github.com/googleapis/java-datastore/issues/1184)) ([6cbb795](https://github.com/googleapis/java-datastore/commit/6cbb79589e7eb8648c734bd02579a93423aa4e13))
+* Update dependency org.easymock:easymock to v5.2.0 ([#1180](https://github.com/googleapis/java-datastore/issues/1180)) ([3e62380](https://github.com/googleapis/java-datastore/commit/3e62380ae2793437aa9c4d21fa4484a8896cb49e))
+
+
+### Documentation
+
+* Marking AggregationResult#get as Obsolete ([#1185](https://github.com/googleapis/java-datastore/issues/1185)) ([252f854](https://github.com/googleapis/java-datastore/commit/252f8549895250ced3aecf5c082cb0b41ea12472))
+
 ## [2.17.0](https://github.com/googleapis/java-datastore/compare/v2.16.3...v2.17.0) (2023-08-22)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7563b33569f9..a693fcb34f69 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.17.1-SNAPSHOT
+  2.17.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1-SNAPSHOT
+    2.17.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 68c5f1d83167..34a7e2b1978c 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.17.1-SNAPSHOT
+  2.17.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.1-SNAPSHOT
+        2.17.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.1-SNAPSHOT
+        2.17.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.1-SNAPSHOT
+        0.108.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.1-SNAPSHOT
+        2.17.1
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ed5e8557c7a9..a1619a509dae 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.1-SNAPSHOT
+  2.17.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1-SNAPSHOT
+    2.17.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f47c8d6ec048..0d4643da71a8 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.17.1-SNAPSHOT
+  2.17.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1-SNAPSHOT
+    2.17.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 58551e78fdfb..bba6d9fa54b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.1-SNAPSHOT
+  2.17.1
   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.17.1-SNAPSHOT
+        2.17.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.1-SNAPSHOT
+        2.17.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.1-SNAPSHOT
+        2.17.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.1-SNAPSHOT
+        0.108.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.1-SNAPSHOT
+        2.17.1
         
           
             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 0d19ac6ce1df..55665d8a59b5 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.17.1-SNAPSHOT
+  2.17.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1-SNAPSHOT
+    2.17.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4c8e36bf877d..77305438f08e 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.108.1-SNAPSHOT
+  0.108.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1-SNAPSHOT
+    2.17.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 689b85ccdb4c..81807f24ad07 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.1-SNAPSHOT
+      2.17.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 052c9072005e..fbfda5a27265 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.0:2.17.1-SNAPSHOT
-google-cloud-datastore-bom:2.17.0:2.17.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.108.0:0.108.1-SNAPSHOT
-datastore-v1-proto-client:2.17.0:2.17.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.17.0:2.17.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.17.0:2.17.1-SNAPSHOT
+google-cloud-datastore:2.17.1:2.17.1
+google-cloud-datastore-bom:2.17.1:2.17.1
+proto-google-cloud-datastore-v1:0.108.1:0.108.1
+datastore-v1-proto-client:2.17.1:2.17.1
+proto-google-cloud-datastore-admin-v1:2.17.1:2.17.1
+grpc-google-cloud-datastore-admin-v1:2.17.1:2.17.1

From 05f01731a490c6430e6a4e9d57b13c6417e907d8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 02:28:12 +0000
Subject: [PATCH 1217/1784] chore(main): release 2.17.2-SNAPSHOT (#1186)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a693fcb34f69..7c369bf62127 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.17.1
+  2.17.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1
+    2.17.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 34a7e2b1978c..e8bf3f66ba48 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.17.1
+  2.17.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.1
+        2.17.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.1
+        2.17.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.1
+        0.108.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.1
+        2.17.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a1619a509dae..1da029449164 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.1
+  2.17.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1
+    2.17.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0d4643da71a8..957a0e87a020 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.17.1
+  2.17.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1
+    2.17.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index bba6d9fa54b9..72dc20406112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.1
+  2.17.2-SNAPSHOT
   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.17.1
+        2.17.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.1
+        2.17.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.1
+        2.17.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.1
+        0.108.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.1
+        2.17.2-SNAPSHOT
         
           
             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 55665d8a59b5..5ce3723f9c1d 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.17.1
+  2.17.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1
+    2.17.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 77305438f08e..263e31f9e022 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.108.1
+  0.108.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.1
+    2.17.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 81807f24ad07..bf17348a287d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.1
+      2.17.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index fbfda5a27265..ffab0ef4bed5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.1:2.17.1
-google-cloud-datastore-bom:2.17.1:2.17.1
-proto-google-cloud-datastore-v1:0.108.1:0.108.1
-datastore-v1-proto-client:2.17.1:2.17.1
-proto-google-cloud-datastore-admin-v1:2.17.1:2.17.1
-grpc-google-cloud-datastore-admin-v1:2.17.1:2.17.1
+google-cloud-datastore:2.17.1:2.17.2-SNAPSHOT
+google-cloud-datastore-bom:2.17.1:2.17.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.108.1:0.108.2-SNAPSHOT
+datastore-v1-proto-client:2.17.1:2.17.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.17.1:2.17.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.17.1:2.17.2-SNAPSHOT

From 27f805ed7f499639d7d4a5fe702eb59df0b88cba Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 12 Sep 2023 05:12:16 +0200
Subject: [PATCH 1218/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.17.1 (#1187)
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.17.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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index fd1b011ed7e0..f7172c9ba2f9 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.17.0
+  2.17.1
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.17.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.17.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.1"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d77507645e2f..f408a2ed1753 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.17.0
+      2.17.1
     
     
 

From 974f32f90fd3604b5de7db925a089859bc9faa16 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 10:53:20 -0400
Subject: [PATCH 1219/1784] chore: for Java repos RenovateBot to ignore GitHub
 Actions workflow file (#1855) (#1183)

chore: for Java repos RenovateBot to ignore GitHub Actions workflow file

The actions used in the GitHub Actions workflow files do not appear in libraries' dependencies and mostly maintained by Java postprocessor templates.

IgnorePath option document: https://docs.renovatebot.com/configuration-options/
Source-Link: https://github.com/googleapis/synthtool/commit/1543029c843989702adbe789acdead153ad696d1
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 4 ++--
 renovate.json             | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index fa335912bd92..52eaa54d82b2 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:3a95f1b9b1102865ca551b76be51d2bdb850900c4db2f6d79269e7af81ac8f84
-# created: 2023-07-27T18:37:44.251188775Z
+  digest: sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f
+# created: 2023-09-05T18:54:42.225408832Z
diff --git a/renovate.json b/renovate.json
index f72fe4775f54..d85059fc5cd2 100644
--- a/renovate.json
+++ b/renovate.json
@@ -10,7 +10,10 @@
     ":maintainLockFilesDisabled",
     ":autodetectPinVersions"
   ],
-  "ignorePaths": [".kokoro/requirements.txt"],
+  "ignorePaths": [
+    ".kokoro/requirements.txt",
+    ".github/workflows/**"
+  ],
   "packageRules": [
     {
       "packagePatterns": [

From 7733004aff34bb8b4b8addccc68e75080f0f33a5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 12 Sep 2023 20:22:16 +0200
Subject: [PATCH 1220/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.26 (#1177)

---
 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 1269932bcf46..98a605954461 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.24
+            0.9.26
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 76e3a71560222894513a485cb91cec7161276e3c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 12 Sep 2023 21:46:00 +0200
Subject: [PATCH 1221/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.26 (#1176)

---
 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 98a605954461..0fadbb5dfeb6 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.24
+          0.9.26
           test
         
       

From 410b9397bb9ba480dff6217c0c4c27364e58db49 Mon Sep 17 00:00:00 2001
From: Yuri Golobokov 
Date: Wed, 13 Sep 2023 11:24:14 -0700
Subject: [PATCH 1222/1784] fix: checksum format (#1178)

Fix checksum format to match the server's format -- unsigned long.
---
 .../v1/client/ChecksumEnforcingInputStream.java      |  2 +-
 .../datastore/v1/client/EndToEndChecksumHandler.java | 10 +++++++---
 .../v1/client/EndToEndChecksumHandlerTest.java       | 12 +++++++++++-
 .../google/datastore/v1/client/RemoteRpcTest.java    |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
index 0b91f18e2bb9..e8cc4163a9fe 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
@@ -76,7 +76,7 @@ public int read(byte[] b, int off, int len) throws IOException {
       endToEndChecksumHandler.update(b, off, i);
     } else {
       // no more payload to read. compute checksum and verify
-      if (!expectedChecksum.equalsIgnoreCase(endToEndChecksumHandler.hash())) {
+      if (!expectedChecksum.equals(endToEndChecksumHandler.hash())) {
         throw new IOException("possible memory corruption on payload detected");
       }
     }
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
index 01aa303c851d..3f840a8ba75b 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
@@ -40,7 +40,11 @@ static String computeChecksum(byte[] bytes) {
       return null;
     }
     HashCode hc = getNewCrc32cHasher().putBytes(bytes).hash();
-    return hc.toString();
+    return hashToString(hc);
+  }
+
+  private static String hashToString(HashCode hc) {
+    return String.valueOf(Integer.toUnsignedLong(hc.asInt()));
   }
 
   private static Hasher getNewCrc32cHasher() {
@@ -59,7 +63,7 @@ static boolean validateChecksum(String checksum, byte[] bytes) {
         && !checksum.isEmpty()
         && bytes != null
         && bytes.length > 0
-        && checksum.equalsIgnoreCase(computeChecksum(bytes));
+        && checksum.equals(computeChecksum(bytes));
   }
 
   static boolean hasChecksumHeader(HttpResponse response) {
@@ -76,6 +80,6 @@ void update(byte[] bytes, int off, int len) {
   }
 
   String hash() {
-    return hasher.hash().toString();
+    return hashToString(hasher.hash());
   }
 }
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
index b0a7e4e86088..1fdc1906a1de 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
@@ -16,6 +16,7 @@
 package com.google.datastore.v1.client;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -27,7 +28,10 @@
 /** Test for {@link EndToEndChecksumHandler}. */
 @RunWith(JUnit4.class)
 public class EndToEndChecksumHandlerTest {
-  private byte[] payloadBytes = "This is a long string with numbers 1234, 134.56 ".getBytes(UTF_8);
+  private final byte[] payloadBytes =
+      "This is a long string with numbers 1234, 134.56 ".getBytes(UTF_8);
+  private final byte[] payloadForUnsignedLongChecksum = "aaa".getBytes(UTF_8);
+  private final String unsignedLongChecksum = "3818383321";
 
   @Test
   public void validateChecksum_correctChecksum() {
@@ -35,6 +39,12 @@ public void validateChecksum_correctChecksum() {
     assertTrue(EndToEndChecksumHandler.validateChecksum(computed, payloadBytes));
   }
 
+  @Test
+  public void computeChecksum_returnsUnsignedLongAsStringValue() {
+    String computed = EndToEndChecksumHandler.computeChecksum(payloadForUnsignedLongChecksum);
+    assertEquals("computeChecksum return value", unsignedLongChecksum, computed);
+  }
+
   @Test
   public void validateChecksum_incorrectChecksum() {
     String computed = EndToEndChecksumHandler.computeChecksum("random string".getBytes(UTF_8));
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 281e92f04390..28e3f20b8a45 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
@@ -176,7 +176,7 @@ public void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
         httpRequest
             .getHeaders()
             .getFirstHeaderStringValue(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER);
-    assertEquals(8, header.length());
+    assertEquals(9, header.length());
   }
 
   @Test

From 12a3d27ebc7ca87338ee896fd6ba3e804edd95ce Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 14 Sep 2023 10:58:14 -0400
Subject: [PATCH 1223/1784] fix: deprecate `databaseId` on
 datastore-v1-proto-client DatastoreOptions (#1190)

---
 .../datastore/v1/client/DatastoreOptions.java | 33 +++++++++++++++++--
 .../v1/client/DatastoreClientTest.java        |  1 +
 .../datastore/spi/v1/HttpDatastoreRpc.java    |  1 -
 3 files changed, 31 insertions(+), 4 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 eefd629ec6a4..687410d78a21 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
@@ -41,7 +41,9 @@
  */
 public class DatastoreOptions {
   private final String projectId;
-  private final String databaseId;
+
+  @Deprecated private final String databaseId;
+
   private final String projectEndpoint;
   private final String host;
   private final String localHost;
@@ -75,7 +77,9 @@ public static class Builder {
         "Can set at most one of project endpoint, host, and local host.";
 
     private String projectId;
-    private String databaseId;
+
+    @Deprecated private String databaseId;
+
     private String projectEndpoint;
     private String host;
     private String localHost;
@@ -107,8 +111,19 @@ public Builder projectId(String projectId) {
       return this;
     }
 
-    /** Sets the database ID used to access Cloud Datastore. */
+    /**
+     * This field is ignored and will be removed in a future release. Please set the database id on
+     * the request itself. For example:
+     *
+     * 
    {@code
+     * CommitRequest.newBuilder()
+     *     .setDatabaseId("my-database-id")
+     *     ....
+     *     .build();
+     * }
    
+     */
     @BetaApi
+    @Deprecated
     public Builder databaseId(String databaseId) {
       this.databaseId = databaseId;
       return this;
@@ -188,7 +203,19 @@ public String getProjectId() {
     return projectId;
   }
 
+  /**
+   * This field is ignored and will be removed in a future release. Please set the database id on
+   * the request itself. For example:
+   *
+   * 
    {@code
+   * CommitRequest.newBuilder()
+   *     .setDatabaseId("my-database-id")
+   *     ....
+   *     .build();
+   * }
    
+   */
   @BetaApi
+  @Deprecated
   public String getDatabaseId() {
     return databaseId;
   }
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 3eb7a66de8c9..3fd82ddca58c 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
@@ -216,6 +216,7 @@ public void create_LocalHost() {
   }
 
   @Test
+  // TODO: remove this test once deprecated `databaseId` is removed
   public void setDatabaseId() {
     DatastoreOptions options =
         new DatastoreOptions.Builder()
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 cfbbaa7df3c5..fd3cdc658a8a 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,7 +55,6 @@ 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() : "";

From c6be76a45d45bb8fb30efef859194644f2c2f7da Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 15 Sep 2023 06:48:06 +0200
Subject: [PATCH 1224/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.23.0 (#1191)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.23.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f7172c9ba2f9..a6aa140f2f1f 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.22.0
+      26.23.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.22.0')
+implementation platform('com.google.cloud:libraries-bom:26.23.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 0fadbb5dfeb6..53c93e4e18b8 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.22.0
+        26.23.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index eb806662d44e..d2f0cde15644 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.22.0
+        26.23.0
         pom
         import
       

From a628255dffc2e8f871df699ebe7a94e4b75eb4b9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 15 Sep 2023 16:47:10 +0200
Subject: [PATCH 1225/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.27 (#1193)

---
 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 53c93e4e18b8..03a28ebbfe66 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.26
+            0.9.27
             true
             
               com.example.datastore.NativeImageDatastoreSample

From aa3bca10de19350cabc244426ebc284c64cb7344 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 15 Sep 2023 16:52:14 +0200
Subject: [PATCH 1226/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.27 (#1192)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.26` -> `0.9.27` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.graalvm.buildtools:junit-platform-native/0.9.27?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.graalvm.buildtools:junit-platform-native/0.9.27?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.graalvm.buildtools:junit-platform-native/0.9.26/0.9.27?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.graalvm.buildtools:junit-platform-native/0.9.26/0.9.27?slim=true)](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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/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 03a28ebbfe66..5e36f7335441 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.26
+          0.9.27
           test
         
           

From 6f0cad7268cee6347d34125c14c1133b80c840d7 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 22 Sep 2023 15:57:47 +0200
Subject: [PATCH 1227/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.16.0 (#1195)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 72dc20406112..1aaa145dd1d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.15.0
+        3.16.0
         pom
         import
       

From b8f108a3d013b5b54c519db24b40dd63e4855240 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 22 Sep 2023 15:58:09 +0200
Subject: [PATCH 1228/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.22.0 (#1194)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1aaa145dd1d6..877e44f26d01 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.21.1
+    2.22.0
       
 
   

From 8062be94b00fe2967e592f3d0a35751f0d11a013 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 26 Sep 2023 16:02:11 +0200
Subject: [PATCH 1229/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.16.1 (#1198)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 877e44f26d01..616ba9b4ce11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.16.0
+        3.16.1
         pom
         import
       

From 2540282653d8f8f06a71568c81eca8d3cb70f00f Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 10:34:29 -0400
Subject: [PATCH 1230/1784] deps: Update gapic-generator-java to 2.26.0 (#1197)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): Update gapic-generator-java to 2.26.0

PiperOrigin-RevId: 567624307

Source-Link: https://github.com/googleapis/googleapis/commit/2ecf4defdf5b4564491e7eee9a4b436b58b29e35

Source-Link: https://github.com/googleapis/googleapis-gen/commit/a5cfbd9a05b3a134e92886114db776fb33cec9f2
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTVjZmJkOWEwNWIzYTEzNGU5Mjg4NjExNGRiNzc2ZmIzM2NlYzlmMiJ9

* 🦉 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 
---
 .../com/google/datastore/admin/v1/DatastoreAdminGrpc.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index 1b1f7803f5b2..e923188921a3 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -68,7 +68,7 @@ public final class DatastoreAdminGrpc {
 
   private DatastoreAdminGrpc() {}
 
-  public static final String SERVICE_NAME = "google.datastore.admin.v1.DatastoreAdmin";
+  public static final java.lang.String SERVICE_NAME = "google.datastore.admin.v1.DatastoreAdmin";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<
@@ -1242,9 +1242,9 @@ private static final class DatastoreAdminFileDescriptorSupplier
   private static final class DatastoreAdminMethodDescriptorSupplier
       extends DatastoreAdminBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    DatastoreAdminMethodDescriptorSupplier(String methodName) {
+    DatastoreAdminMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

From 9d9ef04e2f6d19c11603399e4d27bc0844b2e5be Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 17:48:13 +0000
Subject: [PATCH 1231/1784] chore(main): release 2.17.2 (#1188)

:robot: I have created a release *beep* *boop*
---


## [2.17.2](https://togithub.com/googleapis/java-datastore/compare/v2.17.1...v2.17.2) (2023-09-26)


### Bug Fixes

* Checksum format ([#1178](https://togithub.com/googleapis/java-datastore/issues/1178)) ([410b939](https://togithub.com/googleapis/java-datastore/commit/410b9397bb9ba480dff6217c0c4c27364e58db49))
* Deprecate `databaseId` on datastore-v1-proto-client DatastoreOptions ([#1190](https://togithub.com/googleapis/java-datastore/issues/1190)) ([12a3d27](https://togithub.com/googleapis/java-datastore/commit/12a3d27ebc7ca87338ee896fd6ba3e804edd95ce))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.16.0 ([#1195](https://togithub.com/googleapis/java-datastore/issues/1195)) ([6f0cad7](https://togithub.com/googleapis/java-datastore/commit/6f0cad7268cee6347d34125c14c1133b80c840d7))
* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.16.1 ([#1198](https://togithub.com/googleapis/java-datastore/issues/1198)) ([8062be9](https://togithub.com/googleapis/java-datastore/commit/8062be94b00fe2967e592f3d0a35751f0d11a013))
* Update dependency com.google.errorprone:error_prone_core to v2.22.0 ([#1194](https://togithub.com/googleapis/java-datastore/issues/1194)) ([b8f108a](https://togithub.com/googleapis/java-datastore/commit/b8f108a3d013b5b54c519db24b40dd63e4855240))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.26 ([#1176](https://togithub.com/googleapis/java-datastore/issues/1176)) ([76e3a71](https://togithub.com/googleapis/java-datastore/commit/76e3a71560222894513a485cb91cec7161276e3c))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.27 ([#1192](https://togithub.com/googleapis/java-datastore/issues/1192)) ([aa3bca1](https://togithub.com/googleapis/java-datastore/commit/aa3bca10de19350cabc244426ebc284c64cb7344))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.26 ([#1177](https://togithub.com/googleapis/java-datastore/issues/1177)) ([7733004](https://togithub.com/googleapis/java-datastore/commit/7733004aff34bb8b4b8addccc68e75080f0f33a5))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.27 ([#1193](https://togithub.com/googleapis/java-datastore/issues/1193)) ([a628255](https://togithub.com/googleapis/java-datastore/commit/a628255dffc2e8f871df699ebe7a94e4b75eb4b9))
* Update gapic-generator-java to 2.26.0 ([#1197](https://togithub.com/googleapis/java-datastore/issues/1197)) ([2540282](https://togithub.com/googleapis/java-datastore/commit/2540282653d8f8f06a71568c81eca8d3cb70f00f))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 20 +++++++++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 +++++------
 10 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f235cfe810d..dba7d3246fd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [2.17.2](https://github.com/googleapis/java-datastore/compare/v2.17.1...v2.17.2) (2023-09-26)
+
+
+### Bug Fixes
+
+* Checksum format ([#1178](https://github.com/googleapis/java-datastore/issues/1178)) ([410b939](https://github.com/googleapis/java-datastore/commit/410b9397bb9ba480dff6217c0c4c27364e58db49))
+* Deprecate `databaseId` on datastore-v1-proto-client DatastoreOptions ([#1190](https://github.com/googleapis/java-datastore/issues/1190)) ([12a3d27](https://github.com/googleapis/java-datastore/commit/12a3d27ebc7ca87338ee896fd6ba3e804edd95ce))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.16.0 ([#1195](https://github.com/googleapis/java-datastore/issues/1195)) ([6f0cad7](https://github.com/googleapis/java-datastore/commit/6f0cad7268cee6347d34125c14c1133b80c840d7))
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.16.1 ([#1198](https://github.com/googleapis/java-datastore/issues/1198)) ([8062be9](https://github.com/googleapis/java-datastore/commit/8062be94b00fe2967e592f3d0a35751f0d11a013))
+* Update dependency com.google.errorprone:error_prone_core to v2.22.0 ([#1194](https://github.com/googleapis/java-datastore/issues/1194)) ([b8f108a](https://github.com/googleapis/java-datastore/commit/b8f108a3d013b5b54c519db24b40dd63e4855240))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.26 ([#1176](https://github.com/googleapis/java-datastore/issues/1176)) ([76e3a71](https://github.com/googleapis/java-datastore/commit/76e3a71560222894513a485cb91cec7161276e3c))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.27 ([#1192](https://github.com/googleapis/java-datastore/issues/1192)) ([aa3bca1](https://github.com/googleapis/java-datastore/commit/aa3bca10de19350cabc244426ebc284c64cb7344))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.26 ([#1177](https://github.com/googleapis/java-datastore/issues/1177)) ([7733004](https://github.com/googleapis/java-datastore/commit/7733004aff34bb8b4b8addccc68e75080f0f33a5))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.27 ([#1193](https://github.com/googleapis/java-datastore/issues/1193)) ([a628255](https://github.com/googleapis/java-datastore/commit/a628255dffc2e8f871df699ebe7a94e4b75eb4b9))
+* Update gapic-generator-java to 2.26.0 ([#1197](https://github.com/googleapis/java-datastore/issues/1197)) ([2540282](https://github.com/googleapis/java-datastore/commit/2540282653d8f8f06a71568c81eca8d3cb70f00f))
+
 ## [2.17.1](https://github.com/googleapis/java-datastore/compare/v2.17.0...v2.17.1) (2023-09-11)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7c369bf62127..a1863384dd4f 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.17.2-SNAPSHOT
+  2.17.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2-SNAPSHOT
+    2.17.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e8bf3f66ba48..f0219d485a51 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.17.2-SNAPSHOT
+  2.17.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.2-SNAPSHOT
+        2.17.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.2-SNAPSHOT
+        2.17.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.2-SNAPSHOT
+        0.108.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.2-SNAPSHOT
+        2.17.2
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1da029449164..1fc4e12bb73e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.2-SNAPSHOT
+  2.17.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2-SNAPSHOT
+    2.17.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 957a0e87a020..35bc22f03554 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.17.2-SNAPSHOT
+  2.17.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2-SNAPSHOT
+    2.17.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 616ba9b4ce11..1542cf130943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.2-SNAPSHOT
+  2.17.2
   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.17.2-SNAPSHOT
+        2.17.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.2-SNAPSHOT
+        2.17.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.2-SNAPSHOT
+        2.17.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.2-SNAPSHOT
+        0.108.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.2-SNAPSHOT
+        2.17.2
         
           
             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 5ce3723f9c1d..3da7988265e8 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.17.2-SNAPSHOT
+  2.17.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2-SNAPSHOT
+    2.17.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 263e31f9e022..8b67a6d27549 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.108.2-SNAPSHOT
+  0.108.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2-SNAPSHOT
+    2.17.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index bf17348a287d..b240ef8e4dc9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.2-SNAPSHOT
+      2.17.2
     
     
 
diff --git a/versions.txt b/versions.txt
index ffab0ef4bed5..d641a75aae74 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.1:2.17.2-SNAPSHOT
-google-cloud-datastore-bom:2.17.1:2.17.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.108.1:0.108.2-SNAPSHOT
-datastore-v1-proto-client:2.17.1:2.17.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.17.1:2.17.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.17.1:2.17.2-SNAPSHOT
+google-cloud-datastore:2.17.2:2.17.2
+google-cloud-datastore-bom:2.17.2:2.17.2
+proto-google-cloud-datastore-v1:0.108.2:0.108.2
+datastore-v1-proto-client:2.17.2:2.17.2
+proto-google-cloud-datastore-admin-v1:2.17.2:2.17.2
+grpc-google-cloud-datastore-admin-v1:2.17.2:2.17.2

From 56d0bf59dbe483e3c09d7e4a80b668846e0909b3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 18:24:54 +0000
Subject: [PATCH 1232/1784] chore(main): release 2.17.3-SNAPSHOT (#1199)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a1863384dd4f..7c4cfe1bef7d 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.17.2
+  2.17.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2
+    2.17.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f0219d485a51..d2eb42eab1e7 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.17.2
+  2.17.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.2
+        2.17.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.2
+        2.17.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.2
+        0.108.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.2
+        2.17.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1fc4e12bb73e..080e91b716b2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.2
+  2.17.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2
+    2.17.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 35bc22f03554..815c2baff6fe 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.17.2
+  2.17.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2
+    2.17.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 1542cf130943..d3ad9c919a84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.2
+  2.17.3-SNAPSHOT
   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.17.2
+        2.17.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.2
+        2.17.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.2
+        2.17.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.2
+        0.108.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.2
+        2.17.3-SNAPSHOT
         
           
             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 3da7988265e8..4865c864376c 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.17.2
+  2.17.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2
+    2.17.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8b67a6d27549..bb2fa235dbe8 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.108.2
+  0.108.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.2
+    2.17.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b240ef8e4dc9..b4f717823d0a 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.2
+      2.17.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index d641a75aae74..115016f72938 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.2:2.17.2
-google-cloud-datastore-bom:2.17.2:2.17.2
-proto-google-cloud-datastore-v1:0.108.2:0.108.2
-datastore-v1-proto-client:2.17.2:2.17.2
-proto-google-cloud-datastore-admin-v1:2.17.2:2.17.2
-grpc-google-cloud-datastore-admin-v1:2.17.2:2.17.2
+google-cloud-datastore:2.17.2:2.17.3-SNAPSHOT
+google-cloud-datastore-bom:2.17.2:2.17.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.108.2:0.108.3-SNAPSHOT
+datastore-v1-proto-client:2.17.2:2.17.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.17.2:2.17.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.17.2:2.17.3-SNAPSHOT

From 0ee82e893cd0b13c33cc9a12c95b498a96198a06 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 28 Sep 2023 16:50:27 +0200
Subject: [PATCH 1233/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.17.2 (#1200)
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.17.2

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a6aa140f2f1f..45d78e0a5f53 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.17.1
+  2.17.2
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.17.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.17.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.2"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index f408a2ed1753..42223627d8b5 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.17.1
+      2.17.2
     
     
 

From 7a2a96a98d9ca376e511095334774c21811e7e06 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 3 Oct 2023 19:44:34 +0200
Subject: [PATCH 1234/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.24.0 (#1201)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.24.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 45d78e0a5f53..a600778addb4 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.23.0
+      26.24.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.23.0')
+implementation platform('com.google.cloud:libraries-bom:26.24.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 5e36f7335441..60ca32bc80b2 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.23.0
+        26.24.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d2f0cde15644..26322b84e449 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.23.0
+        26.24.0
         pom
         import
       

From f2a8c417f8e0e5a2c74771adda265758a5cba75c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:51:16 -0400
Subject: [PATCH 1235/1784] chore: bump urllib3 from 1.26.16 to 1.26.17 in
 /synthtool/gcp/templates/java_library/.kokoro (#1875) (#1203)

chore: bump urllib3 in /synthtool/gcp/templates/java_library/.kokoro

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.16 to 1.26.17.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.16...1.26.17)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: indirect
...



Source-Link: https://github.com/googleapis/synthtool/commit/dbb940f3b99eca99265fda43dd4526a548b63a54
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6e2fc7eba84c3100cde964ebcfd0e553d4664ec4a74989c978a143812785ff23

Signed-off-by: dependabot[bot] 
Co-authored-by: Owl Bot 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml |  4 ++--
 .kokoro/requirements.txt  | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 52eaa54d82b2..11fe20466f23 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f
-# created: 2023-09-05T18:54:42.225408832Z
+  digest: sha256:6e2fc7eba84c3100cde964ebcfd0e553d4664ec4a74989c978a143812785ff23
+# created: 2023-10-03T23:18:35.620358763Z
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index a73256ab80be..59de49234092 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -418,6 +418,7 @@ protobuf==3.20.3 \
     #   gcp-docuploader
     #   gcp-releasetool
     #   google-api-core
+    #   googleapis-common-protos
 pyasn1==0.5.0 \
     --hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \
     --hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde
@@ -469,9 +470,9 @@ typing-extensions==4.7.1 \
     --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
     --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
     # via -r requirements.in
-urllib3==1.26.16 \
-    --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \
-    --hash=sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14
+urllib3==1.26.17 \
+    --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \
+    --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b
     # via
     #   google-auth
     #   requests
@@ -485,5 +486,6 @@ zipp==3.16.1 \
     # via importlib-metadata
 
 # WARNING: The following packages were not pinned, but pip requires them to be
-# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
+# pinned when the requirements file includes hashes and the requirement is not
+# satisfied by a package already installed. Consider using the --allow-unsafe flag.
 # setuptools

From c17e09562bc8548ec72505093a725be65027cc13 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Oct 2023 05:58:08 +0200
Subject: [PATCH 1236/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.5.8 (#1205)

---
 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 d2eb42eab1e7..e4eae1653b29 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.7
+    1.5.8
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index d3ad9c919a84..06783c1b32b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.5.7
+    1.5.8
   
 
   

From 2ad068b115c6ff7c59394fdba5e0e445028a3fee Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Oct 2023 06:13:40 +0200
Subject: [PATCH 1237/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.17.0 (#1206)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 06783c1b32b8..b5cc124d9d42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.16.1
+        3.17.0
         pom
         import
       

From 83caba9c918fcc0e141d7e3d01299195cf502c4a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 04:28:14 +0000
Subject: [PATCH 1238/1784] chore(main): release 2.17.3 (#1207)

:robot: I have created a release *beep* *boop*
---


## [2.17.3](https://togithub.com/googleapis/java-datastore/compare/v2.17.2...v2.17.3) (2023-10-10)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.17.0 ([#1206](https://togithub.com/googleapis/java-datastore/issues/1206)) ([2ad068b](https://togithub.com/googleapis/java-datastore/commit/2ad068b115c6ff7c59394fdba5e0e445028a3fee))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dba7d3246fd7..2952420aff28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.17.3](https://github.com/googleapis/java-datastore/compare/v2.17.2...v2.17.3) (2023-10-10)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.17.0 ([#1206](https://github.com/googleapis/java-datastore/issues/1206)) ([2ad068b](https://github.com/googleapis/java-datastore/commit/2ad068b115c6ff7c59394fdba5e0e445028a3fee))
+
 ## [2.17.2](https://github.com/googleapis/java-datastore/compare/v2.17.1...v2.17.2) (2023-09-26)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7c4cfe1bef7d..73c2c52d6435 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.17.3-SNAPSHOT
+  2.17.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3-SNAPSHOT
+    2.17.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e4eae1653b29..f58ce64a1452 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.17.3-SNAPSHOT
+  2.17.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.3-SNAPSHOT
+        2.17.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.3-SNAPSHOT
+        2.17.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.3-SNAPSHOT
+        0.108.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.3-SNAPSHOT
+        2.17.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 080e91b716b2..c12d7584fc59 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.3-SNAPSHOT
+  2.17.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3-SNAPSHOT
+    2.17.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 815c2baff6fe..cb1c7d472d99 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.17.3-SNAPSHOT
+  2.17.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3-SNAPSHOT
+    2.17.3
   
   
     
diff --git a/pom.xml b/pom.xml
index b5cc124d9d42..bffc03675284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.3-SNAPSHOT
+  2.17.3
   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.17.3-SNAPSHOT
+        2.17.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.3-SNAPSHOT
+        2.17.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.3-SNAPSHOT
+        2.17.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.3-SNAPSHOT
+        0.108.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.3-SNAPSHOT
+        2.17.3
         
           
             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 4865c864376c..0318f99c0f4d 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.17.3-SNAPSHOT
+  2.17.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3-SNAPSHOT
+    2.17.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index bb2fa235dbe8..b17f05c1ce98 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.108.3-SNAPSHOT
+  0.108.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3-SNAPSHOT
+    2.17.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b4f717823d0a..94b14979a2fb 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.3-SNAPSHOT
+      2.17.3
     
     
 
diff --git a/versions.txt b/versions.txt
index 115016f72938..02c800f446e0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.2:2.17.3-SNAPSHOT
-google-cloud-datastore-bom:2.17.2:2.17.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.108.2:0.108.3-SNAPSHOT
-datastore-v1-proto-client:2.17.2:2.17.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.17.2:2.17.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.17.2:2.17.3-SNAPSHOT
+google-cloud-datastore:2.17.3:2.17.3
+google-cloud-datastore-bom:2.17.3:2.17.3
+proto-google-cloud-datastore-v1:0.108.3:0.108.3
+datastore-v1-proto-client:2.17.3:2.17.3
+proto-google-cloud-datastore-admin-v1:2.17.3:2.17.3
+grpc-google-cloud-datastore-admin-v1:2.17.3:2.17.3

From bc1bd70f719dd6b601a1b56a1032a96503182e66 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 18:57:16 +0530
Subject: [PATCH 1239/1784] chore(main): release 2.17.4-SNAPSHOT (#1208)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 73c2c52d6435..8c2f6bad3c6a 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.17.3
+  2.17.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3
+    2.17.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f58ce64a1452..5e125042fe49 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.17.3
+  2.17.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.3
+        2.17.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.3
+        2.17.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.3
+        0.108.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.3
+        2.17.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c12d7584fc59..9116cc71a65b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.3
+  2.17.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3
+    2.17.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index cb1c7d472d99..e27156bb211b 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.17.3
+  2.17.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3
+    2.17.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index bffc03675284..261a1c65788e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.3
+  2.17.4-SNAPSHOT
   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.17.3
+        2.17.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.3
+        2.17.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.3
+        2.17.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.3
+        0.108.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.3
+        2.17.4-SNAPSHOT
         
           
             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 0318f99c0f4d..8253ad9ba748 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.17.3
+  2.17.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3
+    2.17.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b17f05c1ce98..325137f8f5cf 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.108.3
+  0.108.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.3
+    2.17.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 94b14979a2fb..89c0a39b2e4d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.3
+      2.17.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 02c800f446e0..c0fb2dafa3c9 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.3:2.17.3
-google-cloud-datastore-bom:2.17.3:2.17.3
-proto-google-cloud-datastore-v1:0.108.3:0.108.3
-datastore-v1-proto-client:2.17.3:2.17.3
-proto-google-cloud-datastore-admin-v1:2.17.3:2.17.3
-grpc-google-cloud-datastore-admin-v1:2.17.3:2.17.3
+google-cloud-datastore:2.17.3:2.17.4-SNAPSHOT
+google-cloud-datastore-bom:2.17.3:2.17.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.108.3:0.108.4-SNAPSHOT
+datastore-v1-proto-client:2.17.3:2.17.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.17.3:2.17.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.17.3:2.17.4-SNAPSHOT

From a3cca9712c59c77f5b90c54f6c0fc7f2cb5a994a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Oct 2023 15:28:18 +0200
Subject: [PATCH 1240/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.17.3 (#1209)
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.17.3

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a600778addb4..00796e514f31 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.17.2
+  2.17.3
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.17.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.17.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.3"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 42223627d8b5..a553d3f14b17 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.17.2
+      2.17.3
     
     
 

From 656ab20ddbce4b75356fed8b86f8055e563fccf3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 16 Oct 2023 06:05:31 +0200
Subject: [PATCH 1241/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.25.0 (#1210)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.25.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 00796e514f31..f5529c86c07b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.24.0
+      26.25.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.24.0')
+implementation platform('com.google.cloud:libraries-bom:26.25.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 60ca32bc80b2..2741e3e13f0a 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.24.0
+        26.25.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 26322b84e449..7461c3ee5307 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.24.0
+        26.25.0
         pom
         import
       

From 2fb94aea3b82157350f56e3cc63a4716c62be82d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 18 Oct 2023 16:36:13 +0200
Subject: [PATCH 1242/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.6.0 (#1211)

---
 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 5e125042fe49..34f235506465 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.8
+    1.6.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 261a1c65788e..93037ea745d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.5.8
+    1.6.0
   
 
   

From c57db43c783ba6ec16a55d470664990e932971ef Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 18 Oct 2023 23:48:13 +0200
Subject: [PATCH 1243/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.23.0 (#1213)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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.22.0` -> `2.23.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.22.0/2.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.22.0/2.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone (com.google.errorprone:error_prone_core)

### [`v2.23.0`](https://togithub.com/google/error-prone/releases/tag/v2.23.0): Error Prone 2.23.0

[Compare Source](https://togithub.com/google/error-prone/compare/v2.22.0...v2.23.0)

New checks:

-   [`DuplicateDateFormatField`](https://errorprone.info/bugpattern/DuplicateDateFormatField)
-   [`NonFinalStaticField`](https://errorprone.info/bugpattern/NonFinalStaticField)
-   [`StringCharset`](https://errorprone.info/bugpattern/StringCharset)
-   [`StringFormatWithLiteral`](https://errorprone.info/bugpattern/StringFormatWithLiteral)
-   [`SuperEqualsIsObjectEquals`](https://errorprone.info/bugpattern/SuperEqualsIsObjectEquals)

Bug fixes and improvements: [#​3897](https://togithub.com/google/error-prone/issues/3897), [#​4114](https://togithub.com/google/error-prone/issues/4114), [#​4123](https://togithub.com/google/error-prone/issues/4123)

Full Changelog: https://togithub.com/google/error-prone/compare/v2.22.0...v2.23.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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 93037ea745d9..d99103a3e145 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.22.0
+    2.23.0
       
 
   

From aa82f019bcf90f99e6d3d2c96a52d8f2b9a8d27a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 20 Oct 2023 20:14:07 +0200
Subject: [PATCH 1244/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.18.0 (#1215)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d99103a3e145..a6cf6d015890 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.17.0
+        3.18.0
         pom
         import
       

From ce4eff24aae8d1e6e02558e627c033dc138891e6 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 20 Oct 2023 20:14:23 +0200
Subject: [PATCH 1245/1784] deps: update dependency
 org.graalvm.buildtools:junit-platform-native to v0.9.28 (#1216)

---
 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 2741e3e13f0a..9f25431d07b1 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.27
+          0.9.28
           test
         
           

From 7d56b3cee53e0852873896f7fd22a0414d4b7d83 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 23 Oct 2023 19:40:44 +0200
Subject: [PATCH 1246/1784] deps: update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.9.28 (#1217)

---
 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 9f25431d07b1..9c093c521737 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.27
+            0.9.28
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 18cbd292cda62e5f2275c871bff421e2956513cf Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:54:14 +0000
Subject: [PATCH 1247/1784] chore(main): release 2.17.4 (#1214)

:robot: I have created a release *beep* *boop*
---


## [2.17.4](https://togithub.com/googleapis/java-datastore/compare/v2.17.3...v2.17.4) (2023-10-23)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.18.0 ([#1215](https://togithub.com/googleapis/java-datastore/issues/1215)) ([aa82f01](https://togithub.com/googleapis/java-datastore/commit/aa82f019bcf90f99e6d3d2c96a52d8f2b9a8d27a))
* Update dependency com.google.errorprone:error_prone_core to v2.23.0 ([#1213](https://togithub.com/googleapis/java-datastore/issues/1213)) ([c57db43](https://togithub.com/googleapis/java-datastore/commit/c57db43c783ba6ec16a55d470664990e932971ef))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.28 ([#1216](https://togithub.com/googleapis/java-datastore/issues/1216)) ([ce4eff2](https://togithub.com/googleapis/java-datastore/commit/ce4eff24aae8d1e6e02558e627c033dc138891e6))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.28 ([#1217](https://togithub.com/googleapis/java-datastore/issues/1217)) ([7d56b3c](https://togithub.com/googleapis/java-datastore/commit/7d56b3cee53e0852873896f7fd22a0414d4b7d83))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 10 ++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2952420aff28..8651d4a074a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.17.4](https://github.com/googleapis/java-datastore/compare/v2.17.3...v2.17.4) (2023-10-23)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.18.0 ([#1215](https://github.com/googleapis/java-datastore/issues/1215)) ([aa82f01](https://github.com/googleapis/java-datastore/commit/aa82f019bcf90f99e6d3d2c96a52d8f2b9a8d27a))
+* Update dependency com.google.errorprone:error_prone_core to v2.23.0 ([#1213](https://github.com/googleapis/java-datastore/issues/1213)) ([c57db43](https://github.com/googleapis/java-datastore/commit/c57db43c783ba6ec16a55d470664990e932971ef))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.28 ([#1216](https://github.com/googleapis/java-datastore/issues/1216)) ([ce4eff2](https://github.com/googleapis/java-datastore/commit/ce4eff24aae8d1e6e02558e627c033dc138891e6))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.28 ([#1217](https://github.com/googleapis/java-datastore/issues/1217)) ([7d56b3c](https://github.com/googleapis/java-datastore/commit/7d56b3cee53e0852873896f7fd22a0414d4b7d83))
+
 ## [2.17.3](https://github.com/googleapis/java-datastore/compare/v2.17.2...v2.17.3) (2023-10-10)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8c2f6bad3c6a..1bd9d3f286d2 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.17.4-SNAPSHOT
+  2.17.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4-SNAPSHOT
+    2.17.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 34f235506465..f05724ac9da2 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.17.4-SNAPSHOT
+  2.17.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.4-SNAPSHOT
+        2.17.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.4-SNAPSHOT
+        2.17.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.4-SNAPSHOT
+        0.108.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.4-SNAPSHOT
+        2.17.4
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9116cc71a65b..5403b79c5101 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.4-SNAPSHOT
+  2.17.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4-SNAPSHOT
+    2.17.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index e27156bb211b..678adcd32cdc 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.17.4-SNAPSHOT
+  2.17.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4-SNAPSHOT
+    2.17.4
   
   
     
diff --git a/pom.xml b/pom.xml
index a6cf6d015890..eff80aa0b344 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.4-SNAPSHOT
+  2.17.4
   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.17.4-SNAPSHOT
+        2.17.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.4-SNAPSHOT
+        2.17.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.4-SNAPSHOT
+        2.17.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.4-SNAPSHOT
+        0.108.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.4-SNAPSHOT
+        2.17.4
         
           
             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 8253ad9ba748..62197e683c3b 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.17.4-SNAPSHOT
+  2.17.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4-SNAPSHOT
+    2.17.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 325137f8f5cf..22d8cb0bcadf 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.108.4-SNAPSHOT
+  0.108.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4-SNAPSHOT
+    2.17.4
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 89c0a39b2e4d..31ae752cb1e0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.4-SNAPSHOT
+      2.17.4
     
     
 
diff --git a/versions.txt b/versions.txt
index c0fb2dafa3c9..4f1febd548f5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.3:2.17.4-SNAPSHOT
-google-cloud-datastore-bom:2.17.3:2.17.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.108.3:0.108.4-SNAPSHOT
-datastore-v1-proto-client:2.17.3:2.17.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.17.3:2.17.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.17.3:2.17.4-SNAPSHOT
+google-cloud-datastore:2.17.4:2.17.4
+google-cloud-datastore-bom:2.17.4:2.17.4
+proto-google-cloud-datastore-v1:0.108.4:0.108.4
+datastore-v1-proto-client:2.17.4:2.17.4
+proto-google-cloud-datastore-admin-v1:2.17.4:2.17.4
+grpc-google-cloud-datastore-admin-v1:2.17.4:2.17.4

From 3e9c2f341ad7da65113626bd24ae6457bb0c70b0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:04:18 +0000
Subject: [PATCH 1248/1784] chore(main): release 2.17.5-SNAPSHOT (#1218)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 1bd9d3f286d2..225f8c219792 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.17.4
+  2.17.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4
+    2.17.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f05724ac9da2..af54a67edf1d 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.17.4
+  2.17.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.4
+        2.17.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.4
+        2.17.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.4
+        0.108.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.4
+        2.17.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5403b79c5101..03e739926f45 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.4
+  2.17.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4
+    2.17.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 678adcd32cdc..1a08e8d467ac 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.17.4
+  2.17.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4
+    2.17.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index eff80aa0b344..5dd3fb177e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.4
+  2.17.5-SNAPSHOT
   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.17.4
+        2.17.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.4
+        2.17.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.4
+        2.17.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.4
+        0.108.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.4
+        2.17.5-SNAPSHOT
         
           
             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 62197e683c3b..82770580b570 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.17.4
+  2.17.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4
+    2.17.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 22d8cb0bcadf..6aa798612e7f 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.108.4
+  0.108.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.4
+    2.17.5-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 31ae752cb1e0..76ee3da94357 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.4
+      2.17.5-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 4f1febd548f5..7c79e8eaa601 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.4:2.17.4
-google-cloud-datastore-bom:2.17.4:2.17.4
-proto-google-cloud-datastore-v1:0.108.4:0.108.4
-datastore-v1-proto-client:2.17.4:2.17.4
-proto-google-cloud-datastore-admin-v1:2.17.4:2.17.4
-grpc-google-cloud-datastore-admin-v1:2.17.4:2.17.4
+google-cloud-datastore:2.17.4:2.17.5-SNAPSHOT
+google-cloud-datastore-bom:2.17.4:2.17.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.108.4:0.108.5-SNAPSHOT
+datastore-v1-proto-client:2.17.4:2.17.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.17.4:2.17.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.17.4:2.17.5-SNAPSHOT

From acfc89d0b58d293f5f1620030abf27a432415a53 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:27:17 -0400
Subject: [PATCH 1249/1784] chore: bump urllib3 from 1.26.17 to 1.26.18 in
 /synthtool/gcp/templates/java_library/.kokoro (#1885) (#1221)

Source-Link: https://github.com/googleapis/synthtool/commit/e4a9d44f7d1ddda567c14bce7df4d93fdb010de0
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:4875b2142cb4325542ba4f3175a81921c4b2b8256db012b220e3ca9637b34154

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .kokoro/requirements.txt  | 6 +++---
 README.md                 | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 11fe20466f23..8058621d830f 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:6e2fc7eba84c3100cde964ebcfd0e553d4664ec4a74989c978a143812785ff23
-# created: 2023-10-03T23:18:35.620358763Z
+  digest: sha256:4875b2142cb4325542ba4f3175a81921c4b2b8256db012b220e3ca9637b34154
+# created: 2023-10-24T01:51:42.863726766Z
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 59de49234092..c5c11bbe7925 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -470,9 +470,9 @@ typing-extensions==4.7.1 \
     --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
     --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
     # via -r requirements.in
-urllib3==1.26.17 \
-    --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \
-    --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b
+urllib3==1.26.18 \
+    --hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \
+    --hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0
     # via
     #   google-auth
     #   requests
diff --git a/README.md b/README.md
index f5529c86c07b..85fd16e08f59 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.17.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.17.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.4"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.4
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

From dd0b08af5b855b79075b2a6abafab8ba9a016ce2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 24 Oct 2023 16:27:38 +0200
Subject: [PATCH 1250/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3.2.1 (#1220)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.2.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 
---
 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 9c093c521737..70d6681048ac 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -97,7 +97,7 @@
             org.apache.maven.plugins
             maven-surefire-plugin
              
-            3.1.2
+            3.2.1
             
               
                 **/IT*

From 7eccde36b925683279013203feb3f5034cec4b8a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 24 Oct 2023 16:27:57 +0200
Subject: [PATCH 1251/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.17.4 (#1219)
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.17.4

* 🦉 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 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 85fd16e08f59..2a1a84964baf 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.17.3
+  2.17.4
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a553d3f14b17..ee83c55b11a4 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.17.3
+      2.17.4
     
     
 

From 4fc9693080b5685b8bd04ca320dd4322ad31422d Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:01:25 -0400
Subject: [PATCH 1252/1784] chore: bump urllib3 from 2.0.6 to 2.0.7 in
 /docker/owlbot/java/src (#1883) (#1223)

Source-Link: https://github.com/googleapis/synthtool/commit/247239027cad7678adea8f57e529ebd12600ee93
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:fb7584f6adb3847ac480ed49a4bfe1463965026b2919a1be270e3174f3ce1191

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 4 ++--
 README.md                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 8058621d830f..208af343821b 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:4875b2142cb4325542ba4f3175a81921c4b2b8256db012b220e3ca9637b34154
-# created: 2023-10-24T01:51:42.863726766Z
+  digest: sha256:fb7584f6adb3847ac480ed49a4bfe1463965026b2919a1be270e3174f3ce1191
+# created: 2023-10-26T23:22:21.357007231Z
diff --git a/README.md b/README.md
index 2a1a84964baf..c8dba6d19d30 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.25.0')
+implementation platform('com.google.cloud:libraries-bom:26.26.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```

From 9bd4cb437ec6213d7fde6d6f2f1d70e4f0ebc102 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 27 Oct 2023 16:01:45 +0200
Subject: [PATCH 1253/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.26.0 (#1222)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.26.0

* 🦉 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/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c8dba6d19d30..0e7b9830bf05 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.25.0
+      26.26.0
       pom
       import
     
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 70d6681048ac..2e5ca1785216 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.25.0
+        26.26.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 7461c3ee5307..03b08298e291 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.25.0
+        26.26.0
         pom
         import
       

From 246d025a4d0045fb978850a06b25f4887c92d6cc Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Tue, 31 Oct 2023 15:54:15 +0000
Subject: [PATCH 1254/1784] chore: update graalvm container images to 22.3.3
 (#1224)

---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 798e390bd470..274e586ee961 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index c85858306db9..c70a18f0db94 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
 }
 
 env_vars: {

From cab43537564512ed8a457de41b32b40578e057e7 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 2 Nov 2023 07:45:03 +0100
Subject: [PATCH 1255/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.6.1 (#1225)

---
 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 af54a67edf1d..1103e388773b 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.6.0
+    1.6.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 5dd3fb177e2b..cfb7515b699d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.6.0
+    1.6.1
   
 
   

From 970ac9652ad16848ccfb26ce248e66956693be9e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 2 Nov 2023 07:46:30 +0100
Subject: [PATCH 1256/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.19.0 (#1226)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cfb7515b699d..cdd239fd2682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.18.0
+        3.19.0
         pom
         import
       

From 64a3a22efe9c4922a33095d828a155722ab60582 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:29:57 +0530
Subject: [PATCH 1257/1784] chore(main): release 2.17.5 (#1227)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8651d4a074a6..a0b333bbee9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.17.5](https://github.com/googleapis/java-datastore/compare/v2.17.4...v2.17.5) (2023-11-02)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.19.0 ([#1226](https://github.com/googleapis/java-datastore/issues/1226)) ([970ac96](https://github.com/googleapis/java-datastore/commit/970ac9652ad16848ccfb26ce248e66956693be9e))
+
 ## [2.17.4](https://github.com/googleapis/java-datastore/compare/v2.17.3...v2.17.4) (2023-10-23)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 225f8c219792..5b8fa11cfd9e 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.17.5-SNAPSHOT
+  2.17.5
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5-SNAPSHOT
+    2.17.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 1103e388773b..71037fd1c24e 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.17.5-SNAPSHOT
+  2.17.5
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.5-SNAPSHOT
+        2.17.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.5-SNAPSHOT
+        2.17.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.5-SNAPSHOT
+        0.108.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.5-SNAPSHOT
+        2.17.5
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 03e739926f45..89da0bdfe08e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.5-SNAPSHOT
+  2.17.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5-SNAPSHOT
+    2.17.5
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 1a08e8d467ac..8951daba1fe0 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.17.5-SNAPSHOT
+  2.17.5
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5-SNAPSHOT
+    2.17.5
   
   
     
diff --git a/pom.xml b/pom.xml
index cdd239fd2682..bcb632e53a3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.5-SNAPSHOT
+  2.17.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.5-SNAPSHOT
+        2.17.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.5-SNAPSHOT
+        2.17.5
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.5-SNAPSHOT
+        2.17.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.5-SNAPSHOT
+        0.108.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.5-SNAPSHOT
+        2.17.5
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index 82770580b570..17c9cf9902f1 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.17.5-SNAPSHOT
+  2.17.5
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5-SNAPSHOT
+    2.17.5
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6aa798612e7f..65bae9fe6598 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.108.5-SNAPSHOT
+  0.108.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5-SNAPSHOT
+    2.17.5
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 76ee3da94357..d06377121904 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.5-SNAPSHOT
+      2.17.5
     
     
 
diff --git a/versions.txt b/versions.txt
index 7c79e8eaa601..f8fa33ea0fe4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.4:2.17.5-SNAPSHOT
-google-cloud-datastore-bom:2.17.4:2.17.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.108.4:0.108.5-SNAPSHOT
-datastore-v1-proto-client:2.17.4:2.17.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.17.4:2.17.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.17.4:2.17.5-SNAPSHOT
+google-cloud-datastore:2.17.5:2.17.5
+google-cloud-datastore-bom:2.17.5:2.17.5
+proto-google-cloud-datastore-v1:0.108.5:0.108.5
+datastore-v1-proto-client:2.17.5:2.17.5
+proto-google-cloud-datastore-admin-v1:2.17.5:2.17.5
+grpc-google-cloud-datastore-admin-v1:2.17.5:2.17.5

From bb8dc7ed88fdf6c4aa7841adae52b2453f54cbe7 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 09:08:37 +0000
Subject: [PATCH 1258/1784] chore(main): release 2.17.6-SNAPSHOT (#1228)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 5b8fa11cfd9e..ebde7c645cc1 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.17.5
+  2.17.6-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5
+    2.17.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 71037fd1c24e..e6ead05068b7 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.17.5
+  2.17.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.5
+        2.17.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.5
+        2.17.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.5
+        0.108.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.5
+        2.17.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 89da0bdfe08e..9c16ae06b71c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.5
+  2.17.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5
+    2.17.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 8951daba1fe0..e5648f270f48 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.17.5
+  2.17.6-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5
+    2.17.6-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index bcb632e53a3f..aa9951ac58fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.5
+  2.17.6-SNAPSHOT
   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.17.5
+        2.17.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.5
+        2.17.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.5
+        2.17.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.5
+        0.108.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.5
+        2.17.6-SNAPSHOT
         
           
             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 17c9cf9902f1..ed2f991f27f2 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.17.5
+  2.17.6-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5
+    2.17.6-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 65bae9fe6598..888dd0ab2837 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.108.5
+  0.108.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.5
+    2.17.6-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d06377121904..032befdc1618 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.5
+      2.17.6-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index f8fa33ea0fe4..e31e9ef9d70e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.5:2.17.5
-google-cloud-datastore-bom:2.17.5:2.17.5
-proto-google-cloud-datastore-v1:0.108.5:0.108.5
-datastore-v1-proto-client:2.17.5:2.17.5
-proto-google-cloud-datastore-admin-v1:2.17.5:2.17.5
-grpc-google-cloud-datastore-admin-v1:2.17.5:2.17.5
+google-cloud-datastore:2.17.5:2.17.6-SNAPSHOT
+google-cloud-datastore-bom:2.17.5:2.17.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.108.5:0.108.6-SNAPSHOT
+datastore-v1-proto-client:2.17.5:2.17.6-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.17.5:2.17.6-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.17.5:2.17.6-SNAPSHOT

From b7b9bb5739da897bcc7d9d38b224821d9c7fdb60 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 3 Nov 2023 06:12:18 +0100
Subject: [PATCH 1259/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.17.5 (#1229)
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.17.5

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0e7b9830bf05..74a7e94f9141 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.17.4
+  2.17.5
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.17.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.17.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.5"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.4
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.5
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index ee83c55b11a4..e45e5784df9d 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.17.4
+      2.17.5
     
     
 

From e6596f94b404589ef4ee2afe5c186848628d024c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 7 Nov 2023 06:48:01 +0100
Subject: [PATCH 1260/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3.2.2 (#1231)

---
 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 2e5ca1785216..7ef475ffa356 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -97,7 +97,7 @@
             org.apache.maven.plugins
             maven-surefire-plugin
              
-            3.2.1
+            3.2.2
             
               
                 **/IT*

From 05c7fc69d52f5a9026a6529f638fe6164860e8f9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 7 Nov 2023 06:48:46 +0100
Subject: [PATCH 1261/1784] deps: update dependency
 org.junit.vintage:junit-vintage-engine to v5.10.1 (#1230)

---
 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 7ef475ffa356..1220e931b0b0 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.10.0
+          5.10.1
           test
         
         

From 154b99d5cc802f0f327703a3e96487b3c3e042b3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 9 Nov 2023 05:30:35 +0100
Subject: [PATCH 1262/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.27.0 (#1234)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.27.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 74a7e94f9141..31a90d7fbfa1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.26.0
+      26.27.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.26.0')
+implementation platform('com.google.cloud:libraries-bom:26.27.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 1220e931b0b0..9ceacb5d5652 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.26.0
+        26.27.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 03b08298e291..6cc5f10861c1 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.26.0
+        26.27.0
         pom
         import
       

From 70dd9cf96f5aa847d8fe29456a0c46980c060de8 Mon Sep 17 00:00:00 2001
From: Prateek 
Date: Wed, 15 Nov 2023 16:49:34 +0000
Subject: [PATCH 1263/1784] chore: add V3-experimental to sync-repo-settings
 (#1236)

---
 .github/sync-repo-settings.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 5539fb82c6c4..aaf34c425044 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -112,6 +112,23 @@ branchProtectionRules:
       - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+  - pattern: V3-experimental
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - OwlBot Post Processor
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
   - pattern: 2.15.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From f087f31191cc3ea904fdda6d07447ac901dfb806 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 16 Nov 2023 10:46:14 -0500
Subject: [PATCH 1264/1784] chore: Update sync-repo-settings.yaml for
 v3-experimental branch (#1239)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 .github/sync-repo-settings.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index aaf34c425044..19ecc2ed8efd 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -118,8 +118,7 @@ branchProtectionRules:
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: false
     requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
+      - dependencies (17)
       - lint
       - clirr
       - units (8)
@@ -129,6 +128,7 @@ branchProtectionRules:
       - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
   - pattern: 2.15.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From 41d43e852d07a9026ae5be2add860c1f6980c7d6 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 29 Nov 2023 10:32:44 -0500
Subject: [PATCH 1265/1784] refactor: rename internal class QueryAndReadOptions
 to QueryConfig (#1245)

---
 .../clirr-ignored-differences.xml             | 29 +++++--------------
 .../google/cloud/datastore/ReadOption.java    | 14 ++++-----
 .../execution/AggregationQueryExecutor.java   | 10 +++----
 .../AggregationQueryRequestProtoPreparer.java | 11 ++++---
 ...regationQueryRequestProtoPreparerTest.java | 12 ++++----
 5 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
index 018afb17ea5a..34395cc01fd3 100644
--- a/google-cloud-datastore/clirr-ignored-differences.xml
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -1,29 +1,16 @@
 
 
 
+    
     
-        com/google/cloud/datastore/Datastore
-        java.util.List reserveIds(com.google.cloud.datastore.Key[])
-        7012
+        com/google/cloud/datastore/ReadOption$QueryAndReadOptions
+        *
+        8001
     
     
-        com/google/cloud/datastore/spi/v1/DatastoreRpc
-        com.google.datastore.v1.ReserveIdsResponse reserveIds(com.google.datastore.v1.ReserveIdsRequest)
-        7012
-    
-    
-        com/google/cloud/datastore/spi/v1/DatastoreRpc
-        com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery(com.google.datastore.v1.RunAggregationQueryRequest)
-        7012
-    
-    
-        com/google/cloud/datastore/Datastore
-        com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.ReadOption[])
-        7012
-    
-    
-        com/google/cloud/datastore/DatastoreReader
-        com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery)
-        7012
+        com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer
+        *QueryAndReadOptions*
+        *QueryConfig*
+        7005
     
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index be5644da0bf5..c249e45a6a66 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -142,17 +142,17 @@ static Map, ReadOption> asImmutableMap(List> {
+  public static class QueryConfig> {
 
     Q query;
     List readOptions;
 
-    private QueryAndReadOptions(Q query, List readOptions) {
+    private QueryConfig(Q query, List readOptions) {
       this.query = query;
       this.readOptions = readOptions;
     }
 
-    private QueryAndReadOptions(Q query) {
+    private QueryConfig(Q query) {
       this.query = query;
       this.readOptions = Collections.emptyList();
     }
@@ -165,13 +165,13 @@ public List getReadOptions() {
       return readOptions;
     }
 
-    public static > QueryAndReadOptions create(Q query) {
-      return new QueryAndReadOptions<>(query);
+    public static > QueryConfig create(Q query) {
+      return new QueryConfig<>(query);
     }
 
-    public static > QueryAndReadOptions create(
+    public static > QueryConfig create(
         Q query, List readOptions) {
-      return new QueryAndReadOptions<>(query, readOptions);
+      return new QueryConfig<>(query, readOptions);
     }
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
index 14e425845f7c..5a1fdd2c371d 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
@@ -20,7 +20,7 @@
 import com.google.cloud.datastore.AggregationResults;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.ReadOption;
-import com.google.cloud.datastore.ReadOption.QueryAndReadOptions;
+import com.google.cloud.datastore.ReadOption.QueryConfig;
 import com.google.cloud.datastore.execution.request.AggregationQueryRequestProtoPreparer;
 import com.google.cloud.datastore.execution.response.AggregationQueryResponseTransformer;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
@@ -57,10 +57,10 @@ public AggregationResults execute(AggregationQuery query, ReadOption... readOpti
 
   private RunAggregationQueryRequest getRunAggregationQueryRequest(
       AggregationQuery query, ReadOption... readOptions) {
-    QueryAndReadOptions queryAndReadOptions =
+    QueryConfig queryConfig =
         readOptions == null
-            ? QueryAndReadOptions.create(query)
-            : QueryAndReadOptions.create(query, Arrays.asList(readOptions));
-    return this.protoPreparer.prepare(queryAndReadOptions);
+            ? QueryConfig.create(query)
+            : QueryConfig.create(query, Arrays.asList(readOptions));
+    return this.protoPreparer.prepare(queryConfig);
   }
 }
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 5c4fb3e5f3b1..475a47b58a1f 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
@@ -22,7 +22,7 @@
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.GqlQueryProtoPreparer;
 import com.google.cloud.datastore.ReadOption;
-import com.google.cloud.datastore.ReadOption.QueryAndReadOptions;
+import com.google.cloud.datastore.ReadOption.QueryConfig;
 import com.google.cloud.datastore.ReadOptionProtoPreparer;
 import com.google.cloud.datastore.StructuredQueryProtoPreparer;
 import com.google.cloud.datastore.aggregation.Aggregation;
@@ -37,7 +37,7 @@
 
 @InternalApi
 public class AggregationQueryRequestProtoPreparer
-    implements ProtoPreparer, RunAggregationQueryRequest> {
+    implements ProtoPreparer, RunAggregationQueryRequest> {
 
   private final DatastoreOptions datastoreOptions;
   private final StructuredQueryProtoPreparer structuredQueryProtoPreparer;
@@ -52,10 +52,9 @@ public AggregationQueryRequestProtoPreparer(DatastoreOptions datastoreOptions) {
   }
 
   @Override
-  public RunAggregationQueryRequest prepare(
-      QueryAndReadOptions aggregationQueryAndReadOptions) {
-    AggregationQuery aggregationQuery = aggregationQueryAndReadOptions.getQuery();
-    List readOptions = aggregationQueryAndReadOptions.getReadOptions();
+  public RunAggregationQueryRequest prepare(QueryConfig queryConfig) {
+    AggregationQuery aggregationQuery = queryConfig.getQuery();
+    List readOptions = queryConfig.getReadOptions();
     PartitionId partitionId = getPartitionId(aggregationQuery);
     RunAggregationQueryRequest.Builder aggregationQueryRequestBuilder =
         RunAggregationQueryRequest.newBuilder()
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 5fbb35b6e825..0f22828d97fe 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
@@ -38,7 +38,7 @@
 import com.google.cloud.datastore.GqlQuery;
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.ReadOption;
-import com.google.cloud.datastore.ReadOption.QueryAndReadOptions;
+import com.google.cloud.datastore.ReadOption.QueryConfig;
 import com.google.common.collect.ImmutableMap;
 import com.google.datastore.v1.RunAggregationQueryRequest;
 import java.util.HashMap;
@@ -91,7 +91,7 @@ public class AggregationQueryRequestProtoPreparerTest {
   @Test
   public void shouldPrepareAggregationQueryRequestWithGivenStructuredQuery() {
     RunAggregationQueryRequest runAggregationQueryRequest =
-        protoPreparer.prepare(QueryAndReadOptions.create(AGGREGATION_OVER_STRUCTURED_QUERY));
+        protoPreparer.prepare(QueryConfig.create(AGGREGATION_OVER_STRUCTURED_QUERY));
 
     assertThat(runAggregationQueryRequest.getProjectId()).isEqualTo(PROJECT_ID);
     assertThat(runAggregationQueryRequest.getDatabaseId()).isEqualTo(DATABASE_ID);
@@ -114,7 +114,7 @@ public void shouldPrepareAggregationQueryRequestWithGivenStructuredQuery() {
   @Test
   public void shouldPrepareAggregationQueryRequestWithGivenGqlQuery() {
     RunAggregationQueryRequest runAggregationQueryRequest =
-        protoPreparer.prepare(QueryAndReadOptions.create(AGGREGATION_OVER_GQL_QUERY));
+        protoPreparer.prepare(QueryConfig.create(AGGREGATION_OVER_GQL_QUERY));
 
     assertThat(runAggregationQueryRequest.getProjectId()).isEqualTo(PROJECT_ID);
     assertThat(runAggregationQueryRequest.getDatabaseId()).isEqualTo(DATABASE_ID);
@@ -172,9 +172,9 @@ public void shouldPrepareAggregationQueryWithNamespaceFromDatastoreOptions() {
         Query.newAggregationQueryBuilder().over(COMPLETED_TASK_GQL_QUERY).build();
 
     RunAggregationQueryRequest runAggregationQueryFromStructuredQuery =
-        protoPreparer.prepare(QueryAndReadOptions.create(structuredQueryWithoutNamespace));
+        protoPreparer.prepare(QueryConfig.create(structuredQueryWithoutNamespace));
     RunAggregationQueryRequest runAggregationQueryFromGqlQuery =
-        protoPreparer.prepare(QueryAndReadOptions.create(gqlQueryWithoutNamespace));
+        protoPreparer.prepare(QueryConfig.create(gqlQueryWithoutNamespace));
 
     assertThat(runAggregationQueryFromStructuredQuery.getPartitionId().getNamespaceId())
         .isEqualTo(NAMESPACE);
@@ -183,6 +183,6 @@ public void shouldPrepareAggregationQueryWithNamespaceFromDatastoreOptions() {
   }
 
   private RunAggregationQueryRequest prepareQuery(AggregationQuery query, ReadOption readOption) {
-    return protoPreparer.prepare(QueryAndReadOptions.create(query, singletonList(readOption)));
+    return protoPreparer.prepare(QueryConfig.create(query, singletonList(readOption)));
   }
 }

From 05e25e5d31f72f9cdedbb5efa85c64b55ccbc405 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 29 Nov 2023 10:34:52 -0500
Subject: [PATCH 1266/1784] fix: remove deprecated `databaseId` field in
 DatastoreOptions (#1237)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: remove deprecated `databaseId` field in DatastoreOptions

* 🦉 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 
---
 .../clirr-ignored-differences.xml             | 11 +++++
 .../datastore/v1/client/DatastoreOptions.java | 42 -------------------
 .../v1/client/DatastoreClientTest.java        | 13 ------
 3 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/datastore-v1-proto-client/clirr-ignored-differences.xml b/datastore-v1-proto-client/clirr-ignored-differences.xml
index e8c0b27f4c54..7df1765da288 100644
--- a/datastore-v1-proto-client/clirr-ignored-differences.xml
+++ b/datastore-v1-proto-client/clirr-ignored-differences.xml
@@ -6,4 +6,15 @@
     java.util.List getSplits(com.google.datastore.v1.Query, com.google.datastore.v1.PartitionId, int, com.google.datastore.v1.client.Datastore, com.google.protobuf.Timestamp)
     7012
   
+  
+  
+    com/google/datastore/v1/client/DatastoreOptions
+    java.lang.String getDatabaseId()
+    7002
+  
+  
+    com/google/datastore/v1/client/DatastoreOptions$Builder
+    com.google.datastore.v1.client.DatastoreOptions$Builder databaseId(java.lang.String)
+    7002
+  
 
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 687410d78a21..9a7045809de8 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,7 +20,6 @@
 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;
 
@@ -42,8 +41,6 @@
 public class DatastoreOptions {
   private final String projectId;
 
-  @Deprecated private final String databaseId;
-
   private final String projectEndpoint;
   private final String host;
   private final String localHost;
@@ -60,7 +57,6 @@ 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;
@@ -78,8 +74,6 @@ public static class Builder {
 
     private String projectId;
 
-    @Deprecated private String databaseId;
-
     private String projectEndpoint;
     private String host;
     private String localHost;
@@ -91,7 +85,6 @@ 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;
@@ -111,24 +104,6 @@ public Builder projectId(String projectId) {
       return this;
     }
 
-    /**
-     * This field is ignored and will be removed in a future release. Please set the database id on
-     * the request itself. For example:
-     *
-     * 
    {@code
-     * CommitRequest.newBuilder()
-     *     .setDatabaseId("my-database-id")
-     *     ....
-     *     .build();
-     * }
    
-     */
-    @BetaApi
-    @Deprecated
-    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.
@@ -203,23 +178,6 @@ public String getProjectId() {
     return projectId;
   }
 
-  /**
-   * This field is ignored and will be removed in a future release. Please set the database id on
-   * the request itself. For example:
-   *
-   * 
    {@code
-   * CommitRequest.newBuilder()
-   *     .setDatabaseId("my-database-id")
-   *     ....
-   *     .build();
-   * }
    
-   */
-  @BetaApi
-  @Deprecated
-  public String getDatabaseId() {
-    return databaseId;
-  }
-
   public String getProjectEndpoint() {
     return projectEndpoint;
   }
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 3fd82ddca58c..16a6303bb2d7 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,19 +215,6 @@ public void create_LocalHost() {
         .isEqualTo("http://localhost:8080/v1/projects/project-id");
   }
 
-  @Test
-  // TODO: remove this test once deprecated `databaseId` is removed
-  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 =

From 9686339ee25511f87a92171171182e9d970bb16d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 29 Nov 2023 17:05:45 +0100
Subject: [PATCH 1267/1784] build(deps): update dependency
 org.codehaus.mojo:build-helper-maven-plugin to v3.5.0 (#1243)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e45e5784df9d..79297daf4a8c 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -53,7 +53,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.4.0
+        3.5.0
         
           
             add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 032befdc1618..5b6890590187 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -52,7 +52,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.4.0
+        3.5.0
         
           
             add-snippets-source

From c4e3533fe357827cc25d0f029e5a83ced31db12a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 30 Nov 2023 16:32:50 +0100
Subject: [PATCH 1268/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.20.0 (#1247)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa9951ac58fc..0a31a265765b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.19.0
+        3.20.0
         pom
         import
       

From 0a965b9f555a819b6895541a8f3f4915ad33208a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:48:14 +0000
Subject: [PATCH 1269/1784] chore(main): release 2.17.6 (#1232)

:robot: I have created a release *beep* *boop*
---


## [2.17.6](https://togithub.com/googleapis/java-datastore/compare/v2.17.5...v2.17.6) (2023-11-30)


### Bug Fixes

* Remove deprecated `databaseId` field in DatastoreOptions ([#1237](https://togithub.com/googleapis/java-datastore/issues/1237)) ([05e25e5](https://togithub.com/googleapis/java-datastore/commit/05e25e5d31f72f9cdedbb5efa85c64b55ccbc405))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.20.0 ([#1247](https://togithub.com/googleapis/java-datastore/issues/1247)) ([c4e3533](https://togithub.com/googleapis/java-datastore/commit/c4e3533fe357827cc25d0f029e5a83ced31db12a))
* Update dependency org.junit.vintage:junit-vintage-engine to v5.10.1 ([#1230](https://togithub.com/googleapis/java-datastore/issues/1230)) ([05c7fc6](https://togithub.com/googleapis/java-datastore/commit/05c7fc69d52f5a9026a6529f638fe6164860e8f9))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0b333bbee9a..a6953a424d80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.17.6](https://github.com/googleapis/java-datastore/compare/v2.17.5...v2.17.6) (2023-11-30)
+
+
+### Bug Fixes
+
+* Remove deprecated `databaseId` field in DatastoreOptions ([#1237](https://github.com/googleapis/java-datastore/issues/1237)) ([05e25e5](https://github.com/googleapis/java-datastore/commit/05e25e5d31f72f9cdedbb5efa85c64b55ccbc405))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.20.0 ([#1247](https://github.com/googleapis/java-datastore/issues/1247)) ([c4e3533](https://github.com/googleapis/java-datastore/commit/c4e3533fe357827cc25d0f029e5a83ced31db12a))
+* Update dependency org.junit.vintage:junit-vintage-engine to v5.10.1 ([#1230](https://github.com/googleapis/java-datastore/issues/1230)) ([05c7fc6](https://github.com/googleapis/java-datastore/commit/05c7fc69d52f5a9026a6529f638fe6164860e8f9))
+
 ## [2.17.5](https://github.com/googleapis/java-datastore/compare/v2.17.4...v2.17.5) (2023-11-02)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ebde7c645cc1..898147427241 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.17.6-SNAPSHOT
+  2.17.6
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6-SNAPSHOT
+    2.17.6
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e6ead05068b7..b224a63779ca 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.17.6-SNAPSHOT
+  2.17.6
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.6-SNAPSHOT
+        2.17.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.6-SNAPSHOT
+        2.17.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.6-SNAPSHOT
+        0.108.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.6-SNAPSHOT
+        2.17.6
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9c16ae06b71c..95cc529430d7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.6-SNAPSHOT
+  2.17.6
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6-SNAPSHOT
+    2.17.6
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index e5648f270f48..c904b9827b71 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.17.6-SNAPSHOT
+  2.17.6
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6-SNAPSHOT
+    2.17.6
   
   
     
diff --git a/pom.xml b/pom.xml
index 0a31a265765b..676ba69b5442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.6-SNAPSHOT
+  2.17.6
   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.17.6-SNAPSHOT
+        2.17.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.6-SNAPSHOT
+        2.17.6
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.6-SNAPSHOT
+        2.17.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.6-SNAPSHOT
+        0.108.6
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.6-SNAPSHOT
+        2.17.6
         
           
             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 ed2f991f27f2..45f206659934 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.17.6-SNAPSHOT
+  2.17.6
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6-SNAPSHOT
+    2.17.6
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 888dd0ab2837..7563d6f566fd 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.108.6-SNAPSHOT
+  0.108.6
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6-SNAPSHOT
+    2.17.6
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5b6890590187..ed5fc68f4016 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.6-SNAPSHOT
+      2.17.6
     
     
 
diff --git a/versions.txt b/versions.txt
index e31e9ef9d70e..e3de8713c4ba 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.5:2.17.6-SNAPSHOT
-google-cloud-datastore-bom:2.17.5:2.17.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.108.5:0.108.6-SNAPSHOT
-datastore-v1-proto-client:2.17.5:2.17.6-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.17.5:2.17.6-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.17.5:2.17.6-SNAPSHOT
+google-cloud-datastore:2.17.6:2.17.6
+google-cloud-datastore-bom:2.17.6:2.17.6
+proto-google-cloud-datastore-v1:0.108.6:0.108.6
+datastore-v1-proto-client:2.17.6:2.17.6
+proto-google-cloud-datastore-admin-v1:2.17.6:2.17.6
+grpc-google-cloud-datastore-admin-v1:2.17.6:2.17.6

From 443f4fed6400651dbdf651dcad9511e2324f0136 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:17:21 -0500
Subject: [PATCH 1270/1784] chore(main): release 2.17.7-SNAPSHOT (#1249)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 898147427241..89e198cab5ce 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.17.6
+  2.17.7-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6
+    2.17.7-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b224a63779ca..a9c07d2729c0 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.17.6
+  2.17.7-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.6
+        2.17.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.6
+        2.17.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.6
+        0.108.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.6
+        2.17.7-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 95cc529430d7..172f54c6a2b9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.6
+  2.17.7-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6
+    2.17.7-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index c904b9827b71..7ea1711ed8c9 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.17.6
+  2.17.7-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6
+    2.17.7-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 676ba69b5442..6de18bec12a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.6
+  2.17.7-SNAPSHOT
   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.17.6
+        2.17.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.6
+        2.17.7-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.6
+        2.17.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.6
+        0.108.7-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.6
+        2.17.7-SNAPSHOT
         
           
             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 45f206659934..969e0f226941 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.17.6
+  2.17.7-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6
+    2.17.7-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7563d6f566fd..f40e0836ff78 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.108.6
+  0.108.7-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.6
+    2.17.7-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ed5fc68f4016..fa8e34132576 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.6
+      2.17.7-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index e3de8713c4ba..2120f37bb7ac 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.6:2.17.6
-google-cloud-datastore-bom:2.17.6:2.17.6
-proto-google-cloud-datastore-v1:0.108.6:0.108.6
-datastore-v1-proto-client:2.17.6:2.17.6
-proto-google-cloud-datastore-admin-v1:2.17.6:2.17.6
-grpc-google-cloud-datastore-admin-v1:2.17.6:2.17.6
+google-cloud-datastore:2.17.6:2.17.7-SNAPSHOT
+google-cloud-datastore-bom:2.17.6:2.17.7-SNAPSHOT
+proto-google-cloud-datastore-v1:0.108.6:0.108.7-SNAPSHOT
+datastore-v1-proto-client:2.17.6:2.17.7-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.17.6:2.17.7-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.17.6:2.17.7-SNAPSHOT

From 56960ed715222fd523b46c997619819f525d2ed5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 30 Nov 2023 21:32:39 +0100
Subject: [PATCH 1271/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.17.6 (#1252)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.17.5` -> `2.17.6` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.17.5/2.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.17.5/2.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.17.6`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2176-2023-11-30)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.17.5...v2.17.6)

##### Bug Fixes

-   Remove deprecated `databaseId` field in DatastoreOptions ([#​1237](https://togithub.com/googleapis/java-datastore/issues/1237)) ([05e25e5](https://togithub.com/googleapis/java-datastore/commit/05e25e5d31f72f9cdedbb5efa85c64b55ccbc405))

##### Dependencies

-   Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.20.0 ([#​1247](https://togithub.com/googleapis/java-datastore/issues/1247)) ([c4e3533](https://togithub.com/googleapis/java-datastore/commit/c4e3533fe357827cc25d0f029e5a83ced31db12a))
-   Update dependency org.junit.vintage:junit-vintage-engine to v5.10.1 ([#​1230](https://togithub.com/googleapis/java-datastore/issues/1230)) ([05c7fc6](https://togithub.com/googleapis/java-datastore/commit/05c7fc69d52f5a9026a6529f638fe6164860e8f9))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 README.md                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 31a90d7fbfa1..6b9d659ecf61 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.17.5
+  2.17.6
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.17.5'
+implementation 'com.google.cloud:google-cloud-datastore:2.17.6'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.6"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.5
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.6
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 79297daf4a8c..e3cfb890125c 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.17.5
+      2.17.6
     
     
 

From 83e16b4ad2bfc1e67b5efa45a722c6ced4e0e89b Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:30:35 -0500
Subject: [PATCH 1272/1784] ci: Update ci.yaml to introduce Java 21 unit
 testing (#1907) (#1254)

Source-Link: https://github.com/googleapis/synthtool/commit/c06d605503f34e91c9d7dfee8f5287d58b5988ae
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml | 4 ++--
 .github/workflows/ci.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 208af343821b..d304652e1c44 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:fb7584f6adb3847ac480ed49a4bfe1463965026b2919a1be270e3174f3ce1191
-# created: 2023-10-26T23:22:21.357007231Z
+  digest: sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88
+# created: 2023-12-01T19:50:20.444857406Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e27b2c57563c..ae66b1973b17 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3

From 6e62444ce5825a8bdcfe91ea9a3f7af8159d7b8e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:28:07 -0500
Subject: [PATCH 1273/1784] build(deps): bump cryptography from 41.0.3 to
 41.0.6 in /synthtool/gcp/templates/java_library/.kokoro (#1908) (#1256)

build(deps): bump cryptography

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.3 to 41.0.6.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/41.0.3...41.0.6)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...



Source-Link: https://github.com/googleapis/synthtool/commit/ea6f80056a7d22f4d3a3e8fee2d59cdc746470bd
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:81f75d962cd28b7ad10740a643b8069b8fa0357cb495b782eef8560bb7a8fd65

Signed-off-by: dependabot[bot] 
Co-authored-by: Owl Bot 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml |  4 ++--
 .kokoro/requirements.txt  | 48 +++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index d304652e1c44..f56920557239 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88
-# created: 2023-12-01T19:50:20.444857406Z
+  digest: sha256:81f75d962cd28b7ad10740a643b8069b8fa0357cb495b782eef8560bb7a8fd65
+# created: 2023-12-05T19:16:19.735195992Z
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index c5c11bbe7925..445c5c1f0929 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -170,30 +170,30 @@ colorlog==6.7.0 \
     --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
     --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
     # via gcp-docuploader
-cryptography==41.0.2 \
-    --hash=sha256:01f1d9e537f9a15b037d5d9ee442b8c22e3ae11ce65ea1f3316a41c78756b711 \
-    --hash=sha256:079347de771f9282fbfe0e0236c716686950c19dee1b76240ab09ce1624d76d7 \
-    --hash=sha256:182be4171f9332b6741ee818ec27daff9fb00349f706629f5cbf417bd50e66fd \
-    --hash=sha256:192255f539d7a89f2102d07d7375b1e0a81f7478925b3bc2e0549ebf739dae0e \
-    --hash=sha256:2a034bf7d9ca894720f2ec1d8b7b5832d7e363571828037f9e0c4f18c1b58a58 \
-    --hash=sha256:342f3767e25876751e14f8459ad85e77e660537ca0a066e10e75df9c9e9099f0 \
-    --hash=sha256:439c3cc4c0d42fa999b83ded80a9a1fb54d53c58d6e59234cfe97f241e6c781d \
-    --hash=sha256:49c3222bb8f8e800aead2e376cbef687bc9e3cb9b58b29a261210456a7783d83 \
-    --hash=sha256:674b669d5daa64206c38e507808aae49904c988fa0a71c935e7006a3e1e83831 \
-    --hash=sha256:7a9a3bced53b7f09da251685224d6a260c3cb291768f54954e28f03ef14e3766 \
-    --hash=sha256:7af244b012711a26196450d34f483357e42aeddb04128885d95a69bd8b14b69b \
-    --hash=sha256:7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c \
-    --hash=sha256:84609ade00a6ec59a89729e87a503c6e36af98ddcd566d5f3be52e29ba993182 \
-    --hash=sha256:9a6673c1828db6270b76b22cc696f40cde9043eb90373da5c2f8f2158957f42f \
-    --hash=sha256:9b6d717393dbae53d4e52684ef4f022444fc1cce3c48c38cb74fca29e1f08eaa \
-    --hash=sha256:9c3fe6534d59d071ee82081ca3d71eed3210f76ebd0361798c74abc2bcf347d4 \
-    --hash=sha256:a719399b99377b218dac6cf547b6ec54e6ef20207b6165126a280b0ce97e0d2a \
-    --hash=sha256:b332cba64d99a70c1e0836902720887fb4529ea49ea7f5462cf6640e095e11d2 \
-    --hash=sha256:d124682c7a23c9764e54ca9ab5b308b14b18eba02722b8659fb238546de83a76 \
-    --hash=sha256:d73f419a56d74fef257955f51b18d046f3506270a5fd2ac5febbfa259d6c0fa5 \
-    --hash=sha256:f0dc40e6f7aa37af01aba07277d3d64d5a03dc66d682097541ec4da03cc140ee \
-    --hash=sha256:f14ad275364c8b4e525d018f6716537ae7b6d369c094805cae45300847e0894f \
-    --hash=sha256:f772610fe364372de33d76edcd313636a25684edb94cee53fd790195f5989d14
+cryptography==41.0.6 \
+    --hash=sha256:068bc551698c234742c40049e46840843f3d98ad7ce265fd2bd4ec0d11306596 \
+    --hash=sha256:0f27acb55a4e77b9be8d550d762b0513ef3fc658cd3eb15110ebbcbd626db12c \
+    --hash=sha256:2132d5865eea673fe6712c2ed5fb4fa49dba10768bb4cc798345748380ee3660 \
+    --hash=sha256:3288acccef021e3c3c10d58933f44e8602cf04dba96d9796d70d537bb2f4bbc4 \
+    --hash=sha256:35f3f288e83c3f6f10752467c48919a7a94b7d88cc00b0668372a0d2ad4f8ead \
+    --hash=sha256:398ae1fc711b5eb78e977daa3cbf47cec20f2c08c5da129b7a296055fbb22aed \
+    --hash=sha256:422e3e31d63743855e43e5a6fcc8b4acab860f560f9321b0ee6269cc7ed70cc3 \
+    --hash=sha256:48783b7e2bef51224020efb61b42704207dde583d7e371ef8fc2a5fb6c0aabc7 \
+    --hash=sha256:4d03186af98b1c01a4eda396b137f29e4e3fb0173e30f885e27acec8823c1b09 \
+    --hash=sha256:5daeb18e7886a358064a68dbcaf441c036cbdb7da52ae744e7b9207b04d3908c \
+    --hash=sha256:60e746b11b937911dc70d164060d28d273e31853bb359e2b2033c9e93e6f3c43 \
+    --hash=sha256:742ae5e9a2310e9dade7932f9576606836ed174da3c7d26bc3d3ab4bd49b9f65 \
+    --hash=sha256:7e00fb556bda398b99b0da289ce7053639d33b572847181d6483ad89835115f6 \
+    --hash=sha256:85abd057699b98fce40b41737afb234fef05c67e116f6f3650782c10862c43da \
+    --hash=sha256:8efb2af8d4ba9dbc9c9dd8f04d19a7abb5b49eab1f3694e7b5a16a5fc2856f5c \
+    --hash=sha256:ae236bb8760c1e55b7a39b6d4d32d2279bc6c7c8500b7d5a13b6fb9fc97be35b \
+    --hash=sha256:afda76d84b053923c27ede5edc1ed7d53e3c9f475ebaf63c68e69f1403c405a8 \
+    --hash=sha256:b27a7fd4229abef715e064269d98a7e2909ebf92eb6912a9603c7e14c181928c \
+    --hash=sha256:b648fe2a45e426aaee684ddca2632f62ec4613ef362f4d681a9a6283d10e079d \
+    --hash=sha256:c5a550dc7a3b50b116323e3d376241829fd326ac47bc195e04eb33a8170902a9 \
+    --hash=sha256:da46e2b5df770070412c46f87bac0849b8d685c5f2679771de277a422c7d0b86 \
+    --hash=sha256:f39812f70fc5c71a15aa3c97b2bbe213c3f2a460b79bd21c40d033bb34a9bf36 \
+    --hash=sha256:ff369dd19e8fe0528b02e8df9f2aeb2479f89b1270d90f96a63500afe9af5cae
     # via
     #   gcp-releasetool
     #   secretstorage

From e397dab4901fdb2c9c0d08a4d4c7a202271b37a5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 6 Dec 2023 20:35:15 +0100
Subject: [PATCH 1274/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.28.0 (#1257)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.28.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6b9d659ecf61..0e4cde279d75 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.27.0
+      26.28.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.27.0')
+implementation platform('com.google.cloud:libraries-bom:26.28.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 9ceacb5d5652..2206f3d0560b 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.27.0
+        26.28.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 6cc5f10861c1..b917d16235b5 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.27.0
+        26.28.0
         pom
         import
       

From 5fc711404db97a57eec6b5c799d988e892a30060 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 14 Dec 2023 22:44:37 +0100
Subject: [PATCH 1275/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.29.0 (#1260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.29.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0e4cde279d75..7ef06cbf41d9 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.28.0
+      26.29.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.28.0')
+implementation platform('com.google.cloud:libraries-bom:26.29.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 2206f3d0560b..d4aa90c01e1f 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.28.0
+        26.29.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index b917d16235b5..d0adae642b78 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.28.0
+        26.29.0
         pom
         import
       

From f4576b7472ce1aa95de0653074171cddede9de05 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 3 Jan 2024 10:35:57 -0500
Subject: [PATCH 1276/1784] test(deps): upgrade errorprone to 2.24.0 (#1271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: upgrade errorprone to 2.24.0

* 🦉 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 
---
 google-cloud-datastore/pom.xml                             | 7 +++++++
 .../src/test/java/com/google/cloud/datastore/BlobTest.java | 4 +++-
 .../test/java/com/google/cloud/datastore/LatLngTest.java   | 4 +++-
 pom.xml                                                    | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 172f54c6a2b9..bc30cf7e41a4 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -118,6 +118,13 @@
       test-jar
       test
         
+
+    
+      com.google.guava
+      guava-testlib
+      33.0.0-jre
+      test
+    
     
     
       com.google.api
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
index 55d5f0319c47..391f6f7654d8 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 
+import com.google.common.testing.EqualsTester;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -46,7 +47,8 @@ public void setUp() {
 
   @Test
   public void testEquals() {
-    assertEquals(blob1, blob1);
+    EqualsTester equalsTester = new EqualsTester();
+    equalsTester.addEqualityGroup(blob1, blob1).testEquals();
     assertEquals(blob1, Blob.copyFrom(bytes1));
     assertNotEquals(blob1, blob2);
   }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
index e8076eba0d01..9363fc15a12e 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import com.google.common.testing.EqualsTester;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -40,7 +41,8 @@ public void testLatLng() {
 
   @Test
   public void testEquals() {
-    assertEquals(gp1, gp1);
+    EqualsTester equalsTester = new EqualsTester();
+    equalsTester.addEqualityGroup(gp1, gp1).testEquals();
     assertNotEquals(gp1, gp2);
   }
 
diff --git a/pom.xml b/pom.xml
index 6de18bec12a6..bd6c8ac15592 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.23.0
+    2.24.0
       
 
   

From da42dcf3256a8879c5eff78b9d190b497a014275 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 3 Jan 2024 16:39:18 +0100
Subject: [PATCH 1277/1784] test(deps): update dependency
 com.google.truth:truth to v1.2.0 (#1267)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 89e198cab5ce..7f4ce55b5f8d 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.1.5
+      1.2.0
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index bc30cf7e41a4..699e34afbe59 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -157,7 +157,7 @@
     
       com.google.truth
       truth
-      1.1.5
+      1.2.0
       test
     
       
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e3cfb890125c..7c6b51231d42 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.1.5
+      1.2.0
       test
     
       
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index d4aa90c01e1f..40e45e53548c 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.1.5
+      1.2.0
       test
     
       
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fa8e34132576..b3096338109b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -41,7 +41,7 @@
     
       com.google.truth
       truth
-      1.1.5
+      1.2.0
       test
     
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d0adae642b78..190e067576f5 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.1.5
+      1.2.0
       test
     
       

From 5f9c9617a78e5cbb773d86f71f4c9fc75d72eca9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 3 Jan 2024 16:39:34 +0100
Subject: [PATCH 1278/1784] build(deps): update dependency
 com.google.cloud:google-cloud-shared-config to v1.7.1 (#1258)

---
 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 a9c07d2729c0..a11fcaa0af29 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.6.1
+    1.7.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index bd6c8ac15592..2716192a5437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-shared-config
-    1.6.1
+    1.7.1
   
 
   

From 2bd9a51122248ee242bbcd4914e219d9d5e435bb Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 3 Jan 2024 11:25:36 -0500
Subject: [PATCH 1279/1784] feat: remove `@BetaApi` annotations from
 get/setDatabaseId methods (#1272)

---
 .../src/main/java/com/google/cloud/datastore/BaseKey.java      | 3 ---
 .../main/java/com/google/cloud/datastore/DatastoreOptions.java | 3 ---
 .../main/java/com/google/cloud/datastore/IncompleteKey.java    | 2 --
 .../src/main/java/com/google/cloud/datastore/Key.java          | 3 ---
 .../src/main/java/com/google/cloud/datastore/KeyFactory.java   | 2 --
 .../google/cloud/datastore/testing/RemoteDatastoreHelper.java  | 2 --
 6 files changed, 15 deletions(-)

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 6a015e3886b7..5547979d9f6c 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
@@ -20,7 +20,6 @@
 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;
@@ -117,7 +116,6 @@ public B setNamespace(String namespace) {
     }
 
     /** Sets the database id of the key. */
-    @BetaApi
     public B setDatabaseId(String databaseId) {
       this.databaseId = databaseId;
       return self();
@@ -148,7 +146,6 @@ 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 d4f3be3c2324..8437c3e22032 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,7 +18,6 @@
 
 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;
@@ -97,7 +96,6 @@ public Builder setNamespace(String namespace) {
       return this;
     }
 
-    @BetaApi
     public Builder setDatabaseId(String databaseId) {
       this.databaseId = databaseId;
       return this;
@@ -155,7 +153,6 @@ public String getNamespace() {
     return namespace;
   }
 
-  @BetaApi
   public String getDatabaseId() {
     return this.databaseId;
   }
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 c1f7118e55ff..db9973cb5adc 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,7 +16,6 @@
 
 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;
@@ -107,7 +106,6 @@ 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);
   }
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 bfd9dd7d3af3..9e851d0cb778 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,7 +18,6 @@
 
 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;
@@ -180,7 +179,6 @@ 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);
   }
@@ -189,7 +187,6 @@ 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);
   }
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 f8c3c93f62cd..628a32353655 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,7 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import com.google.common.collect.ImmutableList;
 
 /**
@@ -37,7 +36,6 @@ public KeyFactory(String projectId, String namespace) {
     this(projectId, namespace, "");
   }
 
-  @BetaApi
   public KeyFactory(String projectId, String namespace, String databaseId) {
     super(projectId);
     setNamespace(namespace);
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 d8b5ad9324d8..596ce96d8692 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,7 +16,6 @@
 
 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;
@@ -79,7 +78,6 @@ public static RemoteDatastoreHelper create() {
   }
 
   /** Creates a {@code RemoteStorageHelper} object. */
-  @BetaApi
   public static RemoteDatastoreHelper create(String databaseId) {
     HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions();
     transportOptions =

From 5e9927813238ef873e2d9ecabc9bbed46a818ef2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 3 Jan 2024 17:25:49 +0100
Subject: [PATCH 1280/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3.2.3 (#1262)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.2.3

* 🦉 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 
---
 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 40e45e53548c..6bac0a1207e1 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -97,7 +97,7 @@
             org.apache.maven.plugins
             maven-surefire-plugin
              
-            3.2.2
+            3.2.3
             
               
                 **/IT*

From 86cd7856463c5039601afc10fecc1b28727d4906 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 3 Jan 2024 19:36:35 +0100
Subject: [PATCH 1281/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.24.1 (#1274)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2716192a5437..ae10abe4b8ec 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.24.0
+    2.24.1
       
 
   

From ac253dca1add844124ca03039a996196e09a1759 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 8 Jan 2024 15:25:52 +0100
Subject: [PATCH 1282/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.21.0 (#1280)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae10abe4b8ec..54bc1c9216fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.20.0
+        3.21.0
         pom
         import
       

From 1a6b4b6822437bd3663716fd71a8cf8778719921 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:58:21 +0000
Subject: [PATCH 1283/1784] chore(main): release 2.18.0 (#1273)

:robot: I have created a release *beep* *boop*
---


## [2.18.0](https://togithub.com/googleapis/java-datastore/compare/v2.17.6...v2.18.0) (2024-01-08)


### Features

* Remove `@BetaApi` annotations from get/setDatabaseId methods ([#1272](https://togithub.com/googleapis/java-datastore/issues/1272)) ([2bd9a51](https://togithub.com/googleapis/java-datastore/commit/2bd9a51122248ee242bbcd4914e219d9d5e435bb))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.21.0 ([#1280](https://togithub.com/googleapis/java-datastore/issues/1280)) ([ac253dc](https://togithub.com/googleapis/java-datastore/commit/ac253dca1add844124ca03039a996196e09a1759))
* Update dependency com.google.errorprone:error_prone_core to v2.24.1 ([#1274](https://togithub.com/googleapis/java-datastore/issues/1274)) ([86cd785](https://togithub.com/googleapis/java-datastore/commit/86cd7856463c5039601afc10fecc1b28727d4906))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6953a424d80..b6945a93b2e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.18.0](https://github.com/googleapis/java-datastore/compare/v2.17.6...v2.18.0) (2024-01-08)
+
+
+### Features
+
+* Remove `@BetaApi` annotations from get/setDatabaseId methods ([#1272](https://github.com/googleapis/java-datastore/issues/1272)) ([2bd9a51](https://github.com/googleapis/java-datastore/commit/2bd9a51122248ee242bbcd4914e219d9d5e435bb))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.21.0 ([#1280](https://github.com/googleapis/java-datastore/issues/1280)) ([ac253dc](https://github.com/googleapis/java-datastore/commit/ac253dca1add844124ca03039a996196e09a1759))
+* Update dependency com.google.errorprone:error_prone_core to v2.24.1 ([#1274](https://github.com/googleapis/java-datastore/issues/1274)) ([86cd785](https://github.com/googleapis/java-datastore/commit/86cd7856463c5039601afc10fecc1b28727d4906))
+
 ## [2.17.6](https://github.com/googleapis/java-datastore/compare/v2.17.5...v2.17.6) (2023-11-30)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7f4ce55b5f8d..54d1d5ba03a6 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.17.7-SNAPSHOT
+  2.18.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.7-SNAPSHOT
+    2.18.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a11fcaa0af29..24aa2daf24a3 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.17.7-SNAPSHOT
+  2.18.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.17.7-SNAPSHOT
+        2.18.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.7-SNAPSHOT
+        2.18.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.7-SNAPSHOT
+        0.109.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.17.7-SNAPSHOT
+        2.18.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 699e34afbe59..d3a9340dce67 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.17.7-SNAPSHOT
+  2.18.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.7-SNAPSHOT
+    2.18.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 7ea1711ed8c9..09bcb250c284 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.17.7-SNAPSHOT
+  2.18.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.7-SNAPSHOT
+    2.18.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 54bc1c9216fa..49856d57aac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.17.7-SNAPSHOT
+  2.18.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.17.7-SNAPSHOT
+        2.18.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.17.7-SNAPSHOT
+        2.18.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.17.7-SNAPSHOT
+        2.18.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.108.7-SNAPSHOT
+        0.109.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.17.7-SNAPSHOT
+        2.18.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 969e0f226941..34e6e96848c6 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.17.7-SNAPSHOT
+  2.18.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.7-SNAPSHOT
+    2.18.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f40e0836ff78..366efc164049 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.108.7-SNAPSHOT
+  0.109.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.17.7-SNAPSHOT
+    2.18.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b3096338109b..d343629e994e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.17.7-SNAPSHOT
+      2.18.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 2120f37bb7ac..58ccbb8ab181 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.17.6:2.17.7-SNAPSHOT
-google-cloud-datastore-bom:2.17.6:2.17.7-SNAPSHOT
-proto-google-cloud-datastore-v1:0.108.6:0.108.7-SNAPSHOT
-datastore-v1-proto-client:2.17.6:2.17.7-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.17.6:2.17.7-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.17.6:2.17.7-SNAPSHOT
+google-cloud-datastore:2.18.0:2.18.0
+google-cloud-datastore-bom:2.18.0:2.18.0
+proto-google-cloud-datastore-v1:0.109.0:0.109.0
+datastore-v1-proto-client:2.18.0:2.18.0
+proto-google-cloud-datastore-admin-v1:2.18.0:2.18.0
+grpc-google-cloud-datastore-admin-v1:2.18.0:2.18.0

From e6232e9f368311b9fa4d9098e773d781babf8e09 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:34:22 +0000
Subject: [PATCH 1284/1784] chore(main): release 2.18.1-SNAPSHOT (#1282)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 54d1d5ba03a6..7256170bc9a9 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.18.0
+  2.18.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.0
+    2.18.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 24aa2daf24a3..bf7e07b8b353 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.18.0
+  2.18.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.0
+        2.18.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.0
+        2.18.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.0
+        0.109.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.0
+        2.18.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d3a9340dce67..8833a08e3bd2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.0
+  2.18.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.0
+    2.18.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 09bcb250c284..5d4446fc7677 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.18.0
+  2.18.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.0
+    2.18.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 49856d57aac3..e9aab05a3094 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.0
+  2.18.1-SNAPSHOT
   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.18.0
+        2.18.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.0
+        2.18.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.0
+        2.18.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.0
+        0.109.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.0
+        2.18.1-SNAPSHOT
         
           
             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 34e6e96848c6..fd148683b529 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.18.0
+  2.18.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.0
+    2.18.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 366efc164049..8bfc2292e691 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.109.0
+  0.109.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.0
+    2.18.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d343629e994e..dc380f03b93b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.0
+      2.18.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 58ccbb8ab181..eb98fd391dd2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.0:2.18.0
-google-cloud-datastore-bom:2.18.0:2.18.0
-proto-google-cloud-datastore-v1:0.109.0:0.109.0
-datastore-v1-proto-client:2.18.0:2.18.0
-proto-google-cloud-datastore-admin-v1:2.18.0:2.18.0
-grpc-google-cloud-datastore-admin-v1:2.18.0:2.18.0
+google-cloud-datastore:2.18.0:2.18.1-SNAPSHOT
+google-cloud-datastore-bom:2.18.0:2.18.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.109.0:0.109.1-SNAPSHOT
+datastore-v1-proto-client:2.18.0:2.18.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.18.0:2.18.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.18.0:2.18.1-SNAPSHOT

From 1ca8bfc92e47e171cafb31a69e236b89d8b46452 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 9 Jan 2024 16:54:48 +0100
Subject: [PATCH 1285/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.18.0 (#1284)
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.18.0

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7ef06cbf41d9..165d145cd265 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.17.6
+  2.18.0
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.17.6'
+implementation 'com.google.cloud:google-cloud-datastore:2.18.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.17.6"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.0"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.17.6
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 7c6b51231d42..73398c1da28c 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.17.6
+      2.18.0
     
     
 

From 01cced66613bc10ba71cc80166119e321915ec34 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 11:54:25 -0500
Subject: [PATCH 1286/1784] fix(deps): Update the Java code generator
 (gapic-generator-java) to 2.31.0 (#1278)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: add new types QueryMode, QueryPlan, ResultSetStats
feat: add QueryMode field to RunQueryRequest
feat: add ResultSetStats field to RunQueryResponse
feat: add QueryMode field to RunAggregationQueryRequest
feat: add ResultSetStats field to RunAggregationQueryResponse

PiperOrigin-RevId: 595774772

Source-Link: https://github.com/googleapis/googleapis/commit/03e7ed44ac499ee71baa2770e78045a3a85f30f5

Source-Link: https://github.com/googleapis/googleapis-gen/commit/dc63e0dea8423c230d5fb0937acb3c98719c9395
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGM2M2UwZGVhODQyM2MyMzBkNWZiMDkzN2FjYjNjOTg3MTljOTM5NSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.31.0

PiperOrigin-RevId: 596645164

Source-Link: https://github.com/googleapis/googleapis/commit/4a0e62ecde2a6459bea8722a33173cfce1e9fb50

Source-Link: https://github.com/googleapis/googleapis-gen/commit/a10ed6a77676c37e60799098d48d0afb16008613
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTEwZWQ2YTc3Njc2YzM3ZTYwNzk5MDk4ZDQ4ZDBhZmIxNjAwODYxMyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix javadoc errors

---------

Co-authored-by: Owl Bot 
Co-authored-by: kolea2 
---
 .../admin/v1/DatastoreAdminClient.java        |  120 +-
 .../v1/stub/DatastoreAdminStubSettings.java   |    6 +
 .../google/datastore/v1/DatastoreProto.java   |  290 ++---
 .../com/google/datastore/v1/QueryMode.java    |  180 +++
 .../com/google/datastore/v1/QueryPlan.java    |  777 ++++++++++++
 .../datastore/v1/QueryPlanOrBuilder.java      |   81 ++
 .../datastore/v1/QueryProfileProto.java       |   87 ++
 .../google/datastore/v1/ResultSetStats.java   | 1075 +++++++++++++++++
 .../datastore/v1/ResultSetStatsOrBuilder.java |  125 ++
 .../v1/RunAggregationQueryRequest.java        |  167 +++
 .../RunAggregationQueryRequestOrBuilder.java  |   31 +
 .../v1/RunAggregationQueryResponse.java       |  296 +++++
 .../RunAggregationQueryResponseOrBuilder.java |   44 +
 .../google/datastore/v1/RunQueryRequest.java  |  167 +++
 .../v1/RunQueryRequestOrBuilder.java          |   31 +
 .../google/datastore/v1/RunQueryResponse.java |  296 +++++
 .../v1/RunQueryResponseOrBuilder.java         |   44 +
 .../proto/google/datastore/v1/datastore.proto |   23 +
 .../google/datastore/v1/query_profile.proto   |   75 ++
 19 files changed, 3762 insertions(+), 153 deletions(-)
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryMode.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStats.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 399e61e01a3f..dc68117363ac 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -115,19 +115,113 @@
  * 
    Note: close() needs to be called on the DatastoreAdminClient object to clean up resources such
  * as threads. In the example above, try-with-resources is used, which automatically calls close().
  *
- * 
    The surface of this class includes several types of Java methods for each of the API's
- * methods:
- *
- * 
      
- *   
    1. A "flattened" method. With this type of method, the fields of the request type have been
- *       converted into function parameters. It may be the case that not all fields are available as
- *       parameters, and not every API method will have a flattened method entry point.
- *   
    2. A "request object" method. This type of method only takes one parameter, a request object,
- *       which must be constructed before the call. Not every API method will have a request object
- *       method.
- *   
    3. A "callable" method. This type of method takes no parameters and returns an immutable API
- *       callable object, which can be used to initiate calls to the service.
- * 
    
+ * 
+ *     
+ *    
+ *      
+ *      
+ *      
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *  
    Methods
    MethodDescriptionMethod Variants
    ExportEntities
     Exports a copy of all or a subset of entities from Google Cloud Datastore to another storage system, such as Google Cloud Storage. Recent updates to entities may not be reflected in the export. The export occurs in the background and its progress can be monitored and managed via the Operation resource that is created. The output of an export may only be used once the associated operation is done. If an export operation is cancelled before completion it may leave partial data behind in Google Cloud Storage.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    • exportEntitiesAsync(ExportEntitiesRequest request)
+ *      
    
+ *      
    Methods that return long-running operations have "Async" method variants that return `OperationFuture`, which is used to track polling of the service.
    
+ *      
      
+ *           
    • exportEntitiesAsync(String projectId, Map<String, String> labels, EntityFilter entityFilter, String outputUrlPrefix)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    • exportEntitiesOperationCallable()
+ *           
    • exportEntitiesCallable()
+ *      
    
+ *       
    ImportEntities
     Imports entities into Google Cloud Datastore. Existing entities with the same key are overwritten. The import occurs in the background and its progress can be monitored and managed via the Operation resource that is created. If an ImportEntities operation is cancelled, it is possible that a subset of the data has already been imported to Cloud Datastore.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    • importEntitiesAsync(ImportEntitiesRequest request)
+ *      
    
+ *      
    Methods that return long-running operations have "Async" method variants that return `OperationFuture`, which is used to track polling of the service.
    
+ *      
      
+ *           
    • importEntitiesAsync(String projectId, Map<String, String> labels, String inputUrl, EntityFilter entityFilter)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    • importEntitiesOperationCallable()
+ *           
    • importEntitiesCallable()
+ *      
    
+ *       
    CreateIndex
     Creates the specified index. A newly created index's initial state is `CREATING`. On completion of the returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`. If the index already exists, the call will return an `ALREADY_EXISTS` status.
+ * 
      During index creation, the process could result in an error, in which case the index will move to the `ERROR` state. The process can be recovered by fixing the data that caused the error, removing the index with [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then re-creating the index with [create] [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+ * 
      Indexes with a single property cannot be created.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    • createIndexAsync(CreateIndexRequest request)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    • createIndexOperationCallable()
+ *           
    • createIndexCallable()
+ *      
    
+ *       
    DeleteIndex
     Deletes an existing index. An index can only be deleted if it is in a `READY` or `ERROR` state. On successful execution of the request, the index will be in a `DELETING` [state][google.datastore.admin.v1.Index.State]. And on completion of the returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
+ * 
      During index deletion, the process could result in an error, in which case the index will move to the `ERROR` state. The process can be recovered by fixing the data that caused the error, followed by calling [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    • deleteIndexAsync(DeleteIndexRequest request)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    • deleteIndexOperationCallable()
+ *           
    • deleteIndexCallable()
+ *      
    
+ *       
    GetIndex
     Gets an index.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    • getIndex(GetIndexRequest request)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    • getIndexCallable()
+ *      
    
+ *       
    ListIndexes
     Lists the indexes that match the specified filters.  Datastore uses an eventually consistent query to fetch the list of indexes and may occasionally return stale results.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    • listIndexes(ListIndexesRequest request)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    • listIndexesPagedCallable()
+ *           
    • listIndexesCallable()
+ *      
    
+ *       
    
  *
  * 
    See the individual methods for example code.
  *
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 08d7b7179962..6de58e7f050f 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -258,6 +258,12 @@ public DatastoreAdminStub createStub() throws IOException {
             "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
   }
 
+  /** Returns the default service name. */
+  @Override
+  public String getServiceName() {
+    return "datastore";
+  }
+
   /** Returns a builder for the default ExecutorProvider for this service. */
   public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
     return InstantiatingExecutorProvider.newBuilder();
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 7c87417353cf..b87fdafea5c4 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,152 @@ 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\"\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"
+          + "proto\032\'google/datastore/v1/query_profile"
+          + ".proto\032\037google/protobuf/timestamp.proto\""
+          + "\244\001\n\rLookupRequest\022\030\n\nproject_id\030\010 \001(\tB\004\342"
+          + "A\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.Key"
+          + "B\004\342A\001\002\"\346\001\n\016LookupResponse\0220\n\005found\030\001 \003(\013"
+          + "2!.google.datastore.v1.EntityResult\0222\n\007m"
+          + "issing\030\002 \003(\0132!.google.datastore.v1.Entit"
+          + "yResult\022*\n\010deferred\030\003 \003(\0132\030.google.datas"
+          + "tore.v1.Key\022\023\n\013transaction\030\005 \001(\014\022-\n\tread"
+          + "_time\030\007 \001(\0132\032.google.protobuf.Timestamp\""
+          + "\323\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_"
+          + "id\030\002 \001(\0132 .google.datastore.v1.Partition"
+          + "Id\0226\n\014read_options\030\001 \001(\0132 .google.datast"
+          + "ore.v1.ReadOptions\022+\n\005query\030\003 \001(\0132\032.goog"
+          + "le.datastore.v1.QueryH\000\0222\n\tgql_query\030\007 \001"
+          + "(\0132\035.google.datastore.v1.GqlQueryH\000\0222\n\004m"
+          + "ode\030\013 \001(\0162\036.google.datastore.v1.QueryMod"
+          + "eB\004\342A\001\001B\014\n\nquery_type\"\274\001\n\020RunQueryRespon"
+          + "se\0224\n\005batch\030\001 \001(\0132%.google.datastore.v1."
+          + "QueryResultBatch\022)\n\005query\030\002 \001(\0132\032.google"
+          + ".datastore.v1.Query\022\023\n\013transaction\030\005 \001(\014"
+          + "\0222\n\005stats\030\006 \001(\0132#.google.datastore.v1.Re"
+          + "sultSetStats\"\365\002\n\032RunAggregationQueryRequ"
           + "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"
+          + "e_id\030\t \001(\t\0226\n\014partition_id\030\002 \001(\0132 .googl"
+          + "e.datastore.v1.PartitionId\0226\n\014read_optio"
+          + "ns\030\001 \001(\0132 .google.datastore.v1.ReadOptio"
+          + "ns\022B\n\021aggregation_query\030\003 \001(\0132%.google.d"
+          + "atastore.v1.AggregationQueryH\000\0222\n\tgql_qu"
+          + "ery\030\007 \001(\0132\035.google.datastore.v1.GqlQuery"
+          + "H\000\0222\n\004mode\030\n \001(\0162\036.google.datastore.v1.Q"
+          + "ueryModeB\004\342A\001\001B\014\n\nquery_type\"\330\001\n\033RunAggr"
+          + "egationQueryResponse\022:\n\005batch\030\001 \001(\0132+.go"
+          + "ogle.datastore.v1.AggregationResultBatch"
+          + "\0224\n\005query\030\002 \001(\0132%.google.datastore.v1.Ag"
+          + "gregationQuery\022\023\n\013transaction\030\005 \001(\014\0222\n\005s"
+          + "tats\030\006 \001(\0132#.google.datastore.v1.ResultS"
+          + "etStats\"\216\001\n\027BeginTransactionRequest\022\030\n\np"
+          + "roject_id\030\010 \001(\tB\004\342A\001\002\022\023\n\013database_id\030\t \001"
+          + "(\t\022D\n\023transaction_options\030\n \001(\0132\'.google"
+          + ".datastore.v1.TransactionOptions\"/\n\030Begi"
+          + "nTransactionResponse\022\023\n\013transaction\030\001 \001("
+          + "\014\"[\n\017RollbackRequest\022\030\n\nproject_id\030\010 \001(\t"
+          + "B\004\342A\001\002\022\023\n\013database_id\030\t \001(\t\022\031\n\013transacti"
+          + "on\030\001 \001(\014B\004\342A\001\002\"\022\n\020RollbackResponse\"\351\002\n\rC"
+          + "ommitRequest\022\030\n\nproject_id\030\010 \001(\tB\004\342A\001\002\022\023"
+          + "\n\013database_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.goog"
+          + "le.datastore.v1.CommitRequest.Mode\022\025\n\013tr"
+          + "ansaction\030\001 \001(\014H\000\022I\n\026single_use_transact"
+          + "ion\030\n \001(\0132\'.google.datastore.v1.Transact"
+          + "ionOptionsH\000\0220\n\tmutations\030\006 \003(\0132\035.google"
+          + ".datastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_U"
+          + "NSPECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_T"
+          + "RANSACTIONAL\020\002B\026\n\024transaction_selector\"\227"
+          + "\001\n\016CommitResponse\022=\n\020mutation_results\030\003 "
+          + "\003(\0132#.google.datastore.v1.MutationResult"
+          + "\022\025\n\rindex_updates\030\004 \001(\005\022/\n\013commit_time\030\010"
+          + " \001(\0132\032.google.protobuf.Timestamp\"q\n\022Allo"
+          + "cateIdsRequest\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.go"
+          + "ogle.datastore.v1.KeyB\004\342A\001\002\"=\n\023AllocateI"
+          + "dsResponse\022&\n\004keys\030\001 \003(\0132\030.google.datast"
+          + "ore.v1.Key\"p\n\021ReserveIdsRequest\022\030\n\nproje"
+          + "ct_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\022ReserveIdsResponse\"\272\002\n\010Mutation\022"
+          + "-\n\006insert\030\004 \001(\0132\033.google.datastore.v1.En"
+          + "tityH\000\022-\n\006update\030\005 \001(\0132\033.google.datastor"
+          + "e.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.d"
+          + "atastore.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.g"
+          + "oogle.datastore.v1.KeyH\000\022\026\n\014base_version"
+          + "\030\010 \001(\003H\001\0221\n\013update_time\030\013 \001(\0132\032.google.p"
+          + "rotobuf.TimestampH\001B\013\n\toperationB\035\n\033conf"
+          + "lict_detection_strategy\"\305\001\n\016MutationResu"
+          + "lt\022%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Ke"
+          + "y\022\017\n\007version\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132"
+          + "\032.google.protobuf.Timestamp\022/\n\013update_ti"
+          + "me\030\006 \001(\0132\032.google.protobuf.Timestamp\022\031\n\021"
+          + "conflict_detected\030\005 \001(\010\"\312\002\n\013ReadOptions\022"
+          + "L\n\020read_consistency\030\001 \001(\01620.google.datas"
+          + "tore.v1.ReadOptions.ReadConsistencyH\000\022\025\n"
+          + "\013transaction\030\002 \001(\014H\000\022B\n\017new_transaction\030"
+          + "\003 \001(\0132\'.google.datastore.v1.TransactionO"
+          + "ptionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.pro"
+          + "tobuf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034"
+          + "READ_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG"
+          + "\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n"
+          + "\022TransactionOptions\022G\n\nread_write\030\001 \001(\0132"
+          + "1.google.datastore.v1.TransactionOptions"
+          + ".ReadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google"
+          + ".datastore.v1.TransactionOptions.ReadOnl"
+          + "yH\000\032)\n\tReadWrite\022\034\n\024previous_transaction"
+          + "\030\001 \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032."
+          + "google.protobuf.TimestampB\006\n\004mode2\341\r\n\tDa"
+          + "tastore\022\300\001\n\006Lookup\022\".google.datastore.v1"
+          + ".LookupRequest\032#.google.datastore.v1.Loo"
+          + "kupResponse\"m\332A\034project_id,read_options,"
+          + "keys\202\323\344\223\002%\" /v1/projects/{project_id}:lo"
+          + "okup:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_"
+          + "id\022\251\001\n\010RunQuery\022$.google.datastore.v1.Ru"
+          + "nQueryRequest\032%.google.datastore.v1.RunQ"
+          + "ueryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{proj"
+          + "ect_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022"
+          + "\r\n\013database_id\022\325\001\n\023RunAggregationQuery\022/"
           + ".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\022\302\001\n\010Roll"
-          + "back\022$.google.datastore.v1.RollbackReque"
-          + "st\032%.google.datastore.v1.RollbackRespons"
-          + "e\"i\332A\026project_id,transaction\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\022\307\001\n\013Allocat"
-          + "eIds\022\'.google.datastore.v1.AllocateIdsRe"
-          + "quest\032(.google.datastore.v1.AllocateIdsR"
-          + "esponse\"e\332A\017project_id,keys\202\323\344\223\002*\"%/v1/p"
-          + "rojects/{project_id}:allocateIds:\001*\212\323\344\223\002"
-          + "\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001\n\nReser"
-          + "veIds\022&.google.datastore.v1.ReserveIdsRe"
-          + "quest\032\'.google.datastore.v1.ReserveIdsRe"
-          + "sponse\"d\332A\017project_id,keys\202\323\344\223\002)\"$/v1/pr"
-          + "ojects/{project_id}:reserveIds:\001*\212\323\344\223\002\035\022"
-          + "\014\n\nproject_id\022\r\n\013database_id\032v\312A\030datasto"
-          + "re.googleapis.com\322AXhttps://www.googleap"
-          + "is.com/auth/cloud-platform,https://www.g"
-          + "oogleapis.com/auth/datastoreB\300\001\n\027com.goo"
-          + "gle.datastore.v1B\016DatastoreProtoP\001Z
+ * The mode in which the query request must be processed.
+ * 
    
+ *
+ * Protobuf enum {@code google.datastore.v1.QueryMode}
+ */
+public enum QueryMode implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   *
+   *
+   * 
    +   * The default mode. Only the query results are returned.
+   * 
    
+   *
+   * NORMAL = 0;
+   */
+  NORMAL(0),
+  /**
+   *
+   *
+   * 
    +   * This mode returns only the query plan, without any results or execution
+   * statistics information.
+   * 
    
+   *
+   * PLAN = 1;
+   */
+  PLAN(1),
+  /**
+   *
+   *
+   * 
    +   * This mode returns both the query plan and the execution statistics along
+   * with the results.
+   * 
    
+   *
+   * PROFILE = 2;
+   */
+  PROFILE(2),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   *
+   *
+   * 
    +   * The default mode. Only the query results are returned.
+   * 
    
+   *
+   * NORMAL = 0;
+   */
+  public static final int NORMAL_VALUE = 0;
+  /**
+   *
+   *
+   * 
    +   * This mode returns only the query plan, without any results or execution
+   * statistics information.
+   * 
    
+   *
+   * PLAN = 1;
+   */
+  public static final int PLAN_VALUE = 1;
+  /**
+   *
+   *
+   * 
    +   * This mode returns both the query plan and the execution statistics along
+   * with the results.
+   * 
    
+   *
+   * PROFILE = 2;
+   */
+  public static final int PROFILE_VALUE = 2;
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static QueryMode valueOf(int value) {
+    return forNumber(value);
+  }
+
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   */
+  public static QueryMode forNumber(int value) {
+    switch (value) {
+      case 0:
+        return NORMAL;
+      case 1:
+        return PLAN;
+      case 2:
+        return PROFILE;
+      default:
+        return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    return internalValueMap;
+  }
+
+  private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+      new com.google.protobuf.Internal.EnumLiteMap() {
+        public QueryMode findValueByNumber(int number) {
+          return QueryMode.forNumber(number);
+        }
+      };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalStateException(
+          "Can't get the descriptor of an unrecognized enum value.");
+    }
+    return getDescriptor().getValues().get(ordinal());
+  }
+
+  public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    return getDescriptor();
+  }
+
+  public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProfileProto.getDescriptor().getEnumTypes().get(0);
+  }
+
+  private static final QueryMode[] VALUES = values();
+
+  public static QueryMode valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private QueryMode(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.datastore.v1.QueryMode)
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java
new file mode 100644
index 000000000000..fd9fc921e1ba
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java
@@ -0,0 +1,777 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * Plan for the query.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.QueryPlan}
+ */
+public final class QueryPlan extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.QueryPlan)
+    QueryPlanOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use QueryPlan.newBuilder() to construct.
+  private QueryPlan(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private QueryPlan() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new QueryPlan();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_QueryPlan_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_QueryPlan_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.QueryPlan.class,
+            com.google.datastore.v1.QueryPlan.Builder.class);
+  }
+
+  public static final int PLAN_INFO_FIELD_NUMBER = 1;
+  private com.google.protobuf.Struct planInfo_;
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query. It will include:
+   *
+   * {
+   *   "indexes_used": [
+   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *   ]
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct plan_info = 1;
+   *
+   * @return Whether the planInfo field is set.
+   */
+  @java.lang.Override
+  public boolean hasPlanInfo() {
+    return planInfo_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query. It will include:
+   *
+   * {
+   *   "indexes_used": [
+   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *   ]
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct plan_info = 1;
+   *
+   * @return The planInfo.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Struct getPlanInfo() {
+    return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query. It will include:
+   *
+   * {
+   *   "indexes_used": [
+   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *   ]
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct plan_info = 1;
+   */
+  @java.lang.Override
+  public com.google.protobuf.StructOrBuilder getPlanInfoOrBuilder() {
+    return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (planInfo_ != null) {
+      output.writeMessage(1, getPlanInfo());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (planInfo_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPlanInfo());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.QueryPlan)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.QueryPlan other = (com.google.datastore.v1.QueryPlan) obj;
+
+    if (hasPlanInfo() != other.hasPlanInfo()) return false;
+    if (hasPlanInfo()) {
+      if (!getPlanInfo().equals(other.getPlanInfo())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasPlanInfo()) {
+      hash = (37 * hash) + PLAN_INFO_FIELD_NUMBER;
+      hash = (53 * hash) + getPlanInfo().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.QueryPlan parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.QueryPlan prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Plan for the query.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.QueryPlan}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.QueryPlan)
+      com.google.datastore.v1.QueryPlanOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_QueryPlan_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_QueryPlan_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.QueryPlan.class,
+              com.google.datastore.v1.QueryPlan.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.QueryPlan.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      planInfo_ = null;
+      if (planInfoBuilder_ != null) {
+        planInfoBuilder_.dispose();
+        planInfoBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_QueryPlan_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.QueryPlan getDefaultInstanceForType() {
+      return com.google.datastore.v1.QueryPlan.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.QueryPlan build() {
+      com.google.datastore.v1.QueryPlan result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.QueryPlan buildPartial() {
+      com.google.datastore.v1.QueryPlan result = new com.google.datastore.v1.QueryPlan(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.QueryPlan result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.planInfo_ = planInfoBuilder_ == null ? planInfo_ : planInfoBuilder_.build();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.QueryPlan) {
+        return mergeFrom((com.google.datastore.v1.QueryPlan) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.QueryPlan other) {
+      if (other == com.google.datastore.v1.QueryPlan.getDefaultInstance()) return this;
+      if (other.hasPlanInfo()) {
+        mergePlanInfo(other.getPlanInfo());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getPlanInfoFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.protobuf.Struct planInfo_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        planInfoBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     *
+     * @return Whether the planInfo field is set.
+     */
+    public boolean hasPlanInfo() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     *
+     * @return The planInfo.
+     */
+    public com.google.protobuf.Struct getPlanInfo() {
+      if (planInfoBuilder_ == null) {
+        return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
+      } else {
+        return planInfoBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     */
+    public Builder setPlanInfo(com.google.protobuf.Struct value) {
+      if (planInfoBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        planInfo_ = value;
+      } else {
+        planInfoBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     */
+    public Builder setPlanInfo(com.google.protobuf.Struct.Builder builderForValue) {
+      if (planInfoBuilder_ == null) {
+        planInfo_ = builderForValue.build();
+      } else {
+        planInfoBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     */
+    public Builder mergePlanInfo(com.google.protobuf.Struct value) {
+      if (planInfoBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)
+            && planInfo_ != null
+            && planInfo_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getPlanInfoBuilder().mergeFrom(value);
+        } else {
+          planInfo_ = value;
+        }
+      } else {
+        planInfoBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     */
+    public Builder clearPlanInfo() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      planInfo_ = null;
+      if (planInfoBuilder_ != null) {
+        planInfoBuilder_.dispose();
+        planInfoBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     */
+    public com.google.protobuf.Struct.Builder getPlanInfoBuilder() {
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return getPlanInfoFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     */
+    public com.google.protobuf.StructOrBuilder getPlanInfoOrBuilder() {
+      if (planInfoBuilder_ != null) {
+        return planInfoBuilder_.getMessageOrBuilder();
+      } else {
+        return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query. It will include:
+     *
+     * {
+     *   "indexes_used": [
+     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *   ]
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct plan_info = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        getPlanInfoFieldBuilder() {
+      if (planInfoBuilder_ == null) {
+        planInfoBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Struct,
+                com.google.protobuf.Struct.Builder,
+                com.google.protobuf.StructOrBuilder>(
+                getPlanInfo(), getParentForChildren(), isClean());
+        planInfo_ = null;
+      }
+      return planInfoBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.QueryPlan)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.QueryPlan)
+  private static final com.google.datastore.v1.QueryPlan DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.QueryPlan();
+  }
+
+  public static com.google.datastore.v1.QueryPlan getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public QueryPlan parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.QueryPlan getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java
new file mode 100644
index 000000000000..dc993225e273
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+package com.google.datastore.v1;
+
+public interface QueryPlanOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.QueryPlan)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query. It will include:
+   *
+   * {
+   *   "indexes_used": [
+   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *   ]
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct plan_info = 1;
+   *
+   * @return Whether the planInfo field is set.
+   */
+  boolean hasPlanInfo();
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query. It will include:
+   *
+   * {
+   *   "indexes_used": [
+   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *   ]
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct plan_info = 1;
+   *
+   * @return The planInfo.
+   */
+  com.google.protobuf.Struct getPlanInfo();
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query. It will include:
+   *
+   * {
+   *   "indexes_used": [
+   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *   ]
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct plan_info = 1;
+   */
+  com.google.protobuf.StructOrBuilder getPlanInfoOrBuilder();
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
new file mode 100644
index 000000000000..cf0be47e676e
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+package com.google.datastore.v1;
+
+public final class QueryProfileProto {
+  private QueryProfileProto() {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_QueryPlan_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_QueryPlan_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_ResultSetStats_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ResultSetStats_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+    return descriptor;
+  }
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\'google/datastore/v1/query_profile.prot"
+          + "o\022\023google.datastore.v1\032\034google/protobuf/"
+          + "struct.proto\"7\n\tQueryPlan\022*\n\tplan_info\030\001"
+          + " \001(\0132\027.google.protobuf.Struct\"r\n\016ResultS"
+          + "etStats\0222\n\nquery_plan\030\001 \001(\0132\036.google.dat"
+          + "astore.v1.QueryPlan\022,\n\013query_stats\030\002 \001(\013"
+          + "2\027.google.protobuf.Struct*.\n\tQueryMode\022\n"
+          + "\n\006NORMAL\020\000\022\010\n\004PLAN\020\001\022\013\n\007PROFILE\020\002B\303\001\n\027co"
+          + "m.google.datastore.v1B\021QueryProfileProto"
+          + "P\001Z
+ * Planning and execution statistics for the query.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.ResultSetStats}
+ */
+public final class ResultSetStats extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.ResultSetStats)
+    ResultSetStatsOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ResultSetStats.newBuilder() to construct.
+  private ResultSetStats(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ResultSetStats() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ResultSetStats();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ResultSetStats_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ResultSetStats_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.ResultSetStats.class,
+            com.google.datastore.v1.ResultSetStats.Builder.class);
+  }
+
+  public static final int QUERY_PLAN_FIELD_NUMBER = 1;
+  private com.google.datastore.v1.QueryPlan queryPlan_;
+  /**
+   *
+   *
+   * 
    +   * Plan for the query.
+   * 
    
+   *
+   * .google.datastore.v1.QueryPlan query_plan = 1;
+   *
+   * @return Whether the queryPlan field is set.
+   */
+  @java.lang.Override
+  public boolean hasQueryPlan() {
+    return queryPlan_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Plan for the query.
+   * 
    
+   *
+   * .google.datastore.v1.QueryPlan query_plan = 1;
+   *
+   * @return The queryPlan.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.QueryPlan getQueryPlan() {
+    return queryPlan_ == null ? com.google.datastore.v1.QueryPlan.getDefaultInstance() : queryPlan_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Plan for the query.
+   * 
    
+   *
+   * .google.datastore.v1.QueryPlan query_plan = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
+    return queryPlan_ == null ? com.google.datastore.v1.QueryPlan.getDefaultInstance() : queryPlan_;
+  }
+
+  public static final int QUERY_STATS_FIELD_NUMBER = 2;
+  private com.google.protobuf.Struct queryStats_;
+  /**
+   *
+   *
+   * 
    +   * Aggregated statistics from the execution of the query.
+   *
+   * This will only be present when the request specifies `PROFILE` mode.
+   * For example, a query will return the statistics including:
+   *
+   * {
+   *   "results_returned": "20",
+   *   "documents_scanned": "20",
+   *   "indexes_entries_scanned": "10050",
+   *   "total_execution_time": "100.7 msecs"
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct query_stats = 2;
+   *
+   * @return Whether the queryStats field is set.
+   */
+  @java.lang.Override
+  public boolean hasQueryStats() {
+    return queryStats_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Aggregated statistics from the execution of the query.
+   *
+   * This will only be present when the request specifies `PROFILE` mode.
+   * For example, a query will return the statistics including:
+   *
+   * {
+   *   "results_returned": "20",
+   *   "documents_scanned": "20",
+   *   "indexes_entries_scanned": "10050",
+   *   "total_execution_time": "100.7 msecs"
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct query_stats = 2;
+   *
+   * @return The queryStats.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Struct getQueryStats() {
+    return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Aggregated statistics from the execution of the query.
+   *
+   * This will only be present when the request specifies `PROFILE` mode.
+   * For example, a query will return the statistics including:
+   *
+   * {
+   *   "results_returned": "20",
+   *   "documents_scanned": "20",
+   *   "indexes_entries_scanned": "10050",
+   *   "total_execution_time": "100.7 msecs"
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct query_stats = 2;
+   */
+  @java.lang.Override
+  public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
+    return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (queryPlan_ != null) {
+      output.writeMessage(1, getQueryPlan());
+    }
+    if (queryStats_ != null) {
+      output.writeMessage(2, getQueryStats());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (queryPlan_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getQueryPlan());
+    }
+    if (queryStats_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQueryStats());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.ResultSetStats)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.ResultSetStats other = (com.google.datastore.v1.ResultSetStats) obj;
+
+    if (hasQueryPlan() != other.hasQueryPlan()) return false;
+    if (hasQueryPlan()) {
+      if (!getQueryPlan().equals(other.getQueryPlan())) return false;
+    }
+    if (hasQueryStats() != other.hasQueryStats()) return false;
+    if (hasQueryStats()) {
+      if (!getQueryStats().equals(other.getQueryStats())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasQueryPlan()) {
+      hash = (37 * hash) + QUERY_PLAN_FIELD_NUMBER;
+      hash = (53 * hash) + getQueryPlan().hashCode();
+    }
+    if (hasQueryStats()) {
+      hash = (37 * hash) + QUERY_STATS_FIELD_NUMBER;
+      hash = (53 * hash) + getQueryStats().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ResultSetStats parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.ResultSetStats prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Planning and execution statistics for the query.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.ResultSetStats}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.ResultSetStats)
+      com.google.datastore.v1.ResultSetStatsOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ResultSetStats_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ResultSetStats_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.ResultSetStats.class,
+              com.google.datastore.v1.ResultSetStats.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.ResultSetStats.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      queryPlan_ = null;
+      if (queryPlanBuilder_ != null) {
+        queryPlanBuilder_.dispose();
+        queryPlanBuilder_ = null;
+      }
+      queryStats_ = null;
+      if (queryStatsBuilder_ != null) {
+        queryStatsBuilder_.dispose();
+        queryStatsBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ResultSetStats_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ResultSetStats getDefaultInstanceForType() {
+      return com.google.datastore.v1.ResultSetStats.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ResultSetStats build() {
+      com.google.datastore.v1.ResultSetStats result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ResultSetStats buildPartial() {
+      com.google.datastore.v1.ResultSetStats result =
+          new com.google.datastore.v1.ResultSetStats(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.ResultSetStats result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.queryPlan_ = queryPlanBuilder_ == null ? queryPlan_ : queryPlanBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryStats_ = queryStatsBuilder_ == null ? queryStats_ : queryStatsBuilder_.build();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.ResultSetStats) {
+        return mergeFrom((com.google.datastore.v1.ResultSetStats) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.ResultSetStats other) {
+      if (other == com.google.datastore.v1.ResultSetStats.getDefaultInstance()) return this;
+      if (other.hasQueryPlan()) {
+        mergeQueryPlan(other.getQueryPlan());
+      }
+      if (other.hasQueryStats()) {
+        mergeQueryStats(other.getQueryStats());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getQueryPlanFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getQueryStatsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.datastore.v1.QueryPlan queryPlan_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.QueryPlan,
+            com.google.datastore.v1.QueryPlan.Builder,
+            com.google.datastore.v1.QueryPlanOrBuilder>
+        queryPlanBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     *
+     * @return Whether the queryPlan field is set.
+     */
+    public boolean hasQueryPlan() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     *
+     * @return The queryPlan.
+     */
+    public com.google.datastore.v1.QueryPlan getQueryPlan() {
+      if (queryPlanBuilder_ == null) {
+        return queryPlan_ == null
+            ? com.google.datastore.v1.QueryPlan.getDefaultInstance()
+            : queryPlan_;
+      } else {
+        return queryPlanBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     */
+    public Builder setQueryPlan(com.google.datastore.v1.QueryPlan value) {
+      if (queryPlanBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        queryPlan_ = value;
+      } else {
+        queryPlanBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     */
+    public Builder setQueryPlan(com.google.datastore.v1.QueryPlan.Builder builderForValue) {
+      if (queryPlanBuilder_ == null) {
+        queryPlan_ = builderForValue.build();
+      } else {
+        queryPlanBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     */
+    public Builder mergeQueryPlan(com.google.datastore.v1.QueryPlan value) {
+      if (queryPlanBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)
+            && queryPlan_ != null
+            && queryPlan_ != com.google.datastore.v1.QueryPlan.getDefaultInstance()) {
+          getQueryPlanBuilder().mergeFrom(value);
+        } else {
+          queryPlan_ = value;
+        }
+      } else {
+        queryPlanBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     */
+    public Builder clearQueryPlan() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      queryPlan_ = null;
+      if (queryPlanBuilder_ != null) {
+        queryPlanBuilder_.dispose();
+        queryPlanBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     */
+    public com.google.datastore.v1.QueryPlan.Builder getQueryPlanBuilder() {
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return getQueryPlanFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     */
+    public com.google.datastore.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
+      if (queryPlanBuilder_ != null) {
+        return queryPlanBuilder_.getMessageOrBuilder();
+      } else {
+        return queryPlan_ == null
+            ? com.google.datastore.v1.QueryPlan.getDefaultInstance()
+            : queryPlan_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Plan for the query.
+     * 
    
+     *
+     * .google.datastore.v1.QueryPlan query_plan = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.QueryPlan,
+            com.google.datastore.v1.QueryPlan.Builder,
+            com.google.datastore.v1.QueryPlanOrBuilder>
+        getQueryPlanFieldBuilder() {
+      if (queryPlanBuilder_ == null) {
+        queryPlanBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.QueryPlan,
+                com.google.datastore.v1.QueryPlan.Builder,
+                com.google.datastore.v1.QueryPlanOrBuilder>(
+                getQueryPlan(), getParentForChildren(), isClean());
+        queryPlan_ = null;
+      }
+      return queryPlanBuilder_;
+    }
+
+    private com.google.protobuf.Struct queryStats_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        queryStatsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     *
+     * @return Whether the queryStats field is set.
+     */
+    public boolean hasQueryStats() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     *
+     * @return The queryStats.
+     */
+    public com.google.protobuf.Struct getQueryStats() {
+      if (queryStatsBuilder_ == null) {
+        return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
+      } else {
+        return queryStatsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     */
+    public Builder setQueryStats(com.google.protobuf.Struct value) {
+      if (queryStatsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        queryStats_ = value;
+      } else {
+        queryStatsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     */
+    public Builder setQueryStats(com.google.protobuf.Struct.Builder builderForValue) {
+      if (queryStatsBuilder_ == null) {
+        queryStats_ = builderForValue.build();
+      } else {
+        queryStatsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     */
+    public Builder mergeQueryStats(com.google.protobuf.Struct value) {
+      if (queryStatsBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryStats_ != null
+            && queryStats_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getQueryStatsBuilder().mergeFrom(value);
+        } else {
+          queryStats_ = value;
+        }
+      } else {
+        queryStatsBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     */
+    public Builder clearQueryStats() {
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryStats_ = null;
+      if (queryStatsBuilder_ != null) {
+        queryStatsBuilder_.dispose();
+        queryStatsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     */
+    public com.google.protobuf.Struct.Builder getQueryStatsBuilder() {
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return getQueryStatsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     */
+    public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
+      if (queryStatsBuilder_ != null) {
+        return queryStatsBuilder_.getMessageOrBuilder();
+      } else {
+        return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated statistics from the execution of the query.
+     *
+     * This will only be present when the request specifies `PROFILE` mode.
+     * For example, a query will return the statistics including:
+     *
+     * {
+     *   "results_returned": "20",
+     *   "documents_scanned": "20",
+     *   "indexes_entries_scanned": "10050",
+     *   "total_execution_time": "100.7 msecs"
+     * }
+     * 
    
+     *
+     * .google.protobuf.Struct query_stats = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        getQueryStatsFieldBuilder() {
+      if (queryStatsBuilder_ == null) {
+        queryStatsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Struct,
+                com.google.protobuf.Struct.Builder,
+                com.google.protobuf.StructOrBuilder>(
+                getQueryStats(), getParentForChildren(), isClean());
+        queryStats_ = null;
+      }
+      return queryStatsBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.ResultSetStats)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.ResultSetStats)
+  private static final com.google.datastore.v1.ResultSetStats DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.ResultSetStats();
+  }
+
+  public static com.google.datastore.v1.ResultSetStats getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ResultSetStats parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.ResultSetStats getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
new file mode 100644
index 000000000000..16a95141911b
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2023 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+package com.google.datastore.v1;
+
+public interface ResultSetStatsOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.ResultSetStats)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Plan for the query.
+   * 
    
+   *
+   * .google.datastore.v1.QueryPlan query_plan = 1;
+   *
+   * @return Whether the queryPlan field is set.
+   */
+  boolean hasQueryPlan();
+  /**
+   *
+   *
+   * 
    +   * Plan for the query.
+   * 
    
+   *
+   * .google.datastore.v1.QueryPlan query_plan = 1;
+   *
+   * @return The queryPlan.
+   */
+  com.google.datastore.v1.QueryPlan getQueryPlan();
+  /**
+   *
+   *
+   * 
    +   * Plan for the query.
+   * 
    
+   *
+   * .google.datastore.v1.QueryPlan query_plan = 1;
+   */
+  com.google.datastore.v1.QueryPlanOrBuilder getQueryPlanOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Aggregated statistics from the execution of the query.
+   *
+   * This will only be present when the request specifies `PROFILE` mode.
+   * For example, a query will return the statistics including:
+   *
+   * {
+   *   "results_returned": "20",
+   *   "documents_scanned": "20",
+   *   "indexes_entries_scanned": "10050",
+   *   "total_execution_time": "100.7 msecs"
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct query_stats = 2;
+   *
+   * @return Whether the queryStats field is set.
+   */
+  boolean hasQueryStats();
+  /**
+   *
+   *
+   * 
    +   * Aggregated statistics from the execution of the query.
+   *
+   * This will only be present when the request specifies `PROFILE` mode.
+   * For example, a query will return the statistics including:
+   *
+   * {
+   *   "results_returned": "20",
+   *   "documents_scanned": "20",
+   *   "indexes_entries_scanned": "10050",
+   *   "total_execution_time": "100.7 msecs"
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct query_stats = 2;
+   *
+   * @return The queryStats.
+   */
+  com.google.protobuf.Struct getQueryStats();
+  /**
+   *
+   *
+   * 
    +   * Aggregated statistics from the execution of the query.
+   *
+   * This will only be present when the request specifies `PROFILE` mode.
+   * For example, a query will return the statistics including:
+   *
+   * {
+   *   "results_returned": "20",
+   *   "documents_scanned": "20",
+   *   "indexes_entries_scanned": "10050",
+   *   "total_execution_time": "100.7 msecs"
+   * }
+   * 
    
+   *
+   * .google.protobuf.Struct query_stats = 2;
+   */
+  com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder();
+}
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 434acb2c32b8..12e9bf63c4d1 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
@@ -41,6 +41,7 @@ private RunAggregationQueryRequest(com.google.protobuf.GeneratedMessageV3.Builde
   private RunAggregationQueryRequest() {
     projectId_ = "";
     databaseId_ = "";
+    mode_ = 0;
   }
 
   @java.lang.Override
@@ -432,6 +433,46 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
+  public static final int MODE_FIELD_NUMBER = 10;
+  private int mode_ = 0;
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The enum numeric value on the wire for mode.
+   */
+  @java.lang.Override
+  public int getModeValue() {
+    return mode_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The mode.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.QueryMode getMode() {
+    com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
+    return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -464,6 +505,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
+    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
+      output.writeEnum(10, mode_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -495,6 +539,9 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
+    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(10, mode_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -521,6 +568,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
+    if (mode_ != other.mode_) return false;
     if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
@@ -555,6 +603,8 @@ public int hashCode() {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
     }
+    hash = (37 * hash) + MODE_FIELD_NUMBER;
+    hash = (53 * hash) + mode_;
     switch (queryTypeCase_) {
       case 3:
         hash = (37 * hash) + AGGREGATION_QUERY_FIELD_NUMBER;
@@ -725,6 +775,7 @@ public Builder clear() {
       if (gqlQueryBuilder_ != null) {
         gqlQueryBuilder_.clear();
       }
+      mode_ = 0;
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -778,6 +829,9 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryRequest re
         result.readOptions_ =
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
       }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.mode_ = mode_;
+      }
     }
 
     private void buildPartialOneofs(com.google.datastore.v1.RunAggregationQueryRequest result) {
@@ -853,6 +907,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryRequest othe
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
+      if (other.mode_ != 0) {
+        setModeValue(other.getModeValue());
+      }
       switch (other.getQueryTypeCase()) {
         case AGGREGATION_QUERY:
           {
@@ -932,6 +989,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000002;
                 break;
               } // case 74
+            case 80:
+              {
+                mode_ = input.readEnum();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 80
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -2000,6 +2063,110 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       return gqlQueryBuilder_;
     }
 
+    private int mode_ = 0;
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The enum numeric value on the wire for mode.
+     */
+    @java.lang.Override
+    public int getModeValue() {
+      return mode_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @param value The enum numeric value on the wire for mode to set.
+     * @return This builder for chaining.
+     */
+    public Builder setModeValue(int value) {
+      mode_ = value;
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The mode.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.QueryMode getMode() {
+      com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
+      return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @param value The mode to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMode(com.google.datastore.v1.QueryMode value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      bitField0_ |= 0x00000040;
+      mode_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearMode() {
+      bitField0_ = (bitField0_ & ~0x00000040);
+      mode_ = 0;
+      onChanged();
+      return this;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 cd3bd4435ca9..6d86f29034fd 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
@@ -228,5 +228,36 @@ public interface RunAggregationQueryRequestOrBuilder
    */
   com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The enum numeric value on the wire for mode.
+   */
+  int getModeValue();
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The mode.
+   */
+  com.google.datastore.v1.QueryMode getMode();
+
   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 cb94cb231866..328afcfdf375 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
@@ -183,6 +183,61 @@ public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
 
+  public static final int STATS_FIELD_NUMBER = 6;
+  private com.google.datastore.v1.ResultSetStats stats_;
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return Whether the stats field is set.
+   */
+  @java.lang.Override
+  public boolean hasStats() {
+    return stats_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return The stats.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ResultSetStats getStats() {
+    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -206,6 +261,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(5, transaction_);
     }
+    if (stats_ != null) {
+      output.writeMessage(6, getStats());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -224,6 +282,9 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
     }
+    if (stats_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getStats());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -249,6 +310,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
     if (!getTransaction().equals(other.getTransaction())) return false;
+    if (hasStats() != other.hasStats()) return false;
+    if (hasStats()) {
+      if (!getStats().equals(other.getStats())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -270,6 +335,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
+    if (hasStats()) {
+      hash = (37 * hash) + STATS_FIELD_NUMBER;
+      hash = (53 * hash) + getStats().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -421,6 +490,11 @@ public Builder clear() {
         queryBuilder_ = null;
       }
       transaction_ = com.google.protobuf.ByteString.EMPTY;
+      stats_ = null;
+      if (statsBuilder_ != null) {
+        statsBuilder_.dispose();
+        statsBuilder_ = null;
+      }
       return this;
     }
 
@@ -466,6 +540,9 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryResponse r
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -523,6 +600,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryResponse oth
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
+      if (other.hasStats()) {
+        mergeStats(other.getStats());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -567,6 +647,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 42
+            case 50:
+              {
+                input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 50
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1026,6 +1112,216 @@ public Builder clearTransaction() {
       return this;
     }
 
+    private com.google.datastore.v1.ResultSetStats stats_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ResultSetStats,
+            com.google.datastore.v1.ResultSetStats.Builder,
+            com.google.datastore.v1.ResultSetStatsOrBuilder>
+        statsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     *
+     * @return Whether the stats field is set.
+     */
+    public boolean hasStats() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     *
+     * @return The stats.
+     */
+    public com.google.datastore.v1.ResultSetStats getStats() {
+      if (statsBuilder_ == null) {
+        return stats_ == null
+            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
+            : stats_;
+      } else {
+        return statsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder setStats(com.google.datastore.v1.ResultSetStats value) {
+      if (statsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        stats_ = value;
+      } else {
+        statsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder setStats(com.google.datastore.v1.ResultSetStats.Builder builderForValue) {
+      if (statsBuilder_ == null) {
+        stats_ = builderForValue.build();
+      } else {
+        statsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder mergeStats(com.google.datastore.v1.ResultSetStats value) {
+      if (statsBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && stats_ != null
+            && stats_ != com.google.datastore.v1.ResultSetStats.getDefaultInstance()) {
+          getStatsBuilder().mergeFrom(value);
+        } else {
+          stats_ = value;
+        }
+      } else {
+        statsBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder clearStats() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      stats_ = null;
+      if (statsBuilder_ != null) {
+        statsBuilder_.dispose();
+        statsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public com.google.datastore.v1.ResultSetStats.Builder getStatsBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getStatsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+      if (statsBuilder_ != null) {
+        return statsBuilder_.getMessageOrBuilder();
+      } else {
+        return stats_ == null
+            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
+            : stats_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ResultSetStats,
+            com.google.datastore.v1.ResultSetStats.Builder,
+            com.google.datastore.v1.ResultSetStatsOrBuilder>
+        getStatsFieldBuilder() {
+      if (statsBuilder_ == null) {
+        statsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ResultSetStats,
+                com.google.datastore.v1.ResultSetStats.Builder,
+                com.google.datastore.v1.ResultSetStatsOrBuilder>(
+                getStats(), getParentForChildren(), isClean());
+        stats_ = null;
+      }
+      return statsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 bb9a1b934778..6caa14766bef 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
@@ -111,4 +111,48 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
+
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return Whether the stats field is set.
+   */
+  boolean hasStats();
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return The stats.
+   */
+  com.google.datastore.v1.ResultSetStats getStats();
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   */
+  com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
 }
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 123ca51778e2..62666648cb51 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
@@ -40,6 +40,7 @@ private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builde
   private RunQueryRequest() {
     projectId_ = "";
     databaseId_ = "";
+    mode_ = 0;
   }
 
   @java.lang.Override
@@ -431,6 +432,46 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
+  public static final int MODE_FIELD_NUMBER = 11;
+  private int mode_ = 0;
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The enum numeric value on the wire for mode.
+   */
+  @java.lang.Override
+  public int getModeValue() {
+    return mode_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The mode.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.QueryMode getMode() {
+    com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
+    return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -463,6 +504,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
+    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
+      output.writeEnum(11, mode_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -494,6 +538,9 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
+    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(11, mode_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -519,6 +566,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
+    if (mode_ != other.mode_) return false;
     if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
@@ -553,6 +601,8 @@ public int hashCode() {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
     }
+    hash = (37 * hash) + MODE_FIELD_NUMBER;
+    hash = (53 * hash) + mode_;
     switch (queryTypeCase_) {
       case 3:
         hash = (37 * hash) + QUERY_FIELD_NUMBER;
@@ -722,6 +772,7 @@ public Builder clear() {
       if (gqlQueryBuilder_ != null) {
         gqlQueryBuilder_.clear();
       }
+      mode_ = 0;
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -775,6 +826,9 @@ private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) {
         result.readOptions_ =
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
       }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.mode_ = mode_;
+      }
     }
 
     private void buildPartialOneofs(com.google.datastore.v1.RunQueryRequest result) {
@@ -849,6 +903,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
+      if (other.mode_ != 0) {
+        setModeValue(other.getModeValue());
+      }
       switch (other.getQueryTypeCase()) {
         case QUERY:
           {
@@ -927,6 +984,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000002;
                 break;
               } // case 74
+            case 88:
+              {
+                mode_ = input.readEnum();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 88
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1991,6 +2054,110 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       return gqlQueryBuilder_;
     }
 
+    private int mode_ = 0;
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The enum numeric value on the wire for mode.
+     */
+    @java.lang.Override
+    public int getModeValue() {
+      return mode_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @param value The enum numeric value on the wire for mode to set.
+     * @return This builder for chaining.
+     */
+    public Builder setModeValue(int value) {
+      mode_ = value;
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The mode.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.QueryMode getMode() {
+      com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
+      return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @param value The mode to set.
+     * @return This builder for chaining.
+     */
+    public Builder setMode(com.google.datastore.v1.QueryMode value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      bitField0_ |= 0x00000040;
+      mode_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The mode in which the query request is processed. This field is
+     * optional, and when not provided, it defaults to `NORMAL` mode where no
+     * additional statistics will be returned with the query results.
+     * 
    
+     *
+     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearMode() {
+      bitField0_ = (bitField0_ & ~0x00000040);
+      mode_ = 0;
+      onChanged();
+      return this;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 34f67c82216e..0f2184076351 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
@@ -228,5 +228,36 @@ public interface RunQueryRequestOrBuilder
    */
   com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The enum numeric value on the wire for mode.
+   */
+  int getModeValue();
+  /**
+   *
+   *
+   * 
    +   * Optional. The mode in which the query request is processed. This field is
+   * optional, and when not provided, it defaults to `NORMAL` mode where no
+   * additional statistics will be returned with the query results.
+   * 
    
+   *
+   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The mode.
+   */
+  com.google.datastore.v1.QueryMode getMode();
+
   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 ff387a929d1c..a9f585048c2c 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
@@ -179,6 +179,61 @@ public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
 
+  public static final int STATS_FIELD_NUMBER = 6;
+  private com.google.datastore.v1.ResultSetStats stats_;
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return Whether the stats field is set.
+   */
+  @java.lang.Override
+  public boolean hasStats() {
+    return stats_ != null;
+  }
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return The stats.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ResultSetStats getStats() {
+    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -202,6 +257,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(5, transaction_);
     }
+    if (stats_ != null) {
+      output.writeMessage(6, getStats());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -220,6 +278,9 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
     }
+    if (stats_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getStats());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -244,6 +305,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
     if (!getTransaction().equals(other.getTransaction())) return false;
+    if (hasStats() != other.hasStats()) return false;
+    if (hasStats()) {
+      if (!getStats().equals(other.getStats())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -265,6 +330,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
+    if (hasStats()) {
+      hash = (37 * hash) + STATS_FIELD_NUMBER;
+      hash = (53 * hash) + getStats().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -416,6 +485,11 @@ public Builder clear() {
         queryBuilder_ = null;
       }
       transaction_ = com.google.protobuf.ByteString.EMPTY;
+      stats_ = null;
+      if (statsBuilder_ != null) {
+        statsBuilder_.dispose();
+        statsBuilder_ = null;
+      }
       return this;
     }
 
@@ -461,6 +535,9 @@ private void buildPartial0(com.google.datastore.v1.RunQueryResponse result) {
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -517,6 +594,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) {
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
+      if (other.hasStats()) {
+        mergeStats(other.getStats());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -561,6 +641,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 42
+            case 50:
+              {
+                input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 50
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1015,6 +1101,216 @@ public Builder clearTransaction() {
       return this;
     }
 
+    private com.google.datastore.v1.ResultSetStats stats_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ResultSetStats,
+            com.google.datastore.v1.ResultSetStats.Builder,
+            com.google.datastore.v1.ResultSetStatsOrBuilder>
+        statsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     *
+     * @return Whether the stats field is set.
+     */
+    public boolean hasStats() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     *
+     * @return The stats.
+     */
+    public com.google.datastore.v1.ResultSetStats getStats() {
+      if (statsBuilder_ == null) {
+        return stats_ == null
+            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
+            : stats_;
+      } else {
+        return statsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder setStats(com.google.datastore.v1.ResultSetStats value) {
+      if (statsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        stats_ = value;
+      } else {
+        statsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder setStats(com.google.datastore.v1.ResultSetStats.Builder builderForValue) {
+      if (statsBuilder_ == null) {
+        stats_ = builderForValue.build();
+      } else {
+        statsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder mergeStats(com.google.datastore.v1.ResultSetStats value) {
+      if (statsBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && stats_ != null
+            && stats_ != com.google.datastore.v1.ResultSetStats.getDefaultInstance()) {
+          getStatsBuilder().mergeFrom(value);
+        } else {
+          stats_ = value;
+        }
+      } else {
+        statsBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public Builder clearStats() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      stats_ = null;
+      if (statsBuilder_ != null) {
+        statsBuilder_.dispose();
+        statsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public com.google.datastore.v1.ResultSetStats.Builder getStatsBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getStatsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+      if (statsBuilder_ != null) {
+        return statsBuilder_.getMessageOrBuilder();
+      } else {
+        return stats_ == null
+            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
+            : stats_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query plan and execution statistics. Note that the returned stats are
+     * subject to change as Firestore evolves.
+     *
+     * This is only present when the request specifies a mode other than `NORMAL`.
+     * 
    
+     *
+     * .google.datastore.v1.ResultSetStats stats = 6;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ResultSetStats,
+            com.google.datastore.v1.ResultSetStats.Builder,
+            com.google.datastore.v1.ResultSetStatsOrBuilder>
+        getStatsFieldBuilder() {
+      if (statsBuilder_ == null) {
+        statsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ResultSetStats,
+                com.google.datastore.v1.ResultSetStats.Builder,
+                com.google.datastore.v1.ResultSetStatsOrBuilder>(
+                getStats(), getParentForChildren(), isClean());
+        stats_ = null;
+      }
+      return statsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 5ec779273f52..bbd48b7b57af 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
@@ -111,4 +111,48 @@ public interface RunQueryResponseOrBuilder
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
+
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return Whether the stats field is set.
+   */
+  boolean hasStats();
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   *
+   * @return The stats.
+   */
+  com.google.datastore.v1.ResultSetStats getStats();
+  /**
+   *
+   *
+   * 
    +   * Query plan and execution statistics. Note that the returned stats are
+   * subject to change as Firestore evolves.
+   *
+   * This is only present when the request specifies a mode other than `NORMAL`.
+   * 
    
+   *
+   * .google.datastore.v1.ResultSetStats stats = 6;
+   */
+  com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
 }
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 533988d77765..476d48f02603 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
@@ -23,6 +23,7 @@ import "google/api/routing.proto";
 import "google/datastore/v1/aggregation_result.proto";
 import "google/datastore/v1/entity.proto";
 import "google/datastore/v1/query.proto";
+import "google/datastore/v1/query_profile.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.V1";
@@ -232,6 +233,11 @@ message RunQueryRequest {
     // The GQL query to run. This query must be a non-aggregation query.
     GqlQuery gql_query = 7;
   }
+
+  // Optional. The mode in which the query request is processed. This field is
+  // optional, and when not provided, it defaults to `NORMAL` mode where no
+  // additional statistics will be returned with the query results.
+  QueryMode mode = 11 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // The response for
@@ -251,6 +257,12 @@ message RunQueryResponse {
   // was set in
   // [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
   bytes transaction = 5;
+
+  // Query plan and execution statistics. Note that the returned stats are
+  // subject to change as Firestore evolves.
+  //
+  // This is only present when the request specifies a mode other than `NORMAL`.
+  ResultSetStats stats = 6;
 }
 
 // The request for
@@ -282,6 +294,11 @@ message RunAggregationQueryRequest {
     // The GQL query to run. This query must be an aggregation query.
     GqlQuery gql_query = 7;
   }
+
+  // Optional. The mode in which the query request is processed. This field is
+  // optional, and when not provided, it defaults to `NORMAL` mode where no
+  // additional statistics will be returned with the query results.
+  QueryMode mode = 10 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // The response for
@@ -301,6 +318,12 @@ message RunAggregationQueryResponse {
   // was set in
   // [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
   bytes transaction = 5;
+
+  // Query plan and execution statistics. Note that the returned stats are
+  // subject to change as Firestore evolves.
+  //
+  // This is only present when the request specifies a mode other than `NORMAL`.
+  ResultSetStats stats = 6;
 }
 
 // The request for
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
new file mode 100644
index 000000000000..05c1cf95ec88
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
@@ -0,0 +1,75 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package google.datastore.v1;
+
+import "google/protobuf/struct.proto";
+
+option csharp_namespace = "Google.Cloud.Datastore.V1";
+option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore";
+option java_multiple_files = true;
+option java_outer_classname = "QueryProfileProto";
+option java_package = "com.google.datastore.v1";
+option php_namespace = "Google\\Cloud\\Datastore\\V1";
+option ruby_package = "Google::Cloud::Datastore::V1";
+
+// Specification of the Datastore Query Profile fields.
+
+// The mode in which the query request must be processed.
+enum QueryMode {
+  // The default mode. Only the query results are returned.
+  NORMAL = 0;
+
+  // This mode returns only the query plan, without any results or execution
+  // statistics information.
+  PLAN = 1;
+
+  // This mode returns both the query plan and the execution statistics along
+  // with the results.
+  PROFILE = 2;
+}
+
+// Plan for the query.
+message QueryPlan {
+  // Planning phase information for the query. It will include:
+  //
+  // {
+  //   "indexes_used": [
+  //     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+  //     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+  //   ]
+  // }
+  google.protobuf.Struct plan_info = 1;
+}
+
+// Planning and execution statistics for the query.
+message ResultSetStats {
+  // Plan for the query.
+  QueryPlan query_plan = 1;
+
+  // Aggregated statistics from the execution of the query.
+  //
+  // This will only be present when the request specifies `PROFILE` mode.
+  // For example, a query will return the statistics including:
+  //
+  // {
+  //   "results_returned": "20",
+  //   "documents_scanned": "20",
+  //   "indexes_entries_scanned": "10050",
+  //   "total_execution_time": "100.7 msecs"
+  // }
+  google.protobuf.Struct query_stats = 2;
+}

From 1849e0be44e94fbfa48211484de4af602ca6b614 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 10 Jan 2024 17:55:32 +0100
Subject: [PATCH 1287/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3.2.5 (#1285)

---
 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 6bac0a1207e1..cb95c730d89d 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -97,7 +97,7 @@
             org.apache.maven.plugins
             maven-surefire-plugin
              
-            3.2.3
+            3.2.5
             
               
                 **/IT*

From b42b5138998cdecc2a3dc4cd807fbdae0641fe80 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 16 Jan 2024 16:04:22 -0500
Subject: [PATCH 1288/1784] test: update datastore emulator version to fix
 flakiness (#1288)

---
 .../google/cloud/datastore/testing/LocalDatastoreHelper.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 26b892186932..2723325eefe9 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
@@ -57,12 +57,12 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
   private static final String GCLOUD_CMD_TEXT = "gcloud beta emulators datastore start";
   private static final String GCLOUD_CMD_PORT_FLAG = "--host-port=";
   private static final String VERSION_PREFIX = "cloud-datastore-emulator ";
-  private static final String MIN_VERSION = "1.2.0";
+  private static final String MIN_VERSION = "2.0.2";
 
   // Downloadable emulator settings
   private static final String BIN_NAME = "cloud-datastore-emulator/cloud_datastore_emulator";
   private static final String FILENAME = "cloud-datastore-emulator-" + MIN_VERSION + ".zip";
-  private static final String MD5_CHECKSUM = "ec2237a0f0ac54964c6bd95e12c73720";
+  private static final String MD5_CHECKSUM = "e0d1170519cf52e2e5f9f93892cdf70c";
   private static final String BIN_CMD_PORT_FLAG = "--port=";
   private static final URL EMULATOR_URL;
   private static final String EMULATOR_URL_ENV_VAR = "DATASTORE_EMULATOR_URL";

From d529d34da22ba37354004afab6726a929de30bc6 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 18 Jan 2024 19:14:19 +0100
Subject: [PATCH 1289/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.30.0 (#1289)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.30.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 165d145cd265..3238cde59bbd 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.29.0
+      26.30.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.29.0')
+implementation platform('com.google.cloud:libraries-bom:26.30.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index cb95c730d89d..53f6396e4151 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.29.0
+        26.30.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 190e067576f5..e44b0dcbccaf 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.29.0
+        26.30.0
         pom
         import
       

From 5a5c78e01a765d3ebce547b54d7d6d16c0894fb2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 19 Jan 2024 16:02:24 +0100
Subject: [PATCH 1290/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.22.0 (#1291)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e9aab05a3094..8cf6d73b5305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.21.0
+        3.22.0
         pom
         import
       

From 4aa45587e5095788ee1dca7e35927003b42cfa6b Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:04:42 -0500
Subject: [PATCH 1291/1784] chore: Create renovate_config_check.yaml (#1920)
 (#1294)

* chore: Create renovate_config_check.yaml
Source-Link: https://github.com/googleapis/synthtool/commit/6612ab8f3afcd5e292aecd647f0fa68812c9f5b5
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:a6aa751984f1e905c3ae5a3aac78fc7b68210626ce91487dc7ff4f0a06f010cc

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml                    |  6 ++---
 .github/workflows/renovate_config_check.yaml | 25 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/renovate_config_check.yaml

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index f56920557239..dc05a72762fe 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:81f75d962cd28b7ad10740a643b8069b8fa0357cb495b782eef8560bb7a8fd65
-# created: 2023-12-05T19:16:19.735195992Z
+  digest: sha256:a6aa751984f1e905c3ae5a3aac78fc7b68210626ce91487dc7ff4f0a06f010cc
+# created: 2024-01-22T14:14:20.913785597Z
diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml
new file mode 100644
index 000000000000..87d8eb2be8cd
--- /dev/null
+++ b/.github/workflows/renovate_config_check.yaml
@@ -0,0 +1,25 @@
+name: Renovate Bot Config Validation
+
+on:
+  pull_request:
+    paths:
+      - 'renovate.json'
+
+jobs:
+  renovate_bot_config_validation:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '20'
+
+    - name: Install Renovate and Config Validator
+      run: |
+        npm install -g npm@latest
+        npm install --global renovate
+        renovate-config-validator

From f4ee0cb4668077f9fb6b0ede1ea69b9033748fe9 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:05:07 -0500
Subject: [PATCH 1292/1784] fix(deps): Update the Java code generator
 (gapic-generator-java) to 2.32.0 (#1293)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.32.0

PiperOrigin-RevId: 599914188

Source-Link: https://github.com/googleapis/googleapis/commit/17e6661f8bf43374633adf950454ed8e69bdcee1

Source-Link: https://github.com/googleapis/googleapis-gen/commit/d86ba5be537e489435105ca85566cc4103301aba
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDg2YmE1YmU1MzdlNDg5NDM1MTA1Y2E4NTU2NmNjNDEwMzMwMWFiYSJ9

* 🦉 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 
---
 .../admin/v1/DatastoreAdminClient.java        | 53 ++++++++++---------
 .../v1/stub/DatastoreAdminStubSettings.java   | 20 ++++++-
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index dc68117363ac..11bc6ca2a548 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -116,108 +116,109 @@
  * as threads. In the example above, try-with-resources is used, which automatically calls close().
  *
  * 
- *     
+ *    
  *    
  *      
  *      
  *      
+ *    
  *    
- *      
+ *      
  *      
  *      
  *    
  *    
- *      
+ *      
  *      
  *      
  *    
  *    
- *      
+ *      
  *      
  *      
  *    
  *    
- *      
+ *      
  *      
  *      
  *    
  *    
- *      
+ *      
  *      
  *      
  *    
  *    
- *      
+ *      
  *      
  *      
  *    
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 6de58e7f050f..e3c2b7d1d93e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -258,6 +258,15 @@ public DatastoreAdminStub createStub() throws IOException {
             "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
   }
 
+  /** Returns the endpoint set by the user or the the service's default endpoint. */
+  @Override
+  public String getEndpoint() {
+    if (super.getEndpoint() != null) {
+      return super.getEndpoint();
+    }
+    return getDefaultEndpoint();
+  }
+
   /** Returns the default service name. */
   @Override
   public String getServiceName() {
@@ -491,7 +500,6 @@ private static Builder createDefault() {
       builder.setTransportChannelProvider(defaultTransportChannelProvider());
       builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
       builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
-      builder.setEndpoint(getDefaultEndpoint());
       builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
       builder.setSwitchToMtlsEndpointAllowed(true);
 
@@ -504,7 +512,6 @@ private static Builder createHttpJsonDefault() {
       builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
       builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
       builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
-      builder.setEndpoint(getDefaultEndpoint());
       builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
       builder.setSwitchToMtlsEndpointAllowed(true);
 
@@ -719,6 +726,15 @@ public UnaryCallSettings.Builder getIndexSettings() {
       return listIndexesSettings;
     }
 
+    /** Returns the endpoint set by the user or the the service's default endpoint. */
+    @Override
+    public String getEndpoint() {
+      if (super.getEndpoint() != null) {
+        return super.getEndpoint();
+      }
+      return getDefaultEndpoint();
+    }
+
     @Override
     public DatastoreAdminStubSettings build() throws IOException {
       return new DatastoreAdminStubSettings(this);

From 8997cbbc8310427b50caa3cfc9eee69eb91de283 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 22 Jan 2024 17:06:11 +0100
Subject: [PATCH 1293/1784] test(deps): update dependency
 com.google.truth:truth to v1.3.0 (#1292)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7256170bc9a9..d5cc65fc1599 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.2.0
+      1.3.0
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8833a08e3bd2..43631a722e08 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -157,7 +157,7 @@
     
       com.google.truth
       truth
-      1.2.0
+      1.3.0
       test
     
   
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 73398c1da28c..bc9270f85ce2 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.2.0
+      1.3.0
       test
     
   
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 53f6396e4151..88ba1a66239e 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.2.0
+      1.3.0
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index dc380f03b93b..173467b6fec0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -41,7 +41,7 @@
     
       com.google.truth
       truth
-      1.2.0
+      1.3.0
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e44b0dcbccaf..766cad1cbc2f 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.2.0
+      1.3.0
       test
     
   

From a2849dd5e5a5ac4219587e0cbc8bde2acbfc01cc Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 16:24:15 +0000
Subject: [PATCH 1294/1784] chore(main): release 2.18.1 (#1286)

:robot: I have created a release *beep* *boop*
---


## [2.18.1](https://togithub.com/googleapis/java-datastore/compare/v2.18.0...v2.18.1) (2024-01-22)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.31.0 ([#1278](https://togithub.com/googleapis/java-datastore/issues/1278)) ([01cced6](https://togithub.com/googleapis/java-datastore/commit/01cced66613bc10ba71cc80166119e321915ec34))
* **deps:** Update the Java code generator (gapic-generator-java) to 2.32.0 ([#1293](https://togithub.com/googleapis/java-datastore/issues/1293)) ([f4ee0cb](https://togithub.com/googleapis/java-datastore/commit/f4ee0cb4668077f9fb6b0ede1ea69b9033748fe9))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.22.0 ([#1291](https://togithub.com/googleapis/java-datastore/issues/1291)) ([5a5c78e](https://togithub.com/googleapis/java-datastore/commit/5a5c78e01a765d3ebce547b54d7d6d16c0894fb2))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6945a93b2e5..3ca20ce999e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.18.1](https://github.com/googleapis/java-datastore/compare/v2.18.0...v2.18.1) (2024-01-22)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.31.0 ([#1278](https://github.com/googleapis/java-datastore/issues/1278)) ([01cced6](https://github.com/googleapis/java-datastore/commit/01cced66613bc10ba71cc80166119e321915ec34))
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.32.0 ([#1293](https://github.com/googleapis/java-datastore/issues/1293)) ([f4ee0cb](https://github.com/googleapis/java-datastore/commit/f4ee0cb4668077f9fb6b0ede1ea69b9033748fe9))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.22.0 ([#1291](https://github.com/googleapis/java-datastore/issues/1291)) ([5a5c78e](https://github.com/googleapis/java-datastore/commit/5a5c78e01a765d3ebce547b54d7d6d16c0894fb2))
+
 ## [2.18.0](https://github.com/googleapis/java-datastore/compare/v2.17.6...v2.18.0) (2024-01-08)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d5cc65fc1599..3d4686b30873 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.18.1-SNAPSHOT
+  2.18.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1-SNAPSHOT
+    2.18.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index bf7e07b8b353..f631e64f407e 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.18.1-SNAPSHOT
+  2.18.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.1-SNAPSHOT
+        2.18.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.1-SNAPSHOT
+        2.18.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.1-SNAPSHOT
+        0.109.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.1-SNAPSHOT
+        2.18.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 43631a722e08..b4bfb5cf342b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.1-SNAPSHOT
+  2.18.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1-SNAPSHOT
+    2.18.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 5d4446fc7677..1f98bfb49e81 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.18.1-SNAPSHOT
+  2.18.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1-SNAPSHOT
+    2.18.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 8cf6d73b5305..516358c31090 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.1-SNAPSHOT
+  2.18.1
   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.18.1-SNAPSHOT
+        2.18.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.1-SNAPSHOT
+        2.18.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.1-SNAPSHOT
+        2.18.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.1-SNAPSHOT
+        0.109.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.1-SNAPSHOT
+        2.18.1
         
           
             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 fd148683b529..a35894780736 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.18.1-SNAPSHOT
+  2.18.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1-SNAPSHOT
+    2.18.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8bfc2292e691..105e5fa960d7 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.109.1-SNAPSHOT
+  0.109.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1-SNAPSHOT
+    2.18.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 173467b6fec0..1ace12f28e45 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.1-SNAPSHOT
+      2.18.1
     
     
 
diff --git a/versions.txt b/versions.txt
index eb98fd391dd2..c611c622e3d8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.0:2.18.1-SNAPSHOT
-google-cloud-datastore-bom:2.18.0:2.18.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.109.0:0.109.1-SNAPSHOT
-datastore-v1-proto-client:2.18.0:2.18.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.18.0:2.18.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.18.0:2.18.1-SNAPSHOT
+google-cloud-datastore:2.18.1:2.18.1
+google-cloud-datastore-bom:2.18.1:2.18.1
+proto-google-cloud-datastore-v1:0.109.1:0.109.1
+datastore-v1-proto-client:2.18.1:2.18.1
+proto-google-cloud-datastore-admin-v1:2.18.1:2.18.1
+grpc-google-cloud-datastore-admin-v1:2.18.1:2.18.1

From b20da95c417c56ea162a3cec7e7f7fa72ffc882f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 16:54:16 +0000
Subject: [PATCH 1295/1784] chore(main): release 2.18.2-SNAPSHOT (#1295)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3d4686b30873..bcfefcefe63d 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.18.1
+  2.18.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1
+    2.18.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f631e64f407e..cfa6c6da2a71 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.18.1
+  2.18.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.1
+        2.18.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.1
+        2.18.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.1
+        0.109.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.1
+        2.18.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b4bfb5cf342b..eda1605f6f03 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.1
+  2.18.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1
+    2.18.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 1f98bfb49e81..12cff958210a 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.18.1
+  2.18.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1
+    2.18.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 516358c31090..6dcd886bc8f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.1
+  2.18.2-SNAPSHOT
   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.18.1
+        2.18.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.1
+        2.18.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.1
+        2.18.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.1
+        0.109.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.1
+        2.18.2-SNAPSHOT
         
           
             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 a35894780736..ef0748452cfa 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.18.1
+  2.18.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1
+    2.18.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 105e5fa960d7..2bb42975b5ee 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.109.1
+  0.109.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.1
+    2.18.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1ace12f28e45..173889161bfd 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.1
+      2.18.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index c611c622e3d8..26087332e8bf 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.1:2.18.1
-google-cloud-datastore-bom:2.18.1:2.18.1
-proto-google-cloud-datastore-v1:0.109.1:0.109.1
-datastore-v1-proto-client:2.18.1:2.18.1
-proto-google-cloud-datastore-admin-v1:2.18.1:2.18.1
-grpc-google-cloud-datastore-admin-v1:2.18.1:2.18.1
+google-cloud-datastore:2.18.1:2.18.2-SNAPSHOT
+google-cloud-datastore-bom:2.18.1:2.18.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.109.1:0.109.2-SNAPSHOT
+datastore-v1-proto-client:2.18.1:2.18.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.18.1:2.18.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.18.1:2.18.2-SNAPSHOT

From 57f95ab20783f433deed6d68d13db8c8c1726e49 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 22 Jan 2024 21:51:34 +0100
Subject: [PATCH 1296/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.18.1 (#1296)
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.18.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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3238cde59bbd..64a1360dccda 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.18.0
+  2.18.1
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.18.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.18.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.1"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index bc9270f85ce2..2fcc3ac9ae0f 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.18.0
+      2.18.1
     
     
 

From dd1862dd9ac94c2136c4dd97c07df7306564bfd1 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:18:19 -0500
Subject: [PATCH 1297/1784] chore: Update CODEOWNERS (#1297)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update CODEOWNERS

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: Update .repo-metadata.json

* 🦉 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 
---
 .github/CODEOWNERS  | 6 +++---
 .repo-metadata.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 17fe1884dea1..95d4bc11b7a4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,11 +4,11 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk
+# The @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners is the default owner for changes in this repo
+*                       @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk
+**/*.java               @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
 
 
 # The java-samples-reviewers team is the default owner for samples changes
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 1d382e4ed0a5..5978dadef35a 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -9,7 +9,7 @@
   "repo": "googleapis/java-datastore",
   "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
-  "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk",
+  "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners",
   "api_id": "datastore.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.",

From ac947a545235fa41f0ffb52c4e3a0ffc498991e1 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 25 Jan 2024 16:24:36 +0100
Subject: [PATCH 1298/1784] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v3.23.0 (#1301)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6dcd886bc8f1..69d9a7a7ab5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.22.0
+        3.23.0
         pom
         import
       

From 04afd64bb6fd117b3c550ab867d00986503f3a08 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:50:16 +0000
Subject: [PATCH 1299/1784] chore(main): release 2.18.2 (#1302)

:robot: I have created a release *beep* *boop*
---


## [2.18.2](https://togithub.com/googleapis/java-datastore/compare/v2.18.1...v2.18.2) (2024-01-25)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.23.0 ([#1301](https://togithub.com/googleapis/java-datastore/issues/1301)) ([ac947a5](https://togithub.com/googleapis/java-datastore/commit/ac947a545235fa41f0ffb52c4e3a0ffc498991e1))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ca20ce999e8..6a5e436a7109 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.18.2](https://github.com/googleapis/java-datastore/compare/v2.18.1...v2.18.2) (2024-01-25)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.23.0 ([#1301](https://github.com/googleapis/java-datastore/issues/1301)) ([ac947a5](https://github.com/googleapis/java-datastore/commit/ac947a545235fa41f0ffb52c4e3a0ffc498991e1))
+
 ## [2.18.1](https://github.com/googleapis/java-datastore/compare/v2.18.0...v2.18.1) (2024-01-22)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index bcfefcefe63d..d4b6db53998f 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.18.2-SNAPSHOT
+  2.18.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2-SNAPSHOT
+    2.18.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index cfa6c6da2a71..eba6ba09eb52 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.18.2-SNAPSHOT
+  2.18.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.2-SNAPSHOT
+        2.18.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.2-SNAPSHOT
+        2.18.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.2-SNAPSHOT
+        0.109.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.2-SNAPSHOT
+        2.18.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index eda1605f6f03..cfe33bc1ac2d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.2-SNAPSHOT
+  2.18.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2-SNAPSHOT
+    2.18.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 12cff958210a..92c64e20b146 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.18.2-SNAPSHOT
+  2.18.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2-SNAPSHOT
+    2.18.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 69d9a7a7ab5a..acd2ff0bcc7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.2-SNAPSHOT
+  2.18.2
   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.18.2-SNAPSHOT
+        2.18.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.2-SNAPSHOT
+        2.18.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.2-SNAPSHOT
+        2.18.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.2-SNAPSHOT
+        0.109.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.2-SNAPSHOT
+        2.18.2
         
           
             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 ef0748452cfa..81d14e2ccaa8 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.18.2-SNAPSHOT
+  2.18.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2-SNAPSHOT
+    2.18.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2bb42975b5ee..3dbf1de31b49 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.109.2-SNAPSHOT
+  0.109.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2-SNAPSHOT
+    2.18.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 173889161bfd..8e828bc151fe 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.2-SNAPSHOT
+      2.18.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 26087332e8bf..87f04f4017af 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.1:2.18.2-SNAPSHOT
-google-cloud-datastore-bom:2.18.1:2.18.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.109.1:0.109.2-SNAPSHOT
-datastore-v1-proto-client:2.18.1:2.18.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.18.1:2.18.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.18.1:2.18.2-SNAPSHOT
+google-cloud-datastore:2.18.2:2.18.2
+google-cloud-datastore-bom:2.18.2:2.18.2
+proto-google-cloud-datastore-v1:0.109.2:0.109.2
+datastore-v1-proto-client:2.18.2:2.18.2
+proto-google-cloud-datastore-admin-v1:2.18.2:2.18.2
+grpc-google-cloud-datastore-admin-v1:2.18.2:2.18.2

From 4cbc8166c338486ca1d300c60f8be99a22afc7b5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:24:15 +0000
Subject: [PATCH 1300/1784] chore(main): release 2.18.3-SNAPSHOT (#1303)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d4b6db53998f..aa39052083a2 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.18.2
+  2.18.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2
+    2.18.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index eba6ba09eb52..c6537c97c21b 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.18.2
+  2.18.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.2
+        2.18.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.2
+        2.18.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.2
+        0.109.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.2
+        2.18.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cfe33bc1ac2d..e5ae9a053dbd 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.2
+  2.18.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2
+    2.18.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 92c64e20b146..525e7c945aab 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.18.2
+  2.18.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2
+    2.18.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index acd2ff0bcc7b..30b79cdc0a68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.2
+  2.18.3-SNAPSHOT
   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.18.2
+        2.18.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.2
+        2.18.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.2
+        2.18.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.2
+        0.109.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.2
+        2.18.3-SNAPSHOT
         
           
             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 81d14e2ccaa8..ac4ea811c288 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.18.2
+  2.18.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2
+    2.18.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3dbf1de31b49..c10b2ff889d8 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.109.2
+  0.109.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.2
+    2.18.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8e828bc151fe..21f6457a734c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.2
+      2.18.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 87f04f4017af..35b6e8a4f63e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.2:2.18.2
-google-cloud-datastore-bom:2.18.2:2.18.2
-proto-google-cloud-datastore-v1:0.109.2:0.109.2
-datastore-v1-proto-client:2.18.2:2.18.2
-proto-google-cloud-datastore-admin-v1:2.18.2:2.18.2
-grpc-google-cloud-datastore-admin-v1:2.18.2:2.18.2
+google-cloud-datastore:2.18.2:2.18.3-SNAPSHOT
+google-cloud-datastore-bom:2.18.2:2.18.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.109.2:0.109.3-SNAPSHOT
+datastore-v1-proto-client:2.18.2:2.18.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.18.2:2.18.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.18.2:2.18.3-SNAPSHOT

From 699811607f2254e3c5d4844a1e3daac32677bae8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 26 Jan 2024 16:55:59 +0100
Subject: [PATCH 1301/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.18.2 (#1305)
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.18.2

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 64a1360dccda..e9408beada5f 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.18.1
+  2.18.2
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.18.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.18.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.2"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 2fcc3ac9ae0f..dc958c9ac630 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.18.1
+      2.18.2
     
     
 

From 62cbc1308e6cc47968d1f28ed5a61e14e38d6437 Mon Sep 17 00:00:00 2001
From: Alice <65933803+alicejli@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:56:41 -0500
Subject: [PATCH 1302/1784] chore: remove obsolete release job configs (#1300)

* chore: remove obsolete release job configs

* remove inadvertent doclet testing files
---
 .kokoro/release/bump_snapshot.cfg     |  53 ---
 .kokoro/release/bump_snapshot.sh      |  30 --
 .kokoro/release/common.cfg            |  49 ---
 .kokoro/release/common.sh             |  50 ---
 .kokoro/release/drop.cfg              |   6 -
 .kokoro/release/drop.sh               |  32 --
 .kokoro/release/promote.cfg           |   6 -
 .kokoro/release/promote.sh            |  34 --
 .kokoro/release/publish_javadoc.cfg   |  23 --
 .kokoro/release/publish_javadoc.sh    |  53 ---
 .kokoro/release/publish_javadoc11.cfg |  30 --
 .kokoro/release/publish_javadoc11.sh  |  63 ----
 .kokoro/release/snapshot.cfg          |   6 -
 .kokoro/release/snapshot.sh           |  33 --
 .kokoro/release/stage.cfg             |  19 -
 .kokoro/release/stage.sh              |  47 ---
 .kokoro/requirements.in               |   6 -
 .kokoro/requirements.txt              | 491 --------------------------
 owlbot.py                             |   2 +
 19 files changed, 2 insertions(+), 1031 deletions(-)
 delete mode 100644 .kokoro/release/bump_snapshot.cfg
 delete mode 100755 .kokoro/release/bump_snapshot.sh
 delete mode 100644 .kokoro/release/common.cfg
 delete mode 100755 .kokoro/release/common.sh
 delete mode 100644 .kokoro/release/drop.cfg
 delete mode 100755 .kokoro/release/drop.sh
 delete mode 100644 .kokoro/release/promote.cfg
 delete mode 100755 .kokoro/release/promote.sh
 delete mode 100644 .kokoro/release/publish_javadoc.cfg
 delete mode 100755 .kokoro/release/publish_javadoc.sh
 delete mode 100644 .kokoro/release/publish_javadoc11.cfg
 delete mode 100755 .kokoro/release/publish_javadoc11.sh
 delete mode 100644 .kokoro/release/snapshot.cfg
 delete mode 100755 .kokoro/release/snapshot.sh
 delete mode 100644 .kokoro/release/stage.cfg
 delete mode 100755 .kokoro/release/stage.sh
 delete mode 100644 .kokoro/requirements.in
 delete mode 100644 .kokoro/requirements.txt

diff --git a/.kokoro/release/bump_snapshot.cfg b/.kokoro/release/bump_snapshot.cfg
deleted file mode 100644
index 028a07acd0ce..000000000000
--- a/.kokoro/release/bump_snapshot.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-  }
-}
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# Use the trampoline script to run in docker.
-build_file: "java-datastore/.kokoro/trampoline.sh"
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/release/bump_snapshot.sh"
-}
-
-# tokens used by release-please to keep an up-to-date release PR.
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "github-magic-proxy-key-release-please"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "github-magic-proxy-token-release-please"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "github-magic-proxy-url-release-please"
-    }
-  }
-}
diff --git a/.kokoro/release/bump_snapshot.sh b/.kokoro/release/bump_snapshot.sh
deleted file mode 100755
index 4ec44ddfa107..000000000000
--- a/.kokoro/release/bump_snapshot.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 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
-#
-#     https://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.
-
-set -eo pipefail
-
-export NPM_CONFIG_PREFIX=/home/node/.npm-global
-
-if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
-  # Groom the snapshot release PR immediately after publishing a release
-  npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
-    --repo-url=googleapis/java-datastore \
-    --package-name="datastore" \
-    --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
-    --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
-    --snapshot \
-    --release-type=java-auth-yoshi
-fi
diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
deleted file mode 100644
index 49654be53c67..000000000000
--- a/.kokoro/release/common.cfg
+++ /dev/null
@@ -1,49 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# Use the trampoline script to run in docker.
-build_file: "java-datastore/.kokoro/trampoline.sh"
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 70247
-      keyname: "maven-gpg-keyring"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 70247
-      keyname: "maven-gpg-passphrase"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 70247
-      keyname: "maven-gpg-pubkeyring"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 70247
-      keyname: "sonatype-credentials"
-    }
-  }
-}
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
deleted file mode 100755
index 7f78ee414faf..000000000000
--- a/.kokoro/release/common.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Copyright 2018 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.
-
-set -eo pipefail
-
-# Get secrets from keystore and set and environment variables
-setup_environment_secrets() {
-  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
-  export GPG_TTY=$(tty)
-  export GPG_HOMEDIR=/gpg
-  mkdir $GPG_HOMEDIR
-  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg
-  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg
-  export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|')
-  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|')
-}
-
-create_settings_xml_file() {
-  echo "
-  
-    
-      ossrh
-      ${SONATYPE_USERNAME}
-      ${SONATYPE_PASSWORD}
-    
-    
-      sonatype-nexus-staging
-      ${SONATYPE_USERNAME}
-      ${SONATYPE_PASSWORD}
-    
-    
-      sonatype-nexus-snapshots
-      ${SONATYPE_USERNAME}
-      ${SONATYPE_PASSWORD}
-    
-  
-" > $1
-}
\ No newline at end of file
diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg
deleted file mode 100644
index 2ad503f7711c..000000000000
--- a/.kokoro/release/drop.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/release/drop.sh"
-}
diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
deleted file mode 100755
index 742ec1a88600..000000000000
--- a/.kokoro/release/drop.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Copyright 2018 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.
-
-set -eo pipefail
-
-# STAGING_REPOSITORY_ID must be set
-if [ -z "${STAGING_REPOSITORY_ID}" ]; then
-  echo "Missing STAGING_REPOSITORY_ID environment variable"
-  exit 1
-fi
-
-source $(dirname "$0")/common.sh
-pushd $(dirname "$0")/../../
-
-setup_environment_secrets
-create_settings_xml_file "settings.xml"
-
-mvn nexus-staging:drop -B \
-  --settings=settings.xml \
-  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg
deleted file mode 100644
index fd61153c9256..000000000000
--- a/.kokoro/release/promote.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/release/promote.sh"
-}
diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
deleted file mode 100755
index 3cac3d8a97d7..000000000000
--- a/.kokoro/release/promote.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Copyright 2018 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.
-
-set -eo pipefail
-
-# STAGING_REPOSITORY_ID must be set
-if [ -z "${STAGING_REPOSITORY_ID}" ]; then
-  echo "Missing STAGING_REPOSITORY_ID environment variable"
-  exit 1
-fi
-
-source $(dirname "$0")/common.sh
-
-pushd $(dirname "$0")/../../
-
-setup_environment_secrets
-create_settings_xml_file "settings.xml"
-
-mvn nexus-staging:release -B \
-  -DperformRelease=true \
-  --settings=settings.xml \
-  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
deleted file mode 100644
index 49de6872d79c..000000000000
--- a/.kokoro/release/publish_javadoc.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/"
-
-env_vars: {
-  key: "STAGING_BUCKET"
-  value: "docs-staging"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/release/publish_javadoc.sh"
-}
-
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "docuploader_service_account"
-    }
-  }
-}
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
deleted file mode 100755
index 62dfe548061e..000000000000
--- a/.kokoro/release/publish_javadoc.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-# Copyright 2019 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.
-
-set -eo pipefail
-
-if [[ -z "${CREDENTIALS}" ]]; then
-  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
-fi
-
-if [[ -z "${STAGING_BUCKET}" ]]; then
-  echo "Need to set STAGING_BUCKET environment variable"
-  exit 1
-fi
-
-# work from the git root directory
-pushd $(dirname "$0")/../../
-
-# install docuploader package
-python3 -m pip install --require-hashes -r .kokoro/requirements.txt
-
-# compile all packages
-mvn clean install -B -q -DskipTests=true
-
-export NAME=google-cloud-datastore
-export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
-
-# build the docs
-mvn site -B -q
-
-pushd target/site/apidocs
-
-# create metadata
-python3 -m docuploader create-metadata \
-  --name ${NAME} \
-  --version ${VERSION} \
-  --language java
-
-# upload docs
-python3 -m docuploader upload . \
-  --credentials ${CREDENTIALS} \
-  --staging-bucket ${STAGING_BUCKET}
diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg
deleted file mode 100644
index 1a57bbcca8ae..000000000000
--- a/.kokoro/release/publish_javadoc11.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# cloud-rad production
-env_vars: {
-  key: "STAGING_BUCKET_V2"
-  value: "docs-staging-v2"
-}
-
-# Configure the docker image for kokoro-trampoline
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/release/publish_javadoc11.sh"
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "docuploader_service_account"
-    }
-  }
-}
-
-# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
deleted file mode 100755
index 04b076b91098..000000000000
--- a/.kokoro/release/publish_javadoc11.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# Copyright 2021 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.
-
-set -eo pipefail
-
-if [[ -z "${CREDENTIALS}" ]]; then
-  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
-fi
-
-if [[ -z "${STAGING_BUCKET_V2}" ]]; then
-  echo "Need to set STAGING_BUCKET_V2 environment variable"
-  exit 1
-fi
-
-# work from the git root directory
-pushd $(dirname "$0")/../../
-
-# install docuploader package
-python3 -m pip install --require-hashes -r .kokoro/requirements.txt
-
-# compile all packages
-mvn clean install -B -q -DskipTests=true
-
-export NAME=google-cloud-datastore
-export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
-
-# cloud RAD generation
-mvn clean javadoc:aggregate -B -q -P docFX
-# include CHANGELOG
-cp CHANGELOG.md target/docfx-yml/history.md
-
-pushd target/docfx-yml
-
-# create metadata
-python3 -m docuploader create-metadata \
- --name ${NAME} \
- --version ${VERSION} \
- --xrefs devsite://java/gax \
- --xrefs devsite://java/google-cloud-core \
- --xrefs devsite://java/api-common \
- --xrefs devsite://java/proto-google-common-protos \
- --xrefs devsite://java/google-api-client \
- --xrefs devsite://java/google-http-client \
- --xrefs devsite://java/protobuf \
- --language java
-
-# upload yml to production bucket
-python3 -m docuploader upload . \
- --credentials ${CREDENTIALS} \
- --staging-bucket ${STAGING_BUCKET_V2} \
- --destination-prefix docfx
diff --git a/.kokoro/release/snapshot.cfg b/.kokoro/release/snapshot.cfg
deleted file mode 100644
index 18722d391b8b..000000000000
--- a/.kokoro/release/snapshot.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/release/snapshot.sh"
-}
\ No newline at end of file
diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
deleted file mode 100755
index 1f55b77024d8..000000000000
--- a/.kokoro/release/snapshot.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Copyright 2019 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.
-
-set -eo pipefail
-
-source $(dirname "$0")/common.sh
-MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
-pushd $(dirname "$0")/../../
-
-# ensure we're trying to push a snapshot (no-result returns non-zero exit code)
-grep SNAPSHOT versions.txt
-
-setup_environment_secrets
-create_settings_xml_file "settings.xml"
-
-mvn clean deploy -B \
-  --settings ${MAVEN_SETTINGS_FILE} \
-  -DperformRelease=true \
-  -Dgpg.executable=gpg \
-  -Dgpg.passphrase=${GPG_PASSPHRASE} \
-  -Dgpg.homedir=${GPG_HOMEDIR}
diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg
deleted file mode 100644
index 159e4cfdfaec..000000000000
--- a/.kokoro/release/stage.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/release/stage.sh"
-}
-
-# Need to save the properties file
-action {
-  define_artifacts {
-    regex: "github/java-datastore/target/nexus-staging/staging/*.properties"
-    strip_prefix: "github/java-datastore"
-  }
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
-}
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
deleted file mode 100755
index 61e714d6ba56..000000000000
--- a/.kokoro/release/stage.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-# Copyright 2018 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.
-
-set -eo pipefail
-
-# Start the releasetool reporter
-requirementsFile=$(realpath $(dirname "${BASH_SOURCE[0]}")/../requirements.txt)
-python3 -m pip install --require-hashes -r $requirementsFile
-python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
-
-source $(dirname "$0")/common.sh
-source $(dirname "$0")/../common.sh
-MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
-pushd $(dirname "$0")/../../
-
-setup_environment_secrets
-create_settings_xml_file "settings.xml"
-
-# attempt to stage 3 times with exponential backoff (starting with 10 seconds)
-retry_with_backoff 3 10 \
-  mvn clean deploy -B \
-    --settings ${MAVEN_SETTINGS_FILE} \
-    -DskipTests=true \
-    -Dclirr.skip=true \
-    -DperformRelease=true \
-    -Dgpg.executable=gpg \
-    -Dgpg.passphrase=${GPG_PASSPHRASE} \
-    -Dgpg.homedir=${GPG_HOMEDIR}
-
-if [[ -n "${AUTORELEASE_PR}" ]]
-then
-  mvn nexus-staging:release -B \
-    -DperformRelease=true \
-    --settings=settings.xml
-fi
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
deleted file mode 100644
index 2092cc741d9c..000000000000
--- a/.kokoro/requirements.in
+++ /dev/null
@@ -1,6 +0,0 @@
-gcp-docuploader
-gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x
-wheel
-setuptools
-typing-extensions
-click<8.1.0
\ No newline at end of file
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
deleted file mode 100644
index 445c5c1f0929..000000000000
--- a/.kokoro/requirements.txt
+++ /dev/null
@@ -1,491 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.9
-# by the following command:
-#
-#     pip-compile requirements.in --generate-hashes --upgrade
-#
-attrs==23.1.0 \
-    --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \
-    --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
-    # via gcp-releasetool
-cachetools==5.3.1 \
-    --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \
-    --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b
-    # via google-auth
-certifi==2023.7.22 \
-    --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \
-    --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9
-    # via requests
-cffi==1.15.1 \
-    --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
-    --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \
-    --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \
-    --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \
-    --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \
-    --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \
-    --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \
-    --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \
-    --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \
-    --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \
-    --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \
-    --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \
-    --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \
-    --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \
-    --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \
-    --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \
-    --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \
-    --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \
-    --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \
-    --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \
-    --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \
-    --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \
-    --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \
-    --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \
-    --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \
-    --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \
-    --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \
-    --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \
-    --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \
-    --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \
-    --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \
-    --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \
-    --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \
-    --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \
-    --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \
-    --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \
-    --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \
-    --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \
-    --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \
-    --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \
-    --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \
-    --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \
-    --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \
-    --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \
-    --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \
-    --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \
-    --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \
-    --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \
-    --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \
-    --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \
-    --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \
-    --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \
-    --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \
-    --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \
-    --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \
-    --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \
-    --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \
-    --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \
-    --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \
-    --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \
-    --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \
-    --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \
-    --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \
-    --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0
-    # via cryptography
-charset-normalizer==3.2.0 \
-    --hash=sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96 \
-    --hash=sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c \
-    --hash=sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710 \
-    --hash=sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706 \
-    --hash=sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020 \
-    --hash=sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252 \
-    --hash=sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad \
-    --hash=sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329 \
-    --hash=sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a \
-    --hash=sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f \
-    --hash=sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6 \
-    --hash=sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4 \
-    --hash=sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a \
-    --hash=sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46 \
-    --hash=sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2 \
-    --hash=sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23 \
-    --hash=sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace \
-    --hash=sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd \
-    --hash=sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982 \
-    --hash=sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10 \
-    --hash=sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2 \
-    --hash=sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea \
-    --hash=sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09 \
-    --hash=sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5 \
-    --hash=sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149 \
-    --hash=sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489 \
-    --hash=sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9 \
-    --hash=sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80 \
-    --hash=sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592 \
-    --hash=sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3 \
-    --hash=sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6 \
-    --hash=sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed \
-    --hash=sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c \
-    --hash=sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200 \
-    --hash=sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a \
-    --hash=sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e \
-    --hash=sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d \
-    --hash=sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6 \
-    --hash=sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623 \
-    --hash=sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669 \
-    --hash=sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3 \
-    --hash=sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa \
-    --hash=sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9 \
-    --hash=sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2 \
-    --hash=sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f \
-    --hash=sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1 \
-    --hash=sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4 \
-    --hash=sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a \
-    --hash=sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8 \
-    --hash=sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3 \
-    --hash=sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029 \
-    --hash=sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f \
-    --hash=sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959 \
-    --hash=sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22 \
-    --hash=sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7 \
-    --hash=sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952 \
-    --hash=sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346 \
-    --hash=sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e \
-    --hash=sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d \
-    --hash=sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299 \
-    --hash=sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd \
-    --hash=sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a \
-    --hash=sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3 \
-    --hash=sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037 \
-    --hash=sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94 \
-    --hash=sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c \
-    --hash=sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858 \
-    --hash=sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a \
-    --hash=sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449 \
-    --hash=sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c \
-    --hash=sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918 \
-    --hash=sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1 \
-    --hash=sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c \
-    --hash=sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac \
-    --hash=sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa
-    # via requests
-click==8.0.4 \
-    --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \
-    --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb
-    # via
-    #   -r requirements.in
-    #   gcp-docuploader
-    #   gcp-releasetool
-colorlog==6.7.0 \
-    --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
-    --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
-    # via gcp-docuploader
-cryptography==41.0.6 \
-    --hash=sha256:068bc551698c234742c40049e46840843f3d98ad7ce265fd2bd4ec0d11306596 \
-    --hash=sha256:0f27acb55a4e77b9be8d550d762b0513ef3fc658cd3eb15110ebbcbd626db12c \
-    --hash=sha256:2132d5865eea673fe6712c2ed5fb4fa49dba10768bb4cc798345748380ee3660 \
-    --hash=sha256:3288acccef021e3c3c10d58933f44e8602cf04dba96d9796d70d537bb2f4bbc4 \
-    --hash=sha256:35f3f288e83c3f6f10752467c48919a7a94b7d88cc00b0668372a0d2ad4f8ead \
-    --hash=sha256:398ae1fc711b5eb78e977daa3cbf47cec20f2c08c5da129b7a296055fbb22aed \
-    --hash=sha256:422e3e31d63743855e43e5a6fcc8b4acab860f560f9321b0ee6269cc7ed70cc3 \
-    --hash=sha256:48783b7e2bef51224020efb61b42704207dde583d7e371ef8fc2a5fb6c0aabc7 \
-    --hash=sha256:4d03186af98b1c01a4eda396b137f29e4e3fb0173e30f885e27acec8823c1b09 \
-    --hash=sha256:5daeb18e7886a358064a68dbcaf441c036cbdb7da52ae744e7b9207b04d3908c \
-    --hash=sha256:60e746b11b937911dc70d164060d28d273e31853bb359e2b2033c9e93e6f3c43 \
-    --hash=sha256:742ae5e9a2310e9dade7932f9576606836ed174da3c7d26bc3d3ab4bd49b9f65 \
-    --hash=sha256:7e00fb556bda398b99b0da289ce7053639d33b572847181d6483ad89835115f6 \
-    --hash=sha256:85abd057699b98fce40b41737afb234fef05c67e116f6f3650782c10862c43da \
-    --hash=sha256:8efb2af8d4ba9dbc9c9dd8f04d19a7abb5b49eab1f3694e7b5a16a5fc2856f5c \
-    --hash=sha256:ae236bb8760c1e55b7a39b6d4d32d2279bc6c7c8500b7d5a13b6fb9fc97be35b \
-    --hash=sha256:afda76d84b053923c27ede5edc1ed7d53e3c9f475ebaf63c68e69f1403c405a8 \
-    --hash=sha256:b27a7fd4229abef715e064269d98a7e2909ebf92eb6912a9603c7e14c181928c \
-    --hash=sha256:b648fe2a45e426aaee684ddca2632f62ec4613ef362f4d681a9a6283d10e079d \
-    --hash=sha256:c5a550dc7a3b50b116323e3d376241829fd326ac47bc195e04eb33a8170902a9 \
-    --hash=sha256:da46e2b5df770070412c46f87bac0849b8d685c5f2679771de277a422c7d0b86 \
-    --hash=sha256:f39812f70fc5c71a15aa3c97b2bbe213c3f2a460b79bd21c40d033bb34a9bf36 \
-    --hash=sha256:ff369dd19e8fe0528b02e8df9f2aeb2479f89b1270d90f96a63500afe9af5cae
-    # via
-    #   gcp-releasetool
-    #   secretstorage
-gcp-docuploader==0.6.5 \
-    --hash=sha256:30221d4ac3e5a2b9c69aa52fdbef68cc3f27d0e6d0d90e220fc024584b8d2318 \
-    --hash=sha256:b7458ef93f605b9d46a4bf3a8dc1755dad1f31d030c8679edf304e343b347eea
-    # via -r requirements.in
-gcp-releasetool==1.16.0 \
-    --hash=sha256:27bf19d2e87aaa884096ff941aa3c592c482be3d6a2bfe6f06afafa6af2353e3 \
-    --hash=sha256:a316b197a543fd036209d0caba7a8eb4d236d8e65381c80cbc6d7efaa7606d63
-    # via -r requirements.in
-google-api-core==2.11.1 \
-    --hash=sha256:25d29e05a0058ed5f19c61c0a78b1b53adea4d9364b464d014fbda941f6d1c9a \
-    --hash=sha256:d92a5a92dc36dd4f4b9ee4e55528a90e432b059f93aee6ad857f9de8cc7ae94a
-    # via
-    #   google-cloud-core
-    #   google-cloud-storage
-google-auth==2.22.0 \
-    --hash=sha256:164cba9af4e6e4e40c3a4f90a1a6c12ee56f14c0b4868d1ca91b32826ab334ce \
-    --hash=sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873
-    # via
-    #   gcp-releasetool
-    #   google-api-core
-    #   google-cloud-core
-    #   google-cloud-storage
-google-cloud-core==2.3.3 \
-    --hash=sha256:37b80273c8d7eee1ae816b3a20ae43585ea50506cb0e60f3cf5be5f87f1373cb \
-    --hash=sha256:fbd11cad3e98a7e5b0343dc07cb1039a5ffd7a5bb96e1f1e27cee4bda4a90863
-    # via google-cloud-storage
-google-cloud-storage==2.10.0 \
-    --hash=sha256:934b31ead5f3994e5360f9ff5750982c5b6b11604dc072bc452c25965e076dc7 \
-    --hash=sha256:9433cf28801671de1c80434238fb1e7e4a1ba3087470e90f70c928ea77c2b9d7
-    # via gcp-docuploader
-google-crc32c==1.5.0 \
-    --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \
-    --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \
-    --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \
-    --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \
-    --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \
-    --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \
-    --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \
-    --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \
-    --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \
-    --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \
-    --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \
-    --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \
-    --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \
-    --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \
-    --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \
-    --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \
-    --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \
-    --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \
-    --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \
-    --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \
-    --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \
-    --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \
-    --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \
-    --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \
-    --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \
-    --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \
-    --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \
-    --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \
-    --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \
-    --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \
-    --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \
-    --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \
-    --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \
-    --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \
-    --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \
-    --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \
-    --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \
-    --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \
-    --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \
-    --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \
-    --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \
-    --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \
-    --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \
-    --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \
-    --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \
-    --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \
-    --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \
-    --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \
-    --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \
-    --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \
-    --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \
-    --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \
-    --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \
-    --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \
-    --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \
-    --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \
-    --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \
-    --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \
-    --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \
-    --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \
-    --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \
-    --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \
-    --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \
-    --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \
-    --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \
-    --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \
-    --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \
-    --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4
-    # via google-resumable-media
-google-resumable-media==2.5.0 \
-    --hash=sha256:218931e8e2b2a73a58eb354a288e03a0fd5fb1c4583261ac6e4c078666468c93 \
-    --hash=sha256:da1bd943e2e114a56d85d6848497ebf9be6a14d3db23e9fc57581e7c3e8170ec
-    # via google-cloud-storage
-googleapis-common-protos==1.59.1 \
-    --hash=sha256:0cbedb6fb68f1c07e18eb4c48256320777707e7d0c55063ae56c15db3224a61e \
-    --hash=sha256:b35d530fe825fb4227857bc47ad84c33c809ac96f312e13182bdeaa2abe1178a
-    # via google-api-core
-idna==3.4 \
-    --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
-    --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
-    # via requests
-importlib-metadata==6.8.0 \
-    --hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
-    --hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
-    # via keyring
-jaraco-classes==3.3.0 \
-    --hash=sha256:10afa92b6743f25c0cf5f37c6bb6e18e2c5bb84a16527ccfc0040ea377e7aaeb \
-    --hash=sha256:c063dd08e89217cee02c8d5e5ec560f2c8ce6cdc2fcdc2e68f7b2e5547ed3621
-    # via keyring
-jeepney==0.8.0 \
-    --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \
-    --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755
-    # via
-    #   keyring
-    #   secretstorage
-jinja2==3.1.2 \
-    --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \
-    --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61
-    # via gcp-releasetool
-keyring==24.2.0 \
-    --hash=sha256:4901caaf597bfd3bbd78c9a0c7c4c29fcd8310dab2cffefe749e916b6527acd6 \
-    --hash=sha256:ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509
-    # via gcp-releasetool
-markupsafe==2.1.3 \
-    --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \
-    --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \
-    --hash=sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431 \
-    --hash=sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686 \
-    --hash=sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559 \
-    --hash=sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc \
-    --hash=sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c \
-    --hash=sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0 \
-    --hash=sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4 \
-    --hash=sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9 \
-    --hash=sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575 \
-    --hash=sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba \
-    --hash=sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d \
-    --hash=sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3 \
-    --hash=sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00 \
-    --hash=sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155 \
-    --hash=sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac \
-    --hash=sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52 \
-    --hash=sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f \
-    --hash=sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8 \
-    --hash=sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b \
-    --hash=sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24 \
-    --hash=sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea \
-    --hash=sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198 \
-    --hash=sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0 \
-    --hash=sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee \
-    --hash=sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be \
-    --hash=sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2 \
-    --hash=sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707 \
-    --hash=sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6 \
-    --hash=sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58 \
-    --hash=sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779 \
-    --hash=sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636 \
-    --hash=sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c \
-    --hash=sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad \
-    --hash=sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee \
-    --hash=sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc \
-    --hash=sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2 \
-    --hash=sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48 \
-    --hash=sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7 \
-    --hash=sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e \
-    --hash=sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b \
-    --hash=sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa \
-    --hash=sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5 \
-    --hash=sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e \
-    --hash=sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb \
-    --hash=sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9 \
-    --hash=sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57 \
-    --hash=sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc \
-    --hash=sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2
-    # via jinja2
-more-itertools==9.1.0 \
-    --hash=sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d \
-    --hash=sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3
-    # via jaraco-classes
-packaging==23.1 \
-    --hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \
-    --hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f
-    # via gcp-releasetool
-protobuf==3.20.3 \
-    --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \
-    --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \
-    --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \
-    --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \
-    --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \
-    --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \
-    --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \
-    --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \
-    --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \
-    --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \
-    --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \
-    --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \
-    --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \
-    --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \
-    --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \
-    --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \
-    --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \
-    --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \
-    --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \
-    --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \
-    --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \
-    --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee
-    # via
-    #   gcp-docuploader
-    #   gcp-releasetool
-    #   google-api-core
-    #   googleapis-common-protos
-pyasn1==0.5.0 \
-    --hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \
-    --hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde
-    # via
-    #   pyasn1-modules
-    #   rsa
-pyasn1-modules==0.3.0 \
-    --hash=sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c \
-    --hash=sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d
-    # via google-auth
-pycparser==2.21 \
-    --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
-    --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-    # via cffi
-pyjwt==2.7.0 \
-    --hash=sha256:ba2b425b15ad5ef12f200dc67dd56af4e26de2331f965c5439994dad075876e1 \
-    --hash=sha256:bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074
-    # via gcp-releasetool
-pyperclip==1.8.2 \
-    --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57
-    # via gcp-releasetool
-python-dateutil==2.8.2 \
-    --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
-    --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
-    # via gcp-releasetool
-requests==2.31.0 \
-    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
-    --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
-    # via
-    #   gcp-releasetool
-    #   google-api-core
-    #   google-cloud-storage
-rsa==4.9 \
-    --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \
-    --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21
-    # via google-auth
-secretstorage==3.3.3 \
-    --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \
-    --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99
-    # via keyring
-six==1.16.0 \
-    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
-    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
-    # via
-    #   gcp-docuploader
-    #   google-auth
-    #   python-dateutil
-typing-extensions==4.7.1 \
-    --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
-    --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
-    # via -r requirements.in
-urllib3==1.26.18 \
-    --hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \
-    --hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0
-    # via
-    #   google-auth
-    #   requests
-wheel==0.40.0 \
-    --hash=sha256:cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873 \
-    --hash=sha256:d236b20e7cb522daf2390fa84c55eea81c5c30190f90f29ae2ca1ad8355bf247
-    # via -r requirements.in
-zipp==3.16.1 \
-    --hash=sha256:0b37c326d826d5ca35f2b9685cd750292740774ef16190008b00a0227c256fe0 \
-    --hash=sha256:857b158da2cbf427b376da1c24fd11faecbac5a4ac7523c3607f8a01f94c2ec0
-    # via importlib-metadata
-
-# WARNING: The following packages were not pinned, but pip requires them to be
-# pinned when the requirements file includes hashes and the requirement is not
-# satisfied by a package already installed. Consider using the --allow-unsafe flag.
-# setuptools
diff --git a/owlbot.py b/owlbot.py
index f96943ca5458..777fbbff208f 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -51,4 +51,6 @@
     '.kokoro/presubmit/graalvm-native-17.cfg',
     '.kokoro/nightly/integration.cfg',
     '.kokoro/nightly/java11-integration.cfg',
+    '.kokoro/requirements.in',
+    '.kokoro/requirements.txt'
 ])

From cebf753127cdcb6af1d4e3ce5fa6ea4b1293836c Mon Sep 17 00:00:00 2001
From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:06:56 +0000
Subject: [PATCH 1303/1784] chore: add an unmanaged dependency check (#1290)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: add an unmanaged dependency check

* 🦉 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 
---
 .../workflows/unmanaged-dependency-check.yaml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/unmanaged-dependency-check.yaml

diff --git a/.github/workflows/unmanaged-dependency-check.yaml b/.github/workflows/unmanaged-dependency-check.yaml
new file mode 100644
index 000000000000..8261645b14fa
--- /dev/null
+++ b/.github/workflows/unmanaged-dependency-check.yaml
@@ -0,0 +1,19 @@
+on:
+  pull_request:
+name: Unmanaged dependency check
+jobs:
+  unmanaged_dependency_check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+    - name: Install modules
+      shell: bash
+      run: .kokoro/build.sh
+    - name: Unmanaged dependency check
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@unmanaged-dependencies-check-latest
+      with:
+        bom-path: google-cloud-datastore-bom/pom.xml

From 250f8305e132ae0c7b3453c3992f4551cd409096 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 29 Jan 2024 20:42:15 +0100
Subject: [PATCH 1304/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.31.0 (#1306)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.30.0` -> `26.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.30.0/26.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.30.0/26.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.31.0`](https://togithub.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26310-2024-01-29)

[Compare Source](https://togithub.com/googleapis/java-cloud-bom/compare/v26.30.0...v26.31.0)

##### Dependencies

-   update actions/checkout action to v4 ([#​6386](https://togithub.com/googleapis/java-cloud-bom/issues/6386)) ([9bc892c](https://togithub.com/googleapis/java-cloud-bom/commit/9bc892c56015679d722243595e2954cd46dbbdc3))
-   update actions/github-script action to v7 ([#​6387](https://togithub.com/googleapis/java-cloud-bom/issues/6387)) ([e23605f](https://togithub.com/googleapis/java-cloud-bom/commit/e23605f6f5b5c952de86a94e8d61eeb3ebf9b936))
-   update actions/setup-java action to v4 ([#​6388](https://togithub.com/googleapis/java-cloud-bom/issues/6388)) ([8d69512](https://togithub.com/googleapis/java-cloud-bom/commit/8d695124ebe2ec7e28f24036ec2a1bab9a2795d7))
-   update actions/setup-node action to v4 ([#​6373](https://togithub.com/googleapis/java-cloud-bom/issues/6373)) ([668d7f2](https://togithub.com/googleapis/java-cloud-bom/commit/668d7f20e2ea00caf19979a38c5bdd9690656f43))
-   update dependency com.google.cloud:first-party-dependencies to v3.22.0 ([#​6369](https://togithub.com/googleapis/java-cloud-bom/issues/6369)) ([1254cd7](https://togithub.com/googleapis/java-cloud-bom/commit/1254cd71d6b531a452da42e32724ce46c40bb4d9))
-   update dependency com.google.cloud:first-party-dependencies to v3.23.0 ([#​6379](https://togithub.com/googleapis/java-cloud-bom/issues/6379)) ([1878f47](https://togithub.com/googleapis/java-cloud-bom/commit/1878f474366ce507aa120d3edbfaaad6d50169d9))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.28.0 ([#​6378](https://togithub.com/googleapis/java-cloud-bom/issues/6378)) ([beb3b60](https://togithub.com/googleapis/java-cloud-bom/commit/beb3b604480e2180ad6888f8772f7f2489597065))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.37.0 ([#​6392](https://togithub.com/googleapis/java-cloud-bom/issues/6392)) ([60d9c13](https://togithub.com/googleapis/java-cloud-bom/commit/60d9c13e54856619a2e4bca27224c867bdebbb3e))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.0.1 ([#​6384](https://togithub.com/googleapis/java-cloud-bom/issues/6384)) ([1a5ad2b](https://togithub.com/googleapis/java-cloud-bom/commit/1a5ad2b0adb8c740d356b6d175256b3d782330d8))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.32.0 ([#​6389](https://togithub.com/googleapis/java-cloud-bom/issues/6389)) ([e1f850a](https://togithub.com/googleapis/java-cloud-bom/commit/e1f850a8e24a2a0f891c789afdc95fd1349a7bb9))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.18.1 ([#​6374](https://togithub.com/googleapis/java-cloud-bom/issues/6374)) ([439c119](https://togithub.com/googleapis/java-cloud-bom/commit/439c1197515ab86aebe66405a94a917d073b3949))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.18.2 ([#​6381](https://togithub.com/googleapis/java-cloud-bom/issues/6381)) ([eb61d11](https://togithub.com/googleapis/java-cloud-bom/commit/eb61d1196e284ace19bae29a92086277a596cf61))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.16.1 ([#​6391](https://togithub.com/googleapis/java-cloud-bom/issues/6391)) ([660df5e](https://togithub.com/googleapis/java-cloud-bom/commit/660df5e5a04839524c56efcac9a344439b65ae4c))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.15.16 ([#​6385](https://togithub.com/googleapis/java-cloud-bom/issues/6385)) ([c69a103](https://togithub.com/googleapis/java-cloud-bom/commit/c69a10362266201259bd5ca7764f0be2f37f6c7f))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.0-alpha ([#​6393](https://togithub.com/googleapis/java-cloud-bom/issues/6393)) ([c48a76a](https://togithub.com/googleapis/java-cloud-bom/commit/c48a76a3e25da832351284ea426fc09fd637d20e))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.0-alpha ([#​6394](https://togithub.com/googleapis/java-cloud-bom/issues/6394)) ([5c7b9e1](https://togithub.com/googleapis/java-cloud-bom/commit/5c7b9e189c7a00127e5a3d07b5ded39aa6dade84))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.10 ([#​6376](https://togithub.com/googleapis/java-cloud-bom/issues/6376)) ([91f441c](https://togithub.com/googleapis/java-cloud-bom/commit/91f441caafa882f1e3b540958983dfceb4af0114))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.11 ([#​6382](https://togithub.com/googleapis/java-cloud-bom/issues/6382)) ([22112ae](https://togithub.com/googleapis/java-cloud-bom/commit/22112ae0417b9153559d265444861f76ecf7692a))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.126.1 ([#​6383](https://togithub.com/googleapis/java-cloud-bom/issues/6383)) ([3d89c3f](https://togithub.com/googleapis/java-cloud-bom/commit/3d89c3f81355ceeb020ab4c882e1b60131be5666))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.126.2 ([#​6395](https://togithub.com/googleapis/java-cloud-bom/issues/6395)) ([88ab161](https://togithub.com/googleapis/java-cloud-bom/commit/88ab16154b41f277b636d7f7acfb89eb5e84ef0e))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.12.21 ([#​6396](https://togithub.com/googleapis/java-cloud-bom/issues/6396)) ([965f2b9](https://togithub.com/googleapis/java-cloud-bom/commit/965f2b9cd1815ee60acd4f4b85f0d53bb6ef2e7b))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.57.0 ([#​6397](https://togithub.com/googleapis/java-cloud-bom/issues/6397)) ([466896d](https://togithub.com/googleapis/java-cloud-bom/commit/466896d810955f2fa16769861875b06bfb577a98))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.57.0 ([#​6399](https://togithub.com/googleapis/java-cloud-bom/issues/6399)) ([085bb3a](https://togithub.com/googleapis/java-cloud-bom/commit/085bb3afc7afc85bb5ff3934bee0bb9777a7836b))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.15.2 ([#​6398](https://togithub.com/googleapis/java-cloud-bom/issues/6398)) ([a111325](https://togithub.com/googleapis/java-cloud-bom/commit/a1113259dc90b062be67d58c645923acc0e83fb1))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.32.0 ([#​6375](https://togithub.com/googleapis/java-cloud-bom/issues/6375)) ([f346ab6](https://togithub.com/googleapis/java-cloud-bom/commit/f346ab62eb696c6bbdbcd5e465bbd4c5c5dc4694))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.32.1 ([#​6380](https://togithub.com/googleapis/java-cloud-bom/issues/6380)) ([8983976](https://togithub.com/googleapis/java-cloud-bom/commit/89839760839a9b512abc282f2f0847b834132357))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e9408beada5f..5a1e9f9a99b3 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.30.0
+      26.31.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.30.0')
+implementation platform('com.google.cloud:libraries-bom:26.31.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 88ba1a66239e..0bb18a3c28f0 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.30.0
+        26.31.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 766cad1cbc2f..4771bf6c80aa 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.30.0
+        26.31.0
         pom
         import
       

From c1e7c6201e0e35469df1492a4ce61bf6a095f8be Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:42:16 +0000
Subject: [PATCH 1305/1784] fix: remove types QueryMode, QueryPlan,
 ResultSetStats (#1304)

- [ ] Regenerate this pull request now.

fix: remove QueryMode field from RunQueryRequest
fix: remove ResultSetStats field from RunQueryResponse
fix: remove QueryMode field from RunAggregationQueryRequest
fix: remove ResultSetStats field from RunAggregationQueryResponse

PiperOrigin-RevId: 601486345

Source-Link: https://togithub.com/googleapis/googleapis/commit/4a6230d5fd2034a994794681b56bc7d04d9e1efd

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/db652ee83ed65816ec6d910d965458d684a31c73
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGI2NTJlZTgzZWQ2NTgxNmVjNmQ5MTBkOTY1NDU4ZDY4NGEzMWM3MyJ9
---
 .../admin/v1/DatastoreAdminGrpc.java          |    2 +-
 .../datastore/admin/v1/CommonMetadata.java    |    2 +-
 .../admin/v1/CommonMetadataOrBuilder.java     |    2 +-
 .../admin/v1/CreateIndexRequest.java          |    2 +-
 .../admin/v1/CreateIndexRequestOrBuilder.java |    2 +-
 .../admin/v1/DatastoreAdminProto.java         |    2 +-
 .../DatastoreFirestoreMigrationMetadata.java  |    2 +-
 ...reFirestoreMigrationMetadataOrBuilder.java |    2 +-
 .../admin/v1/DeleteIndexRequest.java          |    2 +-
 .../admin/v1/DeleteIndexRequestOrBuilder.java |    2 +-
 .../datastore/admin/v1/EntityFilter.java      |    2 +-
 .../admin/v1/EntityFilterOrBuilder.java       |    2 +-
 .../admin/v1/ExportEntitiesMetadata.java      |    2 +-
 .../v1/ExportEntitiesMetadataOrBuilder.java   |    2 +-
 .../admin/v1/ExportEntitiesRequest.java       |    2 +-
 .../v1/ExportEntitiesRequestOrBuilder.java    |    2 +-
 .../admin/v1/ExportEntitiesResponse.java      |    2 +-
 .../v1/ExportEntitiesResponseOrBuilder.java   |    2 +-
 .../datastore/admin/v1/GetIndexRequest.java   |    2 +-
 .../admin/v1/GetIndexRequestOrBuilder.java    |    2 +-
 .../admin/v1/ImportEntitiesMetadata.java      |    2 +-
 .../v1/ImportEntitiesMetadataOrBuilder.java   |    2 +-
 .../admin/v1/ImportEntitiesRequest.java       |    2 +-
 .../v1/ImportEntitiesRequestOrBuilder.java    |    2 +-
 .../com/google/datastore/admin/v1/Index.java  |    2 +-
 .../admin/v1/IndexOperationMetadata.java      |    2 +-
 .../v1/IndexOperationMetadataOrBuilder.java   |    2 +-
 .../datastore/admin/v1/IndexOrBuilder.java    |    2 +-
 .../google/datastore/admin/v1/IndexProto.java |    2 +-
 .../admin/v1/ListIndexesRequest.java          |    2 +-
 .../admin/v1/ListIndexesRequestOrBuilder.java |    2 +-
 .../admin/v1/ListIndexesResponse.java         |    2 +-
 .../v1/ListIndexesResponseOrBuilder.java      |    2 +-
 .../admin/v1/MigrationProgressEvent.java      |    2 +-
 .../v1/MigrationProgressEventOrBuilder.java   |    2 +-
 .../datastore/admin/v1/MigrationProto.java    |    2 +-
 .../datastore/admin/v1/MigrationState.java    |    2 +-
 .../admin/v1/MigrationStateEvent.java         |    2 +-
 .../v1/MigrationStateEventOrBuilder.java      |    2 +-
 .../datastore/admin/v1/MigrationStep.java     |    2 +-
 .../datastore/admin/v1/OperationType.java     |    2 +-
 .../google/datastore/admin/v1/Progress.java   |    2 +-
 .../datastore/admin/v1/ProgressOrBuilder.java |    2 +-
 .../clirr-ignored-differences.xml             |   42 +
 .../google/datastore/v1/AggregationQuery.java |    2 +-
 .../v1/AggregationQueryOrBuilder.java         |    2 +-
 .../datastore/v1/AggregationResult.java       |    2 +-
 .../datastore/v1/AggregationResultBatch.java  |    2 +-
 .../v1/AggregationResultBatchOrBuilder.java   |    2 +-
 .../v1/AggregationResultOrBuilder.java        |    2 +-
 .../datastore/v1/AggregationResultProto.java  |    2 +-
 .../datastore/v1/AllocateIdsRequest.java      |    2 +-
 .../v1/AllocateIdsRequestOrBuilder.java       |    2 +-
 .../datastore/v1/AllocateIdsResponse.java     |    2 +-
 .../v1/AllocateIdsResponseOrBuilder.java      |    2 +-
 .../com/google/datastore/v1/ArrayValue.java   |    2 +-
 .../datastore/v1/ArrayValueOrBuilder.java     |    2 +-
 .../datastore/v1/BeginTransactionRequest.java |    2 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |    2 +-
 .../v1/BeginTransactionResponse.java          |    2 +-
 .../v1/BeginTransactionResponseOrBuilder.java |    2 +-
 .../google/datastore/v1/CommitRequest.java    |    2 +-
 .../datastore/v1/CommitRequestOrBuilder.java  |    2 +-
 .../google/datastore/v1/CommitResponse.java   |    2 +-
 .../datastore/v1/CommitResponseOrBuilder.java |    2 +-
 .../google/datastore/v1/CompositeFilter.java  |    2 +-
 .../v1/CompositeFilterOrBuilder.java          |    2 +-
 .../google/datastore/v1/DatastoreProto.java   |  292 +++--
 .../java/com/google/datastore/v1/Entity.java  |    2 +-
 .../google/datastore/v1/EntityOrBuilder.java  |    2 +-
 .../com/google/datastore/v1/EntityProto.java  |    2 +-
 .../com/google/datastore/v1/EntityResult.java |    2 +-
 .../datastore/v1/EntityResultOrBuilder.java   |    2 +-
 .../java/com/google/datastore/v1/Filter.java  |    2 +-
 .../google/datastore/v1/FilterOrBuilder.java  |    2 +-
 .../com/google/datastore/v1/GqlQuery.java     |    2 +-
 .../datastore/v1/GqlQueryOrBuilder.java       |    2 +-
 .../datastore/v1/GqlQueryParameter.java       |    2 +-
 .../v1/GqlQueryParameterOrBuilder.java        |    2 +-
 .../java/com/google/datastore/v1/Key.java     |    2 +-
 .../com/google/datastore/v1/KeyOrBuilder.java |    2 +-
 .../google/datastore/v1/KindExpression.java   |    2 +-
 .../datastore/v1/KindExpressionOrBuilder.java |    2 +-
 .../google/datastore/v1/LookupRequest.java    |    2 +-
 .../datastore/v1/LookupRequestOrBuilder.java  |    2 +-
 .../google/datastore/v1/LookupResponse.java   |    2 +-
 .../datastore/v1/LookupResponseOrBuilder.java |    2 +-
 .../com/google/datastore/v1/Mutation.java     |    2 +-
 .../datastore/v1/MutationOrBuilder.java       |    2 +-
 .../google/datastore/v1/MutationResult.java   |    2 +-
 .../datastore/v1/MutationResultOrBuilder.java |    2 +-
 .../com/google/datastore/v1/PartitionId.java  |    2 +-
 .../datastore/v1/PartitionIdOrBuilder.java    |    2 +-
 .../com/google/datastore/v1/Projection.java   |    2 +-
 .../datastore/v1/ProjectionOrBuilder.java     |    2 +-
 .../google/datastore/v1/PropertyFilter.java   |    2 +-
 .../datastore/v1/PropertyFilterOrBuilder.java |    2 +-
 .../google/datastore/v1/PropertyOrder.java    |    2 +-
 .../datastore/v1/PropertyOrderOrBuilder.java  |    2 +-
 .../datastore/v1/PropertyReference.java       |    2 +-
 .../v1/PropertyReferenceOrBuilder.java        |    2 +-
 .../java/com/google/datastore/v1/Query.java   |    2 +-
 .../com/google/datastore/v1/QueryMode.java    |  180 ---
 .../google/datastore/v1/QueryOrBuilder.java   |    2 +-
 .../com/google/datastore/v1/QueryPlan.java    |  777 ------------
 .../datastore/v1/QueryPlanOrBuilder.java      |   81 --
 .../datastore/v1/QueryProfileProto.java       |   87 --
 .../com/google/datastore/v1/QueryProto.java   |    2 +-
 .../google/datastore/v1/QueryResultBatch.java |    2 +-
 .../v1/QueryResultBatchOrBuilder.java         |    2 +-
 .../com/google/datastore/v1/ReadOptions.java  |    2 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |    2 +-
 .../datastore/v1/ReserveIdsRequest.java       |    2 +-
 .../v1/ReserveIdsRequestOrBuilder.java        |    2 +-
 .../datastore/v1/ReserveIdsResponse.java      |    2 +-
 .../v1/ReserveIdsResponseOrBuilder.java       |    2 +-
 .../google/datastore/v1/ResultSetStats.java   | 1075 -----------------
 .../datastore/v1/ResultSetStatsOrBuilder.java |  125 --
 .../google/datastore/v1/RollbackRequest.java  |    2 +-
 .../v1/RollbackRequestOrBuilder.java          |    2 +-
 .../google/datastore/v1/RollbackResponse.java |    2 +-
 .../v1/RollbackResponseOrBuilder.java         |    2 +-
 .../v1/RunAggregationQueryRequest.java        |  169 +--
 .../RunAggregationQueryRequestOrBuilder.java  |   33 +-
 .../v1/RunAggregationQueryResponse.java       |  298 +----
 .../RunAggregationQueryResponseOrBuilder.java |   46 +-
 .../google/datastore/v1/RunQueryRequest.java  |  169 +--
 .../v1/RunQueryRequestOrBuilder.java          |   33 +-
 .../google/datastore/v1/RunQueryResponse.java |  298 +----
 .../v1/RunQueryResponseOrBuilder.java         |   46 +-
 .../datastore/v1/TransactionOptions.java      |    2 +-
 .../v1/TransactionOptionsOrBuilder.java       |    2 +-
 .../java/com/google/datastore/v1/Value.java   |    2 +-
 .../google/datastore/v1/ValueOrBuilder.java   |    2 +-
 .../proto/google/datastore/v1/datastore.proto |   23 -
 .../google/datastore/v1/query_profile.proto   |   75 --
 136 files changed, 309 insertions(+), 3776 deletions(-)
 delete mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryMode.java
 delete mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java
 delete mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java
 delete mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
 delete mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStats.java
 delete mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
 delete mode 100644 proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto

diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index e923188921a3..3e36d55f53be 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 3572223d1c1d..1ad218b43d32 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 057b75e24ef0..6430de1b118b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 80b758ca3ab9..281c1ce27d8b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index 9925cac17960..59cc7c3bceda 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index e82c10f34457..c3074534f410 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index 0687bd2d95a1..49f6fb080def 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index f4e5235e8e11..b7ac41a5eae3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 13d385d0c51a..02e1289056dc 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index 26a4a020b152..b99fc3206080 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a76937b369c4..aa77a7852949 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 35306e67ec0f..021a7bd71098 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 86d3fa228155..960e5093f831 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index 85665dbcec1b..3cf97cd971bf 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 57d21e691cff..baa65d84be28 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c542b562c1f0..396d34a61cc6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 48620237540e..db977ed1b8fd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index ddcbad38151e..d33d34615f44 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 84cd35a266dc..f4b557fcdc27 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index 38801c30f09f..8c56001db7bb 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0d1a82b8fe4b..2c32d45a9f2e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 8dbf67421ee6..3b7565c3d008 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 ee9b39b566ef..e3ba7f3aef57 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 dcf83c997c0d..26d6066bc10b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 57a41fc3ea14..57740ae48648 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 cf2a7e510e2f..bc92eda84088 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index 41074813626e..c8897f8b91c7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 6445c073da09..4736c5d15a0d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1f9c2b5e469c..89af3dc4143b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 33825d2ddfae..f1be57c39dba 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index 68e7fa58ed0d..1ee9ba419162 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4a821cfbdb39..d3c21dae053a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index 10d4bac43586..82bf6cb8b193 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 525963f0ace7..2e0039b2862f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 20442f9a6b84..192b6933937f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 8d96d3df98c9..e521386dbd6b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index 1a30a4fb2bb9..a2fee45454bf 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 f8b58487c486..4aa40d5b3d20 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 970c9c8aabbb..080d9f1f581c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index f30bd8f8e688..f3a1a0c9b3d3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index ddd45f78dfaf..14b66b761a61 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a24f906ff13f..c5719b688550 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index eb80ba52204f..4a1a97d73a5e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
index e59f11f80a9f..064bc1b32556 100644
--- a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
@@ -16,4 +16,46 @@
     com/google/datastore/v1/*OrBuilder
     boolean contains*(*)
   
+
+
+    
+        com/google/datastore/v1/QueryMode
+        *
+        8001
+    
+    
+        com/google/datastore/v1/QueryPlan*
+        *
+        8001
+    
+    
+        com/google/datastore/v1/QueryProfileProto
+        *
+        8001
+    
+    
+        com/google/datastore/v1/ResultSetStats*
+        *
+        8001
+    
+    
+        com/google/datastore/v1/*
+        *Mode*
+        7002
+    
+    
+        com/google/datastore/v1/*
+        *Stats*
+        7002
+    
+    
+        com/google/datastore/v1/*
+        MODE_FIELD_NUMBER
+        6011
+    
+    
+        com/google/datastore/v1/*
+        STATS_FIELD_NUMBER
+        6011
+    
 
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 762c9713ce56..005fb5f42237 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 cb14e67d7d5f..585443a69127 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e1737515e7f5..b695c9a16f25 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4792b0a9c88d..1031ad15a8c8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 67167caf2e0c..3f5daa2c4ab5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 436fba072250..d327f8b9a50a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index 3a2806e8644e..a1eabf9d4fee 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 bcd0a649d279..20aa6f03051e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0a169d2612e1..3ab3bbc56bd3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9301de743f35..7a6b97e15fa1 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 612cb9407c06..4a27c43daed7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 66c8d0078d57..08e18ed6cd38 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index 4aa9cafc45be..e34fa65d8ce4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a92900cd5092..a4c7a0e2a752 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 33c17bc1b765..2b1fcec80bff 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 95976d70350a..b5cfc736030f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index e04fdaaa78ea..2abe6d5e3750 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 ee3ab5f4a540..87c8e1ed6382 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 842e268cb6e9..118e22cf3b95 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 903fd6a172b7..320d030e0357 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 5a08d67f049f..5deda13069d5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9996cbdb7235..a0a92b296045 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6403eb13e30c..30a72edf5127 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b87fdafea5c4..95d5f9db4e5f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,152 +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\'google/datastore/v1/query_profile"
-          + ".proto\032\037google/protobuf/timestamp.proto\""
-          + "\244\001\n\rLookupRequest\022\030\n\nproject_id\030\010 \001(\tB\004\342"
-          + "A\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.Key"
-          + "B\004\342A\001\002\"\346\001\n\016LookupResponse\0220\n\005found\030\001 \003(\013"
-          + "2!.google.datastore.v1.EntityResult\0222\n\007m"
-          + "issing\030\002 \003(\0132!.google.datastore.v1.Entit"
-          + "yResult\022*\n\010deferred\030\003 \003(\0132\030.google.datas"
-          + "tore.v1.Key\022\023\n\013transaction\030\005 \001(\014\022-\n\tread"
-          + "_time\030\007 \001(\0132\032.google.protobuf.Timestamp\""
-          + "\323\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_"
-          + "id\030\002 \001(\0132 .google.datastore.v1.Partition"
-          + "Id\0226\n\014read_options\030\001 \001(\0132 .google.datast"
-          + "ore.v1.ReadOptions\022+\n\005query\030\003 \001(\0132\032.goog"
-          + "le.datastore.v1.QueryH\000\0222\n\tgql_query\030\007 \001"
-          + "(\0132\035.google.datastore.v1.GqlQueryH\000\0222\n\004m"
-          + "ode\030\013 \001(\0162\036.google.datastore.v1.QueryMod"
-          + "eB\004\342A\001\001B\014\n\nquery_type\"\274\001\n\020RunQueryRespon"
-          + "se\0224\n\005batch\030\001 \001(\0132%.google.datastore.v1."
-          + "QueryResultBatch\022)\n\005query\030\002 \001(\0132\032.google"
-          + ".datastore.v1.Query\022\023\n\013transaction\030\005 \001(\014"
-          + "\0222\n\005stats\030\006 \001(\0132#.google.datastore.v1.Re"
-          + "sultSetStats\"\365\002\n\032RunAggregationQueryRequ"
+          + "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\0226\n\014partition_id\030\002 \001(\0132 .googl"
-          + "e.datastore.v1.PartitionId\0226\n\014read_optio"
-          + "ns\030\001 \001(\0132 .google.datastore.v1.ReadOptio"
-          + "ns\022B\n\021aggregation_query\030\003 \001(\0132%.google.d"
-          + "atastore.v1.AggregationQueryH\000\0222\n\tgql_qu"
-          + "ery\030\007 \001(\0132\035.google.datastore.v1.GqlQuery"
-          + "H\000\0222\n\004mode\030\n \001(\0162\036.google.datastore.v1.Q"
-          + "ueryModeB\004\342A\001\001B\014\n\nquery_type\"\330\001\n\033RunAggr"
-          + "egationQueryResponse\022:\n\005batch\030\001 \001(\0132+.go"
-          + "ogle.datastore.v1.AggregationResultBatch"
-          + "\0224\n\005query\030\002 \001(\0132%.google.datastore.v1.Ag"
-          + "gregationQuery\022\023\n\013transaction\030\005 \001(\014\0222\n\005s"
-          + "tats\030\006 \001(\0132#.google.datastore.v1.ResultS"
-          + "etStats\"\216\001\n\027BeginTransactionRequest\022\030\n\np"
-          + "roject_id\030\010 \001(\tB\004\342A\001\002\022\023\n\013database_id\030\t \001"
-          + "(\t\022D\n\023transaction_options\030\n \001(\0132\'.google"
-          + ".datastore.v1.TransactionOptions\"/\n\030Begi"
-          + "nTransactionResponse\022\023\n\013transaction\030\001 \001("
-          + "\014\"[\n\017RollbackRequest\022\030\n\nproject_id\030\010 \001(\t"
-          + "B\004\342A\001\002\022\023\n\013database_id\030\t \001(\t\022\031\n\013transacti"
-          + "on\030\001 \001(\014B\004\342A\001\002\"\022\n\020RollbackResponse\"\351\002\n\rC"
-          + "ommitRequest\022\030\n\nproject_id\030\010 \001(\tB\004\342A\001\002\022\023"
-          + "\n\013database_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.goog"
-          + "le.datastore.v1.CommitRequest.Mode\022\025\n\013tr"
-          + "ansaction\030\001 \001(\014H\000\022I\n\026single_use_transact"
-          + "ion\030\n \001(\0132\'.google.datastore.v1.Transact"
-          + "ionOptionsH\000\0220\n\tmutations\030\006 \003(\0132\035.google"
-          + ".datastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_U"
-          + "NSPECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_T"
-          + "RANSACTIONAL\020\002B\026\n\024transaction_selector\"\227"
-          + "\001\n\016CommitResponse\022=\n\020mutation_results\030\003 "
-          + "\003(\0132#.google.datastore.v1.MutationResult"
-          + "\022\025\n\rindex_updates\030\004 \001(\005\022/\n\013commit_time\030\010"
-          + " \001(\0132\032.google.protobuf.Timestamp\"q\n\022Allo"
-          + "cateIdsRequest\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.go"
-          + "ogle.datastore.v1.KeyB\004\342A\001\002\"=\n\023AllocateI"
-          + "dsResponse\022&\n\004keys\030\001 \003(\0132\030.google.datast"
-          + "ore.v1.Key\"p\n\021ReserveIdsRequest\022\030\n\nproje"
-          + "ct_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\022ReserveIdsResponse\"\272\002\n\010Mutation\022"
-          + "-\n\006insert\030\004 \001(\0132\033.google.datastore.v1.En"
-          + "tityH\000\022-\n\006update\030\005 \001(\0132\033.google.datastor"
-          + "e.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.d"
-          + "atastore.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.g"
-          + "oogle.datastore.v1.KeyH\000\022\026\n\014base_version"
-          + "\030\010 \001(\003H\001\0221\n\013update_time\030\013 \001(\0132\032.google.p"
-          + "rotobuf.TimestampH\001B\013\n\toperationB\035\n\033conf"
-          + "lict_detection_strategy\"\305\001\n\016MutationResu"
-          + "lt\022%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Ke"
-          + "y\022\017\n\007version\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132"
-          + "\032.google.protobuf.Timestamp\022/\n\013update_ti"
-          + "me\030\006 \001(\0132\032.google.protobuf.Timestamp\022\031\n\021"
-          + "conflict_detected\030\005 \001(\010\"\312\002\n\013ReadOptions\022"
-          + "L\n\020read_consistency\030\001 \001(\01620.google.datas"
-          + "tore.v1.ReadOptions.ReadConsistencyH\000\022\025\n"
-          + "\013transaction\030\002 \001(\014H\000\022B\n\017new_transaction\030"
-          + "\003 \001(\0132\'.google.datastore.v1.TransactionO"
-          + "ptionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.pro"
-          + "tobuf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034"
-          + "READ_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG"
-          + "\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n"
-          + "\022TransactionOptions\022G\n\nread_write\030\001 \001(\0132"
-          + "1.google.datastore.v1.TransactionOptions"
-          + ".ReadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google"
-          + ".datastore.v1.TransactionOptions.ReadOnl"
-          + "yH\000\032)\n\tReadWrite\022\034\n\024previous_transaction"
-          + "\030\001 \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032."
-          + "google.protobuf.TimestampB\006\n\004mode2\341\r\n\tDa"
-          + "tastore\022\300\001\n\006Lookup\022\".google.datastore.v1"
-          + ".LookupRequest\032#.google.datastore.v1.Loo"
-          + "kupResponse\"m\332A\034project_id,read_options,"
-          + "keys\202\323\344\223\002%\" /v1/projects/{project_id}:lo"
-          + "okup:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_"
-          + "id\022\251\001\n\010RunQuery\022$.google.datastore.v1.Ru"
-          + "nQueryRequest\032%.google.datastore.v1.RunQ"
-          + "ueryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{proj"
-          + "ect_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022"
-          + "\r\n\013database_id\022\325\001\n\023RunAggregationQuery\022/"
+          + "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"
-          + "Request\0320.google.datastore.v1.RunAggrega"
-          + "tionQueryResponse\"[\202\323\344\223\0022\"-/v1/projects/"
-          + "{project_id}:runAggregationQuery:\001*\212\323\344\223\002"
-          + "\035\022\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020Begin"
-          + "Transaction\022,.google.datastore.v1.BeginT"
-          + "ransactionRequest\032-.google.datastore.v1."
-          + "BeginTransactionResponse\"e\332A\nproject_id\202"
-          + "\323\344\223\002/\"*/v1/projects/{project_id}:beginTr"
-          + "ansaction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013data"
-          + "base_id\022\346\001\n\006Commit\022\".google.datastore.v1"
-          + ".CommitRequest\032#.google.datastore.v1.Com"
-          + "mitResponse\"\222\001\332A%project_id,mode,transac"
-          + "tion,mutations\332A\031project_id,mode,mutatio"
-          + "ns\202\323\344\223\002%\" /v1/projects/{project_id}:comm"
-          + "it:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
-          + "\022\302\001\n\010Rollback\022$.google.datastore.v1.Roll"
-          + "backRequest\032%.google.datastore.v1.Rollba"
-          + "ckResponse\"i\332A\026project_id,transaction\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\022\307\001"
-          + "\n\013AllocateIds\022\'.google.datastore.v1.Allo"
-          + "cateIdsRequest\032(.google.datastore.v1.All"
-          + "ocateIdsResponse\"e\332A\017project_id,keys\202\323\344\223"
-          + "\002*\"%/v1/projects/{project_id}:allocateId"
-          + "s:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022"
-          + "\303\001\n\nReserveIds\022&.google.datastore.v1.Res"
-          + "erveIdsRequest\032\'.google.datastore.v1.Res"
-          + "erveIdsResponse\"d\332A\017project_id,keys\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\032v\312"
-          + "A\030datastore.googleapis.com\322AXhttps://www"
-          + ".googleapis.com/auth/cloud-platform,http"
-          + "s://www.googleapis.com/auth/datastoreB\300\001"
-          + "\n\027com.google.datastore.v1B\016DatastoreProt"
-          + "oP\001Z
- * The mode in which the query request must be processed.
- * 
- *
- * Protobuf enum {@code google.datastore.v1.QueryMode}
- */
-public enum QueryMode implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   *
-   *
-   * 
    -   * The default mode. Only the query results are returned.
-   * 
    
-   *
-   * NORMAL = 0;
-   */
-  NORMAL(0),
-  /**
-   *
-   *
-   * 
    -   * This mode returns only the query plan, without any results or execution
-   * statistics information.
-   * 
    
-   *
-   * PLAN = 1;
-   */
-  PLAN(1),
-  /**
-   *
-   *
-   * 
    -   * This mode returns both the query plan and the execution statistics along
-   * with the results.
-   * 
    
-   *
-   * PROFILE = 2;
-   */
-  PROFILE(2),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   *
-   *
-   * 
    -   * The default mode. Only the query results are returned.
-   * 
    
-   *
-   * NORMAL = 0;
-   */
-  public static final int NORMAL_VALUE = 0;
-  /**
-   *
-   *
-   * 
    -   * This mode returns only the query plan, without any results or execution
-   * statistics information.
-   * 
    
-   *
-   * PLAN = 1;
-   */
-  public static final int PLAN_VALUE = 1;
-  /**
-   *
-   *
-   * 
    -   * This mode returns both the query plan and the execution statistics along
-   * with the results.
-   * 
    
-   *
-   * PROFILE = 2;
-   */
-  public static final int PROFILE_VALUE = 2;
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @param value The numeric wire value of the corresponding enum entry.
-   * @return The enum associated with the given numeric wire value.
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static QueryMode valueOf(int value) {
-    return forNumber(value);
-  }
-
-  /**
-   * @param value The numeric wire value of the corresponding enum entry.
-   * @return The enum associated with the given numeric wire value.
-   */
-  public static QueryMode forNumber(int value) {
-    switch (value) {
-      case 0:
-        return NORMAL;
-      case 1:
-        return PLAN;
-      case 2:
-        return PROFILE;
-      default:
-        return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
-    return internalValueMap;
-  }
-
-  private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
-      new com.google.protobuf.Internal.EnumLiteMap() {
-        public QueryMode findValueByNumber(int number) {
-          return QueryMode.forNumber(number);
-        }
-      };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalStateException(
-          "Can't get the descriptor of an unrecognized enum value.");
-    }
-    return getDescriptor().getValues().get(ordinal());
-  }
-
-  public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
-    return getDescriptor();
-  }
-
-  public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProfileProto.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final QueryMode[] VALUES = values();
-
-  public static QueryMode valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private QueryMode(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:google.datastore.v1.QueryMode)
-}
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 91bbc88114bb..3e03609f8cb4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java
deleted file mode 100644
index fd9fc921e1ba..000000000000
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlan.java
+++ /dev/null
@@ -1,777 +0,0 @@
-/*
- * Copyright 2023 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
- *
- *     https://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.
- */
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/datastore/v1/query_profile.proto
-
-package com.google.datastore.v1;
-
-/**
- *
- *
- * 
    - * Plan for the query.
- * 
    
- *
- * Protobuf type {@code google.datastore.v1.QueryPlan}
- */
-public final class QueryPlan extends com.google.protobuf.GeneratedMessageV3
-    implements
-    // @@protoc_insertion_point(message_implements:google.datastore.v1.QueryPlan)
-    QueryPlanOrBuilder {
-  private static final long serialVersionUID = 0L;
-  // Use QueryPlan.newBuilder() to construct.
-  private QueryPlan(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-
-  private QueryPlan() {}
-
-  @java.lang.Override
-  @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
-    return new QueryPlan();
-  }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProfileProto
-        .internal_static_google_datastore_v1_QueryPlan_descriptor;
-  }
-
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProfileProto
-        .internal_static_google_datastore_v1_QueryPlan_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.QueryPlan.class,
-            com.google.datastore.v1.QueryPlan.Builder.class);
-  }
-
-  public static final int PLAN_INFO_FIELD_NUMBER = 1;
-  private com.google.protobuf.Struct planInfo_;
-  /**
-   *
-   *
-   * 
    -   * Planning phase information for the query. It will include:
-   *
-   * {
-   *   "indexes_used": [
-   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-   *   ]
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct plan_info = 1;
-   *
-   * @return Whether the planInfo field is set.
-   */
-  @java.lang.Override
-  public boolean hasPlanInfo() {
-    return planInfo_ != null;
-  }
-  /**
-   *
-   *
-   * 
    -   * Planning phase information for the query. It will include:
-   *
-   * {
-   *   "indexes_used": [
-   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-   *   ]
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct plan_info = 1;
-   *
-   * @return The planInfo.
-   */
-  @java.lang.Override
-  public com.google.protobuf.Struct getPlanInfo() {
-    return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
-  }
-  /**
-   *
-   *
-   * 
    -   * Planning phase information for the query. It will include:
-   *
-   * {
-   *   "indexes_used": [
-   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-   *   ]
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct plan_info = 1;
-   */
-  @java.lang.Override
-  public com.google.protobuf.StructOrBuilder getPlanInfoOrBuilder() {
-    return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-
-  @java.lang.Override
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (planInfo_ != null) {
-      output.writeMessage(1, getPlanInfo());
-    }
-    getUnknownFields().writeTo(output);
-  }
-
-  @java.lang.Override
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (planInfo_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPlanInfo());
-    }
-    size += getUnknownFields().getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof com.google.datastore.v1.QueryPlan)) {
-      return super.equals(obj);
-    }
-    com.google.datastore.v1.QueryPlan other = (com.google.datastore.v1.QueryPlan) obj;
-
-    if (hasPlanInfo() != other.hasPlanInfo()) return false;
-    if (hasPlanInfo()) {
-      if (!getPlanInfo().equals(other.getPlanInfo())) return false;
-    }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
-    return true;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasPlanInfo()) {
-      hash = (37 * hash) + PLAN_INFO_FIELD_NUMBER;
-      hash = (53 * hash) + getPlanInfo().hashCode();
-    }
-    hash = (29 * hash) + getUnknownFields().hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-  }
-
-  public static com.google.datastore.v1.QueryPlan parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
-  }
-
-  @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-
-  public static Builder newBuilder(com.google.datastore.v1.QueryPlan prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-
-  @java.lang.Override
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   *
-   *
-   * 
    -   * Plan for the query.
-   * 
    
-   *
-   * Protobuf type {@code google.datastore.v1.QueryPlan}
-   */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
-      // @@protoc_insertion_point(builder_implements:google.datastore.v1.QueryPlan)
-      com.google.datastore.v1.QueryPlanOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProfileProto
-          .internal_static_google_datastore_v1_QueryPlan_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProfileProto
-          .internal_static_google_datastore_v1_QueryPlan_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.QueryPlan.class,
-              com.google.datastore.v1.QueryPlan.Builder.class);
-    }
-
-    // Construct using com.google.datastore.v1.QueryPlan.newBuilder()
-    private Builder() {}
-
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-    }
-
-    @java.lang.Override
-    public Builder clear() {
-      super.clear();
-      bitField0_ = 0;
-      planInfo_ = null;
-      if (planInfoBuilder_ != null) {
-        planInfoBuilder_.dispose();
-        planInfoBuilder_ = null;
-      }
-      return this;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProfileProto
-          .internal_static_google_datastore_v1_QueryPlan_descriptor;
-    }
-
-    @java.lang.Override
-    public com.google.datastore.v1.QueryPlan getDefaultInstanceForType() {
-      return com.google.datastore.v1.QueryPlan.getDefaultInstance();
-    }
-
-    @java.lang.Override
-    public com.google.datastore.v1.QueryPlan build() {
-      com.google.datastore.v1.QueryPlan result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    @java.lang.Override
-    public com.google.datastore.v1.QueryPlan buildPartial() {
-      com.google.datastore.v1.QueryPlan result = new com.google.datastore.v1.QueryPlan(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.datastore.v1.QueryPlan result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.planInfo_ = planInfoBuilder_ == null ? planInfo_ : planInfoBuilder_.build();
-      }
-    }
-
-    @java.lang.Override
-    public Builder clone() {
-      return super.clone();
-    }
-
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return super.setField(field, value);
-    }
-
-    @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return super.clearField(field);
-    }
-
-    @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return super.clearOneof(oneof);
-    }
-
-    @java.lang.Override
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return super.setRepeatedField(field, index, value);
-    }
-
-    @java.lang.Override
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return super.addRepeatedField(field, value);
-    }
-
-    @java.lang.Override
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.datastore.v1.QueryPlan) {
-        return mergeFrom((com.google.datastore.v1.QueryPlan) other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.datastore.v1.QueryPlan other) {
-      if (other == com.google.datastore.v1.QueryPlan.getDefaultInstance()) return this;
-      if (other.hasPlanInfo()) {
-        mergePlanInfo(other.getPlanInfo());
-      }
-      this.mergeUnknownFields(other.getUnknownFields());
-      onChanged();
-      return this;
-    }
-
-    @java.lang.Override
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    @java.lang.Override
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getPlanInfoFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.unwrapIOException();
-      } finally {
-        onChanged();
-      } // finally
-      return this;
-    }
-
-    private int bitField0_;
-
-    private com.google.protobuf.Struct planInfo_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Struct,
-            com.google.protobuf.Struct.Builder,
-            com.google.protobuf.StructOrBuilder>
-        planInfoBuilder_;
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     *
-     * @return Whether the planInfo field is set.
-     */
-    public boolean hasPlanInfo() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     *
-     * @return The planInfo.
-     */
-    public com.google.protobuf.Struct getPlanInfo() {
-      if (planInfoBuilder_ == null) {
-        return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
-      } else {
-        return planInfoBuilder_.getMessage();
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     */
-    public Builder setPlanInfo(com.google.protobuf.Struct value) {
-      if (planInfoBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        planInfo_ = value;
-      } else {
-        planInfoBuilder_.setMessage(value);
-      }
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     */
-    public Builder setPlanInfo(com.google.protobuf.Struct.Builder builderForValue) {
-      if (planInfoBuilder_ == null) {
-        planInfo_ = builderForValue.build();
-      } else {
-        planInfoBuilder_.setMessage(builderForValue.build());
-      }
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     */
-    public Builder mergePlanInfo(com.google.protobuf.Struct value) {
-      if (planInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && planInfo_ != null
-            && planInfo_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getPlanInfoBuilder().mergeFrom(value);
-        } else {
-          planInfo_ = value;
-        }
-      } else {
-        planInfoBuilder_.mergeFrom(value);
-      }
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     */
-    public Builder clearPlanInfo() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      planInfo_ = null;
-      if (planInfoBuilder_ != null) {
-        planInfoBuilder_.dispose();
-        planInfoBuilder_ = null;
-      }
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     */
-    public com.google.protobuf.Struct.Builder getPlanInfoBuilder() {
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return getPlanInfoFieldBuilder().getBuilder();
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     */
-    public com.google.protobuf.StructOrBuilder getPlanInfoOrBuilder() {
-      if (planInfoBuilder_ != null) {
-        return planInfoBuilder_.getMessageOrBuilder();
-      } else {
-        return planInfo_ == null ? com.google.protobuf.Struct.getDefaultInstance() : planInfo_;
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Planning phase information for the query. It will include:
-     *
-     * {
-     *   "indexes_used": [
-     *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-     *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-     *   ]
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct plan_info = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Struct,
-            com.google.protobuf.Struct.Builder,
-            com.google.protobuf.StructOrBuilder>
-        getPlanInfoFieldBuilder() {
-      if (planInfoBuilder_ == null) {
-        planInfoBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.protobuf.Struct,
-                com.google.protobuf.Struct.Builder,
-                com.google.protobuf.StructOrBuilder>(
-                getPlanInfo(), getParentForChildren(), isClean());
-        planInfo_ = null;
-      }
-      return planInfoBuilder_;
-    }
-
-    @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFields(unknownFields);
-    }
-
-    @java.lang.Override
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-    // @@protoc_insertion_point(builder_scope:google.datastore.v1.QueryPlan)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.datastore.v1.QueryPlan)
-  private static final com.google.datastore.v1.QueryPlan DEFAULT_INSTANCE;
-
-  static {
-    DEFAULT_INSTANCE = new com.google.datastore.v1.QueryPlan();
-  }
-
-  public static com.google.datastore.v1.QueryPlan getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public QueryPlan parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
-        }
-      };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.datastore.v1.QueryPlan getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java
deleted file mode 100644
index dc993225e273..000000000000
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryPlanOrBuilder.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2023 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
- *
- *     https://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.
- */
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/datastore/v1/query_profile.proto
-
-package com.google.datastore.v1;
-
-public interface QueryPlanOrBuilder
-    extends
-    // @@protoc_insertion_point(interface_extends:google.datastore.v1.QueryPlan)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   *
-   *
-   * 
    -   * Planning phase information for the query. It will include:
-   *
-   * {
-   *   "indexes_used": [
-   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-   *   ]
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct plan_info = 1;
-   *
-   * @return Whether the planInfo field is set.
-   */
-  boolean hasPlanInfo();
-  /**
-   *
-   *
-   * 
    -   * Planning phase information for the query. It will include:
-   *
-   * {
-   *   "indexes_used": [
-   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-   *   ]
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct plan_info = 1;
-   *
-   * @return The planInfo.
-   */
-  com.google.protobuf.Struct getPlanInfo();
-  /**
-   *
-   *
-   * 
    -   * Planning phase information for the query. It will include:
-   *
-   * {
-   *   "indexes_used": [
-   *     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-   *     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-   *   ]
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct plan_info = 1;
-   */
-  com.google.protobuf.StructOrBuilder getPlanInfoOrBuilder();
-}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
deleted file mode 100644
index cf0be47e676e..000000000000
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2023 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
- *
- *     https://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.
- */
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/datastore/v1/query_profile.proto
-
-package com.google.datastore.v1;
-
-public final class QueryProfileProto {
-  private QueryProfileProto() {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_QueryPlan_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_datastore_v1_QueryPlan_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_ResultSetStats_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_datastore_v1_ResultSetStats_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
-    return descriptor;
-  }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\'google/datastore/v1/query_profile.prot"
-          + "o\022\023google.datastore.v1\032\034google/protobuf/"
-          + "struct.proto\"7\n\tQueryPlan\022*\n\tplan_info\030\001"
-          + " \001(\0132\027.google.protobuf.Struct\"r\n\016ResultS"
-          + "etStats\0222\n\nquery_plan\030\001 \001(\0132\036.google.dat"
-          + "astore.v1.QueryPlan\022,\n\013query_stats\030\002 \001(\013"
-          + "2\027.google.protobuf.Struct*.\n\tQueryMode\022\n"
-          + "\n\006NORMAL\020\000\022\010\n\004PLAN\020\001\022\013\n\007PROFILE\020\002B\303\001\n\027co"
-          + "m.google.datastore.v1B\021QueryProfileProto"
-          + "P\001Z
- * Planning and execution statistics for the query.
- * 
- *
- * Protobuf type {@code google.datastore.v1.ResultSetStats}
- */
-public final class ResultSetStats extends com.google.protobuf.GeneratedMessageV3
-    implements
-    // @@protoc_insertion_point(message_implements:google.datastore.v1.ResultSetStats)
-    ResultSetStatsOrBuilder {
-  private static final long serialVersionUID = 0L;
-  // Use ResultSetStats.newBuilder() to construct.
-  private ResultSetStats(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-
-  private ResultSetStats() {}
-
-  @java.lang.Override
-  @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
-    return new ResultSetStats();
-  }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProfileProto
-        .internal_static_google_datastore_v1_ResultSetStats_descriptor;
-  }
-
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProfileProto
-        .internal_static_google_datastore_v1_ResultSetStats_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ResultSetStats.class,
-            com.google.datastore.v1.ResultSetStats.Builder.class);
-  }
-
-  public static final int QUERY_PLAN_FIELD_NUMBER = 1;
-  private com.google.datastore.v1.QueryPlan queryPlan_;
-  /**
-   *
-   *
-   * 
    -   * Plan for the query.
-   * 
    
-   *
-   * .google.datastore.v1.QueryPlan query_plan = 1;
-   *
-   * @return Whether the queryPlan field is set.
-   */
-  @java.lang.Override
-  public boolean hasQueryPlan() {
-    return queryPlan_ != null;
-  }
-  /**
-   *
-   *
-   * 
    -   * Plan for the query.
-   * 
    
-   *
-   * .google.datastore.v1.QueryPlan query_plan = 1;
-   *
-   * @return The queryPlan.
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.QueryPlan getQueryPlan() {
-    return queryPlan_ == null ? com.google.datastore.v1.QueryPlan.getDefaultInstance() : queryPlan_;
-  }
-  /**
-   *
-   *
-   * 
    -   * Plan for the query.
-   * 
    
-   *
-   * .google.datastore.v1.QueryPlan query_plan = 1;
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
-    return queryPlan_ == null ? com.google.datastore.v1.QueryPlan.getDefaultInstance() : queryPlan_;
-  }
-
-  public static final int QUERY_STATS_FIELD_NUMBER = 2;
-  private com.google.protobuf.Struct queryStats_;
-  /**
-   *
-   *
-   * 
    -   * Aggregated statistics from the execution of the query.
-   *
-   * This will only be present when the request specifies `PROFILE` mode.
-   * For example, a query will return the statistics including:
-   *
-   * {
-   *   "results_returned": "20",
-   *   "documents_scanned": "20",
-   *   "indexes_entries_scanned": "10050",
-   *   "total_execution_time": "100.7 msecs"
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct query_stats = 2;
-   *
-   * @return Whether the queryStats field is set.
-   */
-  @java.lang.Override
-  public boolean hasQueryStats() {
-    return queryStats_ != null;
-  }
-  /**
-   *
-   *
-   * 
    -   * Aggregated statistics from the execution of the query.
-   *
-   * This will only be present when the request specifies `PROFILE` mode.
-   * For example, a query will return the statistics including:
-   *
-   * {
-   *   "results_returned": "20",
-   *   "documents_scanned": "20",
-   *   "indexes_entries_scanned": "10050",
-   *   "total_execution_time": "100.7 msecs"
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct query_stats = 2;
-   *
-   * @return The queryStats.
-   */
-  @java.lang.Override
-  public com.google.protobuf.Struct getQueryStats() {
-    return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
-  }
-  /**
-   *
-   *
-   * 
    -   * Aggregated statistics from the execution of the query.
-   *
-   * This will only be present when the request specifies `PROFILE` mode.
-   * For example, a query will return the statistics including:
-   *
-   * {
-   *   "results_returned": "20",
-   *   "documents_scanned": "20",
-   *   "indexes_entries_scanned": "10050",
-   *   "total_execution_time": "100.7 msecs"
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct query_stats = 2;
-   */
-  @java.lang.Override
-  public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
-    return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-
-  @java.lang.Override
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (queryPlan_ != null) {
-      output.writeMessage(1, getQueryPlan());
-    }
-    if (queryStats_ != null) {
-      output.writeMessage(2, getQueryStats());
-    }
-    getUnknownFields().writeTo(output);
-  }
-
-  @java.lang.Override
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (queryPlan_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getQueryPlan());
-    }
-    if (queryStats_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQueryStats());
-    }
-    size += getUnknownFields().getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof com.google.datastore.v1.ResultSetStats)) {
-      return super.equals(obj);
-    }
-    com.google.datastore.v1.ResultSetStats other = (com.google.datastore.v1.ResultSetStats) obj;
-
-    if (hasQueryPlan() != other.hasQueryPlan()) return false;
-    if (hasQueryPlan()) {
-      if (!getQueryPlan().equals(other.getQueryPlan())) return false;
-    }
-    if (hasQueryStats() != other.hasQueryStats()) return false;
-    if (hasQueryStats()) {
-      if (!getQueryStats().equals(other.getQueryStats())) return false;
-    }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
-    return true;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasQueryPlan()) {
-      hash = (37 * hash) + QUERY_PLAN_FIELD_NUMBER;
-      hash = (53 * hash) + getQueryPlan().hashCode();
-    }
-    if (hasQueryStats()) {
-      hash = (37 * hash) + QUERY_STATS_FIELD_NUMBER;
-      hash = (53 * hash) + getQueryStats().hashCode();
-    }
-    hash = (29 * hash) + getUnknownFields().hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
-  }
-
-  public static com.google.datastore.v1.ResultSetStats parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
-  }
-
-  @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-
-  public static Builder newBuilder(com.google.datastore.v1.ResultSetStats prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-
-  @java.lang.Override
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   *
-   *
-   * 
    -   * Planning and execution statistics for the query.
-   * 
    
-   *
-   * Protobuf type {@code google.datastore.v1.ResultSetStats}
-   */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
-      // @@protoc_insertion_point(builder_implements:google.datastore.v1.ResultSetStats)
-      com.google.datastore.v1.ResultSetStatsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProfileProto
-          .internal_static_google_datastore_v1_ResultSetStats_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProfileProto
-          .internal_static_google_datastore_v1_ResultSetStats_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ResultSetStats.class,
-              com.google.datastore.v1.ResultSetStats.Builder.class);
-    }
-
-    // Construct using com.google.datastore.v1.ResultSetStats.newBuilder()
-    private Builder() {}
-
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-    }
-
-    @java.lang.Override
-    public Builder clear() {
-      super.clear();
-      bitField0_ = 0;
-      queryPlan_ = null;
-      if (queryPlanBuilder_ != null) {
-        queryPlanBuilder_.dispose();
-        queryPlanBuilder_ = null;
-      }
-      queryStats_ = null;
-      if (queryStatsBuilder_ != null) {
-        queryStatsBuilder_.dispose();
-        queryStatsBuilder_ = null;
-      }
-      return this;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProfileProto
-          .internal_static_google_datastore_v1_ResultSetStats_descriptor;
-    }
-
-    @java.lang.Override
-    public com.google.datastore.v1.ResultSetStats getDefaultInstanceForType() {
-      return com.google.datastore.v1.ResultSetStats.getDefaultInstance();
-    }
-
-    @java.lang.Override
-    public com.google.datastore.v1.ResultSetStats build() {
-      com.google.datastore.v1.ResultSetStats result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    @java.lang.Override
-    public com.google.datastore.v1.ResultSetStats buildPartial() {
-      com.google.datastore.v1.ResultSetStats result =
-          new com.google.datastore.v1.ResultSetStats(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.datastore.v1.ResultSetStats result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.queryPlan_ = queryPlanBuilder_ == null ? queryPlan_ : queryPlanBuilder_.build();
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.queryStats_ = queryStatsBuilder_ == null ? queryStats_ : queryStatsBuilder_.build();
-      }
-    }
-
-    @java.lang.Override
-    public Builder clone() {
-      return super.clone();
-    }
-
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return super.setField(field, value);
-    }
-
-    @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return super.clearField(field);
-    }
-
-    @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return super.clearOneof(oneof);
-    }
-
-    @java.lang.Override
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
-      return super.setRepeatedField(field, index, value);
-    }
-
-    @java.lang.Override
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
-      return super.addRepeatedField(field, value);
-    }
-
-    @java.lang.Override
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.datastore.v1.ResultSetStats) {
-        return mergeFrom((com.google.datastore.v1.ResultSetStats) other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.datastore.v1.ResultSetStats other) {
-      if (other == com.google.datastore.v1.ResultSetStats.getDefaultInstance()) return this;
-      if (other.hasQueryPlan()) {
-        mergeQueryPlan(other.getQueryPlan());
-      }
-      if (other.hasQueryStats()) {
-        mergeQueryStats(other.getQueryStats());
-      }
-      this.mergeUnknownFields(other.getUnknownFields());
-      onChanged();
-      return this;
-    }
-
-    @java.lang.Override
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    @java.lang.Override
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getQueryPlanFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getQueryStatsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.unwrapIOException();
-      } finally {
-        onChanged();
-      } // finally
-      return this;
-    }
-
-    private int bitField0_;
-
-    private com.google.datastore.v1.QueryPlan queryPlan_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.QueryPlan,
-            com.google.datastore.v1.QueryPlan.Builder,
-            com.google.datastore.v1.QueryPlanOrBuilder>
-        queryPlanBuilder_;
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     *
-     * @return Whether the queryPlan field is set.
-     */
-    public boolean hasQueryPlan() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     *
-     * @return The queryPlan.
-     */
-    public com.google.datastore.v1.QueryPlan getQueryPlan() {
-      if (queryPlanBuilder_ == null) {
-        return queryPlan_ == null
-            ? com.google.datastore.v1.QueryPlan.getDefaultInstance()
-            : queryPlan_;
-      } else {
-        return queryPlanBuilder_.getMessage();
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     */
-    public Builder setQueryPlan(com.google.datastore.v1.QueryPlan value) {
-      if (queryPlanBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        queryPlan_ = value;
-      } else {
-        queryPlanBuilder_.setMessage(value);
-      }
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     */
-    public Builder setQueryPlan(com.google.datastore.v1.QueryPlan.Builder builderForValue) {
-      if (queryPlanBuilder_ == null) {
-        queryPlan_ = builderForValue.build();
-      } else {
-        queryPlanBuilder_.setMessage(builderForValue.build());
-      }
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     */
-    public Builder mergeQueryPlan(com.google.datastore.v1.QueryPlan value) {
-      if (queryPlanBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && queryPlan_ != null
-            && queryPlan_ != com.google.datastore.v1.QueryPlan.getDefaultInstance()) {
-          getQueryPlanBuilder().mergeFrom(value);
-        } else {
-          queryPlan_ = value;
-        }
-      } else {
-        queryPlanBuilder_.mergeFrom(value);
-      }
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     */
-    public Builder clearQueryPlan() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      queryPlan_ = null;
-      if (queryPlanBuilder_ != null) {
-        queryPlanBuilder_.dispose();
-        queryPlanBuilder_ = null;
-      }
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     */
-    public com.google.datastore.v1.QueryPlan.Builder getQueryPlanBuilder() {
-      bitField0_ |= 0x00000001;
-      onChanged();
-      return getQueryPlanFieldBuilder().getBuilder();
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     */
-    public com.google.datastore.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
-      if (queryPlanBuilder_ != null) {
-        return queryPlanBuilder_.getMessageOrBuilder();
-      } else {
-        return queryPlan_ == null
-            ? com.google.datastore.v1.QueryPlan.getDefaultInstance()
-            : queryPlan_;
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Plan for the query.
-     * 
    
-     *
-     * .google.datastore.v1.QueryPlan query_plan = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.QueryPlan,
-            com.google.datastore.v1.QueryPlan.Builder,
-            com.google.datastore.v1.QueryPlanOrBuilder>
-        getQueryPlanFieldBuilder() {
-      if (queryPlanBuilder_ == null) {
-        queryPlanBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.QueryPlan,
-                com.google.datastore.v1.QueryPlan.Builder,
-                com.google.datastore.v1.QueryPlanOrBuilder>(
-                getQueryPlan(), getParentForChildren(), isClean());
-        queryPlan_ = null;
-      }
-      return queryPlanBuilder_;
-    }
-
-    private com.google.protobuf.Struct queryStats_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Struct,
-            com.google.protobuf.Struct.Builder,
-            com.google.protobuf.StructOrBuilder>
-        queryStatsBuilder_;
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     *
-     * @return Whether the queryStats field is set.
-     */
-    public boolean hasQueryStats() {
-      return ((bitField0_ & 0x00000002) != 0);
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     *
-     * @return The queryStats.
-     */
-    public com.google.protobuf.Struct getQueryStats() {
-      if (queryStatsBuilder_ == null) {
-        return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
-      } else {
-        return queryStatsBuilder_.getMessage();
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     */
-    public Builder setQueryStats(com.google.protobuf.Struct value) {
-      if (queryStatsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        queryStats_ = value;
-      } else {
-        queryStatsBuilder_.setMessage(value);
-      }
-      bitField0_ |= 0x00000002;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     */
-    public Builder setQueryStats(com.google.protobuf.Struct.Builder builderForValue) {
-      if (queryStatsBuilder_ == null) {
-        queryStats_ = builderForValue.build();
-      } else {
-        queryStatsBuilder_.setMessage(builderForValue.build());
-      }
-      bitField0_ |= 0x00000002;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     */
-    public Builder mergeQueryStats(com.google.protobuf.Struct value) {
-      if (queryStatsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && queryStats_ != null
-            && queryStats_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getQueryStatsBuilder().mergeFrom(value);
-        } else {
-          queryStats_ = value;
-        }
-      } else {
-        queryStatsBuilder_.mergeFrom(value);
-      }
-      bitField0_ |= 0x00000002;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     */
-    public Builder clearQueryStats() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      queryStats_ = null;
-      if (queryStatsBuilder_ != null) {
-        queryStatsBuilder_.dispose();
-        queryStatsBuilder_ = null;
-      }
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     */
-    public com.google.protobuf.Struct.Builder getQueryStatsBuilder() {
-      bitField0_ |= 0x00000002;
-      onChanged();
-      return getQueryStatsFieldBuilder().getBuilder();
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     */
-    public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
-      if (queryStatsBuilder_ != null) {
-        return queryStatsBuilder_.getMessageOrBuilder();
-      } else {
-        return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Aggregated statistics from the execution of the query.
-     *
-     * This will only be present when the request specifies `PROFILE` mode.
-     * For example, a query will return the statistics including:
-     *
-     * {
-     *   "results_returned": "20",
-     *   "documents_scanned": "20",
-     *   "indexes_entries_scanned": "10050",
-     *   "total_execution_time": "100.7 msecs"
-     * }
-     * 
    
-     *
-     * .google.protobuf.Struct query_stats = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Struct,
-            com.google.protobuf.Struct.Builder,
-            com.google.protobuf.StructOrBuilder>
-        getQueryStatsFieldBuilder() {
-      if (queryStatsBuilder_ == null) {
-        queryStatsBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.protobuf.Struct,
-                com.google.protobuf.Struct.Builder,
-                com.google.protobuf.StructOrBuilder>(
-                getQueryStats(), getParentForChildren(), isClean());
-        queryStats_ = null;
-      }
-      return queryStatsBuilder_;
-    }
-
-    @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFields(unknownFields);
-    }
-
-    @java.lang.Override
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-    // @@protoc_insertion_point(builder_scope:google.datastore.v1.ResultSetStats)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.datastore.v1.ResultSetStats)
-  private static final com.google.datastore.v1.ResultSetStats DEFAULT_INSTANCE;
-
-  static {
-    DEFAULT_INSTANCE = new com.google.datastore.v1.ResultSetStats();
-  }
-
-  public static com.google.datastore.v1.ResultSetStats getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public ResultSetStats parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
-        }
-      };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.datastore.v1.ResultSetStats getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
deleted file mode 100644
index 16a95141911b..000000000000
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2023 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
- *
- *     https://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.
- */
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/datastore/v1/query_profile.proto
-
-package com.google.datastore.v1;
-
-public interface ResultSetStatsOrBuilder
-    extends
-    // @@protoc_insertion_point(interface_extends:google.datastore.v1.ResultSetStats)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   *
-   *
-   * 
    -   * Plan for the query.
-   * 
    
-   *
-   * .google.datastore.v1.QueryPlan query_plan = 1;
-   *
-   * @return Whether the queryPlan field is set.
-   */
-  boolean hasQueryPlan();
-  /**
-   *
-   *
-   * 
    -   * Plan for the query.
-   * 
    
-   *
-   * .google.datastore.v1.QueryPlan query_plan = 1;
-   *
-   * @return The queryPlan.
-   */
-  com.google.datastore.v1.QueryPlan getQueryPlan();
-  /**
-   *
-   *
-   * 
    -   * Plan for the query.
-   * 
    
-   *
-   * .google.datastore.v1.QueryPlan query_plan = 1;
-   */
-  com.google.datastore.v1.QueryPlanOrBuilder getQueryPlanOrBuilder();
-
-  /**
-   *
-   *
-   * 
    -   * Aggregated statistics from the execution of the query.
-   *
-   * This will only be present when the request specifies `PROFILE` mode.
-   * For example, a query will return the statistics including:
-   *
-   * {
-   *   "results_returned": "20",
-   *   "documents_scanned": "20",
-   *   "indexes_entries_scanned": "10050",
-   *   "total_execution_time": "100.7 msecs"
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct query_stats = 2;
-   *
-   * @return Whether the queryStats field is set.
-   */
-  boolean hasQueryStats();
-  /**
-   *
-   *
-   * 
    -   * Aggregated statistics from the execution of the query.
-   *
-   * This will only be present when the request specifies `PROFILE` mode.
-   * For example, a query will return the statistics including:
-   *
-   * {
-   *   "results_returned": "20",
-   *   "documents_scanned": "20",
-   *   "indexes_entries_scanned": "10050",
-   *   "total_execution_time": "100.7 msecs"
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct query_stats = 2;
-   *
-   * @return The queryStats.
-   */
-  com.google.protobuf.Struct getQueryStats();
-  /**
-   *
-   *
-   * 
    -   * Aggregated statistics from the execution of the query.
-   *
-   * This will only be present when the request specifies `PROFILE` mode.
-   * For example, a query will return the statistics including:
-   *
-   * {
-   *   "results_returned": "20",
-   *   "documents_scanned": "20",
-   *   "indexes_entries_scanned": "10050",
-   *   "total_execution_time": "100.7 msecs"
-   * }
-   * 
    
-   *
-   * .google.protobuf.Struct query_stats = 2;
-   */
-  com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder();
-}
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 dad648429318..2d64f5bb7554 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 874cda7b7d2c..300a749aabf9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 840b1bde3aab..16dfa20fcb62 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index f9dd7e00d391..69531f934c00 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 12e9bf63c4d1..912351263e33 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ private RunAggregationQueryRequest(com.google.protobuf.GeneratedMessageV3.Builde
   private RunAggregationQueryRequest() {
     projectId_ = "";
     databaseId_ = "";
-    mode_ = 0;
   }
 
   @java.lang.Override
@@ -433,46 +432,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
-  public static final int MODE_FIELD_NUMBER = 10;
-  private int mode_ = 0;
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The enum numeric value on the wire for mode.
-   */
-  @java.lang.Override
-  public int getModeValue() {
-    return mode_;
-  }
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The mode.
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.QueryMode getMode() {
-    com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
-    return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
-  }
-
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -505,9 +464,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
-      output.writeEnum(10, mode_);
-    }
     getUnknownFields().writeTo(output);
   }
 
@@ -539,9 +495,6 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(10, mode_);
-    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -568,7 +521,6 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
-    if (mode_ != other.mode_) return false;
     if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
@@ -603,8 +555,6 @@ public int hashCode() {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
     }
-    hash = (37 * hash) + MODE_FIELD_NUMBER;
-    hash = (53 * hash) + mode_;
     switch (queryTypeCase_) {
       case 3:
         hash = (37 * hash) + AGGREGATION_QUERY_FIELD_NUMBER;
@@ -775,7 +725,6 @@ public Builder clear() {
       if (gqlQueryBuilder_ != null) {
         gqlQueryBuilder_.clear();
       }
-      mode_ = 0;
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -829,9 +778,6 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryRequest re
         result.readOptions_ =
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.mode_ = mode_;
-      }
     }
 
     private void buildPartialOneofs(com.google.datastore.v1.RunAggregationQueryRequest result) {
@@ -907,9 +853,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryRequest othe
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
-      if (other.mode_ != 0) {
-        setModeValue(other.getModeValue());
-      }
       switch (other.getQueryTypeCase()) {
         case AGGREGATION_QUERY:
           {
@@ -989,12 +932,6 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000002;
                 break;
               } // case 74
-            case 80:
-              {
-                mode_ = input.readEnum();
-                bitField0_ |= 0x00000040;
-                break;
-              } // case 80
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -2063,110 +2000,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       return gqlQueryBuilder_;
     }
 
-    private int mode_ = 0;
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @return The enum numeric value on the wire for mode.
-     */
-    @java.lang.Override
-    public int getModeValue() {
-      return mode_;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @param value The enum numeric value on the wire for mode to set.
-     * @return This builder for chaining.
-     */
-    public Builder setModeValue(int value) {
-      mode_ = value;
-      bitField0_ |= 0x00000040;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @return The mode.
-     */
-    @java.lang.Override
-    public com.google.datastore.v1.QueryMode getMode() {
-      com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
-      return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @param value The mode to set.
-     * @return This builder for chaining.
-     */
-    public Builder setMode(com.google.datastore.v1.QueryMode value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      bitField0_ |= 0x00000040;
-      mode_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @return This builder for chaining.
-     */
-    public Builder clearMode() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      mode_ = 0;
-      onChanged();
-      return this;
-    }
-
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 6d86f29034fd..da02f3250a73 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -228,36 +228,5 @@ public interface RunAggregationQueryRequestOrBuilder
    */
   com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
 
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The enum numeric value on the wire for mode.
-   */
-  int getModeValue();
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The mode.
-   */
-  com.google.datastore.v1.QueryMode getMode();
-
   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 328afcfdf375..a8a9b7507ec7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -183,61 +183,6 @@ public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
 
-  public static final int STATS_FIELD_NUMBER = 6;
-  private com.google.datastore.v1.ResultSetStats stats_;
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return Whether the stats field is set.
-   */
-  @java.lang.Override
-  public boolean hasStats() {
-    return stats_ != null;
-  }
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return The stats.
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.ResultSetStats getStats() {
-    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
-  }
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
-    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
-  }
-
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -261,9 +206,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(5, transaction_);
     }
-    if (stats_ != null) {
-      output.writeMessage(6, getStats());
-    }
     getUnknownFields().writeTo(output);
   }
 
@@ -282,9 +224,6 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
     }
-    if (stats_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getStats());
-    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -310,10 +249,6 @@ public boolean equals(final java.lang.Object obj) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
     if (!getTransaction().equals(other.getTransaction())) return false;
-    if (hasStats() != other.hasStats()) return false;
-    if (hasStats()) {
-      if (!getStats().equals(other.getStats())) return false;
-    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -335,10 +270,6 @@ public int hashCode() {
     }
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
-    if (hasStats()) {
-      hash = (37 * hash) + STATS_FIELD_NUMBER;
-      hash = (53 * hash) + getStats().hashCode();
-    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -490,11 +421,6 @@ public Builder clear() {
         queryBuilder_ = null;
       }
       transaction_ = com.google.protobuf.ByteString.EMPTY;
-      stats_ = null;
-      if (statsBuilder_ != null) {
-        statsBuilder_.dispose();
-        statsBuilder_ = null;
-      }
       return this;
     }
 
@@ -540,9 +466,6 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryResponse r
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build();
-      }
     }
 
     @java.lang.Override
@@ -600,9 +523,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryResponse oth
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
-      if (other.hasStats()) {
-        mergeStats(other.getStats());
-      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -647,12 +567,6 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 42
-            case 50:
-              {
-                input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
-                break;
-              } // case 50
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1112,216 +1026,6 @@ public Builder clearTransaction() {
       return this;
     }
 
-    private com.google.datastore.v1.ResultSetStats stats_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ResultSetStats,
-            com.google.datastore.v1.ResultSetStats.Builder,
-            com.google.datastore.v1.ResultSetStatsOrBuilder>
-        statsBuilder_;
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     *
-     * @return Whether the stats field is set.
-     */
-    public boolean hasStats() {
-      return ((bitField0_ & 0x00000008) != 0);
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     *
-     * @return The stats.
-     */
-    public com.google.datastore.v1.ResultSetStats getStats() {
-      if (statsBuilder_ == null) {
-        return stats_ == null
-            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
-            : stats_;
-      } else {
-        return statsBuilder_.getMessage();
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder setStats(com.google.datastore.v1.ResultSetStats value) {
-      if (statsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        stats_ = value;
-      } else {
-        statsBuilder_.setMessage(value);
-      }
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder setStats(com.google.datastore.v1.ResultSetStats.Builder builderForValue) {
-      if (statsBuilder_ == null) {
-        stats_ = builderForValue.build();
-      } else {
-        statsBuilder_.setMessage(builderForValue.build());
-      }
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder mergeStats(com.google.datastore.v1.ResultSetStats value) {
-      if (statsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && stats_ != null
-            && stats_ != com.google.datastore.v1.ResultSetStats.getDefaultInstance()) {
-          getStatsBuilder().mergeFrom(value);
-        } else {
-          stats_ = value;
-        }
-      } else {
-        statsBuilder_.mergeFrom(value);
-      }
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder clearStats() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      stats_ = null;
-      if (statsBuilder_ != null) {
-        statsBuilder_.dispose();
-        statsBuilder_ = null;
-      }
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public com.google.datastore.v1.ResultSetStats.Builder getStatsBuilder() {
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return getStatsFieldBuilder().getBuilder();
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
-      if (statsBuilder_ != null) {
-        return statsBuilder_.getMessageOrBuilder();
-      } else {
-        return stats_ == null
-            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
-            : stats_;
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ResultSetStats,
-            com.google.datastore.v1.ResultSetStats.Builder,
-            com.google.datastore.v1.ResultSetStatsOrBuilder>
-        getStatsFieldBuilder() {
-      if (statsBuilder_ == null) {
-        statsBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.ResultSetStats,
-                com.google.datastore.v1.ResultSetStats.Builder,
-                com.google.datastore.v1.ResultSetStatsOrBuilder>(
-                getStats(), getParentForChildren(), isClean());
-        stats_ = null;
-      }
-      return statsBuilder_;
-    }
-
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 6caa14766bef..f780c9afc5fd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,48 +111,4 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
-
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return Whether the stats field is set.
-   */
-  boolean hasStats();
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return The stats.
-   */
-  com.google.datastore.v1.ResultSetStats getStats();
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   */
-  com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
 }
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 62666648cb51..11b5e47b403f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@ private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builde
   private RunQueryRequest() {
     projectId_ = "";
     databaseId_ = "";
-    mode_ = 0;
   }
 
   @java.lang.Override
@@ -432,46 +431,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
-  public static final int MODE_FIELD_NUMBER = 11;
-  private int mode_ = 0;
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The enum numeric value on the wire for mode.
-   */
-  @java.lang.Override
-  public int getModeValue() {
-    return mode_;
-  }
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The mode.
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.QueryMode getMode() {
-    com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
-    return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
-  }
-
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -504,9 +463,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
-      output.writeEnum(11, mode_);
-    }
     getUnknownFields().writeTo(output);
   }
 
@@ -538,9 +494,6 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(11, mode_);
-    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -566,7 +519,6 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
-    if (mode_ != other.mode_) return false;
     if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
@@ -601,8 +553,6 @@ public int hashCode() {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
     }
-    hash = (37 * hash) + MODE_FIELD_NUMBER;
-    hash = (53 * hash) + mode_;
     switch (queryTypeCase_) {
       case 3:
         hash = (37 * hash) + QUERY_FIELD_NUMBER;
@@ -772,7 +722,6 @@ public Builder clear() {
       if (gqlQueryBuilder_ != null) {
         gqlQueryBuilder_.clear();
       }
-      mode_ = 0;
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -826,9 +775,6 @@ private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) {
         result.readOptions_ =
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.mode_ = mode_;
-      }
     }
 
     private void buildPartialOneofs(com.google.datastore.v1.RunQueryRequest result) {
@@ -903,9 +849,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
-      if (other.mode_ != 0) {
-        setModeValue(other.getModeValue());
-      }
       switch (other.getQueryTypeCase()) {
         case QUERY:
           {
@@ -984,12 +927,6 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000002;
                 break;
               } // case 74
-            case 88:
-              {
-                mode_ = input.readEnum();
-                bitField0_ |= 0x00000040;
-                break;
-              } // case 88
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -2054,110 +1991,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       return gqlQueryBuilder_;
     }
 
-    private int mode_ = 0;
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @return The enum numeric value on the wire for mode.
-     */
-    @java.lang.Override
-    public int getModeValue() {
-      return mode_;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @param value The enum numeric value on the wire for mode to set.
-     * @return This builder for chaining.
-     */
-    public Builder setModeValue(int value) {
-      mode_ = value;
-      bitField0_ |= 0x00000040;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @return The mode.
-     */
-    @java.lang.Override
-    public com.google.datastore.v1.QueryMode getMode() {
-      com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
-      return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @param value The mode to set.
-     * @return This builder for chaining.
-     */
-    public Builder setMode(com.google.datastore.v1.QueryMode value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      bitField0_ |= 0x00000040;
-      mode_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Optional. The mode in which the query request is processed. This field is
-     * optional, and when not provided, it defaults to `NORMAL` mode where no
-     * additional statistics will be returned with the query results.
-     * 
    
-     *
-     * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-     * 
-     *
-     * @return This builder for chaining.
-     */
-    public Builder clearMode() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      mode_ = 0;
-      onChanged();
-      return this;
-    }
-
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 0f2184076351..c944ad86a4a9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -228,36 +228,5 @@ public interface RunQueryRequestOrBuilder
    */
   com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
 
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The enum numeric value on the wire for mode.
-   */
-  int getModeValue();
-  /**
-   *
-   *
-   * 
    -   * Optional. The mode in which the query request is processed. This field is
-   * optional, and when not provided, it defaults to `NORMAL` mode where no
-   * additional statistics will be returned with the query results.
-   * 
    
-   *
-   * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
-   * 
-   *
-   * @return The mode.
-   */
-  com.google.datastore.v1.QueryMode getMode();
-
   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 a9f585048c2c..a89491052dc0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -179,61 +179,6 @@ public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
 
-  public static final int STATS_FIELD_NUMBER = 6;
-  private com.google.datastore.v1.ResultSetStats stats_;
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return Whether the stats field is set.
-   */
-  @java.lang.Override
-  public boolean hasStats() {
-    return stats_ != null;
-  }
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return The stats.
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.ResultSetStats getStats() {
-    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
-  }
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   */
-  @java.lang.Override
-  public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
-    return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
-  }
-
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -257,9 +202,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(5, transaction_);
     }
-    if (stats_ != null) {
-      output.writeMessage(6, getStats());
-    }
     getUnknownFields().writeTo(output);
   }
 
@@ -278,9 +220,6 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
     }
-    if (stats_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getStats());
-    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -305,10 +244,6 @@ public boolean equals(final java.lang.Object obj) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
     if (!getTransaction().equals(other.getTransaction())) return false;
-    if (hasStats() != other.hasStats()) return false;
-    if (hasStats()) {
-      if (!getStats().equals(other.getStats())) return false;
-    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -330,10 +265,6 @@ public int hashCode() {
     }
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
-    if (hasStats()) {
-      hash = (37 * hash) + STATS_FIELD_NUMBER;
-      hash = (53 * hash) + getStats().hashCode();
-    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -485,11 +416,6 @@ public Builder clear() {
         queryBuilder_ = null;
       }
       transaction_ = com.google.protobuf.ByteString.EMPTY;
-      stats_ = null;
-      if (statsBuilder_ != null) {
-        statsBuilder_.dispose();
-        statsBuilder_ = null;
-      }
       return this;
     }
 
@@ -535,9 +461,6 @@ private void buildPartial0(com.google.datastore.v1.RunQueryResponse result) {
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build();
-      }
     }
 
     @java.lang.Override
@@ -594,9 +517,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) {
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
-      if (other.hasStats()) {
-        mergeStats(other.getStats());
-      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -641,12 +561,6 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 42
-            case 50:
-              {
-                input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
-                break;
-              } // case 50
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1101,216 +1015,6 @@ public Builder clearTransaction() {
       return this;
     }
 
-    private com.google.datastore.v1.ResultSetStats stats_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ResultSetStats,
-            com.google.datastore.v1.ResultSetStats.Builder,
-            com.google.datastore.v1.ResultSetStatsOrBuilder>
-        statsBuilder_;
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     *
-     * @return Whether the stats field is set.
-     */
-    public boolean hasStats() {
-      return ((bitField0_ & 0x00000008) != 0);
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     *
-     * @return The stats.
-     */
-    public com.google.datastore.v1.ResultSetStats getStats() {
-      if (statsBuilder_ == null) {
-        return stats_ == null
-            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
-            : stats_;
-      } else {
-        return statsBuilder_.getMessage();
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder setStats(com.google.datastore.v1.ResultSetStats value) {
-      if (statsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        stats_ = value;
-      } else {
-        statsBuilder_.setMessage(value);
-      }
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder setStats(com.google.datastore.v1.ResultSetStats.Builder builderForValue) {
-      if (statsBuilder_ == null) {
-        stats_ = builderForValue.build();
-      } else {
-        statsBuilder_.setMessage(builderForValue.build());
-      }
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder mergeStats(com.google.datastore.v1.ResultSetStats value) {
-      if (statsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && stats_ != null
-            && stats_ != com.google.datastore.v1.ResultSetStats.getDefaultInstance()) {
-          getStatsBuilder().mergeFrom(value);
-        } else {
-          stats_ = value;
-        }
-      } else {
-        statsBuilder_.mergeFrom(value);
-      }
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public Builder clearStats() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      stats_ = null;
-      if (statsBuilder_ != null) {
-        statsBuilder_.dispose();
-        statsBuilder_ = null;
-      }
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public com.google.datastore.v1.ResultSetStats.Builder getStatsBuilder() {
-      bitField0_ |= 0x00000008;
-      onChanged();
-      return getStatsFieldBuilder().getBuilder();
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
-      if (statsBuilder_ != null) {
-        return statsBuilder_.getMessageOrBuilder();
-      } else {
-        return stats_ == null
-            ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
-            : stats_;
-      }
-    }
-    /**
-     *
-     *
-     * 
    -     * Query plan and execution statistics. Note that the returned stats are
-     * subject to change as Firestore evolves.
-     *
-     * This is only present when the request specifies a mode other than `NORMAL`.
-     * 
    
-     *
-     * .google.datastore.v1.ResultSetStats stats = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ResultSetStats,
-            com.google.datastore.v1.ResultSetStats.Builder,
-            com.google.datastore.v1.ResultSetStatsOrBuilder>
-        getStatsFieldBuilder() {
-      if (statsBuilder_ == null) {
-        statsBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.ResultSetStats,
-                com.google.datastore.v1.ResultSetStats.Builder,
-                com.google.datastore.v1.ResultSetStatsOrBuilder>(
-                getStats(), getParentForChildren(), isClean());
-        stats_ = null;
-      }
-      return statsBuilder_;
-    }
-
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 bbd48b7b57af..7e7f442b204f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,48 +111,4 @@ public interface RunQueryResponseOrBuilder
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
-
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return Whether the stats field is set.
-   */
-  boolean hasStats();
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   *
-   * @return The stats.
-   */
-  com.google.datastore.v1.ResultSetStats getStats();
-  /**
-   *
-   *
-   * 
    -   * Query plan and execution statistics. Note that the returned stats are
-   * subject to change as Firestore evolves.
-   *
-   * This is only present when the request specifies a mode other than `NORMAL`.
-   * 
    
-   *
-   * .google.datastore.v1.ResultSetStats stats = 6;
-   */
-  com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
 }
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 3f8f3209f205..3038f7a0970a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5ebbe3a91055..c5d7768d1f83 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4b7e04978d87..247d23e25234 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d9102d3d3a03..b15a641f721d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 476d48f02603..533988d77765 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
@@ -23,7 +23,6 @@ import "google/api/routing.proto";
 import "google/datastore/v1/aggregation_result.proto";
 import "google/datastore/v1/entity.proto";
 import "google/datastore/v1/query.proto";
-import "google/datastore/v1/query_profile.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.V1";
@@ -233,11 +232,6 @@ message RunQueryRequest {
     // The GQL query to run. This query must be a non-aggregation query.
     GqlQuery gql_query = 7;
   }
-
-  // Optional. The mode in which the query request is processed. This field is
-  // optional, and when not provided, it defaults to `NORMAL` mode where no
-  // additional statistics will be returned with the query results.
-  QueryMode mode = 11 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // The response for
@@ -257,12 +251,6 @@ message RunQueryResponse {
   // was set in
   // [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
   bytes transaction = 5;
-
-  // Query plan and execution statistics. Note that the returned stats are
-  // subject to change as Firestore evolves.
-  //
-  // This is only present when the request specifies a mode other than `NORMAL`.
-  ResultSetStats stats = 6;
 }
 
 // The request for
@@ -294,11 +282,6 @@ message RunAggregationQueryRequest {
     // The GQL query to run. This query must be an aggregation query.
     GqlQuery gql_query = 7;
   }
-
-  // Optional. The mode in which the query request is processed. This field is
-  // optional, and when not provided, it defaults to `NORMAL` mode where no
-  // additional statistics will be returned with the query results.
-  QueryMode mode = 10 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // The response for
@@ -318,12 +301,6 @@ message RunAggregationQueryResponse {
   // was set in
   // [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
   bytes transaction = 5;
-
-  // Query plan and execution statistics. Note that the returned stats are
-  // subject to change as Firestore evolves.
-  //
-  // This is only present when the request specifies a mode other than `NORMAL`.
-  ResultSetStats stats = 6;
 }
 
 // The request for
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
deleted file mode 100644
index 05c1cf95ec88..000000000000
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2023 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.
-
-syntax = "proto3";
-
-package google.datastore.v1;
-
-import "google/protobuf/struct.proto";
-
-option csharp_namespace = "Google.Cloud.Datastore.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore";
-option java_multiple_files = true;
-option java_outer_classname = "QueryProfileProto";
-option java_package = "com.google.datastore.v1";
-option php_namespace = "Google\\Cloud\\Datastore\\V1";
-option ruby_package = "Google::Cloud::Datastore::V1";
-
-// Specification of the Datastore Query Profile fields.
-
-// The mode in which the query request must be processed.
-enum QueryMode {
-  // The default mode. Only the query results are returned.
-  NORMAL = 0;
-
-  // This mode returns only the query plan, without any results or execution
-  // statistics information.
-  PLAN = 1;
-
-  // This mode returns both the query plan and the execution statistics along
-  // with the results.
-  PROFILE = 2;
-}
-
-// Plan for the query.
-message QueryPlan {
-  // Planning phase information for the query. It will include:
-  //
-  // {
-  //   "indexes_used": [
-  //     {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
-  //     {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
-  //   ]
-  // }
-  google.protobuf.Struct plan_info = 1;
-}
-
-// Planning and execution statistics for the query.
-message ResultSetStats {
-  // Plan for the query.
-  QueryPlan query_plan = 1;
-
-  // Aggregated statistics from the execution of the query.
-  //
-  // This will only be present when the request specifies `PROFILE` mode.
-  // For example, a query will return the statistics including:
-  //
-  // {
-  //   "results_returned": "20",
-  //   "documents_scanned": "20",
-  //   "indexes_entries_scanned": "10050",
-  //   "total_execution_time": "100.7 msecs"
-  // }
-  google.protobuf.Struct query_stats = 2;
-}

From a898e8fe5e9b6d09e57b789a12b8bb614a333e59 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:11:40 -0500
Subject: [PATCH 1306/1784] chore: adjust renovate bot configs to update the
 sdk-platform-java-config artifact (#1921) (#1309)

chore: update renovate bot configs to update the sdk-platform-java-config artifact
Source-Link: https://github.com/googleapis/synthtool/commit/d7828c02a5b1aeb8dcf3aa6c55f8fdf407a0156f
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:0d1bb26a1a99ae0456176bf891b8490e9aab424a5cb4e4d301d9703c4dc43b58

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml |  4 ++--
 renovate.json             | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index dc05a72762fe..bf48c82da143 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:a6aa751984f1e905c3ae5a3aac78fc7b68210626ce91487dc7ff4f0a06f010cc
-# created: 2024-01-22T14:14:20.913785597Z
+  digest: sha256:0d1bb26a1a99ae0456176bf891b8490e9aab424a5cb4e4d301d9703c4dc43b58
+# created: 2024-01-30T19:46:55.029238294Z
diff --git a/renovate.json b/renovate.json
index d85059fc5cd2..f974ba2a91ba 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,6 +14,17 @@
     ".kokoro/requirements.txt",
     ".github/workflows/**"
   ],
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^.kokoro/presubmit/graalvm-native.*.cfg$"
+      ],
+      "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""],
+      "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
+      "datasourceTemplate": "maven"
+    }
+  ],
   "packageRules": [
     {
       "packagePatterns": [

From c2013679cd0b5657b9ff3f7e67557ea68e964756 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:41:01 +0000
Subject: [PATCH 1307/1784] chore: use sdk-platform-java-config to consolidate
 build configs (#1307)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: use sdk-platform-java-config to consolidate build configs

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 
---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 google-cloud-datastore-bom/pom.xml      | 4 ++--
 pom.xml                                 | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 274e586ee961..df1a8a075eb4 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.23.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index c70a18f0db94..b7def9817fa4 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.23.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c6537c97c21b..0bcb967df841 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -7,8 +7,8 @@
   pom
   
     com.google.cloud
-    google-cloud-shared-config
-    1.7.1
+    sdk-platform-java-config
+    3.23.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 30b79cdc0a68..3260468ab400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
 
   
     com.google.cloud
-    google-cloud-shared-config
-    1.7.1
+    sdk-platform-java-config
+    3.23.0
   
 
   
@@ -151,7 +151,7 @@
       
         com.google.cloud
         google-cloud-shared-dependencies
-        3.23.0
+        ${google-cloud-shared-dependencies.version}
         pom
         import
       

From 3f4ae83b20f160eaccd9de17582d54d8222dd015 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 10:39:40 -0500
Subject: [PATCH 1308/1784] deps: Update protobuf to 25.2 in WORKSPACE (#1311)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build: Update protobuf to 25.2 in WORKSPACE
build: Update grpc to 1.60.0 in WORKSPACE
build: Remove pin for boringssl in WORKSPACE
build: Update bazel to 6.3.0 in .bazeliskrc

PiperOrigin-RevId: 603226138

Source-Link: https://github.com/googleapis/googleapis/commit/2aec9e178dab3427c0ad5654c94a069e0bc7224c

Source-Link: https://github.com/googleapis/googleapis-gen/commit/e9a5c2ef37b4d69c93e39141d87aae0b193c00b1
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTlhNWMyZWYzN2I0ZDY5YzkzZTM5MTQxZDg3YWFlMGIxOTNjMDBiMSJ9

* 🦉 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 
---
 .../reflect-config.json                       | 135 +++++++++++++++
 .../datastore/admin/v1/CommonMetadata.java    |  51 ++++--
 .../admin/v1/CommonMetadataOrBuilder.java     |   1 +
 .../admin/v1/CreateIndexRequest.java          |  28 +++-
 .../admin/v1/CreateIndexRequestOrBuilder.java |   1 +
 .../admin/v1/DatastoreAdminProto.java         |   1 +
 .../DatastoreFirestoreMigrationMetadata.java  |   1 +
 ...reFirestoreMigrationMetadataOrBuilder.java |   1 +
 .../admin/v1/DeleteIndexRequest.java          |   1 +
 .../admin/v1/DeleteIndexRequestOrBuilder.java |   1 +
 .../datastore/admin/v1/EntityFilter.java      |   1 +
 .../admin/v1/EntityFilterOrBuilder.java       |   1 +
 .../admin/v1/ExportEntitiesMetadata.java      |  70 +++++---
 .../v1/ExportEntitiesMetadataOrBuilder.java   |   1 +
 .../admin/v1/ExportEntitiesRequest.java       |  37 ++++-
 .../v1/ExportEntitiesRequestOrBuilder.java    |   1 +
 .../admin/v1/ExportEntitiesResponse.java      |   1 +
 .../v1/ExportEntitiesResponseOrBuilder.java   |   1 +
 .../datastore/admin/v1/GetIndexRequest.java   |   1 +
 .../admin/v1/GetIndexRequestOrBuilder.java    |   1 +
 .../admin/v1/ImportEntitiesMetadata.java      |  70 +++++---
 .../v1/ImportEntitiesMetadataOrBuilder.java   |   1 +
 .../admin/v1/ImportEntitiesRequest.java       |  37 ++++-
 .../v1/ImportEntitiesRequestOrBuilder.java    |   1 +
 .../com/google/datastore/admin/v1/Index.java  |   1 +
 .../admin/v1/IndexOperationMetadata.java      |  42 +++--
 .../v1/IndexOperationMetadataOrBuilder.java   |   1 +
 .../datastore/admin/v1/IndexOrBuilder.java    |   1 +
 .../google/datastore/admin/v1/IndexProto.java |   1 +
 .../admin/v1/ListIndexesRequest.java          |   1 +
 .../admin/v1/ListIndexesRequestOrBuilder.java |   1 +
 .../admin/v1/ListIndexesResponse.java         |   1 +
 .../v1/ListIndexesResponseOrBuilder.java      |   1 +
 .../admin/v1/MigrationProgressEvent.java      |   1 +
 .../v1/MigrationProgressEventOrBuilder.java   |   1 +
 .../datastore/admin/v1/MigrationProto.java    |   1 +
 .../datastore/admin/v1/MigrationState.java    |   1 +
 .../admin/v1/MigrationStateEvent.java         |   1 +
 .../v1/MigrationStateEventOrBuilder.java      |   1 +
 .../datastore/admin/v1/MigrationStep.java     |   1 +
 .../datastore/admin/v1/OperationType.java     |   1 +
 .../google/datastore/admin/v1/Progress.java   |   1 +
 .../datastore/admin/v1/ProgressOrBuilder.java |   1 +
 .../google/datastore/v1/AggregationQuery.java |  82 +++++++--
 .../v1/AggregationQueryOrBuilder.java         |   1 +
 .../datastore/v1/AggregationResult.java       | 130 +++++++++++----
 .../datastore/v1/AggregationResultBatch.java  |  29 +++-
 .../v1/AggregationResultBatchOrBuilder.java   |   1 +
 .../v1/AggregationResultOrBuilder.java        |   1 +
 .../datastore/v1/AggregationResultProto.java  |   1 +
 .../datastore/v1/AllocateIdsRequest.java      |   1 +
 .../v1/AllocateIdsRequestOrBuilder.java       |   1 +
 .../datastore/v1/AllocateIdsResponse.java     |   1 +
 .../v1/AllocateIdsResponseOrBuilder.java      |   1 +
 .../com/google/datastore/v1/ArrayValue.java   |   1 +
 .../datastore/v1/ArrayValueOrBuilder.java     |   1 +
 .../datastore/v1/BeginTransactionRequest.java |  28 +++-
 .../v1/BeginTransactionRequestOrBuilder.java  |   1 +
 .../v1/BeginTransactionResponse.java          |   1 +
 .../v1/BeginTransactionResponseOrBuilder.java |   1 +
 .../google/datastore/v1/CommitRequest.java    |   1 +
 .../datastore/v1/CommitRequestOrBuilder.java  |   1 +
 .../google/datastore/v1/CommitResponse.java   |  29 +++-
 .../datastore/v1/CommitResponseOrBuilder.java |   1 +
 .../google/datastore/v1/CompositeFilter.java  |   1 +
 .../v1/CompositeFilterOrBuilder.java          |   1 +
 .../google/datastore/v1/DatastoreProto.java   |   1 +
 .../java/com/google/datastore/v1/Entity.java  | 155 ++++++++++++++----
 .../google/datastore/v1/EntityOrBuilder.java  |   1 +
 .../com/google/datastore/v1/EntityProto.java  |   1 +
 .../com/google/datastore/v1/EntityResult.java |  56 +++++--
 .../datastore/v1/EntityResultOrBuilder.java   |   1 +
 .../java/com/google/datastore/v1/Filter.java  |   1 +
 .../google/datastore/v1/FilterOrBuilder.java  |   1 +
 .../com/google/datastore/v1/GqlQuery.java     | 133 +++++++++++----
 .../datastore/v1/GqlQueryOrBuilder.java       |   1 +
 .../datastore/v1/GqlQueryParameter.java       |   1 +
 .../v1/GqlQueryParameterOrBuilder.java        |   1 +
 .../java/com/google/datastore/v1/Key.java     |  29 +++-
 .../com/google/datastore/v1/KeyOrBuilder.java |   1 +
 .../google/datastore/v1/KindExpression.java   |   1 +
 .../datastore/v1/KindExpressionOrBuilder.java |   1 +
 .../google/datastore/v1/LookupRequest.java    |  29 +++-
 .../datastore/v1/LookupRequestOrBuilder.java  |   1 +
 .../google/datastore/v1/LookupResponse.java   |  31 +++-
 .../datastore/v1/LookupResponseOrBuilder.java |   1 +
 .../com/google/datastore/v1/Mutation.java     |   1 +
 .../datastore/v1/MutationOrBuilder.java       |   1 +
 .../google/datastore/v1/MutationResult.java   |  56 +++++--
 .../datastore/v1/MutationResultOrBuilder.java |   1 +
 .../com/google/datastore/v1/PartitionId.java  |   1 +
 .../datastore/v1/PartitionIdOrBuilder.java    |   1 +
 .../com/google/datastore/v1/Projection.java   |  28 +++-
 .../datastore/v1/ProjectionOrBuilder.java     |   1 +
 .../google/datastore/v1/PropertyFilter.java   |  42 +++--
 .../datastore/v1/PropertyFilterOrBuilder.java |   1 +
 .../google/datastore/v1/PropertyOrder.java    |  28 +++-
 .../datastore/v1/PropertyOrderOrBuilder.java  |   1 +
 .../datastore/v1/PropertyReference.java       |   1 +
 .../v1/PropertyReferenceOrBuilder.java        |   1 +
 .../java/com/google/datastore/v1/Query.java   |  46 ++++--
 .../google/datastore/v1/QueryOrBuilder.java   |   1 +
 .../com/google/datastore/v1/QueryProto.java   |   1 +
 .../google/datastore/v1/QueryResultBatch.java |  29 +++-
 .../v1/QueryResultBatchOrBuilder.java         |   1 +
 .../com/google/datastore/v1/ReadOptions.java  |   1 +
 .../datastore/v1/ReadOptionsOrBuilder.java    |   1 +
 .../datastore/v1/ReserveIdsRequest.java       |   1 +
 .../v1/ReserveIdsRequestOrBuilder.java        |   1 +
 .../datastore/v1/ReserveIdsResponse.java      |   1 +
 .../v1/ReserveIdsResponseOrBuilder.java       |   1 +
 .../google/datastore/v1/RollbackRequest.java  |   1 +
 .../v1/RollbackRequestOrBuilder.java          |   1 +
 .../google/datastore/v1/RollbackResponse.java |   1 +
 .../v1/RollbackResponseOrBuilder.java         |   1 +
 .../v1/RunAggregationQueryRequest.java        |  42 +++--
 .../RunAggregationQueryRequestOrBuilder.java  |   1 +
 .../v1/RunAggregationQueryResponse.java       |  42 +++--
 .../RunAggregationQueryResponseOrBuilder.java |   1 +
 .../google/datastore/v1/RunQueryRequest.java  |  42 +++--
 .../v1/RunQueryRequestOrBuilder.java          |   1 +
 .../google/datastore/v1/RunQueryResponse.java |  42 +++--
 .../v1/RunQueryResponseOrBuilder.java         |   1 +
 .../datastore/v1/TransactionOptions.java      |  28 +++-
 .../v1/TransactionOptionsOrBuilder.java       |   1 +
 .../java/com/google/datastore/v1/Value.java   |   1 +
 .../google/datastore/v1/ValueOrBuilder.java   |   1 +
 127 files changed, 1357 insertions(+), 366 deletions(-)

diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
index 5103d81c4a64..5ed5e01e5736 100644
--- a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
+++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
@@ -1043,6 +1043,15 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$Edition",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1178,6 +1187,114 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1241,6 +1358,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 1ad218b43d32..31a54735c9c4 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
@@ -55,7 +56,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
     switch (number) {
       case 4:
         return internalGetLabels();
@@ -345,6 +347,7 @@ private State(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.CommonMetadata.State)
   }
 
+  private int bitField0_;
   public static final int START_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp startTime_;
   /**
@@ -360,7 +363,7 @@ private State(int value) {
    */
   @java.lang.Override
   public boolean hasStartTime() {
-    return startTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -406,7 +409,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasEndTime() {
-    return endTime_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -631,10 +634,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (startTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getStartTime());
     }
-    if (endTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getEndTime());
     }
     if (operationType_
@@ -656,10 +659,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (startTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStartTime());
     }
-    if (endTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
     }
     if (operationType_
@@ -853,7 +856,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
       switch (number) {
         case 4:
           return internalGetLabels();
@@ -863,7 +867,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
       switch (number) {
         case 4:
           return internalGetMutableLabels();
@@ -883,10 +888,20 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.admin.v1.CommonMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getStartTimeFieldBuilder();
+        getEndTimeFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -942,11 +957,14 @@ public com.google.datastore.admin.v1.CommonMetadata buildPartial() {
 
     private void buildPartial0(com.google.datastore.admin.v1.CommonMetadata result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.operationType_ = operationType_;
@@ -958,6 +976,7 @@ private void buildPartial0(com.google.datastore.admin.v1.CommonMetadata result)
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.state_ = state_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1200,8 +1219,10 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
       } else {
         startTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (startTime_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1379,8 +1400,10 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (endTime_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 6430de1b118b..95a104fb8d04 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface CommonMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 281c1ce27d8b..27bd6bfe9b4f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.admin.v1.CreateIndexRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
@@ -130,7 +132,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    */
   @java.lang.Override
   public boolean hasIndex() {
-    return index_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -180,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
     }
-    if (index_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(3, getIndex());
     }
     getUnknownFields().writeTo(output);
@@ -195,7 +197,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
     }
-    if (index_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getIndex());
     }
     size += getUnknownFields().getSerializedSize();
@@ -366,10 +368,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.CreateIndexRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getIndexFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -421,9 +432,12 @@ private void buildPartial0(com.google.datastore.admin.v1.CreateIndexRequest resu
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.projectId_ = projectId_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.index_ = indexBuilder_ == null ? index_ : indexBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -748,8 +762,10 @@ public Builder mergeIndex(com.google.datastore.admin.v1.Index value) {
       } else {
         indexBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (index_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index 59cc7c3bceda..1007e11a4415 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface CreateIndexRequestOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index c3074534f410..9660133540c9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public final class DatastoreAdminProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index 49f6fb080def..82df90c5536c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index b7ac41a5eae3..43d4d3a77f13 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface DatastoreFirestoreMigrationMetadataOrBuilder
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 02e1289056dc..5ce02bced429 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index b99fc3206080..205068e374ae 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface DeleteIndexRequestOrBuilder
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 aa77a7852949..f59d4eb1d4d6 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
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 021a7bd71098..5f8cbd8002a9 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface EntityFilterOrBuilder
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 960e5093f831..cec4bb021e90 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
@@ -62,6 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.admin.v1.ExportEntitiesMetadata.Builder.class);
   }
 
+  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.datastore.admin.v1.CommonMetadata common_;
   /**
@@ -77,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return common_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -127,7 +129,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
    */
   @java.lang.Override
   public boolean hasProgressEntities() {
-    return progressEntities_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -177,7 +179,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
    */
   @java.lang.Override
   public boolean hasProgressBytes() {
-    return progressBytes_ != null;
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    *
@@ -227,7 +229,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
    */
   @java.lang.Override
   public boolean hasEntityFilter() {
-    return entityFilter_ != null;
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    *
@@ -335,16 +337,16 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (common_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getCommon());
     }
-    if (progressEntities_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getProgressEntities());
     }
-    if (progressBytes_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeMessage(3, getProgressBytes());
     }
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeMessage(4, getEntityFilter());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
@@ -359,16 +361,16 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (common_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    if (progressEntities_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getProgressEntities());
     }
-    if (progressBytes_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getProgressBytes());
     }
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
@@ -565,10 +567,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.ExportEntitiesMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getCommonFieldBuilder();
+        getProgressEntitiesFieldBuilder();
+        getProgressBytesFieldBuilder();
+        getEntityFilterFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -632,24 +646,30 @@ public com.google.datastore.admin.v1.ExportEntitiesMetadata buildPartial() {
 
     private void buildPartial0(com.google.datastore.admin.v1.ExportEntitiesMetadata result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.progressEntities_ =
             progressEntitiesBuilder_ == null ? progressEntities_ : progressEntitiesBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.progressBytes_ =
             progressBytesBuilder_ == null ? progressBytes_ : progressBytesBuilder_.build();
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.entityFilter_ =
             entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+        to_bitField0_ |= 0x00000008;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.outputUrlPrefix_ = outputUrlPrefix_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -893,8 +913,10 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (common_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1077,8 +1099,10 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
       } else {
         progressEntitiesBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (progressEntities_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1261,8 +1285,10 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value)
       } else {
         progressBytesBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (progressBytes_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1445,8 +1471,10 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (entityFilter_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index 3cf97cd971bf..fa762b066675 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesMetadataOrBuilder
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 baa65d84be28..079957ed2027 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
@@ -56,7 +57,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
     switch (number) {
       case 2:
         return internalGetLabels();
@@ -75,6 +77,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
             com.google.datastore.admin.v1.ExportEntitiesRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
@@ -243,7 +246,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
    */
   @java.lang.Override
   public boolean hasEntityFilter() {
-    return entityFilter_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -382,7 +385,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 2);
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(3, getEntityFilter());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
@@ -410,7 +413,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, labels__);
     }
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getEntityFilter());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) {
@@ -582,7 +585,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
       switch (number) {
         case 2:
           return internalGetLabels();
@@ -592,7 +596,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
       switch (number) {
         case 2:
           return internalGetMutableLabels();
@@ -612,10 +617,19 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.admin.v1.ExportEntitiesRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getEntityFilterFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -673,13 +687,16 @@ private void buildPartial0(com.google.datastore.admin.v1.ExportEntitiesRequest r
         result.labels_ = internalGetLabels();
         result.labels_.makeImmutable();
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.entityFilter_ =
             entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.outputUrlPrefix_ = outputUrlPrefix_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1190,8 +1207,10 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (entityFilter_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
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 396d34a61cc6..4a10ea301e4c 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesRequestOrBuilder
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 db977ed1b8fd..7210158fd01b 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index d33d34615f44..74130ff361c1 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesResponseOrBuilder
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 f4b557fcdc27..fc72dae63006 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index 8c56001db7bb..f270727c220e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface GetIndexRequestOrBuilder
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 2c32d45a9f2e..f5cf31eb7bff 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
@@ -62,6 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.admin.v1.ImportEntitiesMetadata.Builder.class);
   }
 
+  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.datastore.admin.v1.CommonMetadata common_;
   /**
@@ -77,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return common_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -127,7 +129,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
    */
   @java.lang.Override
   public boolean hasProgressEntities() {
-    return progressEntities_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -177,7 +179,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
    */
   @java.lang.Override
   public boolean hasProgressBytes() {
-    return progressBytes_ != null;
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    *
@@ -227,7 +229,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
    */
   @java.lang.Override
   public boolean hasEntityFilter() {
-    return entityFilter_ != null;
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    *
@@ -333,16 +335,16 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (common_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getCommon());
     }
-    if (progressEntities_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getProgressEntities());
     }
-    if (progressBytes_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeMessage(3, getProgressBytes());
     }
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeMessage(4, getEntityFilter());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
@@ -357,16 +359,16 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (common_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    if (progressEntities_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getProgressEntities());
     }
-    if (progressBytes_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getProgressBytes());
     }
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
@@ -563,10 +565,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.ImportEntitiesMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getCommonFieldBuilder();
+        getProgressEntitiesFieldBuilder();
+        getProgressBytesFieldBuilder();
+        getEntityFilterFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -630,24 +644,30 @@ public com.google.datastore.admin.v1.ImportEntitiesMetadata buildPartial() {
 
     private void buildPartial0(com.google.datastore.admin.v1.ImportEntitiesMetadata result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.progressEntities_ =
             progressEntitiesBuilder_ == null ? progressEntities_ : progressEntitiesBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.progressBytes_ =
             progressBytesBuilder_ == null ? progressBytes_ : progressBytesBuilder_.build();
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.entityFilter_ =
             entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+        to_bitField0_ |= 0x00000008;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.inputUrl_ = inputUrl_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -891,8 +911,10 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (common_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1075,8 +1097,10 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
       } else {
         progressEntitiesBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (progressEntities_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1259,8 +1283,10 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value)
       } else {
         progressBytesBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (progressBytes_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1443,8 +1469,10 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (entityFilter_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 3b7565c3d008..0826f143bf5e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesMetadataOrBuilder
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 e3ba7f3aef57..4e57a4050b92 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
@@ -56,7 +57,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
     switch (number) {
       case 2:
         return internalGetLabels();
@@ -75,6 +77,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
             com.google.datastore.admin.v1.ImportEntitiesRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
@@ -323,7 +326,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
    */
   @java.lang.Override
   public boolean hasEntityFilter() {
-    return entityFilter_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -386,7 +389,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, inputUrl_);
     }
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(4, getEntityFilter());
     }
     getUnknownFields().writeTo(output);
@@ -414,7 +417,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, inputUrl_);
     }
-    if (entityFilter_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter());
     }
     size += getUnknownFields().getSerializedSize();
@@ -583,7 +586,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
       switch (number) {
         case 2:
           return internalGetLabels();
@@ -593,7 +597,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
       switch (number) {
         case 2:
           return internalGetMutableLabels();
@@ -613,10 +618,19 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.admin.v1.ImportEntitiesRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getEntityFilterFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -677,10 +691,13 @@ private void buildPartial0(com.google.datastore.admin.v1.ImportEntitiesRequest r
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.inputUrl_ = inputUrl_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.entityFilter_ =
             entityFilterBuilder_ == null ? entityFilter_ : entityFilterBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1377,8 +1394,10 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       } else {
         entityFilterBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (entityFilter_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
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 26d6066bc10b..fc13ff730fe5 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesRequestOrBuilder
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 57740ae48648..bffea1be63dd 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
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 bc92eda84088..310490d60430 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
@@ -62,6 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.admin.v1.IndexOperationMetadata.Builder.class);
   }
 
+  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.datastore.admin.v1.CommonMetadata common_;
   /**
@@ -77,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return common_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -127,7 +129,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
    */
   @java.lang.Override
   public boolean hasProgressEntities() {
-    return progressEntities_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -227,10 +229,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (common_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getCommon());
     }
-    if (progressEntities_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getProgressEntities());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
@@ -245,10 +247,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (common_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    if (progressEntities_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getProgressEntities());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) {
@@ -429,10 +431,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.admin.v1.IndexOperationMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getCommonFieldBuilder();
+        getProgressEntitiesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -486,16 +498,20 @@ public com.google.datastore.admin.v1.IndexOperationMetadata buildPartial() {
 
     private void buildPartial0(com.google.datastore.admin.v1.IndexOperationMetadata result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.progressEntities_ =
             progressEntitiesBuilder_ == null ? progressEntities_ : progressEntitiesBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.indexId_ = indexId_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -721,8 +737,10 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (common_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -905,8 +923,10 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
       } else {
         progressEntitiesBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (progressEntities_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index c8897f8b91c7..8e722fb2e934 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface IndexOperationMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 4736c5d15a0d..5635d1b53e49 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface IndexOrBuilder
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 89af3dc4143b..f3b970f7c1ae 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public final class IndexProto {
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 f1be57c39dba..2f1ad85fbc8d 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index 1ee9ba419162..d5891a45c87f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesRequestOrBuilder
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 d3c21dae053a..a0e99c1f81be 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index 82bf6cb8b193..a27eed1d4bf5 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesResponseOrBuilder
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 2e0039b2862f..e0f0b019689a 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
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 192b6933937f..919c52c64cd8 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface MigrationProgressEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index e521386dbd6b..8e23fb66ef02 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public final class MigrationProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index a2fee45454bf..a0724c30e4f5 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
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 4aa40d5b3d20..4b1f857afbb2 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 080d9f1f581c..50fac8fc6e01 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface MigrationStateEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index f3a1a0c9b3d3..043b3e112074 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index 14b66b761a61..d4e88126bb3a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
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 c5719b688550..a6d5bca29a27 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index 4a1a97d73a5e..71b3c8ee8f4a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.admin.v1;
 
 public interface ProgressOrBuilder
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 005fb5f42237..d9889d3b17a0 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -457,6 +458,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder.class);
       }
 
+      private int bitField0_;
       public static final int UP_TO_FIELD_NUMBER = 1;
       private com.google.protobuf.Int64Value upTo_;
       /**
@@ -492,7 +494,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        */
       @java.lang.Override
       public boolean hasUpTo() {
-        return upTo_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -577,7 +579,7 @@ public final boolean isInitialized() {
 
       @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (upTo_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getUpTo());
         }
         getUnknownFields().writeTo(output);
@@ -589,7 +591,7 @@ public int getSerializedSize() {
         if (size != -1) return size;
 
         size = 0;
-        if (upTo_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getUpTo());
         }
         size += getUnknownFields().getSerializedSize();
@@ -762,10 +764,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.Count.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+            getUpToFieldBuilder();
+          }
         }
 
         @java.lang.Override
@@ -815,9 +826,12 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count buildPartial()
         private void buildPartial0(
             com.google.datastore.v1.AggregationQuery.Aggregation.Count result) {
           int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
             result.upTo_ = upToBuilder_ == null ? upTo_ : upToBuilder_.build();
+            to_bitField0_ |= 0x00000001;
           }
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -1123,8 +1137,10 @@ public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
           } else {
             upToBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
-          onChanged();
+          if (upTo_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
@@ -1451,6 +1467,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder.class);
       }
 
+      private int bitField0_;
       public static final int PROPERTY_FIELD_NUMBER = 1;
       private com.google.datastore.v1.PropertyReference property_;
       /**
@@ -1466,7 +1483,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        */
       @java.lang.Override
       public boolean hasProperty() {
-        return property_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -1515,7 +1532,7 @@ public final boolean isInitialized() {
 
       @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (property_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getProperty());
         }
         getUnknownFields().writeTo(output);
@@ -1527,7 +1544,7 @@ public int getSerializedSize() {
         if (size != -1) return size;
 
         size = 0;
-        if (property_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
         }
         size += getUnknownFields().getSerializedSize();
@@ -1717,10 +1734,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.Sum.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+            getPropertyFieldBuilder();
+          }
         }
 
         @java.lang.Override
@@ -1770,9 +1796,12 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Sum buildPartial() {
         private void buildPartial0(
             com.google.datastore.v1.AggregationQuery.Aggregation.Sum result) {
           int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
             result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+            to_bitField0_ |= 0x00000001;
           }
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -1981,8 +2010,10 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
           } else {
             propertyBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
-          onChanged();
+          if (property_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
@@ -2219,6 +2250,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder.class);
       }
 
+      private int bitField0_;
       public static final int PROPERTY_FIELD_NUMBER = 1;
       private com.google.datastore.v1.PropertyReference property_;
       /**
@@ -2234,7 +2266,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        */
       @java.lang.Override
       public boolean hasProperty() {
-        return property_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        *
@@ -2283,7 +2315,7 @@ public final boolean isInitialized() {
 
       @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (property_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getProperty());
         }
         getUnknownFields().writeTo(output);
@@ -2295,7 +2327,7 @@ public int getSerializedSize() {
         if (size != -1) return size;
 
         size = 0;
-        if (property_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
         }
         size += getUnknownFields().getSerializedSize();
@@ -2475,10 +2507,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.Avg.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+            getPropertyFieldBuilder();
+          }
         }
 
         @java.lang.Override
@@ -2528,9 +2569,12 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Avg buildPartial() {
         private void buildPartial0(
             com.google.datastore.v1.AggregationQuery.Aggregation.Avg result) {
           int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
             result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+            to_bitField0_ |= 0x00000001;
           }
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -2739,8 +2783,10 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
           } else {
             propertyBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
-          onChanged();
+          if (property_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
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 585443a69127..82229632d6e2 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface AggregationQueryOrBuilder
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 b695c9a16f25..23f492681b5e 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -56,7 +57,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
     switch (number) {
       case 2:
         return internalGetAggregateProperties();
@@ -400,7 +402,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
       switch (number) {
         case 2:
           return internalGetAggregateProperties();
@@ -410,7 +413,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
       switch (number) {
         case 2:
           return internalGetMutableAggregateProperties();
@@ -478,8 +482,9 @@ public com.google.datastore.v1.AggregationResult buildPartial() {
     private void buildPartial0(com.google.datastore.v1.AggregationResult result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.aggregateProperties_ = internalGetAggregateProperties();
-        result.aggregateProperties_.makeImmutable();
+        result.aggregateProperties_ =
+            internalGetAggregateProperties()
+                .build(AggregatePropertiesDefaultEntryHolder.defaultEntry);
       }
     }
 
@@ -564,7 +569,7 @@ public Builder mergeFrom(
                             AggregatePropertiesDefaultEntryHolder.defaultEntry.getParserForType(),
                             extensionRegistry);
                 internalGetMutableAggregateProperties()
-                    .getMutableMap()
+                    .ensureBuilderMap()
                     .put(aggregateProperties__.getKey(), aggregateProperties__.getValue());
                 bitField0_ |= 0x00000001;
                 break;
@@ -588,27 +593,57 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.MapField
+    private static final class AggregatePropertiesConverter
+        implements com.google.protobuf.MapFieldBuilder.Converter<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value> {
+      @java.lang.Override
+      public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilder val) {
+        if (val instanceof com.google.datastore.v1.Value) {
+          return (com.google.datastore.v1.Value) val;
+        }
+        return ((com.google.datastore.v1.Value.Builder) val).build();
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.MapEntry
+          defaultEntry() {
+        return AggregatePropertiesDefaultEntryHolder.defaultEntry;
+      }
+    };
+
+    private static final AggregatePropertiesConverter aggregatePropertiesConverter =
+        new AggregatePropertiesConverter();
+
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder>
         aggregateProperties_;
 
-    private com.google.protobuf.MapField
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder>
         internalGetAggregateProperties() {
       if (aggregateProperties_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            AggregatePropertiesDefaultEntryHolder.defaultEntry);
+        return new com.google.protobuf.MapFieldBuilder<>(aggregatePropertiesConverter);
       }
       return aggregateProperties_;
     }
 
-    private com.google.protobuf.MapField
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder>
         internalGetMutableAggregateProperties() {
       if (aggregateProperties_ == null) {
         aggregateProperties_ =
-            com.google.protobuf.MapField.newMapField(
-                AggregatePropertiesDefaultEntryHolder.defaultEntry);
-      }
-      if (!aggregateProperties_.isMutable()) {
-        aggregateProperties_ = aggregateProperties_.copy();
+            new com.google.protobuf.MapFieldBuilder<>(aggregatePropertiesConverter);
       }
       bitField0_ |= 0x00000001;
       onChanged();
@@ -616,7 +651,7 @@ public Builder mergeFrom(
     }
 
     public int getAggregatePropertiesCount() {
-      return internalGetAggregateProperties().getMap().size();
+      return internalGetAggregateProperties().ensureBuilderMap().size();
     }
     /**
      *
@@ -637,7 +672,7 @@ public boolean containsAggregateProperties(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      return internalGetAggregateProperties().getMap().containsKey(key);
+      return internalGetAggregateProperties().ensureBuilderMap().containsKey(key);
     }
     /** Use {@link #getAggregatePropertiesMap()} instead. */
     @java.lang.Override
@@ -662,7 +697,7 @@ public java.util.Map getAggrega
     @java.lang.Override
     public java.util.Map
         getAggregatePropertiesMap() {
-      return internalGetAggregateProperties().getMap();
+      return internalGetAggregateProperties().getImmutableMap();
     }
     /**
      *
@@ -686,9 +721,9 @@ public java.util.Map getAggrega
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetAggregateProperties().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
+      java.util.Map map =
+          internalGetMutableAggregateProperties().ensureBuilderMap();
+      return map.containsKey(key) ? aggregatePropertiesConverter.build(map.get(key)) : defaultValue;
     }
     /**
      *
@@ -709,17 +744,17 @@ public com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.Str
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetAggregateProperties().getMap();
+      java.util.Map map =
+          internalGetMutableAggregateProperties().ensureBuilderMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
-      return map.get(key);
+      return aggregatePropertiesConverter.build(map.get(key));
     }
 
     public Builder clearAggregateProperties() {
       bitField0_ = (bitField0_ & ~0x00000001);
-      internalGetMutableAggregateProperties().getMutableMap().clear();
+      internalGetMutableAggregateProperties().clear();
       return this;
     }
     /**
@@ -740,7 +775,7 @@ public Builder removeAggregateProperties(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      internalGetMutableAggregateProperties().getMutableMap().remove(key);
+      internalGetMutableAggregateProperties().ensureBuilderMap().remove(key);
       return this;
     }
     /** Use alternate mutation accessors instead. */
@@ -748,7 +783,7 @@ public Builder removeAggregateProperties(java.lang.String key) {
     public java.util.Map
         getMutableAggregateProperties() {
       bitField0_ |= 0x00000001;
-      return internalGetMutableAggregateProperties().getMutableMap();
+      return internalGetMutableAggregateProperties().ensureMessageMap();
     }
     /**
      *
@@ -772,7 +807,7 @@ public Builder putAggregateProperties(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-      internalGetMutableAggregateProperties().getMutableMap().put(key, value);
+      internalGetMutableAggregateProperties().ensureBuilderMap().put(key, value);
       bitField0_ |= 0x00000001;
       return this;
     }
@@ -792,10 +827,45 @@ public Builder putAggregateProperties(
      */
     public Builder putAllAggregateProperties(
         java.util.Map values) {
-      internalGetMutableAggregateProperties().getMutableMap().putAll(values);
+      for (java.util.Map.Entry e :
+          values.entrySet()) {
+        if (e.getKey() == null || e.getValue() == null) {
+          throw new NullPointerException();
+        }
+      }
+      internalGetMutableAggregateProperties().ensureBuilderMap().putAll(values);
       bitField0_ |= 0x00000001;
       return this;
     }
+    /**
+     *
+     *
+     * 
    +     * 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
+     * number of aggregation functions in the query.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
+     */
+    public com.google.datastore.v1.Value.Builder putAggregatePropertiesBuilderIfAbsent(
+        java.lang.String key) {
+      java.util.Map builderMap =
+          internalGetMutableAggregateProperties().ensureBuilderMap();
+      com.google.datastore.v1.ValueOrBuilder entry = builderMap.get(key);
+      if (entry == null) {
+        entry = com.google.datastore.v1.Value.newBuilder();
+        builderMap.put(key, entry);
+      }
+      if (entry instanceof com.google.datastore.v1.Value) {
+        entry = ((com.google.datastore.v1.Value) entry).toBuilder();
+        builderMap.put(key, entry);
+      }
+      return (com.google.datastore.v1.Value.Builder) entry;
+    }
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
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 1031ad15a8c8..7a7e7252c1c8 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.AggregationResultBatch.Builder.class);
   }
 
+  private int bitField0_;
   public static final int AGGREGATION_RESULTS_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
@@ -195,7 +197,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
    */
   @java.lang.Override
   public boolean hasReadTime() {
-    return readTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -256,7 +258,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(2, moreResults_);
     }
-    if (readTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(3, getReadTime());
     }
     getUnknownFields().writeTo(output);
@@ -277,7 +279,7 @@ public int getSerializedSize() {
             .getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, moreResults_);
     }
-    if (readTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getReadTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -452,10 +454,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.AggregationResultBatch.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getAggregationResultsFieldBuilder();
+        getReadTimeFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -527,9 +539,12 @@ private void buildPartial0(com.google.datastore.v1.AggregationResultBatch result
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.moreResults_ = moreResults_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1261,8 +1276,10 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       } else {
         readTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (readTime_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
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 3f5daa2c4ab5..29f022e1028e 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface AggregationResultBatchOrBuilder
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 d327f8b9a50a..fdaa6706667e 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface AggregationResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index a1eabf9d4fee..d5d7fd339e2c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public final class AggregationResultProto {
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 20aa6f03051e..f39270856df1 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 3ab3bbc56bd3..d08d9cc422c5 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface AllocateIdsRequestOrBuilder
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 7a6b97e15fa1..dea70c4b54bc 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 4a27c43daed7..a0964c4e2f26 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface AllocateIdsResponseOrBuilder
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 08e18ed6cd38..98c8b6bae04c 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index e34fa65d8ce4..efdb8239bce5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface ArrayValueOrBuilder
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 a4c7a0e2a752..5d0ba70b1e38 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.BeginTransactionRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
 
   @SuppressWarnings("serial")
@@ -187,7 +189,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    */
   @java.lang.Override
   public boolean hasTransactionOptions() {
-    return transactionOptions_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -242,7 +244,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
-    if (transactionOptions_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(10, getTransactionOptions());
     }
     getUnknownFields().writeTo(output);
@@ -260,7 +262,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
-    if (transactionOptions_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getTransactionOptions());
     }
     size += getUnknownFields().getSerializedSize();
@@ -434,10 +436,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.BeginTransactionRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getTransactionOptionsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -493,12 +504,15 @@ private void buildPartial0(com.google.datastore.v1.BeginTransactionRequest resul
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.databaseId_ = databaseId_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transactionOptions_ =
             transactionOptionsBuilder_ == null
                 ? transactionOptions_
                 : transactionOptionsBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -955,8 +969,10 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption
       } else {
         transactionOptionsBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (transactionOptions_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
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 2b1fcec80bff..eafc5c115dfe 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface BeginTransactionRequestOrBuilder
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 b5cfc736030f..21780f6f0023 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index 2abe6d5e3750..5403b4a7f620 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface BeginTransactionResponseOrBuilder
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 87c8e1ed6382..c5a4b95c71fa 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 118e22cf3b95..7b6031d4398c 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface CommitRequestOrBuilder
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 320d030e0357..e8a9c0973a11 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -62,6 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.CommitResponse.Builder.class);
   }
 
+  private int bitField0_;
   public static final int MUTATION_RESULTS_FIELD_NUMBER = 3;
 
   @SuppressWarnings("serial")
@@ -172,7 +174,7 @@ public int getIndexUpdates() {
    */
   @java.lang.Override
   public boolean hasCommitTime() {
-    return commitTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -223,7 +225,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (indexUpdates_ != 0) {
       output.writeInt32(4, indexUpdates_);
     }
-    if (commitTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(8, getCommitTime());
     }
     getUnknownFields().writeTo(output);
@@ -241,7 +243,7 @@ public int getSerializedSize() {
     if (indexUpdates_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, indexUpdates_);
     }
-    if (commitTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCommitTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -415,10 +417,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.CommitResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getMutationResultsFieldBuilder();
+        getCommitTimeFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -490,9 +502,12 @@ private void buildPartial0(com.google.datastore.v1.CommitResponse result) {
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.indexUpdates_ = indexUpdates_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.commitTime_ = commitTimeBuilder_ == null ? commitTime_ : commitTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1173,8 +1188,10 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) {
       } else {
         commitTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (commitTime_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 5deda13069d5..d036538063c4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface CommitResponseOrBuilder
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 a0a92b296045..9dc1f83c9867 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 30a72edf5127..a41080ad3783 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface CompositeFilterOrBuilder
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 95d5f9db4e5f..b1a10540a257 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public final class DatastoreProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index ad36431a3e09..905877770903 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -54,7 +55,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
     switch (number) {
       case 3:
         return internalGetProperties();
@@ -72,6 +74,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
             com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class);
   }
 
+  private int bitField0_;
   public static final int KEY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Key key_;
   /**
@@ -92,7 +95,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    */
   @java.lang.Override
   public boolean hasKey() {
-    return key_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -274,7 +277,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (key_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getKey());
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
@@ -288,7 +291,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (key_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getKey());
     }
     for (java.util.Map.Entry entry :
@@ -460,7 +463,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
       switch (number) {
         case 3:
           return internalGetProperties();
@@ -470,7 +474,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
       switch (number) {
         case 3:
           return internalGetMutableProperties();
@@ -489,10 +494,19 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.datastore.v1.Entity.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getKeyFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -540,13 +554,16 @@ public com.google.datastore.v1.Entity buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.Entity result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.key_ = keyBuilder_ == null ? key_ : keyBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.properties_ = internalGetProperties();
-        result.properties_.makeImmutable();
+        result.properties_ =
+            internalGetProperties().build(PropertiesDefaultEntryHolder.defaultEntry);
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -639,7 +656,7 @@ public Builder mergeFrom(
                             PropertiesDefaultEntryHolder.defaultEntry.getParserForType(),
                             extensionRegistry);
                 internalGetMutableProperties()
-                    .getMutableMap()
+                    .ensureBuilderMap()
                     .put(properties__.getKey(), properties__.getValue());
                 bitField0_ |= 0x00000002;
                 break;
@@ -788,8 +805,10 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       } else {
         keyBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (key_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -886,26 +905,55 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
       return keyBuilder_;
     }
 
-    private com.google.protobuf.MapField
+    private static final class PropertiesConverter
+        implements com.google.protobuf.MapFieldBuilder.Converter<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value> {
+      @java.lang.Override
+      public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilder val) {
+        if (val instanceof com.google.datastore.v1.Value) {
+          return (com.google.datastore.v1.Value) val;
+        }
+        return ((com.google.datastore.v1.Value.Builder) val).build();
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.MapEntry
+          defaultEntry() {
+        return PropertiesDefaultEntryHolder.defaultEntry;
+      }
+    };
+
+    private static final PropertiesConverter propertiesConverter = new PropertiesConverter();
+
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder>
         properties_;
 
-    private com.google.protobuf.MapField
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder>
         internalGetProperties() {
       if (properties_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            PropertiesDefaultEntryHolder.defaultEntry);
+        return new com.google.protobuf.MapFieldBuilder<>(propertiesConverter);
       }
       return properties_;
     }
 
-    private com.google.protobuf.MapField
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.ValueOrBuilder,
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder>
         internalGetMutableProperties() {
       if (properties_ == null) {
-        properties_ =
-            com.google.protobuf.MapField.newMapField(PropertiesDefaultEntryHolder.defaultEntry);
-      }
-      if (!properties_.isMutable()) {
-        properties_ = properties_.copy();
+        properties_ = new com.google.protobuf.MapFieldBuilder<>(propertiesConverter);
       }
       bitField0_ |= 0x00000002;
       onChanged();
@@ -913,7 +961,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
     }
 
     public int getPropertiesCount() {
-      return internalGetProperties().getMap().size();
+      return internalGetProperties().ensureBuilderMap().size();
     }
     /**
      *
@@ -934,7 +982,7 @@ public boolean containsProperties(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      return internalGetProperties().getMap().containsKey(key);
+      return internalGetProperties().ensureBuilderMap().containsKey(key);
     }
     /** Use {@link #getPropertiesMap()} instead. */
     @java.lang.Override
@@ -958,7 +1006,7 @@ public java.util.Map getPropert
      */
     @java.lang.Override
     public java.util.Map getPropertiesMap() {
-      return internalGetProperties().getMap();
+      return internalGetProperties().getImmutableMap();
     }
     /**
      *
@@ -982,9 +1030,9 @@ public java.util.Map getPropert
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetProperties().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
+      java.util.Map map =
+          internalGetMutableProperties().ensureBuilderMap();
+      return map.containsKey(key) ? propertiesConverter.build(map.get(key)) : defaultValue;
     }
     /**
      *
@@ -1005,17 +1053,17 @@ public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key)
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetProperties().getMap();
+      java.util.Map map =
+          internalGetMutableProperties().ensureBuilderMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
-      return map.get(key);
+      return propertiesConverter.build(map.get(key));
     }
 
     public Builder clearProperties() {
       bitField0_ = (bitField0_ & ~0x00000002);
-      internalGetMutableProperties().getMutableMap().clear();
+      internalGetMutableProperties().clear();
       return this;
     }
     /**
@@ -1036,14 +1084,14 @@ public Builder removeProperties(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      internalGetMutableProperties().getMutableMap().remove(key);
+      internalGetMutableProperties().ensureBuilderMap().remove(key);
       return this;
     }
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableProperties() {
       bitField0_ |= 0x00000002;
-      return internalGetMutableProperties().getMutableMap();
+      return internalGetMutableProperties().ensureMessageMap();
     }
     /**
      *
@@ -1066,7 +1114,7 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
       if (value == null) {
         throw new NullPointerException("map value");
       }
-      internalGetMutableProperties().getMutableMap().put(key, value);
+      internalGetMutableProperties().ensureBuilderMap().put(key, value);
       bitField0_ |= 0x00000002;
       return this;
     }
@@ -1086,10 +1134,45 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
      */
     public Builder putAllProperties(
         java.util.Map values) {
-      internalGetMutableProperties().getMutableMap().putAll(values);
+      for (java.util.Map.Entry e :
+          values.entrySet()) {
+        if (e.getKey() == null || e.getValue() == null) {
+          throw new NullPointerException();
+        }
+      }
+      internalGetMutableProperties().ensureBuilderMap().putAll(values);
       bitField0_ |= 0x00000002;
       return this;
     }
+    /**
+     *
+     *
+     * 
    +     * The entity's properties.
+     * The map's keys are property names.
+     * A property name matching regex `__.*__` is reserved.
+     * A reserved property name is forbidden in certain documented contexts.
+     * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+     * be empty.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.Value> properties = 3;
+     */
+    public com.google.datastore.v1.Value.Builder putPropertiesBuilderIfAbsent(
+        java.lang.String key) {
+      java.util.Map builderMap =
+          internalGetMutableProperties().ensureBuilderMap();
+      com.google.datastore.v1.ValueOrBuilder entry = builderMap.get(key);
+      if (entry == null) {
+        entry = com.google.datastore.v1.Value.newBuilder();
+        builderMap.put(key, entry);
+      }
+      if (entry instanceof com.google.datastore.v1.Value) {
+        entry = ((com.google.datastore.v1.Value) entry).toBuilder();
+        builderMap.put(key, entry);
+      }
+      return (com.google.datastore.v1.Value.Builder) entry;
+    }
 
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
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 40ef1922973e..2d5265861ca1 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface EntityOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 2fb805273e76..ac5863737489 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public final class EntityProto {
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 c68c6f569bfc..3d257de3cb21 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -245,6 +246,7 @@ private ResultType(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.v1.EntityResult.ResultType)
   }
 
+  private int bitField0_;
   public static final int ENTITY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Entity entity_;
   /**
@@ -260,7 +262,7 @@ private ResultType(int value) {
    */
   @java.lang.Override
   public boolean hasEntity() {
-    return entity_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -335,7 +337,7 @@ public long getVersion() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return createTime_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -390,7 +392,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return updateTime_ != null;
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    *
@@ -460,7 +462,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (entity_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getEntity());
     }
     if (!cursor_.isEmpty()) {
@@ -469,10 +471,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (version_ != 0L) {
       output.writeInt64(4, version_);
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeMessage(5, getUpdateTime());
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(6, getCreateTime());
     }
     getUnknownFields().writeTo(output);
@@ -484,7 +486,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (entity_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getEntity());
     }
     if (!cursor_.isEmpty()) {
@@ -493,10 +495,10 @@ public int getSerializedSize() {
     if (version_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, version_);
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime());
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getCreateTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -683,10 +685,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.EntityResult.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getEntityFieldBuilder();
+        getCreateTimeFieldBuilder();
+        getUpdateTimeFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -745,21 +758,26 @@ public com.google.datastore.v1.EntityResult buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.EntityResult result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.entity_ = entityBuilder_ == null ? entity_ : entityBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.version_ = version_;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.cursor_ = cursor_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -997,8 +1015,10 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) {
       } else {
         entityBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (entity_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1270,8 +1290,10 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (createTime_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1480,8 +1502,10 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (updateTime_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
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 68db7ff339a0..9b2304ac991c 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface EntityResultOrBuilder
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 fd4a409297db..dfe3e1a0e8b6 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 013157d1ce46..9b4f55d8c113 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface FilterOrBuilder
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 7820f0ba74c2..a9622be98b0f 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -56,7 +57,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
     switch (number) {
       case 5:
         return internalGetNamedBindings();
@@ -584,7 +586,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
       switch (number) {
         case 5:
           return internalGetNamedBindings();
@@ -594,7 +597,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
       switch (number) {
         case 5:
           return internalGetMutableNamedBindings();
@@ -689,8 +693,8 @@ private void buildPartial0(com.google.datastore.v1.GqlQuery result) {
         result.allowLiterals_ = allowLiterals_;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.namedBindings_ = internalGetNamedBindings();
-        result.namedBindings_.makeImmutable();
+        result.namedBindings_ =
+            internalGetNamedBindings().build(NamedBindingsDefaultEntryHolder.defaultEntry);
       }
     }
 
@@ -836,7 +840,7 @@ public Builder mergeFrom(
                             NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(),
                             extensionRegistry);
                 internalGetMutableNamedBindings()
-                    .getMutableMap()
+                    .ensureBuilderMap()
                     .put(namedBindings__.getKey(), namedBindings__.getValue());
                 bitField0_ |= 0x00000004;
                 break;
@@ -1033,29 +1037,58 @@ public Builder clearAllowLiterals() {
       return this;
     }
 
-    private com.google.protobuf.MapField<
-            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+    private static final class NamedBindingsConverter
+        implements com.google.protobuf.MapFieldBuilder.Converter<
+            java.lang.String,
+            com.google.datastore.v1.GqlQueryParameterOrBuilder,
+            com.google.datastore.v1.GqlQueryParameter> {
+      @java.lang.Override
+      public com.google.datastore.v1.GqlQueryParameter build(
+          com.google.datastore.v1.GqlQueryParameterOrBuilder val) {
+        if (val instanceof com.google.datastore.v1.GqlQueryParameter) {
+          return (com.google.datastore.v1.GqlQueryParameter) val;
+        }
+        return ((com.google.datastore.v1.GqlQueryParameter.Builder) val).build();
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.MapEntry<
+              java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+          defaultEntry() {
+        return NamedBindingsDefaultEntryHolder.defaultEntry;
+      }
+    };
+
+    private static final NamedBindingsConverter namedBindingsConverter =
+        new NamedBindingsConverter();
+
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.GqlQueryParameterOrBuilder,
+            com.google.datastore.v1.GqlQueryParameter,
+            com.google.datastore.v1.GqlQueryParameter.Builder>
         namedBindings_;
 
-    private com.google.protobuf.MapField<
-            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.GqlQueryParameterOrBuilder,
+            com.google.datastore.v1.GqlQueryParameter,
+            com.google.datastore.v1.GqlQueryParameter.Builder>
         internalGetNamedBindings() {
       if (namedBindings_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            NamedBindingsDefaultEntryHolder.defaultEntry);
+        return new com.google.protobuf.MapFieldBuilder<>(namedBindingsConverter);
       }
       return namedBindings_;
     }
 
-    private com.google.protobuf.MapField<
-            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
+    private com.google.protobuf.MapFieldBuilder<
+            java.lang.String,
+            com.google.datastore.v1.GqlQueryParameterOrBuilder,
+            com.google.datastore.v1.GqlQueryParameter,
+            com.google.datastore.v1.GqlQueryParameter.Builder>
         internalGetMutableNamedBindings() {
       if (namedBindings_ == null) {
-        namedBindings_ =
-            com.google.protobuf.MapField.newMapField(NamedBindingsDefaultEntryHolder.defaultEntry);
-      }
-      if (!namedBindings_.isMutable()) {
-        namedBindings_ = namedBindings_.copy();
+        namedBindings_ = new com.google.protobuf.MapFieldBuilder<>(namedBindingsConverter);
       }
       bitField0_ |= 0x00000004;
       onChanged();
@@ -1063,7 +1096,7 @@ public Builder clearAllowLiterals() {
     }
 
     public int getNamedBindingsCount() {
-      return internalGetNamedBindings().getMap().size();
+      return internalGetNamedBindings().ensureBuilderMap().size();
     }
     /**
      *
@@ -1083,7 +1116,7 @@ public boolean containsNamedBindings(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      return internalGetNamedBindings().getMap().containsKey(key);
+      return internalGetNamedBindings().ensureBuilderMap().containsKey(key);
     }
     /** Use {@link #getNamedBindingsMap()} instead. */
     @java.lang.Override
@@ -1108,7 +1141,7 @@ public boolean containsNamedBindings(java.lang.String key) {
     @java.lang.Override
     public java.util.Map
         getNamedBindingsMap() {
-      return internalGetNamedBindings().getMap();
+      return internalGetNamedBindings().getImmutableMap();
     }
     /**
      *
@@ -1131,9 +1164,9 @@ public boolean containsNamedBindings(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetNamedBindings().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
+      java.util.Map map =
+          internalGetMutableNamedBindings().ensureBuilderMap();
+      return map.containsKey(key) ? namedBindingsConverter.build(map.get(key)) : defaultValue;
     }
     /**
      *
@@ -1153,17 +1186,17 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetNamedBindings().getMap();
+      java.util.Map map =
+          internalGetMutableNamedBindings().ensureBuilderMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
-      return map.get(key);
+      return namedBindingsConverter.build(map.get(key));
     }
 
     public Builder clearNamedBindings() {
       bitField0_ = (bitField0_ & ~0x00000004);
-      internalGetMutableNamedBindings().getMutableMap().clear();
+      internalGetMutableNamedBindings().clear();
       return this;
     }
     /**
@@ -1183,7 +1216,7 @@ public Builder removeNamedBindings(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      internalGetMutableNamedBindings().getMutableMap().remove(key);
+      internalGetMutableNamedBindings().ensureBuilderMap().remove(key);
       return this;
     }
     /** Use alternate mutation accessors instead. */
@@ -1191,7 +1224,7 @@ public Builder removeNamedBindings(java.lang.String key) {
     public java.util.Map
         getMutableNamedBindings() {
       bitField0_ |= 0x00000004;
-      return internalGetMutableNamedBindings().getMutableMap();
+      return internalGetMutableNamedBindings().ensureMessageMap();
     }
     /**
      *
@@ -1214,7 +1247,7 @@ public Builder putNamedBindings(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-      internalGetMutableNamedBindings().getMutableMap().put(key, value);
+      internalGetMutableNamedBindings().ensureBuilderMap().put(key, value);
       bitField0_ |= 0x00000004;
       return this;
     }
@@ -1233,10 +1266,44 @@ public Builder putNamedBindings(
      */
     public Builder putAllNamedBindings(
         java.util.Map values) {
-      internalGetMutableNamedBindings().getMutableMap().putAll(values);
+      for (java.util.Map.Entry e :
+          values.entrySet()) {
+        if (e.getKey() == null || e.getValue() == null) {
+          throw new NullPointerException();
+        }
+      }
+      internalGetMutableNamedBindings().ensureBuilderMap().putAll(values);
       bitField0_ |= 0x00000004;
       return this;
     }
+    /**
+     *
+     *
+     * 
    +     * 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 `""`.
+     * 
    
+     *
+     * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
+     */
+    public com.google.datastore.v1.GqlQueryParameter.Builder putNamedBindingsBuilderIfAbsent(
+        java.lang.String key) {
+      java.util.Map
+          builderMap = internalGetMutableNamedBindings().ensureBuilderMap();
+      com.google.datastore.v1.GqlQueryParameterOrBuilder entry = builderMap.get(key);
+      if (entry == null) {
+        entry = com.google.datastore.v1.GqlQueryParameter.newBuilder();
+        builderMap.put(key, entry);
+      }
+      if (entry instanceof com.google.datastore.v1.GqlQueryParameter) {
+        entry = ((com.google.datastore.v1.GqlQueryParameter) entry).toBuilder();
+        builderMap.put(key, entry);
+      }
+      return (com.google.datastore.v1.GqlQueryParameter.Builder) entry;
+    }
 
     private java.util.List positionalBindings_ =
         java.util.Collections.emptyList();
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 fc8fd65b73ec..ada6911c53b2 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface GqlQueryOrBuilder
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 e718ae9ed8f3..129399357633 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 b34c06eec494..32ee089dbbfd 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface GqlQueryParameterOrBuilder
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 b4bc7f7bcf2c..9c7e12a71b81 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -1412,6 +1413,7 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
     }
   }
 
+  private int bitField0_;
   public static final int PARTITION_ID_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PartitionId partitionId_;
   /**
@@ -1429,7 +1431,7 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
    */
   @java.lang.Override
   public boolean hasPartitionId() {
-    return partitionId_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -1628,7 +1630,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (partitionId_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getPartitionId());
     }
     for (int i = 0; i < path_.size(); i++) {
@@ -1643,7 +1645,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (partitionId_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPartitionId());
     }
     for (int i = 0; i < path_.size(); i++) {
@@ -1817,10 +1819,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Key.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPartitionIdFieldBuilder();
+        getPathFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1886,10 +1898,13 @@ private void buildPartialRepeatedFields(com.google.datastore.v1.Key result) {
 
     private void buildPartial0(com.google.datastore.v1.Key result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.partitionId_ =
             partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -2143,8 +2158,10 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       } else {
         partitionIdBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (partitionId_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
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 ad49101bd0ea..af1608460f99 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface KeyOrBuilder
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 35cad44b948e..b60072ad45bd 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index ba42186def27..4f1aa3de965d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface KindExpressionOrBuilder
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 29d9e20a2282..82d3b26f7567 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.LookupRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
 
   @SuppressWarnings("serial")
@@ -187,7 +189,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    */
   @java.lang.Override
   public boolean hasReadOptions() {
-    return readOptions_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -311,7 +313,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (readOptions_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getReadOptions());
     }
     for (int i = 0; i < keys_.size(); i++) {
@@ -332,7 +334,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (readOptions_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
     }
     for (int i = 0; i < keys_.size(); i++) {
@@ -517,10 +519,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.LookupRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getReadOptionsFieldBuilder();
+        getKeysFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -596,10 +608,13 @@ private void buildPartial0(com.google.datastore.v1.LookupRequest result) {
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.databaseId_ = databaseId_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.readOptions_ =
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1091,8 +1106,10 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       } else {
         readOptionsBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (readOptions_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
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 72cdbb580111..3b14e083dda2 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface LookupRequestOrBuilder
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 7f72257df52c..4fea00b6024e 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -65,6 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.LookupResponse.Builder.class);
   }
 
+  private int bitField0_;
   public static final int FOUND_FIELD_NUMBER = 1;
 
   @SuppressWarnings("serial")
@@ -346,7 +348,7 @@ public com.google.protobuf.ByteString getTransaction() {
    */
   @java.lang.Override
   public boolean hasReadTime() {
-    return readTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -403,7 +405,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(5, transaction_);
     }
-    if (readTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(7, getReadTime());
     }
     getUnknownFields().writeTo(output);
@@ -427,7 +429,7 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
     }
-    if (readTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getReadTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -611,10 +613,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.LookupResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getFoundFieldBuilder();
+        getMissingFieldBuilder();
+        getDeferredFieldBuilder();
+        getReadTimeFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -718,9 +732,12 @@ private void buildPartial0(com.google.datastore.v1.LookupResponse result) {
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.transaction_ = transaction_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -2272,8 +2289,10 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       } else {
         readTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+      if (readTime_ != null) {
+        bitField0_ |= 0x00000010;
+        onChanged();
+      }
       return this;
     }
     /**
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 4859526432f4..5b512da4598e 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface LookupResponseOrBuilder
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 8acbf2e9cd06..2635a2dced75 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 1b517bd45671..1e03e15f45fd 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface MutationOrBuilder
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 4fc3d36fd848..76bdd3fbfc53 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -60,6 +61,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.MutationResult.Builder.class);
   }
 
+  private int bitField0_;
   public static final int KEY_FIELD_NUMBER = 3;
   private com.google.datastore.v1.Key key_;
   /**
@@ -76,7 +78,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasKey() {
-    return key_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -146,7 +148,7 @@ public long getVersion() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return createTime_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -195,7 +197,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return updateTime_ != null;
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    *
@@ -265,7 +267,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (key_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(3, getKey());
     }
     if (version_ != 0L) {
@@ -274,10 +276,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (conflictDetected_ != false) {
       output.writeBool(5, conflictDetected_);
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeMessage(6, getUpdateTime());
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(7, getCreateTime());
     }
     getUnknownFields().writeTo(output);
@@ -289,7 +291,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (key_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getKey());
     }
     if (version_ != 0L) {
@@ -298,10 +300,10 @@ public int getSerializedSize() {
     if (conflictDetected_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(5, conflictDetected_);
     }
-    if (updateTime_ != null) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getUpdateTime());
     }
-    if (createTime_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getCreateTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -489,10 +491,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.MutationResult.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getKeyFieldBuilder();
+        getCreateTimeFieldBuilder();
+        getUpdateTimeFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -552,21 +565,26 @@ public com.google.datastore.v1.MutationResult buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.MutationResult result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.key_ = keyBuilder_ == null ? key_ : keyBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.version_ = version_;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+        to_bitField0_ |= 0x00000004;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
         result.conflictDetected_ = conflictDetected_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -809,8 +827,10 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       } else {
         keyBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (key_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1058,8 +1078,10 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (createTime_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1256,8 +1278,10 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (updateTime_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 0406287457ec..f9710672e4a5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface MutationResultOrBuilder
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 c63d347c2fed..eb26431b317c 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 4d42cf2f0141..bf9647fc5ec6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface PartitionIdOrBuilder
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 96e04c5ec976..3f3700183709 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -60,6 +61,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.Projection.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
@@ -75,7 +77,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasProperty() {
-    return property_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -124,7 +126,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (property_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getProperty());
     }
     getUnknownFields().writeTo(output);
@@ -136,7 +138,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (property_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
     }
     size += getUnknownFields().getSerializedSize();
@@ -301,10 +303,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Projection.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPropertyFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -351,9 +362,12 @@ public com.google.datastore.v1.Projection buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.Projection result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -557,8 +571,10 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       } else {
         propertyBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (property_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 015e7d87b0d9..f1f47ee349fa 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface ProjectionOrBuilder
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 a423ebd84ff4..f6ae2df5ad47 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -449,6 +450,7 @@ private Operator(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.v1.PropertyFilter.Operator)
   }
 
+  private int bitField0_;
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
@@ -464,7 +466,7 @@ private Operator(int value) {
    */
   @java.lang.Override
   public boolean hasProperty() {
-    return property_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -549,7 +551,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() {
    */
   @java.lang.Override
   public boolean hasValue() {
-    return value_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -594,13 +596,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (property_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getProperty());
     }
     if (op_ != com.google.datastore.v1.PropertyFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, op_);
     }
-    if (value_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(3, getValue());
     }
     getUnknownFields().writeTo(output);
@@ -612,13 +614,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (property_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
     }
     if (op_ != com.google.datastore.v1.PropertyFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, op_);
     }
-    if (value_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getValue());
     }
     size += getUnknownFields().getSerializedSize();
@@ -795,10 +797,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.PropertyFilter.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPropertyFieldBuilder();
+        getValueFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -852,15 +864,19 @@ public com.google.datastore.v1.PropertyFilter buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.PropertyFilter result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.op_ = op_;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.value_ = valueBuilder_ == null ? value_ : valueBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -1082,8 +1098,10 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       } else {
         propertyBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (property_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1353,8 +1371,10 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       } else {
         valueBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (value_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index e6debc68e758..150834bbe619 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface PropertyFilterOrBuilder
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 97e6e6d0e630..e54ef9722ab8 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -219,6 +220,7 @@ private Direction(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.v1.PropertyOrder.Direction)
   }
 
+  private int bitField0_;
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
@@ -234,7 +236,7 @@ private Direction(int value) {
    */
   @java.lang.Override
   public boolean hasProperty() {
-    return property_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -318,7 +320,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (property_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getProperty());
     }
     if (direction_
@@ -334,7 +336,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (property_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
     }
     if (direction_
@@ -506,10 +508,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.PropertyOrder.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPropertyFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -558,12 +569,15 @@ public com.google.datastore.v1.PropertyOrder buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.PropertyOrder result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.property_ = propertyBuilder_ == null ? property_ : propertyBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.direction_ = direction_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -776,8 +790,10 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       } else {
         propertyBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (property_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index 6bef61e738e1..abeeaf057767 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface PropertyOrderOrBuilder
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 bd1e3f14ab7b..14727f1ab021 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 11f9fd82c686..c9569ee253d4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface PropertyReferenceOrBuilder
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 60bd64b580b6..dc1c53b07c01 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -65,6 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class);
   }
 
+  private int bitField0_;
   public static final int PROJECTION_FIELD_NUMBER = 2;
 
   @SuppressWarnings("serial")
@@ -227,7 +229,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
    */
   @java.lang.Override
   public boolean hasFilter() {
-    return filter_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -514,7 +516,7 @@ public int getOffset() {
    */
   @java.lang.Override
   public boolean hasLimit() {
-    return limit_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -571,7 +573,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < kind_.size(); i++) {
       output.writeMessage(3, kind_.get(i));
     }
-    if (filter_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(4, getFilter());
     }
     for (int i = 0; i < order_.size(); i++) {
@@ -589,7 +591,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (offset_ != 0) {
       output.writeInt32(10, offset_);
     }
-    if (limit_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(12, getLimit());
     }
     getUnknownFields().writeTo(output);
@@ -607,7 +609,7 @@ public int getSerializedSize() {
     for (int i = 0; i < kind_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, kind_.get(i));
     }
-    if (filter_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getFilter());
     }
     for (int i = 0; i < order_.size(); i++) {
@@ -625,7 +627,7 @@ public int getSerializedSize() {
     if (offset_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(10, offset_);
     }
-    if (limit_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getLimit());
     }
     size += getUnknownFields().getSerializedSize();
@@ -826,10 +828,24 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Query.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getProjectionFieldBuilder();
+        getKindFieldBuilder();
+        getFilterFieldBuilder();
+        getOrderFieldBuilder();
+        getDistinctOnFieldBuilder();
+        getLimitFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -952,8 +968,10 @@ private void buildPartialRepeatedFields(com.google.datastore.v1.Query result) {
 
     private void buildPartial0(com.google.datastore.v1.Query result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.filter_ = filterBuilder_ == null ? filter_ : filterBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000020) != 0)) {
         result.startCursor_ = startCursor_;
@@ -966,7 +984,9 @@ private void buildPartial0(com.google.datastore.v1.Query result) {
       }
       if (((from_bitField0_ & 0x00000100) != 0)) {
         result.limit_ = limitBuilder_ == null ? limit_ : limitBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -2078,8 +2098,10 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) {
       } else {
         filterBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (filter_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -3281,8 +3303,10 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       } else {
         limitBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+      if (limit_ != null) {
+        bitField0_ |= 0x00000100;
+        onChanged();
+      }
       return this;
     }
     /**
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 3e03609f8cb4..72dd33ea48b0 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface QueryOrBuilder
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 7bb449474e0c..9b7f39a88fb3 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public final class QueryProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 197ac7475836..58c823e895a6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -271,6 +272,7 @@ private MoreResultsType(int value) {
     // @@protoc_insertion_point(enum_scope:google.datastore.v1.QueryResultBatch.MoreResultsType)
   }
 
+  private int bitField0_;
   public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6;
   private int skippedResults_ = 0;
   /**
@@ -519,7 +521,7 @@ public long getSnapshotVersion() {
    */
   @java.lang.Override
   public boolean hasReadTime() {
-    return readTime_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -606,7 +608,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (snapshotVersion_ != 0L) {
       output.writeInt64(7, snapshotVersion_);
     }
-    if (readTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(8, getReadTime());
     }
     getUnknownFields().writeTo(output);
@@ -642,7 +644,7 @@ public int getSerializedSize() {
     if (snapshotVersion_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(7, snapshotVersion_);
     }
-    if (readTime_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getReadTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -831,10 +833,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.QueryResultBatch.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getEntityResultsFieldBuilder();
+        getReadTimeFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -926,9 +938,12 @@ private void buildPartial0(com.google.datastore.v1.QueryResultBatch result) {
       if (((from_bitField0_ & 0x00000040) != 0)) {
         result.snapshotVersion_ = snapshotVersion_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000080) != 0)) {
         result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -2047,8 +2062,10 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       } else {
         readTimeBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+      if (readTime_ != null) {
+        bitField0_ |= 0x00000080;
+        onChanged();
+      }
       return this;
     }
     /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index d55a3ccb8ced..e4cbc74001b6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface QueryResultBatchOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 0566445503f8..9d30b400c319 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 348eda3a906f..3a2db10b2608 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface ReadOptionsOrBuilder
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 33786f99eb1d..77d76536e30f 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 feadd73f14f4..cd19e6510d96 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface ReserveIdsRequestOrBuilder
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 58d85e47d410..ad7cb55117a9 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 35cb22a59b4e..d63243577ba1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface ReserveIdsResponseOrBuilder
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 2d64f5bb7554..47212e8146b2 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 300a749aabf9..05aa91ca47c2 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface RollbackRequestOrBuilder
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 16dfa20fcb62..211b042496ea 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index 69531f934c00..ae97979278a4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface RollbackResponseOrBuilder
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 912351263e33..6b9cd07b5960 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.RunAggregationQueryRequest.Builder.class);
   }
 
+  private int bitField0_;
   private int queryTypeCase_ = 0;
 
   @SuppressWarnings("serial")
@@ -239,7 +241,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    */
   @java.lang.Override
   public boolean hasPartitionId() {
-    return partitionId_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -295,7 +297,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
    */
   @java.lang.Override
   public boolean hasReadOptions() {
-    return readOptions_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -446,10 +448,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (readOptions_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(1, getReadOptions());
     }
-    if (partitionId_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(2, getPartitionId());
     }
     if (queryTypeCase_ == 3) {
@@ -473,10 +475,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (readOptions_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
     }
-    if (partitionId_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId());
     }
     if (queryTypeCase_ == 3) {
@@ -697,10 +699,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RunAggregationQueryRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPartitionIdFieldBuilder();
+        getReadOptionsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -770,14 +782,18 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryRequest re
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.databaseId_ = databaseId_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.partitionId_ =
             partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.readOptions_ =
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     private void buildPartialOneofs(com.google.datastore.v1.RunAggregationQueryRequest result) {
@@ -1309,8 +1325,10 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       } else {
         partitionIdBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (partitionId_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1504,8 +1522,10 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       } else {
         readOptionsBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (readOptions_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
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 da02f3250a73..0982b2b2ba5c 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryRequestOrBuilder
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 a8a9b7507ec7..f33cfc1afa6f 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.RunAggregationQueryResponse.Builder.class);
   }
 
+  private int bitField0_;
   public static final int BATCH_FIELD_NUMBER = 1;
   private com.google.datastore.v1.AggregationResultBatch batch_;
   /**
@@ -78,7 +80,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasBatch() {
-    return batch_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -128,7 +130,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
    */
   @java.lang.Override
   public boolean hasQuery() {
-    return query_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -197,10 +199,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (batch_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getBatch());
     }
-    if (query_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getQuery());
     }
     if (!transaction_.isEmpty()) {
@@ -215,10 +217,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (batch_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch());
     }
-    if (query_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
     }
     if (!transaction_.isEmpty()) {
@@ -400,10 +402,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RunAggregationQueryResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getBatchFieldBuilder();
+        getQueryFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -457,15 +469,19 @@ public com.google.datastore.v1.RunAggregationQueryResponse buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.RunAggregationQueryResponse result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.batch_ = batchBuilder_ == null ? batch_ : batchBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.query_ = queryBuilder_ == null ? query_ : queryBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -689,8 +705,10 @@ public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value)
       } else {
         batchBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (batch_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -872,8 +890,10 @@ public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) {
       } else {
         queryBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (query_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
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 f780c9afc5fd..fc035ea990db 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryResponseOrBuilder
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 11b5e47b403f..e6a745896823 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.RunQueryRequest.Builder.class);
   }
 
+  private int bitField0_;
   private int queryTypeCase_ = 0;
 
   @SuppressWarnings("serial")
@@ -238,7 +240,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
    */
   @java.lang.Override
   public boolean hasPartitionId() {
-    return partitionId_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -294,7 +296,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
    */
   @java.lang.Override
   public boolean hasReadOptions() {
-    return readOptions_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -445,10 +447,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (readOptions_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(1, getReadOptions());
     }
-    if (partitionId_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(2, getPartitionId());
     }
     if (queryTypeCase_ == 3) {
@@ -472,10 +474,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (readOptions_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
     }
-    if (partitionId_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId());
     }
     if (queryTypeCase_ == 3) {
@@ -694,10 +696,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RunQueryRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPartitionIdFieldBuilder();
+        getReadOptionsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -767,14 +779,18 @@ private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) {
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.databaseId_ = databaseId_;
       }
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.partitionId_ =
             partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.readOptions_ =
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     private void buildPartialOneofs(com.google.datastore.v1.RunQueryRequest result) {
@@ -1304,8 +1320,10 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       } else {
         partitionIdBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+      if (partitionId_ != null) {
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -1499,8 +1517,10 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       } else {
         readOptionsBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+      if (readOptions_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
       return this;
     }
     /**
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 c944ad86a4a9..b11ecd648794 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface RunQueryRequestOrBuilder
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 a89491052dc0..f4852c6a8ea4 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.RunQueryResponse.Builder.class);
   }
 
+  private int bitField0_;
   public static final int BATCH_FIELD_NUMBER = 1;
   private com.google.datastore.v1.QueryResultBatch batch_;
   /**
@@ -78,7 +80,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasBatch() {
-    return batch_ != null;
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    *
@@ -124,7 +126,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
    */
   @java.lang.Override
   public boolean hasQuery() {
-    return query_ != null;
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    *
@@ -193,10 +195,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (batch_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(1, getBatch());
     }
-    if (query_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getQuery());
     }
     if (!transaction_.isEmpty()) {
@@ -211,10 +213,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (batch_ != null) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch());
     }
-    if (query_ != null) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
     }
     if (!transaction_.isEmpty()) {
@@ -395,10 +397,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.RunQueryResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getBatchFieldBuilder();
+        getQueryFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -452,15 +464,19 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.RunQueryResponse result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.batch_ = batchBuilder_ == null ? batch_ : batchBuilder_.build();
+        to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
         result.query_ = queryBuilder_ == null ? query_ : queryBuilder_.build();
+        to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
+      result.bitField0_ |= to_bitField0_;
     }
 
     @java.lang.Override
@@ -682,8 +698,10 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
       } else {
         batchBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+      if (batch_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
       return this;
     }
     /**
@@ -863,8 +881,10 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       } else {
         queryBuilder_.mergeFrom(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+      if (query_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
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 7e7f442b204f..53de7bf14560 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface RunQueryResponseOrBuilder
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 3038f7a0970a..1eb755ea8799 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
@@ -706,6 +707,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
     }
 
+    private int bitField0_;
     public static final int READ_TIME_FIELD_NUMBER = 1;
     private com.google.protobuf.Timestamp readTime_;
     /**
@@ -725,7 +727,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasReadTime() {
-      return readTime_ != null;
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      *
@@ -778,7 +780,7 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (readTime_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getReadTime());
       }
       getUnknownFields().writeTo(output);
@@ -790,7 +792,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (readTime_ != null) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadTime());
       }
       size += getUnknownFields().getSerializedSize();
@@ -960,10 +962,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getReadTimeFieldBuilder();
+        }
       }
 
       @java.lang.Override
@@ -1011,9 +1022,12 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
 
       private void buildPartial0(com.google.datastore.v1.TransactionOptions.ReadOnly result) {
         int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
+          to_bitField0_ |= 0x00000001;
         }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1238,8 +1252,10 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
         } else {
           readTimeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+        if (readTime_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
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 c5d7768d1f83..c2f96150234e 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface TransactionOptionsOrBuilder
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 247d23e25234..5ecb2df76876 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 /**
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 b15a641f721d..1b472f4fc707 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
@@ -16,6 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
+// Protobuf Java Version: 3.25.2
 package com.google.datastore.v1;
 
 public interface ValueOrBuilder

From 26e5f9873c4df1815406020a6c22e4a20638f959 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 1 Feb 2024 16:39:57 +0100
Subject: [PATCH 1309/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.24.0 (#1310)

---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 google-cloud-datastore-bom/pom.xml      | 2 +-
 pom.xml                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index df1a8a075eb4..e75b01ffc6f6 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.23.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.24.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index b7def9817fa4..207306bb9696 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.23.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.24.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0bcb967df841..975ab79f4c5a 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.23.0
+    3.24.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 3260468ab400..1d00c9c6aef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.23.0
+    3.24.0
   
 
   

From bd28f91089d00359c8e9d3dbdcb70fb665887058 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 20:16:15 +0000
Subject: [PATCH 1310/1784] chore(main): release 2.18.3 (#1308)

:robot: I have created a release *beep* *boop*
---


## [2.18.3](https://togithub.com/googleapis/java-datastore/compare/v2.18.2...v2.18.3) (2024-02-01)


### Bug Fixes

* Remove QueryMode field from RunAggregationQueryRequest ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
* Remove QueryMode field from RunQueryRequest ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
* Remove ResultSetStats field from RunAggregationQueryResponse ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
* Remove ResultSetStats field from RunQueryResponse ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
* Remove types QueryMode, QueryPlan, ResultSetStats ([#1304](https://togithub.com/googleapis/java-datastore/issues/1304)) ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.24.0 ([#1310](https://togithub.com/googleapis/java-datastore/issues/1310)) ([26e5f98](https://togithub.com/googleapis/java-datastore/commit/26e5f9873c4df1815406020a6c22e4a20638f959))
* Update protobuf to 25.2 in WORKSPACE ([#1311](https://togithub.com/googleapis/java-datastore/issues/1311)) ([3f4ae83](https://togithub.com/googleapis/java-datastore/commit/3f4ae83b20f160eaccd9de17582d54d8222dd015))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a5e436a7109..346a0d3c6dca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [2.18.3](https://github.com/googleapis/java-datastore/compare/v2.18.2...v2.18.3) (2024-02-01)
+
+
+### Bug Fixes
+
+* Remove QueryMode field from RunAggregationQueryRequest ([c1e7c62](https://github.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
+* Remove QueryMode field from RunQueryRequest ([c1e7c62](https://github.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
+* Remove ResultSetStats field from RunAggregationQueryResponse ([c1e7c62](https://github.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
+* Remove ResultSetStats field from RunQueryResponse ([c1e7c62](https://github.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
+* Remove types QueryMode, QueryPlan, ResultSetStats ([#1304](https://github.com/googleapis/java-datastore/issues/1304)) ([c1e7c62](https://github.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.24.0 ([#1310](https://github.com/googleapis/java-datastore/issues/1310)) ([26e5f98](https://github.com/googleapis/java-datastore/commit/26e5f9873c4df1815406020a6c22e4a20638f959))
+* Update protobuf to 25.2 in WORKSPACE ([#1311](https://github.com/googleapis/java-datastore/issues/1311)) ([3f4ae83](https://github.com/googleapis/java-datastore/commit/3f4ae83b20f160eaccd9de17582d54d8222dd015))
+
 ## [2.18.2](https://github.com/googleapis/java-datastore/compare/v2.18.1...v2.18.2) (2024-01-25)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index aa39052083a2..22924aeebab1 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.18.3-SNAPSHOT
+  2.18.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3-SNAPSHOT
+    2.18.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 975ab79f4c5a..8a4f3c14ce6e 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.18.3-SNAPSHOT
+  2.18.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.3-SNAPSHOT
+        2.18.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.3-SNAPSHOT
+        2.18.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.3-SNAPSHOT
+        0.109.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.3-SNAPSHOT
+        2.18.3
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e5ae9a053dbd..6ca243a5e6b5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.3-SNAPSHOT
+  2.18.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3-SNAPSHOT
+    2.18.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 525e7c945aab..acb452f2cd11 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.18.3-SNAPSHOT
+  2.18.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3-SNAPSHOT
+    2.18.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 1d00c9c6aef2..d76f573c1620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.3-SNAPSHOT
+  2.18.3
   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.18.3-SNAPSHOT
+        2.18.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.3-SNAPSHOT
+        2.18.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.3-SNAPSHOT
+        2.18.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.3-SNAPSHOT
+        0.109.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.3-SNAPSHOT
+        2.18.3
         
           
             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 ac4ea811c288..2430d4af83be 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.18.3-SNAPSHOT
+  2.18.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3-SNAPSHOT
+    2.18.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c10b2ff889d8..82edebeac5ac 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.109.3-SNAPSHOT
+  0.109.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3-SNAPSHOT
+    2.18.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 21f6457a734c..d58bf7bcac0b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.3-SNAPSHOT
+      2.18.3
     
     
 
diff --git a/versions.txt b/versions.txt
index 35b6e8a4f63e..3b8b0e608beb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.2:2.18.3-SNAPSHOT
-google-cloud-datastore-bom:2.18.2:2.18.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.109.2:0.109.3-SNAPSHOT
-datastore-v1-proto-client:2.18.2:2.18.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.18.2:2.18.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.18.2:2.18.3-SNAPSHOT
+google-cloud-datastore:2.18.3:2.18.3
+google-cloud-datastore-bom:2.18.3:2.18.3
+proto-google-cloud-datastore-v1:0.109.3:0.109.3
+datastore-v1-proto-client:2.18.3:2.18.3
+proto-google-cloud-datastore-admin-v1:2.18.3:2.18.3
+grpc-google-cloud-datastore-admin-v1:2.18.3:2.18.3

From 6264b999858a6ba0c6e9cc8b16b87fb03073f497 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 21:24:16 +0000
Subject: [PATCH 1311/1784] chore(main): release 2.18.4-SNAPSHOT (#1314)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 22924aeebab1..756b9c76326b 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.18.3
+  2.18.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3
+    2.18.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8a4f3c14ce6e..54ad8ebda325 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.18.3
+  2.18.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.3
+        2.18.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.3
+        2.18.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.3
+        0.109.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.3
+        2.18.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6ca243a5e6b5..e7d03007d8a6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.3
+  2.18.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3
+    2.18.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index acb452f2cd11..fe5be7dcc1c3 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.18.3
+  2.18.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3
+    2.18.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index d76f573c1620..ee1d4dcec644 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.3
+  2.18.4-SNAPSHOT
   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.18.3
+        2.18.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.3
+        2.18.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.3
+        2.18.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.3
+        0.109.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.3
+        2.18.4-SNAPSHOT
         
           
             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 2430d4af83be..50da550599b5 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.18.3
+  2.18.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3
+    2.18.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 82edebeac5ac..d533c8697adc 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.109.3
+  0.109.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.3
+    2.18.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d58bf7bcac0b..394d3d244756 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.3
+      2.18.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 3b8b0e608beb..d6a5a67f5006 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.3:2.18.3
-google-cloud-datastore-bom:2.18.3:2.18.3
-proto-google-cloud-datastore-v1:0.109.3:0.109.3
-datastore-v1-proto-client:2.18.3:2.18.3
-proto-google-cloud-datastore-admin-v1:2.18.3:2.18.3
-grpc-google-cloud-datastore-admin-v1:2.18.3:2.18.3
+google-cloud-datastore:2.18.3:2.18.4-SNAPSHOT
+google-cloud-datastore-bom:2.18.3:2.18.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.109.3:0.109.4-SNAPSHOT
+datastore-v1-proto-client:2.18.3:2.18.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.18.3:2.18.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.18.3:2.18.4-SNAPSHOT

From 8e4d58e5412cdd6ee3d7f32a4c1c161c2c60a165 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 1 Feb 2024 22:42:15 +0100
Subject: [PATCH 1312/1784] test(deps): update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.10.0 (#1313)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.28` -> `0.10.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.graalvm.buildtools:native-maven-plugin/0.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.graalvm.buildtools:native-maven-plugin/0.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.graalvm.buildtools:native-maven-plugin/0.9.28/0.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.graalvm.buildtools:native-maven-plugin/0.9.28/0.10.0?slim=true)](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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/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 0bb18a3c28f0..790a92dd5a45 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.9.28
+            0.10.0
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 2558340f52a2b8852aa9a0d0a74588c7350c2a21 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 1 Feb 2024 22:52:15 +0100
Subject: [PATCH 1313/1784] test(deps): update dependency
 org.graalvm.buildtools:junit-platform-native to v0.10.0 (#1312)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.28` -> `0.10.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.graalvm.buildtools:junit-platform-native/0.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.graalvm.buildtools:junit-platform-native/0.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.graalvm.buildtools:junit-platform-native/0.9.28/0.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.graalvm.buildtools:junit-platform-native/0.9.28/0.10.0?slim=true)](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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/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 790a92dd5a45..e82f947a7650 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.9.28
+          0.10.0
           test
         
       

From 317bef576becf459de32c8c0920f6e7d1bf19ff1 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 1 Feb 2024 22:58:15 +0100
Subject: [PATCH 1314/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.18.3 (#1315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.18.2` -> `2.18.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.18.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.18.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.18.2/2.18.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.18.2/2.18.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.18.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2183-2024-02-01)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.18.2...v2.18.3)

##### Bug Fixes

-   Remove QueryMode field from RunAggregationQueryRequest ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
-   Remove QueryMode field from RunQueryRequest ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
-   Remove ResultSetStats field from RunAggregationQueryResponse ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
-   Remove ResultSetStats field from RunQueryResponse ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))
-   Remove types QueryMode, QueryPlan, ResultSetStats ([#​1304](https://togithub.com/googleapis/java-datastore/issues/1304)) ([c1e7c62](https://togithub.com/googleapis/java-datastore/commit/c1e7c6201e0e35469df1492a4ce61bf6a095f8be))

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.24.0 ([#​1310](https://togithub.com/googleapis/java-datastore/issues/1310)) ([26e5f98](https://togithub.com/googleapis/java-datastore/commit/26e5f9873c4df1815406020a6c22e4a20638f959))
-   Update protobuf to 25.2 in WORKSPACE ([#​1311](https://togithub.com/googleapis/java-datastore/issues/1311)) ([3f4ae83](https://togithub.com/googleapis/java-datastore/commit/3f4ae83b20f160eaccd9de17582d54d8222dd015))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 README.md                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5a1e9f9a99b3..77d0783bd8de 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.18.2
+  2.18.3
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.18.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.18.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.3"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index dc958c9ac630..66a15b1943ea 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.18.2
+      2.18.3
     
     
 

From 3887af766ab67a7f289922761a100d446d5dd738 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 5 Feb 2024 16:34:06 +0100
Subject: [PATCH 1315/1784] test(deps): update dependency
 org.junit.vintage:junit-vintage-engine to v5.10.2 (#1317)

---
 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 e82f947a7650..003d52c278e8 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.10.1
+          5.10.2
           test
         
         

From f7b137a190f743f642fb95e71145a72969e8a5bf Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 5 Feb 2024 16:34:24 +0100
Subject: [PATCH 1316/1784] test(deps): update dependency
 com.google.truth:truth to v1.4.0 (#1316)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 756b9c76326b..78e1eeb9201f 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.3.0
+      1.4.0
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e7d03007d8a6..6bcf4f220f7c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -157,7 +157,7 @@
     
       com.google.truth
       truth
-      1.3.0
+      1.4.0
       test
     
       
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 66a15b1943ea..eb761a0d0177 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.3.0
+      1.4.0
       test
     
       
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 003d52c278e8..b61aadff70e4 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.3.0
+      1.4.0
       test
     
       
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 394d3d244756..58dacf2a52ce 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -41,7 +41,7 @@
     
       com.google.truth
       truth
-      1.3.0
+      1.4.0
       test
     
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 4771bf6c80aa..ea0997561d97 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.3.0
+      1.4.0
       test
     
       

From 64fa57a1f26b0fdbf9375bb49a3405936539bca0 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:00:29 +0000
Subject: [PATCH 1317/1784] chore(java): make
 org.graalvm.buildtools:junit-platform-native a test dependency upgrade in
 renovate (#1922) (#1318)

Source-Link: https://togithub.com/googleapis/synthtool/commit/ee0dedaa6aa1276d9876dddd06655c988f8bd6a2
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:1fb09a3eb66af09221da69087fd1b4d075bc7c79e508d0708f5dc0f842069da2
---
 .github/.OwlBot.lock.yaml | 4 ++--
 renovate.json             | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index bf48c82da143..b9c5b09c7f5f 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:0d1bb26a1a99ae0456176bf891b8490e9aab424a5cb4e4d301d9703c4dc43b58
-# created: 2024-01-30T19:46:55.029238294Z
+  digest: sha256:1fb09a3eb66af09221da69087fd1b4d075bc7c79e508d0708f5dc0f842069da2
+# created: 2024-02-05T19:43:08.106031548Z
diff --git a/renovate.json b/renovate.json
index f974ba2a91ba..0751ef09cd66 100644
--- a/renovate.json
+++ b/renovate.json
@@ -66,7 +66,8 @@
         "^com.google.truth:truth",
         "^org.mockito:mockito-core",
         "^org.objenesis:objenesis",
-        "^com.google.cloud:google-cloud-conformance-tests"
+        "^com.google.cloud:google-cloud-conformance-tests",
+        "^org.graalvm.buildtools:junit-platform-native"
       ],
       "semanticCommitType": "test",
       "semanticCommitScope": "deps"

From 9cfa1c37a8a86fcb09ec896dc9219e4416ff2fef Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 15:52:15 +0000
Subject: [PATCH 1318/1784] deps(autogen): set packed = false on field_behavior
 extension (#1320)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 604675854

Source-Link: https://togithub.com/googleapis/googleapis/commit/42c04fea4338ba626095ec2cde5ea75827191581

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/a1ed8a97a00d02fe456f6ebd4160c5b2b000ad75
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTFlZDhhOTdhMDBkMDJmZTQ1NmY2ZWJkNDE2MGM1YjJiMDAwYWQ3NSJ9
---
 .../admin/v1/DatastoreAdminProto.java         | 182 ++++++------
 .../google/datastore/admin/v1/IndexProto.java |  44 +--
 .../google/datastore/v1/DatastoreProto.java   | 280 +++++++++---------
 .../com/google/datastore/v1/QueryProto.java   | 138 ++++-----
 4 files changed, 322 insertions(+), 322 deletions(-)

diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 9660133540c9..fddbd42d4cd7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -131,97 +131,97 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\022\016\n\nFINALIZING\020\004\022\016\n\nSUCCESSFUL\020\005\022\n\n\006FAIL"
           + "ED\020\006\022\r\n\tCANCELLED\020\007\":\n\010Progress\022\026\n\016work_"
           + "completed\030\001 \001(\003\022\026\n\016work_estimated\030\002 \001(\003\""
-          + "\217\002\n\025ExportEntitiesRequest\022\030\n\nproject_id\030"
-          + "\001 \001(\tB\004\342A\001\002\022L\n\006labels\030\002 \003(\0132<.google.dat"
-          + "astore.admin.v1.ExportEntitiesRequest.La"
-          + "belsEntry\022>\n\rentity_filter\030\003 \001(\0132\'.googl"
-          + "e.datastore.admin.v1.EntityFilter\022\037\n\021out"
-          + "put_url_prefix\030\004 \001(\tB\004\342A\001\002\032-\n\013LabelsEntr"
-          + "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\207\002\n\025Im"
-          + "portEntitiesRequest\022\030\n\nproject_id\030\001 \001(\tB"
-          + "\004\342A\001\002\022L\n\006labels\030\002 \003(\0132<.google.datastore"
-          + ".admin.v1.ImportEntitiesRequest.LabelsEn"
-          + "try\022\027\n\tinput_url\030\003 \001(\tB\004\342A\001\002\022>\n\rentity_f"
-          + "ilter\030\004 \001(\0132\'.google.datastore.admin.v1."
-          + "EntityFilter\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t"
-          + "\022\r\n\005value\030\002 \001(\t:\0028\001\",\n\026ExportEntitiesRes"
-          + "ponse\022\022\n\noutput_url\030\001 \001(\t\"\253\002\n\026ExportEnti"
-          + "tiesMetadata\0229\n\006common\030\001 \001(\0132).google.da"
-          + "tastore.admin.v1.CommonMetadata\022>\n\021progr"
-          + "ess_entities\030\002 \001(\0132#.google.datastore.ad"
-          + "min.v1.Progress\022;\n\016progress_bytes\030\003 \001(\0132"
-          + "#.google.datastore.admin.v1.Progress\022>\n\r"
-          + "entity_filter\030\004 \001(\0132\'.google.datastore.a"
-          + "dmin.v1.EntityFilter\022\031\n\021output_url_prefi"
-          + "x\030\005 \001(\t\"\243\002\n\026ImportEntitiesMetadata\0229\n\006co"
-          + "mmon\030\001 \001(\0132).google.datastore.admin.v1.C"
-          + "ommonMetadata\022>\n\021progress_entities\030\002 \001(\013"
-          + "2#.google.datastore.admin.v1.Progress\022;\n"
-          + "\016progress_bytes\030\003 \001(\0132#.google.datastore"
-          + ".admin.v1.Progress\022>\n\rentity_filter\030\004 \001("
-          + "\0132\'.google.datastore.admin.v1.EntityFilt"
-          + "er\022\021\n\tinput_url\030\005 \001(\t\"4\n\014EntityFilter\022\r\n"
-          + "\005kinds\030\001 \003(\t\022\025\n\rnamespace_ids\030\002 \003(\t\"Y\n\022C"
-          + "reateIndexRequest\022\022\n\nproject_id\030\001 \001(\t\022/\n"
-          + "\005index\030\003 \001(\0132 .google.datastore.admin.v1"
-          + ".Index\":\n\022DeleteIndexRequest\022\022\n\nproject_"
-          + "id\030\001 \001(\t\022\020\n\010index_id\030\003 \001(\t\"7\n\017GetIndexRe"
-          + "quest\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010index_id\030\003 "
-          + "\001(\t\"_\n\022ListIndexesRequest\022\022\n\nproject_id\030"
-          + "\001 \001(\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005"
-          + "\022\022\n\npage_token\030\005 \001(\t\"a\n\023ListIndexesRespo"
-          + "nse\0221\n\007indexes\030\001 \003(\0132 .google.datastore."
-          + "admin.v1.Index\022\027\n\017next_page_token\030\002 \001(\t\""
-          + "\245\001\n\026IndexOperationMetadata\0229\n\006common\030\001 \001"
-          + "(\0132).google.datastore.admin.v1.CommonMet"
-          + "adata\022>\n\021progress_entities\030\002 \001(\0132#.googl"
-          + "e.datastore.admin.v1.Progress\022\020\n\010index_i"
-          + "d\030\003 \001(\t\"\253\001\n#DatastoreFirestoreMigrationM"
-          + "etadata\022B\n\017migration_state\030\001 \001(\0162).googl"
-          + "e.datastore.admin.v1.MigrationState\022@\n\016m"
-          + "igration_step\030\002 \001(\0162(.google.datastore.a"
-          + "dmin.v1.MigrationStep*}\n\rOperationType\022\036"
-          + "\n\032OPERATION_TYPE_UNSPECIFIED\020\000\022\023\n\017EXPORT"
-          + "_ENTITIES\020\001\022\023\n\017IMPORT_ENTITIES\020\002\022\020\n\014CREA"
-          + "TE_INDEX\020\003\022\020\n\014DELETE_INDEX\020\0042\204\n\n\016Datasto"
-          + "reAdmin\022\366\001\n\016ExportEntities\0220.google.data"
-          + "store.admin.v1.ExportEntitiesRequest\032\035.g"
-          + "oogle.longrunning.Operation\"\222\001\312A0\n\026Expor"
-          + "tEntitiesResponse\022\026ExportEntitiesMetadat"
-          + "a\332A1project_id,labels,entity_filter,outp"
-          + "ut_url_prefix\202\323\344\223\002%\" /v1/projects/{proje"
-          + "ct_id}:export:\001*\022\355\001\n\016ImportEntities\0220.go"
-          + "ogle.datastore.admin.v1.ImportEntitiesRe"
-          + "quest\032\035.google.longrunning.Operation\"\211\001\312"
-          + "A/\n\025google.protobuf.Empty\022\026ImportEntitie"
-          + "sMetadata\332A)project_id,labels,input_url,"
-          + "entity_filter\202\323\344\223\002%\" /v1/projects/{proje"
-          + "ct_id}:import:\001*\022\257\001\n\013CreateIndex\022-.googl"
-          + "e.datastore.admin.v1.CreateIndexRequest\032"
-          + "\035.google.longrunning.Operation\"R\312A\037\n\005Ind"
-          + "ex\022\026IndexOperationMetadata\202\323\344\223\002*\"!/v1/pr"
-          + "ojects/{project_id}/indexes:\005index\022\263\001\n\013D"
-          + "eleteIndex\022-.google.datastore.admin.v1.D"
-          + "eleteIndexRequest\032\035.google.longrunning.O"
-          + "peration\"V\312A\037\n\005Index\022\026IndexOperationMeta"
-          + "data\202\323\344\223\002.*,/v1/projects/{project_id}/in"
-          + "dexes/{index_id}\022\216\001\n\010GetIndex\022*.google.d"
-          + "atastore.admin.v1.GetIndexRequest\032 .goog"
-          + "le.datastore.admin.v1.Index\"4\202\323\344\223\002.\022,/v1"
-          + "/projects/{project_id}/indexes/{index_id"
-          + "}\022\227\001\n\013ListIndexes\022-.google.datastore.adm"
-          + "in.v1.ListIndexesRequest\032..google.datast"
-          + "ore.admin.v1.ListIndexesResponse\")\202\323\344\223\002#"
-          + "\022!/v1/projects/{project_id}/indexes\032v\312A\030"
-          + "datastore.googleapis.com\322AXhttps://www.g"
-          + "oogleapis.com/auth/cloud-platform,https:"
-          + "//www.googleapis.com/auth/datastoreB\333\001\n\035"
-          + "com.google.datastore.admin.v1B\023Datastore"
-          + "AdminProtoP\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"
+          + "\215\002\n\025ExportEntitiesRequest\022\027\n\nproject_id\030"
+          + "\001 \001(\tB\003\340A\002\022L\n\006labels\030\002 \003(\0132<.google.data"
+          + "store.admin.v1.ExportEntitiesRequest.Lab"
+          + "elsEntry\022>\n\rentity_filter\030\003 \001(\0132\'.google"
+          + ".datastore.admin.v1.EntityFilter\022\036\n\021outp"
+          + "ut_url_prefix\030\004 \001(\tB\003\340A\002\032-\n\013LabelsEntry\022"
+          + "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\205\002\n\025Impo"
+          + "rtEntitiesRequest\022\027\n\nproject_id\030\001 \001(\tB\003\340"
+          + "A\002\022L\n\006labels\030\002 \003(\0132<.google.datastore.ad"
+          + "min.v1.ImportEntitiesRequest.LabelsEntry"
+          + "\022\026\n\tinput_url\030\003 \001(\tB\003\340A\002\022>\n\rentity_filte"
+          + "r\030\004 \001(\0132\'.google.datastore.admin.v1.Enti"
+          + "tyFilter\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005"
+          + "value\030\002 \001(\t:\0028\001\",\n\026ExportEntitiesRespons"
+          + "e\022\022\n\noutput_url\030\001 \001(\t\"\253\002\n\026ExportEntities"
+          + "Metadata\0229\n\006common\030\001 \001(\0132).google.datast"
+          + "ore.admin.v1.CommonMetadata\022>\n\021progress_"
+          + "entities\030\002 \001(\0132#.google.datastore.admin."
+          + "v1.Progress\022;\n\016progress_bytes\030\003 \001(\0132#.go"
+          + "ogle.datastore.admin.v1.Progress\022>\n\renti"
+          + "ty_filter\030\004 \001(\0132\'.google.datastore.admin"
+          + ".v1.EntityFilter\022\031\n\021output_url_prefix\030\005 "
+          + "\001(\t\"\243\002\n\026ImportEntitiesMetadata\0229\n\006common"
+          + "\030\001 \001(\0132).google.datastore.admin.v1.Commo"
+          + "nMetadata\022>\n\021progress_entities\030\002 \001(\0132#.g"
+          + "oogle.datastore.admin.v1.Progress\022;\n\016pro"
+          + "gress_bytes\030\003 \001(\0132#.google.datastore.adm"
+          + "in.v1.Progress\022>\n\rentity_filter\030\004 \001(\0132\'."
+          + "google.datastore.admin.v1.EntityFilter\022\021"
+          + "\n\tinput_url\030\005 \001(\t\"4\n\014EntityFilter\022\r\n\005kin"
+          + "ds\030\001 \003(\t\022\025\n\rnamespace_ids\030\002 \003(\t\"Y\n\022Creat"
+          + "eIndexRequest\022\022\n\nproject_id\030\001 \001(\t\022/\n\005ind"
+          + "ex\030\003 \001(\0132 .google.datastore.admin.v1.Ind"
+          + "ex\":\n\022DeleteIndexRequest\022\022\n\nproject_id\030\001"
+          + " \001(\t\022\020\n\010index_id\030\003 \001(\t\"7\n\017GetIndexReques"
+          + "t\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010index_id\030\003 \001(\t\""
+          + "_\n\022ListIndexesRequest\022\022\n\nproject_id\030\001 \001("
+          + "\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\022\022\n\n"
+          + "page_token\030\005 \001(\t\"a\n\023ListIndexesResponse\022"
+          + "1\n\007indexes\030\001 \003(\0132 .google.datastore.admi"
+          + "n.v1.Index\022\027\n\017next_page_token\030\002 \001(\t\"\245\001\n\026"
+          + "IndexOperationMetadata\0229\n\006common\030\001 \001(\0132)"
+          + ".google.datastore.admin.v1.CommonMetadat"
+          + "a\022>\n\021progress_entities\030\002 \001(\0132#.google.da"
+          + "tastore.admin.v1.Progress\022\020\n\010index_id\030\003 "
+          + "\001(\t\"\253\001\n#DatastoreFirestoreMigrationMetad"
+          + "ata\022B\n\017migration_state\030\001 \001(\0162).google.da"
+          + "tastore.admin.v1.MigrationState\022@\n\016migra"
+          + "tion_step\030\002 \001(\0162(.google.datastore.admin"
+          + ".v1.MigrationStep*}\n\rOperationType\022\036\n\032OP"
+          + "ERATION_TYPE_UNSPECIFIED\020\000\022\023\n\017EXPORT_ENT"
+          + "ITIES\020\001\022\023\n\017IMPORT_ENTITIES\020\002\022\020\n\014CREATE_I"
+          + "NDEX\020\003\022\020\n\014DELETE_INDEX\020\0042\204\n\n\016DatastoreAd"
+          + "min\022\366\001\n\016ExportEntities\0220.google.datastor"
+          + "e.admin.v1.ExportEntitiesRequest\032\035.googl"
+          + "e.longrunning.Operation\"\222\001\312A0\n\026ExportEnt"
+          + "itiesResponse\022\026ExportEntitiesMetadata\332A1"
+          + "project_id,labels,entity_filter,output_u"
+          + "rl_prefix\202\323\344\223\002%\" /v1/projects/{project_i"
+          + "d}:export:\001*\022\355\001\n\016ImportEntities\0220.google"
+          + ".datastore.admin.v1.ImportEntitiesReques"
+          + "t\032\035.google.longrunning.Operation\"\211\001\312A/\n\025"
+          + "google.protobuf.Empty\022\026ImportEntitiesMet"
+          + "adata\332A)project_id,labels,input_url,enti"
+          + "ty_filter\202\323\344\223\002%\" /v1/projects/{project_i"
+          + "d}:import:\001*\022\257\001\n\013CreateIndex\022-.google.da"
+          + "tastore.admin.v1.CreateIndexRequest\032\035.go"
+          + "ogle.longrunning.Operation\"R\312A\037\n\005Index\022\026"
+          + "IndexOperationMetadata\202\323\344\223\002*\"!/v1/projec"
+          + "ts/{project_id}/indexes:\005index\022\263\001\n\013Delet"
+          + "eIndex\022-.google.datastore.admin.v1.Delet"
+          + "eIndexRequest\032\035.google.longrunning.Opera"
+          + "tion\"V\312A\037\n\005Index\022\026IndexOperationMetadata"
+          + "\202\323\344\223\002.*,/v1/projects/{project_id}/indexe"
+          + "s/{index_id}\022\216\001\n\010GetIndex\022*.google.datas"
+          + "tore.admin.v1.GetIndexRequest\032 .google.d"
+          + "atastore.admin.v1.Index\"4\202\323\344\223\002.\022,/v1/pro"
+          + "jects/{project_id}/indexes/{index_id}\022\227\001"
+          + "\n\013ListIndexes\022-.google.datastore.admin.v"
+          + "1.ListIndexesRequest\032..google.datastore."
+          + "admin.v1.ListIndexesResponse\")\202\323\344\223\002#\022!/v"
+          + "1/projects/{project_id}/indexes\032v\312A\030data"
+          + "store.googleapis.com\322AXhttps://www.googl"
+          + "eapis.com/auth/cloud-platform,https://ww"
+          + "w.googleapis.com/auth/datastoreB\333\001\n\035com."
+          + "google.datastore.admin.v1B\023DatastoreAdmi"
+          + "nProtoP\001Z9cloud.google.com/go/datastore/"
+          + "admin/apiv1/adminpb;adminpb\252\002\037Google.Clo"
+          + "ud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Dat"
+          + "astore\\Admin\\V1\352\002#Google::Cloud::Datasto"
+          + "re::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/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
index f3b970f7c1ae..e78253a65b3c 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
@@ -47,28 +47,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\"\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"
+          + "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"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
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 b1a10540a257..bec52f51495d 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
@@ -132,146 +132,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\"\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\022\302\001\n\010Roll"
-          + "back\022$.google.datastore.v1.RollbackReque"
-          + "st\032%.google.datastore.v1.RollbackRespons"
-          + "e\"i\332A\026project_id,transaction\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\022\307\001\n\013Allocat"
-          + "eIds\022\'.google.datastore.v1.AllocateIdsRe"
-          + "quest\032(.google.datastore.v1.AllocateIdsR"
-          + "esponse\"e\332A\017project_id,keys\202\323\344\223\002*\"%/v1/p"
-          + "rojects/{project_id}:allocateIds:\001*\212\323\344\223\002"
-          + "\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001\n\nReser"
-          + "veIds\022&.google.datastore.v1.ReserveIdsRe"
-          + "quest\032\'.google.datastore.v1.ReserveIdsRe"
-          + "sponse\"d\332A\017project_id,keys\202\323\344\223\002)\"$/v1/pr"
-          + "ojects/{project_id}:reserveIds:\001*\212\323\344\223\002\035\022"
-          + "\014\n\nproject_id\022\r\n\013database_id\032v\312A\030datasto"
-          + "re.googleapis.com\322AXhttps://www.googleap"
-          + "is.com/auth/cloud-platform,https://www.g"
-          + "oogleapis.com/auth/datastoreB\300\001\n\027com.goo"
-          + "gle.datastore.v1B\016DatastoreProtoP\001Z\n\017property_filter\030\002 \001(\0132#.google.data"
-          + "store.v1.PropertyFilterH\000B\r\n\013filter_type"
-          + "\"\261\001\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.googl"
-          + "e.datastore.v1.CompositeFilter.Operator\022"
-          + ",\n\007filters\030\002 \003(\0132\033.google.datastore.v1.F"
-          + "ilter\"5\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIE"
-          + "D\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352\002\n\016PropertyFilter\022"
-          + "8\n\010property\030\001 \001(\0132&.google.datastore.v1."
-          + "PropertyReference\0228\n\002op\030\002 \001(\0162,.google.d"
-          + "atastore.v1.PropertyFilter.Operator\022)\n\005v"
-          + "alue\030\003 \001(\0132\032.google.datastore.v1.Value\"\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\014"
-          + "GREATER_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\014H"
-          + "AS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQuery\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.da"
-          + "tastore.v1.GqlQuery.NamedBindingsEntry\022C"
-          + "\n\023positional_bindings\030\004 \003(\0132&.google.dat"
-          + "astore.v1.GqlQueryParameter\032\\\n\022NamedBind"
-          + "ingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&."
-          + "google.datastore.v1.GqlQueryParameter:\0028"
-          + "\001\"d\n\021GqlQueryParameter\022+\n\005value\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\020QueryResultB"
-          + "atch\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.EntityResult.Res"
-          + "ultType\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.google.da"
-          + "tastore.v1.QueryResultBatch.MoreResultsT"
-          + "ype\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tread_ti"
-          + "me\030\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n"
-          + "\017MoreResultsType\022!\n\035MORE_RESULTS_TYPE_UN"
-          + "SPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RE"
-          + "SULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_AFTE"
-          + "R_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n\027com."
-          + "google.datastore.v1B\nQueryProtoP\001Z"
+          + "\n\017property_filter\030\002 \001(\0132#.google.datasto"
+          + "re.v1.PropertyFilterH\000B\r\n\013filter_type\"\261\001"
+          + "\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.google.d"
+          + "atastore.v1.CompositeFilter.Operator\022,\n\007"
+          + "filters\030\002 \003(\0132\033.google.datastore.v1.Filt"
+          + "er\"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\016PropertyFilter\0228\n\010"
+          + "property\030\001 \001(\0132&.google.datastore.v1.Pro"
+          + "pertyReference\0228\n\002op\030\002 \001(\0162,.google.data"
+          + "store.v1.PropertyFilter.Operator\022)\n\005valu"
+          + "e\030\003 \001(\0132\032.google.datastore.v1.Value\"\270\001\n\010"
+          + "Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\r\n\tLE"
+          + "SS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GRE"
+          + "ATER_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\010GqlQuery\022\024\n\014q"
+          + "uery_string\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001("
+          + "\010\022H\n\016named_bindings\030\005 \003(\01320.google.datas"
+          + "tore.v1.GqlQuery.NamedBindingsEntry\022C\n\023p"
+          + "ositional_bindings\030\004 \003(\0132&.google.datast"
+          + "ore.v1.GqlQueryParameter\032\\\n\022NamedBinding"
+          + "sEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.goo"
+          + "gle.datastore.v1.GqlQueryParameter:\0028\001\"d"
+          + "\n\021GqlQueryParameter\022+\n\005value\030\002 \001(\0132\032.goo"
+          + "gle.datastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014"
+          + "H\000B\020\n\016parameter_type\"\215\004\n\020QueryResultBatc"
+          + "h\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016skipped_cu"
+          + "rsor\030\003 \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,"
+          + ".google.datastore.v1.EntityResult.Result"
+          + "Type\0229\n\016entity_results\030\002 \003(\0132!.google.da"
+          + "tastore.v1.EntityResult\022\022\n\nend_cursor\030\004 "
+          + "\001(\014\022K\n\014more_results\030\005 \001(\01625.google.datas"
+          + "tore.v1.QueryResultBatch.MoreResultsType"
+          + "\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tread_time\030"
+          + "\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n\017Mo"
+          + "reResultsType\022!\n\035MORE_RESULTS_TYPE_UNSPE"
+          + "CIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RESUL"
+          + "TS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_AFTER_C"
+          + "URSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n\027com.goo"
+          + "gle.datastore.v1B\nQueryProtoP\001Z
Date: Wed, 7 Feb 2024 11:49:45 -0500
Subject: [PATCH 1319/1784] chore: update dependabot config for V3-experimental
 branch (#1322)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: update dependabot config for V3-experimental branch

* formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* exclude from owlbot

* Revert "🦉 Updates from OwlBot post-processor"

This reverts commit 8ebf6803ca6cb9c7341cd2f4658060097ab97605.

---------

Co-authored-by: Owl Bot 
---
 .github/dependabot.yml | 14 ++++++++++++++
 owlbot.py              |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 203f9eaccf13..daa58f7e3c53 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,4 +1,5 @@
 version: 2
+
 updates:
   - package-ecosystem: "maven"
     directory: "/"
@@ -17,3 +18,16 @@ updates:
     # it via template in the synthtool repository.
     ignore:
       - dependency-name: "*"
+      
+  # rules for the `V3-experimental` branch
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+    commit-message:
+      # Prefix all commit messages with "deps: "
+      prefix: "deps"
+    open-pull-requests-limit: 10
+    target-branch: "V3-experimental"
+    labels:
+      - "V3 dependencies"
diff --git a/owlbot.py b/owlbot.py
index 777fbbff208f..aa74153f9d9c 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -52,5 +52,6 @@
     '.kokoro/nightly/integration.cfg',
     '.kokoro/nightly/java11-integration.cfg',
     '.kokoro/requirements.in',
-    '.kokoro/requirements.txt'
+    '.kokoro/requirements.txt',
+    '.github/dependabot.yml'
 ])

From 16c441a7f49009588ce3c46db08846e4842d6c9f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 13 Feb 2024 15:35:42 +0100
Subject: [PATCH 1320/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.32.0 (#1332)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.32.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 77d0783bd8de..808531f7a998 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.31.0
+      26.32.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.31.0')
+implementation platform('com.google.cloud:libraries-bom:26.32.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index b61aadff70e4..b75e18fd33ad 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.31.0
+        26.32.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index ea0997561d97..9249478f8486 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.31.0
+        26.32.0
         pom
         import
       

From 0e64a7da73a3b6d40d5952bf09372d631a7d247b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 14 Feb 2024 16:23:01 +0100
Subject: [PATCH 1321/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.25.0 (#1333)

---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 google-cloud-datastore-bom/pom.xml      | 2 +-
 pom.xml                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index e75b01ffc6f6..4e20441a4f4d 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.24.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.25.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 207306bb9696..37934ad9de31 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.24.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.25.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 54ad8ebda325..8355c17261de 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.24.0
+    3.25.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index ee1d4dcec644..63b99d9d12a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.24.0
+    3.25.0
   
 
   

From e5830a48a8e0cbba9d3aa4122ba743cdf96eddc3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 16:16:15 +0000
Subject: [PATCH 1322/1784] chore(main): release 2.18.4 (#1321)

:robot: I have created a release *beep* *boop*
---


## [2.18.4](https://togithub.com/googleapis/java-datastore/compare/v2.18.3...v2.18.4) (2024-02-14)


### Dependencies

* **autogen:** Set packed = false on field_behavior extension ([#1320](https://togithub.com/googleapis/java-datastore/issues/1320)) ([9cfa1c3](https://togithub.com/googleapis/java-datastore/commit/9cfa1c37a8a86fcb09ec896dc9219e4416ff2fef))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.25.0 ([#1333](https://togithub.com/googleapis/java-datastore/issues/1333)) ([0e64a7d](https://togithub.com/googleapis/java-datastore/commit/0e64a7da73a3b6d40d5952bf09372d631a7d247b))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 346a0d3c6dca..ec511293e0fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.18.4](https://github.com/googleapis/java-datastore/compare/v2.18.3...v2.18.4) (2024-02-14)
+
+
+### Dependencies
+
+* **autogen:** Set packed = false on field_behavior extension ([#1320](https://github.com/googleapis/java-datastore/issues/1320)) ([9cfa1c3](https://github.com/googleapis/java-datastore/commit/9cfa1c37a8a86fcb09ec896dc9219e4416ff2fef))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.25.0 ([#1333](https://github.com/googleapis/java-datastore/issues/1333)) ([0e64a7d](https://github.com/googleapis/java-datastore/commit/0e64a7da73a3b6d40d5952bf09372d631a7d247b))
+
 ## [2.18.3](https://github.com/googleapis/java-datastore/compare/v2.18.2...v2.18.3) (2024-02-01)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 78e1eeb9201f..59feb32c54ef 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.18.4-SNAPSHOT
+  2.18.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4-SNAPSHOT
+    2.18.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8355c17261de..a8fd837a4c48 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.18.4-SNAPSHOT
+  2.18.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.4-SNAPSHOT
+        2.18.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.4-SNAPSHOT
+        2.18.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.4-SNAPSHOT
+        0.109.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.4-SNAPSHOT
+        2.18.4
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6bcf4f220f7c..a2b893603fde 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.4-SNAPSHOT
+  2.18.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4-SNAPSHOT
+    2.18.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index fe5be7dcc1c3..26e5eb21e7e2 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.18.4-SNAPSHOT
+  2.18.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4-SNAPSHOT
+    2.18.4
   
   
     
diff --git a/pom.xml b/pom.xml
index 63b99d9d12a4..12d7f6b10948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.4-SNAPSHOT
+  2.18.4
   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.18.4-SNAPSHOT
+        2.18.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.4-SNAPSHOT
+        2.18.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.4-SNAPSHOT
+        2.18.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.4-SNAPSHOT
+        0.109.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.4-SNAPSHOT
+        2.18.4
         
           
             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 50da550599b5..3f66c895e3f8 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.18.4-SNAPSHOT
+  2.18.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4-SNAPSHOT
+    2.18.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d533c8697adc..429470b88b2c 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.109.4-SNAPSHOT
+  0.109.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4-SNAPSHOT
+    2.18.4
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 58dacf2a52ce..790c38690093 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.4-SNAPSHOT
+      2.18.4
     
     
 
diff --git a/versions.txt b/versions.txt
index d6a5a67f5006..8dc531d822bd 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.3:2.18.4-SNAPSHOT
-google-cloud-datastore-bom:2.18.3:2.18.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.109.3:0.109.4-SNAPSHOT
-datastore-v1-proto-client:2.18.3:2.18.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.18.3:2.18.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.18.3:2.18.4-SNAPSHOT
+google-cloud-datastore:2.18.4:2.18.4
+google-cloud-datastore-bom:2.18.4:2.18.4
+proto-google-cloud-datastore-v1:0.109.4:0.109.4
+datastore-v1-proto-client:2.18.4:2.18.4
+proto-google-cloud-datastore-admin-v1:2.18.4:2.18.4
+grpc-google-cloud-datastore-admin-v1:2.18.4:2.18.4

From 073726644fb377ff8044f6c9a59473e26b4f6859 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 17:08:15 +0000
Subject: [PATCH 1323/1784] chore(main): release 2.18.5-SNAPSHOT (#1334)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 59feb32c54ef..51b8448cc00c 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.18.4
+  2.18.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4
+    2.18.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a8fd837a4c48..98be62d5d1ec 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.18.4
+  2.18.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.4
+        2.18.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.4
+        2.18.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.4
+        0.109.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.4
+        2.18.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a2b893603fde..a36d45282566 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.4
+  2.18.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4
+    2.18.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 26e5eb21e7e2..614fa8c34a60 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.18.4
+  2.18.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4
+    2.18.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 12d7f6b10948..0c05502dd455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.4
+  2.18.5-SNAPSHOT
   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.18.4
+        2.18.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.4
+        2.18.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.4
+        2.18.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.4
+        0.109.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.4
+        2.18.5-SNAPSHOT
         
           
             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 3f66c895e3f8..260ebee075e9 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.18.4
+  2.18.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4
+    2.18.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 429470b88b2c..c33efe9b27f6 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.109.4
+  0.109.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.4
+    2.18.5-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 790c38690093..a29407fc61fb 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.4
+      2.18.5-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 8dc531d822bd..9cbbcf6f5ca1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.4:2.18.4
-google-cloud-datastore-bom:2.18.4:2.18.4
-proto-google-cloud-datastore-v1:0.109.4:0.109.4
-datastore-v1-proto-client:2.18.4:2.18.4
-proto-google-cloud-datastore-admin-v1:2.18.4:2.18.4
-grpc-google-cloud-datastore-admin-v1:2.18.4:2.18.4
+google-cloud-datastore:2.18.4:2.18.5-SNAPSHOT
+google-cloud-datastore-bom:2.18.4:2.18.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.109.4:0.109.5-SNAPSHOT
+datastore-v1-proto-client:2.18.4:2.18.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.18.4:2.18.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.18.4:2.18.5-SNAPSHOT

From bcde9f1cf51277176c7f58ccb97be96fdabf37d8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 14 Feb 2024 19:45:21 +0100
Subject: [PATCH 1324/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.18.4 (#1336)
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.18.4

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 808531f7a998..6943f4b2f3e0 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.18.3
+  2.18.4
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.18.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.18.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.4"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.4
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index eb761a0d0177..9afc9a15184c 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.18.3
+      2.18.4
     
     
 

From 1bb2cba7b42fdba72e144f1a2ba873dc89687cad Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:38:51 -0500
Subject: [PATCH 1325/1784] chore: autogen updates (#1337)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add an API method for reordering firewall policies

PiperOrigin-RevId: 607015517

Source-Link: https://github.com/googleapis/googleapis/commit/c43e216cc37c82f16b829f583fd9f6864e34c2c0

Source-Link: https://github.com/googleapis/googleapis-gen/commit/71c27adc96b0c80093b4a413815bd93943196bb2
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzFjMjdhZGM5NmIwYzgwMDkzYjRhNDEzODE1YmQ5Mzk0MzE5NmJiMiJ9

* 🦉 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 
---
 .../google/cloud/datastore/admin/v1/DatastoreAdminClient.java | 2 +-
 .../cloud/datastore/admin/v1/DatastoreAdminSettings.java      | 3 +--
 .../com/google/cloud/datastore/admin/v1/package-info.java     | 2 +-
 .../cloud/datastore/admin/v1/stub/DatastoreAdminStub.java     | 2 +-
 .../datastore/admin/v1/stub/DatastoreAdminStubSettings.java   | 4 +---
 .../admin/v1/stub/GrpcDatastoreAdminCallableFactory.java      | 2 +-
 .../cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java | 2 +-
 .../admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java  | 2 +-
 .../datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java   | 2 +-
 .../datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java  | 2 +-
 .../cloud/datastore/admin/v1/DatastoreAdminClientTest.java    | 2 +-
 .../google/cloud/datastore/admin/v1/MockDatastoreAdmin.java   | 2 +-
 .../cloud/datastore/admin/v1/MockDatastoreAdminImpl.java      | 2 +-
 13 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 11bc6ca2a548..2e58d667994e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index a0249a24c4ed..788784b4211c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -187,7 +187,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
     return DatastoreAdminStubSettings.defaultTransportChannelProvider();
   }
 
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
   public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
     return DatastoreAdminStubSettings.defaultApiClientHeaderProviderBuilder();
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
index 3079a193a7cd..bf70b678aa27 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
index 0551bc2cbe05..90c3c45f9614 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index e3c2b7d1d93e..72e1f36885f0 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -317,7 +317,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
     return defaultGrpcTransportProviderBuilder().build();
   }
 
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
   public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
     return ApiClientHeaderProvider.newBuilder()
         .setGeneratedLibToken(
@@ -326,7 +325,6 @@ public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProvider
             GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
   }
 
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
   public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
     return ApiClientHeaderProvider.newBuilder()
         .setGeneratedLibToken(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
index 7bdea7acdd48..9fa4e901b7ea 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
index 5ac8da1c3d26..0ab662814d0a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
index 7f75461f8c9e..fe123ede2143 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index 4dd2028d24bb..e85386c56c9f 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
index 277919f2fbda..eff9e6b3af71 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
index d28269a1919f..0632151c6bfc 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
index a157fa5bed49..ab9b5b1fbc19 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
index 5bfde0405a8b..cc63d52487c0 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From f74eb7d44c863888015c0bd2468e0b00192be4b2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 16 Feb 2024 20:02:10 +0100
Subject: [PATCH 1326/1784] test(deps): update dependency
 com.google.truth:truth to v1.4.1 (#1338)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 51b8448cc00c..84eca6f178fd 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.4.0
+      1.4.1
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a36d45282566..452b18060441 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -157,7 +157,7 @@
     
       com.google.truth
       truth
-      1.4.0
+      1.4.1
       test
     
   
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 9afc9a15184c..c7eab8dfa732 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.4.0
+      1.4.1
       test
     
   
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index b75e18fd33ad..ef5a134cc9b0 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.4.0
+      1.4.1
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index a29407fc61fb..1ccf241b65ec 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -41,7 +41,7 @@
     
       com.google.truth
       truth
-      1.4.0
+      1.4.1
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 9249478f8486..facbddcfe364 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.4.0
+      1.4.1
       test
     
   

From 1ed65ea3900ade95dc4cbd6f6c1478de7b6441e9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 20 Feb 2024 17:09:38 +0100
Subject: [PATCH 1327/1784] test(deps): update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.10.1 (#1342)

---
 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 ef5a134cc9b0..4837d82aaf1c 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.10.0
+            0.10.1
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 0c6702e27917b976c76a0d44d3f5d550418310be Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 20 Feb 2024 17:11:24 +0100
Subject: [PATCH 1328/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.25.0 (#1339)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0c05502dd455..1f8672e964a6 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.24.1
+    2.25.0
   
 
   

From 7e0b2c2403a974b640d42d3fcf7ac36019cccc62 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 20 Feb 2024 17:47:47 +0100
Subject: [PATCH 1329/1784] test(deps): update dependency
 org.graalvm.buildtools:junit-platform-native to v0.10.1 (#1343)

---
 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 4837d82aaf1c..f18c9ce06466 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.10.0
+          0.10.1
           test
         
           

From 114e50d18039e2ba26e23a55c49551320be51580 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 22 Feb 2024 19:51:04 +0100
Subject: [PATCH 1330/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.33.0 (#1345)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.33.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6943f4b2f3e0..3ea50e6848ad 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.32.0
+      26.33.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.32.0')
+implementation platform('com.google.cloud:libraries-bom:26.33.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index f18c9ce06466..cc06e9d722f8 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.32.0
+        26.33.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index facbddcfe364..8b31b9af8faa 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.32.0
+        26.33.0
         pom
         import
       

From 124d7cab46e2fa1ba654369887fb10ffb3f8eaef Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 4 Mar 2024 17:13:40 +0100
Subject: [PATCH 1331/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.27.0 (#1352)

---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 google-cloud-datastore-bom/pom.xml      | 2 +-
 pom.xml                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 4e20441a4f4d..ea0ff6101143 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.25.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.27.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 37934ad9de31..a4cb8a12c063 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.25.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.27.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 98be62d5d1ec..5bf2d33e4530 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.25.0
+    3.27.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 1f8672e964a6..4a966ce2a378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.25.0
+    3.27.0
   
 
   

From 924c750acc89c72149d898833bdf211c03372231 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:24:16 +0000
Subject: [PATCH 1332/1784] chore(main): release 2.18.5 (#1344)

:robot: I have created a release *beep* *boop*
---


## [2.18.5](https://togithub.com/googleapis/java-datastore/compare/v2.18.4...v2.18.5) (2024-03-04)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.27.0 ([#1352](https://togithub.com/googleapis/java-datastore/issues/1352)) ([124d7ca](https://togithub.com/googleapis/java-datastore/commit/124d7cab46e2fa1ba654369887fb10ffb3f8eaef))
* Update dependency com.google.errorprone:error_prone_core to v2.25.0 ([#1339](https://togithub.com/googleapis/java-datastore/issues/1339)) ([0c6702e](https://togithub.com/googleapis/java-datastore/commit/0c6702e27917b976c76a0d44d3f5d550418310be))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec511293e0fb..3f9f09022279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.18.5](https://github.com/googleapis/java-datastore/compare/v2.18.4...v2.18.5) (2024-03-04)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.27.0 ([#1352](https://github.com/googleapis/java-datastore/issues/1352)) ([124d7ca](https://github.com/googleapis/java-datastore/commit/124d7cab46e2fa1ba654369887fb10ffb3f8eaef))
+* Update dependency com.google.errorprone:error_prone_core to v2.25.0 ([#1339](https://github.com/googleapis/java-datastore/issues/1339)) ([0c6702e](https://github.com/googleapis/java-datastore/commit/0c6702e27917b976c76a0d44d3f5d550418310be))
+
 ## [2.18.4](https://github.com/googleapis/java-datastore/compare/v2.18.3...v2.18.4) (2024-02-14)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 84eca6f178fd..fe456b09a921 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.18.5-SNAPSHOT
+  2.18.5
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5-SNAPSHOT
+    2.18.5
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5bf2d33e4530..19152234c1f8 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.18.5-SNAPSHOT
+  2.18.5
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.5-SNAPSHOT
+        2.18.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.5-SNAPSHOT
+        2.18.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.5-SNAPSHOT
+        0.109.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.5-SNAPSHOT
+        2.18.5
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 452b18060441..f0fb57caf11a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.5-SNAPSHOT
+  2.18.5
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5-SNAPSHOT
+    2.18.5
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 614fa8c34a60..d1638f6e049f 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.18.5-SNAPSHOT
+  2.18.5
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5-SNAPSHOT
+    2.18.5
   
   
     
diff --git a/pom.xml b/pom.xml
index 4a966ce2a378..354a1ddc9bb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.5-SNAPSHOT
+  2.18.5
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.5-SNAPSHOT
+        2.18.5
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.5-SNAPSHOT
+        2.18.5
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.5-SNAPSHOT
+        2.18.5
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.5-SNAPSHOT
+        0.109.5
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.5-SNAPSHOT
+        2.18.5
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index 260ebee075e9..9fda50ec85a6 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.18.5-SNAPSHOT
+  2.18.5
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5-SNAPSHOT
+    2.18.5
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c33efe9b27f6..0bf07f83065b 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.109.5-SNAPSHOT
+  0.109.5
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5-SNAPSHOT
+    2.18.5
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1ccf241b65ec..1e87fd7fb763 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.5-SNAPSHOT
+      2.18.5
     
     
 
diff --git a/versions.txt b/versions.txt
index 9cbbcf6f5ca1..9369a0467ba3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.4:2.18.5-SNAPSHOT
-google-cloud-datastore-bom:2.18.4:2.18.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.109.4:0.109.5-SNAPSHOT
-datastore-v1-proto-client:2.18.4:2.18.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.18.4:2.18.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.18.4:2.18.5-SNAPSHOT
+google-cloud-datastore:2.18.5:2.18.5
+google-cloud-datastore-bom:2.18.5:2.18.5
+proto-google-cloud-datastore-v1:0.109.5:0.109.5
+datastore-v1-proto-client:2.18.5:2.18.5
+proto-google-cloud-datastore-admin-v1:2.18.5:2.18.5
+grpc-google-cloud-datastore-admin-v1:2.18.5:2.18.5

From 576a30cb8503254ce785468ef2eab1e2d9978566 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu 
Date: Mon, 4 Mar 2024 22:42:07 +0000
Subject: [PATCH 1333/1784] feat: next release from main branch is 2.18.0
 (#1348)

---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 2a97697b5487..53b119627f6f 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -26,3 +26,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.15.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.17.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 19ecc2ed8efd..0159d7ae3646 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -145,6 +145,23 @@ branchProtectionRules:
       - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+  - pattern: 2.17.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - OwlBot Post Processor
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
 permissionRules:
   - team: yoshi-admins
     permission: admin

From dc065646e16bc213d5fd13397d5f9ac1f70afba3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:46:43 -0500
Subject: [PATCH 1334/1784] chore(main): release 2.18.6-SNAPSHOT (#1356)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(main): release 2.18.6-SNAPSHOT

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Owl Bot 
---
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 3ea50e6848ad..54f1694e4ec4 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.18.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.18.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.5"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.4
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.5
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index fe456b09a921..f53783a2c9ed 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.18.5
+  2.18.6-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5
+    2.18.6-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 19152234c1f8..0f5f62ac1e6f 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.18.5
+  2.18.6-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.5
+        2.18.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.5
+        2.18.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.5
+        0.109.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.5
+        2.18.6-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f0fb57caf11a..7ade2f1577ed 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.5
+  2.18.6-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5
+    2.18.6-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d1638f6e049f..f903b6eaf4c0 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.18.5
+  2.18.6-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5
+    2.18.6-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 354a1ddc9bb3..6f516f308ffc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.5
+  2.18.6-SNAPSHOT
   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.18.5
+        2.18.6-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.5
+        2.18.6-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.5
+        2.18.6-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.5
+        0.109.6-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.5
+        2.18.6-SNAPSHOT
         
           
             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 9fda50ec85a6..0399f93ee0e3 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.18.5
+  2.18.6-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5
+    2.18.6-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0bf07f83065b..a49289f2ec2d 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.109.5
+  0.109.6-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.5
+    2.18.6-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1e87fd7fb763..f47c9ffd4ca9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.5
+      2.18.6-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 9369a0467ba3..95b465a2607b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.5:2.18.5
-google-cloud-datastore-bom:2.18.5:2.18.5
-proto-google-cloud-datastore-v1:0.109.5:0.109.5
-datastore-v1-proto-client:2.18.5:2.18.5
-proto-google-cloud-datastore-admin-v1:2.18.5:2.18.5
-grpc-google-cloud-datastore-admin-v1:2.18.5:2.18.5
+google-cloud-datastore:2.18.5:2.18.6-SNAPSHOT
+google-cloud-datastore-bom:2.18.5:2.18.6-SNAPSHOT
+proto-google-cloud-datastore-v1:0.109.5:0.109.6-SNAPSHOT
+datastore-v1-proto-client:2.18.5:2.18.6-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.18.5:2.18.6-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.18.5:2.18.6-SNAPSHOT

From 6c45fa94ceaf7262f0ce06fa6a544ab065e47c4c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 6 Mar 2024 17:47:08 +0100
Subject: [PATCH 1335/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.18.5 (#1357)
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.18.5

* 🦉 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 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 54f1694e4ec4..f3e7167569e8 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.18.4
+  2.18.5
 
 
 ```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index c7eab8dfa732..fe795bac97a5 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.18.4
+      2.18.5
     
     
 

From bcc5668039d4dd2055e9666a65fcda3984fc33b5 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:47:32 -0500
Subject: [PATCH 1336/1784] fix(deps): Update the Java code generator
 (gapic-generator-java) to 2.37.0 (#1355)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.37.0

PiperOrigin-RevId: 611816371

Source-Link: https://github.com/googleapis/googleapis/commit/2a40f63ea714c7f4c6856a5db4d1f3cc7d4c4b18

Source-Link: https://github.com/googleapis/googleapis-gen/commit/d30ff0767777b381fb1617f67a90e3abd3bdc6dc
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDMwZmYwNzY3Nzc3YjM4MWZiMTYxN2Y2N2E5MGUzYWJkM2JkYzZkYyJ9

* 🦉 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 
---
 .../cloud/datastore/admin/v1/DatastoreAdminSettings.java  | 2 --
 .../admin/v1/stub/DatastoreAdminStubSettings.java         | 8 --------
 .../v1/stub/HttpJsonDatastoreAdminCallableFactory.java    | 4 ----
 .../admin/v1/stub/HttpJsonDatastoreAdminStub.java         | 2 --
 4 files changed, 16 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 788784b4211c..4bae1f6f3a69 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -197,7 +197,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -239,7 +238,6 @@ private static Builder createDefault() {
       return new Builder(DatastoreAdminStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(DatastoreAdminStubSettings.newHttpJsonBuilder());
     }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 72e1f36885f0..64ad035d876b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -665,8 +665,6 @@ public UnaryCallSettings.Builder exportEntitie
     }
 
     /** Returns the builder for the settings used for calls to exportEntities. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             ExportEntitiesRequest, ExportEntitiesResponse, ExportEntitiesMetadata>
         exportEntitiesOperationSettings() {
@@ -679,8 +677,6 @@ public UnaryCallSettings.Builder importEntitie
     }
 
     /** Returns the builder for the settings used for calls to importEntities. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         importEntitiesOperationSettings() {
       return importEntitiesOperationSettings;
@@ -692,8 +688,6 @@ public UnaryCallSettings.Builder createIndexSetti
     }
 
     /** Returns the builder for the settings used for calls to createIndex. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createIndexOperationSettings() {
       return createIndexOperationSettings;
@@ -705,8 +699,6 @@ public UnaryCallSettings.Builder deleteIndexSetti
     }
 
     /** Returns the builder for the settings used for calls to deleteIndex. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         deleteIndexOperationSettings() {
       return deleteIndexOperationSettings;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
index fe123ede2143..0f992e4c21ce 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datastore.admin.v1.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.httpjson.HttpJsonCallSettings;
 import com.google.api.gax.httpjson.HttpJsonCallableFactory;
 import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
@@ -41,7 +40,6 @@
  * 
    This class is for advanced usage.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonDatastoreAdminCallableFactory
     implements HttpJsonStubCallableFactory {
 
@@ -73,8 +71,6 @@ public  UnaryCallable createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index e85386c56c9f..af095ad28189 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -19,7 +19,6 @@
 import static com.google.cloud.datastore.admin.v1.DatastoreAdminClient.ListIndexesPagedResponse;
 
 import com.google.api.HttpRule;
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -66,7 +65,6 @@
  * 
    This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
   private static final TypeRegistry typeRegistry =
       TypeRegistry.newBuilder()

From b5425c98d1973140464b21e54b58b789e9db4396 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 6 Mar 2024 17:53:13 +0100
Subject: [PATCH 1337/1784] test(deps): update dependency
 com.google.truth:truth to v1.4.2 (#1351)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f53783a2c9ed..796aa21dce66 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.4.1
+      1.4.2
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7ade2f1577ed..4082597e319c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -157,7 +157,7 @@
     
       com.google.truth
       truth
-      1.4.1
+      1.4.2
       test
     
   
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index fe795bac97a5..58d7e4c34ccd 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.4.1
+      1.4.2
       test
     
   
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index cc06e9d722f8..f94426170b24 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.4.1
+      1.4.2
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f47c9ffd4ca9..2511ec0e9639 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -41,7 +41,7 @@
     
       com.google.truth
       truth
-      1.4.1
+      1.4.2
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 8b31b9af8faa..54012617581b 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.4.1
+      1.4.2
       test
     
   

From ee458b4023adb9cd97dc676bd826f829ab73c002 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 8 Mar 2024 16:21:40 +0100
Subject: [PATCH 1338/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.34.0 (#1359)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.34.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f3e7167569e8..49ae68065b31 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.33.0
+      26.34.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.33.0')
+implementation platform('com.google.cloud:libraries-bom:26.34.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index f94426170b24..5ab8f16bd32e 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.33.0
+        26.34.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 54012617581b..9640927ce46f 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.33.0
+        26.34.0
         pom
         import
       

From 9442766ad61b0c1001d36ecfc0668308838b4a83 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 11 Mar 2024 21:28:15 +0100
Subject: [PATCH 1339/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.26.0 (#1361)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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.25.0` -> `2.26.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.25.0/2.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.25.0/2.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone (com.google.errorprone:error_prone_core)

### [`v2.26.0`](https://togithub.com/google/error-prone/releases/tag/v2.26.0): Error Prone 2.26.0

Changes:

-   The 'annotations' artifact now includes a `module-info.java` for Java Platform Module System support, thanks to [@​sgammon](https://togithub.com/sgammon) in [#​4311](https://togithub.com/google/error-prone/issues/4311).
-   Disabled checks passed to `-XepPatchChecks` are now ignored, instead of causing a crash. Thanks to [@​oxkitsune](https://togithub.com/oxkitsune) in [#​4028](https://togithub.com/google/error-prone/issues/4028).

New checks:

-   [`SystemConsoleNull`](https://errorprone.info/bugpattern/SystemConsoleNull): Null-checking `System.console()` is not a reliable way to detect if the console is connected to a terminal.
-   [`EnumOrdinal`](https://errorprone.info/bugpattern/EnumOrdinal): Discourage uses of `Enum.ordinal()`

Closed issues: [#​2649](https://togithub.com/google/error-prone/issues/2649), [#​3908](https://togithub.com/google/error-prone/issues/3908), [#​4028](https://togithub.com/google/error-prone/issues/4028), [#​4311](https://togithub.com/google/error-prone/issues/4311), [#​4314](https://togithub.com/google/error-prone/issues/4314)

Full Changelog: https://togithub.com/google/error-prone/compare/v2.25.0...v2.26.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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6f516f308ffc..f85fcd909047 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.25.0
+    2.26.0
       
 
   

From 89c45dc019246df5b44285dca40819dd3198cb8a Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 13:42:16 +0000
Subject: [PATCH 1340/1784] chore: add new types ExplainOptions,
 ExplainMetrics, PlanSummary, ExecutionStats (#1364)

- [ ] Regenerate this pull request now.

feat: add ExplainOptions field to RunQueryRequest
feat: add ExplainMetrics field to RunQueryResponse
feat: add ExplainOptions field to RunAggregationQueryRequest
feat: add ExplainMetrics field to RunAggregationQueryResponse

PiperOrigin-RevId: 615158168

Source-Link: https://togithub.com/googleapis/googleapis/commit/4d535ac0538bb2d4b406250d7ec10b25a17a54cf

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/02e272ded538b0f97832bfad47decbc3dc65a89a
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDJlMjcyZGVkNTM4YjBmOTc4MzJiZmFkNDdkZWNiYzNkYzY1YTg5YSJ9
---
 .../google/datastore/v1/DatastoreProto.java   |  295 ++--
 .../google/datastore/v1/ExecutionStats.java   | 1305 +++++++++++++++++
 .../datastore/v1/ExecutionStatsOrBuilder.java |  156 ++
 .../google/datastore/v1/ExplainMetrics.java   | 1014 +++++++++++++
 .../datastore/v1/ExplainMetricsOrBuilder.java |  102 ++
 .../google/datastore/v1/ExplainOptions.java   |  557 +++++++
 .../datastore/v1/ExplainOptionsOrBuilder.java |   45 +
 .../com/google/datastore/v1/PlanSummary.java  | 1019 +++++++++++++
 .../datastore/v1/PlanSummaryOrBuilder.java    |   97 ++
 .../datastore/v1/QueryProfileProto.java       |  128 ++
 .../v1/RunAggregationQueryRequest.java        |  306 ++++
 .../RunAggregationQueryRequestOrBuilder.java  |   44 +
 .../v1/RunAggregationQueryResponse.java       |  294 ++++
 .../RunAggregationQueryResponseOrBuilder.java |   41 +
 .../google/datastore/v1/RunQueryRequest.java  |  306 ++++
 .../v1/RunQueryRequestOrBuilder.java          |   44 +
 .../google/datastore/v1/RunQueryResponse.java |  294 ++++
 .../v1/RunQueryResponseOrBuilder.java         |   41 +
 .../proto/google/datastore/v1/datastore.proto |   19 +
 .../google/datastore/v1/query_profile.proto   |   91 ++
 20 files changed, 6056 insertions(+), 142 deletions(-)
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto

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 bec52f51495d..abd7b550830d 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
@@ -132,146 +132,153 @@ 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\332A\034proje"
-          + "ct_id,read_options,keys\202\323\344\223\002%\" /v1/proje"
-          + "cts/{project_id}:lookup:\001*\212\323\344\223\002\035\022\014\n\nproj"
-          + "ect_id\022\r\n\013database_id\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\332A\nproject_id\202\323\344\223\002/\"*/v1/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.CommitRequest\032#.goog"
-          + "le.datastore.v1.CommitResponse\"\222\001\332A%proj"
-          + "ect_id,mode,transaction,mutations\332A\031proj"
-          + "ect_id,mode,mutations\202\323\344\223\002%\" /v1/project"
-          + "s/{project_id}:commit:\001*\212\323\344\223\002\035\022\014\n\nprojec"
-          + "t_id\022\r\n\013database_id\022\302\001\n\010Rollback\022$.googl"
-          + "e.datastore.v1.RollbackRequest\032%.google."
-          + "datastore.v1.RollbackResponse\"i\332A\026projec"
-          + "t_id,transaction\202\323\344\223\002\'\"\"/v1/projects/{pr"
-          + "oject_id}:rollback:\001*\212\323\344\223\002\035\022\014\n\nproject_i"
-          + "d\022\r\n\013database_id\022\307\001\n\013AllocateIds\022\'.googl"
-          + "e.datastore.v1.AllocateIdsRequest\032(.goog"
-          + "le.datastore.v1.AllocateIdsResponse\"e\332A\017"
-          + "project_id,keys\202\323\344\223\002*\"%/v1/projects/{pro"
-          + "ject_id}:allocateIds:\001*\212\323\344\223\002\035\022\014\n\nproject"
-          + "_id\022\r\n\013database_id\022\303\001\n\nReserveIds\022&.goog"
-          + "le.datastore.v1.ReserveIdsRequest\032\'.goog"
-          + "le.datastore.v1.ReserveIdsResponse\"d\332A\017p"
-          + "roject_id,keys\202\323\344\223\002)\"$/v1/projects/{proj"
-          + "ect_id}:reserveIds:\001*\212\323\344\223\002\035\022\014\n\nproject_i"
-          + "d\022\r\n\013database_id\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
+ * Execution statistics for the query.
+ * 
+ *
+ * Protobuf type {@code google.datastore.v1.ExecutionStats}
+ */
+public final class ExecutionStats extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.ExecutionStats)
+    ExecutionStatsOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ExecutionStats.newBuilder() to construct.
+  private ExecutionStats(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ExecutionStats() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ExecutionStats();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ExecutionStats_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ExecutionStats_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.ExecutionStats.class,
+            com.google.datastore.v1.ExecutionStats.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int RESULTS_RETURNED_FIELD_NUMBER = 1;
+  private long resultsReturned_ = 0L;
+  /**
+   *
+   *
+   * 
    +   * Total number of results returned, including documents, projections,
+   * aggregation results, keys.
+   * 
    
+   *
+   * int64 results_returned = 1;
+   *
+   * @return The resultsReturned.
+   */
+  @java.lang.Override
+  public long getResultsReturned() {
+    return resultsReturned_;
+  }
+
+  public static final int EXECUTION_DURATION_FIELD_NUMBER = 3;
+  private com.google.protobuf.Duration executionDuration_;
+  /**
+   *
+   *
+   * 
    +   * Total time to execute the query in the backend.
+   * 
    
+   *
+   * .google.protobuf.Duration execution_duration = 3;
+   *
+   * @return Whether the executionDuration field is set.
+   */
+  @java.lang.Override
+  public boolean hasExecutionDuration() {
+    return ((bitField0_ & 0x00000001) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Total time to execute the query in the backend.
+   * 
    
+   *
+   * .google.protobuf.Duration execution_duration = 3;
+   *
+   * @return The executionDuration.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Duration getExecutionDuration() {
+    return executionDuration_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : executionDuration_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Total time to execute the query in the backend.
+   * 
    
+   *
+   * .google.protobuf.Duration execution_duration = 3;
+   */
+  @java.lang.Override
+  public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() {
+    return executionDuration_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : executionDuration_;
+  }
+
+  public static final int READ_OPERATIONS_FIELD_NUMBER = 4;
+  private long readOperations_ = 0L;
+  /**
+   *
+   *
+   * 
    +   * Total billable read operations.
+   * 
    
+   *
+   * int64 read_operations = 4;
+   *
+   * @return The readOperations.
+   */
+  @java.lang.Override
+  public long getReadOperations() {
+    return readOperations_;
+  }
+
+  public static final int DEBUG_STATS_FIELD_NUMBER = 5;
+  private com.google.protobuf.Struct debugStats_;
+  /**
+   *
+   *
+   * 
    +   * Debugging statistics from the execution of the query. Note that the
+   * debugging stats are subject to change as Firestore evolves. It could
+   * include:
+   *  {
+   *    "indexes_entries_scanned": "1000",
+   *    "documents_scanned": "20",
+   *    "billing_details" : {
+   *       "documents_billable": "20",
+   *       "index_entries_billable": "1000",
+   *       "min_query_cost": "0"
+   *    }
+   *  }
+   * 
    
+   *
+   * .google.protobuf.Struct debug_stats = 5;
+   *
+   * @return Whether the debugStats field is set.
+   */
+  @java.lang.Override
+  public boolean hasDebugStats() {
+    return ((bitField0_ & 0x00000002) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Debugging statistics from the execution of the query. Note that the
+   * debugging stats are subject to change as Firestore evolves. It could
+   * include:
+   *  {
+   *    "indexes_entries_scanned": "1000",
+   *    "documents_scanned": "20",
+   *    "billing_details" : {
+   *       "documents_billable": "20",
+   *       "index_entries_billable": "1000",
+   *       "min_query_cost": "0"
+   *    }
+   *  }
+   * 
    
+   *
+   * .google.protobuf.Struct debug_stats = 5;
+   *
+   * @return The debugStats.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Struct getDebugStats() {
+    return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Debugging statistics from the execution of the query. Note that the
+   * debugging stats are subject to change as Firestore evolves. It could
+   * include:
+   *  {
+   *    "indexes_entries_scanned": "1000",
+   *    "documents_scanned": "20",
+   *    "billing_details" : {
+   *       "documents_billable": "20",
+   *       "index_entries_billable": "1000",
+   *       "min_query_cost": "0"
+   *    }
+   *  }
+   * 
    
+   *
+   * .google.protobuf.Struct debug_stats = 5;
+   */
+  @java.lang.Override
+  public com.google.protobuf.StructOrBuilder getDebugStatsOrBuilder() {
+    return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (resultsReturned_ != 0L) {
+      output.writeInt64(1, resultsReturned_);
+    }
+    if (((bitField0_ & 0x00000001) != 0)) {
+      output.writeMessage(3, getExecutionDuration());
+    }
+    if (readOperations_ != 0L) {
+      output.writeInt64(4, readOperations_);
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      output.writeMessage(5, getDebugStats());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (resultsReturned_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(1, resultsReturned_);
+    }
+    if (((bitField0_ & 0x00000001) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getExecutionDuration());
+    }
+    if (readOperations_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, readOperations_);
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getDebugStats());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.ExecutionStats)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.ExecutionStats other = (com.google.datastore.v1.ExecutionStats) obj;
+
+    if (getResultsReturned() != other.getResultsReturned()) return false;
+    if (hasExecutionDuration() != other.hasExecutionDuration()) return false;
+    if (hasExecutionDuration()) {
+      if (!getExecutionDuration().equals(other.getExecutionDuration())) return false;
+    }
+    if (getReadOperations() != other.getReadOperations()) return false;
+    if (hasDebugStats() != other.hasDebugStats()) return false;
+    if (hasDebugStats()) {
+      if (!getDebugStats().equals(other.getDebugStats())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + RESULTS_RETURNED_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getResultsReturned());
+    if (hasExecutionDuration()) {
+      hash = (37 * hash) + EXECUTION_DURATION_FIELD_NUMBER;
+      hash = (53 * hash) + getExecutionDuration().hashCode();
+    }
+    hash = (37 * hash) + READ_OPERATIONS_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getReadOperations());
+    if (hasDebugStats()) {
+      hash = (37 * hash) + DEBUG_STATS_FIELD_NUMBER;
+      hash = (53 * hash) + getDebugStats().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExecutionStats parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.ExecutionStats prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Execution statistics for the query.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.ExecutionStats}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.ExecutionStats)
+      com.google.datastore.v1.ExecutionStatsOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExecutionStats_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExecutionStats_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.ExecutionStats.class,
+              com.google.datastore.v1.ExecutionStats.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.ExecutionStats.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getExecutionDurationFieldBuilder();
+        getDebugStatsFieldBuilder();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      resultsReturned_ = 0L;
+      executionDuration_ = null;
+      if (executionDurationBuilder_ != null) {
+        executionDurationBuilder_.dispose();
+        executionDurationBuilder_ = null;
+      }
+      readOperations_ = 0L;
+      debugStats_ = null;
+      if (debugStatsBuilder_ != null) {
+        debugStatsBuilder_.dispose();
+        debugStatsBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExecutionStats_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExecutionStats getDefaultInstanceForType() {
+      return com.google.datastore.v1.ExecutionStats.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExecutionStats build() {
+      com.google.datastore.v1.ExecutionStats result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExecutionStats buildPartial() {
+      com.google.datastore.v1.ExecutionStats result =
+          new com.google.datastore.v1.ExecutionStats(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.ExecutionStats result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.resultsReturned_ = resultsReturned_;
+      }
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.executionDuration_ =
+            executionDurationBuilder_ == null
+                ? executionDuration_
+                : executionDurationBuilder_.build();
+        to_bitField0_ |= 0x00000001;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.readOperations_ = readOperations_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.debugStats_ = debugStatsBuilder_ == null ? debugStats_ : debugStatsBuilder_.build();
+        to_bitField0_ |= 0x00000002;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.ExecutionStats) {
+        return mergeFrom((com.google.datastore.v1.ExecutionStats) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.ExecutionStats other) {
+      if (other == com.google.datastore.v1.ExecutionStats.getDefaultInstance()) return this;
+      if (other.getResultsReturned() != 0L) {
+        setResultsReturned(other.getResultsReturned());
+      }
+      if (other.hasExecutionDuration()) {
+        mergeExecutionDuration(other.getExecutionDuration());
+      }
+      if (other.getReadOperations() != 0L) {
+        setReadOperations(other.getReadOperations());
+      }
+      if (other.hasDebugStats()) {
+        mergeDebugStats(other.getDebugStats());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                resultsReturned_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+            case 26:
+              {
+                input.readMessage(
+                    getExecutionDurationFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+            case 32:
+              {
+                readOperations_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 32
+            case 42:
+              {
+                input.readMessage(getDebugStatsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 42
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private long resultsReturned_;
+    /**
+     *
+     *
+     * 
    +     * Total number of results returned, including documents, projections,
+     * aggregation results, keys.
+     * 
    
+     *
+     * int64 results_returned = 1;
+     *
+     * @return The resultsReturned.
+     */
+    @java.lang.Override
+    public long getResultsReturned() {
+      return resultsReturned_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total number of results returned, including documents, projections,
+     * aggregation results, keys.
+     * 
    
+     *
+     * int64 results_returned = 1;
+     *
+     * @param value The resultsReturned to set.
+     * @return This builder for chaining.
+     */
+    public Builder setResultsReturned(long value) {
+
+      resultsReturned_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total number of results returned, including documents, projections,
+     * aggregation results, keys.
+     * 
    
+     *
+     * int64 results_returned = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearResultsReturned() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      resultsReturned_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Duration executionDuration_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Duration,
+            com.google.protobuf.Duration.Builder,
+            com.google.protobuf.DurationOrBuilder>
+        executionDurationBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     *
+     * @return Whether the executionDuration field is set.
+     */
+    public boolean hasExecutionDuration() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     *
+     * @return The executionDuration.
+     */
+    public com.google.protobuf.Duration getExecutionDuration() {
+      if (executionDurationBuilder_ == null) {
+        return executionDuration_ == null
+            ? com.google.protobuf.Duration.getDefaultInstance()
+            : executionDuration_;
+      } else {
+        return executionDurationBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     */
+    public Builder setExecutionDuration(com.google.protobuf.Duration value) {
+      if (executionDurationBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        executionDuration_ = value;
+      } else {
+        executionDurationBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     */
+    public Builder setExecutionDuration(com.google.protobuf.Duration.Builder builderForValue) {
+      if (executionDurationBuilder_ == null) {
+        executionDuration_ = builderForValue.build();
+      } else {
+        executionDurationBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     */
+    public Builder mergeExecutionDuration(com.google.protobuf.Duration value) {
+      if (executionDurationBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) != 0)
+            && executionDuration_ != null
+            && executionDuration_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getExecutionDurationBuilder().mergeFrom(value);
+        } else {
+          executionDuration_ = value;
+        }
+      } else {
+        executionDurationBuilder_.mergeFrom(value);
+      }
+      if (executionDuration_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     */
+    public Builder clearExecutionDuration() {
+      bitField0_ = (bitField0_ & ~0x00000002);
+      executionDuration_ = null;
+      if (executionDurationBuilder_ != null) {
+        executionDurationBuilder_.dispose();
+        executionDurationBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     */
+    public com.google.protobuf.Duration.Builder getExecutionDurationBuilder() {
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return getExecutionDurationFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     */
+    public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() {
+      if (executionDurationBuilder_ != null) {
+        return executionDurationBuilder_.getMessageOrBuilder();
+      } else {
+        return executionDuration_ == null
+            ? com.google.protobuf.Duration.getDefaultInstance()
+            : executionDuration_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Total time to execute the query in the backend.
+     * 
    
+     *
+     * .google.protobuf.Duration execution_duration = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Duration,
+            com.google.protobuf.Duration.Builder,
+            com.google.protobuf.DurationOrBuilder>
+        getExecutionDurationFieldBuilder() {
+      if (executionDurationBuilder_ == null) {
+        executionDurationBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Duration,
+                com.google.protobuf.Duration.Builder,
+                com.google.protobuf.DurationOrBuilder>(
+                getExecutionDuration(), getParentForChildren(), isClean());
+        executionDuration_ = null;
+      }
+      return executionDurationBuilder_;
+    }
+
+    private long readOperations_;
+    /**
+     *
+     *
+     * 
    +     * Total billable read operations.
+     * 
    
+     *
+     * int64 read_operations = 4;
+     *
+     * @return The readOperations.
+     */
+    @java.lang.Override
+    public long getReadOperations() {
+      return readOperations_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total billable read operations.
+     * 
    
+     *
+     * int64 read_operations = 4;
+     *
+     * @param value The readOperations to set.
+     * @return This builder for chaining.
+     */
+    public Builder setReadOperations(long value) {
+
+      readOperations_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Total billable read operations.
+     * 
    
+     *
+     * int64 read_operations = 4;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearReadOperations() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      readOperations_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Struct debugStats_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        debugStatsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     *
+     * @return Whether the debugStats field is set.
+     */
+    public boolean hasDebugStats() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     *
+     * @return The debugStats.
+     */
+    public com.google.protobuf.Struct getDebugStats() {
+      if (debugStatsBuilder_ == null) {
+        return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_;
+      } else {
+        return debugStatsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     */
+    public Builder setDebugStats(com.google.protobuf.Struct value) {
+      if (debugStatsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        debugStats_ = value;
+      } else {
+        debugStatsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     */
+    public Builder setDebugStats(com.google.protobuf.Struct.Builder builderForValue) {
+      if (debugStatsBuilder_ == null) {
+        debugStats_ = builderForValue.build();
+      } else {
+        debugStatsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     */
+    public Builder mergeDebugStats(com.google.protobuf.Struct value) {
+      if (debugStatsBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && debugStats_ != null
+            && debugStats_ != com.google.protobuf.Struct.getDefaultInstance()) {
+          getDebugStatsBuilder().mergeFrom(value);
+        } else {
+          debugStats_ = value;
+        }
+      } else {
+        debugStatsBuilder_.mergeFrom(value);
+      }
+      if (debugStats_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     */
+    public Builder clearDebugStats() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      debugStats_ = null;
+      if (debugStatsBuilder_ != null) {
+        debugStatsBuilder_.dispose();
+        debugStatsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     */
+    public com.google.protobuf.Struct.Builder getDebugStatsBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getDebugStatsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     */
+    public com.google.protobuf.StructOrBuilder getDebugStatsOrBuilder() {
+      if (debugStatsBuilder_ != null) {
+        return debugStatsBuilder_.getMessageOrBuilder();
+      } else {
+        return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Debugging statistics from the execution of the query. Note that the
+     * debugging stats are subject to change as Firestore evolves. It could
+     * include:
+     *  {
+     *    "indexes_entries_scanned": "1000",
+     *    "documents_scanned": "20",
+     *    "billing_details" : {
+     *       "documents_billable": "20",
+     *       "index_entries_billable": "1000",
+     *       "min_query_cost": "0"
+     *    }
+     *  }
+     * 
    
+     *
+     * .google.protobuf.Struct debug_stats = 5;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        getDebugStatsFieldBuilder() {
+      if (debugStatsBuilder_ == null) {
+        debugStatsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Struct,
+                com.google.protobuf.Struct.Builder,
+                com.google.protobuf.StructOrBuilder>(
+                getDebugStats(), getParentForChildren(), isClean());
+        debugStats_ = null;
+      }
+      return debugStatsBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.ExecutionStats)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.ExecutionStats)
+  private static final com.google.datastore.v1.ExecutionStats DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.ExecutionStats();
+  }
+
+  public static com.google.datastore.v1.ExecutionStats getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ExecutionStats parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.ExecutionStats getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
new file mode 100644
index 000000000000..5aa06692856f
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+public interface ExecutionStatsOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.ExecutionStats)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Total number of results returned, including documents, projections,
+   * aggregation results, keys.
+   * 
    
+   *
+   * int64 results_returned = 1;
+   *
+   * @return The resultsReturned.
+   */
+  long getResultsReturned();
+
+  /**
+   *
+   *
+   * 
    +   * Total time to execute the query in the backend.
+   * 
    
+   *
+   * .google.protobuf.Duration execution_duration = 3;
+   *
+   * @return Whether the executionDuration field is set.
+   */
+  boolean hasExecutionDuration();
+  /**
+   *
+   *
+   * 
    +   * Total time to execute the query in the backend.
+   * 
    
+   *
+   * .google.protobuf.Duration execution_duration = 3;
+   *
+   * @return The executionDuration.
+   */
+  com.google.protobuf.Duration getExecutionDuration();
+  /**
+   *
+   *
+   * 
    +   * Total time to execute the query in the backend.
+   * 
    
+   *
+   * .google.protobuf.Duration execution_duration = 3;
+   */
+  com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Total billable read operations.
+   * 
    
+   *
+   * int64 read_operations = 4;
+   *
+   * @return The readOperations.
+   */
+  long getReadOperations();
+
+  /**
+   *
+   *
+   * 
    +   * Debugging statistics from the execution of the query. Note that the
+   * debugging stats are subject to change as Firestore evolves. It could
+   * include:
+   *  {
+   *    "indexes_entries_scanned": "1000",
+   *    "documents_scanned": "20",
+   *    "billing_details" : {
+   *       "documents_billable": "20",
+   *       "index_entries_billable": "1000",
+   *       "min_query_cost": "0"
+   *    }
+   *  }
+   * 
    
+   *
+   * .google.protobuf.Struct debug_stats = 5;
+   *
+   * @return Whether the debugStats field is set.
+   */
+  boolean hasDebugStats();
+  /**
+   *
+   *
+   * 
    +   * Debugging statistics from the execution of the query. Note that the
+   * debugging stats are subject to change as Firestore evolves. It could
+   * include:
+   *  {
+   *    "indexes_entries_scanned": "1000",
+   *    "documents_scanned": "20",
+   *    "billing_details" : {
+   *       "documents_billable": "20",
+   *       "index_entries_billable": "1000",
+   *       "min_query_cost": "0"
+   *    }
+   *  }
+   * 
    
+   *
+   * .google.protobuf.Struct debug_stats = 5;
+   *
+   * @return The debugStats.
+   */
+  com.google.protobuf.Struct getDebugStats();
+  /**
+   *
+   *
+   * 
    +   * Debugging statistics from the execution of the query. Note that the
+   * debugging stats are subject to change as Firestore evolves. It could
+   * include:
+   *  {
+   *    "indexes_entries_scanned": "1000",
+   *    "documents_scanned": "20",
+   *    "billing_details" : {
+   *       "documents_billable": "20",
+   *       "index_entries_billable": "1000",
+   *       "min_query_cost": "0"
+   *    }
+   *  }
+   * 
    
+   *
+   * .google.protobuf.Struct debug_stats = 5;
+   */
+  com.google.protobuf.StructOrBuilder getDebugStatsOrBuilder();
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
new file mode 100644
index 000000000000..9bb2c48725d7
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
@@ -0,0 +1,1014 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * Explain metrics for the query.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.ExplainMetrics}
+ */
+public final class ExplainMetrics extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.ExplainMetrics)
+    ExplainMetricsOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ExplainMetrics.newBuilder() to construct.
+  private ExplainMetrics(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ExplainMetrics() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ExplainMetrics();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ExplainMetrics_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ExplainMetrics_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.ExplainMetrics.class,
+            com.google.datastore.v1.ExplainMetrics.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int PLAN_SUMMARY_FIELD_NUMBER = 1;
+  private com.google.datastore.v1.PlanSummary planSummary_;
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query.
+   * 
    
+   *
+   * .google.datastore.v1.PlanSummary plan_summary = 1;
+   *
+   * @return Whether the planSummary field is set.
+   */
+  @java.lang.Override
+  public boolean hasPlanSummary() {
+    return ((bitField0_ & 0x00000001) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query.
+   * 
    
+   *
+   * .google.datastore.v1.PlanSummary plan_summary = 1;
+   *
+   * @return The planSummary.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PlanSummary getPlanSummary() {
+    return planSummary_ == null
+        ? com.google.datastore.v1.PlanSummary.getDefaultInstance()
+        : planSummary_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query.
+   * 
    
+   *
+   * .google.datastore.v1.PlanSummary plan_summary = 1;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() {
+    return planSummary_ == null
+        ? com.google.datastore.v1.PlanSummary.getDefaultInstance()
+        : planSummary_;
+  }
+
+  public static final int EXECUTION_STATS_FIELD_NUMBER = 2;
+  private com.google.datastore.v1.ExecutionStats executionStats_;
+  /**
+   *
+   *
+   * 
    +   * Aggregated stats from the execution of the query. Only present when
+   * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+   * to true.
+   * 
    
+   *
+   * .google.datastore.v1.ExecutionStats execution_stats = 2;
+   *
+   * @return Whether the executionStats field is set.
+   */
+  @java.lang.Override
+  public boolean hasExecutionStats() {
+    return ((bitField0_ & 0x00000002) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Aggregated stats from the execution of the query. Only present when
+   * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+   * to true.
+   * 
    
+   *
+   * .google.datastore.v1.ExecutionStats execution_stats = 2;
+   *
+   * @return The executionStats.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExecutionStats getExecutionStats() {
+    return executionStats_ == null
+        ? com.google.datastore.v1.ExecutionStats.getDefaultInstance()
+        : executionStats_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Aggregated stats from the execution of the query. Only present when
+   * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+   * to true.
+   * 
    
+   *
+   * .google.datastore.v1.ExecutionStats execution_stats = 2;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExecutionStatsOrBuilder getExecutionStatsOrBuilder() {
+    return executionStats_ == null
+        ? com.google.datastore.v1.ExecutionStats.getDefaultInstance()
+        : executionStats_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (((bitField0_ & 0x00000001) != 0)) {
+      output.writeMessage(1, getPlanSummary());
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      output.writeMessage(2, getExecutionStats());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (((bitField0_ & 0x00000001) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPlanSummary());
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExecutionStats());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.ExplainMetrics)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.ExplainMetrics other = (com.google.datastore.v1.ExplainMetrics) obj;
+
+    if (hasPlanSummary() != other.hasPlanSummary()) return false;
+    if (hasPlanSummary()) {
+      if (!getPlanSummary().equals(other.getPlanSummary())) return false;
+    }
+    if (hasExecutionStats() != other.hasExecutionStats()) return false;
+    if (hasExecutionStats()) {
+      if (!getExecutionStats().equals(other.getExecutionStats())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasPlanSummary()) {
+      hash = (37 * hash) + PLAN_SUMMARY_FIELD_NUMBER;
+      hash = (53 * hash) + getPlanSummary().hashCode();
+    }
+    if (hasExecutionStats()) {
+      hash = (37 * hash) + EXECUTION_STATS_FIELD_NUMBER;
+      hash = (53 * hash) + getExecutionStats().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.ExplainMetrics prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Explain metrics for the query.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.ExplainMetrics}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.ExplainMetrics)
+      com.google.datastore.v1.ExplainMetricsOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExplainMetrics_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExplainMetrics_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.ExplainMetrics.class,
+              com.google.datastore.v1.ExplainMetrics.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.ExplainMetrics.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPlanSummaryFieldBuilder();
+        getExecutionStatsFieldBuilder();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      planSummary_ = null;
+      if (planSummaryBuilder_ != null) {
+        planSummaryBuilder_.dispose();
+        planSummaryBuilder_ = null;
+      }
+      executionStats_ = null;
+      if (executionStatsBuilder_ != null) {
+        executionStatsBuilder_.dispose();
+        executionStatsBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExplainMetrics_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExplainMetrics getDefaultInstanceForType() {
+      return com.google.datastore.v1.ExplainMetrics.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExplainMetrics build() {
+      com.google.datastore.v1.ExplainMetrics result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExplainMetrics buildPartial() {
+      com.google.datastore.v1.ExplainMetrics result =
+          new com.google.datastore.v1.ExplainMetrics(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.ExplainMetrics result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.planSummary_ =
+            planSummaryBuilder_ == null ? planSummary_ : planSummaryBuilder_.build();
+        to_bitField0_ |= 0x00000001;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.executionStats_ =
+            executionStatsBuilder_ == null ? executionStats_ : executionStatsBuilder_.build();
+        to_bitField0_ |= 0x00000002;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.ExplainMetrics) {
+        return mergeFrom((com.google.datastore.v1.ExplainMetrics) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.ExplainMetrics other) {
+      if (other == com.google.datastore.v1.ExplainMetrics.getDefaultInstance()) return this;
+      if (other.hasPlanSummary()) {
+        mergePlanSummary(other.getPlanSummary());
+      }
+      if (other.hasExecutionStats()) {
+        mergeExecutionStats(other.getExecutionStats());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getPlanSummaryFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getExecutionStatsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.datastore.v1.PlanSummary planSummary_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PlanSummary,
+            com.google.datastore.v1.PlanSummary.Builder,
+            com.google.datastore.v1.PlanSummaryOrBuilder>
+        planSummaryBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     *
+     * @return Whether the planSummary field is set.
+     */
+    public boolean hasPlanSummary() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     *
+     * @return The planSummary.
+     */
+    public com.google.datastore.v1.PlanSummary getPlanSummary() {
+      if (planSummaryBuilder_ == null) {
+        return planSummary_ == null
+            ? com.google.datastore.v1.PlanSummary.getDefaultInstance()
+            : planSummary_;
+      } else {
+        return planSummaryBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     */
+    public Builder setPlanSummary(com.google.datastore.v1.PlanSummary value) {
+      if (planSummaryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        planSummary_ = value;
+      } else {
+        planSummaryBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     */
+    public Builder setPlanSummary(com.google.datastore.v1.PlanSummary.Builder builderForValue) {
+      if (planSummaryBuilder_ == null) {
+        planSummary_ = builderForValue.build();
+      } else {
+        planSummaryBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     */
+    public Builder mergePlanSummary(com.google.datastore.v1.PlanSummary value) {
+      if (planSummaryBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)
+            && planSummary_ != null
+            && planSummary_ != com.google.datastore.v1.PlanSummary.getDefaultInstance()) {
+          getPlanSummaryBuilder().mergeFrom(value);
+        } else {
+          planSummary_ = value;
+        }
+      } else {
+        planSummaryBuilder_.mergeFrom(value);
+      }
+      if (planSummary_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     */
+    public Builder clearPlanSummary() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      planSummary_ = null;
+      if (planSummaryBuilder_ != null) {
+        planSummaryBuilder_.dispose();
+        planSummaryBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     */
+    public com.google.datastore.v1.PlanSummary.Builder getPlanSummaryBuilder() {
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return getPlanSummaryFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     */
+    public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() {
+      if (planSummaryBuilder_ != null) {
+        return planSummaryBuilder_.getMessageOrBuilder();
+      } else {
+        return planSummary_ == null
+            ? com.google.datastore.v1.PlanSummary.getDefaultInstance()
+            : planSummary_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Planning phase information for the query.
+     * 
    
+     *
+     * .google.datastore.v1.PlanSummary plan_summary = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PlanSummary,
+            com.google.datastore.v1.PlanSummary.Builder,
+            com.google.datastore.v1.PlanSummaryOrBuilder>
+        getPlanSummaryFieldBuilder() {
+      if (planSummaryBuilder_ == null) {
+        planSummaryBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PlanSummary,
+                com.google.datastore.v1.PlanSummary.Builder,
+                com.google.datastore.v1.PlanSummaryOrBuilder>(
+                getPlanSummary(), getParentForChildren(), isClean());
+        planSummary_ = null;
+      }
+      return planSummaryBuilder_;
+    }
+
+    private com.google.datastore.v1.ExecutionStats executionStats_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExecutionStats,
+            com.google.datastore.v1.ExecutionStats.Builder,
+            com.google.datastore.v1.ExecutionStatsOrBuilder>
+        executionStatsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     *
+     * @return Whether the executionStats field is set.
+     */
+    public boolean hasExecutionStats() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     *
+     * @return The executionStats.
+     */
+    public com.google.datastore.v1.ExecutionStats getExecutionStats() {
+      if (executionStatsBuilder_ == null) {
+        return executionStats_ == null
+            ? com.google.datastore.v1.ExecutionStats.getDefaultInstance()
+            : executionStats_;
+      } else {
+        return executionStatsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     */
+    public Builder setExecutionStats(com.google.datastore.v1.ExecutionStats value) {
+      if (executionStatsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        executionStats_ = value;
+      } else {
+        executionStatsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     */
+    public Builder setExecutionStats(
+        com.google.datastore.v1.ExecutionStats.Builder builderForValue) {
+      if (executionStatsBuilder_ == null) {
+        executionStats_ = builderForValue.build();
+      } else {
+        executionStatsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     */
+    public Builder mergeExecutionStats(com.google.datastore.v1.ExecutionStats value) {
+      if (executionStatsBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) != 0)
+            && executionStats_ != null
+            && executionStats_ != com.google.datastore.v1.ExecutionStats.getDefaultInstance()) {
+          getExecutionStatsBuilder().mergeFrom(value);
+        } else {
+          executionStats_ = value;
+        }
+      } else {
+        executionStatsBuilder_.mergeFrom(value);
+      }
+      if (executionStats_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     */
+    public Builder clearExecutionStats() {
+      bitField0_ = (bitField0_ & ~0x00000002);
+      executionStats_ = null;
+      if (executionStatsBuilder_ != null) {
+        executionStatsBuilder_.dispose();
+        executionStatsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     */
+    public com.google.datastore.v1.ExecutionStats.Builder getExecutionStatsBuilder() {
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return getExecutionStatsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     */
+    public com.google.datastore.v1.ExecutionStatsOrBuilder getExecutionStatsOrBuilder() {
+      if (executionStatsBuilder_ != null) {
+        return executionStatsBuilder_.getMessageOrBuilder();
+      } else {
+        return executionStats_ == null
+            ? com.google.datastore.v1.ExecutionStats.getDefaultInstance()
+            : executionStats_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Aggregated stats from the execution of the query. Only present when
+     * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+     * to true.
+     * 
    
+     *
+     * .google.datastore.v1.ExecutionStats execution_stats = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExecutionStats,
+            com.google.datastore.v1.ExecutionStats.Builder,
+            com.google.datastore.v1.ExecutionStatsOrBuilder>
+        getExecutionStatsFieldBuilder() {
+      if (executionStatsBuilder_ == null) {
+        executionStatsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ExecutionStats,
+                com.google.datastore.v1.ExecutionStats.Builder,
+                com.google.datastore.v1.ExecutionStatsOrBuilder>(
+                getExecutionStats(), getParentForChildren(), isClean());
+        executionStats_ = null;
+      }
+      return executionStatsBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.ExplainMetrics)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.ExplainMetrics)
+  private static final com.google.datastore.v1.ExplainMetrics DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.ExplainMetrics();
+  }
+
+  public static com.google.datastore.v1.ExplainMetrics getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ExplainMetrics parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainMetrics getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
new file mode 100644
index 000000000000..632fc5ef958a
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+public interface ExplainMetricsOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.ExplainMetrics)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query.
+   * 
    
+   *
+   * .google.datastore.v1.PlanSummary plan_summary = 1;
+   *
+   * @return Whether the planSummary field is set.
+   */
+  boolean hasPlanSummary();
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query.
+   * 
    
+   *
+   * .google.datastore.v1.PlanSummary plan_summary = 1;
+   *
+   * @return The planSummary.
+   */
+  com.google.datastore.v1.PlanSummary getPlanSummary();
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query.
+   * 
    
+   *
+   * .google.datastore.v1.PlanSummary plan_summary = 1;
+   */
+  com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Aggregated stats from the execution of the query. Only present when
+   * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+   * to true.
+   * 
    
+   *
+   * .google.datastore.v1.ExecutionStats execution_stats = 2;
+   *
+   * @return Whether the executionStats field is set.
+   */
+  boolean hasExecutionStats();
+  /**
+   *
+   *
+   * 
    +   * Aggregated stats from the execution of the query. Only present when
+   * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+   * to true.
+   * 
    
+   *
+   * .google.datastore.v1.ExecutionStats execution_stats = 2;
+   *
+   * @return The executionStats.
+   */
+  com.google.datastore.v1.ExecutionStats getExecutionStats();
+  /**
+   *
+   *
+   * 
    +   * Aggregated stats from the execution of the query. Only present when
+   * [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+   * to true.
+   * 
    
+   *
+   * .google.datastore.v1.ExecutionStats execution_stats = 2;
+   */
+  com.google.datastore.v1.ExecutionStatsOrBuilder getExecutionStatsOrBuilder();
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
new file mode 100644
index 000000000000..78fa71cd5286
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
@@ -0,0 +1,557 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * Explain options for the query.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.ExplainOptions}
+ */
+public final class ExplainOptions extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.ExplainOptions)
+    ExplainOptionsOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use ExplainOptions.newBuilder() to construct.
+  private ExplainOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private ExplainOptions() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new ExplainOptions();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ExplainOptions_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_ExplainOptions_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.ExplainOptions.class,
+            com.google.datastore.v1.ExplainOptions.Builder.class);
+  }
+
+  public static final int ANALYZE_FIELD_NUMBER = 1;
+  private boolean analyze_ = false;
+  /**
+   *
+   *
+   * 
    +   * Optional. Whether to execute this query.
+   *
+   * When false (the default), the query will be planned, returning only
+   * metrics from the planning stages.
+   *
+   * When true, the query will be planned and executed, returning the full
+   * query results along with both planning and execution stage metrics.
+   * 
    
+   *
+   * bool analyze = 1 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The analyze.
+   */
+  @java.lang.Override
+  public boolean getAnalyze() {
+    return analyze_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (analyze_ != false) {
+      output.writeBool(1, analyze_);
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (analyze_ != false) {
+      size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, analyze_);
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.ExplainOptions)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.ExplainOptions other = (com.google.datastore.v1.ExplainOptions) obj;
+
+    if (getAnalyze() != other.getAnalyze()) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + ANALYZE_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAnalyze());
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.ExplainOptions parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.ExplainOptions prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Explain options for the query.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.ExplainOptions}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.ExplainOptions)
+      com.google.datastore.v1.ExplainOptionsOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExplainOptions_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExplainOptions_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.ExplainOptions.class,
+              com.google.datastore.v1.ExplainOptions.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.ExplainOptions.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      analyze_ = false;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_ExplainOptions_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExplainOptions getDefaultInstanceForType() {
+      return com.google.datastore.v1.ExplainOptions.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExplainOptions build() {
+      com.google.datastore.v1.ExplainOptions result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.ExplainOptions buildPartial() {
+      com.google.datastore.v1.ExplainOptions result =
+          new com.google.datastore.v1.ExplainOptions(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.ExplainOptions result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.analyze_ = analyze_;
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.ExplainOptions) {
+        return mergeFrom((com.google.datastore.v1.ExplainOptions) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.ExplainOptions other) {
+      if (other == com.google.datastore.v1.ExplainOptions.getDefaultInstance()) return this;
+      if (other.getAnalyze() != false) {
+        setAnalyze(other.getAnalyze());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                analyze_ = input.readBool();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private boolean analyze_;
+    /**
+     *
+     *
+     * 
    +     * Optional. Whether to execute this query.
+     *
+     * When false (the default), the query will be planned, returning only
+     * metrics from the planning stages.
+     *
+     * When true, the query will be planned and executed, returning the full
+     * query results along with both planning and execution stage metrics.
+     * 
    
+     *
+     * bool analyze = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The analyze.
+     */
+    @java.lang.Override
+    public boolean getAnalyze() {
+      return analyze_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Whether to execute this query.
+     *
+     * When false (the default), the query will be planned, returning only
+     * metrics from the planning stages.
+     *
+     * When true, the query will be planned and executed, returning the full
+     * query results along with both planning and execution stage metrics.
+     * 
    
+     *
+     * bool analyze = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @param value The analyze to set.
+     * @return This builder for chaining.
+     */
+    public Builder setAnalyze(boolean value) {
+
+      analyze_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Whether to execute this query.
+     *
+     * When false (the default), the query will be planned, returning only
+     * metrics from the planning stages.
+     *
+     * When true, the query will be planned and executed, returning the full
+     * query results along with both planning and execution stage metrics.
+     * 
    
+     *
+     * bool analyze = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearAnalyze() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      analyze_ = false;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.ExplainOptions)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.ExplainOptions)
+  private static final com.google.datastore.v1.ExplainOptions DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.ExplainOptions();
+  }
+
+  public static com.google.datastore.v1.ExplainOptions getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public ExplainOptions parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainOptions getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
new file mode 100644
index 000000000000..d539b998d374
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+public interface ExplainOptionsOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.ExplainOptions)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Optional. Whether to execute this query.
+   *
+   * When false (the default), the query will be planned, returning only
+   * metrics from the planning stages.
+   *
+   * When true, the query will be planned and executed, returning the full
+   * query results along with both planning and execution stage metrics.
+   * 
    
+   *
+   * bool analyze = 1 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The analyze.
+   */
+  boolean getAnalyze();
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
new file mode 100644
index 000000000000..90df86457e4f
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
@@ -0,0 +1,1019 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * Planning phase information for the query.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.PlanSummary}
+ */
+public final class PlanSummary extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.PlanSummary)
+    PlanSummaryOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use PlanSummary.newBuilder() to construct.
+  private PlanSummary(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private PlanSummary() {
+    indexesUsed_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new PlanSummary();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_PlanSummary_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProfileProto
+        .internal_static_google_datastore_v1_PlanSummary_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.PlanSummary.class,
+            com.google.datastore.v1.PlanSummary.Builder.class);
+  }
+
+  public static final int INDEXES_USED_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
+  private java.util.List indexesUsed_;
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  @java.lang.Override
+  public java.util.List getIndexesUsedList() {
+    return indexesUsed_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  @java.lang.Override
+  public java.util.List
+      getIndexesUsedOrBuilderList() {
+    return indexesUsed_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  @java.lang.Override
+  public int getIndexesUsedCount() {
+    return indexesUsed_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  @java.lang.Override
+  public com.google.protobuf.Struct getIndexesUsed(int index) {
+    return indexesUsed_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  @java.lang.Override
+  public com.google.protobuf.StructOrBuilder getIndexesUsedOrBuilder(int index) {
+    return indexesUsed_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    for (int i = 0; i < indexesUsed_.size(); i++) {
+      output.writeMessage(1, indexesUsed_.get(i));
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < indexesUsed_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, indexesUsed_.get(i));
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.PlanSummary)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.PlanSummary other = (com.google.datastore.v1.PlanSummary) obj;
+
+    if (!getIndexesUsedList().equals(other.getIndexesUsedList())) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getIndexesUsedCount() > 0) {
+      hash = (37 * hash) + INDEXES_USED_FIELD_NUMBER;
+      hash = (53 * hash) + getIndexesUsedList().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PlanSummary parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.PlanSummary prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Planning phase information for the query.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.PlanSummary}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.PlanSummary)
+      com.google.datastore.v1.PlanSummaryOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_PlanSummary_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_PlanSummary_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.PlanSummary.class,
+              com.google.datastore.v1.PlanSummary.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.PlanSummary.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      if (indexesUsedBuilder_ == null) {
+        indexesUsed_ = java.util.Collections.emptyList();
+      } else {
+        indexesUsed_ = null;
+        indexesUsedBuilder_.clear();
+      }
+      bitField0_ = (bitField0_ & ~0x00000001);
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProfileProto
+          .internal_static_google_datastore_v1_PlanSummary_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PlanSummary getDefaultInstanceForType() {
+      return com.google.datastore.v1.PlanSummary.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PlanSummary build() {
+      com.google.datastore.v1.PlanSummary result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PlanSummary buildPartial() {
+      com.google.datastore.v1.PlanSummary result = new com.google.datastore.v1.PlanSummary(this);
+      buildPartialRepeatedFields(result);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartialRepeatedFields(com.google.datastore.v1.PlanSummary result) {
+      if (indexesUsedBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          indexesUsed_ = java.util.Collections.unmodifiableList(indexesUsed_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.indexesUsed_ = indexesUsed_;
+      } else {
+        result.indexesUsed_ = indexesUsedBuilder_.build();
+      }
+    }
+
+    private void buildPartial0(com.google.datastore.v1.PlanSummary result) {
+      int from_bitField0_ = bitField0_;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.PlanSummary) {
+        return mergeFrom((com.google.datastore.v1.PlanSummary) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.PlanSummary other) {
+      if (other == com.google.datastore.v1.PlanSummary.getDefaultInstance()) return this;
+      if (indexesUsedBuilder_ == null) {
+        if (!other.indexesUsed_.isEmpty()) {
+          if (indexesUsed_.isEmpty()) {
+            indexesUsed_ = other.indexesUsed_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureIndexesUsedIsMutable();
+            indexesUsed_.addAll(other.indexesUsed_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.indexesUsed_.isEmpty()) {
+          if (indexesUsedBuilder_.isEmpty()) {
+            indexesUsedBuilder_.dispose();
+            indexesUsedBuilder_ = null;
+            indexesUsed_ = other.indexesUsed_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            indexesUsedBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getIndexesUsedFieldBuilder()
+                    : null;
+          } else {
+            indexesUsedBuilder_.addAllMessages(other.indexesUsed_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.protobuf.Struct m =
+                    input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+                if (indexesUsedBuilder_ == null) {
+                  ensureIndexesUsedIsMutable();
+                  indexesUsed_.add(m);
+                } else {
+                  indexesUsedBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.util.List indexesUsed_ =
+        java.util.Collections.emptyList();
+
+    private void ensureIndexesUsedIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        indexesUsed_ = new java.util.ArrayList(indexesUsed_);
+        bitField0_ |= 0x00000001;
+      }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        indexesUsedBuilder_;
+
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public java.util.List getIndexesUsedList() {
+      if (indexesUsedBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(indexesUsed_);
+      } else {
+        return indexesUsedBuilder_.getMessageList();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public int getIndexesUsedCount() {
+      if (indexesUsedBuilder_ == null) {
+        return indexesUsed_.size();
+      } else {
+        return indexesUsedBuilder_.getCount();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public com.google.protobuf.Struct getIndexesUsed(int index) {
+      if (indexesUsedBuilder_ == null) {
+        return indexesUsed_.get(index);
+      } else {
+        return indexesUsedBuilder_.getMessage(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder setIndexesUsed(int index, com.google.protobuf.Struct value) {
+      if (indexesUsedBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureIndexesUsedIsMutable();
+        indexesUsed_.set(index, value);
+        onChanged();
+      } else {
+        indexesUsedBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder setIndexesUsed(int index, com.google.protobuf.Struct.Builder builderForValue) {
+      if (indexesUsedBuilder_ == null) {
+        ensureIndexesUsedIsMutable();
+        indexesUsed_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        indexesUsedBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder addIndexesUsed(com.google.protobuf.Struct value) {
+      if (indexesUsedBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureIndexesUsedIsMutable();
+        indexesUsed_.add(value);
+        onChanged();
+      } else {
+        indexesUsedBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder addIndexesUsed(int index, com.google.protobuf.Struct value) {
+      if (indexesUsedBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureIndexesUsedIsMutable();
+        indexesUsed_.add(index, value);
+        onChanged();
+      } else {
+        indexesUsedBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder addIndexesUsed(com.google.protobuf.Struct.Builder builderForValue) {
+      if (indexesUsedBuilder_ == null) {
+        ensureIndexesUsedIsMutable();
+        indexesUsed_.add(builderForValue.build());
+        onChanged();
+      } else {
+        indexesUsedBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder addIndexesUsed(int index, com.google.protobuf.Struct.Builder builderForValue) {
+      if (indexesUsedBuilder_ == null) {
+        ensureIndexesUsedIsMutable();
+        indexesUsed_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        indexesUsedBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder addAllIndexesUsed(
+        java.lang.Iterable values) {
+      if (indexesUsedBuilder_ == null) {
+        ensureIndexesUsedIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, indexesUsed_);
+        onChanged();
+      } else {
+        indexesUsedBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder clearIndexesUsed() {
+      if (indexesUsedBuilder_ == null) {
+        indexesUsed_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        indexesUsedBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public Builder removeIndexesUsed(int index) {
+      if (indexesUsedBuilder_ == null) {
+        ensureIndexesUsedIsMutable();
+        indexesUsed_.remove(index);
+        onChanged();
+      } else {
+        indexesUsedBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public com.google.protobuf.Struct.Builder getIndexesUsedBuilder(int index) {
+      return getIndexesUsedFieldBuilder().getBuilder(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public com.google.protobuf.StructOrBuilder getIndexesUsedOrBuilder(int index) {
+      if (indexesUsedBuilder_ == null) {
+        return indexesUsed_.get(index);
+      } else {
+        return indexesUsedBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public java.util.List
+        getIndexesUsedOrBuilderList() {
+      if (indexesUsedBuilder_ != null) {
+        return indexesUsedBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(indexesUsed_);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public com.google.protobuf.Struct.Builder addIndexesUsedBuilder() {
+      return getIndexesUsedFieldBuilder()
+          .addBuilder(com.google.protobuf.Struct.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public com.google.protobuf.Struct.Builder addIndexesUsedBuilder(int index) {
+      return getIndexesUsedFieldBuilder()
+          .addBuilder(index, com.google.protobuf.Struct.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The indexes selected for the query. For example:
+     *  [
+     *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+     *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+     *  ]
+     * 
    
+     *
+     * repeated .google.protobuf.Struct indexes_used = 1;
+     */
+    public java.util.List getIndexesUsedBuilderList() {
+      return getIndexesUsedFieldBuilder().getBuilderList();
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        getIndexesUsedFieldBuilder() {
+      if (indexesUsedBuilder_ == null) {
+        indexesUsedBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.protobuf.Struct,
+                com.google.protobuf.Struct.Builder,
+                com.google.protobuf.StructOrBuilder>(
+                indexesUsed_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        indexesUsed_ = null;
+      }
+      return indexesUsedBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.PlanSummary)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.PlanSummary)
+  private static final com.google.datastore.v1.PlanSummary DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.PlanSummary();
+  }
+
+  public static com.google.datastore.v1.PlanSummary getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public PlanSummary parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.PlanSummary getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
new file mode 100644
index 000000000000..a98db6c01c3c
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+public interface PlanSummaryOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.PlanSummary)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  java.util.List getIndexesUsedList();
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  com.google.protobuf.Struct getIndexesUsed(int index);
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  int getIndexesUsedCount();
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  java.util.List getIndexesUsedOrBuilderList();
+  /**
+   *
+   *
+   * 
    +   * The indexes selected for the query. For example:
+   *  [
+   *    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+   *    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+   *  ]
+   * 
    
+   *
+   * repeated .google.protobuf.Struct indexes_used = 1;
+   */
+  com.google.protobuf.StructOrBuilder getIndexesUsedOrBuilder(int index);
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
new file mode 100644
index 000000000000..85089166af4d
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query_profile.proto
+
+// Protobuf Java Version: 3.25.2
+package com.google.datastore.v1;
+
+public final class QueryProfileProto {
+  private QueryProfileProto() {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_ExplainOptions_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ExplainOptions_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_ExplainMetrics_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ExplainMetrics_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_PlanSummary_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_PlanSummary_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_ExecutionStats_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_ExecutionStats_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+    return descriptor;
+  }
+
+  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\'google/datastore/v1/query_profile.prot"
+          + "o\022\023google.datastore.v1\032\037google/api/field"
+          + "_behavior.proto\032\036google/protobuf/duratio"
+          + "n.proto\032\034google/protobuf/struct.proto\"&\n"
+          + "\016ExplainOptions\022\024\n\007analyze\030\001 \001(\010B\003\340A\001\"\206\001"
+          + "\n\016ExplainMetrics\0226\n\014plan_summary\030\001 \001(\0132 "
+          + ".google.datastore.v1.PlanSummary\022<\n\017exec"
+          + "ution_stats\030\002 \001(\0132#.google.datastore.v1."
+          + "ExecutionStats\"<\n\013PlanSummary\022-\n\014indexes"
+          + "_used\030\001 \003(\0132\027.google.protobuf.Struct\"\250\001\n"
+          + "\016ExecutionStats\022\030\n\020results_returned\030\001 \001("
+          + "\003\0225\n\022execution_duration\030\003 \001(\0132\031.google.p"
+          + "rotobuf.Duration\022\027\n\017read_operations\030\004 \001("
+          + "\003\022,\n\013debug_stats\030\005 \001(\0132\027.google.protobuf"
+          + ".StructB\303\001\n\027com.google.datastore.v1B\021Que"
+          + "ryProfileProtoP\001Z
+   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the explainOptions field is set.
+   */
+  @java.lang.Override
+  public boolean hasExplainOptions() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The explainOptions.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainOptions getExplainOptions() {
+    return explainOptions_ == null
+        ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+        : explainOptions_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilder() {
+    return explainOptions_ == null
+        ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+        : explainOptions_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -466,6 +525,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(11, getExplainOptions());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -497,6 +559,9 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, getExplainOptions());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -523,6 +588,10 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
+    if (hasExplainOptions() != other.hasExplainOptions()) return false;
+    if (hasExplainOptions()) {
+      if (!getExplainOptions().equals(other.getExplainOptions())) return false;
+    }
     if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
@@ -557,6 +626,10 @@ public int hashCode() {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
     }
+    if (hasExplainOptions()) {
+      hash = (37 * hash) + EXPLAIN_OPTIONS_FIELD_NUMBER;
+      hash = (53 * hash) + getExplainOptions().hashCode();
+    }
     switch (queryTypeCase_) {
       case 3:
         hash = (37 * hash) + AGGREGATION_QUERY_FIELD_NUMBER;
@@ -712,6 +785,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getPartitionIdFieldBuilder();
         getReadOptionsFieldBuilder();
+        getExplainOptionsFieldBuilder();
       }
     }
 
@@ -737,6 +811,11 @@ public Builder clear() {
       if (gqlQueryBuilder_ != null) {
         gqlQueryBuilder_.clear();
       }
+      explainOptions_ = null;
+      if (explainOptionsBuilder_ != null) {
+        explainOptionsBuilder_.dispose();
+        explainOptionsBuilder_ = null;
+      }
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -793,6 +872,11 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryRequest re
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
         to_bitField0_ |= 0x00000002;
       }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.explainOptions_ =
+            explainOptionsBuilder_ == null ? explainOptions_ : explainOptionsBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
       result.bitField0_ |= to_bitField0_;
     }
 
@@ -869,6 +953,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryRequest othe
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
+      if (other.hasExplainOptions()) {
+        mergeExplainOptions(other.getExplainOptions());
+      }
       switch (other.getQueryTypeCase()) {
         case AGGREGATION_QUERY:
           {
@@ -948,6 +1035,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000002;
                 break;
               } // case 74
+            case 90:
+              {
+                input.readMessage(getExplainOptionsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 90
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -2020,6 +2113,219 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       return gqlQueryBuilder_;
     }
 
+    private com.google.datastore.v1.ExplainOptions explainOptions_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainOptions,
+            com.google.datastore.v1.ExplainOptions.Builder,
+            com.google.datastore.v1.ExplainOptionsOrBuilder>
+        explainOptionsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return Whether the explainOptions field is set.
+     */
+    public boolean hasExplainOptions() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The explainOptions.
+     */
+    public com.google.datastore.v1.ExplainOptions getExplainOptions() {
+      if (explainOptionsBuilder_ == null) {
+        return explainOptions_ == null
+            ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+            : explainOptions_;
+      } else {
+        return explainOptionsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) {
+      if (explainOptionsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        explainOptions_ = value;
+      } else {
+        explainOptionsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setExplainOptions(
+        com.google.datastore.v1.ExplainOptions.Builder builderForValue) {
+      if (explainOptionsBuilder_ == null) {
+        explainOptions_ = builderForValue.build();
+      } else {
+        explainOptionsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) {
+      if (explainOptionsBuilder_ == null) {
+        if (((bitField0_ & 0x00000040) != 0)
+            && explainOptions_ != null
+            && explainOptions_ != com.google.datastore.v1.ExplainOptions.getDefaultInstance()) {
+          getExplainOptionsBuilder().mergeFrom(value);
+        } else {
+          explainOptions_ = value;
+        }
+      } else {
+        explainOptionsBuilder_.mergeFrom(value);
+      }
+      if (explainOptions_ != null) {
+        bitField0_ |= 0x00000040;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder clearExplainOptions() {
+      bitField0_ = (bitField0_ & ~0x00000040);
+      explainOptions_ = null;
+      if (explainOptionsBuilder_ != null) {
+        explainOptionsBuilder_.dispose();
+        explainOptionsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder() {
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return getExplainOptionsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilder() {
+      if (explainOptionsBuilder_ != null) {
+        return explainOptionsBuilder_.getMessageOrBuilder();
+      } else {
+        return explainOptions_ == null
+            ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+            : explainOptions_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainOptions,
+            com.google.datastore.v1.ExplainOptions.Builder,
+            com.google.datastore.v1.ExplainOptionsOrBuilder>
+        getExplainOptionsFieldBuilder() {
+      if (explainOptionsBuilder_ == null) {
+        explainOptionsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ExplainOptions,
+                com.google.datastore.v1.ExplainOptions.Builder,
+                com.google.datastore.v1.ExplainOptionsOrBuilder>(
+                getExplainOptions(), getParentForChildren(), isClean());
+        explainOptions_ = null;
+      }
+      return explainOptionsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 0982b2b2ba5c..23a5c4e62fcf 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
@@ -229,5 +229,49 @@ public interface RunAggregationQueryRequestOrBuilder
    */
   com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the explainOptions field is set.
+   */
+  boolean hasExplainOptions();
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The explainOptions.
+   */
+  com.google.datastore.v1.ExplainOptions getExplainOptions();
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 11 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilder();
+
   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 f33cfc1afa6f..9ddc2eb14958 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
@@ -185,6 +185,62 @@ public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
 
+  public static final int EXPLAIN_METRICS_FIELD_NUMBER = 9;
+  private com.google.datastore.v1.ExplainMetrics explainMetrics_;
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return Whether the explainMetrics field is set.
+   */
+  @java.lang.Override
+  public boolean hasExplainMetrics() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return The explainMetrics.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
+    return explainMetrics_ == null
+        ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+        : explainMetrics_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilder() {
+    return explainMetrics_ == null
+        ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+        : explainMetrics_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -208,6 +264,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(5, transaction_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(9, getExplainMetrics());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -226,6 +285,9 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getExplainMetrics());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -251,6 +313,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
     if (!getTransaction().equals(other.getTransaction())) return false;
+    if (hasExplainMetrics() != other.hasExplainMetrics()) return false;
+    if (hasExplainMetrics()) {
+      if (!getExplainMetrics().equals(other.getExplainMetrics())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -272,6 +338,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
+    if (hasExplainMetrics()) {
+      hash = (37 * hash) + EXPLAIN_METRICS_FIELD_NUMBER;
+      hash = (53 * hash) + getExplainMetrics().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -415,6 +485,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getBatchFieldBuilder();
         getQueryFieldBuilder();
+        getExplainMetricsFieldBuilder();
       }
     }
 
@@ -433,6 +504,11 @@ public Builder clear() {
         queryBuilder_ = null;
       }
       transaction_ = com.google.protobuf.ByteString.EMPTY;
+      explainMetrics_ = null;
+      if (explainMetricsBuilder_ != null) {
+        explainMetricsBuilder_.dispose();
+        explainMetricsBuilder_ = null;
+      }
       return this;
     }
 
@@ -481,6 +557,11 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryResponse r
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.explainMetrics_ =
+            explainMetricsBuilder_ == null ? explainMetrics_ : explainMetricsBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
       result.bitField0_ |= to_bitField0_;
     }
 
@@ -539,6 +620,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryResponse oth
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
+      if (other.hasExplainMetrics()) {
+        mergeExplainMetrics(other.getExplainMetrics());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -583,6 +667,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 42
+            case 74:
+              {
+                input.readMessage(getExplainMetricsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 74
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1046,6 +1136,210 @@ public Builder clearTransaction() {
       return this;
     }
 
+    private com.google.datastore.v1.ExplainMetrics explainMetrics_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainMetrics,
+            com.google.datastore.v1.ExplainMetrics.Builder,
+            com.google.datastore.v1.ExplainMetricsOrBuilder>
+        explainMetricsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     *
+     * @return Whether the explainMetrics field is set.
+     */
+    public boolean hasExplainMetrics() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     *
+     * @return The explainMetrics.
+     */
+    public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
+      if (explainMetricsBuilder_ == null) {
+        return explainMetrics_ == null
+            ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+            : explainMetrics_;
+      } else {
+        return explainMetricsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder setExplainMetrics(com.google.datastore.v1.ExplainMetrics value) {
+      if (explainMetricsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        explainMetrics_ = value;
+      } else {
+        explainMetricsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder setExplainMetrics(
+        com.google.datastore.v1.ExplainMetrics.Builder builderForValue) {
+      if (explainMetricsBuilder_ == null) {
+        explainMetrics_ = builderForValue.build();
+      } else {
+        explainMetricsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder mergeExplainMetrics(com.google.datastore.v1.ExplainMetrics value) {
+      if (explainMetricsBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && explainMetrics_ != null
+            && explainMetrics_ != com.google.datastore.v1.ExplainMetrics.getDefaultInstance()) {
+          getExplainMetricsBuilder().mergeFrom(value);
+        } else {
+          explainMetrics_ = value;
+        }
+      } else {
+        explainMetricsBuilder_.mergeFrom(value);
+      }
+      if (explainMetrics_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder clearExplainMetrics() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      explainMetrics_ = null;
+      if (explainMetricsBuilder_ != null) {
+        explainMetricsBuilder_.dispose();
+        explainMetricsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public com.google.datastore.v1.ExplainMetrics.Builder getExplainMetricsBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getExplainMetricsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilder() {
+      if (explainMetricsBuilder_ != null) {
+        return explainMetricsBuilder_.getMessageOrBuilder();
+      } else {
+        return explainMetrics_ == null
+            ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+            : explainMetrics_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainMetrics,
+            com.google.datastore.v1.ExplainMetrics.Builder,
+            com.google.datastore.v1.ExplainMetricsOrBuilder>
+        getExplainMetricsFieldBuilder() {
+      if (explainMetricsBuilder_ == null) {
+        explainMetricsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ExplainMetrics,
+                com.google.datastore.v1.ExplainMetrics.Builder,
+                com.google.datastore.v1.ExplainMetricsOrBuilder>(
+                getExplainMetrics(), getParentForChildren(), isClean());
+        explainMetrics_ = null;
+      }
+      return explainMetricsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 fc035ea990db..423c26052048 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
@@ -112,4 +112,45 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
+
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return Whether the explainMetrics field is set.
+   */
+  boolean hasExplainMetrics();
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return The explainMetrics.
+   */
+  com.google.datastore.v1.ExplainMetrics getExplainMetrics();
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   */
+  com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilder();
 }
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 e6a745896823..cdbc7b6fa455 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
@@ -433,6 +433,65 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
+  public static final int EXPLAIN_OPTIONS_FIELD_NUMBER = 12;
+  private com.google.datastore.v1.ExplainOptions explainOptions_;
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the explainOptions field is set.
+   */
+  @java.lang.Override
+  public boolean hasExplainOptions() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The explainOptions.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainOptions getExplainOptions() {
+    return explainOptions_ == null
+        ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+        : explainOptions_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilder() {
+    return explainOptions_ == null
+        ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+        : explainOptions_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -465,6 +524,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(12, getExplainOptions());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -496,6 +558,9 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getExplainOptions());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -521,6 +586,10 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
+    if (hasExplainOptions() != other.hasExplainOptions()) return false;
+    if (hasExplainOptions()) {
+      if (!getExplainOptions().equals(other.getExplainOptions())) return false;
+    }
     if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
@@ -555,6 +624,10 @@ public int hashCode() {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
     }
+    if (hasExplainOptions()) {
+      hash = (37 * hash) + EXPLAIN_OPTIONS_FIELD_NUMBER;
+      hash = (53 * hash) + getExplainOptions().hashCode();
+    }
     switch (queryTypeCase_) {
       case 3:
         hash = (37 * hash) + QUERY_FIELD_NUMBER;
@@ -709,6 +782,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getPartitionIdFieldBuilder();
         getReadOptionsFieldBuilder();
+        getExplainOptionsFieldBuilder();
       }
     }
 
@@ -734,6 +808,11 @@ public Builder clear() {
       if (gqlQueryBuilder_ != null) {
         gqlQueryBuilder_.clear();
       }
+      explainOptions_ = null;
+      if (explainOptionsBuilder_ != null) {
+        explainOptionsBuilder_.dispose();
+        explainOptionsBuilder_ = null;
+      }
       queryTypeCase_ = 0;
       queryType_ = null;
       return this;
@@ -790,6 +869,11 @@ private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) {
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
         to_bitField0_ |= 0x00000002;
       }
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.explainOptions_ =
+            explainOptionsBuilder_ == null ? explainOptions_ : explainOptionsBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
       result.bitField0_ |= to_bitField0_;
     }
 
@@ -865,6 +949,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
+      if (other.hasExplainOptions()) {
+        mergeExplainOptions(other.getExplainOptions());
+      }
       switch (other.getQueryTypeCase()) {
         case QUERY:
           {
@@ -943,6 +1030,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000002;
                 break;
               } // case 74
+            case 98:
+              {
+                input.readMessage(getExplainOptionsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 98
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -2011,6 +2104,219 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       return gqlQueryBuilder_;
     }
 
+    private com.google.datastore.v1.ExplainOptions explainOptions_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainOptions,
+            com.google.datastore.v1.ExplainOptions.Builder,
+            com.google.datastore.v1.ExplainOptionsOrBuilder>
+        explainOptionsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return Whether the explainOptions field is set.
+     */
+    public boolean hasExplainOptions() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The explainOptions.
+     */
+    public com.google.datastore.v1.ExplainOptions getExplainOptions() {
+      if (explainOptionsBuilder_ == null) {
+        return explainOptions_ == null
+            ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+            : explainOptions_;
+      } else {
+        return explainOptionsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) {
+      if (explainOptionsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        explainOptions_ = value;
+      } else {
+        explainOptionsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setExplainOptions(
+        com.google.datastore.v1.ExplainOptions.Builder builderForValue) {
+      if (explainOptionsBuilder_ == null) {
+        explainOptions_ = builderForValue.build();
+      } else {
+        explainOptionsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) {
+      if (explainOptionsBuilder_ == null) {
+        if (((bitField0_ & 0x00000040) != 0)
+            && explainOptions_ != null
+            && explainOptions_ != com.google.datastore.v1.ExplainOptions.getDefaultInstance()) {
+          getExplainOptionsBuilder().mergeFrom(value);
+        } else {
+          explainOptions_ = value;
+        }
+      } else {
+        explainOptionsBuilder_.mergeFrom(value);
+      }
+      if (explainOptions_ != null) {
+        bitField0_ |= 0x00000040;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder clearExplainOptions() {
+      bitField0_ = (bitField0_ & ~0x00000040);
+      explainOptions_ = null;
+      if (explainOptionsBuilder_ != null) {
+        explainOptionsBuilder_.dispose();
+        explainOptionsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder() {
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return getExplainOptionsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilder() {
+      if (explainOptionsBuilder_ != null) {
+        return explainOptionsBuilder_.getMessageOrBuilder();
+      } else {
+        return explainOptions_ == null
+            ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
+            : explainOptions_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Explain options for the query. If set, additional query
+     * statistics will be returned. If not, only query results will be returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainOptions,
+            com.google.datastore.v1.ExplainOptions.Builder,
+            com.google.datastore.v1.ExplainOptionsOrBuilder>
+        getExplainOptionsFieldBuilder() {
+      if (explainOptionsBuilder_ == null) {
+        explainOptionsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ExplainOptions,
+                com.google.datastore.v1.ExplainOptions.Builder,
+                com.google.datastore.v1.ExplainOptionsOrBuilder>(
+                getExplainOptions(), getParentForChildren(), isClean());
+        explainOptions_ = null;
+      }
+      return explainOptionsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 b11ecd648794..d94ba46d22ae 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
@@ -229,5 +229,49 @@ public interface RunQueryRequestOrBuilder
    */
   com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the explainOptions field is set.
+   */
+  boolean hasExplainOptions();
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The explainOptions.
+   */
+  com.google.datastore.v1.ExplainOptions getExplainOptions();
+  /**
+   *
+   *
+   * 
    +   * Optional. Explain options for the query. If set, additional query
+   * statistics will be returned. If not, only query results will be returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.ExplainOptions explain_options = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilder();
+
   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 f4852c6a8ea4..338b81c10602 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
@@ -181,6 +181,62 @@ public com.google.protobuf.ByteString getTransaction() {
     return transaction_;
   }
 
+  public static final int EXPLAIN_METRICS_FIELD_NUMBER = 9;
+  private com.google.datastore.v1.ExplainMetrics explainMetrics_;
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return Whether the explainMetrics field is set.
+   */
+  @java.lang.Override
+  public boolean hasExplainMetrics() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return The explainMetrics.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
+    return explainMetrics_ == null
+        ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+        : explainMetrics_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilder() {
+    return explainMetrics_ == null
+        ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+        : explainMetrics_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -204,6 +260,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!transaction_.isEmpty()) {
       output.writeBytes(5, transaction_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(9, getExplainMetrics());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -222,6 +281,9 @@ public int getSerializedSize() {
     if (!transaction_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getExplainMetrics());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -246,6 +308,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getQuery().equals(other.getQuery())) return false;
     }
     if (!getTransaction().equals(other.getTransaction())) return false;
+    if (hasExplainMetrics() != other.hasExplainMetrics()) return false;
+    if (hasExplainMetrics()) {
+      if (!getExplainMetrics().equals(other.getExplainMetrics())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -267,6 +333,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
     hash = (53 * hash) + getTransaction().hashCode();
+    if (hasExplainMetrics()) {
+      hash = (37 * hash) + EXPLAIN_METRICS_FIELD_NUMBER;
+      hash = (53 * hash) + getExplainMetrics().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -410,6 +480,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getBatchFieldBuilder();
         getQueryFieldBuilder();
+        getExplainMetricsFieldBuilder();
       }
     }
 
@@ -428,6 +499,11 @@ public Builder clear() {
         queryBuilder_ = null;
       }
       transaction_ = com.google.protobuf.ByteString.EMPTY;
+      explainMetrics_ = null;
+      if (explainMetricsBuilder_ != null) {
+        explainMetricsBuilder_.dispose();
+        explainMetricsBuilder_ = null;
+      }
       return this;
     }
 
@@ -476,6 +552,11 @@ private void buildPartial0(com.google.datastore.v1.RunQueryResponse result) {
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.transaction_ = transaction_;
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.explainMetrics_ =
+            explainMetricsBuilder_ == null ? explainMetrics_ : explainMetricsBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
       result.bitField0_ |= to_bitField0_;
     }
 
@@ -533,6 +614,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) {
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
+      if (other.hasExplainMetrics()) {
+        mergeExplainMetrics(other.getExplainMetrics());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -577,6 +661,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 42
+            case 74:
+              {
+                input.readMessage(getExplainMetricsFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 74
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1035,6 +1125,210 @@ public Builder clearTransaction() {
       return this;
     }
 
+    private com.google.datastore.v1.ExplainMetrics explainMetrics_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainMetrics,
+            com.google.datastore.v1.ExplainMetrics.Builder,
+            com.google.datastore.v1.ExplainMetricsOrBuilder>
+        explainMetricsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     *
+     * @return Whether the explainMetrics field is set.
+     */
+    public boolean hasExplainMetrics() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     *
+     * @return The explainMetrics.
+     */
+    public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
+      if (explainMetricsBuilder_ == null) {
+        return explainMetrics_ == null
+            ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+            : explainMetrics_;
+      } else {
+        return explainMetricsBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder setExplainMetrics(com.google.datastore.v1.ExplainMetrics value) {
+      if (explainMetricsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        explainMetrics_ = value;
+      } else {
+        explainMetricsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder setExplainMetrics(
+        com.google.datastore.v1.ExplainMetrics.Builder builderForValue) {
+      if (explainMetricsBuilder_ == null) {
+        explainMetrics_ = builderForValue.build();
+      } else {
+        explainMetricsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder mergeExplainMetrics(com.google.datastore.v1.ExplainMetrics value) {
+      if (explainMetricsBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && explainMetrics_ != null
+            && explainMetrics_ != com.google.datastore.v1.ExplainMetrics.getDefaultInstance()) {
+          getExplainMetricsBuilder().mergeFrom(value);
+        } else {
+          explainMetrics_ = value;
+        }
+      } else {
+        explainMetricsBuilder_.mergeFrom(value);
+      }
+      if (explainMetrics_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public Builder clearExplainMetrics() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      explainMetrics_ = null;
+      if (explainMetricsBuilder_ != null) {
+        explainMetricsBuilder_.dispose();
+        explainMetricsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public com.google.datastore.v1.ExplainMetrics.Builder getExplainMetricsBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getExplainMetricsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilder() {
+      if (explainMetricsBuilder_ != null) {
+        return explainMetricsBuilder_.getMessageOrBuilder();
+      } else {
+        return explainMetrics_ == null
+            ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
+            : explainMetrics_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Query explain metrics. This is only present when the
+     * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+     * is provided, and it is sent only once with the last response in the stream.
+     * 
    
+     *
+     * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ExplainMetrics,
+            com.google.datastore.v1.ExplainMetrics.Builder,
+            com.google.datastore.v1.ExplainMetricsOrBuilder>
+        getExplainMetricsFieldBuilder() {
+      if (explainMetricsBuilder_ == null) {
+        explainMetricsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ExplainMetrics,
+                com.google.datastore.v1.ExplainMetrics.Builder,
+                com.google.datastore.v1.ExplainMetricsOrBuilder>(
+                getExplainMetrics(), getParentForChildren(), isClean());
+        explainMetrics_ = null;
+      }
+      return explainMetricsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 53de7bf14560..3bcbb324e4da 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
@@ -112,4 +112,45 @@ public interface RunQueryResponseOrBuilder
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
+
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return Whether the explainMetrics field is set.
+   */
+  boolean hasExplainMetrics();
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   *
+   * @return The explainMetrics.
+   */
+  com.google.datastore.v1.ExplainMetrics getExplainMetrics();
+  /**
+   *
+   *
+   * 
    +   * Query explain metrics. This is only present when the
+   * [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+   * is provided, and it is sent only once with the last response in the stream.
+   * 
    
+   *
+   * .google.datastore.v1.ExplainMetrics explain_metrics = 9;
+   */
+  com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilder();
 }
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 533988d77765..1a3fbdd11a30 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
@@ -23,6 +23,7 @@ import "google/api/routing.proto";
 import "google/datastore/v1/aggregation_result.proto";
 import "google/datastore/v1/entity.proto";
 import "google/datastore/v1/query.proto";
+import "google/datastore/v1/query_profile.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.V1";
@@ -232,6 +233,10 @@ message RunQueryRequest {
     // The GQL query to run. This query must be a non-aggregation query.
     GqlQuery gql_query = 7;
   }
+
+  // Optional. Explain options for the query. If set, additional query
+  // statistics will be returned. If not, only query results will be returned.
+  ExplainOptions explain_options = 12 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // The response for
@@ -251,6 +256,11 @@ message RunQueryResponse {
   // was set in
   // [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
   bytes transaction = 5;
+
+  // Query explain metrics. This is only present when the
+  // [RunQueryRequest.explain_options][google.datastore.v1.RunQueryRequest.explain_options]
+  // is provided, and it is sent only once with the last response in the stream.
+  ExplainMetrics explain_metrics = 9;
 }
 
 // The request for
@@ -282,6 +292,10 @@ message RunAggregationQueryRequest {
     // The GQL query to run. This query must be an aggregation query.
     GqlQuery gql_query = 7;
   }
+
+  // Optional. Explain options for the query. If set, additional query
+  // statistics will be returned. If not, only query results will be returned.
+  ExplainOptions explain_options = 11 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // The response for
@@ -301,6 +315,11 @@ message RunAggregationQueryResponse {
   // was set in
   // [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
   bytes transaction = 5;
+
+  // Query explain metrics. This is only present when the
+  // [RunAggregationQueryRequest.explain_options][google.datastore.v1.RunAggregationQueryRequest.explain_options]
+  // is provided, and it is sent only once with the last response in the stream.
+  ExplainMetrics explain_metrics = 9;
 }
 
 // The request for
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
new file mode 100644
index 000000000000..01c9fc254755
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
@@ -0,0 +1,91 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package google.datastore.v1;
+
+import "google/api/field_behavior.proto";
+import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+
+option csharp_namespace = "Google.Cloud.Datastore.V1";
+option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore";
+option java_multiple_files = true;
+option java_outer_classname = "QueryProfileProto";
+option java_package = "com.google.datastore.v1";
+option php_namespace = "Google\\Cloud\\Datastore\\V1";
+option ruby_package = "Google::Cloud::Datastore::V1";
+
+// Specification of the Datastore Query Profile fields.
+
+// Explain options for the query.
+message ExplainOptions {
+  // Optional. Whether to execute this query.
+  //
+  // When false (the default), the query will be planned, returning only
+  // metrics from the planning stages.
+  //
+  // When true, the query will be planned and executed, returning the full
+  // query results along with both planning and execution stage metrics.
+  bool analyze = 1 [(google.api.field_behavior) = OPTIONAL];
+}
+
+// Explain metrics for the query.
+message ExplainMetrics {
+  // Planning phase information for the query.
+  PlanSummary plan_summary = 1;
+
+  // Aggregated stats from the execution of the query. Only present when
+  // [ExplainOptions.analyze][google.datastore.v1.ExplainOptions.analyze] is set
+  // to true.
+  ExecutionStats execution_stats = 2;
+}
+
+// Planning phase information for the query.
+message PlanSummary {
+  // The indexes selected for the query. For example:
+  //  [
+  //    {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
+  //    {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
+  //  ]
+  repeated google.protobuf.Struct indexes_used = 1;
+}
+
+// Execution statistics for the query.
+message ExecutionStats {
+  // Total number of results returned, including documents, projections,
+  // aggregation results, keys.
+  int64 results_returned = 1;
+
+  // Total time to execute the query in the backend.
+  google.protobuf.Duration execution_duration = 3;
+
+  // Total billable read operations.
+  int64 read_operations = 4;
+
+  // Debugging statistics from the execution of the query. Note that the
+  // debugging stats are subject to change as Firestore evolves. It could
+  // include:
+  //  {
+  //    "indexes_entries_scanned": "1000",
+  //    "documents_scanned": "20",
+  //    "billing_details" : {
+  //       "documents_billable": "20",
+  //       "index_entries_billable": "1000",
+  //       "min_query_cost": "0"
+  //    }
+  //  }
+  google.protobuf.Struct debug_stats = 5;
+}

From 05fe5bccf97dae92c00f2eead98424771cb321fd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 13 Mar 2024 16:34:08 +0100
Subject: [PATCH 1341/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.26.1 (#1363)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f85fcd909047..a89e5784160d 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.26.0
+    2.26.1
       
 
   

From 0195345630f404bbcaf1601ded8a8e2011fc3e6e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 14 Mar 2024 15:34:47 +0100
Subject: [PATCH 1342/1784] deps: update dependency
 com.google.guava:guava-testlib to v33.1.0-jre (#1368)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4082597e319c..acd48eb7f14c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -122,7 +122,7 @@
     
       com.google.guava
       guava-testlib
-      33.0.0-jre
+      33.1.0-jre
       test
     
     

From 09db2a75fa714a909bc6fa9b43a9213ae6467c84 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 15 Mar 2024 20:42:16 +0100
Subject: [PATCH 1343/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.28.0 (#1372)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:sdk-platform-java-config](https://togithub.com/googleapis/java-shared-config) | `3.27.0` -> `3.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:sdk-platform-java-config/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:sdk-platform-java-config/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:sdk-platform-java-config/3.27.0/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:sdk-platform-java-config/3.27.0/3.28.0?slim=true)](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 these updates again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 google-cloud-datastore-bom/pom.xml      | 2 +-
 pom.xml                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index ea0ff6101143..b2c3e5443771 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.27.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.28.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index a4cb8a12c063..96c000ca73a3 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.27.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.28.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0f5f62ac1e6f..35a026810acd 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.27.0
+    3.28.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index a89e5784160d..c36efa6d8a03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.27.0
+    3.28.0
   
 
   

From c6e63e5f876fdda953935d09f0536a90a98a812c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 18 Mar 2024 15:40:15 +0100
Subject: [PATCH 1344/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.28.1 (#1373)

---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 google-cloud-datastore-bom/pom.xml      | 2 +-
 pom.xml                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index b2c3e5443771..60087ed51d59 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.28.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.28.1"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 96c000ca73a3..12ae52070622 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.28.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.28.1"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 35a026810acd..6a174528d8c8 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.28.0
+    3.28.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index c36efa6d8a03..00a3513aa91e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.28.0
+    3.28.1
   
 
   

From 0e9c4d1fd4a2c5dfa48833f79dd657acd9f14b29 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:10:22 +0000
Subject: [PATCH 1345/1784] chore(main): release 2.18.6 (#1358)

:robot: I have created a release *beep* *boop*
---


## [2.18.6](https://togithub.com/googleapis/java-datastore/compare/v2.18.5...v2.18.6) (2024-03-18)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.37.0 ([#1355](https://togithub.com/googleapis/java-datastore/issues/1355)) ([bcc5668](https://togithub.com/googleapis/java-datastore/commit/bcc5668039d4dd2055e9666a65fcda3984fc33b5))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.28.0 ([#1372](https://togithub.com/googleapis/java-datastore/issues/1372)) ([09db2a7](https://togithub.com/googleapis/java-datastore/commit/09db2a75fa714a909bc6fa9b43a9213ae6467c84))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.28.1 ([#1373](https://togithub.com/googleapis/java-datastore/issues/1373)) ([c6e63e5](https://togithub.com/googleapis/java-datastore/commit/c6e63e5f876fdda953935d09f0536a90a98a812c))
* Update dependency com.google.errorprone:error_prone_core to v2.26.0 ([#1361](https://togithub.com/googleapis/java-datastore/issues/1361)) ([9442766](https://togithub.com/googleapis/java-datastore/commit/9442766ad61b0c1001d36ecfc0668308838b4a83))
* Update dependency com.google.errorprone:error_prone_core to v2.26.1 ([#1363](https://togithub.com/googleapis/java-datastore/issues/1363)) ([05fe5bc](https://togithub.com/googleapis/java-datastore/commit/05fe5bccf97dae92c00f2eead98424771cb321fd))
* Update dependency com.google.guava:guava-testlib to v33.1.0-jre ([#1368](https://togithub.com/googleapis/java-datastore/issues/1368)) ([0195345](https://togithub.com/googleapis/java-datastore/commit/0195345630f404bbcaf1601ded8a8e2011fc3e6e))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 16 ++++++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f9f09022279..66f67d374cf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.18.6](https://github.com/googleapis/java-datastore/compare/v2.18.5...v2.18.6) (2024-03-18)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.37.0 ([#1355](https://github.com/googleapis/java-datastore/issues/1355)) ([bcc5668](https://github.com/googleapis/java-datastore/commit/bcc5668039d4dd2055e9666a65fcda3984fc33b5))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.28.0 ([#1372](https://github.com/googleapis/java-datastore/issues/1372)) ([09db2a7](https://github.com/googleapis/java-datastore/commit/09db2a75fa714a909bc6fa9b43a9213ae6467c84))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.28.1 ([#1373](https://github.com/googleapis/java-datastore/issues/1373)) ([c6e63e5](https://github.com/googleapis/java-datastore/commit/c6e63e5f876fdda953935d09f0536a90a98a812c))
+* Update dependency com.google.errorprone:error_prone_core to v2.26.0 ([#1361](https://github.com/googleapis/java-datastore/issues/1361)) ([9442766](https://github.com/googleapis/java-datastore/commit/9442766ad61b0c1001d36ecfc0668308838b4a83))
+* Update dependency com.google.errorprone:error_prone_core to v2.26.1 ([#1363](https://github.com/googleapis/java-datastore/issues/1363)) ([05fe5bc](https://github.com/googleapis/java-datastore/commit/05fe5bccf97dae92c00f2eead98424771cb321fd))
+* Update dependency com.google.guava:guava-testlib to v33.1.0-jre ([#1368](https://github.com/googleapis/java-datastore/issues/1368)) ([0195345](https://github.com/googleapis/java-datastore/commit/0195345630f404bbcaf1601ded8a8e2011fc3e6e))
+
 ## [2.18.5](https://github.com/googleapis/java-datastore/compare/v2.18.4...v2.18.5) (2024-03-04)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 796aa21dce66..4de2b7e8a2a7 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.18.6-SNAPSHOT
+  2.18.6
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6-SNAPSHOT
+    2.18.6
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6a174528d8c8..d1e7544da1d2 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.18.6-SNAPSHOT
+  2.18.6
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.6-SNAPSHOT
+        2.18.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.6-SNAPSHOT
+        2.18.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.6-SNAPSHOT
+        0.109.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.6-SNAPSHOT
+        2.18.6
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index acd48eb7f14c..c91330075888 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.6-SNAPSHOT
+  2.18.6
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6-SNAPSHOT
+    2.18.6
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f903b6eaf4c0..c47481cfe4b4 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.18.6-SNAPSHOT
+  2.18.6
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6-SNAPSHOT
+    2.18.6
   
   
     
diff --git a/pom.xml b/pom.xml
index 00a3513aa91e..9591c538779e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.6-SNAPSHOT
+  2.18.6
   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.18.6-SNAPSHOT
+        2.18.6
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.6-SNAPSHOT
+        2.18.6
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.6-SNAPSHOT
+        2.18.6
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.6-SNAPSHOT
+        0.109.6
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.6-SNAPSHOT
+        2.18.6
         
           
             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 0399f93ee0e3..25b20dd5e9b2 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.18.6-SNAPSHOT
+  2.18.6
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6-SNAPSHOT
+    2.18.6
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a49289f2ec2d..2a925de99a23 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.109.6-SNAPSHOT
+  0.109.6
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6-SNAPSHOT
+    2.18.6
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2511ec0e9639..c0152c055eb8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.6-SNAPSHOT
+      2.18.6
     
     
 
diff --git a/versions.txt b/versions.txt
index 95b465a2607b..b8c9f62f9ec8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.5:2.18.6-SNAPSHOT
-google-cloud-datastore-bom:2.18.5:2.18.6-SNAPSHOT
-proto-google-cloud-datastore-v1:0.109.5:0.109.6-SNAPSHOT
-datastore-v1-proto-client:2.18.5:2.18.6-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.18.5:2.18.6-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.18.5:2.18.6-SNAPSHOT
+google-cloud-datastore:2.18.6:2.18.6
+google-cloud-datastore-bom:2.18.6:2.18.6
+proto-google-cloud-datastore-v1:0.109.6:0.109.6
+datastore-v1-proto-client:2.18.6:2.18.6
+proto-google-cloud-datastore-admin-v1:2.18.6:2.18.6
+grpc-google-cloud-datastore-admin-v1:2.18.6:2.18.6

From 73e633c21a998605a497bc0c3175dd2733c3edeb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 20:30:25 +0000
Subject: [PATCH 1346/1784] chore(main): release 2.18.7-SNAPSHOT (#1376)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4de2b7e8a2a7..2f788d15b235 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.18.6
+  2.18.7-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6
+    2.18.7-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d1e7544da1d2..06392bcca0e0 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.18.6
+  2.18.7-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.6
+        2.18.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.6
+        2.18.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.6
+        0.109.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.6
+        2.18.7-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c91330075888..cfecca80a156 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.6
+  2.18.7-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6
+    2.18.7-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index c47481cfe4b4..18010b4a6bb1 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.18.6
+  2.18.7-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6
+    2.18.7-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 9591c538779e..991da46b9529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.6
+  2.18.7-SNAPSHOT
   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.18.6
+        2.18.7-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.6
+        2.18.7-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.6
+        2.18.7-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.6
+        0.109.7-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.6
+        2.18.7-SNAPSHOT
         
           
             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 25b20dd5e9b2..fabb81e97793 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.18.6
+  2.18.7-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6
+    2.18.7-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2a925de99a23..6d23095c67e0 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.109.6
+  0.109.7-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.6
+    2.18.7-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c0152c055eb8..f3e4af3dec3c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.6
+      2.18.7-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index b8c9f62f9ec8..f68e65d28b20 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.6:2.18.6
-google-cloud-datastore-bom:2.18.6:2.18.6
-proto-google-cloud-datastore-v1:0.109.6:0.109.6
-datastore-v1-proto-client:2.18.6:2.18.6
-proto-google-cloud-datastore-admin-v1:2.18.6:2.18.6
-grpc-google-cloud-datastore-admin-v1:2.18.6:2.18.6
+google-cloud-datastore:2.18.6:2.18.7-SNAPSHOT
+google-cloud-datastore-bom:2.18.6:2.18.7-SNAPSHOT
+proto-google-cloud-datastore-v1:0.109.6:0.109.7-SNAPSHOT
+datastore-v1-proto-client:2.18.6:2.18.7-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.18.6:2.18.7-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.18.6:2.18.7-SNAPSHOT

From c47c108d2566b896d4f8deac2ab6bbbae95cfac5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 18 Mar 2024 23:50:16 +0100
Subject: [PATCH 1347/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.18.6 (#1377)
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.18.6

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 49ae68065b31..0d8b0c339f97 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.18.5
+  2.18.6
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.18.5'
+implementation 'com.google.cloud:google-cloud-datastore:2.18.6'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.5"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.6"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.5
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.6
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 58d7e4c34ccd..3074680dc538 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.18.5
+      2.18.6
     
     
 

From 4ae72d30a3c9887545e63a14c0c1e9082a2807b5 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 20 Mar 2024 15:25:21 -0400
Subject: [PATCH 1348/1784] chore: update dependabot.yml (#1380)

---
 .github/dependabot.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index daa58f7e3c53..3a7c9a454e7a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -29,5 +29,3 @@ updates:
       prefix: "deps"
     open-pull-requests-limit: 10
     target-branch: "V3-experimental"
-    labels:
-      - "V3 dependencies"

From 9818aeec24eb6da9d4726358b03bb6a5ca384f25 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:56:16 -0400
Subject: [PATCH 1349/1784] chore: update concepts test (#1382)

Fixes #1379
---
 .../google/cloud/datastore/it/ITDatastoreConceptsTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
index b8ebd277acba..7700657786af 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
@@ -566,7 +566,7 @@ public void testInequalityRange() {
   }
 
   @Test
-  public void testInequalityInvalid() {
+  public void testInequalityValid() {
     Query query =
         Query.newEntityQueryBuilder()
             .setKind(TASK_CONCEPTS)
@@ -574,7 +574,7 @@ public void testInequalityInvalid() {
                 CompositeFilter.and(
                     PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3)))
             .build();
-    assertInvalidQuery(query);
+    assertValidQuery(query);
   }
 
   @Test

From 2515ed6cf733df84069309a3055a21cdd65c9c90 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 25 Mar 2024 15:02:01 -0400
Subject: [PATCH 1350/1784] feat: implement query profile (#1365)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: implement query profile

* javadoc fixes

* add betaapi in a few more places

* add some extra tests

* add some more ITs

* add some more fine grained tests

* 🦉 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 
---
 .../clirr-ignored-differences.xml             |  56 +++++-
 .../cloud/datastore/AggregationResults.java   |  30 ++-
 .../com/google/cloud/datastore/Datastore.java |  53 +++++
 .../google/cloud/datastore/DatastoreImpl.java |  40 +++-
 .../cloud/datastore/DatastoreReader.java      |  13 ++
 .../com/google/cloud/datastore/Query.java     |   6 +
 .../google/cloud/datastore/QueryResults.java  |   8 +
 .../cloud/datastore/QueryResultsImpl.java     |  33 ++-
 .../google/cloud/datastore/ReadOption.java    |  23 ++-
 .../google/cloud/datastore/Transaction.java   |   7 +
 .../cloud/datastore/TransactionImpl.java      |  19 +-
 .../execution/AggregationQueryExecutor.java   |  15 +-
 .../datastore/execution/QueryExecutor.java    |   5 +-
 .../AggregationQueryRequestProtoPreparer.java |   4 +-
 .../AggregationQueryResponseTransformer.java  |   7 +-
 .../datastore/models/ExecutionStats.java      |  84 ++++++++
 .../datastore/models/ExplainMetrics.java      |  63 ++++++
 .../datastore/models/ExplainOptions.java      |  86 ++++++++
 .../cloud/datastore/models/PlanSummary.java   |  54 +++++
 .../AggregationQueryExecutorTest.java         |  10 +-
 ...regationQueryRequestProtoPreparerTest.java |  38 +++-
 ...gregationQueryResponseTransformerTest.java |  80 ++++++++
 .../cloud/datastore/it/ITDatastoreTest.java   | 188 +++++++++++++++++-
 .../datastore/models/ExecutionStatsTest.java  |  74 +++++++
 .../datastore/models/ExplainOptionsTest.java  |  60 ++++++
 .../datastore/models/PlanSummaryTest.java     |  63 ++++++
 26 files changed, 1071 insertions(+), 48 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java

diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
index 34395cc01fd3..1620fd7525d7 100644
--- a/google-cloud-datastore/clirr-ignored-differences.xml
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -1,16 +1,58 @@
 
 
 
-    
+    
     
-        com/google/cloud/datastore/ReadOption$QueryAndReadOptions
-        *
-        8001
+        com/google/cloud/datastore/Datastore
+        com.google.cloud.datastore.QueryResults run(com.google.cloud.datastore.Query, com.google.cloud.datastore.models.ExplainOptions, com.google.cloud.datastore.ReadOption[])
+        7012
     
     
-        com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer
-        *QueryAndReadOptions*
-        *QueryConfig*
+        com/google/cloud/datastore/Datastore
+        com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.models.ExplainOptions, com.google.cloud.datastore.ReadOption[])
+        7012
+    
+    
+        com/google/cloud/datastore/DatastoreReader
+         com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.models.ExplainOptions)
+        7012
+    
+    
+        com/google/cloud/datastore/QueryResults
+        java.util.Optional getExplainMetrics()
+        7012
+    
+    
+        com/google/cloud/datastore/Transaction
+        com.google.cloud.datastore.QueryResults run(com.google.cloud.datastore.Query, com.google.cloud.datastore.models.ExplainOptions)
+        7012
+    
+
+    
+    
+        com/google/cloud/datastore/ReadOption$QueryConfig
+        com.google.cloud.datastore.ReadOption$QueryConfig create(com.google.cloud.datastore.Query, java.util.List)
+        *com.google.datastore.v1.ExplainOptions*
         7005
     
+    
+        com/google/cloud/datastore/ReadOption$QueryConfig
+        com.google.cloud.datastore.ReadOption$QueryConfig create(com.google.cloud.datastore.Query)
+        7004
+    
+    
+        com/google/cloud/datastore/execution/AggregationQueryExecutor
+        com.google.cloud.datastore.AggregationResults execute(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.ReadOption[])
+        7004
+    
+    
+        com/google/cloud/datastore/execution/AggregationQueryExecutor
+        java.lang.Object execute(com.google.cloud.datastore.Query, com.google.cloud.datastore.ReadOption[])
+        7004
+    
+    
+        com/google/cloud/datastore/execution/QueryExecutor
+        java.lang.Object execute(com.google.cloud.datastore.Query, com.google.cloud.datastore.ReadOption[])
+        7004
+    
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
index d85e8f8ae82b..8e40ab8b765c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
@@ -17,11 +17,14 @@
 
 import static com.google.api.client.util.Preconditions.checkNotNull;
 
+import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.cloud.Timestamp;
+import com.google.cloud.datastore.models.ExplainMetrics;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * The result of an {@link AggregationQuery} query submission. Contains a List<{@link
@@ -34,11 +37,22 @@ public class AggregationResults implements Iterable {
   private final List aggregationResults;
   private final Timestamp readTime;
 
-  public AggregationResults(List aggregationResults, Timestamp readTime) {
+  private final ExplainMetrics explainMetrics;
+
+  @BetaApi
+  public AggregationResults(
+      List aggregationResults,
+      Timestamp readTime,
+      ExplainMetrics explainMetrics) {
     checkNotNull(aggregationResults, "Aggregation results cannot be null");
     checkNotNull(readTime, "readTime cannot be null");
     this.aggregationResults = aggregationResults;
     this.readTime = readTime;
+    this.explainMetrics = explainMetrics;
+  }
+
+  public AggregationResults(List aggregationResults, Timestamp readTime) {
+    this(aggregationResults, readTime, null);
   }
 
   /** Returns {@link Iterator} for underlying List<{@link AggregationResult}>. */
@@ -51,6 +65,14 @@ public int size() {
     return this.aggregationResults.size();
   }
 
+  /**
+   * Returns {@code ExplainMetrics} if {@code ExplainOptions} were enabled. Otherwise, returns null.
+   */
+  @BetaApi
+  public Optional getExplainMetrics() {
+    return Optional.ofNullable(this.explainMetrics);
+  }
+
   @InternalApi
   public AggregationResult get(int index) {
     return this.aggregationResults.get(index);
@@ -70,11 +92,13 @@ public boolean equals(Object o) {
       return false;
     }
     AggregationResults that = (AggregationResults) o;
-    return Objects.equals(aggregationResults, that.aggregationResults);
+    return Objects.equals(aggregationResults, that.aggregationResults)
+        && Objects.equals(readTime, that.readTime)
+        && Objects.equals(explainMetrics, that.explainMetrics);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(aggregationResults);
+    return Objects.hash(aggregationResults, readTime, explainMetrics);
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index d78bea9a2440..5bd8384a35d4 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -16,7 +16,9 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import com.google.cloud.Service;
+import com.google.cloud.datastore.models.ExplainOptions;
 import com.google.datastore.v1.TransactionOptions;
 import java.util.Iterator;
 import java.util.List;
@@ -462,6 +464,28 @@ interface TransactionCallable {
    */
    QueryResults run(Query query, ReadOption... options);
 
+  /**
+   * Submits a {@link Query} with specified {@link com.google.cloud.datastore.models.ExplainOptions}
+   * and returns its result. {@link ReadOption}s can be specified if desired.
+   *
+   * 
    Example of running a query to find all entities of one kind.
+   *
+   * 
    {@code
+   * String kind = "my_kind";
+   * StructuredQuery query = Query.newEntityQueryBuilder()
+   *     .setKind(kind)
+   *     .build();
+   * QueryResults results = datastore.run(query, ExplainOptions.newBuilder().setAnalyze(true).build());
+   * }
    
+   *
+   * @throws DatastoreException upon failure
+   */
+  @BetaApi
+  default  QueryResults run(
+      Query query, ExplainOptions explainOptions, ReadOption... options) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
   /**
    * Submits a {@link AggregationQuery} and returns {@link AggregationResults}. {@link ReadOption}s
    * can be specified if desired.
@@ -508,4 +532,33 @@ interface TransactionCallable {
   default AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
     throw new UnsupportedOperationException("Not implemented.");
   }
+
+  /**
+   * Submits a {@link AggregationQuery} with specified {@link
+   * com.google.cloud.datastore.models.ExplainOptions} and returns {@link AggregationResults}.
+   * {@link ReadOption}s can be specified if desired.
+   *
+   * 
    Example of running an {@link AggregationQuery} to find the count of entities of one kind.
+   *
+   * 
    {@link StructuredQuery} example:
+   *
+   * 
    {@code
+   * EntityQuery selectAllQuery = Query.newEntityQueryBuilder()
+   *    .setKind("Task")
+   *    .build();
+   * AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder()
+   *    .addAggregation(count().as("total_count"))
+   *    .over(selectAllQuery)
+   *    .build();
+   * AggregationResults aggregationResults = datastore.runAggregation(aggregationQuery, ExplainOptions.newBuilder().setAnalyze(true).build());
+   * }
    
+   *
+   * @throws DatastoreException upon failure
+   * @return {@link AggregationResults}
+   */
+  @BetaApi
+  default AggregationResults runAggregation(
+      AggregationQuery query, ExplainOptions explainOptions, ReadOption... options) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
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 a1b337c056ec..a3bfb37966b1 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
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.BaseService;
 import com.google.cloud.ExceptionHandler;
@@ -30,6 +31,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
+import com.google.datastore.v1.ExplainOptions;
 import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.ReserveIdsRequest;
 import com.google.datastore.v1.TransactionOptions;
@@ -182,28 +184,54 @@ public  T runInTransaction(
 
   @Override
   public  QueryResults run(Query query) {
-    return run(Optional.empty(), query);
+    return run(Optional.empty(), query, null);
   }
 
   @Override
   public  QueryResults run(Query query, ReadOption... options) {
-    return run(toReadOptionsPb(options), query);
+    return run(toReadOptionsPb(options), query, null);
+  }
+
+  @Override
+  @BetaApi
+  public  QueryResults run(
+      Query query,
+      com.google.cloud.datastore.models.ExplainOptions explainOptions,
+      ReadOption... options) {
+    return run(toReadOptionsPb(options), query, explainOptions.toPb());
   }
 
   @SuppressWarnings("unchecked")
-   QueryResults run(Optional readOptionsPb, Query query) {
+   QueryResults run(
+      Optional readOptionsPb, Query query, ExplainOptions explainOptions) {
     return new QueryResultsImpl(
-        this, readOptionsPb, (RecordQuery) query, query.getNamespace());
+        this, readOptionsPb, (RecordQuery) query, query.getNamespace(), explainOptions);
   }
 
   @Override
   public AggregationResults runAggregation(AggregationQuery query) {
-    return aggregationQueryExecutor.execute(query);
+    return aggregationQueryExecutor.execute(query, null);
   }
 
   @Override
   public AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
-    return aggregationQueryExecutor.execute(query, options);
+    return aggregationQueryExecutor.execute(query, null, options);
+  }
+
+  @Override
+  @BetaApi
+  public AggregationResults runAggregation(
+      AggregationQuery query, com.google.cloud.datastore.models.ExplainOptions explainOptions) {
+    return aggregationQueryExecutor.execute(query, explainOptions);
+  }
+
+  @Override
+  @BetaApi
+  public AggregationResults runAggregation(
+      AggregationQuery query,
+      com.google.cloud.datastore.models.ExplainOptions explainOptions,
+      ReadOption... options) {
+    return aggregationQueryExecutor.execute(query, explainOptions, options);
   }
 
   com.google.datastore.v1.RunQueryResponse runQuery(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
index 2a3071f3c5c8..8aef7f5c0360 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
@@ -16,6 +16,8 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
+import com.google.cloud.datastore.models.ExplainOptions;
 import java.util.Iterator;
 import java.util.List;
 
@@ -62,4 +64,15 @@ public interface DatastoreReader {
   default AggregationResults runAggregation(AggregationQuery query) {
     throw new UnsupportedOperationException("Not implemented.");
   }
+
+  /**
+   * Submits a {@link AggregationQuery} with a specified {@link
+   * com.google.cloud.datastore.models.ExplainOptions} and returns {@link AggregationResults}.
+   *
+   * @throws DatastoreException upon failure
+   */
+  @BetaApi
+  default AggregationResults runAggregation(AggregationQuery query, ExplainOptions explainOptions) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
index 89b8d8807b57..883051972d93 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.InternalApi;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.Maps;
@@ -117,6 +118,11 @@ public Class resultClass() {
       return resultClass;
     }
 
+    @InternalApi
+    public com.google.datastore.v1.EntityResult.ResultType getQueryType() {
+      return this.queryType;
+    }
+
     @Override
     public int hashCode() {
       return resultClass.hashCode();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
index 3f73824dcdbc..50433a6a95ea 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
@@ -16,8 +16,11 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
+import com.google.cloud.datastore.models.ExplainMetrics;
 import com.google.datastore.v1.QueryResultBatch;
 import java.util.Iterator;
+import java.util.Optional;
 
 /**
  * The result of a Google Cloud Datastore query submission. When the result is not typed it is
@@ -70,4 +73,9 @@ public interface QueryResults extends Iterator {
 
   /** Returns MoreResults state of the query after the current batch. */
   QueryResultBatch.MoreResultsType getMoreResults();
+
+  @BetaApi
+  default Optional getExplainMetrics() {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
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 8fc731ace709..ad51129891b5 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
@@ -16,9 +16,12 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import com.google.cloud.datastore.Query.ResultType;
+import com.google.cloud.datastore.models.ExplainMetrics;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.AbstractIterator;
+import com.google.datastore.v1.ExplainOptions;
 import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
 import com.google.datastore.v1.ReadOptions;
 import com.google.protobuf.ByteString;
@@ -40,16 +43,20 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
   private Iterator entityResultPbIter;
   private ByteString cursor;
   private MoreResultsType moreResults;
+  private final ExplainOptions explainOptions;
+  private ExplainMetrics explainMetrics;
 
   QueryResultsImpl(
       DatastoreImpl datastore,
       Optional readOptionsPb,
       RecordQuery query,
-      String namespace) {
+      String namespace,
+      ExplainOptions explainOptions) {
     this.datastore = datastore;
     this.readOptionsPb = readOptionsPb;
     this.query = query;
     queryResultType = query.getType();
+    this.explainOptions = explainOptions;
     com.google.datastore.v1.PartitionId.Builder pbBuilder =
         com.google.datastore.v1.PartitionId.newBuilder();
     pbBuilder.setProjectId(datastore.getOptions().getProjectId());
@@ -75,6 +82,9 @@ private void sendRequest() {
     requestPb.setPartitionId(partitionIdPb);
     requestPb.setProjectId(datastore.getOptions().getProjectId());
     requestPb.setDatabaseId(datastore.getOptions().getDatabaseId());
+    if (explainOptions != null) {
+      requestPb.setExplainOptions(explainOptions);
+    }
     query.populatePb(requestPb);
     runQueryResponsePb = datastore.runQuery(requestPb.build());
     mostRecentQueryPb = requestPb.getQuery();
@@ -86,9 +96,20 @@ private void sendRequest() {
       // projection entity can represent all type of results
       actualResultType = ResultType.PROJECTION_ENTITY;
     }
+    boolean isExplain =
+        explainOptions != null
+            && actualResultType.getQueryType() == null
+            && !explainOptions.getAnalyze();
     Preconditions.checkState(
-        queryResultType.isAssignableFrom(actualResultType),
-        "Unexpected result type " + actualResultType + " vs " + queryResultType);
+        queryResultType.isAssignableFrom(actualResultType) || isExplain,
+        "Unexpected result type or explain options set "
+            + actualResultType
+            + " vs "
+            + queryResultType
+            + ", explain options = false");
+    if (runQueryResponsePb.hasExplainMetrics()) {
+      this.explainMetrics = new ExplainMetrics(runQueryResponsePb.getExplainMetrics());
+    }
   }
 
   @Override
@@ -127,4 +148,10 @@ public int getSkippedResults() {
   public MoreResultsType getMoreResults() {
     return moreResults;
   }
+
+  @Override
+  @BetaApi
+  public Optional getExplainMetrics() {
+    return Optional.ofNullable(this.explainMetrics);
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index c249e45a6a66..f7d6d82c76a2 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -20,6 +20,7 @@
 import com.google.api.core.InternalApi;
 import com.google.cloud.Timestamp;
 import com.google.common.collect.ImmutableMap;
+import com.google.datastore.v1.ExplainOptions;
 import com.google.protobuf.ByteString;
 import java.io.Serializable;
 import java.util.Collections;
@@ -146,32 +147,38 @@ public static class QueryConfig> {
 
     Q query;
     List readOptions;
+    ExplainOptions explainOptions;
 
-    private QueryConfig(Q query, List readOptions) {
+    private QueryConfig(Q query, ExplainOptions explainOptions, List readOptions) {
       this.query = query;
+      this.explainOptions = explainOptions;
       this.readOptions = readOptions;
     }
 
-    private QueryConfig(Q query) {
-      this.query = query;
-      this.readOptions = Collections.emptyList();
+    private QueryConfig(Q query, ExplainOptions explainOptions) {
+      this(query, explainOptions, Collections.emptyList());
     }
 
     public Q getQuery() {
       return query;
     }
 
+    public ExplainOptions getExplainOptions() {
+      return this.explainOptions;
+    }
+
     public List getReadOptions() {
       return readOptions;
     }
 
-    public static > QueryConfig create(Q query) {
-      return new QueryConfig<>(query);
+    public static > QueryConfig create(
+        Q query, ExplainOptions explainOptions) {
+      return new QueryConfig<>(query, explainOptions);
     }
 
     public static > QueryConfig create(
-        Q query, List readOptions) {
-      return new QueryConfig<>(query, readOptions);
+        Q query, ExplainOptions explainOptions, List readOptions) {
+      return new QueryConfig<>(query, explainOptions, readOptions);
     }
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
index 69c18d75c630..7b6a67a2d8b4 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
@@ -16,6 +16,8 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
+import com.google.cloud.datastore.models.ExplainOptions;
 import com.google.protobuf.ByteString;
 import java.util.Iterator;
 import java.util.List;
@@ -176,6 +178,11 @@ interface Response {
   @Override
    QueryResults run(Query query);
 
+  @BetaApi
+  default  QueryResults run(Query query, ExplainOptions explainOptions) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
   /**
    * Datastore add operation. This method will also allocate id for any entity with an incomplete
    * key. As opposed to {@link #add(FullEntity)} and {@link #add(FullEntity...)}, this method will
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 3b5e5e4e88af..f08a908ecb55 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
@@ -18,6 +18,8 @@
 
 import static com.google.cloud.datastore.ReadOption.transactionId;
 
+import com.google.api.core.BetaApi;
+import com.google.cloud.datastore.models.ExplainOptions;
 import com.google.common.collect.ImmutableList;
 import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.TransactionOptions;
@@ -102,7 +104,16 @@ public  QueryResults run(Query query) {
     validateActive();
     Optional readOptions =
         this.readOptionProtoPreparer.prepare(ImmutableList.of(transactionId(transactionId)));
-    return datastore.run(readOptions, query);
+    return datastore.run(readOptions, query, null);
+  }
+
+  @Override
+  @BetaApi
+  public  QueryResults run(Query query, ExplainOptions explainOptions) {
+    validateActive();
+    Optional readOptions =
+        this.readOptionProtoPreparer.prepare(ImmutableList.of(transactionId(transactionId)));
+    return datastore.run(readOptions, query, explainOptions.toPb());
   }
 
   @Override
@@ -110,6 +121,12 @@ public AggregationResults runAggregation(AggregationQuery query) {
     return datastore.runAggregation(query, transactionId(transactionId));
   }
 
+  @Override
+  @BetaApi
+  public AggregationResults runAggregation(AggregationQuery query, ExplainOptions explainOptions) {
+    return datastore.runAggregation(query, explainOptions, transactionId(transactionId));
+  }
+
   @Override
   public Transaction.Response commit() {
     validateActive();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
index 5a1fdd2c371d..bedcf34e4da1 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
@@ -23,6 +23,7 @@
 import com.google.cloud.datastore.ReadOption.QueryConfig;
 import com.google.cloud.datastore.execution.request.AggregationQueryRequestProtoPreparer;
 import com.google.cloud.datastore.execution.response.AggregationQueryResponseTransformer;
+import com.google.cloud.datastore.models.ExplainOptions;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.datastore.v1.RunAggregationQueryRequest;
 import com.google.datastore.v1.RunAggregationQueryResponse;
@@ -47,20 +48,24 @@ public AggregationQueryExecutor(DatastoreRpc datastoreRpc, DatastoreOptions data
   }
 
   @Override
-  public AggregationResults execute(AggregationQuery query, ReadOption... readOptions) {
+  public AggregationResults execute(
+      AggregationQuery query, ExplainOptions explainOptions, ReadOption... readOptions) {
     RunAggregationQueryRequest runAggregationQueryRequest =
-        getRunAggregationQueryRequest(query, readOptions);
+        getRunAggregationQueryRequest(
+            query, explainOptions == null ? null : explainOptions.toPb(), readOptions);
     RunAggregationQueryResponse runAggregationQueryResponse =
         this.datastoreRpc.runAggregationQuery(runAggregationQueryRequest);
     return this.responseTransformer.transform(runAggregationQueryResponse);
   }
 
   private RunAggregationQueryRequest getRunAggregationQueryRequest(
-      AggregationQuery query, ReadOption... readOptions) {
+      AggregationQuery query,
+      com.google.datastore.v1.ExplainOptions explainOptions,
+      ReadOption... readOptions) {
     QueryConfig queryConfig =
         readOptions == null
-            ? QueryConfig.create(query)
-            : QueryConfig.create(query, Arrays.asList(readOptions));
+            ? QueryConfig.create(query, explainOptions)
+            : QueryConfig.create(query, explainOptions, Arrays.asList(readOptions));
     return this.protoPreparer.prepare(queryConfig);
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
index 856c64a0201d..60c75e0f8f53 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
@@ -18,6 +18,7 @@
 import com.google.api.core.InternalApi;
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.ReadOption;
+import com.google.cloud.datastore.models.ExplainOptions;
 
 /**
  * An internal functional interface whose implementation has the responsibility to execute a {@link
@@ -34,7 +35,9 @@ public interface QueryExecutor, OUTPUT> {
 
   /**
    * @param query A {@link Query} to execute.
+   * @param explainOptions {@link com.google.cloud.datastore.models.ExplainOptions}s to be used when
+   *     executing {@link Query}.
    * @param readOptions Optional {@link ReadOption}s to be used when executing {@link Query}.
    */
-  OUTPUT execute(INPUT query, ReadOption... readOptions);
+  OUTPUT execute(INPUT query, ExplainOptions explainOptions, ReadOption... readOptions);
 }
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 475a47b58a1f..a89ebb11a18c 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
@@ -67,7 +67,9 @@ public RunAggregationQueryRequest prepare(QueryConfig queryCon
     } else {
       aggregationQueryRequestBuilder.setAggregationQuery(getAggregationQuery(aggregationQuery));
     }
-
+    if (queryConfig.getExplainOptions() != null) {
+      aggregationQueryRequestBuilder.setExplainOptions(queryConfig.getExplainOptions());
+    }
     Optional readOptionsPb = readOptionProtoPreparer.prepare(readOptions);
     readOptionsPb.ifPresent(aggregationQueryRequestBuilder::setReadOptions);
     return aggregationQueryRequestBuilder.build();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
index 8c99fcd41c18..71f7453cb884 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
@@ -19,6 +19,7 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.datastore.AggregationResult;
 import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.models.ExplainMetrics;
 import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.Value;
 import java.util.AbstractMap.SimpleEntry;
@@ -40,7 +41,11 @@ public AggregationResults transform(RunAggregationQueryResponse response) {
         response.getBatch().getAggregationResultsList().stream()
             .map(aggregationResult -> new AggregationResult(transformValues(aggregationResult)))
             .collect(Collectors.toCollection(LinkedList::new));
-    return new AggregationResults(aggregationResults, readTime);
+    ExplainMetrics explainMetrics = null;
+    if (response.hasExplainMetrics()) {
+      explainMetrics = new ExplainMetrics(response.getExplainMetrics());
+    }
+    return new AggregationResults(aggregationResults, readTime, explainMetrics);
   }
 
   private Map> transformValues(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
new file mode 100644
index 000000000000..52184a01ad36
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.cloud.datastore.models;
+
+import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
+import com.google.cloud.Structs;
+import com.google.common.base.Objects;
+import java.util.Map;
+import org.threeten.bp.Duration;
+
+/** Model class for {@link com.google.datastore.v1.ExecutionStats} */
+@BetaApi
+public class ExecutionStats {
+  private final long resultsReturned;
+  private final Duration executionDuration;
+  private final long readOperations;
+  private final Map debugStats;
+
+  @InternalApi
+  public ExecutionStats(com.google.datastore.v1.ExecutionStats proto) {
+    this.resultsReturned = proto.getResultsReturned();
+    this.executionDuration = Duration.ofNanos(proto.getExecutionDuration().getNanos());
+    this.readOperations = proto.getReadOperations();
+    this.debugStats = Structs.asMap(proto.getDebugStats());
+  }
+
+  /**
+   * Returns the total number of results returned, including documents, projections, aggregation
+   * results, keys.
+   */
+  public long getResultsReturned() {
+    return resultsReturned;
+  }
+
+  /** Returns the debugging statistics from the execution of the query. */
+  public Map getDebugStats() {
+    return debugStats;
+  }
+
+  /** Returns the total time to execute the query in the backend. */
+  public Duration getExecutionDuration() {
+    return executionDuration;
+  }
+
+  /** Returns the total billable read operations. */
+  public long getReadOperations() {
+    return readOperations;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof ExecutionStats)) {
+      return false;
+    }
+    ExecutionStats that = (ExecutionStats) o;
+
+    return Objects.equal(resultsReturned, that.resultsReturned)
+        && Objects.equal(executionDuration, that.executionDuration)
+        && Objects.equal(readOperations, that.readOperations)
+        && Objects.equal(debugStats, that.debugStats);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(resultsReturned, executionDuration, readOperations, debugStats);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java
new file mode 100644
index 000000000000..75fd94d6178d
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.cloud.datastore.models;
+
+import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
+import com.google.common.base.Objects;
+import java.util.Optional;
+
+/** Model class for {@link com.google.datastore.v1.ExplainMetrics}. */
+@BetaApi
+public class ExplainMetrics {
+  private final PlanSummary planSummary;
+  private ExecutionStats executionStats;
+
+  @InternalApi
+  public ExplainMetrics(com.google.datastore.v1.ExplainMetrics proto) {
+    if (proto.hasExecutionStats()) {
+      this.executionStats = new ExecutionStats(proto.getExecutionStats());
+    }
+    this.planSummary = new PlanSummary(proto.getPlanSummary());
+  }
+
+  /** Returns the planning phase information for the query. */
+  public PlanSummary getPlanSummary() {
+    return planSummary;
+  }
+
+  /**
+   * Returns the aggregated stats from the execution of the query, if present. Only present when
+   * 'analyze' is set to true for {@link ExplainOptions}.
+   */
+  public Optional getExecutionStats() {
+    return Optional.ofNullable(executionStats);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof ExplainMetrics)) return false;
+    ExplainMetrics that = (ExplainMetrics) o;
+    return Objects.equal(planSummary, that.planSummary)
+        && Objects.equal(executionStats, that.executionStats);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(planSummary, executionStats);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java
new file mode 100644
index 000000000000..f339a8510e26
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.cloud.datastore.models;
+
+import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
+
+/**
+ * Model class for {@link com.google.datastore.v1.ExplainOptions}. Contains the explain options for
+ * the query. Analyze is set to 'false' by default.
+ */
+@BetaApi
+public class ExplainOptions {
+  private final com.google.datastore.v1.ExplainOptions proto;
+
+  private ExplainOptions(com.google.datastore.v1.ExplainOptions proto) {
+    this.proto = proto;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  /**
+   * Returns whether analyze is set to true or false. When false (the default), the query will be
+   * planned, returning only metrics from the planning stages. When true, the query will be planned
+   * and executed, returning the full query results along with both planning and execution stage
+   * metrics.
+   */
+  public boolean shouldAnalyze() {
+    return proto.getAnalyze();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof ExplainOptions)) return false;
+    ExplainOptions that = (ExplainOptions) o;
+    return proto.equals(that.proto);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(proto);
+  }
+
+  @InternalApi
+  @VisibleForTesting
+  public com.google.datastore.v1.ExplainOptions toPb() {
+    return this.proto;
+  }
+
+  public static class Builder {
+    private boolean analyze = false;
+
+    /*
+     * Set 'analyze' to true or false for the explain options.
+     * When false (the default), the query will be planned, returning only metrics from the planning stages.
+     * When true, the query will be planned and executed, returning the full query results along with both planning and execution stage metrics.
+     */
+    public Builder setAnalyze(boolean analyze) {
+      this.analyze = analyze;
+      return this;
+    }
+
+    public ExplainOptions build() {
+      return new ExplainOptions(
+          com.google.datastore.v1.ExplainOptions.newBuilder().setAnalyze(this.analyze).build());
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java
new file mode 100644
index 000000000000..ea9e87bd9247
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 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
+ *
+ *       https://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.cloud.datastore.models;
+
+import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
+import com.google.cloud.Structs;
+import com.google.common.base.Objects;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/** Model class for {@link com.google.datastore.v1.PlanSummary} */
+@BetaApi
+public class PlanSummary {
+  private final List> indexesUsed;
+
+  @InternalApi
+  public PlanSummary(com.google.datastore.v1.PlanSummary proto) {
+    this.indexesUsed =
+        proto.getIndexesUsedList().stream().map(Structs::asMap).collect(Collectors.toList());
+  }
+
+  /** Returns the indexes selected for the query. */
+  public List> getIndexesUsed() {
+    return indexesUsed;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof PlanSummary)) return false;
+    PlanSummary planSummary = (PlanSummary) o;
+    return Objects.equal(indexesUsed, planSummary.indexesUsed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(indexesUsed);
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
index f9f23261dbc3..46752ba898f9 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
@@ -88,7 +88,7 @@ public void shouldExecuteAggregationQuery() {
 
     replay(mockRpc);
 
-    AggregationResults aggregationResults = queryExecutor.execute(aggregationQuery);
+    AggregationResults aggregationResults = queryExecutor.execute(aggregationQuery, null);
 
     verify(mockRpc);
     assertThat(aggregationResults)
@@ -101,7 +101,8 @@ public void shouldExecuteAggregationQuery() {
                     new AggregationResult(
                         ImmutableMap.of(
                             "count", LongValue.of(509), "property_2", LongValue.of(100)))),
-                Timestamp.fromProto(runAggregationQueryResponse.getBatch().getReadTime())));
+                Timestamp.fromProto(runAggregationQueryResponse.getBatch().getReadTime()),
+                null));
   }
 
   @Test
@@ -127,7 +128,7 @@ public void shouldExecuteAggregationQueryWithReadOptions() {
     replay(mockRpc);
 
     AggregationResults aggregationResults =
-        queryExecutor.execute(aggregationQuery, eventualConsistency());
+        queryExecutor.execute(aggregationQuery, null, eventualConsistency());
 
     verify(mockRpc);
     assertThat(aggregationResults)
@@ -140,7 +141,8 @@ public void shouldExecuteAggregationQueryWithReadOptions() {
                     new AggregationResult(
                         ImmutableMap.of(
                             "count", LongValue.of(509), "property_2", LongValue.of(100)))),
-                Timestamp.fromProto(runAggregationQueryResponse.getBatch().getReadTime())));
+                Timestamp.fromProto(runAggregationQueryResponse.getBatch().getReadTime()),
+                null));
   }
 
   private RunAggregationQueryResponse placeholderAggregationQueryResponse() {
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 0f22828d97fe..4aec8f7bba43 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
@@ -40,6 +40,7 @@
 import com.google.cloud.datastore.ReadOption;
 import com.google.cloud.datastore.ReadOption.QueryConfig;
 import com.google.common.collect.ImmutableMap;
+import com.google.datastore.v1.ExplainOptions;
 import com.google.datastore.v1.RunAggregationQueryRequest;
 import java.util.HashMap;
 import org.junit.Test;
@@ -91,13 +92,14 @@ public class AggregationQueryRequestProtoPreparerTest {
   @Test
   public void shouldPrepareAggregationQueryRequestWithGivenStructuredQuery() {
     RunAggregationQueryRequest runAggregationQueryRequest =
-        protoPreparer.prepare(QueryConfig.create(AGGREGATION_OVER_STRUCTURED_QUERY));
+        protoPreparer.prepare(QueryConfig.create(AGGREGATION_OVER_STRUCTURED_QUERY, null));
 
     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);
+    assertThat(runAggregationQueryRequest.hasExplainOptions()).isFalse();
 
     com.google.datastore.v1.AggregationQuery aggregationQueryProto =
         runAggregationQueryRequest.getAggregationQuery();
@@ -114,7 +116,7 @@ public void shouldPrepareAggregationQueryRequestWithGivenStructuredQuery() {
   @Test
   public void shouldPrepareAggregationQueryRequestWithGivenGqlQuery() {
     RunAggregationQueryRequest runAggregationQueryRequest =
-        protoPreparer.prepare(QueryConfig.create(AGGREGATION_OVER_GQL_QUERY));
+        protoPreparer.prepare(QueryConfig.create(AGGREGATION_OVER_GQL_QUERY, null));
 
     assertThat(runAggregationQueryRequest.getProjectId()).isEqualTo(PROJECT_ID);
     assertThat(runAggregationQueryRequest.getDatabaseId()).isEqualTo(DATABASE_ID);
@@ -122,6 +124,7 @@ public void shouldPrepareAggregationQueryRequestWithGivenGqlQuery() {
     assertThat(runAggregationQueryRequest.getPartitionId().getProjectId()).isEqualTo(PROJECT_ID);
     assertThat(runAggregationQueryRequest.getPartitionId().getDatabaseId()).isEqualTo(DATABASE_ID);
     assertThat(runAggregationQueryRequest.getPartitionId().getNamespaceId()).isEqualTo(NAMESPACE);
+    assertThat(runAggregationQueryRequest.hasExplainOptions()).isFalse();
 
     com.google.datastore.v1.GqlQuery gqlQueryProto = runAggregationQueryRequest.getGqlQuery();
 
@@ -172,17 +175,42 @@ public void shouldPrepareAggregationQueryWithNamespaceFromDatastoreOptions() {
         Query.newAggregationQueryBuilder().over(COMPLETED_TASK_GQL_QUERY).build();
 
     RunAggregationQueryRequest runAggregationQueryFromStructuredQuery =
-        protoPreparer.prepare(QueryConfig.create(structuredQueryWithoutNamespace));
+        protoPreparer.prepare(QueryConfig.create(structuredQueryWithoutNamespace, null));
     RunAggregationQueryRequest runAggregationQueryFromGqlQuery =
-        protoPreparer.prepare(QueryConfig.create(gqlQueryWithoutNamespace));
+        protoPreparer.prepare(QueryConfig.create(gqlQueryWithoutNamespace, null));
 
     assertThat(runAggregationQueryFromStructuredQuery.getPartitionId().getNamespaceId())
         .isEqualTo(NAMESPACE);
     assertThat(runAggregationQueryFromGqlQuery.getPartitionId().getNamespaceId())
         .isEqualTo(NAMESPACE);
+    assertThat(runAggregationQueryFromStructuredQuery.hasExplainOptions()).isEqualTo(false);
+  }
+
+  @Test
+  public void shouldPrepareAggregationQueryWithDifferentModes() {
+    AggregationQuery structuredQueryWithoutNamespace =
+        Query.newAggregationQueryBuilder()
+            .addAggregation(count().as("total"))
+            .over(COMPLETED_TASK_STRUCTURED_QUERY)
+            .build();
+
+    ExplainOptions explainOptions = ExplainOptions.newBuilder().build();
+    RunAggregationQueryRequest runAggregationQueryFromStructuredQuery =
+        protoPreparer.prepare(QueryConfig.create(structuredQueryWithoutNamespace, explainOptions));
+    assertThat(runAggregationQueryFromStructuredQuery.getPartitionId().getNamespaceId())
+        .isEqualTo(NAMESPACE);
+    assertThat(runAggregationQueryFromStructuredQuery.getExplainOptions())
+        .isEqualTo(explainOptions);
+
+    RunAggregationQueryRequest runAggregationQueryFromStructuredQuery2 =
+        protoPreparer.prepare(QueryConfig.create(structuredQueryWithoutNamespace, explainOptions));
+    assertThat(runAggregationQueryFromStructuredQuery2.getPartitionId().getNamespaceId())
+        .isEqualTo(NAMESPACE);
+    assertThat(runAggregationQueryFromStructuredQuery2.getExplainOptions())
+        .isEqualTo(explainOptions);
   }
 
   private RunAggregationQueryRequest prepareQuery(AggregationQuery query, ReadOption readOption) {
-    return protoPreparer.prepare(QueryConfig.create(query, singletonList(readOption)));
+    return protoPreparer.prepare(QueryConfig.create(query, null, singletonList(readOption)));
   }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
index 7ba57223fab2..9263543dbb4e 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
@@ -22,10 +22,15 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.datastore.AggregationResult;
 import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.models.ExplainMetrics;
 import com.google.common.collect.ImmutableMap;
 import com.google.datastore.v1.AggregationResultBatch;
+import com.google.datastore.v1.ExecutionStats;
+import com.google.datastore.v1.PlanSummary;
 import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.Value;
+import com.google.protobuf.Duration;
+import com.google.protobuf.Struct;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.HashMap;
 import java.util.Map;
@@ -76,6 +81,81 @@ public void shouldTransformAggregationQueryResponseWithIntValues() {
     assertThat(aggregationResults.get(0)).isEqualTo(new AggregationResult(toDomainValues(result1)));
     assertThat(aggregationResults.get(1)).isEqualTo(new AggregationResult(toDomainValues(result2)));
     assertThat(aggregationResults.getReadTime()).isEqualTo(readTime);
+    assertThat(aggregationResults.getExplainMetrics().isPresent()).isFalse();
+  }
+
+  @Test
+  public void shouldTransformAggregationQueryResponseWithIntValuesWithStats() {
+    Map result1 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", intValue(209),
+                "property_2", intValue(100)));
+
+    Map result2 =
+        new HashMap<>(
+            ImmutableMap.of(
+                "count", intValue(509),
+                "property_2", intValue((100))));
+    Timestamp readTime = Timestamp.now();
+
+    AggregationResultBatch resultBatch =
+        AggregationResultBatch.newBuilder()
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result1)
+                    .build())
+            .addAggregationResults(
+                com.google.datastore.v1.AggregationResult.newBuilder()
+                    .putAllAggregateProperties(result2)
+                    .build())
+            .setReadTime(readTime.toProto())
+            .build();
+
+    ExecutionStats executionStats =
+        ExecutionStats.newBuilder()
+            .setDebugStats(
+                Struct.newBuilder()
+                    .putFields(
+                        "field",
+                        com.google.protobuf.Value.newBuilder().setStringValue("val").build())
+                    .build())
+            .setExecutionDuration(Duration.newBuilder().setSeconds(1).build())
+            .setReadOperations(1)
+            .setResultsReturned(2)
+            .build();
+
+    PlanSummary planSummary =
+        PlanSummary.newBuilder()
+            .addIndexesUsed(
+                Struct.newBuilder()
+                    .putFields(
+                        "field2",
+                        com.google.protobuf.Value.newBuilder().setStringValue("val2").build())
+                    .build())
+            .build();
+
+    com.google.datastore.v1.ExplainMetrics explainMetrics =
+        com.google.datastore.v1.ExplainMetrics.newBuilder()
+            .setExecutionStats(executionStats)
+            .setPlanSummary(planSummary)
+            .build();
+
+    RunAggregationQueryResponse runAggregationQueryResponse =
+        RunAggregationQueryResponse.newBuilder()
+            .setBatch(resultBatch)
+            .setExplainMetrics(explainMetrics)
+            .build();
+
+    AggregationResults aggregationResults =
+        responseTransformer.transform(runAggregationQueryResponse);
+
+    assertThat(aggregationResults.size()).isEqualTo(2);
+    assertThat(aggregationResults.get(0)).isEqualTo(new AggregationResult(toDomainValues(result1)));
+    assertThat(aggregationResults.get(1)).isEqualTo(new AggregationResult(toDomainValues(result2)));
+    assertThat(aggregationResults.getReadTime()).isEqualTo(readTime);
+    assertThat(aggregationResults.getExplainMetrics().get())
+        .isEqualTo(new ExplainMetrics(explainMetrics));
   }
 
   @Test
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 7c68ffe325c7..35e1e72b8db6 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
@@ -31,6 +31,7 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.Tuple;
 import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResults;
 import com.google.cloud.datastore.Batch;
 import com.google.cloud.datastore.BooleanValue;
 import com.google.cloud.datastore.Cursor;
@@ -66,9 +67,15 @@
 import com.google.cloud.datastore.TimestampValue;
 import com.google.cloud.datastore.Transaction;
 import com.google.cloud.datastore.ValueType;
+import com.google.cloud.datastore.models.ExecutionStats;
+import com.google.cloud.datastore.models.ExplainMetrics;
+import com.google.cloud.datastore.models.ExplainOptions;
+import com.google.cloud.datastore.models.PlanSummary;
 import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Range;
+import com.google.common.truth.Truth;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.datastore.v1.TransactionOptions.ReadOnly;
 import java.util.ArrayList;
@@ -77,6 +84,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -91,6 +99,7 @@
 import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.threeten.bp.Duration;
 
 @RunWith(Parameterized.class)
 public class ITDatastoreTest {
@@ -358,6 +367,82 @@ public void orQuery() {
     assertFalse(results4.hasNext());
   }
 
+  @Test
+  public void testQueryProfile() {
+    Key key = Key.newBuilder(KEY1, KIND2, 2).build();
+    Entity entity3 =
+        Entity.newBuilder(ENTITY1)
+            .setKey(key)
+            .remove("str")
+            .set("name", "Dan")
+            .setNull("null")
+            .set("age", 19)
+            .build();
+    datastore.put(entity3);
+
+    // age == 19 || age == 20
+    CompositeFilter orFilter =
+        CompositeFilter.or(PropertyFilter.eq("age", 19), PropertyFilter.eq("age", 20));
+    StructuredQuery simpleOrQuery =
+        Query.newEntityQueryBuilder()
+            .setNamespace(NAMESPACE)
+            .setKind(KIND2)
+            .setFilter(orFilter)
+            .build();
+    QueryResults results =
+        datastore.run(simpleOrQuery, ExplainOptions.newBuilder().setAnalyze(true).build());
+    Truth.assertThat(results.hasNext()).isTrue();
+    Truth.assertThat(results.getExplainMetrics().isPresent()).isTrue();
+    assertPlanSummary(results.getExplainMetrics().get().getPlanSummary());
+    assertExecutionStats(results.getExplainMetrics().get().getExecutionStats().get(), 2, 2, "2");
+
+    QueryResults results2 =
+        datastore.run(simpleOrQuery, ExplainOptions.newBuilder().build());
+    Truth.assertThat(results2.hasNext()).isFalse();
+    assertPlanSummary(results2.getExplainMetrics().get().getPlanSummary());
+    Truth.assertThat(results2.getExplainMetrics().get().getExecutionStats().isPresent()).isFalse();
+
+    QueryResults results3 = datastore.run(simpleOrQuery);
+    Truth.assertThat(results3.hasNext()).isTrue();
+    Truth.assertThat(results3.getExplainMetrics().isPresent()).isFalse();
+
+    QueryResults results4 =
+        datastore.run(simpleOrQuery, ExplainOptions.newBuilder().setAnalyze(false).build());
+    Truth.assertThat(results4.hasNext()).isFalse();
+    assertPlanSummary(results4.getExplainMetrics().get().getPlanSummary());
+    Truth.assertThat(results4.getExplainMetrics().get().getExecutionStats().isPresent()).isFalse();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder().over(simpleOrQuery).addAggregation(count()).build();
+    AggregationResults resultsAggregation =
+        datastore.runAggregation(
+            aggregationQuery, ExplainOptions.newBuilder().setAnalyze(true).build());
+
+    Truth.assertThat(resultsAggregation.size() > 0).isTrue();
+
+    assertPlanSummary(resultsAggregation.getExplainMetrics().get().getPlanSummary());
+    assertExecutionStats(
+        resultsAggregation.getExplainMetrics().get().getExecutionStats().get(), 1, 1, "2");
+
+    AggregationQuery aggregationQuery2 =
+        Query.newAggregationQueryBuilder().over(simpleOrQuery).addAggregation(count()).build();
+    AggregationResults resultsAggregation2 =
+        datastore.runAggregation(aggregationQuery2, ExplainOptions.newBuilder().build());
+
+    Truth.assertThat(resultsAggregation2.size() > 0).isFalse();
+
+    assertPlanSummary(resultsAggregation2.getExplainMetrics().get().getPlanSummary());
+    Truth.assertThat(resultsAggregation2.getExplainMetrics().get().getExecutionStats().isPresent())
+        .isFalse();
+
+    AggregationQuery aggregationQuery3 =
+        Query.newAggregationQueryBuilder().over(simpleOrQuery).addAggregation(count()).build();
+    AggregationResults resultsAggregation3 = datastore.runAggregation(aggregationQuery3);
+
+    Truth.assertThat(resultsAggregation3.size() > 0).isTrue();
+    Truth.assertThat(resultsAggregation3.getExplainMetrics().isPresent()).isFalse();
+  }
+
   @Test
   public void testNewTransactionCommit() {
     Transaction transaction = datastore.newTransaction();
@@ -468,6 +553,100 @@ public void testTransactionWithQuery() throws Exception {
     assertThat(onlyOneTransactionIsSuccessful).isTrue();
   }
 
+  @Test
+  public void testTransactionExplainOptionsAnalyze() {
+    StructuredQuery query =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND2)
+            .setFilter(PropertyFilter.hasAncestor(KEY2))
+            .setNamespace(NAMESPACE)
+            .build();
+    Transaction baseTransaction = datastore.newTransaction();
+    QueryResults baseResults =
+        baseTransaction.run(query, ExplainOptions.newBuilder().setAnalyze(true).build());
+    assertTrue(baseResults.hasNext());
+    assertEquals(ENTITY2, baseResults.next());
+    assertFalse(baseResults.hasNext());
+
+    ExplainMetrics explainMetrics = baseResults.getExplainMetrics().get();
+    assertPlanSummary(explainMetrics.getPlanSummary());
+    assertExecutionStats(explainMetrics.getExecutionStats().get(), 1, 1, "1");
+
+    baseTransaction.add(ENTITY3);
+    baseTransaction.commit();
+    assertEquals(ENTITY3, datastore.get(KEY3));
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder().addAggregation(count()).over(query).build();
+
+    Transaction aggregationTransaction = datastore.newTransaction();
+    AggregationResults results =
+        aggregationTransaction.runAggregation(
+            aggregationQuery, ExplainOptions.newBuilder().setAnalyze(true).build());
+    assertTrue(results.size() > 0);
+
+    assertPlanSummary(results.getExplainMetrics().get().getPlanSummary());
+    assertExecutionStats(results.getExplainMetrics().get().getExecutionStats().get(), 1, 1, "1");
+    aggregationTransaction.commit();
+  }
+
+  @Test
+  public void testTransactionExplainOptions() {
+    StructuredQuery query =
+        Query.newEntityQueryBuilder()
+            .setKind(KIND2)
+            .setFilter(PropertyFilter.hasAncestor(KEY2))
+            .setNamespace(NAMESPACE)
+            .build();
+    Transaction baseTransaction = datastore.newTransaction();
+    QueryResults baseResults =
+        baseTransaction.run(query, ExplainOptions.newBuilder().build());
+    assertFalse(baseResults.hasNext());
+
+    ExplainMetrics explainMetrics = baseResults.getExplainMetrics().get();
+    assertPlanSummary(explainMetrics.getPlanSummary());
+    Truth.assertThat(explainMetrics.getExecutionStats().isPresent()).isFalse();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder().addAggregation(count()).over(query).build();
+
+    Transaction aggregationTransaction = datastore.newTransaction();
+    AggregationResults results =
+        aggregationTransaction.runAggregation(
+            aggregationQuery, ExplainOptions.newBuilder().build());
+    assertFalse(results.size() > 0);
+
+    assertPlanSummary(results.getExplainMetrics().get().getPlanSummary());
+    assertThat(results.getExplainMetrics().get().getExecutionStats().isPresent()).isFalse();
+  }
+
+  private void assertPlanSummary(PlanSummary planSummary) {
+    List> indexesUsed = planSummary.getIndexesUsed();
+    indexesUsed.forEach(
+        each -> Truth.assertThat(each.keySet()).containsAtLeast("properties", "query_scope"));
+  }
+
+  private void assertExecutionStats(
+      ExecutionStats executionStats,
+      long expectedReadOps,
+      long expectedResultsReturned,
+      String expectedIndexEntriesScanned) {
+    Map debugStats = executionStats.getDebugStats();
+    Truth.assertThat(debugStats.keySet())
+        .containsAtLeast("billing_details", "documents_scanned", "index_entries_scanned");
+    Truth.assertThat(debugStats.get("index_entries_scanned"))
+        .isEqualTo(expectedIndexEntriesScanned);
+
+    Duration executionDuration = executionStats.getExecutionDuration();
+    Truth.assertThat(executionDuration).isIn(Range.greaterThan(Duration.ofMillis(0)));
+
+    long readOperations = executionStats.getReadOperations();
+    Truth.assertThat(readOperations).isEqualTo(expectedReadOps);
+
+    long resultsReturned = executionStats.getResultsReturned();
+    Truth.assertThat(resultsReturned).isEqualTo(expectedResultsReturned);
+  }
+
   @Test
   public void testNewTransactionRollback() {
     Transaction transaction = datastore.newTransaction();
@@ -1646,10 +1825,13 @@ private void testCountAggregationReadTimeWith(Consumer
           getOnlyElement(datastore.runAggregation(countAggregationQuery)).getLong("total_count");
       assertThat(latestCount).isEqualTo(3L);
 
-      Long oldCount =
-          getOnlyElement(datastore.runAggregation(countAggregationQuery, ReadOption.readTime(now)))
-              .getLong("total_count");
+      ExplainOptions explainOptions = ExplainOptions.newBuilder().setAnalyze(true).build();
+      AggregationResults results =
+          datastore.runAggregation(countAggregationQuery, explainOptions, ReadOption.readTime(now));
+      Long oldCount = getOnlyElement(results).getLong("total_count");
       assertThat(oldCount).isEqualTo(2L);
+      assertPlanSummary(results.getExplainMetrics().get().getPlanSummary());
+      assertExecutionStats(results.getExplainMetrics().get().getExecutionStats().get(), 1, 1, "2");
     } finally {
       datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
     }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
new file mode 100644
index 000000000000..4706e3b86be1
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 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.cloud.datastore.models;
+
+import com.google.cloud.Structs;
+import com.google.common.testing.EqualsTester;
+import com.google.common.truth.Truth;
+import com.google.protobuf.Duration;
+import com.google.protobuf.Struct;
+import com.google.protobuf.Value;
+import org.junit.Test;
+
+public class ExecutionStatsTest {
+  private final Struct struct =
+      Struct.newBuilder()
+          .putFields("key", Value.newBuilder().setStringValue("val").build())
+          .build();
+  private final Duration duration = Duration.newBuilder().setSeconds(23).build();
+  private final com.google.datastore.v1.ExecutionStats proto =
+      com.google.datastore.v1.ExecutionStats.newBuilder()
+          .setDebugStats(struct)
+          .setExecutionDuration(duration)
+          .setReadOperations(2)
+          .setResultsReturned(3)
+          .build();
+  ExecutionStats executionStats = new ExecutionStats(proto);
+
+  @Test
+  public void testModel() {
+    Truth.assertThat(executionStats.getDebugStats()).isEqualTo(Structs.asMap(struct));
+    Truth.assertThat(executionStats.getExecutionDuration())
+        .isEqualTo(org.threeten.bp.Duration.ofNanos(duration.getNanos()));
+    Truth.assertThat(executionStats.getReadOperations()).isEqualTo(2);
+    Truth.assertThat(executionStats.getResultsReturned()).isEqualTo(3);
+  }
+
+  @Test
+  public void testEqualsAndHashcode() {
+    com.google.datastore.v1.ExecutionStats proto2 =
+        com.google.datastore.v1.ExecutionStats.newBuilder()
+            .setDebugStats(struct)
+            .setExecutionDuration(duration)
+            .setReadOperations(6)
+            .setResultsReturned(7)
+            .build();
+
+    ExecutionStats executionStats1 = new ExecutionStats(proto);
+    ExecutionStats executionStats2 = new ExecutionStats(proto2);
+    ExecutionStats executionStats3 = new ExecutionStats(proto2);
+
+    Truth.assertThat(executionStats1).isNotEqualTo(executionStats2);
+    Truth.assertThat(executionStats2).isEqualTo(executionStats3);
+
+    EqualsTester equalsTester = new EqualsTester();
+    equalsTester.addEqualityGroup(executionStats1, executionStats1).testEquals();
+
+    Truth.assertThat(executionStats1.hashCode()).isNotEqualTo(executionStats2.hashCode());
+    Truth.assertThat(executionStats2.hashCode()).isEqualTo(executionStats3.hashCode());
+    Truth.assertThat(executionStats1.hashCode()).isEqualTo(executionStats1.hashCode());
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java
new file mode 100644
index 000000000000..f8fb86abfc17
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2024 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.cloud.datastore.models;
+
+import com.google.common.testing.EqualsTester;
+import com.google.common.truth.Truth;
+import org.junit.Test;
+
+public class ExplainOptionsTest {
+  @Test
+  public void testModel() {
+    com.google.datastore.v1.ExplainOptions builtProto =
+        com.google.datastore.v1.ExplainOptions.newBuilder().setAnalyze(true).build();
+
+    com.google.datastore.v1.ExplainOptions defaultProto =
+        com.google.datastore.v1.ExplainOptions.newBuilder().build();
+
+    ExplainOptions explainOptionsAnalyzeTrue = ExplainOptions.newBuilder().setAnalyze(true).build();
+    ExplainOptions explainOptionsAnalyzeFalse =
+        ExplainOptions.newBuilder().setAnalyze(false).build();
+    ExplainOptions explainOptionsDefault = ExplainOptions.newBuilder().build();
+
+    Truth.assertThat(explainOptionsAnalyzeTrue.shouldAnalyze()).isTrue();
+    Truth.assertThat(explainOptionsAnalyzeTrue.toPb()).isEqualTo(builtProto);
+
+    Truth.assertThat(explainOptionsAnalyzeFalse.shouldAnalyze()).isFalse();
+    Truth.assertThat(explainOptionsAnalyzeFalse.toPb()).isEqualTo(defaultProto);
+
+    Truth.assertThat(explainOptionsDefault.shouldAnalyze()).isFalse();
+    Truth.assertThat(explainOptionsDefault.toPb()).isNotEqualTo(builtProto);
+    Truth.assertThat(explainOptionsDefault.toPb()).isEqualTo(defaultProto);
+    Truth.assertThat(explainOptionsDefault).isEqualTo(explainOptionsAnalyzeFalse);
+  }
+
+  @Test
+  public void testEqualsAndHashcode() {
+    ExplainOptions explainOptions = ExplainOptions.newBuilder().build();
+    ExplainOptions explainOptions2 = ExplainOptions.newBuilder().setAnalyze(true).build();
+
+    Truth.assertThat(explainOptions).isNotEqualTo(explainOptions2);
+    EqualsTester equalsTester = new EqualsTester();
+    equalsTester.addEqualityGroup(explainOptions, explainOptions).testEquals();
+
+    Truth.assertThat(explainOptions.hashCode()).isNotEqualTo(explainOptions2.hashCode());
+    Truth.assertThat(explainOptions.hashCode()).isEqualTo(explainOptions.hashCode());
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java
new file mode 100644
index 000000000000..fe8c0f0d6467
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 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.cloud.datastore.models;
+
+import com.google.cloud.Structs;
+import com.google.common.collect.Lists;
+import com.google.common.testing.EqualsTester;
+import com.google.common.truth.Truth;
+import com.google.protobuf.Struct;
+import com.google.protobuf.Value;
+import org.junit.Test;
+
+public class PlanSummaryTest {
+  private final Struct struct1 =
+      Struct.newBuilder()
+          .putFields("key", Value.newBuilder().setStringValue("val").build())
+          .build();
+  private final Struct struct2 =
+      Struct.newBuilder()
+          .putFields("key2", Value.newBuilder().setStringValue("val2").build())
+          .putFields("key3", Value.newBuilder().setStringValue("val3").build())
+          .build();
+  private final com.google.datastore.v1.PlanSummary proto =
+      com.google.datastore.v1.PlanSummary.newBuilder()
+          .addIndexesUsed(struct1)
+          .addIndexesUsed(struct2)
+          .build();
+  private final PlanSummary planSummary = new PlanSummary(proto);
+
+  @Test
+  public void testModel() {
+    Truth.assertThat(planSummary.getIndexesUsed())
+        .isEqualTo(Lists.newArrayList(Structs.asMap(struct1), Structs.asMap(struct2)));
+    Truth.assertThat(planSummary.getIndexesUsed().get(0).get("key")).isEqualTo("val");
+  }
+
+  @Test
+  public void testEqualsAndHashcode() {
+    com.google.datastore.v1.PlanSummary proto2 =
+        com.google.datastore.v1.PlanSummary.newBuilder().addIndexesUsed(struct1).build();
+    PlanSummary planSummary2 = new PlanSummary(proto2);
+    EqualsTester equalsTester = new EqualsTester();
+    equalsTester.addEqualityGroup(planSummary, planSummary).testEquals();
+
+    Truth.assertThat(planSummary).isNotEqualTo(planSummary2);
+
+    Truth.assertThat(planSummary.hashCode()).isEqualTo(planSummary.hashCode());
+    Truth.assertThat(planSummary.hashCode()).isNotEqualTo(planSummary2.hashCode());
+  }
+}

From 51a1cda3d76da3965b2e647cabf88d19b6b89beb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 11:50:17 -0400
Subject: [PATCH 1351/1784] chore(main): release 2.19.0 (#1384)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66f67d374cf1..b4ef8b87a213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.19.0](https://github.com/googleapis/java-datastore/compare/v2.18.6...v2.19.0) (2024-03-25)
+
+
+### Features
+
+* Implement query profile ([#1365](https://github.com/googleapis/java-datastore/issues/1365)) ([2515ed6](https://github.com/googleapis/java-datastore/commit/2515ed6cf733df84069309a3055a21cdd65c9c90))
+
 ## [2.18.6](https://github.com/googleapis/java-datastore/compare/v2.18.5...v2.18.6) (2024-03-18)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2f788d15b235..abbbfe8d2d08 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.18.7-SNAPSHOT
+  2.19.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.7-SNAPSHOT
+    2.19.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 06392bcca0e0..00944bc276a8 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.18.7-SNAPSHOT
+  2.19.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.18.7-SNAPSHOT
+        2.19.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.7-SNAPSHOT
+        2.19.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.7-SNAPSHOT
+        0.110.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.18.7-SNAPSHOT
+        2.19.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cfecca80a156..45fc2596a748 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.18.7-SNAPSHOT
+  2.19.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.7-SNAPSHOT
+    2.19.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 18010b4a6bb1..955bb91b7e07 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.18.7-SNAPSHOT
+  2.19.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.7-SNAPSHOT
+    2.19.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 991da46b9529..b7d272da933f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.18.7-SNAPSHOT
+  2.19.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.18.7-SNAPSHOT
+        2.19.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.18.7-SNAPSHOT
+        2.19.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.18.7-SNAPSHOT
+        2.19.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.109.7-SNAPSHOT
+        0.110.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.18.7-SNAPSHOT
+        2.19.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 fabb81e97793..a10ed0cf5f08 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.18.7-SNAPSHOT
+  2.19.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.7-SNAPSHOT
+    2.19.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6d23095c67e0..eabbad91b3eb 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.109.7-SNAPSHOT
+  0.110.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.18.7-SNAPSHOT
+    2.19.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f3e4af3dec3c..55a5a05133e3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.18.7-SNAPSHOT
+      2.19.0
     
     
 
diff --git a/versions.txt b/versions.txt
index f68e65d28b20..3557553b8cb1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.18.6:2.18.7-SNAPSHOT
-google-cloud-datastore-bom:2.18.6:2.18.7-SNAPSHOT
-proto-google-cloud-datastore-v1:0.109.6:0.109.7-SNAPSHOT
-datastore-v1-proto-client:2.18.6:2.18.7-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.18.6:2.18.7-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.18.6:2.18.7-SNAPSHOT
+google-cloud-datastore:2.19.0:2.19.0
+google-cloud-datastore-bom:2.19.0:2.19.0
+proto-google-cloud-datastore-v1:0.110.0:0.110.0
+datastore-v1-proto-client:2.19.0:2.19.0
+proto-google-cloud-datastore-admin-v1:2.19.0:2.19.0
+grpc-google-cloud-datastore-admin-v1:2.19.0:2.19.0

From fae2c4b719ee5fca8c2cd4b4e209b175df541919 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:34:16 +0000
Subject: [PATCH 1352/1784] chore(main): release 2.19.1-SNAPSHOT (#1386)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index abbbfe8d2d08..57e0e854987e 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.19.0
+  2.19.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.0
+    2.19.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 00944bc276a8..a5bb5f4e41e8 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.19.0
+  2.19.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.0
+        2.19.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.0
+        2.19.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.0
+        0.110.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.0
+        2.19.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 45fc2596a748..6ae9d9bfecf3 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.0
+  2.19.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.0
+    2.19.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 955bb91b7e07..d8de40fc02b7 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.19.0
+  2.19.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.0
+    2.19.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index b7d272da933f..2a1c4bb9fe9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.0
+  2.19.1-SNAPSHOT
   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.19.0
+        2.19.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.0
+        2.19.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.0
+        2.19.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.0
+        0.110.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.0
+        2.19.1-SNAPSHOT
         
           
             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 a10ed0cf5f08..2014eed3792b 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.19.0
+  2.19.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.0
+    2.19.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index eabbad91b3eb..98e0748c6717 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.110.0
+  0.110.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.0
+    2.19.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 55a5a05133e3..ad97c12601d1 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.0
+      2.19.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 3557553b8cb1..6333574c9a1c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.0:2.19.0
-google-cloud-datastore-bom:2.19.0:2.19.0
-proto-google-cloud-datastore-v1:0.110.0:0.110.0
-datastore-v1-proto-client:2.19.0:2.19.0
-proto-google-cloud-datastore-admin-v1:2.19.0:2.19.0
-grpc-google-cloud-datastore-admin-v1:2.19.0:2.19.0
+google-cloud-datastore:2.19.0:2.19.1-SNAPSHOT
+google-cloud-datastore-bom:2.19.0:2.19.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.110.0:0.110.1-SNAPSHOT
+datastore-v1-proto-client:2.19.0:2.19.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.19.0:2.19.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.19.0:2.19.1-SNAPSHOT

From 30a51f6691a1ea0fa0aa533edd861b4aeb6a6db6 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 26 Mar 2024 20:54:17 +0100
Subject: [PATCH 1353/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.19.0 (#1387)
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.19.0

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0d8b0c339f97..bafef07c8381 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.18.6
+  2.19.0
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.18.6'
+implementation 'com.google.cloud:google-cloud-datastore:2.19.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.6"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.0"
 ```
 
 
@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.6
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 3074680dc538..399d53610a3b 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.18.6
+      2.19.0
     
     
 

From 520ebd44eadc4476f758c266e7e2a3c0457af1b1 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki 
Date: Wed, 27 Mar 2024 12:22:16 -0400
Subject: [PATCH 1354/1784] ci: sample build in Cloud Build (#1381)

---
 .cloudbuild/samples_build.yaml                | 32 +++++++++++++++++++
 .../snippets/src/test/resources/index.yaml    |  6 +++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 .cloudbuild/samples_build.yaml

diff --git a/.cloudbuild/samples_build.yaml b/.cloudbuild/samples_build.yaml
new file mode 100644
index 000000000000..204a7b25481f
--- /dev/null
+++ b/.cloudbuild/samples_build.yaml
@@ -0,0 +1,32 @@
+steps:
+- name: gcr.io/cloud-devrel-public-resources/java8
+  entrypoint: ls
+  args: [
+    '-alt',
+  ]
+- name: gcr.io/cloud-devrel-public-resources/java8
+  entrypoint: curl
+  args: [
+    '--header',
+    'Metadata-Flavor: Google',
+    'http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email'
+  ]
+- name: gcr.io/cloud-devrel-public-resources/java8
+  entrypoint: pwd
+- name: gcr.io/cloud-devrel-public-resources/java8
+  entrypoint: bash
+  args: [
+    '.kokoro/build.sh'
+  ]
+  env:
+  - 'JOB_TYPE=samples'
+  - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-sample'
+  - 'KOKORO_GITHUB_PULL_REQUEST_NUMBER=$_PR_NUMBER'
+- name: gcr.io/cloud-devrel-public-resources/java8
+  entrypoint: echo
+  args: [
+    'Sample job succeeded',
+  ]
+timeout: 3600s
+options:
+  defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET
diff --git a/samples/snippets/src/test/resources/index.yaml b/samples/snippets/src/test/resources/index.yaml
index 50ab1ca0f68b..8652a0ee097f 100644
--- a/samples/snippets/src/test/resources/index.yaml
+++ b/samples/snippets/src/test/resources/index.yaml
@@ -12,10 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# one time index creation is required to run AggregationQuerySampleTestIT
+# one time index creation is required to run AggregationQuerySampleTestIT and ConceptsTest
 # see https://cloud.google.com/sdk/gcloud/reference/datastore/indexes/create for more details
 indexes:
 - kind: Sales
   properties:
   - name: customerId
   - name: amount
+- kind: Task
+  properties:
+  - name: tag
+  - name: tag

From 22456edfbd29b4d3def04c8f5e0d61389571ad55 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 27 Mar 2024 14:32:17 -0400
Subject: [PATCH 1355/1784] samples: query profile (#1385)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 README.md                                     |   4 +
 .../queryprofile/QueryProfileExplain.java     |  55 +++++++++
 .../QueryProfileExplainAggregation.java       |  64 +++++++++++
 .../QueryProfileExplainAnalyze.java           |  83 ++++++++++++++
 ...QueryProfileExplainAnalyzeAggregation.java |  88 +++++++++++++++
 .../AggregationQuerySampleTestIT.java         |  19 +---
 .../{ => filters}/OrFilterQuerySampleIT.java  |   3 +-
 .../queryprofile/QueryProfileSampleIT.java    | 104 ++++++++++++++++++
 8 files changed, 400 insertions(+), 20 deletions(-)
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java
 rename samples/snippets/src/test/java/com/example/datastore/{ => aggregation}/AggregationQuerySampleTestIT.java (81%)
 rename samples/snippets/src/test/java/com/example/datastore/{ => filters}/OrFilterQuerySampleIT.java (96%)
 create mode 100644 samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java

diff --git a/README.md b/README.md
index bafef07c8381..cf3c466a95d9 100644
--- a/README.md
+++ b/README.md
@@ -280,6 +280,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 | Sum Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) |
 | Sum Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) |
 | Create a union between two filters | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) |
+| Query Profile Explain | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) |
+| Query Profile Explain Aggregation | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) |
+| Query Profile Explain Analyze | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) |
+| Query Profile Explain Analyze Aggregation | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java) |
 | Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
 
diff --git a/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java
new file mode 100644
index 000000000000..8954589c5d0c
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 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.example.datastore.queryprofile;
+
+// [START datastore_query_explain_entity]
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.models.ExplainMetrics;
+import com.google.cloud.datastore.models.ExplainOptions;
+import com.google.cloud.datastore.models.PlanSummary;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class QueryProfileExplain {
+  public static void invoke() throws Exception {
+    // Instantiates a client
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // Build the query
+    Query query = Query.newEntityQueryBuilder().setKind("Task").build();
+
+    // Set the explain options to get back *only* the plan summary
+    QueryResults results = datastore.run(query, ExplainOptions.newBuilder().build());
+
+    // Get the explain metrics
+    Optional explainMetrics = results.getExplainMetrics();
+    if (!explainMetrics.isPresent()) {
+      throw new Exception("No explain metrics returned");
+    }
+    PlanSummary planSummary = explainMetrics.get().getPlanSummary();
+    List> indexesUsed = planSummary.getIndexesUsed();
+    System.out.println("----- Indexes Used -----");
+    indexesUsed.forEach(map -> map.forEach((key, val) -> System.out.println(key + ": " + val)));
+  }
+}
+// [END datastore_query_explain_entity]
diff --git a/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java
new file mode 100644
index 000000000000..8176cdc6bb88
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 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.example.datastore.queryprofile;
+
+// [START datastore_query_explain_aggregation]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.datastore.models.ExplainMetrics;
+import com.google.cloud.datastore.models.ExplainOptions;
+import com.google.cloud.datastore.models.PlanSummary;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class QueryProfileExplainAggregation {
+  public static void invoke() throws Exception {
+    // Instantiates a client
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // Build the query
+    StructuredQuery query = Query.newEntityQueryBuilder().setKind("Task").build();
+
+    // Build the aggregation query
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder().over(query).addAggregation(count()).build();
+
+    // Set the explain options to get back *only* the plan summary
+    AggregationResults results =
+        datastore.runAggregation(aggregationQuery, ExplainOptions.newBuilder().build());
+
+    // Get the explain metrics
+    Optional explainMetrics = results.getExplainMetrics();
+    if (!explainMetrics.isPresent()) {
+      throw new Exception("No explain metrics returned");
+    }
+    PlanSummary planSummary = explainMetrics.get().getPlanSummary();
+    List> indexesUsed = planSummary.getIndexesUsed();
+    System.out.println("----- Indexes Used -----");
+    indexesUsed.forEach(map -> map.forEach((key, val) -> System.out.println(key + ": " + val)));
+  }
+}
+// [END datastore_query_explain_aggregation]
diff --git a/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java
new file mode 100644
index 000000000000..7a1b34a623c8
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2024 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.example.datastore.queryprofile;
+
+// [START datastore_query_explain_analyze_entity]
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.models.ExecutionStats;
+import com.google.cloud.datastore.models.ExplainMetrics;
+import com.google.cloud.datastore.models.ExplainOptions;
+import com.google.cloud.datastore.models.PlanSummary;
+import java.util.List;
+import java.util.Map;
+
+public class QueryProfileExplainAnalyze {
+  public static void invoke() throws Exception {
+    // Instantiates a client
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // Build the query
+    Query query = Query.newEntityQueryBuilder().setKind("Task").build();
+
+    // Set explain options with analzye = true to get back the query stats, plan info, and query
+    // results
+    QueryResults results =
+        datastore.run(query, ExplainOptions.newBuilder().setAnalyze(true).build());
+
+    // Get the result set stats
+    if (!results.getExplainMetrics().isPresent()) {
+      throw new Exception("No explain metrics returned");
+    }
+    ExplainMetrics explainMetrics = results.getExplainMetrics().get();
+
+    // Get the execution stats
+    if (!explainMetrics.getExecutionStats().isPresent()) {
+      throw new Exception("No execution stats returned");
+    }
+
+    ExecutionStats executionStats = explainMetrics.getExecutionStats().get();
+    Map debugStats = executionStats.getDebugStats();
+    System.out.println("----- Debug Stats -----");
+    debugStats.forEach((key, val) -> System.out.println(key + ": " + val));
+    System.out.println("----------");
+
+    long resultsReturned = executionStats.getResultsReturned();
+    System.out.println("Results returned: " + resultsReturned);
+
+    // Get the plan summary
+    PlanSummary planSummary = explainMetrics.getPlanSummary();
+    List> indexesUsed = planSummary.getIndexesUsed();
+    System.out.println("----- Indexes Used -----");
+    indexesUsed.forEach(map -> map.forEach((key, val) -> System.out.println(key + ": " + val)));
+
+    if (!results.hasNext()) {
+      throw new Exception("query yielded no results");
+    }
+
+    // Get the query results
+    System.out.println("----- Query Results -----");
+    while (results.hasNext()) {
+      Entity entity = results.next();
+      System.out.printf("Entity: %s%n", entity);
+    }
+  }
+}
+// [END datastore_query_explain_analyze_entity]
diff --git a/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java
new file mode 100644
index 000000000000..5bbc8ccca656
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2024 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.example.datastore.queryprofile;
+
+// [START datastore_query_explain_analyze_aggregation]
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.datastore.models.ExecutionStats;
+import com.google.cloud.datastore.models.ExplainMetrics;
+import com.google.cloud.datastore.models.ExplainOptions;
+import com.google.cloud.datastore.models.PlanSummary;
+import com.google.common.collect.Iterables;
+import java.util.List;
+import java.util.Map;
+
+public class QueryProfileExplainAnalyzeAggregation {
+  public static void invoke() throws Exception {
+    // Instantiates a client
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // Build the query
+    StructuredQuery query = Query.newEntityQueryBuilder().setKind("Task").build();
+
+    // Build the aggregation query
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(query)
+            .addAggregation(count().as("countVal"))
+            .build();
+
+    // Set the explain options with analyze = true to get back the query stats, plan info, and
+    // aggregation results
+    AggregationResults results =
+        datastore.runAggregation(
+            aggregationQuery, ExplainOptions.newBuilder().setAnalyze(true).build());
+
+    if (!results.getExplainMetrics().isPresent()) {
+      throw new Exception("No explain metrics returned");
+    }
+    ExplainMetrics explainMetrics = results.getExplainMetrics().get();
+
+    if (!explainMetrics.getExecutionStats().isPresent()) {
+      throw new Exception("No execution stats returned");
+    }
+    ExecutionStats executionStats = explainMetrics.getExecutionStats().get();
+    Map debugStats = executionStats.getDebugStats();
+    System.out.println("----- Debug Stats -----");
+    debugStats.forEach((key, val) -> System.out.println(key + ": " + val));
+    System.out.println("----------");
+
+    long resultsReturned = executionStats.getResultsReturned();
+    System.out.println("Results returned: " + resultsReturned);
+
+    // Get the plan summary
+    PlanSummary planSummary = explainMetrics.getPlanSummary();
+    List> indexesUsed = planSummary.getIndexesUsed();
+    System.out.println("----- Indexes Used -----");
+    indexesUsed.forEach(map -> map.forEach((key, val) -> System.out.println(key + ": " + val)));
+
+    System.out.println("----- Aggregation Results -----");
+    AggregationResult result = Iterables.getOnlyElement(results);
+    System.out.println("Count: " + result.getLong("countVal"));
+  }
+}
+// [END datastore_query_explain_analyze_aggregation]
diff --git a/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java b/samples/snippets/src/test/java/com/example/datastore/aggregation/AggregationQuerySampleTestIT.java
similarity index 81%
rename from samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
rename to samples/snippets/src/test/java/com/example/datastore/aggregation/AggregationQuerySampleTestIT.java
index ab709f5753d9..65a5ef3f3150 100644
--- a/samples/snippets/src/test/java/com/example/datastore/AggregationQuerySampleTestIT.java
+++ b/samples/snippets/src/test/java/com/example/datastore/aggregation/AggregationQuerySampleTestIT.java
@@ -14,27 +14,10 @@
  * limitations under the License.
  */
 
-package com.example.datastore;
+package com.example.datastore.aggregation;
 
 import static org.junit.Assert.assertThrows;
 
-import com.example.datastore.aggregation.AvgAggregationOnKind;
-import com.example.datastore.aggregation.AvgAggregationWithLimit;
-import com.example.datastore.aggregation.AvgAggregationWithOrderBy;
-import com.example.datastore.aggregation.AvgAggregationWithPropertyFilter;
-import com.example.datastore.aggregation.CountAggregationInTransaction;
-import com.example.datastore.aggregation.CountAggregationOnKind;
-import com.example.datastore.aggregation.CountAggregationWithGqlQuery;
-import com.example.datastore.aggregation.CountAggregationWithLimit;
-import com.example.datastore.aggregation.CountAggregationWithOrderBy;
-import com.example.datastore.aggregation.CountAggregationWithPropertyFilter;
-import com.example.datastore.aggregation.CountAggregationWithStaleRead;
-import com.example.datastore.aggregation.MultipleAggregationsInGqlQuery;
-import com.example.datastore.aggregation.MultipleAggregationsInStructuredQuery;
-import com.example.datastore.aggregation.SumAggregationOnKind;
-import com.example.datastore.aggregation.SumAggregationWithLimit;
-import com.example.datastore.aggregation.SumAggregationWithOrderBy;
-import com.example.datastore.aggregation.SumAggregationWithPropertyFilter;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Key;
diff --git a/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java b/samples/snippets/src/test/java/com/example/datastore/filters/OrFilterQuerySampleIT.java
similarity index 96%
rename from samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java
rename to samples/snippets/src/test/java/com/example/datastore/filters/OrFilterQuerySampleIT.java
index 7e6cc8fa8612..a1b84cdfdad0 100644
--- a/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java
+++ b/samples/snippets/src/test/java/com/example/datastore/filters/OrFilterQuerySampleIT.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.example.datastore;
+package com.example.datastore.filters;
 
-import com.example.datastore.filters.OrFilterQuery;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Entity;
diff --git a/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
new file mode 100644
index 000000000000..bc8d84237931
--- /dev/null
+++ b/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2024 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.example.datastore.queryprofile;
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Key;
+import com.rule.SystemsOutRule;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+@SuppressWarnings("checkstyle:abbreviationaswordinname")
+public class QueryProfileSampleIT {
+
+  private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+  private final String fieldName = "description";
+
+  private Key taskKey1;
+  private Key taskKey2;
+
+  @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule();
+
+  @Before
+  public void setUp() {
+    taskKey1 = datastore.newKeyFactory().setKind("Task").newKey("sampleTask");
+    Entity task1 = Entity.newBuilder(taskKey1).set(fieldName, "Buy milk").build();
+
+    taskKey2 = datastore.newKeyFactory().setKind("Task").newKey("sampleTask2");
+    Entity task2 = Entity.newBuilder(taskKey2).set(fieldName, "Feed cats").build();
+
+    datastore.put(task1);
+    datastore.put(task2);
+  }
+
+  @After
+  public void tearDown() {
+    datastore.delete(taskKey1);
+    datastore.delete(taskKey2);
+  }
+
+  @Test
+  public void testQueryProfileExplain() throws Exception {
+    // Act
+    QueryProfileExplain.invoke();
+
+    // Assert
+    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("properties: (__name__ ASC)");
+  }
+
+  @Test
+  public void testQueryProfileExplainAggregation() throws Exception {
+    // Act
+    QueryProfileExplainAggregation.invoke();
+
+    // Assert
+    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("properties: (__name__ ASC)");
+  }
+
+  @Test
+  public void testQueryProfileExplainAnalyze() throws Exception {
+    // Act
+    QueryProfileExplainAnalyze.invoke();
+
+    // Assert
+    systemsOutRule.assertContains("documents_scanned:");
+    systemsOutRule.assertContains("index_entries_scanned:");
+    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("Entity: Entity{key=");
+  }
+
+  @Test
+  public void testQueryProfileExplainAnalyzeAggregation() throws Exception {
+    // Act
+    QueryProfileExplainAnalyzeAggregation.invoke();
+
+    // Assert
+    systemsOutRule.assertContains("index_entries_scanned:");
+    systemsOutRule.assertContains("documents_scanned:");
+    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("Count: 2");
+  }
+}

From c90c284f3e9998119a3f41486f72ac3a62f45bf2 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 14:36:55 -0400
Subject: [PATCH 1356/1784] chore: update ignore paths in renovate config
 (#1945) (#1388)

* chore: update ignore paths in renovate config (#1945)

Source-Link: https://github.com/googleapis/synthtool/commit/571a0916913e0aff0f66ca513514072893d534eb
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:81c3ec554428c8ff6c92f0d58668b7ef52265d053a82284c97a326745e786949

* change the version of unmanaged dependency check

---------

Co-authored-by: Owl Bot 
Co-authored-by: Joe Wang 
---
 .github/.OwlBot.lock.yaml                          |  4 ++--
 ...-check.yaml => unmanaged_dependency_check.yaml} |  2 +-
 renovate.json                                      | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)
 rename .github/workflows/{unmanaged-dependency-check.yaml => unmanaged_dependency_check.yaml} (87%)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index b9c5b09c7f5f..6167135e9534 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:1fb09a3eb66af09221da69087fd1b4d075bc7c79e508d0708f5dc0f842069da2
-# created: 2024-02-05T19:43:08.106031548Z
+  digest: sha256:81c3ec554428c8ff6c92f0d58668b7ef52265d053a82284c97a326745e786949
+# created: 2024-03-27T17:59:25.436353226Z
diff --git a/.github/workflows/unmanaged-dependency-check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
similarity index 87%
rename from .github/workflows/unmanaged-dependency-check.yaml
rename to .github/workflows/unmanaged_dependency_check.yaml
index 8261645b14fa..a5f241b35bb6 100644
--- a/.github/workflows/unmanaged-dependency-check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@unmanaged-dependencies-check-latest
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.27.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/renovate.json b/renovate.json
index 0751ef09cd66..7b29398067d7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -12,7 +12,10 @@
   ],
   "ignorePaths": [
     ".kokoro/requirements.txt",
-    ".github/workflows/**"
+    ".github/workflows/approve-readme.yaml",
+    ".github/workflows/ci.yaml",
+    ".github/workflows/renovate_config_check.yaml",
+    ".github/workflows/samples.yaml"
   ],
   "customManagers": [
     {
@@ -23,6 +26,15 @@
       "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""],
       "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
       "datasourceTemplate": "maven"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^.github/workflows/unmanaged_dependency_check.yaml$"
+      ],
+      "matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"],
+      "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
+      "datasourceTemplate": "maven"
     }
   ],
   "packageRules": [

From c1467efdffa012b1423e59cc6f6e20729c07d0f1 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 1 Apr 2024 15:59:33 +0200
Subject: [PATCH 1357/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.35.0 (#1392)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.35.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cf3c466a95d9..56e81e311b62 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.34.0
+      26.35.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.34.0')
+implementation platform('com.google.cloud:libraries-bom:26.35.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 5ab8f16bd32e..fb82e03e3cad 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.34.0
+        26.35.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 9640927ce46f..2be58480a5e0 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.34.0
+        26.35.0
         pom
         import
       

From 18c1ed580b9080f23494f125c2e3eace9ba47948 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 1 Apr 2024 15:59:55 +0200
Subject: [PATCH 1358/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.28.1 (#1389)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index a5f241b35bb6..db45ebd29fb0 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.27.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.28.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml

From efe6d991b436b86ae8f517b7c57cb3104152debf Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 4 Apr 2024 21:58:25 +0200
Subject: [PATCH 1359/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.36.0 (#1395)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.36.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 56e81e311b62..9e532aaf48a0 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.35.0
+      26.36.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.35.0')
+implementation platform('com.google.cloud:libraries-bom:26.36.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index fb82e03e3cad..af78d4d08b79 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.35.0
+        26.36.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 2be58480a5e0..f24381e7f555 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.35.0
+        26.36.0
         pom
         import
       

From 35be724af20098850e675e837695f878e3cee8eb Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 5 Apr 2024 20:19:58 +0200
Subject: [PATCH 1360/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.37.0 (#1398)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.37.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9e532aaf48a0..a21667770886 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.36.0
+      26.37.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.36.0')
+implementation platform('com.google.cloud:libraries-bom:26.37.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index af78d4d08b79..25aa152bae31 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.36.0
+        26.37.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f24381e7f555..d6607d7cd3b4 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.36.0
+        26.37.0
         pom
         import
       

From b8fe0d55f09510a807451f9ad9e6a864f4c2321b Mon Sep 17 00:00:00 2001
From: Alice <65933803+alicejli@users.noreply.github.com>
Date: Tue, 16 Apr 2024 12:20:04 -0400
Subject: [PATCH 1361/1784] chore: include recommended_package in
 repo-metadata.json (#1397)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: include recommended_package in repo-metadata.json

* 🦉 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 
---
 .repo-metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index 5978dadef35a..e6ebd09de190 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -15,5 +15,6 @@
   "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.",
   "excluded_dependencies": "grpc-google-cloud-datastore-v1",
   "extra_versioned_modules": "datastore-v1-proto-client",
-  "excluded_poms": "grpc-google-cloud-datastore-v1"
+  "excluded_poms": "grpc-google-cloud-datastore-v1",
+  "recommended_package": "com.google.cloud.datastore"
 }

From 2fce0f305ca3656cbeeab759a73be3ead35e9555 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 10:06:58 -0400
Subject: [PATCH 1362/1784] build: Update protobuf to 25.3 in WORKSPACE (#1399)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build: Update protobuf to 25.3 in WORKSPACE

PiperOrigin-RevId: 624989428

Source-Link: https://github.com/googleapis/googleapis/commit/caf600abae856335abbfcfa6d978bca051c2bc8c

Source-Link: https://github.com/googleapis/googleapis-gen/commit/cc580b8ea4c07f774093d0f8c4afedd2eae6e856
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2M1ODBiOGVhNGMwN2Y3NzQwOTNkMGY4YzRhZmVkZDJlYWU2ZTg1NiJ9

* 🦉 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 
---
 .../main/java/com/google/datastore/admin/v1/CommonMetadata.java | 2 +-
 .../com/google/datastore/admin/v1/CommonMetadataOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/CreateIndexRequest.java  | 2 +-
 .../google/datastore/admin/v1/CreateIndexRequestOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/DatastoreAdminProto.java | 2 +-
 .../datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java | 2 +-
 .../admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/DeleteIndexRequest.java  | 2 +-
 .../google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java  | 2 +-
 .../main/java/com/google/datastore/admin/v1/EntityFilter.java   | 2 +-
 .../com/google/datastore/admin/v1/EntityFilterOrBuilder.java    | 2 +-
 .../com/google/datastore/admin/v1/ExportEntitiesMetadata.java   | 2 +-
 .../datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java     | 2 +-
 .../com/google/datastore/admin/v1/ExportEntitiesRequest.java    | 2 +-
 .../datastore/admin/v1/ExportEntitiesRequestOrBuilder.java      | 2 +-
 .../com/google/datastore/admin/v1/ExportEntitiesResponse.java   | 2 +-
 .../datastore/admin/v1/ExportEntitiesResponseOrBuilder.java     | 2 +-
 .../java/com/google/datastore/admin/v1/GetIndexRequest.java     | 2 +-
 .../com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java | 2 +-
 .../com/google/datastore/admin/v1/ImportEntitiesMetadata.java   | 2 +-
 .../datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java     | 2 +-
 .../com/google/datastore/admin/v1/ImportEntitiesRequest.java    | 2 +-
 .../datastore/admin/v1/ImportEntitiesRequestOrBuilder.java      | 2 +-
 .../src/main/java/com/google/datastore/admin/v1/Index.java      | 2 +-
 .../com/google/datastore/admin/v1/IndexOperationMetadata.java   | 2 +-
 .../datastore/admin/v1/IndexOperationMetadataOrBuilder.java     | 2 +-
 .../main/java/com/google/datastore/admin/v1/IndexOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/admin/v1/IndexProto.java | 2 +-
 .../java/com/google/datastore/admin/v1/ListIndexesRequest.java  | 2 +-
 .../google/datastore/admin/v1/ListIndexesRequestOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/ListIndexesResponse.java | 2 +-
 .../google/datastore/admin/v1/ListIndexesResponseOrBuilder.java | 2 +-
 .../com/google/datastore/admin/v1/MigrationProgressEvent.java   | 2 +-
 .../datastore/admin/v1/MigrationProgressEventOrBuilder.java     | 2 +-
 .../main/java/com/google/datastore/admin/v1/MigrationProto.java | 2 +-
 .../main/java/com/google/datastore/admin/v1/MigrationState.java | 2 +-
 .../java/com/google/datastore/admin/v1/MigrationStateEvent.java | 2 +-
 .../google/datastore/admin/v1/MigrationStateEventOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/admin/v1/MigrationStep.java  | 2 +-
 .../main/java/com/google/datastore/admin/v1/OperationType.java  | 2 +-
 .../src/main/java/com/google/datastore/admin/v1/Progress.java   | 2 +-
 .../java/com/google/datastore/admin/v1/ProgressOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/AggregationQuery.java | 2 +-
 .../java/com/google/datastore/v1/AggregationQueryOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/v1/AggregationResult.java    | 2 +-
 .../java/com/google/datastore/v1/AggregationResultBatch.java    | 2 +-
 .../google/datastore/v1/AggregationResultBatchOrBuilder.java    | 2 +-
 .../com/google/datastore/v1/AggregationResultOrBuilder.java     | 2 +-
 .../java/com/google/datastore/v1/AggregationResultProto.java    | 2 +-
 .../main/java/com/google/datastore/v1/AllocateIdsRequest.java   | 2 +-
 .../com/google/datastore/v1/AllocateIdsRequestOrBuilder.java    | 2 +-
 .../main/java/com/google/datastore/v1/AllocateIdsResponse.java  | 2 +-
 .../com/google/datastore/v1/AllocateIdsResponseOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/ArrayValue.java       | 2 +-
 .../main/java/com/google/datastore/v1/ArrayValueOrBuilder.java  | 2 +-
 .../java/com/google/datastore/v1/BeginTransactionRequest.java   | 2 +-
 .../google/datastore/v1/BeginTransactionRequestOrBuilder.java   | 2 +-
 .../java/com/google/datastore/v1/BeginTransactionResponse.java  | 2 +-
 .../google/datastore/v1/BeginTransactionResponseOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/CommitRequest.java    | 2 +-
 .../java/com/google/datastore/v1/CommitRequestOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/CommitResponse.java   | 2 +-
 .../java/com/google/datastore/v1/CommitResponseOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/CompositeFilter.java  | 2 +-
 .../java/com/google/datastore/v1/CompositeFilterOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/DatastoreProto.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/Entity.java           | 2 +-
 .../src/main/java/com/google/datastore/v1/EntityOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/EntityProto.java      | 2 +-
 .../src/main/java/com/google/datastore/v1/EntityResult.java     | 2 +-
 .../java/com/google/datastore/v1/EntityResultOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/ExecutionStats.java   | 2 +-
 .../java/com/google/datastore/v1/ExecutionStatsOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/ExplainMetrics.java   | 2 +-
 .../java/com/google/datastore/v1/ExplainMetricsOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/ExplainOptions.java   | 2 +-
 .../java/com/google/datastore/v1/ExplainOptionsOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/Filter.java           | 2 +-
 .../src/main/java/com/google/datastore/v1/FilterOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/GqlQuery.java         | 2 +-
 .../main/java/com/google/datastore/v1/GqlQueryOrBuilder.java    | 2 +-
 .../main/java/com/google/datastore/v1/GqlQueryParameter.java    | 2 +-
 .../com/google/datastore/v1/GqlQueryParameterOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/Key.java              | 2 +-
 .../src/main/java/com/google/datastore/v1/KeyOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/KindExpression.java   | 2 +-
 .../java/com/google/datastore/v1/KindExpressionOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/LookupRequest.java    | 2 +-
 .../java/com/google/datastore/v1/LookupRequestOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/LookupResponse.java   | 2 +-
 .../java/com/google/datastore/v1/LookupResponseOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/Mutation.java         | 2 +-
 .../main/java/com/google/datastore/v1/MutationOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/MutationResult.java   | 2 +-
 .../java/com/google/datastore/v1/MutationResultOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/PartitionId.java      | 2 +-
 .../main/java/com/google/datastore/v1/PartitionIdOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/v1/PlanSummary.java      | 2 +-
 .../main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/v1/Projection.java       | 2 +-
 .../main/java/com/google/datastore/v1/ProjectionOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/PropertyFilter.java   | 2 +-
 .../java/com/google/datastore/v1/PropertyFilterOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/PropertyOrder.java    | 2 +-
 .../java/com/google/datastore/v1/PropertyOrderOrBuilder.java    | 2 +-
 .../main/java/com/google/datastore/v1/PropertyReference.java    | 2 +-
 .../com/google/datastore/v1/PropertyReferenceOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/Query.java            | 2 +-
 .../src/main/java/com/google/datastore/v1/QueryOrBuilder.java   | 2 +-
 .../main/java/com/google/datastore/v1/QueryProfileProto.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/QueryProto.java       | 2 +-
 .../src/main/java/com/google/datastore/v1/QueryResultBatch.java | 2 +-
 .../java/com/google/datastore/v1/QueryResultBatchOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/v1/ReadOptions.java      | 2 +-
 .../main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/v1/ReserveIdsRequest.java    | 2 +-
 .../com/google/datastore/v1/ReserveIdsRequestOrBuilder.java     | 2 +-
 .../main/java/com/google/datastore/v1/ReserveIdsResponse.java   | 2 +-
 .../com/google/datastore/v1/ReserveIdsResponseOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/RollbackRequest.java  | 2 +-
 .../java/com/google/datastore/v1/RollbackRequestOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/RollbackResponse.java | 2 +-
 .../java/com/google/datastore/v1/RollbackResponseOrBuilder.java | 2 +-
 .../com/google/datastore/v1/RunAggregationQueryRequest.java     | 2 +-
 .../datastore/v1/RunAggregationQueryRequestOrBuilder.java       | 2 +-
 .../com/google/datastore/v1/RunAggregationQueryResponse.java    | 2 +-
 .../datastore/v1/RunAggregationQueryResponseOrBuilder.java      | 2 +-
 .../src/main/java/com/google/datastore/v1/RunQueryRequest.java  | 2 +-
 .../java/com/google/datastore/v1/RunQueryRequestOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/RunQueryResponse.java | 2 +-
 .../java/com/google/datastore/v1/RunQueryResponseOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/v1/TransactionOptions.java   | 2 +-
 .../com/google/datastore/v1/TransactionOptionsOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/Value.java            | 2 +-
 .../src/main/java/com/google/datastore/v1/ValueOrBuilder.java   | 2 +-
 135 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 31a54735c9c4..2c078756dd1e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 95a104fb8d04..fa127dc7c5a2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface CommonMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 27bd6bfe9b4f..c86b9a967469 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index 1007e11a4415..537fb10b9d2f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface CreateIndexRequestOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index fddbd42d4cd7..9a4bb925fc7c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public final class DatastoreAdminProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index 82df90c5536c..a0695ffd0e98 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index 43d4d3a77f13..3bf3c03f825b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface DatastoreFirestoreMigrationMetadataOrBuilder
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 5ce02bced429..0b82ce7cc1a8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index 205068e374ae..9ac5d54116e2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface DeleteIndexRequestOrBuilder
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 f59d4eb1d4d6..a4c6617c3b9a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
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 5f8cbd8002a9..59fff0657c9a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface EntityFilterOrBuilder
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 cec4bb021e90..360a2c5c69e8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index fa762b066675..a65dedc9c6d7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesMetadataOrBuilder
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 079957ed2027..acad36a3eb2d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
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 4a10ea301e4c..01f5ec35df12 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesRequestOrBuilder
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 7210158fd01b..fd3350685a40 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index 74130ff361c1..77bf913fbd3f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesResponseOrBuilder
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 fc72dae63006..00fb79822ef3 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index f270727c220e..e33a2bd2e50e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface GetIndexRequestOrBuilder
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 f5cf31eb7bff..f89135ebdd28 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 0826f143bf5e..71c6928afdcf 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesMetadataOrBuilder
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 4e57a4050b92..596bbfa1ab27 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
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 fc13ff730fe5..92261658652b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesRequestOrBuilder
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 bffea1be63dd..7244182dcc51 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
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 310490d60430..96b2a12ac166 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index 8e722fb2e934..20348e0447f8 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface IndexOperationMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 5635d1b53e49..25373353b927 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface IndexOrBuilder
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 e78253a65b3c..9dbdecdf1edb 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public final class IndexProto {
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 2f1ad85fbc8d..5eb553c33823 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index d5891a45c87f..389feb19ab3f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesRequestOrBuilder
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 a0e99c1f81be..05da1f24d364 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index a27eed1d4bf5..e6b8e4376d7d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesResponseOrBuilder
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 e0f0b019689a..d69e36b88530 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
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 919c52c64cd8..68441b30b06b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface MigrationProgressEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 8e23fb66ef02..0c11104447d9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public final class MigrationProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index a0724c30e4f5..1cc5376774d1 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
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 4b1f857afbb2..54f20a287dc9 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 50fac8fc6e01..3920f71c731e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface MigrationStateEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index 043b3e112074..6810cfd53678 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index d4e88126bb3a..b8a5f327be15 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
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 a6d5bca29a27..347508413a4c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index 71b3c8ee8f4a..faa613564364 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.admin.v1;
 
 public interface ProgressOrBuilder
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 d9889d3b17a0..654257a1d322 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 82229632d6e2..bfb5e8448218 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface AggregationQueryOrBuilder
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 23f492681b5e..5a6afdcffbd6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 7a7e7252c1c8..040d282df4ef 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 29f022e1028e..5c1fb1daabb0 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface AggregationResultBatchOrBuilder
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 fdaa6706667e..4bcde0f9574d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface AggregationResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index d5d7fd339e2c..a924705f1dab 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public final class AggregationResultProto {
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 f39270856df1..e46e1931dcad 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 d08d9cc422c5..3f2db79c40ef 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface AllocateIdsRequestOrBuilder
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 dea70c4b54bc..c1ac60e391fc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index a0964c4e2f26..15aa0780ebb3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface AllocateIdsResponseOrBuilder
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 98c8b6bae04c..332ecd57f6f8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index efdb8239bce5..3f8acbe27066 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ArrayValueOrBuilder
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 5d0ba70b1e38..eee52d8fd800 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 eafc5c115dfe..322bbccc67e5 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface BeginTransactionRequestOrBuilder
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 21780f6f0023..c955d18fdbb8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index 5403b4a7f620..065ffa4bd77c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface BeginTransactionResponseOrBuilder
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 c5a4b95c71fa..3b865f5be765 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 7b6031d4398c..8da438a0159d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface CommitRequestOrBuilder
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 e8a9c0973a11..610c275ea9c6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index d036538063c4..41d4a006d4d5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface CommitResponseOrBuilder
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 9dc1f83c9867..500df91cc75e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 a41080ad3783..b9d87ece848c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface CompositeFilterOrBuilder
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 abd7b550830d..1b8753e3541d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public final class DatastoreProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 905877770903..a2dfad0cdc45 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 2d5265861ca1..cc8398b53755 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface EntityOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index ac5863737489..1239bbd98e5c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public final class EntityProto {
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 3d257de3cb21..717aa0b04249 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 9b2304ac991c..b8262fd26c4e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface EntityResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
index 0cb9dff31866..7530347c4925 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
index 5aa06692856f..b31b1227b98e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ExecutionStatsOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
index 9bb2c48725d7..423b58973036 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
index 632fc5ef958a..c6b995167af7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ExplainMetricsOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
index 78fa71cd5286..4e2f328724c3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
index d539b998d374..0248d51018aa 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ExplainOptionsOrBuilder
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 dfe3e1a0e8b6..b9b60db38987 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 9b4f55d8c113..b7a38fddf8da 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface FilterOrBuilder
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 a9622be98b0f..0c7eb2a61397 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 ada6911c53b2..7cedc2fd3275 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface GqlQueryOrBuilder
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 129399357633..866409cffc29 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 32ee089dbbfd..c4faa7547356 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface GqlQueryParameterOrBuilder
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 9c7e12a71b81..693c867fb59c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 af1608460f99..b88c3493e919 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface KeyOrBuilder
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 b60072ad45bd..fde068625df8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 4f1aa3de965d..b3c48590ccc3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface KindExpressionOrBuilder
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 82d3b26f7567..cd95d3a06546 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 3b14e083dda2..82fe24661ae8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface LookupRequestOrBuilder
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 4fea00b6024e..6b56e1025945 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 5b512da4598e..2935a1b62287 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface LookupResponseOrBuilder
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 2635a2dced75..91895d180e2b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 1e03e15f45fd..e833ed94207a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface MutationOrBuilder
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 76bdd3fbfc53..2e7abf0bde5c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index f9710672e4a5..bec5014e232e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface MutationResultOrBuilder
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 eb26431b317c..9116410f50aa 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index bf9647fc5ec6..d9dc8c271c04 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface PartitionIdOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
index 90df86457e4f..b68c700c33c2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
index a98db6c01c3c..634faded7947 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface PlanSummaryOrBuilder
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 3f3700183709..412dc13dd4db 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index f1f47ee349fa..c1a094d81b3f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ProjectionOrBuilder
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 f6ae2df5ad47..3eb9c2c1d44f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index 150834bbe619..c7c9d0577718 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface PropertyFilterOrBuilder
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 e54ef9722ab8..b42405c97061 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index abeeaf057767..3522ab951348 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface PropertyOrderOrBuilder
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 14727f1ab021..a7a4c304ede2 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index c9569ee253d4..7761b1421db7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface PropertyReferenceOrBuilder
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 dc1c53b07c01..a91fd271e142 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 72dd33ea48b0..5783fb2ead81 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface QueryOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
index 85089166af4d..1e34aa95a309 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public final class QueryProfileProto {
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 87e4f13681bc..d11d674d6047 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public final class QueryProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 58c823e895a6..a8ee6cc57eee 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index e4cbc74001b6..b17dc17aea9b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface QueryResultBatchOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 9d30b400c319..a64c56d36ad9 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 3a2db10b2608..dd02b663f976 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ReadOptionsOrBuilder
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 77d76536e30f..f33ed677ea6b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 cd19e6510d96..f430680f6a22 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ReserveIdsRequestOrBuilder
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 ad7cb55117a9..6fd381126096 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index d63243577ba1..f58f797f22c5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ReserveIdsResponseOrBuilder
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 47212e8146b2..ddc3bbdd611c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 05aa91ca47c2..1396a426ce59 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface RollbackRequestOrBuilder
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 211b042496ea..8aed6de56c89 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index ae97979278a4..13fbedee938d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface RollbackResponseOrBuilder
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 edcb31d5e7c0..aff95e007f41 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 23a5c4e62fcf..cde16b816af8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryRequestOrBuilder
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 9ddc2eb14958..9165ba575c78 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 423c26052048..dc90c61e6c8a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryResponseOrBuilder
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 cdbc7b6fa455..4420d5779fea 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 d94ba46d22ae..9e7a6f0b96e6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface RunQueryRequestOrBuilder
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 338b81c10602..03d5b4b8f1ba 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 3bcbb324e4da..e3c0dbf8daaf 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface RunQueryResponseOrBuilder
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 1eb755ea8799..52c53d486a10 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 c2f96150234e..5abaa12a4f73 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface TransactionOptionsOrBuilder
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 5ecb2df76876..1d63815b90bb 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 /**
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 1b472f4fc707..8e4021a585b4 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.datastore.v1;
 
 public interface ValueOrBuilder

From 9ef89ba2c5ad983bb6aac6ac5f5a7250a7e78e10 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:08:04 -0400
Subject: [PATCH 1363/1784] test: add DatastoreException assertions in
 integration tests (#1396)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test: add DatastoreException assertions in integration tests

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix nested assertions

---------

Co-authored-by: Owl Bot 
---
 .../cloud/datastore/it/ITDatastoreTest.java   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

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 35e1e72b8db6..fded9bc3d1ae 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
@@ -463,14 +463,14 @@ public void testNewTransactionCommit() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals("FAILED_PRECONDITION", expected.getReason());
+      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
     }
 
     try {
       transaction.rollback();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals("FAILED_PRECONDITION", expected.getReason());
+      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
     }
   }
 
@@ -666,7 +666,7 @@ public void testNewTransactionRollback() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals("FAILED_PRECONDITION", expected.getReason());
+      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
     }
 
     List list = datastore.fetch(KEY1, KEY2, KEY3);
@@ -718,7 +718,7 @@ public void testNewBatch() {
       batch.submit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals("FAILED_PRECONDITION", expected.getReason());
+      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
     }
 
     batch = datastore.newBatch();
@@ -1430,7 +1430,7 @@ public void testGetArrayNoDeferredResults() {
       entity3.getString("str");
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      // expected - no such property
+      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
     }
     assertFalse(result.hasNext());
     datastore.delete(ENTITY3.getKey());
@@ -1447,7 +1447,7 @@ public void testAddEntity() {
       datastore.add(ENTITY1);
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      // expected;
+      assertDatastoreException(expected, "ALREADY_EXISTS", 6);
     }
 
     List entities = datastore.add(ENTITY3, PARTIAL_ENTITY1, PARTIAL_ENTITY2);
@@ -1475,7 +1475,7 @@ public void testUpdate() {
       datastore.update(ENTITY3);
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      // expected;
+      assertDatastoreException(expected, "NOT_FOUND", 5);
     }
     datastore.add(ENTITY3);
     assertEquals(ENTITY3, datastore.get(ENTITY3.getKey()));
@@ -1566,7 +1566,7 @@ public Integer run(DatastoreReaderWriter transaction) {
       datastore.runInTransaction(callable2);
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(4, ((DatastoreException) expected.getCause()).getCode());
+      assertDatastoreException((DatastoreException) expected.getCause(), "DEADLINE_EXCEEDED", 4);
     }
   }
 
@@ -1620,7 +1620,7 @@ public Integer run(DatastoreReaderWriter transaction) {
       datastore.runInTransaction(callable2, readOnlyOptions);
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(3, ((DatastoreException) expected.getCause()).getCode());
+      assertDatastoreException((DatastoreException) expected.getCause(), "INVALID_ARGUMENT", 3);
     }
   }
 
@@ -1836,4 +1836,10 @@ private void testCountAggregationReadTimeWith(Consumer
       datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
     }
   }
+
+  private void assertDatastoreException(
+      DatastoreException expected, String reason, int statusCode) {
+    assertEquals(reason, expected.getReason());
+    assertEquals(statusCode, expected.getCode());
+  }
 }

From 29030460d2d287a9e656a881223d54a98dbb27fd Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:40:53 -0400
Subject: [PATCH 1364/1784] samples(test): ignore string case when comparing
 outputs (#1402)

---
 .../datastore/queryprofile/QueryProfileSampleIT.java      | 8 ++++----
 .../snippets/src/test/java/com/rule/SystemsOutRule.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
index bc8d84237931..6003b4a0f397 100644
--- a/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
+++ b/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
@@ -64,7 +64,7 @@ public void testQueryProfileExplain() throws Exception {
     QueryProfileExplain.invoke();
 
     // Assert
-    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("query_scope: Collection group");
     systemsOutRule.assertContains("properties: (__name__ ASC)");
   }
 
@@ -74,7 +74,7 @@ public void testQueryProfileExplainAggregation() throws Exception {
     QueryProfileExplainAggregation.invoke();
 
     // Assert
-    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("query_scope: Collection group");
     systemsOutRule.assertContains("properties: (__name__ ASC)");
   }
 
@@ -86,7 +86,7 @@ public void testQueryProfileExplainAnalyze() throws Exception {
     // Assert
     systemsOutRule.assertContains("documents_scanned:");
     systemsOutRule.assertContains("index_entries_scanned:");
-    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("query_scope: Collection group");
     systemsOutRule.assertContains("Entity: Entity{key=");
   }
 
@@ -98,7 +98,7 @@ public void testQueryProfileExplainAnalyzeAggregation() throws Exception {
     // Assert
     systemsOutRule.assertContains("index_entries_scanned:");
     systemsOutRule.assertContains("documents_scanned:");
-    systemsOutRule.assertContains("query_scope: Collection Group");
+    systemsOutRule.assertContains("query_scope: Collection group");
     systemsOutRule.assertContains("Count: 2");
   }
 }
diff --git a/samples/snippets/src/test/java/com/rule/SystemsOutRule.java b/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
index 9cdb2744e166..829fd8a53f70 100644
--- a/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
+++ b/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
@@ -48,6 +48,6 @@ public void evaluate() throws Throwable {
   }
 
   public void assertContains(String content) {
-    assertThat(currentOut.toString()).contains(content);
+    assertThat(currentOut.toString().toLowerCase()).contains(content.toLowerCase());
   }
 }

From d23dc4c26a95f2c323ade4db9a88d5435a173be8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 19 Apr 2024 15:27:50 +0200
Subject: [PATCH 1365/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.29.0 (#1403)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index db45ebd29fb0..851d94b206b5 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.28.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.29.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 60087ed51d59..d7a73c2c6598 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.28.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.29.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 12ae52070622..b5c7f594bd35 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.28.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.29.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a5bb5f4e41e8..86edd2ef193b 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.28.1
+    3.29.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 2a1c4bb9fe9b..7adc39c1e92e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.28.1
+    3.29.0
   
 
   

From e900c7af31bad0c627d2056162fafc3b3927713c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:30:19 +0000
Subject: [PATCH 1366/1784] chore(main): release 2.19.1 (#1393)

:robot: I have created a release *beep* *boop*
---


## [2.19.1](https://togithub.com/googleapis/java-datastore/compare/v2.19.0...v2.19.1) (2024-04-19)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.29.0 ([#1403](https://togithub.com/googleapis/java-datastore/issues/1403)) ([d23dc4c](https://togithub.com/googleapis/java-datastore/commit/d23dc4c26a95f2c323ade4db9a88d5435a173be8))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4ef8b87a213..ba6bc10ff2ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.19.1](https://github.com/googleapis/java-datastore/compare/v2.19.0...v2.19.1) (2024-04-19)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.29.0 ([#1403](https://github.com/googleapis/java-datastore/issues/1403)) ([d23dc4c](https://github.com/googleapis/java-datastore/commit/d23dc4c26a95f2c323ade4db9a88d5435a173be8))
+
 ## [2.19.0](https://github.com/googleapis/java-datastore/compare/v2.18.6...v2.19.0) (2024-03-25)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 57e0e854987e..60697372e512 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.19.1-SNAPSHOT
+  2.19.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1-SNAPSHOT
+    2.19.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 86edd2ef193b..bffe9d3ac4c6 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.19.1-SNAPSHOT
+  2.19.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.1-SNAPSHOT
+        2.19.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.1-SNAPSHOT
+        2.19.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.1-SNAPSHOT
+        0.110.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.1-SNAPSHOT
+        2.19.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6ae9d9bfecf3..dcaeda02fae2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.1-SNAPSHOT
+  2.19.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1-SNAPSHOT
+    2.19.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d8de40fc02b7..5284ef5d09c8 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.19.1-SNAPSHOT
+  2.19.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1-SNAPSHOT
+    2.19.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 7adc39c1e92e..de76c9cc83d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.1-SNAPSHOT
+  2.19.1
   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.19.1-SNAPSHOT
+        2.19.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.1-SNAPSHOT
+        2.19.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.1-SNAPSHOT
+        2.19.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.1-SNAPSHOT
+        0.110.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.1-SNAPSHOT
+        2.19.1
         
           
             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 2014eed3792b..172baaa89c76 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.19.1-SNAPSHOT
+  2.19.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1-SNAPSHOT
+    2.19.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 98e0748c6717..ce31d7a395e3 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.110.1-SNAPSHOT
+  0.110.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1-SNAPSHOT
+    2.19.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ad97c12601d1..422c2f24a92d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.1-SNAPSHOT
+      2.19.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 6333574c9a1c..63798b754d93 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.0:2.19.1-SNAPSHOT
-google-cloud-datastore-bom:2.19.0:2.19.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.110.0:0.110.1-SNAPSHOT
-datastore-v1-proto-client:2.19.0:2.19.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.19.0:2.19.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.19.0:2.19.1-SNAPSHOT
+google-cloud-datastore:2.19.1:2.19.1
+google-cloud-datastore-bom:2.19.1:2.19.1
+proto-google-cloud-datastore-v1:0.110.1:0.110.1
+datastore-v1-proto-client:2.19.1:2.19.1
+proto-google-cloud-datastore-admin-v1:2.19.1:2.19.1
+grpc-google-cloud-datastore-admin-v1:2.19.1:2.19.1

From 8544397db133c6b1a3c2706f40c591f6deeb2e12 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 16:54:18 +0000
Subject: [PATCH 1367/1784] chore(main): release 2.19.2-SNAPSHOT (#1407)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 60697372e512..e136a9d8c712 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.19.1
+  2.19.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1
+    2.19.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index bffe9d3ac4c6..2651713e3d40 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.19.1
+  2.19.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.1
+        2.19.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.1
+        2.19.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.1
+        0.110.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.1
+        2.19.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index dcaeda02fae2..8d6b79e8ddea 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.1
+  2.19.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1
+    2.19.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 5284ef5d09c8..150832cdeb3b 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.19.1
+  2.19.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1
+    2.19.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index de76c9cc83d1..bab61ae59db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.1
+  2.19.2-SNAPSHOT
   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.19.1
+        2.19.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.1
+        2.19.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.1
+        2.19.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.1
+        0.110.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.1
+        2.19.2-SNAPSHOT
         
           
             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 172baaa89c76..58e80a474746 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.19.1
+  2.19.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1
+    2.19.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ce31d7a395e3..f7533666e041 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.110.1
+  0.110.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.1
+    2.19.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 422c2f24a92d..45331e46b774 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.1
+      2.19.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 63798b754d93..3d01cfb1ce3f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.1:2.19.1
-google-cloud-datastore-bom:2.19.1:2.19.1
-proto-google-cloud-datastore-v1:0.110.1:0.110.1
-datastore-v1-proto-client:2.19.1:2.19.1
-proto-google-cloud-datastore-admin-v1:2.19.1:2.19.1
-grpc-google-cloud-datastore-admin-v1:2.19.1:2.19.1
+google-cloud-datastore:2.19.1:2.19.2-SNAPSHOT
+google-cloud-datastore-bom:2.19.1:2.19.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.110.1:0.110.2-SNAPSHOT
+datastore-v1-proto-client:2.19.1:2.19.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.19.1:2.19.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.19.1:2.19.2-SNAPSHOT

From d8de0a598028360573336f284fc2d50773cfdcd3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 23 Apr 2024 20:01:09 +0200
Subject: [PATCH 1368/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.19.1 (#1408)
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.19.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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a21667770886..339fa120aaa6 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.19.0
+  2.19.1
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.19.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.19.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.1"
 ```
 
 
@@ -384,7 +384,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 399d53610a3b..d367223811d7 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.19.0
+      2.19.1
     
     
 

From ef98d54ea9a4f6ab56b685d9a7a55b6d9de89533 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 23 Apr 2024 20:33:29 +0200
Subject: [PATCH 1369/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 (#1375)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bab61ae59db2..37803c4f2b92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,7 +232,7 @@
           
             org.apache.maven.plugins
             maven-compiler-plugin
-            3.11.0
+            3.13.0
             
               UTF-8
               true

From 9f55f65401b48b814834780e8f431a458cf12ae2 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Mon, 29 Apr 2024 21:16:19 -0400
Subject: [PATCH 1370/1784] test(refactor): move aggregation tests into
 ITDatastoreTest (#1413)

---
 .../it/ITDatastoreAggregationsTest.java       | 361 -------------
 .../cloud/datastore/it/ITDatastoreTest.java   | 511 ++++++++++++++----
 2 files changed, 411 insertions(+), 461 deletions(-)
 delete mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java

diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java
deleted file mode 100644
index fd430095f34e..000000000000
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright 2023 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
- *
- *     https://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.cloud.datastore.it;
-
-import static com.google.cloud.datastore.aggregation.Aggregation.avg;
-import static com.google.cloud.datastore.aggregation.Aggregation.count;
-import static com.google.cloud.datastore.aggregation.Aggregation.sum;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.cloud.datastore.AggregationQuery;
-import com.google.cloud.datastore.AggregationResult;
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.Datastore.TransactionCallable;
-import com.google.cloud.datastore.DatastoreOptions;
-import com.google.cloud.datastore.Entity;
-import com.google.cloud.datastore.EntityQuery;
-import com.google.cloud.datastore.GqlQuery;
-import com.google.cloud.datastore.Key;
-import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.QueryResults;
-import com.google.cloud.datastore.Transaction;
-import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.datastore.v1.TransactionOptions;
-import com.google.datastore.v1.TransactionOptions.ReadOnly;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import org.junit.After;
-import org.junit.Test;
-
-// TODO(jainsahab) Move all the aggregation related tests from ITDatastoreTest to this file
-public class ITDatastoreAggregationsTest {
-
-  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 KIND = "Marks";
-
-  @After
-  public void tearDown() {
-    EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build();
-    QueryResults allEntities = DATASTORE.run(allEntitiesQuery);
-    Key[] keysToDelete =
-        ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new);
-    DATASTORE.delete(keysToDelete);
-  }
-
-  Key key1 = DATASTORE.newKeyFactory().setKind(KIND).newKey(1);
-  Key key2 = DATASTORE.newKeyFactory().setKind(KIND).newKey(2);
-  Key key3 = DATASTORE.newKeyFactory().setKind(KIND).newKey(3);
-
-  Entity entity1 =
-      Entity.newBuilder(key1).set("name", "Jon Stark").set("marks", 89).set("cgpa", 7.34).build();
-  Entity entity2 =
-      Entity.newBuilder(key2).set("name", "Arya Stark").set("marks", 95).set("cgpa", 9.27).build();
-  Entity entity3 =
-      Entity.newBuilder(key3).set("name", "Night king").set("marks", 55).set("cgpa", 5.16).build();
-
-  @Test
-  public void testSumAggregation() {
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregations(sum("marks").as("total_marks"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // sum of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
-        .isEqualTo(184L);
-
-    // sum of 3 entities
-    DATASTORE.put(entity3);
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
-        .isEqualTo(239L);
-  }
-
-  @Test
-  public void testSumAggregationWithAutoGeneratedAlias() {
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregations(sum("marks"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // sum of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("property_1"))
-        .isEqualTo(184L);
-
-    // sum of 3 entities
-    DATASTORE.put(entity3);
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("property_1"))
-        .isEqualTo(239L);
-  }
-
-  @Test
-  public void testSumAggregationInGqlQuery() {
-    DATASTORE.put(entity1, entity2);
-
-    GqlQuery gqlQuery =
-        GqlQuery.newGqlQueryBuilder(
-                "AGGREGATE SUM(marks) AS total_marks OVER (SELECT * FROM Marks)")
-            .build();
-
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(gqlQuery)
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // sum of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
-        .isEqualTo(184L);
-
-    // sum of 3 entities
-    DATASTORE.put(entity3);
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
-        .isEqualTo(239L);
-  }
-
-  @Test
-  public void testSumAggregationWithResultOfDoubleType() {
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregations(sum("cgpa").as("total_cgpa"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // sum of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("total_cgpa"))
-        .isEqualTo(16.61);
-
-    // sum of 3 entities
-    DATASTORE.put(entity3);
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("total_cgpa"))
-        .isEqualTo(21.77);
-  }
-
-  @Test
-  public void testAvgAggregation() {
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregations(avg("marks").as("avg_marks"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // avg of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
-        .isEqualTo(92D);
-
-    // avg of 3 entities
-    DATASTORE.put(entity3);
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
-        .isEqualTo(79.66666666666667);
-  }
-
-  @Test
-  public void testAvgAggregationWithAutoGeneratedAlias() {
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregations(avg("marks"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // avg of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("property_1"))
-        .isEqualTo(92D);
-
-    // avg of 3 entities
-    DATASTORE.put(entity3);
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("property_1"))
-        .isEqualTo(79.66666666666667);
-  }
-
-  @Test
-  public void testAvgAggregationInGqlQuery() {
-    DATASTORE.put(entity1, entity2);
-
-    GqlQuery gqlQuery =
-        Query.newGqlQueryBuilder("AGGREGATE AVG(marks) AS avg_marks OVER (SELECT * FROM Marks)")
-            .build();
-
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(gqlQuery)
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // avg of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
-        .isEqualTo(92D);
-
-    // avg of 3 entities
-    DATASTORE.put(entity3);
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
-        .isEqualTo(79.66666666666667);
-  }
-
-  @Test
-  public void testSumAndAvgAggregationTogether() {
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregations(sum("marks").as("total_marks"))
-            .addAggregations(avg("marks").as("avg_marks"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // sum of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
-        .isEqualTo(184L);
-    // avg of 2 entities
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
-        .isEqualTo(92D);
-  }
-
-  @Test
-  public void testTransactionShouldReturnAConsistentSnapshot() {
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregation(count().as("count"))
-            .addAggregations(sum("marks").as("total_marks"))
-            .addAggregations(avg("marks").as("avg_marks"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    // original entity count is 2
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
-        .isEqualTo(2L);
-
-    // FIRST TRANSACTION
-    DATASTORE.runInTransaction(
-        (TransactionCallable)
-            inFirstTransaction -> {
-              // creating a new entity
-              inFirstTransaction.put(entity3);
-
-              // aggregation result consistently being produced for original 2 entities
-              AggregationResult aggregationResult =
-                  getOnlyElement(inFirstTransaction.runAggregation(aggregationQuery));
-              assertThat(aggregationResult.getLong("count")).isEqualTo(2L);
-              assertThat(aggregationResult.getLong("total_marks")).isEqualTo(184L);
-              assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(92D);
-              return null;
-            });
-
-    // after first transaction is committed, we have 3 entities now.
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
-        .isEqualTo(3L);
-
-    // SECOND TRANSACTION
-    DATASTORE.runInTransaction(
-        (TransactionCallable)
-            inSecondTransaction -> {
-              // deleting ENTITY3
-              inSecondTransaction.delete(entity3.getKey());
-
-              // aggregation result still coming for 3 entities
-              AggregationResult aggregationResult =
-                  getOnlyElement(inSecondTransaction.runAggregation(aggregationQuery));
-              assertThat(aggregationResult.getLong("count")).isEqualTo(3L);
-              assertThat(aggregationResult.getLong("total_marks")).isEqualTo(239L);
-              assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(79.66666666666667);
-              return null;
-            });
-
-    // after second transaction is committed, we are back to 2 entities now.
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
-        .isEqualTo(2L);
-  }
-
-  @Test
-  public void testReadOnlyTransactionShouldNotLockTheDocuments()
-      throws ExecutionException, InterruptedException {
-    ExecutorService executor = Executors.newSingleThreadExecutor();
-    DATASTORE.put(entity1, entity2);
-
-    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
-    AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder()
-            .over(baseQuery)
-            .addAggregation(count().as("count"))
-            .addAggregations(sum("marks").as("total_marks"))
-            .addAggregations(avg("marks").as("avg_marks"))
-            .setNamespace(OPTIONS.getNamespace())
-            .build();
-
-    TransactionOptions transactionOptions =
-        TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build();
-    Transaction readOnlyTransaction = DATASTORE.newTransaction(transactionOptions);
-
-    // Executing query in transaction, results for original 2 entities
-    AggregationResult aggregationResult =
-        getOnlyElement(readOnlyTransaction.runAggregation(aggregationQuery));
-    assertThat(aggregationResult.getLong("count")).isEqualTo(2L);
-    assertThat(aggregationResult.getLong("total_marks")).isEqualTo(184L);
-    assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(92D);
-
-    // Concurrent write task.
-    Future addNewEntityTaskOutsideTransaction =
-        executor.submit(
-            () -> {
-              DATASTORE.put(entity3);
-              return null;
-            });
-
-    // should not throw exception and complete successfully as the ongoing transaction is read-only.
-    addNewEntityTaskOutsideTransaction.get();
-
-    // cleanup
-    readOnlyTransaction.commit();
-    executor.shutdownNow();
-
-    assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("count"))
-        .isEqualTo(3L);
-  }
-}
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 fded9bc3d1ae..09dcd211655b 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
@@ -16,7 +16,9 @@
 
 package com.google.cloud.datastore.it;
 
+import static com.google.cloud.datastore.aggregation.Aggregation.avg;
 import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.cloud.datastore.aggregation.Aggregation.sum;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -31,6 +33,7 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.Tuple;
 import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
 import com.google.cloud.datastore.AggregationResults;
 import com.google.cloud.datastore.Batch;
 import com.google.cloud.datastore.BooleanValue;
@@ -86,6 +89,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -140,6 +144,7 @@ public class ITDatastoreTest {
   private static Key KEY3;
   private static Key KEY4;
   private static Key KEY5;
+  private static final String MARKS_KIND = "Marks";
   private static FullEntity PARTIAL_ENTITY1;
   private static FullEntity PARTIAL_ENTITY2;
   private static FullEntity PARTIAL_ENTITY3;
@@ -147,6 +152,10 @@ public class ITDatastoreTest {
   private static Entity ENTITY2;
   private static Entity ENTITY3;
 
+  private static Entity AGGREGATION_ENTITY_1;
+  private static Entity AGGREGATION_ENTITY_2;
+  private static Entity AGGREGATION_ENTITY_3;
+
   @Rule public Timeout globalTimeout = Timeout.seconds(100);
 
   @Rule public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3);
@@ -233,6 +242,29 @@ public ITDatastoreTest(
             .set("partial1", PARTIAL_ENTITY2)
             .set("partial2", ENTITY2)
             .build();
+
+    Key aggregationKey1 = datastore.newKeyFactory().setKind(MARKS_KIND).newKey(1);
+    Key aggregationKey2 = datastore.newKeyFactory().setKind(MARKS_KIND).newKey(2);
+    Key aggregationKey3 = datastore.newKeyFactory().setKind(MARKS_KIND).newKey(3);
+
+    AGGREGATION_ENTITY_1 =
+        Entity.newBuilder(aggregationKey1)
+            .set("name", "Person1")
+            .set("marks", 89)
+            .set("cgpa", 7.34)
+            .build();
+    AGGREGATION_ENTITY_2 =
+        Entity.newBuilder(aggregationKey2)
+            .set("name", "Person2")
+            .set("marks", 95)
+            .set("cgpa", 9.27)
+            .build();
+    AGGREGATION_ENTITY_3 =
+        Entity.newBuilder(aggregationKey3)
+            .set("name", "Person3")
+            .set("marks", 55)
+            .set("cgpa", 5.16)
+            .build();
   }
 
   @Before
@@ -974,6 +1006,385 @@ public void testRunAggregationQueryWithLimit() {
                     .build()));
   }
 
+  @Test
+  public void testSumAggregation() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("marks").as("total_marks"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(184L);
+
+    // sum of 3 entities
+    datastore.put(AGGREGATION_ENTITY_3);
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(239L);
+  }
+
+  @Test
+  public void testSumAggregationWithAutoGeneratedAlias() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("marks"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("property_1"))
+        .isEqualTo(184L);
+
+    // sum of 3 entities
+    datastore.put(AGGREGATION_ENTITY_3);
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("property_1"))
+        .isEqualTo(239L);
+  }
+
+  @Test
+  public void testSumAggregationInGqlQuery() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    GqlQuery gqlQuery =
+        GqlQuery.newGqlQueryBuilder(
+                "AGGREGATE SUM(marks) AS total_marks OVER (SELECT * FROM Marks)")
+            .build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder().over(gqlQuery).setNamespace(NAMESPACE).build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(184L);
+
+    // sum of 3 entities
+    datastore.put(AGGREGATION_ENTITY_3);
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(239L);
+  }
+
+  @Test
+  public void testSumAggregationWithResultOfDoubleType() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("cgpa").as("total_cgpa"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("total_cgpa"))
+        .isEqualTo(16.61);
+
+    // sum of 3 entities
+    datastore.put(AGGREGATION_ENTITY_3);
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("total_cgpa"))
+        .isEqualTo(21.77);
+  }
+
+  @Test
+  public void testAvgAggregation() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    // avg of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(92D);
+
+    // avg of 3 entities
+    datastore.put(AGGREGATION_ENTITY_3);
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(79.66666666666667);
+  }
+
+  @Test
+  public void testAvgAggregationWithAutoGeneratedAlias() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(avg("marks"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    // avg of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("property_1"))
+        .isEqualTo(92D);
+
+    // avg of 3 entities
+    datastore.put(AGGREGATION_ENTITY_3);
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("property_1"))
+        .isEqualTo(79.66666666666667);
+  }
+
+  @Test
+  public void testAvgAggregationInGqlQuery() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    GqlQuery gqlQuery =
+        Query.newGqlQueryBuilder("AGGREGATE AVG(marks) AS avg_marks OVER (SELECT * FROM Marks)")
+            .build();
+
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder().over(gqlQuery).setNamespace(NAMESPACE).build();
+
+    // avg of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(92D);
+
+    // avg of 3 entities
+    datastore.put(AGGREGATION_ENTITY_3);
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(79.66666666666667);
+  }
+
+  @Test
+  public void testSumAndAvgAggregationTogether() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("marks").as("total_marks"))
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    // sum of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("total_marks"))
+        .isEqualTo(184L);
+    // avg of 2 entities
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getDouble("avg_marks"))
+        .isEqualTo(92D);
+  }
+
+  @Test
+  public void testTransactionShouldReturnAConsistentSnapshot() {
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregation(count().as("count"))
+            .addAggregations(sum("marks").as("total_marks"))
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    // original entity count is 2
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(2L);
+
+    // FIRST TRANSACTION
+    datastore.runInTransaction(
+        (TransactionCallable)
+            inFirstTransaction -> {
+              // creating a new entity
+              inFirstTransaction.put(AGGREGATION_ENTITY_3);
+
+              // aggregation result consistently being produced for original 2 entities
+              AggregationResult aggregationResult =
+                  getOnlyElement(inFirstTransaction.runAggregation(aggregationQuery));
+              assertThat(aggregationResult.getLong("count")).isEqualTo(2L);
+              assertThat(aggregationResult.getLong("total_marks")).isEqualTo(184L);
+              assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(92D);
+              return null;
+            });
+
+    // after first transaction is committed, we have 3 entities now.
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(3L);
+
+    // SECOND TRANSACTION
+    datastore.runInTransaction(
+        (TransactionCallable)
+            inSecondTransaction -> {
+              // deleting ENTITY3
+              inSecondTransaction.delete(AGGREGATION_ENTITY_3.getKey());
+
+              // aggregation result still coming for 3 entities
+              AggregationResult aggregationResult =
+                  getOnlyElement(inSecondTransaction.runAggregation(aggregationQuery));
+              assertThat(aggregationResult.getLong("count")).isEqualTo(3L);
+              assertThat(aggregationResult.getLong("total_marks")).isEqualTo(239L);
+              assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(79.66666666666667);
+              return null;
+            });
+
+    // after second transaction is committed, we are back to 2 entities now.
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(2L);
+  }
+
+  @Test
+  public void testReadOnlyTransactionShouldNotLockTheDocuments()
+      throws ExecutionException, InterruptedException {
+    ExecutorService executor = Executors.newSingleThreadExecutor();
+    datastore.put(AGGREGATION_ENTITY_1, AGGREGATION_ENTITY_2);
+
+    EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(MARKS_KIND).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregation(count().as("count"))
+            .addAggregations(sum("marks").as("total_marks"))
+            .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(NAMESPACE)
+            .build();
+
+    TransactionOptions transactionOptions =
+        TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build();
+    Transaction readOnlyTransaction = datastore.newTransaction(transactionOptions);
+
+    // Executing query in transaction, results for original 2 entities
+    AggregationResult aggregationResult =
+        getOnlyElement(readOnlyTransaction.runAggregation(aggregationQuery));
+    assertThat(aggregationResult.getLong("count")).isEqualTo(2L);
+    assertThat(aggregationResult.getLong("total_marks")).isEqualTo(184L);
+    assertThat(aggregationResult.getDouble("avg_marks")).isEqualTo(92D);
+
+    // Concurrent write task.
+    Future addNewEntityTaskOutsideTransaction =
+        executor.submit(
+            () -> {
+              datastore.put(AGGREGATION_ENTITY_3);
+              return null;
+            });
+
+    // should not throw exception and complete successfully as the ongoing transaction is read-only.
+    addNewEntityTaskOutsideTransaction.get();
+
+    // cleanup
+    readOnlyTransaction.commit();
+    executor.shutdownNow();
+
+    assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong("count"))
+        .isEqualTo(3L);
+  }
+
+  private void testCountAggregationWith(Consumer configurer) {
+    AggregationQuery.Builder builder = Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+    configurer.accept(builder);
+    AggregationQuery aggregationQuery = builder.build();
+    String alias = "total_count";
+
+    Long countBeforeAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong(alias);
+    long expectedCount = countBeforeAdd + 1;
+
+    Entity newEntity =
+        Entity.newBuilder(ENTITY1)
+            .setKey(Key.newBuilder(KEY3, KIND1, 1).build())
+            .set("null", NULL_VALUE)
+            .set("partial1", PARTIAL_ENTITY2)
+            .set("partial2", ENTITY2)
+            .build();
+    datastore.put(newEntity);
+
+    Long countAfterAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong(alias);
+    assertThat(countAfterAdd).isEqualTo(expectedCount);
+
+    datastore.delete(newEntity.getKey());
+  }
+
+  private void testCountAggregationWithLimit(
+      Consumer withoutLimitConfigurer,
+      BiConsumer withLimitConfigurer) {
+    String alias = "total_count";
+
+    AggregationQuery.Builder withoutLimitBuilder =
+        Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+    withoutLimitConfigurer.accept(withoutLimitBuilder);
+
+    Long currentCount =
+        getOnlyElement(datastore.runAggregation(withoutLimitBuilder.build())).getLong(alias);
+    long limit = currentCount - 1;
+
+    AggregationQuery.Builder withLimitBuilder =
+        Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+    withLimitConfigurer.accept(withLimitBuilder, limit);
+
+    Long countWithLimit =
+        getOnlyElement(datastore.runAggregation(withLimitBuilder.build())).getLong(alias);
+    assertThat(countWithLimit).isEqualTo(limit);
+  }
+
+  private void testCountAggregationReadTimeWith(Consumer configurer)
+      throws InterruptedException {
+    Entity entity1 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-01")
+                    .setDatabaseId(options.getDatabaseId())
+                    .setNamespace(NAMESPACE)
+                    .build())
+            .set("name", "name01")
+            .build();
+    Entity entity2 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-02")
+                    .setDatabaseId(options.getDatabaseId())
+                    .setNamespace(NAMESPACE)
+                    .build())
+            .set("name", "name02")
+            .build();
+    Entity entity3 =
+        Entity.newBuilder(
+                Key.newBuilder(PROJECT_ID, "new_kind", "name-03")
+                    .setDatabaseId(options.getDatabaseId())
+                    .setNamespace(NAMESPACE)
+                    .build())
+            .set("name", "name03")
+            .build();
+
+    datastore.put(entity1, entity2);
+    Thread.sleep(1000);
+    Timestamp now = Timestamp.now();
+    Thread.sleep(1000);
+    datastore.put(entity3);
+
+    try {
+      AggregationQuery.Builder builder = Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
+      configurer.accept(builder);
+      AggregationQuery countAggregationQuery = builder.build();
+
+      Long latestCount =
+          getOnlyElement(datastore.runAggregation(countAggregationQuery)).getLong("total_count");
+      assertThat(latestCount).isEqualTo(3L);
+
+      ExplainOptions explainOptions = ExplainOptions.newBuilder().setAnalyze(true).build();
+      AggregationResults results =
+          datastore.runAggregation(countAggregationQuery, explainOptions, ReadOption.readTime(now));
+      Long oldCount = getOnlyElement(results).getLong("total_count");
+      assertThat(oldCount).isEqualTo(2L);
+      assertPlanSummary(results.getExplainMetrics().get().getPlanSummary());
+      assertExecutionStats(results.getExplainMetrics().get().getExecutionStats().get(), 1, 1, "2");
+    } finally {
+      datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
+    }
+  }
+
   /**
    * if an entity is modified or deleted within a transaction, a query or lookup returns the
    * original version of the entity as of the beginning of the transaction, or nothing if the entity
@@ -1737,106 +2148,6 @@ public void testQueryWithReadTime() throws InterruptedException {
     }
   }
 
-  private void testCountAggregationWith(Consumer configurer) {
-    AggregationQuery.Builder builder = Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
-    configurer.accept(builder);
-    AggregationQuery aggregationQuery = builder.build();
-    String alias = "total_count";
-
-    Long countBeforeAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong(alias);
-    long expectedCount = countBeforeAdd + 1;
-
-    Entity newEntity =
-        Entity.newBuilder(ENTITY1)
-            .setKey(Key.newBuilder(KEY3, KIND1, 1).build())
-            .set("null", NULL_VALUE)
-            .set("partial1", PARTIAL_ENTITY2)
-            .set("partial2", ENTITY2)
-            .build();
-    datastore.put(newEntity);
-
-    Long countAfterAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).getLong(alias);
-    assertThat(countAfterAdd).isEqualTo(expectedCount);
-
-    datastore.delete(newEntity.getKey());
-  }
-
-  private void testCountAggregationWithLimit(
-      Consumer withoutLimitConfigurer,
-      BiConsumer withLimitConfigurer) {
-    String alias = "total_count";
-
-    AggregationQuery.Builder withoutLimitBuilder =
-        Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
-    withoutLimitConfigurer.accept(withoutLimitBuilder);
-
-    Long currentCount =
-        getOnlyElement(datastore.runAggregation(withoutLimitBuilder.build())).getLong(alias);
-    long limit = currentCount - 1;
-
-    AggregationQuery.Builder withLimitBuilder =
-        Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
-    withLimitConfigurer.accept(withLimitBuilder, limit);
-
-    Long countWithLimit =
-        getOnlyElement(datastore.runAggregation(withLimitBuilder.build())).getLong(alias);
-    assertThat(countWithLimit).isEqualTo(limit);
-  }
-
-  private void testCountAggregationReadTimeWith(Consumer configurer)
-      throws InterruptedException {
-    Entity entity1 =
-        Entity.newBuilder(
-                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")
-                    .setDatabaseId(options.getDatabaseId())
-                    .setNamespace(NAMESPACE)
-                    .build())
-            .set("name", "Jaime Lannister")
-            .build();
-    Entity entity3 =
-        Entity.newBuilder(
-                Key.newBuilder(PROJECT_ID, "new_kind", "name-03")
-                    .setDatabaseId(options.getDatabaseId())
-                    .setNamespace(NAMESPACE)
-                    .build())
-            .set("name", "Cersei Lannister")
-            .build();
-
-    datastore.put(entity1, entity2);
-    Thread.sleep(1000);
-    Timestamp now = Timestamp.now();
-    Thread.sleep(1000);
-    datastore.put(entity3);
-
-    try {
-      AggregationQuery.Builder builder = Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
-      configurer.accept(builder);
-      AggregationQuery countAggregationQuery = builder.build();
-
-      Long latestCount =
-          getOnlyElement(datastore.runAggregation(countAggregationQuery)).getLong("total_count");
-      assertThat(latestCount).isEqualTo(3L);
-
-      ExplainOptions explainOptions = ExplainOptions.newBuilder().setAnalyze(true).build();
-      AggregationResults results =
-          datastore.runAggregation(countAggregationQuery, explainOptions, ReadOption.readTime(now));
-      Long oldCount = getOnlyElement(results).getLong("total_count");
-      assertThat(oldCount).isEqualTo(2L);
-      assertPlanSummary(results.getExplainMetrics().get().getPlanSummary());
-      assertExecutionStats(results.getExplainMetrics().get().getExecutionStats().get(), 1, 1, "2");
-    } finally {
-      datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
-    }
-  }
-
   private void assertDatastoreException(
       DatastoreException expected, String reason, int statusCode) {
     assertEquals(reason, expected.getReason());

From a3f5a2c24bff408479541e08278e888cf3166727 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 30 Apr 2024 03:21:42 +0200
Subject: [PATCH 1371/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.27.0 (#1411)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 37803c4f2b92..eeb20ad87bde 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.26.1
+    2.27.0
   
 
   

From f5a2f042a396f42491f79dd2394124c2efe55b9f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 30 Apr 2024 18:28:22 +0200
Subject: [PATCH 1372/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.38.0 (#1415)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.37.0` -> `26.38.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.38.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.38.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.37.0/26.38.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.37.0/26.38.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.38.0`](https://togithub.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26380-2024-04-30)

##### Dependencies

-   update actions/checkout action to v4 ([#​6507](https://togithub.com/googleapis/java-cloud-bom/issues/6507)) ([5a9e817](https://togithub.com/googleapis/java-cloud-bom/commit/5a9e817b73209e40d2b55abce451d668143839c8))
-   update actions/github-script action to v7 ([#​6508](https://togithub.com/googleapis/java-cloud-bom/issues/6508)) ([e2f9c9f](https://togithub.com/googleapis/java-cloud-bom/commit/e2f9c9ff3bf95206945b6aac26dd00ce0d1cf9fc))
-   update actions/setup-java action to v4 ([#​6509](https://togithub.com/googleapis/java-cloud-bom/issues/6509)) ([8aae14e](https://togithub.com/googleapis/java-cloud-bom/commit/8aae14ea4fa7a113541307a2e417a1e0ed6c5001))
-   update actions/setup-node action to v4 ([#​6510](https://togithub.com/googleapis/java-cloud-bom/issues/6510)) ([a20788d](https://togithub.com/googleapis/java-cloud-bom/commit/a20788dfe145e5f477d60d1ed8ea39bded1d1bfc))
-   update dependency com.google.cloud:first-party-dependencies to v3.29.0 ([#​6540](https://togithub.com/googleapis/java-cloud-bom/issues/6540)) ([938cd30](https://togithub.com/googleapis/java-cloud-bom/commit/938cd303d70557abdc100cd72f33c6037a2cd62a))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.36.0 ([#​6549](https://togithub.com/googleapis/java-cloud-bom/issues/6549)) ([64ec4b5](https://togithub.com/googleapis/java-cloud-bom/commit/64ec4b5f8534ecf82dfca76ad0ed0e5ec88fa675))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.39.0 ([#​6541](https://togithub.com/googleapis/java-cloud-bom/issues/6541)) ([a5798fc](https://togithub.com/googleapis/java-cloud-bom/commit/a5798fc611f95d3a80d45b6e8fd4c1bf47197e4e))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.39.1 ([#​6554](https://togithub.com/googleapis/java-cloud-bom/issues/6554)) ([075716c](https://togithub.com/googleapis/java-cloud-bom/commit/075716c35b9471f00cca38bf74dfc275a54ef0dc))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.5.0 ([#​6551](https://togithub.com/googleapis/java-cloud-bom/issues/6551)) ([d4a55af](https://togithub.com/googleapis/java-cloud-bom/commit/d4a55afbce06fdd3a02d606ec6704886a7b551cf))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.39.0 ([#​6543](https://togithub.com/googleapis/java-cloud-bom/issues/6543)) ([107b178](https://togithub.com/googleapis/java-cloud-bom/commit/107b1780898577c56f416b38f45b93fc43c2008f))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.19.1 ([#​6536](https://togithub.com/googleapis/java-cloud-bom/issues/6536)) ([4bd9f22](https://togithub.com/googleapis/java-cloud-bom/commit/4bd9f22483b648c1d9f8246a8a61f0589172d562))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.20.2 ([#​6537](https://togithub.com/googleapis/java-cloud-bom/issues/6537)) ([5d4e4bf](https://togithub.com/googleapis/java-cloud-bom/commit/5d4e4bf0a45dfc613959767fb6f2786cb4daf0aa))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.21.0 ([#​6550](https://togithub.com/googleapis/java-cloud-bom/issues/6550)) ([a497e07](https://togithub.com/googleapis/java-cloud-bom/commit/a497e07f39b6d5babc038cedb4db146c3653f3d5))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.17.0 ([#​6544](https://togithub.com/googleapis/java-cloud-bom/issues/6544)) ([9b4fd06](https://togithub.com/googleapis/java-cloud-bom/commit/9b4fd06c039334a4c4657e08b52f6108dfcd3586))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.5-alpha ([#​6542](https://togithub.com/googleapis/java-cloud-bom/issues/6542)) ([8f5603b](https://togithub.com/googleapis/java-cloud-bom/commit/8f5603b9d4799a335923a871897302232f91cff9))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.16 ([#​6538](https://togithub.com/googleapis/java-cloud-bom/issues/6538)) ([cd70cb1](https://togithub.com/googleapis/java-cloud-bom/commit/cd70cb17201994cddada81ed4087563df5135114))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.129.0 ([#​6524](https://togithub.com/googleapis/java-cloud-bom/issues/6524)) ([c3fcf29](https://togithub.com/googleapis/java-cloud-bom/commit/c3fcf29562c4c9559adc60e3e985bb828187a447))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.129.1 ([#​6539](https://togithub.com/googleapis/java-cloud-bom/issues/6539)) ([952991e](https://togithub.com/googleapis/java-cloud-bom/commit/952991e5855cb5360f5080df7c4a78153a44b38b))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.13.3 ([#​6548](https://togithub.com/googleapis/java-cloud-bom/issues/6548)) ([20d3ebd](https://togithub.com/googleapis/java-cloud-bom/commit/20d3ebd081b431b08e1ce038cd01416ed73a8efc))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.65.0 ([#​6517](https://togithub.com/googleapis/java-cloud-bom/issues/6517)) ([c18e4a1](https://togithub.com/googleapis/java-cloud-bom/commit/c18e4a15f10046440f2b00ccf7dcfc477a4c825c))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.65.1 ([#​6555](https://togithub.com/googleapis/java-cloud-bom/issues/6555)) ([f48df36](https://togithub.com/googleapis/java-cloud-bom/commit/f48df3617749a7306b6478136c34340875c1ec47))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.17.0 ([#​6545](https://togithub.com/googleapis/java-cloud-bom/issues/6545)) ([4daf874](https://togithub.com/googleapis/java-cloud-bom/commit/4daf874c8cf7d94af80e08fbcfcbf8a84f236e9e))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.37.0 ([#​6546](https://togithub.com/googleapis/java-cloud-bom/issues/6546)) ([fa3d6b7](https://togithub.com/googleapis/java-cloud-bom/commit/fa3d6b7afd4986c02b1b554d6aa9ee92273e6b5d))
-   update dependency com.google.googlejavaformat:google-java-format to v1.22.0 ([#​6518](https://togithub.com/googleapis/java-cloud-bom/issues/6518)) ([dcdaf2a](https://togithub.com/googleapis/java-cloud-bom/commit/dcdaf2a88075e1c7d8660d1fbb5180b7a23d723f))
-   update dependency commons-cli:commons-cli to v1.7.0 ([#​6547](https://togithub.com/googleapis/java-cloud-bom/issues/6547)) ([7e20379](https://togithub.com/googleapis/java-cloud-bom/commit/7e203796880b9f241effdc38aae1231935c48445))
-   update dependency commons-io:commons-io to v2.16.1 ([#​6513](https://togithub.com/googleapis/java-cloud-bom/issues/6513)) ([a9d7444](https://togithub.com/googleapis/java-cloud-bom/commit/a9d7444eb810d98cff1e1d5da62c7996143f5ad2))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 README.md                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 339fa120aaa6..3f6f9916c7d1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.37.0
+      26.38.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.37.0')
+implementation platform('com.google.cloud:libraries-bom:26.38.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 25aa152bae31..d1d30028d2a5 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.37.0
+        26.38.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d6607d7cd3b4..82f0945a7ada 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.37.0
+        26.38.0
         pom
         import
       

From 39839ca9cfea914f0dfaf589e7257f2675784640 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Wed, 1 May 2024 11:20:18 -0400
Subject: [PATCH 1373/1784] chore: update sync-repo-settings.yaml (#1417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 .github/sync-repo-settings.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 0159d7ae3646..4bdaef4e9ed8 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -162,6 +162,23 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
+  - pattern: grpc-experimental
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - OwlBot Post Processor
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
 permissionRules:
   - team: yoshi-admins
     permission: admin

From 48d7dafc0c7a49e95bf41d29865ac872b0de0faf Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 2 May 2024 17:15:13 +0200
Subject: [PATCH 1374/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.27.1 (#1421)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eeb20ad87bde..bdb5d4f6888e 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.27.0
+    2.27.1
       
 
   

From 5a5dfdfb0855cf485b875ab071b79979d24f98dd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 2 May 2024 17:20:49 +0200
Subject: [PATCH 1375/1784] deps: update dependency
 com.google.guava:guava-testlib to v33.2.0-jre (#1422)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8d6b79e8ddea..351e0dfae1d8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -122,7 +122,7 @@
     
       com.google.guava
       guava-testlib
-      33.1.0-jre
+      33.2.0-jre
       test
     
     

From ac3a1c10f64c8338346f8fb39f4857f47e8fc639 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 3 May 2024 16:56:09 +0200
Subject: [PATCH 1376/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 851d94b206b5..59c863ec0fdd 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.29.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index d7a73c2c6598..c72b54690721 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.29.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index b5c7f594bd35..ac1b9d4e96fa 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.29.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2651713e3d40..f149e76dc175 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.29.0
+    3.30.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index bdb5d4f6888e..a67d68b4e1fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.29.0
+    3.30.0
   
 
   

From b265fb3c3b8ebc972edbe5a7beae816379846dac Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 16:32:17 +0000
Subject: [PATCH 1377/1784] fix(deps): Update the Java code generator
 (gapic-generator-java) to 2.39.0 (#1406)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 626430774

Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9
---
 .../v1/stub/DatastoreAdminStubSettings.java    | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 64ad035d876b..fc346d38c039 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -258,15 +258,6 @@ public DatastoreAdminStub createStub() throws IOException {
             "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
   }
 
-  /** Returns the endpoint set by the user or the the service's default endpoint. */
-  @Override
-  public String getEndpoint() {
-    if (super.getEndpoint() != null) {
-      return super.getEndpoint();
-    }
-    return getDefaultEndpoint();
-  }
-
   /** Returns the default service name. */
   @Override
   public String getServiceName() {
@@ -716,15 +707,6 @@ public UnaryCallSettings.Builder getIndexSettings() {
       return listIndexesSettings;
     }
 
-    /** Returns the endpoint set by the user or the the service's default endpoint. */
-    @Override
-    public String getEndpoint() {
-      if (super.getEndpoint() != null) {
-        return super.getEndpoint();
-      }
-      return getDefaultEndpoint();
-    }
-
     @Override
     public DatastoreAdminStubSettings build() throws IOException {
       return new DatastoreAdminStubSettings(this);

From da51c88b81faee5141e9eb6c5ccbc2cc25e581b2 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 14:20:16 +0000
Subject: [PATCH 1378/1784] chore(main): release 2.19.2 (#1414)

:robot: I have created a release *beep* *boop*
---


## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 15 +++++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba6bc10ff2ce..b026d8096f2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.19.2](https://github.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://github.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://github.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://github.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://github.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
+* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://github.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://github.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
+* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://github.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://github.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
+* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://github.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://github.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))
+
 ## [2.19.1](https://github.com/googleapis/java-datastore/compare/v2.19.0...v2.19.1) (2024-04-19)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index e136a9d8c712..4c926f63048d 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.19.2-SNAPSHOT
+  2.19.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2-SNAPSHOT
+    2.19.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f149e76dc175..4e9e971c087d 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.19.2-SNAPSHOT
+  2.19.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.2-SNAPSHOT
+        2.19.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.2-SNAPSHOT
+        2.19.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.2-SNAPSHOT
+        0.110.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.2-SNAPSHOT
+        2.19.2
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 351e0dfae1d8..4337bb6775e3 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.2-SNAPSHOT
+  2.19.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2-SNAPSHOT
+    2.19.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 150832cdeb3b..938047de0d47 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.19.2-SNAPSHOT
+  2.19.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2-SNAPSHOT
+    2.19.2
   
   
     
diff --git a/pom.xml b/pom.xml
index a67d68b4e1fb..7e8f89d1b34a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.2-SNAPSHOT
+  2.19.2
   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.19.2-SNAPSHOT
+        2.19.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.2-SNAPSHOT
+        2.19.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.2-SNAPSHOT
+        2.19.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.2-SNAPSHOT
+        0.110.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.2-SNAPSHOT
+        2.19.2
         
           
             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 58e80a474746..f76114f5f46a 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.19.2-SNAPSHOT
+  2.19.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2-SNAPSHOT
+    2.19.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f7533666e041..17524e533081 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.110.2-SNAPSHOT
+  0.110.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2-SNAPSHOT
+    2.19.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 45331e46b774..94b4517b409e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.2-SNAPSHOT
+      2.19.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 3d01cfb1ce3f..572000fda98c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.1:2.19.2-SNAPSHOT
-google-cloud-datastore-bom:2.19.1:2.19.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.110.1:0.110.2-SNAPSHOT
-datastore-v1-proto-client:2.19.1:2.19.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.19.1:2.19.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.19.1:2.19.2-SNAPSHOT
+google-cloud-datastore:2.19.2:2.19.2
+google-cloud-datastore-bom:2.19.2:2.19.2
+proto-google-cloud-datastore-v1:0.110.2:0.110.2
+datastore-v1-proto-client:2.19.2:2.19.2
+proto-google-cloud-datastore-admin-v1:2.19.2:2.19.2
+grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.2

From beb8d0d7163ca071039beca66228b926416de7c9 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 15:00:31 +0000
Subject: [PATCH 1379/1784] chore(main): release 2.19.3-SNAPSHOT (#1432)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4c926f63048d..afebe45cb333 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.19.2
+  2.19.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2
+    2.19.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4e9e971c087d..52634188017f 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.19.2
+  2.19.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.2
+        2.19.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.2
+        2.19.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.2
+        0.110.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.2
+        2.19.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4337bb6775e3..ae5c82ff7765 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.2
+  2.19.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2
+    2.19.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 938047de0d47..aea98fffbf53 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.19.2
+  2.19.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2
+    2.19.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 7e8f89d1b34a..e40fd6e1c423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.2
+  2.19.3-SNAPSHOT
   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.19.2
+        2.19.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.2
+        2.19.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.2
+        2.19.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.2
+        0.110.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.2
+        2.19.3-SNAPSHOT
         
           
             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 f76114f5f46a..3e16b006e32c 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.19.2
+  2.19.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2
+    2.19.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 17524e533081..29cc3ef79c3a 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.110.2
+  0.110.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.2
+    2.19.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 94b4517b409e..4aacf65426fc 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.2
+      2.19.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 572000fda98c..6d440544d60c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.2:2.19.2
-google-cloud-datastore-bom:2.19.2:2.19.2
-proto-google-cloud-datastore-v1:0.110.2:0.110.2
-datastore-v1-proto-client:2.19.2:2.19.2
-proto-google-cloud-datastore-admin-v1:2.19.2:2.19.2
-grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.2
+google-cloud-datastore:2.19.2:2.19.3-SNAPSHOT
+google-cloud-datastore-bom:2.19.2:2.19.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.110.2:0.110.3-SNAPSHOT
+datastore-v1-proto-client:2.19.2:2.19.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT

From f93c60f192ddbffdb02d8e377b148942c351a1ef Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 6 May 2024 19:11:37 +0200
Subject: [PATCH 1380/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412)

---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index a24801164023..745443d357a8 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -39,7 +39,7 @@
       
         org.apache.maven.plugins
         maven-deploy-plugin
-        3.1.1
+        3.1.2
         
           true
         

From 063a81e2d49788f3cca3f4c8f359c1c9b1cf4a34 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 6 May 2024 19:30:18 +0200
Subject: [PATCH 1381/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.19.2 (#1433)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2)

##### Bug Fixes

-   **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
-   Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 README.md                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3f6f9916c7d1..528dec305bfe 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.19.1
+  2.19.2
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.19.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.19.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.2"
 ```
 
 
@@ -384,7 +384,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d367223811d7..91a97482337f 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.19.1
+      2.19.2
     
     
 

From b6f1c89f6892baaba0d545ad87db435aca2055a6 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 10:53:31 -0400
Subject: [PATCH 1382/1784] chore: autogen updates (#1434)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService`
fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService`
fix: An existing message `UpdateVehicleLocationRequest` is removed

PiperOrigin-RevId: 631557549

Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9

* 🦉 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 
---
 .../main/proto/google/datastore/admin/v1/datastore_admin.proto  | 2 +-
 .../src/main/proto/google/datastore/admin/v1/index.proto        | 2 +-
 .../src/main/proto/google/datastore/admin/v1/migration.proto    | 2 +-
 .../src/main/proto/google/datastore/v1/aggregation_result.proto | 2 +-
 .../src/main/proto/google/datastore/v1/datastore.proto          | 2 +-
 .../src/main/proto/google/datastore/v1/entity.proto             | 2 +-
 .../src/main/proto/google/datastore/v1/query.proto              | 2 +-
 .../src/main/proto/google/datastore/v1/query_profile.proto      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
index 79ca3df6880b..a8b3f9986b96 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
index 60bb5af5f588..6a1d12227672 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
index e5f7477da6e6..813de87ddd32 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
index 91c521716e8e..262b61fa4fba 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 1a3fbdd11a30..fbbabb0a3037 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
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 d80dd9093dfb..ef4429343e2e 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
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 d1f0f8d07467..81386d47b513 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
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
index 01c9fc254755..f38681c665a4 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

From d6c295e1aea5f2a3bc3ce5606500d6e712293aa8 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 16:54:27 +0000
Subject: [PATCH 1383/1784] chore: update dependency versions in java templates
 (#1964) (#1435)

* chore: update dependency versions in java templates

* update other templates
Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e
---
 .github/.OwlBot.lock.yaml                    |  4 +--
 .github/workflows/approve-readme.yaml        |  2 +-
 .github/workflows/ci.yaml                    | 30 ++++++++++----------
 .github/workflows/renovate_config_check.yaml |  2 +-
 .github/workflows/samples.yaml               |  4 +--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 6167135e9534..5db36a5f7d8e 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:81c3ec554428c8ff6c92f0d58668b7ef52265d053a82284c97a326745e786949
-# created: 2024-03-27T17:59:25.436353226Z
+  digest: sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e
+# created: 2024-05-09T16:31:37.168667071Z
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index f5fc7d5169eb..59f00b8eb6e6 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
           script: |
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ae66b1973b17..b91fa381f56b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,8 +27,8 @@ jobs:
       matrix:
         java: [11, 17, 21]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: ${{matrix.java}}
@@ -41,8 +41,8 @@ jobs:
     name: "units (8)"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: temurin
@@ -51,7 +51,7 @@ jobs:
         # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
         run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
         shell: bash
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -63,8 +63,8 @@ jobs:
     steps:
     - name: Support longpaths
       run: git config --system core.longpaths true
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 8
@@ -78,8 +78,8 @@ jobs:
       matrix:
         java: [17]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: ${{matrix.java}}
@@ -88,8 +88,8 @@ jobs:
   javadoc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -100,8 +100,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 11
@@ -112,8 +112,8 @@ jobs:
   clirr:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 8
diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml
index 87d8eb2be8cd..7c5ec7865e11 100644
--- a/.github/workflows/renovate_config_check.yaml
+++ b/.github/workflows/renovate_config_check.yaml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '20'
 
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index 10d252d77538..03b2939567a9 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -20,8 +20,8 @@ jobs:
   checkstyle:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8

From 24f878035070d3137e6bd01d65ba60c66f87abd8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 13 May 2024 17:28:56 +0200
Subject: [PATCH 1384/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.39.0 (#1436)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 528dec305bfe..931c9c4ddb01 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.38.0
+      26.39.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.38.0')
+implementation platform('com.google.cloud:libraries-bom:26.39.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index d1d30028d2a5..d1035724ceb1 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.38.0
+        26.39.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 82f0945a7ada..6ac0109ed2ca 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.38.0
+        26.39.0
         pom
         import
       

From b9cece7eb2e7fe06cd7424fa27056606bfec97d2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 13 May 2024 17:59:38 +0200
Subject: [PATCH 1385/1784] build: update actions/setup-java action to v4
 (#1391)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 59c863ec0fdd..2ddcab03092c 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 11

From 80dbca1246facf21b08d33e5c6a09b9708b6ce63 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 14 May 2024 15:46:07 +0200
Subject: [PATCH 1386/1784] deps: update actions/checkout action to v4 (#1390)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 2ddcab03092c..7890ce870287 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -5,7 +5,7 @@ jobs:
   unmanaged_dependency_check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
         distribution: temurin

From 79f6c46bdbabc66082f23e9562ee9541e0fdeac9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 16 May 2024 19:12:12 +0200
Subject: [PATCH 1387/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 7890ce870287..5ff23d7aa5f4 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index c72b54690721..3b76021cef48 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.1"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index ac1b9d4e96fa..8c9d2b1038a0 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.1"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 52634188017f..2f271a3bf6d1 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.30.0
+    3.30.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index e40fd6e1c423..a398872b1ea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.30.0
+    3.30.1
   
 
   

From b3836a44c5cb68ee5c13daa63aa10e918ae17bee Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 17:26:17 +0000
Subject: [PATCH 1388/1784] chore(main): release 2.19.3 (#1438)

:robot: I have created a release *beep* *boop*
---


## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)


### Dependencies

* Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  8 ++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b026d8096f2d..185e9d8918a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.19.3](https://github.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)
+
+
+### Dependencies
+
+* Update actions/checkout action to v4 ([#1390](https://github.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://github.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://github.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://github.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))
+
 ## [2.19.2](https://github.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index afebe45cb333..73888aaa8445 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.19.3-SNAPSHOT
+  2.19.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3-SNAPSHOT
+    2.19.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2f271a3bf6d1..808ef3745b4a 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.19.3-SNAPSHOT
+  2.19.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.3-SNAPSHOT
+        2.19.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.3-SNAPSHOT
+        2.19.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.3-SNAPSHOT
+        0.110.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.3-SNAPSHOT
+        2.19.3
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ae5c82ff7765..2d6872b40d24 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.3-SNAPSHOT
+  2.19.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3-SNAPSHOT
+    2.19.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index aea98fffbf53..cd0a1cc6489f 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.19.3-SNAPSHOT
+  2.19.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3-SNAPSHOT
+    2.19.3
   
   
     
diff --git a/pom.xml b/pom.xml
index a398872b1ea5..48ecc581accf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.3-SNAPSHOT
+  2.19.3
   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.19.3-SNAPSHOT
+        2.19.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.3-SNAPSHOT
+        2.19.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.3-SNAPSHOT
+        2.19.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.3-SNAPSHOT
+        0.110.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.3-SNAPSHOT
+        2.19.3
         
           
             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 3e16b006e32c..20d09333fd0b 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.19.3-SNAPSHOT
+  2.19.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3-SNAPSHOT
+    2.19.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 29cc3ef79c3a..cc61e5080a72 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.110.3-SNAPSHOT
+  0.110.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3-SNAPSHOT
+    2.19.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4aacf65426fc..48e7c491b63b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.3-SNAPSHOT
+      2.19.3
     
     
 
diff --git a/versions.txt b/versions.txt
index 6d440544d60c..c31381ffcf97 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.2:2.19.3-SNAPSHOT
-google-cloud-datastore-bom:2.19.2:2.19.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.110.2:0.110.3-SNAPSHOT
-datastore-v1-proto-client:2.19.2:2.19.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT
+google-cloud-datastore:2.19.3:2.19.3
+google-cloud-datastore-bom:2.19.3:2.19.3
+proto-google-cloud-datastore-v1:0.110.3:0.110.3
+datastore-v1-proto-client:2.19.3:2.19.3
+proto-google-cloud-datastore-admin-v1:2.19.3:2.19.3
+grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.3

From 13d9af1c3eba37fcad70ce55f69ab4fea9a62627 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 18:12:16 +0000
Subject: [PATCH 1389/1784] chore(main): release 2.19.4-SNAPSHOT (#1444)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 73888aaa8445..4c6c8306b479 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.19.3
+  2.19.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3
+    2.19.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 808ef3745b4a..f4509a986169 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.19.3
+  2.19.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.3
+        2.19.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.3
+        2.19.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.3
+        0.110.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.3
+        2.19.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2d6872b40d24..50a0dc771013 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.3
+  2.19.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3
+    2.19.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index cd0a1cc6489f..d846af69e06d 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.19.3
+  2.19.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3
+    2.19.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 48ecc581accf..859d22ae85ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.3
+  2.19.4-SNAPSHOT
   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.19.3
+        2.19.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.3
+        2.19.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.3
+        2.19.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.3
+        0.110.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.3
+        2.19.4-SNAPSHOT
         
           
             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 20d09333fd0b..b7d230c9326e 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.19.3
+  2.19.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3
+    2.19.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cc61e5080a72..406872937235 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.110.3
+  0.110.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.3
+    2.19.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 48e7c491b63b..c74f052fb0c7 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.3
+      2.19.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index c31381ffcf97..5a99dd778965 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.3:2.19.3
-google-cloud-datastore-bom:2.19.3:2.19.3
-proto-google-cloud-datastore-v1:0.110.3:0.110.3
-datastore-v1-proto-client:2.19.3:2.19.3
-proto-google-cloud-datastore-admin-v1:2.19.3:2.19.3
-grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.3
+google-cloud-datastore:2.19.3:2.19.4-SNAPSHOT
+google-cloud-datastore-bom:2.19.3:2.19.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.110.3:0.110.4-SNAPSHOT
+datastore-v1-proto-client:2.19.3:2.19.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT

From 41919388adf2f86e264a504de27619f86c67b7d5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 17 May 2024 21:36:17 +0200
Subject: [PATCH 1390/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.19.3 (#1446)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3)

##### Dependencies

-   Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).

---
 README.md                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 931c9c4ddb01..0a6931db2390 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.19.2
+  2.19.3
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.19.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.19.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.3"
 ```
 
 
@@ -384,7 +384,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 91a97482337f..5943271fb9de 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.19.2
+      2.19.3
     
     
 

From 29aea34c916825bbf34f7630c1ac313be14caf92 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 20 May 2024 16:32:08 +0200
Subject: [PATCH 1391/1784] test(deps): update dependency
 org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2

* 🦉 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 
---
 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 d1035724ceb1..3b15124d5196 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -107,7 +107,7 @@
           
             org.graalvm.buildtools
             native-maven-plugin
-            0.10.1
+            0.10.2
             true
             
               com.example.datastore.NativeImageDatastoreSample

From 6caf603f95926f0d14c007f6dd35d447181d32da Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 20 May 2024 16:33:43 +0200
Subject: [PATCH 1392/1784] build(deps): update dependency
 org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453)

---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 5943271fb9de..45eb263541e8 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -53,7 +53,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.5.0
+        3.6.0
         
           
             add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c74f052fb0c7..0f1b38b1b6b3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -52,7 +52,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.5.0
+        3.6.0
         
           
             add-snippets-source

From 15365eb03b8f26f0b90d11bb41ccbb65093e7a45 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 14:46:16 +0000
Subject: [PATCH 1393/1784] chore: [java] allow passing libraries_bom_version
 from env (#1967) (#1451)

* feat: [java] allow passing libraries_bom_version from env

* reformat
Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea
---
 .github/.OwlBot.lock.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 5db36a5f7d8e..f817c5f44999 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e
-# created: 2024-05-09T16:31:37.168667071Z
+  digest: sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea
+# created: 2024-05-17T15:15:57.6714113Z

From 15148f140b62c2f952537b86993a7ab9ea5645b3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 20 May 2024 17:23:19 +0200
Subject: [PATCH 1394/1784] test(deps): update dependency
 org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2

* 🦉 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 
---
 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 3b15124d5196..00999bee3745 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -86,7 +86,7 @@
         
           org.graalvm.buildtools
           junit-platform-native
-          0.10.1
+          0.10.2
           test
         
           

From c3c131735863d71971110e2ac7ac0244ce16ee92 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu 
Date: Mon, 20 May 2024 16:49:25 +0000
Subject: [PATCH 1395/1784] fix: Migrate off TextPrinter's deprecated methods
 (#1452)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: chore: Migrate off TextPrinter's deprecated methods

* 🦉 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 
---
 .../src/main/java/com/google/cloud/datastore/Key.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9e851d0cb778..14fe264bba07 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
@@ -145,7 +145,7 @@ public Object getNameOrId() {
   /** Returns the key in an encoded form that can be used as part of a URL. */
   public String toUrlSafe() {
     try {
-      return URLEncoder.encode(TextFormat.printToString(toPb()), UTF_8.name());
+      return URLEncoder.encode(TextFormat.printer().printToString(toPb()), UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new IllegalStateException("Unexpected encoding exception", e);
     }

From ff5e39775446216b4806f55f14dacb7fc8e8854b Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 15:05:45 -0400
Subject: [PATCH 1396/1784] feat: New PropertyMask field which allows partial
 commits, lookups, and query results (#1455)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 
---
 .../google/datastore/v1/DatastoreProto.java   | 310 ++++---
 .../google/datastore/v1/LookupRequest.java    | 329 +++++++
 .../datastore/v1/LookupRequestOrBuilder.java  |  50 ++
 .../com/google/datastore/v1/Mutation.java     | 366 +++++++-
 .../datastore/v1/MutationOrBuilder.java       |  56 ++
 .../com/google/datastore/v1/PropertyMask.java | 848 ++++++++++++++++++
 .../datastore/v1/PropertyMaskOrBuilder.java   | 117 +++
 .../google/datastore/v1/RunQueryRequest.java  | 337 ++++++-
 .../v1/RunQueryRequestOrBuilder.java          |  47 +
 .../proto/google/datastore/v1/datastore.proto |  42 +
 10 files changed, 2346 insertions(+), 156 deletions(-)
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java

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 1b8753e3541d..e637dd010db4 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
@@ -100,6 +100,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_datastore_v1_MutationResult_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_MutationResult_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_PropertyMask_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_datastore_v1_ReadOptions_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -134,151 +138,157 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "entity.proto\032\037google/datastore/v1/query."
           + "proto\032\'google/datastore/v1/query_profile"
           + ".proto\032\037google/protobuf/timestamp.proto\""
-          + "\242\001\n\rLookupRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
+          + "\334\001\n\rLookupRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
           + "A\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\007mis"
-          + "sing\030\002 \003(\0132!.google.datastore.v1.EntityR"
-          + "esult\022*\n\010deferred\030\003 \003(\0132\030.google.datasto"
-          + "re.v1.Key\022\023\n\013transaction\030\005 \001(\014\022-\n\tread_t"
-          + "ime\030\007 \001(\0132\032.google.protobuf.Timestamp\"\341\002"
-          + "\n\017RunQueryRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
-          + "A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014partition_id\030"
-          + "\002 \001(\0132 .google.datastore.v1.PartitionId\022"
-          + "6\n\014read_options\030\001 \001(\0132 .google.datastore"
-          + ".v1.ReadOptions\022+\n\005query\030\003 \001(\0132\032.google."
-          + "datastore.v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132"
-          + "\035.google.datastore.v1.GqlQueryH\000\022A\n\017expl"
-          + "ain_options\030\014 \001(\0132#.google.datastore.v1."
-          + "ExplainOptionsB\003\340A\001B\014\n\nquery_type\"\306\001\n\020Ru"
-          + "nQueryResponse\0224\n\005batch\030\001 \001(\0132%.google.d"
-          + "atastore.v1.QueryResultBatch\022)\n\005query\030\002 "
-          + "\001(\0132\032.google.datastore.v1.Query\022\023\n\013trans"
-          + "action\030\005 \001(\014\022<\n\017explain_metrics\030\t \001(\0132#."
-          + "google.datastore.v1.ExplainMetrics\"\203\003\n\032R"
-          + "unAggregationQueryRequest\022\027\n\nproject_id\030"
-          + "\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014parti"
-          + "tion_id\030\002 \001(\0132 .google.datastore.v1.Part"
-          + "itionId\0226\n\014read_options\030\001 \001(\0132 .google.d"
-          + "atastore.v1.ReadOptions\022B\n\021aggregation_q"
-          + "uery\030\003 \001(\0132%.google.datastore.v1.Aggrega"
-          + "tionQueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google."
-          + "datastore.v1.GqlQueryH\000\022A\n\017explain_optio"
-          + "ns\030\013 \001(\0132#.google.datastore.v1.ExplainOp"
-          + "tionsB\003\340A\001B\014\n\nquery_type\"\342\001\n\033RunAggregat"
-          + "ionQueryResponse\022:\n\005batch\030\001 \001(\0132+.google"
-          + ".datastore.v1.AggregationResultBatch\0224\n\005"
-          + "query\030\002 \001(\0132%.google.datastore.v1.Aggreg"
-          + "ationQuery\022\023\n\013transaction\030\005 \001(\014\022<\n\017expla"
-          + "in_metrics\030\t \001(\0132#.google.datastore.v1.E"
-          + "xplainMetrics\"\215\001\n\027BeginTransactionReques"
-          + "t\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_i"
-          + "d\030\t \001(\t\022D\n\023transaction_options\030\n \001(\0132\'.g"
-          + "oogle.datastore.v1.TransactionOptions\"/\n"
-          + "\030BeginTransactionResponse\022\023\n\013transaction"
-          + "\030\001 \001(\014\"Y\n\017RollbackRequest\022\027\n\nproject_id\030"
-          + "\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022\030\n\013trans"
-          + "action\030\001 \001(\014B\003\340A\002\"\022\n\020RollbackResponse\"\350\002"
-          + "\n\rCommitRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002"
-          + "\022\023\n\013database_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.go"
-          + "ogle.datastore.v1.CommitRequest.Mode\022\025\n\013"
-          + "transaction\030\001 \001(\014H\000\022I\n\026single_use_transa"
-          + "ction\030\n \001(\0132\'.google.datastore.v1.Transa"
-          + "ctionOptionsH\000\0220\n\tmutations\030\006 \003(\0132\035.goog"
-          + "le.datastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE"
-          + "_UNSPECIFIED\020\000\022\021\n\rTRANSACTIONAL\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.datastore.v1.MutationResu"
-          + "lt\022\025\n\rindex_updates\030\004 \001(\005\022/\n\013commit_time"
-          + "\030\010 \001(\0132\032.google.protobuf.Timestamp\"o\n\022Al"
-          + "locateIdsRequest\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.g"
-          + "oogle.datastore.v1.KeyB\003\340A\002\"=\n\023AllocateI"
-          + "dsResponse\022&\n\004keys\030\001 \003(\0132\030.google.datast"
-          + "ore.v1.Key\"n\n\021ReserveIdsRequest\022\027\n\nproje"
-          + "ct_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\340"
-          + "A\002\"\024\n\022ReserveIdsResponse\"\272\002\n\010Mutation\022-\n"
-          + "\006insert\030\004 \001(\0132\033.google.datastore.v1.Enti"
-          + "tyH\000\022-\n\006update\030\005 \001(\0132\033.google.datastore."
-          + "v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.dat"
-          + "astore.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.goo"
-          + "gle.datastore.v1.KeyH\000\022\026\n\014base_version\030\010"
-          + " \001(\003H\001\0221\n\013update_time\030\013 \001(\0132\032.google.pro"
-          + "tobuf.TimestampH\001B\013\n\toperationB\035\n\033confli"
-          + "ct_detection_strategy\"\305\001\n\016MutationResult"
-          + "\022%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022"
-          + "\017\n\007version\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\021co"
-          + "nflict_detected\030\005 \001(\010\"\312\002\n\013ReadOptions\022L\n"
-          + "\020read_consistency\030\001 \001(\01620.google.datasto"
-          + "re.v1.ReadOptions.ReadConsistencyH\000\022\025\n\013t"
-          + "ransaction\030\002 \001(\014H\000\022B\n\017new_transaction\030\003 "
-          + "\001(\0132\'.google.datastore.v1.TransactionOpt"
-          + "ionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.proto"
-          + "buf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034RE"
-          + "AD_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG\020\001"
-          + "\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n\022T"
-          + "ransactionOptions\022G\n\nread_write\030\001 \001(\01321."
-          + "google.datastore.v1.TransactionOptions.R"
-          + "eadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google.d"
-          + "atastore.v1.TransactionOptions.ReadOnlyH"
-          + "\000\032)\n\tReadWrite\022\034\n\024previous_transaction\030\001"
-          + " \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032.go"
-          + "ogle.protobuf.TimestampB\006\n\004mode2\341\r\n\tData"
-          + "store\022\300\001\n\006Lookup\022\".google.datastore.v1.L"
-          + "ookupRequest\032#.google.datastore.v1.Looku"
-          + "pResponse\"m\332A\034project_id,read_options,ke"
-          + "ys\202\323\344\223\002%\" /v1/projects/{project_id}:look"
-          + "up:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
-          + "\022\251\001\n\010RunQuery\022$.google.datastore.v1.RunQ"
-          + "ueryRequest\032%.google.datastore.v1.RunQue"
-          + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{projec"
-          + "t_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n"
-          + "\013database_id\022\325\001\n\023RunAggregationQuery\022/.g"
-          + "oogle.datastore.v1.RunAggregationQueryRe"
-          + "quest\0320.google.datastore.v1.RunAggregati"
-          + "onQueryResponse\"[\202\323\344\223\0022\"-/v1/projects/{p"
-          + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022"
-          + "\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020BeginTr"
-          + "ansaction\022,.google.datastore.v1.BeginTra"
-          + "nsactionRequest\032-.google.datastore.v1.Be"
-          + "ginTransactionResponse\"e\332A\nproject_id\202\323\344"
-          + "\223\002/\"*/v1/projects/{project_id}:beginTran"
-          + "saction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa"
-          + "se_id\022\346\001\n\006Commit\022\".google.datastore.v1.C"
-          + "ommitRequest\032#.google.datastore.v1.Commi"
-          + "tResponse\"\222\001\332A%project_id,mode,transacti"
-          + "on,mutations\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\022\302"
-          + "\001\n\010Rollback\022$.google.datastore.v1.Rollba"
-          + "ckRequest\032%.google.datastore.v1.Rollback"
-          + "Response\"i\332A\026project_id,transaction\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\022\307\001\n\013"
-          + "AllocateIds\022\'.google.datastore.v1.Alloca"
-          + "teIdsRequest\032(.google.datastore.v1.Alloc"
-          + "ateIdsResponse\"e\332A\017project_id,keys\202\323\344\223\002*"
-          + "\"%/v1/projects/{project_id}:allocateIds:"
-          + "\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001"
-          + "\n\nReserveIds\022&.google.datastore.v1.Reser"
-          + "veIdsRequest\032\'.google.datastore.v1.Reser"
-          + "veIdsResponse\"d\332A\017project_id,keys\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\032v\312A\030"
-          + "datastore.googleapis.com\322AXhttps://www.g"
-          + "oogleapis.com/auth/cloud-platform,https:"
-          + "//www.googleapis.com/auth/datastoreB\300\001\n\027"
-          + "com.google.datastore.v1B\016DatastoreProtoP"
-          + "\001Z
+   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   * 
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 5;
+   *
+   * @return Whether the propertyMask field is set.
+   */
+  @java.lang.Override
+  public boolean hasPropertyMask() {
+    return ((bitField0_ & 0x00000002) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 5;
+   *
+   * @return The propertyMask.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyMask getPropertyMask() {
+    return propertyMask_ == null
+        ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+        : propertyMask_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 5;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() {
+    return propertyMask_ == null
+        ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+        : propertyMask_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -319,6 +384,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(3, keys_.get(i));
     }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      output.writeMessage(5, getPropertyMask());
+    }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
@@ -340,6 +408,9 @@ public int getSerializedSize() {
     for (int i = 0; i < keys_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, keys_.get(i));
     }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getPropertyMask());
+    }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
@@ -368,6 +439,10 @@ public boolean equals(final java.lang.Object obj) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
     if (!getKeysList().equals(other.getKeysList())) return false;
+    if (hasPropertyMask() != other.hasPropertyMask()) return false;
+    if (hasPropertyMask()) {
+      if (!getPropertyMask().equals(other.getPropertyMask())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -391,6 +466,10 @@ public int hashCode() {
       hash = (37 * hash) + KEYS_FIELD_NUMBER;
       hash = (53 * hash) + getKeysList().hashCode();
     }
+    if (hasPropertyMask()) {
+      hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getPropertyMask().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -532,6 +611,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getReadOptionsFieldBuilder();
         getKeysFieldBuilder();
+        getPropertyMaskFieldBuilder();
       }
     }
 
@@ -553,6 +633,11 @@ public Builder clear() {
         keysBuilder_.clear();
       }
       bitField0_ = (bitField0_ & ~0x00000008);
+      propertyMask_ = null;
+      if (propertyMaskBuilder_ != null) {
+        propertyMaskBuilder_.dispose();
+        propertyMaskBuilder_ = null;
+      }
       return this;
     }
 
@@ -614,6 +699,11 @@ private void buildPartial0(com.google.datastore.v1.LookupRequest result) {
             readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
         to_bitField0_ |= 0x00000001;
       }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.propertyMask_ =
+            propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build();
+        to_bitField0_ |= 0x00000002;
+      }
       result.bitField0_ |= to_bitField0_;
     }
 
@@ -702,6 +792,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
           }
         }
       }
+      if (other.hasPropertyMask()) {
+        mergePropertyMask(other.getPropertyMask());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -746,6 +839,12 @@ public Builder mergeFrom(
                 }
                 break;
               } // case 26
+            case 42:
+              {
+                input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
             case 66:
               {
                 projectId_ = input.readStringRequireUtf8();
@@ -1549,6 +1648,236 @@ public java.util.List getKeysBuilderList()
       return keysBuilder_;
     }
 
+    private com.google.datastore.v1.PropertyMask propertyMask_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyMask,
+            com.google.datastore.v1.PropertyMask.Builder,
+            com.google.datastore.v1.PropertyMaskOrBuilder>
+        propertyMaskBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     *
+     * @return Whether the propertyMask field is set.
+     */
+    public boolean hasPropertyMask() {
+      return ((bitField0_ & 0x00000010) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     *
+     * @return The propertyMask.
+     */
+    public com.google.datastore.v1.PropertyMask getPropertyMask() {
+      if (propertyMaskBuilder_ == null) {
+        return propertyMask_ == null
+            ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+            : propertyMask_;
+      } else {
+        return propertyMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     */
+    public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) {
+      if (propertyMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        propertyMask_ = value;
+      } else {
+        propertyMaskBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     */
+    public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder builderForValue) {
+      if (propertyMaskBuilder_ == null) {
+        propertyMask_ = builderForValue.build();
+      } else {
+        propertyMaskBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     */
+    public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
+      if (propertyMaskBuilder_ == null) {
+        if (((bitField0_ & 0x00000010) != 0)
+            && propertyMask_ != null
+            && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) {
+          getPropertyMaskBuilder().mergeFrom(value);
+        } else {
+          propertyMask_ = value;
+        }
+      } else {
+        propertyMaskBuilder_.mergeFrom(value);
+      }
+      if (propertyMask_ != null) {
+        bitField0_ |= 0x00000010;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     */
+    public Builder clearPropertyMask() {
+      bitField0_ = (bitField0_ & ~0x00000010);
+      propertyMask_ = null;
+      if (propertyMaskBuilder_ != null) {
+        propertyMaskBuilder_.dispose();
+        propertyMaskBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     */
+    public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() {
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return getPropertyMaskFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     */
+    public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() {
+      if (propertyMaskBuilder_ != null) {
+        return propertyMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return propertyMask_ == null
+            ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+            : propertyMask_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 5;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyMask,
+            com.google.datastore.v1.PropertyMask.Builder,
+            com.google.datastore.v1.PropertyMaskOrBuilder>
+        getPropertyMaskFieldBuilder() {
+      if (propertyMaskBuilder_ == null) {
+        propertyMaskBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyMask,
+                com.google.datastore.v1.PropertyMask.Builder,
+                com.google.datastore.v1.PropertyMaskOrBuilder>(
+                getPropertyMask(), getParentForChildren(), isClean());
+        propertyMask_ = null;
+      }
+      return propertyMaskBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 82fe24661ae8..d343eeca4204 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
@@ -170,4 +170,54 @@ public interface LookupRequestOrBuilder
    * 
    */
   com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
+
+  /**
+   *
+   *
+   * 
    +   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 5;
+   *
+   * @return Whether the propertyMask field is set.
+   */
+  boolean hasPropertyMask();
+  /**
+   *
+   *
+   * 
    +   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 5;
+   *
+   * @return The propertyMask.
+   */
+  com.google.datastore.v1.PropertyMask getPropertyMask();
+  /**
+   *
+   *
+   * 
    +   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 5;
+   */
+  com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder();
 }
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 91895d180e2b..6857d48a6b05 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
@@ -60,6 +60,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class);
   }
 
+  private int bitField0_;
   private int operationCase_ = 0;
 
   @SuppressWarnings("serial")
@@ -476,6 +477,77 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
 
+  public static final int PROPERTY_MASK_FIELD_NUMBER = 9;
+  private com.google.datastore.v1.PropertyMask propertyMask_;
+  /**
+   *
+   *
+   * 
    +   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 9;
+   *
+   * @return Whether the propertyMask field is set.
+   */
+  @java.lang.Override
+  public boolean hasPropertyMask() {
+    return ((bitField0_ & 0x00000001) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 9;
+   *
+   * @return The propertyMask.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyMask getPropertyMask() {
+    return propertyMask_ == null
+        ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+        : propertyMask_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 9;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() {
+    return propertyMask_ == null
+        ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+        : propertyMask_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -505,6 +577,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (conflictDetectionStrategyCase_ == 8) {
       output.writeInt64(8, (long) ((java.lang.Long) conflictDetectionStrategy_));
     }
+    if (((bitField0_ & 0x00000001) != 0)) {
+      output.writeMessage(9, getPropertyMask());
+    }
     if (conflictDetectionStrategyCase_ == 11) {
       output.writeMessage(11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_);
     }
@@ -542,6 +617,9 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeInt64Size(
               8, (long) ((java.lang.Long) conflictDetectionStrategy_));
     }
+    if (((bitField0_ & 0x00000001) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getPropertyMask());
+    }
     if (conflictDetectionStrategyCase_ == 11) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
@@ -562,6 +640,10 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj;
 
+    if (hasPropertyMask() != other.hasPropertyMask()) return false;
+    if (hasPropertyMask()) {
+      if (!getPropertyMask().equals(other.getPropertyMask())) return false;
+    }
     if (!getOperationCase().equals(other.getOperationCase())) return false;
     switch (operationCase_) {
       case 4:
@@ -602,6 +684,10 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasPropertyMask()) {
+      hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getPropertyMask().hashCode();
+    }
     switch (operationCase_) {
       case 4:
         hash = (37 * hash) + INSERT_FIELD_NUMBER;
@@ -762,10 +848,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.datastore.v1.Mutation.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPropertyMaskFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -787,6 +882,11 @@ public Builder clear() {
       if (updateTimeBuilder_ != null) {
         updateTimeBuilder_.clear();
       }
+      propertyMask_ = null;
+      if (propertyMaskBuilder_ != null) {
+        propertyMaskBuilder_.dispose();
+        propertyMaskBuilder_ = null;
+      }
       operationCase_ = 0;
       operation_ = null;
       conflictDetectionStrategyCase_ = 0;
@@ -827,6 +927,13 @@ public com.google.datastore.v1.Mutation buildPartial() {
 
     private void buildPartial0(com.google.datastore.v1.Mutation result) {
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.propertyMask_ =
+            propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build();
+        to_bitField0_ |= 0x00000001;
+      }
+      result.bitField0_ |= to_bitField0_;
     }
 
     private void buildPartialOneofs(com.google.datastore.v1.Mutation result) {
@@ -896,6 +1003,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.datastore.v1.Mutation other) {
       if (other == com.google.datastore.v1.Mutation.getDefaultInstance()) return this;
+      if (other.hasPropertyMask()) {
+        mergePropertyMask(other.getPropertyMask());
+      }
       switch (other.getOperationCase()) {
         case INSERT:
           {
@@ -994,6 +1104,12 @@ public Builder mergeFrom(
                 conflictDetectionStrategyCase_ = 8;
                 break;
               } // case 64
+            case 74:
+              {
+                input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 74
             case 90:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
@@ -2206,6 +2322,254 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       return updateTimeBuilder_;
     }
 
+    private com.google.datastore.v1.PropertyMask propertyMask_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyMask,
+            com.google.datastore.v1.PropertyMask.Builder,
+            com.google.datastore.v1.PropertyMaskOrBuilder>
+        propertyMaskBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     *
+     * @return Whether the propertyMask field is set.
+     */
+    public boolean hasPropertyMask() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     *
+     * @return The propertyMask.
+     */
+    public com.google.datastore.v1.PropertyMask getPropertyMask() {
+      if (propertyMaskBuilder_ == null) {
+        return propertyMask_ == null
+            ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+            : propertyMask_;
+      } else {
+        return propertyMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     */
+    public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) {
+      if (propertyMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        propertyMask_ = value;
+      } else {
+        propertyMaskBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     */
+    public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder builderForValue) {
+      if (propertyMaskBuilder_ == null) {
+        propertyMask_ = builderForValue.build();
+      } else {
+        propertyMaskBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     */
+    public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
+      if (propertyMaskBuilder_ == null) {
+        if (((bitField0_ & 0x00000040) != 0)
+            && propertyMask_ != null
+            && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) {
+          getPropertyMaskBuilder().mergeFrom(value);
+        } else {
+          propertyMask_ = value;
+        }
+      } else {
+        propertyMaskBuilder_.mergeFrom(value);
+      }
+      if (propertyMask_ != null) {
+        bitField0_ |= 0x00000040;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     */
+    public Builder clearPropertyMask() {
+      bitField0_ = (bitField0_ & ~0x00000040);
+      propertyMask_ = null;
+      if (propertyMaskBuilder_ != null) {
+        propertyMaskBuilder_.dispose();
+        propertyMaskBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     */
+    public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() {
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return getPropertyMaskFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     */
+    public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() {
+      if (propertyMaskBuilder_ != null) {
+        return propertyMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return propertyMask_ == null
+            ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+            : propertyMask_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 9;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyMask,
+            com.google.datastore.v1.PropertyMask.Builder,
+            com.google.datastore.v1.PropertyMaskOrBuilder>
+        getPropertyMaskFieldBuilder() {
+      if (propertyMaskBuilder_ == null) {
+        propertyMaskBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyMask,
+                com.google.datastore.v1.PropertyMask.Builder,
+                com.google.datastore.v1.PropertyMaskOrBuilder>(
+                getPropertyMask(), getParentForChildren(), isClean());
+        propertyMask_ = null;
+      }
+      return propertyMaskBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 e833ed94207a..e051e60030f6 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
@@ -246,6 +246,62 @@ public interface MutationOrBuilder
    */
   com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 9;
+   *
+   * @return Whether the propertyMask field is set.
+   */
+  boolean hasPropertyMask();
+  /**
+   *
+   *
+   * 
    +   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 9;
+   *
+   * @return The propertyMask.
+   */
+  com.google.datastore.v1.PropertyMask getPropertyMask();
+  /**
+   *
+   *
+   * 
    +   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 9;
+   */
+  com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder();
+
   com.google.datastore.v1.Mutation.OperationCase getOperationCase();
 
   com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase getConflictDetectionStrategyCase();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
new file mode 100644
index 000000000000..2d9c2caf6c46
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
@@ -0,0 +1,848 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+// Protobuf Java Version: 3.25.3
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * The set of arbitrarily nested property paths used to restrict an operation to
+ * only a subset of properties in an entity.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.PropertyMask}
+ */
+public final class PropertyMask extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyMask)
+    PropertyMaskOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use PropertyMask.newBuilder() to construct.
+  private PropertyMask(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private PropertyMask() {
+    paths_ = com.google.protobuf.LazyStringArrayList.emptyList();
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new PropertyMask();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_PropertyMask_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.PropertyMask.class,
+            com.google.datastore.v1.PropertyMask.Builder.class);
+  }
+
+  public static final int PATHS_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
+  private com.google.protobuf.LazyStringArrayList paths_ =
+      com.google.protobuf.LazyStringArrayList.emptyList();
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @return A list containing the paths.
+   */
+  public com.google.protobuf.ProtocolStringList getPathsList() {
+    return paths_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @return The count of paths.
+   */
+  public int getPathsCount() {
+    return paths_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @param index The index of the element to return.
+   * @return The paths at the given index.
+   */
+  public java.lang.String getPaths(int index) {
+    return paths_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the paths at the given index.
+   */
+  public com.google.protobuf.ByteString getPathsBytes(int index) {
+    return paths_.getByteString(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    for (int i = 0; i < paths_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, paths_.getRaw(i));
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < paths_.size(); i++) {
+        dataSize += computeStringSizeNoTag(paths_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getPathsList().size();
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.PropertyMask)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.PropertyMask other = (com.google.datastore.v1.PropertyMask) obj;
+
+    if (!getPathsList().equals(other.getPathsList())) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getPathsCount() > 0) {
+      hash = (37 * hash) + PATHS_FIELD_NUMBER;
+      hash = (53 * hash) + getPathsList().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PropertyMask parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.PropertyMask prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * The set of arbitrarily nested property paths used to restrict an operation to
+   * only a subset of properties in an entity.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.PropertyMask}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyMask)
+      com.google.datastore.v1.PropertyMaskOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_PropertyMask_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.PropertyMask.class,
+              com.google.datastore.v1.PropertyMask.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.PropertyMask.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      paths_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_PropertyMask_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PropertyMask getDefaultInstanceForType() {
+      return com.google.datastore.v1.PropertyMask.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PropertyMask build() {
+      com.google.datastore.v1.PropertyMask result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PropertyMask buildPartial() {
+      com.google.datastore.v1.PropertyMask result = new com.google.datastore.v1.PropertyMask(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.PropertyMask result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        paths_.makeImmutable();
+        result.paths_ = paths_;
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.PropertyMask) {
+        return mergeFrom((com.google.datastore.v1.PropertyMask) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.PropertyMask other) {
+      if (other == com.google.datastore.v1.PropertyMask.getDefaultInstance()) return this;
+      if (!other.paths_.isEmpty()) {
+        if (paths_.isEmpty()) {
+          paths_ = other.paths_;
+          bitField0_ |= 0x00000001;
+        } else {
+          ensurePathsIsMutable();
+          paths_.addAll(other.paths_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensurePathsIsMutable();
+                paths_.add(s);
+                break;
+              } // case 10
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.protobuf.LazyStringArrayList paths_ =
+        com.google.protobuf.LazyStringArrayList.emptyList();
+
+    private void ensurePathsIsMutable() {
+      if (!paths_.isModifiable()) {
+        paths_ = new com.google.protobuf.LazyStringArrayList(paths_);
+      }
+      bitField0_ |= 0x00000001;
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @return A list containing the paths.
+     */
+    public com.google.protobuf.ProtocolStringList getPathsList() {
+      paths_.makeImmutable();
+      return paths_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @return The count of paths.
+     */
+    public int getPathsCount() {
+      return paths_.size();
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @param index The index of the element to return.
+     * @return The paths at the given index.
+     */
+    public java.lang.String getPaths(int index) {
+      return paths_.get(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @param index The index of the value to return.
+     * @return The bytes of the paths at the given index.
+     */
+    public com.google.protobuf.ByteString getPathsBytes(int index) {
+      return paths_.getByteString(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @param index The index to set the value at.
+     * @param value The paths to set.
+     * @return This builder for chaining.
+     */
+    public Builder setPaths(int index, java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensurePathsIsMutable();
+      paths_.set(index, value);
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @param value The paths to add.
+     * @return This builder for chaining.
+     */
+    public Builder addPaths(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensurePathsIsMutable();
+      paths_.add(value);
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @param values The paths to add.
+     * @return This builder for chaining.
+     */
+    public Builder addAllPaths(java.lang.Iterable values) {
+      ensurePathsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(values, paths_);
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearPaths() {
+      paths_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      ;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     * 
    
+     *
+     * repeated string paths = 1;
+     *
+     * @param value The bytes of the paths to add.
+     * @return This builder for chaining.
+     */
+    public Builder addPathsBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      ensurePathsIsMutable();
+      paths_.add(value);
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyMask)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyMask)
+  private static final com.google.datastore.v1.PropertyMask DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyMask();
+  }
+
+  public static com.google.datastore.v1.PropertyMask getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public PropertyMask parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyMask getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
new file mode 100644
index 000000000000..8711d5d8a339
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+// Protobuf Java Version: 3.25.3
+package com.google.datastore.v1;
+
+public interface PropertyMaskOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyMask)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @return A list containing the paths.
+   */
+  java.util.List getPathsList();
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @return The count of paths.
+   */
+  int getPathsCount();
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @param index The index of the element to return.
+   * @return The paths at the given index.
+   */
+  java.lang.String getPaths(int index);
+  /**
+   *
+   *
+   * 
    +   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   * 
    
+   *
+   * repeated string paths = 1;
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the paths at the given index.
+   */
+  com.google.protobuf.ByteString getPathsBytes(int index);
+}
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 4420d5779fea..55691ceae175 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
@@ -433,6 +433,68 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
+  public static final int PROPERTY_MASK_FIELD_NUMBER = 10;
+  private com.google.datastore.v1.PropertyMask propertyMask_;
+  /**
+   *
+   *
+   * 
    +   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 10;
+   *
+   * @return Whether the propertyMask field is set.
+   */
+  @java.lang.Override
+  public boolean hasPropertyMask() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 10;
+   *
+   * @return The propertyMask.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyMask getPropertyMask() {
+    return propertyMask_ == null
+        ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+        : propertyMask_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 10;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() {
+    return propertyMask_ == null
+        ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+        : propertyMask_;
+  }
+
   public static final int EXPLAIN_OPTIONS_FIELD_NUMBER = 12;
   private com.google.datastore.v1.ExplainOptions explainOptions_;
   /**
@@ -451,7 +513,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
    */
   @java.lang.Override
   public boolean hasExplainOptions() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    *
@@ -525,6 +587,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
     }
     if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(10, getPropertyMask());
+    }
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeMessage(12, getExplainOptions());
     }
     getUnknownFields().writeTo(output);
@@ -559,6 +624,9 @@ public int getSerializedSize() {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
     }
     if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getPropertyMask());
+    }
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getExplainOptions());
     }
     size += getUnknownFields().getSerializedSize();
@@ -586,6 +654,10 @@ public boolean equals(final java.lang.Object obj) {
     if (hasReadOptions()) {
       if (!getReadOptions().equals(other.getReadOptions())) return false;
     }
+    if (hasPropertyMask() != other.hasPropertyMask()) return false;
+    if (hasPropertyMask()) {
+      if (!getPropertyMask().equals(other.getPropertyMask())) return false;
+    }
     if (hasExplainOptions() != other.hasExplainOptions()) return false;
     if (hasExplainOptions()) {
       if (!getExplainOptions().equals(other.getExplainOptions())) return false;
@@ -624,6 +696,10 @@ public int hashCode() {
       hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getReadOptions().hashCode();
     }
+    if (hasPropertyMask()) {
+      hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getPropertyMask().hashCode();
+    }
     if (hasExplainOptions()) {
       hash = (37 * hash) + EXPLAIN_OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getExplainOptions().hashCode();
@@ -782,6 +858,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getPartitionIdFieldBuilder();
         getReadOptionsFieldBuilder();
+        getPropertyMaskFieldBuilder();
         getExplainOptionsFieldBuilder();
       }
     }
@@ -808,6 +885,11 @@ public Builder clear() {
       if (gqlQueryBuilder_ != null) {
         gqlQueryBuilder_.clear();
       }
+      propertyMask_ = null;
+      if (propertyMaskBuilder_ != null) {
+        propertyMaskBuilder_.dispose();
+        propertyMaskBuilder_ = null;
+      }
       explainOptions_ = null;
       if (explainOptionsBuilder_ != null) {
         explainOptionsBuilder_.dispose();
@@ -870,9 +952,14 @@ private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) {
         to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.propertyMask_ =
+            propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
+      if (((from_bitField0_ & 0x00000080) != 0)) {
         result.explainOptions_ =
             explainOptionsBuilder_ == null ? explainOptions_ : explainOptionsBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+        to_bitField0_ |= 0x00000008;
       }
       result.bitField0_ |= to_bitField0_;
     }
@@ -949,6 +1036,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
       if (other.hasReadOptions()) {
         mergeReadOptions(other.getReadOptions());
       }
+      if (other.hasPropertyMask()) {
+        mergePropertyMask(other.getPropertyMask());
+      }
       if (other.hasExplainOptions()) {
         mergeExplainOptions(other.getExplainOptions());
       }
@@ -1030,10 +1120,16 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000002;
                 break;
               } // case 74
+            case 82:
+              {
+                input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 82
             case 98:
               {
                 input.readMessage(getExplainOptionsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+                bitField0_ |= 0x00000080;
                 break;
               } // case 98
             default:
@@ -2104,6 +2200,227 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       return gqlQueryBuilder_;
     }
 
+    private com.google.datastore.v1.PropertyMask propertyMask_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyMask,
+            com.google.datastore.v1.PropertyMask.Builder,
+            com.google.datastore.v1.PropertyMaskOrBuilder>
+        propertyMaskBuilder_;
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     *
+     * @return Whether the propertyMask field is set.
+     */
+    public boolean hasPropertyMask() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     *
+     * @return The propertyMask.
+     */
+    public com.google.datastore.v1.PropertyMask getPropertyMask() {
+      if (propertyMaskBuilder_ == null) {
+        return propertyMask_ == null
+            ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+            : propertyMask_;
+      } else {
+        return propertyMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     */
+    public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) {
+      if (propertyMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        propertyMask_ = value;
+      } else {
+        propertyMaskBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     */
+    public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder builderForValue) {
+      if (propertyMaskBuilder_ == null) {
+        propertyMask_ = builderForValue.build();
+      } else {
+        propertyMaskBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     */
+    public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
+      if (propertyMaskBuilder_ == null) {
+        if (((bitField0_ & 0x00000040) != 0)
+            && propertyMask_ != null
+            && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) {
+          getPropertyMaskBuilder().mergeFrom(value);
+        } else {
+          propertyMask_ = value;
+        }
+      } else {
+        propertyMaskBuilder_.mergeFrom(value);
+      }
+      if (propertyMask_ != null) {
+        bitField0_ |= 0x00000040;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     */
+    public Builder clearPropertyMask() {
+      bitField0_ = (bitField0_ & ~0x00000040);
+      propertyMask_ = null;
+      if (propertyMaskBuilder_ != null) {
+        propertyMaskBuilder_.dispose();
+        propertyMaskBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     */
+    public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() {
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return getPropertyMaskFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     */
+    public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() {
+      if (propertyMaskBuilder_ != null) {
+        return propertyMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return propertyMask_ == null
+            ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
+            : propertyMask_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     * 
    
+     *
+     * .google.datastore.v1.PropertyMask property_mask = 10;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyMask,
+            com.google.datastore.v1.PropertyMask.Builder,
+            com.google.datastore.v1.PropertyMaskOrBuilder>
+        getPropertyMaskFieldBuilder() {
+      if (propertyMaskBuilder_ == null) {
+        propertyMaskBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyMask,
+                com.google.datastore.v1.PropertyMask.Builder,
+                com.google.datastore.v1.PropertyMaskOrBuilder>(
+                getPropertyMask(), getParentForChildren(), isClean());
+        propertyMask_ = null;
+      }
+      return propertyMaskBuilder_;
+    }
+
     private com.google.datastore.v1.ExplainOptions explainOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.ExplainOptions,
@@ -2125,7 +2442,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
      * @return Whether the explainOptions field is set.
      */
     public boolean hasExplainOptions() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2171,7 +2488,7 @@ public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) {
       } else {
         explainOptionsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2194,7 +2511,7 @@ public Builder setExplainOptions(
       } else {
         explainOptionsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2212,7 +2529,7 @@ public Builder setExplainOptions(
      */
     public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) {
       if (explainOptionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
+        if (((bitField0_ & 0x00000080) != 0)
             && explainOptions_ != null
             && explainOptions_ != com.google.datastore.v1.ExplainOptions.getDefaultInstance()) {
           getExplainOptionsBuilder().mergeFrom(value);
@@ -2223,7 +2540,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value)
         explainOptionsBuilder_.mergeFrom(value);
       }
       if (explainOptions_ != null) {
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         onChanged();
       }
       return this;
@@ -2241,7 +2558,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value)
      * 
      */
     public Builder clearExplainOptions() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000080);
       explainOptions_ = null;
       if (explainOptionsBuilder_ != null) {
         explainOptionsBuilder_.dispose();
@@ -2263,7 +2580,7 @@ public Builder clearExplainOptions() {
      * 
      */
     public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder() {
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return getExplainOptionsFieldBuilder().getBuilder();
     }
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 9e7a6f0b96e6..55218e0e9c1e 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
@@ -229,6 +229,53 @@ public interface RunQueryRequestOrBuilder
    */
   com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 10;
+   *
+   * @return Whether the propertyMask field is set.
+   */
+  boolean hasPropertyMask();
+  /**
+   *
+   *
+   * 
    +   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 10;
+   *
+   * @return The propertyMask.
+   */
+  com.google.datastore.v1.PropertyMask getPropertyMask();
+  /**
+   *
+   *
+   * 
    +   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   * 
    
+   *
+   * .google.datastore.v1.PropertyMask property_mask = 10;
+   */
+  com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder();
+
   /**
    *
    *
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 fbbabb0a3037..92b5038ea9c4 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
@@ -173,6 +173,14 @@ message LookupRequest {
 
   // Required. Keys of entities to look up.
   repeated Key keys = 3 [(google.api.field_behavior) = REQUIRED];
+
+  // The properties to return. Defaults to returning all properties.
+  //
+  // If this field is set and an entity has a property not referenced in the
+  // mask, it will be absent from [LookupResponse.found.entity.properties][].
+  //
+  // The entity's key is always returned.
+  PropertyMask property_mask = 5;
 }
 
 // The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
@@ -234,6 +242,13 @@ message RunQueryRequest {
     GqlQuery gql_query = 7;
   }
 
+  // The properties to return.
+  // This field must not be set for a projection query.
+  //
+  // See
+  // [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+  PropertyMask property_mask = 10;
+
   // Optional. Explain options for the query. If set, additional query
   // statistics will be returned. If not, only query results will be returned.
   ExplainOptions explain_options = 12 [(google.api.field_behavior) = OPTIONAL];
@@ -526,6 +541,16 @@ message Mutation {
     // mutation conflicts.
     google.protobuf.Timestamp update_time = 11;
   }
+
+  // The properties to write in this mutation.
+  // None of the properties in the mask may have a reserved name, except for
+  // `__key__`.
+  // This field is ignored for `delete`.
+  //
+  // If the entity already exists, only properties referenced in the mask are
+  // updated, others are left untouched.
+  // Properties referenced in the mask but not in the entity are deleted.
+  PropertyMask property_mask = 9;
 }
 
 // The result of applying a mutation.
@@ -555,6 +580,23 @@ message MutationResult {
   bool conflict_detected = 5;
 }
 
+// The set of arbitrarily nested property paths used to restrict an operation to
+// only a subset of properties in an entity.
+message PropertyMask {
+  // The paths to the properties covered by this mask.
+  //
+  // A path is a list of property names separated by dots (`.`), for example
+  // `foo.bar` means the property `bar` inside the entity property `foo` inside
+  // the entity associated with this path.
+  //
+  // If a property name contains a dot `.` or a backslash `\`, then that
+  // name must be escaped.
+  //
+  // A path must not be empty, and may not reference a value inside an
+  // [array value][google.datastore.v1.Value.array_value].
+  repeated string paths = 1;
+}
+
 // The options shared by read requests.
 message ReadOptions {
   // The possible values for read consistencies.

From 992815d9989d04f7b371dfa320ed17894626a07f Mon Sep 17 00:00:00 2001
From: Henry Johnson 
Date: Tue, 28 May 2024 11:10:31 +1200
Subject: [PATCH 1397/1784] fix: set the correct database id on the key parent
 when calling Key#getParent (#1457)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: set database ID on parent key

* 🦉 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 
---
 .../com/google/cloud/datastore/IncompleteKey.java    |  6 ++++--
 .../google/cloud/datastore/IncompleteKeyTest.java    | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

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 db9973cb5adc..71e31b94d0fe 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
@@ -91,9 +91,11 @@ public Key getParent() {
     PathElement parent = ancestors.get(ancestors.size() - 1);
     Key.Builder keyBuilder;
     if (parent.hasName()) {
-      keyBuilder = Key.newBuilder(getProjectId(), parent.getKind(), parent.getName());
+      keyBuilder =
+          Key.newBuilder(getProjectId(), parent.getKind(), parent.getName(), getDatabaseId());
     } else {
-      keyBuilder = Key.newBuilder(getProjectId(), parent.getKind(), parent.getId());
+      keyBuilder =
+          Key.newBuilder(getProjectId(), parent.getKind(), parent.getId(), getDatabaseId());
     }
     String namespace = getNamespace();
     if (namespace != null) {
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 a1f8956b526e..75549e5ea112 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,15 +25,17 @@
 
 public class IncompleteKeyTest {
 
-  private static IncompleteKey pk1, pk2, pk4;
-  private static Key parent1;
+  private static IncompleteKey pk1, pk2, pk4, pk5;
+  private static Key parent1, parent2;
 
   @Before
   public void setUp() {
     pk1 = IncompleteKey.newBuilder("ds", "kind1").build();
     parent1 = Key.newBuilder("ds", "kind2", 10).setNamespace("ns").build();
+    parent2 = Key.newBuilder("ds", "kind2", 10, "test-db").setNamespace("ns").build();
     pk2 = IncompleteKey.newBuilder(parent1, "kind3").build();
     pk4 = IncompleteKey.newBuilderWithDatabaseId("ds", "kind3", "test-db").build();
+    pk5 = IncompleteKey.newBuilder(parent2, "kind4").build();
   }
 
   @Test
@@ -59,12 +61,18 @@ public void testBuilders() {
     assertEquals("test-db", pk4.getDatabaseId());
     assertEquals("kind3", pk4.getKind());
     assertTrue(pk4.getAncestors().isEmpty());
+
+    assertEquals("ds", pk5.getProjectId());
+    assertEquals("test-db", pk5.getDatabaseId());
+    assertEquals("kind4", pk5.getKind());
+    assertEquals(parent2.getPath(), pk5.getAncestors());
   }
 
   @Test
   public void testParent() {
     assertNull(pk1.getParent());
     assertEquals(parent1, pk2.getParent());
+    assertEquals(parent2, pk5.getParent());
     Key parent2 = Key.newBuilder("ds", "kind3", "name").setNamespace("ns").build();
     IncompleteKey pk3 = IncompleteKey.newBuilder(parent2, "kind3").build();
     assertEquals(parent2, pk3.getParent());

From 2d380e51e7ddde71e8625b23b94857e4a48c12f9 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 13:30:17 +0000
Subject: [PATCH 1398/1784] chore(main): release 2.20.0 (#1454)

:robot: I have created a release *beep* *boop*
---


## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)


### Features

* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b))


### Bug Fixes

* Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92))
* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 185e9d8918a0..37dd53f58f44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.20.0](https://github.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)
+
+
+### Features
+
+* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://github.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://github.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b))
+
+
+### Bug Fixes
+
+* Migrate off TextPrinter's deprecated methods ([#1452](https://github.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://github.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92))
+* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://github.com/googleapis/java-datastore/issues/1457)) ([992815d](https://github.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f))
+
 ## [2.19.3](https://github.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4c6c8306b479..6a96c7688827 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.19.4-SNAPSHOT
+  2.20.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.4-SNAPSHOT
+    2.20.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f4509a986169..837193172500 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.19.4-SNAPSHOT
+  2.20.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.19.4-SNAPSHOT
+        2.20.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.4-SNAPSHOT
+        2.20.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.4-SNAPSHOT
+        0.111.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.19.4-SNAPSHOT
+        2.20.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 50a0dc771013..21ea96e1f80f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.19.4-SNAPSHOT
+  2.20.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.4-SNAPSHOT
+    2.20.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 d846af69e06d..0411bb3e1328 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.19.4-SNAPSHOT
+  2.20.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.4-SNAPSHOT
+    2.20.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 859d22ae85ff..2aa5869ae66b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.19.4-SNAPSHOT
+  2.20.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.19.4-SNAPSHOT
+        2.20.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.19.4-SNAPSHOT
+        2.20.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.19.4-SNAPSHOT
+        2.20.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.110.4-SNAPSHOT
+        0.111.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.19.4-SNAPSHOT
+        2.20.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 b7d230c9326e..5ce728f7a5ca 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.19.4-SNAPSHOT
+  2.20.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.4-SNAPSHOT
+    2.20.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 406872937235..bb5427dfb5a2 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.110.4-SNAPSHOT
+  0.111.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.19.4-SNAPSHOT
+    2.20.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0f1b38b1b6b3..6d378e51633c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.19.4-SNAPSHOT
+      2.20.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 5a99dd778965..e8bac13b0b36 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.19.3:2.19.4-SNAPSHOT
-google-cloud-datastore-bom:2.19.3:2.19.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.110.3:0.110.4-SNAPSHOT
-datastore-v1-proto-client:2.19.3:2.19.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT
+google-cloud-datastore:2.20.0:2.20.0
+google-cloud-datastore-bom:2.20.0:2.20.0
+proto-google-cloud-datastore-v1:0.111.0:0.111.0
+datastore-v1-proto-client:2.20.0:2.20.0
+proto-google-cloud-datastore-admin-v1:2.20.0:2.20.0
+grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.0

From 55c5a6397c688623cacba045aab31c5f6b845b93 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 15:32:17 +0000
Subject: [PATCH 1399/1784] chore(main): release 2.20.1-SNAPSHOT (#1461)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6a96c7688827..c9805ccc0f1f 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.20.0
+  2.20.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.0
+    2.20.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 837193172500..fd4ff704a909 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.20.0
+  2.20.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.20.0
+        2.20.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.0
+        2.20.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.0
+        0.111.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.20.0
+        2.20.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 21ea96e1f80f..9467dd6924bd 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.20.0
+  2.20.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.0
+    2.20.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0411bb3e1328..34ed50955044 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.20.0
+  2.20.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.0
+    2.20.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 2aa5869ae66b..a72b38f987a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.20.0
+  2.20.1-SNAPSHOT
   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.20.0
+        2.20.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.0
+        2.20.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.20.0
+        2.20.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.0
+        0.111.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.20.0
+        2.20.1-SNAPSHOT
         
           
             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 5ce728f7a5ca..95dd5fcaa888 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.20.0
+  2.20.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.0
+    2.20.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index bb5427dfb5a2..de242755bf06 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.111.0
+  0.111.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.0
+    2.20.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 6d378e51633c..421612d06913 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.20.0
+      2.20.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index e8bac13b0b36..6f2c5611b481 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.20.0:2.20.0
-google-cloud-datastore-bom:2.20.0:2.20.0
-proto-google-cloud-datastore-v1:0.111.0:0.111.0
-datastore-v1-proto-client:2.20.0:2.20.0
-proto-google-cloud-datastore-admin-v1:2.20.0:2.20.0
-grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.0
+google-cloud-datastore:2.20.0:2.20.1-SNAPSHOT
+google-cloud-datastore-bom:2.20.0:2.20.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.111.0:0.111.1-SNAPSHOT
+datastore-v1-proto-client:2.20.0:2.20.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT

From 5058efbfa235f6ffa9c41071fb1421c842336116 Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 28 May 2024 11:49:35 -0400
Subject: [PATCH 1400/1784] test: add integration test for incomplete key
 (#1460)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test: add integration test for incomplete key

* 🦉 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 
---
 .../cloud/datastore/it/ITDatastoreTest.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

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 09dcd211655b..c012d28c9294 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
@@ -144,6 +144,7 @@ public class ITDatastoreTest {
   private static Key KEY3;
   private static Key KEY4;
   private static Key KEY5;
+  private static Key KEY6;
   private static final String MARKS_KIND = "Marks";
   private static FullEntity PARTIAL_ENTITY1;
   private static FullEntity PARTIAL_ENTITY2;
@@ -193,6 +194,10 @@ public ITDatastoreTest(
     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();
+    KEY6 =
+        Key.newBuilder(options.getProjectId(), KIND2, 100, options.getDatabaseId())
+            .setNamespace(NAMESPACE)
+            .build();
 
     LIST_VALUE2 = ListValue.of(Collections.singletonList(KeyValue.of(KEY1)));
 
@@ -1787,6 +1792,21 @@ public void testGet() {
     assertFalse(entity.contains("bla"));
   }
 
+  @Test
+  public void testIncompleteKey() {
+    Key parentKey = null;
+    try {
+      IncompleteKey incompleteKey = IncompleteKey.newBuilder(KEY6, KIND1).build();
+      parentKey = incompleteKey.getParent();
+      Entity entity = Entity.newBuilder(parentKey).set("name", "val").build();
+      datastore.put(entity);
+      Entity retrievedEntity = datastore.get(parentKey);
+      assertThat(retrievedEntity).isEqualTo(entity);
+    } finally {
+      datastore.delete(parentKey);
+    }
+  }
+
   @Test
   public void testGetWithReadTime() throws InterruptedException {
     Key key =

From 85b90a266421a842db0093c83d16346fd04513ed Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 28 May 2024 17:58:02 +0200
Subject: [PATCH 1401/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.20.0 (#1463)
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.20.0

* 🦉 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                           | 8 ++++----
 samples/install-without-bom/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0a6931db2390..9bdf33b26a86 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.19.3
+  2.20.0
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.19.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.20.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.0"
 ```
 
 
@@ -384,7 +384,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 45eb263541e8..4b268da0e971 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.19.3
+      2.20.0
     
     
 

From bb1b4033f80995d4bd52f85092179a7d2f997e4c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 29 May 2024 23:06:10 +0200
Subject: [PATCH 1402/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.40.0 (#1466)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0

* 🦉 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                           | 4 ++--
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9bdf33b26a86..4520f2779c00 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.39.0
+      26.40.0
       pom
       import
     
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.39.0')
+implementation platform('com.google.cloud:libraries-bom:26.40.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 00999bee3745..282d2e56d778 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.39.0
+        26.40.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 6ac0109ed2ca..65ec852e3b02 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.39.0
+        26.40.0
         pom
         import
       

From 42c643d78562c5cbd6c17c29a0a124be8d05198a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 4 Jun 2024 05:47:36 +0200
Subject: [PATCH 1403/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 5ff23d7aa5f4..10b46672b6fb 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.31.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 3b76021cef48..ca8cab04c115 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.31.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 8c9d2b1038a0..b1afa67b1286 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.31.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index fd4ff704a909..f4c9564b3135 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.30.1
+    3.31.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index a72b38f987a6..fbae08ca6aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.30.1
+    3.31.0
   
 
   

From 614e930f2bdccc517d4733e5fb7f3cefad696a20 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 4 Jun 2024 05:58:35 +0200
Subject: [PATCH 1404/1784] deps: update dependency
 com.google.guava:guava-testlib to v33.2.1-jre (#1470)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9467dd6924bd..0605a135917f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -122,7 +122,7 @@
     
       com.google.guava
       guava-testlib
-      33.2.0-jre
+      33.2.1-jre
       test
     
     

From e3fac2bf9992fcb2e91319df0520094865de2d49 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 4 Jun 2024 05:59:13 +0200
Subject: [PATCH 1405/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.28.0 (#1469)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fbae08ca6aa2..d5ea36b79a1a 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.27.1
+    2.28.0
   
 
   

From e8e1576f840215143ff4be861cc58f0850dbeb01 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 4 Jun 2024 08:00:01 +0200
Subject: [PATCH 1406/1784] build(deps): update dependency
 org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459)

---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 745443d357a8..e81bec4509b4 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -47,7 +47,7 @@
       
         org.sonatype.plugins
         nexus-staging-maven-plugin
-        1.6.13
+        1.7.0
         
           true
         

From e7636fdf3bd582f15ba7511ec12dfba7a289a132 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:04:39 +0800
Subject: [PATCH 1407/1784] chore(main): release 2.20.1 (#1476)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  9 +++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37dd53f58f44..074f849e814a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [2.20.1](https://github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) (2024-06-04)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#1471](https://github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
+* Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#1469](https://github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
+* Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#1470](https://github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
+
 ## [2.20.0](https://github.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index c9805ccc0f1f..53589fe5806c 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.20.1-SNAPSHOT
+  2.20.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1-SNAPSHOT
+    2.20.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f4c9564b3135..042d87294991 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.20.1-SNAPSHOT
+  2.20.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.20.1-SNAPSHOT
+        2.20.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.1-SNAPSHOT
+        2.20.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.1-SNAPSHOT
+        0.111.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.20.1-SNAPSHOT
+        2.20.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0605a135917f..6d9c3ab0a592 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.20.1-SNAPSHOT
+  2.20.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1-SNAPSHOT
+    2.20.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 34ed50955044..f2059b821b16 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.20.1-SNAPSHOT
+  2.20.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1-SNAPSHOT
+    2.20.1
   
   
     
diff --git a/pom.xml b/pom.xml
index d5ea36b79a1a..0d81b4a1e310 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.20.1-SNAPSHOT
+  2.20.1
   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.20.1-SNAPSHOT
+        2.20.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.1-SNAPSHOT
+        2.20.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.20.1-SNAPSHOT
+        2.20.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.1-SNAPSHOT
+        0.111.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.20.1-SNAPSHOT
+        2.20.1
         
           
             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 95dd5fcaa888..94759e4ad78d 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.20.1-SNAPSHOT
+  2.20.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1-SNAPSHOT
+    2.20.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index de242755bf06..3d41fdbe241e 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.111.1-SNAPSHOT
+  0.111.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1-SNAPSHOT
+    2.20.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 421612d06913..d882d89169b5 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.20.1-SNAPSHOT
+      2.20.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 6f2c5611b481..bd987449e13a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.20.0:2.20.1-SNAPSHOT
-google-cloud-datastore-bom:2.20.0:2.20.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.111.0:0.111.1-SNAPSHOT
-datastore-v1-proto-client:2.20.0:2.20.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT
+google-cloud-datastore:2.20.1:2.20.1
+google-cloud-datastore-bom:2.20.1:2.20.1
+proto-google-cloud-datastore-v1:0.111.1:0.111.1
+datastore-v1-proto-client:2.20.1:2.20.1
+proto-google-cloud-datastore-admin-v1:2.20.1:2.20.1
+grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.1

From 9d61e9b5348cfa0df27a5c5b05e57b93a8c82396 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Wed, 26 Jun 2024 04:50:20 +0800
Subject: [PATCH 1408/1784] Doc: Add gRPC datastore gapic upgrade user guide
 (#1489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Add read me user guide

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Updating formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fixing formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* adjusting formatting

* 🦉 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-partials.yaml |  98 ++++++++++++++++++++++++++++++++++++++-
 README.md             | 104 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 197 insertions(+), 5 deletions(-)

diff --git a/.readme-partials.yaml b/.readme-partials.yaml
index 9823b5c70187..ced21e49ff86 100644
--- a/.readme-partials.yaml
+++ b/.readme-partials.yaml
@@ -105,7 +105,103 @@ custom_content: |
   running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
   the code from the main method to your application's servlet class and change the print statements to
   display on your webpage.
-
+  
+  gRPC Java Datastore Client User Guide
+  -------
+  In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
+  
+  #### Download Instructions
+  Instructions:
+  1. Clone the grpc-experimental branch from GitHub:
+  ```python
+  git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git
+  ```
+  2. Run the following commands to build the library:
+  ```python
+  # Go to the directory the code was downloaded to
+  cd java-datastore/
+  
+  # Build the library
+  mvn clean install -DskipTests=true
+  ```
+  3. Add the following dependency to your project:
+  ```xml
+  
+    com.google.cloud
+    google-cloud-datastore
+    2.20.0-grpc-experimental-1-SNAPSHOT
+  
+  ```
+  
+  #### How to Use
+  To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation.
+  
+  Example:
+  ```java
+  DatastoreOptions datastoreOptions =
+       DatastoreOptions.newBuilder()
+               .setProjectId("my-project")
+               .setDatabaseId("my-database")
+               .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+               .build();
+  ```
+  Setting the transport options explicitly to `GrpcTransportOptions` will signal the client to use gRPC instead of HTTP when making calls to the server.
+  
+  To revert back to the existing stable behavior and transport, simply remove the transport options line or replace it with `HttpTransportOptions`. Please note this will require an application rebuild and restart.
+  Example:
+  ```java
+  // will default to existing HTTP transport behavior
+  DatastoreOptions datastoreOptions = DatastoreOptions.newBuilder()
+      .setProjectId("my-project")
+      .setDatabaseId("my-database")
+      .build();
+  
+  // will also default to existing HTTP transport behavior
+  DatastoreOptions datastoreOptions =
+              DatastoreOptions.newBuilder()
+                .setProjectId("my-project")
+                .setDatabaseId("my-database")
+                .setTransportOptions(HttpTransportOptions.newBuilder()
+                .setConnectTimeout(1000)
+                .build()).build();
+  ```
+  
+  Note: client instantiations that already use `setTransportOptions` with `HttpTransportOptions` will continue to have the same behavior. Only transports that are explicitly set to gRPC will change.
+  
+  #### Verify Datastore Transport Options Type
+  To verify which type of TransportOptions you have successfully configured, you can use the below lines of code to compare transport options type:
+  ```java
+  // checks if using gRPC transport options
+  boolean isGRPC = datastore.getOptions().getTransportOptions() instanceof GrpcTransportOptions;
+  
+  // checks if using HTTP transport options
+  boolean isHTTP = datastore.getOptions().getTransportOptions() instanceof HTTPTransportOptions;
+  ```
+  
+  #### New Features
+  There are new gRPC specific features available to use in this update.
+  
+  ##### Channel Pooling
+  To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. 
+  See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance.
+  
+  Example:
+  ```java
+  InstantiatingGrpcChannelProvider channelProvider =
+        DatastoreSettings.defaultGrpcTransportProviderBuilder()
+                .setChannelPoolSettings(
+                       ChannelPoolSettings.builder()
+                                .setInitialChannelCount(MIN_VAL)
+                                .setMaxChannelCount(MAX_VAL)
+                                .build())
+                .build();
+  
+  DatastoreOptions options = DatastoreOptions.newBuilder()
+                            .setProjectId("my-project")
+                            .setChannelProvider(channelProvider)
+                            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+                            .build();
+  ```
   Testing
   -------
 
diff --git a/README.md b/README.md
index 4520f2779c00..7ddb359d59e3 100644
--- a/README.md
+++ b/README.md
@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.40.0')
+implementation platform('com.google.cloud:libraries-bom:26.42.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.20.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.20.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.1"
 ```
 
 
@@ -210,6 +210,102 @@ running on Compute Engine or from your own desktop. To run the example on App En
 the code from the main method to your application's servlet class and change the print statements to
 display on your webpage.
 
+gRPC Java Datastore Client User Guide
+-------
+In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
+
+#### Download Instructions
+Instructions:
+1. Clone the grpc-experimental branch from GitHub:
+```python
+git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git
+```
+2. Run the following commands to build the library:
+```python
+# Go to the directory the code was downloaded to
+cd java-datastore/
+
+# Build the library
+mvn clean install -DskipTests=true
+```
+3. Add the following dependency to your project:
+```xml
+
+  com.google.cloud
+  google-cloud-datastore
+  2.20.0-grpc-experimental-1-SNAPSHOT
+
+```
+
+#### How to Use
+To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation.
+
+Example:
+```java
+DatastoreOptions datastoreOptions =
+     DatastoreOptions.newBuilder()
+             .setProjectId("my-project")
+             .setDatabaseId("my-database")
+             .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+             .build();
+```
+Setting the transport options explicitly to `GrpcTransportOptions` will signal the client to use gRPC instead of HTTP when making calls to the server.
+
+To revert back to the existing stable behavior and transport, simply remove the transport options line or replace it with `HttpTransportOptions`. Please note this will require an application rebuild and restart.
+Example:
+```java
+// will default to existing HTTP transport behavior
+DatastoreOptions datastoreOptions = DatastoreOptions.newBuilder()
+    .setProjectId("my-project")
+    .setDatabaseId("my-database")
+    .build();
+
+// will also default to existing HTTP transport behavior
+DatastoreOptions datastoreOptions =
+            DatastoreOptions.newBuilder()
+              .setProjectId("my-project")
+              .setDatabaseId("my-database")
+              .setTransportOptions(HttpTransportOptions.newBuilder()
+              .setConnectTimeout(1000)
+              .build()).build();
+```
+
+Note: client instantiations that already use `setTransportOptions` with `HttpTransportOptions` will continue to have the same behavior. Only transports that are explicitly set to gRPC will change.
+
+#### Verify Datastore Transport Options Type
+To verify which type of TransportOptions you have successfully configured, you can use the below lines of code to compare transport options type:
+```java
+// checks if using gRPC transport options
+boolean isGRPC = datastore.getOptions().getTransportOptions() instanceof GrpcTransportOptions;
+
+// checks if using HTTP transport options
+boolean isHTTP = datastore.getOptions().getTransportOptions() instanceof HTTPTransportOptions;
+```
+
+#### New Features
+There are new gRPC specific features available to use in this update.
+
+##### Channel Pooling
+To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. 
+See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance.
+
+Example:
+```java
+InstantiatingGrpcChannelProvider channelProvider =
+      DatastoreSettings.defaultGrpcTransportProviderBuilder()
+              .setChannelPoolSettings(
+                     ChannelPoolSettings.builder()
+                              .setInitialChannelCount(MIN_VAL)
+                              .setMaxChannelCount(MAX_VAL)
+                              .build())
+              .build();
+
+DatastoreOptions options = DatastoreOptions.newBuilder()
+                          .setProjectId("my-project")
+                          .setChannelProvider(channelProvider)
+                          .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+                          .build();
+```
 Testing
 -------
 
@@ -384,7 +480,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

From 44080bcd9ef256873076a35b95a50d5a1123644c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 05:18:22 +0000
Subject: [PATCH 1409/1784] chore(main): release 2.20.2-SNAPSHOT (#1479)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 53589fe5806c..398f55761230 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.20.1
+  2.20.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1
+    2.20.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 042d87294991..9b4d65cd5db6 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.20.1
+  2.20.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.20.1
+        2.20.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.1
+        2.20.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.1
+        0.111.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.20.1
+        2.20.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6d9c3ab0a592..52ecab94f3d7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.20.1
+  2.20.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1
+    2.20.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f2059b821b16..14f7fc6060a5 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.20.1
+  2.20.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1
+    2.20.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 0d81b4a1e310..19ddfdf15646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.20.1
+  2.20.2-SNAPSHOT
   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.20.1
+        2.20.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.1
+        2.20.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.20.1
+        2.20.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.1
+        0.111.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.20.1
+        2.20.2-SNAPSHOT
         
           
             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 94759e4ad78d..64647bf0b37b 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.20.1
+  2.20.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1
+    2.20.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3d41fdbe241e..86d6e1cecb5c 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.111.1
+  0.111.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.1
+    2.20.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d882d89169b5..b4462afa88d0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.20.1
+      2.20.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index bd987449e13a..a3e4e9988ce0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.20.1:2.20.1
-google-cloud-datastore-bom:2.20.1:2.20.1
-proto-google-cloud-datastore-v1:0.111.1:0.111.1
-datastore-v1-proto-client:2.20.1:2.20.1
-proto-google-cloud-datastore-admin-v1:2.20.1:2.20.1
-grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.1
+google-cloud-datastore:2.20.1:2.20.2-SNAPSHOT
+google-cloud-datastore-bom:2.20.1:2.20.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.111.1:0.111.2-SNAPSHOT
+datastore-v1-proto-client:2.20.1:2.20.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT

From d940c937959942d753f9215e7ce940ab6742be46 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 28 Jun 2024 21:48:34 +0200
Subject: [PATCH 1410/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0

* 🦉 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 
---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 10b46672b6fb..ec72b08ac6c7 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.31.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index ca8cab04c115..0c813eaf7e7f 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.31.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index b1afa67b1286..ef1c9176c553 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.31.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 9b4d65cd5db6..38ed9bb5377c 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.31.0
+    3.32.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 19ddfdf15646..4236919adf1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.31.0
+    3.32.0
   
 
   

From 9293051b1d966f0d55be2d8df1b873b99d6d160d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:26:19 +0000
Subject: [PATCH 1411/1784] chore(main): release 2.20.2 (#1503)

:robot: I have created a release *beep* *boop*
---


## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 074f849e814a..f9ca1c263af5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.20.2](https://github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))
+
 ## [2.20.1](https://github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) (2024-06-04)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 398f55761230..dd7683c6400b 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.20.2-SNAPSHOT
+  2.20.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2-SNAPSHOT
+    2.20.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 38ed9bb5377c..5b01bd928d0a 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.20.2-SNAPSHOT
+  2.20.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.20.2-SNAPSHOT
+        2.20.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.2-SNAPSHOT
+        2.20.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.2-SNAPSHOT
+        0.111.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.20.2-SNAPSHOT
+        2.20.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 52ecab94f3d7..7a70bdf732db 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.20.2-SNAPSHOT
+  2.20.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2-SNAPSHOT
+    2.20.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 14f7fc6060a5..5c3f255f5cd3 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.20.2-SNAPSHOT
+  2.20.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2-SNAPSHOT
+    2.20.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 4236919adf1f..b72ce5ec3bbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.20.2-SNAPSHOT
+  2.20.2
   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.20.2-SNAPSHOT
+        2.20.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.2-SNAPSHOT
+        2.20.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.20.2-SNAPSHOT
+        2.20.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.2-SNAPSHOT
+        0.111.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.20.2-SNAPSHOT
+        2.20.2
         
           
             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 64647bf0b37b..b63ebd708251 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.20.2-SNAPSHOT
+  2.20.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2-SNAPSHOT
+    2.20.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 86d6e1cecb5c..8128587a618c 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.111.2-SNAPSHOT
+  0.111.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2-SNAPSHOT
+    2.20.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b4462afa88d0..1f2e22ec4722 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.20.2-SNAPSHOT
+      2.20.2
     
     
 
diff --git a/versions.txt b/versions.txt
index a3e4e9988ce0..f42550e75212 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.20.1:2.20.2-SNAPSHOT
-google-cloud-datastore-bom:2.20.1:2.20.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.111.1:0.111.2-SNAPSHOT
-datastore-v1-proto-client:2.20.1:2.20.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT
+google-cloud-datastore:2.20.2:2.20.2
+google-cloud-datastore-bom:2.20.2:2.20.2
+proto-google-cloud-datastore-v1:0.111.2:0.111.2
+datastore-v1-proto-client:2.20.2:2.20.2
+proto-google-cloud-datastore-admin-v1:2.20.2:2.20.2
+grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.2

From d142d9c95d91c8cadaf696efc12d6136814938ff Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Sat, 29 Jun 2024 21:46:56 -0400
Subject: [PATCH 1412/1784] feat: enable hermetic library generation (#1462)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* restore to older version

* update googleapis_committish

* fix googleapis_committish

* infer image tag from config yaml

* correct workflow name

* update config scripts and yamls

* remove old update_googleapis_committish workflow

* restore proto folder

* Revert "restore proto folder"

This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5.

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* sync config structure with that of google-cloud-java

* remove quotes from config yamls

* fix typo in update_generation_config.yaml

* correct

* quote codeowners_team in generation config

* update generator version

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Owl Bot 
---
 .../{.OwlBot.yaml => .OwlBot-hermetic.yaml}   |   0
 .../scripts/hermetic_library_generation.sh    | 117 +++++++++++++++++
 .github/scripts/update_generation_config.sh   | 121 ++++++++++++++++++
 .../hermetic_library_generation.yaml          |  38 ++++++
 .../workflows/update_generation_config.yaml   |  42 ++++++
 generation_config.yaml                        |  25 ++++
 6 files changed, 343 insertions(+)
 rename .github/{.OwlBot.yaml => .OwlBot-hermetic.yaml} (100%)
 create mode 100644 .github/scripts/hermetic_library_generation.sh
 create mode 100644 .github/scripts/update_generation_config.sh
 create mode 100644 .github/workflows/hermetic_library_generation.yaml
 create mode 100644 .github/workflows/update_generation_config.yaml
 create mode 100644 generation_config.yaml

diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot-hermetic.yaml
similarity index 100%
rename from .github/.OwlBot.yaml
rename to .github/.OwlBot-hermetic.yaml
diff --git a/.github/scripts/hermetic_library_generation.sh b/.github/scripts/hermetic_library_generation.sh
new file mode 100644
index 000000000000..6c3f22d8f9e7
--- /dev/null
+++ b/.github/scripts/hermetic_library_generation.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+set -e
+# This script should be run at the root of the repository.
+# This script is used to, when a pull request changes the generation
+# configuration (generation_config.yaml by default):
+# 1. Find whether the last commit in this pull request contains changes to
+# the generation configuration and exit early if it doesn't have such a change
+# since the generation result would be the same.
+# 2. Compare generation configurations in the current branch (with which the
+# pull request associated) and target branch (into which the pull request is
+# merged);
+# 3. Generate changed libraries using library_generation image;
+# 4. Commit the changes to the pull request, if any.
+# 5. Edit the PR body with generated pull request description, if applicable.
+
+# The following commands need to be installed before running the script:
+# 1. git
+# 2. gh
+# 3. docker
+
+# The parameters of this script is:
+# 1. target_branch, the branch into which the pull request is merged.
+# 2. current_branch, the branch with which the pull request is associated.
+# 3. [optional] generation_config, the path to the generation configuration,
+# the default value is generation_config.yaml in the repository root.
+while [[ $# -gt 0 ]]; do
+key="$1"
+case "${key}" in
+  --target_branch)
+    target_branch="$2"
+    shift
+    ;;
+  --current_branch)
+    current_branch="$2"
+    shift
+    ;;
+  --generation_config)
+    generation_config="$2"
+    shift
+    ;;
+  *)
+    echo "Invalid option: [$1]"
+    exit 1
+    ;;
+esac
+shift
+done
+
+if [ -z "${target_branch}" ]; then
+  echo "missing required argument --target_branch"
+  exit 1
+fi
+
+if [ -z "${current_branch}" ]; then
+  echo "missing required argument --current_branch"
+  exit 1
+fi
+
+if [ -z "${generation_config}" ]; then
+  generation_config=generation_config.yaml
+  echo "Using default generation config: ${generation_config}"
+fi
+
+workspace_name="/workspace"
+baseline_generation_config="baseline_generation_config.yaml"
+message="chore: generate libraries at $(date)"
+
+git checkout "${target_branch}"
+git checkout "${current_branch}"
+# if the last commit doesn't contain changes to generation configuration,
+# do not generate again as the result will be the same.
+change_of_last_commit="$(git diff-tree --no-commit-id --name-only HEAD~1..HEAD -r)"
+if [[ ! ("${change_of_last_commit}" == *"${generation_config}"*) ]]; then
+    echo "The last commit doesn't contain any changes to the generation_config.yaml, skipping the whole generation process." || true
+    exit 0
+fi
+# copy generation configuration from target branch to current branch.
+git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}"
+config_diff=$(diff "${generation_config}" "${baseline_generation_config}" || true)
+
+# parse image tag from the generation configuration.
+image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs)
+
+# run hermetic code generation docker image.
+docker run \
+  --rm \
+  -u "$(id -u):$(id -g)" \
+  -v "$(pwd):${workspace_name}" \
+  gcr.io/cloud-devrel-public-resources/java-library-generation:"${image_tag}" \
+  --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \
+  --current-generation-config-path="${workspace_name}/${generation_config}"
+
+
+# commit the change to the pull request.
+if [[ $(basename $(pwd)) == "google-cloud-java" ]]; then
+  git add java-* pom.xml gapic-libraries-bom/pom.xml versions.txt
+else
+  # The image leaves intermediate folders and files it works with. Here we remove them
+  rm -rdf output googleapis "${baseline_generation_config}"
+  git add --all -- ':!pr_description.txt'
+fi
+changed_files=$(git diff --cached --name-only)
+if [[ "${changed_files}" == "" ]]; then
+    echo "There is no generated code change with the generation config change ${config_diff}."
+    echo "Skip committing to the pull request."
+    exit 0
+fi
+
+echo "Configuration diff:"
+echo "${config_diff}"
+git commit -m "${message}"
+git push
+# set pr body if pr_description.txt is generated.
+if [[ -f "pr_description.txt" ]]; then
+  pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
+  gh pr edit "${pr_num}" --body "$(cat pr_description.txt)"
+fi
diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh
new file mode 100644
index 000000000000..561a313040f3
--- /dev/null
+++ b/.github/scripts/update_generation_config.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+set -e
+# This script should be run at the root of the repository.
+# This script is used to update googleapis_commitish, gapic_generator_version,
+# and libraries_bom_version in generation configuration at the time of running
+# and create a pull request.
+
+# The following commands need to be installed before running the script:
+# 1. git
+# 2. gh
+# 3. jq
+
+# Utility functions
+# Get the latest released version of a Maven artifact.
+function get_latest_released_version() {
+    local group_id=$1
+    local artifact_id=$2
+    latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
+    echo "${latest}"
+}
+
+# Update a key to a new value in the generation config.
+function update_config() {
+    local key_word=$1
+    local new_value=$2
+    local file=$3
+    echo "Update ${key_word} to ${new_value} in ${file}"
+    sed -i -e "s/^${key_word}.*$/${key_word}: ${new_value}/" "${file}"
+}
+
+# The parameters of this script is:
+# 1. base_branch, the base branch of the result pull request.
+# 2. repo, organization/repo-name, e.g., googleapis/google-cloud-java
+# 3. [optional] generation_config, the path to the generation configuration,
+# the default value is generation_config.yaml in the repository root.
+while [[ $# -gt 0 ]]; do
+key="$1"
+case "${key}" in
+  --base_branch)
+    base_branch="$2"
+    shift
+    ;;
+  --repo)
+    repo="$2"
+    shift
+    ;;
+  --generation_config)
+    generation_config="$2"
+    shift
+    ;;
+  *)
+    echo "Invalid option: [$1]"
+    exit 1
+    ;;
+esac
+shift
+done
+
+if [ -z "${base_branch}" ]; then
+  echo "missing required argument --base_branch"
+  exit 1
+fi
+
+if [ -z "${repo}" ]; then
+  echo "missing required argument --repo"
+  exit 1
+fi
+
+if [ -z "${generation_config}" ]; then
+  generation_config="generation_config.yaml"
+  echo "Use default generation config: ${generation_config}"
+fi
+
+current_branch="generate-libraries-${base_branch}"
+title="chore: Update generation configuration at $(date)"
+
+# try to find a open pull request associated with the branch
+pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
+# create a branch if there's no open pull request associated with the
+# branch; otherwise checkout the pull request.
+if [ -z "${pr_num}" ]; then
+  git checkout -b "${current_branch}"
+else
+  gh pr checkout "${pr_num}"
+fi
+
+mkdir tmp-googleapis
+# use partial clone because only commit history is needed.
+git clone --filter=blob:none https://github.com/googleapis/googleapis.git tmp-googleapis
+pushd tmp-googleapis
+git pull
+latest_commit=$(git rev-parse HEAD)
+popd
+rm -rf tmp-googleapis
+update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
+
+# update gapic-generator-java version to the latest
+latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
+update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
+
+# update libraries-bom version to the latest
+latest_version=$(get_latest_released_version "com.google.cloud" "libraries-bom")
+update_config "libraries_bom_version" "${latest_version}" "${generation_config}"
+
+git add "${generation_config}"
+changed_files=$(git diff --cached --name-only)
+if [[ "${changed_files}" == "" ]]; then
+    echo "The latest generation config is not changed."
+    echo "Skip committing to the pull request."
+    exit 0
+fi
+git commit -m "${title}"
+if [ -z "${pr_num}" ]; then
+  git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${repo}.git"
+  git fetch -q --unshallow remote_repo
+  git push -f remote_repo "${current_branch}"
+  gh pr create --title "${title}" --head "${current_branch}" --body "${title}" --base "${base_branch}"
+else
+  git push
+  gh pr edit "${pr_num}" --title "${title}" --body "${title}"
+fi
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
new file mode 100644
index 000000000000..0c7a82a3ca5a
--- /dev/null
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -0,0 +1,38 @@
+# Copyright 2024 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.
+# GitHub action job to test core java library features on
+# downstream client libraries before they are released.
+name: Hermetic library generation upon generation config change through pull requests
+on:
+  pull_request:
+
+jobs:
+  library_generation:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+    - name: Generate changed libraries
+      shell: bash
+      run: |
+        set -x
+        [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
+        [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
+        bash .github/scriptes/hermetic_library_generation.sh \
+          --target_branch ${{ github.base_ref }} \
+          --current_branch ${{ github.head_ref }}
+      env:
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml
new file mode 100644
index 000000000000..3cf773992644
--- /dev/null
+++ b/.github/workflows/update_generation_config.yaml
@@ -0,0 +1,42 @@
+# Copyright 2024 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.
+# GitHub action job to test core java library features on
+# downstream client libraries before they are released.
+name: Update generation configuration
+on:
+  schedule:
+  - cron: '0 2 * * *'
+  workflow_dispatch:
+
+jobs:
+  update-generation-config:
+    runs-on: ubuntu-22.04
+    env:
+      # the branch into which the pull request is merged
+      base_branch: main
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+    - name: Update params in generation config to latest
+      shell: bash
+      run: |
+        set -x
+        [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
+        [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
+        bash .github/scripts/update_generation_config.sh \
+          --base_branch "${base_branch}"\
+          --repo ${{ github.repository }}
+      env:
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
diff --git a/generation_config.yaml b/generation_config.yaml
new file mode 100644
index 000000000000..ae6c9c9be829
--- /dev/null
+++ b/generation_config.yaml
@@ -0,0 +1,25 @@
+gapic_generator_version: 2.42.0
+googleapis_commitish: bcaed39fd1a805a6411a3992ea32dc1ba0ba7ec3
+libraries_bom_version: 26.38.0
+libraries:
+  - api_shortname: datastore
+    name_pretty: Cloud Datastore
+    product_documentation: https://cloud.google.com/datastore
+    client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
+    issue_tracker: https://issuetracker.google.com/savedsearches/559768
+    release_level: stable
+    language: java
+    repo: googleapis/java-datastore
+    repo_short: java-datastore
+    distribution_name: com.google.cloud:google-cloud-datastore
+    codeowner_team: '@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners'
+    api_id: datastore.googleapis.com
+    library_type: GAPIC_COMBO
+    api_description: is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.
+    excluded_dependencies: grpc-google-cloud-datastore-v1
+    extra_versioned_modules: datastore-v1-proto-client
+    excluded_poms: grpc-google-cloud-datastore-v1
+    recommended_package: com.google.cloud.datastore
+    GAPICs:
+      - proto_path: google/datastore/v1
+      - proto_path: google/datastore/admin/v1

From b55ec328ea1d8ca415d711bdffc2ce7246cc26d6 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 02:38:42 +0800
Subject: [PATCH 1413/1784] ci: [java] automatic kokoro label in and /gcbrun
 comment (#1965) (#1481)

Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3

Co-authored-by: Owl Bot 
---
 .github/.OwlBot.lock.yaml        | 4 ++--
 .github/trusted-contribution.yml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index f817c5f44999..359fe71c1964 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea
-# created: 2024-05-17T15:15:57.6714113Z
+  digest: sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3
+# created: 2024-06-05T18:32:21.724930324Z
diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
index a0ba1f7d9078..88d3ac9bf1a7 100644
--- a/.github/trusted-contribution.yml
+++ b/.github/trusted-contribution.yml
@@ -1,3 +1,9 @@
 trustedContributors:
 - renovate-bot
 - gcf-owl-bot[bot]
+
+annotations:
+- type: comment
+  text: "/gcbrun"
+- type: label
+  text: "kokoro:force-run"

From 43b00f3fa85b470f615c3d1cc2e0b85821dd4fbb Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 1 Jul 2024 21:26:50 +0200
Subject: [PATCH 1414/1784] test(deps): update dependency
 com.google.truth:truth to v1.4.3 (#1501)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index dd7683c6400b..019ad21c3971 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.4.2
+      1.4.3
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7a70bdf732db..e87d85d29b2e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -157,7 +157,7 @@
     
       com.google.truth
       truth
-      1.4.2
+      1.4.3
       test
     
   
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4b268da0e971..715d7154c314 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.4.2
+      1.4.3
       test
     
   
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 282d2e56d778..25f7e959a1f7 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -50,7 +50,7 @@
     
       com.google.truth
       truth
-      1.4.2
+      1.4.3
       test
     
   
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1f2e22ec4722..b1777167f7fc 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -41,7 +41,7 @@
     
       com.google.truth
       truth
-      1.4.2
+      1.4.3
       test
     
   
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 65ec852e3b02..5d57d6d14454 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.4.2
+      1.4.3
       test
     
   

From 515331e2ec6338f1bf8f3a59679957ce97b4fc11 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Tue, 2 Jul 2024 12:07:46 -0400
Subject: [PATCH 1415/1784] chore: correct hermetic library generation script
 path (#1506)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: correct hermetic library generation script path

* 🦉 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 
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 README.md                                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 0c7a82a3ca5a..3ea9ae43e4ac 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -31,7 +31,7 @@ jobs:
         set -x
         [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
         [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
-        bash .github/scriptes/hermetic_library_generation.sh \
+        bash .github/scripts/hermetic_library_generation.sh \
           --target_branch ${{ github.base_ref }} \
           --current_branch ${{ github.head_ref }}
       env:
diff --git a/README.md b/README.md
index 7ddb359d59e3..175ca2b8fd69 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.20.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.20.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.2"
 ```
 
 
@@ -480,7 +480,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

From c146cab1d0f328f83dce739b3dd33f75b9d4f36a Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Tue, 2 Jul 2024 18:54:24 -0400
Subject: [PATCH 1416/1784] chore: skip hermetic generation on fork PRs (#1510)

---
 .github/workflows/hermetic_library_generation.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 3ea9ae43e4ac..7146cc3dc1ca 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -19,6 +19,8 @@ on:
 
 jobs:
   library_generation:
+    # skip pull requests coming from a forked repository
+    if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

From 250f86b28ac5abcb6ce885a2128ad4e19e962b4f Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Wed, 3 Jul 2024 15:26:15 -0400
Subject: [PATCH 1417/1784] chore: make the owlbot postprocessor check
 non-required (#1512)

* chore: make the owlbot postprocessor check non-required

* remove required check in other branches
---
 .github/sync-repo-settings.yaml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 4bdaef4e9ed8..046f232007b2 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -15,7 +15,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
@@ -62,7 +61,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
   - pattern: 2.2.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
@@ -77,7 +75,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
   - pattern: 2.12.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
@@ -92,7 +89,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
   - pattern: multi-db
@@ -109,7 +105,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
   - pattern: V3-experimental
@@ -125,7 +120,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
@@ -142,7 +136,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
   - pattern: 2.17.x
@@ -158,7 +151,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
@@ -175,7 +167,6 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - OwlBot Post Processor
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc

From d9dff923ef0d5123d7aa1395e8fb3334bbe1aa41 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Wed, 3 Jul 2024 15:26:37 -0400
Subject: [PATCH 1418/1784] chore: disable the Owl Bot post-processor (#1511)

via deleting .OwlBot.lock.yaml (context)
---
 .github/.OwlBot.lock.yaml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .github/.OwlBot.lock.yaml

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
deleted file mode 100644
index 359fe71c1964..000000000000
--- a/.github/.OwlBot.lock.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2024 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.
-docker:
-  image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3
-# created: 2024-06-05T18:32:21.724930324Z

From b244b8f5e5b550f48c6bd3c94571fe2f494b3a8a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 9 Jul 2024 18:26:44 +0200
Subject: [PATCH 1419/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.41.0 (#1485)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 
Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 README.md                           | 2 +-
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 175ca2b8fd69..9089655ec47e 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.40.0
+      26.41.0
       pom
       import
     
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 25f7e959a1f7..0f3c1919c286 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.40.0
+        26.41.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 5d57d6d14454..f04cdc885d42 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.40.0
+        26.41.0
         pom
         import
       

From 6a6e925f2c24f88d30a662cb476210757af0cf69 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 14:58:22 +0000
Subject: [PATCH 1420/1784] chore(main): release 2.20.3-SNAPSHOT (#1504)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 019ad21c3971..70b9590b0383 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.20.2
+  2.20.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2
+    2.20.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5b01bd928d0a..281c581c920d 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.20.2
+  2.20.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.20.2
+        2.20.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.2
+        2.20.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.2
+        0.111.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.20.2
+        2.20.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e87d85d29b2e..b06df4c0f1a8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.20.2
+  2.20.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2
+    2.20.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 5c3f255f5cd3..69da06680eef 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.20.2
+  2.20.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2
+    2.20.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index b72ce5ec3bbb..407041f2b1a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.20.2
+  2.20.3-SNAPSHOT
   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.20.2
+        2.20.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.2
+        2.20.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.20.2
+        2.20.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.2
+        0.111.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.20.2
+        2.20.3-SNAPSHOT
         
           
             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 b63ebd708251..f53996a6d06f 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.20.2
+  2.20.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2
+    2.20.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8128587a618c..85f530c75b58 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.111.2
+  0.111.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.2
+    2.20.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b1777167f7fc..93710c03bc80 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.20.2
+      2.20.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index f42550e75212..5d2ffbced447 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.20.2:2.20.2
-google-cloud-datastore-bom:2.20.2:2.20.2
-proto-google-cloud-datastore-v1:0.111.2:0.111.2
-datastore-v1-proto-client:2.20.2:2.20.2
-proto-google-cloud-datastore-admin-v1:2.20.2:2.20.2
-grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.2
+google-cloud-datastore:2.20.2:2.20.3-SNAPSHOT
+google-cloud-datastore-bom:2.20.2:2.20.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.111.2:0.111.3-SNAPSHOT
+datastore-v1-proto-client:2.20.2:2.20.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT

From d4780095a6690dc01e7b50768a386bc26c9876b6 Mon Sep 17 00:00:00 2001
From: Min Zhu 
Date: Wed, 31 Jul 2024 16:55:44 -0400
Subject: [PATCH 1421/1784] chore: setup 2.19.x lts branch (#1535)

---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 53b119627f6f..cbb5be49c805 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -30,3 +30,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.17.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.19.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 046f232007b2..fce568dc2970 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -170,6 +170,22 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
+  - pattern: 2.19.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
 permissionRules:
   - team: yoshi-admins
     permission: admin

From 21d8cad8b198fafad904aaa0b5d07296bbf9350b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 21:24:20 +0000
Subject: [PATCH 1422/1784] chore(main): release 2.21.0 (#1517)

:robot: I have created a release *beep* *boop*
---


## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)


### Features

* Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ca1c263af5..52e107131622 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.21.0](https://github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)
+
+
+### Features
+
+* Enable hermetic library generation ([#1462](https://github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))
+
 ## [2.20.2](https://github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 70b9590b0383..59a18afe9df4 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.20.3-SNAPSHOT
+  2.21.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.3-SNAPSHOT
+    2.21.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 281c581c920d..87cc26a83670 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.20.3-SNAPSHOT
+  2.21.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.20.3-SNAPSHOT
+        2.21.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.3-SNAPSHOT
+        2.21.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.3-SNAPSHOT
+        0.112.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.20.3-SNAPSHOT
+        2.21.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b06df4c0f1a8..17c7d4ec73f8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.20.3-SNAPSHOT
+  2.21.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.3-SNAPSHOT
+    2.21.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 69da06680eef..c92a2e085075 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.20.3-SNAPSHOT
+  2.21.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.3-SNAPSHOT
+    2.21.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 407041f2b1a6..92e9e6b9c827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.20.3-SNAPSHOT
+  2.21.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.20.3-SNAPSHOT
+        2.21.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.20.3-SNAPSHOT
+        2.21.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.20.3-SNAPSHOT
+        2.21.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.111.3-SNAPSHOT
+        0.112.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.20.3-SNAPSHOT
+        2.21.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 f53996a6d06f..712d421f2f18 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.20.3-SNAPSHOT
+  2.21.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.3-SNAPSHOT
+    2.21.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 85f530c75b58..6a4c4c02625d 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.111.3-SNAPSHOT
+  0.112.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.20.3-SNAPSHOT
+    2.21.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 93710c03bc80..18c99a15228c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.20.3-SNAPSHOT
+      2.21.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 5d2ffbced447..5dca750afdd7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.20.2:2.20.3-SNAPSHOT
-google-cloud-datastore-bom:2.20.2:2.20.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.111.2:0.111.3-SNAPSHOT
-datastore-v1-proto-client:2.20.2:2.20.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT
+google-cloud-datastore:2.21.0:2.21.0
+google-cloud-datastore-bom:2.21.0:2.21.0
+proto-google-cloud-datastore-v1:0.112.0:0.112.0
+datastore-v1-proto-client:2.21.0:2.21.0
+proto-google-cloud-datastore-admin-v1:2.21.0:2.21.0
+grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.0

From 9e52395f7ee71315331790284d35e7aad2f387ed Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 6 Aug 2024 16:35:45 +0200
Subject: [PATCH 1423/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index ec72b08ac6c7..ffc8585434eb 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 0c813eaf7e7f..a452e7c8cf53 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index ef1c9176c553..ad15d4f7f678 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 87cc26a83670..f1be69a621d4 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.32.0
+    3.33.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 92e9e6b9c827..5f7573e982ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.32.0
+    3.33.0
   
 
   

From 2e3926510913d4c429666d96b4333952db0fd350 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 11:02:31 -0700
Subject: [PATCH 1424/1784] chore(main): release 2.21.1-SNAPSHOT (#1538)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 59a18afe9df4..58425b4b135c 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.21.0
+  2.21.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.0
+    2.21.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f1be69a621d4..fa6abfeda71c 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.21.0
+  2.21.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.0
+        2.21.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.0
+        2.21.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.0
+        0.112.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.0
+        2.21.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 17c7d4ec73f8..6e8fc6b8f0fb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.0
+  2.21.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.0
+    2.21.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index c92a2e085075..c74367bf9539 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.21.0
+  2.21.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.0
+    2.21.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 5f7573e982ca..85eeafc8e4aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.0
+  2.21.1-SNAPSHOT
   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.21.0
+        2.21.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.0
+        2.21.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.0
+        2.21.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.0
+        0.112.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.0
+        2.21.1-SNAPSHOT
         
           
             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 712d421f2f18..533ad8ad32c5 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.21.0
+  2.21.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.0
+    2.21.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6a4c4c02625d..b8bb530fabfa 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.112.0
+  0.112.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.0
+    2.21.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 18c99a15228c..b182ec319b8e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.0
+      2.21.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 5dca750afdd7..5141114d4486 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.0:2.21.0
-google-cloud-datastore-bom:2.21.0:2.21.0
-proto-google-cloud-datastore-v1:0.112.0:0.112.0
-datastore-v1-proto-client:2.21.0:2.21.0
-proto-google-cloud-datastore-admin-v1:2.21.0:2.21.0
-grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.0
+google-cloud-datastore:2.21.0:2.21.1-SNAPSHOT
+google-cloud-datastore-bom:2.21.0:2.21.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.112.0:0.112.1-SNAPSHOT
+datastore-v1-proto-client:2.21.0:2.21.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT

From 7bc796e78a4aff21d9a02fe5a315a3383a0c1a71 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 6 Aug 2024 20:15:59 +0200
Subject: [PATCH 1425/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.43.0 (#1515)

---
 samples/native-image-sample/pom.xml | 2 +-
 samples/snippets/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 0f3c1919c286..5a0ee23869e2 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
       
         com.google.cloud
         libraries-bom
-        26.41.0
+        26.43.0
         pom
         import
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f04cdc885d42..7e4de0be6221 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.41.0
+        26.43.0
         pom
         import
       

From a9e90f321da9d4061d3c87a2f5b7f30662b401ca Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 13:45:05 -0700
Subject: [PATCH 1426/1784] chore(main): release 2.21.1 (#1540)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e107131622..f6234e13b4e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.21.1](https://github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) (2024-08-06)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#1531](https://github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))
+
 ## [2.21.0](https://github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 58425b4b135c..eb7a2871360f 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.21.1-SNAPSHOT
+  2.21.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1-SNAPSHOT
+    2.21.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index fa6abfeda71c..c683a94740a1 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.21.1-SNAPSHOT
+  2.21.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.1-SNAPSHOT
+        2.21.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.1-SNAPSHOT
+        2.21.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.1-SNAPSHOT
+        0.112.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.1-SNAPSHOT
+        2.21.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6e8fc6b8f0fb..29bb63d3df46 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.1-SNAPSHOT
+  2.21.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1-SNAPSHOT
+    2.21.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index c74367bf9539..373333ce358b 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.21.1-SNAPSHOT
+  2.21.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1-SNAPSHOT
+    2.21.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 85eeafc8e4aa..72d70b38699e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.1-SNAPSHOT
+  2.21.1
   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.21.1-SNAPSHOT
+        2.21.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.1-SNAPSHOT
+        2.21.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.1-SNAPSHOT
+        2.21.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.1-SNAPSHOT
+        0.112.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.1-SNAPSHOT
+        2.21.1
         
           
             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 533ad8ad32c5..1c660d581804 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.21.1-SNAPSHOT
+  2.21.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1-SNAPSHOT
+    2.21.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b8bb530fabfa..4740a89c45c3 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.112.1-SNAPSHOT
+  0.112.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1-SNAPSHOT
+    2.21.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b182ec319b8e..3d3b267ebfc2 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.1-SNAPSHOT
+      2.21.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 5141114d4486..478c0b62e9c0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.0:2.21.1-SNAPSHOT
-google-cloud-datastore-bom:2.21.0:2.21.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.112.0:0.112.1-SNAPSHOT
-datastore-v1-proto-client:2.21.0:2.21.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT
+google-cloud-datastore:2.21.1:2.21.1
+google-cloud-datastore-bom:2.21.1:2.21.1
+proto-google-cloud-datastore-v1:0.112.1:0.112.1
+datastore-v1-proto-client:2.21.1:2.21.1
+proto-google-cloud-datastore-admin-v1:2.21.1:2.21.1
+grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.1

From af6831d51285fe851f0999c613ad4a52aadfdb1d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:28:27 +0000
Subject: [PATCH 1427/1784] chore(main): release 2.21.2-SNAPSHOT (#1541)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index eb7a2871360f..38ede6074a6a 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.21.1
+  2.21.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1
+    2.21.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c683a94740a1..234946cf0d94 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.21.1
+  2.21.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.1
+        2.21.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.1
+        2.21.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.1
+        0.112.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.1
+        2.21.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 29bb63d3df46..b9e2da34afb2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.1
+  2.21.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1
+    2.21.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 373333ce358b..793e30422dbf 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.21.1
+  2.21.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1
+    2.21.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 72d70b38699e..4fcdfc0e2a5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.1
+  2.21.2-SNAPSHOT
   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.21.1
+        2.21.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.1
+        2.21.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.1
+        2.21.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.1
+        0.112.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.1
+        2.21.2-SNAPSHOT
         
           
             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 1c660d581804..4032680c9cc0 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.21.1
+  2.21.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1
+    2.21.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4740a89c45c3..0e9cb573698c 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.112.1
+  0.112.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.1
+    2.21.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3d3b267ebfc2..aea2bd2f35fd 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.1
+      2.21.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 478c0b62e9c0..8b0985906d76 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.1:2.21.1
-google-cloud-datastore-bom:2.21.1:2.21.1
-proto-google-cloud-datastore-v1:0.112.1:0.112.1
-datastore-v1-proto-client:2.21.1:2.21.1
-proto-google-cloud-datastore-admin-v1:2.21.1:2.21.1
-grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.1
+google-cloud-datastore:2.21.1:2.21.2-SNAPSHOT
+google-cloud-datastore-bom:2.21.1:2.21.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.112.1:0.112.2-SNAPSHOT
+datastore-v1-proto-client:2.21.1:2.21.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT

From 642e12f0929a3def103cb5e1339a8224bb434658 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Tue, 20 Aug 2024 13:59:45 -0400
Subject: [PATCH 1428/1784] chore: secure hermetic_library_generation workflow
 (#1552)

* chore: secure hermetic_library_generation workflow

Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections.

* fix wording
---
 .github/workflows/hermetic_library_generation.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 7146cc3dc1ca..ab23b9fec097 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -17,10 +17,14 @@ name: Hermetic library generation upon generation config change through pull req
 on:
   pull_request:
 
+env:
+  HEAD_REF: ${{ github.head_ref }}
+  REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
+
 jobs:
   library_generation:
     # skip pull requests coming from a forked repository
-    if: github.event.pull_request.head.repo.full_name == github.repository
+    if: github.env.REPO_FULL_NAME == github.repository
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -30,11 +34,11 @@ jobs:
     - name: Generate changed libraries
       shell: bash
       run: |
-        set -x
+        set -ex
         [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
         [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
         bash .github/scripts/hermetic_library_generation.sh \
           --target_branch ${{ github.base_ref }} \
-          --current_branch ${{ github.head_ref }}
+          --current_branch $HEAD_REF
       env:
         GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}

From 8c5f5954d88732ab929b4477a3f15b0052adc2ff Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 22 Aug 2024 19:30:09 +0200
Subject: [PATCH 1429/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index ffc8585434eb..84c86037f026 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.34.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index a452e7c8cf53..639683e726d7 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.34.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index ad15d4f7f678..b2121a633699 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.34.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 234946cf0d94..435b6e8949a7 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.33.0
+    3.34.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 4fcdfc0e2a5c..85ab3c70b9a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.33.0
+    3.34.0
   
 
   

From e368dc5f87020212f6ef4bde82fa958ac1ccbcfe Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 09:14:44 -0700
Subject: [PATCH 1430/1784] chore(main): release 2.21.2 (#1553)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6234e13b4e3..e953fa33fb64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.21.2](https://github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) (2024-08-22)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#1547](https://github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))
+
 ## [2.21.1](https://github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) (2024-08-06)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 38ede6074a6a..ae1f83917a41 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.21.2-SNAPSHOT
+  2.21.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2-SNAPSHOT
+    2.21.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 435b6e8949a7..63beb11f1e86 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.21.2-SNAPSHOT
+  2.21.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.2-SNAPSHOT
+        2.21.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.2-SNAPSHOT
+        2.21.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.2-SNAPSHOT
+        0.112.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.2-SNAPSHOT
+        2.21.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b9e2da34afb2..e928bea4e0e5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.2-SNAPSHOT
+  2.21.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2-SNAPSHOT
+    2.21.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 793e30422dbf..6527e96f3a20 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.21.2-SNAPSHOT
+  2.21.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2-SNAPSHOT
+    2.21.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 85ab3c70b9a1..fda01b132e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.2-SNAPSHOT
+  2.21.2
   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.21.2-SNAPSHOT
+        2.21.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.2-SNAPSHOT
+        2.21.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.2-SNAPSHOT
+        2.21.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.2-SNAPSHOT
+        0.112.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.2-SNAPSHOT
+        2.21.2
         
           
             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 4032680c9cc0..a8c91f4dde16 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.21.2-SNAPSHOT
+  2.21.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2-SNAPSHOT
+    2.21.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0e9cb573698c..bf896574d07e 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.112.2-SNAPSHOT
+  0.112.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2-SNAPSHOT
+    2.21.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index aea2bd2f35fd..5f2e900a831f 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.2-SNAPSHOT
+      2.21.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 8b0985906d76..3cee21923c1a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.1:2.21.2-SNAPSHOT
-google-cloud-datastore-bom:2.21.1:2.21.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.112.1:0.112.2-SNAPSHOT
-datastore-v1-proto-client:2.21.1:2.21.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT
+google-cloud-datastore:2.21.2:2.21.2
+google-cloud-datastore-bom:2.21.2:2.21.2
+proto-google-cloud-datastore-v1:0.112.2:0.112.2
+datastore-v1-proto-client:2.21.2:2.21.2
+proto-google-cloud-datastore-admin-v1:2.21.2:2.21.2
+grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.2

From f209ad4302cdaa95f5e98824457878a09d6f71f9 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:16:23 -0400
Subject: [PATCH 1431/1784] chore: remove datastore native image sample in
 favor of sample hosted in google-cloud-java (#1519)

---
 samples/native-image-sample/README.md         |  96 ------------
 samples/native-image-sample/pom.xml           | 141 ------------------
 .../datastore/NativeImageDatastoreSample.java | 131 ----------------
 .../ITNativeImageDatastoreSample.java         |  75 ----------
 samples/pom.xml                               |   1 -
 5 files changed, 444 deletions(-)
 delete mode 100644 samples/native-image-sample/README.md
 delete mode 100644 samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
 delete mode 100644 samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java

diff --git a/samples/native-image-sample/README.md b/samples/native-image-sample/README.md
deleted file mode 100644
index 5f2cfbd271a8..000000000000
--- a/samples/native-image-sample/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Datastore Sample Application with Native Image
-
-This application uses the [Google Cloud Datastore client library](https://cloud.google.com/datastore/docs/reference/libraries) and is compatible with Native Image compilation.
-
-This sample runs through some basic operations of creating/deleting entities, running queries, and running transaction code.
-
-## Setup Instructions
-
-You will need to follow these prerequisite steps in order to run the samples:
-
-1. If you have not already, [create a Google Cloud Platform Project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project).
-
-2. Install the [Google Cloud SDK](https://cloud.google.com/sdk/) which will allow you to run the sample with your project's credentials.
-
-   Once installed, log in with Application Default Credentials using the following command:
-
-    ```
-    gcloud auth application-default login
-    ```
-
-   **Note:** Authenticating with Application Default Credentials is convenient to use during development, but we recommend [alternate methods of authentication](https://cloud.google.com/docs/authentication/production) during production use.
-
-3. Install the native image compiler.
-
-   You can follow the [installation instructions](https://www.graalvm.org/docs/getting-started/#install-graalvm).
-   After following the instructions, ensure that you install the native image extension installed by running:
-
-    ```
-    gu install native-image
-    ```
-
-   Once you finish following the instructions, verify that the default version of Java is set to the correct version by running `java -version` in a terminal.
-
-   You will see something similar to the below output:
-
-    ```
-    $ java -version
-   
-    openjdk version "17.0.3" 2022-04-19
-    OpenJDK Runtime Environment GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06)
-    OpenJDK 64-Bit Server VM GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06, mixed mode, sharing)
-    ```
-## Sample
-1. **(Optional)** If you wish to run the application against the [Datastore emulator](https://cloud.google.com/sdk/gcloud/reference/beta/emulators/datastore), ensure that you have the [Google Cloud SDK](https://cloud.google.com/sdk) installed.
-
-   In a new terminal window, start the emulator via `gcloud`:
-
-    ```
-    gcloud beta emulators datastore start --host-port=localhost:9010
-    ```
-
-   Leave the emulator running in this terminal for now.
-   In the next section, we will run the sample application against the Datastore emulator instance.
-
-2. Navigate to this directory and compile the application with the native image compiler.
-
-    ```
-    mvn package -P native -DskipTests
-    ```
-
-3. **(Optional)** If you're using the emulator, export the `DATASTORE_EMULATOR_HOST` as an environment variable in your terminal.
-
-    ```
-    export DATASTORE_EMULATOR_HOST=localhost:9010
-    ``` 
-
-   The Datastore Client Libraries will detect this environment variable and automatically connect to the emulator instance if this variable is set.
-
-4. Run the application.
-
-    ```
-    ./target/native-image-sample
-    ```
-
-5. The application will run through some basic Datastore operations and log some output statements.
-
-   ```
-      Successfully added entity.
-      Reading entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e
-      Successfully deleted entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e
-      Run fake transaction code.
-      Found entity:
-          name=de4f36f4-3936-4252-98d3-e0d56d485254
-          kind=test-kind
-          namespace=nativeimage-test-namespace
-          properties={description=StringValue{valueType=STRING, excludeFromIndexes=false, meaning=0, value=hello world}}
-      Ran transaction callable.
-   ```
-
-### Sample Integration test with Native Image Support
-
-In order to run the sample integration test as a native image, call the following command:
-
-   ```
-   mvn test -Pnative
-   ```
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 5a0ee23869e2..e69de29bb2d1 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -1,141 +0,0 @@
-
-
-  4.0.0
-  com.example.datastore
-  native-image-sample
-  Native Image Sample
-  https://github.com/googleapis/java-datastore
-
-  
-  
-    com.google.cloud.samples
-    shared-configuration
-    1.2.0
-  
-
-  
-    
-    1.8
-    1.8
-    UTF-8
-  
-
-  
-    
-      
-        com.google.cloud
-        libraries-bom
-        26.43.0
-        pom
-        import
-      
-    
-  
-
-  
-    
-      com.google.cloud
-      google-cloud-datastore
-    
-
-    
-      junit
-      junit
-      4.13.2
-      test
-    
-    
-      com.google.truth
-      truth
-      1.4.3
-      test
-    
-  
-
-  
-    
-      
-        org.apache.maven.plugins
-        maven-jar-plugin
-        
-          
-            
-              com.example.datastore.NativeImageDatastoreSample
-            
-          
-        
-      
-    
-  
-
-  
-  
-    
-      native
-
-      
-        
-          org.junit.vintage
-          junit-vintage-engine
-          5.10.2
-          test
-        
-        
-          org.graalvm.buildtools
-          junit-platform-native
-          0.10.2
-          test
-        
-      
-
-      
-        
-          
-            org.apache.maven.plugins
-            maven-surefire-plugin
-             
-            3.2.5
-            
-              
-                **/IT*
-              
-            
-          
-          
-            org.graalvm.buildtools
-            native-maven-plugin
-            0.10.2
-            true
-            
-              com.example.datastore.NativeImageDatastoreSample
-              
-                --no-fallback
-                --no-server
-              
-            
-            
-              
-                build-native
-                
-                  build
-                  test
-                
-                package
-              
-              
-                test-native
-                
-                  test
-                
-                test
-              
-            
-          
-        
-      
-    
-  
-
\ No newline at end of file
diff --git a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
deleted file mode 100644
index 7ce5c900a964..000000000000
--- a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2020-2021 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
- *
- *     https://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.example.datastore;
-
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.DatastoreOptions;
-import com.google.cloud.datastore.Entity;
-import com.google.cloud.datastore.Key;
-import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.QueryResults;
-import com.google.cloud.datastore.StructuredQuery;
-import com.google.cloud.datastore.Transaction;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.UUID;
-
-/** Sample Datastore Application. */
-public class NativeImageDatastoreSample {
-
-  /* Datastore namespace where entities will be created. */
-  private static final String TEST_NAMESPACE = "nativeimage-test-namespace";
-
-  /* Datastore kind used. */
-  private static final String TEST_KIND = "test-kind";
-
-  /** Entrypoint to the Datastore sample application. */
-  public static void main(String[] args) {
-    Instant startTime = Instant.now();
-    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
-
-    String testId = UUID.randomUUID().toString();
-
-    addEntity(datastore, testId);
-    getEntity(datastore, testId);
-    deleteEntity(datastore, testId);
-
-    runTransaction(datastore);
-
-    String id = UUID.randomUUID().toString();
-    Key key = createKey(datastore, id);
-    runTransactionCallable(datastore, key);
-    Instant endTime = Instant.now();
-    Duration duration = Duration.between(startTime, endTime);
-    System.out.println("Duration: " + duration.toString());
-  }
-
-  static void addEntity(Datastore datastore, String id) {
-    Key key = createKey(datastore, id);
-    Entity entity = Entity.newBuilder(key).set("description", "hello world").build();
-    datastore.add(entity);
-    System.out.println("Successfully added entity.");
-  }
-
-  static void getEntity(Datastore datastore, String id) {
-    Key key = createKey(datastore, id);
-    Entity entity = datastore.get(key);
-    System.out.println("Reading entity: " + entity.getKey().getName());
-  }
-
-  static void deleteEntity(Datastore datastore, String id) {
-    Key key = createKey(datastore, id);
-    datastore.delete(key);
-
-    Entity entity = datastore.get(key);
-    if (entity == null) {
-      System.out.println("Successfully deleted entity: " + id);
-    } else {
-      throw new RuntimeException("Failed to delete entity: " + id);
-    }
-  }
-
-  static void runTransactionCallable(Datastore datastore, Key entityKey) {
-    datastore.runInTransaction(
-        client -> {
-          Entity entity = Entity.newBuilder(entityKey).set("description", "hello world").build();
-          datastore.add(entity);
-
-          StructuredQuery query =
-              Query.newEntityQueryBuilder().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).build();
-
-          QueryResults results = datastore.run(query);
-          while (results.hasNext()) {
-            Entity result = results.next();
-            String name = result.getKey().getName();
-            String kind = result.getKey().getKind();
-            String namespace = result.getKey().getNamespace();
-            System.out.println(
-                "Found entity:"
-                    + "\n\t\tname="
-                    + name
-                    + "\n\t\tkind="
-                    + kind
-                    + "\n\t\tnamespace="
-                    + namespace
-                    + "\n\t\tproperties="
-                    + result.getProperties().toString());
-          }
-
-          datastore.delete(entityKey);
-          return null;
-        });
-
-    System.out.println("Ran transaction callable.");
-  }
-
-  private static void runTransaction(Datastore datastore) {
-    Transaction transaction = datastore.newTransaction();
-    transaction.commit();
-    transaction = datastore.newTransaction();
-    transaction.rollback();
-    System.out.println("Run fake transaction code.");
-  }
-
-  static Key createKey(Datastore datastore, String id) {
-    return datastore.newKeyFactory().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).newKey(id);
-  }
-}
diff --git a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java
deleted file mode 100644
index 710f18367554..000000000000
--- a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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
- *
- *     https://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.example.datastore;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.DatastoreOptions;
-import com.google.cloud.datastore.Key;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.UUID;
-import org.junit.Before;
-import org.junit.Test;
-
-/** Tests for {@link com.example.datastore.NativeImageDatastoreSample} */
-public class ITNativeImageDatastoreSample {
-
-  private Datastore datastore;
-  private ByteArrayOutputStream bout;
-  private PrintStream out;
-
-  @Before
-  public void setUp() {
-    datastore = DatastoreOptions.getDefaultInstance().getService();
-    bout = new ByteArrayOutputStream();
-    out = new PrintStream(bout);
-    System.setOut(out);
-  }
-
-  @Test
-  public void testAddAndGetEntity() {
-    bout.reset();
-    String testId = "test-id-" + UUID.randomUUID();
-    NativeImageDatastoreSample.addEntity(datastore, testId);
-    NativeImageDatastoreSample.getEntity(datastore, testId);
-    assertThat(bout.toString()).contains("Reading entity: " + testId);
-
-    NativeImageDatastoreSample.deleteEntity(datastore, testId);
-  }
-
-  @Test
-  public void testRunTransactionalCallable() {
-    bout.reset();
-    String testId = "test-id-" + UUID.randomUUID();
-    Key key = NativeImageDatastoreSample.createKey(datastore, testId);
-    NativeImageDatastoreSample.runTransactionCallable(datastore, key);
-    assertThat(bout.toString())
-        .contains(
-            "Found entity:"
-                + "\n\t\tname="
-                + testId
-                + "\n\t\tkind=test-kind"
-                + "\n\t\tnamespace=nativeimage-test-namespace"
-                + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false,"
-                + " meaning=0, value=hello world}}\n"
-                + "Ran transaction callable.");
-
-    NativeImageDatastoreSample.deleteEntity(datastore, "test-id");
-  }
-}
diff --git a/samples/pom.xml b/samples/pom.xml
index e81bec4509b4..2e970d081a36 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -31,7 +31,6 @@
     install-without-bom
     snapshot
     snippets
-    native-image-sample
   
 
   

From da529327d2d0de790b1011ad01de29d7429cef10 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Thu, 5 Sep 2024 13:16:06 -0400
Subject: [PATCH 1432/1784] chore: remove unused image tag in
 .OwlBot-hermetic.yaml (#1559)

This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo.

Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline).
---
 .github/.OwlBot-hermetic.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/.OwlBot-hermetic.yaml b/.github/.OwlBot-hermetic.yaml
index d89045599416..02f0dd37bbac 100644
--- a/.github/.OwlBot-hermetic.yaml
+++ b/.github/.OwlBot-hermetic.yaml
@@ -11,9 +11,6 @@
 # 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.
-
-docker:
-  image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
 deep-remove-regex:
 - "/proto-google-.*/src"
 
@@ -29,4 +26,4 @@ deep-copy-regex:
   dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-admin-$1/src"
 # Admin & Data APIs share the same wrapper library.
 - source: "/google/datastore/admin/(v.*)/.*-java/gapic-google-.*/src"
-  dest: "/owl-bot-staging/$1/google-cloud-datastore/src"
\ No newline at end of file
+  dest: "/owl-bot-staging/$1/google-cloud-datastore/src"

From a9e8a670c1bcd8ff836200d8fd3d909f11a6bcdb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 23:30:25 +0000
Subject: [PATCH 1433/1784] chore(main): release 2.21.3-SNAPSHOT (#1554)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ae1f83917a41..52758f476694 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.21.2
+  2.21.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2
+    2.21.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 63beb11f1e86..452c69153d5d 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.21.2
+  2.21.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.2
+        2.21.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.2
+        2.21.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.2
+        0.112.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.2
+        2.21.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e928bea4e0e5..85359ce2640e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.2
+  2.21.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2
+    2.21.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 6527e96f3a20..0464bed48ab3 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.21.2
+  2.21.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2
+    2.21.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index fda01b132e32..054bcb00970b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.2
+  2.21.3-SNAPSHOT
   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.21.2
+        2.21.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.2
+        2.21.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.2
+        2.21.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.2
+        0.112.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.2
+        2.21.3-SNAPSHOT
         
           
             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 a8c91f4dde16..e9a85dc5e950 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.21.2
+  2.21.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2
+    2.21.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index bf896574d07e..a8d6064ca947 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.112.2
+  0.112.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.2
+    2.21.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5f2e900a831f..662500308aee 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.2
+      2.21.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 3cee21923c1a..a22a8396ef1d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.2:2.21.2
-google-cloud-datastore-bom:2.21.2:2.21.2
-proto-google-cloud-datastore-v1:0.112.2:0.112.2
-datastore-v1-proto-client:2.21.2:2.21.2
-proto-google-cloud-datastore-admin-v1:2.21.2:2.21.2
-grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.2
+google-cloud-datastore:2.21.2:2.21.3-SNAPSHOT
+google-cloud-datastore-bom:2.21.2:2.21.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.112.2:0.112.3-SNAPSHOT
+datastore-v1-proto-client:2.21.2:2.21.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT

From 99e9d175d7df36c356c35101c0a01d803b676131 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:13:22 -0400
Subject: [PATCH 1434/1784] chore: Update generation configuration at Tue Sep
 10 17:00:48 UTC 2024 (#1564)

---
 generation_config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index ae6c9c9be829..941eaaef0391 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.42.0
-googleapis_commitish: bcaed39fd1a805a6411a3992ea32dc1ba0ba7ec3
-libraries_bom_version: 26.38.0
+gapic_generator_version: 2.45.0
+googleapis_commitish: 02f62c8e241a9f95f0d183785354e90e35388cbd
+libraries_bom_version: 26.45.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 27e6063656dc22dbc3e9909d57274762b0ed2615 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Sep 2024 20:20:28 +0200
Subject: [PATCH 1435/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.45.0 (#1544)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011))
-   update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f))

### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0))
-   update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 7e4de0be6221..bd49599d33ad 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.43.0
+        26.45.0
         pom
         import
       

From 5a79fd8d1202e65c02423fe40402c41af6050efa Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Sep 2024 22:56:12 +0200
Subject: [PATCH 1436/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 84c86037f026..9d1576d940ff 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.34.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.35.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 639683e726d7..41590566e638 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.34.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.35.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index b2121a633699..d6941e80e7fd 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.34.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.35.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 452c69153d5d..0fe170fa1a61 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.34.0
+    3.35.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 054bcb00970b..503e5e530ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.34.0
+    3.35.0
   
 
   

From 18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Sep 2024 22:56:39 +0200
Subject: [PATCH 1437/1784] deps: update dependency
 com.google.guava:guava-testlib to v33.3.0-jre (#1548)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 85359ce2640e..c80548fe54ce 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -122,7 +122,7 @@
     
       com.google.guava
       guava-testlib
-      33.2.1-jre
+      33.3.0-jre
       test
     
     

From 8d3af322fb56032cd7a9d29e60fd93d1f3e7e632 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Sep 2024 23:00:40 +0200
Subject: [PATCH 1438/1784] deps: update dependency
 com.google.errorprone:error_prone_core to v2.31.0 (#1523)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone (com.google.errorprone:error_prone_core)

### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0

This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`.

Changes:

-   Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe)
-   Improved support for latest JDK 24 EA builds
-   Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756))

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing.

Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0

### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes.
-   [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions.
-   [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches.

Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487)

Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0

### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus:

-   a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479))
-   restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2

### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus:

-   a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451))
-   a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1

### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0

New checks:

-   [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention)
-   [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized)
-   [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch)

Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467)

Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 503e5e530ca6..6ab0ec44898b 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.28.0
+    2.31.0
       
 
   

From 90811b6bda565701fe8be59ac589591d002e8001 Mon Sep 17 00:00:00 2001
From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:40:09 +0000
Subject: [PATCH 1439/1784] chore: change if condition in workflow (#1567)

* chore: change if condition in workflow

* add head_ref

* add var
---
 .../hermetic_library_generation.yaml          | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index ab23b9fec097..0266fbc96a3e 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -18,27 +18,37 @@ on:
   pull_request:
 
 env:
-  HEAD_REF: ${{ github.head_ref }}
   REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
+  GITHUB_REPOSITORY: ${{ github.repository }}
 
 jobs:
   library_generation:
-    # skip pull requests coming from a forked repository
-    if: github.env.REPO_FULL_NAME == github.repository
     runs-on: ubuntu-latest
     steps:
+    - name: Determine whether the pull request comes from a fork
+      run: |
+        if [[ "${GITHUB_REPOSITORY}" != "${REPO_FULL_NAME}" ]]; then
+          echo "This PR comes from a fork. Skip library generation."
+          echo "SHOULD_RUN=false" >> $GITHUB_ENV
+        else
+          echo "SHOULD_RUN=true" >> $GITHUB_ENV
+        fi
     - uses: actions/checkout@v4
+      if: env.SHOULD_RUN == 'true'
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
     - name: Generate changed libraries
+      if: env.SHOULD_RUN == 'true'
       shell: bash
       run: |
         set -ex
         [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
         [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
         bash .github/scripts/hermetic_library_generation.sh \
-          --target_branch ${{ github.base_ref }} \
-          --current_branch $HEAD_REF
+          --target_branch "${BASE_REF}" \
+          --current_branch "${HEAD_REF}"
       env:
+        BASE_REF: ${{ github.base_ref }}
+        HEAD_REF: ${{ github.head_ref }}
         GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}

From 4ce30824c4dc0a57ae5ad84a5749f7dda99ab319 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:59:24 -0400
Subject: [PATCH 1440/1784] chore: Update generation configuration at Wed Sep
 11 15:40:41 UTC 2024 (#1568)

* chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024

* chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024
---
 .repo-metadata.json                           | 12 +++--
 README.md                                     | 25 +++++-----
 generation_config.yaml                        |  2 +-
 .../admin/v1/DatastoreAdminSettings.java      | 43 +++++++++++++++-
 .../v1/stub/DatastoreAdminStubSettings.java   | 49 +++++++++++++++++--
 .../reflect-config.json                       | 18 +++++++
 .../datastore/admin/v1/CommonMetadata.java    |  2 +-
 .../admin/v1/CommonMetadataOrBuilder.java     |  2 +-
 .../admin/v1/CreateIndexRequest.java          |  2 +-
 .../admin/v1/CreateIndexRequestOrBuilder.java |  2 +-
 .../admin/v1/DatastoreAdminProto.java         |  2 +-
 .../DatastoreFirestoreMigrationMetadata.java  |  2 +-
 ...reFirestoreMigrationMetadataOrBuilder.java |  2 +-
 .../admin/v1/DeleteIndexRequest.java          |  2 +-
 .../admin/v1/DeleteIndexRequestOrBuilder.java |  2 +-
 .../datastore/admin/v1/EntityFilter.java      |  2 +-
 .../admin/v1/EntityFilterOrBuilder.java       |  2 +-
 .../admin/v1/ExportEntitiesMetadata.java      |  2 +-
 .../v1/ExportEntitiesMetadataOrBuilder.java   |  2 +-
 .../admin/v1/ExportEntitiesRequest.java       |  2 +-
 .../v1/ExportEntitiesRequestOrBuilder.java    |  2 +-
 .../admin/v1/ExportEntitiesResponse.java      |  2 +-
 .../v1/ExportEntitiesResponseOrBuilder.java   |  2 +-
 .../datastore/admin/v1/GetIndexRequest.java   |  2 +-
 .../admin/v1/GetIndexRequestOrBuilder.java    |  2 +-
 .../admin/v1/ImportEntitiesMetadata.java      |  2 +-
 .../v1/ImportEntitiesMetadataOrBuilder.java   |  2 +-
 .../admin/v1/ImportEntitiesRequest.java       |  2 +-
 .../v1/ImportEntitiesRequestOrBuilder.java    |  2 +-
 .../com/google/datastore/admin/v1/Index.java  |  2 +-
 .../admin/v1/IndexOperationMetadata.java      |  2 +-
 .../v1/IndexOperationMetadataOrBuilder.java   |  2 +-
 .../datastore/admin/v1/IndexOrBuilder.java    |  2 +-
 .../google/datastore/admin/v1/IndexProto.java |  2 +-
 .../admin/v1/ListIndexesRequest.java          |  2 +-
 .../admin/v1/ListIndexesRequestOrBuilder.java |  2 +-
 .../admin/v1/ListIndexesResponse.java         |  2 +-
 .../v1/ListIndexesResponseOrBuilder.java      |  2 +-
 .../admin/v1/MigrationProgressEvent.java      |  2 +-
 .../v1/MigrationProgressEventOrBuilder.java   |  2 +-
 .../datastore/admin/v1/MigrationProto.java    |  2 +-
 .../datastore/admin/v1/MigrationState.java    |  2 +-
 .../admin/v1/MigrationStateEvent.java         |  2 +-
 .../v1/MigrationStateEventOrBuilder.java      |  2 +-
 .../datastore/admin/v1/MigrationStep.java     |  2 +-
 .../datastore/admin/v1/OperationType.java     |  2 +-
 .../google/datastore/admin/v1/Progress.java   |  2 +-
 .../datastore/admin/v1/ProgressOrBuilder.java |  2 +-
 .../google/datastore/v1/AggregationQuery.java |  2 +-
 .../v1/AggregationQueryOrBuilder.java         |  2 +-
 .../datastore/v1/AggregationResult.java       |  2 +-
 .../datastore/v1/AggregationResultBatch.java  |  2 +-
 .../v1/AggregationResultBatchOrBuilder.java   |  2 +-
 .../v1/AggregationResultOrBuilder.java        |  2 +-
 .../datastore/v1/AggregationResultProto.java  | 14 +++---
 .../datastore/v1/AllocateIdsRequest.java      |  2 +-
 .../v1/AllocateIdsRequestOrBuilder.java       |  2 +-
 .../datastore/v1/AllocateIdsResponse.java     |  2 +-
 .../v1/AllocateIdsResponseOrBuilder.java      |  2 +-
 .../com/google/datastore/v1/ArrayValue.java   |  2 +-
 .../datastore/v1/ArrayValueOrBuilder.java     |  2 +-
 .../datastore/v1/BeginTransactionRequest.java |  2 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |  2 +-
 .../v1/BeginTransactionResponse.java          |  2 +-
 .../v1/BeginTransactionResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/CommitRequest.java    |  2 +-
 .../datastore/v1/CommitRequestOrBuilder.java  |  2 +-
 .../google/datastore/v1/CommitResponse.java   |  2 +-
 .../datastore/v1/CommitResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/CompositeFilter.java  |  2 +-
 .../v1/CompositeFilterOrBuilder.java          |  2 +-
 .../google/datastore/v1/DatastoreProto.java   | 14 +++---
 .../java/com/google/datastore/v1/Entity.java  |  2 +-
 .../google/datastore/v1/EntityOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/EntityProto.java  | 12 ++---
 .../com/google/datastore/v1/EntityResult.java |  2 +-
 .../datastore/v1/EntityResultOrBuilder.java   |  2 +-
 .../google/datastore/v1/ExecutionStats.java   |  2 +-
 .../datastore/v1/ExecutionStatsOrBuilder.java |  2 +-
 .../google/datastore/v1/ExplainMetrics.java   |  2 +-
 .../datastore/v1/ExplainMetricsOrBuilder.java |  2 +-
 .../google/datastore/v1/ExplainOptions.java   |  2 +-
 .../datastore/v1/ExplainOptionsOrBuilder.java |  2 +-
 .../java/com/google/datastore/v1/Filter.java  |  2 +-
 .../google/datastore/v1/FilterOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/GqlQuery.java     |  2 +-
 .../datastore/v1/GqlQueryOrBuilder.java       |  2 +-
 .../datastore/v1/GqlQueryParameter.java       |  2 +-
 .../v1/GqlQueryParameterOrBuilder.java        |  2 +-
 .../java/com/google/datastore/v1/Key.java     |  2 +-
 .../com/google/datastore/v1/KeyOrBuilder.java |  2 +-
 .../google/datastore/v1/KindExpression.java   |  2 +-
 .../datastore/v1/KindExpressionOrBuilder.java |  2 +-
 .../google/datastore/v1/LookupRequest.java    |  2 +-
 .../datastore/v1/LookupRequestOrBuilder.java  |  2 +-
 .../google/datastore/v1/LookupResponse.java   |  2 +-
 .../datastore/v1/LookupResponseOrBuilder.java |  2 +-
 .../com/google/datastore/v1/Mutation.java     |  2 +-
 .../datastore/v1/MutationOrBuilder.java       |  2 +-
 .../google/datastore/v1/MutationResult.java   |  2 +-
 .../datastore/v1/MutationResultOrBuilder.java |  2 +-
 .../com/google/datastore/v1/PartitionId.java  |  2 +-
 .../datastore/v1/PartitionIdOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/PlanSummary.java  |  2 +-
 .../datastore/v1/PlanSummaryOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/Projection.java   |  2 +-
 .../datastore/v1/ProjectionOrBuilder.java     |  2 +-
 .../google/datastore/v1/PropertyFilter.java   |  2 +-
 .../datastore/v1/PropertyFilterOrBuilder.java |  2 +-
 .../com/google/datastore/v1/PropertyMask.java |  2 +-
 .../datastore/v1/PropertyMaskOrBuilder.java   |  2 +-
 .../google/datastore/v1/PropertyOrder.java    |  2 +-
 .../datastore/v1/PropertyOrderOrBuilder.java  |  2 +-
 .../datastore/v1/PropertyReference.java       |  2 +-
 .../v1/PropertyReferenceOrBuilder.java        |  2 +-
 .../java/com/google/datastore/v1/Query.java   |  2 +-
 .../google/datastore/v1/QueryOrBuilder.java   |  2 +-
 .../datastore/v1/QueryProfileProto.java       | 14 +++---
 .../com/google/datastore/v1/QueryProto.java   | 14 +++---
 .../google/datastore/v1/QueryResultBatch.java |  2 +-
 .../v1/QueryResultBatchOrBuilder.java         |  2 +-
 .../com/google/datastore/v1/ReadOptions.java  |  2 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |  2 +-
 .../datastore/v1/ReserveIdsRequest.java       |  2 +-
 .../v1/ReserveIdsRequestOrBuilder.java        |  2 +-
 .../datastore/v1/ReserveIdsResponse.java      |  2 +-
 .../v1/ReserveIdsResponseOrBuilder.java       |  2 +-
 .../google/datastore/v1/RollbackRequest.java  |  2 +-
 .../v1/RollbackRequestOrBuilder.java          |  2 +-
 .../google/datastore/v1/RollbackResponse.java |  2 +-
 .../v1/RollbackResponseOrBuilder.java         |  2 +-
 .../v1/RunAggregationQueryRequest.java        |  2 +-
 .../RunAggregationQueryRequestOrBuilder.java  |  2 +-
 .../v1/RunAggregationQueryResponse.java       |  2 +-
 .../RunAggregationQueryResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/RunQueryRequest.java  |  2 +-
 .../v1/RunQueryRequestOrBuilder.java          |  2 +-
 .../google/datastore/v1/RunQueryResponse.java |  2 +-
 .../v1/RunQueryResponseOrBuilder.java         |  2 +-
 .../datastore/v1/TransactionOptions.java      |  2 +-
 .../v1/TransactionOptionsOrBuilder.java       |  2 +-
 .../java/com/google/datastore/v1/Value.java   |  2 +-
 .../google/datastore/v1/ValueOrBuilder.java   |  2 +-
 .../datastore/v1/aggregation_result.proto     |  2 +-
 .../proto/google/datastore/v1/datastore.proto |  2 +-
 .../proto/google/datastore/v1/entity.proto    |  2 +-
 .../proto/google/datastore/v1/query.proto     |  2 +-
 .../google/datastore/v1/query_profile.proto   |  2 +-
 renovate.json                                 | 12 +++--
 149 files changed, 303 insertions(+), 200 deletions(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index e6ebd09de190..6ae8c95c023b 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -2,19 +2,21 @@
   "api_shortname": "datastore",
   "name_pretty": "Cloud Datastore",
   "product_documentation": "https://cloud.google.com/datastore",
+  "api_description": "is a fully managed, schemaless database for\\nstoring non-relational data. Cloud Datastore automatically scales with\\nyour users and supports ACID transactions, high availability of reads and\\nwrites, strong consistency for reads and ancestor queries, and eventual\\nconsistency for all other queries.",
   "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history",
-  "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
   "release_level": "stable",
+  "transport": "both",
   "language": "java",
   "repo": "googleapis/java-datastore",
   "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
-  "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners",
   "api_id": "datastore.googleapis.com",
   "library_type": "GAPIC_COMBO",
-  "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.",
+  "requires_billing": true,
+  "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners",
   "excluded_dependencies": "grpc-google-cloud-datastore-v1",
-  "extra_versioned_modules": "datastore-v1-proto-client",
   "excluded_poms": "grpc-google-cloud-datastore-v1",
+  "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
+  "extra_versioned_modules": "datastore-v1-proto-client",
   "recommended_package": "com.google.cloud.datastore"
-}
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 9089655ec47e..e6d69755b3b8 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.41.0
+      26.45.0
       pom
       import
     
@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.42.0')
+implementation platform('com.google.cloud:libraries-bom:26.45.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.20.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.21.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.2"
 ```
 
 
@@ -80,7 +80,7 @@ The client application making API calls must be granted [authorization scopes][a
 ### Prerequisites
 
 You will need a [Google Cloud Platform Console][developer-console] project with the Cloud Datastore [API enabled][enable-api].
-
+You will need to [enable billing][enable-billing] to use Google Cloud Datastore.
 [Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by
 [installing the Google Cloud Command Line Interface][cloud-cli] and running the following commands in command line:
 `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
@@ -93,11 +93,7 @@ to add `google-cloud-datastore` as a dependency in your code.
 ## About Cloud Datastore
 
 
-[Cloud Datastore][product-docs] is a fully managed, schemaless database for
-storing non-relational data. Cloud Datastore automatically scales with
-your users and supports ACID transactions, high availability of reads and
-writes, strong consistency for reads and ancestor queries, and eventual
-consistency for all other queries.
+[Cloud Datastore][product-docs] is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.
 
 See the [Cloud Datastore client library docs][javadocs] to learn how to
 use this Cloud Datastore Client Library.
@@ -356,7 +352,6 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 
 | Sample                      | Source Code                       | Try it |
 | --------------------------- | --------------------------------- | ------ |
-| Native Image Datastore Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) |
 | Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
 | Avg Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) |
 | Avg Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) |
@@ -388,6 +383,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 
 To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting].
 
+## Transport
+
+Cloud Datastore uses both gRPC and HTTP/JSON for the transport layer.
+
 ## Supported Java Versions
 
 Java 8 or above is required for using this client.
@@ -480,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
@@ -492,7 +491,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [contributing]: https://github.com/googleapis/java-datastore/blob/main/CONTRIBUTING.md
 [code-of-conduct]: https://github.com/googleapis/java-datastore/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [license]: https://github.com/googleapis/java-datastore/blob/main/LICENSE
-
+[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
 [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com
 [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
 [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png
diff --git a/generation_config.yaml b/generation_config.yaml
index 941eaaef0391..e030af441cd5 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.45.0
-googleapis_commitish: 02f62c8e241a9f95f0d183785354e90e35388cbd
+googleapis_commitish: 41cd9dba9e88f707a663d6686148ae3dc24116b8
 libraries_bom_version: 26.45.0
 libraries:
   - api_shortname: datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 4bae1f6f3a69..cafef310effc 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -65,7 +65,9 @@
  * 
    The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * 
    For example, to set the total timeout of getIndex to 30 seconds:
+ * 
    For example, to set the
+ * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings)
+ * of getIndex:
  *
  * 
    {@code
  * // This snippet has been automatically generated and should be regarded as a code template only.
@@ -82,10 +84,47 @@
  *             .getIndexSettings()
  *             .getRetrySettings()
  *             .toBuilder()
- *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
  *             .build());
  * DatastoreAdminSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
  * }
    
+ *
+ * Please refer to the [Client Side Retry
+ * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
+ * additional support in setting retries.
+ *
+ * 
    To configure the RetrySettings of a Long Running Operation method, create an
+ * OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to
+ * configure the RetrySettings for exportEntities:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * DatastoreAdminSettings.Builder datastoreAdminSettingsBuilder =
+ *     DatastoreAdminSettings.newBuilder();
+ * TimedRetryAlgorithm timedRetryAlgorithm =
+ *     OperationalTimedPollAlgorithm.create(
+ *         RetrySettings.newBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofMillis(500))
+ *             .setRetryDelayMultiplier(1.5)
+ *             .setMaxRetryDelay(Duration.ofMillis(5000))
+ *             .setTotalTimeoutDuration(Duration.ofHours(24))
+ *             .build());
+ * datastoreAdminSettingsBuilder
+ *     .createClusterOperationSettings()
+ *     .setPollingAlgorithm(timedRetryAlgorithm)
+ *     .build();
+ * }
    
  */
 @Generated("by gapic-generator-java")
 public class DatastoreAdminSettings extends ClientSettings {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index fc346d38c039..82df00c03bd8 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -21,6 +21,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -85,7 +86,9 @@
  * 
    The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * 
    For example, to set the total timeout of getIndex to 30 seconds:
+ * 
    For example, to set the
+ * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings)
+ * of getIndex:
  *
  * 
    {@code
  * // This snippet has been automatically generated and should be regarded as a code template only.
@@ -102,10 +105,47 @@
  *             .getIndexSettings()
  *             .getRetrySettings()
  *             .toBuilder()
- *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
  *             .build());
  * DatastoreAdminStubSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
  * }
    
+ *
+ * Please refer to the [Client Side Retry
+ * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
+ * additional support in setting retries.
+ *
+ * 
    To configure the RetrySettings of a Long Running Operation method, create an
+ * OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to
+ * configure the RetrySettings for exportEntities:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * DatastoreAdminStubSettings.Builder datastoreAdminSettingsBuilder =
+ *     DatastoreAdminStubSettings.newBuilder();
+ * TimedRetryAlgorithm timedRetryAlgorithm =
+ *     OperationalTimedPollAlgorithm.create(
+ *         RetrySettings.newBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofMillis(500))
+ *             .setRetryDelayMultiplier(1.5)
+ *             .setMaxRetryDelay(Duration.ofMillis(5000))
+ *             .setTotalTimeoutDuration(Duration.ofHours(24))
+ *             .build());
+ * datastoreAdminSettingsBuilder
+ *     .createClusterOperationSettings()
+ *     .setPollingAlgorithm(timedRetryAlgorithm)
+ *     .build();
+ * }
    
  */
 @Generated("by gapic-generator-java")
 public class DatastoreAdminStubSettings extends StubSettings {
@@ -163,9 +203,7 @@ public String extractNextToken(ListIndexesResponse payload) {
 
             @Override
             public Iterable extractResources(ListIndexesResponse payload) {
-              return payload.getIndexesList() == null
-                  ? ImmutableList.of()
-                  : payload.getIndexesList();
+              return payload.getIndexesList();
             }
           };
 
@@ -270,6 +308,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "datastore.googleapis.com:443";
   }
diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
index 5ed5e01e5736..e4ca7ae5ff36 100644
--- a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
+++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
@@ -305,6 +305,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.api.PythonSettings$ExperimentalFeatures",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings$ExperimentalFeatures$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.api.ResourceDescriptor",
     "queryAllDeclaredConstructors": true,
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 2c078756dd1e..27c9ab4483e0 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index fa127dc7c5a2..913db1a5a6bf 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface CommonMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index c86b9a967469..f9e6986e1c86 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index 537fb10b9d2f..6440f28fc813 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface CreateIndexRequestOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 9a4bb925fc7c..bcea2e23a9d8 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public final class DatastoreAdminProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index a0695ffd0e98..072da0b59774 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index 3bf3c03f825b..1476b0451a61 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface DatastoreFirestoreMigrationMetadataOrBuilder
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 0b82ce7cc1a8..19311057eda7 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index 9ac5d54116e2..b2e5e6325b7c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface DeleteIndexRequestOrBuilder
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 a4c6617c3b9a..f48b9fc168e7 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
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 59fff0657c9a..ff9abf72cb90 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface EntityFilterOrBuilder
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 360a2c5c69e8..a48521aab800 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index a65dedc9c6d7..dd09e14bfe2c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesMetadataOrBuilder
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 acad36a3eb2d..a87805a6c01d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
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 01f5ec35df12..e54ff1d1e59a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesRequestOrBuilder
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 fd3350685a40..f629356dd1e9 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index 77bf913fbd3f..a71ac8e9d016 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesResponseOrBuilder
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 00fb79822ef3..e1d6886b2c3f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index e33a2bd2e50e..5c5d811d7bbc 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface GetIndexRequestOrBuilder
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 f89135ebdd28..47de2e41ed29 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 71c6928afdcf..462bfacf25d5 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesMetadataOrBuilder
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 596bbfa1ab27..43f3a746ea35 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
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 92261658652b..a38f509173dd 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesRequestOrBuilder
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 7244182dcc51..a2649edfbfbf 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
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 96b2a12ac166..a153b684868e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index 20348e0447f8..538df95213aa 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface IndexOperationMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 25373353b927..459a0ef57b2a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface IndexOrBuilder
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 9dbdecdf1edb..f350301dbb24 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public final class IndexProto {
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 5eb553c33823..8dcdac9b93f5 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index 389feb19ab3f..4a3ea0672735 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesRequestOrBuilder
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 05da1f24d364..63bc8361f635 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index e6b8e4376d7d..83ee6d607c38 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesResponseOrBuilder
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 d69e36b88530..34b32c5c957d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
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 68441b30b06b..1b746f571bd5 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface MigrationProgressEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 0c11104447d9..c5eae435312f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public final class MigrationProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index 1cc5376774d1..0ffd47e82f5b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
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 54f20a287dc9..0e3913ecd9c4 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 3920f71c731e..a96dd7999bcf 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface MigrationStateEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index 6810cfd53678..ad98ba777daa 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index b8a5f327be15..644f8de69c28 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
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 347508413a4c..bacd7cd7e0d8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index faa613564364..57bc88fc4bf9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.admin.v1;
 
 public interface ProgressOrBuilder
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 654257a1d322..5207578bd0ab 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.v1;
 
 /**
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 bfb5e8448218..4d34dc10711d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.v1;
 
 public interface AggregationQueryOrBuilder
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 5a6afdcffbd6..9ad3eb613c9b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.v1;
 
 /**
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 040d282df4ef..8b0a4ddad251 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.v1;
 
 /**
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 5c1fb1daabb0..6dc72d3898f5 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.v1;
 
 public interface AggregationResultBatchOrBuilder
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 4bcde0f9574d..27ab61915e17 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.v1;
 
 public interface AggregationResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index a924705f1dab..254cef18a404 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.3
+// Protobuf Java Version: 3.25.4
 package com.google.datastore.v1;
 
 public final class AggregationResultProto {
@@ -63,13 +63,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "tastore.v1.AggregationResult\022K\n\014more_res"
           + "ults\030\002 \001(\01625.google.datastore.v1.QueryRe"
           + "sultBatch.MoreResultsType\022-\n\tread_time\030\003"
-          + " \001(\0132\032.google.protobuf.TimestampB\310\001\n\027com"
+          + " \001(\0132\032.google.protobuf.TimestampB\307\001\n\027com"
           + ".google.datastore.v1B\026AggregationResultP"
-          + "rotoP\001Z.*?)\""],
+      "matchStrings": [
+        "value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""
+      ],
       "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
       "datasourceTemplate": "maven"
     },
@@ -32,7 +36,9 @@
       "fileMatch": [
         "^.github/workflows/unmanaged_dependency_check.yaml$"
       ],
-      "matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"],
+      "matchStrings": [
+        "uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"
+      ],
       "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
       "datasourceTemplate": "maven"
     }
@@ -99,4 +105,4 @@
   ],
   "semanticCommits": true,
   "dependencyDashboard": true
-}
+}
\ No newline at end of file

From 266f703cafc9616086dd142fd385b502a7a2ce10 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 11 Sep 2024 22:26:27 +0200
Subject: [PATCH 1441/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551)

---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 2e970d081a36..56fd2ae2c769 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -38,7 +38,7 @@
       
         org.apache.maven.plugins
         maven-deploy-plugin
-        3.1.2
+        3.1.3
         
           true
         

From 0478c55bc2bef6c691fe69511fd3152636c58c0e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 11 Sep 2024 23:08:07 +0200
Subject: [PATCH 1442/1784] test(deps): update dependency
 com.google.truth:truth to v1.4.4 (#1520)

---
 datastore-v1-proto-client/pom.xml   | 2 +-
 google-cloud-datastore/pom.xml      | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 52758f476694..177de84c7618 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -98,7 +98,7 @@
     
       com.google.truth
       truth
-      1.4.3
+      1.4.4
       test
       
         
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index c80548fe54ce..55f4ecf52cae 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -157,7 +157,7 @@
     
       com.google.truth
       truth
-      1.4.3
+      1.4.4
       test
     
       
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 715d7154c314..284584221bfc 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -42,7 +42,7 @@
     
       com.google.truth
       truth
-      1.4.3
+      1.4.4
       test
     
       
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 662500308aee..f44b9f8bc9f4 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -41,7 +41,7 @@
     
       com.google.truth
       truth
-      1.4.3
+      1.4.4
       test
     
       
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index bd49599d33ad..1cc4e91521fe 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -53,7 +53,7 @@
     
       com.google.truth
       truth
-      1.4.3
+      1.4.4
       test
     
       

From ee788a162841994e09a61bb81b94cbe93353a78e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 11 Sep 2024 23:08:16 +0200
Subject: [PATCH 1443/1784] deps: update dependency org.easymock:easymock to
 v5.4.0 (#1482)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6ab0ec44898b..1397398f8152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
       
         org.easymock
         easymock
-        5.2.0
+        5.4.0
         test
       
         

From 37a4f58124cb3cdde409dc54f3ab1047dfaf2234 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 11 Sep 2024 23:08:29 +0200
Subject: [PATCH 1444/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.21.2 (#1480)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 284584221bfc..d884dbf55616 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.20.0
+      2.21.2
     
     
 

From 7e7a0308f73a14228ba9cf0a9fd26afa2f93869e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:28:21 -0700
Subject: [PATCH 1445/1784] chore(main): release 2.21.3 (#1565)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  | 10 ++++++++++
 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 ++--
 samples/install-without-bom/pom.xml           |  2 +-
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e953fa33fb64..a38532a8174e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.21.3](https://github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) (2024-09-11)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#1561](https://github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa))
+* Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#1523](https://github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632))
+* Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#1548](https://github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9))
+* Update dependency org.easymock:easymock to v5.4.0 ([#1482](https://github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))
+
 ## [2.21.2](https://github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) (2024-08-22)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 177de84c7618..3922a27578d8 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.21.3-SNAPSHOT
+  2.21.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3-SNAPSHOT
+    2.21.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0fe170fa1a61..a13792e8f7b9 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.21.3-SNAPSHOT
+  2.21.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.3-SNAPSHOT
+        2.21.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.3-SNAPSHOT
+        2.21.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.3-SNAPSHOT
+        0.112.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.3-SNAPSHOT
+        2.21.3
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 55f4ecf52cae..595f04ba4fdf 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.3-SNAPSHOT
+  2.21.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3-SNAPSHOT
+    2.21.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0464bed48ab3..fe38bbef164d 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.21.3-SNAPSHOT
+  2.21.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3-SNAPSHOT
+    2.21.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 1397398f8152..23737d6b346f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.3-SNAPSHOT
+  2.21.3
   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.21.3-SNAPSHOT
+        2.21.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.3-SNAPSHOT
+        2.21.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.3-SNAPSHOT
+        2.21.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.3-SNAPSHOT
+        0.112.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.3-SNAPSHOT
+        2.21.3
         
           
             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 e9a85dc5e950..5ddd934ff394 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.21.3-SNAPSHOT
+  2.21.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3-SNAPSHOT
+    2.21.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a8d6064ca947..a2bceec90780 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.112.3-SNAPSHOT
+  0.112.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3-SNAPSHOT
+    2.21.3
   
   
     
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d884dbf55616..284584221bfc 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.21.2
+      2.20.0
     
     
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f44b9f8bc9f4..af7856d352ec 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.3-SNAPSHOT
+      2.21.3
     
     
 
diff --git a/versions.txt b/versions.txt
index a22a8396ef1d..9cc37ac81a52 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.2:2.21.3-SNAPSHOT
-google-cloud-datastore-bom:2.21.2:2.21.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.112.2:0.112.3-SNAPSHOT
-datastore-v1-proto-client:2.21.2:2.21.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT
+google-cloud-datastore:2.21.3:2.21.3
+google-cloud-datastore-bom:2.21.3:2.21.3
+proto-google-cloud-datastore-v1:0.112.3:0.112.3
+datastore-v1-proto-client:2.21.3:2.21.3
+proto-google-cloud-datastore-admin-v1:2.21.3:2.21.3
+grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.3

From 3e33c4cb3c3066e1281edfab7e84adb73b7fb1cd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 11 Sep 2024 23:40:34 +0200
Subject: [PATCH 1446/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.21.2 (#1570)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 284584221bfc..d884dbf55616 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.20.0
+      2.21.2
     
     
 

From e95d878986a0a5aa35341764b56de7e9a4d8ed23 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 12 Sep 2024 18:40:25 +0200
Subject: [PATCH 1447/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.21.3 (#1572)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa))
-   Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632))
-   Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9))
-   Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d884dbf55616..9187ea8ce818 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.21.2
+      2.21.3
     
     
 

From 3e9bf506c8dea79697f924398e8738fc8394ba7e Mon Sep 17 00:00:00 2001
From: Lawrence Qiu 
Date: Fri, 13 Sep 2024 20:02:59 +0000
Subject: [PATCH 1448/1784] chore: Add Clirr exemptions for Protobuf 4.27.4+
 runtime (#1575)

---
 .../clirr-ignored-differences.xml             | 62 +++++++++++++++++++
 .../clirr-ignored-differences.xml             | 62 +++++++++++++++++++
 2 files changed, 124 insertions(+)

diff --git a/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml
index c384c422ece1..7cf3ac808fad 100644
--- a/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml
@@ -16,4 +16,66 @@
     com/google/datastore/admin/v1/*OrBuilder
     boolean has*(*)
   
+
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * getDefaultInstanceForType()
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * addRepeatedField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * clear()
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * clearField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * clearOneof(*)
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * clone()
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * mergeUnknownFields(*)
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * setField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * setRepeatedField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/admin/v1/**
+    * setUnknownFields(*)
+    **
+  
 
diff --git a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
index 064bc1b32556..34662f77c14c 100644
--- a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml
@@ -58,4 +58,66 @@
         STATS_FIELD_NUMBER
         6011
     
+
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * getDefaultInstanceForType()
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * addRepeatedField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * clear()
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * clearField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * clearOneof(*)
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * clone()
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * mergeUnknownFields(*)
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * setField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * setRepeatedField(*)
+    **
+  
+  
+    7006
+    com/google/datastore/v1/**
+    * setUnknownFields(*)
+    **
+  
 

From 224b13781baa96f94ca36c47220291273164127a Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 19 Sep 2024 14:08:22 -0400
Subject: [PATCH 1449/1784] chore: Update generation configuration at Thu Sep
 19 02:21:53 UTC 2024 (#1573)

* chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024

* chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024

* chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024

* chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024

* chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024

* chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024

* chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024

* chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024

* chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024
---
 README.md              | 10 +++++-----
 generation_config.yaml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e6d69755b3b8..e5e9c1afedbf 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.20.0
+  2.21.2
 
 
 ```
@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.45.0')
+implementation platform('com.google.cloud:libraries-bom:26.46.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.21.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.21.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.3"
 ```
 
 
@@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/generation_config.yaml b/generation_config.yaml
index e030af441cd5..cd940462a927 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.45.0
-googleapis_commitish: 41cd9dba9e88f707a663d6686148ae3dc24116b8
-libraries_bom_version: 26.45.0
+googleapis_commitish: 607c2ae82620153880a66898bcbf0a46d38d7d10
+libraries_bom_version: 26.46.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 5440c22364074c108450c3a748a6a17d5f1dddda Mon Sep 17 00:00:00 2001
From: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com>
Date: Thu, 19 Sep 2024 14:56:26 -0700
Subject: [PATCH 1450/1784] feat: Introducing Tracing with OpenTelemetry API
 #1537 (#1576)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431)

* Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest
* Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable
* Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431

* feat: Adding Lookup RPC OpenTelemetry Tracing (#1437)

* feat: Adding Lookup RPC OpenTelemetry Tracing
- Removed OpenCensus Tracing
- Added E2E tests with Global and Local OTel SDK
- Moved OTel SDK setup to RemoteDatastoreHelper
- Fixed pom to depend on BOM for all shared dependencies

* feat: Adding Commit RPC Trace Instrumentation (#1440)

- Added end-to-end test for Datastore operationsput, add, update and delete.
- Updated E2E Test to use the namespace correctly for efficient clean-up of test data

* feat: RunQuery trace instrumentation (#1441)

* feat: RunQuery trace instrumentation

* feat: RunAggregationQuery instrumentation (#1447)

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: Add Transaction tracing
test: transactionalLookupTest

* test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn..

* Adding transaction span names

* TransactionLookupTest

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* Revert "feat: support for transactional operations"

This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3.

* feat: support for transactional operations (#1468)

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* feat: Allocateid tracing (#1488)

* feat: Adding tracing for AllocateIds RPC

* formatting

* 🦉 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 

* feat: Add tracing for ReserveIds operation (#1490)

- added end-to-end test

* fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495)

* fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the parent instead of `Context`.
- This fixes the hierarchy of Spans appearing in a transaction under a Run method.
- Tested using existing transaction test

* Fixed commit reordering and typos

* fix: lint errors

* fix: Refactored the ReadWriteTransactioncallable.call method to use startSpan idiomatically
- TraceUtil.startSpan needs more debugging
- return DefaultTracerProvider instance (no-op) when initializing DisabledTraceUtil - this fixes the unit tests in DatastoreTest.testRunInTransactionWithReadWriteOption

* feat: Added tracing for Transaction.RunQuery (#1499)

* feat: Added span for Transactional RunQuery
- tested

* fix: lint

* fix: patch apply issues

* fix: refactor using boolean flag

* fix: s/startSpan/startSpanWithParentContext

* test: Additional Transaction Testing and cleanup OpenCensus usage (#1505)

* test: newTransactionReadWriteTraceTest

* fix: test literal

* feat: Added tests for transaction cases

* fix: Cleanup OpenCensus dead code

* fix: updating version from 2.20.1 -> 2.21.0

* fix: reverting version from 2.21.0 -> 2.20.1

* fix: Adding an exception to the clirr-maven-plugin for an internal API parameter change from com.google.cloud.datastore.TraceUtil -> com.google.cloud.datastore.telemetry.TraceUtil

* fix: Fixing the differenceType in clirr exception

* fix: add an exception for removal of an internal class (com.google.cloud.datastore.TraceUtil)

* fix: fixing incomplete difference details for type 7005

* fix: Fixing `to` of the difference to be the entire signature

* fix: typo

* test: Adding ITTracingTest to verify events and span attributes (whic… (#1514)

* test: Adding ITTracingTest to verify events and span attributes (which are not verified in ITE2ETracingTest) due to TraceClient API limitations.
- This test uses InMemorySpanExporter to read the generated Otel span data by the test process to verify generated span data as it were before exporting to a backend. None of the span data is exported to a durable backend.
- This test is still an E2E test as it requires a project to send RPCs to.

* fix: fixing compilation error due to missing pom dependency.

* test: Test for AllocateId and ReserveId rpcs

* test: Commit/Put/Update/Delete tests

* test: Added fixes and test for RunQuery event

* test: Additional Transaction tests and AggregationQuery test (#1518)

* test: ReadWrite Transaction test

* test: Added test for Transactional RunQuery and Transaction Rollback

* test: runInTransaction API tracing test
- Fixed setting of common span attributes to spans in runInTransaction
- Removed some gRPC related channel attributes that are not present in this Datastore version, yet.

* fix: Undelete gRPC upgrade docs

* fix: Undo merge mistakes

* fix: Updating span event strings (#1539)

* fix: Fixing user-facing span names in line with go/firestore-client-trace-catalog

* fix: updating bom dependency version to fix https://github.com/googleapis/java-datastore/actions/runs/10256441634/job/28375496112?pr=1539

* Fix: typo in test causing integration test failure (#1556)

https://btx.cloud.google.com/invocations/c11a2e8b-4494-4ddc-a77e-cf2bcbcf5254/targets/cloud-devrel%2Fclient-libraries%2Fjava%2Fjava-datastore%2Fpresubmit%2Fintegration;config=default/log

* fix: opentelemetry-sdk should only be used as a Test Dependency

* fix: Update opentelemetry.version - this also fixes the tests failing in https://github.com/googleapis/java-datastore/actions/runs/10891578591/job/30222786908

* fix: Replacing attribute key values w/ constants

* fix: opentelemetry.version to fix RequireUpperBoundDeps check https://github.com/googleapis/java-datastore/actions/runs/10892403348/job/30225154043?pr=1576

* fix: Create Span hierarchy using parent Span (#1580)

* fix: Replace use of TraceUtil.SpanContext w/ TraceUtil.Context

* fix: Fixing how span hierarchy is created across threads - using Span instead of Context

* fix: cleaning up startSpan(spanName, parentContext) variant

* fix: add TracedReadWriteTransactionCallable to bifurcate tracing enabled/disabled paths for the Transaction callback.
- This change implements the idiomatic way to express nested spans as described in https://opentelemetry.io/docs/languages/java/instrumentation/#create-nested-spans

* fix: cleanup

* fix: cleanup

* fix: cleanup

* fix: formatting and import refactoring

* chore: generate libraries at Thu Sep 19 18:35:54 UTC 2024

---------

Co-authored-by: Owl Bot 
Co-authored-by: cloud-java-bot 
---
 README.md                                     |    2 +-
 .../clirr-ignored-differences.xml             |   12 +
 google-cloud-datastore/pom.xml                |   86 +-
 .../google/cloud/datastore/DatastoreImpl.java |  289 +++--
 .../DatastoreOpenTelemetryOptions.java        |   97 ++
 .../cloud/datastore/DatastoreOptions.java     |   40 +
 .../RetryAndTraceDatastoreRpcDecorator.java   |   30 +-
 .../com/google/cloud/datastore/TraceUtil.java |   76 --
 .../cloud/datastore/TransactionImpl.java      |    5 +
 .../datastore/spi/v1/HttpDatastoreRpc.java    |    5 +-
 .../telemetry/DisabledTraceUtil.java          |  131 +++
 .../datastore/telemetry/EnabledTraceUtil.java |  323 ++++++
 .../cloud/datastore/telemetry/TraceUtil.java  |  167 +++
 .../testing/RemoteDatastoreHelper.java        |   29 +-
 .../cloud/datastore/DatastoreOptionsTest.java |   14 +
 .../google/cloud/datastore/DatastoreTest.java |    2 +
 ...etryAndTraceDatastoreRpcDecoratorTest.java |   84 --
 .../cloud/datastore/it/ITE2ETracingTest.java  | 1009 +++++++++++++++++
 .../cloud/datastore/it/ITTracingTest.java     |  849 ++++++++++++++
 .../telemetry/DisabledTraceUtilTest.java      |   54 +
 .../telemetry/EnabledTraceUtilTest.java       |  106 ++
 .../datastore/telemetry/TraceUtilTest.java    |   62 +
 22 files changed, 3216 insertions(+), 256 deletions(-)
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java
 delete mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
 delete mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java

diff --git a/README.md b/README.md
index e5e9c1afedbf..d8b43bd0a747 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.21.2
+  2.21.3
 
 
 ```
diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
index 1620fd7525d7..847ba4f4c92d 100644
--- a/google-cloud-datastore/clirr-ignored-differences.xml
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -55,4 +55,16 @@
         java.lang.Object execute(com.google.cloud.datastore.Query, com.google.cloud.datastore.ReadOption[])
         7004
     
+    
+        com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator
+        RetryAndTraceDatastoreRpcDecorator(com.google.cloud.datastore.spi.v1.DatastoreRpc, com.google.cloud.datastore.TraceUtil, com.google.api.gax.retrying.RetrySettings, com.google.cloud.datastore.DatastoreOptions)
+        RetryAndTraceDatastoreRpcDecorator(com.google.cloud.datastore.spi.v1.DatastoreRpc, com.google.cloud.datastore.telemetry.TraceUtil, com.google.api.gax.retrying.RetrySettings, com.google.cloud.datastore.DatastoreOptions)
+        7005
+    
+
+    
+    
+        com/google/cloud/datastore/TraceUtil
+        8001
+    
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 595f04ba4fdf..5137728ead58 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -16,7 +16,20 @@
       
   
     google-cloud-datastore
+    1.42.0
   
+  
+    
+      
+        
+        com.google.cloud
+        gapic-libraries-bom
+        1.37.0
+        pom
+        import
+      
+    
+  
   
     
       com.google.api.grpc
@@ -38,6 +51,10 @@
       com.google.cloud.datastore
       datastore-v1-proto-client
     
+    
+      com.google.auth
+        google-auth-library-credentials
+    
     
       io.grpc
       grpc-api
@@ -111,6 +128,19 @@
       jsr305
     
 
+    
+    
+      io.opentelemetry
+      opentelemetry-api
+      ${opentelemetry.version}
+    
+    
+      io.opentelemetry
+      opentelemetry-context
+      ${opentelemetry.version}
+    
+    
+
     
     
       ${project.groupId}
@@ -118,7 +148,6 @@
       test-jar
       test
     
-
     
       com.google.guava
       guava-testlib
@@ -160,6 +189,61 @@
       1.4.4
       test
     
+    
+      com.google.testparameterinjector
+      test-parameter-injector
+      1.16
+      test
+    
+    
+    
+      io.opentelemetry
+      opentelemetry-sdk
+      ${opentelemetry.version}
+    
+    
+      io.opentelemetry
+      opentelemetry-sdk-common
+      ${opentelemetry.version}
+      test
+    
+    
+      io.opentelemetry
+      opentelemetry-sdk-testing
+      ${opentelemetry.version}
+      test
+    
+    
+      io.opentelemetry
+      opentelemetry-sdk-trace
+      ${opentelemetry.version}
+      test
+    
+    
+      io.opentelemetry
+      opentelemetry-semconv
+      1.1.0-alpha
+      test
+    
+    
+    
+    
+      com.google.cloud.opentelemetry
+      exporter-trace
+      0.15.0
+      test
+    
+    
+      com.google.cloud
+      google-cloud-trace
+      test
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-trace-v1
+      test
+    
+    
   
 
   
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 a3bfb37966b1..2bf8389fd9df 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
@@ -16,6 +16,26 @@
 
 package com.google.cloud.datastore;
 
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_DEFERRED;
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_DOCUMENT_COUNT;
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_MISSING;
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_MORE_RESULTS;
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_READ_CONSISTENCY;
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_RECEIVED;
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_TRANSACTIONAL;
+import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_TRANSACTION_ID;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ALLOCATE_IDS;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_BEGIN_TRANSACTION;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_COMMIT;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_LOOKUP;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RESERVE_IDS;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ROLLBACK;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_QUERY;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_COMMIT;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_LOOKUP;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN_QUERY;
+
 import com.google.api.core.BetaApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.BaseService;
@@ -25,20 +45,23 @@
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.datastore.execution.AggregationQueryExecutor;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.cloud.datastore.telemetry.TraceUtil;
+import com.google.cloud.datastore.telemetry.TraceUtil.Scope;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
+import com.google.datastore.v1.CommitResponse;
 import com.google.datastore.v1.ExplainOptions;
 import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.RunQueryResponse;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.protobuf.ByteString;
-import io.opencensus.common.Scope;
-import io.opencensus.trace.Span;
-import io.opencensus.trace.Status;
+import io.opentelemetry.context.Context;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -50,6 +73,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import javax.annotation.Nullable;
 
 final class DatastoreImpl extends BaseService implements Datastore {
 
@@ -59,7 +83,9 @@ final class DatastoreImpl extends BaseService implements Datas
       TransactionExceptionHandler.build();
   private static final ExceptionHandler TRANSACTION_OPERATION_EXCEPTION_HANDLER =
       TransactionOperationExceptionHandler.build();
-  private final TraceUtil traceUtil = TraceUtil.getInstance();
+
+  private final com.google.cloud.datastore.telemetry.TraceUtil otelTraceUtil =
+      getOptions().getTraceUtil();
 
   private final ReadOptionProtoPreparer readOptionProtoPreparer;
   private final AggregationQueryExecutor aggregationQueryExecutor;
@@ -73,7 +99,8 @@ final class DatastoreImpl extends BaseService implements Datas
     readOptionProtoPreparer = new ReadOptionProtoPreparer();
     aggregationQueryExecutor =
         new AggregationQueryExecutor(
-            new RetryAndTraceDatastoreRpcDecorator(datastoreRpc, traceUtil, retrySettings, options),
+            new RetryAndTraceDatastoreRpcDecorator(
+                datastoreRpc, otelTraceUtil, retrySettings, options),
             options);
   }
 
@@ -92,8 +119,68 @@ public Transaction newTransaction() {
     return new TransactionImpl(this);
   }
 
-  static class ReadWriteTransactionCallable implements Callable {
+  static class TracedReadWriteTransactionCallable implements Callable {
+    private final Datastore datastore;
+    private final TransactionCallable callable;
+    private volatile TransactionOptions options;
+    private volatile Transaction transaction;
+
+    private final TraceUtil.Span parentSpan;
+
+    TracedReadWriteTransactionCallable(
+        Datastore datastore,
+        TransactionCallable callable,
+        TransactionOptions options,
+        @Nullable com.google.cloud.datastore.telemetry.TraceUtil.Span parentSpan) {
+      this.datastore = datastore;
+      this.callable = callable;
+      this.options = options;
+      this.transaction = null;
+      this.parentSpan = parentSpan;
+    }
+
+    Datastore getDatastore() {
+      return datastore;
+    }
+
+    TransactionOptions getOptions() {
+      return options;
+    }
+
+    Transaction getTransaction() {
+      return transaction;
+    }
+
+    void setPrevTransactionId(ByteString transactionId) {
+      TransactionOptions.ReadWrite readWrite =
+          TransactionOptions.ReadWrite.newBuilder().setPreviousTransaction(transactionId).build();
+      options = options.toBuilder().setReadWrite(readWrite).build();
+    }
+
+    @Override
+    public T call() throws DatastoreException {
+      try (io.opentelemetry.context.Scope ignored =
+          Context.current().with(parentSpan.getSpan()).makeCurrent()) {
+        transaction = datastore.newTransaction(options);
+        T value = callable.run(transaction);
+        transaction.commit();
+        return value;
+      } catch (Exception ex) {
+        transaction.rollback();
+        throw DatastoreException.propagateUserException(ex);
+      } finally {
+        if (transaction.isActive()) {
+          transaction.rollback();
+        }
+        if (options != null
+            && options.getModeCase().equals(TransactionOptions.ModeCase.READ_WRITE)) {
+          setPrevTransactionId(transaction.getTransactionId());
+        }
+      }
+    }
+  }
 
+  static class ReadWriteTransactionCallable implements Callable {
     private final Datastore datastore;
     private final TransactionCallable callable;
     private volatile TransactionOptions options;
@@ -127,8 +214,8 @@ void setPrevTransactionId(ByteString transactionId) {
 
     @Override
     public T call() throws DatastoreException {
-      transaction = datastore.newTransaction(options);
       try {
+        transaction = datastore.newTransaction(options);
         T value = callable.run(transaction);
         transaction.commit();
         return value;
@@ -149,36 +236,47 @@ public T call() throws DatastoreException {
 
   @Override
   public  T runInTransaction(final TransactionCallable callable) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_TRANSACTION);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    TraceUtil.Span span = otelTraceUtil.startSpan(SPAN_NAME_TRANSACTION_RUN);
+    Callable transactionCallable =
+        (getOptions().getOpenTelemetryOptions().isEnabled()
+            ? new TracedReadWriteTransactionCallable(
+                this, callable, /*transactionOptions=*/ null, span)
+            : new ReadWriteTransactionCallable(this, callable, /*transactionOptions=*/ null));
+    try (Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
-          new ReadWriteTransactionCallable(this, callable, null),
+          transactionCallable,
           retrySettings,
           TRANSACTION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
   @Override
   public  T runInTransaction(
       final TransactionCallable callable, TransactionOptions transactionOptions) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_TRANSACTION);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    TraceUtil.Span span = otelTraceUtil.startSpan(SPAN_NAME_TRANSACTION_RUN);
+
+    Callable transactionCallable =
+        (getOptions().getOpenTelemetryOptions().isEnabled()
+            ? new TracedReadWriteTransactionCallable(this, callable, transactionOptions, span)
+            : new ReadWriteTransactionCallable(this, callable, transactionOptions));
+
+    try (Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
-          new ReadWriteTransactionCallable(this, callable, transactionOptions),
+          transactionCallable,
           retrySettings,
           TRANSACTION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
@@ -236,20 +334,39 @@ public AggregationResults runAggregation(
 
   com.google.datastore.v1.RunQueryResponse runQuery(
       final com.google.datastore.v1.RunQueryRequest requestPb) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RUNQUERY);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
-      return RetryHelper.runWithRetries(
-          () -> datastoreRpc.runQuery(requestPb),
-          retrySettings,
-          requestPb.getReadOptions().getTransaction().isEmpty()
-              ? EXCEPTION_HANDLER
-              : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
-          getOptions().getClock());
+    ReadOptions readOptions = requestPb.getReadOptions();
+    boolean isTransactional = readOptions.hasTransaction() || readOptions.hasNewTransaction();
+    String spanName = (isTransactional ? SPAN_NAME_TRANSACTION_RUN_QUERY : SPAN_NAME_RUN_QUERY);
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(spanName);
+
+    try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) {
+      RunQueryResponse response =
+          RetryHelper.runWithRetries(
+              () -> datastoreRpc.runQuery(requestPb),
+              retrySettings,
+              requestPb.getReadOptions().getTransaction().isEmpty()
+                  ? EXCEPTION_HANDLER
+                  : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
+              getOptions().getClock());
+      span.addEvent(
+          spanName + " complete.",
+          new ImmutableMap.Builder()
+              .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, response.getBatch().getEntityResultsCount())
+              .put(ATTRIBUTES_KEY_TRANSACTIONAL, isTransactional)
+              .put(ATTRIBUTES_KEY_READ_CONSISTENCY, readOptions.getReadConsistency().toString())
+              .put(
+                  ATTRIBUTES_KEY_TRANSACTION_ID,
+                  (isTransactional
+                      ? requestPb.getReadOptions().getTransaction().toStringUtf8()
+                      : ""))
+              .put(ATTRIBUTES_KEY_MORE_RESULTS, response.getBatch().getMoreResults().toString())
+              .build());
+      return response;
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
@@ -291,8 +408,9 @@ public List allocateId(IncompleteKey... keys) {
 
   private com.google.datastore.v1.AllocateIdsResponse allocateIds(
       final com.google.datastore.v1.AllocateIdsRequest requestPb) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_ALLOCATEIDS);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span =
+        otelTraceUtil.startSpan(SPAN_NAME_ALLOCATE_IDS);
+    try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -304,10 +422,10 @@ public com.google.datastore.v1.AllocateIdsResponse call() throws DatastoreExcept
           EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
@@ -450,14 +568,27 @@ protected Entity computeNext() {
 
   com.google.datastore.v1.LookupResponse lookup(
       final com.google.datastore.v1.LookupRequest requestPb) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_LOOKUP);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    ReadOptions readOptions = requestPb.getReadOptions();
+    boolean isTransactional = readOptions.hasTransaction() || readOptions.hasNewTransaction();
+    String spanName = (isTransactional ? SPAN_NAME_TRANSACTION_LOOKUP : SPAN_NAME_LOOKUP);
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(spanName);
+
+    try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
-          new Callable() {
-            @Override
-            public com.google.datastore.v1.LookupResponse call() throws DatastoreException {
-              return datastoreRpc.lookup(requestPb);
-            }
+          () -> {
+            com.google.datastore.v1.LookupResponse response = datastoreRpc.lookup(requestPb);
+            span.addEvent(
+                spanName + " complete.",
+                new ImmutableMap.Builder()
+                    .put(ATTRIBUTES_KEY_RECEIVED, response.getFoundCount())
+                    .put(ATTRIBUTES_KEY_MISSING, response.getMissingCount())
+                    .put(ATTRIBUTES_KEY_DEFERRED, response.getDeferredCount())
+                    .put(ATTRIBUTES_KEY_TRANSACTIONAL, isTransactional)
+                    .put(
+                        ATTRIBUTES_KEY_TRANSACTION_ID,
+                        isTransactional ? readOptions.getTransaction().toStringUtf8() : "")
+                    .build());
+            return response;
           },
           retrySettings,
           requestPb.getReadOptions().getTransaction().isEmpty()
@@ -465,10 +596,10 @@ public com.google.datastore.v1.LookupResponse call() throws DatastoreException {
               : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
@@ -492,8 +623,9 @@ public List reserveIds(Key... keys) {
 
   com.google.datastore.v1.ReserveIdsResponse reserveIds(
       final com.google.datastore.v1.ReserveIdsRequest requestPb) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RESERVEIDS);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span =
+        otelTraceUtil.startSpan(SPAN_NAME_RESERVE_IDS);
+    try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -505,10 +637,10 @@ public com.google.datastore.v1.ReserveIdsResponse call() throws DatastoreExcepti
           EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
@@ -602,20 +734,34 @@ private com.google.datastore.v1.CommitResponse commitMutation(
 
   com.google.datastore.v1.CommitResponse commit(
       final com.google.datastore.v1.CommitRequest requestPb) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_COMMIT);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
-      return RetryHelper.runWithRetries(
-          () -> datastoreRpc.commit(requestPb),
-          retrySettings,
-          requestPb.getTransaction().isEmpty()
-              ? EXCEPTION_HANDLER
-              : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
-          getOptions().getClock());
+    final boolean isTransactional =
+        requestPb.hasTransaction() || requestPb.hasSingleUseTransaction();
+    final String spanName = isTransactional ? SPAN_NAME_TRANSACTION_COMMIT : SPAN_NAME_COMMIT;
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(spanName);
+    try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) {
+      CommitResponse response =
+          RetryHelper.runWithRetries(
+              () -> datastoreRpc.commit(requestPb),
+              retrySettings,
+              requestPb.getTransaction().isEmpty()
+                  ? EXCEPTION_HANDLER
+                  : TRANSACTION_OPERATION_EXCEPTION_HANDLER,
+              getOptions().getClock());
+      span.addEvent(
+          spanName + " complete.",
+          new ImmutableMap.Builder()
+              .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, response.getMutationResultsCount())
+              .put(ATTRIBUTES_KEY_TRANSACTIONAL, isTransactional)
+              .put(
+                  ATTRIBUTES_KEY_TRANSACTION_ID,
+                  isTransactional ? requestPb.getTransaction().toStringUtf8() : "")
+              .build());
+      return response;
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
@@ -626,24 +772,19 @@ ByteString requestTransactionId(
 
   com.google.datastore.v1.BeginTransactionResponse beginTransaction(
       final com.google.datastore.v1.BeginTransactionRequest requestPb) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_BEGINTRANSACTION);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span =
+        otelTraceUtil.startSpan(SPAN_NAME_BEGIN_TRANSACTION);
+    try (com.google.cloud.datastore.telemetry.TraceUtil.Scope scope = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
-          new Callable() {
-            @Override
-            public com.google.datastore.v1.BeginTransactionResponse call()
-                throws DatastoreException {
-              return datastoreRpc.beginTransaction(requestPb);
-            }
-          },
+          () -> datastoreRpc.beginTransaction(requestPb),
           retrySettings,
           EXCEPTION_HANDLER,
           getOptions().getClock());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 
@@ -657,8 +798,9 @@ void rollbackTransaction(ByteString transaction) {
   }
 
   void rollback(final com.google.datastore.v1.RollbackRequest requestPb) {
-    Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_ROLLBACK);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span =
+        otelTraceUtil.startSpan(SPAN_NAME_ROLLBACK);
+    try (Scope scope = span.makeCurrent()) {
       RetryHelper.runWithRetries(
           new Callable() {
             @Override
@@ -670,11 +812,16 @@ public Void call() throws DatastoreException {
           retrySettings,
           EXCEPTION_HANDLER,
           getOptions().getClock());
+      span.addEvent(
+          SPAN_NAME_ROLLBACK,
+          new ImmutableMap.Builder()
+              .put(ATTRIBUTES_KEY_TRANSACTION_ID, requestPb.getTransaction().toStringUtf8())
+              .build());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java
new file mode 100644
index 000000000000..ac266562e0ba
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2024 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.cloud.datastore;
+
+import io.opentelemetry.api.OpenTelemetry;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class DatastoreOpenTelemetryOptions {
+  private final boolean enabled;
+  private final @Nullable OpenTelemetry openTelemetry;
+
+  DatastoreOpenTelemetryOptions(Builder builder) {
+    this.enabled = builder.enabled;
+    this.openTelemetry = builder.openTelemetry;
+  }
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  @Nullable
+  public OpenTelemetry getOpenTelemetry() {
+    return openTelemetry;
+  }
+
+  @Nonnull
+  public DatastoreOpenTelemetryOptions.Builder toBuilder() {
+    return new DatastoreOpenTelemetryOptions.Builder(this);
+  }
+
+  @Nonnull
+  public static DatastoreOpenTelemetryOptions.Builder newBuilder() {
+    return new DatastoreOpenTelemetryOptions.Builder();
+  }
+
+  public static class Builder {
+
+    private boolean enabled;
+
+    @Nullable private OpenTelemetry openTelemetry;
+
+    private Builder() {
+      enabled = false;
+      openTelemetry = null;
+    }
+
+    private Builder(DatastoreOpenTelemetryOptions options) {
+      this.enabled = options.enabled;
+      this.openTelemetry = options.openTelemetry;
+    }
+
+    @Nonnull
+    public DatastoreOpenTelemetryOptions build() {
+      return new DatastoreOpenTelemetryOptions(this);
+    }
+
+    /**
+     * Sets whether tracing should be enabled.
+     *
+     * @param enabled Whether tracing should be enabled.
+     */
+    @Nonnull
+    public DatastoreOpenTelemetryOptions.Builder setTracingEnabled(boolean enabled) {
+      this.enabled = enabled;
+      return this;
+    }
+
+    /**
+     * Sets the {@link OpenTelemetry} to use with this Datastore instance. If telemetry collection
+     * is enabled, but an `OpenTelemetry` is not provided, the Datastore SDK will attempt to use the
+     * `GlobalOpenTelemetry`.
+     *
+     * @param openTelemetry The OpenTelemetry that should be used by this Datastore instance.
+     */
+    @Nonnull
+    public DatastoreOpenTelemetryOptions.Builder setOpenTelemetry(
+        @Nonnull OpenTelemetry openTelemetry) {
+      this.openTelemetry = openTelemetry;
+      return this;
+    }
+  }
+}
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 8437c3e22032..cef40eedd4c1 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;
@@ -31,6 +32,8 @@
 import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class DatastoreOptions extends ServiceOptions {
 
@@ -43,6 +46,9 @@ public class DatastoreOptions extends ServiceOptions {
 
     private String namespace;
     private String databaseId;
 
+    @Nullable private DatastoreOpenTelemetryOptions openTelemetryOptions = null;
+
     private Builder() {}
 
     private Builder(DatastoreOptions options) {
       super(options);
       namespace = options.namespace;
       databaseId = options.databaseId;
+      this.openTelemetryOptions = options.openTelemetryOptions;
     }
 
     @Override
@@ -100,10 +120,30 @@ public Builder setDatabaseId(String databaseId) {
       this.databaseId = databaseId;
       return this;
     }
+
+    /**
+     * Sets the {@link DatastoreOpenTelemetryOptions} to be used for this Firestore instance.
+     *
+     * @param openTelemetryOptions The `DatastoreOpenTelemetryOptions` to use.
+     */
+    @BetaApi
+    @Nonnull
+    public Builder setOpenTelemetryOptions(
+        @Nonnull DatastoreOpenTelemetryOptions openTelemetryOptions) {
+      this.openTelemetryOptions = openTelemetryOptions;
+      return this;
+    }
   }
 
   private DatastoreOptions(Builder builder) {
     super(DatastoreFactory.class, DatastoreRpcFactory.class, builder, new DatastoreDefaults());
+
+    this.openTelemetryOptions =
+        builder.openTelemetryOptions != null
+            ? builder.openTelemetryOptions
+            : DatastoreOpenTelemetryOptions.newBuilder().build();
+    this.traceUtil = com.google.cloud.datastore.telemetry.TraceUtil.getInstance(this);
+
     namespace = MoreObjects.firstNonNull(builder.namespace, defaultNamespace());
     databaseId = MoreObjects.firstNonNull(builder.databaseId, DEFAULT_DATABASE_ID);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
index c4a85caabbc5..e1ea6e8ddad0 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
@@ -16,13 +16,13 @@
 package com.google.cloud.datastore;
 
 import static com.google.cloud.BaseService.EXCEPTION_HANDLER;
-import static com.google.cloud.datastore.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY;
 
 import com.google.api.core.InternalApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.RetryHelper;
 import com.google.cloud.RetryHelper.RetryHelperException;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.cloud.datastore.telemetry.TraceUtil;
 import com.google.datastore.v1.AllocateIdsRequest;
 import com.google.datastore.v1.AllocateIdsResponse;
 import com.google.datastore.v1.BeginTransactionRequest;
@@ -31,6 +31,7 @@
 import com.google.datastore.v1.CommitResponse;
 import com.google.datastore.v1.LookupRequest;
 import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.ReserveIdsRequest;
 import com.google.datastore.v1.ReserveIdsResponse;
 import com.google.datastore.v1.RollbackRequest;
@@ -39,9 +40,6 @@
 import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
-import io.opencensus.common.Scope;
-import io.opencensus.trace.Span;
-import io.opencensus.trace.Status;
 import java.util.concurrent.Callable;
 
 /**
@@ -52,19 +50,19 @@
 public class RetryAndTraceDatastoreRpcDecorator implements DatastoreRpc {
 
   private final DatastoreRpc datastoreRpc;
-  private final TraceUtil traceUtil;
+  private final com.google.cloud.datastore.telemetry.TraceUtil otelTraceUtil;
   private final RetrySettings retrySettings;
   private final DatastoreOptions datastoreOptions;
 
   public RetryAndTraceDatastoreRpcDecorator(
       DatastoreRpc datastoreRpc,
-      TraceUtil traceUtil,
+      TraceUtil otelTraceUtil,
       RetrySettings retrySettings,
       DatastoreOptions datastoreOptions) {
     this.datastoreRpc = datastoreRpc;
-    this.traceUtil = traceUtil;
     this.retrySettings = retrySettings;
     this.datastoreOptions = datastoreOptions;
+    this.otelTraceUtil = otelTraceUtil;
   }
 
   @Override
@@ -105,20 +103,26 @@ public RunQueryResponse runQuery(RunQueryRequest request) {
 
   @Override
   public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) {
-    return invokeRpc(
-        () -> datastoreRpc.runAggregationQuery(request), SPAN_NAME_RUN_AGGREGATION_QUERY);
+    ReadOptions readOptions = request.getReadOptions();
+    boolean isTransactional = readOptions.hasTransaction() || readOptions.hasNewTransaction();
+    String spanName =
+        (isTransactional
+            ? com.google.cloud.datastore.telemetry.TraceUtil
+                .SPAN_NAME_TRANSACTION_RUN_AGGREGATION_QUERY
+            : com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY);
+    return invokeRpc(() -> datastoreRpc.runAggregationQuery(request), spanName);
   }
 
   public  O invokeRpc(Callable block, String startSpan) {
-    Span span = traceUtil.startSpan(startSpan);
-    try (Scope scope = traceUtil.getTracer().withSpan(span)) {
+    com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(startSpan);
+    try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
           block, this.retrySettings, EXCEPTION_HANDLER, this.datastoreOptions.getClock());
     } catch (RetryHelperException e) {
-      span.setStatus(Status.UNKNOWN.withDescription(e.getMessage()));
+      span.end(e);
       throw DatastoreException.translateAndThrow(e);
     } finally {
-      span.end(TraceUtil.END_SPAN_OPTIONS);
+      span.end();
     }
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
deleted file mode 100644
index 57525d15d769..000000000000
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2020 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.cloud.datastore;
-
-import com.google.cloud.datastore.spi.v1.HttpDatastoreRpc;
-import io.opencensus.trace.EndSpanOptions;
-import io.opencensus.trace.Span;
-import io.opencensus.trace.Tracer;
-import io.opencensus.trace.Tracing;
-
-/**
- * Helper class for tracing utility. It is used for instrumenting {@link HttpDatastoreRpc} with
- * OpenCensus APIs.
- *
- * 
    TraceUtil instances are created by the {@link TraceUtil#getInstance()} method.
- */
-public class TraceUtil {
-  private final Tracer tracer = Tracing.getTracer();
-  private static final TraceUtil traceUtil = new TraceUtil();
-  static final String SPAN_NAME_ALLOCATEIDS = "CloudDatastoreOperation.allocateIds";
-  static final String SPAN_NAME_TRANSACTION = "CloudDatastoreOperation.readWriteTransaction";
-  static final String SPAN_NAME_BEGINTRANSACTION = "CloudDatastoreOperation.beginTransaction";
-  static final String SPAN_NAME_COMMIT = "CloudDatastoreOperation.commit";
-  static final String SPAN_NAME_LOOKUP = "CloudDatastoreOperation.lookup";
-  static final String SPAN_NAME_RESERVEIDS = "CloudDatastoreOperation.reserveIds";
-  static final String SPAN_NAME_ROLLBACK = "CloudDatastoreOperation.rollback";
-  static final String SPAN_NAME_RUNQUERY = "CloudDatastoreOperation.runQuery";
-  static final String SPAN_NAME_RUN_AGGREGATION_QUERY =
-      "CloudDatastoreOperation.runAggregationQuery";
-  static final EndSpanOptions END_SPAN_OPTIONS =
-      EndSpanOptions.builder().setSampleToLocalSpanStore(true).build();
-
-  /**
-   * Starts a new span.
-   *
-   * @param spanName The name of the returned Span.
-   * @return The newly created {@link Span}.
-   */
-  protected Span startSpan(String spanName) {
-    return tracer.spanBuilder(spanName).startSpan();
-  }
-
-  /**
-   * Return the global {@link Tracer}.
-   *
-   * @return The global {@link Tracer}.
-   */
-  public Tracer getTracer() {
-    return tracer;
-  }
-
-  /**
-   * Return TraceUtil Object.
-   *
-   * @return An instance of {@link TraceUtil}
-   */
-  public static TraceUtil getInstance() {
-    return traceUtil;
-  }
-
-  private TraceUtil() {}
-}
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 f08a908ecb55..e730db81f3e8 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
@@ -20,6 +20,7 @@
 
 import com.google.api.core.BetaApi;
 import com.google.cloud.datastore.models.ExplainOptions;
+import com.google.cloud.datastore.telemetry.TraceUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.TransactionOptions;
@@ -28,6 +29,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
+import javax.annotation.Nonnull;
 
 final class TransactionImpl extends BaseDatastoreBatchWriter implements Transaction {
 
@@ -37,6 +39,8 @@ final class TransactionImpl extends BaseDatastoreBatchWriter implements Transact
 
   private final ReadOptionProtoPreparer readOptionProtoPreparer;
 
+  @Nonnull private final TraceUtil traceUtil;
+
   static class ResponseImpl implements Transaction.Response {
 
     private final com.google.datastore.v1.CommitResponse response;
@@ -78,6 +82,7 @@ public List getGeneratedKeys() {
 
     transactionId = datastore.requestTransactionId(requestPb);
     this.readOptionProtoPreparer = new ReadOptionProtoPreparer();
+    this.traceUtil = datastore.getOptions().getTraceUtil();
   }
 
   @Override
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 fd3cdc658a8a..d927a2d7f5a0 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
@@ -21,7 +21,6 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.cloud.datastore.DatastoreException;
 import com.google.cloud.datastore.DatastoreOptions;
-import com.google.cloud.datastore.TraceUtil;
 import com.google.cloud.http.CensusHttpModule;
 import com.google.cloud.http.HttpTransportOptions;
 import com.google.datastore.v1.AllocateIdsRequest;
@@ -40,6 +39,7 @@
 import com.google.datastore.v1.RunAggregationQueryResponse;
 import com.google.datastore.v1.RunQueryRequest;
 import com.google.datastore.v1.RunQueryResponse;
+import io.opencensus.trace.Tracing;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
@@ -80,8 +80,7 @@ public HttpDatastoreRpc(DatastoreOptions options) {
   private HttpRequestInitializer getHttpRequestInitializer(
       final DatastoreOptions options, HttpTransportOptions httpTransportOptions) {
     // Open Census initialization
-    CensusHttpModule censusHttpModule =
-        new CensusHttpModule(TraceUtil.getInstance().getTracer(), true);
+    CensusHttpModule censusHttpModule = new CensusHttpModule(Tracing.getTracer(), true);
     final HttpRequestInitializer censusHttpModuleHttpRequestInitializer =
         censusHttpModule.getHttpRequestInitializer(
             httpTransportOptions.getHttpRequestInitializer(options));
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
new file mode 100644
index 000000000000..ebb6305159b6
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2024 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.cloud.datastore.telemetry;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.telemetry.TraceUtil.Context;
+import io.grpc.ManagedChannelBuilder;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.api.trace.TracerProvider;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Tracing utility implementation, used to stub out tracing instrumentation when tracing is
+ * disabled.
+ */
+@InternalApi
+public class DisabledTraceUtil implements TraceUtil {
+  static class Span implements TraceUtil.Span {
+    @Override
+    public void end() {}
+
+    @Override
+    public void end(Throwable error) {}
+
+    @Override
+    public  void endAtFuture(ApiFuture futureValue) {}
+
+    @Override
+    public TraceUtil.Span addEvent(String name) {
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span addEvent(String name, Map attributes) {
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span setAttribute(String key, int value) {
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span setAttribute(String key, String value) {
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span setAttribute(String key, boolean value) {
+      return this;
+    }
+
+    public io.opentelemetry.api.trace.Span getSpan() {
+      return null;
+    }
+
+    @Override
+    public Scope makeCurrent() {
+      return new Scope();
+    }
+  }
+
+  static class Context implements TraceUtil.Context {
+    @Override
+    public Scope makeCurrent() {
+      return new Scope();
+    }
+  }
+
+  static class Scope implements TraceUtil.Scope {
+    @Override
+    public void close() {}
+  }
+
+  @Nullable
+  @Override
+  public ApiFunction getChannelConfigurator() {
+    return null;
+  }
+
+  @Override
+  public Span startSpan(String spanName) {
+    return new Span();
+  }
+
+  @Override
+  public TraceUtil.Span startSpan(String spanName, TraceUtil.Span parentSpan) {
+    return new Span();
+  }
+
+  public SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) {
+    return getTracer().spanBuilder("TRACING_DISABLED_NO_OP");
+  }
+
+  @Nonnull
+  @Override
+  public TraceUtil.Span getCurrentSpan() {
+    return new Span();
+  }
+
+  @Nonnull
+  @Override
+  public TraceUtil.Context getCurrentContext() {
+    return new Context();
+  }
+
+  @Override
+  public Tracer getTracer() {
+    return TracerProvider.noop().get(LIBRARY_NAME);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
new file mode 100644
index 000000000000..40fc7308e3ca
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
@@ -0,0 +1,323 @@
+/*
+ * Copyright 2024 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.cloud.datastore.telemetry;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.ApiFutureCallback;
+import com.google.api.core.ApiFutures;
+import com.google.api.core.InternalApi;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.telemetry.TraceUtil.Context;
+import com.google.cloud.datastore.telemetry.TraceUtil.Scope;
+import com.google.cloud.datastore.telemetry.TraceUtil.Span;
+import com.google.common.base.Throwables;
+import io.grpc.ManagedChannelBuilder;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Tracing utility implementation, used to stub out tracing instrumentation when tracing is enabled.
+ */
+@InternalApi
+public class EnabledTraceUtil implements TraceUtil {
+  private final Tracer tracer;
+  private final OpenTelemetry openTelemetry;
+  private final DatastoreOptions datastoreOptions;
+
+  EnabledTraceUtil(DatastoreOptions datastoreOptions) {
+    OpenTelemetry openTelemetry = datastoreOptions.getOpenTelemetryOptions().getOpenTelemetry();
+
+    // If tracing is enabled, but an OpenTelemetry instance is not provided, fall back
+    // to using GlobalOpenTelemetry.
+    if (openTelemetry == null) {
+      openTelemetry = GlobalOpenTelemetry.get();
+    }
+
+    this.datastoreOptions = datastoreOptions;
+    this.openTelemetry = openTelemetry;
+    this.tracer = openTelemetry.getTracer(LIBRARY_NAME);
+  }
+
+  public OpenTelemetry getOpenTelemetry() {
+    return openTelemetry;
+  }
+
+  @Override
+  @Nullable
+  public ApiFunction getChannelConfigurator() {
+    // TODO(jimit) Update this to return a gRPC Channel Configurator after gRPC upgrade.
+    return null;
+  }
+
+  static class Span implements TraceUtil.Span {
+    private final io.opentelemetry.api.trace.Span span;
+    private final String spanName;
+
+    public Span(io.opentelemetry.api.trace.Span span, String spanName) {
+      this.span = span;
+      this.spanName = spanName;
+    }
+
+    @Override
+    public io.opentelemetry.api.trace.Span getSpan() {
+      return this.span;
+    }
+
+    /** Ends this span. */
+    @Override
+    public void end() {
+      span.end();
+    }
+
+    /** Ends this span in an error. */
+    @Override
+    public void end(Throwable error) {
+      span.setStatus(StatusCode.ERROR, error.getMessage());
+      span.recordException(
+          error,
+          Attributes.builder()
+              .put("exception.message", error.getMessage())
+              .put("exception.type", error.getClass().getName())
+              .put("exception.stacktrace", Throwables.getStackTraceAsString(error))
+              .build());
+      span.end();
+    }
+
+    /**
+     * If an operation ends in the future, its relevant span should end _after_ the future has been
+     * completed. This method "appends" the span completion code at the completion of the given
+     * future. In order for telemetry info to be recorded, the future returned by this method should
+     * be completed.
+     */
+    @Override
+    public  void endAtFuture(ApiFuture futureValue) {
+      io.opentelemetry.context.Context asyncContext = io.opentelemetry.context.Context.current();
+      ApiFutures.addCallback(
+          futureValue,
+          new ApiFutureCallback() {
+            @Override
+            public void onFailure(Throwable t) {
+              try (io.opentelemetry.context.Scope scope = asyncContext.makeCurrent()) {
+                span.addEvent(spanName + " failed.");
+                end(t);
+              }
+            }
+
+            @Override
+            public void onSuccess(T result) {
+              try (io.opentelemetry.context.Scope scope = asyncContext.makeCurrent()) {
+                span.addEvent(spanName + " succeeded.");
+                end();
+              }
+            }
+          });
+    }
+
+    /** Adds the given event to this span. */
+    @Override
+    public TraceUtil.Span addEvent(String name) {
+      span.addEvent(name);
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span addEvent(String name, Map attributes) {
+      AttributesBuilder attributesBuilder = Attributes.builder();
+      attributes.forEach(
+          (key, value) -> {
+            if (value instanceof Integer) {
+              attributesBuilder.put(key, (int) value);
+            } else if (value instanceof Long) {
+              attributesBuilder.put(key, (long) value);
+            } else if (value instanceof Double) {
+              attributesBuilder.put(key, (double) value);
+            } else if (value instanceof Float) {
+              attributesBuilder.put(key, (float) value);
+            } else if (value instanceof Boolean) {
+              attributesBuilder.put(key, (boolean) value);
+            } else if (value instanceof String) {
+              attributesBuilder.put(key, (String) value);
+            } else {
+              // OpenTelemetry APIs do not support any other type.
+              throw new IllegalArgumentException(
+                  "Unknown attribute type:" + value.getClass().getSimpleName());
+            }
+          });
+      span.addEvent(name, attributesBuilder.build());
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span setAttribute(String key, int value) {
+      span.setAttribute(ATTRIBUTE_SERVICE_PREFIX + key, value);
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span setAttribute(String key, String value) {
+      span.setAttribute(ATTRIBUTE_SERVICE_PREFIX + key, value);
+      return this;
+    }
+
+    @Override
+    public TraceUtil.Span setAttribute(String key, boolean value) {
+      span.setAttribute(ATTRIBUTE_SERVICE_PREFIX + key, value);
+      return this;
+    }
+
+    @Override
+    public Scope makeCurrent() {
+      try (io.opentelemetry.context.Scope scope = span.makeCurrent()) {
+        return new Scope(scope);
+      }
+    }
+  }
+
+  static class Scope implements TraceUtil.Scope {
+    private final io.opentelemetry.context.Scope scope;
+
+    Scope(io.opentelemetry.context.Scope scope) {
+      this.scope = scope;
+    }
+
+    @Override
+    public void close() {
+      scope.close();
+    }
+  }
+
+  static class Context implements TraceUtil.Context {
+    private final io.opentelemetry.context.Context context;
+
+    Context(io.opentelemetry.context.Context context) {
+      this.context = context;
+    }
+
+    @Override
+    public Scope makeCurrent() {
+      try (io.opentelemetry.context.Scope scope = context.makeCurrent()) {
+        return new Scope(scope);
+      }
+    }
+  }
+
+  /** Applies the current Datastore instance settings as attributes to the current Span */
+  @Override
+  public SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) {
+    spanBuilder =
+        spanBuilder.setAllAttributes(
+            Attributes.builder()
+                .put(
+                    ATTRIBUTE_SERVICE_PREFIX + "settings.databaseId",
+                    datastoreOptions.getDatabaseId())
+                .put(ATTRIBUTE_SERVICE_PREFIX + "settings.host", datastoreOptions.getHost())
+                .build());
+
+    if (datastoreOptions.getCredentials() != null) {
+      spanBuilder =
+          spanBuilder.setAttribute(
+              ATTRIBUTE_SERVICE_PREFIX + "settings.credentials.authenticationType",
+              datastoreOptions.getCredentials().getAuthenticationType());
+    }
+
+    if (datastoreOptions.getRetrySettings() != null) {
+      spanBuilder =
+          spanBuilder.setAllAttributes(
+              Attributes.builder()
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.initialRetryDelay",
+                      datastoreOptions.getRetrySettings().getInitialRetryDelay().toString())
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.maxRetryDelay",
+                      datastoreOptions.getRetrySettings().getMaxRetryDelay().toString())
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.retryDelayMultiplier",
+                      String.valueOf(datastoreOptions.getRetrySettings().getRetryDelayMultiplier()))
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.maxAttempts",
+                      String.valueOf(datastoreOptions.getRetrySettings().getMaxAttempts()))
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.initialRpcTimeout",
+                      datastoreOptions.getRetrySettings().getInitialRpcTimeout().toString())
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.maxRpcTimeout",
+                      datastoreOptions.getRetrySettings().getMaxRpcTimeout().toString())
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.rpcTimeoutMultiplier",
+                      String.valueOf(datastoreOptions.getRetrySettings().getRpcTimeoutMultiplier()))
+                  .put(
+                      ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.totalTimeout",
+                      datastoreOptions.getRetrySettings().getTotalTimeout().toString())
+                  .build());
+    }
+
+    // Add the memory utilization of the client at the time this trace was collected.
+    long totalMemory = Runtime.getRuntime().totalMemory();
+    long freeMemory = Runtime.getRuntime().freeMemory();
+    double memoryUtilization = ((double) (totalMemory - freeMemory)) / totalMemory;
+    spanBuilder.setAttribute(
+        ATTRIBUTE_SERVICE_PREFIX + "memoryUtilization",
+        String.format("%.2f", memoryUtilization * 100) + "%");
+
+    return spanBuilder;
+  }
+
+  @Override
+  public Span startSpan(String spanName) {
+    SpanBuilder spanBuilder = tracer.spanBuilder(spanName).setSpanKind(SpanKind.PRODUCER);
+    io.opentelemetry.api.trace.Span span =
+        addSettingsAttributesToCurrentSpan(spanBuilder).startSpan();
+    return new Span(span, spanName);
+  }
+
+  @Override
+  public TraceUtil.Span startSpan(String spanName, TraceUtil.Span parentSpan) {
+    SpanBuilder spanBuilder =
+        tracer
+            .spanBuilder(spanName)
+            .setSpanKind(SpanKind.PRODUCER)
+            .setParent(io.opentelemetry.context.Context.current().with(parentSpan.getSpan()));
+    return new Span(addSettingsAttributesToCurrentSpan(spanBuilder).startSpan(), spanName);
+  }
+
+  @Nonnull
+  @Override
+  public TraceUtil.Span getCurrentSpan() {
+    return new Span(io.opentelemetry.api.trace.Span.current(), "");
+  }
+
+  @Nonnull
+  @Override
+  public TraceUtil.Context getCurrentContext() {
+    return new Context(io.opentelemetry.context.Context.current());
+  }
+
+  @Override
+  public Tracer getTracer() {
+    return this.tracer;
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
new file mode 100644
index 000000000000..fd616a733c49
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2024 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.cloud.datastore.telemetry;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.InternalExtensionOnly;
+import com.google.cloud.datastore.DatastoreOptions;
+import io.grpc.ManagedChannelBuilder;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.Tracer;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/** Utility interface to manage OpenTelemetry tracing instrumentation based on the configuration. */
+@InternalExtensionOnly
+public interface TraceUtil {
+  static final String ATTRIBUTE_SERVICE_PREFIX = "gcp.datastore.";
+  static final String ENABLE_TRACING_ENV_VAR = "DATASTORE_ENABLE_TRACING";
+  static final String LIBRARY_NAME = "com.google.cloud.datastore";
+  static final String SPAN_NAME_LOOKUP = "Lookup";
+  static final String SPAN_NAME_ALLOCATE_IDS = "AllocateIds";
+  static final String SPAN_NAME_RESERVE_IDS = "ReserveIds";
+  static final String SPAN_NAME_COMMIT = "Commit";
+  static final String SPAN_NAME_RUN_QUERY = "RunQuery";
+  static final String SPAN_NAME_RUN_AGGREGATION_QUERY = "RunAggregationQuery";
+  static final String SPAN_NAME_TRANSACTION_RUN = "Transaction.Run";
+  static final String SPAN_NAME_BEGIN_TRANSACTION = "Transaction.Begin";
+  static final String SPAN_NAME_TRANSACTION_LOOKUP = "Transaction.Lookup";
+  static final String SPAN_NAME_TRANSACTION_COMMIT = "Transaction.Commit";
+  static final String SPAN_NAME_TRANSACTION_RUN_QUERY = "Transaction.RunQuery";
+  static final String SPAN_NAME_ROLLBACK = "Transaction.Rollback";
+  static final String SPAN_NAME_TRANSACTION_RUN_AGGREGATION_QUERY =
+      "Transaction.RunAggregationQuery";
+  static final String ATTRIBUTES_KEY_DOCUMENT_COUNT = "doc_count";
+  static final String ATTRIBUTES_KEY_TRANSACTIONAL = "transactional";
+  static final String ATTRIBUTES_KEY_TRANSACTION_ID = "transaction_id";
+  static final String ATTRIBUTES_KEY_READ_CONSISTENCY = "read_consistency";
+  static final String ATTRIBUTES_KEY_RECEIVED = "Received";
+  static final String ATTRIBUTES_KEY_MISSING = "Missing";
+  static final String ATTRIBUTES_KEY_DEFERRED = "Deferred";
+  static final String ATTRIBUTES_KEY_MORE_RESULTS = "mor_results";
+
+  /**
+   * Creates and returns an instance of the TraceUtil class.
+   *
+   * @param datastoreOptions The DatastoreOptions object that is requesting an instance of
+   *     TraceUtil.
+   * @return An instance of the TraceUtil class.
+   */
+  static TraceUtil getInstance(@Nonnull DatastoreOptions datastoreOptions) {
+    boolean createEnabledInstance = datastoreOptions.getOpenTelemetryOptions().isEnabled();
+
+    // The environment variable can override options to enable/disable telemetry collection.
+    String enableTracingEnvVar = System.getenv(ENABLE_TRACING_ENV_VAR);
+    if (enableTracingEnvVar != null) {
+      if (enableTracingEnvVar.equalsIgnoreCase("true")
+          || enableTracingEnvVar.equalsIgnoreCase("on")) {
+        createEnabledInstance = true;
+      }
+      if (enableTracingEnvVar.equalsIgnoreCase("false")
+          || enableTracingEnvVar.equalsIgnoreCase("off")) {
+        createEnabledInstance = false;
+      }
+    }
+
+    if (createEnabledInstance) {
+      return new EnabledTraceUtil(datastoreOptions);
+    } else {
+      return new DisabledTraceUtil();
+    }
+  }
+
+  /** Returns a channel configurator for gRPC, or {@code null} if tracing is disabled. */
+  @Nullable
+  ApiFunction getChannelConfigurator();
+
+  /** Represents a trace span. */
+  interface Span {
+    /** Adds the given event to this span. */
+    Span addEvent(String name);
+
+    /** Adds the given event with the given attributes to this span. */
+    Span addEvent(String name, Map attributes);
+
+    /** Adds the given attribute to this span. */
+    Span setAttribute(String key, int value);
+
+    /** Adds the given attribute to this span. */
+    Span setAttribute(String key, String value);
+
+    /** Adds the given attribute to this span. */
+    Span setAttribute(String key, boolean value);
+
+    io.opentelemetry.api.trace.Span getSpan();
+
+    /** Marks this span as the current span. */
+    Scope makeCurrent();
+
+    /** Ends this span. */
+    void end();
+
+    /** Ends this span in an error. */
+    void end(Throwable error);
+
+    /**
+     * If an operation ends in the future, its relevant span should end _after_ the future has been
+     * completed. This method "appends" the span completion code at the completion of the given
+     * future. In order for telemetry info to be recorded, the future returned by this method should
+     * be completed.
+     */
+     void endAtFuture(ApiFuture futureValue);
+  }
+
+  /** Represents a trace context. */
+  interface Context {
+    /** Makes this context the current context. */
+    Scope makeCurrent();
+  }
+
+  /** Represents a trace scope. */
+  interface Scope extends AutoCloseable {
+    /** Closes the current scope. */
+    void close();
+  }
+
+  /** Starts a new span with the given name, sets it as the current span, and returns it. */
+  Span startSpan(String spanName);
+
+  /**
+   * Starts a new span with the given name and the span represented by the parentSpan as its parent,
+   * sets it as the current span and returns it.
+   */
+  Span startSpan(String spanName, Span parentSpan);
+
+  /**
+   * Adds common SpanAttributes to the current span, useful when hand-creating a new Span without
+   * using the TraceUtil.Span interface.
+   */
+  SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder);
+
+  /** Returns the current span. */
+  @Nonnull
+  Span getCurrentSpan();
+
+  /** Returns the current Context. */
+  @Nonnull
+  Context getCurrentContext();
+
+  /** Returns the current OpenTelemetry Tracer when OpenTelemetry SDK is provided. */
+  Tracer getTracer();
+}
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 596ce96d8692..6167cedcae22 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
@@ -19,13 +19,16 @@
 import com.google.api.core.InternalApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOpenTelemetryOptions;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Key;
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.StructuredQuery;
 import com.google.cloud.http.HttpTransportOptions;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import java.util.UUID;
+import javax.annotation.Nullable;
 import org.threeten.bp.Duration;
 
 /**
@@ -38,13 +41,13 @@
  * RetrySettings#getTotalTimeout()} is {@code 120000} and {@link
  * RetrySettings#getInitialRetryDelay()} is {@code 250}. {@link
  * HttpTransportOptions#getConnectTimeout()} and {@link HttpTransportOptions#getReadTimeout()} are
- * both both set to {@code 60000}.
+ * both both set to {@code 60000}. If an OpenTelemetrySdk object is passed in, OpenTelemetry Trace
+ * collection will be enabled for the Client application.
  *
  * 
    Internal testing use only
  */
 @InternalApi
 public class RemoteDatastoreHelper {
-
   private final DatastoreOptions options;
   private final Datastore datastore;
   private final String namespace;
@@ -78,18 +81,30 @@ public static RemoteDatastoreHelper create() {
   }
 
   /** Creates a {@code RemoteStorageHelper} object. */
-  public static RemoteDatastoreHelper create(String databaseId) {
+  public static RemoteDatastoreHelper create(
+      String databaseId, @Nullable OpenTelemetrySdk openTelemetrySdk) {
     HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions();
     transportOptions =
         transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000).build();
-    DatastoreOptions datastoreOption =
+    DatastoreOptions.Builder datastoreOptionBuilder =
         DatastoreOptions.newBuilder()
             .setDatabaseId(databaseId)
             .setNamespace(UUID.randomUUID().toString())
             .setRetrySettings(retrySettings())
-            .setTransportOptions(transportOptions)
-            .build();
-    return new RemoteDatastoreHelper(datastoreOption);
+            .setTransportOptions(transportOptions);
+
+    if (openTelemetrySdk != null) {
+      datastoreOptionBuilder.setOpenTelemetryOptions(
+          DatastoreOpenTelemetryOptions.newBuilder()
+              .setOpenTelemetry(openTelemetrySdk)
+              .setTracingEnabled(true)
+              .build());
+    }
+    return new RemoteDatastoreHelper(datastoreOptionBuilder.build());
+  }
+
+  public static RemoteDatastoreHelper create(String databaseId) {
+    return create(databaseId, /*openTelemetrySdk=*/ null);
   }
 
   private static RetrySettings retrySettings() {
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 a545580e2047..85703f739e1a 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
@@ -70,6 +70,20 @@ public void testHost() {
     assertEquals("http://localhost:" + PORT, options.build().getHost());
   }
 
+  @Test
+  public void testOpenTelemetryOptionsEnabled() {
+    options.setOpenTelemetryOptions(
+        DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build());
+    assertTrue(options.build().getOpenTelemetryOptions().isEnabled());
+  }
+
+  @Test
+  public void testOpenTelemetryOptionsDisabled() {
+    options.setOpenTelemetryOptions(
+        DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(false).build());
+    assertTrue(!options.build().getOpenTelemetryOptions().isEnabled());
+  }
+
   @Test
   public void testNamespace() {
     assertTrue(options.build().getNamespace().isEmpty());
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 cd768f9868e9..d88e1d1ec0c7 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
@@ -176,6 +176,8 @@ public static void beforeClass() throws IOException, InterruptedException {
   public void setUp() {
     rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
     rpcMock = EasyMock.createStrictMock(DatastoreRpc.class);
+    DatastoreOpenTelemetryOptions.Builder otelOptionsBuilder =
+        DatastoreOpenTelemetryOptions.newBuilder();
     rpcMockOptions =
         options
             .toBuilder()
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java
deleted file mode 100644
index b86355afab93..000000000000
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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
- *
- *     https://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.cloud.datastore;
-
-import static com.google.cloud.datastore.TraceUtil.END_SPAN_OPTIONS;
-import static com.google.cloud.datastore.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY;
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.rpc.Code.UNAVAILABLE;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import com.google.api.gax.retrying.RetrySettings;
-import com.google.cloud.datastore.spi.v1.DatastoreRpc;
-import com.google.datastore.v1.RunAggregationQueryRequest;
-import com.google.datastore.v1.RunAggregationQueryResponse;
-import io.opencensus.trace.Span;
-import io.opencensus.trace.Tracer;
-import org.junit.Before;
-import org.junit.Test;
-
-public class RetryAndTraceDatastoreRpcDecoratorTest {
-
-  public static final int MAX_ATTEMPTS = 3;
-  private DatastoreRpc mockDatastoreRpc;
-  private TraceUtil mockTraceUtil;
-  private DatastoreOptions datastoreOptions =
-      DatastoreOptions.newBuilder().setProjectId("project-id").build();
-  private RetrySettings retrySettings =
-      RetrySettings.newBuilder().setMaxAttempts(MAX_ATTEMPTS).build();
-
-  private RetryAndTraceDatastoreRpcDecorator datastoreRpcDecorator;
-
-  @Before
-  public void setUp() throws Exception {
-    mockDatastoreRpc = createStrictMock(DatastoreRpc.class);
-    mockTraceUtil = createStrictMock(TraceUtil.class);
-    datastoreRpcDecorator =
-        new RetryAndTraceDatastoreRpcDecorator(
-            mockDatastoreRpc, mockTraceUtil, retrySettings, datastoreOptions);
-  }
-
-  @Test
-  public void testRunAggregationQuery() {
-    Span mockSpan = createStrictMock(Span.class);
-    RunAggregationQueryRequest aggregationQueryRequest =
-        RunAggregationQueryRequest.getDefaultInstance();
-    RunAggregationQueryResponse aggregationQueryResponse =
-        RunAggregationQueryResponse.getDefaultInstance();
-
-    expect(mockDatastoreRpc.runAggregationQuery(aggregationQueryRequest))
-        .andThrow(
-            new DatastoreException(
-                UNAVAILABLE.getNumber(), "API not accessible currently", UNAVAILABLE.name()))
-        .times(2)
-        .andReturn(aggregationQueryResponse);
-    expect(mockTraceUtil.startSpan(SPAN_NAME_RUN_AGGREGATION_QUERY)).andReturn(mockSpan);
-    expect(mockTraceUtil.getTracer()).andReturn(createNiceMock(Tracer.class));
-    mockSpan.end(END_SPAN_OPTIONS);
-
-    replay(mockDatastoreRpc, mockTraceUtil, mockSpan);
-
-    RunAggregationQueryResponse actualAggregationQueryResponse =
-        datastoreRpcDecorator.runAggregationQuery(aggregationQueryRequest);
-
-    assertThat(actualAggregationQueryResponse).isSameInstanceAs(aggregationQueryResponse);
-    verify(mockDatastoreRpc, mockTraceUtil, mockSpan);
-  }
-}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
new file mode 100644
index 000000000000..bee54a1f03c6
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
@@ -0,0 +1,1009 @@
+/*
+ * Copyright 2024 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.cloud.datastore.it;
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ALLOCATE_IDS;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_BEGIN_TRANSACTION;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_COMMIT;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_LOOKUP;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RESERVE_IDS;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ROLLBACK;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_QUERY;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_COMMIT;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_LOOKUP;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN;
+import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN_QUERY;
+import static com.google.common.truth.Truth.assertThat;
+import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.api.gax.rpc.NotFoundException;
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.IncompleteKey;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.KeyFactory;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.ReadOption;
+import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.cloud.datastore.Transaction;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
+import com.google.cloud.opentelemetry.trace.TraceConfiguration;
+import com.google.cloud.opentelemetry.trace.TraceExporter;
+import com.google.cloud.trace.v1.TraceServiceClient;
+import com.google.common.base.Preconditions;
+import com.google.devtools.cloudtrace.v1.Trace;
+import com.google.devtools.cloudtrace.v1.TraceSpan;
+import com.google.testing.junit.testparameterinjector.TestParameter;
+import com.google.testing.junit.testparameterinjector.TestParameterInjector;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TraceFlags;
+import io.opentelemetry.api.trace.TraceState;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
+import io.opentelemetry.sdk.trace.samplers.Sampler;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+// This End-to-End test verifies Client-side Tracing Functionality instrumented using the
+// OpenTelemetry API.
+// The test depends on the following external APIs/Services:
+// 1. Java OpenTelemetry SDK
+// 2. Cloud Trace Exporter
+// 3. TraceServiceClient from Cloud Trace API v1.
+//
+// Permissions required to run this test (https://cloud.google.com/trace/docs/iam#trace-roles):
+// 1. gcloud auth application-default login must be run with the test user.
+// 2. To write traces, test user must have one of roles/cloudtrace.[admin|agent|user] roles.
+// 3. To read traces, test user must have one of roles/cloudtrace.[admin|user] roles.
+//
+// Each test-case has the following workflow:
+// 1. OpenTelemetry SDK is initialized with Cloud Trace Exporter and 100% Trace Sampling
+// 2. On initialization, Datastore client is provided the OpenTelemetry SDK object from (1)
+// 3. A custom TraceID is generated and injected using a custom SpanContext
+// 4. Datastore operations are run inside a root TraceSpan created using the custom SpanContext from
+// (3).
+// 5. Traces are read-back using TraceServiceClient and verified against expected Call Stacks.
+@RunWith(TestParameterInjector.class)
+public class ITE2ETracingTest {
+
+  protected boolean isUsingGlobalOpenTelemetrySDK() {
+    return useGlobalOpenTelemetrySDK;
+  }
+
+  protected String datastoreNamedDatabase() {
+    return datastoreNamedDatabase;
+  }
+
+  // Helper class to track call-stacks in a trace
+  protected static class TraceContainer {
+
+    // Maps Span ID to TraceSpan
+    private final Map idSpanMap;
+
+    // Maps Parent Span ID to a list of Child SpanIDs, useful for top-down traversal
+    private final Map> parentChildIdMap;
+
+    // Tracks the Root Span ID
+    private long rootId;
+
+    public TraceContainer(String rootSpanName, Trace trace) {
+      idSpanMap = new TreeMap<>();
+      parentChildIdMap = new TreeMap<>();
+      for (TraceSpan span : trace.getSpansList()) {
+        long spanId = span.getSpanId();
+        idSpanMap.put(spanId, span);
+        if (rootSpanName.equals(span.getName())) {
+          rootId = span.getSpanId();
+        }
+
+        // Add self as a child of the parent span
+        if (!parentChildIdMap.containsKey(span.getParentSpanId())) {
+          parentChildIdMap.put(span.getParentSpanId(), new ArrayList<>());
+        }
+        parentChildIdMap.get(span.getParentSpanId()).add(spanId);
+      }
+    }
+
+    String spanName(long spanId) {
+      return idSpanMap.get(spanId).getName();
+    }
+
+    List childSpans(long spanId) {
+      return parentChildIdMap.get(spanId);
+    }
+
+    // This method only works for matching call stacks with traces which have children of distinct
+    // type at all levels. This is good enough as the intention is to validate if the e2e path is
+    // WAI - the intention is not to validate Cloud Trace's correctness w.r.t. durability of all
+    // kinds of traces.
+    boolean containsCallStack(String... callStack) throws RuntimeException {
+      List expectedCallStack = Arrays.asList(callStack);
+      if (expectedCallStack.isEmpty()) {
+        throw new RuntimeException("Input callStack is empty");
+      }
+      return dfsContainsCallStack(rootId, expectedCallStack);
+    }
+
+    // Depth-first check for call stack in the trace
+    private boolean dfsContainsCallStack(long spanId, List expectedCallStack) {
+      logger.info(
+          "span="
+              + spanName(spanId)
+              + ", expectedCallStack[0]="
+              + (expectedCallStack.isEmpty() ? "null" : expectedCallStack.get(0)));
+      if (expectedCallStack.isEmpty()) {
+        return false;
+      }
+      if (spanName(spanId).equals(expectedCallStack.get(0))) {
+        // Recursion termination
+        if (childSpans(spanId) == null) {
+          logger.info("No more children for " + spanName(spanId));
+          return expectedCallStack.size() <= 1;
+        } else {
+          // Examine the child spans
+          for (Long childSpan : childSpans(spanId)) {
+            int callStackListSize = expectedCallStack.size();
+            logger.info(
+                "childSpan="
+                    + spanName(childSpan)
+                    + ", expectedCallStackSize="
+                    + callStackListSize);
+            if (dfsContainsCallStack(
+                childSpan,
+                expectedCallStack.subList(
+                    /*fromIndexInclusive=*/ 1, /*toIndexExclusive*/ callStackListSize))) {
+              return true;
+            }
+          }
+        }
+      } else {
+        logger.info(spanName(spanId) + " didn't match " + expectedCallStack.get(0));
+      }
+      return false;
+    }
+  }
+
+  private static final Logger logger = Logger.getLogger(ITE2ETracingTest.class.getName());
+
+  private static final String RUN_AGGREGATION_QUERY_RPC_NAME = "RunAggregationQuery";
+
+  private static final String RUN_QUERY_RPC_NAME = "RunQuery";
+
+  private static final int NUM_TRACE_ID_BYTES = 32;
+
+  private static final int NUM_SPAN_ID_BYTES = 16;
+
+  private static final int GET_TRACE_RETRY_COUNT = 60;
+
+  private static final int GET_TRACE_RETRY_BACKOFF_MILLIS = 1000;
+
+  private static final int TRACE_FORCE_FLUSH_MILLIS = 5000;
+
+  private static final int TRACE_PROVIDER_SHUTDOWN_MILLIS = 1000;
+
+  private static Key KEY1;
+
+  private static Key KEY2;
+
+  private static Key KEY3;
+
+  private static Key KEY4;
+
+  // Random int generator for trace ID and span ID
+  private static Random random;
+
+  private static TraceExporter traceExporter;
+
+  // Required for reading back traces from Cloud Trace for validation
+  private static TraceServiceClient traceClient_v1;
+
+  // Custom SpanContext for each test, required for TraceID injection
+  private static SpanContext customSpanContext;
+
+  // Trace read back from Cloud Trace using traceClient_v1 for verification
+  private static Trace retrievedTrace;
+
+  private static String rootSpanName;
+  private static Tracer tracer;
+
+  // Required to set custom-root span
+  private static OpenTelemetrySdk openTelemetrySdk;
+
+  private static String projectId;
+
+  private static DatastoreOptions options;
+
+  private static Datastore datastore;
+
+  private static RemoteDatastoreHelper remoteDatastoreHelper;
+
+  @TestParameter boolean useGlobalOpenTelemetrySDK;
+
+  @TestParameter({
+    /*(default)*/
+    "",
+    "test-db"
+  })
+  String datastoreNamedDatabase;
+
+  @BeforeClass
+  public static void setup() throws IOException {
+    projectId = DatastoreOptions.getDefaultProjectId();
+    traceExporter =
+        TraceExporter.createWithConfiguration(
+            TraceConfiguration.builder().setProjectId(projectId).build());
+    traceClient_v1 = TraceServiceClient.create();
+    random = new Random();
+  }
+
+  @Before
+  public void before() throws Exception {
+    // Set up OTel SDK
+    Resource resource =
+        Resource.getDefault().merge(Resource.builder().put(SERVICE_NAME, "Sparky").build());
+
+    if (isUsingGlobalOpenTelemetrySDK()) {
+      openTelemetrySdk =
+          OpenTelemetrySdk.builder()
+              .setTracerProvider(
+                  SdkTracerProvider.builder()
+                      .setResource(resource)
+                      .addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build())
+                      .setSampler(Sampler.alwaysOn())
+                      .build())
+              .buildAndRegisterGlobal();
+    } else {
+      openTelemetrySdk =
+          OpenTelemetrySdk.builder()
+              .setTracerProvider(
+                  SdkTracerProvider.builder()
+                      .setResource(resource)
+                      .addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build())
+                      .setSampler(Sampler.alwaysOn())
+                      .build())
+              .build();
+    }
+
+    // Initialize the Datastore DB w/ the OTel SDK. Ideally we'd do this is the @BeforeAll method
+    // but because gRPC traces need to be deterministically force-flushed for every test
+    String namedDb = datastoreNamedDatabase();
+    logger.log(Level.INFO, "Integration test using named database " + namedDb);
+    remoteDatastoreHelper = RemoteDatastoreHelper.create(namedDb, openTelemetrySdk);
+    options = remoteDatastoreHelper.getOptions();
+    datastore = options.getService();
+
+    Preconditions.checkNotNull(
+        datastore,
+        "Error instantiating Datastore. Check that the service account credentials "
+            + "were properly set.");
+
+    String projectId = options.getProjectId();
+    String kind1 = "kind1";
+    KEY1 =
+        Key.newBuilder(projectId, kind1, "key1", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    KEY2 =
+        Key.newBuilder(projectId, kind1, "key2", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    KEY3 =
+        Key.newBuilder(projectId, kind1, "key3", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    KEY4 =
+        Key.newBuilder(projectId, kind1, "key4", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    // Set up the tracer for custom TraceID injection
+    rootSpanName =
+        String.format("%s%d", this.getClass().getSimpleName(), System.currentTimeMillis());
+    if (isUsingGlobalOpenTelemetrySDK()) {
+      tracer = GlobalOpenTelemetry.getTracer(rootSpanName);
+    } else {
+      tracer =
+          datastore
+              .getOptions()
+              .getOpenTelemetryOptions()
+              .getOpenTelemetry()
+              .getTracer(rootSpanName);
+    }
+
+    // Get up a new SpanContext (ergo TraceId) for each test
+    customSpanContext = getNewSpanContext();
+    assertNotNull(customSpanContext);
+    assertNull(retrievedTrace);
+  }
+
+  @After
+  public void after() throws Exception {
+    if (isUsingGlobalOpenTelemetrySDK()) {
+      GlobalOpenTelemetry.resetForTest();
+    }
+    remoteDatastoreHelper.deleteNamespace();
+    rootSpanName = null;
+    tracer = null;
+    retrievedTrace = null;
+    customSpanContext = null;
+    openTelemetrySdk = null;
+  }
+
+  @AfterClass
+  public static void teardown() throws Exception {
+    traceClient_v1.close();
+  }
+
+  // Generates a random hex string of length `numBytes`
+  private String generateRandomHexString(int numBytes) {
+    StringBuilder newTraceId = new StringBuilder();
+    while (newTraceId.length() < numBytes) {
+      newTraceId.append(Integer.toHexString(random.nextInt()));
+    }
+    return newTraceId.substring(0, numBytes);
+  }
+
+  protected String generateNewTraceId() {
+    return generateRandomHexString(NUM_TRACE_ID_BYTES);
+  }
+
+  // Generates a random 16-byte hex string
+  protected String generateNewSpanId() {
+    return generateRandomHexString(NUM_SPAN_ID_BYTES);
+  }
+
+  // Generates a new SpanContext w/ random traceId,spanId
+  protected SpanContext getNewSpanContext() {
+    String traceId = generateNewTraceId();
+    String spanId = generateNewSpanId();
+    logger.info("traceId=" + traceId + ", spanId=" + spanId);
+
+    return SpanContext.create(traceId, spanId, TraceFlags.getSampled(), TraceState.getDefault());
+  }
+
+  protected Span getNewRootSpanWithContext() {
+    // Execute the DB operation in the context of the custom root span.
+    return tracer
+        .spanBuilder(rootSpanName)
+        .setParent(Context.root().with(Span.wrap(customSpanContext)))
+        .startSpan();
+  }
+
+  protected void waitForTracesToComplete() throws Exception {
+    logger.info("Flushing traces...");
+    CompletableResultCode completableResultCode =
+        openTelemetrySdk.getSdkTracerProvider().forceFlush();
+    completableResultCode.join(TRACE_FORCE_FLUSH_MILLIS, TimeUnit.MILLISECONDS);
+  }
+
+  // Validates `retrievedTrace`. Cloud Trace indexes traces w/ eventual consistency, even when
+  // indexing traceId, therefore the test must retry a few times before the complete trace is
+  // available.
+  // For Transaction traces, there may be more spans than in the trace than specified in
+  // `callStack`. So `numExpectedSpans` is the expected total number of spans (and not just the
+  // spans in `callStack`)
+  protected void fetchAndValidateTrace(
+      String traceId, int numExpectedSpans, List> callStackList)
+      throws InterruptedException {
+    // Large enough count to accommodate eventually consistent Cloud Trace backend
+    int numRetries = GET_TRACE_RETRY_COUNT;
+    // Account for rootSpanName
+    numExpectedSpans++;
+
+    // Fetch traces
+    do {
+      try {
+        retrievedTrace = traceClient_v1.getTrace(projectId, traceId);
+        assertEquals(traceId, retrievedTrace.getTraceId());
+
+        logger.info(
+            "expectedSpanCount="
+                + numExpectedSpans
+                + ", retrievedSpanCount="
+                + retrievedTrace.getSpansCount());
+      } catch (NotFoundException notFound) {
+        logger.info("Trace not found, retrying in " + GET_TRACE_RETRY_BACKOFF_MILLIS + " ms");
+      } catch (IndexOutOfBoundsException outOfBoundsException) {
+        logger.info("Call stack not found in trace. Retrying.");
+      }
+      if (retrievedTrace == null || numExpectedSpans != retrievedTrace.getSpansCount()) {
+        Thread.sleep(GET_TRACE_RETRY_BACKOFF_MILLIS);
+      }
+    } while (numRetries-- > 0
+        && (retrievedTrace == null || numExpectedSpans != retrievedTrace.getSpansCount()));
+
+    if (retrievedTrace == null || numExpectedSpans != retrievedTrace.getSpansCount()) {
+      throw new RuntimeException(
+          "Expected number of spans: "
+              + numExpectedSpans
+              + ", Actual number of spans: "
+              + (retrievedTrace != null
+                  ? retrievedTrace.getSpansList().toString()
+                  : "Trace NOT_FOUND"));
+    }
+
+    TraceContainer traceContainer = new TraceContainer(rootSpanName, retrievedTrace);
+
+    for (List callStack : callStackList) {
+      // Update all call stacks to be rooted at rootSpanName
+      ArrayList expectedCallStack = new ArrayList<>(callStack);
+
+      // numExpectedSpans should account for rootSpanName (not passed in callStackList)
+      expectedCallStack.add(0, rootSpanName);
+
+      // *May be* the full trace was returned
+      logger.info("Checking if TraceContainer contains the callStack");
+      String[] expectedCallList = new String[expectedCallStack.size()];
+      if (!traceContainer.containsCallStack(expectedCallStack.toArray(expectedCallList))) {
+        throw new RuntimeException(
+            "Expected spans: "
+                + Arrays.toString(expectedCallList)
+                + ", Actual spans: "
+                + (retrievedTrace != null
+                    ? retrievedTrace.getSpansList().toString()
+                    : "Trace NOT_FOUND"));
+      }
+      logger.severe("CallStack not found in TraceContainer.");
+    }
+  }
+
+  // Validates `retrievedTrace`. Cloud Trace indexes traces w/ eventual consistency, even when
+  // indexing traceId, therefore the test must retry a few times before the complete trace is
+  // available.
+  // For Non-Transaction traces, there is a 1:1 ratio of spans in `spanNames` and in the trace.
+  protected void fetchAndValidateTrace(String traceId, String... spanNames)
+      throws InterruptedException {
+    fetchAndValidateTrace(traceId, spanNames.length, Arrays.asList(Arrays.asList(spanNames)));
+  }
+
+  @Test
+  public void traceContainerTest() throws Exception {
+    // Make sure the test has a new SpanContext (and TraceId for injection)
+    assertNotNull(customSpanContext);
+
+    // Inject new trace ID
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Entity entity = datastore.get(KEY1);
+      assertNull(entity);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    Trace traceResp = null;
+    int expectedSpanCount = 2;
+
+    int numRetries = GET_TRACE_RETRY_COUNT;
+    do {
+      try {
+        traceResp = traceClient_v1.getTrace(projectId, customSpanContext.getTraceId());
+        if (traceResp.getSpansCount() == expectedSpanCount) {
+          logger.info("Success: Got " + expectedSpanCount + " spans.");
+          break;
+        }
+      } catch (NotFoundException notFoundException) {
+        Thread.sleep(GET_TRACE_RETRY_BACKOFF_MILLIS);
+        logger.info("Trace not found, retrying in " + GET_TRACE_RETRY_BACKOFF_MILLIS + " ms");
+      }
+      logger.info(
+          "Trace Found. The trace did not contain "
+              + expectedSpanCount
+              + " spans. Going to retry.");
+      numRetries--;
+    } while (numRetries > 0);
+
+    // Make sure we got as many spans as we expected.
+    assertNotNull(traceResp);
+    assertEquals(expectedSpanCount, traceResp.getSpansCount());
+
+    TraceContainer traceCont = new TraceContainer(rootSpanName, traceResp);
+
+    // Contains exact path
+    assertTrue(traceCont.containsCallStack(rootSpanName, SPAN_NAME_LOOKUP));
+
+    // Top-level mismatch
+    assertFalse(traceCont.containsCallStack(SPAN_NAME_LOOKUP, RUN_QUERY_RPC_NAME));
+
+    // Leaf-level mismatch/missing
+    assertFalse(
+        traceCont.containsCallStack(
+            rootSpanName, SPAN_NAME_LOOKUP, RUN_AGGREGATION_QUERY_RPC_NAME));
+  }
+
+  @Test
+  public void lookupTraceTest() throws Exception {
+    // Make sure the test has a new SpanContext (and TraceId for injection)
+    assertNotNull(customSpanContext);
+
+    // Inject new trace ID
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Entity entity = datastore.get(KEY1);
+      assertNull(entity);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_LOOKUP);
+  }
+
+  @Test
+  public void allocateIdsTraceTest() throws Exception {
+    assertNotNull(customSpanContext);
+
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      String kind1 = "kind1";
+      KeyFactory keyFactory = datastore.newKeyFactory().setKind(kind1);
+      IncompleteKey pk1 = keyFactory.newKey();
+      Key key1 = datastore.allocateId(pk1);
+      assertEquals(key1.getProjectId(), pk1.getProjectId());
+      assertEquals(key1.getNamespace(), pk1.getNamespace());
+      assertEquals(key1.getAncestors(), pk1.getAncestors());
+      assertEquals(key1.getKind(), pk1.getKind());
+      assertTrue(key1.hasId());
+      assertFalse(key1.hasName());
+      assertEquals(Key.newBuilder(pk1, key1.getId()).build(), key1);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_ALLOCATE_IDS);
+  }
+
+  @Test
+  public void reserveIdsTraceTest() throws Exception {
+    assertNotNull(customSpanContext);
+
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+      Key key1 = keyFactory.newKey(10);
+      Key key2 = keyFactory.newKey("name");
+      List keyList = datastore.reserveIds(key1, key2);
+      assertEquals(2, keyList.size());
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_RESERVE_IDS);
+  }
+
+  @Test
+  public void commitTraceTest() throws Exception {
+    assertNotNull(customSpanContext);
+
+    Span rootSpan = getNewRootSpanWithContext();
+
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Entity response = datastore.add(entity1);
+      assertEquals(entity1, response);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT);
+  }
+
+  @Test
+  public void putTraceTest() throws Exception {
+    assertNotNull(customSpanContext);
+
+    Span rootSpan = getNewRootSpanWithContext();
+
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Entity response = datastore.put(entity1);
+      assertEquals(entity1, response);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT);
+  }
+
+  @Test
+  public void updateTraceTest() throws Exception {
+    assertNotNull(customSpanContext);
+
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Entity entity1_update =
+          Entity.newBuilder(entity1).set("test_field", "new_test_value1").build();
+      Entity entity2_update =
+          Entity.newBuilder(entity2).set("test_field", "new_test_value1").build();
+      datastore.update(entity1_update, entity2_update);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT);
+  }
+
+  @Test
+  public void deleteTraceTest() throws Exception {
+    assertNotNull(customSpanContext);
+
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build();
+    Entity response = datastore.put(entity1);
+    assertEquals(entity1, response);
+
+    Span rootSpan = getNewRootSpanWithContext();
+
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      datastore.delete(entity1.getKey());
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT);
+  }
+
+  @Test
+  public void runQueryTraceTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field"));
+      Query query =
+          Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build();
+      QueryResults queryResults = datastore.run(query);
+      assertTrue(queryResults.hasNext());
+      assertEquals(entity1, queryResults.next());
+      assertFalse(queryResults.hasNext());
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_RUN_QUERY);
+  }
+
+  @Test
+  public void runAggregationQueryTraceTest() throws Exception {
+    Entity entity1 =
+        Entity.newBuilder(KEY1)
+            .set("pepper_name", "jalapeno")
+            .set("max_scoville_level", 10000)
+            .build();
+    Entity entity2 =
+        Entity.newBuilder(KEY2)
+            .set("pepper_name", "serrano")
+            .set("max_scoville_level", 25000)
+            .build();
+    Entity entity3 =
+        Entity.newBuilder(KEY3)
+            .set("pepper_name", "habanero")
+            .set("max_scoville_level", 350000)
+            .build();
+    Entity entity4 =
+        Entity.newBuilder(KEY4)
+            .set("pepper_name", "ghost")
+            .set("max_scoville_level", 1500000)
+            .build();
+
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+    entityList.add(entity3);
+    entityList.add(entity4);
+
+    List response = datastore.add(entity1, entity2, entity3, entity4);
+    assertEquals(entityList, response);
+
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      PropertyFilter mediumSpicyFilters = PropertyFilter.lt("max_scoville_level", 100000);
+      StructuredQuery mediumSpicyQuery =
+          Query.newEntityQueryBuilder()
+              .setKind(KEY1.getKind())
+              .setFilter(mediumSpicyFilters)
+              .build();
+      AggregationQuery countSpicyPeppers =
+          Query.newAggregationQueryBuilder()
+              .addAggregation(count().as("count"))
+              .over(mediumSpicyQuery)
+              .build();
+      AggregationResults results = datastore.runAggregation(countSpicyPeppers);
+      assertThat(results.size()).isEqualTo(1);
+      AggregationResult result = results.get(0);
+      assertThat(result.getLong("count")).isEqualTo(2L);
+    } finally {
+      rootSpan.end();
+    }
+
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_RUN_AGGREGATION_QUERY);
+  }
+
+  @Test
+  public void newTransactionReadTest() throws Exception {
+    assertNotNull(customSpanContext);
+
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Transaction transaction = datastore.newTransaction();
+      Entity entity = datastore.get(KEY1, ReadOption.transactionId(transaction.getTransactionId()));
+      transaction.commit();
+      assertNull(entity);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(
+        customSpanContext.getTraceId(),
+        /*numExpectedSpans=*/ 3,
+        Arrays.asList(
+            Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
+            Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP),
+            Collections.singletonList(SPAN_NAME_TRANSACTION_COMMIT)));
+  }
+
+  @Test
+  public void newTransactionQueryTest() throws Exception {
+    // Set up
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    assertNotNull(customSpanContext);
+
+    // Test
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Transaction transaction = datastore.newTransaction();
+      PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field"));
+      Query query =
+          Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build();
+      QueryResults queryResults = transaction.run(query);
+      transaction.commit();
+      assertTrue(queryResults.hasNext());
+      assertEquals(entity1, queryResults.next());
+      assertFalse(queryResults.hasNext());
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(
+        customSpanContext.getTraceId(),
+        /*numExpectedSpans=*/ 3,
+        Arrays.asList(
+            Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
+            Collections.singletonList(SPAN_NAME_TRANSACTION_RUN_QUERY),
+            Collections.singletonList(SPAN_NAME_TRANSACTION_COMMIT)));
+  }
+
+  @Test
+  public void newTransactionReadWriteTraceTest() throws Exception {
+    // Set up
+    Entity entity1 = Entity.newBuilder(KEY1).set("pepper_type", "jalapeno").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("pepper_type", "habanero").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    String simplified_spice_level = "not_spicy";
+    Entity entity1update =
+        Entity.newBuilder(entity1).set("spice_level", simplified_spice_level).build();
+
+    assertNotNull(customSpanContext);
+
+    // Test
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Transaction transaction = datastore.newTransaction();
+      entity1 = transaction.get(KEY1);
+      switch (entity1.getString("pepper_type")) {
+        case "jalapeno":
+          simplified_spice_level = "mild";
+          break;
+
+        case "habanero":
+          simplified_spice_level = "hot";
+          break;
+      }
+      transaction.update(entity1update);
+      transaction.delete(KEY2);
+      transaction.commit();
+      assertFalse(transaction.isActive());
+    } finally {
+      rootSpan.end();
+    }
+
+    waitForTracesToComplete();
+
+    List list = datastore.fetch(KEY1, KEY2);
+    assertEquals(list.get(0), entity1update);
+    assertNull(list.get(1));
+
+    fetchAndValidateTrace(
+        customSpanContext.getTraceId(),
+        /*numExpectedSpans=*/ 3,
+        Arrays.asList(
+            Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
+            Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP),
+            Collections.singletonList(SPAN_NAME_TRANSACTION_COMMIT)));
+  }
+
+  @Test
+  public void newTransactionRollbackTest() throws Exception {
+    // Set up
+    Entity entity1 = Entity.newBuilder(KEY1).set("pepper_type", "jalapeno").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("pepper_type", "habanero").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    String simplified_spice_level = "not_spicy";
+    Entity entity1update =
+        Entity.newBuilder(entity1).set("spice_level", simplified_spice_level).build();
+
+    assertNotNull(customSpanContext);
+
+    // Test
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      Transaction transaction = datastore.newTransaction();
+      entity1 = transaction.get(KEY1);
+      switch (entity1.getString("pepper_type")) {
+        case "jalapeno":
+          simplified_spice_level = "mild";
+          break;
+
+        case "habanero":
+          simplified_spice_level = "hot";
+          break;
+      }
+      transaction.update(entity1update);
+      transaction.delete(KEY2);
+      transaction.rollback();
+      assertFalse(transaction.isActive());
+    } finally {
+      rootSpan.end();
+    }
+
+    waitForTracesToComplete();
+
+    List list = datastore.fetch(KEY1, KEY2);
+    assertEquals(list.get(0), entity1);
+    assertEquals(list.get(1), entity2);
+
+    fetchAndValidateTrace(
+        customSpanContext.getTraceId(),
+        /*numExpectedSpans=*/ 3,
+        Arrays.asList(
+            Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
+            Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP),
+            Collections.singletonList(SPAN_NAME_ROLLBACK)));
+  }
+
+  @Test
+  public void runInTransactionQueryTest() throws Exception {
+    // Set up
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    assertNotNull(customSpanContext);
+
+    Span rootSpan = getNewRootSpanWithContext();
+    try (Scope ignored = rootSpan.makeCurrent()) {
+      PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field"));
+      Query query =
+          Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build();
+      Datastore.TransactionCallable callable =
+          transaction -> {
+            QueryResults queryResults = datastore.run(query);
+            assertTrue(queryResults.hasNext());
+            assertEquals(entity1, queryResults.next());
+            assertFalse(queryResults.hasNext());
+            return true;
+          };
+      datastore.runInTransaction(callable);
+    } finally {
+      rootSpan.end();
+    }
+    waitForTracesToComplete();
+
+    fetchAndValidateTrace(
+        customSpanContext.getTraceId(),
+        /*numExpectedSpans=*/ 4,
+        Arrays.asList(
+            Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_BEGIN_TRANSACTION),
+            Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_RUN_QUERY),
+            Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_TRANSACTION_COMMIT)));
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
new file mode 100644
index 000000000000..aefb51352be2
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
@@ -0,0 +1,849 @@
+/*
+ * Copyright 2024 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.cloud.datastore.it;
+
+import static com.google.cloud.datastore.aggregation.Aggregation.count;
+import static com.google.cloud.datastore.telemetry.TraceUtil.*;
+import static com.google.common.truth.Truth.assertThat;
+import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.cloud.datastore.AggregationQuery;
+import com.google.cloud.datastore.AggregationResult;
+import com.google.cloud.datastore.AggregationResults;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOpenTelemetryOptions;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.IncompleteKey;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.KeyFactory;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.ReadOption;
+import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.cloud.datastore.Transaction;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
+import com.google.common.base.Preconditions;
+import com.google.testing.junit.testparameterinjector.TestParameter;
+import com.google.testing.junit.testparameterinjector.TestParameterInjector;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.OpenTelemetrySdkBuilder;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.SpanProcessor;
+import io.opentelemetry.sdk.trace.data.EventData;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
+import io.opentelemetry.sdk.trace.samplers.Sampler;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+
+@RunWith(TestParameterInjector.class)
+public class ITTracingTest {
+  protected boolean isUsingGlobalOpenTelemetrySDK() {
+    return useGlobalOpenTelemetrySDK;
+  }
+
+  protected String datastoreNamedDatabase() {
+    return datastoreNamedDatabase;
+  }
+
+  private static final Logger logger =
+      Logger.getLogger(com.google.cloud.datastore.it.ITTracingTest.class.getName());
+
+  private static final int TRACE_FORCE_FLUSH_MILLIS = 1000;
+  private static final int TRACE_PROVIDER_SHUTDOWN_MILLIS = 1000;
+  private static final int IN_MEMORY_SPAN_EXPORTER_DELAY_MILLIS = 50;
+  private static final String SERVICE = "google.datastore.v1.Datastore/";
+
+  private static Key KEY1;
+
+  private static Key KEY2;
+
+  private static Key KEY3;
+
+  private static Key KEY4;
+
+  private static OpenTelemetrySdk openTelemetrySdk;
+
+  // We use an InMemorySpanExporter for testing which keeps all generated trace spans
+  // in memory so that we can check their correctness.
+  protected InMemorySpanExporter inMemorySpanExporter;
+  private static DatastoreOptions options;
+
+  protected Datastore datastore;
+  private static RemoteDatastoreHelper remoteDatastoreHelper;
+
+  @TestParameter boolean useGlobalOpenTelemetrySDK;
+
+  @TestParameter({
+    /*(default)*/
+    "",
+    "test-db"
+  })
+  String datastoreNamedDatabase;
+
+  Map spanNameToSpanId = new HashMap<>();
+  Map spanIdToParentSpanId = new HashMap<>();
+  Map spanNameToSpanData = new HashMap<>();
+
+  @Rule public TestName testName = new TestName();
+
+  @Before
+  public void before() {
+    inMemorySpanExporter = InMemorySpanExporter.create();
+
+    Resource resource =
+        Resource.getDefault().merge(Resource.builder().put(SERVICE_NAME, "Sparky").build());
+    SpanProcessor inMemorySpanProcessor = SimpleSpanProcessor.create(inMemorySpanExporter);
+    DatastoreOptions.Builder optionsBuilder = DatastoreOptions.newBuilder();
+    DatastoreOpenTelemetryOptions.Builder otelOptionsBuilder =
+        DatastoreOpenTelemetryOptions.newBuilder();
+    OpenTelemetrySdkBuilder openTelemetrySdkBuilder =
+        OpenTelemetrySdk.builder()
+            .setTracerProvider(
+                SdkTracerProvider.builder()
+                    .setResource(resource)
+                    .addSpanProcessor(inMemorySpanProcessor)
+                    .setSampler(Sampler.alwaysOn())
+                    .build());
+
+    if (isUsingGlobalOpenTelemetrySDK()) {
+      GlobalOpenTelemetry.resetForTest();
+      openTelemetrySdk = openTelemetrySdkBuilder.buildAndRegisterGlobal();
+      optionsBuilder.setOpenTelemetryOptions(otelOptionsBuilder.setTracingEnabled(true).build());
+    } else {
+      openTelemetrySdk = openTelemetrySdkBuilder.build();
+      optionsBuilder.setOpenTelemetryOptions(
+          otelOptionsBuilder.setTracingEnabled(true).setOpenTelemetry(openTelemetrySdk).build());
+    }
+
+    String namedDb = datastoreNamedDatabase();
+    logger.log(Level.INFO, "Integration test using named database " + namedDb);
+    remoteDatastoreHelper = RemoteDatastoreHelper.create(namedDb, openTelemetrySdk);
+    options = remoteDatastoreHelper.getOptions();
+    datastore = options.getService();
+
+    Preconditions.checkNotNull(
+        datastore,
+        "Error instantiating Datastore. Check that the service account credentials "
+            + "were properly set.");
+
+    String projectId = options.getProjectId();
+    String kind1 = "kind1";
+    KEY1 =
+        Key.newBuilder(projectId, kind1, "key1", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    KEY2 =
+        Key.newBuilder(projectId, kind1, "key2", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    KEY3 =
+        Key.newBuilder(projectId, kind1, "key3", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    KEY4 =
+        Key.newBuilder(projectId, kind1, "key4", options.getDatabaseId())
+            .setNamespace(options.getNamespace())
+            .build();
+    cleanupTestSpanContext();
+  }
+
+  @After
+  public void after() throws Exception {
+    if (isUsingGlobalOpenTelemetrySDK()) {
+      GlobalOpenTelemetry.resetForTest();
+    }
+    remoteDatastoreHelper.deleteNamespace();
+    inMemorySpanExporter.reset();
+    CompletableResultCode completableResultCode =
+        openTelemetrySdk.getSdkTracerProvider().shutdown();
+    completableResultCode.join(TRACE_PROVIDER_SHUTDOWN_MILLIS, TimeUnit.MILLISECONDS);
+    openTelemetrySdk = null;
+  }
+
+  @AfterClass
+  public static void teardown() {}
+
+  void waitForTracesToComplete() throws Exception {
+    // The same way that querying the Cloud Trace backend may not give us the
+    // full trace on the first try, querying the in-memory traces may not result
+    // in the full trace immediately. Note that performing the `flush` is not
+    // enough. This doesn't pose an issue in practice, but can make tests flaky.
+    // Therefore, we're adding a delay to make sure we avoid any flakiness.
+    inMemorySpanExporter.flush().join(IN_MEMORY_SPAN_EXPORTER_DELAY_MILLIS, TimeUnit.MILLISECONDS);
+    TimeUnit.MILLISECONDS.sleep(IN_MEMORY_SPAN_EXPORTER_DELAY_MILLIS);
+
+    CompletableResultCode completableResultCode =
+        openTelemetrySdk.getSdkTracerProvider().forceFlush();
+    completableResultCode.join(TRACE_FORCE_FLUSH_MILLIS, TimeUnit.MILLISECONDS);
+  }
+
+  // Prepares all the spans in memory for inspection.
+  List prepareSpans() throws Exception {
+    waitForTracesToComplete();
+    List spans = inMemorySpanExporter.getFinishedSpanItems();
+    buildSpanMaps(spans);
+    printSpans();
+    return spans;
+  }
+
+  void buildSpanMaps(List spans) {
+    for (SpanData spanData : spans) {
+      spanNameToSpanData.put(spanData.getName(), spanData);
+      spanNameToSpanId.put(spanData.getName(), spanData.getSpanId());
+      spanIdToParentSpanId.put(spanData.getSpanId(), spanData.getParentSpanId());
+    }
+  }
+
+  // Returns the SpanData object for the span with the given name.
+  // Returns null if no span with the given name exists.
+  @Nullable
+  SpanData getSpanByName(String spanName) {
+    return spanNameToSpanData.get(spanName);
+  }
+
+  // Returns the SpanData object for the gRPC span with the given RPC name.
+  // Returns null if no such span exists.
+  @Nullable
+  SpanData getGrpcSpanByName(String rpcName) {
+    return getSpanByName(SERVICE + rpcName);
+  }
+
+  String grpcSpanName(String rpcName) {
+    return SERVICE + rpcName;
+  }
+
+  void assertSameTrace(SpanData... spans) {
+    if (spans.length > 1) {
+      String traceId = spans[0].getTraceId();
+      for (SpanData spanData : spans) {
+        assertEquals(traceId, spanData.getTraceId());
+      }
+    }
+  }
+
+  // Helper to see the spans in standard output while developing tests
+  void printSpans() {
+    for (SpanData spanData : spanNameToSpanData.values()) {
+      logger.log(
+          Level.FINE,
+          String.format(
+              "SPAN ID:%s, ParentID:%s, KIND:%s, TRACE ID:%s, NAME:%s, ATTRIBUTES:%s, EVENTS:%s\n",
+              spanData.getSpanId(),
+              spanData.getParentSpanId(),
+              spanData.getKind(),
+              spanData.getTraceId(),
+              spanData.getName(),
+              spanData.getAttributes().toString(),
+              spanData.getEvents().toString()));
+    }
+  }
+
+  // Asserts that the span hierarchy exists for the given span names. The hierarchy starts with the
+  // root span, followed
+  // by the child span, grandchild span, and so on. It also asserts that all the given spans belong
+  // to the same trace,
+  // and that datastore-generated spans contain the expected datastore attributes.
+  void assertSpanHierarchy(String... spanNamesHierarchy) {
+    List spanNames = Arrays.asList(spanNamesHierarchy);
+
+    for (int i = 0; i + 1 < spanNames.size(); ++i) {
+      String parentSpanName = spanNames.get(i);
+      String childSpanName = spanNames.get(i + 1);
+      SpanData parentSpan = getSpanByName(parentSpanName);
+      SpanData childSpan = getSpanByName(childSpanName);
+      assertNotNull(parentSpan);
+      assertNotNull(childSpan);
+      assertEquals(childSpan.getParentSpanId(), parentSpan.getSpanId());
+      assertSameTrace(childSpan, parentSpan);
+      // gRPC spans do not have datastore attributes.
+      if (!parentSpanName.startsWith(SERVICE)) {
+        assertHasExpectedAttributes(parentSpan);
+      }
+      if (!childSpanName.startsWith(SERVICE)) {
+        assertHasExpectedAttributes(childSpan);
+      }
+    }
+  }
+
+  void assertHasExpectedAttributes(SpanData spanData, String... additionalExpectedAttributes) {
+    // All datastore-generated spans have the settings attributes.
+    List expectedAttributes =
+        Arrays.asList(
+            "gcp.datastore.memoryUtilization",
+            "gcp.datastore.settings.host",
+            "gcp.datastore.settings.databaseId",
+            "gcp.datastore.settings.retrySettings.maxRpcTimeout",
+            "gcp.datastore.settings.retrySettings.retryDelayMultiplier",
+            "gcp.datastore.settings.retrySettings.initialRetryDelay",
+            "gcp.datastore.settings.credentials.authenticationType",
+            "gcp.datastore.settings.retrySettings.maxAttempts",
+            "gcp.datastore.settings.retrySettings.maxRetryDelay",
+            "gcp.datastore.settings.retrySettings.rpcTimeoutMultiplier",
+            "gcp.datastore.settings.retrySettings.totalTimeout",
+            "gcp.datastore.settings.retrySettings.initialRpcTimeout");
+
+    expectedAttributes.addAll(Arrays.asList(additionalExpectedAttributes));
+
+    Attributes spanAttributes = spanData.getAttributes();
+    for (String expectedAttribute : expectedAttributes) {
+      assertNotNull(spanAttributes.get(AttributeKey.stringKey(expectedAttribute)));
+    }
+  }
+
+  // Returns true if and only if the given span data contains an event with the given name and the
+  // given expected
+  // attributes.
+  boolean hasEvent(SpanData spanData, String eventName, @Nullable Attributes expectedAttributes) {
+    if (spanData == null) {
+      return false;
+    }
+
+    logger.log(
+        Level.INFO,
+        String.format(
+            "Checking if span named '%s' (ID='%s') contains an event named '%s'",
+            spanData.getName(), spanData.getSpanId(), eventName));
+
+    List events = spanData.getEvents();
+    for (EventData event : events) {
+      if (event.getName().equals(eventName)) {
+        if (expectedAttributes == null) {
+          return true;
+        }
+
+        // Make sure attributes also match.
+        Attributes eventAttributes = event.getAttributes();
+        return expectedAttributes.equals(eventAttributes);
+      }
+    }
+    return false;
+  }
+
+  void cleanupTestSpanContext() {
+    inMemorySpanExporter.reset();
+    spanNameToSpanId.clear();
+    spanIdToParentSpanId.clear();
+    spanNameToSpanData.clear();
+  }
+
+  // This is a POJO used for testing APIs that take a POJO.
+  public static class Pojo {
+    public int bar;
+
+    public Pojo() {
+      bar = 0;
+    }
+
+    public Pojo(int bar) {
+      this.bar = bar;
+    }
+
+    public int getBar() {
+      return bar;
+    }
+
+    public void setBar(int bar) {
+      this.bar = bar;
+    }
+  }
+
+  @Test
+  public void lookupTraceTest() throws Exception {
+    Entity entity = datastore.get(KEY1);
+    assertNull(entity);
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_LOOKUP);
+    SpanData span = getSpanByName(SPAN_NAME_LOOKUP);
+    assertTrue(
+        hasEvent(
+            span,
+            SPAN_NAME_LOOKUP + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_RECEIVED, 0)
+                .put(ATTRIBUTES_KEY_MISSING, 1)
+                .put(ATTRIBUTES_KEY_DEFERRED, 0)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, false)
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, "")
+                .build()));
+  }
+
+  @Test
+  public void allocateIdsTraceTest() throws Exception {
+    String kind1 = "kind1";
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind(kind1);
+    IncompleteKey pk1 = keyFactory.newKey();
+    Key key1 = datastore.allocateId(pk1);
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_ALLOCATE_IDS);
+  }
+
+  @Test
+  public void reserveIdsTraceTest() throws Exception {
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
+    Key key1 = keyFactory.newKey(10);
+    Key key2 = keyFactory.newKey("name");
+    List keyList = datastore.reserveIds(key1, key2);
+    assertEquals(2, keyList.size());
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_RESERVE_IDS);
+  }
+
+  @Test
+  public void commitTraceTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build();
+    Entity response = datastore.add(entity1);
+    assertEquals(entity1, response);
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_COMMIT);
+  }
+
+  @Test
+  public void putTraceTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build();
+    Entity response = datastore.put(entity1);
+    assertEquals(entity1, response);
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_COMMIT);
+  }
+
+  @Test
+  public void updateTraceTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_COMMIT);
+
+    SpanData spanData = getSpanByName(SPAN_NAME_COMMIT);
+    assertTrue(
+        hasEvent(
+            spanData,
+            SPAN_NAME_COMMIT + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, response.size())
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, false)
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, "")
+                .build()));
+
+    // Clean Up test span context to verify update spans
+    cleanupTestSpanContext();
+
+    Entity entity1_update = Entity.newBuilder(entity1).set("test_field", "new_test_value1").build();
+    Entity entity2_update = Entity.newBuilder(entity2).set("test_field", "new_test_value1").build();
+    datastore.update(entity1_update, entity2_update);
+
+    waitForTracesToComplete();
+
+    spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_COMMIT);
+  }
+
+  @Test
+  public void deleteTraceTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build();
+    Entity response = datastore.put(entity1);
+    assertEquals(entity1, response);
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_COMMIT);
+
+    SpanData spanData = getSpanByName(SPAN_NAME_COMMIT);
+    assertTrue(
+        hasEvent(
+            spanData,
+            SPAN_NAME_COMMIT + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, false)
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, "")
+                .build()));
+
+    // Clean Up test span context to verify update spans
+    cleanupTestSpanContext();
+
+    datastore.delete(entity1.getKey());
+
+    waitForTracesToComplete();
+
+    spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_COMMIT);
+
+    spanData = getSpanByName(SPAN_NAME_COMMIT);
+    assertTrue(
+        hasEvent(
+            spanData,
+            SPAN_NAME_COMMIT + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, false)
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, "")
+                .build()));
+  }
+
+  @Test
+  public void runQueryTraceTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    // Clean Up test span context to verify RunQuery spans
+    cleanupTestSpanContext();
+
+    PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field"));
+    Query query =
+        Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build();
+    QueryResults queryResults = datastore.run(query);
+    assertTrue(queryResults.hasNext());
+    assertEquals(entity1, queryResults.next());
+    assertFalse(queryResults.hasNext());
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_RUN_QUERY);
+
+    SpanData span = getSpanByName(SPAN_NAME_RUN_QUERY);
+    assertTrue(
+        hasEvent(
+            span,
+            SPAN_NAME_RUN_QUERY + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, false)
+                .put(ATTRIBUTES_KEY_READ_CONSISTENCY, "READ_CONSISTENCY_UNSPECIFIED")
+                .put(ATTRIBUTES_KEY_MORE_RESULTS, "NO_MORE_RESULTS")
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, "")
+                .build()));
+  }
+
+  @Test
+  public void runAggregationQueryTraceTest() throws Exception {
+    Entity entity1 =
+        Entity.newBuilder(KEY1)
+            .set("pepper_name", "jalapeno")
+            .set("max_scoville_level", 10000)
+            .build();
+    Entity entity2 =
+        Entity.newBuilder(KEY2)
+            .set("pepper_name", "serrano")
+            .set("max_scoville_level", 25000)
+            .build();
+    Entity entity3 =
+        Entity.newBuilder(KEY3)
+            .set("pepper_name", "habanero")
+            .set("max_scoville_level", 350000)
+            .build();
+    Entity entity4 =
+        Entity.newBuilder(KEY4)
+            .set("pepper_name", "ghost")
+            .set("max_scoville_level", 1500000)
+            .build();
+
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+    entityList.add(entity3);
+    entityList.add(entity4);
+
+    List response = datastore.add(entity1, entity2, entity3, entity4);
+    assertEquals(entityList, response);
+
+    // Clean Up test span context to verify RunAggregationQuery spans
+    cleanupTestSpanContext();
+
+    PropertyFilter mediumSpicyFilters = PropertyFilter.lt("max_scoville_level", 100000);
+    StructuredQuery mediumSpicyQuery =
+        Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(mediumSpicyFilters).build();
+    AggregationQuery countSpicyPeppers =
+        Query.newAggregationQueryBuilder()
+            .addAggregation(count().as("count"))
+            .over(mediumSpicyQuery)
+            .build();
+    AggregationResults results = datastore.runAggregation(countSpicyPeppers);
+    assertThat(results.size()).isEqualTo(1);
+    AggregationResult result = results.get(0);
+    assertThat(result.getLong("count")).isEqualTo(2L);
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(1, spans.size());
+    assertSpanHierarchy(SPAN_NAME_RUN_AGGREGATION_QUERY);
+  }
+
+  @Test
+  public void newTransactionReadWriteTraceTest() throws Exception {
+    // Transaction.Begin
+    Transaction transaction = datastore.newTransaction();
+
+    // Transaction.Lookup
+    Entity entity = datastore.get(KEY1, ReadOption.transactionId(transaction.getTransactionId()));
+    assertNull(entity);
+
+    Entity updatedEntity = Entity.newBuilder(KEY1).set("test_field", "new_test_value1").build();
+    transaction.put(updatedEntity);
+
+    // Transaction.Commit
+    transaction.commit();
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(3, spans.size());
+
+    assertSpanHierarchy(SPAN_NAME_BEGIN_TRANSACTION);
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_LOOKUP);
+    SpanData span = getSpanByName(SPAN_NAME_TRANSACTION_LOOKUP);
+    assertTrue(
+        hasEvent(
+            span,
+            SPAN_NAME_TRANSACTION_LOOKUP + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DEFERRED, 0)
+                .put(ATTRIBUTES_KEY_MISSING, 1)
+                .put(ATTRIBUTES_KEY_RECEIVED, 0)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, true)
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8())
+                .build()));
+
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_COMMIT);
+    span = getSpanByName(SPAN_NAME_TRANSACTION_COMMIT);
+    assertTrue(
+        hasEvent(
+            span,
+            SPAN_NAME_TRANSACTION_COMMIT + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, true)
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8())
+                .build()));
+  }
+
+  @Test
+  public void newTransactionQueryTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    // Clean Up test span context to verify Transaction RunQuery spans
+    cleanupTestSpanContext();
+
+    Transaction transaction = datastore.newTransaction();
+    PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field"));
+    Query query =
+        Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build();
+    QueryResults queryResults = transaction.run(query);
+    transaction.commit();
+    assertTrue(queryResults.hasNext());
+    assertEquals(entity1, queryResults.next());
+    assertFalse(queryResults.hasNext());
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(3, spans.size());
+
+    assertSpanHierarchy(SPAN_NAME_BEGIN_TRANSACTION);
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN_QUERY);
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_COMMIT);
+    SpanData span = getSpanByName(SPAN_NAME_TRANSACTION_RUN_QUERY);
+    assertTrue(
+        hasEvent(
+            span,
+            SPAN_NAME_TRANSACTION_RUN_QUERY + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, true)
+                .put(ATTRIBUTES_KEY_READ_CONSISTENCY, "READ_CONSISTENCY_UNSPECIFIED")
+                .put(ATTRIBUTES_KEY_MORE_RESULTS, "NO_MORE_RESULTS")
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8())
+                .build()));
+  }
+
+  @Test
+  public void newTransactionRollbackTest() throws Exception {
+    Entity entity1 = Entity.newBuilder(KEY1).set("pepper_type", "jalapeno").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("pepper_type", "habanero").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    // Clean Up test span context to verify Transaction Rollback spans
+    cleanupTestSpanContext();
+
+    String simplified_spice_level = "not_spicy";
+    Entity entity1update =
+        Entity.newBuilder(entity1).set("spice_level", simplified_spice_level).build();
+    Transaction transaction = datastore.newTransaction();
+    entity1 = transaction.get(KEY1);
+    switch (entity1.getString("pepper_type")) {
+      case "jalapeno":
+        simplified_spice_level = "mild";
+        break;
+
+      case "habanero":
+        simplified_spice_level = "hot";
+        break;
+    }
+    transaction.update(entity1update);
+    transaction.delete(KEY2);
+    transaction.rollback();
+    assertFalse(transaction.isActive());
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(3, spans.size());
+
+    assertSpanHierarchy(SPAN_NAME_BEGIN_TRANSACTION);
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_LOOKUP);
+    SpanData span = getSpanByName(SPAN_NAME_TRANSACTION_LOOKUP);
+    assertTrue(
+        hasEvent(
+            span,
+            SPAN_NAME_TRANSACTION_LOOKUP + " complete.",
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_DEFERRED, 0)
+                .put(ATTRIBUTES_KEY_MISSING, 0)
+                .put(ATTRIBUTES_KEY_RECEIVED, 1)
+                .put(ATTRIBUTES_KEY_TRANSACTIONAL, true)
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8())
+                .build()));
+
+    assertSpanHierarchy(SPAN_NAME_ROLLBACK);
+    span = getSpanByName(SPAN_NAME_ROLLBACK);
+    assertTrue(
+        hasEvent(
+            span,
+            SPAN_NAME_ROLLBACK,
+            Attributes.builder()
+                .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8())
+                .build()));
+  }
+
+  @Test
+  public void runInTransactionQueryTest() throws Exception {
+    // Set up
+    Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build();
+    Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build();
+    List entityList = new ArrayList<>();
+    entityList.add(entity1);
+    entityList.add(entity2);
+
+    List response = datastore.add(entity1, entity2);
+    assertEquals(entityList, response);
+
+    // Clean Up test span context to verify Transaction Rollback spans
+    cleanupTestSpanContext();
+
+    PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field"));
+    Query query =
+        Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build();
+    Datastore.TransactionCallable callable =
+        transaction -> {
+          QueryResults queryResults = datastore.run(query);
+          assertTrue(queryResults.hasNext());
+          assertEquals(entity1, queryResults.next());
+          assertFalse(queryResults.hasNext());
+          return true;
+        };
+    datastore.runInTransaction(callable);
+
+    waitForTracesToComplete();
+
+    List spans = prepareSpans();
+    assertEquals(4, spans.size());
+
+    // Since the runInTransaction method runs the TransactionCallable opaquely in a transaction
+    // there is no way for the API user to know the transaction ID, so we will not validate it here.
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_BEGIN_TRANSACTION);
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_RUN_QUERY);
+    assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_TRANSACTION_COMMIT);
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java
new file mode 100644
index 000000000000..c80ef9353fd5
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 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.cloud.datastore.telemetry;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+
+public class DisabledTraceUtilTest {
+  @Test
+  public void disabledTraceUtilDoesNotProvideChannelConfigurator() {
+    DisabledTraceUtil traceUtil = new DisabledTraceUtil();
+    assertThat(traceUtil.getChannelConfigurator()).isNull();
+  }
+
+  @Test
+  public void usesDisabledContext() {
+    DisabledTraceUtil traceUtil = new DisabledTraceUtil();
+    assertThat(traceUtil.getCurrentContext() instanceof DisabledTraceUtil.Context).isTrue();
+  }
+
+  @Test
+  public void usesDisabledSpan() {
+    DisabledTraceUtil traceUtil = new DisabledTraceUtil();
+    assertThat(traceUtil.getCurrentSpan() instanceof DisabledTraceUtil.Span).isTrue();
+    assertThat(traceUtil.startSpan("foo") instanceof DisabledTraceUtil.Span).isTrue();
+    assertThat(
+            traceUtil.startSpan("foo", traceUtil.getCurrentSpan())
+                instanceof DisabledTraceUtil.Span)
+        .isTrue();
+  }
+
+  @Test
+  public void usesDisabledScope() {
+    DisabledTraceUtil traceUtil = new DisabledTraceUtil();
+    assertThat(traceUtil.getCurrentContext().makeCurrent() instanceof DisabledTraceUtil.Scope)
+        .isTrue();
+    assertThat(traceUtil.getCurrentSpan().makeCurrent() instanceof DisabledTraceUtil.Scope)
+        .isTrue();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
new file mode 100644
index 000000000000..50d7b6820418
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2024 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.cloud.datastore.telemetry;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.cloud.NoCredentials;
+import com.google.cloud.datastore.DatastoreOpenTelemetryOptions;
+import com.google.cloud.datastore.DatastoreOptions;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EnabledTraceUtilTest {
+  @Before
+  public void setUp() {
+    GlobalOpenTelemetry.resetForTest();
+  }
+
+  DatastoreOptions.Builder getBaseOptions() {
+    return DatastoreOptions.newBuilder()
+        .setProjectId("test-project")
+        .setCredentials(NoCredentials.getInstance());
+  }
+
+  DatastoreOptions getTracingEnabledOptions() {
+    return getBaseOptions()
+        .setOpenTelemetryOptions(
+            DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build())
+        .build();
+  }
+
+  EnabledTraceUtil newEnabledTraceUtil() {
+    return new EnabledTraceUtil(getTracingEnabledOptions());
+  }
+
+  @Test
+  public void usesOpenTelemetryFromOptions() {
+    OpenTelemetrySdk myOpenTelemetrySdk = OpenTelemetrySdk.builder().build();
+    DatastoreOptions firestoreOptions =
+        getBaseOptions()
+            .setOpenTelemetryOptions(
+                DatastoreOpenTelemetryOptions.newBuilder()
+                    .setTracingEnabled(true)
+                    .setOpenTelemetry(myOpenTelemetrySdk)
+                    .build())
+            .build();
+    EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions);
+    assertThat(traceUtil.getOpenTelemetry()).isEqualTo(myOpenTelemetrySdk);
+  }
+
+  @Test
+  public void usesGlobalOpenTelemetryIfOpenTelemetryInstanceNotProvided() {
+    OpenTelemetrySdk ignored = OpenTelemetrySdk.builder().buildAndRegisterGlobal();
+    DatastoreOptions firestoreOptions =
+        getBaseOptions()
+            .setOpenTelemetryOptions(
+                DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build())
+            .build();
+    EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions);
+    assertThat(traceUtil.getOpenTelemetry()).isEqualTo(GlobalOpenTelemetry.get());
+  }
+
+  @Test
+  public void enabledTraceUtilProvidesChannelConfigurator() {
+    assertThat(newEnabledTraceUtil().getChannelConfigurator()).isNull();
+  }
+
+  @Test
+  public void usesEnabledContext() {
+    assertThat(newEnabledTraceUtil().getCurrentContext() instanceof EnabledTraceUtil.Context)
+        .isTrue();
+  }
+
+  @Test
+  public void usesEnabledSpan() {
+    EnabledTraceUtil traceUtil = newEnabledTraceUtil();
+    assertThat(traceUtil.getCurrentSpan() instanceof EnabledTraceUtil.Span).isTrue();
+    assertThat(traceUtil.startSpan("foo") != null).isTrue();
+    assertThat(
+            traceUtil.startSpan("foo", traceUtil.getCurrentSpan()) instanceof EnabledTraceUtil.Span)
+        .isTrue();
+  }
+
+  @Test
+  public void usesEnabledScope() {
+    EnabledTraceUtil traceUtil = newEnabledTraceUtil();
+    assertThat(traceUtil.getCurrentContext().makeCurrent() instanceof EnabledTraceUtil.Scope)
+        .isTrue();
+    assertThat(traceUtil.getCurrentSpan().makeCurrent() instanceof EnabledTraceUtil.Scope).isTrue();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java
new file mode 100644
index 000000000000..f1cce800689e
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 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.cloud.datastore.telemetry;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.cloud.NoCredentials;
+import com.google.cloud.datastore.DatastoreOpenTelemetryOptions;
+import com.google.cloud.datastore.DatastoreOptions;
+import org.junit.Test;
+
+public class TraceUtilTest {
+  @Test
+  public void defaultOptionsUseDisabledTraceUtil() {
+    TraceUtil traceUtil =
+        TraceUtil.getInstance(
+            DatastoreOptions.newBuilder()
+                .setProjectId("test-project")
+                .setCredentials(NoCredentials.getInstance())
+                .build());
+    assertThat(traceUtil instanceof DisabledTraceUtil).isTrue();
+  }
+
+  @Test
+  public void tracingDisabledOptionsUseDisabledTraceUtil() {
+    TraceUtil traceUtil =
+        TraceUtil.getInstance(
+            DatastoreOptions.newBuilder()
+                .setProjectId("test-project")
+                .setCredentials(NoCredentials.getInstance())
+                .setOpenTelemetryOptions(
+                    DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(false).build())
+                .build());
+    assertThat(traceUtil instanceof DisabledTraceUtil).isTrue();
+  }
+
+  @Test
+  public void tracingEnabledOptionsUseEnabledTraceUtil() {
+    TraceUtil traceUtil =
+        TraceUtil.getInstance(
+            DatastoreOptions.newBuilder()
+                .setProjectId("test-project")
+                .setCredentials(NoCredentials.getInstance())
+                .setOpenTelemetryOptions(
+                    DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build())
+                .build());
+    assertThat(traceUtil instanceof EnabledTraceUtil).isTrue();
+  }
+}

From 63218dc8bca3a408bcc8b72a0752a550032ddf7d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2024 20:50:24 +0000
Subject: [PATCH 1451/1784] chore(main): release 2.21.4-SNAPSHOT (#1571)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3922a27578d8..d55ccc6afada 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.21.3
+  2.21.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3
+    2.21.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a13792e8f7b9..a3a740e7c540 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.21.3
+  2.21.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.3
+        2.21.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.3
+        2.21.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.3
+        0.112.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.3
+        2.21.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5137728ead58..23d17e8368e8 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.3
+  2.21.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3
+    2.21.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index fe38bbef164d..8f51e25fc7c0 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.21.3
+  2.21.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3
+    2.21.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 23737d6b346f..1d30d1961912 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.3
+  2.21.4-SNAPSHOT
   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.21.3
+        2.21.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.3
+        2.21.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.3
+        2.21.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.3
+        0.112.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.3
+        2.21.4-SNAPSHOT
         
           
             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 5ddd934ff394..10b83d827986 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.21.3
+  2.21.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3
+    2.21.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a2bceec90780..437485dc0da4 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.112.3
+  0.112.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.3
+    2.21.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index af7856d352ec..bf1562ed7bd0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.3
+      2.21.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 9cc37ac81a52..8622f54a26c5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.3:2.21.3
-google-cloud-datastore-bom:2.21.3:2.21.3
-proto-google-cloud-datastore-v1:0.112.3:0.112.3
-datastore-v1-proto-client:2.21.3:2.21.3
-proto-google-cloud-datastore-admin-v1:2.21.3:2.21.3
-grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.3
+google-cloud-datastore:2.21.3:2.21.4-SNAPSHOT
+google-cloud-datastore-bom:2.21.3:2.21.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.112.3:0.112.4-SNAPSHOT
+datastore-v1-proto-client:2.21.3:2.21.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT

From b43a5c3676792509bcc0ab56e6410923eb7b567b Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:43:06 -0400
Subject: [PATCH 1452/1784] chore: Update generation configuration at Sat Sep
 21 02:20:09 UTC 2024 (#1586)

* chore: Update generation configuration at Fri Sep 20 02:21:45 UTC 2024

* chore: generate libraries at Fri Sep 20 02:22:36 UTC 2024

* chore: Update generation configuration at Sat Sep 21 02:20:09 UTC 2024
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d8b43bd0a747..144f2e567a76 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.46.0')
+implementation platform('com.google.cloud:libraries-bom:26.47.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index cd940462a927..99ade5352517 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.45.0
-googleapis_commitish: 607c2ae82620153880a66898bcbf0a46d38d7d10
-libraries_bom_version: 26.46.0
+googleapis_commitish: a18d9b2c3563527b26c4b713469e795b92795271
+libraries_bom_version: 26.47.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 9d719e809ea830d8602399b72e432580f14ae6bd Mon Sep 17 00:00:00 2001
From: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com>
Date: Tue, 24 Sep 2024 11:15:37 -0700
Subject: [PATCH 1453/1784] fix: Update opentelemetry-sdk dependency to be
 test-only (#1595)

* fix: Update opentelemetry-sdk dependency to be test-only

* fix: move RemoteDatastoreHelper into `test`

* fix: Add CLIRR exception for 8001: Removed class for `RemoteDatastoreHelper`
---
 google-cloud-datastore/clirr-ignored-differences.xml         | 5 +++++
 google-cloud-datastore/pom.xml                               | 1 +
 .../cloud/datastore/testing/RemoteDatastoreHelper.java       | 0
 3 files changed, 6 insertions(+)
 rename google-cloud-datastore/src/{main => test}/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java (100%)

diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
index 847ba4f4c92d..6275f05c63f4 100644
--- a/google-cloud-datastore/clirr-ignored-differences.xml
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -67,4 +67,9 @@
         com/google/cloud/datastore/TraceUtil
         8001
     
+    
+        com/google/cloud/datastore/testing/RemoteDatastoreHelper
+        8001
+    
+
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 23d17e8368e8..26b2825c5bda 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -200,6 +200,7 @@
       io.opentelemetry
       opentelemetry-sdk
       ${opentelemetry.version}
+      test
     
     
       io.opentelemetry
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java

From 23c5c2662117370c66c611604c56b878d41f4738 Mon Sep 17 00:00:00 2001
From: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com>
Date: Tue, 24 Sep 2024 12:20:24 -0700
Subject: [PATCH 1454/1784] fix: Update opentelemetry.version to 1.42.1 to
 match the BOM version (#1598)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 26b2825c5bda..d43a5e86e23a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -16,7 +16,7 @@
   
   
     google-cloud-datastore
-    1.42.0
+    1.42.1
   
   
     

From 2db9e439189baf8f97127f6cff1de5d47efb0073 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 25 Sep 2024 00:17:19 +0200
Subject: [PATCH 1455/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.36.0 (#1590)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 9d1576d940ff..158a36c96c47 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.35.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 41590566e638..5ca041eb24d8 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.35.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index d6941e80e7fd..20592bf3e49f 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.35.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a3a740e7c540..34f4f9ec9563 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.35.0
+    3.36.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 1d30d1961912..04d25a1792a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.35.0
+    3.36.0
   
 
   

From d2a214cd38bdac990d57603952a546c5fefe2acf Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:10:26 -0400
Subject: [PATCH 1456/1784] chore: Update generation configuration at Tue Sep
 24 02:23:54 UTC 2024 (#1593)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 99ade5352517..f707b9034fc2 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.45.0
-googleapis_commitish: a18d9b2c3563527b26c4b713469e795b92795271
+googleapis_commitish: 534e49c0ca0b9297f4ede6f119a0db054b35dd1e
 libraries_bom_version: 26.47.0
 libraries:
   - api_shortname: datastore

From fae3b74eaa3494a27fd43f56435c01e8fc09e5ee Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 25 Sep 2024 17:41:43 +0200
Subject: [PATCH 1457/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.43.0 (#1584)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d43a5e86e23a..61426ea1e217 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.37.0
+        1.43.0
         pom
         import
       

From 5d078a4b294d071716f51f0d4b9baa5d65a0fe90 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 25 Sep 2024 17:41:54 +0200
Subject: [PATCH 1458/1784] deps: update dependency
 com.google.guava:guava-testlib to v33.3.1-jre (#1592)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 61426ea1e217..e7a4971b3960 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -151,7 +151,7 @@
     
       com.google.guava
       guava-testlib
-      33.3.0-jre
+      33.3.1-jre
       test
     
     

From 1286792d7b49229d698df652cd117d229a5cd97e Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:28:12 -0700
Subject: [PATCH 1459/1784] feat: add sample code for multiple inequalities
 indexing consideration query (#1579)

* feat: add sample code for multiple inequalities indexing consideration query

* fix formatting

* fix formatting

* fix formatting

* fix formatting

* Add index

* Correct indexes

* Add orderfileds query

* fix orderby asc

* Move region tag to include import statements
---
 .../filters/IndexingConsiderationQuery.java   | 64 +++++++++++++
 .../datastore/filters/OrderFieldsQuery.java   | 63 ++++++++++++
 .../filters/MultiIneqQuerySampleIT.java       | 96 +++++++++++++++++++
 .../snippets/src/test/resources/index.yaml    |  4 +
 4 files changed, 227 insertions(+)
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
 create mode 100644 samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java

diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
new file mode 100644
index 000000000000..f0c9cd5da474
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 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.example.datastore.filters;
+
+// sample-metadata:
+//   title: Queries with indexing considerations
+//   description: The following query produces a result set
+//   that is ordered according to the index definition.
+
+// [START datastore_query_indexing_considerations]
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
+import com.google.cloud.datastore.StructuredQuery.Filter;
+import com.google.cloud.datastore.StructuredQuery.OrderBy;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+
+public class IndexingConsiderationQuery {
+  public static void invoke() throws Exception {
+
+    // Instantiates a client
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // Build a query with multi inequal filters and optimized index order of index properties.
+    Query query = Query.newEntityQueryBuilder()
+            .setKind("employees")
+            .setFilter(CompositeFilter.and(
+                    PropertyFilter.gt("salary", 100000),
+                    PropertyFilter.gt("experience", 0)))
+            .setOrderBy(OrderBy.asc("salary"), OrderBy.asc("experience"))
+            .build();
+
+    // Get the results back from Datastore
+    QueryResults results = datastore.run(query);
+
+    if (!results.hasNext()) {
+      throw new Exception("query yielded no results");
+    }
+
+    while (results.hasNext()) {
+      Entity entity = results.next();
+      System.out.printf("Entity: %s%n", entity);
+    }
+  }
+}
+// [END datastore_query_indexing_considerations]
diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
new file mode 100644
index 000000000000..1739dbade76d
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 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.example.datastore.filters;
+
+// sample-metadata:
+//   title: Queries with order fileds
+//   description: The following query order properties
+//   in the decreasing order of query constraint selectivity.
+
+// [START datastore_query_order_fields]
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.StructuredQuery.Filter;
+import com.google.cloud.datastore.StructuredQuery.OrderBy;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+
+public class OrderFieldsQuery {
+  public static void invoke() throws Exception {
+
+    // Instantiates a client
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+    // Build a query with order properties in the decreasing order of query constraint selectivity.
+    Query query =
+            Query.newEntityQueryBuilder()
+                    .setKind("employees")
+                    .setFilter(PropertyFilter.gt("salary", 100000))
+                    .setOrderBy(OrderBy.asc("salary"))
+                    .build();
+
+    // Get the results back from Datastore
+    QueryResults results = datastore.run(query);
+    // Order results by `experience`
+
+    if (!results.hasNext()) {
+      throw new Exception("query yielded no results");
+    }
+
+    while (results.hasNext()) {
+      Entity entity = results.next();
+      System.out.printf("Entity: %s%n", entity);
+    }
+  }
+}
+// [END datastore_query_order_fields]
diff --git a/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
new file mode 100644
index 000000000000..6fee2a8064c7
--- /dev/null
+++ b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2024 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.example.datastore.filters;
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Key;
+import com.rule.SystemsOutRule;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+@SuppressWarnings("checkstyle:abbreviationaswordinname")
+public class MultiIneqQuerySampleIT {
+
+  private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+
+  private Key employeeKey1;
+  private Key employeeKey2;
+  private Key employeeKey3;
+
+  @Rule
+  public final SystemsOutRule systemsOutRule = new SystemsOutRule();
+
+  @Before
+  public void setUp() {
+    employeeKey1 = datastore.newKeyFactory().setKind("employees").newKey("employee1");
+    Entity employee1 = Entity.newBuilder(employeeKey1)
+            .set("name", "Alice")
+            .set("salary", 100001)
+            .set("experience", 10)
+            .build();
+
+    employeeKey2 = datastore.newKeyFactory().setKind("employees").newKey("employee2");
+    Entity employee2 = Entity.newBuilder(employeeKey2)
+            .set("name", "Bob")
+            .set("salary", 90000)
+            .set("experience", 5)
+            .build();
+
+    employeeKey3 = datastore.newKeyFactory().setKind("employees").newKey("employee3");
+    Entity employee3 = Entity.newBuilder(employeeKey3)
+            .set("name", "Jay")
+            .set("salary", 120000)
+            .set("experience", 15)
+            .build();
+
+    datastore.put(employee1);
+    datastore.put(employee2);
+    datastore.put(employee3);
+  }
+
+  @After
+  public void tearDown() {
+    datastore.delete(employeeKey1);
+    datastore.delete(employeeKey2);
+    datastore.delete(employeeKey3);
+  }
+
+  @Test
+  public void testIndexingConsiderationQuery() throws Exception {
+    // Act
+    IndexingConsiderationQuery.invoke();
+
+    // Assert
+    systemsOutRule.assertContains("Entity");
+  }
+
+  @Test
+  public void testOrderFieldsQuery() throws Exception {
+    // Act
+    OrderFieldsQuery.invoke();
+
+    // Assert
+    systemsOutRule.assertContains("Entity");
+  }
+}
diff --git a/samples/snippets/src/test/resources/index.yaml b/samples/snippets/src/test/resources/index.yaml
index 8652a0ee097f..5f2f0c74a646 100644
--- a/samples/snippets/src/test/resources/index.yaml
+++ b/samples/snippets/src/test/resources/index.yaml
@@ -23,3 +23,7 @@ indexes:
   properties:
   - name: tag
   - name: tag
+- kind: employees
+  properties:
+    - name: salary
+    - name: experience
\ No newline at end of file

From 9e9786e7c11c800abd29724284fdf2b7aaf45819 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 26 Sep 2024 16:38:40 +0200
Subject: [PATCH 1460/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.47.0 (#1578)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 1cc4e91521fe..677692680acf 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.45.0
+        26.47.0
         pom
         import
       

From e1b7d4b205312d7d4c2a285f3d1f61388da65c83 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 26 Sep 2024 22:26:06 +0200
Subject: [PATCH 1461/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.36.1 (#1602)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 158a36c96c47..aabf59292d7d 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 5ca041eb24d8..b39cf017dac6 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.1"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 20592bf3e49f..c59887969bc7 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.1"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 34f4f9ec9563..fc281ecdd9c4 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.36.0
+    3.36.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 04d25a1792a5..0942649dbaf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.36.0
+    3.36.1
   
 
   

From 8f74a49c5982d00bd168e78671163683f7b41126 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 26 Sep 2024 22:27:04 +0200
Subject: [PATCH 1462/1784] deps: update dependency
 com.google.testparameterinjector:test-parameter-injector to v1.17 (#1585)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e7a4971b3960..8f7b315a76ec 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -192,7 +192,7 @@
     
       com.google.testparameterinjector
       test-parameter-injector
-      1.16
+      1.17
       test
     
     

From df9705b0c9cb561336ac4dd1e8a4bf09b3f51ebd Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 09:25:46 -0700
Subject: [PATCH 1463/1784] chore(main): release 2.22.0 (#1589)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  | 23 +++++++++++++++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 +++++-----
 10 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a38532a8174e..e2670cb02680 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## [2.22.0](https://github.com/googleapis/java-datastore/compare/v2.21.3...v2.22.0) (2024-09-26)
+
+
+### Features
+
+* Add sample code for multiple inequalities indexing consideration query ([#1579](https://github.com/googleapis/java-datastore/issues/1579)) ([1286792](https://github.com/googleapis/java-datastore/commit/1286792d7b49229d698df652cd117d229a5cd97e))
+* Introducing Tracing with OpenTelemetry API [#1537](https://github.com/googleapis/java-datastore/issues/1537) ([#1576](https://github.com/googleapis/java-datastore/issues/1576)) ([5440c22](https://github.com/googleapis/java-datastore/commit/5440c22364074c108450c3a748a6a17d5f1dddda))
+
+
+### Bug Fixes
+
+* Update opentelemetry-sdk dependency to be test-only ([#1595](https://github.com/googleapis/java-datastore/issues/1595)) ([9d719e8](https://github.com/googleapis/java-datastore/commit/9d719e809ea830d8602399b72e432580f14ae6bd))
+* Update opentelemetry.version to 1.42.1 to match the BOM version ([#1598](https://github.com/googleapis/java-datastore/issues/1598)) ([23c5c26](https://github.com/googleapis/java-datastore/commit/23c5c2662117370c66c611604c56b878d41f4738))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.43.0 ([#1584](https://github.com/googleapis/java-datastore/issues/1584)) ([fae3b74](https://github.com/googleapis/java-datastore/commit/fae3b74eaa3494a27fd43f56435c01e8fc09e5ee))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.0 ([#1590](https://github.com/googleapis/java-datastore/issues/1590)) ([2db9e43](https://github.com/googleapis/java-datastore/commit/2db9e439189baf8f97127f6cff1de5d47efb0073))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#1602](https://github.com/googleapis/java-datastore/issues/1602)) ([e1b7d4b](https://github.com/googleapis/java-datastore/commit/e1b7d4b205312d7d4c2a285f3d1f61388da65c83))
+* Update dependency com.google.guava:guava-testlib to v33.3.1-jre ([#1592](https://github.com/googleapis/java-datastore/issues/1592)) ([5d078a4](https://github.com/googleapis/java-datastore/commit/5d078a4b294d071716f51f0d4b9baa5d65a0fe90))
+* Update dependency com.google.testparameterinjector:test-parameter-injector to v1.17 ([#1585](https://github.com/googleapis/java-datastore/issues/1585)) ([8f74a49](https://github.com/googleapis/java-datastore/commit/8f74a49c5982d00bd168e78671163683f7b41126))
+
 ## [2.21.3](https://github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) (2024-09-11)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d55ccc6afada..34c4d947519b 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.21.4-SNAPSHOT
+  2.22.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.4-SNAPSHOT
+    2.22.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index fc281ecdd9c4..4c3ab17bb47c 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.21.4-SNAPSHOT
+  2.22.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.21.4-SNAPSHOT
+        2.22.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.4-SNAPSHOT
+        2.22.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.4-SNAPSHOT
+        0.113.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.21.4-SNAPSHOT
+        2.22.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8f7b315a76ec..9e91f9ca56da 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.21.4-SNAPSHOT
+  2.22.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.4-SNAPSHOT
+    2.22.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 8f51e25fc7c0..966e0c054bb1 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.21.4-SNAPSHOT
+  2.22.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.4-SNAPSHOT
+    2.22.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 0942649dbaf0..a90b44f5e7c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.21.4-SNAPSHOT
+  2.22.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.21.4-SNAPSHOT
+        2.22.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.21.4-SNAPSHOT
+        2.22.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.21.4-SNAPSHOT
+        2.22.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.112.4-SNAPSHOT
+        0.113.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.21.4-SNAPSHOT
+        2.22.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 10b83d827986..9d3256b3f342 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.21.4-SNAPSHOT
+  2.22.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.4-SNAPSHOT
+    2.22.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 437485dc0da4..2e34da3af9cd 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.112.4-SNAPSHOT
+  0.113.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.21.4-SNAPSHOT
+    2.22.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index bf1562ed7bd0..973390f5d93e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.21.4-SNAPSHOT
+      2.22.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 8622f54a26c5..191d0abf12ab 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.21.3:2.21.4-SNAPSHOT
-google-cloud-datastore-bom:2.21.3:2.21.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.112.3:0.112.4-SNAPSHOT
-datastore-v1-proto-client:2.21.3:2.21.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT
+google-cloud-datastore:2.22.0:2.22.0
+google-cloud-datastore-bom:2.22.0:2.22.0
+proto-google-cloud-datastore-v1:0.113.0:0.113.0
+datastore-v1-proto-client:2.22.0:2.22.0
+proto-google-cloud-datastore-admin-v1:2.22.0:2.22.0
+grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.0

From 678eee2dfb6d447a852edd436137f8ebfbe50d74 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:27:32 -0400
Subject: [PATCH 1464/1784] chore: Update generation configuration at Sat Sep
 28 02:22:38 UTC 2024 (#1599)

* chore: Update generation configuration at Wed Sep 25 02:24:24 UTC 2024

* update gen script

* chore: generate libraries at Wed Sep 25 23:31:54 UTC 2024

* chore: Update generation configuration at Thu Sep 26 02:23:26 UTC 2024

* chore: Update generation configuration at Fri Sep 27 02:23:56 UTC 2024

* chore: Update generation configuration at Sat Sep 28 02:22:38 UTC 2024

---------

Co-authored-by: Joe Wang 
---
 .../scripts/hermetic_library_generation.sh    | 45 +++++++++----------
 generation_config.yaml                        |  4 +-
 .../datastore/admin/v1/CommonMetadata.java    |  2 +-
 .../admin/v1/CommonMetadataOrBuilder.java     |  2 +-
 .../admin/v1/CreateIndexRequest.java          |  2 +-
 .../admin/v1/CreateIndexRequestOrBuilder.java |  2 +-
 .../admin/v1/DatastoreAdminProto.java         |  2 +-
 .../DatastoreFirestoreMigrationMetadata.java  |  2 +-
 ...reFirestoreMigrationMetadataOrBuilder.java |  2 +-
 .../admin/v1/DeleteIndexRequest.java          |  2 +-
 .../admin/v1/DeleteIndexRequestOrBuilder.java |  2 +-
 .../datastore/admin/v1/EntityFilter.java      |  2 +-
 .../admin/v1/EntityFilterOrBuilder.java       |  2 +-
 .../admin/v1/ExportEntitiesMetadata.java      |  2 +-
 .../v1/ExportEntitiesMetadataOrBuilder.java   |  2 +-
 .../admin/v1/ExportEntitiesRequest.java       |  2 +-
 .../v1/ExportEntitiesRequestOrBuilder.java    |  2 +-
 .../admin/v1/ExportEntitiesResponse.java      |  2 +-
 .../v1/ExportEntitiesResponseOrBuilder.java   |  2 +-
 .../datastore/admin/v1/GetIndexRequest.java   |  2 +-
 .../admin/v1/GetIndexRequestOrBuilder.java    |  2 +-
 .../admin/v1/ImportEntitiesMetadata.java      |  2 +-
 .../v1/ImportEntitiesMetadataOrBuilder.java   |  2 +-
 .../admin/v1/ImportEntitiesRequest.java       |  2 +-
 .../v1/ImportEntitiesRequestOrBuilder.java    |  2 +-
 .../com/google/datastore/admin/v1/Index.java  |  2 +-
 .../admin/v1/IndexOperationMetadata.java      |  2 +-
 .../v1/IndexOperationMetadataOrBuilder.java   |  2 +-
 .../datastore/admin/v1/IndexOrBuilder.java    |  2 +-
 .../google/datastore/admin/v1/IndexProto.java |  2 +-
 .../admin/v1/ListIndexesRequest.java          |  2 +-
 .../admin/v1/ListIndexesRequestOrBuilder.java |  2 +-
 .../admin/v1/ListIndexesResponse.java         |  2 +-
 .../v1/ListIndexesResponseOrBuilder.java      |  2 +-
 .../admin/v1/MigrationProgressEvent.java      |  2 +-
 .../v1/MigrationProgressEventOrBuilder.java   |  2 +-
 .../datastore/admin/v1/MigrationProto.java    |  2 +-
 .../datastore/admin/v1/MigrationState.java    |  2 +-
 .../admin/v1/MigrationStateEvent.java         |  2 +-
 .../v1/MigrationStateEventOrBuilder.java      |  2 +-
 .../datastore/admin/v1/MigrationStep.java     |  2 +-
 .../datastore/admin/v1/OperationType.java     |  2 +-
 .../google/datastore/admin/v1/Progress.java   |  2 +-
 .../datastore/admin/v1/ProgressOrBuilder.java |  2 +-
 .../google/datastore/v1/AggregationQuery.java |  2 +-
 .../v1/AggregationQueryOrBuilder.java         |  2 +-
 .../datastore/v1/AggregationResult.java       |  2 +-
 .../datastore/v1/AggregationResultBatch.java  |  2 +-
 .../v1/AggregationResultBatchOrBuilder.java   |  2 +-
 .../v1/AggregationResultOrBuilder.java        |  2 +-
 .../datastore/v1/AggregationResultProto.java  |  2 +-
 .../datastore/v1/AllocateIdsRequest.java      |  2 +-
 .../v1/AllocateIdsRequestOrBuilder.java       |  2 +-
 .../datastore/v1/AllocateIdsResponse.java     |  2 +-
 .../v1/AllocateIdsResponseOrBuilder.java      |  2 +-
 .../com/google/datastore/v1/ArrayValue.java   |  2 +-
 .../datastore/v1/ArrayValueOrBuilder.java     |  2 +-
 .../datastore/v1/BeginTransactionRequest.java |  2 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |  2 +-
 .../v1/BeginTransactionResponse.java          |  2 +-
 .../v1/BeginTransactionResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/CommitRequest.java    |  2 +-
 .../datastore/v1/CommitRequestOrBuilder.java  |  2 +-
 .../google/datastore/v1/CommitResponse.java   |  2 +-
 .../datastore/v1/CommitResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/CompositeFilter.java  |  2 +-
 .../v1/CompositeFilterOrBuilder.java          |  2 +-
 .../google/datastore/v1/DatastoreProto.java   |  2 +-
 .../java/com/google/datastore/v1/Entity.java  |  2 +-
 .../google/datastore/v1/EntityOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/EntityProto.java  |  2 +-
 .../com/google/datastore/v1/EntityResult.java |  2 +-
 .../datastore/v1/EntityResultOrBuilder.java   |  2 +-
 .../google/datastore/v1/ExecutionStats.java   |  2 +-
 .../datastore/v1/ExecutionStatsOrBuilder.java |  2 +-
 .../google/datastore/v1/ExplainMetrics.java   |  2 +-
 .../datastore/v1/ExplainMetricsOrBuilder.java |  2 +-
 .../google/datastore/v1/ExplainOptions.java   |  2 +-
 .../datastore/v1/ExplainOptionsOrBuilder.java |  2 +-
 .../java/com/google/datastore/v1/Filter.java  |  2 +-
 .../google/datastore/v1/FilterOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/GqlQuery.java     |  2 +-
 .../datastore/v1/GqlQueryOrBuilder.java       |  2 +-
 .../datastore/v1/GqlQueryParameter.java       |  2 +-
 .../v1/GqlQueryParameterOrBuilder.java        |  2 +-
 .../java/com/google/datastore/v1/Key.java     |  2 +-
 .../com/google/datastore/v1/KeyOrBuilder.java |  2 +-
 .../google/datastore/v1/KindExpression.java   |  2 +-
 .../datastore/v1/KindExpressionOrBuilder.java |  2 +-
 .../google/datastore/v1/LookupRequest.java    |  2 +-
 .../datastore/v1/LookupRequestOrBuilder.java  |  2 +-
 .../google/datastore/v1/LookupResponse.java   |  2 +-
 .../datastore/v1/LookupResponseOrBuilder.java |  2 +-
 .../com/google/datastore/v1/Mutation.java     |  2 +-
 .../datastore/v1/MutationOrBuilder.java       |  2 +-
 .../google/datastore/v1/MutationResult.java   |  2 +-
 .../datastore/v1/MutationResultOrBuilder.java |  2 +-
 .../com/google/datastore/v1/PartitionId.java  |  2 +-
 .../datastore/v1/PartitionIdOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/PlanSummary.java  |  2 +-
 .../datastore/v1/PlanSummaryOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/Projection.java   |  2 +-
 .../datastore/v1/ProjectionOrBuilder.java     |  2 +-
 .../google/datastore/v1/PropertyFilter.java   |  2 +-
 .../datastore/v1/PropertyFilterOrBuilder.java |  2 +-
 .../com/google/datastore/v1/PropertyMask.java |  2 +-
 .../datastore/v1/PropertyMaskOrBuilder.java   |  2 +-
 .../google/datastore/v1/PropertyOrder.java    |  2 +-
 .../datastore/v1/PropertyOrderOrBuilder.java  |  2 +-
 .../datastore/v1/PropertyReference.java       |  2 +-
 .../v1/PropertyReferenceOrBuilder.java        |  2 +-
 .../java/com/google/datastore/v1/Query.java   |  2 +-
 .../google/datastore/v1/QueryOrBuilder.java   |  2 +-
 .../datastore/v1/QueryProfileProto.java       |  2 +-
 .../com/google/datastore/v1/QueryProto.java   |  2 +-
 .../google/datastore/v1/QueryResultBatch.java |  2 +-
 .../v1/QueryResultBatchOrBuilder.java         |  2 +-
 .../com/google/datastore/v1/ReadOptions.java  |  2 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |  2 +-
 .../datastore/v1/ReserveIdsRequest.java       |  2 +-
 .../v1/ReserveIdsRequestOrBuilder.java        |  2 +-
 .../datastore/v1/ReserveIdsResponse.java      |  2 +-
 .../v1/ReserveIdsResponseOrBuilder.java       |  2 +-
 .../google/datastore/v1/RollbackRequest.java  |  2 +-
 .../v1/RollbackRequestOrBuilder.java          |  2 +-
 .../google/datastore/v1/RollbackResponse.java |  2 +-
 .../v1/RollbackResponseOrBuilder.java         |  2 +-
 .../v1/RunAggregationQueryRequest.java        |  2 +-
 .../RunAggregationQueryRequestOrBuilder.java  |  2 +-
 .../v1/RunAggregationQueryResponse.java       |  2 +-
 .../RunAggregationQueryResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/RunQueryRequest.java  |  2 +-
 .../v1/RunQueryRequestOrBuilder.java          |  2 +-
 .../google/datastore/v1/RunQueryResponse.java |  2 +-
 .../v1/RunQueryResponseOrBuilder.java         |  2 +-
 .../datastore/v1/TransactionOptions.java      |  2 +-
 .../v1/TransactionOptionsOrBuilder.java       |  2 +-
 .../java/com/google/datastore/v1/Value.java   |  2 +-
 .../google/datastore/v1/ValueOrBuilder.java   |  2 +-
 139 files changed, 161 insertions(+), 162 deletions(-)

diff --git a/.github/scripts/hermetic_library_generation.sh b/.github/scripts/hermetic_library_generation.sh
index 6c3f22d8f9e7..49a7414cf7e8 100644
--- a/.github/scripts/hermetic_library_generation.sh
+++ b/.github/scripts/hermetic_library_generation.sh
@@ -67,20 +67,24 @@ message="chore: generate libraries at $(date)"
 
 git checkout "${target_branch}"
 git checkout "${current_branch}"
-# if the last commit doesn't contain changes to generation configuration,
-# do not generate again as the result will be the same.
-change_of_last_commit="$(git diff-tree --no-commit-id --name-only HEAD~1..HEAD -r)"
-if [[ ! ("${change_of_last_commit}" == *"${generation_config}"*) ]]; then
-    echo "The last commit doesn't contain any changes to the generation_config.yaml, skipping the whole generation process." || true
-    exit 0
-fi
+
 # copy generation configuration from target branch to current branch.
 git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}"
-config_diff=$(diff "${generation_config}" "${baseline_generation_config}" || true)
 
 # parse image tag from the generation configuration.
 image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs)
 
+repo_root_dir=$(pwd)
+mkdir -p "${repo_root_dir}/output"
+# download api definitions from googleapis repository
+googleapis_commitish=$(grep googleapis_commitish "${generation_config}" | cut -d ":" -f 2 | xargs)
+api_def_dir=$(mktemp -d)
+git clone https://github.com/googleapis/googleapis.git "${api_def_dir}"
+pushd "${api_def_dir}"
+git checkout "${googleapis_commitish}"
+cp -r google/ grafeas/ "${repo_root_dir}/output"
+popd
+
 # run hermetic code generation docker image.
 docker run \
   --rm \
@@ -90,26 +94,21 @@ docker run \
   --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \
   --current-generation-config-path="${workspace_name}/${generation_config}"
 
+# remove api definitions after generation
+rm -rf "${api_def_dir}"
 
 # commit the change to the pull request.
-if [[ $(basename $(pwd)) == "google-cloud-java" ]]; then
-  git add java-* pom.xml gapic-libraries-bom/pom.xml versions.txt
-else
-  # The image leaves intermediate folders and files it works with. Here we remove them
-  rm -rdf output googleapis "${baseline_generation_config}"
-  git add --all -- ':!pr_description.txt'
-fi
+rm -rdf output googleapis "${baseline_generation_config}"
+git add --all -- ':!pr_description.txt' ':!hermetic_library_generation.sh'
 changed_files=$(git diff --cached --name-only)
-if [[ "${changed_files}" == "" ]]; then
-    echo "There is no generated code change with the generation config change ${config_diff}."
-    echo "Skip committing to the pull request."
-    exit 0
+if [[ "${changed_files}" != "" ]]; then
+    echo "Commit changes..."
+    git commit -m "${message}"
+    git push
+else
+    echo "There is no generated code change, skip commit."
 fi
 
-echo "Configuration diff:"
-echo "${config_diff}"
-git commit -m "${message}"
-git push
 # set pr body if pr_description.txt is generated.
 if [[ -f "pr_description.txt" ]]; then
   pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
diff --git a/generation_config.yaml b/generation_config.yaml
index f707b9034fc2..bff4d8b4147c 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.45.0
-googleapis_commitish: 534e49c0ca0b9297f4ede6f119a0db054b35dd1e
+gapic_generator_version: 2.46.1
+googleapis_commitish: d6f184876ec67295addccbb70aa4af622e049a7e
 libraries_bom_version: 26.47.0
 libraries:
   - api_shortname: datastore
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 27c9ab4483e0..3bd274168e49 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 913db1a5a6bf..3ef2919c4dec 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface CommonMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index f9e6986e1c86..6a14a8152bcd 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index 6440f28fc813..0d87e8faa96e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface CreateIndexRequestOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index bcea2e23a9d8..838a55b36b88 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public final class DatastoreAdminProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index 072da0b59774..ea0e28ff1f5f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index 1476b0451a61..2f6c2ae7c83c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface DatastoreFirestoreMigrationMetadataOrBuilder
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 19311057eda7..d4f87d2a8c75 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index b2e5e6325b7c..ab53b6df5918 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface DeleteIndexRequestOrBuilder
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 f48b9fc168e7..3a6b14377c8c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
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 ff9abf72cb90..3f75daeffcf7 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface EntityFilterOrBuilder
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 a48521aab800..a6bded093c62 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index dd09e14bfe2c..099f4bb5b669 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesMetadataOrBuilder
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 a87805a6c01d..88eeb5b0fb09 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
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 e54ff1d1e59a..9ddd587f98fc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesRequestOrBuilder
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 f629356dd1e9..b4f183c049f3 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index a71ac8e9d016..338f4ff99b10 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesResponseOrBuilder
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 e1d6886b2c3f..2513a6c2bc79 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index 5c5d811d7bbc..da3d4617de19 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface GetIndexRequestOrBuilder
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 47de2e41ed29..9e8265e494cc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 462bfacf25d5..2ed2c3684564 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesMetadataOrBuilder
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 43f3a746ea35..1ca992dd5a47 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
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 a38f509173dd..c1d8424fe0ed 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesRequestOrBuilder
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 a2649edfbfbf..cb5c4b96c2cf 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
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 a153b684868e..c524fb3b222c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index 538df95213aa..e85b0747a580 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface IndexOperationMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 459a0ef57b2a..b45823f6a9ee 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface IndexOrBuilder
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 f350301dbb24..e44ad1c73179 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public final class IndexProto {
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 8dcdac9b93f5..8472db7dc078 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index 4a3ea0672735..dc18f1b6368c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesRequestOrBuilder
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 63bc8361f635..abce952f3a6e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index 83ee6d607c38..a305da039740 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesResponseOrBuilder
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 34b32c5c957d..a35cd49caeba 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
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 1b746f571bd5..4db619cd0e4a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface MigrationProgressEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index c5eae435312f..63e6e1186d45 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public final class MigrationProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index 0ffd47e82f5b..a5b46ab836b8 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
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 0e3913ecd9c4..203980b3a564 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index a96dd7999bcf..de901f9e36ea 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface MigrationStateEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index ad98ba777daa..46a80ff317c4 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index 644f8de69c28..34316b3be821 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
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 bacd7cd7e0d8..7e010b15dd66 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index 57bc88fc4bf9..cc6b6c27bae7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ProgressOrBuilder
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 5207578bd0ab..fa056f1b1841 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 4d34dc10711d..d71b7a7ec2f0 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface AggregationQueryOrBuilder
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 9ad3eb613c9b..5566884f05f1 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 8b0a4ddad251..d40e87f167ea 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 6dc72d3898f5..280f19bd4cfc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface AggregationResultBatchOrBuilder
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 27ab61915e17..470d13243778 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface AggregationResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index 254cef18a404..5a3b32a739ec 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public final class AggregationResultProto {
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 9a7568b5e5c8..6aeec8c61190 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 67bc67b1d82a..e39eca958e77 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface AllocateIdsRequestOrBuilder
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 091cc9964e79..25b3b348cbc0 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 5ff577f9f281..2204290ae254 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface AllocateIdsResponseOrBuilder
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 e0d23c6c8691..245cb4b38a6d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index 9c6910f1c689..021a8ba56030 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ArrayValueOrBuilder
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 dfd89d0dec0a..79747e7ba487 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 6d3aa722f874..8a8bbadd26e7 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface BeginTransactionRequestOrBuilder
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 45f35d98035a..c9cbae64e698 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index 4c701078212a..ef98909fd2ce 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface BeginTransactionResponseOrBuilder
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 4be4d798dcf3..baefc371e7af 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 a3dd5081710b..137b6996318f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface CommitRequestOrBuilder
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 030da5583aa7..e24a08499d78 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index f46c69b6c5b3..ac4da4033d37 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface CommitResponseOrBuilder
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 73941db09575..10fb06dfdb2d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 e2739044ed6f..3e53e363afc8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface CompositeFilterOrBuilder
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 605c6a093ceb..851692f0fccc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public final class DatastoreProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 7e2d68fc6446..6688af1dc9ea 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 5eb6072df9d9..8359303a8c09 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface EntityOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index c9da99a31070..8d131a68a370 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public final class EntityProto {
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 976833f13489..4fac83ece7fc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 034c02f565d3..6d1020451a00 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface EntityResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
index e779bf33e1c6..2e17827a8d76 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
index a18726ef85cd..237bd2909f1c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ExecutionStatsOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
index cc0c25272d1b..e6fefcd176ae 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
index 47d09d2502ea..3b4d3578b426 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ExplainMetricsOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
index 7ea6f45b7506..0871c6cbbcec 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
index ff52c5a15563..764b080ee2c2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ExplainOptionsOrBuilder
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 e226df0257fd..55d69597d98b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 411b5d2aac2d..49f3eb7081fe 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface FilterOrBuilder
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 4dd8adb21f86..49a2985906b6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 a66357c228c8..48a1a92de160 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface GqlQueryOrBuilder
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 0b1d8bf8cb17..d22732f68966 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 c8c219e27b89..dfa3547b8ec2 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface GqlQueryParameterOrBuilder
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 52ca9246985e..90c1fe1fcea0 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 eef38ea7bc2c..ca5be689d860 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface KeyOrBuilder
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 670d287dd3f7..8d478290969c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 43569465bad3..08dc4b3d2118 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface KindExpressionOrBuilder
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 f899d37c0022..4a9d5243979e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 9494c3480380..e417f3306bbf 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface LookupRequestOrBuilder
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 bb517bcdc6a9..f624e5d4d30c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 9def5c181f58..9dfacb3d6cff 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface LookupResponseOrBuilder
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 4f82c423bd0c..71c31051665c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 2082fb48e293..0bee8832511c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface MutationOrBuilder
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 ee39e90102be..03e96876d9cc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index c3586b7e40b1..7d3b4f895db3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface MutationResultOrBuilder
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 7b87a1df5d76..09ea652c91d3 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 1146a856d4f7..7c418fe37434 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface PartitionIdOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
index 2e45efb7b535..365b11d31ae0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
index 4b405e880f5e..8088a8c24b25 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface PlanSummaryOrBuilder
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 f5257355a08b..cfd0dc7053b2 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index f492feebbd22..71920236c19e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ProjectionOrBuilder
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 7bb7d77cbc8b..814bfe7fa2e1 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index da06f4f42a29..fd74ed8e99ef 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface PropertyFilterOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
index 54f0847868a0..432846ebc2e1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
index 6b4c913364ce..e36a55be598c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface PropertyMaskOrBuilder
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 6b9cd57babad..c12f8741b9b6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index 2590df078c54..4e4e8b98606a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface PropertyOrderOrBuilder
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 89ca784ebdf5..d1ce5477ef10 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 12e3c0344ad0..0d80ea0ea229 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface PropertyReferenceOrBuilder
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 d925fbd82d44..2c0c40f79b89 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 bda9dcb7c181..70533577fda8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface QueryOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
index 5b1d59a7a98b..83e5d176362d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public final class QueryProfileProto {
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 749fbb368e00..60c35e2e1d59 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public final class QueryProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 264b04c2b562..49bb3799fce1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index 10e886e97e60..57ae675f6f00 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface QueryResultBatchOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 195a26679343..dd545344edbb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 22210bac5010..64500abd95a0 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ReadOptionsOrBuilder
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 4fb3a324a9bd..d37792b79aa9 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 1509951d087d..74644db43e2e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ReserveIdsRequestOrBuilder
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 b64df8ca4512..9cf9adff350c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 93ad913d3b6e..8858bddf2922 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ReserveIdsResponseOrBuilder
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 b8efa36205d2..1e3b5e93db54 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 76f2ec4f7c6c..5c4ac466471a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface RollbackRequestOrBuilder
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 7ecae56a6032..a8de2a48b93d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index c5f5cddacfa4..3b89b7ed5c47 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface RollbackResponseOrBuilder
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 a3e4b5fbb6e2..85021f6fa471 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 181e67626efd..6137bb693397 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryRequestOrBuilder
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 e159171831d9..f122b0943022 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 518244e3a22c..cacfa52e8f9c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryResponseOrBuilder
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 42a25c70ef9b..7886ca3c7662 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 66125f517d32..85845572356d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface RunQueryRequestOrBuilder
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 50de039e4fa3..714256e654f9 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 2eb2df5c787c..c7fceec74577 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface RunQueryResponseOrBuilder
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 1460d75c91f7..7e73f6826f9a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 915877a31310..551969802aa2 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface TransactionOptionsOrBuilder
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 d8db3277e878..56b6fae302f1 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 /**
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 6024a74d7c76..a375525d90ce 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.v1;
 
 public interface ValueOrBuilder

From 0da1219b49b27263783ee336d7078e5ccb796d2d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 30 Sep 2024 23:32:27 +0200
Subject: [PATCH 1465/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.22.0 (#1607)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.3` -> `2.22.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.3/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.3/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.22.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2220-2024-09-26)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.3...v2.22.0)

##### Features

-   Add sample code for multiple inequalities indexing consideration query ([#​1579](https://redirect.github.com/googleapis/java-datastore/issues/1579)) ([1286792](https://redirect.github.com/googleapis/java-datastore/commit/1286792d7b49229d698df652cd117d229a5cd97e))
-   Introducing Tracing with OpenTelemetry API [#​1537](https://redirect.github.com/googleapis/java-datastore/issues/1537) ([#​1576](https://redirect.github.com/googleapis/java-datastore/issues/1576)) ([5440c22](https://redirect.github.com/googleapis/java-datastore/commit/5440c22364074c108450c3a748a6a17d5f1dddda))

##### Bug Fixes

-   Update opentelemetry-sdk dependency to be test-only ([#​1595](https://redirect.github.com/googleapis/java-datastore/issues/1595)) ([9d719e8](https://redirect.github.com/googleapis/java-datastore/commit/9d719e809ea830d8602399b72e432580f14ae6bd))
-   Update opentelemetry.version to 1.42.1 to match the BOM version ([#​1598](https://redirect.github.com/googleapis/java-datastore/issues/1598)) ([23c5c26](https://redirect.github.com/googleapis/java-datastore/commit/23c5c2662117370c66c611604c56b878d41f4738))

##### Dependencies

-   Update dependency com.google.cloud:gapic-libraries-bom to v1.43.0 ([#​1584](https://redirect.github.com/googleapis/java-datastore/issues/1584)) ([fae3b74](https://redirect.github.com/googleapis/java-datastore/commit/fae3b74eaa3494a27fd43f56435c01e8fc09e5ee))
-   Update dependency com.google.cloud:sdk-platform-java-config to v3.36.0 ([#​1590](https://redirect.github.com/googleapis/java-datastore/issues/1590)) ([2db9e43](https://redirect.github.com/googleapis/java-datastore/commit/2db9e439189baf8f97127f6cff1de5d47efb0073))
-   Update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#​1602](https://redirect.github.com/googleapis/java-datastore/issues/1602)) ([e1b7d4b](https://redirect.github.com/googleapis/java-datastore/commit/e1b7d4b205312d7d4c2a285f3d1f61388da65c83))
-   Update dependency com.google.guava:guava-testlib to v33.3.1-jre ([#​1592](https://redirect.github.com/googleapis/java-datastore/issues/1592)) ([5d078a4](https://redirect.github.com/googleapis/java-datastore/commit/5d078a4b294d071716f51f0d4b9baa5d65a0fe90))
-   Update dependency com.google.testparameterinjector:test-parameter-injector to v1.17 ([#​1585](https://redirect.github.com/googleapis/java-datastore/issues/1585)) ([8f74a49](https://redirect.github.com/googleapis/java-datastore/commit/8f74a49c5982d00bd168e78671163683f7b41126))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 9187ea8ce818..c39bbf20b2a6 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.21.3
+      2.22.0
     
     
 

From 742d059f444e41985142553514b0a0abd033c5cb Mon Sep 17 00:00:00 2001
From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:22:44 +0000
Subject: [PATCH 1466/1784] chore: use composite action (#1610)

* chore: use composite action

* chore: generate libraries at Wed Oct  2 13:35:35 UTC 2024

---------

Co-authored-by: cloud-java-bot 
---
 .../scripts/hermetic_library_generation.sh    | 116 ------------------
 .../hermetic_library_generation.yaml          |  19 +--
 README.md                                     |  12 +-
 3 files changed, 12 insertions(+), 135 deletions(-)
 delete mode 100644 .github/scripts/hermetic_library_generation.sh

diff --git a/.github/scripts/hermetic_library_generation.sh b/.github/scripts/hermetic_library_generation.sh
deleted file mode 100644
index 49a7414cf7e8..000000000000
--- a/.github/scripts/hermetic_library_generation.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-set -e
-# This script should be run at the root of the repository.
-# This script is used to, when a pull request changes the generation
-# configuration (generation_config.yaml by default):
-# 1. Find whether the last commit in this pull request contains changes to
-# the generation configuration and exit early if it doesn't have such a change
-# since the generation result would be the same.
-# 2. Compare generation configurations in the current branch (with which the
-# pull request associated) and target branch (into which the pull request is
-# merged);
-# 3. Generate changed libraries using library_generation image;
-# 4. Commit the changes to the pull request, if any.
-# 5. Edit the PR body with generated pull request description, if applicable.
-
-# The following commands need to be installed before running the script:
-# 1. git
-# 2. gh
-# 3. docker
-
-# The parameters of this script is:
-# 1. target_branch, the branch into which the pull request is merged.
-# 2. current_branch, the branch with which the pull request is associated.
-# 3. [optional] generation_config, the path to the generation configuration,
-# the default value is generation_config.yaml in the repository root.
-while [[ $# -gt 0 ]]; do
-key="$1"
-case "${key}" in
-  --target_branch)
-    target_branch="$2"
-    shift
-    ;;
-  --current_branch)
-    current_branch="$2"
-    shift
-    ;;
-  --generation_config)
-    generation_config="$2"
-    shift
-    ;;
-  *)
-    echo "Invalid option: [$1]"
-    exit 1
-    ;;
-esac
-shift
-done
-
-if [ -z "${target_branch}" ]; then
-  echo "missing required argument --target_branch"
-  exit 1
-fi
-
-if [ -z "${current_branch}" ]; then
-  echo "missing required argument --current_branch"
-  exit 1
-fi
-
-if [ -z "${generation_config}" ]; then
-  generation_config=generation_config.yaml
-  echo "Using default generation config: ${generation_config}"
-fi
-
-workspace_name="/workspace"
-baseline_generation_config="baseline_generation_config.yaml"
-message="chore: generate libraries at $(date)"
-
-git checkout "${target_branch}"
-git checkout "${current_branch}"
-
-# copy generation configuration from target branch to current branch.
-git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}"
-
-# parse image tag from the generation configuration.
-image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs)
-
-repo_root_dir=$(pwd)
-mkdir -p "${repo_root_dir}/output"
-# download api definitions from googleapis repository
-googleapis_commitish=$(grep googleapis_commitish "${generation_config}" | cut -d ":" -f 2 | xargs)
-api_def_dir=$(mktemp -d)
-git clone https://github.com/googleapis/googleapis.git "${api_def_dir}"
-pushd "${api_def_dir}"
-git checkout "${googleapis_commitish}"
-cp -r google/ grafeas/ "${repo_root_dir}/output"
-popd
-
-# run hermetic code generation docker image.
-docker run \
-  --rm \
-  -u "$(id -u):$(id -g)" \
-  -v "$(pwd):${workspace_name}" \
-  gcr.io/cloud-devrel-public-resources/java-library-generation:"${image_tag}" \
-  --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \
-  --current-generation-config-path="${workspace_name}/${generation_config}"
-
-# remove api definitions after generation
-rm -rf "${api_def_dir}"
-
-# commit the change to the pull request.
-rm -rdf output googleapis "${baseline_generation_config}"
-git add --all -- ':!pr_description.txt' ':!hermetic_library_generation.sh'
-changed_files=$(git diff --cached --name-only)
-if [[ "${changed_files}" != "" ]]; then
-    echo "Commit changes..."
-    git commit -m "${message}"
-    git push
-else
-    echo "There is no generated code change, skip commit."
-fi
-
-# set pr body if pr_description.txt is generated.
-if [[ -f "pr_description.txt" ]]; then
-  pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
-  gh pr edit "${pr_num}" --body "$(cat pr_description.txt)"
-fi
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 0266fbc96a3e..4caa5567a3e4 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -20,7 +20,6 @@ on:
 env:
   REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
   GITHUB_REPOSITORY: ${{ github.repository }}
-
 jobs:
   library_generation:
     runs-on: ubuntu-latest
@@ -38,17 +37,9 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - name: Generate changed libraries
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.46.0
       if: env.SHOULD_RUN == 'true'
-      shell: bash
-      run: |
-        set -ex
-        [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
-        [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
-        bash .github/scripts/hermetic_library_generation.sh \
-          --target_branch "${BASE_REF}" \
-          --current_branch "${HEAD_REF}"
-      env:
-        BASE_REF: ${{ github.base_ref }}
-        HEAD_REF: ${{ github.head_ref }}
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+      with:
+        base_ref: ${{ github.base_ref }}
+        head_ref: ${{ github.head_ref }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
diff --git a/README.md b/README.md
index 144f2e567a76..da7d93a81752 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.45.0
+      26.47.0
       pom
       import
     
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.21.3
+  2.22.0
 
 
 ```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.21.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.22.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.22.0"
 ```
 
 
@@ -370,7 +370,9 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 | Sum Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) |
 | Sum Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) |
 | Sum Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) |
+| Indexing Consideration Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) |
 | Create a union between two filters | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) |
+| Order Fields Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) |
 | Query Profile Explain | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) |
 | Query Profile Explain Aggregation | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) |
 | Query Profile Explain Analyze | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) |
@@ -479,7 +481,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.22.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

From b299266e42037b731ee7bbba21dbded73a37323c Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 9 Oct 2024 17:03:50 -0400
Subject: [PATCH 1467/1784] chore: Update generation configuration at Wed Oct 
 9 02:23:35 UTC 2024 (#1608)

* chore: Update generation configuration at Tue Oct  1 02:27:19 UTC 2024

* chore: generate libraries at Tue Oct  1 02:27:43 UTC 2024

* chore: Update generation configuration at Wed Oct  2 02:23:35 UTC 2024

* chore: Update generation configuration at Thu Oct  3 02:23:49 UTC 2024

* chore: Update generation configuration at Fri Oct  4 02:23:55 UTC 2024

* chore: generate libraries at Fri Oct  4 02:24:21 UTC 2024

* chore: Update generation configuration at Sat Oct  5 02:26:12 UTC 2024

* chore: Update generation configuration at Sun Oct  6 02:25:59 UTC 2024

* chore: generate libraries at Sun Oct  6 02:26:25 UTC 2024

* chore: Update generation configuration at Tue Oct  8 02:25:05 UTC 2024

* chore: generate libraries at Tue Oct  8 02:25:30 UTC 2024

* chore: Update generation configuration at Wed Oct  9 02:23:35 UTC 2024
---
 README.md                                     |    2 +-
 generation_config.yaml                        |    6 +-
 .../google/datastore/v1/DatastoreProto.java   |  200 +-
 .../com/google/datastore/v1/Mutation.java     | 1014 +++++-
 .../datastore/v1/MutationOrBuilder.java       |  115 +
 .../google/datastore/v1/MutationResult.java   |  544 ++-
 .../datastore/v1/MutationResultOrBuilder.java |   62 +
 .../datastore/v1/PropertyTransform.java       | 3197 +++++++++++++++++
 .../v1/PropertyTransformOrBuilder.java        |  438 +++
 .../proto/google/datastore/v1/datastore.proto |  141 +-
 renovate.json                                 |   17 +
 11 files changed, 5633 insertions(+), 103 deletions(-)
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java

diff --git a/README.md b/README.md
index da7d93a81752..d5e61c715376 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.47.0')
+implementation platform('com.google.cloud:libraries-bom:26.48.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index bff4d8b4147c..44eb5d8aaa5c 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.46.1
-googleapis_commitish: d6f184876ec67295addccbb70aa4af622e049a7e
-libraries_bom_version: 26.47.0
+gapic_generator_version: 2.47.0
+googleapis_commitish: 8692273ae7e0ef95d264e1bb8bcb900fa950674f
+libraries_bom_version: 26.48.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore
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 851692f0fccc..b186c25f0b8e 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
@@ -96,6 +96,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_datastore_v1_Mutation_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Mutation_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_PropertyTransform_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_datastore_v1_MutationResult_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -208,87 +212,106 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "v1.Key\"n\n\021ReserveIdsRequest\022\027\n\nproject_i"
           + "d\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022+\n\004key"
           + "s\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\"\024"
-          + "\n\022ReserveIdsResponse\"\364\002\n\010Mutation\022-\n\006ins"
+          + "\n\022ReserveIdsResponse\"\362\004\n\010Mutation\022-\n\006ins"
           + "ert\030\004 \001(\0132\033.google.datastore.v1.EntityH\000"
           + "\022-\n\006update\030\005 \001(\0132\033.google.datastore.v1.E"
           + "ntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.datasto"
           + "re.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.google."
           + "datastore.v1.KeyH\000\022\026\n\014base_version\030\010 \001(\003"
           + "H\001\0221\n\013update_time\030\013 \001(\0132\032.google.protobu"
-          + "f.TimestampH\001\0228\n\rproperty_mask\030\t \001(\0132!.g"
-          + "oogle.datastore.v1.PropertyMaskB\013\n\topera"
-          + "tionB\035\n\033conflict_detection_strategy\"\305\001\n\016"
-          + "MutationResult\022%\n\003key\030\003 \001(\0132\030.google.dat"
-          + "astore.v1.Key\022\017\n\007version\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.T"
-          + "imestamp\022\031\n\021conflict_detected\030\005 \001(\010\"\035\n\014P"
-          + "ropertyMask\022\r\n\005paths\030\001 \003(\t\"\312\002\n\013ReadOptio"
-          + "ns\022L\n\020read_consistency\030\001 \001(\01620.google.da"
-          + "tastore.v1.ReadOptions.ReadConsistencyH\000"
-          + "\022\025\n\013transaction\030\002 \001(\014H\000\022B\n\017new_transacti"
-          + "on\030\003 \001(\0132\'.google.datastore.v1.Transacti"
-          + "onOptionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google."
-          + "protobuf.TimestampH\000\"M\n\017ReadConsistency\022"
-          + " \n\034READ_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STR"
-          + "ONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\""
-          + "\222\002\n\022TransactionOptions\022G\n\nread_write\030\001 \001"
-          + "(\01321.google.datastore.v1.TransactionOpti"
-          + "ons.ReadWriteH\000\022E\n\tread_only\030\002 \001(\01320.goo"
-          + "gle.datastore.v1.TransactionOptions.Read"
-          + "OnlyH\000\032)\n\tReadWrite\022\034\n\024previous_transact"
-          + "ion\030\001 \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\013"
-          + "2\032.google.protobuf.TimestampB\006\n\004mode2\341\r\n"
-          + "\tDatastore\022\300\001\n\006Lookup\022\".google.datastore"
-          + ".v1.LookupRequest\032#.google.datastore.v1."
-          + "LookupResponse\"m\332A\034project_id,read_optio"
-          + "ns,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\013databa"
-          + "se_id\022\251\001\n\010RunQuery\022$.google.datastore.v1"
-          + ".RunQueryRequest\032%.google.datastore.v1.R"
-          + "unQueryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{p"
-          + "roject_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_"
-          + "id\022\r\n\013database_id\022\325\001\n\023RunAggregationQuer"
-          + "y\022/.google.datastore.v1.RunAggregationQu"
-          + "eryRequest\0320.google.datastore.v1.RunAggr"
-          + "egationQueryResponse\"[\202\323\344\223\0022\"-/v1/projec"
-          + "ts/{project_id}:runAggregationQuery:\001*\212\323"
-          + "\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020Be"
-          + "ginTransaction\022,.google.datastore.v1.Beg"
-          + "inTransactionRequest\032-.google.datastore."
-          + "v1.BeginTransactionResponse\"e\332A\nproject_"
-          + "id\202\323\344\223\002/\"*/v1/projects/{project_id}:begi"
-          + "nTransaction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013d"
-          + "atabase_id\022\346\001\n\006Commit\022\".google.datastore"
-          + ".v1.CommitRequest\032#.google.datastore.v1."
-          + "CommitResponse\"\222\001\332A%project_id,mode,tran"
-          + "saction,mutations\332A\031project_id,mode,muta"
-          + "tions\202\323\344\223\002%\" /v1/projects/{project_id}:c"
-          + "ommit:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database"
-          + "_id\022\302\001\n\010Rollback\022$.google.datastore.v1.R"
-          + "ollbackRequest\032%.google.datastore.v1.Rol"
-          + "lbackResponse\"i\332A\026project_id,transaction"
-          + "\202\323\344\223\002\'\"\"/v1/projects/{project_id}:rollba"
-          + "ck:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
-          + "\022\307\001\n\013AllocateIds\022\'.google.datastore.v1.A"
-          + "llocateIdsRequest\032(.google.datastore.v1."
-          + "AllocateIdsResponse\"e\332A\017project_id,keys\202"
-          + "\323\344\223\002*\"%/v1/projects/{project_id}:allocat"
-          + "eIds:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_"
-          + "id\022\303\001\n\nReserveIds\022&.google.datastore.v1."
-          + "ReserveIdsRequest\032\'.google.datastore.v1."
-          + "ReserveIdsResponse\"d\332A\017project_id,keys\202\323"
-          + "\344\223\002)\"$/v1/projects/{project_id}:reserveI"
-          + "ds:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
-          + "\032v\312A\030datastore.googleapis.com\322AXhttps://"
-          + "www.googleapis.com/auth/cloud-platform,h"
-          + "ttps://www.googleapis.com/auth/datastore"
-          + "B\277\001\n\027com.google.datastore.v1B\016DatastoreP"
-          + "rotoP\001Z;cloud.google.com/go/datastore/ap"
-          + "iv1/datastorepb;datastorepb\252\002\031Google.Clo"
-          + "ud.Datastore.V1\312\002\031Google\\Cloud\\Datastore"
-          + "\\V1\352\002\034Google::Cloud::Datastore::V1b\006prot"
-          + "o3"
+          + "f.TimestampH\001\022^\n\034conflict_resolution_str"
+          + "ategy\030\n \001(\01628.google.datastore.v1.Mutati"
+          + "on.ConflictResolutionStrategy\0228\n\rpropert"
+          + "y_mask\030\t \001(\0132!.google.datastore.v1.Prope"
+          + "rtyMask\022H\n\023property_transforms\030\014 \003(\0132&.g"
+          + "oogle.datastore.v1.PropertyTransformB\003\340A"
+          + "\001\"R\n\032ConflictResolutionStrategy\022\030\n\024STRAT"
+          + "EGY_UNSPECIFIED\020\000\022\020\n\014SERVER_VALUE\020\001\022\010\n\004F"
+          + "AIL\020\003B\013\n\toperationB\035\n\033conflict_detection"
+          + "_strategy\"\343\003\n\021PropertyTransform\022\025\n\010prope"
+          + "rty\030\001 \001(\tB\003\340A\001\022Q\n\023set_to_server_value\030\002 "
+          + "\001(\01622.google.datastore.v1.PropertyTransf"
+          + "orm.ServerValueH\000\022/\n\tincrement\030\003 \001(\0132\032.g"
+          + "oogle.datastore.v1.ValueH\000\022-\n\007maximum\030\004 "
+          + "\001(\0132\032.google.datastore.v1.ValueH\000\022-\n\007min"
+          + "imum\030\005 \001(\0132\032.google.datastore.v1.ValueH\000"
+          + "\022B\n\027append_missing_elements\030\006 \001(\0132\037.goog"
+          + "le.datastore.v1.ArrayValueH\000\022@\n\025remove_a"
+          + "ll_from_array\030\007 \001(\0132\037.google.datastore.v"
+          + "1.ArrayValueH\000\"=\n\013ServerValue\022\034\n\030SERVER_"
+          + "VALUE_UNSPECIFIED\020\000\022\020\n\014REQUEST_TIME\020\001B\020\n"
+          + "\016transform_type\"\374\001\n\016MutationResult\022%\n\003ke"
+          + "y\030\003 \001(\0132\030.google.datastore.v1.Key\022\017\n\007ver"
+          + "sion\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132\032.google"
+          + ".protobuf.Timestamp\022/\n\013update_time\030\006 \001(\013"
+          + "2\032.google.protobuf.Timestamp\022\031\n\021conflict"
+          + "_detected\030\005 \001(\010\0225\n\021transform_results\030\010 \003"
+          + "(\0132\032.google.datastore.v1.Value\"\035\n\014Proper"
+          + "tyMask\022\r\n\005paths\030\001 \003(\t\"\312\002\n\013ReadOptions\022L\n"
+          + "\020read_consistency\030\001 \001(\01620.google.datasto"
+          + "re.v1.ReadOptions.ReadConsistencyH\000\022\025\n\013t"
+          + "ransaction\030\002 \001(\014H\000\022B\n\017new_transaction\030\003 "
+          + "\001(\0132\'.google.datastore.v1.TransactionOpt"
+          + "ionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.proto"
+          + "buf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034RE"
+          + "AD_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG\020\001"
+          + "\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n\022T"
+          + "ransactionOptions\022G\n\nread_write\030\001 \001(\01321."
+          + "google.datastore.v1.TransactionOptions.R"
+          + "eadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google.d"
+          + "atastore.v1.TransactionOptions.ReadOnlyH"
+          + "\000\032)\n\tReadWrite\022\034\n\024previous_transaction\030\001"
+          + " \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032.go"
+          + "ogle.protobuf.TimestampB\006\n\004mode2\341\r\n\tData"
+          + "store\022\300\001\n\006Lookup\022\".google.datastore.v1.L"
+          + "ookupRequest\032#.google.datastore.v1.Looku"
+          + "pResponse\"m\332A\034project_id,read_options,ke"
+          + "ys\202\323\344\223\002%\" /v1/projects/{project_id}:look"
+          + "up:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
+          + "\022\251\001\n\010RunQuery\022$.google.datastore.v1.RunQ"
+          + "ueryRequest\032%.google.datastore.v1.RunQue"
+          + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{projec"
+          + "t_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n"
+          + "\013database_id\022\325\001\n\023RunAggregationQuery\022/.g"
+          + "oogle.datastore.v1.RunAggregationQueryRe"
+          + "quest\0320.google.datastore.v1.RunAggregati"
+          + "onQueryResponse\"[\202\323\344\223\0022\"-/v1/projects/{p"
+          + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022"
+          + "\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020BeginTr"
+          + "ansaction\022,.google.datastore.v1.BeginTra"
+          + "nsactionRequest\032-.google.datastore.v1.Be"
+          + "ginTransactionResponse\"e\332A\nproject_id\202\323\344"
+          + "\223\002/\"*/v1/projects/{project_id}:beginTran"
+          + "saction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa"
+          + "se_id\022\346\001\n\006Commit\022\".google.datastore.v1.C"
+          + "ommitRequest\032#.google.datastore.v1.Commi"
+          + "tResponse\"\222\001\332A%project_id,mode,transacti"
+          + "on,mutations\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\022\302"
+          + "\001\n\010Rollback\022$.google.datastore.v1.Rollba"
+          + "ckRequest\032%.google.datastore.v1.Rollback"
+          + "Response\"i\332A\026project_id,transaction\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\022\307\001\n\013"
+          + "AllocateIds\022\'.google.datastore.v1.Alloca"
+          + "teIdsRequest\032(.google.datastore.v1.Alloc"
+          + "ateIdsResponse\"e\332A\017project_id,keys\202\323\344\223\002*"
+          + "\"%/v1/projects/{project_id}:allocateIds:"
+          + "\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001"
+          + "\n\nReserveIds\022&.google.datastore.v1.Reser"
+          + "veIdsRequest\032\'.google.datastore.v1.Reser"
+          + "veIdsResponse\"d\332A\017project_id,keys\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\032v\312A\030"
+          + "datastore.googleapis.com\322AXhttps://www.g"
+          + "oogleapis.com/auth/cloud-platform,https:"
+          + "//www.googleapis.com/auth/datastoreB\277\001\n\027"
+          + "com.google.datastore.v1B\016DatastoreProtoP"
+          + "\001Z;cloud.google.com/go/datastore/apiv1/d"
+          + "atastorepb;datastorepb\252\002\031Google.Cloud.Da"
+          + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002"
+          + "\034Google::Cloud::Datastore::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -461,20 +484,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Delete",
               "BaseVersion",
               "UpdateTime",
+              "ConflictResolutionStrategy",
               "PropertyMask",
+              "PropertyTransforms",
               "Operation",
               "ConflictDetectionStrategy",
             });
-    internal_static_google_datastore_v1_MutationResult_descriptor =
+    internal_static_google_datastore_v1_PropertyTransform_descriptor =
         getDescriptor().getMessageTypes().get(17);
+    internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_v1_PropertyTransform_descriptor,
+            new java.lang.String[] {
+              "Property",
+              "SetToServerValue",
+              "Increment",
+              "Maximum",
+              "Minimum",
+              "AppendMissingElements",
+              "RemoveAllFromArray",
+              "TransformType",
+            });
+    internal_static_google_datastore_v1_MutationResult_descriptor =
+        getDescriptor().getMessageTypes().get(18);
     internal_static_google_datastore_v1_MutationResult_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_datastore_v1_MutationResult_descriptor,
             new java.lang.String[] {
-              "Key", "Version", "CreateTime", "UpdateTime", "ConflictDetected",
+              "Key", "Version", "CreateTime", "UpdateTime", "ConflictDetected", "TransformResults",
             });
     internal_static_google_datastore_v1_PropertyMask_descriptor =
-        getDescriptor().getMessageTypes().get(18);
+        getDescriptor().getMessageTypes().get(19);
     internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_datastore_v1_PropertyMask_descriptor,
@@ -482,7 +522,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Paths",
             });
     internal_static_google_datastore_v1_ReadOptions_descriptor =
-        getDescriptor().getMessageTypes().get(19);
+        getDescriptor().getMessageTypes().get(20);
     internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_datastore_v1_ReadOptions_descriptor,
@@ -490,7 +530,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "ReadConsistency", "Transaction", "NewTransaction", "ReadTime", "ConsistencyType",
             });
     internal_static_google_datastore_v1_TransactionOptions_descriptor =
-        getDescriptor().getMessageTypes().get(20);
+        getDescriptor().getMessageTypes().get(21);
     internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_datastore_v1_TransactionOptions_descriptor,
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 71c31051665c..ff6a54f5bed0 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
@@ -38,7 +38,10 @@ private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
 
-  private Mutation() {}
+  private Mutation() {
+    conflictResolutionStrategy_ = 0;
+    propertyTransforms_ = java.util.Collections.emptyList();
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
@@ -60,6 +63,166 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class);
   }
 
+  /**
+   *
+   *
+   * 
    +   * The possible ways to resolve a conflict detected in a mutation.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.v1.Mutation.ConflictResolutionStrategy}
+   */
+  public enum ConflictResolutionStrategy implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * Unspecified. Defaults to `SERVER_VALUE`.
+     * 
    
+     *
+     * STRATEGY_UNSPECIFIED = 0;
+     */
+    STRATEGY_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * The server entity is kept.
+     * 
    
+     *
+     * SERVER_VALUE = 1;
+     */
+    SERVER_VALUE(1),
+    /**
+     *
+     *
+     * 
    +     * The whole commit request fails.
+     * 
    
+     *
+     * FAIL = 3;
+     */
+    FAIL(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * Unspecified. Defaults to `SERVER_VALUE`.
+     * 
    
+     *
+     * STRATEGY_UNSPECIFIED = 0;
+     */
+    public static final int STRATEGY_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * The server entity is kept.
+     * 
    
+     *
+     * SERVER_VALUE = 1;
+     */
+    public static final int SERVER_VALUE_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * The whole commit request fails.
+     * 
    
+     *
+     * FAIL = 3;
+     */
+    public static final int FAIL_VALUE = 3;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ConflictResolutionStrategy valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ConflictResolutionStrategy forNumber(int value) {
+      switch (value) {
+        case 0:
+          return STRATEGY_UNSPECIFIED;
+        case 1:
+          return SERVER_VALUE;
+        case 3:
+          return FAIL;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap
+        internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public ConflictResolutionStrategy findValueByNumber(int number) {
+                return ConflictResolutionStrategy.forNumber(number);
+              }
+            };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.v1.Mutation.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ConflictResolutionStrategy[] VALUES = values();
+
+    public static ConflictResolutionStrategy valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ConflictResolutionStrategy(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.v1.Mutation.ConflictResolutionStrategy)
+  }
+
   private int bitField0_;
   private int operationCase_ = 0;
 
@@ -477,6 +640,53 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
 
+  public static final int CONFLICT_RESOLUTION_STRATEGY_FIELD_NUMBER = 10;
+  private int conflictResolutionStrategy_ = 0;
+  /**
+   *
+   *
+   * 
    +   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+   * 
+   *
+   * @return The enum numeric value on the wire for conflictResolutionStrategy.
+   */
+  @java.lang.Override
+  public int getConflictResolutionStrategyValue() {
+    return conflictResolutionStrategy_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+   * 
+   *
+   * @return The conflictResolutionStrategy.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Mutation.ConflictResolutionStrategy
+      getConflictResolutionStrategy() {
+    com.google.datastore.v1.Mutation.ConflictResolutionStrategy result =
+        com.google.datastore.v1.Mutation.ConflictResolutionStrategy.forNumber(
+            conflictResolutionStrategy_);
+    return result == null
+        ? com.google.datastore.v1.Mutation.ConflictResolutionStrategy.UNRECOGNIZED
+        : result;
+  }
+
   public static final int PROPERTY_MASK_FIELD_NUMBER = 9;
   private com.google.datastore.v1.PropertyMask propertyMask_;
   /**
@@ -548,6 +758,108 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
         : propertyMask_;
   }
 
+  public static final int PROPERTY_TRANSFORMS_FIELD_NUMBER = 12;
+
+  @SuppressWarnings("serial")
+  private java.util.List propertyTransforms_;
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public java.util.List getPropertyTransformsList() {
+    return propertyTransforms_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public java.util.List
+      getPropertyTransformsOrBuilderList() {
+    return propertyTransforms_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public int getPropertyTransformsCount() {
+    return propertyTransforms_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index) {
+    return propertyTransforms_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsOrBuilder(
+      int index) {
+    return propertyTransforms_.get(index);
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -580,9 +892,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000001) != 0)) {
       output.writeMessage(9, getPropertyMask());
     }
+    if (conflictResolutionStrategy_
+        != com.google.datastore.v1.Mutation.ConflictResolutionStrategy.STRATEGY_UNSPECIFIED
+            .getNumber()) {
+      output.writeEnum(10, conflictResolutionStrategy_);
+    }
     if (conflictDetectionStrategyCase_ == 11) {
       output.writeMessage(11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_);
     }
+    for (int i = 0; i < propertyTransforms_.size(); i++) {
+      output.writeMessage(12, propertyTransforms_.get(i));
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -620,11 +940,21 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getPropertyMask());
     }
+    if (conflictResolutionStrategy_
+        != com.google.datastore.v1.Mutation.ConflictResolutionStrategy.STRATEGY_UNSPECIFIED
+            .getNumber()) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeEnumSize(10, conflictResolutionStrategy_);
+    }
     if (conflictDetectionStrategyCase_ == 11) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_);
     }
+    for (int i = 0; i < propertyTransforms_.size(); i++) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(12, propertyTransforms_.get(i));
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -640,10 +970,12 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj;
 
+    if (conflictResolutionStrategy_ != other.conflictResolutionStrategy_) return false;
     if (hasPropertyMask() != other.hasPropertyMask()) return false;
     if (hasPropertyMask()) {
       if (!getPropertyMask().equals(other.getPropertyMask())) return false;
     }
+    if (!getPropertyTransformsList().equals(other.getPropertyTransformsList())) return false;
     if (!getOperationCase().equals(other.getOperationCase())) return false;
     switch (operationCase_) {
       case 4:
@@ -684,10 +1016,16 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + CONFLICT_RESOLUTION_STRATEGY_FIELD_NUMBER;
+    hash = (53 * hash) + conflictResolutionStrategy_;
     if (hasPropertyMask()) {
       hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getPropertyMask().hashCode();
     }
+    if (getPropertyTransformsCount() > 0) {
+      hash = (37 * hash) + PROPERTY_TRANSFORMS_FIELD_NUMBER;
+      hash = (53 * hash) + getPropertyTransformsList().hashCode();
+    }
     switch (operationCase_) {
       case 4:
         hash = (37 * hash) + INSERT_FIELD_NUMBER;
@@ -860,6 +1198,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
         getPropertyMaskFieldBuilder();
+        getPropertyTransformsFieldBuilder();
       }
     }
 
@@ -882,11 +1221,19 @@ public Builder clear() {
       if (updateTimeBuilder_ != null) {
         updateTimeBuilder_.clear();
       }
+      conflictResolutionStrategy_ = 0;
       propertyMask_ = null;
       if (propertyMaskBuilder_ != null) {
         propertyMaskBuilder_.dispose();
         propertyMaskBuilder_ = null;
       }
+      if (propertyTransformsBuilder_ == null) {
+        propertyTransforms_ = java.util.Collections.emptyList();
+      } else {
+        propertyTransforms_ = null;
+        propertyTransformsBuilder_.clear();
+      }
+      bitField0_ = (bitField0_ & ~0x00000100);
       operationCase_ = 0;
       operation_ = null;
       conflictDetectionStrategyCase_ = 0;
@@ -917,6 +1264,7 @@ public com.google.datastore.v1.Mutation build() {
     @java.lang.Override
     public com.google.datastore.v1.Mutation buildPartial() {
       com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -925,10 +1273,25 @@ public com.google.datastore.v1.Mutation buildPartial() {
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.datastore.v1.Mutation result) {
+      if (propertyTransformsBuilder_ == null) {
+        if (((bitField0_ & 0x00000100) != 0)) {
+          propertyTransforms_ = java.util.Collections.unmodifiableList(propertyTransforms_);
+          bitField0_ = (bitField0_ & ~0x00000100);
+        }
+        result.propertyTransforms_ = propertyTransforms_;
+      } else {
+        result.propertyTransforms_ = propertyTransformsBuilder_.build();
+      }
+    }
+
     private void buildPartial0(com.google.datastore.v1.Mutation result) {
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000040) != 0)) {
+        result.conflictResolutionStrategy_ = conflictResolutionStrategy_;
+      }
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000080) != 0)) {
         result.propertyMask_ =
             propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build();
         to_bitField0_ |= 0x00000001;
@@ -1003,9 +1366,39 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.datastore.v1.Mutation other) {
       if (other == com.google.datastore.v1.Mutation.getDefaultInstance()) return this;
+      if (other.conflictResolutionStrategy_ != 0) {
+        setConflictResolutionStrategyValue(other.getConflictResolutionStrategyValue());
+      }
       if (other.hasPropertyMask()) {
         mergePropertyMask(other.getPropertyMask());
       }
+      if (propertyTransformsBuilder_ == null) {
+        if (!other.propertyTransforms_.isEmpty()) {
+          if (propertyTransforms_.isEmpty()) {
+            propertyTransforms_ = other.propertyTransforms_;
+            bitField0_ = (bitField0_ & ~0x00000100);
+          } else {
+            ensurePropertyTransformsIsMutable();
+            propertyTransforms_.addAll(other.propertyTransforms_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.propertyTransforms_.isEmpty()) {
+          if (propertyTransformsBuilder_.isEmpty()) {
+            propertyTransformsBuilder_.dispose();
+            propertyTransformsBuilder_ = null;
+            propertyTransforms_ = other.propertyTransforms_;
+            bitField0_ = (bitField0_ & ~0x00000100);
+            propertyTransformsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getPropertyTransformsFieldBuilder()
+                    : null;
+          } else {
+            propertyTransformsBuilder_.addAllMessages(other.propertyTransforms_);
+          }
+        }
+      }
       switch (other.getOperationCase()) {
         case INSERT:
           {
@@ -1107,15 +1500,34 @@ public Builder mergeFrom(
             case 74:
               {
                 input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+                bitField0_ |= 0x00000080;
                 break;
               } // case 74
+            case 80:
+              {
+                conflictResolutionStrategy_ = input.readEnum();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 80
             case 90:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
                 conflictDetectionStrategyCase_ = 11;
                 break;
               } // case 90
+            case 98:
+              {
+                com.google.datastore.v1.PropertyTransform m =
+                    input.readMessage(
+                        com.google.datastore.v1.PropertyTransform.parser(), extensionRegistry);
+                if (propertyTransformsBuilder_ == null) {
+                  ensurePropertyTransformsIsMutable();
+                  propertyTransforms_.add(m);
+                } else {
+                  propertyTransformsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 98
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -2322,6 +2734,121 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       return updateTimeBuilder_;
     }
 
+    private int conflictResolutionStrategy_ = 0;
+    /**
+     *
+     *
+     * 
    +     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+     * 
+     *
+     * @return The enum numeric value on the wire for conflictResolutionStrategy.
+     */
+    @java.lang.Override
+    public int getConflictResolutionStrategyValue() {
+      return conflictResolutionStrategy_;
+    }
+    /**
+     *
+     *
+     * 
    +     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+     * 
+     *
+     * @param value The enum numeric value on the wire for conflictResolutionStrategy to set.
+     * @return This builder for chaining.
+     */
+    public Builder setConflictResolutionStrategyValue(int value) {
+      conflictResolutionStrategy_ = value;
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+     * 
+     *
+     * @return The conflictResolutionStrategy.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.Mutation.ConflictResolutionStrategy
+        getConflictResolutionStrategy() {
+      com.google.datastore.v1.Mutation.ConflictResolutionStrategy result =
+          com.google.datastore.v1.Mutation.ConflictResolutionStrategy.forNumber(
+              conflictResolutionStrategy_);
+      return result == null
+          ? com.google.datastore.v1.Mutation.ConflictResolutionStrategy.UNRECOGNIZED
+          : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+     * 
+     *
+     * @param value The conflictResolutionStrategy to set.
+     * @return This builder for chaining.
+     */
+    public Builder setConflictResolutionStrategy(
+        com.google.datastore.v1.Mutation.ConflictResolutionStrategy value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      bitField0_ |= 0x00000040;
+      conflictResolutionStrategy_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+     * 
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearConflictResolutionStrategy() {
+      bitField0_ = (bitField0_ & ~0x00000040);
+      conflictResolutionStrategy_ = 0;
+      onChanged();
+      return this;
+    }
+
     private com.google.datastore.v1.PropertyMask propertyMask_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.datastore.v1.PropertyMask,
@@ -2347,7 +2874,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the propertyMask field is set.
      */
     public boolean hasPropertyMask() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      *
@@ -2401,7 +2928,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) {
       } else {
         propertyMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2427,7 +2954,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil
       } else {
         propertyMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2449,7 +2976,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil
      */
     public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
       if (propertyMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
+        if (((bitField0_ & 0x00000080) != 0)
             && propertyMask_ != null
             && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) {
           getPropertyMaskBuilder().mergeFrom(value);
@@ -2460,7 +2987,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
         propertyMaskBuilder_.mergeFrom(value);
       }
       if (propertyMask_ != null) {
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         onChanged();
       }
       return this;
@@ -2482,7 +3009,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
      * .google.datastore.v1.PropertyMask property_mask = 9;
      */
     public Builder clearPropertyMask() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000080);
       propertyMask_ = null;
       if (propertyMaskBuilder_ != null) {
         propertyMaskBuilder_.dispose();
@@ -2508,7 +3035,7 @@ public Builder clearPropertyMask() {
      * .google.datastore.v1.PropertyMask property_mask = 9;
      */
     public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() {
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return getPropertyMaskFieldBuilder().getBuilder();
     }
@@ -2570,6 +3097,473 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
       return propertyMaskBuilder_;
     }
 
+    private java.util.List propertyTransforms_ =
+        java.util.Collections.emptyList();
+
+    private void ensurePropertyTransformsIsMutable() {
+      if (!((bitField0_ & 0x00000100) != 0)) {
+        propertyTransforms_ =
+            new java.util.ArrayList(propertyTransforms_);
+        bitField0_ |= 0x00000100;
+      }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.PropertyTransform,
+            com.google.datastore.v1.PropertyTransform.Builder,
+            com.google.datastore.v1.PropertyTransformOrBuilder>
+        propertyTransformsBuilder_;
+
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public java.util.List getPropertyTransformsList() {
+      if (propertyTransformsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(propertyTransforms_);
+      } else {
+        return propertyTransformsBuilder_.getMessageList();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public int getPropertyTransformsCount() {
+      if (propertyTransformsBuilder_ == null) {
+        return propertyTransforms_.size();
+      } else {
+        return propertyTransformsBuilder_.getCount();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index) {
+      if (propertyTransformsBuilder_ == null) {
+        return propertyTransforms_.get(index);
+      } else {
+        return propertyTransformsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setPropertyTransforms(
+        int index, com.google.datastore.v1.PropertyTransform value) {
+      if (propertyTransformsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePropertyTransformsIsMutable();
+        propertyTransforms_.set(index, value);
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setPropertyTransforms(
+        int index, com.google.datastore.v1.PropertyTransform.Builder builderForValue) {
+      if (propertyTransformsBuilder_ == null) {
+        ensurePropertyTransformsIsMutable();
+        propertyTransforms_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addPropertyTransforms(com.google.datastore.v1.PropertyTransform value) {
+      if (propertyTransformsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePropertyTransformsIsMutable();
+        propertyTransforms_.add(value);
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addPropertyTransforms(
+        int index, com.google.datastore.v1.PropertyTransform value) {
+      if (propertyTransformsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePropertyTransformsIsMutable();
+        propertyTransforms_.add(index, value);
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addPropertyTransforms(
+        com.google.datastore.v1.PropertyTransform.Builder builderForValue) {
+      if (propertyTransformsBuilder_ == null) {
+        ensurePropertyTransformsIsMutable();
+        propertyTransforms_.add(builderForValue.build());
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addPropertyTransforms(
+        int index, com.google.datastore.v1.PropertyTransform.Builder builderForValue) {
+      if (propertyTransformsBuilder_ == null) {
+        ensurePropertyTransformsIsMutable();
+        propertyTransforms_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder addAllPropertyTransforms(
+        java.lang.Iterable values) {
+      if (propertyTransformsBuilder_ == null) {
+        ensurePropertyTransformsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, propertyTransforms_);
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder clearPropertyTransforms() {
+      if (propertyTransformsBuilder_ == null) {
+        propertyTransforms_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000100);
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder removePropertyTransforms(int index) {
+      if (propertyTransformsBuilder_ == null) {
+        ensurePropertyTransformsIsMutable();
+        propertyTransforms_.remove(index);
+        onChanged();
+      } else {
+        propertyTransformsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.PropertyTransform.Builder getPropertyTransformsBuilder(
+        int index) {
+      return getPropertyTransformsFieldBuilder().getBuilder(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsOrBuilder(
+        int index) {
+      if (propertyTransformsBuilder_ == null) {
+        return propertyTransforms_.get(index);
+      } else {
+        return propertyTransformsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public java.util.List
+        getPropertyTransformsOrBuilderList() {
+      if (propertyTransformsBuilder_ != null) {
+        return propertyTransformsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(propertyTransforms_);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBuilder() {
+      return getPropertyTransformsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.PropertyTransform.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBuilder(
+        int index) {
+      return getPropertyTransformsFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.PropertyTransform.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     * 
    
+     *
+     * 
+     * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public java.util.List
+        getPropertyTransformsBuilderList() {
+      return getPropertyTransformsFieldBuilder().getBuilderList();
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.PropertyTransform,
+            com.google.datastore.v1.PropertyTransform.Builder,
+            com.google.datastore.v1.PropertyTransformOrBuilder>
+        getPropertyTransformsFieldBuilder() {
+      if (propertyTransformsBuilder_ == null) {
+        propertyTransformsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.PropertyTransform,
+                com.google.datastore.v1.PropertyTransform.Builder,
+                com.google.datastore.v1.PropertyTransformOrBuilder>(
+                propertyTransforms_,
+                ((bitField0_ & 0x00000100) != 0),
+                getParentForChildren(),
+                isClean());
+        propertyTransforms_ = null;
+      }
+      return propertyTransformsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 0bee8832511c..131454c79f5b 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
@@ -246,6 +246,39 @@ public interface MutationOrBuilder
    */
   com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+   * 
+   *
+   * @return The enum numeric value on the wire for conflictResolutionStrategy.
+   */
+  int getConflictResolutionStrategyValue();
+  /**
+   *
+   *
+   * 
    +   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10;
+   * 
+   *
+   * @return The conflictResolutionStrategy.
+   */
+  com.google.datastore.v1.Mutation.ConflictResolutionStrategy getConflictResolutionStrategy();
+
   /**
    *
    *
@@ -302,6 +335,88 @@ public interface MutationOrBuilder
    */
   com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder();
 
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  java.util.List getPropertyTransformsList();
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index);
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  int getPropertyTransformsCount();
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  java.util.List
+      getPropertyTransformsOrBuilderList();
+  /**
+   *
+   *
+   * 
    +   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   * 
    
+   *
+   * 
+   * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsOrBuilder(int index);
+
   com.google.datastore.v1.Mutation.OperationCase getOperationCase();
 
   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 03e96876d9cc..aa05f03daae5 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
@@ -38,7 +38,9 @@ private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder
     super(builder);
   }
 
-  private MutationResult() {}
+  private MutationResult() {
+    transformResults_ = java.util.Collections.emptyList();
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
@@ -253,6 +255,87 @@ public boolean getConflictDetected() {
     return conflictDetected_;
   }
 
+  public static final int TRANSFORM_RESULTS_FIELD_NUMBER = 8;
+
+  @SuppressWarnings("serial")
+  private java.util.List transformResults_;
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  @java.lang.Override
+  public java.util.List getTransformResultsList() {
+    return transformResults_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  @java.lang.Override
+  public java.util.List
+      getTransformResultsOrBuilderList() {
+    return transformResults_;
+  }
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  @java.lang.Override
+  public int getTransformResultsCount() {
+    return transformResults_.size();
+  }
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Value getTransformResults(int index) {
+    return transformResults_.get(index);
+  }
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int index) {
+    return transformResults_.get(index);
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -282,6 +365,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(7, getCreateTime());
     }
+    for (int i = 0; i < transformResults_.size(); i++) {
+      output.writeMessage(8, transformResults_.get(i));
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -306,6 +392,9 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getCreateTime());
     }
+    for (int i = 0; i < transformResults_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, transformResults_.get(i));
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -335,6 +424,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
     }
     if (getConflictDetected() != other.getConflictDetected()) return false;
+    if (!getTransformResultsList().equals(other.getTransformResultsList())) return false;
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -362,6 +452,10 @@ public int hashCode() {
     }
     hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConflictDetected());
+    if (getTransformResultsCount() > 0) {
+      hash = (37 * hash) + TRANSFORM_RESULTS_FIELD_NUMBER;
+      hash = (53 * hash) + getTransformResultsList().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -505,6 +599,7 @@ private void maybeForceBuilderInitialization() {
         getKeyFieldBuilder();
         getCreateTimeFieldBuilder();
         getUpdateTimeFieldBuilder();
+        getTransformResultsFieldBuilder();
       }
     }
 
@@ -529,6 +624,13 @@ public Builder clear() {
         updateTimeBuilder_ = null;
       }
       conflictDetected_ = false;
+      if (transformResultsBuilder_ == null) {
+        transformResults_ = java.util.Collections.emptyList();
+      } else {
+        transformResults_ = null;
+        transformResultsBuilder_.clear();
+      }
+      bitField0_ = (bitField0_ & ~0x00000020);
       return this;
     }
 
@@ -556,6 +658,7 @@ public com.google.datastore.v1.MutationResult build() {
     public com.google.datastore.v1.MutationResult buildPartial() {
       com.google.datastore.v1.MutationResult result =
           new com.google.datastore.v1.MutationResult(this);
+      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) {
         buildPartial0(result);
       }
@@ -563,6 +666,18 @@ public com.google.datastore.v1.MutationResult buildPartial() {
       return result;
     }
 
+    private void buildPartialRepeatedFields(com.google.datastore.v1.MutationResult result) {
+      if (transformResultsBuilder_ == null) {
+        if (((bitField0_ & 0x00000020) != 0)) {
+          transformResults_ = java.util.Collections.unmodifiableList(transformResults_);
+          bitField0_ = (bitField0_ & ~0x00000020);
+        }
+        result.transformResults_ = transformResults_;
+      } else {
+        result.transformResults_ = transformResultsBuilder_.build();
+      }
+    }
+
     private void buildPartial0(com.google.datastore.v1.MutationResult result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
@@ -647,6 +762,33 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) {
       if (other.getConflictDetected() != false) {
         setConflictDetected(other.getConflictDetected());
       }
+      if (transformResultsBuilder_ == null) {
+        if (!other.transformResults_.isEmpty()) {
+          if (transformResults_.isEmpty()) {
+            transformResults_ = other.transformResults_;
+            bitField0_ = (bitField0_ & ~0x00000020);
+          } else {
+            ensureTransformResultsIsMutable();
+            transformResults_.addAll(other.transformResults_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.transformResults_.isEmpty()) {
+          if (transformResultsBuilder_.isEmpty()) {
+            transformResultsBuilder_.dispose();
+            transformResultsBuilder_ = null;
+            transformResults_ = other.transformResults_;
+            bitField0_ = (bitField0_ & ~0x00000020);
+            transformResultsBuilder_ =
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
+                    ? getTransformResultsFieldBuilder()
+                    : null;
+          } else {
+            transformResultsBuilder_.addAllMessages(other.transformResults_);
+          }
+        }
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -703,6 +845,18 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 58
+            case 66:
+              {
+                com.google.datastore.v1.Value m =
+                    input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
+                if (transformResultsBuilder_ == null) {
+                  ensureTransformResultsIsMutable();
+                  transformResults_.add(m);
+                } else {
+                  transformResultsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 66
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1429,6 +1583,394 @@ public Builder clearConflictDetected() {
       return this;
     }
 
+    private java.util.List transformResults_ =
+        java.util.Collections.emptyList();
+
+    private void ensureTransformResultsIsMutable() {
+      if (!((bitField0_ & 0x00000020) != 0)) {
+        transformResults_ =
+            new java.util.ArrayList(transformResults_);
+        bitField0_ |= 0x00000020;
+      }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        transformResultsBuilder_;
+
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public java.util.List getTransformResultsList() {
+      if (transformResultsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(transformResults_);
+      } else {
+        return transformResultsBuilder_.getMessageList();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public int getTransformResultsCount() {
+      if (transformResultsBuilder_ == null) {
+        return transformResults_.size();
+      } else {
+        return transformResultsBuilder_.getCount();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public com.google.datastore.v1.Value getTransformResults(int index) {
+      if (transformResultsBuilder_ == null) {
+        return transformResults_.get(index);
+      } else {
+        return transformResultsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder setTransformResults(int index, com.google.datastore.v1.Value value) {
+      if (transformResultsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureTransformResultsIsMutable();
+        transformResults_.set(index, value);
+        onChanged();
+      } else {
+        transformResultsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder setTransformResults(
+        int index, com.google.datastore.v1.Value.Builder builderForValue) {
+      if (transformResultsBuilder_ == null) {
+        ensureTransformResultsIsMutable();
+        transformResults_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        transformResultsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder addTransformResults(com.google.datastore.v1.Value value) {
+      if (transformResultsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureTransformResultsIsMutable();
+        transformResults_.add(value);
+        onChanged();
+      } else {
+        transformResultsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder addTransformResults(int index, com.google.datastore.v1.Value value) {
+      if (transformResultsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureTransformResultsIsMutable();
+        transformResults_.add(index, value);
+        onChanged();
+      } else {
+        transformResultsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder addTransformResults(com.google.datastore.v1.Value.Builder builderForValue) {
+      if (transformResultsBuilder_ == null) {
+        ensureTransformResultsIsMutable();
+        transformResults_.add(builderForValue.build());
+        onChanged();
+      } else {
+        transformResultsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder addTransformResults(
+        int index, com.google.datastore.v1.Value.Builder builderForValue) {
+      if (transformResultsBuilder_ == null) {
+        ensureTransformResultsIsMutable();
+        transformResults_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        transformResultsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder addAllTransformResults(
+        java.lang.Iterable values) {
+      if (transformResultsBuilder_ == null) {
+        ensureTransformResultsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, transformResults_);
+        onChanged();
+      } else {
+        transformResultsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder clearTransformResults() {
+      if (transformResultsBuilder_ == null) {
+        transformResults_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        onChanged();
+      } else {
+        transformResultsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public Builder removeTransformResults(int index) {
+      if (transformResultsBuilder_ == null) {
+        ensureTransformResultsIsMutable();
+        transformResults_.remove(index);
+        onChanged();
+      } else {
+        transformResultsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public com.google.datastore.v1.Value.Builder getTransformResultsBuilder(int index) {
+      return getTransformResultsFieldBuilder().getBuilder(index);
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int index) {
+      if (transformResultsBuilder_ == null) {
+        return transformResults_.get(index);
+      } else {
+        return transformResultsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public java.util.List
+        getTransformResultsOrBuilderList() {
+      if (transformResultsBuilder_ != null) {
+        return transformResultsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(transformResults_);
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public com.google.datastore.v1.Value.Builder addTransformResultsBuilder() {
+      return getTransformResultsFieldBuilder()
+          .addBuilder(com.google.datastore.v1.Value.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public com.google.datastore.v1.Value.Builder addTransformResultsBuilder(int index) {
+      return getTransformResultsFieldBuilder()
+          .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance());
+    }
+    /**
+     *
+     *
+     * 
    +     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     * 
    
+     *
+     * repeated .google.datastore.v1.Value transform_results = 8;
+     */
+    public java.util.List getTransformResultsBuilderList() {
+      return getTransformResultsFieldBuilder().getBuilderList();
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        getTransformResultsFieldBuilder() {
+      if (transformResultsBuilder_ == null) {
+        transformResultsBuilder_ =
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
+                transformResults_,
+                ((bitField0_ & 0x00000020) != 0),
+                getParentForChildren(),
+                isClean());
+        transformResults_ = null;
+      }
+      return transformResultsBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 7d3b4f895db3..e4f8c7561541 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -171,4 +171,66 @@ public interface MutationResultOrBuilder
    * @return The conflictDetected.
    */
   boolean getConflictDetected();
+
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  java.util.List getTransformResultsList();
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  com.google.datastore.v1.Value getTransformResults(int index);
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  int getTransformResultsCount();
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  java.util.List
+      getTransformResultsOrBuilderList();
+  /**
+   *
+   *
+   * 
    +   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   * 
    
+   *
+   * repeated .google.datastore.v1.Value transform_results = 8;
+   */
+  com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
new file mode 100644
index 000000000000..520ccb0f20f0
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
@@ -0,0 +1,3197 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+// Protobuf Java Version: 3.25.5
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * A transformation of an entity property.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.PropertyTransform}
+ */
+public final class PropertyTransform extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyTransform)
+    PropertyTransformOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use PropertyTransform.newBuilder() to construct.
+  private PropertyTransform(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private PropertyTransform() {
+    property_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new PropertyTransform();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_PropertyTransform_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.DatastoreProto
+        .internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.PropertyTransform.class,
+            com.google.datastore.v1.PropertyTransform.Builder.class);
+  }
+
+  /**
+   *
+   *
+   * 
    +   * A value that is calculated by the server.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.v1.PropertyTransform.ServerValue}
+   */
+  public enum ServerValue implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * Unspecified. This value must not be used.
+     * 
    
+     *
+     * SERVER_VALUE_UNSPECIFIED = 0;
+     */
+    SERVER_VALUE_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * The time at which the server processed the request, with millisecond
+     * precision. If used on multiple properties (same or different entities)
+     * in a transaction, all the properties will get the same server timestamp.
+     * 
    
+     *
+     * REQUEST_TIME = 1;
+     */
+    REQUEST_TIME(1),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * Unspecified. This value must not be used.
+     * 
    
+     *
+     * SERVER_VALUE_UNSPECIFIED = 0;
+     */
+    public static final int SERVER_VALUE_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * The time at which the server processed the request, with millisecond
+     * precision. If used on multiple properties (same or different entities)
+     * in a transaction, all the properties will get the same server timestamp.
+     * 
    
+     *
+     * REQUEST_TIME = 1;
+     */
+    public static final int REQUEST_TIME_VALUE = 1;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ServerValue valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ServerValue forNumber(int value) {
+      switch (value) {
+        case 0:
+          return SERVER_VALUE_UNSPECIFIED;
+        case 1:
+          return REQUEST_TIME;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public ServerValue findValueByNumber(int number) {
+            return ServerValue.forNumber(number);
+          }
+        };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.v1.PropertyTransform.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ServerValue[] VALUES = values();
+
+    public static ServerValue valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ServerValue(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.v1.PropertyTransform.ServerValue)
+  }
+
+  private int transformTypeCase_ = 0;
+
+  @SuppressWarnings("serial")
+  private java.lang.Object transformType_;
+
+  public enum TransformTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+    SET_TO_SERVER_VALUE(2),
+    INCREMENT(3),
+    MAXIMUM(4),
+    MINIMUM(5),
+    APPEND_MISSING_ELEMENTS(6),
+    REMOVE_ALL_FROM_ARRAY(7),
+    TRANSFORMTYPE_NOT_SET(0);
+    private final int value;
+
+    private TransformTypeCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @param value The number of the enum to look for.
+     * @return The enum associated with the given number.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static TransformTypeCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static TransformTypeCase forNumber(int value) {
+      switch (value) {
+        case 2:
+          return SET_TO_SERVER_VALUE;
+        case 3:
+          return INCREMENT;
+        case 4:
+          return MAXIMUM;
+        case 5:
+          return MINIMUM;
+        case 6:
+          return APPEND_MISSING_ELEMENTS;
+        case 7:
+          return REMOVE_ALL_FROM_ARRAY;
+        case 0:
+          return TRANSFORMTYPE_NOT_SET;
+        default:
+          return null;
+      }
+    }
+
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public TransformTypeCase getTransformTypeCase() {
+    return TransformTypeCase.forNumber(transformTypeCase_);
+  }
+
+  public static final int PROPERTY_FIELD_NUMBER = 1;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object property_ = "";
+  /**
+   *
+   *
+   * 
    +   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   * 
    
+   *
+   * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The property.
+   */
+  @java.lang.Override
+  public java.lang.String getProperty() {
+    java.lang.Object ref = property_;
+    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();
+      property_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   * 
    
+   *
+   * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The bytes for property.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getPropertyBytes() {
+    java.lang.Object ref = property_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      property_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int SET_TO_SERVER_VALUE_FIELD_NUMBER = 2;
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the given server value.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+   *
+   * @return Whether the setToServerValue field is set.
+   */
+  public boolean hasSetToServerValue() {
+    return transformTypeCase_ == 2;
+  }
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the given server value.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+   *
+   * @return The enum numeric value on the wire for setToServerValue.
+   */
+  public int getSetToServerValueValue() {
+    if (transformTypeCase_ == 2) {
+      return (java.lang.Integer) transformType_;
+    }
+    return 0;
+  }
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the given server value.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+   *
+   * @return The setToServerValue.
+   */
+  public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue() {
+    if (transformTypeCase_ == 2) {
+      com.google.datastore.v1.PropertyTransform.ServerValue result =
+          com.google.datastore.v1.PropertyTransform.ServerValue.forNumber(
+              (java.lang.Integer) transformType_);
+      return result == null
+          ? com.google.datastore.v1.PropertyTransform.ServerValue.UNRECOGNIZED
+          : result;
+    }
+    return com.google.datastore.v1.PropertyTransform.ServerValue.SERVER_VALUE_UNSPECIFIED;
+  }
+
+  public static final int INCREMENT_FIELD_NUMBER = 3;
+  /**
+   *
+   *
+   * 
    +   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   * 
    
+   *
+   * .google.datastore.v1.Value increment = 3;
+   *
+   * @return Whether the increment field is set.
+   */
+  @java.lang.Override
+  public boolean hasIncrement() {
+    return transformTypeCase_ == 3;
+  }
+  /**
+   *
+   *
+   * 
    +   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   * 
    
+   *
+   * .google.datastore.v1.Value increment = 3;
+   *
+   * @return The increment.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Value getIncrement() {
+    if (transformTypeCase_ == 3) {
+      return (com.google.datastore.v1.Value) transformType_;
+    }
+    return com.google.datastore.v1.Value.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   * 
    
+   *
+   * .google.datastore.v1.Value increment = 3;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() {
+    if (transformTypeCase_ == 3) {
+      return (com.google.datastore.v1.Value) transformType_;
+    }
+    return com.google.datastore.v1.Value.getDefaultInstance();
+  }
+
+  public static final int MAXIMUM_FIELD_NUMBER = 4;
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value maximum = 4;
+   *
+   * @return Whether the maximum field is set.
+   */
+  @java.lang.Override
+  public boolean hasMaximum() {
+    return transformTypeCase_ == 4;
+  }
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value maximum = 4;
+   *
+   * @return The maximum.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Value getMaximum() {
+    if (transformTypeCase_ == 4) {
+      return (com.google.datastore.v1.Value) transformType_;
+    }
+    return com.google.datastore.v1.Value.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value maximum = 4;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() {
+    if (transformTypeCase_ == 4) {
+      return (com.google.datastore.v1.Value) transformType_;
+    }
+    return com.google.datastore.v1.Value.getDefaultInstance();
+  }
+
+  public static final int MINIMUM_FIELD_NUMBER = 5;
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value minimum = 5;
+   *
+   * @return Whether the minimum field is set.
+   */
+  @java.lang.Override
+  public boolean hasMinimum() {
+    return transformTypeCase_ == 5;
+  }
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value minimum = 5;
+   *
+   * @return The minimum.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Value getMinimum() {
+    if (transformTypeCase_ == 5) {
+      return (com.google.datastore.v1.Value) transformType_;
+    }
+    return com.google.datastore.v1.Value.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value minimum = 5;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() {
+    if (transformTypeCase_ == 5) {
+      return (com.google.datastore.v1.Value) transformType_;
+    }
+    return com.google.datastore.v1.Value.getDefaultInstance();
+  }
+
+  public static final int APPEND_MISSING_ELEMENTS_FIELD_NUMBER = 6;
+  /**
+   *
+   *
+   * 
    +   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+   *
+   * @return Whether the appendMissingElements field is set.
+   */
+  @java.lang.Override
+  public boolean hasAppendMissingElements() {
+    return transformTypeCase_ == 6;
+  }
+  /**
+   *
+   *
+   * 
    +   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+   *
+   * @return The appendMissingElements.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ArrayValue getAppendMissingElements() {
+    if (transformTypeCase_ == 6) {
+      return (com.google.datastore.v1.ArrayValue) transformType_;
+    }
+    return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBuilder() {
+    if (transformTypeCase_ == 6) {
+      return (com.google.datastore.v1.ArrayValue) transformType_;
+    }
+    return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+  }
+
+  public static final int REMOVE_ALL_FROM_ARRAY_FIELD_NUMBER = 7;
+  /**
+   *
+   *
+   * 
    +   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+   *
+   * @return Whether the removeAllFromArray field is set.
+   */
+  @java.lang.Override
+  public boolean hasRemoveAllFromArray() {
+    return transformTypeCase_ == 7;
+  }
+  /**
+   *
+   *
+   * 
    +   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+   *
+   * @return The removeAllFromArray.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() {
+    if (transformTypeCase_ == 7) {
+      return (com.google.datastore.v1.ArrayValue) transformType_;
+    }
+    return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+  }
+  /**
+   *
+   *
+   * 
    +   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilder() {
+    if (transformTypeCase_ == 7) {
+      return (com.google.datastore.v1.ArrayValue) transformType_;
+    }
+    return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(property_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, property_);
+    }
+    if (transformTypeCase_ == 2) {
+      output.writeEnum(2, ((java.lang.Integer) transformType_));
+    }
+    if (transformTypeCase_ == 3) {
+      output.writeMessage(3, (com.google.datastore.v1.Value) transformType_);
+    }
+    if (transformTypeCase_ == 4) {
+      output.writeMessage(4, (com.google.datastore.v1.Value) transformType_);
+    }
+    if (transformTypeCase_ == 5) {
+      output.writeMessage(5, (com.google.datastore.v1.Value) transformType_);
+    }
+    if (transformTypeCase_ == 6) {
+      output.writeMessage(6, (com.google.datastore.v1.ArrayValue) transformType_);
+    }
+    if (transformTypeCase_ == 7) {
+      output.writeMessage(7, (com.google.datastore.v1.ArrayValue) transformType_);
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(property_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, property_);
+    }
+    if (transformTypeCase_ == 2) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeEnumSize(
+              2, ((java.lang.Integer) transformType_));
+    }
+    if (transformTypeCase_ == 3) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              3, (com.google.datastore.v1.Value) transformType_);
+    }
+    if (transformTypeCase_ == 4) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              4, (com.google.datastore.v1.Value) transformType_);
+    }
+    if (transformTypeCase_ == 5) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              5, (com.google.datastore.v1.Value) transformType_);
+    }
+    if (transformTypeCase_ == 6) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              6, (com.google.datastore.v1.ArrayValue) transformType_);
+    }
+    if (transformTypeCase_ == 7) {
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              7, (com.google.datastore.v1.ArrayValue) transformType_);
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.PropertyTransform)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.PropertyTransform other =
+        (com.google.datastore.v1.PropertyTransform) obj;
+
+    if (!getProperty().equals(other.getProperty())) return false;
+    if (!getTransformTypeCase().equals(other.getTransformTypeCase())) return false;
+    switch (transformTypeCase_) {
+      case 2:
+        if (getSetToServerValueValue() != other.getSetToServerValueValue()) return false;
+        break;
+      case 3:
+        if (!getIncrement().equals(other.getIncrement())) return false;
+        break;
+      case 4:
+        if (!getMaximum().equals(other.getMaximum())) return false;
+        break;
+      case 5:
+        if (!getMinimum().equals(other.getMinimum())) return false;
+        break;
+      case 6:
+        if (!getAppendMissingElements().equals(other.getAppendMissingElements())) return false;
+        break;
+      case 7:
+        if (!getRemoveAllFromArray().equals(other.getRemoveAllFromArray())) return false;
+        break;
+      case 0:
+      default:
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PROPERTY_FIELD_NUMBER;
+    hash = (53 * hash) + getProperty().hashCode();
+    switch (transformTypeCase_) {
+      case 2:
+        hash = (37 * hash) + SET_TO_SERVER_VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + getSetToServerValueValue();
+        break;
+      case 3:
+        hash = (37 * hash) + INCREMENT_FIELD_NUMBER;
+        hash = (53 * hash) + getIncrement().hashCode();
+        break;
+      case 4:
+        hash = (37 * hash) + MAXIMUM_FIELD_NUMBER;
+        hash = (53 * hash) + getMaximum().hashCode();
+        break;
+      case 5:
+        hash = (37 * hash) + MINIMUM_FIELD_NUMBER;
+        hash = (53 * hash) + getMinimum().hashCode();
+        break;
+      case 6:
+        hash = (37 * hash) + APPEND_MISSING_ELEMENTS_FIELD_NUMBER;
+        hash = (53 * hash) + getAppendMissingElements().hashCode();
+        break;
+      case 7:
+        hash = (37 * hash) + REMOVE_ALL_FROM_ARRAY_FIELD_NUMBER;
+        hash = (53 * hash) + getRemoveAllFromArray().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.PropertyTransform parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.PropertyTransform prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * A transformation of an entity property.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.PropertyTransform}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyTransform)
+      com.google.datastore.v1.PropertyTransformOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_PropertyTransform_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.PropertyTransform.class,
+              com.google.datastore.v1.PropertyTransform.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.PropertyTransform.newBuilder()
+    private Builder() {}
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      property_ = "";
+      if (incrementBuilder_ != null) {
+        incrementBuilder_.clear();
+      }
+      if (maximumBuilder_ != null) {
+        maximumBuilder_.clear();
+      }
+      if (minimumBuilder_ != null) {
+        minimumBuilder_.clear();
+      }
+      if (appendMissingElementsBuilder_ != null) {
+        appendMissingElementsBuilder_.clear();
+      }
+      if (removeAllFromArrayBuilder_ != null) {
+        removeAllFromArrayBuilder_.clear();
+      }
+      transformTypeCase_ = 0;
+      transformType_ = null;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto
+          .internal_static_google_datastore_v1_PropertyTransform_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PropertyTransform getDefaultInstanceForType() {
+      return com.google.datastore.v1.PropertyTransform.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PropertyTransform build() {
+      com.google.datastore.v1.PropertyTransform result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.PropertyTransform buildPartial() {
+      com.google.datastore.v1.PropertyTransform result =
+          new com.google.datastore.v1.PropertyTransform(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      buildPartialOneofs(result);
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.PropertyTransform result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.property_ = property_;
+      }
+    }
+
+    private void buildPartialOneofs(com.google.datastore.v1.PropertyTransform result) {
+      result.transformTypeCase_ = transformTypeCase_;
+      result.transformType_ = this.transformType_;
+      if (transformTypeCase_ == 3 && incrementBuilder_ != null) {
+        result.transformType_ = incrementBuilder_.build();
+      }
+      if (transformTypeCase_ == 4 && maximumBuilder_ != null) {
+        result.transformType_ = maximumBuilder_.build();
+      }
+      if (transformTypeCase_ == 5 && minimumBuilder_ != null) {
+        result.transformType_ = minimumBuilder_.build();
+      }
+      if (transformTypeCase_ == 6 && appendMissingElementsBuilder_ != null) {
+        result.transformType_ = appendMissingElementsBuilder_.build();
+      }
+      if (transformTypeCase_ == 7 && removeAllFromArrayBuilder_ != null) {
+        result.transformType_ = removeAllFromArrayBuilder_.build();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.PropertyTransform) {
+        return mergeFrom((com.google.datastore.v1.PropertyTransform) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.PropertyTransform other) {
+      if (other == com.google.datastore.v1.PropertyTransform.getDefaultInstance()) return this;
+      if (!other.getProperty().isEmpty()) {
+        property_ = other.property_;
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
+      switch (other.getTransformTypeCase()) {
+        case SET_TO_SERVER_VALUE:
+          {
+            setSetToServerValueValue(other.getSetToServerValueValue());
+            break;
+          }
+        case INCREMENT:
+          {
+            mergeIncrement(other.getIncrement());
+            break;
+          }
+        case MAXIMUM:
+          {
+            mergeMaximum(other.getMaximum());
+            break;
+          }
+        case MINIMUM:
+          {
+            mergeMinimum(other.getMinimum());
+            break;
+          }
+        case APPEND_MISSING_ELEMENTS:
+          {
+            mergeAppendMissingElements(other.getAppendMissingElements());
+            break;
+          }
+        case REMOVE_ALL_FROM_ARRAY:
+          {
+            mergeRemoveAllFromArray(other.getRemoveAllFromArray());
+            break;
+          }
+        case TRANSFORMTYPE_NOT_SET:
+          {
+            break;
+          }
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                property_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+            case 16:
+              {
+                int rawValue = input.readEnum();
+                transformTypeCase_ = 2;
+                transformType_ = rawValue;
+                break;
+              } // case 16
+            case 26:
+              {
+                input.readMessage(getIncrementFieldBuilder().getBuilder(), extensionRegistry);
+                transformTypeCase_ = 3;
+                break;
+              } // case 26
+            case 34:
+              {
+                input.readMessage(getMaximumFieldBuilder().getBuilder(), extensionRegistry);
+                transformTypeCase_ = 4;
+                break;
+              } // case 34
+            case 42:
+              {
+                input.readMessage(getMinimumFieldBuilder().getBuilder(), extensionRegistry);
+                transformTypeCase_ = 5;
+                break;
+              } // case 42
+            case 50:
+              {
+                input.readMessage(
+                    getAppendMissingElementsFieldBuilder().getBuilder(), extensionRegistry);
+                transformTypeCase_ = 6;
+                break;
+              } // case 50
+            case 58:
+              {
+                input.readMessage(
+                    getRemoveAllFromArrayFieldBuilder().getBuilder(), extensionRegistry);
+                transformTypeCase_ = 7;
+                break;
+              } // case 58
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int transformTypeCase_ = 0;
+    private java.lang.Object transformType_;
+
+    public TransformTypeCase getTransformTypeCase() {
+      return TransformTypeCase.forNumber(transformTypeCase_);
+    }
+
+    public Builder clearTransformType() {
+      transformTypeCase_ = 0;
+      transformType_ = null;
+      onChanged();
+      return this;
+    }
+
+    private int bitField0_;
+
+    private java.lang.Object property_ = "";
+    /**
+     *
+     *
+     * 
    +     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     * 
    
+     *
+     * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The property.
+     */
+    public java.lang.String getProperty() {
+      java.lang.Object ref = property_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        property_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     * 
    
+     *
+     * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The bytes for property.
+     */
+    public com.google.protobuf.ByteString getPropertyBytes() {
+      java.lang.Object ref = property_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        property_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     * 
    
+     *
+     * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @param value The property to set.
+     * @return This builder for chaining.
+     */
+    public Builder setProperty(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      property_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     * 
    
+     *
+     * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearProperty() {
+      property_ = getDefaultInstance().getProperty();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     * 
    
+     *
+     * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @param value The bytes for property to set.
+     * @return This builder for chaining.
+     */
+    public Builder setPropertyBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      property_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the given server value.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+     *
+     * @return Whether the setToServerValue field is set.
+     */
+    @java.lang.Override
+    public boolean hasSetToServerValue() {
+      return transformTypeCase_ == 2;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the given server value.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+     *
+     * @return The enum numeric value on the wire for setToServerValue.
+     */
+    @java.lang.Override
+    public int getSetToServerValueValue() {
+      if (transformTypeCase_ == 2) {
+        return ((java.lang.Integer) transformType_).intValue();
+      }
+      return 0;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the given server value.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+     *
+     * @param value The enum numeric value on the wire for setToServerValue to set.
+     * @return This builder for chaining.
+     */
+    public Builder setSetToServerValueValue(int value) {
+      transformTypeCase_ = 2;
+      transformType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the given server value.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+     *
+     * @return The setToServerValue.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue() {
+      if (transformTypeCase_ == 2) {
+        com.google.datastore.v1.PropertyTransform.ServerValue result =
+            com.google.datastore.v1.PropertyTransform.ServerValue.forNumber(
+                (java.lang.Integer) transformType_);
+        return result == null
+            ? com.google.datastore.v1.PropertyTransform.ServerValue.UNRECOGNIZED
+            : result;
+      }
+      return com.google.datastore.v1.PropertyTransform.ServerValue.SERVER_VALUE_UNSPECIFIED;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the given server value.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+     *
+     * @param value The setToServerValue to set.
+     * @return This builder for chaining.
+     */
+    public Builder setSetToServerValue(
+        com.google.datastore.v1.PropertyTransform.ServerValue value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      transformTypeCase_ = 2;
+      transformType_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the given server value.
+     * 
    
+     *
+     * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearSetToServerValue() {
+      if (transformTypeCase_ == 2) {
+        transformTypeCase_ = 0;
+        transformType_ = null;
+        onChanged();
+      }
+      return this;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        incrementBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     *
+     * @return Whether the increment field is set.
+     */
+    @java.lang.Override
+    public boolean hasIncrement() {
+      return transformTypeCase_ == 3;
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     *
+     * @return The increment.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.Value getIncrement() {
+      if (incrementBuilder_ == null) {
+        if (transformTypeCase_ == 3) {
+          return (com.google.datastore.v1.Value) transformType_;
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      } else {
+        if (transformTypeCase_ == 3) {
+          return incrementBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     */
+    public Builder setIncrement(com.google.datastore.v1.Value value) {
+      if (incrementBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        transformType_ = value;
+        onChanged();
+      } else {
+        incrementBuilder_.setMessage(value);
+      }
+      transformTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     */
+    public Builder setIncrement(com.google.datastore.v1.Value.Builder builderForValue) {
+      if (incrementBuilder_ == null) {
+        transformType_ = builderForValue.build();
+        onChanged();
+      } else {
+        incrementBuilder_.setMessage(builderForValue.build());
+      }
+      transformTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     */
+    public Builder mergeIncrement(com.google.datastore.v1.Value value) {
+      if (incrementBuilder_ == null) {
+        if (transformTypeCase_ == 3
+            && transformType_ != com.google.datastore.v1.Value.getDefaultInstance()) {
+          transformType_ =
+              com.google.datastore.v1.Value.newBuilder(
+                      (com.google.datastore.v1.Value) transformType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          transformType_ = value;
+        }
+        onChanged();
+      } else {
+        if (transformTypeCase_ == 3) {
+          incrementBuilder_.mergeFrom(value);
+        } else {
+          incrementBuilder_.setMessage(value);
+        }
+      }
+      transformTypeCase_ = 3;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     */
+    public Builder clearIncrement() {
+      if (incrementBuilder_ == null) {
+        if (transformTypeCase_ == 3) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+          onChanged();
+        }
+      } else {
+        if (transformTypeCase_ == 3) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+        }
+        incrementBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     */
+    public com.google.datastore.v1.Value.Builder getIncrementBuilder() {
+      return getIncrementFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() {
+      if ((transformTypeCase_ == 3) && (incrementBuilder_ != null)) {
+        return incrementBuilder_.getMessageOrBuilder();
+      } else {
+        if (transformTypeCase_ == 3) {
+          return (com.google.datastore.v1.Value) transformType_;
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     * 
    
+     *
+     * .google.datastore.v1.Value increment = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        getIncrementFieldBuilder() {
+      if (incrementBuilder_ == null) {
+        if (!(transformTypeCase_ == 3)) {
+          transformType_ = com.google.datastore.v1.Value.getDefaultInstance();
+        }
+        incrementBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
+                (com.google.datastore.v1.Value) transformType_, getParentForChildren(), isClean());
+        transformType_ = null;
+      }
+      transformTypeCase_ = 3;
+      onChanged();
+      return incrementBuilder_;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        maximumBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     *
+     * @return Whether the maximum field is set.
+     */
+    @java.lang.Override
+    public boolean hasMaximum() {
+      return transformTypeCase_ == 4;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     *
+     * @return The maximum.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.Value getMaximum() {
+      if (maximumBuilder_ == null) {
+        if (transformTypeCase_ == 4) {
+          return (com.google.datastore.v1.Value) transformType_;
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      } else {
+        if (transformTypeCase_ == 4) {
+          return maximumBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     */
+    public Builder setMaximum(com.google.datastore.v1.Value value) {
+      if (maximumBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        transformType_ = value;
+        onChanged();
+      } else {
+        maximumBuilder_.setMessage(value);
+      }
+      transformTypeCase_ = 4;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     */
+    public Builder setMaximum(com.google.datastore.v1.Value.Builder builderForValue) {
+      if (maximumBuilder_ == null) {
+        transformType_ = builderForValue.build();
+        onChanged();
+      } else {
+        maximumBuilder_.setMessage(builderForValue.build());
+      }
+      transformTypeCase_ = 4;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     */
+    public Builder mergeMaximum(com.google.datastore.v1.Value value) {
+      if (maximumBuilder_ == null) {
+        if (transformTypeCase_ == 4
+            && transformType_ != com.google.datastore.v1.Value.getDefaultInstance()) {
+          transformType_ =
+              com.google.datastore.v1.Value.newBuilder(
+                      (com.google.datastore.v1.Value) transformType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          transformType_ = value;
+        }
+        onChanged();
+      } else {
+        if (transformTypeCase_ == 4) {
+          maximumBuilder_.mergeFrom(value);
+        } else {
+          maximumBuilder_.setMessage(value);
+        }
+      }
+      transformTypeCase_ = 4;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     */
+    public Builder clearMaximum() {
+      if (maximumBuilder_ == null) {
+        if (transformTypeCase_ == 4) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+          onChanged();
+        }
+      } else {
+        if (transformTypeCase_ == 4) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+        }
+        maximumBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     */
+    public com.google.datastore.v1.Value.Builder getMaximumBuilder() {
+      return getMaximumFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() {
+      if ((transformTypeCase_ == 4) && (maximumBuilder_ != null)) {
+        return maximumBuilder_.getMessageOrBuilder();
+      } else {
+        if (transformTypeCase_ == 4) {
+          return (com.google.datastore.v1.Value) transformType_;
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value maximum = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        getMaximumFieldBuilder() {
+      if (maximumBuilder_ == null) {
+        if (!(transformTypeCase_ == 4)) {
+          transformType_ = com.google.datastore.v1.Value.getDefaultInstance();
+        }
+        maximumBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
+                (com.google.datastore.v1.Value) transformType_, getParentForChildren(), isClean());
+        transformType_ = null;
+      }
+      transformTypeCase_ = 4;
+      onChanged();
+      return maximumBuilder_;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        minimumBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     *
+     * @return Whether the minimum field is set.
+     */
+    @java.lang.Override
+    public boolean hasMinimum() {
+      return transformTypeCase_ == 5;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     *
+     * @return The minimum.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.Value getMinimum() {
+      if (minimumBuilder_ == null) {
+        if (transformTypeCase_ == 5) {
+          return (com.google.datastore.v1.Value) transformType_;
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      } else {
+        if (transformTypeCase_ == 5) {
+          return minimumBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     */
+    public Builder setMinimum(com.google.datastore.v1.Value value) {
+      if (minimumBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        transformType_ = value;
+        onChanged();
+      } else {
+        minimumBuilder_.setMessage(value);
+      }
+      transformTypeCase_ = 5;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     */
+    public Builder setMinimum(com.google.datastore.v1.Value.Builder builderForValue) {
+      if (minimumBuilder_ == null) {
+        transformType_ = builderForValue.build();
+        onChanged();
+      } else {
+        minimumBuilder_.setMessage(builderForValue.build());
+      }
+      transformTypeCase_ = 5;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     */
+    public Builder mergeMinimum(com.google.datastore.v1.Value value) {
+      if (minimumBuilder_ == null) {
+        if (transformTypeCase_ == 5
+            && transformType_ != com.google.datastore.v1.Value.getDefaultInstance()) {
+          transformType_ =
+              com.google.datastore.v1.Value.newBuilder(
+                      (com.google.datastore.v1.Value) transformType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          transformType_ = value;
+        }
+        onChanged();
+      } else {
+        if (transformTypeCase_ == 5) {
+          minimumBuilder_.mergeFrom(value);
+        } else {
+          minimumBuilder_.setMessage(value);
+        }
+      }
+      transformTypeCase_ = 5;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     */
+    public Builder clearMinimum() {
+      if (minimumBuilder_ == null) {
+        if (transformTypeCase_ == 5) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+          onChanged();
+        }
+      } else {
+        if (transformTypeCase_ == 5) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+        }
+        minimumBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     */
+    public com.google.datastore.v1.Value.Builder getMinimumBuilder() {
+      return getMinimumFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() {
+      if ((transformTypeCase_ == 5) && (minimumBuilder_ != null)) {
+        return minimumBuilder_.getMessageOrBuilder();
+      } else {
+        if (transformTypeCase_ == 5) {
+          return (com.google.datastore.v1.Value) transformType_;
+        }
+        return com.google.datastore.v1.Value.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     * 
    
+     *
+     * .google.datastore.v1.Value minimum = 5;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        getMinimumFieldBuilder() {
+      if (minimumBuilder_ == null) {
+        if (!(transformTypeCase_ == 5)) {
+          transformType_ = com.google.datastore.v1.Value.getDefaultInstance();
+        }
+        minimumBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
+                (com.google.datastore.v1.Value) transformType_, getParentForChildren(), isClean());
+        transformType_ = null;
+      }
+      transformTypeCase_ = 5;
+      onChanged();
+      return minimumBuilder_;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ArrayValue,
+            com.google.datastore.v1.ArrayValue.Builder,
+            com.google.datastore.v1.ArrayValueOrBuilder>
+        appendMissingElementsBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     *
+     * @return Whether the appendMissingElements field is set.
+     */
+    @java.lang.Override
+    public boolean hasAppendMissingElements() {
+      return transformTypeCase_ == 6;
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     *
+     * @return The appendMissingElements.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.ArrayValue getAppendMissingElements() {
+      if (appendMissingElementsBuilder_ == null) {
+        if (transformTypeCase_ == 6) {
+          return (com.google.datastore.v1.ArrayValue) transformType_;
+        }
+        return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+      } else {
+        if (transformTypeCase_ == 6) {
+          return appendMissingElementsBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     */
+    public Builder setAppendMissingElements(com.google.datastore.v1.ArrayValue value) {
+      if (appendMissingElementsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        transformType_ = value;
+        onChanged();
+      } else {
+        appendMissingElementsBuilder_.setMessage(value);
+      }
+      transformTypeCase_ = 6;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     */
+    public Builder setAppendMissingElements(
+        com.google.datastore.v1.ArrayValue.Builder builderForValue) {
+      if (appendMissingElementsBuilder_ == null) {
+        transformType_ = builderForValue.build();
+        onChanged();
+      } else {
+        appendMissingElementsBuilder_.setMessage(builderForValue.build());
+      }
+      transformTypeCase_ = 6;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     */
+    public Builder mergeAppendMissingElements(com.google.datastore.v1.ArrayValue value) {
+      if (appendMissingElementsBuilder_ == null) {
+        if (transformTypeCase_ == 6
+            && transformType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) {
+          transformType_ =
+              com.google.datastore.v1.ArrayValue.newBuilder(
+                      (com.google.datastore.v1.ArrayValue) transformType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          transformType_ = value;
+        }
+        onChanged();
+      } else {
+        if (transformTypeCase_ == 6) {
+          appendMissingElementsBuilder_.mergeFrom(value);
+        } else {
+          appendMissingElementsBuilder_.setMessage(value);
+        }
+      }
+      transformTypeCase_ = 6;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     */
+    public Builder clearAppendMissingElements() {
+      if (appendMissingElementsBuilder_ == null) {
+        if (transformTypeCase_ == 6) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+          onChanged();
+        }
+      } else {
+        if (transformTypeCase_ == 6) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+        }
+        appendMissingElementsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     */
+    public com.google.datastore.v1.ArrayValue.Builder getAppendMissingElementsBuilder() {
+      return getAppendMissingElementsFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBuilder() {
+      if ((transformTypeCase_ == 6) && (appendMissingElementsBuilder_ != null)) {
+        return appendMissingElementsBuilder_.getMessageOrBuilder();
+      } else {
+        if (transformTypeCase_ == 6) {
+          return (com.google.datastore.v1.ArrayValue) transformType_;
+        }
+        return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ArrayValue,
+            com.google.datastore.v1.ArrayValue.Builder,
+            com.google.datastore.v1.ArrayValueOrBuilder>
+        getAppendMissingElementsFieldBuilder() {
+      if (appendMissingElementsBuilder_ == null) {
+        if (!(transformTypeCase_ == 6)) {
+          transformType_ = com.google.datastore.v1.ArrayValue.getDefaultInstance();
+        }
+        appendMissingElementsBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ArrayValue,
+                com.google.datastore.v1.ArrayValue.Builder,
+                com.google.datastore.v1.ArrayValueOrBuilder>(
+                (com.google.datastore.v1.ArrayValue) transformType_,
+                getParentForChildren(),
+                isClean());
+        transformType_ = null;
+      }
+      transformTypeCase_ = 6;
+      onChanged();
+      return appendMissingElementsBuilder_;
+    }
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ArrayValue,
+            com.google.datastore.v1.ArrayValue.Builder,
+            com.google.datastore.v1.ArrayValueOrBuilder>
+        removeAllFromArrayBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     *
+     * @return Whether the removeAllFromArray field is set.
+     */
+    @java.lang.Override
+    public boolean hasRemoveAllFromArray() {
+      return transformTypeCase_ == 7;
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     *
+     * @return The removeAllFromArray.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() {
+      if (removeAllFromArrayBuilder_ == null) {
+        if (transformTypeCase_ == 7) {
+          return (com.google.datastore.v1.ArrayValue) transformType_;
+        }
+        return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+      } else {
+        if (transformTypeCase_ == 7) {
+          return removeAllFromArrayBuilder_.getMessage();
+        }
+        return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     */
+    public Builder setRemoveAllFromArray(com.google.datastore.v1.ArrayValue value) {
+      if (removeAllFromArrayBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        transformType_ = value;
+        onChanged();
+      } else {
+        removeAllFromArrayBuilder_.setMessage(value);
+      }
+      transformTypeCase_ = 7;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     */
+    public Builder setRemoveAllFromArray(
+        com.google.datastore.v1.ArrayValue.Builder builderForValue) {
+      if (removeAllFromArrayBuilder_ == null) {
+        transformType_ = builderForValue.build();
+        onChanged();
+      } else {
+        removeAllFromArrayBuilder_.setMessage(builderForValue.build());
+      }
+      transformTypeCase_ = 7;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     */
+    public Builder mergeRemoveAllFromArray(com.google.datastore.v1.ArrayValue value) {
+      if (removeAllFromArrayBuilder_ == null) {
+        if (transformTypeCase_ == 7
+            && transformType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) {
+          transformType_ =
+              com.google.datastore.v1.ArrayValue.newBuilder(
+                      (com.google.datastore.v1.ArrayValue) transformType_)
+                  .mergeFrom(value)
+                  .buildPartial();
+        } else {
+          transformType_ = value;
+        }
+        onChanged();
+      } else {
+        if (transformTypeCase_ == 7) {
+          removeAllFromArrayBuilder_.mergeFrom(value);
+        } else {
+          removeAllFromArrayBuilder_.setMessage(value);
+        }
+      }
+      transformTypeCase_ = 7;
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     */
+    public Builder clearRemoveAllFromArray() {
+      if (removeAllFromArrayBuilder_ == null) {
+        if (transformTypeCase_ == 7) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+          onChanged();
+        }
+      } else {
+        if (transformTypeCase_ == 7) {
+          transformTypeCase_ = 0;
+          transformType_ = null;
+        }
+        removeAllFromArrayBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     */
+    public com.google.datastore.v1.ArrayValue.Builder getRemoveAllFromArrayBuilder() {
+      return getRemoveAllFromArrayFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilder() {
+      if ((transformTypeCase_ == 7) && (removeAllFromArrayBuilder_ != null)) {
+        return removeAllFromArrayBuilder_.getMessageOrBuilder();
+      } else {
+        if (transformTypeCase_ == 7) {
+          return (com.google.datastore.v1.ArrayValue) transformType_;
+        }
+        return com.google.datastore.v1.ArrayValue.getDefaultInstance();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     * 
    
+     *
+     * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ArrayValue,
+            com.google.datastore.v1.ArrayValue.Builder,
+            com.google.datastore.v1.ArrayValueOrBuilder>
+        getRemoveAllFromArrayFieldBuilder() {
+      if (removeAllFromArrayBuilder_ == null) {
+        if (!(transformTypeCase_ == 7)) {
+          transformType_ = com.google.datastore.v1.ArrayValue.getDefaultInstance();
+        }
+        removeAllFromArrayBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.ArrayValue,
+                com.google.datastore.v1.ArrayValue.Builder,
+                com.google.datastore.v1.ArrayValueOrBuilder>(
+                (com.google.datastore.v1.ArrayValue) transformType_,
+                getParentForChildren(),
+                isClean());
+        transformType_ = null;
+      }
+      transformTypeCase_ = 7;
+      onChanged();
+      return removeAllFromArrayBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyTransform)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyTransform)
+  private static final com.google.datastore.v1.PropertyTransform DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyTransform();
+  }
+
+  public static com.google.datastore.v1.PropertyTransform getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public PropertyTransform parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyTransform getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
new file mode 100644
index 000000000000..34782a859e46
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
@@ -0,0 +1,438 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/datastore.proto
+
+// Protobuf Java Version: 3.25.5
+package com.google.datastore.v1;
+
+public interface PropertyTransformOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyTransform)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   * 
    
+   *
+   * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The property.
+   */
+  java.lang.String getProperty();
+  /**
+   *
+   *
+   * 
    +   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   * 
    
+   *
+   * string property = 1 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The bytes for property.
+   */
+  com.google.protobuf.ByteString getPropertyBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the given server value.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+   *
+   * @return Whether the setToServerValue field is set.
+   */
+  boolean hasSetToServerValue();
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the given server value.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+   *
+   * @return The enum numeric value on the wire for setToServerValue.
+   */
+  int getSetToServerValueValue();
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the given server value.
+   * 
    
+   *
+   * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2;
+   *
+   * @return The setToServerValue.
+   */
+  com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue();
+
+  /**
+   *
+   *
+   * 
    +   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   * 
    
+   *
+   * .google.datastore.v1.Value increment = 3;
+   *
+   * @return Whether the increment field is set.
+   */
+  boolean hasIncrement();
+  /**
+   *
+   *
+   * 
    +   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   * 
    
+   *
+   * .google.datastore.v1.Value increment = 3;
+   *
+   * @return The increment.
+   */
+  com.google.datastore.v1.Value getIncrement();
+  /**
+   *
+   *
+   * 
    +   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   * 
    
+   *
+   * .google.datastore.v1.Value increment = 3;
+   */
+  com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value maximum = 4;
+   *
+   * @return Whether the maximum field is set.
+   */
+  boolean hasMaximum();
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value maximum = 4;
+   *
+   * @return The maximum.
+   */
+  com.google.datastore.v1.Value getMaximum();
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value maximum = 4;
+   */
+  com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value minimum = 5;
+   *
+   * @return Whether the minimum field is set.
+   */
+  boolean hasMinimum();
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value minimum = 5;
+   *
+   * @return The minimum.
+   */
+  com.google.datastore.v1.Value getMinimum();
+  /**
+   *
+   *
+   * 
    +   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   * 
    
+   *
+   * .google.datastore.v1.Value minimum = 5;
+   */
+  com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+   *
+   * @return Whether the appendMissingElements field is set.
+   */
+  boolean hasAppendMissingElements();
+  /**
+   *
+   *
+   * 
    +   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+   *
+   * @return The appendMissingElements.
+   */
+  com.google.datastore.v1.ArrayValue getAppendMissingElements();
+  /**
+   *
+   *
+   * 
    +   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue append_missing_elements = 6;
+   */
+  com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+   *
+   * @return Whether the removeAllFromArray field is set.
+   */
+  boolean hasRemoveAllFromArray();
+  /**
+   *
+   *
+   * 
    +   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+   *
+   * @return The removeAllFromArray.
+   */
+  com.google.datastore.v1.ArrayValue getRemoveAllFromArray();
+  /**
+   *
+   *
+   * 
    +   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   * 
    
+   *
+   * .google.datastore.v1.ArrayValue remove_all_from_array = 7;
+   */
+  com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilder();
+
+  com.google.datastore.v1.PropertyTransform.TransformTypeCase getTransformTypeCase();
+}
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 9c44501af274..c0683b9ba191 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
@@ -501,6 +501,18 @@ message ReserveIdsResponse {}
 
 // A mutation to apply to an entity.
 message Mutation {
+  // The possible ways to resolve a conflict detected in a mutation.
+  enum ConflictResolutionStrategy {
+    // Unspecified. Defaults to `SERVER_VALUE`.
+    STRATEGY_UNSPECIFIED = 0;
+
+    // The server entity is kept.
+    SERVER_VALUE = 1;
+
+    // The whole commit request fails.
+    FAIL = 3;
+  }
+
   // The mutation operation.
   //
   // For `insert`, `update`, and `upsert`:
@@ -542,6 +554,11 @@ message Mutation {
     google.protobuf.Timestamp update_time = 11;
   }
 
+  // The strategy to use when a conflict is detected. Defaults to
+  // `SERVER_VALUE`.
+  // If this is set, then `conflict_detection_strategy` must also be set.
+  ConflictResolutionStrategy conflict_resolution_strategy = 10;
+
   // The properties to write in this mutation.
   // None of the properties in the mask may have a reserved name, except for
   // `__key__`.
@@ -551,6 +568,112 @@ message Mutation {
   // updated, others are left untouched.
   // Properties referenced in the mask but not in the entity are deleted.
   PropertyMask property_mask = 9;
+
+  // Optional. The transforms to perform on the entity.
+  //
+  // This field can be set only when the operation is `insert`, `update`,
+  // or `upsert`. If present, the transforms are be applied to the entity
+  // regardless of the property mask, in order, after the operation.
+  repeated PropertyTransform property_transforms = 12
+      [(google.api.field_behavior) = OPTIONAL];
+}
+
+// A transformation of an entity property.
+message PropertyTransform {
+  // A value that is calculated by the server.
+  enum ServerValue {
+    // Unspecified. This value must not be used.
+    SERVER_VALUE_UNSPECIFIED = 0;
+
+    // The time at which the server processed the request, with millisecond
+    // precision. If used on multiple properties (same or different entities)
+    // in a transaction, all the properties will get the same server timestamp.
+    REQUEST_TIME = 1;
+  }
+
+  // Optional. The name of the property.
+  //
+  // Property paths (a list of property names separated by dots (`.`)) may be
+  // used to refer to properties inside entity values. For example `foo.bar`
+  // means the property `bar` inside the entity property `foo`.
+  //
+  // If a property name contains a dot `.` or a backlslash `\`, then that name
+  // must be escaped.
+  string property = 1 [(google.api.field_behavior) = OPTIONAL];
+
+  // The transformation to apply to the property.
+  oneof transform_type {
+    // Sets the property to the given server value.
+    ServerValue set_to_server_value = 2;
+
+    // Adds the given value to the property's current value.
+    //
+    // This must be an integer or a double value.
+    // If the property is not an integer or double, or if the property does not
+    // yet exist, the transformation will set the property to the given value.
+    // If either of the given value or the current property value are doubles,
+    // both values will be interpreted as doubles. Double arithmetic and
+    // representation of double values follows IEEE 754 semantics.
+    // If there is positive/negative integer overflow, the property is resolved
+    // to the largest magnitude positive/negative integer.
+    Value increment = 3;
+
+    // Sets the property to the maximum of its current value and the given
+    // value.
+    //
+    // This must be an integer or a double value.
+    // If the property is not an integer or double, or if the property does not
+    // yet exist, the transformation will set the property to the given value.
+    // If a maximum operation is applied where the property and the input value
+    // are of mixed types (that is - one is an integer and one is a double)
+    // the property takes on the type of the larger operand. If the operands are
+    // equivalent (e.g. 3 and 3.0), the property does not change.
+    // 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+    // zero input value is always the stored value.
+    // The maximum of any numeric value x and NaN is NaN.
+    Value maximum = 4;
+
+    // Sets the property to the minimum of its current value and the given
+    // value.
+    //
+    // This must be an integer or a double value.
+    // If the property is not an integer or double, or if the property does not
+    // yet exist, the transformation will set the property to the input value.
+    // If a minimum operation is applied where the property and the input value
+    // are of mixed types (that is - one is an integer and one is a double)
+    // the property takes on the type of the smaller operand. If the operands
+    // are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+    // and -0.0 are all zero. The minimum of a zero stored value and zero input
+    // value is always the stored value. The minimum of any numeric value x and
+    // NaN is NaN.
+    Value minimum = 5;
+
+    // Appends the given elements in order if they are not already present in
+    // the current property value.
+    // If the property is not an array, or if the property does not yet exist,
+    // it is first set to the empty array.
+    //
+    // Equivalent numbers of different types (e.g. 3L and 3.0) are
+    // considered equal when checking if a value is missing.
+    // NaN is equal to NaN, and the null value is equal to the null value.
+    // If the input contains multiple equivalent values, only the first will
+    // be considered.
+    //
+    // The corresponding transform result will be the null value.
+    ArrayValue append_missing_elements = 6;
+
+    // Removes all of the given elements from the array in the property.
+    // If the property is not an array, or if the property does not yet exist,
+    // it is set to the empty array.
+    //
+    // Equivalent numbers of different types (e.g. 3L and 3.0) are
+    // considered equal when deciding whether an element should be removed.
+    // NaN is equal to NaN, and the null value is equal to the null value.
+    // This will remove all equivalent values if there are duplicates.
+    //
+    // The corresponding transform result will be the null value.
+    ArrayValue remove_all_from_array = 7;
+  }
 }
 
 // The result of applying a mutation.
@@ -578,6 +701,11 @@ message MutationResult {
   // Whether a conflict was detected for this mutation. Always false when a
   // conflict detection strategy field is not set in the mutation.
   bool conflict_detected = 5;
+
+  // The results of applying each
+  // [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+  // order of the request.
+  repeated Value transform_results = 8;
 }
 
 // The set of arbitrarily nested property paths used to restrict an operation to
@@ -611,16 +739,13 @@ message ReadOptions {
     EVENTUAL = 2;
   }
 
-  // For Cloud Datastore, if read_consistency is not specified, then lookups and
-  // ancestor queries default to `read_consistency`=`STRONG`, global queries
-  // default to `read_consistency`=`EVENTUAL`.
-  //
-  // For Cloud Firestore in Datastore mode, if read_consistency is not specified
-  // then lookups and all queries default to `read_consistency`=`STRONG`.
+  // For Cloud Firestore in Datastore mode, if you don't specify
+  // read_consistency then all lookups and queries default to
+  // `read_consistency`=`STRONG`. Note that, in Cloud Datastore, global queries
+  // defaulted to `read_consistency`=`EVENTUAL`.
   //
   // Explicitly setting `read_consistency`=`EVENTUAL` will result in eventually
-  // consistent lookups & queries in both Cloud Datastore & Cloud Firestore in
-  // Datastore mode.
+  // consistent lookups and queries.
   oneof consistency_type {
     // The non-transactional read consistency to use.
     ReadConsistency read_consistency = 1;
diff --git a/renovate.json b/renovate.json
index 5862088529e6..b3314f4b2e6f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -41,6 +41,16 @@
       ],
       "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
       "datasourceTemplate": "maven"
+    },
+    {
+      "fileMatch": [
+        "^.github/workflows/hermetic_library_generation.yaml$"
+      ],
+      "matchStrings": [
+        "uses: googleapis/sdk-platform-java/.github/scripts@v(?.+?)\\n"
+      ],
+      "depNameTemplate": "com.google.api:gapic-generator-java",
+      "datasourceTemplate": "maven"
     }
   ],
   "packageRules": [
@@ -101,6 +111,13 @@
         "^com.fasterxml.jackson.core"
       ],
       "groupName": "jackson dependencies"
+    },
+    {
+      "matchPackagePatterns": [
+        "^com.google.api:gapic-generator-java",
+        "^com.google.cloud:sdk-platform-java-config"
+      ],
+      "groupName": "SDK platform Java dependencies"
     }
   ],
   "semanticCommits": true,

From 6eaff23f9de25ae6ad2a4fea67c0b65a243c08fd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 14 Oct 2024 18:57:04 +0200
Subject: [PATCH 1468/1784] deps: update sdk platform java dependencies (#1617)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 .github/workflows/unmanaged_dependency_check.yaml  | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native.cfg               | 2 +-
 google-cloud-datastore-bom/pom.xml                 | 2 +-
 pom.xml                                            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 4caa5567a3e4..9399ebef235b 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.46.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.47.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index aabf59292d7d..8e4ccadbdda5 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.37.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index b39cf017dac6..5cb66b4fe8c0 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.37.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index c59887969bc7..11c4b309b42c 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.37.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4c3ab17bb47c..f76a7993b375 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.36.1
+    3.37.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index a90b44f5e7c3..5ba61348b9eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.36.1
+    3.37.0
   
 
   

From fee3f7c52fdc3b9757c04b8dd6136600771319e1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:57:28 -0400
Subject: [PATCH 1469/1784] chore(main): release 2.22.1-SNAPSHOT (#1606)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 34c4d947519b..4c2b1c674975 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -19,12 +19,12 @@
   4.0.0
   com.google.cloud.datastore
   datastore-v1-proto-client
-  2.22.0
+  2.22.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.0
+    2.22.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f76a7993b375..7abe271563b5 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-datastore-bom
-  2.22.0
+  2.22.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.22.0
+        2.22.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.22.0
+        2.22.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.113.0
+        0.113.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.22.0
+        2.22.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9e91f9ca56da..47aa880ccb28 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.22.0
+  2.22.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.0
+    2.22.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 966e0c054bb1..44114db73593 100644
--- a/grpc-google-cloud-datastore-admin-v1/pom.xml
+++ b/grpc-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-admin-v1
-  2.22.0
+  2.22.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.0
+    2.22.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 5ba61348b9eb..e869e58fd81d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.22.0
+  2.22.1-SNAPSHOT
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.22.0
+        2.22.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.22.0
+        2.22.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.22.0
+        2.22.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.113.0
+        0.113.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.22.0
+        2.22.1-SNAPSHOT
         
           
             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 9d3256b3f342..560cad9d1325 100644
--- a/proto-google-cloud-datastore-admin-v1/pom.xml
+++ b/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-admin-v1
-  2.22.0
+  2.22.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.0
+    2.22.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2e34da3af9cd..03f4a7eb2793 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-v1
-  0.113.0
+  0.113.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.0
+    2.22.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 973390f5d93e..ca12a5f14d81 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.22.0
+      2.22.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 191d0abf12ab..73e85b1edb47 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.22.0:2.22.0
-google-cloud-datastore-bom:2.22.0:2.22.0
-proto-google-cloud-datastore-v1:0.113.0:0.113.0
-datastore-v1-proto-client:2.22.0:2.22.0
-proto-google-cloud-datastore-admin-v1:2.22.0:2.22.0
-grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.0
+google-cloud-datastore:2.22.0:2.22.1-SNAPSHOT
+google-cloud-datastore-bom:2.22.0:2.22.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.113.0:0.113.1-SNAPSHOT
+datastore-v1-proto-client:2.22.0:2.22.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT

From e15bb0559b40f49fb42b291ddaab347f9049920d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:17:20 -0700
Subject: [PATCH 1470/1784] chore(main): release 2.23.0 (#1622)

* chore(main): release 2.23.0

* chore: generate libraries at Mon Oct 14 16:58:14 UTC 2024

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                   | 18 ++++++++++++++++++
 README.md                                      |  8 +++-----
 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 ++--
 samples/snapshot/pom.xml                       |  2 +-
 .../filters/IndexingConsiderationQuery.java    | 10 +++++-----
 .../datastore/filters/OrderFieldsQuery.java    | 11 +++++------
 .../filters/MultiIneqQuerySampleIT.java        | 12 +++++++-----
 versions.txt                                   | 12 ++++++------
 14 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2670cb02680..34aeb6370fb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.23.0](https://github.com/googleapis/java-datastore/compare/v2.22.0...v2.23.0) (2024-10-14)
+
+
+### Features
+
+* Support for field update operators in the Datastore API and resolution strategies when there is a conflict at write time ([b299266](https://github.com/googleapis/java-datastore/commit/b299266e42037b731ee7bbba21dbded73a37323c))
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.46.1 ([678eee2](https://github.com/googleapis/java-datastore/commit/678eee2dfb6d447a852edd436137f8ebfbe50d74))
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.47.0 ([b299266](https://github.com/googleapis/java-datastore/commit/b299266e42037b731ee7bbba21dbded73a37323c))
+
+
+### Dependencies
+
+* Update sdk platform java dependencies ([#1617](https://github.com/googleapis/java-datastore/issues/1617)) ([6eaff23](https://github.com/googleapis/java-datastore/commit/6eaff23f9de25ae6ad2a4fea67c0b65a243c08fd))
+
 ## [2.22.0](https://github.com/googleapis/java-datastore/compare/v2.21.3...v2.22.0) (2024-09-26)
 
 
diff --git a/README.md b/README.md
index d5e61c715376..e76f6832bf56 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
 If you are using Maven without the BOM, add this to your dependencies:
 
-
 
 ```xml
 
@@ -57,15 +56,14 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.22.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.23.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.22.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.23.0"
 ```
-
 
 ## Authentication
 
@@ -481,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.22.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.23.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4c2b1c674975..723d37a51b1d 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -19,12 +19,12 @@
   4.0.0
   com.google.cloud.datastore
   datastore-v1-proto-client
-  2.22.1-SNAPSHOT
+  2.23.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.1-SNAPSHOT
+    2.23.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7abe271563b5..6cfeb40e221c 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-datastore-bom
-  2.22.1-SNAPSHOT
+  2.23.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.22.1-SNAPSHOT
+        2.23.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.22.1-SNAPSHOT
+        2.23.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.113.1-SNAPSHOT
+        0.114.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.22.1-SNAPSHOT
+        2.23.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 47aa880ccb28..3c860788797f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.22.1-SNAPSHOT
+  2.23.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.1-SNAPSHOT
+    2.23.0
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 44114db73593..ad06274a93e7 100644
--- a/grpc-google-cloud-datastore-admin-v1/pom.xml
+++ b/grpc-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-admin-v1
-  2.22.1-SNAPSHOT
+  2.23.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.1-SNAPSHOT
+    2.23.0
   
   
     
diff --git a/pom.xml b/pom.xml
index e869e58fd81d..665933af646f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.22.1-SNAPSHOT
+  2.23.0
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -159,27 +159,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.22.1-SNAPSHOT
+        2.23.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.22.1-SNAPSHOT
+        2.23.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.22.1-SNAPSHOT
+        2.23.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.113.1-SNAPSHOT
+        0.114.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.22.1-SNAPSHOT
+        2.23.0
         
           
             com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index 560cad9d1325..4d4da04db71c 100644
--- a/proto-google-cloud-datastore-admin-v1/pom.xml
+++ b/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-admin-v1
-  2.22.1-SNAPSHOT
+  2.23.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.1-SNAPSHOT
+    2.23.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 03f4a7eb2793..d4bda3ee4e3b 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-datastore-v1
-  0.113.1-SNAPSHOT
+  0.114.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.22.1-SNAPSHOT
+    2.23.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ca12a5f14d81..4da3f232bf63 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.22.1-SNAPSHOT
+      2.23.0
     
     
 
diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
index f0c9cd5da474..90a94014c5f0 100644
--- a/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
+++ b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
@@ -29,7 +29,6 @@
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
-import com.google.cloud.datastore.StructuredQuery.Filter;
 import com.google.cloud.datastore.StructuredQuery.OrderBy;
 import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
 
@@ -40,11 +39,12 @@ public static void invoke() throws Exception {
     Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
 
     // Build a query with multi inequal filters and optimized index order of index properties.
-    Query query = Query.newEntityQueryBuilder()
+    Query query =
+        Query.newEntityQueryBuilder()
             .setKind("employees")
-            .setFilter(CompositeFilter.and(
-                    PropertyFilter.gt("salary", 100000),
-                    PropertyFilter.gt("experience", 0)))
+            .setFilter(
+                CompositeFilter.and(
+                    PropertyFilter.gt("salary", 100000), PropertyFilter.gt("experience", 0)))
             .setOrderBy(OrderBy.asc("salary"), OrderBy.asc("experience"))
             .build();
 
diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
index 1739dbade76d..24fc7901c7e8 100644
--- a/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
+++ b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
@@ -28,7 +28,6 @@
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.QueryResults;
-import com.google.cloud.datastore.StructuredQuery.Filter;
 import com.google.cloud.datastore.StructuredQuery.OrderBy;
 import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
 
@@ -40,11 +39,11 @@ public static void invoke() throws Exception {
 
     // Build a query with order properties in the decreasing order of query constraint selectivity.
     Query query =
-            Query.newEntityQueryBuilder()
-                    .setKind("employees")
-                    .setFilter(PropertyFilter.gt("salary", 100000))
-                    .setOrderBy(OrderBy.asc("salary"))
-                    .build();
+        Query.newEntityQueryBuilder()
+            .setKind("employees")
+            .setFilter(PropertyFilter.gt("salary", 100000))
+            .setOrderBy(OrderBy.asc("salary"))
+            .build();
 
     // Get the results back from Datastore
     QueryResults results = datastore.run(query);
diff --git a/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
index 6fee2a8064c7..8e3fa4c10554 100644
--- a/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
+++ b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
@@ -38,27 +38,29 @@ public class MultiIneqQuerySampleIT {
   private Key employeeKey2;
   private Key employeeKey3;
 
-  @Rule
-  public final SystemsOutRule systemsOutRule = new SystemsOutRule();
+  @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule();
 
   @Before
   public void setUp() {
     employeeKey1 = datastore.newKeyFactory().setKind("employees").newKey("employee1");
-    Entity employee1 = Entity.newBuilder(employeeKey1)
+    Entity employee1 =
+        Entity.newBuilder(employeeKey1)
             .set("name", "Alice")
             .set("salary", 100001)
             .set("experience", 10)
             .build();
 
     employeeKey2 = datastore.newKeyFactory().setKind("employees").newKey("employee2");
-    Entity employee2 = Entity.newBuilder(employeeKey2)
+    Entity employee2 =
+        Entity.newBuilder(employeeKey2)
             .set("name", "Bob")
             .set("salary", 90000)
             .set("experience", 5)
             .build();
 
     employeeKey3 = datastore.newKeyFactory().setKind("employees").newKey("employee3");
-    Entity employee3 = Entity.newBuilder(employeeKey3)
+    Entity employee3 =
+        Entity.newBuilder(employeeKey3)
             .set("name", "Jay")
             .set("salary", 120000)
             .set("experience", 15)
diff --git a/versions.txt b/versions.txt
index 73e85b1edb47..666cbda4ee95 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.22.0:2.22.1-SNAPSHOT
-google-cloud-datastore-bom:2.22.0:2.22.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.113.0:0.113.1-SNAPSHOT
-datastore-v1-proto-client:2.22.0:2.22.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT
+google-cloud-datastore:2.23.0:2.23.0
+google-cloud-datastore-bom:2.23.0:2.23.0
+proto-google-cloud-datastore-v1:0.114.0:0.114.0
+datastore-v1-proto-client:2.23.0:2.23.0
+proto-google-cloud-datastore-admin-v1:2.23.0:2.23.0
+grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.0

From 3512ba2f1bcd358e3c39c36944e05873b3f25f51 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:29:28 -0400
Subject: [PATCH 1471/1784] chore: Update generation configuration at Tue Oct
 15 02:24:25 UTC 2024 (#1618)

* chore: Update generation configuration at Thu Oct 10 02:23:46 UTC 2024

* chore: Update generation configuration at Fri Oct 11 02:23:15 UTC 2024

* chore: generate libraries at Fri Oct 11 02:23:38 UTC 2024

* chore: Update generation configuration at Sat Oct 12 02:21:27 UTC 2024

* chore: generate libraries at Sat Oct 12 02:21:51 UTC 2024

* chore: Update generation configuration at Sun Oct 13 02:25:36 UTC 2024

* chore: Update generation configuration at Tue Oct 15 02:24:25 UTC 2024
---
 generation_config.yaml                        |    2 +-
 .../com/google/datastore/v1/FindNearest.java  | 2272 +++++++++++++++++
 .../datastore/v1/FindNearestOrBuilder.java    |  269 ++
 .../java/com/google/datastore/v1/Query.java   |  359 +++
 .../google/datastore/v1/QueryOrBuilder.java   |   53 +
 .../com/google/datastore/v1/QueryProto.java   |  181 +-
 .../proto/google/datastore/v1/query.proto     |   80 +
 7 files changed, 3140 insertions(+), 76 deletions(-)
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
 create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java

diff --git a/generation_config.yaml b/generation_config.yaml
index 44eb5d8aaa5c..3e00e550d211 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.47.0
-googleapis_commitish: 8692273ae7e0ef95d264e1bb8bcb900fa950674f
+googleapis_commitish: f78cd2f7943b9a2eb9734e56a8f3428da75917e2
 libraries_bom_version: 26.48.0
 libraries:
   - api_shortname: datastore
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
new file mode 100644
index 000000000000..999b5b1f2854
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
@@ -0,0 +1,2272 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query.proto
+
+// Protobuf Java Version: 3.25.5
+package com.google.datastore.v1;
+
+/**
+ *
+ *
+ * 
    + * Nearest Neighbors search config. The ordering provided by FindNearest
+ * supersedes the order_by stage. If multiple documents have the same vector
+ * distance, the returned document order is not guaranteed to be stable between
+ * queries.
+ * 
    
+ *
+ * Protobuf type {@code google.datastore.v1.FindNearest}
+ */
+public final class FindNearest extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.datastore.v1.FindNearest)
+    FindNearestOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use FindNearest.newBuilder() to construct.
+  private FindNearest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+
+  private FindNearest() {
+    distanceMeasure_ = 0;
+    distanceResultProperty_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new FindNearest();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_FindNearest_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.datastore.v1.QueryProto
+        .internal_static_google_datastore_v1_FindNearest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.datastore.v1.FindNearest.class,
+            com.google.datastore.v1.FindNearest.Builder.class);
+  }
+
+  /**
+   *
+   *
+   * 
    +   * The distance measure to use when comparing vectors.
+   * 
    
+   *
+   * Protobuf enum {@code google.datastore.v1.FindNearest.DistanceMeasure}
+   */
+  public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     *
+     *
+     * 
    +     * Should not be set.
+     * 
    
+     *
+     * DISTANCE_MEASURE_UNSPECIFIED = 0;
+     */
+    DISTANCE_MEASURE_UNSPECIFIED(0),
+    /**
+     *
+     *
+     * 
    +     * Measures the EUCLIDEAN distance between the vectors. See
+     * [Euclidean](https://en.wikipedia.org/wiki/Euclidean_distance) to learn
+     * more. The resulting distance decreases the more similar two vectors are.
+     * 
    
+     *
+     * EUCLIDEAN = 1;
+     */
+    EUCLIDEAN(1),
+    /**
+     *
+     *
+     * 
    +     * COSINE distance compares vectors based on the angle between them, which
+     * allows you to measure similarity that isn't based on the vectors
+     * magnitude. We recommend using DOT_PRODUCT with unit normalized vectors
+     * instead of COSINE distance, which is mathematically equivalent with
+     * better performance. See [Cosine
+     * Similarity](https://en.wikipedia.org/wiki/Cosine_similarity) to learn
+     * more about COSINE similarity and COSINE distance. The resulting COSINE
+     * distance decreases the more similar two vectors are.
+     * 
    
+     *
+     * COSINE = 2;
+     */
+    COSINE(2),
+    /**
+     *
+     *
+     * 
    +     * Similar to cosine but is affected by the magnitude of the vectors. See
+     * [Dot Product](https://en.wikipedia.org/wiki/Dot_product) to learn more.
+     * The resulting distance increases the more similar two vectors are.
+     * 
    
+     *
+     * DOT_PRODUCT = 3;
+     */
+    DOT_PRODUCT(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     *
+     *
+     * 
    +     * Should not be set.
+     * 
    
+     *
+     * DISTANCE_MEASURE_UNSPECIFIED = 0;
+     */
+    public static final int DISTANCE_MEASURE_UNSPECIFIED_VALUE = 0;
+    /**
+     *
+     *
+     * 
    +     * Measures the EUCLIDEAN distance between the vectors. See
+     * [Euclidean](https://en.wikipedia.org/wiki/Euclidean_distance) to learn
+     * more. The resulting distance decreases the more similar two vectors are.
+     * 
    
+     *
+     * EUCLIDEAN = 1;
+     */
+    public static final int EUCLIDEAN_VALUE = 1;
+    /**
+     *
+     *
+     * 
    +     * COSINE distance compares vectors based on the angle between them, which
+     * allows you to measure similarity that isn't based on the vectors
+     * magnitude. We recommend using DOT_PRODUCT with unit normalized vectors
+     * instead of COSINE distance, which is mathematically equivalent with
+     * better performance. See [Cosine
+     * Similarity](https://en.wikipedia.org/wiki/Cosine_similarity) to learn
+     * more about COSINE similarity and COSINE distance. The resulting COSINE
+     * distance decreases the more similar two vectors are.
+     * 
    
+     *
+     * COSINE = 2;
+     */
+    public static final int COSINE_VALUE = 2;
+    /**
+     *
+     *
+     * 
    +     * Similar to cosine but is affected by the magnitude of the vectors. See
+     * [Dot Product](https://en.wikipedia.org/wiki/Dot_product) to learn more.
+     * The resulting distance increases the more similar two vectors are.
+     * 
    
+     *
+     * DOT_PRODUCT = 3;
+     */
+    public static final int DOT_PRODUCT_VALUE = 3;
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static DistanceMeasure valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static DistanceMeasure forNumber(int value) {
+      switch (value) {
+        case 0:
+          return DISTANCE_MEASURE_UNSPECIFIED;
+        case 1:
+          return EUCLIDEAN;
+        case 2:
+          return COSINE;
+        case 3:
+          return DOT_PRODUCT;
+        default:
+          return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+      return internalValueMap;
+    }
+
+    private static final com.google.protobuf.Internal.EnumLiteMap
+        internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap() {
+              public DistanceMeasure findValueByNumber(int number) {
+                return DistanceMeasure.forNumber(number);
+              }
+            };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+
+    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+      return getDescriptor();
+    }
+
+    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+      return com.google.datastore.v1.FindNearest.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final DistanceMeasure[] VALUES = values();
+
+    public static DistanceMeasure valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private DistanceMeasure(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.datastore.v1.FindNearest.DistanceMeasure)
+  }
+
+  private int bitField0_;
+  public static final int VECTOR_PROPERTY_FIELD_NUMBER = 1;
+  private com.google.datastore.v1.PropertyReference vectorProperty_;
+  /**
+   *
+   *
+   * 
    +   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return Whether the vectorProperty field is set.
+   */
+  @java.lang.Override
+  public boolean hasVectorProperty() {
+    return ((bitField0_ & 0x00000001) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The vectorProperty.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyReference getVectorProperty() {
+    return vectorProperty_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : vectorProperty_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBuilder() {
+    return vectorProperty_ == null
+        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+        : vectorProperty_;
+  }
+
+  public static final int QUERY_VECTOR_FIELD_NUMBER = 2;
+  private com.google.datastore.v1.Value queryVector_;
+  /**
+   *
+   *
+   * 
    +   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   * 
    
+   *
+   * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return Whether the queryVector field is set.
+   */
+  @java.lang.Override
+  public boolean hasQueryVector() {
+    return ((bitField0_ & 0x00000002) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   * 
    
+   *
+   * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The queryVector.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.Value getQueryVector() {
+    return queryVector_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : queryVector_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   * 
    
+   *
+   * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() {
+    return queryVector_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : queryVector_;
+  }
+
+  public static final int DISTANCE_MEASURE_FIELD_NUMBER = 3;
+  private int distanceMeasure_ = 0;
+  /**
+   *
+   *
+   * 
    +   * Required. The Distance Measure to use, required.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The enum numeric value on the wire for distanceMeasure.
+   */
+  @java.lang.Override
+  public int getDistanceMeasureValue() {
+    return distanceMeasure_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The Distance Measure to use, required.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The distanceMeasure.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure() {
+    com.google.datastore.v1.FindNearest.DistanceMeasure result =
+        com.google.datastore.v1.FindNearest.DistanceMeasure.forNumber(distanceMeasure_);
+    return result == null
+        ? com.google.datastore.v1.FindNearest.DistanceMeasure.UNRECOGNIZED
+        : result;
+  }
+
+  public static final int LIMIT_FIELD_NUMBER = 4;
+  private com.google.protobuf.Int32Value limit_;
+  /**
+   *
+   *
+   * 
    +   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   * 
    
+   *
+   * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return Whether the limit field is set.
+   */
+  @java.lang.Override
+  public boolean hasLimit() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   * 
    
+   *
+   * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The limit.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Int32Value getLimit() {
+    return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   * 
    
+   *
+   * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+   */
+  @java.lang.Override
+  public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
+    return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
+  }
+
+  public static final int DISTANCE_RESULT_PROPERTY_FIELD_NUMBER = 5;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object distanceResultProperty_ = "";
+  /**
+   *
+   *
+   * 
    +   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   * 
    
+   *
+   * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The distanceResultProperty.
+   */
+  @java.lang.Override
+  public java.lang.String getDistanceResultProperty() {
+    java.lang.Object ref = distanceResultProperty_;
+    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();
+      distanceResultProperty_ = s;
+      return s;
+    }
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   * 
    
+   *
+   * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The bytes for distanceResultProperty.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString getDistanceResultPropertyBytes() {
+    java.lang.Object ref = distanceResultProperty_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      distanceResultProperty_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int DISTANCE_THRESHOLD_FIELD_NUMBER = 6;
+  private com.google.protobuf.DoubleValue distanceThreshold_;
+  /**
+   *
+   *
+   * 
    +   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   * 
    
+   *
+   * 
+   * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the distanceThreshold field is set.
+   */
+  @java.lang.Override
+  public boolean hasDistanceThreshold() {
+    return ((bitField0_ & 0x00000008) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   * 
    
+   *
+   * 
+   * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The distanceThreshold.
+   */
+  @java.lang.Override
+  public com.google.protobuf.DoubleValue getDistanceThreshold() {
+    return distanceThreshold_ == null
+        ? com.google.protobuf.DoubleValue.getDefaultInstance()
+        : distanceThreshold_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   * 
    
+   *
+   * 
+   * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder() {
+    return distanceThreshold_ == null
+        ? com.google.protobuf.DoubleValue.getDefaultInstance()
+        : distanceThreshold_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    if (((bitField0_ & 0x00000001) != 0)) {
+      output.writeMessage(1, getVectorProperty());
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      output.writeMessage(2, getQueryVector());
+    }
+    if (distanceMeasure_
+        != com.google.datastore.v1.FindNearest.DistanceMeasure.DISTANCE_MEASURE_UNSPECIFIED
+            .getNumber()) {
+      output.writeEnum(3, distanceMeasure_);
+    }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(4, getLimit());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(distanceResultProperty_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, distanceResultProperty_);
+    }
+    if (((bitField0_ & 0x00000008) != 0)) {
+      output.writeMessage(6, getDistanceThreshold());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (((bitField0_ & 0x00000001) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getVectorProperty());
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQueryVector());
+    }
+    if (distanceMeasure_
+        != com.google.datastore.v1.FindNearest.DistanceMeasure.DISTANCE_MEASURE_UNSPECIFIED
+            .getNumber()) {
+      size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, distanceMeasure_);
+    }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getLimit());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(distanceResultProperty_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, distanceResultProperty_);
+    }
+    if (((bitField0_ & 0x00000008) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getDistanceThreshold());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof com.google.datastore.v1.FindNearest)) {
+      return super.equals(obj);
+    }
+    com.google.datastore.v1.FindNearest other = (com.google.datastore.v1.FindNearest) obj;
+
+    if (hasVectorProperty() != other.hasVectorProperty()) return false;
+    if (hasVectorProperty()) {
+      if (!getVectorProperty().equals(other.getVectorProperty())) return false;
+    }
+    if (hasQueryVector() != other.hasQueryVector()) return false;
+    if (hasQueryVector()) {
+      if (!getQueryVector().equals(other.getQueryVector())) return false;
+    }
+    if (distanceMeasure_ != other.distanceMeasure_) return false;
+    if (hasLimit() != other.hasLimit()) return false;
+    if (hasLimit()) {
+      if (!getLimit().equals(other.getLimit())) return false;
+    }
+    if (!getDistanceResultProperty().equals(other.getDistanceResultProperty())) return false;
+    if (hasDistanceThreshold() != other.hasDistanceThreshold()) return false;
+    if (hasDistanceThreshold()) {
+      if (!getDistanceThreshold().equals(other.getDistanceThreshold())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasVectorProperty()) {
+      hash = (37 * hash) + VECTOR_PROPERTY_FIELD_NUMBER;
+      hash = (53 * hash) + getVectorProperty().hashCode();
+    }
+    if (hasQueryVector()) {
+      hash = (37 * hash) + QUERY_VECTOR_FIELD_NUMBER;
+      hash = (53 * hash) + getQueryVector().hashCode();
+    }
+    hash = (37 * hash) + DISTANCE_MEASURE_FIELD_NUMBER;
+    hash = (53 * hash) + distanceMeasure_;
+    if (hasLimit()) {
+      hash = (37 * hash) + LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getLimit().hashCode();
+    }
+    hash = (37 * hash) + DISTANCE_RESULT_PROPERTY_FIELD_NUMBER;
+    hash = (53 * hash) + getDistanceResultProperty().hashCode();
+    if (hasDistanceThreshold()) {
+      hash = (37 * hash) + DISTANCE_THRESHOLD_FIELD_NUMBER;
+      hash = (53 * hash) + getDistanceThreshold().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(
+      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(
+      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseDelimitedFrom(
+      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.datastore.v1.FindNearest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+        PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() {
+    return newBuilder();
+  }
+
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+
+  public static Builder newBuilder(com.google.datastore.v1.FindNearest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   *
+   *
+   * 
    +   * Nearest Neighbors search config. The ordering provided by FindNearest
+   * supersedes the order_by stage. If multiple documents have the same vector
+   * distance, the returned document order is not guaranteed to be stable between
+   * queries.
+   * 
    
+   *
+   * Protobuf type {@code google.datastore.v1.FindNearest}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+      implements
+      // @@protoc_insertion_point(builder_implements:google.datastore.v1.FindNearest)
+      com.google.datastore.v1.FindNearestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_FindNearest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_FindNearest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.datastore.v1.FindNearest.class,
+              com.google.datastore.v1.FindNearest.Builder.class);
+    }
+
+    // Construct using com.google.datastore.v1.FindNearest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getVectorPropertyFieldBuilder();
+        getQueryVectorFieldBuilder();
+        getLimitFieldBuilder();
+        getDistanceThresholdFieldBuilder();
+      }
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      vectorProperty_ = null;
+      if (vectorPropertyBuilder_ != null) {
+        vectorPropertyBuilder_.dispose();
+        vectorPropertyBuilder_ = null;
+      }
+      queryVector_ = null;
+      if (queryVectorBuilder_ != null) {
+        queryVectorBuilder_.dispose();
+        queryVectorBuilder_ = null;
+      }
+      distanceMeasure_ = 0;
+      limit_ = null;
+      if (limitBuilder_ != null) {
+        limitBuilder_.dispose();
+        limitBuilder_ = null;
+      }
+      distanceResultProperty_ = "";
+      distanceThreshold_ = null;
+      if (distanceThresholdBuilder_ != null) {
+        distanceThresholdBuilder_.dispose();
+        distanceThresholdBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto
+          .internal_static_google_datastore_v1_FindNearest_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.FindNearest getDefaultInstanceForType() {
+      return com.google.datastore.v1.FindNearest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.FindNearest build() {
+      com.google.datastore.v1.FindNearest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.datastore.v1.FindNearest buildPartial() {
+      com.google.datastore.v1.FindNearest result = new com.google.datastore.v1.FindNearest(this);
+      if (bitField0_ != 0) {
+        buildPartial0(result);
+      }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(com.google.datastore.v1.FindNearest result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.vectorProperty_ =
+            vectorPropertyBuilder_ == null ? vectorProperty_ : vectorPropertyBuilder_.build();
+        to_bitField0_ |= 0x00000001;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.queryVector_ =
+            queryVectorBuilder_ == null ? queryVector_ : queryVectorBuilder_.build();
+        to_bitField0_ |= 0x00000002;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.distanceMeasure_ = distanceMeasure_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.limit_ = limitBuilder_ == null ? limit_ : limitBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.distanceResultProperty_ = distanceResultProperty_;
+      }
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        result.distanceThreshold_ =
+            distanceThresholdBuilder_ == null
+                ? distanceThreshold_
+                : distanceThresholdBuilder_.build();
+        to_bitField0_ |= 0x00000008;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.datastore.v1.FindNearest) {
+        return mergeFrom((com.google.datastore.v1.FindNearest) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.datastore.v1.FindNearest other) {
+      if (other == com.google.datastore.v1.FindNearest.getDefaultInstance()) return this;
+      if (other.hasVectorProperty()) {
+        mergeVectorProperty(other.getVectorProperty());
+      }
+      if (other.hasQueryVector()) {
+        mergeQueryVector(other.getQueryVector());
+      }
+      if (other.distanceMeasure_ != 0) {
+        setDistanceMeasureValue(other.getDistanceMeasureValue());
+      }
+      if (other.hasLimit()) {
+        mergeLimit(other.getLimit());
+      }
+      if (!other.getDistanceResultProperty().isEmpty()) {
+        distanceResultProperty_ = other.distanceResultProperty_;
+        bitField0_ |= 0x00000010;
+        onChanged();
+      }
+      if (other.hasDistanceThreshold()) {
+        mergeDistanceThreshold(other.getDistanceThreshold());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                input.readMessage(getVectorPropertyFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+            case 18:
+              {
+                input.readMessage(getQueryVectorFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+            case 24:
+              {
+                distanceMeasure_ = input.readEnum();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+            case 34:
+              {
+                input.readMessage(getLimitFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+            case 42:
+              {
+                distanceResultProperty_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+            case 50:
+              {
+                input.readMessage(
+                    getDistanceThresholdFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 50
+            default:
+              {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+
+    private int bitField0_;
+
+    private com.google.datastore.v1.PropertyReference vectorProperty_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        vectorPropertyBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return Whether the vectorProperty field is set.
+     */
+    public boolean hasVectorProperty() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The vectorProperty.
+     */
+    public com.google.datastore.v1.PropertyReference getVectorProperty() {
+      if (vectorPropertyBuilder_ == null) {
+        return vectorProperty_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : vectorProperty_;
+      } else {
+        return vectorPropertyBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder setVectorProperty(com.google.datastore.v1.PropertyReference value) {
+      if (vectorPropertyBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        vectorProperty_ = value;
+      } else {
+        vectorPropertyBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder setVectorProperty(
+        com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+      if (vectorPropertyBuilder_ == null) {
+        vectorProperty_ = builderForValue.build();
+      } else {
+        vectorPropertyBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder mergeVectorProperty(com.google.datastore.v1.PropertyReference value) {
+      if (vectorPropertyBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)
+            && vectorProperty_ != null
+            && vectorProperty_ != com.google.datastore.v1.PropertyReference.getDefaultInstance()) {
+          getVectorPropertyBuilder().mergeFrom(value);
+        } else {
+          vectorProperty_ = value;
+        }
+      } else {
+        vectorPropertyBuilder_.mergeFrom(value);
+      }
+      if (vectorProperty_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder clearVectorProperty() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      vectorProperty_ = null;
+      if (vectorPropertyBuilder_ != null) {
+        vectorPropertyBuilder_.dispose();
+        vectorPropertyBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.v1.PropertyReference.Builder getVectorPropertyBuilder() {
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return getVectorPropertyFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBuilder() {
+      if (vectorPropertyBuilder_ != null) {
+        return vectorPropertyBuilder_.getMessageOrBuilder();
+      } else {
+        return vectorProperty_ == null
+            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
+            : vectorProperty_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyReference,
+            com.google.datastore.v1.PropertyReference.Builder,
+            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        getVectorPropertyFieldBuilder() {
+      if (vectorPropertyBuilder_ == null) {
+        vectorPropertyBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.PropertyReference,
+                com.google.datastore.v1.PropertyReference.Builder,
+                com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                getVectorProperty(), getParentForChildren(), isClean());
+        vectorProperty_ = null;
+      }
+      return vectorPropertyBuilder_;
+    }
+
+    private com.google.datastore.v1.Value queryVector_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        queryVectorBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return Whether the queryVector field is set.
+     */
+    public boolean hasQueryVector() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The queryVector.
+     */
+    public com.google.datastore.v1.Value getQueryVector() {
+      if (queryVectorBuilder_ == null) {
+        return queryVector_ == null
+            ? com.google.datastore.v1.Value.getDefaultInstance()
+            : queryVector_;
+      } else {
+        return queryVectorBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder setQueryVector(com.google.datastore.v1.Value value) {
+      if (queryVectorBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        queryVector_ = value;
+      } else {
+        queryVectorBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder setQueryVector(com.google.datastore.v1.Value.Builder builderForValue) {
+      if (queryVectorBuilder_ == null) {
+        queryVector_ = builderForValue.build();
+      } else {
+        queryVectorBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder mergeQueryVector(com.google.datastore.v1.Value value) {
+      if (queryVectorBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) != 0)
+            && queryVector_ != null
+            && queryVector_ != com.google.datastore.v1.Value.getDefaultInstance()) {
+          getQueryVectorBuilder().mergeFrom(value);
+        } else {
+          queryVector_ = value;
+        }
+      } else {
+        queryVectorBuilder_.mergeFrom(value);
+      }
+      if (queryVector_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public Builder clearQueryVector() {
+      bitField0_ = (bitField0_ & ~0x00000002);
+      queryVector_ = null;
+      if (queryVectorBuilder_ != null) {
+        queryVectorBuilder_.dispose();
+        queryVectorBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.v1.Value.Builder getQueryVectorBuilder() {
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return getQueryVectorFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() {
+      if (queryVectorBuilder_ != null) {
+        return queryVectorBuilder_.getMessageOrBuilder();
+      } else {
+        return queryVector_ == null
+            ? com.google.datastore.v1.Value.getDefaultInstance()
+            : queryVector_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     * 
    
+     *
+     * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value,
+            com.google.datastore.v1.Value.Builder,
+            com.google.datastore.v1.ValueOrBuilder>
+        getQueryVectorFieldBuilder() {
+      if (queryVectorBuilder_ == null) {
+        queryVectorBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.Value,
+                com.google.datastore.v1.Value.Builder,
+                com.google.datastore.v1.ValueOrBuilder>(
+                getQueryVector(), getParentForChildren(), isClean());
+        queryVector_ = null;
+      }
+      return queryVectorBuilder_;
+    }
+
+    private int distanceMeasure_ = 0;
+    /**
+     *
+     *
+     * 
    +     * Required. The Distance Measure to use, required.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The enum numeric value on the wire for distanceMeasure.
+     */
+    @java.lang.Override
+    public int getDistanceMeasureValue() {
+      return distanceMeasure_;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The Distance Measure to use, required.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @param value The enum numeric value on the wire for distanceMeasure to set.
+     * @return This builder for chaining.
+     */
+    public Builder setDistanceMeasureValue(int value) {
+      distanceMeasure_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The Distance Measure to use, required.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return The distanceMeasure.
+     */
+    @java.lang.Override
+    public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure() {
+      com.google.datastore.v1.FindNearest.DistanceMeasure result =
+          com.google.datastore.v1.FindNearest.DistanceMeasure.forNumber(distanceMeasure_);
+      return result == null
+          ? com.google.datastore.v1.FindNearest.DistanceMeasure.UNRECOGNIZED
+          : result;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The Distance Measure to use, required.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @param value The distanceMeasure to set.
+     * @return This builder for chaining.
+     */
+    public Builder setDistanceMeasure(com.google.datastore.v1.FindNearest.DistanceMeasure value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      bitField0_ |= 0x00000004;
+      distanceMeasure_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The Distance Measure to use, required.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+     * 
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearDistanceMeasure() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      distanceMeasure_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Int32Value limit_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Int32Value,
+            com.google.protobuf.Int32Value.Builder,
+            com.google.protobuf.Int32ValueOrBuilder>
+        limitBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return Whether the limit field is set.
+     */
+    public boolean hasLimit() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     *
+     * @return The limit.
+     */
+    public com.google.protobuf.Int32Value getLimit() {
+      if (limitBuilder_ == null) {
+        return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
+      } else {
+        return limitBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     */
+    public Builder setLimit(com.google.protobuf.Int32Value value) {
+      if (limitBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        limit_ = value;
+      } else {
+        limitBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     */
+    public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue) {
+      if (limitBuilder_ == null) {
+        limit_ = builderForValue.build();
+      } else {
+        limitBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     */
+    public Builder mergeLimit(com.google.protobuf.Int32Value value) {
+      if (limitBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && limit_ != null
+            && limit_ != com.google.protobuf.Int32Value.getDefaultInstance()) {
+          getLimitBuilder().mergeFrom(value);
+        } else {
+          limit_ = value;
+        }
+      } else {
+        limitBuilder_.mergeFrom(value);
+      }
+      if (limit_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     */
+    public Builder clearLimit() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      limit_ = null;
+      if (limitBuilder_ != null) {
+        limitBuilder_.dispose();
+        limitBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     */
+    public com.google.protobuf.Int32Value.Builder getLimitBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getLimitFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     */
+    public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
+      if (limitBuilder_ != null) {
+        return limitBuilder_.getMessageOrBuilder();
+      } else {
+        return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     * 
    
+     *
+     * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Int32Value,
+            com.google.protobuf.Int32Value.Builder,
+            com.google.protobuf.Int32ValueOrBuilder>
+        getLimitFieldBuilder() {
+      if (limitBuilder_ == null) {
+        limitBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Int32Value,
+                com.google.protobuf.Int32Value.Builder,
+                com.google.protobuf.Int32ValueOrBuilder>(
+                getLimit(), getParentForChildren(), isClean());
+        limit_ = null;
+      }
+      return limitBuilder_;
+    }
+
+    private java.lang.Object distanceResultProperty_ = "";
+    /**
+     *
+     *
+     * 
    +     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The distanceResultProperty.
+     */
+    public java.lang.String getDistanceResultProperty() {
+      java.lang.Object ref = distanceResultProperty_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        distanceResultProperty_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return The bytes for distanceResultProperty.
+     */
+    public com.google.protobuf.ByteString getDistanceResultPropertyBytes() {
+      java.lang.Object ref = distanceResultProperty_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b =
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        distanceResultProperty_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @param value The distanceResultProperty to set.
+     * @return This builder for chaining.
+     */
+    public Builder setDistanceResultProperty(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      distanceResultProperty_ = value;
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearDistanceResultProperty() {
+      distanceResultProperty_ = getDefaultInstance().getDistanceResultProperty();
+      bitField0_ = (bitField0_ & ~0x00000010);
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     * 
    
+     *
+     * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+     *
+     * @param value The bytes for distanceResultProperty to set.
+     * @return This builder for chaining.
+     */
+    public Builder setDistanceResultPropertyBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      distanceResultProperty_ = value;
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.DoubleValue distanceThreshold_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.DoubleValue,
+            com.google.protobuf.DoubleValue.Builder,
+            com.google.protobuf.DoubleValueOrBuilder>
+        distanceThresholdBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return Whether the distanceThreshold field is set.
+     */
+    public boolean hasDistanceThreshold() {
+      return ((bitField0_ & 0x00000020) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The distanceThreshold.
+     */
+    public com.google.protobuf.DoubleValue getDistanceThreshold() {
+      if (distanceThresholdBuilder_ == null) {
+        return distanceThreshold_ == null
+            ? com.google.protobuf.DoubleValue.getDefaultInstance()
+            : distanceThreshold_;
+      } else {
+        return distanceThresholdBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setDistanceThreshold(com.google.protobuf.DoubleValue value) {
+      if (distanceThresholdBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        distanceThreshold_ = value;
+      } else {
+        distanceThresholdBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000020;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setDistanceThreshold(com.google.protobuf.DoubleValue.Builder builderForValue) {
+      if (distanceThresholdBuilder_ == null) {
+        distanceThreshold_ = builderForValue.build();
+      } else {
+        distanceThresholdBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000020;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder mergeDistanceThreshold(com.google.protobuf.DoubleValue value) {
+      if (distanceThresholdBuilder_ == null) {
+        if (((bitField0_ & 0x00000020) != 0)
+            && distanceThreshold_ != null
+            && distanceThreshold_ != com.google.protobuf.DoubleValue.getDefaultInstance()) {
+          getDistanceThresholdBuilder().mergeFrom(value);
+        } else {
+          distanceThreshold_ = value;
+        }
+      } else {
+        distanceThresholdBuilder_.mergeFrom(value);
+      }
+      if (distanceThreshold_ != null) {
+        bitField0_ |= 0x00000020;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder clearDistanceThreshold() {
+      bitField0_ = (bitField0_ & ~0x00000020);
+      distanceThreshold_ = null;
+      if (distanceThresholdBuilder_ != null) {
+        distanceThresholdBuilder_.dispose();
+        distanceThresholdBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.protobuf.DoubleValue.Builder getDistanceThresholdBuilder() {
+      bitField0_ |= 0x00000020;
+      onChanged();
+      return getDistanceThresholdFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder() {
+      if (distanceThresholdBuilder_ != null) {
+        return distanceThresholdBuilder_.getMessageOrBuilder();
+      } else {
+        return distanceThreshold_ == null
+            ? com.google.protobuf.DoubleValue.getDefaultInstance()
+            : distanceThreshold_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     * 
    
+     *
+     * 
+     * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.DoubleValue,
+            com.google.protobuf.DoubleValue.Builder,
+            com.google.protobuf.DoubleValueOrBuilder>
+        getDistanceThresholdFieldBuilder() {
+      if (distanceThresholdBuilder_ == null) {
+        distanceThresholdBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.DoubleValue,
+                com.google.protobuf.DoubleValue.Builder,
+                com.google.protobuf.DoubleValueOrBuilder>(
+                getDistanceThreshold(), getParentForChildren(), isClean());
+        distanceThreshold_ = null;
+      }
+      return distanceThresholdBuilder_;
+    }
+
+    @java.lang.Override
+    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+    // @@protoc_insertion_point(builder_scope:google.datastore.v1.FindNearest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.datastore.v1.FindNearest)
+  private static final com.google.datastore.v1.FindNearest DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE = new com.google.datastore.v1.FindNearest();
+  }
+
+  public static com.google.datastore.v1.FindNearest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser PARSER =
+      new com.google.protobuf.AbstractParser() {
+        @java.lang.Override
+        public FindNearest parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.datastore.v1.FindNearest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
new file mode 100644
index 000000000000..ac7b994a6923
--- /dev/null
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/datastore/v1/query.proto
+
+// Protobuf Java Version: 3.25.5
+package com.google.datastore.v1;
+
+public interface FindNearestOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.datastore.v1.FindNearest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * 
    +   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return Whether the vectorProperty field is set.
+   */
+  boolean hasVectorProperty();
+  /**
+   *
+   *
+   * 
    +   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The vectorProperty.
+   */
+  com.google.datastore.v1.PropertyReference getVectorProperty();
+  /**
+   *
+   *
+   * 
    +   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   * 
    
+   *
+   * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return Whether the queryVector field is set.
+   */
+  boolean hasQueryVector();
+  /**
+   *
+   *
+   * 
    +   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   * 
    
+   *
+   * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The queryVector.
+   */
+  com.google.datastore.v1.Value getQueryVector();
+  /**
+   *
+   *
+   * 
    +   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   * 
    
+   *
+   * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   */
+  com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Required. The Distance Measure to use, required.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The enum numeric value on the wire for distanceMeasure.
+   */
+  int getDistanceMeasureValue();
+  /**
+   *
+   *
+   * 
    +   * Required. The Distance Measure to use, required.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED];
+   * 
+   *
+   * @return The distanceMeasure.
+   */
+  com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure();
+
+  /**
+   *
+   *
+   * 
    +   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   * 
    
+   *
+   * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return Whether the limit field is set.
+   */
+  boolean hasLimit();
+  /**
+   *
+   *
+   * 
    +   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   * 
    
+   *
+   * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+   *
+   * @return The limit.
+   */
+  com.google.protobuf.Int32Value getLimit();
+  /**
+   *
+   *
+   * 
    +   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   * 
    
+   *
+   * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED];
+   */
+  com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   * 
    
+   *
+   * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The distanceResultProperty.
+   */
+  java.lang.String getDistanceResultProperty();
+  /**
+   *
+   *
+   * 
    +   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   * 
    
+   *
+   * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL];
+   *
+   * @return The bytes for distanceResultProperty.
+   */
+  com.google.protobuf.ByteString getDistanceResultPropertyBytes();
+
+  /**
+   *
+   *
+   * 
    +   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   * 
    
+   *
+   * 
+   * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the distanceThreshold field is set.
+   */
+  boolean hasDistanceThreshold();
+  /**
+   *
+   *
+   * 
    +   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   * 
    
+   *
+   * 
+   * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The distanceThreshold.
+   */
+  com.google.protobuf.DoubleValue getDistanceThreshold();
+  /**
+   *
+   *
+   * 
    +   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   * 
    
+   *
+   * 
+   * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder();
+}
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 2c0c40f79b89..25fba4c89ffe 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
@@ -24,6 +24,15 @@
  *
  * 
      * A query for entities.
+ *
+ * The query stages are executed in the following order:
+ * 1. kind
+ * 2. filter
+ * 3. projection
+ * 4. order + start_cursor + end_cursor
+ * 5. offset
+ * 6. limit
+ * 7. find_nearest
  * 
    
  *
  * Protobuf type {@code google.datastore.v1.Query}
@@ -553,6 +562,74 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
     return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
   }
 
+  public static final int FIND_NEAREST_FIELD_NUMBER = 13;
+  private com.google.datastore.v1.FindNearest findNearest_;
+  /**
+   *
+   *
+   * 
    +   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the findNearest field is set.
+   */
+  @java.lang.Override
+  public boolean hasFindNearest() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The findNearest.
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.FindNearest getFindNearest() {
+    return findNearest_ == null
+        ? com.google.datastore.v1.FindNearest.getDefaultInstance()
+        : findNearest_;
+  }
+  /**
+   *
+   *
+   * 
    +   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  @java.lang.Override
+  public com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder() {
+    return findNearest_ == null
+        ? com.google.datastore.v1.FindNearest.getDefaultInstance()
+        : findNearest_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -594,6 +671,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(12, getLimit());
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(13, getFindNearest());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -630,6 +710,9 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getLimit());
     }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(13, getFindNearest());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -660,6 +743,10 @@ public boolean equals(final java.lang.Object obj) {
     if (hasLimit()) {
       if (!getLimit().equals(other.getLimit())) return false;
     }
+    if (hasFindNearest() != other.hasFindNearest()) return false;
+    if (hasFindNearest()) {
+      if (!getFindNearest().equals(other.getFindNearest())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -701,6 +788,10 @@ public int hashCode() {
       hash = (37 * hash) + LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getLimit().hashCode();
     }
+    if (hasFindNearest()) {
+      hash = (37 * hash) + FIND_NEAREST_FIELD_NUMBER;
+      hash = (53 * hash) + getFindNearest().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -805,6 +896,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
        * A query for entities.
+   *
+   * The query stages are executed in the following order:
+   * 1. kind
+   * 2. filter
+   * 3. projection
+   * 4. order + start_cursor + end_cursor
+   * 5. offset
+   * 6. limit
+   * 7. find_nearest
    * 
    
    *
    * Protobuf type {@code google.datastore.v1.Query}
@@ -845,6 +945,7 @@ private void maybeForceBuilderInitialization() {
         getOrderFieldBuilder();
         getDistinctOnFieldBuilder();
         getLimitFieldBuilder();
+        getFindNearestFieldBuilder();
       }
     }
 
@@ -893,6 +994,11 @@ public Builder clear() {
         limitBuilder_.dispose();
         limitBuilder_ = null;
       }
+      findNearest_ = null;
+      if (findNearestBuilder_ != null) {
+        findNearestBuilder_.dispose();
+        findNearestBuilder_ = null;
+      }
       return this;
     }
 
@@ -986,6 +1092,11 @@ private void buildPartial0(com.google.datastore.v1.Query result) {
         result.limit_ = limitBuilder_ == null ? limit_ : limitBuilder_.build();
         to_bitField0_ |= 0x00000002;
       }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.findNearest_ =
+            findNearestBuilder_ == null ? findNearest_ : findNearestBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
       result.bitField0_ |= to_bitField0_;
     }
 
@@ -1157,6 +1268,9 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
       if (other.hasLimit()) {
         mergeLimit(other.getLimit());
       }
+      if (other.hasFindNearest()) {
+        mergeFindNearest(other.getFindNearest());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1265,6 +1379,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000100;
                 break;
               } // case 98
+            case 106:
+              {
+                input.readMessage(getFindNearestFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 106
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -3396,6 +3516,245 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
       return limitBuilder_;
     }
 
+    private com.google.datastore.v1.FindNearest findNearest_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.FindNearest,
+            com.google.datastore.v1.FindNearest.Builder,
+            com.google.datastore.v1.FindNearestOrBuilder>
+        findNearestBuilder_;
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return Whether the findNearest field is set.
+     */
+    public boolean hasFindNearest() {
+      return ((bitField0_ & 0x00000200) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     *
+     * @return The findNearest.
+     */
+    public com.google.datastore.v1.FindNearest getFindNearest() {
+      if (findNearestBuilder_ == null) {
+        return findNearest_ == null
+            ? com.google.datastore.v1.FindNearest.getDefaultInstance()
+            : findNearest_;
+      } else {
+        return findNearestBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setFindNearest(com.google.datastore.v1.FindNearest value) {
+      if (findNearestBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        findNearest_ = value;
+      } else {
+        findNearestBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000200;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder setFindNearest(com.google.datastore.v1.FindNearest.Builder builderForValue) {
+      if (findNearestBuilder_ == null) {
+        findNearest_ = builderForValue.build();
+      } else {
+        findNearestBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000200;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder mergeFindNearest(com.google.datastore.v1.FindNearest value) {
+      if (findNearestBuilder_ == null) {
+        if (((bitField0_ & 0x00000200) != 0)
+            && findNearest_ != null
+            && findNearest_ != com.google.datastore.v1.FindNearest.getDefaultInstance()) {
+          getFindNearestBuilder().mergeFrom(value);
+        } else {
+          findNearest_ = value;
+        }
+      } else {
+        findNearestBuilder_.mergeFrom(value);
+      }
+      if (findNearest_ != null) {
+        bitField0_ |= 0x00000200;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public Builder clearFindNearest() {
+      bitField0_ = (bitField0_ & ~0x00000200);
+      findNearest_ = null;
+      if (findNearestBuilder_ != null) {
+        findNearestBuilder_.dispose();
+        findNearestBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.FindNearest.Builder getFindNearestBuilder() {
+      bitField0_ |= 0x00000200;
+      onChanged();
+      return getFindNearestFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    public com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder() {
+      if (findNearestBuilder_ != null) {
+        return findNearestBuilder_.getMessageOrBuilder();
+      } else {
+        return findNearest_ == null
+            ? com.google.datastore.v1.FindNearest.getDefaultInstance()
+            : findNearest_;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     * 
    
+     *
+     * 
+     * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+     * 
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.FindNearest,
+            com.google.datastore.v1.FindNearest.Builder,
+            com.google.datastore.v1.FindNearestOrBuilder>
+        getFindNearestFieldBuilder() {
+      if (findNearestBuilder_ == null) {
+        findNearestBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.datastore.v1.FindNearest,
+                com.google.datastore.v1.FindNearest.Builder,
+                com.google.datastore.v1.FindNearestOrBuilder>(
+                getFindNearest(), getParentForChildren(), isClean());
+        findNearest_ = null;
+      }
+      return findNearestBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 70533577fda8..86e6d218f4f0 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
@@ -394,4 +394,57 @@ public interface QueryOrBuilder
    * .google.protobuf.Int32Value limit = 12;
    */
   com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder();
+
+  /**
+   *
+   *
+   * 
    +   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return Whether the findNearest field is set.
+   */
+  boolean hasFindNearest();
+  /**
+   *
+   *
+   * 
    +   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   *
+   * @return The findNearest.
+   */
+  com.google.datastore.v1.FindNearest getFindNearest();
+  /**
+   *
+   *
+   * 
    +   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   * 
    
+   *
+   * 
+   * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL];
+   * 
+   */
+  com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder();
 }
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 60c35e2e1d59..489e035abd15 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
@@ -84,6 +84,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_datastore_v1_PropertyFilter_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_datastore_v1_FindNearest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_datastore_v1_FindNearest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_datastore_v1_GqlQuery_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -120,7 +124,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "date_time\030\005 \001(\0132\032.google.protobuf.Timest"
           + "amp\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RES"
           + "ULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJ"
-          + "ECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nproj"
+          + "ECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\257\003\n\005Query\0223\n\nproj"
           + "ection\030\002 \003(\0132\037.google.datastore.v1.Proje"
           + "ction\0221\n\004kind\030\003 \003(\0132#.google.datastore.v"
           + "1.KindExpression\022+\n\006filter\030\004 \001(\0132\033.googl"
@@ -129,77 +133,90 @@ 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\"\344\004\n\020"
-          + "AggregationQuery\0222\n\014nested_query\030\001 \001(\0132\032"
-          + ".google.datastore.v1.QueryH\000\022L\n\014aggregat"
-          + "ions\030\003 \003(\01321.google.datastore.v1.Aggrega"
-          + "tionQuery.AggregationB\003\340A\001\032\277\003\n\013Aggregati"
-          + "on\022H\n\005count\030\001 \001(\01327.google.datastore.v1."
-          + "AggregationQuery.Aggregation.CountH\000\022D\n\003"
-          + "sum\030\002 \001(\01325.google.datastore.v1.Aggregat"
-          + "ionQuery.Aggregation.SumH\000\022D\n\003avg\030\003 \001(\0132"
-          + "5.google.datastore.v1.AggregationQuery.A"
-          + "ggregation.AvgH\000\022\022\n\005alias\030\007 \001(\tB\003\340A\001\0328\n\005"
-          + "Count\022/\n\005up_to\030\001 \001(\0132\033.google.protobuf.I"
-          + "nt64ValueB\003\340A\001\032?\n\003Sum\0228\n\010property\030\001 \001(\0132"
-          + "&.google.datastore.v1.PropertyReference\032"
-          + "?\n\003Avg\0228\n\010property\030\001 \001(\0132&.google.datast"
-          + "ore.v1.PropertyReferenceB\n\n\010operatorB\014\n\n"
-          + "query_type\"\036\n\016KindExpression\022\014\n\004name\030\001 \001"
-          + "(\t\"!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n"
-          + "\nProjection\0228\n\010property\030\001 \001(\0132&.google.d"
-          + "atastore.v1.PropertyReference\"\321\001\n\rProper"
-          + "tyOrder\0228\n\010property\030\001 \001(\0132&.google.datas"
-          + "tore.v1.PropertyReference\022?\n\tdirection\030\002"
-          + " \001(\0162,.google.datastore.v1.PropertyOrder"
-          + ".Direction\"E\n\tDirection\022\031\n\025DIRECTION_UNS"
-          + "PECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020"
-          + "\002\"\231\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$"
-          + ".google.datastore.v1.CompositeFilterH\000\022>"
-          + "\n\017property_filter\030\002 \001(\0132#.google.datasto"
-          + "re.v1.PropertyFilterH\000B\r\n\013filter_type\"\261\001"
-          + "\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.google.d"
-          + "atastore.v1.CompositeFilter.Operator\022,\n\007"
-          + "filters\030\002 \003(\0132\033.google.datastore.v1.Filt"
-          + "er\"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\016PropertyFilter\0228\n\010"
-          + "property\030\001 \001(\0132&.google.datastore.v1.Pro"
-          + "pertyReference\0228\n\002op\030\002 \001(\0162,.google.data"
-          + "store.v1.PropertyFilter.Operator\022)\n\005valu"
-          + "e\030\003 \001(\0132\032.google.datastore.v1.Value\"\270\001\n\010"
-          + "Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\r\n\tLE"
-          + "SS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GRE"
-          + "ATER_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\010GqlQuery\022\024\n\014q"
-          + "uery_string\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001("
-          + "\010\022H\n\016named_bindings\030\005 \003(\01320.google.datas"
-          + "tore.v1.GqlQuery.NamedBindingsEntry\022C\n\023p"
-          + "ositional_bindings\030\004 \003(\0132&.google.datast"
-          + "ore.v1.GqlQueryParameter\032\\\n\022NamedBinding"
-          + "sEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.goo"
-          + "gle.datastore.v1.GqlQueryParameter:\0028\001\"d"
-          + "\n\021GqlQueryParameter\022+\n\005value\030\002 \001(\0132\032.goo"
-          + "gle.datastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014"
-          + "H\000B\020\n\016parameter_type\"\215\004\n\020QueryResultBatc"
-          + "h\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016skipped_cu"
-          + "rsor\030\003 \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,"
-          + ".google.datastore.v1.EntityResult.Result"
-          + "Type\0229\n\016entity_results\030\002 \003(\0132!.google.da"
-          + "tastore.v1.EntityResult\022\022\n\nend_cursor\030\004 "
-          + "\001(\014\022K\n\014more_results\030\005 \001(\01625.google.datas"
-          + "tore.v1.QueryResultBatch.MoreResultsType"
-          + "\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tread_time\030"
-          + "\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n\017Mo"
-          + "reResultsType\022!\n\035MORE_RESULTS_TYPE_UNSPE"
-          + "CIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RESUL"
-          + "TS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_AFTER_C"
-          + "URSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\273\001\n\027com.goo"
-          + "gle.datastore.v1B\nQueryProtoP\001Z;cloud.go"
-          + "ogle.com/go/datastore/apiv1/datastorepb;"
-          + "datastorepb\252\002\031Google.Cloud.Datastore.V1\312"
-          + "\002\031Google\\Cloud\\Datastore\\V1\352\002\034Google::Cl"
-          + "oud::Datastore::V1b\006proto3"
+          + "\030\014 \001(\0132\033.google.protobuf.Int32Value\022;\n\014f"
+          + "ind_nearest\030\r \001(\0132 .google.datastore.v1."
+          + "FindNearestB\003\340A\001\"\344\004\n\020AggregationQuery\0222\n"
+          + "\014nested_query\030\001 \001(\0132\032.google.datastore.v"
+          + "1.QueryH\000\022L\n\014aggregations\030\003 \003(\01321.google"
+          + ".datastore.v1.AggregationQuery.Aggregati"
+          + "onB\003\340A\001\032\277\003\n\013Aggregation\022H\n\005count\030\001 \001(\01327"
+          + ".google.datastore.v1.AggregationQuery.Ag"
+          + "gregation.CountH\000\022D\n\003sum\030\002 \001(\01325.google."
+          + "datastore.v1.AggregationQuery.Aggregatio"
+          + "n.SumH\000\022D\n\003avg\030\003 \001(\01325.google.datastore."
+          + "v1.AggregationQuery.Aggregation.AvgH\000\022\022\n"
+          + "\005alias\030\007 \001(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001("
+          + "\0132\033.google.protobuf.Int64ValueB\003\340A\001\032?\n\003S"
+          + "um\0228\n\010property\030\001 \001(\0132&.google.datastore."
+          + "v1.PropertyReference\032?\n\003Avg\0228\n\010property\030"
+          + "\001 \001(\0132&.google.datastore.v1.PropertyRefe"
+          + "renceB\n\n\010operatorB\014\n\nquery_type\"\036\n\016KindE"
+          + "xpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRefer"
+          + "ence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010prop"
+          + "erty\030\001 \001(\0132&.google.datastore.v1.Propert"
+          + "yReference\"\321\001\n\rPropertyOrder\0228\n\010property"
+          + "\030\001 \001(\0132&.google.datastore.v1.PropertyRef"
+          + "erence\022?\n\tdirection\030\002 \001(\0162,.google.datas"
+          + "tore.v1.PropertyOrder.Direction\"E\n\tDirec"
+          + "tion\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCEN"
+          + "DING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020com"
+          + "posite_filter\030\001 \001(\0132$.google.datastore.v"
+          + "1.CompositeFilterH\000\022>\n\017property_filter\030\002"
+          + " \001(\0132#.google.datastore.v1.PropertyFilte"
+          + "rH\000B\r\n\013filter_type\"\261\001\n\017CompositeFilter\0229"
+          + "\n\002op\030\001 \001(\0162-.google.datastore.v1.Composi"
+          + "teFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.goo"
+          + "gle.datastore.v1.Filter\"5\n\010Operator\022\030\n\024O"
+          + "PERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352"
+          + "\002\n\016PropertyFilter\0228\n\010property\030\001 \001(\0132&.go"
+          + "ogle.datastore.v1.PropertyReference\0228\n\002o"
+          + "p\030\002 \001(\0162,.google.datastore.v1.PropertyFi"
+          + "lter.Operator\022)\n\005value\030\003 \001(\0132\032.google.da"
+          + "tastore.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATO"
+          + "R_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_T"
+          + "HAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREA"
+          + "TER_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_I"
+          + "N\020\r\"\323\003\n\013FindNearest\022D\n\017vector_property\030\001"
+          + " \001(\0132&.google.datastore.v1.PropertyRefer"
+          + "enceB\003\340A\002\0225\n\014query_vector\030\002 \001(\0132\032.google"
+          + ".datastore.v1.ValueB\003\340A\002\022O\n\020distance_mea"
+          + "sure\030\003 \001(\01620.google.datastore.v1.FindNea"
+          + "rest.DistanceMeasureB\003\340A\002\022/\n\005limit\030\004 \001(\013"
+          + "2\033.google.protobuf.Int32ValueB\003\340A\002\022%\n\030di"
+          + "stance_result_property\030\005 \001(\tB\003\340A\001\022=\n\022dis"
+          + "tance_threshold\030\006 \001(\0132\034.google.protobuf."
+          + "DoubleValueB\003\340A\001\"_\n\017DistanceMeasure\022 \n\034D"
+          + "ISTANCE_MEASURE_UNSPECIFIED\020\000\022\r\n\tEUCLIDE"
+          + "AN\020\001\022\n\n\006COSINE\020\002\022\017\n\013DOT_PRODUCT\020\003\"\245\002\n\010Gq"
+          + "lQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_li"
+          + "terals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.g"
+          + "oogle.datastore.v1.GqlQuery.NamedBinding"
+          + "sEntry\022C\n\023positional_bindings\030\004 \003(\0132&.go"
+          + "ogle.datastore.v1.GqlQueryParameter\032\\\n\022N"
+          + "amedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030"
+          + "\002 \001(\0132&.google.datastore.v1.GqlQueryPara"
+          + "meter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030"
+          + "\002 \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006c"
+          + "ursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020Quer"
+          + "yResultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n"
+          + "\016skipped_cursor\030\003 \001(\014\022H\n\022entity_result_t"
+          + "ype\030\001 \001(\0162,.google.datastore.v1.EntityRe"
+          + "sult.ResultType\0229\n\016entity_results\030\002 \003(\0132"
+          + "!.google.datastore.v1.EntityResult\022\022\n\nen"
+          + "d_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.g"
+          + "oogle.datastore.v1.QueryResultBatch.More"
+          + "ResultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n"
+          + "\tread_time\030\010 \001(\0132\032.google.protobuf.Times"
+          + "tamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS"
+          + "_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n"
+          + "\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESU"
+          + "LTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B"
+          + "\273\001\n\027com.google.datastore.v1B\nQueryProtoP"
+          + "\001Z;cloud.google.com/go/datastore/apiv1/d"
+          + "atastorepb;datastorepb\252\002\031Google.Cloud.Da"
+          + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002"
+          + "\034Google::Cloud::Datastore::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -232,6 +249,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "EndCursor",
               "Offset",
               "Limit",
+              "FindNearest",
             });
     internal_static_google_datastore_v1_AggregationQuery_descriptor =
         getDescriptor().getMessageTypes().get(2);
@@ -335,8 +353,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Property", "Op", "Value",
             });
-    internal_static_google_datastore_v1_GqlQuery_descriptor =
+    internal_static_google_datastore_v1_FindNearest_descriptor =
         getDescriptor().getMessageTypes().get(10);
+    internal_static_google_datastore_v1_FindNearest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_datastore_v1_FindNearest_descriptor,
+            new java.lang.String[] {
+              "VectorProperty",
+              "QueryVector",
+              "DistanceMeasure",
+              "Limit",
+              "DistanceResultProperty",
+              "DistanceThreshold",
+            });
+    internal_static_google_datastore_v1_GqlQuery_descriptor =
+        getDescriptor().getMessageTypes().get(11);
     internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_datastore_v1_GqlQuery_descriptor,
@@ -352,7 +383,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Key", "Value",
             });
     internal_static_google_datastore_v1_GqlQueryParameter_descriptor =
-        getDescriptor().getMessageTypes().get(11);
+        getDescriptor().getMessageTypes().get(12);
     internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_datastore_v1_GqlQueryParameter_descriptor,
@@ -360,7 +391,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Value", "Cursor", "ParameterType",
             });
     internal_static_google_datastore_v1_QueryResultBatch_descriptor =
-        getDescriptor().getMessageTypes().get(12);
+        getDescriptor().getMessageTypes().get(13);
     internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_datastore_v1_QueryResultBatch_descriptor,
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 5ec0eea61a0c..3c2e8ae6688d 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
@@ -82,6 +82,15 @@ message EntityResult {
 }
 
 // A query for entities.
+//
+// The query stages are executed in the following order:
+// 1. kind
+// 2. filter
+// 3. projection
+// 4. order + start_cursor + end_cursor
+// 5. offset
+// 6. limit
+// 7. find_nearest
 message Query {
   // The projection to return. Defaults to returning all properties.
   repeated Projection projection = 2;
@@ -127,6 +136,13 @@ message Query {
   // Unspecified is interpreted as no limit.
   // Must be >= 0 if specified.
   google.protobuf.Int32Value limit = 12;
+
+  // Optional. A potential Nearest Neighbors Search.
+  //
+  // Applies after all other filters and ordering.
+  //
+  // Finds the closest vector embeddings to the given query vector.
+  FindNearest find_nearest = 13 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Datastore query for running an aggregation over a
@@ -436,6 +452,70 @@ message PropertyFilter {
   Value value = 3;
 }
 
+// Nearest Neighbors search config. The ordering provided by FindNearest
+// supersedes the order_by stage. If multiple documents have the same vector
+// distance, the returned document order is not guaranteed to be stable between
+// queries.
+message FindNearest {
+  // The distance measure to use when comparing vectors.
+  enum DistanceMeasure {
+    // Should not be set.
+    DISTANCE_MEASURE_UNSPECIFIED = 0;
+
+    // Measures the EUCLIDEAN distance between the vectors. See
+    // [Euclidean](https://en.wikipedia.org/wiki/Euclidean_distance) to learn
+    // more. The resulting distance decreases the more similar two vectors are.
+    EUCLIDEAN = 1;
+
+    // COSINE distance compares vectors based on the angle between them, which
+    // allows you to measure similarity that isn't based on the vectors
+    // magnitude. We recommend using DOT_PRODUCT with unit normalized vectors
+    // instead of COSINE distance, which is mathematically equivalent with
+    // better performance. See [Cosine
+    // Similarity](https://en.wikipedia.org/wiki/Cosine_similarity) to learn
+    // more about COSINE similarity and COSINE distance. The resulting COSINE
+    // distance decreases the more similar two vectors are.
+    COSINE = 2;
+
+    // Similar to cosine but is affected by the magnitude of the vectors. See
+    // [Dot Product](https://en.wikipedia.org/wiki/Dot_product) to learn more.
+    // The resulting distance increases the more similar two vectors are.
+    DOT_PRODUCT = 3;
+  }
+
+  // Required. An indexed vector property to search upon. Only documents which
+  // contain vectors whose dimensionality match the query_vector can be
+  // returned.
+  PropertyReference vector_property = 1
+      [(google.api.field_behavior) = REQUIRED];
+
+  // Required. The query vector that we are searching on. Must be a vector of no
+  // more than 2048 dimensions.
+  Value query_vector = 2 [(google.api.field_behavior) = REQUIRED];
+
+  // Required. The Distance Measure to use, required.
+  DistanceMeasure distance_measure = 3 [(google.api.field_behavior) = REQUIRED];
+
+  // Required. The number of nearest neighbors to return. Must be a positive
+  // integer of no more than 100.
+  google.protobuf.Int32Value limit = 4 [(google.api.field_behavior) = REQUIRED];
+
+  // Optional. Optional name of the field to output the result of the vector
+  // distance calculation. Must conform to [entity
+  // property][google.datastore.v1.Entity.properties] limitations.
+  string distance_result_property = 5 [(google.api.field_behavior) = OPTIONAL];
+
+  // Optional. Option to specify a threshold for which no less similar documents
+  // will be returned. The behavior of the specified `distance_measure` will
+  // affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+  // increase when the vectors are more similar, the comparison is inverted.
+  //
+  // For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+  // For DOT_PRODUCT:       WHERE distance >= distance_threshold
+  google.protobuf.DoubleValue distance_threshold = 6
+      [(google.api.field_behavior) = OPTIONAL];
+}
+
 // A [GQL
 // query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
 message GqlQuery {

From d13d9c63ef87a0115f70b85a6d6b60ab3ff5a222 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:10:36 -0400
Subject: [PATCH 1472/1784] chore: Update generation configuration at Fri Oct
 18 02:24:22 UTC 2024 (#1625)

* chore: Update generation configuration at Wed Oct 16 02:24:55 UTC 2024

* chore: Update generation configuration at Thu Oct 17 02:23:50 UTC 2024

* chore: generate libraries at Thu Oct 17 02:24:19 UTC 2024

* chore: Update generation configuration at Fri Oct 18 02:24:22 UTC 2024
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e76f6832bf56..a6a76d6c5cb4 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.48.0')
+implementation platform('com.google.cloud:libraries-bom:26.49.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 3e00e550d211..570a4341fb4d 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.47.0
-googleapis_commitish: f78cd2f7943b9a2eb9734e56a8f3428da75917e2
-libraries_bom_version: 26.48.0
+googleapis_commitish: 5ebb5c1e3d2953efd05c068b27138098eecc8308
+libraries_bom_version: 26.49.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From e3c413880018e1866c46b08fcd4e2c3110a15264 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 22 Oct 2024 12:52:30 -0400
Subject: [PATCH 1473/1784] chore: Update generation configuration at Tue Oct
 22 02:24:17 UTC 2024 (#1626)

* chore: Update generation configuration at Sat Oct 19 02:22:40 UTC 2024

* chore: Update generation configuration at Tue Oct 22 02:24:17 UTC 2024
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 570a4341fb4d..f8e731ddce0e 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.47.0
-googleapis_commitish: 5ebb5c1e3d2953efd05c068b27138098eecc8308
+googleapis_commitish: beea48a164c2a8cc8485185c3a4f56c587090e1a
 libraries_bom_version: 26.49.0
 libraries:
   - api_shortname: datastore

From af7de6526786783a3f4173eaa17d25a6aa52d4fa Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:58:24 +0000
Subject: [PATCH 1474/1784] chore(main): release 2.23.1-SNAPSHOT (#1623)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 723d37a51b1d..6e3f7cfc97d3 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.23.0
+  2.23.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.0
+    2.23.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6cfeb40e221c..73f8b5cbe252 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.23.0
+  2.23.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.23.0
+        2.23.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.23.0
+        2.23.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.114.0
+        0.114.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.23.0
+        2.23.1-SNAPSHOT
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3c860788797f..11e6620ea00c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.23.0
+  2.23.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.0
+    2.23.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index ad06274a93e7..36820f768661 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.23.0
+  2.23.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.0
+    2.23.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 665933af646f..108aca675c61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.23.0
+  2.23.1-SNAPSHOT
   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.23.0
+        2.23.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.23.0
+        2.23.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.23.0
+        2.23.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.114.0
+        0.114.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.23.0
+        2.23.1-SNAPSHOT
         
           
             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 4d4da04db71c..621327b74abe 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.23.0
+  2.23.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.0
+    2.23.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d4bda3ee4e3b..c07b7321e401 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.114.0
+  0.114.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.0
+    2.23.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4da3f232bf63..04401d182c2e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.23.0
+      2.23.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 666cbda4ee95..1d3d32591af3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.23.0:2.23.0
-google-cloud-datastore-bom:2.23.0:2.23.0
-proto-google-cloud-datastore-v1:0.114.0:0.114.0
-datastore-v1-proto-client:2.23.0:2.23.0
-proto-google-cloud-datastore-admin-v1:2.23.0:2.23.0
-grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.0
+google-cloud-datastore:2.23.0:2.23.1-SNAPSHOT
+google-cloud-datastore-bom:2.23.0:2.23.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.114.0:0.114.1-SNAPSHOT
+datastore-v1-proto-client:2.23.0:2.23.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT

From 67f41ffe47cc1b88c6580702048c08a4a9e2d5f1 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:29:57 -0400
Subject: [PATCH 1475/1784] chore: Update generation configuration at Thu Oct
 24 02:23:46 UTC 2024 (#1629)

* chore: Update generation configuration at Wed Oct 23 02:23:50 UTC 2024

* chore: Update generation configuration at Thu Oct 24 02:23:46 UTC 2024

* chore: generate libraries at Thu Oct 24 02:24:14 UTC 2024
---
 generation_config.yaml                         |  4 ++--
 .../reflect-config.json                        | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index f8e731ddce0e..5efd31c259b5 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.47.0
-googleapis_commitish: beea48a164c2a8cc8485185c3a4f56c587090e1a
+gapic_generator_version: 2.48.0
+googleapis_commitish: 7d0624db6f5b5b7d8f5cf36571b33ded2067c5e1
 libraries_bom_version: 26.49.0
 libraries:
   - api_shortname: datastore
diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
index e4ca7ae5ff36..dfe00073075b 100644
--- a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
+++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json
@@ -395,6 +395,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.api.SelectiveGapicGeneration",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.SelectiveGapicGeneration$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.datastore.admin.v1.CommonMetadata",
     "queryAllDeclaredConstructors": true,

From d3bce79467254b3128a8f16d5754e91d29ece525 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 24 Oct 2024 19:33:03 +0200
Subject: [PATCH 1476/1784] deps: update googleapis/sdk-platform-java action to
 v2.48.0 (#1628)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 9399ebef235b..4943e3e93ee1 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.47.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.48.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From c44f17a7bb93d688367611ee2533c59c940ae61f Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:59:15 -0700
Subject: [PATCH 1477/1784] fix(sample): change update entity sample to use
 transaction (#1633)

---
 .../com/google/datastore/snippets/ConceptsTest.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 1397728ba719..045b16a9ab45 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -297,8 +297,17 @@ public void testLookup() {
   public void testUpdate() {
     datastore.put(testEntity);
     // [START datastore_update]
-    Entity task = Entity.newBuilder(datastore.get(taskKey)).set("priority", 5).build();
-    datastore.update(task);
+    Entity task;
+    Transaction txn = datastore.newTransaction();
+    try {
+      task = Entity.newBuilder(txn.get(taskKey)).set("priority", 5).build();
+      txn.put(task);
+      txn.commit();
+    } finally {
+      if (txn.isActive()) {
+        txn.rollback();
+      }
+    }
     // [END datastore_update]
     assertEquals(task, datastore.get(taskKey));
   }

From 6453f1e44f370a13434ef68295ae5638612032c8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 25 Oct 2024 00:59:23 +0200
Subject: [PATCH 1478/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.38.0 (#1632)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 8e4ccadbdda5..e53ea6bf9e48 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.37.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.38.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 5cb66b4fe8c0..49b4cde5f5e8 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.37.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 11c4b309b42c..d486f7e50dad 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.37.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 73f8b5cbe252..b5d0bd9195ff 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.37.0
+    3.38.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 108aca675c61..2ea152f6c652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.37.0
+    3.38.0
   
 
   

From 51b7e35574e4dbf253734b504a877c8a19c2c75b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:22:22 -0700
Subject: [PATCH 1479/1784] chore(main): release 2.24.0 (#1631)

* chore(main): release 2.24.0

* chore: generate libraries at Thu Oct 24 23:00:05 UTC 2024

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 18 ++++++++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34aeb6370fb4..cd4b9d6f9984 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.24.0](https://github.com/googleapis/java-datastore/compare/v2.23.0...v2.24.0) (2024-10-24)
+
+
+### Features
+
+* Add FindNearest API to the stable branch ([3512ba2](https://github.com/googleapis/java-datastore/commit/3512ba2f1bcd358e3c39c36944e05873b3f25f51))
+
+
+### Bug Fixes
+
+* **sample:** Change update entity sample to use transaction ([#1633](https://github.com/googleapis/java-datastore/issues/1633)) ([c44f17a](https://github.com/googleapis/java-datastore/commit/c44f17a7bb93d688367611ee2533c59c940ae61f))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.38.0 ([#1632](https://github.com/googleapis/java-datastore/issues/1632)) ([6453f1e](https://github.com/googleapis/java-datastore/commit/6453f1e44f370a13434ef68295ae5638612032c8))
+* Update googleapis/sdk-platform-java action to v2.48.0 ([#1628](https://github.com/googleapis/java-datastore/issues/1628)) ([d3bce79](https://github.com/googleapis/java-datastore/commit/d3bce79467254b3128a8f16d5754e91d29ece525))
+
 ## [2.23.0](https://github.com/googleapis/java-datastore/compare/v2.22.0...v2.23.0) (2024-10-14)
 
 
diff --git a/README.md b/README.md
index a6a76d6c5cb4..bd795fe50a4c 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.23.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.24.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.23.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.0"
 ```
 
 ## Authentication
@@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.23.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6e3f7cfc97d3..59dfb497923a 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.23.1-SNAPSHOT
+  2.24.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.1-SNAPSHOT
+    2.24.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b5d0bd9195ff..8f22264e04dd 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.23.1-SNAPSHOT
+  2.24.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.23.1-SNAPSHOT
+        2.24.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.23.1-SNAPSHOT
+        2.24.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.114.1-SNAPSHOT
+        0.115.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.23.1-SNAPSHOT
+        2.24.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 11e6620ea00c..b6a7829a5121 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.23.1-SNAPSHOT
+  2.24.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.1-SNAPSHOT
+    2.24.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 36820f768661..d0e64f478070 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.23.1-SNAPSHOT
+  2.24.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.1-SNAPSHOT
+    2.24.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 2ea152f6c652..c0e18bc930f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.23.1-SNAPSHOT
+  2.24.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.23.1-SNAPSHOT
+        2.24.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.23.1-SNAPSHOT
+        2.24.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.23.1-SNAPSHOT
+        2.24.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.114.1-SNAPSHOT
+        0.115.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.23.1-SNAPSHOT
+        2.24.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 621327b74abe..fe5016f50747 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.23.1-SNAPSHOT
+  2.24.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.1-SNAPSHOT
+    2.24.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index c07b7321e401..fb92c3d744cf 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.114.1-SNAPSHOT
+  0.115.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.23.1-SNAPSHOT
+    2.24.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 04401d182c2e..3c12a17253db 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.23.1-SNAPSHOT
+      2.24.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 1d3d32591af3..cbf5e4466dba 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.23.0:2.23.1-SNAPSHOT
-google-cloud-datastore-bom:2.23.0:2.23.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.114.0:0.114.1-SNAPSHOT
-datastore-v1-proto-client:2.23.0:2.23.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT
+google-cloud-datastore:2.24.0:2.24.0
+google-cloud-datastore-bom:2.24.0:2.24.0
+proto-google-cloud-datastore-v1:0.115.0:0.115.0
+datastore-v1-proto-client:2.24.0:2.24.0
+proto-google-cloud-datastore-admin-v1:2.24.0:2.24.0
+grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.0

From 57598d7d59cd6917f23a653403613e4edc160c64 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 28 Oct 2024 17:34:40 +0100
Subject: [PATCH 1480/1784] deps: update googleapis/sdk-platform-java action to
 v2.49.0 (#1638)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 4943e3e93ee1..46b80edc1c7f 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.48.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.49.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From bff8540a88e12a60103caa34ddef5e53433dcbbb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 09:34:58 -0700
Subject: [PATCH 1481/1784] chore(main): release 2.24.1-SNAPSHOT (#1635)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 59dfb497923a..7393d37da812 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.24.0
+  2.24.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.0
+    2.24.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8f22264e04dd..ea57703ec9e2 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.24.0
+  2.24.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.0
+        2.24.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.0
+        2.24.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.0
+        0.115.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.0
+        2.24.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b6a7829a5121..115c1ec4a24e 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.0
+  2.24.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.0
+    2.24.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d0e64f478070..879820cf2c19 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.24.0
+  2.24.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.0
+    2.24.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index c0e18bc930f2..a14bafbe852b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.0
+  2.24.1-SNAPSHOT
   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.24.0
+        2.24.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.0
+        2.24.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.0
+        2.24.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.0
+        0.115.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.0
+        2.24.1-SNAPSHOT
         
           
             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 fe5016f50747..ca0d206f6ee4 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.24.0
+  2.24.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.0
+    2.24.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index fb92c3d744cf..ffec1dc62bb2 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.115.0
+  0.115.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.0
+    2.24.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3c12a17253db..cfb3a5b62d43 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.0
+      2.24.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index cbf5e4466dba..71a58858fcb2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.0:2.24.0
-google-cloud-datastore-bom:2.24.0:2.24.0
-proto-google-cloud-datastore-v1:0.115.0:0.115.0
-datastore-v1-proto-client:2.24.0:2.24.0
-proto-google-cloud-datastore-admin-v1:2.24.0:2.24.0
-grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.0
+google-cloud-datastore:2.24.0:2.24.1-SNAPSHOT
+google-cloud-datastore-bom:2.24.0:2.24.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.115.0:0.115.1-SNAPSHOT
+datastore-v1-proto-client:2.24.0:2.24.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT

From 6bc3f1b5198427195a3394c3770328220090365d Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:58:20 -0400
Subject: [PATCH 1482/1784] chore: Update generation configuration at Sun Oct
 27 02:26:19 UTC 2024 (#1634)

* chore: Update generation configuration at Fri Oct 25 02:24:17 UTC 2024

* chore: Update generation configuration at Sat Oct 26 02:21:39 UTC 2024

* chore: Update generation configuration at Sun Oct 27 02:26:19 UTC 2024
---
 generation_config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 5efd31c259b5..f2751f7dc7a2 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.48.0
-googleapis_commitish: 7d0624db6f5b5b7d8f5cf36571b33ded2067c5e1
+gapic_generator_version: 2.49.0
+googleapis_commitish: 48d30c4966ef9ea31b897e13f75d8f94070cc8e9
 libraries_bom_version: 26.49.0
 libraries:
   - api_shortname: datastore

From fe61f6691a5e3c8fbfc974b6fe613a69652241ca Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 28 Oct 2024 18:16:30 +0100
Subject: [PATCH 1483/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.39.0 (#1640)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index e53ea6bf9e48..f1796d28650a 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.38.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.39.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 49b4cde5f5e8..e8c154f481a2 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index d486f7e50dad..046dc8df4ef1 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ea57703ec9e2..15b54408c3d7 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.38.0
+    3.39.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index a14bafbe852b..415bbbf63c10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.38.0
+    3.39.0
   
 
   

From 5899f7c471792af054954b7e44c2d04cb44b3121 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:48:12 -0700
Subject: [PATCH 1484/1784] chore(main): release 2.24.1 (#1641)

* chore(main): release 2.24.1

* chore: generate libraries at Mon Oct 28 17:17:32 UTC 2024

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  |  8 ++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd4b9d6f9984..b76fbc206e08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.24.1](https://github.com/googleapis/java-datastore/compare/v2.24.0...v2.24.1) (2024-10-28)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.39.0 ([#1640](https://github.com/googleapis/java-datastore/issues/1640)) ([fe61f66](https://github.com/googleapis/java-datastore/commit/fe61f6691a5e3c8fbfc974b6fe613a69652241ca))
+* Update googleapis/sdk-platform-java action to v2.49.0 ([#1638](https://github.com/googleapis/java-datastore/issues/1638)) ([57598d7](https://github.com/googleapis/java-datastore/commit/57598d7d59cd6917f23a653403613e4edc160c64))
+
 ## [2.24.0](https://github.com/googleapis/java-datastore/compare/v2.23.0...v2.24.0) (2024-10-24)
 
 
diff --git a/README.md b/README.md
index bd795fe50a4c..ef03d1261f9b 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.24.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.24.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.1"
 ```
 
 ## Authentication
@@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7393d37da812..235be990e904 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.24.1-SNAPSHOT
+  2.24.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1-SNAPSHOT
+    2.24.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 15b54408c3d7..627c32f586fd 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.24.1-SNAPSHOT
+  2.24.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.1-SNAPSHOT
+        2.24.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.1-SNAPSHOT
+        2.24.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.1-SNAPSHOT
+        0.115.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.1-SNAPSHOT
+        2.24.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 115c1ec4a24e..6f39d39225f2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.1-SNAPSHOT
+  2.24.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1-SNAPSHOT
+    2.24.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 879820cf2c19..ebe1b66cd5d3 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.24.1-SNAPSHOT
+  2.24.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1-SNAPSHOT
+    2.24.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 415bbbf63c10..b4211aa32fae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.1-SNAPSHOT
+  2.24.1
   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.24.1-SNAPSHOT
+        2.24.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.1-SNAPSHOT
+        2.24.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.1-SNAPSHOT
+        2.24.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.1-SNAPSHOT
+        0.115.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.1-SNAPSHOT
+        2.24.1
         
           
             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 ca0d206f6ee4..1c19e4ab33dd 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.24.1-SNAPSHOT
+  2.24.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1-SNAPSHOT
+    2.24.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ffec1dc62bb2..f8d1b8c04dd5 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.115.1-SNAPSHOT
+  0.115.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1-SNAPSHOT
+    2.24.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index cfb3a5b62d43..46881f45b655 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.1-SNAPSHOT
+      2.24.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 71a58858fcb2..6939d61e96cb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.0:2.24.1-SNAPSHOT
-google-cloud-datastore-bom:2.24.0:2.24.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.115.0:0.115.1-SNAPSHOT
-datastore-v1-proto-client:2.24.0:2.24.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT
+google-cloud-datastore:2.24.1:2.24.1
+google-cloud-datastore-bom:2.24.1:2.24.1
+proto-google-cloud-datastore-v1:0.115.1:0.115.1
+datastore-v1-proto-client:2.24.1:2.24.1
+proto-google-cloud-datastore-admin-v1:2.24.1:2.24.1
+grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.1

From 173a88330cc5693f54504348cf39bf3191db2250 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:29:03 -0700
Subject: [PATCH 1485/1784] fix(doc): Add discriptions for TransactionCallable
 interface (#1644)

* fix(doc): Add discriptions for TransactionCallable interface

* chore: generate libraries at Mon Oct 28 22:49:19 UTC 2024

---------

Co-authored-by: cloud-java-bot 
---
 .../main/java/com/google/cloud/datastore/Datastore.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index 5bd8384a35d4..45cecbf2585b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -51,6 +51,13 @@ public interface Datastore extends Service, DatastoreReaderWri
    * @param  the type of the return value
    */
   interface TransactionCallable {
+    /**
+     * Callback's invoke method for the TransactionCallable.
+     *
+     * @param readerWriter DatastoreReaderWriter associated with the new transaction
+     * @return T The transaction result
+     * @throws Exception upon failure
+     */
     T run(DatastoreReaderWriter readerWriter) throws Exception;
   }
 

From 11892116f0fb8eacb711a8f48e780e48a232f987 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:29:18 -0700
Subject: [PATCH 1486/1784] fix(doc): Fix return types for batch interface
 (#1645)

* fix(doc): Fix return types for batch interface

* chore: generate libraries at Tue Oct 29 00:30:42 UTC 2024

---------

Co-authored-by: cloud-java-bot 
---
 .../com/google/cloud/datastore/Batch.java     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
index eb4abd854bf1..882a4db2514a 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
@@ -53,9 +53,13 @@ interface Response {
   /**
    * {@inheritDoc}
    *
-   * 
    If an entity for {@code entity.getKey()} does not exists, {@code entity} is inserted.
+   * 
    If an entity for {@code entity.getKey()} does not exist, {@code entity} is inserted.
    * Otherwise, {@link #submit()} will throw a {@link DatastoreException} with {@link
    * DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}.
+   *
+   * @param entity the entity to be added to the datastore
+   * @return The entity that was added
+   * @throws DatastoreException if there was any failure
    */
   @Override
   Entity add(FullEntity entity);
@@ -67,6 +71,10 @@ interface Response {
    * exists, {@link #submit()} will throw a {@link DatastoreException} with {@link
    * DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in {@code
    * entities} whose key did not exist are inserted.
+   *
+   * @param entities entities to be added to the datastore
+   * @return A list of entities that have been added
+   * @throws DatastoreException if there was any failure
    */
   @Override
   List add(FullEntity... entities);
@@ -74,10 +82,15 @@ interface Response {
   /**
    * Submit the batch to the Datastore.
    *
-   * @throws DatastoreException if there was any failure or if batch is not longer active
+   * @return Response of the batch submit operation.
+   * @throws DatastoreException if there was any failure or if batch is no longer active
    */
   Response submit();
 
-  /** Returns the batch associated {@link Datastore}. */
+  /**
+   * Returns the batch associated {@link Datastore}.
+   *
+   * @return The batch associated datastore
+   */
   Datastore getDatastore();
 }

From cb6a8fc24dc11b868441fe8d9d6d95598218084e Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:31:07 -0400
Subject: [PATCH 1487/1784] chore: Update generation configuration at Tue Oct
 29 02:24:47 UTC 2024 (#1646)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index f2751f7dc7a2..17098ace7f5c 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.49.0
-googleapis_commitish: 48d30c4966ef9ea31b897e13f75d8f94070cc8e9
+googleapis_commitish: ba8ea80f25d19bde8501cd51f314391f8d39bde8
 libraries_bom_version: 26.49.0
 libraries:
   - api_shortname: datastore

From 29daac0e23ec9c7fe9beccda4953550e098a3ea5 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 30 Oct 2024 13:15:46 -0400
Subject: [PATCH 1488/1784] chore: Update generation configuration at Wed Oct
 30 02:24:22 UTC 2024 (#1647)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 17098ace7f5c..b94bf11c9d2b 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.49.0
-googleapis_commitish: ba8ea80f25d19bde8501cd51f314391f8d39bde8
+googleapis_commitish: f108d78638893ec91cc0d71222ed3d9a048f7a98
 libraries_bom_version: 26.49.0
 libraries:
   - api_shortname: datastore

From ef586eaf4b2e0f45e7d8d68841edf92ec77b6ec3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:30:24 +0000
Subject: [PATCH 1489/1784] chore(main): release 2.24.2-SNAPSHOT (#1643)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 235be990e904..139de8788320 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.24.1
+  2.24.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1
+    2.24.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 627c32f586fd..2106efa7e1d2 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.24.1
+  2.24.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.1
+        2.24.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.1
+        2.24.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.1
+        0.115.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.1
+        2.24.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6f39d39225f2..259614fdd615 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.1
+  2.24.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1
+    2.24.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index ebe1b66cd5d3..044dd0a77e44 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.24.1
+  2.24.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1
+    2.24.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index b4211aa32fae..170cd3609b11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.1
+  2.24.2-SNAPSHOT
   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.24.1
+        2.24.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.1
+        2.24.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.1
+        2.24.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.1
+        0.115.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.1
+        2.24.2-SNAPSHOT
         
           
             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 1c19e4ab33dd..a592fc19181a 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.24.1
+  2.24.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1
+    2.24.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f8d1b8c04dd5..ca0f3b6635cc 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.115.1
+  0.115.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.1
+    2.24.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 46881f45b655..cd9f2fd3ceea 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.1
+      2.24.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 6939d61e96cb..3b0af5d9e68d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.1:2.24.1
-google-cloud-datastore-bom:2.24.1:2.24.1
-proto-google-cloud-datastore-v1:0.115.1:0.115.1
-datastore-v1-proto-client:2.24.1:2.24.1
-proto-google-cloud-datastore-admin-v1:2.24.1:2.24.1
-grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.1
+google-cloud-datastore:2.24.1:2.24.2-SNAPSHOT
+google-cloud-datastore-bom:2.24.1:2.24.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.115.1:0.115.2-SNAPSHOT
+datastore-v1-proto-client:2.24.1:2.24.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT

From 29f818562fa994dd6dac1743ee21e4292a88bb7d Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 31 Oct 2024 12:37:27 -0400
Subject: [PATCH 1490/1784] chore: Update generation configuration at Thu Oct
 31 02:24:55 UTC 2024 (#1649)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index b94bf11c9d2b..c74ee03aa053 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.49.0
-googleapis_commitish: f108d78638893ec91cc0d71222ed3d9a048f7a98
+googleapis_commitish: 8c534a5c3afe69eeca1b9d4c8415d6d1952aa5ce
 libraries_bom_version: 26.49.0
 libraries:
   - api_shortname: datastore

From adf7a547e0534e7f351d91c69520e5dc5f4e0aa8 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:57:46 -0500
Subject: [PATCH 1491/1784] chore: Update generation configuration at Sat Nov 
 2 02:22:17 UTC 2024 (#1650)

* chore: Update generation configuration at Fri Nov  1 02:27:18 UTC 2024

* chore: Update generation configuration at Sat Nov  2 02:22:17 UTC 2024

* chore: generate libraries at Sat Nov  2 02:22:55 UTC 2024
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ef03d1261f9b..78621b205829 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.49.0')
+implementation platform('com.google.cloud:libraries-bom:26.50.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index c74ee03aa053..a370f19613c8 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.49.0
-googleapis_commitish: 8c534a5c3afe69eeca1b9d4c8415d6d1952aa5ce
-libraries_bom_version: 26.49.0
+googleapis_commitish: 9b94dba2f7f4b601f8232bc3a3f6ef32665279b9
+libraries_bom_version: 26.50.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 8f32aca4bd779f552c21bf2f7044367214888912 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 4 Nov 2024 18:38:27 +0100
Subject: [PATCH 1492/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.50.0 (#1613)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 677692680acf..d31d40cb9193 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.47.0
+        26.50.0
         pom
         import
       

From 92952c8e033aaeed7f0dcded1226bbaed577e140 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 4 Nov 2024 18:38:39 +0100
Subject: [PATCH 1493/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.24.1 (#1624)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index c39bbf20b2a6..30cba8255eef 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.22.0
+      2.24.1
     
     
 

From 61a1c2b791a4ae01413ca0006d945ffce547a3bc Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:17:20 -0500
Subject: [PATCH 1494/1784] chore: Update generation configuration at Tue Nov 
 5 02:22:24 UTC 2024 (#1652)

* chore: Update generation configuration at Tue Nov  5 02:22:24 UTC 2024

* chore: generate libraries at Tue Nov  5 02:23:04 UTC 2024
---
 README.md              | 4 ++--
 generation_config.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 78621b205829..5618dd688772 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.47.0
+      26.50.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.22.0
+  2.24.1
 
 
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index a370f19613c8..ec3f32594f8b 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.49.0
-googleapis_commitish: 9b94dba2f7f4b601f8232bc3a3f6ef32665279b9
+googleapis_commitish: 1f2e5aab4f95b9bd38dd1ac8c7486657f93c1975
 libraries_bom_version: 26.50.0
 libraries:
   - api_shortname: datastore

From d05d1a47bda7de457147d5716bc6b1fa9538f59f Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:12:25 -0500
Subject: [PATCH 1495/1784] chore: Update generation configuration at Wed Nov 
 6 02:21:44 UTC 2024 (#1653)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index ec3f32594f8b..87be80054b2f 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.49.0
-googleapis_commitish: 1f2e5aab4f95b9bd38dd1ac8c7486657f93c1975
+googleapis_commitish: 5e306b977beaf42766855a4a26ebe1f2dd133d92
 libraries_bom_version: 26.50.0
 libraries:
   - api_shortname: datastore

From 73460e064545222739c6ce69ac0b8a99c3fa267a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 12:20:15 -0800
Subject: [PATCH 1496/1784] chore(main): release 2.24.2 (#1648)

* chore(main): release 2.24.2

* chore: generate libraries at Wed Nov  6 21:13:30 UTC 2024

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  |  8 ++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b76fbc206e08..36d4e90cfc03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.24.2](https://github.com/googleapis/java-datastore/compare/v2.24.1...v2.24.2) (2024-11-06)
+
+
+### Bug Fixes
+
+* **doc:** Add discriptions for TransactionCallable interface ([#1644](https://github.com/googleapis/java-datastore/issues/1644)) ([173a883](https://github.com/googleapis/java-datastore/commit/173a88330cc5693f54504348cf39bf3191db2250))
+* **doc:** Fix return types for batch interface ([#1645](https://github.com/googleapis/java-datastore/issues/1645)) ([1189211](https://github.com/googleapis/java-datastore/commit/11892116f0fb8eacb711a8f48e780e48a232f987))
+
 ## [2.24.1](https://github.com/googleapis/java-datastore/compare/v2.24.0...v2.24.1) (2024-10-28)
 
 
diff --git a/README.md b/README.md
index 5618dd688772..536b57f4cf18 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.24.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.24.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.2"
 ```
 
 ## Authentication
@@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 139de8788320..31e19645e008 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.24.2-SNAPSHOT
+  2.24.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2-SNAPSHOT
+    2.24.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2106efa7e1d2..f9b016415bd0 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.24.2-SNAPSHOT
+  2.24.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.2-SNAPSHOT
+        2.24.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.2-SNAPSHOT
+        2.24.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.2-SNAPSHOT
+        0.115.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.2-SNAPSHOT
+        2.24.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 259614fdd615..419bd87aedbe 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.2-SNAPSHOT
+  2.24.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2-SNAPSHOT
+    2.24.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 044dd0a77e44..cfd79c52dc82 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.24.2-SNAPSHOT
+  2.24.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2-SNAPSHOT
+    2.24.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 170cd3609b11..e3c13861578b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.2-SNAPSHOT
+  2.24.2
   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.24.2-SNAPSHOT
+        2.24.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.2-SNAPSHOT
+        2.24.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.2-SNAPSHOT
+        2.24.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.2-SNAPSHOT
+        0.115.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.2-SNAPSHOT
+        2.24.2
         
           
             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 a592fc19181a..02befd0a5f39 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.24.2-SNAPSHOT
+  2.24.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2-SNAPSHOT
+    2.24.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ca0f3b6635cc..47bbefce703e 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.115.2-SNAPSHOT
+  0.115.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2-SNAPSHOT
+    2.24.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index cd9f2fd3ceea..3e017bbe24a9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.2-SNAPSHOT
+      2.24.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 3b0af5d9e68d..5a01f70c6486 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.1:2.24.2-SNAPSHOT
-google-cloud-datastore-bom:2.24.1:2.24.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.115.1:0.115.2-SNAPSHOT
-datastore-v1-proto-client:2.24.1:2.24.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT
+google-cloud-datastore:2.24.2:2.24.2
+google-cloud-datastore-bom:2.24.2:2.24.2
+proto-google-cloud-datastore-v1:0.115.2:0.115.2
+datastore-v1-proto-client:2.24.2:2.24.2
+proto-google-cloud-datastore-admin-v1:2.24.2:2.24.2
+grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.2

From dc9258c6fd5212df1aaaee55665e7955dc5a3ded Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:55:07 -0500
Subject: [PATCH 1497/1784] chore: Update generation configuration at Tue Nov
 12 02:21:13 UTC 2024 (#1654)

* chore: Update generation configuration at Thu Nov  7 02:22:45 UTC 2024

* chore: Update generation configuration at Fri Nov  8 02:22:33 UTC 2024

* chore: Update generation configuration at Sat Nov  9 02:19:26 UTC 2024

* chore: Update generation configuration at Tue Nov 12 02:21:13 UTC 2024
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 87be80054b2f..273697bc6bd0 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.49.0
-googleapis_commitish: 5e306b977beaf42766855a4a26ebe1f2dd133d92
+googleapis_commitish: 5257378f52352e70b8995713f0d4484bdab7e71d
 libraries_bom_version: 26.50.0
 libraries:
   - api_shortname: datastore

From 21f1a221b7d0501ca702ea07fc57a3c1f7423a17 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 10:09:00 -0800
Subject: [PATCH 1498/1784] chore(main): release 2.24.3-SNAPSHOT (#1655)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 31e19645e008..34fe5986677d 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.24.2
+  2.24.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2
+    2.24.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f9b016415bd0..3c28596431f0 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.24.2
+  2.24.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.2
+        2.24.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.2
+        2.24.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.2
+        0.115.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.2
+        2.24.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 419bd87aedbe..2b173dbda1cd 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.2
+  2.24.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2
+    2.24.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index cfd79c52dc82..618e4a11468c 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.24.2
+  2.24.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2
+    2.24.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index e3c13861578b..9384a3f1c089 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.2
+  2.24.3-SNAPSHOT
   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.24.2
+        2.24.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.2
+        2.24.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.2
+        2.24.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.2
+        0.115.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.2
+        2.24.3-SNAPSHOT
         
           
             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 02befd0a5f39..0e54ae372054 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.24.2
+  2.24.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2
+    2.24.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 47bbefce703e..7047f6a30dec 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.115.2
+  0.115.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.2
+    2.24.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3e017bbe24a9..999da4b70594 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.2
+      2.24.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 5a01f70c6486..eb2d903931bf 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.2:2.24.2
-google-cloud-datastore-bom:2.24.2:2.24.2
-proto-google-cloud-datastore-v1:0.115.2:0.115.2
-datastore-v1-proto-client:2.24.2:2.24.2
-proto-google-cloud-datastore-admin-v1:2.24.2:2.24.2
-grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.2
+google-cloud-datastore:2.24.2:2.24.3-SNAPSHOT
+google-cloud-datastore-bom:2.24.2:2.24.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.115.2:0.115.3-SNAPSHOT
+datastore-v1-proto-client:2.24.2:2.24.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT

From b4d3ab9a72bb2a4dff59bf54abcc5d9536b2596b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 18 Nov 2024 19:11:25 +0100
Subject: [PATCH 1499/1784] deps: update sdk platform java dependencies (#1662)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 .github/workflows/unmanaged_dependency_check.yaml  | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native.cfg               | 2 +-
 google-cloud-datastore-bom/pom.xml                 | 2 +-
 pom.xml                                            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 46b80edc1c7f..35aa3b151d65 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.49.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.50.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index f1796d28650a..0ee0f5aaa912 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.39.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.40.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index e8c154f481a2..aabe0f1f99a9 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.40.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 046dc8df4ef1..4b9610ffcca3 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.40.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3c28596431f0..62f90d65fcf4 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.39.0
+    3.40.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 9384a3f1c089..f8f609aeef94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.39.0
+    3.40.0
   
 
   

From 7d247a89be1abc0249ca530c37b526088b7b0bf8 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:18:21 -0500
Subject: [PATCH 1500/1784] chore: Update generation configuration at Mon Nov
 18 02:27:15 UTC 2024 (#1657)

* chore: Update generation configuration at Wed Nov 13 02:22:54 UTC 2024

* chore: Update generation configuration at Thu Nov 14 02:23:22 UTC 2024

* chore: Update generation configuration at Fri Nov 15 02:26:26 UTC 2024

* chore: Update generation configuration at Sat Nov 16 02:25:10 UTC 2024

* chore: Update generation configuration at Mon Nov 18 02:27:15 UTC 2024
---
 generation_config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 273697bc6bd0..0294465376db 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.49.0
-googleapis_commitish: 5257378f52352e70b8995713f0d4484bdab7e71d
+gapic_generator_version: 2.50.0
+googleapis_commitish: 0b5613ee74c9558dd284aa2b01a585ce297c0045
 libraries_bom_version: 26.50.0
 libraries:
   - api_shortname: datastore

From 5d5f1db4c5d183602badabd90d8e0759bcadb406 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 11:04:10 -0800
Subject: [PATCH 1501/1784] chore(main): release 2.24.3 (#1665)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++++++
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36d4e90cfc03..07cf43d6dec3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.24.3](https://github.com/googleapis/java-datastore/compare/v2.24.2...v2.24.3) (2024-11-18)
+
+
+### Dependencies
+
+* Update sdk platform java dependencies ([#1662](https://github.com/googleapis/java-datastore/issues/1662)) ([b4d3ab9](https://github.com/googleapis/java-datastore/commit/b4d3ab9a72bb2a4dff59bf54abcc5d9536b2596b))
+
 ## [2.24.2](https://github.com/googleapis/java-datastore/compare/v2.24.1...v2.24.2) (2024-11-06)
 
 
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 34fe5986677d..81f589e82595 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.24.3-SNAPSHOT
+  2.24.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3-SNAPSHOT
+    2.24.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 62f90d65fcf4..c44f4504046c 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.24.3-SNAPSHOT
+  2.24.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.3-SNAPSHOT
+        2.24.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.3-SNAPSHOT
+        2.24.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.3-SNAPSHOT
+        0.115.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.3-SNAPSHOT
+        2.24.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2b173dbda1cd..6c8dbf1564e7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.3-SNAPSHOT
+  2.24.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3-SNAPSHOT
+    2.24.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 618e4a11468c..bc6da09a2ba5 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.24.3-SNAPSHOT
+  2.24.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3-SNAPSHOT
+    2.24.3
   
   
     
diff --git a/pom.xml b/pom.xml
index f8f609aeef94..010f41c6baa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.3-SNAPSHOT
+  2.24.3
   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.24.3-SNAPSHOT
+        2.24.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.3-SNAPSHOT
+        2.24.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.3-SNAPSHOT
+        2.24.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.3-SNAPSHOT
+        0.115.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.3-SNAPSHOT
+        2.24.3
         
           
             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 0e54ae372054..e0eb6c902b12 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.24.3-SNAPSHOT
+  2.24.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3-SNAPSHOT
+    2.24.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7047f6a30dec..49d767dfb72f 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.115.3-SNAPSHOT
+  0.115.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3-SNAPSHOT
+    2.24.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 999da4b70594..e484c2694f48 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.3-SNAPSHOT
+      2.24.3
     
     
 
diff --git a/versions.txt b/versions.txt
index eb2d903931bf..99f46fe1905c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.2:2.24.3-SNAPSHOT
-google-cloud-datastore-bom:2.24.2:2.24.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.115.2:0.115.3-SNAPSHOT
-datastore-v1-proto-client:2.24.2:2.24.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT
+google-cloud-datastore:2.24.3:2.24.3
+google-cloud-datastore-bom:2.24.3:2.24.3
+proto-google-cloud-datastore-v1:0.115.3:0.115.3
+datastore-v1-proto-client:2.24.3:2.24.3
+proto-google-cloud-datastore-admin-v1:2.24.3:2.24.3
+grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.3

From 8244ad258a90e5bbc7e7d8ec384555b2be84ab8f Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:50:00 -0500
Subject: [PATCH 1502/1784] chore: Update generation configuration at Wed Nov
 20 02:25:57 UTC 2024 (#1669)

* chore: Update generation configuration at Tue Nov 19 02:26:26 UTC 2024

* chore: generate libraries at Tue Nov 19 02:27:03 UTC 2024

* chore: Update generation configuration at Wed Nov 20 02:25:57 UTC 2024
---
 README.md                                     |  6 +-
 generation_config.yaml                        |  2 +-
 .../admin/v1/DatastoreAdminSettings.java      |  2 +-
 .../v1/stub/DatastoreAdminStubSettings.java   | 60 +++++++++----------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 536b57f4cf18..f059e75ed4d0 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.24.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.24.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.3"
 ```
 
 ## Authentication
@@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/generation_config.yaml b/generation_config.yaml
index 0294465376db..b9de0b0191e1 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.50.0
-googleapis_commitish: 0b5613ee74c9558dd284aa2b01a585ce297c0045
+googleapis_commitish: a547fc1420eb0a0f3ae32b0a4eb72d3b8b17d136
 libraries_bom_version: 26.50.0
 libraries:
   - api_shortname: datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index cafef310effc..4db454e2066d 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -117,7 +117,7 @@
  *         RetrySettings.newBuilder()
  *             .setInitialRetryDelayDuration(Duration.ofMillis(500))
  *             .setRetryDelayMultiplier(1.5)
- *             .setMaxRetryDelay(Duration.ofMillis(5000))
+ *             .setMaxRetryDelayDuration(Duration.ofMillis(5000))
  *             .setTotalTimeoutDuration(Duration.ofHours(24))
  *             .build());
  * datastoreAdminSettingsBuilder
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 82df00c03bd8..aa10d582f2fb 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -67,9 +67,9 @@
 import com.google.longrunning.Operation;
 import com.google.protobuf.Empty;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.List;
 import javax.annotation.Generated;
-import org.threeten.bp.Duration;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
@@ -138,7 +138,7 @@
  *         RetrySettings.newBuilder()
  *             .setInitialRetryDelayDuration(Duration.ofMillis(500))
  *             .setRetryDelayMultiplier(1.5)
- *             .setMaxRetryDelay(Duration.ofMillis(5000))
+ *             .setMaxRetryDelayDuration(Duration.ofMillis(5000))
  *             .setTotalTimeoutDuration(Duration.ofHours(24))
  *             .build());
  * datastoreAdminSettingsBuilder
@@ -449,21 +449,21 @@ public static class Builder extends StubSettings.Builder
Date: Wed, 20 Nov 2024 13:35:07 -0500
Subject: [PATCH 1503/1784] chore: make library generation required (#1672)

* chore: make library generation required

* chore: generate libraries at Tue Nov 19 22:29:32 UTC 2024

---------

Co-authored-by: cloud-java-bot 
---
 .github/sync-repo-settings.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index fce568dc2970..bd6908f9180f 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -18,6 +18,7 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
+      - library_generation
   - pattern: 1.106.5-sp
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From 593c50c34849c0f967822e05bfd3859eacedd99c Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Wed, 20 Nov 2024 16:21:56 -0800
Subject: [PATCH 1504/1784] chore: disable V3-experimental branch rules (#1668)

* chore:Disable v3-experimental branch rules

* chore: generate libraries at Tue Nov 19 00:24:17 UTC 2024

---------

Co-authored-by: cloud-java-bot 
---
 .github/dependabot.yml          | 13 +------------
 .github/sync-repo-settings.yaml | 16 ----------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3a7c9a454e7a..2afe7bfe7318 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,15 +17,4 @@ updates:
     # If a security vulnerability comes in, we will be notified about 
     # it via template in the synthtool repository.
     ignore:
-      - dependency-name: "*"
-      
-  # rules for the `V3-experimental` branch
-  - package-ecosystem: maven
-    directory: "/"
-    schedule:
-      interval: daily
-    commit-message:
-      # Prefix all commit messages with "deps: "
-      prefix: "deps"
-    open-pull-requests-limit: 10
-    target-branch: "V3-experimental"
+      - dependency-name: "*"
\ No newline at end of file
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index bd6908f9180f..ab421dce583f 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -108,22 +108,6 @@ branchProtectionRules:
       - cla/google
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
-  - pattern: V3-experimental
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
   - pattern: 2.15.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From 5a78a8075867f4b2fc598f0423bd2ab65b559856 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Wed, 27 Nov 2024 19:06:20 -0500
Subject: [PATCH 1505/1784] feat: introduce `java.time` methods and variables
 (#1671)

This PR introduces `java.time` alternatives to existing `org.threeten.bp.*` methods, as well as switching internal variables (if any) to `java.time`

The main constraint is to keep the changes backwards compatible, so for each existing threeten method "`method1(org.threeten.bp.Duration)`" we will add an alternative with a _Duration_ (or _Timestamp_ when applicable) suffix: "`method1Duration(java.time.Duration)`".

For most cases, the implementation will be held in the `java.time` method and the old threeten method will just delegate the call to it. However, for the case of abstract classes, the implementation will be kept in the threeten method to avoid breaking changes (i.e. users that already overloaded the method in their user code).
---
 .../datastore/models/ExecutionStats.java      | 16 ++++++++++----
 .../testing/LocalDatastoreHelper.java         | 22 ++++++++++++++-----
 .../google/cloud/datastore/DatastoreTest.java |  4 ++--
 .../cloud/datastore/it/ITDatastoreTest.java   |  4 ++--
 .../datastore/models/ExecutionStatsTest.java  |  4 ++--
 .../testing/ITLocalDatastoreHelperTest.java   |  6 ++---
 .../testing/RemoteDatastoreHelper.java        | 12 +++++-----
 .../datastore/snippets/ConceptsTest.java      |  3 +--
 8 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
index 52184a01ad36..6738d84e3941 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
@@ -15,25 +15,27 @@
  */
 package com.google.cloud.datastore.models;
 
+import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;
+
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.cloud.Structs;
 import com.google.common.base.Objects;
 import java.util.Map;
-import org.threeten.bp.Duration;
 
 /** Model class for {@link com.google.datastore.v1.ExecutionStats} */
 @BetaApi
 public class ExecutionStats {
   private final long resultsReturned;
-  private final Duration executionDuration;
+  private final java.time.Duration executionDuration;
   private final long readOperations;
   private final Map debugStats;
 
   @InternalApi
   public ExecutionStats(com.google.datastore.v1.ExecutionStats proto) {
     this.resultsReturned = proto.getResultsReturned();
-    this.executionDuration = Duration.ofNanos(proto.getExecutionDuration().getNanos());
+    this.executionDuration = java.time.Duration.ofNanos(proto.getExecutionDuration().getNanos());
     this.readOperations = proto.getReadOperations();
     this.debugStats = Structs.asMap(proto.getDebugStats());
   }
@@ -51,8 +53,14 @@ public Map getDebugStats() {
     return debugStats;
   }
 
+  /** This method is obsolete. Use {@link #getExecutionDurationJavaTime()} instead. */
+  @ObsoleteApi("Use getExecutionDurationJavaTime() instead")
+  public org.threeten.bp.Duration getExecutionDuration() {
+    return toThreetenDuration(getExecutionDurationJavaTime());
+  }
+
   /** Returns the total time to execute the query in the backend. */
-  public Duration getExecutionDuration() {
+  public java.time.Duration getExecutionDurationJavaTime() {
     return executionDuration;
   }
 
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 2723325eefe9..32bf9611c987 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
@@ -16,9 +16,11 @@
 
 package com.google.cloud.datastore.testing;
 
+import static com.google.api.gax.util.TimeConversionUtils.toJavaTimeDuration;
 import static com.google.common.base.MoreObjects.firstNonNull;
 
 import com.google.api.core.InternalApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.datastore.DatastoreOptions;
@@ -38,7 +40,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
-import org.threeten.bp.Duration;
 
 /**
  * Utility to start and stop local Google Cloud Datastore emulators.
@@ -307,6 +308,14 @@ public void reset() throws IOException {
     sendPostRequest("/reset");
   }
 
+  /** This method is obsolete. Use {@link #stopDuration(java.time.Duration)} instead */
+  @ObsoleteApi("Use stopDuration(java.time.Duration) instead")
+  @Override
+  public void stop(org.threeten.bp.Duration timeout)
+      throws IOException, InterruptedException, TimeoutException {
+    stopDuration(toJavaTimeDuration(timeout));
+  }
+
   /**
    * Stops the Datastore emulator.
    *
@@ -319,15 +328,16 @@ public void reset() throws IOException {
    *     this value high to ensure proper shutdown, like 5 seconds or more.
    */
   @Override
-  public void stop(Duration timeout) throws IOException, InterruptedException, TimeoutException {
+  public void stopDuration(java.time.Duration timeout)
+      throws IOException, InterruptedException, TimeoutException {
     sendPostRequest("/shutdown");
-    waitForProcess(timeout);
+    waitForProcessDuration(timeout);
     deleteRecursively(gcdPath);
   }
 
   /**
-   * Stops the Datastore emulator. The same as {@link #stop(Duration)} but with timeout duration of
-   * 20 seconds.
+   * Stops the Datastore emulator. The same as {@link #stopDuration(java.time.Duration)} but with
+   * timeout duration of 20 seconds.
    *
    * 
    It is important to stop the emulator. Since the emulator runs in its own process, not
    * stopping it might cause it to become orphan.
@@ -335,7 +345,7 @@ public void stop(Duration timeout) throws IOException, InterruptedException, Tim
    * 
    It is not required to call {@link #reset()} before {@code stop()}.
    */
   public void stop() throws IOException, InterruptedException, TimeoutException {
-    stop(Duration.ofSeconds(20));
+    stopDuration(java.time.Duration.ofSeconds(20));
   }
 
   static void deleteRecursively(Path path) throws IOException {
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 d88e1d1ec0c7..459278f25a42 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
@@ -68,6 +68,7 @@
 import com.google.datastore.v1.TransactionOptions;
 import com.google.protobuf.ByteString;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -87,7 +88,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
 public class DatastoreTest {
@@ -193,7 +193,7 @@ public void setUp() {
 
   @AfterClass
   public static void afterClass() throws IOException, InterruptedException, TimeoutException {
-    helper.stop(Duration.ofMinutes(1));
+    helper.stopDuration(Duration.ofMinutes(1));
   }
 
   @Test
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 c012d28c9294..bf0c20dcef5f 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
@@ -81,6 +81,7 @@
 import com.google.common.truth.Truth;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.datastore.v1.TransactionOptions.ReadOnly;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -103,7 +104,6 @@
 import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.threeten.bp.Duration;
 
 @RunWith(Parameterized.class)
 public class ITDatastoreTest {
@@ -674,7 +674,7 @@ private void assertExecutionStats(
     Truth.assertThat(debugStats.get("index_entries_scanned"))
         .isEqualTo(expectedIndexEntriesScanned);
 
-    Duration executionDuration = executionStats.getExecutionDuration();
+    Duration executionDuration = executionStats.getExecutionDurationJavaTime();
     Truth.assertThat(executionDuration).isIn(Range.greaterThan(Duration.ofMillis(0)));
 
     long readOperations = executionStats.getReadOperations();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
index 4706e3b86be1..a0e778cee74b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
@@ -41,8 +41,8 @@ public class ExecutionStatsTest {
   @Test
   public void testModel() {
     Truth.assertThat(executionStats.getDebugStats()).isEqualTo(Structs.asMap(struct));
-    Truth.assertThat(executionStats.getExecutionDuration())
-        .isEqualTo(org.threeten.bp.Duration.ofNanos(duration.getNanos()));
+    Truth.assertThat(executionStats.getExecutionDurationJavaTime())
+        .isEqualTo(java.time.Duration.ofNanos(duration.getNanos()));
     Truth.assertThat(executionStats.getReadOperations()).isEqualTo(2);
     Truth.assertThat(executionStats.getResultsReturned()).isEqualTo(3);
   }
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 3ebd3ef4a060..dfa2255a0f34 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
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.concurrent.TimeoutException;
 import org.junit.After;
 import org.junit.Assert;
@@ -39,7 +40,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
 public class ITLocalDatastoreHelperTest {
@@ -178,7 +178,7 @@ public void testStartStopReset() throws IOException, InterruptedException, Timeo
       assertNotNull(datastore.get(key));
       helper.reset();
       assertNull(datastore.get(key));
-      helper.stop(Duration.ofMinutes(1));
+      helper.stopDuration(Duration.ofMinutes(1));
       datastore.get(key);
       Assert.fail();
     } catch (DatastoreException ex) {
@@ -198,7 +198,7 @@ public void testStartStopResetWithBuilder()
       assertNotNull(datastore.get(key));
       helper.reset();
       assertNull(datastore.get(key));
-      helper.stop(Duration.ofMinutes(1));
+      helper.stopDuration(Duration.ofMinutes(1));
       datastore.get(key);
       Assert.fail();
     } catch (DatastoreException ex) {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
index 6167cedcae22..a4b389a1e2a3 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
@@ -27,9 +27,9 @@
 import com.google.cloud.datastore.StructuredQuery;
 import com.google.cloud.http.HttpTransportOptions;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
+import java.time.Duration;
 import java.util.UUID;
 import javax.annotation.Nullable;
-import org.threeten.bp.Duration;
 
 /**
  * Utility to create a remote datastore configuration for testing. Datastore options can be obtained
@@ -110,13 +110,13 @@ public static RemoteDatastoreHelper create(String databaseId) {
   private static RetrySettings retrySettings() {
     return RetrySettings.newBuilder()
         .setMaxAttempts(10)
-        .setMaxRetryDelay(Duration.ofMillis(30000L))
-        .setTotalTimeout(Duration.ofMillis(120000L))
-        .setInitialRetryDelay(Duration.ofMillis(250L))
+        .setMaxRetryDelayDuration(Duration.ofMillis(30000L))
+        .setTotalTimeoutDuration(Duration.ofMillis(120000L))
+        .setInitialRetryDelayDuration(Duration.ofMillis(250L))
         .setRetryDelayMultiplier(1.0)
-        .setInitialRpcTimeout(Duration.ofMillis(120000L))
+        .setInitialRpcTimeoutDuration(Duration.ofMillis(120000L))
         .setRpcTimeoutMultiplier(1.0)
-        .setMaxRpcTimeout(Duration.ofMillis(120000L))
+        .setMaxRpcTimeoutDuration(Duration.ofMillis(120000L))
         .build();
   }
 }
diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 045b16a9ab45..33aa63ab4ec3 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -77,7 +77,6 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.threeten.bp.Duration;
 
 /** Contains Cloud Datastore snippets demonstrating concepts for documentation. */
 @RunWith(JUnit4.class)
@@ -147,7 +146,7 @@ public void tearDown() throws Exception {
    */
   @AfterClass
   public static void afterClass() throws IOException, InterruptedException, TimeoutException {
-    HELPER.stop(Duration.ofMinutes(1));
+    HELPER.stopDuration(java.time.Duration.ofMinutes(1));
   }
 
   private void assertValidKey(Key taskKey) {

From 8146530139e2bdcec0961c252cc2fc1bfff2bd4a Mon Sep 17 00:00:00 2001
From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
Date: Thu, 28 Nov 2024 12:37:53 +0000
Subject: [PATCH 1506/1784] chore: mark the unmanaged dependency check required
 (#1675)

---
 .github/sync-repo-settings.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index ab421dce583f..203644341dc5 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -19,6 +19,7 @@ branchProtectionRules:
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
       - library_generation
+      - unmanaged_dependency_check
   - pattern: 1.106.5-sp
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From b3fbfcc9654bc63bf0d8f3025641d8c50a24ef97 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:17:28 -0800
Subject: [PATCH 1507/1784] Docs: Update gapic upgrade installation
 instructions (#1677)

* Update user guide

* chore: generate libraries at Wed Dec  4 18:25:42 UTC 2024

* Formatting code block

* chore: generate libraries at Wed Dec  4 19:22:29 UTC 2024

* Remove client-side metrics suggestions

---------

Co-authored-by: cloud-java-bot 
---
 .readme-partials.yaml | 82 +++++++++++++++++++++++++++++++------------
 README.md             | 82 +++++++++++++++++++++++++++++++------------
 2 files changed, 120 insertions(+), 44 deletions(-)

diff --git a/.readme-partials.yaml b/.readme-partials.yaml
index ced21e49ff86..3e8d3a46559a 100644
--- a/.readme-partials.yaml
+++ b/.readme-partials.yaml
@@ -110,28 +110,33 @@ custom_content: |
   -------
   In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
   
-  #### Download Instructions
-  Instructions:
-  1. Clone the grpc-experimental branch from GitHub:
-  ```python
-  git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git
-  ```
-  2. Run the following commands to build the library:
-  ```python
-  # Go to the directory the code was downloaded to
-  cd java-datastore/
-  
-  # Build the library
-  mvn clean install -DskipTests=true
-  ```
-  3. Add the following dependency to your project:
-  ```xml
-  
+  #### Installation Instructions
+  The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below.
+
+  1. Download the datastore private preview package with dependencies:
+    ```
+    curl -o   https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar
+    ```
+  2. Run the following commands to install JDK locally:
+    ```
+    mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc
+    ```
+  3. Edit your pom.xml to add above package to `` section:
+    ```xml
+    
     com.google.cloud
     google-cloud-datastore
     2.20.0-grpc-experimental-1-SNAPSHOT
-  
-  ```
+    
+    ```
+  
+  And if you have not yet, add below to `` section:
+    ```xml
+    
+    local-repo
+    file://${user.home}/.m2/repository
+    
+    ```
   
   #### How to Use
   To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation.
@@ -181,11 +186,44 @@ custom_content: |
   #### New Features
   There are new gRPC specific features available to use in this update.
   
-  ##### Channel Pooling
-  To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. 
+  ##### Connection Pool
+  A connection pool, also known as a channel pool, is a cache of database connections that are shared and reused to improve connection latency and performance. With this update, now you will be able to configure the channel pool to improve application performance. This section guides you in determining the optimal connection pool size and configuring it within the Java datastore client.
+  To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions.
+  ###### Determine the best connection pool size
+  The default connection pool size is right for most applications, and in most cases there's no need to change it.
+  
+  However sometimes you may want to change your connection pool size due to high throughput or buffered requests. Ideally, to leave room for traffic fluctuations, a connection pool has about twice the number of connections it takes for maximum saturation. Because a connection can handle a maximum of 100 concurrent requests, between 10 and 50 outstanding requests per connection is optimal. The limit of 100 concurrent streams per gRPC connection is enforced in Google's middleware layer, and you are not able to reconfigure this number.
+  
+  The following steps help you calculate the optimal number of connections in your channel pool using estimate per-client QPS and average latency numbers.
+
+  To calculate the optimal connections, gather the following information:
+
+  1. The maximum number of queries per second (QPS) per client when your application is running a typical workload.
+  2. The average latency (the response time for a single request) in ms.
+  3. Determine the number of requests that you can send serially per second by dividing 1,000 by the average latency value.
+  4. Divide the QPS in seconds by the number of serial requests per second.
+  5. Divide the result by 50 requests per channel to determine the minimum optimal channel pool size. (If your calculation is less than 2, use at least 2 channels anyway, to ensure redundancy.)
+  6. Divide the same result by 10 requests per channel to determine the maximum optimal channel pool size.
+
+  These steps are expressed in the following equations:
+  ```java
+  (QPS ÷ (1,000 ÷ latency ms)) ÷ 50 streams = Minimum optimal number of connections
+  (QPS ÷ (1,000 ÷ latency ms)) ÷ 10 streams = Maximum optimal number of connections
+  ```
+
+  ###### Example
+  Your application typically sends 50,000 requests per second, and the average latency is 10 ms. Divide 1,000 by 10 ms to determine that you can send 100 requests serially per second.
+  Divide that number into 50,000 to get the parallelism needed to send 50,000 QPS: 500. Each channel can have at most 100 requests out concurrently, and your target channel utilization
+  is between 10 and 50 concurrent streams. Therefore, to calculate the minimum, divide 500 by 50 to get 10. To find the maximum, divide 500 by 10 to get 50. This means that your channel
+  pool size for this example should be between 10 and 50 connections.
+
+  It is also important to monitor your traffic after making changes and adjust the number of connections in your pool if necessary.
+  
+  ###### Set the pool size
+  The following code sample demonstrates how to configure the channel pool in the client libraries using `DatastoreOptions`.
   See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance.
   
-  Example:
+  Code Example
   ```java
   InstantiatingGrpcChannelProvider channelProvider =
         DatastoreSettings.defaultGrpcTransportProviderBuilder()
diff --git a/README.md b/README.md
index f059e75ed4d0..4dc14a97fc1d 100644
--- a/README.md
+++ b/README.md
@@ -208,28 +208,33 @@ gRPC Java Datastore Client User Guide
 -------
 In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
 
-#### Download Instructions
-Instructions:
-1. Clone the grpc-experimental branch from GitHub:
-```python
-git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git
-```
-2. Run the following commands to build the library:
-```python
-# Go to the directory the code was downloaded to
-cd java-datastore/
-
-# Build the library
-mvn clean install -DskipTests=true
-```
-3. Add the following dependency to your project:
-```xml
-
+#### Installation Instructions
+The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below.
+
+1. Download the datastore private preview package with dependencies:
+  ```
+  curl -o   https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar
+  ```
+2. Run the following commands to install JDK locally:
+  ```
+  mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc
+  ```
+3. Edit your pom.xml to add above package to `` section:
+  ```xml
+  
   com.google.cloud
   google-cloud-datastore
   2.20.0-grpc-experimental-1-SNAPSHOT
-
-```
+  
+  ```
+
+And if you have not yet, add below to `` section:
+  ```xml
+  
+  local-repo
+  file://${user.home}/.m2/repository
+  
+  ```
 
 #### How to Use
 To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation.
@@ -279,11 +284,44 @@ boolean isHTTP = datastore.getOptions().getTransportOptions() instanceof HTTPTra
 #### New Features
 There are new gRPC specific features available to use in this update.
 
-##### Channel Pooling
-To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. 
+##### Connection Pool
+A connection pool, also known as a channel pool, is a cache of database connections that are shared and reused to improve connection latency and performance. With this update, now you will be able to configure the channel pool to improve application performance. This section guides you in determining the optimal connection pool size and configuring it within the Java datastore client.
+To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions.
+###### Determine the best connection pool size
+The default connection pool size is right for most applications, and in most cases there's no need to change it.
+
+However sometimes you may want to change your connection pool size due to high throughput or buffered requests. Ideally, to leave room for traffic fluctuations, a connection pool has about twice the number of connections it takes for maximum saturation. Because a connection can handle a maximum of 100 concurrent requests, between 10 and 50 outstanding requests per connection is optimal. The limit of 100 concurrent streams per gRPC connection is enforced in Google's middleware layer, and you are not able to reconfigure this number.
+
+The following steps help you calculate the optimal number of connections in your channel pool using estimate per-client QPS and average latency numbers.
+
+To calculate the optimal connections, gather the following information:
+
+1. The maximum number of queries per second (QPS) per client when your application is running a typical workload.
+2. The average latency (the response time for a single request) in ms.
+3. Determine the number of requests that you can send serially per second by dividing 1,000 by the average latency value.
+4. Divide the QPS in seconds by the number of serial requests per second.
+5. Divide the result by 50 requests per channel to determine the minimum optimal channel pool size. (If your calculation is less than 2, use at least 2 channels anyway, to ensure redundancy.)
+6. Divide the same result by 10 requests per channel to determine the maximum optimal channel pool size.
+
+These steps are expressed in the following equations:
+```java
+(QPS ÷ (1,000 ÷ latency ms)) ÷ 50 streams = Minimum optimal number of connections
+(QPS ÷ (1,000 ÷ latency ms)) ÷ 10 streams = Maximum optimal number of connections
+```
+
+###### Example
+Your application typically sends 50,000 requests per second, and the average latency is 10 ms. Divide 1,000 by 10 ms to determine that you can send 100 requests serially per second.
+Divide that number into 50,000 to get the parallelism needed to send 50,000 QPS: 500. Each channel can have at most 100 requests out concurrently, and your target channel utilization
+is between 10 and 50 concurrent streams. Therefore, to calculate the minimum, divide 500 by 50 to get 10. To find the maximum, divide 500 by 10 to get 50. This means that your channel
+pool size for this example should be between 10 and 50 connections.
+
+It is also important to monitor your traffic after making changes and adjust the number of connections in your pool if necessary.
+
+###### Set the pool size
+The following code sample demonstrates how to configure the channel pool in the client libraries using `DatastoreOptions`.
 See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance.
 
-Example:
+Code Example
 ```java
 InstantiatingGrpcChannelProvider channelProvider =
       DatastoreSettings.defaultGrpcTransportProviderBuilder()

From c308e4c57439460785378be7f46af057bc2d1b72 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 9 Dec 2024 19:04:50 +0100
Subject: [PATCH 1508/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.51.0 (#1678)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d31d40cb9193..95c5f4db491e 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.50.0
+        26.51.0
         pom
         import
       

From 3de67d55917a4ed97cf5f34e5f1183e865ce6e3a Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:22:07 -0500
Subject: [PATCH 1509/1784] chore: Update generation configuration at Sat Dec 
 7 02:27:08 UTC 2024 (#1673)

* chore: Update generation configuration at Thu Nov 21 02:25:49 UTC 2024

* chore: Update generation configuration at Fri Nov 22 02:26:29 UTC 2024

* chore: Update generation configuration at Sat Nov 23 02:25:13 UTC 2024

* chore: Update generation configuration at Tue Nov 26 02:26:48 UTC 2024

* chore: Update generation configuration at Wed Nov 27 02:27:31 UTC 2024

* chore: Update generation configuration at Thu Nov 28 02:27:23 UTC 2024

* chore: Update generation configuration at Fri Nov 29 02:27:22 UTC 2024

* chore: Update generation configuration at Tue Dec  3 02:27:53 UTC 2024

* chore: Update generation configuration at Wed Dec  4 02:28:04 UTC 2024

* chore: Update generation configuration at Thu Dec  5 02:28:17 UTC 2024

* chore: Update generation configuration at Fri Dec  6 02:27:42 UTC 2024

* chore: generate libraries at Fri Dec  6 02:28:19 UTC 2024

* chore: Update generation configuration at Sat Dec  7 02:27:08 UTC 2024
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4dc14a97fc1d..780b96e759b3 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.50.0')
+implementation platform('com.google.cloud:libraries-bom:26.51.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index b9de0b0191e1..d7067bcdaa38 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.50.0
-googleapis_commitish: a547fc1420eb0a0f3ae32b0a4eb72d3b8b17d136
-libraries_bom_version: 26.50.0
+googleapis_commitish: 0f3a20ebd29fb1deb2bd1f75c7ba55500d35457d
+libraries_bom_version: 26.51.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 9c992a77fee4b114815acd178dae515d345e2f98 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:36:22 +0000
Subject: [PATCH 1510/1784] chore(main): release 2.24.4-SNAPSHOT (#1667)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 README.md                                     |  2 +-
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 780b96e759b3..321a5e15cba5 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.50.0
+      26.51.0
       pom
       import
     
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 81f589e82595..5bddd489ba1a 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.24.3
+  2.24.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3
+    2.24.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c44f4504046c..e2efd3ff3535 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.24.3
+  2.24.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.3
+        2.24.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.3
+        2.24.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.3
+        0.115.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.3
+        2.24.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6c8dbf1564e7..16c16241e8d7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.3
+  2.24.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3
+    2.24.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index bc6da09a2ba5..46a6065ba1bb 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.24.3
+  2.24.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3
+    2.24.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 010f41c6baa8..7c0df571c41c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.3
+  2.24.4-SNAPSHOT
   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.24.3
+        2.24.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.3
+        2.24.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.3
+        2.24.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.3
+        0.115.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.3
+        2.24.4-SNAPSHOT
         
           
             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 e0eb6c902b12..1fb4dd265322 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.24.3
+  2.24.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3
+    2.24.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 49d767dfb72f..1e9a5083f5bf 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.115.3
+  0.115.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.3
+    2.24.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e484c2694f48..5eefa5993b61 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.3
+      2.24.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 99f46fe1905c..e40fb3ab7669 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.3:2.24.3
-google-cloud-datastore-bom:2.24.3:2.24.3
-proto-google-cloud-datastore-v1:0.115.3:0.115.3
-datastore-v1-proto-client:2.24.3:2.24.3
-proto-google-cloud-datastore-admin-v1:2.24.3:2.24.3
-grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.3
+google-cloud-datastore:2.24.3:2.24.4-SNAPSHOT
+google-cloud-datastore-bom:2.24.3:2.24.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.115.3:0.115.4-SNAPSHOT
+datastore-v1-proto-client:2.24.3:2.24.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT

From b3042ddc2f76a01ef411f26c1e271f2566108592 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:47:50 -0500
Subject: [PATCH 1511/1784] chore: Update generation configuration at Tue Dec
 10 02:28:41 UTC 2024 (#1680)

* chore: Update generation configuration at Tue Dec 10 02:28:41 UTC 2024

* chore: generate libraries at Tue Dec 10 02:29:17 UTC 2024
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index d7067bcdaa38..685dceedba1d 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.50.0
-googleapis_commitish: 0f3a20ebd29fb1deb2bd1f75c7ba55500d35457d
+googleapis_commitish: 5d5b1bf126485b0e2c972bac41b376438601e266
 libraries_bom_version: 26.51.0
 libraries:
   - api_shortname: datastore

From 5c6a67844f7b5d4c7001cccd1bed3d0d56be6e90 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Dec 2024 22:40:28 +0100
Subject: [PATCH 1512/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.48.0 (#1605)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 16c16241e8d7..a294f039ea36 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.43.0
+        1.48.0
         pom
         import
       

From 456ecaa61007f909922665f8123f96b9e58e0c9d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Dec 2024 22:40:40 +0100
Subject: [PATCH 1513/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.24.3 (#1656)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 30cba8255eef..3b581a09342a 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.24.1
+      2.24.3
     
     
 

From 1d89e6c0e2eadefed46c100895c4d9c111279f1b Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:57:52 -0500
Subject: [PATCH 1514/1784] chore: Update generation configuration at Wed Dec
 11 02:27:51 UTC 2024 (#1682)

* chore: Update generation configuration at Wed Dec 11 02:27:51 UTC 2024

* chore: generate libraries at Wed Dec 11 02:28:26 UTC 2024
---
 README.md              | 2 +-
 generation_config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 321a5e15cba5..f063e2691d11 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.24.1
+  2.24.3
 
 
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 685dceedba1d..63fce0276aa0 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.50.0
-googleapis_commitish: 5d5b1bf126485b0e2c972bac41b376438601e266
+googleapis_commitish: 798bd23a97e0c6a2582a4b442c09523b1325b533
 libraries_bom_version: 26.51.0
 libraries:
   - api_shortname: datastore

From f9652d42dc25ca4a8a6ca88e76b1f2e67f553064 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:28:04 -0800
Subject: [PATCH 1515/1784] chore(main): release 2.25.0 (#1681)

* chore(main): release 2.25.0

* chore: generate libraries at Wed Dec 11 18:58:48 UTC 2024

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 17 +++++++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07cf43d6dec3..0724226174e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [2.25.0](https://github.com/googleapis/java-datastore/compare/v2.24.3...v2.25.0) (2024-12-11)
+
+
+### Features
+
+* Introduce `java.time` methods and variables ([#1671](https://github.com/googleapis/java-datastore/issues/1671)) ([5a78a80](https://github.com/googleapis/java-datastore/commit/5a78a8075867f4b2fc598f0423bd2ab65b559856))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.48.0 ([#1605](https://github.com/googleapis/java-datastore/issues/1605)) ([5c6a678](https://github.com/googleapis/java-datastore/commit/5c6a67844f7b5d4c7001cccd1bed3d0d56be6e90))
+
+
+### Documentation
+
+* Update gapic upgrade installation instructions ([#1677](https://github.com/googleapis/java-datastore/issues/1677)) ([b3fbfcc](https://github.com/googleapis/java-datastore/commit/b3fbfcc9654bc63bf0d8f3025641d8c50a24ef97))
+
 ## [2.24.3](https://github.com/googleapis/java-datastore/compare/v2.24.2...v2.24.3) (2024-11-18)
 
 
diff --git a/README.md b/README.md
index f063e2691d11..bc5bf8abcaa6 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.24.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.25.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.0"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 5bddd489ba1a..7cf0fff8a036 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.24.4-SNAPSHOT
+  2.25.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.4-SNAPSHOT
+    2.25.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e2efd3ff3535..9725aa812e94 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.24.4-SNAPSHOT
+  2.25.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.24.4-SNAPSHOT
+        2.25.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.4-SNAPSHOT
+        2.25.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.4-SNAPSHOT
+        0.116.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.24.4-SNAPSHOT
+        2.25.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a294f039ea36..6f3838a63d3d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.24.4-SNAPSHOT
+  2.25.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.4-SNAPSHOT
+    2.25.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 46a6065ba1bb..613e5df1a8a7 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.24.4-SNAPSHOT
+  2.25.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.4-SNAPSHOT
+    2.25.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 7c0df571c41c..93f84904a372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.24.4-SNAPSHOT
+  2.25.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.24.4-SNAPSHOT
+        2.25.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.24.4-SNAPSHOT
+        2.25.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.24.4-SNAPSHOT
+        2.25.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.115.4-SNAPSHOT
+        0.116.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.24.4-SNAPSHOT
+        2.25.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 1fb4dd265322..78a52ca6fab9 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.24.4-SNAPSHOT
+  2.25.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.4-SNAPSHOT
+    2.25.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1e9a5083f5bf..ac9bdfc05a8d 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.115.4-SNAPSHOT
+  0.116.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.24.4-SNAPSHOT
+    2.25.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5eefa5993b61..274bd463fba3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.24.4-SNAPSHOT
+      2.25.0
     
     
 
diff --git a/versions.txt b/versions.txt
index e40fb3ab7669..1e2a77f49c48 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.24.3:2.24.4-SNAPSHOT
-google-cloud-datastore-bom:2.24.3:2.24.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.115.3:0.115.4-SNAPSHOT
-datastore-v1-proto-client:2.24.3:2.24.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT
+google-cloud-datastore:2.25.0:2.25.0
+google-cloud-datastore-bom:2.25.0:2.25.0
+proto-google-cloud-datastore-v1:0.116.0:0.116.0
+datastore-v1-proto-client:2.25.0:2.25.0
+proto-google-cloud-datastore-admin-v1:2.25.0:2.25.0
+grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.0

From 3b52271b13161661f92c04cdd8e8d6bdca28e900 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:57:41 -0500
Subject: [PATCH 1516/1784] chore(main): release 2.25.1-SNAPSHOT (#1686)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7cf0fff8a036..fc986bac4ce7 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.25.0
+  2.25.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.0
+    2.25.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 9725aa812e94..b1d7d5940e1e 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.25.0
+  2.25.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.0
+        2.25.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.0
+        2.25.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.0
+        0.116.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.0
+        2.25.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6f3838a63d3d..6078401f7eeb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.0
+  2.25.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.0
+    2.25.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 613e5df1a8a7..ab7770677e3b 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.25.0
+  2.25.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.0
+    2.25.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 93f84904a372..ea6c611c0fa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.0
+  2.25.1-SNAPSHOT
   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.25.0
+        2.25.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.0
+        2.25.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.0
+        2.25.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.0
+        0.116.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.0
+        2.25.1-SNAPSHOT
         
           
             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 78a52ca6fab9..88b8584111fd 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.25.0
+  2.25.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.0
+    2.25.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ac9bdfc05a8d..7968ce4d8c38 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.116.0
+  0.116.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.0
+    2.25.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 274bd463fba3..a420fb812ed8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.0
+      2.25.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 1e2a77f49c48..7b5b118273e8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.0:2.25.0
-google-cloud-datastore-bom:2.25.0:2.25.0
-proto-google-cloud-datastore-v1:0.116.0:0.116.0
-datastore-v1-proto-client:2.25.0:2.25.0
-proto-google-cloud-datastore-admin-v1:2.25.0:2.25.0
-grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.0
+google-cloud-datastore:2.25.0:2.25.1-SNAPSHOT
+google-cloud-datastore-bom:2.25.0:2.25.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.116.0:0.116.1-SNAPSHOT
+datastore-v1-proto-client:2.25.0:2.25.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT

From 4372350117ba57903f510512a383339b6a4ea47c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 13 Dec 2024 18:48:34 +0100
Subject: [PATCH 1517/1784] deps: update sdk platform java dependencies (#1685)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 .github/workflows/unmanaged_dependency_check.yaml  | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native.cfg               | 2 +-
 google-cloud-datastore-bom/pom.xml                 | 2 +-
 pom.xml                                            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 35aa3b151d65..604b674bad98 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.50.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 0ee0f5aaa912..87c21c0a0c62 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.40.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index aabe0f1f99a9..6c760a779882 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.40.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 4b9610ffcca3..2a166877fef8 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.40.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b1d7d5940e1e..793feee87999 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.40.0
+    3.41.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index ea6c611c0fa8..de06d32030a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.40.0
+    3.41.0
   
 
   

From 2e85cb75bdd98107cdcb7cda7716510e32f16878 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 13 Dec 2024 19:07:00 +0100
Subject: [PATCH 1518/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.25.0 (#1687)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 3b581a09342a..f60a4bb5afd8 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.24.3
+      2.25.0
     
     
 

From 106ee4dd7ca4dd9e59a5419f59b8625680e60f15 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 13 Dec 2024 13:27:10 -0500
Subject: [PATCH 1519/1784] chore: Update generation configuration at Fri Dec
 13 02:28:28 UTC 2024 (#1683)

* chore: Update generation configuration at Thu Dec 12 02:27:48 UTC 2024

* chore: Update generation configuration at Fri Dec 13 02:28:28 UTC 2024

* update workflow script

* update generation config

* chore: generate libraries at Fri Dec 13 18:10:48 UTC 2024

---------

Co-authored-by: Joe Wang 
---
 .github/scripts/update_generation_config.sh | 63 ++++++++++++++++++---
 README.md                                   |  2 +-
 generation_config.yaml                      |  4 +-
 renovate.json                               | 17 ------
 4 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh
index 561a313040f3..91434688cc5c 100644
--- a/.github/scripts/update_generation_config.sh
+++ b/.github/scripts/update_generation_config.sh
@@ -28,11 +28,23 @@ function update_config() {
     sed -i -e "s/^${key_word}.*$/${key_word}: ${new_value}/" "${file}"
 }
 
+# Update an action to a new version in GitHub action.
+function update_action() {
+    local key_word=$1
+    local new_value=$2
+    local file=$3
+    echo "Update ${key_word} to ${new_value} in ${file}"
+    # use a different delimiter because the key_word contains "/".
+    sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}"
+}
+
 # The parameters of this script is:
 # 1. base_branch, the base branch of the result pull request.
 # 2. repo, organization/repo-name, e.g., googleapis/google-cloud-java
 # 3. [optional] generation_config, the path to the generation configuration,
 # the default value is generation_config.yaml in the repository root.
+# 4. [optional] workflow, the library generation workflow file,
+# the default value is .github/workflows/hermetic_library_generation.yaml.
 while [[ $# -gt 0 ]]; do
 key="$1"
 case "${key}" in
@@ -48,6 +60,10 @@ case "${key}" in
     generation_config="$2"
     shift
     ;;
+  --workflow)
+    workflow="$2"
+    shift
+    ;;
   *)
     echo "Invalid option: [$1]"
     exit 1
@@ -71,21 +87,34 @@ if [ -z "${generation_config}" ]; then
   echo "Use default generation config: ${generation_config}"
 fi
 
+if [ -z "${workflow}" ]; then
+    workflow=".github/workflows/hermetic_library_generation.yaml"
+    echo "Use default library generation workflow file: ${workflow}"
+fi
+
 current_branch="generate-libraries-${base_branch}"
 title="chore: Update generation configuration at $(date)"
 
-# try to find a open pull request associated with the branch
+git checkout "${base_branch}"
+# Try to find a open pull request associated with the branch
 pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
-# create a branch if there's no open pull request associated with the
+# Create a branch if there's no open pull request associated with the
 # branch; otherwise checkout the pull request.
 if [ -z "${pr_num}" ]; then
   git checkout -b "${current_branch}"
+  # Push the current branch to remote so that we can
+  # compare the commits later.
+  git push -u origin "${current_branch}"
 else
   gh pr checkout "${pr_num}"
 fi
 
+# Only allow fast-forward merging; exit with non-zero result if there's merging
+# conflict.
+git merge -m "chore: merge ${base_branch} into ${current_branch}" "${base_branch}"
+
 mkdir tmp-googleapis
-# use partial clone because only commit history is needed.
+# Use partial clone because only commit history is needed.
 git clone --filter=blob:none https://github.com/googleapis/googleapis.git tmp-googleapis
 pushd tmp-googleapis
 git pull
@@ -94,25 +123,43 @@ popd
 rm -rf tmp-googleapis
 update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
 
-# update gapic-generator-java version to the latest
+# Update gapic-generator-java version to the latest
 latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
 update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
 
-# update libraries-bom version to the latest
+# Update composite action version to latest gapic-generator-java version
+update_action "googleapis/sdk-platform-java/.github/scripts" \
+  "${latest_version}" \
+  "${workflow}"
+
+# Update libraries-bom version to the latest
 latest_version=$(get_latest_released_version "com.google.cloud" "libraries-bom")
 update_config "libraries_bom_version" "${latest_version}" "${generation_config}"
 
-git add "${generation_config}"
+git add "${generation_config}" "${workflow}"
 changed_files=$(git diff --cached --name-only)
 if [[ "${changed_files}" == "" ]]; then
     echo "The latest generation config is not changed."
     echo "Skip committing to the pull request."
+else
+    git commit -m "${title}"
+fi
+
+# There are potentially at most two commits: merge commit and change commit.
+# We want to exit the script if no commit happens (otherwise this will be an
+# infinite loop).
+# `git cherry` is a way to find whether the local branch has commits that are
+# not in the remote branch.
+# If we find any such commit, push them to remote branch.
+unpushed_commit=$(git cherry -v "origin/${current_branch}" | wc -l)
+if [[ "${unpushed_commit}" -eq 0 ]]; then
+    echo "No unpushed commits, exit"
     exit 0
 fi
-git commit -m "${title}"
+
 if [ -z "${pr_num}" ]; then
   git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${repo}.git"
-  git fetch -q --unshallow remote_repo
+  git fetch -q remote_repo
   git push -f remote_repo "${current_branch}"
   gh pr create --title "${title}" --head "${current_branch}" --body "${title}" --base "${base_branch}"
 else
diff --git a/README.md b/README.md
index bc5bf8abcaa6..362f547a7162 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.24.3
+  2.25.0
 
 
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 63fce0276aa0..13bc526fb100 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.50.0
-googleapis_commitish: 798bd23a97e0c6a2582a4b442c09523b1325b533
+gapic_generator_version: 2.51.0
+googleapis_commitish: 7d0c6bee2517d77635beb2a1dd6d6e7d4d943512
 libraries_bom_version: 26.51.0
 libraries:
   - api_shortname: datastore
diff --git a/renovate.json b/renovate.json
index b3314f4b2e6f..5862088529e6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -41,16 +41,6 @@
       ],
       "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
       "datasourceTemplate": "maven"
-    },
-    {
-      "fileMatch": [
-        "^.github/workflows/hermetic_library_generation.yaml$"
-      ],
-      "matchStrings": [
-        "uses: googleapis/sdk-platform-java/.github/scripts@v(?.+?)\\n"
-      ],
-      "depNameTemplate": "com.google.api:gapic-generator-java",
-      "datasourceTemplate": "maven"
     }
   ],
   "packageRules": [
@@ -111,13 +101,6 @@
         "^com.fasterxml.jackson.core"
       ],
       "groupName": "jackson dependencies"
-    },
-    {
-      "matchPackagePatterns": [
-        "^com.google.api:gapic-generator-java",
-        "^com.google.cloud:sdk-platform-java-config"
-      ],
-      "groupName": "SDK platform Java dependencies"
     }
   ],
   "semanticCommits": true,

From 12b8f125baa5a3324e7d5a50a89d427d18f9c2d1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:12:10 -0800
Subject: [PATCH 1520/1784] chore(main): release 2.25.1 (#1688)

* chore(main): release 2.25.1

* chore: generate libraries at Fri Dec 13 18:28:02 UTC 2024

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0724226174e1..adec35297873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.25.1](https://github.com/googleapis/java-datastore/compare/v2.25.0...v2.25.1) (2024-12-13)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.51.0 ([106ee4d](https://github.com/googleapis/java-datastore/commit/106ee4dd7ca4dd9e59a5419f59b8625680e60f15))
+
+
+### Dependencies
+
+* Update sdk platform java dependencies ([#1685](https://github.com/googleapis/java-datastore/issues/1685)) ([4372350](https://github.com/googleapis/java-datastore/commit/4372350117ba57903f510512a383339b6a4ea47c))
+
 ## [2.25.0](https://github.com/googleapis/java-datastore/compare/v2.24.3...v2.25.0) (2024-12-11)
 
 
diff --git a/README.md b/README.md
index 362f547a7162..2fa4ffd04baa 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.25.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.25.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.1"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index fc986bac4ce7..f71e20221c30 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.25.1-SNAPSHOT
+  2.25.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1-SNAPSHOT
+    2.25.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 793feee87999..c9cfd3347908 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.25.1-SNAPSHOT
+  2.25.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.1-SNAPSHOT
+        2.25.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.1-SNAPSHOT
+        2.25.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.1-SNAPSHOT
+        0.116.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.1-SNAPSHOT
+        2.25.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6078401f7eeb..6f22c2be20ed 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.1-SNAPSHOT
+  2.25.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1-SNAPSHOT
+    2.25.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index ab7770677e3b..74b964682fd4 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.25.1-SNAPSHOT
+  2.25.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1-SNAPSHOT
+    2.25.1
   
   
     
diff --git a/pom.xml b/pom.xml
index de06d32030a7..4a8583e61a2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.1-SNAPSHOT
+  2.25.1
   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.25.1-SNAPSHOT
+        2.25.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.1-SNAPSHOT
+        2.25.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.1-SNAPSHOT
+        2.25.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.1-SNAPSHOT
+        0.116.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.1-SNAPSHOT
+        2.25.1
         
           
             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 88b8584111fd..28ed4b0e7c91 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.25.1-SNAPSHOT
+  2.25.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1-SNAPSHOT
+    2.25.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7968ce4d8c38..a2fc2f2a8ad4 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.116.1-SNAPSHOT
+  0.116.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1-SNAPSHOT
+    2.25.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index a420fb812ed8..174ac036d341 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.1-SNAPSHOT
+      2.25.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 7b5b118273e8..783c47b1f7b1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.0:2.25.1-SNAPSHOT
-google-cloud-datastore-bom:2.25.0:2.25.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.116.0:0.116.1-SNAPSHOT
-datastore-v1-proto-client:2.25.0:2.25.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT
+google-cloud-datastore:2.25.1:2.25.1
+google-cloud-datastore-bom:2.25.1:2.25.1
+proto-google-cloud-datastore-v1:0.116.1:0.116.1
+datastore-v1-proto-client:2.25.1:2.25.1
+proto-google-cloud-datastore-admin-v1:2.25.1:2.25.1
+grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.1

From 926c25faac3dab65e0e7f6c3004e03a385b3ea15 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:53:01 -0500
Subject: [PATCH 1521/1784] chore: Update generation configuration at Sat Dec
 14 02:26:29 UTC 2024 (#1691)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 13bc526fb100..a35232f28536 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.51.0
-googleapis_commitish: 7d0c6bee2517d77635beb2a1dd6d6e7d4d943512
+googleapis_commitish: f4eff5440fd07389f820d22d2a55690c6390dc6d
 libraries_bom_version: 26.51.0
 libraries:
   - api_shortname: datastore

From 93e45edf335f06fd707ce64398c8b02d2a433f6f Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 2 Jan 2025 16:52:51 -0500
Subject: [PATCH 1522/1784] chore: Update generation configuration at Tue Dec
 31 02:22:25 UTC 2024 (#1692)

* chore: Update generation configuration at Tue Dec 17 02:27:47 UTC 2024

* chore: Update generation configuration at Wed Dec 18 02:26:15 UTC 2024

* chore: Update generation configuration at Thu Dec 19 02:26:21 UTC 2024

* chore: generate libraries at Thu Dec 19 02:26:53 UTC 2024

* chore: Update generation configuration at Fri Dec 20 02:23:43 UTC 2024

* chore: Update generation configuration at Sat Dec 21 02:21:26 UTC 2024

* chore: Update generation configuration at Tue Dec 24 02:23:27 UTC 2024

* chore: Update generation configuration at Fri Dec 27 02:23:22 UTC 2024

* chore: Update generation configuration at Sat Dec 28 02:20:59 UTC 2024

* chore: Update generation configuration at Tue Dec 31 02:22:25 UTC 2024
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2fa4ffd04baa..160907fc0ae4 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.51.0')
+implementation platform('com.google.cloud:libraries-bom:26.52.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index a35232f28536..54ff42158eac 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.51.0
-googleapis_commitish: f4eff5440fd07389f820d22d2a55690c6390dc6d
-libraries_bom_version: 26.51.0
+googleapis_commitish: 52e410823122cf44d265c3beecb86c773db248a2
+libraries_bom_version: 26.52.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 732ae660d2755ebb88aaabbae2175e013125f03c Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 3 Jan 2025 19:59:59 -0500
Subject: [PATCH 1523/1784] chore: Update generation configuration at Fri Jan 
 3 02:23:25 UTC 2025 (#1696)

* chore: Update generation configuration at Fri Jan  3 02:23:25 UTC 2025

* chore: generate libraries at Fri Jan  3 02:23:58 UTC 2025
---
 generation_config.yaml                                          | 2 +-
 .../google/cloud/datastore/admin/v1/DatastoreAdminClient.java   | 2 +-
 .../google/cloud/datastore/admin/v1/DatastoreAdminSettings.java | 2 +-
 .../java/com/google/cloud/datastore/admin/v1/package-info.java  | 2 +-
 .../cloud/datastore/admin/v1/stub/DatastoreAdminStub.java       | 2 +-
 .../datastore/admin/v1/stub/DatastoreAdminStubSettings.java     | 2 +-
 .../admin/v1/stub/GrpcDatastoreAdminCallableFactory.java        | 2 +-
 .../cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java   | 2 +-
 .../admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java    | 2 +-
 .../datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java     | 2 +-
 .../datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java    | 2 +-
 .../cloud/datastore/admin/v1/DatastoreAdminClientTest.java      | 2 +-
 .../com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java | 2 +-
 .../google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java | 2 +-
 .../java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java  | 2 +-
 .../main/java/com/google/datastore/admin/v1/CommonMetadata.java | 2 +-
 .../com/google/datastore/admin/v1/CommonMetadataOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/CreateIndexRequest.java  | 2 +-
 .../google/datastore/admin/v1/CreateIndexRequestOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/DatastoreAdminProto.java | 2 +-
 .../datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java | 2 +-
 .../admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/DeleteIndexRequest.java  | 2 +-
 .../google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java  | 2 +-
 .../main/java/com/google/datastore/admin/v1/EntityFilter.java   | 2 +-
 .../com/google/datastore/admin/v1/EntityFilterOrBuilder.java    | 2 +-
 .../com/google/datastore/admin/v1/ExportEntitiesMetadata.java   | 2 +-
 .../datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java     | 2 +-
 .../com/google/datastore/admin/v1/ExportEntitiesRequest.java    | 2 +-
 .../datastore/admin/v1/ExportEntitiesRequestOrBuilder.java      | 2 +-
 .../com/google/datastore/admin/v1/ExportEntitiesResponse.java   | 2 +-
 .../datastore/admin/v1/ExportEntitiesResponseOrBuilder.java     | 2 +-
 .../java/com/google/datastore/admin/v1/GetIndexRequest.java     | 2 +-
 .../com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java | 2 +-
 .../com/google/datastore/admin/v1/ImportEntitiesMetadata.java   | 2 +-
 .../datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java     | 2 +-
 .../com/google/datastore/admin/v1/ImportEntitiesRequest.java    | 2 +-
 .../datastore/admin/v1/ImportEntitiesRequestOrBuilder.java      | 2 +-
 .../src/main/java/com/google/datastore/admin/v1/Index.java      | 2 +-
 .../com/google/datastore/admin/v1/IndexOperationMetadata.java   | 2 +-
 .../datastore/admin/v1/IndexOperationMetadataOrBuilder.java     | 2 +-
 .../main/java/com/google/datastore/admin/v1/IndexOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/admin/v1/IndexProto.java | 2 +-
 .../java/com/google/datastore/admin/v1/ListIndexesRequest.java  | 2 +-
 .../google/datastore/admin/v1/ListIndexesRequestOrBuilder.java  | 2 +-
 .../java/com/google/datastore/admin/v1/ListIndexesResponse.java | 2 +-
 .../google/datastore/admin/v1/ListIndexesResponseOrBuilder.java | 2 +-
 .../com/google/datastore/admin/v1/MigrationProgressEvent.java   | 2 +-
 .../datastore/admin/v1/MigrationProgressEventOrBuilder.java     | 2 +-
 .../main/java/com/google/datastore/admin/v1/MigrationProto.java | 2 +-
 .../main/java/com/google/datastore/admin/v1/MigrationState.java | 2 +-
 .../java/com/google/datastore/admin/v1/MigrationStateEvent.java | 2 +-
 .../google/datastore/admin/v1/MigrationStateEventOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/admin/v1/MigrationStep.java  | 2 +-
 .../main/java/com/google/datastore/admin/v1/OperationType.java  | 2 +-
 .../src/main/java/com/google/datastore/admin/v1/Progress.java   | 2 +-
 .../java/com/google/datastore/admin/v1/ProgressOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/AggregationQuery.java | 2 +-
 .../java/com/google/datastore/v1/AggregationQueryOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/v1/AggregationResult.java    | 2 +-
 .../java/com/google/datastore/v1/AggregationResultBatch.java    | 2 +-
 .../google/datastore/v1/AggregationResultBatchOrBuilder.java    | 2 +-
 .../com/google/datastore/v1/AggregationResultOrBuilder.java     | 2 +-
 .../java/com/google/datastore/v1/AggregationResultProto.java    | 2 +-
 .../main/java/com/google/datastore/v1/AllocateIdsRequest.java   | 2 +-
 .../com/google/datastore/v1/AllocateIdsRequestOrBuilder.java    | 2 +-
 .../main/java/com/google/datastore/v1/AllocateIdsResponse.java  | 2 +-
 .../com/google/datastore/v1/AllocateIdsResponseOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/ArrayValue.java       | 2 +-
 .../main/java/com/google/datastore/v1/ArrayValueOrBuilder.java  | 2 +-
 .../java/com/google/datastore/v1/BeginTransactionRequest.java   | 2 +-
 .../google/datastore/v1/BeginTransactionRequestOrBuilder.java   | 2 +-
 .../java/com/google/datastore/v1/BeginTransactionResponse.java  | 2 +-
 .../google/datastore/v1/BeginTransactionResponseOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/CommitRequest.java    | 2 +-
 .../java/com/google/datastore/v1/CommitRequestOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/CommitResponse.java   | 2 +-
 .../java/com/google/datastore/v1/CommitResponseOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/CompositeFilter.java  | 2 +-
 .../java/com/google/datastore/v1/CompositeFilterOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/DatastoreProto.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/Entity.java           | 2 +-
 .../src/main/java/com/google/datastore/v1/EntityOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/EntityProto.java      | 2 +-
 .../src/main/java/com/google/datastore/v1/EntityResult.java     | 2 +-
 .../java/com/google/datastore/v1/EntityResultOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/ExecutionStats.java   | 2 +-
 .../java/com/google/datastore/v1/ExecutionStatsOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/ExplainMetrics.java   | 2 +-
 .../java/com/google/datastore/v1/ExplainMetricsOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/ExplainOptions.java   | 2 +-
 .../java/com/google/datastore/v1/ExplainOptionsOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/Filter.java           | 2 +-
 .../src/main/java/com/google/datastore/v1/FilterOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/FindNearest.java      | 2 +-
 .../main/java/com/google/datastore/v1/FindNearestOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/v1/GqlQuery.java         | 2 +-
 .../main/java/com/google/datastore/v1/GqlQueryOrBuilder.java    | 2 +-
 .../main/java/com/google/datastore/v1/GqlQueryParameter.java    | 2 +-
 .../com/google/datastore/v1/GqlQueryParameterOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/Key.java              | 2 +-
 .../src/main/java/com/google/datastore/v1/KeyOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/KindExpression.java   | 2 +-
 .../java/com/google/datastore/v1/KindExpressionOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/LookupRequest.java    | 2 +-
 .../java/com/google/datastore/v1/LookupRequestOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/LookupResponse.java   | 2 +-
 .../java/com/google/datastore/v1/LookupResponseOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/Mutation.java         | 2 +-
 .../main/java/com/google/datastore/v1/MutationOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/MutationResult.java   | 2 +-
 .../java/com/google/datastore/v1/MutationResultOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/PartitionId.java      | 2 +-
 .../main/java/com/google/datastore/v1/PartitionIdOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/v1/PlanSummary.java      | 2 +-
 .../main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/v1/Projection.java       | 2 +-
 .../main/java/com/google/datastore/v1/ProjectionOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/PropertyFilter.java   | 2 +-
 .../java/com/google/datastore/v1/PropertyFilterOrBuilder.java   | 2 +-
 .../src/main/java/com/google/datastore/v1/PropertyMask.java     | 2 +-
 .../java/com/google/datastore/v1/PropertyMaskOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/PropertyOrder.java    | 2 +-
 .../java/com/google/datastore/v1/PropertyOrderOrBuilder.java    | 2 +-
 .../main/java/com/google/datastore/v1/PropertyReference.java    | 2 +-
 .../com/google/datastore/v1/PropertyReferenceOrBuilder.java     | 2 +-
 .../main/java/com/google/datastore/v1/PropertyTransform.java    | 2 +-
 .../com/google/datastore/v1/PropertyTransformOrBuilder.java     | 2 +-
 .../src/main/java/com/google/datastore/v1/Query.java            | 2 +-
 .../src/main/java/com/google/datastore/v1/QueryOrBuilder.java   | 2 +-
 .../main/java/com/google/datastore/v1/QueryProfileProto.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/QueryProto.java       | 2 +-
 .../src/main/java/com/google/datastore/v1/QueryResultBatch.java | 2 +-
 .../java/com/google/datastore/v1/QueryResultBatchOrBuilder.java | 2 +-
 .../src/main/java/com/google/datastore/v1/ReadOptions.java      | 2 +-
 .../main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/v1/ReserveIdsRequest.java    | 2 +-
 .../com/google/datastore/v1/ReserveIdsRequestOrBuilder.java     | 2 +-
 .../main/java/com/google/datastore/v1/ReserveIdsResponse.java   | 2 +-
 .../com/google/datastore/v1/ReserveIdsResponseOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/RollbackRequest.java  | 2 +-
 .../java/com/google/datastore/v1/RollbackRequestOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/RollbackResponse.java | 2 +-
 .../java/com/google/datastore/v1/RollbackResponseOrBuilder.java | 2 +-
 .../com/google/datastore/v1/RunAggregationQueryRequest.java     | 2 +-
 .../datastore/v1/RunAggregationQueryRequestOrBuilder.java       | 2 +-
 .../com/google/datastore/v1/RunAggregationQueryResponse.java    | 2 +-
 .../datastore/v1/RunAggregationQueryResponseOrBuilder.java      | 2 +-
 .../src/main/java/com/google/datastore/v1/RunQueryRequest.java  | 2 +-
 .../java/com/google/datastore/v1/RunQueryRequestOrBuilder.java  | 2 +-
 .../src/main/java/com/google/datastore/v1/RunQueryResponse.java | 2 +-
 .../java/com/google/datastore/v1/RunQueryResponseOrBuilder.java | 2 +-
 .../main/java/com/google/datastore/v1/TransactionOptions.java   | 2 +-
 .../com/google/datastore/v1/TransactionOptionsOrBuilder.java    | 2 +-
 .../src/main/java/com/google/datastore/v1/Value.java            | 2 +-
 .../src/main/java/com/google/datastore/v1/ValueOrBuilder.java   | 2 +-
 156 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 54ff42158eac..fdfb8c1feda2 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.51.0
-googleapis_commitish: 52e410823122cf44d265c3beecb86c773db248a2
+googleapis_commitish: c72d7385435589176aa6e44563fcfbc795b9a476
 libraries_bom_version: 26.52.0
 libraries:
   - api_shortname: datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 2e58d667994e..9ef7f1edf90d 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 4db454e2066d..35f993cc8ee3 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
index bf70b678aa27..73f593170298 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
index 90c3c45f9614..e5a17cc7d166 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index aa10d582f2fb..77314c4bc4c4 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
index 9fa4e901b7ea..fa1147044143 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
index 0ab662814d0a..1f6e840e014b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
index 0f992e4c21ce..e56561c69564 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index af095ad28189..7c1a53ea39f3 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
index eff9e6b3af71..60e786eb98f7 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
index 0632151c6bfc..e279f543ef1f 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
index ab9b5b1fbc19..ab02d565b7f0 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
index cc63d52487c0..7ac63a381ff7 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index 3e36d55f53be..fcea8a71fa84 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 3bd274168e49..8b6c77deb002 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 3ef2919c4dec..7532c1b7ab7d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 6a14a8152bcd..8a418b846338 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index 0d87e8faa96e..aafb81d48b4a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 838a55b36b88..c97248e0ae94 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index ea0e28ff1f5f..ef2be326bfe9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index 2f6c2ae7c83c..e73f8c7378ab 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d4f87d2a8c75..828c5c1fb959 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index ab53b6df5918..9a93b66f28c7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 3a6b14377c8c..5cbe9bb4d642 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 3f75daeffcf7..d5e1a058fbc4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a6bded093c62..6acc9b76f9d0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index 099f4bb5b669..908f325003e9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 88eeb5b0fb09..e953f46217da 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9ddd587f98fc..e0b0c0bcb61d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b4f183c049f3..4bddab90fc5a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index 338f4ff99b10..8b85687745e3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 2513a6c2bc79..cbacd2260458 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index da3d4617de19..d1d781b7d197 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9e8265e494cc..5fea7cf9846c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index 2ed2c3684564..ba30c430a98f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1ca992dd5a47..94e8192ce161 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c1d8424fe0ed..e0d8abbe0cf3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 cb5c4b96c2cf..20c0e9c40263 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c524fb3b222c..0eb0440d16cf 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index e85b0747a580..1ffba87d4dd0 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index b45823f6a9ee..f47a371a4c8a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e44ad1c73179..90627347f56e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8472db7dc078..258d08cd9d06 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index dc18f1b6368c..3a5d68fc4cbf 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 abce952f3a6e..956b22417a95 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index a305da039740..40f2e4ba165d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a35cd49caeba..7dd512772a98 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4db619cd0e4a..08bbab7bf8a4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 63e6e1186d45..4da124461fb2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index a5b46ab836b8..9df1276a84a3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 203980b3a564..0fac9e592715 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index de901f9e36ea..962e1416ed20 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index 46a80ff317c4..9e2cc7f61e86 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index 34316b3be821..66e73b4dc603 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 7e010b15dd66..139ed5960d52 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index cc6b6c27bae7..0d22c5b2cf6a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 fa056f1b1841..85ab869883f2 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d71b7a7ec2f0..7f9a0a6088fa 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5566884f05f1..358672417b57 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d40e87f167ea..84cfc1a97b9c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 280f19bd4cfc..c75fce0f37c9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 470d13243778..8bdf749c3756 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index 5a3b32a739ec..8c172f409a58 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6aeec8c61190..ba8b762c56dd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e39eca958e77..92532d1f72ec 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 25b3b348cbc0..d741665c8d42 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 2204290ae254..1624266d1692 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 245cb4b38a6d..64ac1d115a72 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index 021a8ba56030..d9a3fe96dd1b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 79747e7ba487..70db0864871f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8a8bbadd26e7..38e18ec75ede 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c9cbae64e698..fcca145c2a83 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index ef98909fd2ce..408896255824 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 baefc371e7af..27db571723d6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 137b6996318f..02dd0e53b539 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e24a08499d78..1c99dbe42850 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index ac4da4033d37..14881db57e04 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 10fb06dfdb2d..549b6c60d824 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 3e53e363afc8..43f56bd57bdd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b186c25f0b8e..2764eb38fc9f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 6688af1dc9ea..7217a2bdc92f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8359303a8c09..1ec6d192bdaa 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 8d131a68a370..9bd0e100270f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4fac83ece7fc..58f2b5131d3c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6d1020451a00..408813f6b210 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
index 2e17827a8d76..fca303323ef3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
index 237bd2909f1c..67957d774d13 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
index e6fefcd176ae..23a8172e5fcd 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
index 3b4d3578b426..bfcc297a23e0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
index 0871c6cbbcec..a7a497c803c2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
index 764b080ee2c2..f6c779c1965f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 55d69597d98b..c6c71843bdb0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 49f3eb7081fe..4d351a272771 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
index 999b5b1f2854..105ba669e422 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
index ac7b994a6923..504c10bb5b56 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 49a2985906b6..766dfa10ef4d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 48a1a92de160..1ce49ae7ae99 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d22732f68966..d57a38e8500d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 dfa3547b8ec2..5c3fc53dadf6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 90c1fe1fcea0..9cd165e426c9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 ca5be689d860..dca0ac30092a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8d478290969c..2440248b27a0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 08dc4b3d2118..75f85f5fa311 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4a9d5243979e..c9debbee560f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e417f3306bbf..645d311f2de4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 f624e5d4d30c..211ecfd32103 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9dfacb3d6cff..540ffdd11f74 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 ff6a54f5bed0..e9d1e85273be 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 131454c79f5b..f608c8c7187d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 aa05f03daae5..e2bd44311032 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index e4f8c7561541..c948ceffb265 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 09ea652c91d3..c5c48023008d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 7c418fe37434..0fd99d809c53 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
index 365b11d31ae0..25c75ada895e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
index 8088a8c24b25..ace5cbe50328 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 cfd0dc7053b2..440ca2b2c231 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 71920236c19e..179dddadc57c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 814bfe7fa2e1..e549f15f9bf8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index fd74ed8e99ef..1cd09dd3e706 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
index 432846ebc2e1..a60894f47528 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
index e36a55be598c..f34a77f67e0d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c12f8741b9b6..7991da53c412 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index 4e4e8b98606a..a190d59d3d11 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d1ce5477ef10..56ee78cec55f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 0d80ea0ea229..6e93680def7c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
index 520ccb0f20f0..516aa58ade66 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
index 34782a859e46..169427dd6b0f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 25fba4c89ffe..d210c1636407 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 86e6d218f4f0..4ae6b255dbbf 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
index 83e5d176362d..9bfe380f795c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 489e035abd15..bdd8d76827cf 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index 49bb3799fce1..a5f09b7c90ce 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index 57ae675f6f00..01f9c75a7156 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index dd545344edbb..ed5ac6a48351 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 64500abd95a0..4c0ac317b43c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d37792b79aa9..bec6a7ae944a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 74644db43e2e..794b3102fd37 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9cf9adff350c..5100f525e7e7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 8858bddf2922..182dfdc188b3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1e3b5e93db54..edae24a6c63d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5c4ac466471a..754a192103c2 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a8de2a48b93d..b7aae859631b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index 3b89b7ed5c47..69e9ae346dda 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 85021f6fa471..1d262da92105 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6137bb693397..7f12bcfe22b6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 f122b0943022..54453de38171 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 cacfa52e8f9c..a8845ed1a791 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 7886ca3c7662..0dc924f05d6d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 85845572356d..7135a9e04b6e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 714256e654f9..814bd4257d8e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c7fceec74577..c4ad0528c8d3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 7e73f6826f9a..3da61336948f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 551969802aa2..6d256b6150fe 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 56b6fae302f1..14ce0060716e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a375525d90ce..96773b933cea 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 9d531957da3f017f0702a126601eaa8afe3113d6 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:16:21 -0800
Subject: [PATCH 1524/1784] fix: Fix emulator command arg data-dir (#1695)

The current gcloudRunner doesn't take any `--data-dir` flag due to a bug. This PR is to fix the `--data-dir` flag.
---
 .../cloud/datastore/testing/LocalDatastoreHelper.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 32bf9611c987..79d10220cce4 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
@@ -163,15 +163,15 @@ private LocalDatastoreHelper(Builder builder) {
     if (!builder.storeOnDisk) {
       gcloudCommand.add("--no-store-on-disk");
     }
+    if (builder.dataDir != null) {
+      gcloudCommand.add("--data-dir=" + getGcdPath());
+    }
     GcloudEmulatorRunner gcloudRunner =
         new GcloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION);
     List binCommand = new ArrayList<>(Arrays.asList(binName, "start"));
     binCommand.add("--testing");
     binCommand.add(BIN_CMD_PORT_FLAG + getPort());
     binCommand.add(CONSISTENCY_FLAG + getConsistency());
-    if (builder.dataDir != null) {
-      gcloudCommand.add("--data-dir=" + getGcdPath());
-    }
     DownloadableEmulatorRunner downloadRunner =
         new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM, ACCESS_TOKEN);
     this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner);

From 9b63580c5fac85f783690e1b8b844719c335c3e2 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 6 Jan 2025 12:21:18 -0500
Subject: [PATCH 1525/1784] chore: Update generation configuration at Sat Jan 
 4 02:21:14 UTC 2025 (#1697)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index fdfb8c1feda2..67a3d1ef518e 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.51.0
-googleapis_commitish: c72d7385435589176aa6e44563fcfbc795b9a476
+googleapis_commitish: e1b13abbbbec18998ad0bfe39a32ad2b061d4eda
 libraries_bom_version: 26.52.0
 libraries:
   - api_shortname: datastore

From 978fafe9ab3f3bc6e6b2e764a7f7c7ac7e5a607f Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 8 Jan 2025 16:35:01 -0500
Subject: [PATCH 1526/1784] chore: Update generation configuration at Wed Jan 
 8 02:23:09 UTC 2025 (#1699)

* chore: Update generation configuration at Tue Jan  7 02:24:02 UTC 2025

* chore: Update generation configuration at Wed Jan  8 02:23:09 UTC 2025
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 67a3d1ef518e..ca592fd998d4 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.51.0
-googleapis_commitish: e1b13abbbbec18998ad0bfe39a32ad2b061d4eda
+googleapis_commitish: 130b113520c1b3fffd90f67198681b5fe84de464
 libraries_bom_version: 26.52.0
 libraries:
   - api_shortname: datastore

From b91a2af534eb7568ec86a0b27a80a6bd2943af7b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 8 Jan 2025 22:36:17 +0100
Subject: [PATCH 1527/1784] deps: update dependency
 com.google.guava:guava-testlib to v33.4.0-jre (#1694)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6f22c2be20ed..14dbbfb73bb5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -151,7 +151,7 @@
     
       com.google.guava
       guava-testlib
-      33.3.1-jre
+      33.4.0-jre
       test
     
     

From cd258d048811b3d6e09dfee4b044da370ad943a4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 8 Jan 2025 13:36:33 -0800
Subject: [PATCH 1528/1784] chore(main): release 2.25.2-SNAPSHOT (#1689)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f71e20221c30..20383ef09832 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.25.1
+  2.25.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1
+    2.25.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c9cfd3347908..4d1be0d6f2c3 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.25.1
+  2.25.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.1
+        2.25.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.1
+        2.25.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.1
+        0.116.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.1
+        2.25.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 14dbbfb73bb5..b8157b04d462 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.1
+  2.25.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1
+    2.25.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 74b964682fd4..870bd340eeac 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.25.1
+  2.25.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1
+    2.25.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 4a8583e61a2f..cdfbc9208684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.1
+  2.25.2-SNAPSHOT
   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.25.1
+        2.25.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.1
+        2.25.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.1
+        2.25.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.1
+        0.116.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.1
+        2.25.2-SNAPSHOT
         
           
             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 28ed4b0e7c91..e053c1c50f12 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.25.1
+  2.25.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1
+    2.25.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a2fc2f2a8ad4..de04132d9187 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.116.1
+  0.116.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.1
+    2.25.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 174ac036d341..d749b07af187 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.1
+      2.25.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 783c47b1f7b1..64fa74fc1186 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.1:2.25.1
-google-cloud-datastore-bom:2.25.1:2.25.1
-proto-google-cloud-datastore-v1:0.116.1:0.116.1
-datastore-v1-proto-client:2.25.1:2.25.1
-proto-google-cloud-datastore-admin-v1:2.25.1:2.25.1
-grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.1
+google-cloud-datastore:2.25.1:2.25.2-SNAPSHOT
+google-cloud-datastore-bom:2.25.1:2.25.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.116.1:0.116.2-SNAPSHOT
+datastore-v1-proto-client:2.25.1:2.25.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT

From 8160c2895e947c118cea24e92d9a31a1fdf4653f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 8 Jan 2025 22:37:57 +0100
Subject: [PATCH 1529/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.49.0 (#1693)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b8157b04d462..56e61e7fe213 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.48.0
+        1.49.0
         pom
         import
       

From f94b5952cc3589ed8970a453ecc6e005a39625f3 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 8 Jan 2025 22:58:11 +0100
Subject: [PATCH 1530/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.52.0 (#1701)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 95c5f4db491e..6f9dca16c31f 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.51.0
+        26.52.0
         pom
         import
       

From bf9537f81b6e7cc2252ad0183fb87db656b009d7 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 8 Jan 2025 22:58:29 +0100
Subject: [PATCH 1531/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.41.1 (#1703)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 87c21c0a0c62..07240c01801c 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 6c760a779882..82991aa29e57 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.1"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 2a166877fef8..9303e1793be0 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.1"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 4d1be0d6f2c3..01f5831f272e 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.41.0
+    3.41.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index cdfbc9208684..4f085e97bba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.41.0
+    3.41.1
   
 
   

From 7f5c379ed1a065179aa77d847a3f7d43905e6da4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 8 Jan 2025 23:55:51 +0100
Subject: [PATCH 1532/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.25.1 (#1690)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index f60a4bb5afd8..72a4cae0c1ea 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.25.0
+      2.25.1
     
     
 

From 90d8b3034d5a583d880a822d1e763035a2120f4a Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 9 Jan 2025 12:46:45 -0500
Subject: [PATCH 1533/1784] chore: Update generation configuration at Thu Jan 
 9 02:33:59 UTC 2025 (#1705)

* chore: Update generation configuration at Thu Jan  9 02:33:59 UTC 2025

* chore: generate libraries at Thu Jan  9 02:34:46 UTC 2025
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 README.md                                          | 4 ++--
 generation_config.yaml                             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 604b674bad98..c1be8aca557b 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/README.md b/README.md
index 160907fc0ae4..fb097be5930e 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.51.0
+      26.52.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.25.0
+  2.25.1
 
 
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index ca592fd998d4..657b30e8fd8a 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.51.0
-googleapis_commitish: 130b113520c1b3fffd90f67198681b5fe84de464
+gapic_generator_version: 2.51.1
+googleapis_commitish: 00196e2a68b16a864c57db2e870822875a7f1198
 libraries_bom_version: 26.52.0
 libraries:
   - api_shortname: datastore

From 1beb7a1757babd5057a027747e56648729a94d1e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:10:25 -0800
Subject: [PATCH 1534/1784] chore(main): release 2.25.2 (#1702)

* chore(main): release 2.25.2

* chore: generate libraries at Thu Jan  9 20:16:10 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 15 +++++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adec35297873..ac277985c0ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.25.2](https://github.com/googleapis/java-datastore/compare/v2.25.1...v2.25.2) (2025-01-09)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.51.1 ([90d8b30](https://github.com/googleapis/java-datastore/commit/90d8b3034d5a583d880a822d1e763035a2120f4a))
+* Fix emulator command arg data-dir ([#1695](https://github.com/googleapis/java-datastore/issues/1695)) ([9d53195](https://github.com/googleapis/java-datastore/commit/9d531957da3f017f0702a126601eaa8afe3113d6))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.49.0 ([#1693](https://github.com/googleapis/java-datastore/issues/1693)) ([8160c28](https://github.com/googleapis/java-datastore/commit/8160c2895e947c118cea24e92d9a31a1fdf4653f))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.41.1 ([#1703](https://github.com/googleapis/java-datastore/issues/1703)) ([bf9537f](https://github.com/googleapis/java-datastore/commit/bf9537f81b6e7cc2252ad0183fb87db656b009d7))
+* Update dependency com.google.guava:guava-testlib to v33.4.0-jre ([#1694](https://github.com/googleapis/java-datastore/issues/1694)) ([b91a2af](https://github.com/googleapis/java-datastore/commit/b91a2af534eb7568ec86a0b27a80a6bd2943af7b))
+
 ## [2.25.1](https://github.com/googleapis/java-datastore/compare/v2.25.0...v2.25.1) (2024-12-13)
 
 
diff --git a/README.md b/README.md
index fb097be5930e..25ff835b0949 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.25.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.25.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.2"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 20383ef09832..181845869003 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.25.2-SNAPSHOT
+  2.25.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2-SNAPSHOT
+    2.25.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 01f5831f272e..3ea804a551f8 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.25.2-SNAPSHOT
+  2.25.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.2-SNAPSHOT
+        2.25.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.2-SNAPSHOT
+        2.25.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.2-SNAPSHOT
+        0.116.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.2-SNAPSHOT
+        2.25.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 56e61e7fe213..7ceaa1d4e76f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.2-SNAPSHOT
+  2.25.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2-SNAPSHOT
+    2.25.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 870bd340eeac..5dc40791d543 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.25.2-SNAPSHOT
+  2.25.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2-SNAPSHOT
+    2.25.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 4f085e97bba0..750c26156b3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.2-SNAPSHOT
+  2.25.2
   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.25.2-SNAPSHOT
+        2.25.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.2-SNAPSHOT
+        2.25.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.2-SNAPSHOT
+        2.25.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.2-SNAPSHOT
+        0.116.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.2-SNAPSHOT
+        2.25.2
         
           
             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 e053c1c50f12..f60cac1d76a0 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.25.2-SNAPSHOT
+  2.25.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2-SNAPSHOT
+    2.25.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index de04132d9187..b33dff30b482 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.116.2-SNAPSHOT
+  0.116.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2-SNAPSHOT
+    2.25.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d749b07af187..92e479703729 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.2-SNAPSHOT
+      2.25.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 64fa74fc1186..38a509604924 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.1:2.25.2-SNAPSHOT
-google-cloud-datastore-bom:2.25.1:2.25.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.116.1:0.116.2-SNAPSHOT
-datastore-v1-proto-client:2.25.1:2.25.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT
+google-cloud-datastore:2.25.2:2.25.2
+google-cloud-datastore-bom:2.25.2:2.25.2
+proto-google-cloud-datastore-v1:0.116.2:0.116.2
+datastore-v1-proto-client:2.25.2:2.25.2
+proto-google-cloud-datastore-admin-v1:2.25.2:2.25.2
+grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.2

From b78660f3866ce5c1198db4590b5e1f645170ecff Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 13 Jan 2025 19:18:15 +0100
Subject: [PATCH 1535/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.50.0 (#1708)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 7ceaa1d4e76f..2bc73cfdd641 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.49.0
+        1.50.0
         pom
         import
       

From f336bf7d7a9bd19115801ae369326d37d20f8dcc Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 13 Jan 2025 13:18:36 -0500
Subject: [PATCH 1536/1784] chore: Update generation configuration at Mon Jan
 13 02:25:37 UTC 2025 (#1707)

* chore: Update generation configuration at Fri Jan 10 02:24:46 UTC 2025

* chore: Update generation configuration at Sat Jan 11 02:23:02 UTC 2025

* chore: Update generation configuration at Sun Jan 12 02:26:48 UTC 2025

* chore: Update generation configuration at Mon Jan 13 02:25:37 UTC 2025

---------

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 657b30e8fd8a..3fd93e0ec393 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.51.1
-googleapis_commitish: 00196e2a68b16a864c57db2e870822875a7f1198
+googleapis_commitish: d5cc1cd738a66bb7104162bcb35ebd539c658415
 libraries_bom_version: 26.52.0
 libraries:
   - api_shortname: datastore

From 124f8b227cbcfa87df3cf593ab9ee9c3c2e7bcda Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 13 Jan 2025 19:55:30 +0100
Subject: [PATCH 1537/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.25.2 (#1710)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 72a4cae0c1ea..84f763453dd7 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.25.1
+      2.25.2
     
     
 

From 1573ccaffded52dd0f070a9ce2b7c64d0bc4a341 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:46:23 -0800
Subject: [PATCH 1538/1784] chore(main): release 2.25.3-SNAPSHOT (#1709)

* chore(main): release 2.25.3-SNAPSHOT

* chore: generate libraries at Mon Jan 13 18:56:29 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 README.md                                     |  2 +-
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 25ff835b0949..12e6a2c041a6 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.25.1
+  2.25.2
 
 
 ```
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 181845869003..53a4f5751adb 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.25.2
+  2.25.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2
+    2.25.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3ea804a551f8..9611a2182172 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.25.2
+  2.25.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.2
+        2.25.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.2
+        2.25.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.2
+        0.116.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.2
+        2.25.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2bc73cfdd641..6c210369d3a1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.2
+  2.25.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2
+    2.25.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 5dc40791d543..f207af3c87bc 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.25.2
+  2.25.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2
+    2.25.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 750c26156b3f..170494d2de2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.2
+  2.25.3-SNAPSHOT
   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.25.2
+        2.25.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.2
+        2.25.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.2
+        2.25.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.2
+        0.116.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.2
+        2.25.3-SNAPSHOT
         
           
             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 f60cac1d76a0..79d14613972e 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.25.2
+  2.25.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2
+    2.25.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b33dff30b482..3c1b7f545e9c 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.116.2
+  0.116.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.2
+    2.25.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 92e479703729..e636da6ee576 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.2
+      2.25.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 38a509604924..a0abd7bdbe3f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.2:2.25.2
-google-cloud-datastore-bom:2.25.2:2.25.2
-proto-google-cloud-datastore-v1:0.116.2:0.116.2
-datastore-v1-proto-client:2.25.2:2.25.2
-proto-google-cloud-datastore-admin-v1:2.25.2:2.25.2
-grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.2
+google-cloud-datastore:2.25.2:2.25.3-SNAPSHOT
+google-cloud-datastore-bom:2.25.2:2.25.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.116.2:0.116.3-SNAPSHOT
+datastore-v1-proto-client:2.25.2:2.25.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT

From 352b248991529c4be9f26c26fc16c739b4026be3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:41:09 -0800
Subject: [PATCH 1539/1784] chore(main): release 2.25.3 (#1714)

* chore(main): release 2.25.3

* chore: generate libraries at Wed Jan 15 19:47:17 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac277985c0ae..24de017f9481 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.25.3](https://github.com/googleapis/java-datastore/compare/v2.25.2...v2.25.3) (2025-01-15)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.50.0 ([#1708](https://github.com/googleapis/java-datastore/issues/1708)) ([b78660f](https://github.com/googleapis/java-datastore/commit/b78660f3866ce5c1198db4590b5e1f645170ecff))
+
 ## [2.25.2](https://github.com/googleapis/java-datastore/compare/v2.25.1...v2.25.2) (2025-01-09)
 
 
diff --git a/README.md b/README.md
index 12e6a2c041a6..ba1a2143c1b0 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.25.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.25.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.3"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 53a4f5751adb..3acf5b61fabb 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.25.3-SNAPSHOT
+  2.25.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3-SNAPSHOT
+    2.25.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 9611a2182172..1ab3f57c9057 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.25.3-SNAPSHOT
+  2.25.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.3-SNAPSHOT
+        2.25.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.3-SNAPSHOT
+        2.25.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.3-SNAPSHOT
+        0.116.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.3-SNAPSHOT
+        2.25.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6c210369d3a1..78e862752f4a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.3-SNAPSHOT
+  2.25.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3-SNAPSHOT
+    2.25.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f207af3c87bc..2e240f549c4c 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.25.3-SNAPSHOT
+  2.25.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3-SNAPSHOT
+    2.25.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 170494d2de2d..2dc557eccf98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.3-SNAPSHOT
+  2.25.3
   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.25.3-SNAPSHOT
+        2.25.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.3-SNAPSHOT
+        2.25.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.3-SNAPSHOT
+        2.25.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.3-SNAPSHOT
+        0.116.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.3-SNAPSHOT
+        2.25.3
         
           
             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 79d14613972e..e1c7befb2a25 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.25.3-SNAPSHOT
+  2.25.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3-SNAPSHOT
+    2.25.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3c1b7f545e9c..ea9aac37df91 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.116.3-SNAPSHOT
+  0.116.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3-SNAPSHOT
+    2.25.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e636da6ee576..7ef6cdcaa6cb 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.3-SNAPSHOT
+      2.25.3
     
     
 
diff --git a/versions.txt b/versions.txt
index a0abd7bdbe3f..e7b449b766b5 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.2:2.25.3-SNAPSHOT
-google-cloud-datastore-bom:2.25.2:2.25.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.116.2:0.116.3-SNAPSHOT
-datastore-v1-proto-client:2.25.2:2.25.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT
+google-cloud-datastore:2.25.3:2.25.3
+google-cloud-datastore-bom:2.25.3:2.25.3
+proto-google-cloud-datastore-v1:0.116.3:0.116.3
+datastore-v1-proto-client:2.25.3:2.25.3
+proto-google-cloud-datastore-admin-v1:2.25.3:2.25.3
+grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.3

From 2a7a9a114257ada6b195d2c58467005c23b5d9d1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 11:04:46 -0500
Subject: [PATCH 1540/1784] chore(main): release 2.25.4-SNAPSHOT (#1715)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3acf5b61fabb..1d720d54f664 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.25.3
+  2.25.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3
+    2.25.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 1ab3f57c9057..2b77ecd5b4f1 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.25.3
+  2.25.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.3
+        2.25.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.3
+        2.25.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.3
+        0.116.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.3
+        2.25.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 78e862752f4a..e37499d3366a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.3
+  2.25.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3
+    2.25.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 2e240f549c4c..4b754b8b51b0 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.25.3
+  2.25.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3
+    2.25.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 2dc557eccf98..74c56c801250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.3
+  2.25.4-SNAPSHOT
   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.25.3
+        2.25.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.3
+        2.25.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.3
+        2.25.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.3
+        0.116.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.3
+        2.25.4-SNAPSHOT
         
           
             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 e1c7befb2a25..40747b4916f6 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.25.3
+  2.25.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3
+    2.25.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index ea9aac37df91..a759958b5526 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.116.3
+  0.116.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.3
+    2.25.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7ef6cdcaa6cb..d338a86470ca 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.3
+      2.25.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index e7b449b766b5..29feb608fb32 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.3:2.25.3
-google-cloud-datastore-bom:2.25.3:2.25.3
-proto-google-cloud-datastore-v1:0.116.3:0.116.3
-datastore-v1-proto-client:2.25.3:2.25.3
-proto-google-cloud-datastore-admin-v1:2.25.3:2.25.3
-grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.3
+google-cloud-datastore:2.25.3:2.25.4-SNAPSHOT
+google-cloud-datastore-bom:2.25.3:2.25.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.116.3:0.116.4-SNAPSHOT
+datastore-v1-proto-client:2.25.3:2.25.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT

From 9d5c8dddf636a0cb2a9aa6c7302d73edef96d152 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:56:11 -0500
Subject: [PATCH 1541/1784] chore: Update generation configuration at Thu Jan
 16 02:19:57 UTC 2025 (#1711)

* chore: Update generation configuration at Tue Jan 14 02:19:18 UTC 2025

* chore: generate libraries at Tue Jan 14 02:19:54 UTC 2025

* chore: Update generation configuration at Wed Jan 15 02:20:57 UTC 2025

* chore: Update generation configuration at Thu Jan 16 02:19:57 UTC 2025

---------

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 3fd93e0ec393..187bb8c3a2b1 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.51.1
-googleapis_commitish: d5cc1cd738a66bb7104162bcb35ebd539c658415
+googleapis_commitish: 8c9639ac76d6f08df5b3c2c0aa759cab126bbba5
 libraries_bom_version: 26.52.0
 libraries:
   - api_shortname: datastore

From 0333b0744bab87afe78dad1c17f6811d3dec47e6 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 22 Jan 2025 22:31:20 +0100
Subject: [PATCH 1542/1784] deps: update dependency org.easymock:easymock to
 v5.5.0 (#1666)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 74c56c801250..092ea05777ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
       
         org.easymock
         easymock
-        5.4.0
+        5.5.0
         test
       
     

From 2f31c5b3ade3e255dcc0a3f093041317f8c805b6 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 22 Jan 2025 22:32:32 +0100
Subject: [PATCH 1543/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.53.0 (#1713)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 6f9dca16c31f..20ba4adb97f6 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.52.0
+        26.53.0
         pom
         import
       

From fa8cea090e5d41645c64ab0379bd035307c07f0d Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 22 Jan 2025 16:32:48 -0500
Subject: [PATCH 1544/1784] chore: Update generation configuration at Wed Jan
 22 02:22:09 UTC 2025 (#1717)

* chore: Update generation configuration at Wed Jan 22 02:22:09 UTC 2025

* chore: generate libraries at Wed Jan 22 02:22:43 UTC 2025
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ba1a2143c1b0..0f4fdf46da66 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.52.0')
+implementation platform('com.google.cloud:libraries-bom:26.53.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 187bb8c3a2b1..69ac415c0db6 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.51.1
-googleapis_commitish: 8c9639ac76d6f08df5b3c2c0aa759cab126bbba5
-libraries_bom_version: 26.52.0
+googleapis_commitish: e9a4c38a81933108eaa6ac96c7ead31e253c8c64
+libraries_bom_version: 26.53.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From a38a741b8364a7048656c074e8aa42b9c2496990 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:20:28 -0800
Subject: [PATCH 1545/1784] chore(main): release 2.25.4 (#1718)

* chore(main): release 2.25.4

* chore: generate libraries at Wed Jan 22 21:33:50 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  8 ++++----
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24de017f9481..78c769d0c7ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.25.4](https://github.com/googleapis/java-datastore/compare/v2.25.3...v2.25.4) (2025-01-22)
+
+
+### Dependencies
+
+* Update dependency org.easymock:easymock to v5.5.0 ([#1666](https://github.com/googleapis/java-datastore/issues/1666)) ([0333b07](https://github.com/googleapis/java-datastore/commit/0333b0744bab87afe78dad1c17f6811d3dec47e6))
+
 ## [2.25.3](https://github.com/googleapis/java-datastore/compare/v2.25.2...v2.25.3) (2025-01-15)
 
 
diff --git a/README.md b/README.md
index 0f4fdf46da66..1470ac3e7132 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.52.0
+      26.53.0
       pom
       import
     
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.25.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.25.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.4"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.4
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 1d720d54f664..c6b52b79638a 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.25.4-SNAPSHOT
+  2.25.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4-SNAPSHOT
+    2.25.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2b77ecd5b4f1..f3475c4a9e2c 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.25.4-SNAPSHOT
+  2.25.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.4-SNAPSHOT
+        2.25.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.4-SNAPSHOT
+        2.25.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.4-SNAPSHOT
+        0.116.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.4-SNAPSHOT
+        2.25.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e37499d3366a..5b228e916259 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.4-SNAPSHOT
+  2.25.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4-SNAPSHOT
+    2.25.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 4b754b8b51b0..125807ce5074 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.25.4-SNAPSHOT
+  2.25.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4-SNAPSHOT
+    2.25.4
   
   
     
diff --git a/pom.xml b/pom.xml
index 092ea05777ab..4579f4aef927 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.4-SNAPSHOT
+  2.25.4
   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.25.4-SNAPSHOT
+        2.25.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.4-SNAPSHOT
+        2.25.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.4-SNAPSHOT
+        2.25.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.4-SNAPSHOT
+        0.116.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.4-SNAPSHOT
+        2.25.4
         
           
             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 40747b4916f6..fab8c1c58bcc 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.25.4-SNAPSHOT
+  2.25.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4-SNAPSHOT
+    2.25.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a759958b5526..8ab0b4196b46 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.116.4-SNAPSHOT
+  0.116.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4-SNAPSHOT
+    2.25.4
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d338a86470ca..706cbea5784d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.4-SNAPSHOT
+      2.25.4
     
     
 
diff --git a/versions.txt b/versions.txt
index 29feb608fb32..f7fd65578ed2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.3:2.25.4-SNAPSHOT
-google-cloud-datastore-bom:2.25.3:2.25.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.116.3:0.116.4-SNAPSHOT
-datastore-v1-proto-client:2.25.3:2.25.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT
+google-cloud-datastore:2.25.4:2.25.4
+google-cloud-datastore-bom:2.25.4:2.25.4
+proto-google-cloud-datastore-v1:0.116.4:0.116.4
+datastore-v1-proto-client:2.25.4:2.25.4
+proto-google-cloud-datastore-admin-v1:2.25.4:2.25.4
+grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.4

From 50f106d4c50884ce471a66c00df322270fe4a91c Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Fri, 24 Jan 2025 01:23:32 -0800
Subject: [PATCH 1546/1784] feat: Add firestoreInDatastoreMode for datastore
 emulator (#1698)

* feat: Add firestoreInDatastoreMode for datastore emulator

* chore: generate libraries at Mon Jan  6 17:28:37 UTC 2025

* update emulator min version

* update version to 2.2.2

* update version to 2.3.0

* update version to 2.2.1

* update version to 2.3.1

* chore: generate libraries at Mon Jan 13 23:32:38 UTC 2025

* Fix ci testing environment with java 11

* Add Java 11 enviroment to run tests

* Fix java env formatting

* set maven env

* set maven env

* testing java 11

* Add sample test env variable

* Add sample test env variable

* Add sample test env variable

* run with java8 but build with 11

* Add java 11 as java_home sample build

* Add java_home for presubmit

* Fix SUREFIRE_JVM_OPT for sample build

* Fix JAVA_HOME for sample build

* Fix JAVA_HOME for sample build

* Modify Java env for presubmit integration build

* Add setjava to builder script

* Add setjava to builder script

* Add setjava to builder script

* Add debugging info to builder script

* Add debugging info to builder script

* Add debugging info to builder script

* Add debugging info to builder script

* formatting

* Add debugging

* Add debugging

* Add debugging

* Add debugging

* Add debugging

* Add debugging

* Resolve conflicts

* Change sample build to use java11 container

* chore: generate libraries at Thu Jan 23 23:20:47 UTC 2025

---------

Co-authored-by: cloud-java-bot 
---
 .cloudbuild/samples_build.yaml                | 10 ++---
 .github/workflows/ci.yaml                     | 10 ++++-
 .kokoro/build.sh                              | 12 ++++++
 .kokoro/common.sh                             |  2 +-
 .kokoro/presubmit/integration.cfg             |  2 +-
 .../testing/LocalDatastoreHelper.java         | 38 +++++++++++++++++--
 .../testing/ITLocalDatastoreHelperTest.java   | 24 ++++++++++++
 7 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/.cloudbuild/samples_build.yaml b/.cloudbuild/samples_build.yaml
index 204a7b25481f..3dd2ff94ced1 100644
--- a/.cloudbuild/samples_build.yaml
+++ b/.cloudbuild/samples_build.yaml
@@ -1,19 +1,19 @@
 steps:
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: ls
   args: [
     '-alt',
   ]
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: curl
   args: [
     '--header',
     'Metadata-Flavor: Google',
     'http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email'
   ]
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: pwd
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: bash
   args: [
     '.kokoro/build.sh'
@@ -22,7 +22,7 @@ steps:
   - 'JOB_TYPE=samples'
   - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-sample'
   - 'KOKORO_GITHUB_PULL_REQUEST_NUMBER=$_PR_NUMBER'
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: echo
   args: [
     'Sample job succeeded',
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b91fa381f56b..941f2f3b419e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -59,6 +59,7 @@ jobs:
         env:
           JOB_TYPE: test
   windows:
+    # Building using Java 11 and run the tests with Java 8 runtime
     runs-on: windows-latest
     steps:
     - name: Support longpaths
@@ -66,8 +67,15 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
-        distribution: temurin
         java-version: 8
+        distribution: temurin
+    - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
+      run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}\bin\java" >> $GITHUB_ENV
+      shell: bash
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 11
     - run: java -version
     - run: .kokoro/build.bat
       env:
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 8a894939cfc4..c4b65f8b5695 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -60,6 +60,18 @@ javadoc)
     RETURN_CODE=$?
     ;;
 integration)
+    # Kokoro integration tests use both JDK 11 and JDK 8. Integration
+    # tests require JDK 11 export as JAVA env variable to run cloud datastore
+    # emulator (https://cloud.google.com/sdk/docs/release-notes#39300_2022-07-12).
+    # For Java 8 environment, we will still run the tests using Java 8 with
+    # SUREFIRE_JVM_OPT for Maven surefire plugin:
+    # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
+    if [[ -n "${JAVA11_HOME}"  &&  -n "${JAVA8_HOME}" ]]
+    then
+      export JAVA=${JAVA11_HOME}/bin/java
+      export SUREFIRE_JVM_OPT=-Djvm=${JAVA8_HOME}/bin/java
+    fi
+
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \
       -Penable-integration-tests \
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index f8f957af1112..aeb3568bbaa0 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -52,7 +52,7 @@ function retry_with_backoff {
     return $exit_code
 }
 
-## Helper functionss
+## Helper functions
 function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
 function msg() { println "$*" >&2; }
 function println() { printf '%s\n' "$(now) $*"; }
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index fd5cd6689afb..71431d938ab3 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -35,4 +35,4 @@ env_vars: {
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
-}
+}
\ No newline at end of file
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 79d10220cce4..20321f8127dd 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
@@ -53,12 +53,13 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
   private final double consistency;
   private final Path gcdPath;
   private boolean storeOnDisk;
+  private boolean firestoreInDatastoreMode;
 
   // Gcloud emulator settings
   private static final String GCLOUD_CMD_TEXT = "gcloud beta emulators datastore start";
   private static final String GCLOUD_CMD_PORT_FLAG = "--host-port=";
   private static final String VERSION_PREFIX = "cloud-datastore-emulator ";
-  private static final String MIN_VERSION = "2.0.2";
+  private static final String MIN_VERSION = "2.3.1";
 
   // Downloadable emulator settings
   private static final String BIN_NAME = "cloud-datastore-emulator/cloud_datastore_emulator";
@@ -74,6 +75,8 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
   private static final String PROJECT_FLAG = "--project=";
   private static final double DEFAULT_CONSISTENCY = 0.9;
   private static final String DEFAULT_PROJECT_ID = PROJECT_ID_PREFIX + UUID.randomUUID();
+  private static final String FIRESTORE_IN_DATASTORE_MODE_FLAG =
+      "--use-firestore-in-datastore-mode";
 
   private static final Logger LOGGER = Logger.getLogger(LocalDatastoreHelper.class.getName());
 
@@ -102,6 +105,7 @@ public static class Builder {
     private int port;
     private Path dataDir;
     private boolean storeOnDisk = true;
+    private boolean firestoreInDatastoreMode = false;
     private String projectId;
 
     private Builder() {}
@@ -110,6 +114,7 @@ private Builder(LocalDatastoreHelper helper) {
       this.consistency = helper.consistency;
       this.dataDir = helper.gcdPath;
       this.storeOnDisk = helper.storeOnDisk;
+      this.firestoreInDatastoreMode = helper.firestoreInDatastoreMode;
     }
 
     public Builder setConsistency(double consistency) {
@@ -137,6 +142,11 @@ public Builder setStoreOnDisk(boolean storeOnDisk) {
       return this;
     }
 
+    public Builder setFirestoreInDatastoreMode(boolean firestoreInDatastoreMode) {
+      this.firestoreInDatastoreMode = firestoreInDatastoreMode;
+      return this;
+    }
+
     /** Creates a {@code LocalDatastoreHelper} object. */
     public LocalDatastoreHelper build() {
       return new LocalDatastoreHelper(this);
@@ -152,14 +162,21 @@ private LocalDatastoreHelper(Builder builder) {
     this.consistency = builder.consistency > 0 ? builder.consistency : DEFAULT_CONSISTENCY;
     this.gcdPath = builder.dataDir;
     this.storeOnDisk = builder.storeOnDisk;
+    this.firestoreInDatastoreMode = builder.firestoreInDatastoreMode;
     String binName = BIN_NAME;
     if (isWindows()) {
       binName = BIN_NAME.replace("/", "\\");
     }
     List gcloudCommand = new ArrayList<>(Arrays.asList(GCLOUD_CMD_TEXT.split(" ")));
     gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + "localhost:" + getPort());
-    gcloudCommand.add(CONSISTENCY_FLAG + builder.consistency);
     gcloudCommand.add(PROJECT_FLAG + projectId);
+    if (builder.firestoreInDatastoreMode) {
+      gcloudCommand.add(FIRESTORE_IN_DATASTORE_MODE_FLAG);
+    } else {
+      // At most one of --consistency | --use-firestore-in-datastore-mode can be specified.
+      // --consistency will be ignored with --use-firestore-in-datastore-mode.
+      gcloudCommand.add(CONSISTENCY_FLAG + builder.consistency);
+    }
     if (!builder.storeOnDisk) {
       gcloudCommand.add("--no-store-on-disk");
     }
@@ -170,8 +187,16 @@ private LocalDatastoreHelper(Builder builder) {
         new GcloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION);
     List binCommand = new ArrayList<>(Arrays.asList(binName, "start"));
     binCommand.add("--testing");
+    if (builder.firestoreInDatastoreMode) {
+      // Downloadable emulator runner takes the flag in a different
+      // format: --firestore_in_datastore_mode
+      binCommand.add("--firestore_in_datastore_mode");
+    } else {
+      // At most one of --consistency | --firestore_in_datastore_mode can be specified.
+      // --consistency will be ignored with --firestore_in_datastore_mode.
+      binCommand.add(CONSISTENCY_FLAG + getConsistency());
+    }
     binCommand.add(BIN_CMD_PORT_FLAG + getPort());
-    binCommand.add(CONSISTENCY_FLAG + getConsistency());
     DownloadableEmulatorRunner downloadRunner =
         new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM, ACCESS_TOKEN);
     this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner);
@@ -235,6 +260,13 @@ public boolean isStoreOnDisk() {
     return storeOnDisk;
   }
 
+  /**
+   * Returns {@code true} use firestore-in-datastore-mode, otherwise {@code false} use native mode.
+   */
+  public boolean isFirestoreInDatastoreMode() {
+    return firestoreInDatastoreMode;
+  }
+
   /**
    * Creates a local Datastore helper with the specified settings for project ID and consistency.
    *
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 dfa2255a0f34..cad6d4fbece1 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
@@ -76,11 +76,13 @@ public void testCreateWithBuilder() {
             .setConsistency(0.75)
             .setPort(8081)
             .setStoreOnDisk(false)
+            .setFirestoreInDatastoreMode(true)
             .setDataDir(dataDir)
             .build();
     assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE);
     assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
     assertFalse(helper.isStoreOnDisk());
+    assertTrue(helper.isFirestoreInDatastoreMode());
     assertEquals(8081, helper.getPort());
     assertEquals(dataDir, helper.getGcdPath());
     LocalDatastoreHelper incompleteHelper = LocalDatastoreHelper.newBuilder().build();
@@ -103,11 +105,13 @@ public void testCreateWithToBuilder() throws IOException {
             .setConsistency(0.75)
             .setPort(8081)
             .setStoreOnDisk(false)
+            .setFirestoreInDatastoreMode(true)
             .setDataDir(dataDir)
             .build();
     assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE);
     assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
     assertFalse(helper.isStoreOnDisk());
+    assertTrue(helper.isFirestoreInDatastoreMode());
     assertEquals(8081, helper.getPort());
     assertEquals(dataDir, helper.getGcdPath());
     LocalDatastoreHelper actualHelper = helper.toBuilder().build();
@@ -119,10 +123,12 @@ public void testCreateWithToBuilder() throws IOException {
             .setConsistency(0.85)
             .setPort(9091)
             .setStoreOnDisk(true)
+            .setFirestoreInDatastoreMode(false)
             .setDataDir(dataDir)
             .build();
     assertTrue(Math.abs(0.85 - actualHelper.getConsistency()) < TOLERANCE);
     assertTrue(actualHelper.isStoreOnDisk());
+    assertFalse(actualHelper.isFirestoreInDatastoreMode());
     assertEquals(9091, actualHelper.getPort());
     assertEquals(dataDir, actualHelper.getGcdPath());
     LocalDatastoreHelper.deleteRecursively(dataDir);
@@ -206,10 +212,28 @@ public void testStartStopResetWithBuilder()
     }
   }
 
+  @Test
+  public void testCreateWithFirestoreInDatastoreMode()
+      throws IOException, InterruptedException, TimeoutException {
+    LocalDatastoreHelper helper =
+        LocalDatastoreHelper.newBuilder().setFirestoreInDatastoreMode(true).build();
+    assertTrue(helper.isFirestoreInDatastoreMode());
+    helper.start();
+    Datastore datastore = helper.getOptions().getService();
+    Key key = datastore.newKeyFactory().setKind("kind").newKey("name");
+    Entity expected = Entity.newBuilder(key).build();
+    datastore.put(expected);
+    assertNotNull(datastore.get(key));
+    Entity actual = datastore.get(key);
+    assertEquals(expected, actual);
+    helper.stop();
+  }
+
   public void assertLocalDatastoreHelpersEquivelent(
       LocalDatastoreHelper expected, LocalDatastoreHelper actual) {
     assertEquals(expected.getConsistency(), actual.getConsistency(), 0);
     assertEquals(expected.isStoreOnDisk(), actual.isStoreOnDisk());
+    assertEquals(expected.isFirestoreInDatastoreMode(), actual.isFirestoreInDatastoreMode());
     assertEquals(expected.getGcdPath(), actual.getGcdPath());
   }
 }

From df740b60b0fe9ca9caa9ec5ea86a39e582a5331c Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 24 Jan 2025 12:48:59 -0500
Subject: [PATCH 1547/1784] chore: Update generation configuration at Thu Jan
 23 02:20:40 UTC 2025 (#1721)

* chore: Update generation configuration at Thu Jan 23 02:20:40 UTC 2025

* chore: generate libraries at Thu Jan 23 02:21:21 UTC 2025

---------

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 69ac415c0db6..6d2d9bc03699 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.51.1
-googleapis_commitish: e9a4c38a81933108eaa6ac96c7ead31e253c8c64
+googleapis_commitish: 1a0e353ac4a372cf7016df4ce0a7d7e609f339b3
 libraries_bom_version: 26.53.0
 libraries:
   - api_shortname: datastore

From 1cbaf22cf557aec606dce7a5ca5d3ebe620a9339 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 29 Jan 2025 20:09:47 +0100
Subject: [PATCH 1548/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.42.0 (#1725)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 07240c01801c..b0249a7b80d9 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.42.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 82991aa29e57..68a18d5c0c2b 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.42.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 9303e1793be0..a8f6347977c4 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.42.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f3475c4a9e2c..68f80a38e6e6 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.41.1
+    3.42.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 4579f4aef927..897db9e21a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.41.1
+    3.42.0
   
 
   

From 999d51a4cdc29afbb4ed7cfe931408f211f6032b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 15:10:25 -0500
Subject: [PATCH 1549/1784] chore(main): release 2.25.5-SNAPSHOT (#1722)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index c6b52b79638a..ca4f8caa7fdf 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.25.4
+  2.25.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4
+    2.25.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 68f80a38e6e6..df5fe58c2c3b 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.25.4
+  2.25.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.4
+        2.25.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.4
+        2.25.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.4
+        0.116.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.4
+        2.25.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5b228e916259..83f3761a63c3 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.4
+  2.25.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4
+    2.25.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 125807ce5074..45112775db9c 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.25.4
+  2.25.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4
+    2.25.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 897db9e21a4b..1e980cffe631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.4
+  2.25.5-SNAPSHOT
   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.25.4
+        2.25.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.4
+        2.25.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.4
+        2.25.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.4
+        0.116.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.4
+        2.25.5-SNAPSHOT
         
           
             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 fab8c1c58bcc..6c201d81ae9c 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.25.4
+  2.25.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4
+    2.25.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8ab0b4196b46..0420e5acdc00 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.116.4
+  0.116.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.4
+    2.25.5-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 706cbea5784d..63ce5241db6b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.4
+      2.25.5-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index f7fd65578ed2..6b9232d7884f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.4:2.25.4
-google-cloud-datastore-bom:2.25.4:2.25.4
-proto-google-cloud-datastore-v1:0.116.4:0.116.4
-datastore-v1-proto-client:2.25.4:2.25.4
-proto-google-cloud-datastore-admin-v1:2.25.4:2.25.4
-grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.4
+google-cloud-datastore:2.25.4:2.25.5-SNAPSHOT
+google-cloud-datastore-bom:2.25.4:2.25.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.116.4:0.116.5-SNAPSHOT
+datastore-v1-proto-client:2.25.4:2.25.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT

From bde9254b3c877c3bd3be7fa5a3e2b3e06a610215 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 10:48:44 -0500
Subject: [PATCH 1550/1784] chore(main): release 2.26.0 (#1727)

* chore(main): release 2.26.0

* chore: generate libraries at Wed Jan 29 20:11:20 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78c769d0c7ef..794f60678317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.26.0](https://github.com/googleapis/java-datastore/compare/v2.25.4...v2.26.0) (2025-01-29)
+
+
+### Features
+
+* Add firestoreInDatastoreMode for datastore emulator ([#1698](https://github.com/googleapis/java-datastore/issues/1698)) ([50f106d](https://github.com/googleapis/java-datastore/commit/50f106d4c50884ce471a66c00df322270fe4a91c))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.42.0 ([#1725](https://github.com/googleapis/java-datastore/issues/1725)) ([1cbaf22](https://github.com/googleapis/java-datastore/commit/1cbaf22cf557aec606dce7a5ca5d3ebe620a9339))
+
 ## [2.25.4](https://github.com/googleapis/java-datastore/compare/v2.25.3...v2.25.4) (2025-01-22)
 
 
diff --git a/README.md b/README.md
index 1470ac3e7132..c2f02f1cef81 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.25.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.26.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.0"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.4
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ca4f8caa7fdf..d5e7defc812d 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.25.5-SNAPSHOT
+  2.26.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.5-SNAPSHOT
+    2.26.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index df5fe58c2c3b..d67c016fbef7 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.25.5-SNAPSHOT
+  2.26.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.25.5-SNAPSHOT
+        2.26.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.5-SNAPSHOT
+        2.26.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.5-SNAPSHOT
+        0.117.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.25.5-SNAPSHOT
+        2.26.0
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 83f3761a63c3..4059aaa2c376 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.25.5-SNAPSHOT
+  2.26.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.5-SNAPSHOT
+    2.26.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 45112775db9c..d066da0ace55 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.25.5-SNAPSHOT
+  2.26.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.5-SNAPSHOT
+    2.26.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 1e980cffe631..91579d9af81e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.25.5-SNAPSHOT
+  2.26.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.25.5-SNAPSHOT
+        2.26.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.25.5-SNAPSHOT
+        2.26.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.25.5-SNAPSHOT
+        2.26.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.116.5-SNAPSHOT
+        0.117.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.25.5-SNAPSHOT
+        2.26.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 6c201d81ae9c..6c50068e5d82 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.25.5-SNAPSHOT
+  2.26.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.5-SNAPSHOT
+    2.26.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0420e5acdc00..a41f0ae34f75 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.116.5-SNAPSHOT
+  0.117.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.25.5-SNAPSHOT
+    2.26.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 63ce5241db6b..c923bab291cd 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.25.5-SNAPSHOT
+      2.26.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 6b9232d7884f..7cf291116c5f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.25.4:2.25.5-SNAPSHOT
-google-cloud-datastore-bom:2.25.4:2.25.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.116.4:0.116.5-SNAPSHOT
-datastore-v1-proto-client:2.25.4:2.25.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT
+google-cloud-datastore:2.26.0:2.26.0
+google-cloud-datastore-bom:2.26.0:2.26.0
+proto-google-cloud-datastore-v1:0.117.0:0.117.0
+datastore-v1-proto-client:2.26.0:2.26.0
+proto-google-cloud-datastore-admin-v1:2.26.0:2.26.0
+grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.0

From 95940241de9f324000d52dc80b3106aedefd481e Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 30 Jan 2025 18:10:48 -0500
Subject: [PATCH 1551/1784] chore: Update generation configuration at Wed Jan
 29 02:19:56 UTC 2025 (#1723)

* chore: Update generation configuration at Sat Jan 25 02:17:00 UTC 2025

* chore: Update generation configuration at Mon Jan 27 02:21:43 UTC 2025

* chore: Update generation configuration at Tue Jan 28 02:20:23 UTC 2025

* chore: Update generation configuration at Wed Jan 29 02:19:56 UTC 2025
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 generation_config.yaml                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index c1be8aca557b..f7804e9d0263 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.52.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/generation_config.yaml b/generation_config.yaml
index 6d2d9bc03699..f74abe9259d1 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.51.1
-googleapis_commitish: 1a0e353ac4a372cf7016df4ce0a7d7e609f339b3
+gapic_generator_version: 2.52.0
+googleapis_commitish: 280725e991516d4a0f136268faf5aa6d32d21b54
 libraries_bom_version: 26.53.0
 libraries:
   - api_shortname: datastore

From ffa05a242d495d46f3a0d0df9aba5bdd0b7808fe Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Sat, 1 Feb 2025 21:48:34 -0500
Subject: [PATCH 1552/1784] chore: Update generation configuration at Fri Jan
 31 02:20:29 UTC 2025 (#1729)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index f74abe9259d1..795d4d4863f5 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.52.0
-googleapis_commitish: 280725e991516d4a0f136268faf5aa6d32d21b54
+googleapis_commitish: dd1210af5bee414c9e606f5637e0eb0fd9d894e8
 libraries_bom_version: 26.53.0
 libraries:
   - api_shortname: datastore

From a690e53934bb6d4760ce0f695b13c3ad05d91e15 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 08:34:27 -0800
Subject: [PATCH 1553/1784] chore(main): release 2.26.1-SNAPSHOT (#1728)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d5e7defc812d..3f5e61e8ebb2 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.26.0
+  2.26.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.0
+    2.26.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d67c016fbef7..f2d630f347cf 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.26.0
+  2.26.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.0
+        2.26.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.0
+        2.26.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.0
+        0.117.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.0
+        2.26.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4059aaa2c376..1843574b18f1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.0
+  2.26.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.0
+    2.26.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d066da0ace55..80efbb22990e 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.26.0
+  2.26.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.0
+    2.26.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 91579d9af81e..9763d9786fd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.0
+  2.26.1-SNAPSHOT
   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.26.0
+        2.26.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.0
+        2.26.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.0
+        2.26.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.0
+        0.117.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.0
+        2.26.1-SNAPSHOT
         
           
             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 6c50068e5d82..94bd710a62e5 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.26.0
+  2.26.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.0
+    2.26.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a41f0ae34f75..8153848f27bc 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.117.0
+  0.117.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.0
+    2.26.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c923bab291cd..1b9e6dde4107 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.0
+      2.26.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 7cf291116c5f..008ca948f92f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.0:2.26.0
-google-cloud-datastore-bom:2.26.0:2.26.0
-proto-google-cloud-datastore-v1:0.117.0:0.117.0
-datastore-v1-proto-client:2.26.0:2.26.0
-proto-google-cloud-datastore-admin-v1:2.26.0:2.26.0
-grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.0
+google-cloud-datastore:2.26.0:2.26.1-SNAPSHOT
+google-cloud-datastore-bom:2.26.0:2.26.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.117.0:0.117.1-SNAPSHOT
+datastore-v1-proto-client:2.26.0:2.26.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT

From 89f31a88d346193c9a5533de3e38c9088db30043 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 3 Feb 2025 17:58:06 +0100
Subject: [PATCH 1554/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.51.0 (#1726)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 1843574b18f1..4476e41fc828 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.50.0
+        1.51.0
         pom
         import
       

From ebc9bcf8a92b4505c0b232249b5d5f71f052867b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 5 Feb 2025 02:22:12 +0100
Subject: [PATCH 1555/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.54.0 (#1732)

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 20ba4adb97f6..915461c90295 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.53.0
+        26.54.0
         pom
         import
       

From 6e62989a598998b69c73e6ac7a7529efbab8aa44 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 4 Feb 2025 20:22:26 -0500
Subject: [PATCH 1556/1784] chore: Update generation configuration at Mon Feb 
 3 02:21:17 UTC 2025 (#1730)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 795d4d4863f5..d936e58c975e 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.52.0
-googleapis_commitish: dd1210af5bee414c9e606f5637e0eb0fd9d894e8
+googleapis_commitish: 3cf61b2df20eace09e6336c23f9e08859c0d87ae
 libraries_bom_version: 26.53.0
 libraries:
   - api_shortname: datastore

From c4d82a3adf91753ef03a8a588fd18a6974047bbd Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:51:53 -0500
Subject: [PATCH 1557/1784] chore: Update generation configuration at Wed Feb 
 5 02:21:45 UTC 2025 (#1733)

* chore: Update generation configuration at Wed Feb  5 02:21:45 UTC 2025

* chore: generate libraries at Wed Feb  5 02:22:19 UTC 2025
---
 README.md              | 4 ++--
 generation_config.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c2f02f1cef81..331d9f7a8d94 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.53.0
+      26.54.0
       pom
       import
     
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.53.0')
+implementation platform('com.google.cloud:libraries-bom:26.54.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index d936e58c975e..940fc05f43b5 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.52.0
-googleapis_commitish: 3cf61b2df20eace09e6336c23f9e08859c0d87ae
-libraries_bom_version: 26.53.0
+googleapis_commitish: a1c746a0304b9d0d913ab013cb248ce605a6871b
+libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 8b5499438ca45d1b652509173a927c9d075b76db Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 16:18:46 +0000
Subject: [PATCH 1558/1784] chore(main): release 2.26.1 (#1731)

:robot: I have created a release *beep* *boop*
---


## [2.26.1](https://togithub.com/googleapis/java-datastore/compare/v2.26.0...v2.26.1) (2025-02-05)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.52.0 ([9594024](https://togithub.com/googleapis/java-datastore/commit/95940241de9f324000d52dc80b3106aedefd481e))


### Dependencies

* Update dependency com.google.cloud:gapic-libraries-bom to v1.51.0 ([#1726](https://togithub.com/googleapis/java-datastore/issues/1726)) ([89f31a8](https://togithub.com/googleapis/java-datastore/commit/89f31a88d346193c9a5533de3e38c9088db30043))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 794f60678317..c55341a22a54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.26.1](https://github.com/googleapis/java-datastore/compare/v2.26.0...v2.26.1) (2025-02-05)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.52.0 ([9594024](https://github.com/googleapis/java-datastore/commit/95940241de9f324000d52dc80b3106aedefd481e))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.51.0 ([#1726](https://github.com/googleapis/java-datastore/issues/1726)) ([89f31a8](https://github.com/googleapis/java-datastore/commit/89f31a88d346193c9a5533de3e38c9088db30043))
+
 ## [2.26.0](https://github.com/googleapis/java-datastore/compare/v2.25.4...v2.26.0) (2025-01-29)
 
 
diff --git a/README.md b/README.md
index 331d9f7a8d94..a2cd957877a6 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.26.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.26.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.1"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3f5e61e8ebb2..51503fcf05a4 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.26.1-SNAPSHOT
+  2.26.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1-SNAPSHOT
+    2.26.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f2d630f347cf..1f202fe1b27d 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.26.1-SNAPSHOT
+  2.26.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.1-SNAPSHOT
+        2.26.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.1-SNAPSHOT
+        2.26.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.1-SNAPSHOT
+        0.117.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.1-SNAPSHOT
+        2.26.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4476e41fc828..805dc6e26001 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.1-SNAPSHOT
+  2.26.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1-SNAPSHOT
+    2.26.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 80efbb22990e..0a241859167d 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.26.1-SNAPSHOT
+  2.26.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1-SNAPSHOT
+    2.26.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 9763d9786fd8..224ed3a5ea85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.1-SNAPSHOT
+  2.26.1
   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.26.1-SNAPSHOT
+        2.26.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.1-SNAPSHOT
+        2.26.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.1-SNAPSHOT
+        2.26.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.1-SNAPSHOT
+        0.117.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.1-SNAPSHOT
+        2.26.1
         
           
             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 94bd710a62e5..72a95a754b48 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.26.1-SNAPSHOT
+  2.26.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1-SNAPSHOT
+    2.26.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8153848f27bc..a373b4131f5e 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.117.1-SNAPSHOT
+  0.117.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1-SNAPSHOT
+    2.26.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1b9e6dde4107..ff0e02a2f344 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.1-SNAPSHOT
+      2.26.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 008ca948f92f..933af631e963 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.0:2.26.1-SNAPSHOT
-google-cloud-datastore-bom:2.26.0:2.26.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.117.0:0.117.1-SNAPSHOT
-datastore-v1-proto-client:2.26.0:2.26.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT
+google-cloud-datastore:2.26.1:2.26.1
+google-cloud-datastore-bom:2.26.1:2.26.1
+proto-google-cloud-datastore-v1:0.117.1:0.117.1
+datastore-v1-proto-client:2.26.1:2.26.1
+proto-google-cloud-datastore-admin-v1:2.26.1:2.26.1
+grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.1

From bf553dbac498ca4d6f8da95bb3446d73e7c60c82 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 6 Feb 2025 19:46:37 -0500
Subject: [PATCH 1559/1784] chore: Update generation configuration at Thu Feb 
 6 02:21:48 UTC 2025 (#1734)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 940fc05f43b5..b32da6c528f0 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.52.0
-googleapis_commitish: a1c746a0304b9d0d913ab013cb248ce605a6871b
+googleapis_commitish: fed8c2613ed7e9e49ad6a98101f585cf00f6657b
 libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: datastore

From 6ce5039c3da31e9042c3f556466b33bd051c3f73 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 19:06:05 -0800
Subject: [PATCH 1560/1784] chore(main): release 2.26.2-SNAPSHOT (#1735)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 51503fcf05a4..ea8b454ec8f9 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.26.1
+  2.26.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1
+    2.26.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 1f202fe1b27d..cae8cb287401 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.26.1
+  2.26.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.1
+        2.26.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.1
+        2.26.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.1
+        0.117.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.1
+        2.26.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 805dc6e26001..9376d7da6a05 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.1
+  2.26.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1
+    2.26.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0a241859167d..f76fd16c99eb 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.26.1
+  2.26.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1
+    2.26.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 224ed3a5ea85..648d4faba36b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.1
+  2.26.2-SNAPSHOT
   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.26.1
+        2.26.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.1
+        2.26.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.1
+        2.26.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.1
+        0.117.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.1
+        2.26.2-SNAPSHOT
         
           
             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 72a95a754b48..b767e4cc636c 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.26.1
+  2.26.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1
+    2.26.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a373b4131f5e..d6616eb61a9f 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.117.1
+  0.117.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.1
+    2.26.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ff0e02a2f344..c1ec03877000 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.1
+      2.26.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 933af631e963..d5764eceebb1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.1:2.26.1
-google-cloud-datastore-bom:2.26.1:2.26.1
-proto-google-cloud-datastore-v1:0.117.1:0.117.1
-datastore-v1-proto-client:2.26.1:2.26.1
-proto-google-cloud-datastore-admin-v1:2.26.1:2.26.1
-grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.1
+google-cloud-datastore:2.26.1:2.26.2-SNAPSHOT
+google-cloud-datastore-bom:2.26.1:2.26.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.117.1:0.117.2-SNAPSHOT
+datastore-v1-proto-client:2.26.1:2.26.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT

From 7a7a2030ce6be77eb0a48f2a101594881d62fde1 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 10 Feb 2025 22:06:25 -0500
Subject: [PATCH 1561/1784] chore: Update generation configuration at Tue Feb
 11 02:22:43 UTC 2025 (#1736)

* chore: Update generation configuration at Fri Feb  7 02:22:28 UTC 2025

* chore: Update generation configuration at Sat Feb  8 02:19:21 UTC 2025

* chore: Update generation configuration at Tue Feb 11 02:22:43 UTC 2025
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index b32da6c528f0..5ff323b28ad3 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.52.0
-googleapis_commitish: fed8c2613ed7e9e49ad6a98101f585cf00f6657b
+googleapis_commitish: 04132de0b952ee921d91a2583915dbd82d10cd3c
 libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: datastore

From b8a7a5d5d8700ccccb643162843e3043396a9444 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 12 Feb 2025 04:22:59 +0100
Subject: [PATCH 1562/1784] deps: update googleapis/sdk-platform-java action to
 v2.53.0 (#1738)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index f7804e9d0263..545f190487a3 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.52.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.53.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From 0e1a2d6209d2ccedd5e0e9435e2416a00a517b96 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 12 Feb 2025 04:23:19 +0100
Subject: [PATCH 1563/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.25.3 (#1716)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 84f763453dd7..9fc1e0a83e06 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.25.2
+      2.25.3
     
     
 

From 5b59a62e729072e62b9ed21536db06db63ee9b51 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 12 Feb 2025 05:52:02 +0100
Subject: [PATCH 1564/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.26.1 (#1741)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 9fc1e0a83e06..1f1ea4f1f230 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.25.3
+      2.26.1
     
     
 

From be0d0cd960b9254d26404d9331b78dee1104cf0a Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 11 Feb 2025 23:55:13 -0500
Subject: [PATCH 1565/1784] chore: Update generation configuration at Wed Feb
 12 02:21:54 UTC 2025 (#1739)

---
 generation_config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 5ff323b28ad3..9461e7b405a8 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.52.0
-googleapis_commitish: 04132de0b952ee921d91a2583915dbd82d10cd3c
+gapic_generator_version: 2.53.0
+googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4
 libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: datastore

From 7272a4197a0d7fb97ee039ccb88ac13a1ec037d1 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 12 Feb 2025 05:55:37 +0100
Subject: [PATCH 1566/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.43.0 (#1737)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index b0249a7b80d9..ea5e4f46b5ba 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.42.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 68a18d5c0c2b..a9a633716d93 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.42.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index a8f6347977c4..327e2ed78f1a 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.42.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index cae8cb287401..59b6a0f0e141 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.42.0
+    3.43.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 648d4faba36b..0118c8b09bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.42.0
+    3.43.0
   
 
   

From 4755aeb2150dbb1ae2cf2769355989ec6f2df791 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 17:40:27 +0000
Subject: [PATCH 1567/1784] chore(main): release 2.26.2 (#1740)

:robot: I have created a release *beep* *boop*
---


## [2.26.2](https://togithub.com/googleapis/java-datastore/compare/v2.26.1...v2.26.2) (2025-02-12)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.53.0 ([be0d0cd](https://togithub.com/googleapis/java-datastore/commit/be0d0cd960b9254d26404d9331b78dee1104cf0a))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 ([#1737](https://togithub.com/googleapis/java-datastore/issues/1737)) ([7272a41](https://togithub.com/googleapis/java-datastore/commit/7272a4197a0d7fb97ee039ccb88ac13a1ec037d1))
* Update googleapis/sdk-platform-java action to v2.53.0 ([#1738](https://togithub.com/googleapis/java-datastore/issues/1738)) ([b8a7a5d](https://togithub.com/googleapis/java-datastore/commit/b8a7a5d5d8700ccccb643162843e3043396a9444))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 README.md                                     |  8 ++++----
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c55341a22a54..f9e8e7e4f56b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.26.2](https://github.com/googleapis/java-datastore/compare/v2.26.1...v2.26.2) (2025-02-12)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.53.0 ([be0d0cd](https://github.com/googleapis/java-datastore/commit/be0d0cd960b9254d26404d9331b78dee1104cf0a))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 ([#1737](https://github.com/googleapis/java-datastore/issues/1737)) ([7272a41](https://github.com/googleapis/java-datastore/commit/7272a4197a0d7fb97ee039ccb88ac13a1ec037d1))
+* Update googleapis/sdk-platform-java action to v2.53.0 ([#1738](https://github.com/googleapis/java-datastore/issues/1738)) ([b8a7a5d](https://github.com/googleapis/java-datastore/commit/b8a7a5d5d8700ccccb643162843e3043396a9444))
+
 ## [2.26.1](https://github.com/googleapis/java-datastore/compare/v2.26.0...v2.26.1) (2025-02-05)
 
 
diff --git a/README.md b/README.md
index a2cd957877a6..92af750c1a1d 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.25.2
+  2.26.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.26.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.26.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.2"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ea8b454ec8f9..a23fdc02117d 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.26.2-SNAPSHOT
+  2.26.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2-SNAPSHOT
+    2.26.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 59b6a0f0e141..04503d68d06d 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.26.2-SNAPSHOT
+  2.26.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.2-SNAPSHOT
+        2.26.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.2-SNAPSHOT
+        2.26.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.2-SNAPSHOT
+        0.117.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.2-SNAPSHOT
+        2.26.2
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9376d7da6a05..392cc12b0ce7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.2-SNAPSHOT
+  2.26.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2-SNAPSHOT
+    2.26.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f76fd16c99eb..3e9d82244aad 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.26.2-SNAPSHOT
+  2.26.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2-SNAPSHOT
+    2.26.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 0118c8b09bdf..4c6a3b38e448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.2-SNAPSHOT
+  2.26.2
   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.26.2-SNAPSHOT
+        2.26.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.2-SNAPSHOT
+        2.26.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.2-SNAPSHOT
+        2.26.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.2-SNAPSHOT
+        0.117.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.2-SNAPSHOT
+        2.26.2
         
           
             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 b767e4cc636c..cd0a2a91b26f 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.26.2-SNAPSHOT
+  2.26.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2-SNAPSHOT
+    2.26.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d6616eb61a9f..9d1aa744fe86 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.117.2-SNAPSHOT
+  0.117.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2-SNAPSHOT
+    2.26.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c1ec03877000..a95b17619955 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.2-SNAPSHOT
+      2.26.2
     
     
 
diff --git a/versions.txt b/versions.txt
index d5764eceebb1..1ada84ac2d3d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.1:2.26.2-SNAPSHOT
-google-cloud-datastore-bom:2.26.1:2.26.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.117.1:0.117.2-SNAPSHOT
-datastore-v1-proto-client:2.26.1:2.26.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT
+google-cloud-datastore:2.26.2:2.26.2
+google-cloud-datastore-bom:2.26.2:2.26.2
+proto-google-cloud-datastore-v1:0.117.2:0.117.2
+datastore-v1-proto-client:2.26.2:2.26.2
+proto-google-cloud-datastore-admin-v1:2.26.2:2.26.2
+grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.2

From de24a2c236e33138285be3d7b9bbb787ebf10c9f Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 12 Feb 2025 23:30:56 -0500
Subject: [PATCH 1568/1784] chore: Update generation configuration at Thu Feb
 13 02:22:31 UTC 2025 (#1744)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 9461e7b405a8..80828c88ae8b 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.53.0
-googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4
+googleapis_commitish: da30f52583f070f676ed886ed9e33d84a646f74c
 libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: datastore

From c4157f8f2c1a20fabfbbf9af05792a6f774979ba Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Mon, 17 Feb 2025 01:34:24 -0800
Subject: [PATCH 1569/1784] chore: add grpc-experimental branch rules (#1745)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable github branch rules for gapic client branch [grpc-experimental](https://togithub.com/googleapis/java-datastore/tree/grpc-experimental).
We need the dependencies to be up-to-date before launching the public preview.

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [x] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [x] Ensure the tests and linter pass
- [x] Code coverage does not decrease (if any source code was changed)
- [x] Appropriate docs were updated (if necessary)

Fixes # ☕️
---
 .github/dependabot.yml          | 13 ++++++++++++-
 .github/sync-repo-settings.yaml | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2afe7bfe7318..ac8af89e1c7f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,4 +17,15 @@ updates:
     # If a security vulnerability comes in, we will be notified about 
     # it via template in the synthtool repository.
     ignore:
-      - dependency-name: "*"
\ No newline at end of file
+    - dependency-name: "*"
+
+# rules for the `grpc-experimental` branch
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+    commit-message:
+      # Prefix all commit messages with "deps: "
+      prefix: "deps"
+    open-pull-requests-limit: 10
+    target-branch: "grpc-experimental"
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 203644341dc5..1af0c45a38ab 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -109,6 +109,22 @@ branchProtectionRules:
       - cla/google
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+  - pattern: grpc-experimental
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+        - dependencies (17)
+        - lint
+        - clirr
+        - units (8)
+        - units (11)
+        - 'Kokoro - Test: Integration'
+        - cla/google
+        - 'Kokoro - Test: Java GraalVM Native Image'
+        - 'Kokoro - Test: Java 17 GraalVM Native Image'
+        - javadoc
   - pattern: 2.15.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1

From a42c6df3aecf6c0bd54585ea8d4b9486168b81e8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 20 Feb 2025 03:50:51 +0100
Subject: [PATCH 1570/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.26.2 (#1743)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1f1ea4f1f230..4a194ca75168 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.26.1
+      2.26.2
     
     
 

From fb2bd58b770cfa1e951b3311bdbc4977f83801ac Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 20 Feb 2025 05:15:42 -0500
Subject: [PATCH 1571/1784] chore: Update generation configuration at Sat Feb
 15 02:21:37 UTC 2025 (#1746)

* chore: Update generation configuration at Fri Feb 14 02:22:08 UTC 2025

* chore: Update generation configuration at Sat Feb 15 02:21:37 UTC 2025

* chore: generate libraries at Thu Feb 20 02:51:23 UTC 2025

---------

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 README.md              | 2 +-
 generation_config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 92af750c1a1d..316ebda7c555 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.26.1
+  2.26.2
 
 
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 80828c88ae8b..40ecdae6f605 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.53.0
-googleapis_commitish: da30f52583f070f676ed886ed9e33d84a646f74c
+googleapis_commitish: 58be301346758c9a342de5632c3f9284d05c4b95
 libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: datastore

From 592072b194706e63a7fd4a6f6230377e8f4b729d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 20 Feb 2025 16:50:31 +0100
Subject: [PATCH 1572/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.52.0 (#1747)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 392cc12b0ce7..8f7d7dd76f0c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.51.0
+        1.52.0
         pom
         import
       

From 26c3db044bfd5311baa1de73b24403f590eee6da Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 01:54:22 +0000
Subject: [PATCH 1573/1784] chore(main): release 2.26.3-SNAPSHOT (#1742)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a23fdc02117d..22de0a26b9b9 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.26.2
+  2.26.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2
+    2.26.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 04503d68d06d..1e4e5ded4777 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.26.2
+  2.26.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.2
+        2.26.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.2
+        2.26.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.2
+        0.117.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.2
+        2.26.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8f7d7dd76f0c..2a5b479c65f5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.2
+  2.26.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2
+    2.26.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 3e9d82244aad..d2b0dd980245 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.26.2
+  2.26.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2
+    2.26.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 4c6a3b38e448..30921603d3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.2
+  2.26.3-SNAPSHOT
   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.26.2
+        2.26.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.2
+        2.26.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.2
+        2.26.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.2
+        0.117.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.2
+        2.26.3-SNAPSHOT
         
           
             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 cd0a2a91b26f..8232820dc4aa 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.26.2
+  2.26.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2
+    2.26.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9d1aa744fe86..2aca97593018 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.117.2
+  0.117.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.2
+    2.26.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index a95b17619955..0864d2d3049c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.2
+      2.26.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 1ada84ac2d3d..48e1d17c4ed2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.2:2.26.2
-google-cloud-datastore-bom:2.26.2:2.26.2
-proto-google-cloud-datastore-v1:0.117.2:0.117.2
-datastore-v1-proto-client:2.26.2:2.26.2
-proto-google-cloud-datastore-admin-v1:2.26.2:2.26.2
-grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.2
+google-cloud-datastore:2.26.2:2.26.3-SNAPSHOT
+google-cloud-datastore-bom:2.26.2:2.26.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.117.2:0.117.3-SNAPSHOT
+datastore-v1-proto-client:2.26.2:2.26.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT

From da5d9e5e4f0a87356d5a0bb02a53787321ec45af Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Sat, 22 Feb 2025 02:18:23 +0000
Subject: [PATCH 1574/1784] chore(main): release 2.26.3 (#1758)

:robot: I have created a release *beep* *boop*
---


## [2.26.3](https://togithub.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21)


### Dependencies

* Update dependency com.google.cloud:gapic-libraries-bom to v1.52.0 ([#1747](https://togithub.com/googleapis/java-datastore/issues/1747)) ([592072b](https://togithub.com/googleapis/java-datastore/commit/592072b194706e63a7fd4a6f6230377e8f4b729d))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9e8e7e4f56b..c820d29ab440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.26.3](https://github.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.52.0 ([#1747](https://github.com/googleapis/java-datastore/issues/1747)) ([592072b](https://github.com/googleapis/java-datastore/commit/592072b194706e63a7fd4a6f6230377e8f4b729d))
+
 ## [2.26.2](https://github.com/googleapis/java-datastore/compare/v2.26.1...v2.26.2) (2025-02-12)
 
 
diff --git a/README.md b/README.md
index 316ebda7c555..7162f7d5aaec 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.26.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.26.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.3"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 22de0a26b9b9..116fe8c95aa7 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.26.3-SNAPSHOT
+  2.26.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3-SNAPSHOT
+    2.26.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 1e4e5ded4777..a33b5ec34ff1 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.26.3-SNAPSHOT
+  2.26.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.3-SNAPSHOT
+        2.26.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.3-SNAPSHOT
+        2.26.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.3-SNAPSHOT
+        0.117.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.3-SNAPSHOT
+        2.26.3
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2a5b479c65f5..375bccfe4807 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.3-SNAPSHOT
+  2.26.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3-SNAPSHOT
+    2.26.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index d2b0dd980245..b0211b72de43 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.26.3-SNAPSHOT
+  2.26.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3-SNAPSHOT
+    2.26.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 30921603d3e3..a804178cbe08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.3-SNAPSHOT
+  2.26.3
   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.26.3-SNAPSHOT
+        2.26.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.3-SNAPSHOT
+        2.26.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.3-SNAPSHOT
+        2.26.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.3-SNAPSHOT
+        0.117.3
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.3-SNAPSHOT
+        2.26.3
         
           
             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 8232820dc4aa..73667ed91a81 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.26.3-SNAPSHOT
+  2.26.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3-SNAPSHOT
+    2.26.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2aca97593018..f33fe48d5899 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.117.3-SNAPSHOT
+  0.117.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3-SNAPSHOT
+    2.26.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0864d2d3049c..1670fd682de4 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.3-SNAPSHOT
+      2.26.3
     
     
 
diff --git a/versions.txt b/versions.txt
index 48e1d17c4ed2..390cf29e7627 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.2:2.26.3-SNAPSHOT
-google-cloud-datastore-bom:2.26.2:2.26.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.117.2:0.117.3-SNAPSHOT
-datastore-v1-proto-client:2.26.2:2.26.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT
+google-cloud-datastore:2.26.3:2.26.3
+google-cloud-datastore-bom:2.26.3:2.26.3
+proto-google-cloud-datastore-v1:0.117.3:0.117.3
+datastore-v1-proto-client:2.26.3:2.26.3
+proto-google-cloud-datastore-admin-v1:2.26.3:2.26.3
+grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.3

From 63468ae5c5af96d818ea347dbdbad1fd2a9bd77f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 18:02:21 +0000
Subject: [PATCH 1575/1784] chore(main): release 2.26.4-SNAPSHOT (#1762)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 116fe8c95aa7..2d7e490af7c5 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.26.3
+  2.26.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3
+    2.26.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a33b5ec34ff1..2e1df43a20c0 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.26.3
+  2.26.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.3
+        2.26.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.3
+        2.26.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.3
+        0.117.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.3
+        2.26.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 375bccfe4807..492d517e449c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.3
+  2.26.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3
+    2.26.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index b0211b72de43..8f85dd1a061c 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.26.3
+  2.26.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3
+    2.26.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index a804178cbe08..bcd076c2b54a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.3
+  2.26.4-SNAPSHOT
   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.26.3
+        2.26.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.3
+        2.26.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.3
+        2.26.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.3
+        0.117.4-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.3
+        2.26.4-SNAPSHOT
         
           
             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 73667ed91a81..51cc2309687c 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.26.3
+  2.26.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3
+    2.26.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f33fe48d5899..21334223eb97 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.117.3
+  0.117.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.3
+    2.26.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1670fd682de4..50bf6cfa506c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.3
+      2.26.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 390cf29e7627..ffb8d14d6400 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.3:2.26.3
-google-cloud-datastore-bom:2.26.3:2.26.3
-proto-google-cloud-datastore-v1:0.117.3:0.117.3
-datastore-v1-proto-client:2.26.3:2.26.3
-proto-google-cloud-datastore-admin-v1:2.26.3:2.26.3
-grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.3
+google-cloud-datastore:2.26.3:2.26.4-SNAPSHOT
+google-cloud-datastore-bom:2.26.3:2.26.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.117.3:0.117.4-SNAPSHOT
+datastore-v1-proto-client:2.26.3:2.26.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT

From 5144e7af0de6e93650a02b3e43da925adfdc59b0 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:09:57 -0500
Subject: [PATCH 1576/1784] chore: Update generation configuration at Fri Feb
 21 02:23:23 UTC 2025 (#1759)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 40ecdae6f605..77b25623c7d3 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.53.0
-googleapis_commitish: 58be301346758c9a342de5632c3f9284d05c4b95
+googleapis_commitish: caac3b8802186510a881d9ae26e6a09c5d800936
 libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: datastore

From 65479a201a5fb8bb291098bbce6bd345fc1ec5aa Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 24 Feb 2025 19:10:09 +0100
Subject: [PATCH 1577/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.26.3 (#1763)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 4a194ca75168..77da5663d019 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.26.2
+      2.26.3
     
     
 

From a573815c81e9108b76da7af0c0ee738d583032df Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 24 Feb 2025 20:55:22 +0100
Subject: [PATCH 1578/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.55.0 (#1761)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 915461c90295..6bd0da5c9413 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.54.0
+        26.55.0
         pom
         import
       

From 6f7d7c126fc8f59d7aa4c8b0c38b8d4c48253e05 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:20:04 -0500
Subject: [PATCH 1579/1784] chore: Update generation configuration at Tue Feb
 25 02:24:23 UTC 2025 (#1764)

* chore: Update generation configuration at Tue Feb 25 02:24:23 UTC 2025

* chore: generate libraries at Tue Feb 25 02:24:58 UTC 2025
---
 README.md              | 6 +++---
 generation_config.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7162f7d5aaec..c4dd2f360bbe 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.54.0
+      26.55.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.26.2
+  2.26.3
 
 
 ```
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.54.0')
+implementation platform('com.google.cloud:libraries-bom:26.55.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 77b25623c7d3..f1f949c50cdb 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.53.0
-googleapis_commitish: caac3b8802186510a881d9ae26e6a09c5d800936
-libraries_bom_version: 26.54.0
+googleapis_commitish: 6bc8e91bf92cc985da5ed0c227b48f12315cb695
+libraries_bom_version: 26.55.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 28f5d27ec834b31900401dd0e8ba94e8bc8e756b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 25 Feb 2025 19:23:13 +0100
Subject: [PATCH 1580/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-compiler-plugin to v3.14.0 (#1760)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bcd076c2b54a..e98dd2d4ccf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,7 +232,7 @@
           
             org.apache.maven.plugins
             maven-compiler-plugin
-            3.13.0
+            3.14.0
             
               UTF-8
               true

From be01b183cb5ec06d236fa587f7237eaffb6e54c0 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 26 Feb 2025 13:37:08 -0500
Subject: [PATCH 1581/1784] chore: Update generation configuration at Wed Feb
 26 02:24:15 UTC 2025 (#1768)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index f1f949c50cdb..89599a2a184e 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.53.0
-googleapis_commitish: 6bc8e91bf92cc985da5ed0c227b48f12315cb695
+googleapis_commitish: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f
 libraries_bom_version: 26.55.0
 libraries:
   - api_shortname: datastore

From 7a8650939e652fc3b384053454d6ef5084bb1508 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 26 Feb 2025 20:10:49 +0100
Subject: [PATCH 1582/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.44.0 (#1769)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index ea5e4f46b5ba..1bc662efeb69 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index a9a633716d93..65c1a67d80ed 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 327e2ed78f1a..c84b27e7d2ef 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2e1df43a20c0..389890661a5e 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.43.0
+    3.44.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index e98dd2d4ccf4..c14db9cb9cae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.43.0
+    3.44.0
   
 
   

From a12b0f3f411d80188c4916c39a7df29d71b3082d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 26 Feb 2025 21:56:22 +0000
Subject: [PATCH 1583/1784] chore(main): release 2.26.4 (#1772)

:robot: I have created a release *beep* *boop*
---


## [2.26.4](https://togithub.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#1769](https://togithub.com/googleapis/java-datastore/issues/1769)) ([7a86509](https://togithub.com/googleapis/java-datastore/commit/7a8650939e652fc3b384053454d6ef5084bb1508))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c820d29ab440..437feb9b29b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.26.4](https://github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#1769](https://github.com/googleapis/java-datastore/issues/1769)) ([7a86509](https://github.com/googleapis/java-datastore/commit/7a8650939e652fc3b384053454d6ef5084bb1508))
+
 ## [2.26.3](https://github.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21)
 
 
diff --git a/README.md b/README.md
index c4dd2f360bbe..7168de6d230f 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.26.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.26.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.4"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.4
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2d7e490af7c5..95b049e1ece4 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.26.4-SNAPSHOT
+  2.26.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4-SNAPSHOT
+    2.26.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 389890661a5e..06b9c9e44404 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.26.4-SNAPSHOT
+  2.26.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.4-SNAPSHOT
+        2.26.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.4-SNAPSHOT
+        2.26.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.4-SNAPSHOT
+        0.117.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.4-SNAPSHOT
+        2.26.4
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 492d517e449c..8a4842303edb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.4-SNAPSHOT
+  2.26.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4-SNAPSHOT
+    2.26.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 8f85dd1a061c..f4bbffff1f38 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.26.4-SNAPSHOT
+  2.26.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4-SNAPSHOT
+    2.26.4
   
   
     
diff --git a/pom.xml b/pom.xml
index c14db9cb9cae..493b5418766e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.4-SNAPSHOT
+  2.26.4
   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.26.4-SNAPSHOT
+        2.26.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.4-SNAPSHOT
+        2.26.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.4-SNAPSHOT
+        2.26.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.4-SNAPSHOT
+        0.117.4
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.4-SNAPSHOT
+        2.26.4
         
           
             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 51cc2309687c..ec44d1474881 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.26.4-SNAPSHOT
+  2.26.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4-SNAPSHOT
+    2.26.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 21334223eb97..7fb54a1f3e5c 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.117.4-SNAPSHOT
+  0.117.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4-SNAPSHOT
+    2.26.4
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 50bf6cfa506c..d1e78ece0a8e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.4-SNAPSHOT
+      2.26.4
     
     
 
diff --git a/versions.txt b/versions.txt
index ffb8d14d6400..347b939165f4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.3:2.26.4-SNAPSHOT
-google-cloud-datastore-bom:2.26.3:2.26.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.117.3:0.117.4-SNAPSHOT
-datastore-v1-proto-client:2.26.3:2.26.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT
+google-cloud-datastore:2.26.4:2.26.4
+google-cloud-datastore-bom:2.26.4:2.26.4
+proto-google-cloud-datastore-v1:0.117.4:0.117.4
+datastore-v1-proto-client:2.26.4:2.26.4
+proto-google-cloud-datastore-admin-v1:2.26.4:2.26.4
+grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.4

From b9b302bb6c8bb1c8d8b175b776b2f65317511987 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 27 Feb 2025 18:15:23 -0500
Subject: [PATCH 1584/1784] chore: Update generation configuration at Thu Feb
 27 02:24:49 UTC 2025 (#1776)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 generation_config.yaml                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 545f190487a3..5ad2a254b92a 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.53.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.54.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/generation_config.yaml b/generation_config.yaml
index 89599a2a184e..4f2ace2f05b1 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.53.0
-googleapis_commitish: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f
+gapic_generator_version: 2.54.0
+googleapis_commitish: 554575ee8d01d277344ec704e0561e9abc7f57f3
 libraries_bom_version: 26.55.0
 libraries:
   - api_shortname: datastore

From d29f47cbef9998acdc8b7b0f42d93574dab3cc7f Mon Sep 17 00:00:00 2001
From: ldetmer <1771267+ldetmer@users.noreply.github.com>
Date: Fri, 28 Feb 2025 18:11:32 +0000
Subject: [PATCH 1585/1784] feat: next release from main branch is 2.27.0
 (#1781)

* feat: next release from main branch is 2.27.0

* revert formatting fix
---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index cbb5be49c805..3fd939966c92 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -34,3 +34,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.19.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.26.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 1af0c45a38ab..09c9c67d75af 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -188,6 +188,24 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
+  - pattern: 2.26.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
+      - library_generation
+      - unmanaged_dependency_check
 permissionRules:
   - team: yoshi-admins
     permission: admin

From a278ce03541a94af92ef9cace8c9a3317c2b58f5 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 3 Mar 2025 18:56:22 +0000
Subject: [PATCH 1586/1784] chore(main): release 2.26.5-SNAPSHOT (#1774)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 95b049e1ece4..db359ce2b1fb 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.26.4
+  2.26.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4
+    2.26.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 06b9c9e44404..51d708154574 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.26.4
+  2.26.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.4
+        2.26.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.4
+        2.26.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.4
+        0.117.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.4
+        2.26.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8a4842303edb..280b54902909 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.4
+  2.26.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4
+    2.26.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f4bbffff1f38..1beb1169648e 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.26.4
+  2.26.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4
+    2.26.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 493b5418766e..dd78d6d9fc72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.4
+  2.26.5-SNAPSHOT
   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.26.4
+        2.26.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.4
+        2.26.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.4
+        2.26.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.4
+        0.117.5-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.4
+        2.26.5-SNAPSHOT
         
           
             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 ec44d1474881..0cb9a3a4e04e 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.26.4
+  2.26.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4
+    2.26.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7fb54a1f3e5c..4831e38a51af 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.117.4
+  0.117.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.4
+    2.26.5-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d1e78ece0a8e..d21d97aaea75 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.4
+      2.26.5-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 347b939165f4..62073db0aa95 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.4:2.26.4
-google-cloud-datastore-bom:2.26.4:2.26.4
-proto-google-cloud-datastore-v1:0.117.4:0.117.4
-datastore-v1-proto-client:2.26.4:2.26.4
-proto-google-cloud-datastore-admin-v1:2.26.4:2.26.4
-grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.4
+google-cloud-datastore:2.26.4:2.26.5-SNAPSHOT
+google-cloud-datastore-bom:2.26.4:2.26.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.117.4:0.117.5-SNAPSHOT
+datastore-v1-proto-client:2.26.4:2.26.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT

From d5e4e8437aa0d67fc358e5c9b9d2aadea708d9a2 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 4 Mar 2025 13:01:15 -0500
Subject: [PATCH 1587/1784] chore: Update generation configuration at Fri Feb
 28 02:25:01 UTC 2025 (#1780)

* chore: Update generation configuration at Fri Feb 28 02:25:01 UTC 2025

* chore: generate libraries at Fri Feb 28 02:25:31 UTC 2025
---
 generation_config.yaml                                          | 2 +-
 .../main/proto/google/datastore/admin/v1/datastore_admin.proto  | 2 +-
 .../src/main/proto/google/datastore/admin/v1/index.proto        | 2 +-
 .../src/main/proto/google/datastore/admin/v1/migration.proto    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 4f2ace2f05b1..3be066208f3c 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.54.0
-googleapis_commitish: 554575ee8d01d277344ec704e0561e9abc7f57f3
+googleapis_commitish: 68b6376ca75f03094a65ec5bbbc868bd9f058ee3
 libraries_bom_version: 26.55.0
 libraries:
   - api_shortname: datastore
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
index a8b3f9986b96..50c4d0cc87e3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
index 6a1d12227672..c907660568c6 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
index 813de87ddd32..67ac1ab711d7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

From eda6bf8c9b195fe7362170d2903a5460be3f6d67 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:19:51 -0500
Subject: [PATCH 1588/1784] chore: Update generation configuration at Wed Mar 
 5 02:25:11 UTC 2025 (#1785)

* chore: Update generation configuration at Wed Mar  5 02:25:11 UTC 2025

* chore: generate libraries at Wed Mar  5 02:25:47 UTC 2025
---
 README.md                                                     | 2 +-
 generation_config.yaml                                        | 4 ++--
 .../main/proto/google/datastore/v1/aggregation_result.proto   | 2 +-
 .../src/main/proto/google/datastore/v1/datastore.proto        | 2 +-
 .../src/main/proto/google/datastore/v1/entity.proto           | 2 +-
 .../src/main/proto/google/datastore/v1/query.proto            | 2 +-
 .../src/main/proto/google/datastore/v1/query_profile.proto    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7168de6d230f..0851bfb863f1 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.55.0')
+implementation platform('com.google.cloud:libraries-bom:26.56.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 3be066208f3c..ea58b9f516a7 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.54.0
-googleapis_commitish: 68b6376ca75f03094a65ec5bbbc868bd9f058ee3
-libraries_bom_version: 26.55.0
+googleapis_commitish: f4f8efb9e05e589abf94f8086fb6d0492f3551b8
+libraries_bom_version: 26.56.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
index e31052c0d331..cd51f660c419 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 c0683b9ba191..c0a281b18797 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
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 d9742d68de2a..fdf0a32cb7f9 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
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
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 3c2e8ae6688d..2e36f958b67d 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
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
index e00a28e3c2b5..71a4eb599335 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

From 126f9199e7f5f8d801a24025a380aa7eb82573c2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 5 Mar 2025 19:32:22 +0100
Subject: [PATCH 1589/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.56.0 (#1784)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.55.0` -> `26.56.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.55.0/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.55.0/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.56.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26560-2025-03-03)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.55.0...v26.56.0)

##### Dependencies

-   update bigtable bom ([#​6974](https://redirect.github.com/googleapis/java-cloud-bom/issues/6974)) ([ca61d7d](https://redirect.github.com/googleapis/java-cloud-bom/commit/ca61d7dc19a96efd50c41934c3692a69ff5a923f))
-   update dependency com.google.cloud:first-party-dependencies to v3.44.0 ([#​6957](https://redirect.github.com/googleapis/java-cloud-bom/issues/6957)) ([5eba4d7](https://redirect.github.com/googleapis/java-cloud-bom/commit/5eba4d7fb7119709a12e3c6c92589ddcc37d8505))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.53.0 ([#​6970](https://redirect.github.com/googleapis/java-cloud-bom/issues/6970)) ([599bec2](https://redirect.github.com/googleapis/java-cloud-bom/commit/599bec2783ed9b91ec69b659f0755ff87a93afeb))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.48.1 ([#​6965](https://redirect.github.com/googleapis/java-cloud-bom/issues/6965)) ([d810cc6](https://redirect.github.com/googleapis/java-cloud-bom/commit/d810cc64b2db14781795429911f9e8ee7dd5baa6))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.11.4 ([#​6958](https://redirect.github.com/googleapis/java-cloud-bom/issues/6958)) ([211ca26](https://redirect.github.com/googleapis/java-cloud-bom/commit/211ca269a66b6c19a25447066bab80cdd7c1c392))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.53.0 ([#​6973](https://redirect.github.com/googleapis/java-cloud-bom/issues/6973)) ([4c5e805](https://redirect.github.com/googleapis/java-cloud-bom/commit/4c5e805b726ef439816411bf816c10fa32f556ba))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.26.4 ([#​6956](https://redirect.github.com/googleapis/java-cloud-bom/issues/6956)) ([0174952](https://redirect.github.com/googleapis/java-cloud-bom/commit/017495217b721dcaf9f69f302b37a27b43b54505))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.30.9 ([#​6959](https://redirect.github.com/googleapis/java-cloud-bom/issues/6959)) ([56ee88e](https://redirect.github.com/googleapis/java-cloud-bom/commit/56ee88e776534a672f430325a7d797eda17fbfae))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.21.4 ([#​6961](https://redirect.github.com/googleapis/java-cloud-bom/issues/6961)) ([6d6ab90](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d6ab90151e852ba253531b8152d97d740b18858))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.132.4-alpha ([#​6962](https://redirect.github.com/googleapis/java-cloud-bom/issues/6962)) ([274a6e7](https://redirect.github.com/googleapis/java-cloud-bom/commit/274a6e7bf48ada55308e325445e188a7c2e79f15))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.32 ([#​6966](https://redirect.github.com/googleapis/java-cloud-bom/issues/6966)) ([130b2be](https://redirect.github.com/googleapis/java-cloud-bom/commit/130b2be341d33363e9bdd0d3b699e9993e819bf7))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.137.1 ([#​6964](https://redirect.github.com/googleapis/java-cloud-bom/issues/6964)) ([39d6c74](https://redirect.github.com/googleapis/java-cloud-bom/commit/39d6c74593518680b6418af384cf51a49323b2d4))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.4 ([#​6967](https://redirect.github.com/googleapis/java-cloud-bom/issues/6967)) ([c452159](https://redirect.github.com/googleapis/java-cloud-bom/commit/c4521591104469c6f27376046dc118948356e56d))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.88.0 ([#​6971](https://redirect.github.com/googleapis/java-cloud-bom/issues/6971)) ([e56bfb4](https://redirect.github.com/googleapis/java-cloud-bom/commit/e56bfb4d7e0c92a356dbfbf357568ff81fdd45cd))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.27.1 ([#​6972](https://redirect.github.com/googleapis/java-cloud-bom/issues/6972)) ([6e2c575](https://redirect.github.com/googleapis/java-cloud-bom/commit/6e2c57515648ff58440a37d16232547a697229ca))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.49.0 ([#​6969](https://redirect.github.com/googleapis/java-cloud-bom/issues/6969)) ([1c9287f](https://redirect.github.com/googleapis/java-cloud-bom/commit/1c9287f413ead9f288c8897f0317b51002e5879b))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 6bd0da5c9413..8dc99135363c 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.55.0
+        26.56.0
         pom
         import
       

From 0fea1bb793ebbe4409d7cc8b1bf915e4fb161cd8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 5 Mar 2025 19:38:25 +0100
Subject: [PATCH 1590/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.26.4 (#1777)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.26.3` -> `2.26.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.26.3/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.26.3/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.26.4`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2264-2025-02-26)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#​1769](https://redirect.github.com/googleapis/java-datastore/issues/1769)) ([7a86509](https://redirect.github.com/googleapis/java-datastore/commit/7a8650939e652fc3b384053454d6ef5084bb1508))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 77da5663d019..2f00439b6107 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.26.3
+      2.26.4
     
     
 

From 8369118994e9a18b888a7779376fea7e22b219ed Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 6 Mar 2025 00:01:30 +0100
Subject: [PATCH 1591/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.53.0 (#1779)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 280b54902909..a62c34acdaef 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.52.0
+        1.53.0
         pom
         import
           

From e763727f520a5c451b71c914aa30a0eb03edac88 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 6 Mar 2025 00:01:40 +0100
Subject: [PATCH 1592/1784] build(deps): update dependency
 org.apache.maven.plugins:maven-deploy-plugin to v3.1.4 (#1775)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index 56fd2ae2c769..41074b3957d7 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -38,7 +38,7 @@
       
         org.apache.maven.plugins
         maven-deploy-plugin
-        3.1.3
+        3.1.4
         
           true
         

From 08f282692e64a8d6ac8837de0c572ce6bac4ae2b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:34:22 -0800
Subject: [PATCH 1593/1784] chore(main): release 2.27.0 (#1783)

* chore(main): release 2.27.0

* chore: generate libraries at Wed Mar  5 23:02:15 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 17 +++++++++++++++++
 README.md                                     | 10 +++++-----
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 437feb9b29b8..5679ce48d39b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [2.27.0](https://github.com/googleapis/java-datastore/compare/v2.26.4...v2.27.0) (2025-03-05)
+
+
+### Features
+
+* Next release from main branch is 2.27.0 ([#1781](https://github.com/googleapis/java-datastore/issues/1781)) ([d29f47c](https://github.com/googleapis/java-datastore/commit/d29f47cbef9998acdc8b7b0f42d93574dab3cc7f))
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.54.0 ([b9b302b](https://github.com/googleapis/java-datastore/commit/b9b302bb6c8bb1c8d8b175b776b2f65317511987))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.53.0 ([#1779](https://github.com/googleapis/java-datastore/issues/1779)) ([8369118](https://github.com/googleapis/java-datastore/commit/8369118994e9a18b888a7779376fea7e22b219ed))
+
 ## [2.26.4](https://github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26)
 
 
diff --git a/README.md b/README.md
index 0851bfb863f1..b5a4bfb8a97d 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.55.0
+      26.56.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.26.3
+  2.26.4
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.26.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.27.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.0"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.4
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index db359ce2b1fb..7d5af2012778 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.26.5-SNAPSHOT
+  2.27.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.5-SNAPSHOT
+    2.27.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 51d708154574..3450c5fd90ad 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.26.5-SNAPSHOT
+  2.27.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.26.5-SNAPSHOT
+        2.27.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.5-SNAPSHOT
+        2.27.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.5-SNAPSHOT
+        0.118.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.26.5-SNAPSHOT
+        2.27.0
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index a62c34acdaef..2185e66d29fb 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.26.5-SNAPSHOT
+  2.27.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.5-SNAPSHOT
+    2.27.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 1beb1169648e..7c880906905c 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.26.5-SNAPSHOT
+  2.27.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.5-SNAPSHOT
+    2.27.0
   
   
     
diff --git a/pom.xml b/pom.xml
index dd78d6d9fc72..72ff139a8379 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.26.5-SNAPSHOT
+  2.27.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.26.5-SNAPSHOT
+        2.27.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.26.5-SNAPSHOT
+        2.27.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.26.5-SNAPSHOT
+        2.27.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.117.5-SNAPSHOT
+        0.118.0
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.26.5-SNAPSHOT
+        2.27.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 0cb9a3a4e04e..cadc1e7905df 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.26.5-SNAPSHOT
+  2.27.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.5-SNAPSHOT
+    2.27.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4831e38a51af..4e0ef15b8e2b 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.117.5-SNAPSHOT
+  0.118.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.26.5-SNAPSHOT
+    2.27.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d21d97aaea75..c26d5eecd364 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.26.5-SNAPSHOT
+      2.27.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 62073db0aa95..606a8e55cf22 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.26.4:2.26.5-SNAPSHOT
-google-cloud-datastore-bom:2.26.4:2.26.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.117.4:0.117.5-SNAPSHOT
-datastore-v1-proto-client:2.26.4:2.26.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT
+google-cloud-datastore:2.27.0:2.27.0
+google-cloud-datastore-bom:2.27.0:2.27.0
+proto-google-cloud-datastore-v1:0.118.0:0.118.0
+datastore-v1-proto-client:2.27.0:2.27.0
+proto-google-cloud-datastore-admin-v1:2.27.0:2.27.0
+grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.0

From b8aa8daef024780ba3917cb1590e4bbe75d5a3be Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 18:24:36 +0000
Subject: [PATCH 1594/1784] chore(main): release 2.27.1-SNAPSHOT (#1787)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7d5af2012778..f3adaac3a521 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.27.0
+  2.27.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.0
+    2.27.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3450c5fd90ad..64927148c0b7 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.27.0
+  2.27.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.27.0
+        2.27.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.0
+        2.27.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.0
+        0.118.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.27.0
+        2.27.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2185e66d29fb..22ca9d73facc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.27.0
+  2.27.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.0
+    2.27.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 7c880906905c..47b2f69e7c3c 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.27.0
+  2.27.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.0
+    2.27.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 72ff139a8379..a380ba686665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.27.0
+  2.27.1-SNAPSHOT
   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.27.0
+        2.27.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.0
+        2.27.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.27.0
+        2.27.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.0
+        0.118.1-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.27.0
+        2.27.1-SNAPSHOT
         
           
             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 cadc1e7905df..0c119df39332 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.27.0
+  2.27.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.0
+    2.27.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 4e0ef15b8e2b..6000a76b6e1c 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.118.0
+  0.118.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.0
+    2.27.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c26d5eecd364..b592515982ae 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.27.0
+      2.27.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 606a8e55cf22..2b23ec786a90 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.27.0:2.27.0
-google-cloud-datastore-bom:2.27.0:2.27.0
-proto-google-cloud-datastore-v1:0.118.0:0.118.0
-datastore-v1-proto-client:2.27.0:2.27.0
-proto-google-cloud-datastore-admin-v1:2.27.0:2.27.0
-grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.0
+google-cloud-datastore:2.27.0:2.27.1-SNAPSHOT
+google-cloud-datastore-bom:2.27.0:2.27.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.118.0:0.118.1-SNAPSHOT
+datastore-v1-proto-client:2.27.0:2.27.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT

From 18333497dad2f70c8bb5e4354b0c4d7083a503b3 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 11 Mar 2025 14:12:52 -0400
Subject: [PATCH 1595/1784] chore: Update generation configuration at Fri Mar 
 7 02:25:44 UTC 2025 (#1786)

chore: Update generation configuration at Fri Mar  7 02:25:44 UTC 2025
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index ea58b9f516a7..33a785daa441 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.54.0
-googleapis_commitish: f4f8efb9e05e589abf94f8086fb6d0492f3551b8
+googleapis_commitish: 9513189365a4cd150cbd62024ea23b0a4d3265c4
 libraries_bom_version: 26.56.0
 libraries:
   - api_shortname: datastore

From ba1ad98cce4c0feae13a370ea0581d15674dd43c Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 17 Mar 2025 14:51:23 -0400
Subject: [PATCH 1596/1784] chore: Update generation configuration at Mon Mar
 17 02:27:09 UTC 2025 (#1789)

* chore: Update generation configuration at Wed Mar 12 02:25:18 UTC 2025

* chore: Update generation configuration at Thu Mar 13 02:26:22 UTC 2025

* chore: Update generation configuration at Fri Mar 14 02:25:18 UTC 2025

* chore: Update generation configuration at Sat Mar 15 02:24:25 UTC 2025

* chore: Update generation configuration at Mon Mar 17 02:27:09 UTC 2025
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 generation_config.yaml                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 5ad2a254b92a..ca1baea12a6d 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.54.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/generation_config.yaml b/generation_config.yaml
index 33a785daa441..838148d6486b 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.54.0
-googleapis_commitish: 9513189365a4cd150cbd62024ea23b0a4d3265c4
+gapic_generator_version: 2.55.1
+googleapis_commitish: bc7f715d7f58afe381fbc244a8bcde7f0afa11ed
 libraries_bom_version: 26.56.0
 libraries:
   - api_shortname: datastore

From ab5ac8e6407541520fabb4504fcce0d675347f63 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 18 Mar 2025 15:39:26 +0100
Subject: [PATCH 1597/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.45.1 (#1791)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-17.cfg           | 2 +-
 .kokoro/presubmit/graalvm-native.cfg              | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 1bc662efeb69..1ecabfe2736f 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 65c1a67d80ed..842dadd7f521 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index c84b27e7d2ef..745c5c961cbb 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 64927148c0b7..f682a34439dc 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.44.0
+    3.45.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index a380ba686665..edc3e8848105 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.44.0
+    3.45.1
   
 
   

From cbf58a5ffbf643b45fa1330f7b22bceb92ff2ee8 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 20 Mar 2025 13:48:21 -0400
Subject: [PATCH 1598/1784] chore: Update generation configuration at Tue Mar
 18 02:26:52 UTC 2025 (#1795)

chore: Update generation configuration at Tue Mar 18 02:26:52 UTC 2025
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 838148d6486b..0141d0185210 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.55.1
-googleapis_commitish: bc7f715d7f58afe381fbc244a8bcde7f0afa11ed
+googleapis_commitish: 6155d42e99f45ebf53100d492852be1561916137
 libraries_bom_version: 26.56.0
 libraries:
   - api_shortname: datastore

From 2a82de0de194b56538c77c5adfb58abb32dbbfa8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 13:48:35 -0400
Subject: [PATCH 1599/1784] chore(main): release 2.27.1 (#1794)

* chore(main): release 2.27.1

* chore: generate libraries at Tue Mar 18 14:40:24 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5679ce48d39b..788ff76c40ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.27.1](https://github.com/googleapis/java-datastore/compare/v2.27.0...v2.27.1) (2025-03-18)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.55.1 ([ba1ad98](https://github.com/googleapis/java-datastore/commit/ba1ad98cce4c0feae13a370ea0581d15674dd43c))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.45.1 ([#1791](https://github.com/googleapis/java-datastore/issues/1791)) ([ab5ac8e](https://github.com/googleapis/java-datastore/commit/ab5ac8e6407541520fabb4504fcce0d675347f63))
+
 ## [2.27.0](https://github.com/googleapis/java-datastore/compare/v2.26.4...v2.27.0) (2025-03-05)
 
 
diff --git a/README.md b/README.md
index b5a4bfb8a97d..6618f6a490a6 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.27.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.27.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.1"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index f3adaac3a521..c8cff4f307e4 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.27.1-SNAPSHOT
+  2.27.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1-SNAPSHOT
+    2.27.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f682a34439dc..7be68ff1300e 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.27.1-SNAPSHOT
+  2.27.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.27.1-SNAPSHOT
+        2.27.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.1-SNAPSHOT
+        2.27.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.1-SNAPSHOT
+        0.118.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.27.1-SNAPSHOT
+        2.27.1
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 22ca9d73facc..ea9a953802fa 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.27.1-SNAPSHOT
+  2.27.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1-SNAPSHOT
+    2.27.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 47b2f69e7c3c..f605d4b05f40 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.27.1-SNAPSHOT
+  2.27.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1-SNAPSHOT
+    2.27.1
   
   
     
diff --git a/pom.xml b/pom.xml
index edc3e8848105..7c1ec3708c6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.27.1-SNAPSHOT
+  2.27.1
   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.27.1-SNAPSHOT
+        2.27.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.1-SNAPSHOT
+        2.27.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.27.1-SNAPSHOT
+        2.27.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.1-SNAPSHOT
+        0.118.1
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.27.1-SNAPSHOT
+        2.27.1
         
           
             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 0c119df39332..cf2a885c308c 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.27.1-SNAPSHOT
+  2.27.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1-SNAPSHOT
+    2.27.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6000a76b6e1c..305c81593829 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.118.1-SNAPSHOT
+  0.118.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1-SNAPSHOT
+    2.27.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b592515982ae..6e226db483a2 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.27.1-SNAPSHOT
+      2.27.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 2b23ec786a90..e2dae47ae201 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.27.0:2.27.1-SNAPSHOT
-google-cloud-datastore-bom:2.27.0:2.27.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.118.0:0.118.1-SNAPSHOT
-datastore-v1-proto-client:2.27.0:2.27.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT
+google-cloud-datastore:2.27.1:2.27.1
+google-cloud-datastore-bom:2.27.1:2.27.1
+proto-google-cloud-datastore-v1:0.118.1:0.118.1
+datastore-v1-proto-client:2.27.1:2.27.1
+proto-google-cloud-datastore-admin-v1:2.27.1:2.27.1
+grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.1

From 8ceb62b5182e30b4f771d6c1b586a22fb084c9ac Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 27 Mar 2025 16:16:36 -0400
Subject: [PATCH 1600/1784] chore: Update generation configuration at Thu Mar
 27 02:26:48 UTC 2025 (#1805)

* chore: Update generation configuration at Fri Mar 21 02:26:50 UTC 2025

* chore: Update generation configuration at Sat Mar 22 02:25:21 UTC 2025

* chore: generate libraries at Sat Mar 22 02:25:54 UTC 2025

* chore: Update generation configuration at Tue Mar 25 02:27:03 UTC 2025

* chore: Update generation configuration at Wed Mar 26 02:26:49 UTC 2025

* chore: Update generation configuration at Thu Mar 27 02:26:48 UTC 2025
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6618f6a490a6..def36c0cd01e 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.56.0')
+implementation platform('com.google.cloud:libraries-bom:26.57.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 0141d0185210..920e4077d81c 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.55.1
-googleapis_commitish: 6155d42e99f45ebf53100d492852be1561916137
-libraries_bom_version: 26.56.0
+googleapis_commitish: 00716e8ec21866b5744ffbe967f3467cf3246e88
+libraries_bom_version: 26.57.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From b8f7a486722407fc575b7823ee9257fb453f036a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 21 Apr 2025 11:25:03 -0700
Subject: [PATCH 1601/1784] chore(main): release 2.27.2-SNAPSHOT (#1804)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index c8cff4f307e4..4178bfa2562c 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.27.1
+  2.27.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1
+    2.27.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7be68ff1300e..f02b30d9e249 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.27.1
+  2.27.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.27.1
+        2.27.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.1
+        2.27.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.1
+        0.118.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.27.1
+        2.27.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ea9a953802fa..fb581a186ef7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.27.1
+  2.27.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1
+    2.27.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f605d4b05f40..a0cf3a469533 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.27.1
+  2.27.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1
+    2.27.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 7c1ec3708c6a..9fedd55b460a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.27.1
+  2.27.2-SNAPSHOT
   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.27.1
+        2.27.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.1
+        2.27.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.27.1
+        2.27.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.1
+        0.118.2-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.27.1
+        2.27.2-SNAPSHOT
         
           
             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 cf2a885c308c..a8f1bb4647e8 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.27.1
+  2.27.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1
+    2.27.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 305c81593829..1cc404ce65a6 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.118.1
+  0.118.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.1
+    2.27.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 6e226db483a2..4273064f8cca 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.27.1
+      2.27.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index e2dae47ae201..f3fa9247965c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.27.1:2.27.1
-google-cloud-datastore-bom:2.27.1:2.27.1
-proto-google-cloud-datastore-v1:0.118.1:0.118.1
-datastore-v1-proto-client:2.27.1:2.27.1
-proto-google-cloud-datastore-admin-v1:2.27.1:2.27.1
-grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.1
+google-cloud-datastore:2.27.1:2.27.2-SNAPSHOT
+google-cloud-datastore-bom:2.27.1:2.27.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.118.1:0.118.2-SNAPSHOT
+datastore-v1-proto-client:2.27.1:2.27.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT

From 1e2433400fdde200f13e735b87d6ccdd469a48cd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 22 Apr 2025 18:28:44 +0100
Subject: [PATCH 1602/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.27.0 (#1788)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 2f00439b6107..8f6d763feeb8 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.26.4
+      2.27.0
     
     
 

From 5c736faabcb02661677f6b3c24d878c86a02e0e9 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 22 Apr 2025 18:42:24 +0100
Subject: [PATCH 1603/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.59.0 (#1807)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.56.0` -> `26.59.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.56.0/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.56.0/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.59.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26590-2025-03-31)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.58.0...v26.59.0)

##### Dependencies

-   update dependency com.google.cloud:gapic-libraries-bom to v1.54.2 ([#​7011](https://redirect.github.com/googleapis/java-cloud-bom/issues/7011)) ([cb41fcf](https://redirect.github.com/googleapis/java-cloud-bom/commit/cb41fcf9d6dd0d052831b547131b56269a73251d))

### [`v26.58.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26580-2025-03-28)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.57.0...v26.58.0)

##### Bug Fixes

-   add error handling to script ([#​7001](https://redirect.github.com/googleapis/java-cloud-bom/issues/7001)) ([cfc7ea2](https://redirect.github.com/googleapis/java-cloud-bom/commit/cfc7ea2630bd9fbce38057f8114a1e3c85dc01f4))

##### Dependencies

-   update dependency com.google.cloud:gapic-libraries-bom to v1.54.1 ([#​7006](https://redirect.github.com/googleapis/java-cloud-bom/issues/7006)) ([37fcbe5](https://redirect.github.com/googleapis/java-cloud-bom/commit/37fcbe526eb959c425c02ac0ae2d7300e4f90dab))

### [`v26.57.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26570-2025-03-21)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.56.0...v26.57.0)

##### Dependencies

-   Protobuf 4.29.4 in Libraries BOM ([#​6986](https://redirect.github.com/googleapis/java-cloud-bom/issues/6986)) ([b2fdf41](https://redirect.github.com/googleapis/java-cloud-bom/commit/b2fdf41eab274d95285699560fc6c9fcf9bfc2fe))
-   update dependency com.google.cloud:first-party-dependencies to v3.45.1 ([#​6980](https://redirect.github.com/googleapis/java-cloud-bom/issues/6980)) ([1b9a203](https://redirect.github.com/googleapis/java-cloud-bom/commit/1b9a2038de423a41005327961434a7a1b7bfdcce))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.54.0 ([#​6989](https://redirect.github.com/googleapis/java-cloud-bom/issues/6989)) ([9e27d1e](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e27d1e6b6a209aec9e65f796fa411c1fe00b2b2))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.49.0 ([#​6990](https://redirect.github.com/googleapis/java-cloud-bom/issues/6990)) ([d293b75](https://redirect.github.com/googleapis/java-cloud-bom/commit/d293b7534ffeec88fe7cd7ca4c9b6ec417b460e1))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.12.0 ([#​6991](https://redirect.github.com/googleapis/java-cloud-bom/issues/6991)) ([90c6772](https://redirect.github.com/googleapis/java-cloud-bom/commit/90c677281bc2624cbcf541d8ca0e9d06199e91a0))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.27.1 ([#​6977](https://redirect.github.com/googleapis/java-cloud-bom/issues/6977)) ([c1ee194](https://redirect.github.com/googleapis/java-cloud-bom/commit/c1ee194cacbbcb6b11e7c21c7a7c2afe1db153d4))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.30.11 ([#​6976](https://redirect.github.com/googleapis/java-cloud-bom/issues/6976)) ([57028d5](https://redirect.github.com/googleapis/java-cloud-bom/commit/57028d5fae0d97bf2421de1a99c2be9e7e220faa))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.22.0 ([#​6992](https://redirect.github.com/googleapis/java-cloud-bom/issues/6992)) ([8142494](https://redirect.github.com/googleapis/java-cloud-bom/commit/81424944ddce2f16a1fc7d7fb707878123d31f1d))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.132.5-alpha ([#​6985](https://redirect.github.com/googleapis/java-cloud-bom/issues/6985)) ([87ea53f](https://redirect.github.com/googleapis/java-cloud-bom/commit/87ea53fbeb55dd7a1f55a86dcdd328abff127714))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.33 ([#​6987](https://redirect.github.com/googleapis/java-cloud-bom/issues/6987)) ([bcf4e3c](https://redirect.github.com/googleapis/java-cloud-bom/commit/bcf4e3c655c2b4d749cdefe91ff9ceb8255dcc96))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.138.0 ([#​6993](https://redirect.github.com/googleapis/java-cloud-bom/issues/6993)) ([27f63d7](https://redirect.github.com/googleapis/java-cloud-bom/commit/27f63d7150b7fff0495c0e2aafab4f3eef7cc843))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.5 ([#​6988](https://redirect.github.com/googleapis/java-cloud-bom/issues/6988)) ([51f57f2](https://redirect.github.com/googleapis/java-cloud-bom/commit/51f57f2a11e343bd935a75c946fe7461fdba36fd))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.89.0 ([#​6994](https://redirect.github.com/googleapis/java-cloud-bom/issues/6994)) ([3081df5](https://redirect.github.com/googleapis/java-cloud-bom/commit/3081df53c75b5905f30472765a295d9579a55ff4))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.28.0 ([#​6996](https://redirect.github.com/googleapis/java-cloud-bom/issues/6996)) ([8773613](https://redirect.github.com/googleapis/java-cloud-bom/commit/877361356fe26987246a1a7d99039407f0709f86))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.50.0 ([#​6995](https://redirect.github.com/googleapis/java-cloud-bom/issues/6995)) ([8eec8b6](https://redirect.github.com/googleapis/java-cloud-bom/commit/8eec8b687b8e91b08251137ff6e107fd88154247))
-   update dependency node to v22 ([#​6979](https://redirect.github.com/googleapis/java-cloud-bom/issues/6979)) ([27cd056](https://redirect.github.com/googleapis/java-cloud-bom/commit/27cd0567e7e545992148a669d1b8f5729e5bc2df))
-   updated dependency of google-cloud-bigtable-bom ([#​6981](https://redirect.github.com/googleapis/java-cloud-bom/issues/6981)) ([ea69ffc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ea69ffcffb7a864bfa9e8eb5059e27f85c8e2e57))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 8dc99135363c..88e93a110712 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.56.0
+        26.59.0
         pom
         import
       

From 1210f32662e7aafd2e170643bedbb851f40f3646 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 25 Apr 2025 10:55:12 -0400
Subject: [PATCH 1604/1784] chore: Update generation configuration at Fri Apr
 25 02:28:52 UTC 2025 (#1822)

* chore: Update generation configuration at Wed Apr 23 17:17:24 UTC 2025

* chore: generate libraries at Wed Apr 23 17:17:54 UTC 2025

* chore: Update generation configuration at Thu Apr 24 02:28:55 UTC 2025

* chore: manually update generation configuration

* chore: generate libraries at Thu Apr 24 14:55:47 UTC 2025

* chore: remove old graalvm jobs

* chore: Update generation configuration at Fri Apr 25 02:28:52 UTC 2025

* chore: restore custom files

---------

Co-authored-by: Diego Marquez 
---
 .github/generated-files-bot.yml               |   1 +
 .github/scripts/update_generation_config.sh   |  11 +-
 .github/sync-repo-settings.yaml               |   5 +-
 .github/workflows/ci.yaml                     |   2 +-
 .../hermetic_library_generation.yaml          |   2 +-
 .github/workflows/renovate_config_check.yaml  |   4 +-
 .github/workflows/samples.yaml                |   2 +-
 .../workflows/update_generation_config.yaml   |   6 +-
 .kokoro/build.sh                              |  24 +-
 ...raalvm-native.cfg => graalvm-native-a.cfg} |   6 +-
 ...lvm-native-17.cfg => graalvm-native-b.cfg} |   8 +-
 .kokoro/presubmit/graalvm-native-c.cfg        |  38 ++
 CONTRIBUTING.md                               |   2 +-
 README.md                                     |   6 +-
 .../v1/client/DatastoreEmulator.java          |   1 +
 .../v1/client/DatastoreException.java         |   8 +-
 .../datastore/v1/client/DatastoreHelper.java  |   4 +-
 .../v1/client/EndToEndChecksumHandler.java    |   1 +
 .../v1/client/QuerySplitterTest.java          |  39 +-
 generation_config.yaml                        |   6 +-
 .../google/cloud/datastore/DatastoreImpl.java |   4 +-
 .../aggregation/CountAggregation.java         |   4 +-
 .../google/cloud/datastore/DatastoreTest.java |   3 +-
 .../cloud/datastore/it/ITE2ETracingTest.java  |  12 +-
 .../testing/ITLocalDatastoreHelperTest.java   |   3 +-
 .../testing/RemoteDatastoreHelper.java        |   2 +-
 .../admin/v1/DatastoreAdminGrpc.java          | 180 +++++++++
 owlbot.py                                     |   4 +-
 .../datastore/admin/v1/CommonMetadata.java    |  61 +++
 .../admin/v1/CommonMetadataOrBuilder.java     |  11 +
 .../admin/v1/CreateIndexRequest.java          |  21 ++
 .../admin/v1/CreateIndexRequestOrBuilder.java |   3 +
 .../admin/v1/DatastoreAdminProto.java         | 219 ++++++-----
 .../DatastoreFirestoreMigrationMetadata.java  |  16 +
 ...reFirestoreMigrationMetadataOrBuilder.java |   2 +
 .../admin/v1/DeleteIndexRequest.java          |  16 +
 .../admin/v1/DeleteIndexRequestOrBuilder.java |   2 +
 .../datastore/admin/v1/EntityFilter.java      |  28 ++
 .../admin/v1/EntityFilterOrBuilder.java       |   6 +
 .../admin/v1/ExportEntitiesMetadata.java      |  57 +++
 .../v1/ExportEntitiesMetadataOrBuilder.java   |   9 +
 .../admin/v1/ExportEntitiesRequest.java       |  42 +++
 .../v1/ExportEntitiesRequestOrBuilder.java    |   9 +
 .../admin/v1/ExportEntitiesResponse.java      |   9 +
 .../v1/ExportEntitiesResponseOrBuilder.java   |   1 +
 .../datastore/admin/v1/GetIndexRequest.java   |  16 +
 .../admin/v1/GetIndexRequestOrBuilder.java    |   2 +
 .../admin/v1/ImportEntitiesMetadata.java      |  57 +++
 .../v1/ImportEntitiesMetadataOrBuilder.java   |   9 +
 .../admin/v1/ImportEntitiesRequest.java       |  42 +++
 .../v1/ImportEntitiesRequestOrBuilder.java    |   9 +
 .../com/google/datastore/admin/v1/Index.java  |  86 +++++
 .../admin/v1/IndexOperationMetadata.java      |  33 ++
 .../v1/IndexOperationMetadataOrBuilder.java   |   5 +
 .../datastore/admin/v1/IndexOrBuilder.java    |   9 +
 .../google/datastore/admin/v1/IndexProto.java |  56 +--
 .../admin/v1/ListIndexesRequest.java          |  27 ++
 .../admin/v1/ListIndexesRequestOrBuilder.java |   3 +
 .../admin/v1/ListIndexesResponse.java         |  31 ++
 .../v1/ListIndexesResponseOrBuilder.java      |   5 +
 .../admin/v1/MigrationProgressEvent.java      |  59 +++
 .../v1/MigrationProgressEventOrBuilder.java   |   5 +
 .../datastore/admin/v1/MigrationState.java    |   3 +
 .../admin/v1/MigrationStateEvent.java         |   9 +
 .../v1/MigrationStateEventOrBuilder.java      |   1 +
 .../datastore/admin/v1/MigrationStep.java     |   7 +
 .../datastore/admin/v1/OperationType.java     |   4 +
 .../google/datastore/admin/v1/Progress.java   |  10 +
 .../google/datastore/v1/AggregationQuery.java | 142 +++++++
 .../v1/AggregationQueryOrBuilder.java         |   6 +
 .../datastore/v1/AggregationResult.java       |  20 +-
 .../datastore/v1/AggregationResultBatch.java  |  43 +++
 .../v1/AggregationResultBatchOrBuilder.java   |   7 +
 .../v1/AggregationResultOrBuilder.java        |   5 +
 .../datastore/v1/AllocateIdsRequest.java      |  38 ++
 .../v1/AllocateIdsRequestOrBuilder.java       |   6 +
 .../datastore/v1/AllocateIdsResponse.java     |  24 ++
 .../v1/AllocateIdsResponseOrBuilder.java      |   4 +
 .../com/google/datastore/v1/ArrayValue.java   |  24 ++
 .../datastore/v1/ArrayValueOrBuilder.java     |   4 +
 .../datastore/v1/BeginTransactionRequest.java |  28 ++
 .../v1/BeginTransactionRequestOrBuilder.java  |   4 +
 .../v1/BeginTransactionResponse.java          |   6 +
 .../google/datastore/v1/CommitRequest.java    |  65 ++++
 .../datastore/v1/CommitRequestOrBuilder.java  |  10 +
 .../google/datastore/v1/CommitResponse.java   |  40 ++
 .../datastore/v1/CommitResponseOrBuilder.java |   6 +
 .../google/datastore/v1/CompositeFilter.java  |  33 ++
 .../v1/CompositeFilterOrBuilder.java          |   5 +
 .../google/datastore/v1/DatastoreProto.java   | 356 ++++++++++--------
 .../java/com/google/datastore/v1/Entity.java  |  32 +-
 .../google/datastore/v1/EntityOrBuilder.java  |   7 +
 .../com/google/datastore/v1/EntityProto.java  |  70 ++--
 .../com/google/datastore/v1/EntityResult.java |  49 +++
 .../datastore/v1/EntityResultOrBuilder.java   |   6 +
 .../google/datastore/v1/ExecutionStats.java   |  34 ++
 .../datastore/v1/ExecutionStatsOrBuilder.java |   4 +
 .../google/datastore/v1/ExplainMetrics.java   |  26 ++
 .../datastore/v1/ExplainMetricsOrBuilder.java |   4 +
 .../google/datastore/v1/ExplainOptions.java   |   6 +
 .../java/com/google/datastore/v1/Filter.java  |  27 ++
 .../google/datastore/v1/FilterOrBuilder.java  |   4 +
 .../com/google/datastore/v1/FindNearest.java  |  67 ++++
 .../datastore/v1/FindNearestOrBuilder.java    |  10 +
 .../com/google/datastore/v1/GqlQuery.java     |  53 ++-
 .../datastore/v1/GqlQueryOrBuilder.java       |  10 +
 .../datastore/v1/GqlQueryParameter.java       |  20 +
 .../v1/GqlQueryParameterOrBuilder.java        |   3 +
 .../java/com/google/datastore/v1/Key.java     |  64 ++++
 .../com/google/datastore/v1/KeyOrBuilder.java |   6 +
 .../google/datastore/v1/KindExpression.java   |   9 +
 .../datastore/v1/KindExpressionOrBuilder.java |   1 +
 .../google/datastore/v1/LookupRequest.java    |  62 +++
 .../datastore/v1/LookupRequestOrBuilder.java  |  10 +
 .../google/datastore/v1/LookupResponse.java   |  84 +++++
 .../datastore/v1/LookupResponseOrBuilder.java |  14 +
 .../com/google/datastore/v1/Mutation.java     | 112 ++++++
 .../datastore/v1/MutationOrBuilder.java       |  18 +
 .../google/datastore/v1/MutationResult.java   |  68 ++++
 .../datastore/v1/MutationResultOrBuilder.java |  10 +
 .../com/google/datastore/v1/PartitionId.java  |  23 ++
 .../datastore/v1/PartitionIdOrBuilder.java    |   3 +
 .../com/google/datastore/v1/PlanSummary.java  |  24 ++
 .../datastore/v1/PlanSummaryOrBuilder.java    |   4 +
 .../com/google/datastore/v1/Projection.java   |  14 +
 .../datastore/v1/ProjectionOrBuilder.java     |   2 +
 .../google/datastore/v1/PropertyFilter.java   |  42 +++
 .../datastore/v1/PropertyFilterOrBuilder.java |   5 +
 .../com/google/datastore/v1/PropertyMask.java |  15 +
 .../datastore/v1/PropertyMaskOrBuilder.java   |   3 +
 .../google/datastore/v1/PropertyOrder.java    |  23 ++
 .../datastore/v1/PropertyOrderOrBuilder.java  |   3 +
 .../datastore/v1/PropertyReference.java       |   9 +
 .../v1/PropertyReferenceOrBuilder.java        |   1 +
 .../datastore/v1/PropertyTransform.java       |  79 ++++
 .../v1/PropertyTransformOrBuilder.java        |  13 +
 .../java/com/google/datastore/v1/Query.java   | 138 +++++++
 .../google/datastore/v1/QueryOrBuilder.java   |  22 ++
 .../com/google/datastore/v1/QueryProto.java   | 240 +++++++-----
 .../google/datastore/v1/QueryResultBatch.java |  70 ++++
 .../v1/QueryResultBatchOrBuilder.java         |   8 +
 .../com/google/datastore/v1/ReadOptions.java  |  42 +++
 .../datastore/v1/ReadOptionsOrBuilder.java    |   7 +
 .../datastore/v1/ReserveIdsRequest.java       |  38 ++
 .../v1/ReserveIdsRequestOrBuilder.java        |   6 +
 .../datastore/v1/ReserveIdsResponse.java      |   2 +
 .../google/datastore/v1/RollbackRequest.java  |  20 +
 .../v1/RollbackRequestOrBuilder.java          |   2 +
 .../google/datastore/v1/RollbackResponse.java |   2 +
 .../v1/RunAggregationQueryRequest.java        |  77 ++++
 .../RunAggregationQueryRequestOrBuilder.java  |  12 +
 .../v1/RunAggregationQueryResponse.java       |  42 +++
 .../RunAggregationQueryResponseOrBuilder.java |   6 +
 .../google/datastore/v1/RunQueryRequest.java  |  89 +++++
 .../v1/RunQueryRequestOrBuilder.java          |  14 +
 .../google/datastore/v1/RunQueryResponse.java |  42 +++
 .../v1/RunQueryResponseOrBuilder.java         |   6 +
 .../datastore/v1/TransactionOptions.java      |  51 +++
 .../v1/TransactionOptionsOrBuilder.java       |   4 +
 .../java/com/google/datastore/v1/Value.java   | 107 ++++++
 .../google/datastore/v1/ValueOrBuilder.java   |  18 +
 renovate.json                                 |   1 -
 .../google/datastore/snippets/TaskList.java   |   5 +
 .../datastore/snippets/ConceptsTest.java      |   1 +
 164 files changed, 3987 insertions(+), 502 deletions(-)
 rename .kokoro/presubmit/{graalvm-native.cfg => graalvm-native-a.cfg} (78%)
 rename .kokoro/presubmit/{graalvm-native-17.cfg => graalvm-native-b.cfg} (76%)
 create mode 100644 .kokoro/presubmit/graalvm-native-c.cfg

diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml
index c644a24e1129..e58cdcbad65a 100644
--- a/.github/generated-files-bot.yml
+++ b/.github/generated-files-bot.yml
@@ -6,6 +6,7 @@ externalManifests:
   file: '.github/readme/synth.metadata/synth.metadata'
   jsonpath: '$.generatedFiles[*]'
 ignoreAuthors:
+- 'cloud-java-bot'
 - 'renovate-bot'
 - 'yoshi-automation'
 - 'release-please[bot]'
diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh
index 91434688cc5c..fff56bf5ddf3 100644
--- a/.github/scripts/update_generation_config.sh
+++ b/.github/scripts/update_generation_config.sh
@@ -15,8 +15,15 @@ set -e
 function get_latest_released_version() {
     local group_id=$1
     local artifact_id=$2
-    latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
-    echo "${latest}"
+    json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
+    latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
+    if [[ -z "${latest}" ]]; then
+        echo "The latest version of ${group_id}:${artifact_id} is empty."
+        echo "The returned json from maven.org is invalid: ${json_content}"
+        exit 1
+    else
+        echo "${latest}"
+    fi
 }
 
 # Update a key to a new value in the generation config.
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 09c9c67d75af..6fdb2fb2e49b 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -15,8 +15,9 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - 'Kokoro - Test: Java GraalVM Native Image A'
+      - 'Kokoro - Test: Java GraalVM Native Image B'
+      - 'Kokoro - Test: Java GraalVM Native Image C'
       - javadoc
       - library_generation
       - unmanaged_dependency_check
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 941f2f3b419e..2192f032d2d3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -112,7 +112,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: temurin
-        java-version: 11
+        java-version: 17
     - run: java -version
     - run: .kokoro/build.sh
       env:
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index ca1baea12a6d..6b856abdef3f 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml
index 7c5ec7865e11..47b9e87c98bb 100644
--- a/.github/workflows/renovate_config_check.yaml
+++ b/.github/workflows/renovate_config_check.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   renovate_bot_config_validation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout code
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: '22'
 
     - name: Install Renovate and Config Validator
       run: |
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index 03b2939567a9..186fd8bcfc51 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 17
       - name: Run checkstyle
         run: mvn -P lint --quiet --batch-mode checkstyle:check
         working-directory: samples/snippets
diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml
index 3cf773992644..cd2d5fd5a8e4 100644
--- a/.github/workflows/update_generation_config.yaml
+++ b/.github/workflows/update_generation_config.yaml
@@ -21,13 +21,14 @@ on:
 
 jobs:
   update-generation-config:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       # the branch into which the pull request is merged
       base_branch: main
     steps:
     - uses: actions/checkout@v4
       with:
+        fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
     - name: Update params in generation config to latest
       shell: bash
@@ -36,7 +37,8 @@ jobs:
         [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
         [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
         bash .github/scripts/update_generation_config.sh \
-          --base_branch "${base_branch}"\
+          --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
         GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index c4b65f8b5695..f77424b4ffea 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 2019 Google LLC
+# Copyright 2025 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
+#     https://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,
@@ -42,21 +42,22 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
     export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 
+
 RETURN_CODE=0
 set +e
 
 case ${JOB_TYPE} in
 test)
     echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
-    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
+    mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
     RETURN_CODE=$?
     ;;
 lint)
-    mvn com.coveo:fmt-maven-plugin:check -B -ntp
+    mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
     RETURN_CODE=$?
     ;;
 javadoc)
-    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
+    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
     RETURN_CODE=$?
     ;;
 integration)
@@ -78,18 +79,16 @@ integration)
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
       -Denforcer.skip=true \
+      -Dcheckstyle.skip=true \
+      -DskipUnitTests=true \
+      -Dfmt.skip=true \
       -fae \
       verify
     RETURN_CODE=$?
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
-    RETURN_CODE=$?
-    ;;
-graalvm17)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
     RETURN_CODE=$?
     ;;
 samples)
@@ -113,6 +112,7 @@ samples)
           -DtrimStackTrace=false \
           -Dclirr.skip=true \
           -Denforcer.skip=true \
+		  -Dfmt.skip=true \
           -fae \
           verify
         RETURN_CODE=$?
@@ -122,7 +122,7 @@ samples)
     fi
     ;;
 clirr)
-    mvn -B -ntp -Denforcer.skip=true clirr:check
+    mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
     RETURN_CODE=$?
     ;;
 *)
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
similarity index 78%
rename from .kokoro/presubmit/graalvm-native.cfg
rename to .kokoro/presubmit/graalvm-native-a.cfg
index 745c5c961cbb..d0c295213338 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
@@ -33,6 +33,6 @@ env_vars: {
 }
 
 env_vars: {
-  key: "DATASTORE_PROJECT_ID"
-  value: "gcloud-devel"
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
 }
\ No newline at end of file
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
similarity index 76%
rename from .kokoro/presubmit/graalvm-native-17.cfg
rename to .kokoro/presubmit/graalvm-native-b.cfg
index 842dadd7f521..962c305ff7fb 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,12 +3,12 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvm17"
+  value: "graalvm"
 }
 
 # TODO: remove this after we've migrated all tests and scripts
@@ -33,6 +33,6 @@ env_vars: {
 }
 
 env_vars: {
-  key: "DATASTORE_PROJECT_ID"
-  value: "gcloud-devel"
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
 }
\ No newline at end of file
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
new file mode 100644
index 000000000000..87b5dff65a31
--- /dev/null
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -0,0 +1,38 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
+}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b65dd279c946..ff092b68e3fc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -84,7 +84,7 @@ Code in this repo is formatted with
 [google-java-format](https://github.com/google/google-java-format).
 To run formatting on your project, you can run:
 ```
-mvn com.coveo:fmt-maven-plugin:format
+mvn com.spotify.fmt:fmt-maven-plugin:format
 ```
 
 [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account
diff --git a/README.md b/README.md
index def36c0cd01e..8027f49c137a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.56.0
+      26.59.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.26.4
+  2.27.0
 
 
 ```
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.57.0')
+implementation platform('com.google.cloud:libraries-bom:26.59.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
index 2fb11ebe8917..dcca102a1679 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
@@ -262,6 +262,7 @@ public synchronized File getProjectDirectory() {
   static class StartupMonitor extends Thread {
     private final InputStream inputStream;
     private volatile boolean success = false;
+
     /** This latch will reach 0 once server startup has completed. */
     private final CountDownLatch startupCompleteLatch = new CountDownLatch(1);
 
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
index 400e633088f8..b283603fbfe2 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
@@ -28,12 +28,16 @@ public DatastoreException(String methodName, Code code, String message, Throwabl
     this.code = code;
   }
 
-  /** @return the canonical error code */
+  /**
+   * @return the canonical error code
+   */
   public Code getCode() {
     return code;
   }
 
-  /** @return the datastore method name */
+  /**
+   * @return the datastore method name
+   */
   public String getMethodName() {
     return methodName;
   }
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 23ac315b5895..2396730616ce 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
@@ -336,7 +336,9 @@ private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options)
     return;
   }
 
-  /** @see #getOptionsFromEnv() */
+  /**
+   * @see #getOptionsFromEnv()
+   */
   public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException {
     return DatastoreFactory.get().create(getOptionsFromEnv().build());
   }
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
index 3f840a8ba75b..339fe4878d78 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
@@ -24,6 +24,7 @@
 class EndToEndChecksumHandler {
   /** The checksum http header on http requests */
   static final String HTTP_REQUEST_CHECKSUM_HEADER = "x-request-checksum-348659783";
+
   /** The checksum http header on http responses */
   static final String HTTP_RESPONSE_CHECKSUM_HEADER = "x-response-checksum-348659783";
 
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 b064e137ad5c..0802a62aa80d 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
@@ -101,8 +101,7 @@ public void disallowsSortOrder() {
   public void disallowsMultipleKinds() {
     Datastore datastore = factory.create(options.build());
     Query queryWithMultipleKinds =
-        query
-            .toBuilder()
+        query.toBuilder()
             .addKind(KindExpression.newBuilder().setName("another-kind").build())
             .build();
     IllegalArgumentException exception =
@@ -129,8 +128,7 @@ public void disallowsKindlessQuery() {
   public void disallowsInequalityFilter() {
     Datastore datastore = factory.create(options.build());
     Query queryWithInequality =
-        query
-            .toBuilder()
+        query.toBuilder()
             .setFilter(makeFilter("foo", Operator.GREATER_THAN, makeValue("value")))
             .build();
     IllegalArgumentException exception =
@@ -177,16 +175,13 @@ public void getSplits() throws Exception {
 
     assertThat(splittedQueries)
         .containsExactly(
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
                 .build(),
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
                 .build(),
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
                 .build());
 
@@ -229,16 +224,13 @@ public void getSplitsWithDatabaseId() throws Exception {
 
     assertThat(splitQueries)
         .containsExactly(
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
                 .build(),
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
                 .build(),
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
                 .build());
 
@@ -277,12 +269,10 @@ public void notEnoughSplits() throws Exception {
 
     assertThat(splittedQueries)
         .containsExactly(
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey0))
                 .build(),
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey0, null))
                 .build());
 
@@ -325,16 +315,13 @@ public void getSplits_withReadTime() throws Exception {
 
     assertThat(splittedQueries)
         .containsExactly(
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
                 .build(),
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
                 .build(),
-            query
-                .toBuilder()
+            query.toBuilder()
                 .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
                 .build());
 
diff --git a/generation_config.yaml b/generation_config.yaml
index 920e4077d81c..5e7d6072a86c 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.55.1
-googleapis_commitish: 00716e8ec21866b5744ffbe967f3467cf3246e88
-libraries_bom_version: 26.57.0
+gapic_generator_version: 2.56.2
+googleapis_commitish: 2e5f8ba097342c6ef4efeba5c07677b3d35571d4
+libraries_bom_version: 26.59.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore
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 2bf8389fd9df..42bc1a093802 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
@@ -240,8 +240,8 @@ public  T runInTransaction(final TransactionCallable callable) {
     Callable transactionCallable =
         (getOptions().getOpenTelemetryOptions().isEnabled()
             ? new TracedReadWriteTransactionCallable(
-                this, callable, /*transactionOptions=*/ null, span)
-            : new ReadWriteTransactionCallable(this, callable, /*transactionOptions=*/ null));
+                this, callable, /* transactionOptions= */ null, span)
+            : new ReadWriteTransactionCallable(this, callable, /* transactionOptions= */ null));
     try (Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
           transactionCallable,
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
index 632b6633daf6..af2f23788291 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
@@ -23,7 +23,9 @@
 /** Represents an {@link Aggregation} which returns count. */
 public class CountAggregation extends Aggregation {
 
-  /** @param alias Alias to used when running this aggregation. */
+  /**
+   * @param alias Alias to used when running this aggregation.
+   */
   public CountAggregation(String alias) {
     super(alias);
   }
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 459278f25a42..ca84ab35ad04 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
@@ -179,8 +179,7 @@ public void setUp() {
     DatastoreOpenTelemetryOptions.Builder otelOptionsBuilder =
         DatastoreOpenTelemetryOptions.newBuilder();
     rpcMockOptions =
-        options
-            .toBuilder()
+        options.toBuilder()
             .setRetrySettings(ServiceOptions.getDefaultRetrySettings())
             .setServiceRpcFactory(rpcFactoryMock)
             .build();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
index bee54a1f03c6..d0631f51acd9 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
@@ -201,7 +201,7 @@ private boolean dfsContainsCallStack(long spanId, List expectedCallStack
             if (dfsContainsCallStack(
                 childSpan,
                 expectedCallStack.subList(
-                    /*fromIndexInclusive=*/ 1, /*toIndexExclusive*/ callStackListSize))) {
+                    /* fromIndexInclusive= */ 1, /*toIndexExclusive*/ callStackListSize))) {
               return true;
             }
           }
@@ -808,7 +808,7 @@ public void newTransactionReadTest() throws Exception {
 
     fetchAndValidateTrace(
         customSpanContext.getTraceId(),
-        /*numExpectedSpans=*/ 3,
+        /* numExpectedSpans= */ 3,
         Arrays.asList(
             Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
             Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP),
@@ -848,7 +848,7 @@ public void newTransactionQueryTest() throws Exception {
 
     fetchAndValidateTrace(
         customSpanContext.getTraceId(),
-        /*numExpectedSpans=*/ 3,
+        /* numExpectedSpans= */ 3,
         Arrays.asList(
             Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
             Collections.singletonList(SPAN_NAME_TRANSACTION_RUN_QUERY),
@@ -903,7 +903,7 @@ public void newTransactionReadWriteTraceTest() throws Exception {
 
     fetchAndValidateTrace(
         customSpanContext.getTraceId(),
-        /*numExpectedSpans=*/ 3,
+        /* numExpectedSpans= */ 3,
         Arrays.asList(
             Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
             Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP),
@@ -958,7 +958,7 @@ public void newTransactionRollbackTest() throws Exception {
 
     fetchAndValidateTrace(
         customSpanContext.getTraceId(),
-        /*numExpectedSpans=*/ 3,
+        /* numExpectedSpans= */ 3,
         Arrays.asList(
             Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION),
             Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP),
@@ -1000,7 +1000,7 @@ public void runInTransactionQueryTest() throws Exception {
 
     fetchAndValidateTrace(
         customSpanContext.getTraceId(),
-        /*numExpectedSpans=*/ 4,
+        /* numExpectedSpans= */ 4,
         Arrays.asList(
             Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_BEGIN_TRANSACTION),
             Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_RUN_QUERY),
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 cad6d4fbece1..d5be6b9e627a 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
@@ -118,8 +118,7 @@ public void testCreateWithToBuilder() throws IOException {
     assertLocalDatastoreHelpersEquivelent(helper, actualHelper);
     Path dataDir = Files.createTempDirectory("gcd_data_dir");
     actualHelper =
-        helper
-            .toBuilder()
+        helper.toBuilder()
             .setConsistency(0.85)
             .setPort(9091)
             .setStoreOnDisk(true)
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
index a4b389a1e2a3..cc30ace71b63 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
@@ -104,7 +104,7 @@ public static RemoteDatastoreHelper create(
   }
 
   public static RemoteDatastoreHelper create(String databaseId) {
-    return create(databaseId, /*openTelemetrySdk=*/ null);
+    return create(databaseId, /* openTelemetrySdk= */ null);
   }
 
   private static RetrySettings retrySettings() {
diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index fcea8a71fa84..f331aba0e7ac 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -344,6 +344,19 @@ public DatastoreAdminStub newStub(
     return DatastoreAdminStub.newStub(factory, channel);
   }
 
+  /** Creates a new blocking-style stub that supports all types of calls on the service */
+  public static DatastoreAdminBlockingV2Stub newBlockingV2Stub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreAdminBlockingV2Stub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreAdminBlockingV2Stub(channel, callOptions);
+          }
+        };
+    return DatastoreAdminBlockingV2Stub.newStub(factory, channel);
+  }
+
   /**
    * Creates a new blocking-style stub that supports unary and streaming output calls on the service
    */
@@ -813,6 +826,173 @@ public void listIndexes(
    * service google.longrunning.Operations.
    * 
    */
+  public static final class DatastoreAdminBlockingV2Stub
+      extends io.grpc.stub.AbstractBlockingStub {
+    private DatastoreAdminBlockingV2Stub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreAdminBlockingV2Stub build(
+        io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreAdminBlockingV2Stub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Exports a copy of all or a subset of entities from Google Cloud Datastore
+     * to another storage system, such as Google Cloud Storage. Recent updates to
+     * entities may not be reflected in the export. The export occurs in the
+     * background and its progress can be monitored and managed via the
+     * Operation resource that is created. The output of an export may only be
+     * used once the associated operation is done. If an export operation is
+     * cancelled before completion it may leave partial data behind in Google
+     * Cloud Storage.
+     * 
    
+     */
+    public com.google.longrunning.Operation exportEntities(
+        com.google.datastore.admin.v1.ExportEntitiesRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getExportEntitiesMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Imports entities into Google Cloud Datastore. Existing entities with the
+     * same key are overwritten. The import occurs in the background and its
+     * progress can be monitored and managed via the Operation resource that is
+     * created. If an ImportEntities operation is cancelled, it is possible
+     * that a subset of the data has already been imported to Cloud Datastore.
+     * 
    
+     */
+    public com.google.longrunning.Operation importEntities(
+        com.google.datastore.admin.v1.ImportEntitiesRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getImportEntitiesMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Creates the specified index.
+     * A newly created index's initial state is `CREATING`. On completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * state will be `READY`. If the index already exists, the call will return an
+     * `ALREADY_EXISTS` status.
+     * During index creation, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, removing the index with
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then
+     * re-creating the index with [create]
+     * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+     * Indexes with a single property cannot be created.
+     * 
    
+     */
+    public com.google.longrunning.Operation createIndex(
+        com.google.datastore.admin.v1.CreateIndexRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCreateIndexMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Deletes an existing index.
+     * An index can only be deleted if it is in a `READY` or `ERROR` state. On
+     * successful execution of the request, the index will be in a `DELETING`
+     * [state][google.datastore.admin.v1.Index.State]. And on completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * index will be removed.
+     * During index deletion, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, followed by calling
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
+     * 
    
+     */
+    public com.google.longrunning.Operation deleteIndex(
+        com.google.datastore.admin.v1.DeleteIndexRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getDeleteIndexMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Gets an index.
+     * 
    
+     */
+    public com.google.datastore.admin.v1.Index getIndex(
+        com.google.datastore.admin.v1.GetIndexRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getGetIndexMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Lists the indexes that match the specified filters.  Datastore uses an
+     * eventually consistent query to fetch the list of indexes and may
+     * occasionally return stale results.
+     * 
    
+     */
+    public com.google.datastore.admin.v1.ListIndexesResponse listIndexes(
+        com.google.datastore.admin.v1.ListIndexesRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getListIndexesMethod(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   * A stub to allow clients to do limited synchronous rpc calls to service DatastoreAdmin.
+   *
+   * 
    +   * Google Cloud Datastore Admin API
+   * The Datastore Admin API provides several admin services for Cloud Datastore.
+   * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+   * Datastore API.
+   * Operation: An Operation represents work being performed in the background.
+   * EntityFilter: Allows specifying a subset of entities in a project. This is
+   * specified as a combination of kinds and namespaces (either or both of which
+   * may be all).
+   * Export/Import Service:
+   * - The Export/Import service provides the ability to copy all or a subset of
+   * entities to/from Google Cloud Storage.
+   * - Exported data may be imported into Cloud Datastore for any Google Cloud
+   * Platform project. It is not restricted to the export source project. It is
+   * possible to export from one project and then import into another.
+   * - Exported data can also be loaded into Google BigQuery for analysis.
+   * - Exports and imports are performed asynchronously. An Operation resource is
+   * created for each export/import. The state (including any errors encountered)
+   * of the export/import may be queried via the Operation resource.
+   * Index Service:
+   * - The index service manages Cloud Datastore composite indexes.
+   * - Index creation and deletion are performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * Operation Service:
+   * - The Operations collection provides a record of actions performed for the
+   * specified project (including any operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * - An operation that is not yet done may be cancelled. The request to cancel
+   * is asynchronous and the operation may continue to run for some time after the
+   * request to cancel is made.
+   * - An operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection.
+   * - ListOperations returns all pending operations, but not completed
+   * operations.
+   * - Operations are created by service DatastoreAdmin, but are accessed via
+   * service google.longrunning.Operations.
+   * 
    
+   */
   public static final class DatastoreAdminBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
     private DatastoreAdminBlockingStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
diff --git a/owlbot.py b/owlbot.py
index aa74153f9d9c..a858b736689f 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -46,6 +46,7 @@
 
 s.remove_staging_dirs()
 java.common_templates(excludes=[
+    '.kokoro/build.sh',
     '.kokoro/presubmit/integration.cfg',
     '.kokoro/presubmit/graalvm-native.cfg',
     '.kokoro/presubmit/graalvm-native-17.cfg',
@@ -53,5 +54,6 @@
     '.kokoro/nightly/java11-integration.cfg',
     '.kokoro/requirements.in',
     '.kokoro/requirements.txt',
-    '.github/dependabot.yml'
+    '.github/dependabot.yml',
+    '.github/workflows/ci.yaml'
 ])
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index 8b6c77deb002..d7c5167a191b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -33,6 +33,7 @@ public final class CommonMetadata extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.CommonMetadata)
     CommonMetadataOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use CommonMetadata.newBuilder() to construct.
   private CommonMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -181,6 +182,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * STATE_UNSPECIFIED = 0;
      */
     public static final int STATE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -191,6 +193,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * INITIALIZING = 1;
      */
     public static final int INITIALIZING_VALUE = 1;
+
     /**
      *
      *
@@ -201,6 +204,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * PROCESSING = 2;
      */
     public static final int PROCESSING_VALUE = 2;
+
     /**
      *
      *
@@ -212,6 +216,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * CANCELLING = 3;
      */
     public static final int CANCELLING_VALUE = 3;
+
     /**
      *
      *
@@ -222,6 +227,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * FINALIZING = 4;
      */
     public static final int FINALIZING_VALUE = 4;
+
     /**
      *
      *
@@ -232,6 +238,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * SUCCESSFUL = 5;
      */
     public static final int SUCCESSFUL_VALUE = 5;
+
     /**
      *
      *
@@ -242,6 +249,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * FAILED = 6;
      */
     public static final int FAILED_VALUE = 6;
+
     /**
      *
      *
@@ -350,6 +358,7 @@ private State(int value) {
   private int bitField0_;
   public static final int START_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp startTime_;
+
   /**
    *
    *
@@ -365,6 +374,7 @@ private State(int value) {
   public boolean hasStartTime() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -380,6 +390,7 @@ public boolean hasStartTime() {
   public com.google.protobuf.Timestamp getStartTime() {
     return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
   }
+
   /**
    *
    *
@@ -396,6 +407,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
 
   public static final int END_TIME_FIELD_NUMBER = 2;
   private com.google.protobuf.Timestamp endTime_;
+
   /**
    *
    *
@@ -411,6 +423,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
   public boolean hasEndTime() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -426,6 +439,7 @@ public boolean hasEndTime() {
   public com.google.protobuf.Timestamp getEndTime() {
     return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
   }
+
   /**
    *
    *
@@ -442,6 +456,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
 
   public static final int OPERATION_TYPE_FIELD_NUMBER = 3;
   private int operationType_ = 0;
+
   /**
    *
    *
@@ -458,6 +473,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
   public int getOperationTypeValue() {
     return operationType_;
   }
+
   /**
    *
    *
@@ -503,6 +519,7 @@ private com.google.protobuf.MapField interna
   public int getLabelsCount() {
     return internalGetLabels().getMap().size();
   }
+
   /**
    *
    *
@@ -520,12 +537,14 @@ public boolean containsLabels(java.lang.String key) {
     }
     return internalGetLabels().getMap().containsKey(key);
   }
+
   /** Use {@link #getLabelsMap()} instead. */
   @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map getLabels() {
     return getLabelsMap();
   }
+
   /**
    *
    *
@@ -540,6 +559,7 @@ public java.util.Map getLabels() {
   public java.util.Map getLabelsMap() {
     return internalGetLabels().getMap();
   }
+
   /**
    *
    *
@@ -561,6 +581,7 @@ public java.util.Map getLabelsMap() {
     java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
+
   /**
    *
    *
@@ -585,6 +606,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
 
   public static final int STATE_FIELD_NUMBER = 5;
   private int state_ = 0;
+
   /**
    *
    *
@@ -600,6 +622,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
   public int getStateValue() {
     return state_;
   }
+
   /**
    *
    *
@@ -837,6 +860,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1125,6 +1149,7 @@ public Builder mergeFrom(
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         startTimeBuilder_;
+
     /**
      *
      *
@@ -1139,6 +1164,7 @@ public Builder mergeFrom(
     public boolean hasStartTime() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -1157,6 +1183,7 @@ public com.google.protobuf.Timestamp getStartTime() {
         return startTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1179,6 +1206,7 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1198,6 +1226,7 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1225,6 +1254,7 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1244,6 +1274,7 @@ public Builder clearStartTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1258,6 +1289,7 @@ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
       onChanged();
       return getStartTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1274,6 +1306,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
         return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
       }
     }
+
     /**
      *
      *
@@ -1306,6 +1339,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         endTimeBuilder_;
+
     /**
      *
      *
@@ -1320,6 +1354,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
     public boolean hasEndTime() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -1338,6 +1373,7 @@ public com.google.protobuf.Timestamp getEndTime() {
         return endTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1360,6 +1396,7 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1379,6 +1416,7 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1406,6 +1444,7 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1425,6 +1464,7 @@ public Builder clearEndTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1439,6 +1479,7 @@ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1455,6 +1496,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
         return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
       }
     }
+
     /**
      *
      *
@@ -1482,6 +1524,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
     }
 
     private int operationType_ = 0;
+
     /**
      *
      *
@@ -1498,6 +1541,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
     public int getOperationTypeValue() {
       return operationType_;
     }
+
     /**
      *
      *
@@ -1517,6 +1561,7 @@ public Builder setOperationTypeValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1535,6 +1580,7 @@ public com.google.datastore.admin.v1.OperationType getOperationType() {
           com.google.datastore.admin.v1.OperationType.forNumber(operationType_);
       return result == null ? com.google.datastore.admin.v1.OperationType.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -1557,6 +1603,7 @@ public Builder setOperationType(com.google.datastore.admin.v1.OperationType valu
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1601,6 +1648,7 @@ private com.google.protobuf.MapField interna
     public int getLabelsCount() {
       return internalGetLabels().getMap().size();
     }
+
     /**
      *
      *
@@ -1618,12 +1666,14 @@ public boolean containsLabels(java.lang.String key) {
       }
       return internalGetLabels().getMap().containsKey(key);
     }
+
     /** Use {@link #getLabelsMap()} instead. */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map getLabels() {
       return getLabelsMap();
     }
+
     /**
      *
      *
@@ -1638,6 +1688,7 @@ public java.util.Map getLabels() {
     public java.util.Map getLabelsMap() {
       return internalGetLabels().getMap();
     }
+
     /**
      *
      *
@@ -1659,6 +1710,7 @@ public java.util.Map getLabelsMap() {
       java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
+
     /**
      *
      *
@@ -1686,6 +1738,7 @@ public Builder clearLabels() {
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
+
     /**
      *
      *
@@ -1703,12 +1756,14 @@ public Builder removeLabels(java.lang.String key) {
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
     }
+
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
       bitField0_ |= 0x00000008;
       return internalGetMutableLabels().getMutableMap();
     }
+
     /**
      *
      *
@@ -1730,6 +1785,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       bitField0_ |= 0x00000008;
       return this;
     }
+
     /**
      *
      *
@@ -1747,6 +1803,7 @@ public Builder putAllLabels(java.util.Map va
     }
 
     private int state_ = 0;
+
     /**
      *
      *
@@ -1762,6 +1819,7 @@ public Builder putAllLabels(java.util.Map va
     public int getStateValue() {
       return state_;
     }
+
     /**
      *
      *
@@ -1780,6 +1838,7 @@ public Builder setStateValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1799,6 +1858,7 @@ public com.google.datastore.admin.v1.CommonMetadata.State getState() {
           ? com.google.datastore.admin.v1.CommonMetadata.State.UNRECOGNIZED
           : result;
     }
+
     /**
      *
      *
@@ -1820,6 +1880,7 @@ public Builder setState(com.google.datastore.admin.v1.CommonMetadata.State value
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 7532c1b7ab7d..29e4383cb71a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -36,6 +36,7 @@ public interface CommonMetadataOrBuilder
    * @return Whether the startTime field is set.
    */
   boolean hasStartTime();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface CommonMetadataOrBuilder
    * @return The startTime.
    */
   com.google.protobuf.Timestamp getStartTime();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface CommonMetadataOrBuilder
    * @return Whether the endTime field is set.
    */
   boolean hasEndTime();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface CommonMetadataOrBuilder
    * @return The endTime.
    */
   com.google.protobuf.Timestamp getEndTime();
+
   /**
    *
    *
@@ -107,6 +111,7 @@ public interface CommonMetadataOrBuilder
    * @return The enum numeric value on the wire for operationType.
    */
   int getOperationTypeValue();
+
   /**
    *
    *
@@ -132,6 +137,7 @@ public interface CommonMetadataOrBuilder
    * map<string, string> labels = 4;
    */
   int getLabelsCount();
+
   /**
    *
    *
@@ -143,9 +149,11 @@ public interface CommonMetadataOrBuilder
    * map<string, string> labels = 4;
    */
   boolean containsLabels(java.lang.String key);
+
   /** Use {@link #getLabelsMap()} instead. */
   @java.lang.Deprecated
   java.util.Map getLabels();
+
   /**
    *
    *
@@ -157,6 +165,7 @@ public interface CommonMetadataOrBuilder
    * map<string, string> labels = 4;
    */
   java.util.Map getLabelsMap();
+
   /**
    *
    *
@@ -172,6 +181,7 @@ java.lang.String getLabelsOrDefault(
       java.lang.String key,
       /* nullable */
       java.lang.String defaultValue);
+
   /**
    *
    *
@@ -196,6 +206,7 @@ java.lang.String getLabelsOrDefault(
    * @return The enum numeric value on the wire for state.
    */
   int getStateValue();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 8a418b846338..bff6b84a3d5b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -34,6 +34,7 @@ public final class CreateIndexRequest extends com.google.protobuf.GeneratedMessa
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.CreateIndexRequest)
     CreateIndexRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use CreateIndexRequest.newBuilder() to construct.
   private CreateIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -118,6 +121,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   public static final int INDEX_FIELD_NUMBER = 3;
   private com.google.datastore.admin.v1.Index index_;
+
   /**
    *
    *
@@ -134,6 +138,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public boolean hasIndex() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -150,6 +155,7 @@ public boolean hasIndex() {
   public com.google.datastore.admin.v1.Index getIndex() {
     return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_;
   }
+
   /**
    *
    *
@@ -338,6 +344,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -552,6 +559,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -574,6 +582,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -596,6 +605,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -617,6 +627,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -634,6 +645,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -663,6 +675,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
             com.google.datastore.admin.v1.Index.Builder,
             com.google.datastore.admin.v1.IndexOrBuilder>
         indexBuilder_;
+
     /**
      *
      *
@@ -678,6 +691,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     public boolean hasIndex() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -697,6 +711,7 @@ public com.google.datastore.admin.v1.Index getIndex() {
         return indexBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -720,6 +735,7 @@ public Builder setIndex(com.google.datastore.admin.v1.Index value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -740,6 +756,7 @@ public Builder setIndex(com.google.datastore.admin.v1.Index.Builder builderForVa
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -768,6 +785,7 @@ public Builder mergeIndex(com.google.datastore.admin.v1.Index value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -788,6 +806,7 @@ public Builder clearIndex() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -803,6 +822,7 @@ public com.google.datastore.admin.v1.Index.Builder getIndexBuilder() {
       onChanged();
       return getIndexFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -820,6 +840,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexOrBuilder() {
         return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index aafb81d48b4a..a3de2d745f86 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -36,6 +36,7 @@ public interface CreateIndexRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -62,6 +63,7 @@ public interface CreateIndexRequestOrBuilder
    * @return Whether the index field is set.
    */
   boolean hasIndex();
+
   /**
    *
    *
@@ -75,6 +77,7 @@ public interface CreateIndexRequestOrBuilder
    * @return The index.
    */
   com.google.datastore.admin.v1.Index getIndex();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index c97248e0ae94..cf104bfb7151 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -109,119 +109,134 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     java.lang.String[] descriptorData = {
-      "\n/google/datastore/admin/v1/datastore_ad"
+      "\n"
+          + "/google/datastore/admin/v1/datastore_ad"
           + "min.proto\022\031google.datastore.admin.v1\032\034go"
           + "ogle/api/annotations.proto\032\027google/api/c"
           + "lient.proto\032\037google/api/field_behavior.p"
-          + "roto\032%google/datastore/admin/v1/index.pr"
-          + "oto\032)google/datastore/admin/v1/migration"
-          + ".proto\032#google/longrunning/operations.pr"
-          + "oto\032\037google/protobuf/timestamp.proto\"\364\003\n"
-          + "\016CommonMetadata\022.\n\nstart_time\030\001 \001(\0132\032.go"
-          + "ogle.protobuf.Timestamp\022,\n\010end_time\030\002 \001("
-          + "\0132\032.google.protobuf.Timestamp\022@\n\016operati"
-          + "on_type\030\003 \001(\0162(.google.datastore.admin.v"
-          + "1.OperationType\022E\n\006labels\030\004 \003(\01325.google"
-          + ".datastore.admin.v1.CommonMetadata.Label"
-          + "sEntry\022>\n\005state\030\005 \001(\0162/.google.datastore"
-          + ".admin.v1.CommonMetadata.State\032-\n\013Labels"
-          + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\213\001"
-          + "\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\020\n\014INITIA"
-          + "LIZING\020\001\022\016\n\nPROCESSING\020\002\022\016\n\nCANCELLING\020\003"
-          + "\022\016\n\nFINALIZING\020\004\022\016\n\nSUCCESSFUL\020\005\022\n\n\006FAIL"
-          + "ED\020\006\022\r\n\tCANCELLED\020\007\":\n\010Progress\022\026\n\016work_"
-          + "completed\030\001 \001(\003\022\026\n\016work_estimated\030\002 \001(\003\""
-          + "\215\002\n\025ExportEntitiesRequest\022\027\n\nproject_id\030"
-          + "\001 \001(\tB\003\340A\002\022L\n\006labels\030\002 \003(\0132<.google.data"
-          + "store.admin.v1.ExportEntitiesRequest.Lab"
-          + "elsEntry\022>\n\rentity_filter\030\003 \001(\0132\'.google"
-          + ".datastore.admin.v1.EntityFilter\022\036\n\021outp"
-          + "ut_url_prefix\030\004 \001(\tB\003\340A\002\032-\n\013LabelsEntry\022"
-          + "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\205\002\n\025Impo"
-          + "rtEntitiesRequest\022\027\n\nproject_id\030\001 \001(\tB\003\340"
-          + "A\002\022L\n\006labels\030\002 \003(\0132<.google.datastore.ad"
-          + "min.v1.ImportEntitiesRequest.LabelsEntry"
-          + "\022\026\n\tinput_url\030\003 \001(\tB\003\340A\002\022>\n\rentity_filte"
-          + "r\030\004 \001(\0132\'.google.datastore.admin.v1.Enti"
-          + "tyFilter\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005"
-          + "value\030\002 \001(\t:\0028\001\",\n\026ExportEntitiesRespons"
-          + "e\022\022\n\noutput_url\030\001 \001(\t\"\253\002\n\026ExportEntities"
-          + "Metadata\0229\n\006common\030\001 \001(\0132).google.datast"
-          + "ore.admin.v1.CommonMetadata\022>\n\021progress_"
-          + "entities\030\002 \001(\0132#.google.datastore.admin."
-          + "v1.Progress\022;\n\016progress_bytes\030\003 \001(\0132#.go"
-          + "ogle.datastore.admin.v1.Progress\022>\n\renti"
-          + "ty_filter\030\004 \001(\0132\'.google.datastore.admin"
-          + ".v1.EntityFilter\022\031\n\021output_url_prefix\030\005 "
-          + "\001(\t\"\243\002\n\026ImportEntitiesMetadata\0229\n\006common"
-          + "\030\001 \001(\0132).google.datastore.admin.v1.Commo"
-          + "nMetadata\022>\n\021progress_entities\030\002 \001(\0132#.g"
-          + "oogle.datastore.admin.v1.Progress\022;\n\016pro"
-          + "gress_bytes\030\003 \001(\0132#.google.datastore.adm"
-          + "in.v1.Progress\022>\n\rentity_filter\030\004 \001(\0132\'."
-          + "google.datastore.admin.v1.EntityFilter\022\021"
-          + "\n\tinput_url\030\005 \001(\t\"4\n\014EntityFilter\022\r\n\005kin"
-          + "ds\030\001 \003(\t\022\025\n\rnamespace_ids\030\002 \003(\t\"Y\n\022Creat"
-          + "eIndexRequest\022\022\n\nproject_id\030\001 \001(\t\022/\n\005ind"
-          + "ex\030\003 \001(\0132 .google.datastore.admin.v1.Ind"
-          + "ex\":\n\022DeleteIndexRequest\022\022\n\nproject_id\030\001"
-          + " \001(\t\022\020\n\010index_id\030\003 \001(\t\"7\n\017GetIndexReques"
-          + "t\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010index_id\030\003 \001(\t\""
-          + "_\n\022ListIndexesRequest\022\022\n\nproject_id\030\001 \001("
-          + "\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\022\022\n\n"
-          + "page_token\030\005 \001(\t\"a\n\023ListIndexesResponse\022"
-          + "1\n\007indexes\030\001 \003(\0132 .google.datastore.admi"
-          + "n.v1.Index\022\027\n\017next_page_token\030\002 \001(\t\"\245\001\n\026"
-          + "IndexOperationMetadata\0229\n\006common\030\001 \001(\0132)"
-          + ".google.datastore.admin.v1.CommonMetadat"
-          + "a\022>\n\021progress_entities\030\002 \001(\0132#.google.da"
-          + "tastore.admin.v1.Progress\022\020\n\010index_id\030\003 "
-          + "\001(\t\"\253\001\n#DatastoreFirestoreMigrationMetad"
-          + "ata\022B\n\017migration_state\030\001 \001(\0162).google.da"
-          + "tastore.admin.v1.MigrationState\022@\n\016migra"
-          + "tion_step\030\002 \001(\0162(.google.datastore.admin"
-          + ".v1.MigrationStep*}\n\rOperationType\022\036\n\032OP"
-          + "ERATION_TYPE_UNSPECIFIED\020\000\022\023\n\017EXPORT_ENT"
-          + "ITIES\020\001\022\023\n\017IMPORT_ENTITIES\020\002\022\020\n\014CREATE_I"
-          + "NDEX\020\003\022\020\n\014DELETE_INDEX\020\0042\204\n\n\016DatastoreAd"
-          + "min\022\366\001\n\016ExportEntities\0220.google.datastor"
-          + "e.admin.v1.ExportEntitiesRequest\032\035.googl"
-          + "e.longrunning.Operation\"\222\001\312A0\n\026ExportEnt"
-          + "itiesResponse\022\026ExportEntitiesMetadata\332A1"
-          + "project_id,labels,entity_filter,output_u"
-          + "rl_prefix\202\323\344\223\002%\" /v1/projects/{project_i"
-          + "d}:export:\001*\022\355\001\n\016ImportEntities\0220.google"
-          + ".datastore.admin.v1.ImportEntitiesReques"
-          + "t\032\035.google.longrunning.Operation\"\211\001\312A/\n\025"
-          + "google.protobuf.Empty\022\026ImportEntitiesMet"
-          + "adata\332A)project_id,labels,input_url,enti"
-          + "ty_filter\202\323\344\223\002%\" /v1/projects/{project_i"
-          + "d}:import:\001*\022\257\001\n\013CreateIndex\022-.google.da"
-          + "tastore.admin.v1.CreateIndexRequest\032\035.go"
-          + "ogle.longrunning.Operation\"R\312A\037\n\005Index\022\026"
-          + "IndexOperationMetadata\202\323\344\223\002*\"!/v1/projec"
-          + "ts/{project_id}/indexes:\005index\022\263\001\n\013Delet"
-          + "eIndex\022-.google.datastore.admin.v1.Delet"
-          + "eIndexRequest\032\035.google.longrunning.Opera"
-          + "tion\"V\312A\037\n\005Index\022\026IndexOperationMetadata"
-          + "\202\323\344\223\002.*,/v1/projects/{project_id}/indexe"
-          + "s/{index_id}\022\216\001\n\010GetIndex\022*.google.datas"
-          + "tore.admin.v1.GetIndexRequest\032 .google.d"
+          + "roto\032%google/datastore/admin/v1/index.proto\032)google/datastore/admin/v1/migration"
+          + ".proto\032#google/longrunning/operations.proto\032\037google/protobuf/timestamp.proto\"\364\003\n"
+          + "\016CommonMetadata\022.\n\n"
+          + "start_time\030\001 \001(\0132\032.google.protobuf.Timestamp\022,\n"
+          + "\010end_time\030\002 \001(\0132\032.google.protobuf.Timestamp\022@\n"
+          + "\016operation_type\030\003 \001(\0162(.google.datastore.admin.v1.OperationType\022E\n"
+          + "\006labels\030\004 \003(\01325.google"
+          + ".datastore.admin.v1.CommonMetadata.LabelsEntry\022>\n"
+          + "\005state\030\005 \001(\0162/.google.datastore.admin.v1.CommonMetadata.State\032-\n"
+          + "\013LabelsEntry\022\013\n"
+          + "\003key\030\001 \001(\t\022\r\n"
+          + "\005value\030\002 \001(\t:\0028\001\"\213\001\n"
+          + "\005State\022\025\n"
+          + "\021STATE_UNSPECIFIED\020\000\022\020\n"
+          + "\014INITIALIZING\020\001\022\016\n\n"
+          + "PROCESSING\020\002\022\016\n\n"
+          + "CANCELLING\020\003\022\016\n\n"
+          + "FINALIZING\020\004\022\016\n\n"
+          + "SUCCESSFUL\020\005\022\n\n"
+          + "\006FAILED\020\006\022\r\n"
+          + "\tCANCELLED\020\007\":\n"
+          + "\010Progress\022\026\n"
+          + "\016work_completed\030\001 \001(\003\022\026\n"
+          + "\016work_estimated\030\002 \001(\003\"\215\002\n"
+          + "\025ExportEntitiesRequest\022\027\n\n"
+          + "project_id\030\001 \001(\tB\003\340A\002\022L\n"
+          + "\006labels\030\002 \003(\0132<.google.data"
+          + "store.admin.v1.ExportEntitiesRequest.LabelsEntry\022>\n\r"
+          + "entity_filter\030\003 \001(\0132\'.google.datastore.admin.v1.EntityFilter\022\036\n"
+          + "\021output_url_prefix\030\004 \001(\tB\003\340A\002\032-\n"
+          + "\013LabelsEntry\022\013\n"
+          + "\003key\030\001 \001(\t\022\r\n"
+          + "\005value\030\002 \001(\t:\0028\001\"\205\002\n"
+          + "\025ImportEntitiesRequest\022\027\n\n"
+          + "project_id\030\001 \001(\tB\003\340A\002\022L\n"
+          + "\006labels\030\002 \003(\0132<.google.datastore.ad"
+          + "min.v1.ImportEntitiesRequest.LabelsEntry\022\026\n"
+          + "\tinput_url\030\003 \001(\tB\003\340A\002\022>\n\r"
+          + "entity_filter\030\004 \001(\0132\'.google.datastore.admin.v1.EntityFilter\032-\n"
+          + "\013LabelsEntry\022\013\n"
+          + "\003key\030\001 \001(\t\022\r\n"
+          + "\005value\030\002 \001(\t:\0028\001\",\n"
+          + "\026ExportEntitiesResponse\022\022\n\n"
+          + "output_url\030\001 \001(\t\"\253\002\n"
+          + "\026ExportEntitiesMetadata\0229\n"
+          + "\006common\030\001 \001(\0132).google.datastore.admin.v1.CommonMetadata\022>\n"
+          + "\021progress_entities\030\002 \001(\0132#.google.datastore.admin.v1.Progress\022;\n"
+          + "\016progress_bytes\030\003 \001(\0132#.google.datastore.admin.v1.Progress\022>\n\r"
+          + "entity_filter\030\004 \001(\0132\'.google.datastore.admin.v1.EntityFilter\022\031\n"
+          + "\021output_url_prefix\030\005 \001(\t\"\243\002\n"
+          + "\026ImportEntitiesMetadata\0229\n"
+          + "\006common\030\001 \001(\0132).google.datastore.admin.v1.CommonMetadata\022>\n"
+          + "\021progress_entities\030\002 \001(\0132#.google.datastore.admin.v1.Progress\022;\n"
+          + "\016progress_bytes\030\003 \001(\0132#.google.datastore.admin.v1.Progress\022>\n\r"
+          + "entity_filter\030\004 \001(\0132\'.google.datastore.admin.v1.EntityFilter\022\021\n"
+          + "\tinput_url\030\005 \001(\t\"4\n"
+          + "\014EntityFilter\022\r\n"
+          + "\005kinds\030\001 \003(\t\022\025\n\r"
+          + "namespace_ids\030\002 \003(\t\"Y\n"
+          + "\022CreateIndexRequest\022\022\n\n"
+          + "project_id\030\001 \001(\t\022/\n"
+          + "\005index\030\003 \001(\0132 .google.datastore.admin.v1.Index\":\n"
+          + "\022DeleteIndexRequest\022\022\n\n"
+          + "project_id\030\001 \001(\t\022\020\n"
+          + "\010index_id\030\003 \001(\t\"7\n"
+          + "\017GetIndexRequest\022\022\n\n"
+          + "project_id\030\001 \001(\t\022\020\n"
+          + "\010index_id\030\003 \001(\t\"_\n"
+          + "\022ListIndexesRequest\022\022\n\n"
+          + "project_id\030\001 \001(\t\022\016\n"
+          + "\006filter\030\003 \001(\t\022\021\n"
+          + "\tpage_size\030\004 \001(\005\022\022\n\n"
+          + "page_token\030\005 \001(\t\"a\n"
+          + "\023ListIndexesResponse\0221\n"
+          + "\007indexes\030\001 \003(\0132 .google.datastore.admin.v1.Index\022\027\n"
+          + "\017next_page_token\030\002 \001(\t\"\245\001\n"
+          + "\026IndexOperationMetadata\0229\n"
+          + "\006common\030\001 \001(\0132).google.datastore.admin.v1.CommonMetadata\022>\n"
+          + "\021progress_entities\030\002 \001(\0132#.google.datastore.admin.v1.Progress\022\020\n"
+          + "\010index_id\030\003 \001(\t\"\253\001\n"
+          + "#DatastoreFirestoreMigrationMetadata\022B\n"
+          + "\017migration_state\030\001"
+          + " \001(\0162).google.datastore.admin.v1.MigrationState\022@\n"
+          + "\016migration_step\030\002 \001(\0162(.google.datastore.admin.v1.MigrationStep*}\n\r"
+          + "OperationType\022\036\n"
+          + "\032OPERATION_TYPE_UNSPECIFIED\020\000\022\023\n"
+          + "\017EXPORT_ENTITIES\020\001\022\023\n"
+          + "\017IMPORT_ENTITIES\020\002\022\020\n"
+          + "\014CREATE_INDEX\020\003\022\020\n"
+          + "\014DELETE_INDEX\020\0042\204\n\n"
+          + "\016DatastoreAdmin\022\366\001\n"
+          + "\016ExportEntities\0220.google.datastor"
+          + "e.admin.v1.ExportEntitiesRequest\032\035.google.longrunning.Operation\"\222\001\312A0\n"
+          + "\026ExportEntitiesResponse\022\026ExportEntitiesMetadata\332A1"
+          + "project_id,labels,entity_filter,output_url_prefix\202\323\344\223\002%\""
+          + " /v1/projects/{project_id}:export:\001*\022\355\001\n"
+          + "\016ImportEntities\0220.google"
+          + ".datastore.admin.v1.ImportEntitiesRequest\032\035.google.longrunning.Operation\"\211\001\312A/\n"
+          + "\025google.protobuf.Empty\022\026ImportEntitiesMet"
+          + "adata\332A)project_id,labels,input_url,entity_filter\202\323\344\223\002%\""
+          + " /v1/projects/{project_id}:import:\001*\022\257\001\n"
+          + "\013CreateIndex\022-.google.da"
+          + "tastore.admin.v1.CreateIndexRequest\032\035.google.longrunning.Operation\"R\312A\037\n"
+          + "\005Index\022\026"
+          + "IndexOperationMetadata\202\323\344\223\002*\"!/v1/projects/{project_id}/indexes:\005index\022\263\001\n"
+          + "\013DeleteIndex\022-.google.datastore.admin.v1.Delet"
+          + "eIndexRequest\032\035.google.longrunning.Operation\"V\312A\037\n"
+          + "\005Index\022\026IndexOperationMetadata"
+          + "\202\323\344\223\002.*,/v1/projects/{project_id}/indexes/{index_id}\022\216\001\n"
+          + "\010GetIndex\022*.google.datastore.admin.v1.GetIndexRequest\032 .google.d"
           + "atastore.admin.v1.Index\"4\202\323\344\223\002.\022,/v1/pro"
-          + "jects/{project_id}/indexes/{index_id}\022\227\001"
-          + "\n\013ListIndexes\022-.google.datastore.admin.v"
+          + "jects/{project_id}/indexes/{index_id}\022\227\001\n"
+          + "\013ListIndexes\022-.google.datastore.admin.v"
           + "1.ListIndexesRequest\032..google.datastore."
           + "admin.v1.ListIndexesResponse\")\202\323\344\223\002#\022!/v"
           + "1/projects/{project_id}/indexes\032v\312A\030data"
           + "store.googleapis.com\322AXhttps://www.googl"
-          + "eapis.com/auth/cloud-platform,https://ww"
-          + "w.googleapis.com/auth/datastoreB\333\001\n\035com."
-          + "google.datastore.admin.v1B\023DatastoreAdmi"
+          + "eapis.com/auth/cloud-platform,https://www.googleapis.com/auth/datastoreB\333\001\n"
+          + "\035com.google.datastore.admin.v1B\023DatastoreAdmi"
           + "nProtoP\001Z9cloud.google.com/go/datastore/"
           + "admin/apiv1/adminpb;adminpb\252\002\037Google.Clo"
           + "ud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Dat"
-          + "astore\\Admin\\V1\352\002#Google::Cloud::Datasto"
-          + "re::Admin::V1b\006proto3"
+          + "astore\\Admin\\V1\352\002#Google::Cloud::Datastore::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/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index ef2be326bfe9..fe3a7cf43e92 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -41,6 +41,7 @@ public final class DatastoreFirestoreMigrationMetadata
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata)
     DatastoreFirestoreMigrationMetadataOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use DatastoreFirestoreMigrationMetadata.newBuilder() to construct.
   private DatastoreFirestoreMigrationMetadata(
       com.google.protobuf.GeneratedMessageV3.Builder builder) {
@@ -75,6 +76,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   public static final int MIGRATION_STATE_FIELD_NUMBER = 1;
   private int migrationState_ = 0;
+
   /**
    *
    *
@@ -91,6 +93,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public int getMigrationStateValue() {
     return migrationState_;
   }
+
   /**
    *
    *
@@ -112,6 +115,7 @@ public com.google.datastore.admin.v1.MigrationState getMigrationState() {
 
   public static final int MIGRATION_STEP_FIELD_NUMBER = 2;
   private int migrationStep_ = 0;
+
   /**
    *
    *
@@ -128,6 +132,7 @@ public com.google.datastore.admin.v1.MigrationState getMigrationState() {
   public int getMigrationStepValue() {
     return migrationStep_;
   }
+
   /**
    *
    *
@@ -321,6 +326,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -528,6 +534,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private int migrationState_ = 0;
+
     /**
      *
      *
@@ -544,6 +551,7 @@ public Builder mergeFrom(
     public int getMigrationStateValue() {
       return migrationState_;
     }
+
     /**
      *
      *
@@ -563,6 +571,7 @@ public Builder setMigrationStateValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -581,6 +590,7 @@ public com.google.datastore.admin.v1.MigrationState getMigrationState() {
           com.google.datastore.admin.v1.MigrationState.forNumber(migrationState_);
       return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -603,6 +613,7 @@ public Builder setMigrationState(com.google.datastore.admin.v1.MigrationState va
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -623,6 +634,7 @@ public Builder clearMigrationState() {
     }
 
     private int migrationStep_ = 0;
+
     /**
      *
      *
@@ -639,6 +651,7 @@ public Builder clearMigrationState() {
     public int getMigrationStepValue() {
       return migrationStep_;
     }
+
     /**
      *
      *
@@ -658,6 +671,7 @@ public Builder setMigrationStepValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -676,6 +690,7 @@ public com.google.datastore.admin.v1.MigrationStep getMigrationStep() {
           com.google.datastore.admin.v1.MigrationStep.forNumber(migrationStep_);
       return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -698,6 +713,7 @@ public Builder setMigrationStep(com.google.datastore.admin.v1.MigrationStep valu
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index e73f8c7378ab..dd1e0884d4ff 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -37,6 +37,7 @@ public interface DatastoreFirestoreMigrationMetadataOrBuilder
    * @return The enum numeric value on the wire for migrationState.
    */
   int getMigrationStateValue();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface DatastoreFirestoreMigrationMetadataOrBuilder
    * @return The enum numeric value on the wire for migrationStep.
    */
   int getMigrationStepValue();
+
   /**
    *
    *
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 828c5c1fb959..e2e7ae6de729 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
@@ -34,6 +34,7 @@ public final class DeleteIndexRequest extends com.google.protobuf.GeneratedMessa
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.DeleteIndexRequest)
     DeleteIndexRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use DeleteIndexRequest.newBuilder() to construct.
   private DeleteIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -120,6 +123,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object indexId_ = "";
+
   /**
    *
    *
@@ -143,6 +147,7 @@ public java.lang.String getIndexId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -335,6 +340,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -535,6 +541,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -557,6 +564,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -579,6 +587,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -600,6 +609,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -617,6 +627,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -641,6 +652,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object indexId_ = "";
+
     /**
      *
      *
@@ -663,6 +675,7 @@ public java.lang.String getIndexId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -685,6 +698,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -706,6 +720,7 @@ public Builder setIndexId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -723,6 +738,7 @@ public Builder clearIndexId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index 9a93b66f28c7..860bbcc27860 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -36,6 +36,7 @@ public interface DeleteIndexRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -61,6 +62,7 @@ public interface DeleteIndexRequestOrBuilder
    * @return The indexId.
    */
   java.lang.String getIndexId();
+
   /**
    *
    *
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 5cbe9bb4d642..35db5e1f2a13 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
@@ -51,6 +51,7 @@ public final class EntityFilter extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.EntityFilter)
     EntityFilterOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use EntityFilter.newBuilder() to construct.
   private EntityFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -87,6 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringArrayList kinds_ =
       com.google.protobuf.LazyStringArrayList.emptyList();
+
   /**
    *
    *
@@ -101,6 +103,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public com.google.protobuf.ProtocolStringList getKindsList() {
     return kinds_;
   }
+
   /**
    *
    *
@@ -115,6 +118,7 @@ public com.google.protobuf.ProtocolStringList getKindsList() {
   public int getKindsCount() {
     return kinds_.size();
   }
+
   /**
    *
    *
@@ -130,6 +134,7 @@ public int getKindsCount() {
   public java.lang.String getKinds(int index) {
     return kinds_.get(index);
   }
+
   /**
    *
    *
@@ -151,6 +156,7 @@ public com.google.protobuf.ByteString getKindsBytes(int index) {
   @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringArrayList namespaceIds_ =
       com.google.protobuf.LazyStringArrayList.emptyList();
+
   /**
    *
    *
@@ -171,6 +177,7 @@ public com.google.protobuf.ByteString getKindsBytes(int index) {
   public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
     return namespaceIds_;
   }
+
   /**
    *
    *
@@ -191,6 +198,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
   public int getNamespaceIdsCount() {
     return namespaceIds_.size();
   }
+
   /**
    *
    *
@@ -212,6 +220,7 @@ public int getNamespaceIdsCount() {
   public java.lang.String getNamespaceIds(int index) {
     return namespaceIds_.get(index);
   }
+
   /**
    *
    *
@@ -416,6 +425,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -654,6 +664,7 @@ private void ensureKindsIsMutable() {
       }
       bitField0_ |= 0x00000001;
     }
+
     /**
      *
      *
@@ -669,6 +680,7 @@ public com.google.protobuf.ProtocolStringList getKindsList() {
       kinds_.makeImmutable();
       return kinds_;
     }
+
     /**
      *
      *
@@ -683,6 +695,7 @@ public com.google.protobuf.ProtocolStringList getKindsList() {
     public int getKindsCount() {
       return kinds_.size();
     }
+
     /**
      *
      *
@@ -698,6 +711,7 @@ public int getKindsCount() {
     public java.lang.String getKinds(int index) {
       return kinds_.get(index);
     }
+
     /**
      *
      *
@@ -713,6 +727,7 @@ public java.lang.String getKinds(int index) {
     public com.google.protobuf.ByteString getKindsBytes(int index) {
       return kinds_.getByteString(index);
     }
+
     /**
      *
      *
@@ -736,6 +751,7 @@ public Builder setKinds(int index, java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -758,6 +774,7 @@ public Builder addKinds(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -777,6 +794,7 @@ public Builder addAllKinds(java.lang.Iterable values) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -795,6 +813,7 @@ public Builder clearKinds() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -828,6 +847,7 @@ private void ensureNamespaceIdsIsMutable() {
       }
       bitField0_ |= 0x00000002;
     }
+
     /**
      *
      *
@@ -849,6 +869,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
       namespaceIds_.makeImmutable();
       return namespaceIds_;
     }
+
     /**
      *
      *
@@ -869,6 +890,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
     public int getNamespaceIdsCount() {
       return namespaceIds_.size();
     }
+
     /**
      *
      *
@@ -890,6 +912,7 @@ public int getNamespaceIdsCount() {
     public java.lang.String getNamespaceIds(int index) {
       return namespaceIds_.get(index);
     }
+
     /**
      *
      *
@@ -911,6 +934,7 @@ public java.lang.String getNamespaceIds(int index) {
     public com.google.protobuf.ByteString getNamespaceIdsBytes(int index) {
       return namespaceIds_.getByteString(index);
     }
+
     /**
      *
      *
@@ -940,6 +964,7 @@ public Builder setNamespaceIds(int index, java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -968,6 +993,7 @@ public Builder addNamespaceIds(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -993,6 +1019,7 @@ public Builder addAllNamespaceIds(java.lang.Iterable values) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1017,6 +1044,7 @@ public Builder clearNamespaceIds() {
       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 d5e1a058fbc4..381e1e38d6ee 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
@@ -36,6 +36,7 @@ public interface EntityFilterOrBuilder
    * @return A list containing the kinds.
    */
   java.util.List getKindsList();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface EntityFilterOrBuilder
    * @return The count of kinds.
    */
   int getKindsCount();
+
   /**
    *
    *
@@ -61,6 +63,7 @@ public interface EntityFilterOrBuilder
    * @return The kinds at the given index.
    */
   java.lang.String getKinds(int index);
+
   /**
    *
    *
@@ -93,6 +96,7 @@ public interface EntityFilterOrBuilder
    * @return A list containing the namespaceIds.
    */
   java.util.List getNamespaceIdsList();
+
   /**
    *
    *
@@ -111,6 +115,7 @@ public interface EntityFilterOrBuilder
    * @return The count of namespaceIds.
    */
   int getNamespaceIdsCount();
+
   /**
    *
    *
@@ -130,6 +135,7 @@ public interface EntityFilterOrBuilder
    * @return The namespaceIds at the given index.
    */
   java.lang.String getNamespaceIds(int index);
+
   /**
    *
    *
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 6acc9b76f9d0..946dd9d6b3a8 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
@@ -33,6 +33,7 @@ public final class ExportEntitiesMetadata extends com.google.protobuf.GeneratedM
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesMetadata)
     ExportEntitiesMetadataOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ExportEntitiesMetadata.newBuilder() to construct.
   private ExportEntitiesMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.datastore.admin.v1.CommonMetadata common_;
+
   /**
    *
    *
@@ -81,6 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasCommon() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -98,6 +101,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
         ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
         : common_;
   }
+
   /**
    *
    *
@@ -116,6 +120,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
 
   public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
   private com.google.datastore.admin.v1.Progress progressEntities_;
+
   /**
    *
    *
@@ -131,6 +136,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
   public boolean hasProgressEntities() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -148,6 +154,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
         ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
         : progressEntities_;
   }
+
   /**
    *
    *
@@ -166,6 +173,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
 
   public static final int PROGRESS_BYTES_FIELD_NUMBER = 3;
   private com.google.datastore.admin.v1.Progress progressBytes_;
+
   /**
    *
    *
@@ -181,6 +189,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
   public boolean hasProgressBytes() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -198,6 +207,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() {
         ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
         : progressBytes_;
   }
+
   /**
    *
    *
@@ -216,6 +226,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
 
   public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
   private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+
   /**
    *
    *
@@ -231,6 +242,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
   public boolean hasEntityFilter() {
     return ((bitField0_ & 0x00000008) != 0);
   }
+
   /**
    *
    *
@@ -248,6 +260,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
         : entityFilter_;
   }
+
   /**
    *
    *
@@ -268,6 +281,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object outputUrlPrefix_ = "";
+
   /**
    *
    *
@@ -295,6 +309,7 @@ public java.lang.String getOutputUrlPrefix() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -538,6 +553,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -817,6 +833,7 @@ public Builder mergeFrom(
             com.google.datastore.admin.v1.CommonMetadata.Builder,
             com.google.datastore.admin.v1.CommonMetadataOrBuilder>
         commonBuilder_;
+
     /**
      *
      *
@@ -831,6 +848,7 @@ public Builder mergeFrom(
     public boolean hasCommon() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -851,6 +869,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
         return commonBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -873,6 +892,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -892,6 +912,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -919,6 +940,7 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -938,6 +960,7 @@ public Builder clearCommon() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -952,6 +975,7 @@ public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -970,6 +994,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
             : common_;
       }
     }
+
     /**
      *
      *
@@ -1002,6 +1027,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
             com.google.datastore.admin.v1.Progress.Builder,
             com.google.datastore.admin.v1.ProgressOrBuilder>
         progressEntitiesBuilder_;
+
     /**
      *
      *
@@ -1016,6 +1042,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
     public boolean hasProgressEntities() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -1036,6 +1063,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
         return progressEntitiesBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1058,6 +1086,7 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1078,6 +1107,7 @@ public Builder setProgressEntities(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1105,6 +1135,7 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1124,6 +1155,7 @@ public Builder clearProgressEntities() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1138,6 +1170,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder
       onChanged();
       return getProgressEntitiesFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1156,6 +1189,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
             : progressEntities_;
       }
     }
+
     /**
      *
      *
@@ -1188,6 +1222,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
             com.google.datastore.admin.v1.Progress.Builder,
             com.google.datastore.admin.v1.ProgressOrBuilder>
         progressBytesBuilder_;
+
     /**
      *
      *
@@ -1202,6 +1237,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
     public boolean hasProgressBytes() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1222,6 +1258,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() {
         return progressBytesBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1244,6 +1281,7 @@ public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1264,6 +1302,7 @@ public Builder setProgressBytes(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1291,6 +1330,7 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1310,6 +1350,7 @@ public Builder clearProgressBytes() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1324,6 +1365,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder()
       onChanged();
       return getProgressBytesFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1342,6 +1384,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
             : progressBytes_;
       }
     }
+
     /**
      *
      *
@@ -1374,6 +1417,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
             com.google.datastore.admin.v1.EntityFilter.Builder,
             com.google.datastore.admin.v1.EntityFilterOrBuilder>
         entityFilterBuilder_;
+
     /**
      *
      *
@@ -1388,6 +1432,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
     public boolean hasEntityFilter() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1408,6 +1453,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         return entityFilterBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1430,6 +1476,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1450,6 +1497,7 @@ public Builder setEntityFilter(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1477,6 +1525,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1496,6 +1545,7 @@ public Builder clearEntityFilter() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1510,6 +1560,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1528,6 +1579,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
             : entityFilter_;
       }
     }
+
     /**
      *
      *
@@ -1555,6 +1607,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
     }
 
     private java.lang.Object outputUrlPrefix_ = "";
+
     /**
      *
      *
@@ -1581,6 +1634,7 @@ public java.lang.String getOutputUrlPrefix() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1607,6 +1661,7 @@ public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1632,6 +1687,7 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1653,6 +1709,7 @@ public Builder clearOutputUrlPrefix() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index 908f325003e9..d6e626eea8b8 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -36,6 +36,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return Whether the common field is set.
    */
   boolean hasCommon();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return The common.
    */
   com.google.datastore.admin.v1.CommonMetadata getCommon();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return Whether the progressEntities field is set.
    */
   boolean hasProgressEntities();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return The progressEntities.
    */
   com.google.datastore.admin.v1.Progress getProgressEntities();
+
   /**
    *
    *
@@ -106,6 +110,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return Whether the progressBytes field is set.
    */
   boolean hasProgressBytes();
+
   /**
    *
    *
@@ -118,6 +123,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return The progressBytes.
    */
   com.google.datastore.admin.v1.Progress getProgressBytes();
+
   /**
    *
    *
@@ -141,6 +147,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return Whether the entityFilter field is set.
    */
   boolean hasEntityFilter();
+
   /**
    *
    *
@@ -153,6 +160,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return The entityFilter.
    */
   com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+
   /**
    *
    *
@@ -180,6 +188,7 @@ public interface ExportEntitiesMetadataOrBuilder
    * @return The outputUrlPrefix.
    */
   java.lang.String getOutputUrlPrefix();
+
   /**
    *
    *
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 e953f46217da..ae104717730d 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
@@ -34,6 +34,7 @@ public final class ExportEntitiesRequest extends com.google.protobuf.GeneratedMe
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesRequest)
     ExportEntitiesRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ExportEntitiesRequest.newBuilder() to construct.
   private ExportEntitiesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -82,6 +83,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -105,6 +107,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -155,6 +158,7 @@ private com.google.protobuf.MapField interna
   public int getLabelsCount() {
     return internalGetLabels().getMap().size();
   }
+
   /**
    *
    *
@@ -171,12 +175,14 @@ public boolean containsLabels(java.lang.String key) {
     }
     return internalGetLabels().getMap().containsKey(key);
   }
+
   /** Use {@link #getLabelsMap()} instead. */
   @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map getLabels() {
     return getLabelsMap();
   }
+
   /**
    *
    *
@@ -190,6 +196,7 @@ public java.util.Map getLabels() {
   public java.util.Map getLabelsMap() {
     return internalGetLabels().getMap();
   }
+
   /**
    *
    *
@@ -210,6 +217,7 @@ public java.util.Map getLabelsMap() {
     java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
+
   /**
    *
    *
@@ -233,6 +241,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
 
   public static final int ENTITY_FILTER_FIELD_NUMBER = 3;
   private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+
   /**
    *
    *
@@ -248,6 +257,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
   public boolean hasEntityFilter() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -265,6 +275,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
         : entityFilter_;
   }
+
   /**
    *
    *
@@ -285,6 +296,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object outputUrlPrefix_ = "";
+
   /**
    *
    *
@@ -325,6 +337,7 @@ public java.lang.String getOutputUrlPrefix() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -565,6 +578,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -836,6 +850,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -858,6 +873,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -880,6 +896,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -901,6 +918,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -918,6 +936,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -966,6 +985,7 @@ private com.google.protobuf.MapField interna
     public int getLabelsCount() {
       return internalGetLabels().getMap().size();
     }
+
     /**
      *
      *
@@ -982,12 +1002,14 @@ public boolean containsLabels(java.lang.String key) {
       }
       return internalGetLabels().getMap().containsKey(key);
     }
+
     /** Use {@link #getLabelsMap()} instead. */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map getLabels() {
       return getLabelsMap();
     }
+
     /**
      *
      *
@@ -1001,6 +1023,7 @@ public java.util.Map getLabels() {
     public java.util.Map getLabelsMap() {
       return internalGetLabels().getMap();
     }
+
     /**
      *
      *
@@ -1021,6 +1044,7 @@ public java.util.Map getLabelsMap() {
       java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
+
     /**
      *
      *
@@ -1047,6 +1071,7 @@ public Builder clearLabels() {
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
+
     /**
      *
      *
@@ -1063,12 +1088,14 @@ public Builder removeLabels(java.lang.String key) {
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
     }
+
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
       bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
+
     /**
      *
      *
@@ -1089,6 +1116,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       bitField0_ |= 0x00000002;
       return this;
     }
+
     /**
      *
      *
@@ -1110,6 +1138,7 @@ public Builder putAllLabels(java.util.Map va
             com.google.datastore.admin.v1.EntityFilter.Builder,
             com.google.datastore.admin.v1.EntityFilterOrBuilder>
         entityFilterBuilder_;
+
     /**
      *
      *
@@ -1124,6 +1153,7 @@ public Builder putAllLabels(java.util.Map va
     public boolean hasEntityFilter() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1144,6 +1174,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         return entityFilterBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1166,6 +1197,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1186,6 +1218,7 @@ public Builder setEntityFilter(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1213,6 +1246,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1232,6 +1266,7 @@ public Builder clearEntityFilter() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1246,6 +1281,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1264,6 +1300,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
             : entityFilter_;
       }
     }
+
     /**
      *
      *
@@ -1291,6 +1328,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
     }
 
     private java.lang.Object outputUrlPrefix_ = "";
+
     /**
      *
      *
@@ -1330,6 +1368,7 @@ public java.lang.String getOutputUrlPrefix() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1369,6 +1408,7 @@ public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1407,6 +1447,7 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1441,6 +1482,7 @@ public Builder clearOutputUrlPrefix() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 e0b0c0bcb61d..0b9dae2e69a8 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
@@ -36,6 +36,7 @@ public interface ExportEntitiesRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -59,6 +60,7 @@ public interface ExportEntitiesRequestOrBuilder
    * map<string, string> labels = 2;
    */
   int getLabelsCount();
+
   /**
    *
    *
@@ -69,9 +71,11 @@ public interface ExportEntitiesRequestOrBuilder
    * map<string, string> labels = 2;
    */
   boolean containsLabels(java.lang.String key);
+
   /** Use {@link #getLabelsMap()} instead. */
   @java.lang.Deprecated
   java.util.Map getLabels();
+
   /**
    *
    *
@@ -82,6 +86,7 @@ public interface ExportEntitiesRequestOrBuilder
    * map<string, string> labels = 2;
    */
   java.util.Map getLabelsMap();
+
   /**
    *
    *
@@ -96,6 +101,7 @@ java.lang.String getLabelsOrDefault(
       java.lang.String key,
       /* nullable */
       java.lang.String defaultValue);
+
   /**
    *
    *
@@ -119,6 +125,7 @@ java.lang.String getLabelsOrDefault(
    * @return Whether the entityFilter field is set.
    */
   boolean hasEntityFilter();
+
   /**
    *
    *
@@ -131,6 +138,7 @@ java.lang.String getLabelsOrDefault(
    * @return The entityFilter.
    */
   com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+
   /**
    *
    *
@@ -171,6 +179,7 @@ java.lang.String getLabelsOrDefault(
    * @return The outputUrlPrefix.
    */
   java.lang.String getOutputUrlPrefix();
+
   /**
    *
    *
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 4bddab90fc5a..8916b5572c9e 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
@@ -34,6 +34,7 @@ public final class ExportEntitiesResponse extends com.google.protobuf.GeneratedM
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesResponse)
     ExportEntitiesResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ExportEntitiesResponse.newBuilder() to construct.
   private ExportEntitiesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -68,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object outputUrl_ = "";
+
   /**
    *
    *
@@ -94,6 +96,7 @@ public java.lang.String getOutputUrl() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -280,6 +283,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -465,6 +469,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object outputUrl_ = "";
+
     /**
      *
      *
@@ -490,6 +495,7 @@ public java.lang.String getOutputUrl() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -515,6 +521,7 @@ public com.google.protobuf.ByteString getOutputUrlBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -539,6 +546,7 @@ public Builder setOutputUrl(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -559,6 +567,7 @@ public Builder clearOutputUrl() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index 8b85687745e3..9d515855d61e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -39,6 +39,7 @@ public interface ExportEntitiesResponseOrBuilder
    * @return The outputUrl.
    */
   java.lang.String getOutputUrl();
+
   /**
    *
    *
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 cbacd2260458..4d7406fd1d51 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
@@ -34,6 +34,7 @@ public final class GetIndexRequest extends com.google.protobuf.GeneratedMessageV
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.GetIndexRequest)
     GetIndexRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use GetIndexRequest.newBuilder() to construct.
   private GetIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -120,6 +123,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object indexId_ = "";
+
   /**
    *
    *
@@ -143,6 +147,7 @@ public java.lang.String getIndexId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -335,6 +340,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -534,6 +540,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -556,6 +563,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -578,6 +586,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -599,6 +608,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -616,6 +626,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -640,6 +651,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object indexId_ = "";
+
     /**
      *
      *
@@ -662,6 +674,7 @@ public java.lang.String getIndexId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -684,6 +697,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -705,6 +719,7 @@ public Builder setIndexId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -722,6 +737,7 @@ public Builder clearIndexId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index d1d781b7d197..2b49cfd613a2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -36,6 +36,7 @@ public interface GetIndexRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -61,6 +62,7 @@ public interface GetIndexRequestOrBuilder
    * @return The indexId.
    */
   java.lang.String getIndexId();
+
   /**
    *
    *
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 5fea7cf9846c..da2ab3e7309d 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
@@ -33,6 +33,7 @@ public final class ImportEntitiesMetadata extends com.google.protobuf.GeneratedM
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ImportEntitiesMetadata)
     ImportEntitiesMetadataOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ImportEntitiesMetadata.newBuilder() to construct.
   private ImportEntitiesMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.datastore.admin.v1.CommonMetadata common_;
+
   /**
    *
    *
@@ -81,6 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasCommon() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -98,6 +101,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
         ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
         : common_;
   }
+
   /**
    *
    *
@@ -116,6 +120,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
 
   public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
   private com.google.datastore.admin.v1.Progress progressEntities_;
+
   /**
    *
    *
@@ -131,6 +136,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
   public boolean hasProgressEntities() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -148,6 +154,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
         ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
         : progressEntities_;
   }
+
   /**
    *
    *
@@ -166,6 +173,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
 
   public static final int PROGRESS_BYTES_FIELD_NUMBER = 3;
   private com.google.datastore.admin.v1.Progress progressBytes_;
+
   /**
    *
    *
@@ -181,6 +189,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
   public boolean hasProgressBytes() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -198,6 +207,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() {
         ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
         : progressBytes_;
   }
+
   /**
    *
    *
@@ -216,6 +226,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
 
   public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
   private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+
   /**
    *
    *
@@ -231,6 +242,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
   public boolean hasEntityFilter() {
     return ((bitField0_ & 0x00000008) != 0);
   }
+
   /**
    *
    *
@@ -248,6 +260,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
         : entityFilter_;
   }
+
   /**
    *
    *
@@ -268,6 +281,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object inputUrl_ = "";
+
   /**
    *
    *
@@ -294,6 +308,7 @@ public java.lang.String getInputUrl() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -536,6 +551,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -815,6 +831,7 @@ public Builder mergeFrom(
             com.google.datastore.admin.v1.CommonMetadata.Builder,
             com.google.datastore.admin.v1.CommonMetadataOrBuilder>
         commonBuilder_;
+
     /**
      *
      *
@@ -829,6 +846,7 @@ public Builder mergeFrom(
     public boolean hasCommon() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -849,6 +867,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
         return commonBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -871,6 +890,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -890,6 +910,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -917,6 +938,7 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -936,6 +958,7 @@ public Builder clearCommon() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -950,6 +973,7 @@ public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -968,6 +992,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
             : common_;
       }
     }
+
     /**
      *
      *
@@ -1000,6 +1025,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
             com.google.datastore.admin.v1.Progress.Builder,
             com.google.datastore.admin.v1.ProgressOrBuilder>
         progressEntitiesBuilder_;
+
     /**
      *
      *
@@ -1014,6 +1040,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
     public boolean hasProgressEntities() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -1034,6 +1061,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
         return progressEntitiesBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1056,6 +1084,7 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1076,6 +1105,7 @@ public Builder setProgressEntities(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1103,6 +1133,7 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1122,6 +1153,7 @@ public Builder clearProgressEntities() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1136,6 +1168,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder
       onChanged();
       return getProgressEntitiesFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1154,6 +1187,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
             : progressEntities_;
       }
     }
+
     /**
      *
      *
@@ -1186,6 +1220,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
             com.google.datastore.admin.v1.Progress.Builder,
             com.google.datastore.admin.v1.ProgressOrBuilder>
         progressBytesBuilder_;
+
     /**
      *
      *
@@ -1200,6 +1235,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
     public boolean hasProgressBytes() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1220,6 +1256,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() {
         return progressBytesBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1242,6 +1279,7 @@ public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1262,6 +1300,7 @@ public Builder setProgressBytes(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1289,6 +1328,7 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1308,6 +1348,7 @@ public Builder clearProgressBytes() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1322,6 +1363,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder()
       onChanged();
       return getProgressBytesFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1340,6 +1382,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
             : progressBytes_;
       }
     }
+
     /**
      *
      *
@@ -1372,6 +1415,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
             com.google.datastore.admin.v1.EntityFilter.Builder,
             com.google.datastore.admin.v1.EntityFilterOrBuilder>
         entityFilterBuilder_;
+
     /**
      *
      *
@@ -1386,6 +1430,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder
     public boolean hasEntityFilter() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1406,6 +1451,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         return entityFilterBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1428,6 +1474,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1448,6 +1495,7 @@ public Builder setEntityFilter(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1475,6 +1523,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1494,6 +1543,7 @@ public Builder clearEntityFilter() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1508,6 +1558,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1526,6 +1577,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
             : entityFilter_;
       }
     }
+
     /**
      *
      *
@@ -1553,6 +1605,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
     }
 
     private java.lang.Object inputUrl_ = "";
+
     /**
      *
      *
@@ -1578,6 +1631,7 @@ public java.lang.String getInputUrl() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1603,6 +1657,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1627,6 +1682,7 @@ public Builder setInputUrl(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1647,6 +1703,7 @@ public Builder clearInputUrl() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index ba30c430a98f..f814d500ea03 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -36,6 +36,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return Whether the common field is set.
    */
   boolean hasCommon();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return The common.
    */
   com.google.datastore.admin.v1.CommonMetadata getCommon();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return Whether the progressEntities field is set.
    */
   boolean hasProgressEntities();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return The progressEntities.
    */
   com.google.datastore.admin.v1.Progress getProgressEntities();
+
   /**
    *
    *
@@ -106,6 +110,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return Whether the progressBytes field is set.
    */
   boolean hasProgressBytes();
+
   /**
    *
    *
@@ -118,6 +123,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return The progressBytes.
    */
   com.google.datastore.admin.v1.Progress getProgressBytes();
+
   /**
    *
    *
@@ -141,6 +147,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return Whether the entityFilter field is set.
    */
   boolean hasEntityFilter();
+
   /**
    *
    *
@@ -153,6 +160,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return The entityFilter.
    */
   com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+
   /**
    *
    *
@@ -179,6 +187,7 @@ public interface ImportEntitiesMetadataOrBuilder
    * @return The inputUrl.
    */
   java.lang.String getInputUrl();
+
   /**
    *
    *
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 94e8192ce161..66d1fdb0b36b 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
@@ -34,6 +34,7 @@ public final class ImportEntitiesRequest extends com.google.protobuf.GeneratedMe
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ImportEntitiesRequest)
     ImportEntitiesRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ImportEntitiesRequest.newBuilder() to construct.
   private ImportEntitiesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -82,6 +83,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -105,6 +107,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -155,6 +158,7 @@ private com.google.protobuf.MapField interna
   public int getLabelsCount() {
     return internalGetLabels().getMap().size();
   }
+
   /**
    *
    *
@@ -171,12 +175,14 @@ public boolean containsLabels(java.lang.String key) {
     }
     return internalGetLabels().getMap().containsKey(key);
   }
+
   /** Use {@link #getLabelsMap()} instead. */
   @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map getLabels() {
     return getLabelsMap();
   }
+
   /**
    *
    *
@@ -190,6 +196,7 @@ public java.util.Map getLabels() {
   public java.util.Map getLabelsMap() {
     return internalGetLabels().getMap();
   }
+
   /**
    *
    *
@@ -210,6 +217,7 @@ public java.util.Map getLabelsMap() {
     java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
+
   /**
    *
    *
@@ -235,6 +243,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object inputUrl_ = "";
+
   /**
    *
    *
@@ -271,6 +280,7 @@ public java.lang.String getInputUrl() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -310,6 +320,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
 
   public static final int ENTITY_FILTER_FIELD_NUMBER = 4;
   private com.google.datastore.admin.v1.EntityFilter entityFilter_;
+
   /**
    *
    *
@@ -328,6 +339,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
   public boolean hasEntityFilter() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -348,6 +360,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance()
         : entityFilter_;
   }
+
   /**
    *
    *
@@ -566,6 +579,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -837,6 +851,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -859,6 +874,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -881,6 +897,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -902,6 +919,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -919,6 +937,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -967,6 +986,7 @@ private com.google.protobuf.MapField interna
     public int getLabelsCount() {
       return internalGetLabels().getMap().size();
     }
+
     /**
      *
      *
@@ -983,12 +1003,14 @@ public boolean containsLabels(java.lang.String key) {
       }
       return internalGetLabels().getMap().containsKey(key);
     }
+
     /** Use {@link #getLabelsMap()} instead. */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map getLabels() {
       return getLabelsMap();
     }
+
     /**
      *
      *
@@ -1002,6 +1024,7 @@ public java.util.Map getLabels() {
     public java.util.Map getLabelsMap() {
       return internalGetLabels().getMap();
     }
+
     /**
      *
      *
@@ -1022,6 +1045,7 @@ public java.util.Map getLabelsMap() {
       java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
+
     /**
      *
      *
@@ -1048,6 +1072,7 @@ public Builder clearLabels() {
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
+
     /**
      *
      *
@@ -1064,12 +1089,14 @@ public Builder removeLabels(java.lang.String key) {
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
     }
+
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
       bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
+
     /**
      *
      *
@@ -1090,6 +1117,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       bitField0_ |= 0x00000002;
       return this;
     }
+
     /**
      *
      *
@@ -1106,6 +1134,7 @@ public Builder putAllLabels(java.util.Map va
     }
 
     private java.lang.Object inputUrl_ = "";
+
     /**
      *
      *
@@ -1141,6 +1170,7 @@ public java.lang.String getInputUrl() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1176,6 +1206,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1210,6 +1241,7 @@ public Builder setInputUrl(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1240,6 +1272,7 @@ public Builder clearInputUrl() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1282,6 +1315,7 @@ public Builder setInputUrlBytes(com.google.protobuf.ByteString value) {
             com.google.datastore.admin.v1.EntityFilter.Builder,
             com.google.datastore.admin.v1.EntityFilterOrBuilder>
         entityFilterBuilder_;
+
     /**
      *
      *
@@ -1299,6 +1333,7 @@ public Builder setInputUrlBytes(com.google.protobuf.ByteString value) {
     public boolean hasEntityFilter() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1322,6 +1357,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() {
         return entityFilterBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1347,6 +1383,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1370,6 +1407,7 @@ public Builder setEntityFilter(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1400,6 +1438,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1422,6 +1461,7 @@ public Builder clearEntityFilter() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1439,6 +1479,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder
       onChanged();
       return getEntityFilterFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1460,6 +1501,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
             : entityFilter_;
       }
     }
+
     /**
      *
      *
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 e0d8abbe0cf3..6bde8cc3cc2f 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
@@ -36,6 +36,7 @@ public interface ImportEntitiesRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -59,6 +60,7 @@ public interface ImportEntitiesRequestOrBuilder
    * map<string, string> labels = 2;
    */
   int getLabelsCount();
+
   /**
    *
    *
@@ -69,9 +71,11 @@ public interface ImportEntitiesRequestOrBuilder
    * map<string, string> labels = 2;
    */
   boolean containsLabels(java.lang.String key);
+
   /** Use {@link #getLabelsMap()} instead. */
   @java.lang.Deprecated
   java.util.Map getLabels();
+
   /**
    *
    *
@@ -82,6 +86,7 @@ public interface ImportEntitiesRequestOrBuilder
    * map<string, string> labels = 2;
    */
   java.util.Map getLabelsMap();
+
   /**
    *
    *
@@ -96,6 +101,7 @@ java.lang.String getLabelsOrDefault(
       java.lang.String key,
       /* nullable */
       java.lang.String defaultValue);
+
   /**
    *
    *
@@ -132,6 +138,7 @@ java.lang.String getLabelsOrDefault(
    * @return The inputUrl.
    */
   java.lang.String getInputUrl();
+
   /**
    *
    *
@@ -173,6 +180,7 @@ java.lang.String getLabelsOrDefault(
    * @return Whether the entityFilter field is set.
    */
   boolean hasEntityFilter();
+
   /**
    *
    *
@@ -188,6 +196,7 @@ java.lang.String getLabelsOrDefault(
    * @return The entityFilter.
    */
   com.google.datastore.admin.v1.EntityFilter getEntityFilter();
+
   /**
    *
    *
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 20c0e9c40263..0f2721672d4f 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
@@ -33,6 +33,7 @@ public final class Index extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Index)
     IndexOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Index.newBuilder() to construct.
   private Index(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -122,6 +123,7 @@ public enum AncestorMode implements com.google.protobuf.ProtocolMessageEnum {
      * ANCESTOR_MODE_UNSPECIFIED = 0;
      */
     public static final int ANCESTOR_MODE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -132,6 +134,7 @@ public enum AncestorMode implements com.google.protobuf.ProtocolMessageEnum {
      * NONE = 1;
      */
     public static final int NONE_VALUE = 1;
+
     /**
      *
      *
@@ -281,6 +284,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      * DIRECTION_UNSPECIFIED = 0;
      */
     public static final int DIRECTION_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -292,6 +296,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      * ASCENDING = 1;
      */
     public static final int ASCENDING_VALUE = 1;
+
     /**
      *
      *
@@ -473,6 +478,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * STATE_UNSPECIFIED = 0;
      */
     public static final int STATE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -486,6 +492,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * CREATING = 1;
      */
     public static final int CREATING_VALUE = 1;
+
     /**
      *
      *
@@ -498,6 +505,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * READY = 2;
      */
     public static final int READY_VALUE = 2;
+
     /**
      *
      *
@@ -511,6 +519,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      * DELETING = 3;
      */
     public static final int DELETING_VALUE = 3;
+
     /**
      *
      *
@@ -631,6 +640,7 @@ public interface IndexedPropertyOrBuilder
      * @return The name.
      */
     java.lang.String getName();
+
     /**
      *
      *
@@ -659,6 +669,7 @@ public interface IndexedPropertyOrBuilder
      * @return The enum numeric value on the wire for direction.
      */
     int getDirectionValue();
+
     /**
      *
      *
@@ -675,6 +686,7 @@ public interface IndexedPropertyOrBuilder
      */
     com.google.datastore.admin.v1.Index.Direction getDirection();
   }
+
   /**
    *
    *
@@ -689,6 +701,7 @@ public static final class IndexedProperty extends com.google.protobuf.GeneratedM
       // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Index.IndexedProperty)
       IndexedPropertyOrBuilder {
     private static final long serialVersionUID = 0L;
+
     // Use IndexedProperty.newBuilder() to construct.
     private IndexedProperty(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
@@ -724,6 +737,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @SuppressWarnings("serial")
     private volatile java.lang.Object name_ = "";
+
     /**
      *
      *
@@ -747,6 +761,7 @@ public java.lang.String getName() {
         return s;
       }
     }
+
     /**
      *
      *
@@ -773,6 +788,7 @@ public com.google.protobuf.ByteString getNameBytes() {
 
     public static final int DIRECTION_FIELD_NUMBER = 2;
     private int direction_ = 0;
+
     /**
      *
      *
@@ -791,6 +807,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     public int getDirectionValue() {
       return direction_;
     }
+
     /**
      *
      *
@@ -984,6 +1001,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -1184,6 +1202,7 @@ public Builder mergeFrom(
       private int bitField0_;
 
       private java.lang.Object name_ = "";
+
       /**
        *
        *
@@ -1206,6 +1225,7 @@ public java.lang.String getName() {
           return (java.lang.String) ref;
         }
       }
+
       /**
        *
        *
@@ -1228,6 +1248,7 @@ public com.google.protobuf.ByteString getNameBytes() {
           return (com.google.protobuf.ByteString) ref;
         }
       }
+
       /**
        *
        *
@@ -1249,6 +1270,7 @@ public Builder setName(java.lang.String value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1266,6 +1288,7 @@ public Builder clearName() {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1290,6 +1313,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       }
 
       private int direction_ = 0;
+
       /**
        *
        *
@@ -1308,6 +1332,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       public int getDirectionValue() {
         return direction_;
       }
+
       /**
        *
        *
@@ -1329,6 +1354,7 @@ public Builder setDirectionValue(int value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1349,6 +1375,7 @@ public com.google.datastore.admin.v1.Index.Direction getDirection() {
             com.google.datastore.admin.v1.Index.Direction.forNumber(direction_);
         return result == null ? com.google.datastore.admin.v1.Index.Direction.UNRECOGNIZED : result;
       }
+
       /**
        *
        *
@@ -1373,6 +1400,7 @@ public Builder setDirection(com.google.datastore.admin.v1.Index.Direction value)
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1462,6 +1490,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty getDefaultInstanceFor
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -1485,6 +1514,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -1513,6 +1543,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object indexId_ = "";
+
   /**
    *
    *
@@ -1536,6 +1567,7 @@ public java.lang.String getIndexId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -1564,6 +1596,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object kind_ = "";
+
   /**
    *
    *
@@ -1587,6 +1620,7 @@ public java.lang.String getKind() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -1613,6 +1647,7 @@ public com.google.protobuf.ByteString getKindBytes() {
 
   public static final int ANCESTOR_FIELD_NUMBER = 5;
   private int ancestor_ = 0;
+
   /**
    *
    *
@@ -1631,6 +1666,7 @@ public com.google.protobuf.ByteString getKindBytes() {
   public int getAncestorValue() {
     return ancestor_;
   }
+
   /**
    *
    *
@@ -1656,6 +1692,7 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
 
   @SuppressWarnings("serial")
   private java.util.List properties_;
+
   /**
    *
    *
@@ -1675,6 +1712,7 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
   public java.util.List getPropertiesList() {
     return properties_;
   }
+
   /**
    *
    *
@@ -1695,6 +1733,7 @@ public java.util.List getPr
       getPropertiesOrBuilderList() {
     return properties_;
   }
+
   /**
    *
    *
@@ -1714,6 +1753,7 @@ public java.util.List getPr
   public int getPropertiesCount() {
     return properties_.size();
   }
+
   /**
    *
    *
@@ -1733,6 +1773,7 @@ public int getPropertiesCount() {
   public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int index) {
     return properties_.get(index);
   }
+
   /**
    *
    *
@@ -1756,6 +1797,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie
 
   public static final int STATE_FIELD_NUMBER = 7;
   private int state_ = 0;
+
   /**
    *
    *
@@ -1773,6 +1815,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie
   public int getStateValue() {
     return state_;
   }
+
   /**
    *
    *
@@ -1999,6 +2042,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -2298,6 +2342,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -2320,6 +2365,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -2342,6 +2388,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -2363,6 +2410,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2380,6 +2428,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2404,6 +2453,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object indexId_ = "";
+
     /**
      *
      *
@@ -2426,6 +2476,7 @@ public java.lang.String getIndexId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -2448,6 +2499,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -2469,6 +2521,7 @@ public Builder setIndexId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2486,6 +2539,7 @@ public Builder clearIndexId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2510,6 +2564,7 @@ public Builder setIndexIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object kind_ = "";
+
     /**
      *
      *
@@ -2532,6 +2587,7 @@ public java.lang.String getKind() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -2554,6 +2610,7 @@ public com.google.protobuf.ByteString getKindBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -2575,6 +2632,7 @@ public Builder setKind(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2592,6 +2650,7 @@ public Builder clearKind() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2616,6 +2675,7 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
     }
 
     private int ancestor_ = 0;
+
     /**
      *
      *
@@ -2634,6 +2694,7 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
     public int getAncestorValue() {
       return ancestor_;
     }
+
     /**
      *
      *
@@ -2655,6 +2716,7 @@ public Builder setAncestorValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2677,6 +2739,7 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() {
           ? com.google.datastore.admin.v1.Index.AncestorMode.UNRECOGNIZED
           : result;
     }
+
     /**
      *
      *
@@ -2701,6 +2764,7 @@ public Builder setAncestor(com.google.datastore.admin.v1.Index.AncestorMode valu
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2762,6 +2826,7 @@ public java.util.List getPr
         return propertiesBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -2784,6 +2849,7 @@ public int getPropertiesCount() {
         return propertiesBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -2806,6 +2872,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int ind
         return propertiesBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -2835,6 +2902,7 @@ public Builder setProperties(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2861,6 +2929,7 @@ public Builder setProperties(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2889,6 +2958,7 @@ public Builder addProperties(com.google.datastore.admin.v1.Index.IndexedProperty
       }
       return this;
     }
+
     /**
      *
      *
@@ -2918,6 +2988,7 @@ public Builder addProperties(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2944,6 +3015,7 @@ public Builder addProperties(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2970,6 +3042,7 @@ public Builder addProperties(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2996,6 +3069,7 @@ public Builder addAllProperties(
       }
       return this;
     }
+
     /**
      *
      *
@@ -3021,6 +3095,7 @@ public Builder clearProperties() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3046,6 +3121,7 @@ public Builder removeProperties(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3065,6 +3141,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder getProperties
         int index) {
       return getPropertiesFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -3088,6 +3165,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie
         return propertiesBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -3111,6 +3189,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie
         return java.util.Collections.unmodifiableList(properties_);
       }
     }
+
     /**
      *
      *
@@ -3130,6 +3209,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties
       return getPropertiesFieldBuilder()
           .addBuilder(com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -3151,6 +3231,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties
           .addBuilder(
               index, com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -3189,6 +3270,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties
     }
 
     private int state_ = 0;
+
     /**
      *
      *
@@ -3206,6 +3288,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties
     public int getStateValue() {
       return state_;
     }
+
     /**
      *
      *
@@ -3226,6 +3309,7 @@ public Builder setStateValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3245,6 +3329,7 @@ public com.google.datastore.admin.v1.Index.State getState() {
           com.google.datastore.admin.v1.Index.State.forNumber(state_);
       return result == null ? com.google.datastore.admin.v1.Index.State.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -3268,6 +3353,7 @@ public Builder setState(com.google.datastore.admin.v1.Index.State value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 0eb0440d16cf..c66aa37d4652 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
@@ -33,6 +33,7 @@ public final class IndexOperationMetadata extends com.google.protobuf.GeneratedM
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.IndexOperationMetadata)
     IndexOperationMetadataOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use IndexOperationMetadata.newBuilder() to construct.
   private IndexOperationMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.datastore.admin.v1.CommonMetadata common_;
+
   /**
    *
    *
@@ -81,6 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasCommon() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -98,6 +101,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
         ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance()
         : common_;
   }
+
   /**
    *
    *
@@ -116,6 +120,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
 
   public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2;
   private com.google.datastore.admin.v1.Progress progressEntities_;
+
   /**
    *
    *
@@ -131,6 +136,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
   public boolean hasProgressEntities() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -148,6 +154,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
         ? com.google.datastore.admin.v1.Progress.getDefaultInstance()
         : progressEntities_;
   }
+
   /**
    *
    *
@@ -168,6 +175,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object indexId_ = "";
+
   /**
    *
    *
@@ -191,6 +199,7 @@ public java.lang.String getIndexId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -402,6 +411,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -641,6 +651,7 @@ public Builder mergeFrom(
             com.google.datastore.admin.v1.CommonMetadata.Builder,
             com.google.datastore.admin.v1.CommonMetadataOrBuilder>
         commonBuilder_;
+
     /**
      *
      *
@@ -655,6 +666,7 @@ public Builder mergeFrom(
     public boolean hasCommon() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -675,6 +687,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() {
         return commonBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -697,6 +710,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -716,6 +730,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -743,6 +758,7 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -762,6 +778,7 @@ public Builder clearCommon() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -776,6 +793,7 @@ public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() {
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -794,6 +812,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
             : common_;
       }
     }
+
     /**
      *
      *
@@ -826,6 +845,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
             com.google.datastore.admin.v1.Progress.Builder,
             com.google.datastore.admin.v1.ProgressOrBuilder>
         progressEntitiesBuilder_;
+
     /**
      *
      *
@@ -840,6 +860,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder(
     public boolean hasProgressEntities() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -860,6 +881,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() {
         return progressEntitiesBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -882,6 +904,7 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -902,6 +925,7 @@ public Builder setProgressEntities(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -929,6 +953,7 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -948,6 +973,7 @@ public Builder clearProgressEntities() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -962,6 +988,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder
       onChanged();
       return getProgressEntitiesFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -980,6 +1007,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
             : progressEntities_;
       }
     }
+
     /**
      *
      *
@@ -1007,6 +1035,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil
     }
 
     private java.lang.Object indexId_ = "";
+
     /**
      *
      *
@@ -1029,6 +1058,7 @@ public java.lang.String getIndexId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1051,6 +1081,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1072,6 +1103,7 @@ public Builder setIndexId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1089,6 +1121,7 @@ public Builder clearIndexId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index 1ffba87d4dd0..ba34cbf02c63 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -36,6 +36,7 @@ public interface IndexOperationMetadataOrBuilder
    * @return Whether the common field is set.
    */
   boolean hasCommon();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface IndexOperationMetadataOrBuilder
    * @return The common.
    */
   com.google.datastore.admin.v1.CommonMetadata getCommon();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface IndexOperationMetadataOrBuilder
    * @return Whether the progressEntities field is set.
    */
   boolean hasProgressEntities();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface IndexOperationMetadataOrBuilder
    * @return The progressEntities.
    */
   com.google.datastore.admin.v1.Progress getProgressEntities();
+
   /**
    *
    *
@@ -106,6 +110,7 @@ public interface IndexOperationMetadataOrBuilder
    * @return The indexId.
    */
   java.lang.String getIndexId();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index f47a371a4c8a..a786ec0c3462 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -36,6 +36,7 @@ public interface IndexOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -61,6 +62,7 @@ public interface IndexOrBuilder
    * @return The indexId.
    */
   java.lang.String getIndexId();
+
   /**
    *
    *
@@ -86,6 +88,7 @@ public interface IndexOrBuilder
    * @return The kind.
    */
   java.lang.String getKind();
+
   /**
    *
    *
@@ -114,6 +117,7 @@ public interface IndexOrBuilder
    * @return The enum numeric value on the wire for ancestor.
    */
   int getAncestorValue();
+
   /**
    *
    *
@@ -146,6 +150,7 @@ public interface IndexOrBuilder
    * 
    */
   java.util.List getPropertiesList();
+
   /**
    *
    *
@@ -162,6 +167,7 @@ public interface IndexOrBuilder
    * 
    */
   com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int index);
+
   /**
    *
    *
@@ -178,6 +184,7 @@ public interface IndexOrBuilder
    * 
    */
   int getPropertiesCount();
+
   /**
    *
    *
@@ -195,6 +202,7 @@ public interface IndexOrBuilder
    */
   java.util.List
       getPropertiesOrBuilderList();
+
   /**
    *
    *
@@ -226,6 +234,7 @@ public interface IndexOrBuilder
    * @return The enum numeric value on the wire for state.
    */
   int getStateValue();
+
   /**
    *
    *
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 90627347f56e..e66e42843aef 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
@@ -45,30 +45,42 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     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"
+          + "%google/datastore/admin/v1/index.proto\022"
+          + "\031google.datastore.admin.v1\032\037google/api/field_behavior.proto\"\346\004\n"
+          + "\005Index\022\027\n\n"
+          + "project_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.AncestorModeB\003\340A\002\022I\n\n"
+          + "properties\030\006 \003(\01320.google.data"
+          + "store.admin.v1.Index.IndexedPropertyB\003\340A\002\022:\n"
+          + "\005state\030\007"
+          + " \001(\0162&.google.datastore.admin.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.DirectionB\003\340A\002\"J\n"
+          + "\014AncestorMode\022\035\n"
+          + "\031ANCESTOR_MODE_UNSPECIFIED\020\000\022\010\n"
+          + "\004NONE\020\001\022\021\n\r"
+          + "ALL_ANCESTORS\020\002\"E\n"
+          + "\tDirection\022\031\n"
+          + "\025DIRECTION_UNSPECIFIED\020\000\022\r\n"
+          + "\tASCENDING\020\001\022\016\n\n"
+          + "DESCENDING\020\002\"P\n"
+          + "\005State\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\n"
+          + "IndexProtoP\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"
+          + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::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 258d08cd9d06..ca32a0fa376c 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
@@ -34,6 +34,7 @@ public final class ListIndexesRequest extends com.google.protobuf.GeneratedMessa
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ListIndexesRequest)
     ListIndexesRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ListIndexesRequest.newBuilder() to construct.
   private ListIndexesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -93,6 +95,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object filter_ = "";
+
   /**
    * string filter = 3;
    *
@@ -138,6 +142,7 @@ public java.lang.String getFilter() {
       return s;
     }
   }
+
   /**
    * string filter = 3;
    *
@@ -158,6 +163,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 4;
   private int pageSize_ = 0;
+
   /**
    *
    *
@@ -179,6 +185,7 @@ public int getPageSize() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object pageToken_ = "";
+
   /**
    *
    *
@@ -202,6 +209,7 @@ public java.lang.String getPageToken() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -412,6 +420,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -640,6 +649,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -662,6 +672,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -684,6 +695,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -705,6 +717,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -722,6 +735,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -746,6 +760,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object filter_ = "";
+
     /**
      * string filter = 3;
      *
@@ -762,6 +777,7 @@ public java.lang.String getFilter() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      * string filter = 3;
      *
@@ -778,6 +794,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      * string filter = 3;
      *
@@ -793,6 +810,7 @@ public Builder setFilter(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      * string filter = 3;
      *
@@ -804,6 +822,7 @@ public Builder clearFilter() {
       onChanged();
       return this;
     }
+
     /**
      * string filter = 3;
      *
@@ -822,6 +841,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
     }
 
     private int pageSize_;
+
     /**
      *
      *
@@ -838,6 +858,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
     public int getPageSize() {
       return pageSize_;
     }
+
     /**
      *
      *
@@ -858,6 +879,7 @@ public Builder setPageSize(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -878,6 +900,7 @@ public Builder clearPageSize() {
     }
 
     private java.lang.Object pageToken_ = "";
+
     /**
      *
      *
@@ -900,6 +923,7 @@ public java.lang.String getPageToken() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -922,6 +946,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -943,6 +968,7 @@ public Builder setPageToken(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -960,6 +986,7 @@ public Builder clearPageToken() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index 3a5d68fc4cbf..1c4c70c350e5 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -36,6 +36,7 @@ public interface ListIndexesRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -55,6 +56,7 @@ public interface ListIndexesRequestOrBuilder
    * @return The filter.
    */
   java.lang.String getFilter();
+
   /**
    * string filter = 3;
    *
@@ -88,6 +90,7 @@ public interface ListIndexesRequestOrBuilder
    * @return The pageToken.
    */
   java.lang.String getPageToken();
+
   /**
    *
    *
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 956b22417a95..3aae0bc18497 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
@@ -34,6 +34,7 @@ public final class ListIndexesResponse extends com.google.protobuf.GeneratedMess
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ListIndexesResponse)
     ListIndexesResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ListIndexesResponse.newBuilder() to construct.
   private ListIndexesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List indexes_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getIndexesList() {
     return indexes_;
   }
+
   /**
    *
    *
@@ -96,6 +99,7 @@ public java.util.List getIndexesList() {
       getIndexesOrBuilderList() {
     return indexes_;
   }
+
   /**
    *
    *
@@ -109,6 +113,7 @@ public java.util.List getIndexesList() {
   public int getIndexesCount() {
     return indexes_.size();
   }
+
   /**
    *
    *
@@ -122,6 +127,7 @@ public int getIndexesCount() {
   public com.google.datastore.admin.v1.Index getIndexes(int index) {
     return indexes_.get(index);
   }
+
   /**
    *
    *
@@ -140,6 +146,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int inde
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object nextPageToken_ = "";
+
   /**
    *
    *
@@ -163,6 +170,7 @@ public java.lang.String getNextPageToken() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -357,6 +365,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -634,6 +643,7 @@ public java.util.List getIndexesList() {
         return indexesBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -650,6 +660,7 @@ public int getIndexesCount() {
         return indexesBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -666,6 +677,7 @@ public com.google.datastore.admin.v1.Index getIndexes(int index) {
         return indexesBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -688,6 +700,7 @@ public Builder setIndexes(int index, com.google.datastore.admin.v1.Index value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -708,6 +721,7 @@ public Builder setIndexes(
       }
       return this;
     }
+
     /**
      *
      *
@@ -730,6 +744,7 @@ public Builder addIndexes(com.google.datastore.admin.v1.Index value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -752,6 +767,7 @@ public Builder addIndexes(int index, com.google.datastore.admin.v1.Index value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -771,6 +787,7 @@ public Builder addIndexes(com.google.datastore.admin.v1.Index.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -791,6 +808,7 @@ public Builder addIndexes(
       }
       return this;
     }
+
     /**
      *
      *
@@ -811,6 +829,7 @@ public Builder addAllIndexes(
       }
       return this;
     }
+
     /**
      *
      *
@@ -830,6 +849,7 @@ public Builder clearIndexes() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -849,6 +869,7 @@ public Builder removeIndexes(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -861,6 +882,7 @@ public Builder removeIndexes(int index) {
     public com.google.datastore.admin.v1.Index.Builder getIndexesBuilder(int index) {
       return getIndexesFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -877,6 +899,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int inde
         return indexesBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -894,6 +917,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int inde
         return java.util.Collections.unmodifiableList(indexes_);
       }
     }
+
     /**
      *
      *
@@ -907,6 +931,7 @@ public com.google.datastore.admin.v1.Index.Builder addIndexesBuilder() {
       return getIndexesFieldBuilder()
           .addBuilder(com.google.datastore.admin.v1.Index.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -920,6 +945,7 @@ public com.google.datastore.admin.v1.Index.Builder addIndexesBuilder(int index)
       return getIndexesFieldBuilder()
           .addBuilder(index, com.google.datastore.admin.v1.Index.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -951,6 +977,7 @@ public java.util.List getIndexesBui
     }
 
     private java.lang.Object nextPageToken_ = "";
+
     /**
      *
      *
@@ -973,6 +1000,7 @@ public java.lang.String getNextPageToken() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -995,6 +1023,7 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1016,6 +1045,7 @@ public Builder setNextPageToken(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1033,6 +1063,7 @@ public Builder clearNextPageToken() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index 40f2e4ba165d..c89b116ed938 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -34,6 +34,7 @@ public interface ListIndexesResponseOrBuilder
    * repeated .google.datastore.admin.v1.Index indexes = 1;
    */
   java.util.List getIndexesList();
+
   /**
    *
    *
@@ -44,6 +45,7 @@ public interface ListIndexesResponseOrBuilder
    * repeated .google.datastore.admin.v1.Index indexes = 1;
    */
   com.google.datastore.admin.v1.Index getIndexes(int index);
+
   /**
    *
    *
@@ -54,6 +56,7 @@ public interface ListIndexesResponseOrBuilder
    * repeated .google.datastore.admin.v1.Index indexes = 1;
    */
   int getIndexesCount();
+
   /**
    *
    *
@@ -64,6 +67,7 @@ public interface ListIndexesResponseOrBuilder
    * repeated .google.datastore.admin.v1.Index indexes = 1;
    */
   java.util.List getIndexesOrBuilderList();
+
   /**
    *
    *
@@ -87,6 +91,7 @@ public interface ListIndexesResponseOrBuilder
    * @return The nextPageToken.
    */
   java.lang.String getNextPageToken();
+
   /**
    *
    *
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 7dd512772a98..7833fb2a22a7 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
@@ -35,6 +35,7 @@ public final class MigrationProgressEvent extends com.google.protobuf.GeneratedM
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent)
     MigrationProgressEventOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use MigrationProgressEvent.newBuilder() to construct.
   private MigrationProgressEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -128,6 +129,7 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum {
      * CONCURRENCY_MODE_UNSPECIFIED = 0;
      */
     public static final int CONCURRENCY_MODE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -138,6 +140,7 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum {
      * PESSIMISTIC = 1;
      */
     public static final int PESSIMISTIC_VALUE = 1;
+
     /**
      *
      *
@@ -148,6 +151,7 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum {
      * OPTIMISTIC = 2;
      */
     public static final int OPTIMISTIC_VALUE = 2;
+
     /**
      *
      *
@@ -267,6 +271,7 @@ public interface PrepareStepDetailsOrBuilder
      * @return The enum numeric value on the wire for concurrencyMode.
      */
     int getConcurrencyModeValue();
+
     /**
      *
      *
@@ -282,6 +287,7 @@ public interface PrepareStepDetailsOrBuilder
      */
     com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode getConcurrencyMode();
   }
+
   /**
    *
    *
@@ -296,6 +302,7 @@ public static final class PrepareStepDetails extends com.google.protobuf.Generat
       // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails)
       PrepareStepDetailsOrBuilder {
     private static final long serialVersionUID = 0L;
+
     // Use PrepareStepDetails.newBuilder() to construct.
     private PrepareStepDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
@@ -329,6 +336,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1;
     private int concurrencyMode_ = 0;
+
     /**
      *
      *
@@ -346,6 +354,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     public int getConcurrencyModeValue() {
       return concurrencyMode_;
     }
+
     /**
      *
      *
@@ -539,6 +548,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -735,6 +745,7 @@ public Builder mergeFrom(
       private int bitField0_;
 
       private int concurrencyMode_ = 0;
+
       /**
        *
        *
@@ -753,6 +764,7 @@ public Builder mergeFrom(
       public int getConcurrencyModeValue() {
         return concurrencyMode_;
       }
+
       /**
        *
        *
@@ -774,6 +786,7 @@ public Builder setConcurrencyModeValue(int value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -798,6 +811,7 @@ public Builder setConcurrencyModeValue(int value) {
             ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
             : result;
       }
+
       /**
        *
        *
@@ -823,6 +837,7 @@ public Builder setConcurrencyMode(
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -930,6 +945,7 @@ public interface RedirectWritesStepDetailsOrBuilder
      * @return The enum numeric value on the wire for concurrencyMode.
      */
     int getConcurrencyModeValue();
+
     /**
      *
      *
@@ -944,6 +960,7 @@ public interface RedirectWritesStepDetailsOrBuilder
      */
     com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode getConcurrencyMode();
   }
+
   /**
    *
    *
@@ -959,6 +976,7 @@ public static final class RedirectWritesStepDetails extends com.google.protobuf.
       // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails)
       RedirectWritesStepDetailsOrBuilder {
     private static final long serialVersionUID = 0L;
+
     // Use RedirectWritesStepDetails.newBuilder() to construct.
     private RedirectWritesStepDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
@@ -992,6 +1010,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1;
     private int concurrencyMode_ = 0;
+
     /**
      *
      *
@@ -1008,6 +1027,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     public int getConcurrencyModeValue() {
       return concurrencyMode_;
     }
+
     /**
      *
      *
@@ -1206,6 +1226,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -1408,6 +1429,7 @@ public Builder mergeFrom(
       private int bitField0_;
 
       private int concurrencyMode_ = 0;
+
       /**
        *
        *
@@ -1425,6 +1447,7 @@ public Builder mergeFrom(
       public int getConcurrencyModeValue() {
         return concurrencyMode_;
       }
+
       /**
        *
        *
@@ -1445,6 +1468,7 @@ public Builder setConcurrencyModeValue(int value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1468,6 +1492,7 @@ public Builder setConcurrencyModeValue(int value) {
             ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED
             : result;
       }
+
       /**
        *
        *
@@ -1492,6 +1517,7 @@ public Builder setConcurrencyMode(
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1598,6 +1624,7 @@ public enum StepDetailsCase
     private StepDetailsCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -1632,6 +1659,7 @@ public StepDetailsCase getStepDetailsCase() {
 
   public static final int STEP_FIELD_NUMBER = 1;
   private int step_ = 0;
+
   /**
    *
    *
@@ -1650,6 +1678,7 @@ public StepDetailsCase getStepDetailsCase() {
   public int getStepValue() {
     return step_;
   }
+
   /**
    *
    *
@@ -1672,6 +1701,7 @@ public com.google.datastore.admin.v1.MigrationStep getStep() {
   }
 
   public static final int PREPARE_STEP_DETAILS_FIELD_NUMBER = 2;
+
   /**
    *
    *
@@ -1689,6 +1719,7 @@ public com.google.datastore.admin.v1.MigrationStep getStep() {
   public boolean hasPrepareStepDetails() {
     return stepDetailsCase_ == 2;
   }
+
   /**
    *
    *
@@ -1711,6 +1742,7 @@ public boolean hasPrepareStepDetails() {
     return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails
         .getDefaultInstance();
   }
+
   /**
    *
    *
@@ -1733,6 +1765,7 @@ public boolean hasPrepareStepDetails() {
   }
 
   public static final int REDIRECT_WRITES_STEP_DETAILS_FIELD_NUMBER = 3;
+
   /**
    *
    *
@@ -1750,6 +1783,7 @@ public boolean hasPrepareStepDetails() {
   public boolean hasRedirectWritesStepDetails() {
     return stepDetailsCase_ == 3;
   }
+
   /**
    *
    *
@@ -1773,6 +1807,7 @@ public boolean hasRedirectWritesStepDetails() {
     return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
         .getDefaultInstance();
   }
+
   /**
    *
    *
@@ -2005,6 +2040,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -2253,6 +2289,7 @@ public Builder clearStepDetails() {
     private int bitField0_;
 
     private int step_ = 0;
+
     /**
      *
      *
@@ -2271,6 +2308,7 @@ public Builder clearStepDetails() {
     public int getStepValue() {
       return step_;
     }
+
     /**
      *
      *
@@ -2292,6 +2330,7 @@ public Builder setStepValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2312,6 +2351,7 @@ public com.google.datastore.admin.v1.MigrationStep getStep() {
           com.google.datastore.admin.v1.MigrationStep.forNumber(step_);
       return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -2336,6 +2376,7 @@ public Builder setStep(com.google.datastore.admin.v1.MigrationStep value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2362,6 +2403,7 @@ public Builder clearStep() {
             com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder,
             com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder>
         prepareStepDetailsBuilder_;
+
     /**
      *
      *
@@ -2379,6 +2421,7 @@ public Builder clearStep() {
     public boolean hasPrepareStepDetails() {
       return stepDetailsCase_ == 2;
     }
+
     /**
      *
      *
@@ -2410,6 +2453,7 @@ public boolean hasPrepareStepDetails() {
             .getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2435,6 +2479,7 @@ public Builder setPrepareStepDetails(
       stepDetailsCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -2458,6 +2503,7 @@ public Builder setPrepareStepDetails(
       stepDetailsCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -2496,6 +2542,7 @@ public Builder mergePrepareStepDetails(
       stepDetailsCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -2523,6 +2570,7 @@ public Builder clearPrepareStepDetails() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2538,6 +2586,7 @@ public Builder clearPrepareStepDetails() {
         getPrepareStepDetailsBuilder() {
       return getPrepareStepDetailsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2563,6 +2612,7 @@ public Builder clearPrepareStepDetails() {
             .getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2606,6 +2656,7 @@ public Builder clearPrepareStepDetails() {
             com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder,
             com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder>
         redirectWritesStepDetailsBuilder_;
+
     /**
      *
      *
@@ -2623,6 +2674,7 @@ public Builder clearPrepareStepDetails() {
     public boolean hasRedirectWritesStepDetails() {
       return stepDetailsCase_ == 3;
     }
+
     /**
      *
      *
@@ -2654,6 +2706,7 @@ public boolean hasRedirectWritesStepDetails() {
             .getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2679,6 +2732,7 @@ public Builder setRedirectWritesStepDetails(
       stepDetailsCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -2702,6 +2756,7 @@ public Builder setRedirectWritesStepDetails(
       stepDetailsCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -2742,6 +2797,7 @@ public Builder mergeRedirectWritesStepDetails(
       stepDetailsCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -2769,6 +2825,7 @@ public Builder clearRedirectWritesStepDetails() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2784,6 +2841,7 @@ public Builder clearRedirectWritesStepDetails() {
         getRedirectWritesStepDetailsBuilder() {
       return getRedirectWritesStepDetailsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2809,6 +2867,7 @@ public Builder clearRedirectWritesStepDetails() {
             .getDefaultInstance();
       }
     }
+
     /**
      *
      *
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 08bbab7bf8a4..c23e32fbb0ce 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
@@ -39,6 +39,7 @@ public interface MigrationProgressEventOrBuilder
    * @return The enum numeric value on the wire for step.
    */
   int getStepValue();
+
   /**
    *
    *
@@ -69,6 +70,7 @@ public interface MigrationProgressEventOrBuilder
    * @return Whether the prepareStepDetails field is set.
    */
   boolean hasPrepareStepDetails();
+
   /**
    *
    *
@@ -83,6 +85,7 @@ public interface MigrationProgressEventOrBuilder
    * @return The prepareStepDetails.
    */
   com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails getPrepareStepDetails();
+
   /**
    *
    *
@@ -111,6 +114,7 @@ public interface MigrationProgressEventOrBuilder
    * @return Whether the redirectWritesStepDetails field is set.
    */
   boolean hasRedirectWritesStepDetails();
+
   /**
    *
    *
@@ -126,6 +130,7 @@ public interface MigrationProgressEventOrBuilder
    */
   com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails
       getRedirectWritesStepDetails();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index 9df1276a84a3..5434e3eaeb6f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -82,6 +82,7 @@ public enum MigrationState implements com.google.protobuf.ProtocolMessageEnum {
    * MIGRATION_STATE_UNSPECIFIED = 0;
    */
   public static final int MIGRATION_STATE_UNSPECIFIED_VALUE = 0;
+
   /**
    *
    *
@@ -92,6 +93,7 @@ public enum MigrationState implements com.google.protobuf.ProtocolMessageEnum {
    * RUNNING = 1;
    */
   public static final int RUNNING_VALUE = 1;
+
   /**
    *
    *
@@ -102,6 +104,7 @@ public enum MigrationState implements com.google.protobuf.ProtocolMessageEnum {
    * PAUSED = 2;
    */
   public static final int PAUSED_VALUE = 2;
+
   /**
    *
    *
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 0fac9e592715..1e06a1c49612 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
@@ -35,6 +35,7 @@ public final class MigrationStateEvent extends com.google.protobuf.GeneratedMess
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationStateEvent)
     MigrationStateEventOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use MigrationStateEvent.newBuilder() to construct.
   private MigrationStateEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   public static final int STATE_FIELD_NUMBER = 1;
   private int state_ = 0;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public int getStateValue() {
     return state_;
   }
+
   /**
    *
    *
@@ -261,6 +264,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -445,6 +449,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private int state_ = 0;
+
     /**
      *
      *
@@ -460,6 +465,7 @@ public Builder mergeFrom(
     public int getStateValue() {
       return state_;
     }
+
     /**
      *
      *
@@ -478,6 +484,7 @@ public Builder setStateValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -495,6 +502,7 @@ public com.google.datastore.admin.v1.MigrationState getState() {
           com.google.datastore.admin.v1.MigrationState.forNumber(state_);
       return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -516,6 +524,7 @@ public Builder setState(com.google.datastore.admin.v1.MigrationState value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 962e1416ed20..758d5fe00894 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -36,6 +36,7 @@ public interface MigrationStateEventOrBuilder
    * @return The enum numeric value on the wire for state.
    */
   int getStateValue();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index 9e2cc7f61e86..44f3c4c5e11b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -123,6 +123,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
    * MIGRATION_STEP_UNSPECIFIED = 0;
    */
   public static final int MIGRATION_STEP_UNSPECIFIED_VALUE = 0;
+
   /**
    *
    *
@@ -133,6 +134,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
    * PREPARE = 6;
    */
   public static final int PREPARE_VALUE = 6;
+
   /**
    *
    *
@@ -143,6 +145,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
    * START = 1;
    */
   public static final int START_VALUE = 1;
+
   /**
    *
    *
@@ -153,6 +156,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
    * APPLY_WRITES_SYNCHRONOUSLY = 7;
    */
   public static final int APPLY_WRITES_SYNCHRONOUSLY_VALUE = 7;
+
   /**
    *
    *
@@ -164,6 +168,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
    * COPY_AND_VERIFY = 2;
    */
   public static final int COPY_AND_VERIFY_VALUE = 2;
+
   /**
    *
    *
@@ -174,6 +179,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
    * REDIRECT_EVENTUALLY_CONSISTENT_READS = 3;
    */
   public static final int REDIRECT_EVENTUALLY_CONSISTENT_READS_VALUE = 3;
+
   /**
    *
    *
@@ -184,6 +190,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum {
    * REDIRECT_STRONGLY_CONSISTENT_READS = 4;
    */
   public static final int REDIRECT_STRONGLY_CONSISTENT_READS_VALUE = 4;
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index 66e73b4dc603..db31a688df07 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -92,6 +92,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum {
    * OPERATION_TYPE_UNSPECIFIED = 0;
    */
   public static final int OPERATION_TYPE_UNSPECIFIED_VALUE = 0;
+
   /**
    *
    *
@@ -102,6 +103,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum {
    * EXPORT_ENTITIES = 1;
    */
   public static final int EXPORT_ENTITIES_VALUE = 1;
+
   /**
    *
    *
@@ -112,6 +114,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum {
    * IMPORT_ENTITIES = 2;
    */
   public static final int IMPORT_ENTITIES_VALUE = 2;
+
   /**
    *
    *
@@ -122,6 +125,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum {
    * CREATE_INDEX = 3;
    */
   public static final int CREATE_INDEX_VALUE = 3;
+
   /**
    *
    *
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 139ed5960d52..48580643e17a 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
@@ -33,6 +33,7 @@ public final class Progress extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Progress)
     ProgressOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Progress.newBuilder() to construct.
   private Progress(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   public static final int WORK_COMPLETED_FIELD_NUMBER = 1;
   private long workCompleted_ = 0L;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public long getWorkCompleted() {
 
   public static final int WORK_ESTIMATED_FIELD_NUMBER = 2;
   private long workEstimated_ = 0L;
+
   /**
    *
    *
@@ -266,6 +269,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -460,6 +464,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private long workCompleted_;
+
     /**
      *
      *
@@ -476,6 +481,7 @@ public Builder mergeFrom(
     public long getWorkCompleted() {
       return workCompleted_;
     }
+
     /**
      *
      *
@@ -496,6 +502,7 @@ public Builder setWorkCompleted(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -516,6 +523,7 @@ public Builder clearWorkCompleted() {
     }
 
     private long workEstimated_;
+
     /**
      *
      *
@@ -532,6 +540,7 @@ public Builder clearWorkCompleted() {
     public long getWorkEstimated() {
       return workEstimated_;
     }
+
     /**
      *
      *
@@ -552,6 +561,7 @@ public Builder setWorkEstimated(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 85ab869883f2..700120cebb7f 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
@@ -34,6 +34,7 @@ public final class AggregationQuery extends com.google.protobuf.GeneratedMessage
     // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery)
     AggregationQueryOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use AggregationQuery.newBuilder() to construct.
   private AggregationQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -81,6 +82,7 @@ public interface AggregationOrBuilder
      * @return Whether the count field is set.
      */
     boolean hasCount();
+
     /**
      *
      *
@@ -93,6 +95,7 @@ public interface AggregationOrBuilder
      * @return The count.
      */
     com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount();
+
     /**
      *
      *
@@ -116,6 +119,7 @@ public interface AggregationOrBuilder
      * @return Whether the sum field is set.
      */
     boolean hasSum();
+
     /**
      *
      *
@@ -128,6 +132,7 @@ public interface AggregationOrBuilder
      * @return The sum.
      */
     com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum();
+
     /**
      *
      *
@@ -151,6 +156,7 @@ public interface AggregationOrBuilder
      * @return Whether the avg field is set.
      */
     boolean hasAvg();
+
     /**
      *
      *
@@ -163,6 +169,7 @@ public interface AggregationOrBuilder
      * @return The avg.
      */
     com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg();
+
     /**
      *
      *
@@ -220,6 +227,7 @@ public interface AggregationOrBuilder
      * @return The alias.
      */
     java.lang.String getAlias();
+
     /**
      *
      *
@@ -269,6 +277,7 @@ public interface AggregationOrBuilder
 
     com.google.datastore.v1.AggregationQuery.Aggregation.OperatorCase getOperatorCase();
   }
+
   /**
    *
    *
@@ -283,6 +292,7 @@ public static final class Aggregation extends com.google.protobuf.GeneratedMessa
       // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation)
       AggregationOrBuilder {
     private static final long serialVersionUID = 0L;
+
     // Use Aggregation.newBuilder() to construct.
     private Aggregation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
@@ -350,6 +360,7 @@ public interface CountOrBuilder
        * @return Whether the upTo field is set.
        */
       boolean hasUpTo();
+
       /**
        *
        *
@@ -382,6 +393,7 @@ public interface CountOrBuilder
        * @return The upTo.
        */
       com.google.protobuf.Int64Value getUpTo();
+
       /**
        *
        *
@@ -413,6 +425,7 @@ public interface CountOrBuilder
        */
       com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder();
     }
+
     /**
      *
      *
@@ -430,6 +443,7 @@ public static final class Count extends com.google.protobuf.GeneratedMessageV3
         // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Count)
         CountOrBuilder {
       private static final long serialVersionUID = 0L;
+
       // Use Count.newBuilder() to construct.
       private Count(com.google.protobuf.GeneratedMessageV3.Builder builder) {
         super(builder);
@@ -461,6 +475,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       private int bitField0_;
       public static final int UP_TO_FIELD_NUMBER = 1;
       private com.google.protobuf.Int64Value upTo_;
+
       /**
        *
        *
@@ -496,6 +511,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       public boolean hasUpTo() {
         return ((bitField0_ & 0x00000001) != 0);
       }
+
       /**
        *
        *
@@ -531,6 +547,7 @@ public boolean hasUpTo() {
       public com.google.protobuf.Int64Value getUpTo() {
         return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_;
       }
+
       /**
        *
        *
@@ -731,6 +748,7 @@ protected Builder newBuilderForType(
         Builder builder = new Builder(parent);
         return builder;
       }
+
       /**
        *
        *
@@ -943,6 +961,7 @@ public Builder mergeFrom(
                 com.google.protobuf.Int64Value.Builder,
                 com.google.protobuf.Int64ValueOrBuilder>
             upToBuilder_;
+
         /**
          *
          *
@@ -977,6 +996,7 @@ public Builder mergeFrom(
         public boolean hasUpTo() {
           return ((bitField0_ & 0x00000001) != 0);
         }
+
         /**
          *
          *
@@ -1015,6 +1035,7 @@ public com.google.protobuf.Int64Value getUpTo() {
             return upToBuilder_.getMessage();
           }
         }
+
         /**
          *
          *
@@ -1057,6 +1078,7 @@ public Builder setUpTo(com.google.protobuf.Int64Value value) {
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -1096,6 +1118,7 @@ public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) {
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -1143,6 +1166,7 @@ public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
           }
           return this;
         }
+
         /**
          *
          *
@@ -1182,6 +1206,7 @@ public Builder clearUpTo() {
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -1216,6 +1241,7 @@ public com.google.protobuf.Int64Value.Builder getUpToBuilder() {
           onChanged();
           return getUpToFieldBuilder().getBuilder();
         }
+
         /**
          *
          *
@@ -1252,6 +1278,7 @@ public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() {
             return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_;
           }
         }
+
         /**
          *
          *
@@ -1382,6 +1409,7 @@ public interface SumOrBuilder
        * @return Whether the property field is set.
        */
       boolean hasProperty();
+
       /**
        *
        *
@@ -1394,6 +1422,7 @@ public interface SumOrBuilder
        * @return The property.
        */
       com.google.datastore.v1.PropertyReference getProperty();
+
       /**
        *
        *
@@ -1405,6 +1434,7 @@ public interface SumOrBuilder
        */
       com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
     }
+
     /**
      *
      *
@@ -1439,6 +1469,7 @@ public static final class Sum extends com.google.protobuf.GeneratedMessageV3
         // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Sum)
         SumOrBuilder {
       private static final long serialVersionUID = 0L;
+
       // Use Sum.newBuilder() to construct.
       private Sum(com.google.protobuf.GeneratedMessageV3.Builder builder) {
         super(builder);
@@ -1470,6 +1501,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       private int bitField0_;
       public static final int PROPERTY_FIELD_NUMBER = 1;
       private com.google.datastore.v1.PropertyReference property_;
+
       /**
        *
        *
@@ -1485,6 +1517,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       public boolean hasProperty() {
         return ((bitField0_ & 0x00000001) != 0);
       }
+
       /**
        *
        *
@@ -1502,6 +1535,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
             ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
             : property_;
       }
+
       /**
        *
        *
@@ -1684,6 +1718,7 @@ protected Builder newBuilderForType(
         Builder builder = new Builder(parent);
         return builder;
       }
+
       /**
        *
        *
@@ -1913,6 +1948,7 @@ public Builder mergeFrom(
                 com.google.datastore.v1.PropertyReference.Builder,
                 com.google.datastore.v1.PropertyReferenceOrBuilder>
             propertyBuilder_;
+
         /**
          *
          *
@@ -1927,6 +1963,7 @@ public Builder mergeFrom(
         public boolean hasProperty() {
           return ((bitField0_ & 0x00000001) != 0);
         }
+
         /**
          *
          *
@@ -1947,6 +1984,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
             return propertyBuilder_.getMessage();
           }
         }
+
         /**
          *
          *
@@ -1969,6 +2007,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -1989,6 +2028,7 @@ public Builder setProperty(
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -2016,6 +2056,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
           }
           return this;
         }
+
         /**
          *
          *
@@ -2035,6 +2076,7 @@ public Builder clearProperty() {
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -2049,6 +2091,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
           onChanged();
           return getPropertyFieldBuilder().getBuilder();
         }
+
         /**
          *
          *
@@ -2067,6 +2110,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
                 : property_;
           }
         }
+
         /**
          *
          *
@@ -2175,6 +2219,7 @@ public interface AvgOrBuilder
        * @return Whether the property field is set.
        */
       boolean hasProperty();
+
       /**
        *
        *
@@ -2187,6 +2232,7 @@ public interface AvgOrBuilder
        * @return The property.
        */
       com.google.datastore.v1.PropertyReference getProperty();
+
       /**
        *
        *
@@ -2198,6 +2244,7 @@ public interface AvgOrBuilder
        */
       com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
     }
+
     /**
      *
      *
@@ -2222,6 +2269,7 @@ public static final class Avg extends com.google.protobuf.GeneratedMessageV3
         // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Avg)
         AvgOrBuilder {
       private static final long serialVersionUID = 0L;
+
       // Use Avg.newBuilder() to construct.
       private Avg(com.google.protobuf.GeneratedMessageV3.Builder builder) {
         super(builder);
@@ -2253,6 +2301,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       private int bitField0_;
       public static final int PROPERTY_FIELD_NUMBER = 1;
       private com.google.datastore.v1.PropertyReference property_;
+
       /**
        *
        *
@@ -2268,6 +2317,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       public boolean hasProperty() {
         return ((bitField0_ & 0x00000001) != 0);
       }
+
       /**
        *
        *
@@ -2285,6 +2335,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
             ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
             : property_;
       }
+
       /**
        *
        *
@@ -2467,6 +2518,7 @@ protected Builder newBuilderForType(
         Builder builder = new Builder(parent);
         return builder;
       }
+
       /**
        *
        *
@@ -2686,6 +2738,7 @@ public Builder mergeFrom(
                 com.google.datastore.v1.PropertyReference.Builder,
                 com.google.datastore.v1.PropertyReferenceOrBuilder>
             propertyBuilder_;
+
         /**
          *
          *
@@ -2700,6 +2753,7 @@ public Builder mergeFrom(
         public boolean hasProperty() {
           return ((bitField0_ & 0x00000001) != 0);
         }
+
         /**
          *
          *
@@ -2720,6 +2774,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
             return propertyBuilder_.getMessage();
           }
         }
+
         /**
          *
          *
@@ -2742,6 +2797,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -2762,6 +2818,7 @@ public Builder setProperty(
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -2789,6 +2846,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
           }
           return this;
         }
+
         /**
          *
          *
@@ -2808,6 +2866,7 @@ public Builder clearProperty() {
           onChanged();
           return this;
         }
+
         /**
          *
          *
@@ -2822,6 +2881,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
           onChanged();
           return getPropertyFieldBuilder().getBuilder();
         }
+
         /**
          *
          *
@@ -2840,6 +2900,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
                 : property_;
           }
         }
+
         /**
          *
          *
@@ -2949,6 +3010,7 @@ public enum OperatorCase
       private OperatorCase(int value) {
         this.value = value;
       }
+
       /**
        * @param value The number of the enum to look for.
        * @return The enum associated with the given number.
@@ -2984,6 +3046,7 @@ public OperatorCase getOperatorCase() {
     }
 
     public static final int COUNT_FIELD_NUMBER = 1;
+
     /**
      *
      *
@@ -2999,6 +3062,7 @@ public OperatorCase getOperatorCase() {
     public boolean hasCount() {
       return operatorCase_ == 1;
     }
+
     /**
      *
      *
@@ -3017,6 +3081,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
       }
       return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
     }
+
     /**
      *
      *
@@ -3035,6 +3100,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
     }
 
     public static final int SUM_FIELD_NUMBER = 2;
+
     /**
      *
      *
@@ -3050,6 +3116,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
     public boolean hasSum() {
       return operatorCase_ == 2;
     }
+
     /**
      *
      *
@@ -3068,6 +3135,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum() {
       }
       return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
     }
+
     /**
      *
      *
@@ -3086,6 +3154,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO
     }
 
     public static final int AVG_FIELD_NUMBER = 3;
+
     /**
      *
      *
@@ -3101,6 +3170,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO
     public boolean hasAvg() {
       return operatorCase_ == 3;
     }
+
     /**
      *
      *
@@ -3119,6 +3189,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg() {
       }
       return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
     }
+
     /**
      *
      *
@@ -3140,6 +3211,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgO
 
     @SuppressWarnings("serial")
     private volatile java.lang.Object alias_ = "";
+
     /**
      *
      *
@@ -3197,6 +3269,7 @@ public java.lang.String getAlias() {
         return s;
       }
     }
+
     /**
      *
      *
@@ -3473,6 +3546,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -3743,6 +3817,7 @@ public Builder clearOperator() {
               com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder,
               com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>
           countBuilder_;
+
       /**
        *
        *
@@ -3758,6 +3833,7 @@ public Builder clearOperator() {
       public boolean hasCount() {
         return operatorCase_ == 1;
       }
+
       /**
        *
        *
@@ -3783,6 +3859,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() {
           return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
         }
       }
+
       /**
        *
        *
@@ -3805,6 +3882,7 @@ public Builder setCount(com.google.datastore.v1.AggregationQuery.Aggregation.Cou
         operatorCase_ = 1;
         return this;
       }
+
       /**
        *
        *
@@ -3825,6 +3903,7 @@ public Builder setCount(
         operatorCase_ = 1;
         return this;
       }
+
       /**
        *
        *
@@ -3859,6 +3938,7 @@ public Builder mergeCount(com.google.datastore.v1.AggregationQuery.Aggregation.C
         operatorCase_ = 1;
         return this;
       }
+
       /**
        *
        *
@@ -3884,6 +3964,7 @@ public Builder clearCount() {
         }
         return this;
       }
+
       /**
        *
        *
@@ -3896,6 +3977,7 @@ public Builder clearCount() {
       public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCountBuilder() {
         return getCountFieldBuilder().getBuilder();
       }
+
       /**
        *
        *
@@ -3917,6 +3999,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
           return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance();
         }
       }
+
       /**
        *
        *
@@ -3956,6 +4039,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
               com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder,
               com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder>
           sumBuilder_;
+
       /**
        *
        *
@@ -3971,6 +4055,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
       public boolean hasSum() {
         return operatorCase_ == 2;
       }
+
       /**
        *
        *
@@ -3996,6 +4081,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum() {
           return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
         }
       }
+
       /**
        *
        *
@@ -4018,6 +4104,7 @@ public Builder setSum(com.google.datastore.v1.AggregationQuery.Aggregation.Sum v
         operatorCase_ = 2;
         return this;
       }
+
       /**
        *
        *
@@ -4038,6 +4125,7 @@ public Builder setSum(
         operatorCase_ = 2;
         return this;
       }
+
       /**
        *
        *
@@ -4072,6 +4160,7 @@ public Builder mergeSum(com.google.datastore.v1.AggregationQuery.Aggregation.Sum
         operatorCase_ = 2;
         return this;
       }
+
       /**
        *
        *
@@ -4097,6 +4186,7 @@ public Builder clearSum() {
         }
         return this;
       }
+
       /**
        *
        *
@@ -4109,6 +4199,7 @@ public Builder clearSum() {
       public com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder getSumBuilder() {
         return getSumFieldBuilder().getBuilder();
       }
+
       /**
        *
        *
@@ -4129,6 +4220,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO
           return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance();
         }
       }
+
       /**
        *
        *
@@ -4168,6 +4260,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO
               com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder,
               com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder>
           avgBuilder_;
+
       /**
        *
        *
@@ -4183,6 +4276,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO
       public boolean hasAvg() {
         return operatorCase_ == 3;
       }
+
       /**
        *
        *
@@ -4208,6 +4302,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg() {
           return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
         }
       }
+
       /**
        *
        *
@@ -4230,6 +4325,7 @@ public Builder setAvg(com.google.datastore.v1.AggregationQuery.Aggregation.Avg v
         operatorCase_ = 3;
         return this;
       }
+
       /**
        *
        *
@@ -4250,6 +4346,7 @@ public Builder setAvg(
         operatorCase_ = 3;
         return this;
       }
+
       /**
        *
        *
@@ -4284,6 +4381,7 @@ public Builder mergeAvg(com.google.datastore.v1.AggregationQuery.Aggregation.Avg
         operatorCase_ = 3;
         return this;
       }
+
       /**
        *
        *
@@ -4309,6 +4407,7 @@ public Builder clearAvg() {
         }
         return this;
       }
+
       /**
        *
        *
@@ -4321,6 +4420,7 @@ public Builder clearAvg() {
       public com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder getAvgBuilder() {
         return getAvgFieldBuilder().getBuilder();
       }
+
       /**
        *
        *
@@ -4341,6 +4441,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgO
           return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance();
         }
       }
+
       /**
        *
        *
@@ -4376,6 +4477,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgO
       }
 
       private java.lang.Object alias_ = "";
+
       /**
        *
        *
@@ -4432,6 +4534,7 @@ public java.lang.String getAlias() {
           return (java.lang.String) ref;
         }
       }
+
       /**
        *
        *
@@ -4488,6 +4591,7 @@ public com.google.protobuf.ByteString getAliasBytes() {
           return (com.google.protobuf.ByteString) ref;
         }
       }
+
       /**
        *
        *
@@ -4543,6 +4647,7 @@ public Builder setAlias(java.lang.String value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -4594,6 +4699,7 @@ public Builder clearAlias() {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -4731,6 +4837,7 @@ public enum QueryTypeCase
     private QueryTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -4762,6 +4869,7 @@ public QueryTypeCase getQueryTypeCase() {
   }
 
   public static final int NESTED_QUERY_FIELD_NUMBER = 1;
+
   /**
    *
    *
@@ -4777,6 +4885,7 @@ public QueryTypeCase getQueryTypeCase() {
   public boolean hasNestedQuery() {
     return queryTypeCase_ == 1;
   }
+
   /**
    *
    *
@@ -4795,6 +4904,7 @@ public com.google.datastore.v1.Query getNestedQuery() {
     }
     return com.google.datastore.v1.Query.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -4816,6 +4926,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
 
   @SuppressWarnings("serial")
   private java.util.List aggregations_;
+
   /**
    *
    *
@@ -4837,6 +4948,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
       getAggregationsList() {
     return aggregations_;
   }
+
   /**
    *
    *
@@ -4858,6 +4970,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
       getAggregationsOrBuilderList() {
     return aggregations_;
   }
+
   /**
    *
    *
@@ -4878,6 +4991,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
   public int getAggregationsCount() {
     return aggregations_.size();
   }
+
   /**
    *
    *
@@ -4898,6 +5012,7 @@ public int getAggregationsCount() {
   public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index) {
     return aggregations_.get(index);
   }
+
   /**
    *
    *
@@ -5104,6 +5219,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -5383,6 +5499,7 @@ public Builder clearQueryType() {
             com.google.datastore.v1.Query.Builder,
             com.google.datastore.v1.QueryOrBuilder>
         nestedQueryBuilder_;
+
     /**
      *
      *
@@ -5398,6 +5515,7 @@ public Builder clearQueryType() {
     public boolean hasNestedQuery() {
       return queryTypeCase_ == 1;
     }
+
     /**
      *
      *
@@ -5423,6 +5541,7 @@ public com.google.datastore.v1.Query getNestedQuery() {
         return com.google.datastore.v1.Query.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -5445,6 +5564,7 @@ public Builder setNestedQuery(com.google.datastore.v1.Query value) {
       queryTypeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -5464,6 +5584,7 @@ public Builder setNestedQuery(com.google.datastore.v1.Query.Builder builderForVa
       queryTypeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -5495,6 +5616,7 @@ public Builder mergeNestedQuery(com.google.datastore.v1.Query value) {
       queryTypeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -5520,6 +5642,7 @@ public Builder clearNestedQuery() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -5532,6 +5655,7 @@ public Builder clearNestedQuery() {
     public com.google.datastore.v1.Query.Builder getNestedQueryBuilder() {
       return getNestedQueryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -5552,6 +5676,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
         return com.google.datastore.v1.Query.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -5625,6 +5750,7 @@ private void ensureAggregationsIsMutable() {
         return aggregationsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -5648,6 +5774,7 @@ public int getAggregationsCount() {
         return aggregationsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -5671,6 +5798,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int
         return aggregationsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -5701,6 +5829,7 @@ public Builder setAggregations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -5728,6 +5857,7 @@ public Builder setAggregations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -5757,6 +5887,7 @@ public Builder addAggregations(com.google.datastore.v1.AggregationQuery.Aggregat
       }
       return this;
     }
+
     /**
      *
      *
@@ -5787,6 +5918,7 @@ public Builder addAggregations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -5814,6 +5946,7 @@ public Builder addAggregations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -5841,6 +5974,7 @@ public Builder addAggregations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -5868,6 +6002,7 @@ public Builder addAllAggregations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -5894,6 +6029,7 @@ public Builder clearAggregations() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -5920,6 +6056,7 @@ public Builder removeAggregations(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -5940,6 +6077,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder getAggregati
         int index) {
       return getAggregationsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -5964,6 +6102,7 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat
         return aggregationsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -5988,6 +6127,7 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat
         return java.util.Collections.unmodifiableList(aggregations_);
       }
     }
+
     /**
      *
      *
@@ -6008,6 +6148,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati
       return getAggregationsFieldBuilder()
           .addBuilder(com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -6030,6 +6171,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati
           .addBuilder(
               index, com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance());
     }
+
     /**
      *
      *
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 7f9a0a6088fa..1bced478b834 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
@@ -36,6 +36,7 @@ public interface AggregationQueryOrBuilder
    * @return Whether the nestedQuery field is set.
    */
   boolean hasNestedQuery();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface AggregationQueryOrBuilder
    * @return The nestedQuery.
    */
   com.google.datastore.v1.Query getNestedQuery();
+
   /**
    *
    *
@@ -76,6 +78,7 @@ public interface AggregationQueryOrBuilder
    * 
    */
   java.util.List getAggregationsList();
+
   /**
    *
    *
@@ -93,6 +96,7 @@ public interface AggregationQueryOrBuilder
    * 
    */
   com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index);
+
   /**
    *
    *
@@ -110,6 +114,7 @@ public interface AggregationQueryOrBuilder
    * 
    */
   int getAggregationsCount();
+
   /**
    *
    *
@@ -128,6 +133,7 @@ public interface AggregationQueryOrBuilder
    */
   java.util.List
       getAggregationsOrBuilderList();
+
   /**
    *
    *
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 358672417b57..a8af25d7469a 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
@@ -37,6 +37,7 @@ public final class AggregationResult extends com.google.protobuf.GeneratedMessag
     // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResult)
     AggregationResultOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use AggregationResult.newBuilder() to construct.
   private AggregationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -108,6 +109,7 @@ private static final class AggregatePropertiesDefaultEntryHolder {
   public int getAggregatePropertiesCount() {
     return internalGetAggregateProperties().getMap().size();
   }
+
   /**
    *
    *
@@ -129,12 +131,14 @@ public boolean containsAggregateProperties(java.lang.String key) {
     }
     return internalGetAggregateProperties().getMap().containsKey(key);
   }
+
   /** Use {@link #getAggregatePropertiesMap()} instead. */
   @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map getAggregateProperties() {
     return getAggregatePropertiesMap();
   }
+
   /**
    *
    *
@@ -154,6 +158,7 @@ public java.util.Map getAggrega
       getAggregatePropertiesMap() {
     return internalGetAggregateProperties().getMap();
   }
+
   /**
    *
    *
@@ -180,6 +185,7 @@ public java.util.Map getAggrega
         internalGetAggregateProperties().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
+
   /**
    *
    *
@@ -379,6 +385,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -611,7 +618,8 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde
           defaultEntry() {
         return AggregatePropertiesDefaultEntryHolder.defaultEntry;
       }
-    };
+    }
+    ;
 
     private static final AggregatePropertiesConverter aggregatePropertiesConverter =
         new AggregatePropertiesConverter();
@@ -653,6 +661,7 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde
     public int getAggregatePropertiesCount() {
       return internalGetAggregateProperties().ensureBuilderMap().size();
     }
+
     /**
      *
      *
@@ -674,12 +683,14 @@ public boolean containsAggregateProperties(java.lang.String key) {
       }
       return internalGetAggregateProperties().ensureBuilderMap().containsKey(key);
     }
+
     /** Use {@link #getAggregatePropertiesMap()} instead. */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map getAggregateProperties() {
       return getAggregatePropertiesMap();
     }
+
     /**
      *
      *
@@ -699,6 +710,7 @@ public java.util.Map getAggrega
         getAggregatePropertiesMap() {
       return internalGetAggregateProperties().getImmutableMap();
     }
+
     /**
      *
      *
@@ -725,6 +737,7 @@ public java.util.Map getAggrega
           internalGetMutableAggregateProperties().ensureBuilderMap();
       return map.containsKey(key) ? aggregatePropertiesConverter.build(map.get(key)) : defaultValue;
     }
+
     /**
      *
      *
@@ -757,6 +770,7 @@ public Builder clearAggregateProperties() {
       internalGetMutableAggregateProperties().clear();
       return this;
     }
+
     /**
      *
      *
@@ -778,6 +792,7 @@ public Builder removeAggregateProperties(java.lang.String key) {
       internalGetMutableAggregateProperties().ensureBuilderMap().remove(key);
       return this;
     }
+
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map
@@ -785,6 +800,7 @@ public Builder removeAggregateProperties(java.lang.String key) {
       bitField0_ |= 0x00000001;
       return internalGetMutableAggregateProperties().ensureMessageMap();
     }
+
     /**
      *
      *
@@ -811,6 +827,7 @@ public Builder putAggregateProperties(
       bitField0_ |= 0x00000001;
       return this;
     }
+
     /**
      *
      *
@@ -837,6 +854,7 @@ public Builder putAllAggregateProperties(
       bitField0_ |= 0x00000001;
       return this;
     }
+
     /**
      *
      *
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 84cfc1a97b9c..2db8614e58a7 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
@@ -33,6 +33,7 @@ public final class AggregationResultBatch extends com.google.protobuf.GeneratedM
     // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResultBatch)
     AggregationResultBatchOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use AggregationResultBatch.newBuilder() to construct.
   private AggregationResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List aggregationResults_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getAggregationResultsList() {
     return aggregationResults_;
   }
+
   /**
    *
    *
@@ -96,6 +99,7 @@ public java.util.List getAggregationR
       getAggregationResultsOrBuilderList() {
     return aggregationResults_;
   }
+
   /**
    *
    *
@@ -109,6 +113,7 @@ public java.util.List getAggregationR
   public int getAggregationResultsCount() {
     return aggregationResults_.size();
   }
+
   /**
    *
    *
@@ -122,6 +127,7 @@ public int getAggregationResultsCount() {
   public com.google.datastore.v1.AggregationResult getAggregationResults(int index) {
     return aggregationResults_.get(index);
   }
+
   /**
    *
    *
@@ -139,6 +145,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO
 
   public static final int MORE_RESULTS_FIELD_NUMBER = 2;
   private int moreResults_ = 0;
+
   /**
    *
    *
@@ -156,6 +163,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO
   public int getMoreResultsValue() {
     return moreResults_;
   }
+
   /**
    *
    *
@@ -180,6 +188,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
 
   public static final int READ_TIME_FIELD_NUMBER = 3;
   private com.google.protobuf.Timestamp readTime_;
+
   /**
    *
    *
@@ -199,6 +208,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
   public boolean hasReadTime() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -218,6 +228,7 @@ public boolean hasReadTime() {
   public com.google.protobuf.Timestamp getReadTime() {
     return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
   }
+
   /**
    *
    *
@@ -425,6 +436,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -728,6 +740,7 @@ public java.util.List getAggregationR
         return aggregationResultsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -744,6 +757,7 @@ public int getAggregationResultsCount() {
         return aggregationResultsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -760,6 +774,7 @@ public com.google.datastore.v1.AggregationResult getAggregationResults(int index
         return aggregationResultsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -783,6 +798,7 @@ public Builder setAggregationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -803,6 +819,7 @@ public Builder setAggregationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -825,6 +842,7 @@ public Builder addAggregationResults(com.google.datastore.v1.AggregationResult v
       }
       return this;
     }
+
     /**
      *
      *
@@ -848,6 +866,7 @@ public Builder addAggregationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -868,6 +887,7 @@ public Builder addAggregationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -888,6 +908,7 @@ public Builder addAggregationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -908,6 +929,7 @@ public Builder addAllAggregationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -927,6 +949,7 @@ public Builder clearAggregationResults() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -946,6 +969,7 @@ public Builder removeAggregationResults(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -959,6 +983,7 @@ public com.google.datastore.v1.AggregationResult.Builder getAggregationResultsBu
         int index) {
       return getAggregationResultsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -976,6 +1001,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO
         return aggregationResultsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -993,6 +1019,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO
         return java.util.Collections.unmodifiableList(aggregationResults_);
       }
     }
+
     /**
      *
      *
@@ -1006,6 +1033,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu
       return getAggregationResultsFieldBuilder()
           .addBuilder(com.google.datastore.v1.AggregationResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1020,6 +1048,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu
       return getAggregationResultsFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.AggregationResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1055,6 +1084,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu
     }
 
     private int moreResults_ = 0;
+
     /**
      *
      *
@@ -1072,6 +1102,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu
     public int getMoreResultsValue() {
       return moreResults_;
     }
+
     /**
      *
      *
@@ -1092,6 +1123,7 @@ public Builder setMoreResultsValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1113,6 +1145,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
           ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
           : result;
     }
+
     /**
      *
      *
@@ -1136,6 +1169,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1162,6 +1196,7 @@ public Builder clearMoreResults() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         readTimeBuilder_;
+
     /**
      *
      *
@@ -1180,6 +1215,7 @@ public Builder clearMoreResults() {
     public boolean hasReadTime() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1202,6 +1238,7 @@ public com.google.protobuf.Timestamp getReadTime() {
         return readTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1228,6 +1265,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1251,6 +1289,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1282,6 +1321,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1305,6 +1345,7 @@ public Builder clearReadTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1323,6 +1364,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
       onChanged();
       return getReadTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1343,6 +1385,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
         return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
       }
     }
+
     /**
      *
      *
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 c75fce0f37c9..0c8ebc3fda2d 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
@@ -34,6 +34,7 @@ public interface AggregationResultBatchOrBuilder
    * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
    */
   java.util.List getAggregationResultsList();
+
   /**
    *
    *
@@ -44,6 +45,7 @@ public interface AggregationResultBatchOrBuilder
    * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
    */
   com.google.datastore.v1.AggregationResult getAggregationResults(int index);
+
   /**
    *
    *
@@ -54,6 +56,7 @@ public interface AggregationResultBatchOrBuilder
    * repeated .google.datastore.v1.AggregationResult aggregation_results = 1;
    */
   int getAggregationResultsCount();
+
   /**
    *
    *
@@ -65,6 +68,7 @@ public interface AggregationResultBatchOrBuilder
    */
   java.util.List
       getAggregationResultsOrBuilderList();
+
   /**
    *
    *
@@ -90,6 +94,7 @@ public interface AggregationResultBatchOrBuilder
    * @return The enum numeric value on the wire for moreResults.
    */
   int getMoreResultsValue();
+
   /**
    *
    *
@@ -121,6 +126,7 @@ public interface AggregationResultBatchOrBuilder
    * @return Whether the readTime field is set.
    */
   boolean hasReadTime();
+
   /**
    *
    *
@@ -137,6 +143,7 @@ public interface AggregationResultBatchOrBuilder
    * @return The readTime.
    */
   com.google.protobuf.Timestamp getReadTime();
+
   /**
    *
    *
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 8bdf749c3756..94e573e78893 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
@@ -39,6 +39,7 @@ public interface AggregationResultOrBuilder
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
    */
   int getAggregatePropertiesCount();
+
   /**
    *
    *
@@ -54,9 +55,11 @@ public interface AggregationResultOrBuilder
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
    */
   boolean containsAggregateProperties(java.lang.String key);
+
   /** Use {@link #getAggregatePropertiesMap()} instead. */
   @java.lang.Deprecated
   java.util.Map getAggregateProperties();
+
   /**
    *
    *
@@ -72,6 +75,7 @@ public interface AggregationResultOrBuilder
    * map<string, .google.datastore.v1.Value> aggregate_properties = 2;
    */
   java.util.Map getAggregatePropertiesMap();
+
   /**
    *
    *
@@ -91,6 +95,7 @@ com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
       java.lang.String key,
       /* nullable */
       com.google.datastore.v1.Value defaultValue);
+
   /**
    *
    *
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 ba8b762c56dd..b3bd50bd51e0 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
@@ -34,6 +34,7 @@ public final class AllocateIdsRequest extends com.google.protobuf.GeneratedMessa
     // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsRequest)
     AllocateIdsRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use AllocateIdsRequest.newBuilder() to construct.
   private AllocateIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -93,6 +95,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -178,6 +183,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   @SuppressWarnings("serial")
   private java.util.List keys_;
+
   /**
    *
    *
@@ -193,6 +199,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public java.util.List getKeysList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -208,6 +215,7 @@ public java.util.List getKeysList() {
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -223,6 +231,7 @@ public java.util.List getKeysOrB
   public int getKeysCount() {
     return keys_.size();
   }
+
   /**
    *
    *
@@ -238,6 +247,7 @@ public int getKeysCount() {
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
+
   /**
    *
    *
@@ -433,6 +443,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -691,6 +702,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -713,6 +725,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -735,6 +748,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -756,6 +770,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -773,6 +788,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -797,6 +813,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -822,6 +839,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -847,6 +865,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -871,6 +890,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -891,6 +911,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -950,6 +971,7 @@ public java.util.List getKeysList() {
         return keysBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -968,6 +990,7 @@ public int getKeysCount() {
         return keysBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -986,6 +1009,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
         return keysBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1010,6 +1034,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1031,6 +1056,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -1055,6 +1081,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1079,6 +1106,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1100,6 +1128,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1121,6 +1150,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -1142,6 +1172,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB
         return java.util.Collections.unmodifiableList(keys_);
       }
     }
+
     /**
      *
      *
@@ -1248,6 +1284,7 @@ public java.util.List getKeysOrB
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
       return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1263,6 +1300,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
       return getKeysFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
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 92532d1f72ec..13d3009e7c09 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
@@ -36,6 +36,7 @@ public interface AllocateIdsRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface AllocateIdsRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public interface AllocateIdsRequestOrBuilder
    * 
    */
   java.util.List getKeysList();
+
   /**
    *
    *
@@ -104,6 +107,7 @@ public interface AllocateIdsRequestOrBuilder
    * 
    */
   com.google.datastore.v1.Key getKeys(int index);
+
   /**
    *
    *
@@ -116,6 +120,7 @@ public interface AllocateIdsRequestOrBuilder
    * 
    */
   int getKeysCount();
+
   /**
    *
    *
@@ -128,6 +133,7 @@ public interface AllocateIdsRequestOrBuilder
    * 
    */
   java.util.List getKeysOrBuilderList();
+
   /**
    *
    *
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 d741665c8d42..b7e67dcc0e17 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
@@ -34,6 +34,7 @@ public final class AllocateIdsResponse extends com.google.protobuf.GeneratedMess
     // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsResponse)
     AllocateIdsResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use AllocateIdsResponse.newBuilder() to construct.
   private AllocateIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -68,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List keys_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getKeysList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -96,6 +99,7 @@ public java.util.List getKeysList() {
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -110,6 +114,7 @@ public java.util.List getKeysOrB
   public int getKeysCount() {
     return keys_.size();
   }
+
   /**
    *
    *
@@ -124,6 +129,7 @@ public int getKeysCount() {
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
+
   /**
    *
    *
@@ -300,6 +306,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -559,6 +566,7 @@ public java.util.List getKeysList() {
         return keysBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -576,6 +584,7 @@ public int getKeysCount() {
         return keysBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -593,6 +602,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
         return keysBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -616,6 +626,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -636,6 +647,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -659,6 +671,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -682,6 +695,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -702,6 +716,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -722,6 +737,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -742,6 +758,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB
         return java.util.Collections.unmodifiableList(keys_);
       }
     }
+
     /**
      *
      *
@@ -842,6 +864,7 @@ public java.util.List getKeysOrB
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
       return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -856,6 +879,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
       return getKeysFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 1624266d1692..6dbcd866d00b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -35,6 +35,7 @@ public interface AllocateIdsResponseOrBuilder
    * repeated .google.datastore.v1.Key keys = 1;
    */
   java.util.List getKeysList();
+
   /**
    *
    *
@@ -46,6 +47,7 @@ public interface AllocateIdsResponseOrBuilder
    * repeated .google.datastore.v1.Key keys = 1;
    */
   com.google.datastore.v1.Key getKeys(int index);
+
   /**
    *
    *
@@ -57,6 +59,7 @@ public interface AllocateIdsResponseOrBuilder
    * repeated .google.datastore.v1.Key keys = 1;
    */
   int getKeysCount();
+
   /**
    *
    *
@@ -68,6 +71,7 @@ public interface AllocateIdsResponseOrBuilder
    * repeated .google.datastore.v1.Key keys = 1;
    */
   java.util.List getKeysOrBuilderList();
+
   /**
    *
    *
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 64ac1d115a72..0d73c1fa7180 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
@@ -33,6 +33,7 @@ public final class ArrayValue extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ArrayValue)
     ArrayValueOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ArrayValue.newBuilder() to construct.
   private ArrayValue(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List values_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getValuesList() {
     return values_;
   }
+
   /**
    *
    *
@@ -97,6 +100,7 @@ public java.util.List getValuesList() {
   public java.util.List getValuesOrBuilderList() {
     return values_;
   }
+
   /**
    *
    *
@@ -112,6 +116,7 @@ public java.util.List getValue
   public int getValuesCount() {
     return values_.size();
   }
+
   /**
    *
    *
@@ -127,6 +132,7 @@ public int getValuesCount() {
   public com.google.datastore.v1.Value getValues(int index) {
     return values_.get(index);
   }
+
   /**
    *
    *
@@ -302,6 +308,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -561,6 +568,7 @@ public java.util.List getValuesList() {
         return valuesBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -579,6 +587,7 @@ public int getValuesCount() {
         return valuesBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -597,6 +606,7 @@ public com.google.datastore.v1.Value getValues(int index) {
         return valuesBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -621,6 +631,7 @@ public Builder setValues(int index, com.google.datastore.v1.Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -642,6 +653,7 @@ public Builder setValues(int index, com.google.datastore.v1.Value.Builder builde
       }
       return this;
     }
+
     /**
      *
      *
@@ -666,6 +678,7 @@ public Builder addValues(com.google.datastore.v1.Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -690,6 +703,7 @@ public Builder addValues(int index, com.google.datastore.v1.Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -711,6 +725,7 @@ public Builder addValues(com.google.datastore.v1.Value.Builder builderForValue)
       }
       return this;
     }
+
     /**
      *
      *
@@ -732,6 +747,7 @@ public Builder addValues(int index, com.google.datastore.v1.Value.Builder builde
       }
       return this;
     }
+
     /**
      *
      *
@@ -754,6 +770,7 @@ public Builder addAllValues(
       }
       return this;
     }
+
     /**
      *
      *
@@ -775,6 +792,7 @@ public Builder clearValues() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -796,6 +814,7 @@ public Builder removeValues(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -810,6 +829,7 @@ public Builder removeValues(int index) {
     public com.google.datastore.v1.Value.Builder getValuesBuilder(int index) {
       return getValuesFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -828,6 +848,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
         return valuesBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -847,6 +868,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
         return java.util.Collections.unmodifiableList(values_);
       }
     }
+
     /**
      *
      *
@@ -861,6 +883,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
     public com.google.datastore.v1.Value.Builder addValuesBuilder() {
       return getValuesFieldBuilder().addBuilder(com.google.datastore.v1.Value.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -876,6 +899,7 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder(int index) {
       return getValuesFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance());
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index d9a3fe96dd1b..c6d447186b9c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -36,6 +36,7 @@ public interface ArrayValueOrBuilder
    * repeated .google.datastore.v1.Value values = 1;
    */
   java.util.List getValuesList();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface ArrayValueOrBuilder
    * repeated .google.datastore.v1.Value values = 1;
    */
   com.google.datastore.v1.Value getValues(int index);
+
   /**
    *
    *
@@ -60,6 +62,7 @@ public interface ArrayValueOrBuilder
    * repeated .google.datastore.v1.Value values = 1;
    */
   int getValuesCount();
+
   /**
    *
    *
@@ -72,6 +75,7 @@ public interface ArrayValueOrBuilder
    * repeated .google.datastore.v1.Value values = 1;
    */
   java.util.List getValuesOrBuilderList();
+
   /**
    *
    *
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 70db0864871f..6fdef6176df3 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
@@ -34,6 +34,7 @@ public final class BeginTransactionRequest extends com.google.protobuf.Generated
     // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionRequest)
     BeginTransactionRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use BeginTransactionRequest.newBuilder() to construct.
   private BeginTransactionRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -93,6 +95,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -176,6 +181,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   public static final int TRANSACTION_OPTIONS_FIELD_NUMBER = 10;
   private com.google.datastore.v1.TransactionOptions transactionOptions_;
+
   /**
    *
    *
@@ -191,6 +197,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public boolean hasTransactionOptions() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -208,6 +215,7 @@ public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
         ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
         : transactionOptions_;
   }
+
   /**
    *
    *
@@ -406,6 +414,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -639,6 +648,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -661,6 +671,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -683,6 +694,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -704,6 +716,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -721,6 +734,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -745,6 +759,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -770,6 +785,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -795,6 +811,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -819,6 +836,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -839,6 +857,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -871,6 +890,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
             com.google.datastore.v1.TransactionOptions.Builder,
             com.google.datastore.v1.TransactionOptionsOrBuilder>
         transactionOptionsBuilder_;
+
     /**
      *
      *
@@ -885,6 +905,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     public boolean hasTransactionOptions() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -905,6 +926,7 @@ public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
         return transactionOptionsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -927,6 +949,7 @@ public Builder setTransactionOptions(com.google.datastore.v1.TransactionOptions
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -947,6 +970,7 @@ public Builder setTransactionOptions(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -975,6 +999,7 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption
       }
       return this;
     }
+
     /**
      *
      *
@@ -994,6 +1019,7 @@ public Builder clearTransactionOptions() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1008,6 +1034,7 @@ public com.google.datastore.v1.TransactionOptions.Builder getTransactionOptionsB
       onChanged();
       return getTransactionOptionsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1026,6 +1053,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
             : transactionOptions_;
       }
     }
+
     /**
      *
      *
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 38e18ec75ede..9441e577d6d7 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
@@ -36,6 +36,7 @@ public interface BeginTransactionRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface BeginTransactionRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public interface BeginTransactionRequestOrBuilder
    * @return Whether the transactionOptions field is set.
    */
   boolean hasTransactionOptions();
+
   /**
    *
    *
@@ -104,6 +107,7 @@ public interface BeginTransactionRequestOrBuilder
    * @return The transactionOptions.
    */
   com.google.datastore.v1.TransactionOptions getTransactionOptions();
+
   /**
    *
    *
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 fcca145c2a83..839dab467ac2 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
@@ -34,6 +34,7 @@ public final class BeginTransactionResponse extends com.google.protobuf.Generate
     // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionResponse)
     BeginTransactionResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use BeginTransactionResponse.newBuilder() to construct.
   private BeginTransactionResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -241,6 +243,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -424,6 +427,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -439,6 +443,7 @@ public Builder mergeFrom(
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
+
     /**
      *
      *
@@ -460,6 +465,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 27db571723d6..3189b3fa6f06 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
@@ -33,6 +33,7 @@ public final class CommitRequest extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitRequest)
     CommitRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use CommitRequest.newBuilder() to construct.
   private CommitRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -121,6 +122,7 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      * MODE_UNSPECIFIED = 0;
      */
     public static final int MODE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -133,6 +135,7 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      * TRANSACTIONAL = 1;
      */
     public static final int TRANSACTIONAL_VALUE = 1;
+
     /**
      *
      *
@@ -244,6 +247,7 @@ public enum TransactionSelectorCase
     private TransactionSelectorCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -280,6 +284,7 @@ public TransactionSelectorCase getTransactionSelectorCase() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -303,6 +308,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -331,6 +337,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -357,6 +364,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -386,6 +394,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   public static final int MODE_FIELD_NUMBER = 5;
   private int mode_ = 0;
+
   /**
    *
    *
@@ -401,6 +410,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public int getModeValue() {
     return mode_;
   }
+
   /**
    *
    *
@@ -420,6 +430,7 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
+
   /**
    *
    *
@@ -437,6 +448,7 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
   public boolean hasTransaction() {
     return transactionSelectorCase_ == 1;
   }
+
   /**
    *
    *
@@ -459,6 +471,7 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   public static final int SINGLE_USE_TRANSACTION_FIELD_NUMBER = 10;
+
   /**
    *
    *
@@ -477,6 +490,7 @@ public com.google.protobuf.ByteString getTransaction() {
   public boolean hasSingleUseTransaction() {
     return transactionSelectorCase_ == 10;
   }
+
   /**
    *
    *
@@ -498,6 +512,7 @@ public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() {
     }
     return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -522,6 +537,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti
 
   @SuppressWarnings("serial")
   private java.util.List mutations_;
+
   /**
    *
    *
@@ -547,6 +563,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti
   public java.util.List getMutationsList() {
     return mutations_;
   }
+
   /**
    *
    *
@@ -573,6 +590,7 @@ public java.util.List getMutationsList() {
       getMutationsOrBuilderList() {
     return mutations_;
   }
+
   /**
    *
    *
@@ -598,6 +616,7 @@ public java.util.List getMutationsList() {
   public int getMutationsCount() {
     return mutations_.size();
   }
+
   /**
    *
    *
@@ -623,6 +642,7 @@ public int getMutationsCount() {
   public com.google.datastore.v1.Mutation getMutations(int index) {
     return mutations_.get(index);
   }
+
   /**
    *
    *
@@ -874,6 +894,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1201,6 +1222,7 @@ public Builder clearTransactionSelector() {
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -1223,6 +1245,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1245,6 +1268,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1266,6 +1290,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1283,6 +1308,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1307,6 +1333,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -1332,6 +1359,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1357,6 +1385,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1381,6 +1410,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1401,6 +1431,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1428,6 +1459,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private int mode_ = 0;
+
     /**
      *
      *
@@ -1443,6 +1475,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     public int getModeValue() {
       return mode_;
     }
+
     /**
      *
      *
@@ -1461,6 +1494,7 @@ public Builder setModeValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1478,6 +1512,7 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
           com.google.datastore.v1.CommitRequest.Mode.forNumber(mode_);
       return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -1499,6 +1534,7 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1533,6 +1569,7 @@ public Builder clearMode() {
     public boolean hasTransaction() {
       return transactionSelectorCase_ == 1;
     }
+
     /**
      *
      *
@@ -1552,6 +1589,7 @@ public com.google.protobuf.ByteString getTransaction() {
       }
       return com.google.protobuf.ByteString.EMPTY;
     }
+
     /**
      *
      *
@@ -1575,6 +1613,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1602,6 +1641,7 @@ public Builder clearTransaction() {
             com.google.datastore.v1.TransactionOptions.Builder,
             com.google.datastore.v1.TransactionOptionsOrBuilder>
         singleUseTransactionBuilder_;
+
     /**
      *
      *
@@ -1620,6 +1660,7 @@ public Builder clearTransaction() {
     public boolean hasSingleUseTransaction() {
       return transactionSelectorCase_ == 10;
     }
+
     /**
      *
      *
@@ -1648,6 +1689,7 @@ public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() {
         return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1673,6 +1715,7 @@ public Builder setSingleUseTransaction(com.google.datastore.v1.TransactionOption
       transactionSelectorCase_ = 10;
       return this;
     }
+
     /**
      *
      *
@@ -1696,6 +1739,7 @@ public Builder setSingleUseTransaction(
       transactionSelectorCase_ = 10;
       return this;
     }
+
     /**
      *
      *
@@ -1732,6 +1776,7 @@ public Builder mergeSingleUseTransaction(com.google.datastore.v1.TransactionOpti
       transactionSelectorCase_ = 10;
       return this;
     }
+
     /**
      *
      *
@@ -1760,6 +1805,7 @@ public Builder clearSingleUseTransaction() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1775,6 +1821,7 @@ public Builder clearSingleUseTransaction() {
     public com.google.datastore.v1.TransactionOptions.Builder getSingleUseTransactionBuilder() {
       return getSingleUseTransactionFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1798,6 +1845,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti
         return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1878,6 +1926,7 @@ public java.util.List getMutationsList() {
         return mutationsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1906,6 +1955,7 @@ public int getMutationsCount() {
         return mutationsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1934,6 +1984,7 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
         return mutationsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1968,6 +2019,7 @@ public Builder setMutations(int index, com.google.datastore.v1.Mutation value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2000,6 +2052,7 @@ public Builder setMutations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2034,6 +2087,7 @@ public Builder addMutations(com.google.datastore.v1.Mutation value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2068,6 +2122,7 @@ public Builder addMutations(int index, com.google.datastore.v1.Mutation value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2099,6 +2154,7 @@ public Builder addMutations(com.google.datastore.v1.Mutation.Builder builderForV
       }
       return this;
     }
+
     /**
      *
      *
@@ -2131,6 +2187,7 @@ public Builder addMutations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2163,6 +2220,7 @@ public Builder addAllMutations(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2194,6 +2252,7 @@ public Builder clearMutations() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2225,6 +2284,7 @@ public Builder removeMutations(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2249,6 +2309,7 @@ public Builder removeMutations(int index) {
     public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(int index) {
       return getMutationsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -2277,6 +2338,7 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index
         return mutationsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -2306,6 +2368,7 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index
         return java.util.Collections.unmodifiableList(mutations_);
       }
     }
+
     /**
      *
      *
@@ -2331,6 +2394,7 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() {
       return getMutationsFieldBuilder()
           .addBuilder(com.google.datastore.v1.Mutation.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2356,6 +2420,7 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(int index) {
       return getMutationsFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Mutation.getDefaultInstance());
     }
+
     /**
      *
      *
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 02dd0e53b539..2602a23f5399 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
@@ -36,6 +36,7 @@ public interface CommitRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface CommitRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public interface CommitRequestOrBuilder
    * @return The enum numeric value on the wire for mode.
    */
   int getModeValue();
+
   /**
    *
    *
@@ -119,6 +122,7 @@ public interface CommitRequestOrBuilder
    * @return Whether the transaction field is set.
    */
   boolean hasTransaction();
+
   /**
    *
    *
@@ -149,6 +153,7 @@ public interface CommitRequestOrBuilder
    * @return Whether the singleUseTransaction field is set.
    */
   boolean hasSingleUseTransaction();
+
   /**
    *
    *
@@ -164,6 +169,7 @@ public interface CommitRequestOrBuilder
    * @return The singleUseTransaction.
    */
   com.google.datastore.v1.TransactionOptions getSingleUseTransaction();
+
   /**
    *
    *
@@ -200,6 +206,7 @@ public interface CommitRequestOrBuilder
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
   java.util.List getMutationsList();
+
   /**
    *
    *
@@ -222,6 +229,7 @@ public interface CommitRequestOrBuilder
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
   com.google.datastore.v1.Mutation getMutations(int index);
+
   /**
    *
    *
@@ -244,6 +252,7 @@ public interface CommitRequestOrBuilder
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
   int getMutationsCount();
+
   /**
    *
    *
@@ -266,6 +275,7 @@ public interface CommitRequestOrBuilder
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
   java.util.List getMutationsOrBuilderList();
+
   /**
    *
    *
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 1c99dbe42850..51aadd20bdd8 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
@@ -33,6 +33,7 @@ public final class CommitResponse extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitResponse)
     CommitResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use CommitResponse.newBuilder() to construct.
   private CommitResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -68,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List mutationResults_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getMutationResultsList() {
     return mutationResults_;
   }
+
   /**
    *
    *
@@ -97,6 +100,7 @@ public java.util.List getMutationResults
       getMutationResultsOrBuilderList() {
     return mutationResults_;
   }
+
   /**
    *
    *
@@ -111,6 +115,7 @@ public java.util.List getMutationResults
   public int getMutationResultsCount() {
     return mutationResults_.size();
   }
+
   /**
    *
    *
@@ -125,6 +130,7 @@ public int getMutationResultsCount() {
   public com.google.datastore.v1.MutationResult getMutationResults(int index) {
     return mutationResults_.get(index);
   }
+
   /**
    *
    *
@@ -142,6 +148,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
 
   public static final int INDEX_UPDATES_FIELD_NUMBER = 4;
   private int indexUpdates_ = 0;
+
   /**
    *
    *
@@ -161,6 +168,7 @@ public int getIndexUpdates() {
 
   public static final int COMMIT_TIME_FIELD_NUMBER = 8;
   private com.google.protobuf.Timestamp commitTime_;
+
   /**
    *
    *
@@ -176,6 +184,7 @@ public int getIndexUpdates() {
   public boolean hasCommitTime() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -191,6 +200,7 @@ public boolean hasCommitTime() {
   public com.google.protobuf.Timestamp getCommitTime() {
     return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_;
   }
+
   /**
    *
    *
@@ -388,6 +398,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -692,6 +703,7 @@ public java.util.List getMutationResults
         return mutationResultsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -709,6 +721,7 @@ public int getMutationResultsCount() {
         return mutationResultsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -726,6 +739,7 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
         return mutationResultsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -749,6 +763,7 @@ public Builder setMutationResults(int index, com.google.datastore.v1.MutationRes
       }
       return this;
     }
+
     /**
      *
      *
@@ -770,6 +785,7 @@ public Builder setMutationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -793,6 +809,7 @@ public Builder addMutationResults(com.google.datastore.v1.MutationResult value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -816,6 +833,7 @@ public Builder addMutationResults(int index, com.google.datastore.v1.MutationRes
       }
       return this;
     }
+
     /**
      *
      *
@@ -837,6 +855,7 @@ public Builder addMutationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -858,6 +877,7 @@ public Builder addMutationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -879,6 +899,7 @@ public Builder addAllMutationResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -899,6 +920,7 @@ public Builder clearMutationResults() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -919,6 +941,7 @@ public Builder removeMutationResults(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -932,6 +955,7 @@ public Builder removeMutationResults(int index) {
     public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(int index) {
       return getMutationResultsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -949,6 +973,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
         return mutationResultsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -967,6 +992,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
         return java.util.Collections.unmodifiableList(mutationResults_);
       }
     }
+
     /**
      *
      *
@@ -981,6 +1007,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
       return getMutationResultsFieldBuilder()
           .addBuilder(com.google.datastore.v1.MutationResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -995,6 +1022,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
       return getMutationResultsFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.MutationResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1031,6 +1059,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
     }
 
     private int indexUpdates_;
+
     /**
      *
      *
@@ -1047,6 +1076,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
     public int getIndexUpdates() {
       return indexUpdates_;
     }
+
     /**
      *
      *
@@ -1067,6 +1097,7 @@ public Builder setIndexUpdates(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1092,6 +1123,7 @@ public Builder clearIndexUpdates() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         commitTimeBuilder_;
+
     /**
      *
      *
@@ -1106,6 +1138,7 @@ public Builder clearIndexUpdates() {
     public boolean hasCommitTime() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1126,6 +1159,7 @@ public com.google.protobuf.Timestamp getCommitTime() {
         return commitTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1148,6 +1182,7 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1167,6 +1202,7 @@ public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForVal
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1194,6 +1230,7 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1213,6 +1250,7 @@ public Builder clearCommitTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1227,6 +1265,7 @@ public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() {
       onChanged();
       return getCommitTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1245,6 +1284,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
             : commitTime_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 14881db57e04..734dab60a098 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -35,6 +35,7 @@ public interface CommitResponseOrBuilder
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
   java.util.List getMutationResultsList();
+
   /**
    *
    *
@@ -46,6 +47,7 @@ public interface CommitResponseOrBuilder
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
   com.google.datastore.v1.MutationResult getMutationResults(int index);
+
   /**
    *
    *
@@ -57,6 +59,7 @@ public interface CommitResponseOrBuilder
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
   int getMutationResultsCount();
+
   /**
    *
    *
@@ -69,6 +72,7 @@ public interface CommitResponseOrBuilder
    */
   java.util.List
       getMutationResultsOrBuilderList();
+
   /**
    *
    *
@@ -107,6 +111,7 @@ public interface CommitResponseOrBuilder
    * @return Whether the commitTime field is set.
    */
   boolean hasCommitTime();
+
   /**
    *
    *
@@ -119,6 +124,7 @@ public interface CommitResponseOrBuilder
    * @return The commitTime.
    */
   com.google.protobuf.Timestamp getCommitTime();
+
   /**
    *
    *
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 549b6c60d824..48ce71656821 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
@@ -33,6 +33,7 @@ public final class CompositeFilter extends com.google.protobuf.GeneratedMessageV
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CompositeFilter)
     CompositeFilterOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use CompositeFilter.newBuilder() to construct.
   private CompositeFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -117,6 +118,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * OPERATOR_UNSPECIFIED = 0;
      */
     public static final int OPERATOR_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -127,6 +129,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * AND = 1;
      */
     public static final int AND_VALUE = 1;
+
     /**
      *
      *
@@ -223,6 +226,7 @@ private Operator(int value) {
 
   public static final int OP_FIELD_NUMBER = 1;
   private int op_ = 0;
+
   /**
    *
    *
@@ -238,6 +242,7 @@ private Operator(int value) {
   public int getOpValue() {
     return op_;
   }
+
   /**
    *
    *
@@ -260,6 +265,7 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
 
   @SuppressWarnings("serial")
   private java.util.List filters_;
+
   /**
    *
    *
@@ -277,6 +283,7 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
   public java.util.List getFiltersList() {
     return filters_;
   }
+
   /**
    *
    *
@@ -295,6 +302,7 @@ public java.util.List getFiltersList() {
       getFiltersOrBuilderList() {
     return filters_;
   }
+
   /**
    *
    *
@@ -312,6 +320,7 @@ public java.util.List getFiltersList() {
   public int getFiltersCount() {
     return filters_.size();
   }
+
   /**
    *
    *
@@ -329,6 +338,7 @@ public int getFiltersCount() {
   public com.google.datastore.v1.Filter getFilters(int index) {
     return filters_.get(index);
   }
+
   /**
    *
    *
@@ -516,6 +526,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -756,6 +767,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private int op_ = 0;
+
     /**
      *
      *
@@ -771,6 +783,7 @@ public Builder mergeFrom(
     public int getOpValue() {
       return op_;
     }
+
     /**
      *
      *
@@ -789,6 +802,7 @@ public Builder setOpValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -808,6 +822,7 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
           ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED
           : result;
     }
+
     /**
      *
      *
@@ -829,6 +844,7 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -883,6 +899,7 @@ public java.util.List getFiltersList() {
         return filtersBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -903,6 +920,7 @@ public int getFiltersCount() {
         return filtersBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -923,6 +941,7 @@ public com.google.datastore.v1.Filter getFilters(int index) {
         return filtersBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -949,6 +968,7 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -972,6 +992,7 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder buil
       }
       return this;
     }
+
     /**
      *
      *
@@ -998,6 +1019,7 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1024,6 +1046,7 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1047,6 +1070,7 @@ public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue
       }
       return this;
     }
+
     /**
      *
      *
@@ -1070,6 +1094,7 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder buil
       }
       return this;
     }
+
     /**
      *
      *
@@ -1094,6 +1119,7 @@ public Builder addAllFilters(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1117,6 +1143,7 @@ public Builder clearFilters() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1140,6 +1167,7 @@ public Builder removeFilters(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1156,6 +1184,7 @@ public Builder removeFilters(int index) {
     public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) {
       return getFiltersFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -1176,6 +1205,7 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
         return filtersBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -1197,6 +1227,7 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
         return java.util.Collections.unmodifiableList(filters_);
       }
     }
+
     /**
      *
      *
@@ -1214,6 +1245,7 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
       return getFiltersFieldBuilder()
           .addBuilder(com.google.datastore.v1.Filter.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1231,6 +1263,7 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) {
       return getFiltersFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Filter.getDefaultInstance());
     }
+
     /**
      *
      *
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 43f56bd57bdd..da11961a0fa9 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
@@ -36,6 +36,7 @@ public interface CompositeFilterOrBuilder
    * @return The enum numeric value on the wire for op.
    */
   int getOpValue();
+
   /**
    *
    *
@@ -63,6 +64,7 @@ public interface CompositeFilterOrBuilder
    * repeated .google.datastore.v1.Filter filters = 2;
    */
   java.util.List getFiltersList();
+
   /**
    *
    *
@@ -77,6 +79,7 @@ public interface CompositeFilterOrBuilder
    * repeated .google.datastore.v1.Filter filters = 2;
    */
   com.google.datastore.v1.Filter getFilters(int index);
+
   /**
    *
    *
@@ -91,6 +94,7 @@ public interface CompositeFilterOrBuilder
    * repeated .google.datastore.v1.Filter filters = 2;
    */
   int getFiltersCount();
+
   /**
    *
    *
@@ -105,6 +109,7 @@ public interface CompositeFilterOrBuilder
    * repeated .google.datastore.v1.Filter filters = 2;
    */
   java.util.List getFiltersOrBuilderList();
+
   /**
    *
    *
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 2764eb38fc9f..b7fd2e6b5ed4 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
@@ -133,181 +133,213 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     java.lang.String[] descriptorData = {
-      "\n#google/datastore/v1/datastore.proto\022\023g"
+      "\n"
+          + "#google/datastore/v1/datastore.proto\022\023g"
           + "oogle.datastore.v1\032\034google/api/annotatio"
           + "ns.proto\032\027google/api/client.proto\032\037googl"
           + "e/api/field_behavior.proto\032\030google/api/r"
-          + "outing.proto\032,google/datastore/v1/aggreg"
-          + "ation_result.proto\032 google/datastore/v1/"
+          + "outing.proto\032,google/datastore/v1/aggregation_result.proto\032 google/datastore/v1/"
           + "entity.proto\032\037google/datastore/v1/query."
           + "proto\032\'google/datastore/v1/query_profile"
-          + ".proto\032\037google/protobuf/timestamp.proto\""
-          + "\334\001\n\rLookupRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
-          + "A\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\0228\n\rproperty_mask\030\005 \001(\0132!.google.dat"
-          + "astore.v1.PropertyMask\"\346\001\n\016LookupRespons"
-          + "e\0220\n\005found\030\001 \003(\0132!.google.datastore.v1.E"
-          + "ntityResult\0222\n\007missing\030\002 \003(\0132!.google.da"
-          + "tastore.v1.EntityResult\022*\n\010deferred\030\003 \003("
-          + "\0132\030.google.datastore.v1.Key\022\023\n\013transacti"
-          + "on\030\005 \001(\014\022-\n\tread_time\030\007 \001(\0132\032.google.pro"
-          + "tobuf.Timestamp\"\233\003\n\017RunQueryRequest\022\027\n\np"
-          + "roject_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.datasto"
-          + "re.v1.PartitionId\0226\n\014read_options\030\001 \001(\0132"
-          + " .google.datastore.v1.ReadOptions\022+\n\005que"
-          + "ry\030\003 \001(\0132\032.google.datastore.v1.QueryH\000\0222"
-          + "\n\tgql_query\030\007 \001(\0132\035.google.datastore.v1."
-          + "GqlQueryH\000\0228\n\rproperty_mask\030\n \001(\0132!.goog"
-          + "le.datastore.v1.PropertyMask\022A\n\017explain_"
-          + "options\030\014 \001(\0132#.google.datastore.v1.Expl"
-          + "ainOptionsB\003\340A\001B\014\n\nquery_type\"\306\001\n\020RunQue"
-          + "ryResponse\0224\n\005batch\030\001 \001(\0132%.google.datas"
-          + "tore.v1.QueryResultBatch\022)\n\005query\030\002 \001(\0132"
-          + "\032.google.datastore.v1.Query\022\023\n\013transacti"
-          + "on\030\005 \001(\014\022<\n\017explain_metrics\030\t \001(\0132#.goog"
-          + "le.datastore.v1.ExplainMetrics\"\203\003\n\032RunAg"
-          + "gregationQueryRequest\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.Partitio"
-          + "nId\0226\n\014read_options\030\001 \001(\0132 .google.datas"
-          + "tore.v1.ReadOptions\022B\n\021aggregation_query"
-          + "\030\003 \001(\0132%.google.datastore.v1.Aggregation"
-          + "QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.data"
-          + "store.v1.GqlQueryH\000\022A\n\017explain_options\030\013"
-          + " \001(\0132#.google.datastore.v1.ExplainOption"
-          + "sB\003\340A\001B\014\n\nquery_type\"\342\001\n\033RunAggregationQ"
-          + "ueryResponse\022:\n\005batch\030\001 \001(\0132+.google.dat"
-          + "astore.v1.AggregationResultBatch\0224\n\005quer"
-          + "y\030\002 \001(\0132%.google.datastore.v1.Aggregatio"
-          + "nQuery\022\023\n\013transaction\030\005 \001(\014\022<\n\017explain_m"
-          + "etrics\030\t \001(\0132#.google.datastore.v1.Expla"
-          + "inMetrics\"\215\001\n\027BeginTransactionRequest\022\027\n"
-          + "\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t "
-          + "\001(\t\022D\n\023transaction_options\030\n \001(\0132\'.googl"
-          + "e.datastore.v1.TransactionOptions\"/\n\030Beg"
-          + "inTransactionResponse\022\023\n\013transaction\030\001 \001"
-          + "(\014\"Y\n\017RollbackRequest\022\027\n\nproject_id\030\010 \001("
-          + "\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022\030\n\013transacti"
-          + "on\030\001 \001(\014B\003\340A\002\"\022\n\020RollbackResponse\"\350\002\n\rCo"
-          + "mmitRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013"
-          + "database_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.google"
-          + ".datastore.v1.CommitRequest.Mode\022\025\n\013tran"
-          + "saction\030\001 \001(\014H\000\022I\n\026single_use_transactio"
-          + "n\030\n \001(\0132\'.google.datastore.v1.Transactio"
-          + "nOptionsH\000\0220\n\tmutations\030\006 \003(\0132\035.google.d"
-          + "atastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_UNS"
-          + "PECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_TRA"
-          + "NSACTIONAL\020\002B\026\n\024transaction_selector\"\227\001\n"
-          + "\016CommitResponse\022=\n\020mutation_results\030\003 \003("
-          + "\0132#.google.datastore.v1.MutationResult\022\025"
-          + "\n\rindex_updates\030\004 \001(\005\022/\n\013commit_time\030\010 \001"
-          + "(\0132\032.google.protobuf.Timestamp\"o\n\022Alloca"
-          + "teIdsRequest\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\"=\n\023AllocateIdsRe"
-          + "sponse\022&\n\004keys\030\001 \003(\0132\030.google.datastore."
-          + "v1.Key\"n\n\021ReserveIdsRequest\022\027\n\nproject_i"
-          + "d\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022+\n\004key"
-          + "s\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\"\024"
-          + "\n\022ReserveIdsResponse\"\362\004\n\010Mutation\022-\n\006ins"
-          + "ert\030\004 \001(\0132\033.google.datastore.v1.EntityH\000"
-          + "\022-\n\006update\030\005 \001(\0132\033.google.datastore.v1.E"
-          + "ntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.datasto"
-          + "re.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.google."
-          + "datastore.v1.KeyH\000\022\026\n\014base_version\030\010 \001(\003"
-          + "H\001\0221\n\013update_time\030\013 \001(\0132\032.google.protobu"
-          + "f.TimestampH\001\022^\n\034conflict_resolution_str"
-          + "ategy\030\n \001(\01628.google.datastore.v1.Mutati"
-          + "on.ConflictResolutionStrategy\0228\n\rpropert"
-          + "y_mask\030\t \001(\0132!.google.datastore.v1.Prope"
-          + "rtyMask\022H\n\023property_transforms\030\014 \003(\0132&.g"
-          + "oogle.datastore.v1.PropertyTransformB\003\340A"
-          + "\001\"R\n\032ConflictResolutionStrategy\022\030\n\024STRAT"
-          + "EGY_UNSPECIFIED\020\000\022\020\n\014SERVER_VALUE\020\001\022\010\n\004F"
-          + "AIL\020\003B\013\n\toperationB\035\n\033conflict_detection"
-          + "_strategy\"\343\003\n\021PropertyTransform\022\025\n\010prope"
-          + "rty\030\001 \001(\tB\003\340A\001\022Q\n\023set_to_server_value\030\002 "
-          + "\001(\01622.google.datastore.v1.PropertyTransf"
-          + "orm.ServerValueH\000\022/\n\tincrement\030\003 \001(\0132\032.g"
-          + "oogle.datastore.v1.ValueH\000\022-\n\007maximum\030\004 "
-          + "\001(\0132\032.google.datastore.v1.ValueH\000\022-\n\007min"
-          + "imum\030\005 \001(\0132\032.google.datastore.v1.ValueH\000"
-          + "\022B\n\027append_missing_elements\030\006 \001(\0132\037.goog"
-          + "le.datastore.v1.ArrayValueH\000\022@\n\025remove_a"
-          + "ll_from_array\030\007 \001(\0132\037.google.datastore.v"
-          + "1.ArrayValueH\000\"=\n\013ServerValue\022\034\n\030SERVER_"
-          + "VALUE_UNSPECIFIED\020\000\022\020\n\014REQUEST_TIME\020\001B\020\n"
-          + "\016transform_type\"\374\001\n\016MutationResult\022%\n\003ke"
-          + "y\030\003 \001(\0132\030.google.datastore.v1.Key\022\017\n\007ver"
-          + "sion\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132\032.google"
-          + ".protobuf.Timestamp\022/\n\013update_time\030\006 \001(\013"
-          + "2\032.google.protobuf.Timestamp\022\031\n\021conflict"
-          + "_detected\030\005 \001(\010\0225\n\021transform_results\030\010 \003"
-          + "(\0132\032.google.datastore.v1.Value\"\035\n\014Proper"
-          + "tyMask\022\r\n\005paths\030\001 \003(\t\"\312\002\n\013ReadOptions\022L\n"
-          + "\020read_consistency\030\001 \001(\01620.google.datasto"
-          + "re.v1.ReadOptions.ReadConsistencyH\000\022\025\n\013t"
-          + "ransaction\030\002 \001(\014H\000\022B\n\017new_transaction\030\003 "
-          + "\001(\0132\'.google.datastore.v1.TransactionOpt"
-          + "ionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.proto"
-          + "buf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034RE"
-          + "AD_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG\020\001"
-          + "\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n\022T"
-          + "ransactionOptions\022G\n\nread_write\030\001 \001(\01321."
-          + "google.datastore.v1.TransactionOptions.R"
-          + "eadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google.d"
-          + "atastore.v1.TransactionOptions.ReadOnlyH"
-          + "\000\032)\n\tReadWrite\022\034\n\024previous_transaction\030\001"
-          + " \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032.go"
-          + "ogle.protobuf.TimestampB\006\n\004mode2\341\r\n\tData"
-          + "store\022\300\001\n\006Lookup\022\".google.datastore.v1.L"
-          + "ookupRequest\032#.google.datastore.v1.Looku"
-          + "pResponse\"m\332A\034project_id,read_options,ke"
-          + "ys\202\323\344\223\002%\" /v1/projects/{project_id}:look"
-          + "up:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
-          + "\022\251\001\n\010RunQuery\022$.google.datastore.v1.RunQ"
-          + "ueryRequest\032%.google.datastore.v1.RunQue"
-          + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{projec"
-          + "t_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n"
-          + "\013database_id\022\325\001\n\023RunAggregationQuery\022/.g"
-          + "oogle.datastore.v1.RunAggregationQueryRe"
+          + ".proto\032\037google/protobuf/timestamp.proto\"\334\001\n\r"
+          + "LookupRequest\022\027\n\n"
+          + "project_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\0228\n\r"
+          + "property_mask\030\005 \001(\0132!.google.datastore.v1.PropertyMask\"\346\001\n"
+          + "\016LookupResponse\0220\n"
+          + "\005found\030\001 \003(\0132!.google.datastore.v1.EntityResult\0222\n"
+          + "\007missing\030\002 \003(\0132!.google.datastore.v1.EntityResult\022*\n"
+          + "\010deferred\030\003 \003(\0132\030.google.datastore.v1.Key\022\023\n"
+          + "\013transaction\030\005 \001(\014\022-\n"
+          + "\tread_time\030\007 \001(\0132\032.google.protobuf.Timestamp\"\233\003\n"
+          + "\017RunQueryRequest\022\027\n\n"
+          + "project_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.datastore.v1.QueryH\000\0222\n"
+          + "\tgql_query\030\007 \001(\0132\035.google.datastore.v1.GqlQueryH\000\0228\n\r"
+          + "property_mask\030\n"
+          + " \001(\0132!.google.datastore.v1.PropertyMask\022A\n"
+          + "\017explain_options\030\014"
+          + " \001(\0132#.google.datastore.v1.ExplainOptionsB\003\340A\001B\014\n\n"
+          + "query_type\"\306\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.Query\022\023\n"
+          + "\013transaction\030\005 \001(\014\022<\n"
+          + "\017explain_metrics\030\t \001(\0132#.google.datastore.v1.ExplainMetrics\"\203\003\n"
+          + "\032RunAggregationQueryRequest\022\027\n\n"
+          + "project_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\022B\n"
+          + "\021aggregation_query\030\003"
+          + " \001(\0132%.google.datastore.v1.AggregationQueryH\000\0222\n"
+          + "\tgql_query\030\007 \001(\0132\035.google.datastore.v1.GqlQueryH\000\022A\n"
+          + "\017explain_options\030\013"
+          + " \001(\0132#.google.datastore.v1.ExplainOptionsB\003\340A\001B\014\n\n"
+          + "query_type\"\342\001\n"
+          + "\033RunAggregationQueryResponse\022:\n"
+          + "\005batch\030\001 \001(\0132+.google.datastore.v1.AggregationResultBatch\0224\n"
+          + "\005query\030\002 \001(\0132%.google.datastore.v1.AggregationQuery\022\023\n"
+          + "\013transaction\030\005 \001(\014\022<\n"
+          + "\017explain_metrics\030\t \001(\0132#.google.datastore.v1.ExplainMetrics\"\215\001\n"
+          + "\027BeginTransactionRequest\022\027\n"
+          + "\n"
+          + "project_id\030\010 \001(\tB\003\340A\002\022\023\n"
+          + "\013database_id\030\t \001(\t\022D\n"
+          + "\023transaction_options\030\n"
+          + " \001(\0132\'.google.datastore.v1.TransactionOptions\"/\n"
+          + "\030BeginTransactionResponse\022\023\n"
+          + "\013transaction\030\001 \001(\014\"Y\n"
+          + "\017RollbackRequest\022\027\n\n"
+          + "project_id\030\010 \001(\tB\003\340A\002\022\023\n"
+          + "\013database_id\030\t \001(\t\022\030\n"
+          + "\013transaction\030\001 \001(\014B\003\340A\002\"\022\n"
+          + "\020RollbackResponse\"\350\002\n\r"
+          + "CommitRequest\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.CommitRequest.Mode\022\025\n"
+          + "\013transaction\030\001 \001(\014H\000\022I\n"
+          + "\026single_use_transaction\030\n"
+          + " \001(\0132\'.google.datastore.v1.TransactionOptionsH\000\0220\n"
+          + "\tmutations\030\006 \003(\0132\035.google.datastore.v1.Mutation\"F\n"
+          + "\004Mode\022\024\n"
+          + "\020MODE_UNSPECIFIED\020\000\022\021\n\r"
+          + "TRANSACTIONAL\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.datastore.v1.MutationResult\022\025\n\r"
+          + "index_updates\030\004 \001(\005\022/\n"
+          + "\013commit_time\030\010 \001(\0132\032.google.protobuf.Timestamp\"o\n"
+          + "\022AllocateIdsRequest\022\027\n\n"
+          + "project_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"
+          + "\021ReserveIdsRequest\022\027\n\n"
+          + "project_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\"\024\n"
+          + "\022ReserveIdsResponse\"\362\004\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.EntityH\000\022-\n"
+          + "\006upsert\030\006 \001(\0132\033.google.datastore.v1.EntityH\000\022*\n"
+          + "\006delete\030\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n"
+          + "\014base_version\030\010 \001(\003H\001\0221\n"
+          + "\013update_time\030\013 \001(\0132\032.google.protobuf.TimestampH\001\022^\n"
+          + "\034conflict_resolution_strategy\030\n"
+          + " \001(\01628.google.datastore.v1.Mutation.ConflictResolutionStrategy\0228\n\r"
+          + "property_mask\030\t \001(\0132!.google.datastore.v1.PropertyMask\022H\n"
+          + "\023property_transforms\030\014 \003(\0132&.g"
+          + "oogle.datastore.v1.PropertyTransformB\003\340A\001\"R\n"
+          + "\032ConflictResolutionStrategy\022\030\n"
+          + "\024STRATEGY_UNSPECIFIED\020\000\022\020\n"
+          + "\014SERVER_VALUE\020\001\022\010\n"
+          + "\004FAIL\020\003B\013\n"
+          + "\toperationB\035\n"
+          + "\033conflict_detection_strategy\"\343\003\n"
+          + "\021PropertyTransform\022\025\n"
+          + "\010property\030\001 \001(\tB\003\340A\001\022Q\n"
+          + "\023set_to_server_value\030\002 "
+          + "\001(\01622.google.datastore.v1.PropertyTransform.ServerValueH\000\022/\n"
+          + "\tincrement\030\003 \001(\0132\032.google.datastore.v1.ValueH\000\022-\n"
+          + "\007maximum\030\004 \001(\0132\032.google.datastore.v1.ValueH\000\022-\n"
+          + "\007minimum\030\005 \001(\0132\032.google.datastore.v1.ValueH\000\022B\n"
+          + "\027append_missing_elements\030\006"
+          + " \001(\0132\037.google.datastore.v1.ArrayValueH\000\022@\n"
+          + "\025remove_all_from_array\030\007"
+          + " \001(\0132\037.google.datastore.v1.ArrayValueH\000\"=\n"
+          + "\013ServerValue\022\034\n"
+          + "\030SERVER_VALUE_UNSPECIFIED\020\000\022\020\n"
+          + "\014REQUEST_TIME\020\001B\020\n"
+          + "\016transform_type\"\374\001\n"
+          + "\016MutationResult\022%\n"
+          + "\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017\n"
+          + "\007version\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\0225\n"
+          + "\021transform_results\030\010 \003(\0132\032.google.datastore.v1.Value\"\035\n"
+          + "\014PropertyMask\022\r\n"
+          + "\005paths\030\001 \003(\t\"\312\002\n"
+          + "\013ReadOptions\022L\n"
+          + "\020read_consistency\030\001"
+          + " \001(\01620.google.datastore.v1.ReadOptions.ReadConsistencyH\000\022\025\n"
+          + "\013transaction\030\002 \001(\014H\000\022B\n"
+          + "\017new_transaction\030\003 "
+          + "\001(\0132\'.google.datastore.v1.TransactionOptionsH\000\022/\n"
+          + "\tread_time\030\004 \001(\0132\032.google.protobuf.TimestampH\000\"M\n"
+          + "\017ReadConsistency\022 \n"
+          + "\034READ_CONSISTENCY_UNSPECIFIED\020\000\022\n\n"
+          + "\006STRONG\020\001\022\014\n"
+          + "\010EVENTUAL\020\002B\022\n"
+          + "\020consistency_type\"\222\002\n"
+          + "\022TransactionOptions\022G\n\n"
+          + "read_write\030\001 \001(\01321."
+          + "google.datastore.v1.TransactionOptions.ReadWriteH\000\022E\n"
+          + "\tread_only\030\002 \001(\01320.google.d"
+          + "atastore.v1.TransactionOptions.ReadOnlyH\000\032)\n"
+          + "\tReadWrite\022\034\n"
+          + "\024previous_transaction\030\001 \001(\014\0329\n"
+          + "\010ReadOnly\022-\n"
+          + "\tread_time\030\001 \001(\0132\032.google.protobuf.TimestampB\006\n"
+          + "\004mode2\341\r\n"
+          + "\tDatastore\022\300\001\n"
+          + "\006Lookup\022\".google.datastore.v1.LookupRequest\032#.google.datastore.v1.Looku"
+          + "pResponse\"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\n"
+          + "project_id\022\r\n"
+          + "\013database_id\022\251\001\n"
+          + "\010RunQuery\022$.google.datastore.v1.RunQueryRequest\032%.google.datastore.v1.RunQue"
+          + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\n"
+          + "project_id\022\r\n"
+          + "\013database_id\022\325\001\n"
+          + "\023RunAggregationQuery\022/.google.datastore.v1.RunAggregationQueryRe"
           + "quest\0320.google.datastore.v1.RunAggregati"
           + "onQueryResponse\"[\202\323\344\223\0022\"-/v1/projects/{p"
-          + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022"
-          + "\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020BeginTr"
-          + "ansaction\022,.google.datastore.v1.BeginTra"
-          + "nsactionRequest\032-.google.datastore.v1.Be"
-          + "ginTransactionResponse\"e\332A\nproject_id\202\323\344"
-          + "\223\002/\"*/v1/projects/{project_id}:beginTran"
-          + "saction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa"
-          + "se_id\022\346\001\n\006Commit\022\".google.datastore.v1.C"
-          + "ommitRequest\032#.google.datastore.v1.Commi"
+          + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022\014\n\n"
+          + "project_id\022\r\n"
+          + "\013database_id\022\326\001\n"
+          + "\020BeginTransaction\022,.google.datastore.v1.BeginTra"
+          + "nsactionRequest\032-.google.datastore.v1.BeginTransactionResponse\"e\332A\n"
+          + "project_id\202\323\344"
+          + "\223\002/\"*/v1/projects/{project_id}:beginTransaction:\001*\212\323\344\223\002\035\022\014\n\n"
+          + "project_id\022\r\n"
+          + "\013database_id\022\346\001\n"
+          + "\006Commit\022\".google.datastore.v1.CommitRequest\032#.google.datastore.v1.Commi"
           + "tResponse\"\222\001\332A%project_id,mode,transacti"
-          + "on,mutations\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\022\302"
-          + "\001\n\010Rollback\022$.google.datastore.v1.Rollba"
+          + "on,mutations\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\n"
+          + "project_id\022\r\n"
+          + "\013database_id\022\302\001\n"
+          + "\010Rollback\022$.google.datastore.v1.Rollba"
           + "ckRequest\032%.google.datastore.v1.Rollback"
           + "Response\"i\332A\026project_id,transaction\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\022\307\001\n\013"
-          + "AllocateIds\022\'.google.datastore.v1.Alloca"
+          + "\'\"\"/v1/projects/{project_id}:rollback:\001*\212\323\344\223\002\035\022\014\n\n"
+          + "project_id\022\r\n"
+          + "\013database_id\022\307\001\n"
+          + "\013AllocateIds\022\'.google.datastore.v1.Alloca"
           + "teIdsRequest\032(.google.datastore.v1.Alloc"
           + "ateIdsResponse\"e\332A\017project_id,keys\202\323\344\223\002*"
-          + "\"%/v1/projects/{project_id}:allocateIds:"
-          + "\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001"
-          + "\n\nReserveIds\022&.google.datastore.v1.Reser"
-          + "veIdsRequest\032\'.google.datastore.v1.Reser"
+          + "\"%/v1/projects/{project_id}:allocateIds:\001*\212\323\344\223\002\035\022\014\n\n"
+          + "project_id\022\r\n"
+          + "\013database_id\022\303\001\n\n"
+          + "ReserveIds\022&.google.datastore.v1.ReserveIdsRequest\032\'.google.datastore.v1.Reser"
           + "veIdsResponse\"d\332A\017project_id,keys\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\032v\312A\030"
-          + "datastore.googleapis.com\322AXhttps://www.g"
-          + "oogleapis.com/auth/cloud-platform,https:"
-          + "//www.googleapis.com/auth/datastoreB\277\001\n\027"
-          + "com.google.datastore.v1B\016DatastoreProtoP"
+          + "$/v1/projects/{project_id}:reserveIds:\001*\212\323\344\223\002\035\022\014\n\n"
+          + "project_id\022\r\n"
+          + "\013database_id\032v\312A\030datastore.googleapis.com\322AXhttps://www.g"
+          + "oogleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/datastoreB\277\001\n"
+          + "\027com.google.datastore.v1B\016DatastoreProtoP"
           + "\001Z;cloud.google.com/go/datastore/apiv1/d"
           + "atastorepb;datastorepb\252\002\031Google.Cloud.Da"
           + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002"
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 7217a2bdc92f..7a16929fa4e3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -35,6 +35,7 @@ public final class Entity extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Entity)
     EntityOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Entity.newBuilder() to construct.
   private Entity(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -77,6 +78,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   private int bitField0_;
   public static final int KEY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Key key_;
+
   /**
    *
    *
@@ -97,6 +99,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   public boolean hasKey() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -117,6 +120,7 @@ public boolean hasKey() {
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
+
   /**
    *
    *
@@ -165,6 +169,7 @@ private static final class PropertiesDefaultEntryHolder {
   public int getPropertiesCount() {
     return internalGetProperties().getMap().size();
   }
+
   /**
    *
    *
@@ -186,12 +191,14 @@ public boolean containsProperties(java.lang.String key) {
     }
     return internalGetProperties().getMap().containsKey(key);
   }
+
   /** Use {@link #getPropertiesMap()} instead. */
   @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map getProperties() {
     return getPropertiesMap();
   }
+
   /**
    *
    *
@@ -210,6 +217,7 @@ public java.util.Map getPropert
   public java.util.Map getPropertiesMap() {
     return internalGetProperties().getMap();
   }
+
   /**
    *
    *
@@ -236,6 +244,7 @@ public java.util.Map getPropert
         internalGetProperties().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
+
   /**
    *
    *
@@ -442,6 +451,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -686,6 +696,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.Key.Builder,
             com.google.datastore.v1.KeyOrBuilder>
         keyBuilder_;
+
     /**
      *
      *
@@ -705,6 +716,7 @@ public Builder mergeFrom(
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -728,6 +740,7 @@ public com.google.datastore.v1.Key getKey() {
         return keyBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -755,6 +768,7 @@ public Builder setKey(com.google.datastore.v1.Key value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -779,6 +793,7 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -811,6 +826,7 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -835,6 +851,7 @@ public Builder clearKey() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -854,6 +871,7 @@ public com.google.datastore.v1.Key.Builder getKeyBuilder() {
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -875,6 +893,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
         return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
       }
     }
+
     /**
      *
      *
@@ -923,7 +942,8 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde
           defaultEntry() {
         return PropertiesDefaultEntryHolder.defaultEntry;
       }
-    };
+    }
+    ;
 
     private static final PropertiesConverter propertiesConverter = new PropertiesConverter();
 
@@ -963,6 +983,7 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde
     public int getPropertiesCount() {
       return internalGetProperties().ensureBuilderMap().size();
     }
+
     /**
      *
      *
@@ -984,12 +1005,14 @@ public boolean containsProperties(java.lang.String key) {
       }
       return internalGetProperties().ensureBuilderMap().containsKey(key);
     }
+
     /** Use {@link #getPropertiesMap()} instead. */
     @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map getProperties() {
       return getPropertiesMap();
     }
+
     /**
      *
      *
@@ -1008,6 +1031,7 @@ public java.util.Map getPropert
     public java.util.Map getPropertiesMap() {
       return internalGetProperties().getImmutableMap();
     }
+
     /**
      *
      *
@@ -1034,6 +1058,7 @@ public java.util.Map getPropert
           internalGetMutableProperties().ensureBuilderMap();
       return map.containsKey(key) ? propertiesConverter.build(map.get(key)) : defaultValue;
     }
+
     /**
      *
      *
@@ -1066,6 +1091,7 @@ public Builder clearProperties() {
       internalGetMutableProperties().clear();
       return this;
     }
+
     /**
      *
      *
@@ -1087,12 +1113,14 @@ public Builder removeProperties(java.lang.String key) {
       internalGetMutableProperties().ensureBuilderMap().remove(key);
       return this;
     }
+
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableProperties() {
       bitField0_ |= 0x00000002;
       return internalGetMutableProperties().ensureMessageMap();
     }
+
     /**
      *
      *
@@ -1118,6 +1146,7 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
       bitField0_ |= 0x00000002;
       return this;
     }
+
     /**
      *
      *
@@ -1144,6 +1173,7 @@ public Builder putAllProperties(
       bitField0_ |= 0x00000002;
       return this;
     }
+
     /**
      *
      *
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 1ec6d192bdaa..455c0fe51b66 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
@@ -41,6 +41,7 @@ public interface EntityOrBuilder
    * @return Whether the key field is set.
    */
   boolean hasKey();
+
   /**
    *
    *
@@ -58,6 +59,7 @@ public interface EntityOrBuilder
    * @return The key.
    */
   com.google.datastore.v1.Key getKey();
+
   /**
    *
    *
@@ -89,6 +91,7 @@ public interface EntityOrBuilder
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
   int getPropertiesCount();
+
   /**
    *
    *
@@ -104,9 +107,11 @@ public interface EntityOrBuilder
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
   boolean containsProperties(java.lang.String key);
+
   /** Use {@link #getPropertiesMap()} instead. */
   @java.lang.Deprecated
   java.util.Map getProperties();
+
   /**
    *
    *
@@ -122,6 +127,7 @@ public interface EntityOrBuilder
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
   java.util.Map getPropertiesMap();
+
   /**
    *
    *
@@ -141,6 +147,7 @@ com.google.datastore.v1.Value getPropertiesOrDefault(
       java.lang.String key,
       /* nullable */
       com.google.datastore.v1.Value defaultValue);
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 9bd0e100270f..fdccb22406dd 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -65,37 +65,47 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     java.lang.String[] descriptorData = {
-      "\n google/datastore/v1/entity.proto\022\023goog"
+      "\n"
+          + " google/datastore/v1/entity.proto\022\023goog"
           + "le.datastore.v1\032\034google/protobuf/struct."
-          + "proto\032\037google/protobuf/timestamp.proto\032\030"
-          + "google/type/latlng.proto\"L\n\013PartitionId\022"
-          + "\022\n\nproject_id\030\002 \001(\t\022\023\n\013database_id\030\003 \001(\t"
-          + "\022\024\n\014namespace_id\030\004 \001(\t\"\267\001\n\003Key\0226\n\014partit"
-          + "ion_id\030\001 \001(\0132 .google.datastore.v1.Parti"
-          + "tionId\0222\n\004path\030\002 \003(\0132$.google.datastore."
-          + "v1.Key.PathElement\032D\n\013PathElement\022\014\n\004kin"
-          + "d\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003 \001(\tH\000B\t\n"
-          + "\007id_type\"8\n\nArrayValue\022*\n\006values\030\001 \003(\0132\032"
-          + ".google.datastore.v1.Value\"\361\003\n\005Value\0220\n\n"
-          + "null_value\030\013 \001(\0162\032.google.protobuf.NullV"
-          + "alueH\000\022\027\n\rboolean_value\030\001 \001(\010H\000\022\027\n\rinteg"
-          + "er_value\030\002 \001(\003H\000\022\026\n\014double_value\030\003 \001(\001H\000"
-          + "\0225\n\017timestamp_value\030\n \001(\0132\032.google.proto"
-          + "buf.TimestampH\000\022-\n\tkey_value\030\005 \001(\0132\030.goo"
-          + "gle.datastore.v1.KeyH\000\022\026\n\014string_value\030\021"
-          + " \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n\017geo_poin"
-          + "t_value\030\010 \001(\0132\023.google.type.LatLngH\000\0223\n\014"
-          + "entity_value\030\006 \001(\0132\033.google.datastore.v1"
-          + ".EntityH\000\0226\n\013array_value\030\t \001(\0132\037.google."
-          + "datastore.v1.ArrayValueH\000\022\017\n\007meaning\030\016 \001"
-          + "(\005\022\034\n\024exclude_from_indexes\030\023 \001(\010B\014\n\nvalu"
-          + "e_type\"\277\001\n\006Entity\022%\n\003key\030\001 \001(\0132\030.google."
-          + "datastore.v1.Key\022?\n\nproperties\030\003 \003(\0132+.g"
-          + "oogle.datastore.v1.Entity.PropertiesEntr"
-          + "y\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022)\n\005val"
-          + "ue\030\002 \001(\0132\032.google.datastore.v1.Value:\0028\001"
-          + "B\274\001\n\027com.google.datastore.v1B\013EntityProt"
-          + "oP\001Z;cloud.google.com/go/datastore/apiv1"
+          + "proto\032\037google/protobuf/timestamp.proto\032\030google/type/latlng.proto\"L\n"
+          + "\013PartitionId\022\022\n\n"
+          + "project_id\030\002 \001(\t\022\023\n"
+          + "\013database_id\030\003 \001(\t\022\024\n"
+          + "\014namespace_id\030\004 \001(\t\"\267\001\n"
+          + "\003Key\0226\n"
+          + "\014partition_id\030\001 \001(\0132 .google.datastore.v1.PartitionId\0222\n"
+          + "\004path\030\002 \003(\0132$.google.datastore.v1.Key.PathElement\032D\n"
+          + "\013PathElement\022\014\n"
+          + "\004kind\030\001 \001(\t\022\014\n"
+          + "\002id\030\002 \001(\003H\000\022\016\n"
+          + "\004name\030\003 \001(\tH\000B\t\n"
+          + "\007id_type\"8\n\n"
+          + "ArrayValue\022*\n"
+          + "\006values\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n"
+          + "\005Value\0220\n\n"
+          + "null_value\030\013 \001(\0162\032.google.protobuf.NullValueH\000\022\027\n\r"
+          + "boolean_value\030\001 \001(\010H\000\022\027\n\r"
+          + "integer_value\030\002 \001(\003H\000\022\026\n"
+          + "\014double_value\030\003 \001(\001H\000\0225\n"
+          + "\017timestamp_value\030\n"
+          + " \001(\0132\032.google.protobuf.TimestampH\000\022-\n"
+          + "\tkey_value\030\005 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n"
+          + "\014string_value\030\021 \001(\tH\000\022\024\n\n"
+          + "blob_value\030\022 \001(\014H\000\022.\n"
+          + "\017geo_point_value\030\010 \001(\0132\023.google.type.LatLngH\000\0223\n"
+          + "\014entity_value\030\006 \001(\0132\033.google.datastore.v1.EntityH\000\0226\n"
+          + "\013array_value\030\t \001(\0132\037.google.datastore.v1.ArrayValueH\000\022\017\n"
+          + "\007meaning\030\016 \001(\005\022\034\n"
+          + "\024exclude_from_indexes\030\023 \001(\010B\014\n\n"
+          + "value_type\"\277\001\n"
+          + "\006Entity\022%\n"
+          + "\003key\030\001 \001(\0132\030.google.datastore.v1.Key\022?\n\n"
+          + "properties\030\003 \003(\0132+.google.datastore.v1.Entity.PropertiesEntry\032M\n"
+          + "\017PropertiesEntry\022\013\n"
+          + "\003key\030\001 \001(\t\022)\n"
+          + "\005value\030\002 \001(\0132\032.google.datastore.v1.Value:\0028\001B\274\001\n"
+          + "\027com.google.datastore.v1B\013EntityProtoP\001Z;cloud.google.com/go/datastore/apiv1"
           + "/datastorepb;datastorepb\252\002\031Google.Cloud."
           + "Datastore.V1\312\002\031Google\\Cloud\\Datastore\\V1"
           + "\352\002\034Google::Cloud::Datastore::V1b\006proto3"
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 58f2b5131d3c..1d5997ea56fe 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
@@ -33,6 +33,7 @@ public final class EntityResult extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.EntityResult)
     EntityResultOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use EntityResult.newBuilder() to construct.
   private EntityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -130,6 +131,7 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      * RESULT_TYPE_UNSPECIFIED = 0;
      */
     public static final int RESULT_TYPE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -140,6 +142,7 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      * FULL = 1;
      */
     public static final int FULL_VALUE = 1;
+
     /**
      *
      *
@@ -150,6 +153,7 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      * PROJECTION = 2;
      */
     public static final int PROJECTION_VALUE = 2;
+
     /**
      *
      *
@@ -249,6 +253,7 @@ private ResultType(int value) {
   private int bitField0_;
   public static final int ENTITY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Entity entity_;
+
   /**
    *
    *
@@ -264,6 +269,7 @@ private ResultType(int value) {
   public boolean hasEntity() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -279,6 +285,7 @@ public boolean hasEntity() {
   public com.google.datastore.v1.Entity getEntity() {
     return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
   }
+
   /**
    *
    *
@@ -295,6 +302,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
 
   public static final int VERSION_FIELD_NUMBER = 4;
   private long version_ = 0L;
+
   /**
    *
    *
@@ -321,6 +329,7 @@ public long getVersion() {
 
   public static final int CREATE_TIME_FIELD_NUMBER = 6;
   private com.google.protobuf.Timestamp createTime_;
+
   /**
    *
    *
@@ -339,6 +348,7 @@ public long getVersion() {
   public boolean hasCreateTime() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -357,6 +367,7 @@ public boolean hasCreateTime() {
   public com.google.protobuf.Timestamp getCreateTime() {
     return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
+
   /**
    *
    *
@@ -376,6 +387,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 5;
   private com.google.protobuf.Timestamp updateTime_;
+
   /**
    *
    *
@@ -394,6 +406,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
   public boolean hasUpdateTime() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -412,6 +425,7 @@ public boolean hasUpdateTime() {
   public com.google.protobuf.Timestamp getUpdateTime() {
     return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
+
   /**
    *
    *
@@ -431,6 +445,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
 
   public static final int CURSOR_FIELD_NUMBER = 3;
   private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -656,6 +671,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -921,6 +937,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.Entity.Builder,
             com.google.datastore.v1.EntityOrBuilder>
         entityBuilder_;
+
     /**
      *
      *
@@ -935,6 +952,7 @@ public Builder mergeFrom(
     public boolean hasEntity() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -953,6 +971,7 @@ public com.google.datastore.v1.Entity getEntity() {
         return entityBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -975,6 +994,7 @@ public Builder setEntity(com.google.datastore.v1.Entity value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -994,6 +1014,7 @@ public Builder setEntity(com.google.datastore.v1.Entity.Builder builderForValue)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1021,6 +1042,7 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1040,6 +1062,7 @@ public Builder clearEntity() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1054,6 +1077,7 @@ public com.google.datastore.v1.Entity.Builder getEntityBuilder() {
       onChanged();
       return getEntityFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1070,6 +1094,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
         return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
       }
     }
+
     /**
      *
      *
@@ -1097,6 +1122,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
     }
 
     private long version_;
+
     /**
      *
      *
@@ -1120,6 +1146,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
     public long getVersion() {
       return version_;
     }
+
     /**
      *
      *
@@ -1147,6 +1174,7 @@ public Builder setVersion(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1179,6 +1207,7 @@ public Builder clearVersion() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         createTimeBuilder_;
+
     /**
      *
      *
@@ -1196,6 +1225,7 @@ public Builder clearVersion() {
     public boolean hasCreateTime() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1219,6 +1249,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
         return createTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1244,6 +1275,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1266,6 +1298,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1296,6 +1329,7 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1318,6 +1352,7 @@ public Builder clearCreateTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1335,6 +1370,7 @@ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1356,6 +1392,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
             : createTime_;
       }
     }
+
     /**
      *
      *
@@ -1391,6 +1428,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         updateTimeBuilder_;
+
     /**
      *
      *
@@ -1408,6 +1446,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
     public boolean hasUpdateTime() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1431,6 +1470,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
         return updateTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1456,6 +1496,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1478,6 +1519,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1508,6 +1550,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1530,6 +1573,7 @@ public Builder clearUpdateTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1547,6 +1591,7 @@ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1568,6 +1613,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
             : updateTime_;
       }
     }
+
     /**
      *
      *
@@ -1598,6 +1644,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     }
 
     private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -1614,6 +1661,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     public com.google.protobuf.ByteString getCursor() {
       return cursor_;
     }
+
     /**
      *
      *
@@ -1636,6 +1684,7 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 408813f6b210..85d9d4ce18bb 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
@@ -36,6 +36,7 @@ public interface EntityResultOrBuilder
    * @return Whether the entity field is set.
    */
   boolean hasEntity();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface EntityResultOrBuilder
    * @return The entity.
    */
   com.google.datastore.v1.Entity getEntity();
+
   /**
    *
    *
@@ -95,6 +97,7 @@ public interface EntityResultOrBuilder
    * @return Whether the createTime field is set.
    */
   boolean hasCreateTime();
+
   /**
    *
    *
@@ -110,6 +113,7 @@ public interface EntityResultOrBuilder
    * @return The createTime.
    */
   com.google.protobuf.Timestamp getCreateTime();
+
   /**
    *
    *
@@ -139,6 +143,7 @@ public interface EntityResultOrBuilder
    * @return Whether the updateTime field is set.
    */
   boolean hasUpdateTime();
+
   /**
    *
    *
@@ -154,6 +159,7 @@ public interface EntityResultOrBuilder
    * @return The updateTime.
    */
   com.google.protobuf.Timestamp getUpdateTime();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
index fca303323ef3..d42944e056c9 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
@@ -33,6 +33,7 @@ public final class ExecutionStats extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ExecutionStats)
     ExecutionStatsOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ExecutionStats.newBuilder() to construct.
   private ExecutionStats(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int RESULTS_RETURNED_FIELD_NUMBER = 1;
   private long resultsReturned_ = 0L;
+
   /**
    *
    *
@@ -83,6 +85,7 @@ public long getResultsReturned() {
 
   public static final int EXECUTION_DURATION_FIELD_NUMBER = 3;
   private com.google.protobuf.Duration executionDuration_;
+
   /**
    *
    *
@@ -98,6 +101,7 @@ public long getResultsReturned() {
   public boolean hasExecutionDuration() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -115,6 +119,7 @@ public com.google.protobuf.Duration getExecutionDuration() {
         ? com.google.protobuf.Duration.getDefaultInstance()
         : executionDuration_;
   }
+
   /**
    *
    *
@@ -133,6 +138,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() {
 
   public static final int READ_OPERATIONS_FIELD_NUMBER = 4;
   private long readOperations_ = 0L;
+
   /**
    *
    *
@@ -151,6 +157,7 @@ public long getReadOperations() {
 
   public static final int DEBUG_STATS_FIELD_NUMBER = 5;
   private com.google.protobuf.Struct debugStats_;
+
   /**
    *
    *
@@ -177,6 +184,7 @@ public long getReadOperations() {
   public boolean hasDebugStats() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -203,6 +211,7 @@ public boolean hasDebugStats() {
   public com.google.protobuf.Struct getDebugStats() {
     return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_;
   }
+
   /**
    *
    *
@@ -423,6 +432,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -669,6 +679,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private long resultsReturned_;
+
     /**
      *
      *
@@ -685,6 +696,7 @@ public Builder mergeFrom(
     public long getResultsReturned() {
       return resultsReturned_;
     }
+
     /**
      *
      *
@@ -705,6 +717,7 @@ public Builder setResultsReturned(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -730,6 +743,7 @@ public Builder clearResultsReturned() {
             com.google.protobuf.Duration.Builder,
             com.google.protobuf.DurationOrBuilder>
         executionDurationBuilder_;
+
     /**
      *
      *
@@ -744,6 +758,7 @@ public Builder clearResultsReturned() {
     public boolean hasExecutionDuration() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -764,6 +779,7 @@ public com.google.protobuf.Duration getExecutionDuration() {
         return executionDurationBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -786,6 +802,7 @@ public Builder setExecutionDuration(com.google.protobuf.Duration value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -805,6 +822,7 @@ public Builder setExecutionDuration(com.google.protobuf.Duration.Builder builder
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -832,6 +850,7 @@ public Builder mergeExecutionDuration(com.google.protobuf.Duration value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -851,6 +870,7 @@ public Builder clearExecutionDuration() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -865,6 +885,7 @@ public com.google.protobuf.Duration.Builder getExecutionDurationBuilder() {
       onChanged();
       return getExecutionDurationFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -883,6 +904,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() {
             : executionDuration_;
       }
     }
+
     /**
      *
      *
@@ -910,6 +932,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() {
     }
 
     private long readOperations_;
+
     /**
      *
      *
@@ -925,6 +948,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() {
     public long getReadOperations() {
       return readOperations_;
     }
+
     /**
      *
      *
@@ -944,6 +968,7 @@ public Builder setReadOperations(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -968,6 +993,7 @@ public Builder clearReadOperations() {
             com.google.protobuf.Struct.Builder,
             com.google.protobuf.StructOrBuilder>
         debugStatsBuilder_;
+
     /**
      *
      *
@@ -993,6 +1019,7 @@ public Builder clearReadOperations() {
     public boolean hasDebugStats() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1022,6 +1049,7 @@ public com.google.protobuf.Struct getDebugStats() {
         return debugStatsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1055,6 +1083,7 @@ public Builder setDebugStats(com.google.protobuf.Struct value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1085,6 +1114,7 @@ public Builder setDebugStats(com.google.protobuf.Struct.Builder builderForValue)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1123,6 +1153,7 @@ public Builder mergeDebugStats(com.google.protobuf.Struct value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1153,6 +1184,7 @@ public Builder clearDebugStats() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1178,6 +1210,7 @@ public com.google.protobuf.Struct.Builder getDebugStatsBuilder() {
       onChanged();
       return getDebugStatsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1205,6 +1238,7 @@ public com.google.protobuf.StructOrBuilder getDebugStatsOrBuilder() {
         return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
index 67957d774d13..ffbf156bfcb5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
@@ -50,6 +50,7 @@ public interface ExecutionStatsOrBuilder
    * @return Whether the executionDuration field is set.
    */
   boolean hasExecutionDuration();
+
   /**
    *
    *
@@ -62,6 +63,7 @@ public interface ExecutionStatsOrBuilder
    * @return The executionDuration.
    */
   com.google.protobuf.Duration getExecutionDuration();
+
   /**
    *
    *
@@ -109,6 +111,7 @@ public interface ExecutionStatsOrBuilder
    * @return Whether the debugStats field is set.
    */
   boolean hasDebugStats();
+
   /**
    *
    *
@@ -132,6 +135,7 @@ public interface ExecutionStatsOrBuilder
    * @return The debugStats.
    */
   com.google.protobuf.Struct getDebugStats();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
index 23a8172e5fcd..7a4f5361d8d4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
@@ -33,6 +33,7 @@ public final class ExplainMetrics extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ExplainMetrics)
     ExplainMetricsOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ExplainMetrics.newBuilder() to construct.
   private ExplainMetrics(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int PLAN_SUMMARY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PlanSummary planSummary_;
+
   /**
    *
    *
@@ -79,6 +81,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasPlanSummary() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -96,6 +99,7 @@ public com.google.datastore.v1.PlanSummary getPlanSummary() {
         ? com.google.datastore.v1.PlanSummary.getDefaultInstance()
         : planSummary_;
   }
+
   /**
    *
    *
@@ -114,6 +118,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() {
 
   public static final int EXECUTION_STATS_FIELD_NUMBER = 2;
   private com.google.datastore.v1.ExecutionStats executionStats_;
+
   /**
    *
    *
@@ -131,6 +136,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() {
   public boolean hasExecutionStats() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -150,6 +156,7 @@ public com.google.datastore.v1.ExecutionStats getExecutionStats() {
         ? com.google.datastore.v1.ExecutionStats.getDefaultInstance()
         : executionStats_;
   }
+
   /**
    *
    *
@@ -345,6 +352,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -568,6 +576,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.PlanSummary.Builder,
             com.google.datastore.v1.PlanSummaryOrBuilder>
         planSummaryBuilder_;
+
     /**
      *
      *
@@ -582,6 +591,7 @@ public Builder mergeFrom(
     public boolean hasPlanSummary() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -602,6 +612,7 @@ public com.google.datastore.v1.PlanSummary getPlanSummary() {
         return planSummaryBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -624,6 +635,7 @@ public Builder setPlanSummary(com.google.datastore.v1.PlanSummary value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -643,6 +655,7 @@ public Builder setPlanSummary(com.google.datastore.v1.PlanSummary.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -670,6 +683,7 @@ public Builder mergePlanSummary(com.google.datastore.v1.PlanSummary value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -689,6 +703,7 @@ public Builder clearPlanSummary() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -703,6 +718,7 @@ public com.google.datastore.v1.PlanSummary.Builder getPlanSummaryBuilder() {
       onChanged();
       return getPlanSummaryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -721,6 +737,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() {
             : planSummary_;
       }
     }
+
     /**
      *
      *
@@ -753,6 +770,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() {
             com.google.datastore.v1.ExecutionStats.Builder,
             com.google.datastore.v1.ExecutionStatsOrBuilder>
         executionStatsBuilder_;
+
     /**
      *
      *
@@ -769,6 +787,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() {
     public boolean hasExecutionStats() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -791,6 +810,7 @@ public com.google.datastore.v1.ExecutionStats getExecutionStats() {
         return executionStatsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -815,6 +835,7 @@ public Builder setExecutionStats(com.google.datastore.v1.ExecutionStats value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -837,6 +858,7 @@ public Builder setExecutionStats(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -866,6 +888,7 @@ public Builder mergeExecutionStats(com.google.datastore.v1.ExecutionStats value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -887,6 +910,7 @@ public Builder clearExecutionStats() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -903,6 +927,7 @@ public com.google.datastore.v1.ExecutionStats.Builder getExecutionStatsBuilder()
       onChanged();
       return getExecutionStatsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -923,6 +948,7 @@ public com.google.datastore.v1.ExecutionStatsOrBuilder getExecutionStatsOrBuilde
             : executionStats_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
index bfcc297a23e0..b9463b3e0f1b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
@@ -36,6 +36,7 @@ public interface ExplainMetricsOrBuilder
    * @return Whether the planSummary field is set.
    */
   boolean hasPlanSummary();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface ExplainMetricsOrBuilder
    * @return The planSummary.
    */
   com.google.datastore.v1.PlanSummary getPlanSummary();
+
   /**
    *
    *
@@ -73,6 +75,7 @@ public interface ExplainMetricsOrBuilder
    * @return Whether the executionStats field is set.
    */
   boolean hasExecutionStats();
+
   /**
    *
    *
@@ -87,6 +90,7 @@ public interface ExplainMetricsOrBuilder
    * @return The executionStats.
    */
   com.google.datastore.v1.ExecutionStats getExecutionStats();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
index a7a497c803c2..5d374909fc46 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
@@ -33,6 +33,7 @@ public final class ExplainOptions extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ExplainOptions)
     ExplainOptionsOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ExplainOptions.newBuilder() to construct.
   private ExplainOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   public static final int ANALYZE_FIELD_NUMBER = 1;
   private boolean analyze_ = false;
+
   /**
    *
    *
@@ -243,6 +245,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -424,6 +427,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private boolean analyze_;
+
     /**
      *
      *
@@ -445,6 +449,7 @@ public Builder mergeFrom(
     public boolean getAnalyze() {
       return analyze_;
     }
+
     /**
      *
      *
@@ -470,6 +475,7 @@ public Builder setAnalyze(boolean value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 c6c71843bdb0..7454f23b653b 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
@@ -33,6 +33,7 @@ public final class Filter extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Filter)
     FilterOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Filter.newBuilder() to construct.
   private Filter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -76,6 +77,7 @@ public enum FilterTypeCase
     private FilterTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -109,6 +111,7 @@ public FilterTypeCase getFilterTypeCase() {
   }
 
   public static final int COMPOSITE_FILTER_FIELD_NUMBER = 1;
+
   /**
    *
    *
@@ -124,6 +127,7 @@ public FilterTypeCase getFilterTypeCase() {
   public boolean hasCompositeFilter() {
     return filterTypeCase_ == 1;
   }
+
   /**
    *
    *
@@ -142,6 +146,7 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
     }
     return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -160,6 +165,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
   }
 
   public static final int PROPERTY_FILTER_FIELD_NUMBER = 2;
+
   /**
    *
    *
@@ -175,6 +181,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
   public boolean hasPropertyFilter() {
     return filterTypeCase_ == 2;
   }
+
   /**
    *
    *
@@ -193,6 +200,7 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
     }
     return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -397,6 +405,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -629,6 +638,7 @@ public Builder clearFilterType() {
             com.google.datastore.v1.CompositeFilter.Builder,
             com.google.datastore.v1.CompositeFilterOrBuilder>
         compositeFilterBuilder_;
+
     /**
      *
      *
@@ -644,6 +654,7 @@ public Builder clearFilterType() {
     public boolean hasCompositeFilter() {
       return filterTypeCase_ == 1;
     }
+
     /**
      *
      *
@@ -669,6 +680,7 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
         return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -691,6 +703,7 @@ public Builder setCompositeFilter(com.google.datastore.v1.CompositeFilter value)
       filterTypeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -711,6 +724,7 @@ public Builder setCompositeFilter(
       filterTypeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -743,6 +757,7 @@ public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter valu
       filterTypeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -768,6 +783,7 @@ public Builder clearCompositeFilter() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -780,6 +796,7 @@ public Builder clearCompositeFilter() {
     public com.google.datastore.v1.CompositeFilter.Builder getCompositeFilterBuilder() {
       return getCompositeFilterFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -800,6 +817,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
         return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -838,6 +856,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
             com.google.datastore.v1.PropertyFilter.Builder,
             com.google.datastore.v1.PropertyFilterOrBuilder>
         propertyFilterBuilder_;
+
     /**
      *
      *
@@ -853,6 +872,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
     public boolean hasPropertyFilter() {
       return filterTypeCase_ == 2;
     }
+
     /**
      *
      *
@@ -878,6 +898,7 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
         return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -900,6 +921,7 @@ public Builder setPropertyFilter(com.google.datastore.v1.PropertyFilter value) {
       filterTypeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -920,6 +942,7 @@ public Builder setPropertyFilter(
       filterTypeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -952,6 +975,7 @@ public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value)
       filterTypeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -977,6 +1001,7 @@ public Builder clearPropertyFilter() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -989,6 +1014,7 @@ public Builder clearPropertyFilter() {
     public com.google.datastore.v1.PropertyFilter.Builder getPropertyFilterBuilder() {
       return getPropertyFilterFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1009,6 +1035,7 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
         return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
       }
     }
+
     /**
      *
      *
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 4d351a272771..1136f49a386e 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
@@ -36,6 +36,7 @@ public interface FilterOrBuilder
    * @return Whether the compositeFilter field is set.
    */
   boolean hasCompositeFilter();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface FilterOrBuilder
    * @return The compositeFilter.
    */
   com.google.datastore.v1.CompositeFilter getCompositeFilter();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface FilterOrBuilder
    * @return Whether the propertyFilter field is set.
    */
   boolean hasPropertyFilter();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface FilterOrBuilder
    * @return The propertyFilter.
    */
   com.google.datastore.v1.PropertyFilter getPropertyFilter();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
index 105ba669e422..fd233c99bfec 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
@@ -36,6 +36,7 @@ public final class FindNearest extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.FindNearest)
     FindNearestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use FindNearest.newBuilder() to construct.
   private FindNearest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -141,6 +142,7 @@ public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum {
      * DISTANCE_MEASURE_UNSPECIFIED = 0;
      */
     public static final int DISTANCE_MEASURE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -153,6 +155,7 @@ public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum {
      * EUCLIDEAN = 1;
      */
     public static final int EUCLIDEAN_VALUE = 1;
+
     /**
      *
      *
@@ -170,6 +173,7 @@ public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum {
      * COSINE = 2;
      */
     public static final int COSINE_VALUE = 2;
+
     /**
      *
      *
@@ -273,6 +277,7 @@ private DistanceMeasure(int value) {
   private int bitField0_;
   public static final int VECTOR_PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference vectorProperty_;
+
   /**
    *
    *
@@ -292,6 +297,7 @@ private DistanceMeasure(int value) {
   public boolean hasVectorProperty() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -313,6 +319,7 @@ public com.google.datastore.v1.PropertyReference getVectorProperty() {
         ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
         : vectorProperty_;
   }
+
   /**
    *
    *
@@ -335,6 +342,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui
 
   public static final int QUERY_VECTOR_FIELD_NUMBER = 2;
   private com.google.datastore.v1.Value queryVector_;
+
   /**
    *
    *
@@ -352,6 +360,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui
   public boolean hasQueryVector() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -369,6 +378,7 @@ public boolean hasQueryVector() {
   public com.google.datastore.v1.Value getQueryVector() {
     return queryVector_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : queryVector_;
   }
+
   /**
    *
    *
@@ -387,6 +397,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() {
 
   public static final int DISTANCE_MEASURE_FIELD_NUMBER = 3;
   private int distanceMeasure_ = 0;
+
   /**
    *
    *
@@ -404,6 +415,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() {
   public int getDistanceMeasureValue() {
     return distanceMeasure_;
   }
+
   /**
    *
    *
@@ -428,6 +440,7 @@ public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure()
 
   public static final int LIMIT_FIELD_NUMBER = 4;
   private com.google.protobuf.Int32Value limit_;
+
   /**
    *
    *
@@ -444,6 +457,7 @@ public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure()
   public boolean hasLimit() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -460,6 +474,7 @@ public boolean hasLimit() {
   public com.google.protobuf.Int32Value getLimit() {
     return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
   }
+
   /**
    *
    *
@@ -479,6 +494,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object distanceResultProperty_ = "";
+
   /**
    *
    *
@@ -504,6 +520,7 @@ public java.lang.String getDistanceResultProperty() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -532,6 +549,7 @@ public com.google.protobuf.ByteString getDistanceResultPropertyBytes() {
 
   public static final int DISTANCE_THRESHOLD_FIELD_NUMBER = 6;
   private com.google.protobuf.DoubleValue distanceThreshold_;
+
   /**
    *
    *
@@ -555,6 +573,7 @@ public com.google.protobuf.ByteString getDistanceResultPropertyBytes() {
   public boolean hasDistanceThreshold() {
     return ((bitField0_ & 0x00000008) != 0);
   }
+
   /**
    *
    *
@@ -580,6 +599,7 @@ public com.google.protobuf.DoubleValue getDistanceThreshold() {
         ? com.google.protobuf.DoubleValue.getDefaultInstance()
         : distanceThreshold_;
   }
+
   /**
    *
    *
@@ -830,6 +850,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1125,6 +1146,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.PropertyReference.Builder,
             com.google.datastore.v1.PropertyReferenceOrBuilder>
         vectorPropertyBuilder_;
+
     /**
      *
      *
@@ -1143,6 +1165,7 @@ public Builder mergeFrom(
     public boolean hasVectorProperty() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -1167,6 +1190,7 @@ public com.google.datastore.v1.PropertyReference getVectorProperty() {
         return vectorPropertyBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1193,6 +1217,7 @@ public Builder setVectorProperty(com.google.datastore.v1.PropertyReference value
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1217,6 +1242,7 @@ public Builder setVectorProperty(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1248,6 +1274,7 @@ public Builder mergeVectorProperty(com.google.datastore.v1.PropertyReference val
       }
       return this;
     }
+
     /**
      *
      *
@@ -1271,6 +1298,7 @@ public Builder clearVectorProperty() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1289,6 +1317,7 @@ public com.google.datastore.v1.PropertyReference.Builder getVectorPropertyBuilde
       onChanged();
       return getVectorPropertyFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1311,6 +1340,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui
             : vectorProperty_;
       }
     }
+
     /**
      *
      *
@@ -1347,6 +1377,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui
             com.google.datastore.v1.Value.Builder,
             com.google.datastore.v1.ValueOrBuilder>
         queryVectorBuilder_;
+
     /**
      *
      *
@@ -1363,6 +1394,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui
     public boolean hasQueryVector() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -1385,6 +1417,7 @@ public com.google.datastore.v1.Value getQueryVector() {
         return queryVectorBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1409,6 +1442,7 @@ public Builder setQueryVector(com.google.datastore.v1.Value value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1430,6 +1464,7 @@ public Builder setQueryVector(com.google.datastore.v1.Value.Builder builderForVa
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1459,6 +1494,7 @@ public Builder mergeQueryVector(com.google.datastore.v1.Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1480,6 +1516,7 @@ public Builder clearQueryVector() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1496,6 +1533,7 @@ public com.google.datastore.v1.Value.Builder getQueryVectorBuilder() {
       onChanged();
       return getQueryVectorFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1516,6 +1554,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() {
             : queryVector_;
       }
     }
+
     /**
      *
      *
@@ -1545,6 +1584,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() {
     }
 
     private int distanceMeasure_ = 0;
+
     /**
      *
      *
@@ -1562,6 +1602,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() {
     public int getDistanceMeasureValue() {
       return distanceMeasure_;
     }
+
     /**
      *
      *
@@ -1582,6 +1623,7 @@ public Builder setDistanceMeasureValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1603,6 +1645,7 @@ public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure()
           ? com.google.datastore.v1.FindNearest.DistanceMeasure.UNRECOGNIZED
           : result;
     }
+
     /**
      *
      *
@@ -1626,6 +1669,7 @@ public Builder setDistanceMeasure(com.google.datastore.v1.FindNearest.DistanceMe
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1652,6 +1696,7 @@ public Builder clearDistanceMeasure() {
             com.google.protobuf.Int32Value.Builder,
             com.google.protobuf.Int32ValueOrBuilder>
         limitBuilder_;
+
     /**
      *
      *
@@ -1667,6 +1712,7 @@ public Builder clearDistanceMeasure() {
     public boolean hasLimit() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1686,6 +1732,7 @@ public com.google.protobuf.Int32Value getLimit() {
         return limitBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1709,6 +1756,7 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1729,6 +1777,7 @@ public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1757,6 +1806,7 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1777,6 +1827,7 @@ public Builder clearLimit() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1792,6 +1843,7 @@ public com.google.protobuf.Int32Value.Builder getLimitBuilder() {
       onChanged();
       return getLimitFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1809,6 +1861,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
         return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
       }
     }
+
     /**
      *
      *
@@ -1837,6 +1890,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
     }
 
     private java.lang.Object distanceResultProperty_ = "";
+
     /**
      *
      *
@@ -1861,6 +1915,7 @@ public java.lang.String getDistanceResultProperty() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1885,6 +1940,7 @@ public com.google.protobuf.ByteString getDistanceResultPropertyBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1908,6 +1964,7 @@ public Builder setDistanceResultProperty(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1927,6 +1984,7 @@ public Builder clearDistanceResultProperty() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1958,6 +2016,7 @@ public Builder setDistanceResultPropertyBytes(com.google.protobuf.ByteString val
             com.google.protobuf.DoubleValue.Builder,
             com.google.protobuf.DoubleValueOrBuilder>
         distanceThresholdBuilder_;
+
     /**
      *
      *
@@ -1980,6 +2039,7 @@ public Builder setDistanceResultPropertyBytes(com.google.protobuf.ByteString val
     public boolean hasDistanceThreshold() {
       return ((bitField0_ & 0x00000020) != 0);
     }
+
     /**
      *
      *
@@ -2008,6 +2068,7 @@ public com.google.protobuf.DoubleValue getDistanceThreshold() {
         return distanceThresholdBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2038,6 +2099,7 @@ public Builder setDistanceThreshold(com.google.protobuf.DoubleValue value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2065,6 +2127,7 @@ public Builder setDistanceThreshold(com.google.protobuf.DoubleValue.Builder buil
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2100,6 +2163,7 @@ public Builder mergeDistanceThreshold(com.google.protobuf.DoubleValue value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2127,6 +2191,7 @@ public Builder clearDistanceThreshold() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2149,6 +2214,7 @@ public com.google.protobuf.DoubleValue.Builder getDistanceThresholdBuilder() {
       onChanged();
       return getDistanceThresholdFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2175,6 +2241,7 @@ public com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder()
             : distanceThreshold_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
index 504c10bb5b56..4e21ec5c31dc 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
@@ -40,6 +40,7 @@ public interface FindNearestOrBuilder
    * @return Whether the vectorProperty field is set.
    */
   boolean hasVectorProperty();
+
   /**
    *
    *
@@ -56,6 +57,7 @@ public interface FindNearestOrBuilder
    * @return The vectorProperty.
    */
   com.google.datastore.v1.PropertyReference getVectorProperty();
+
   /**
    *
    *
@@ -85,6 +87,7 @@ public interface FindNearestOrBuilder
    * @return Whether the queryVector field is set.
    */
   boolean hasQueryVector();
+
   /**
    *
    *
@@ -99,6 +102,7 @@ public interface FindNearestOrBuilder
    * @return The queryVector.
    */
   com.google.datastore.v1.Value getQueryVector();
+
   /**
    *
    *
@@ -126,6 +130,7 @@ public interface FindNearestOrBuilder
    * @return The enum numeric value on the wire for distanceMeasure.
    */
   int getDistanceMeasureValue();
+
   /**
    *
    *
@@ -154,6 +159,7 @@ public interface FindNearestOrBuilder
    * @return Whether the limit field is set.
    */
   boolean hasLimit();
+
   /**
    *
    *
@@ -167,6 +173,7 @@ public interface FindNearestOrBuilder
    * @return The limit.
    */
   com.google.protobuf.Int32Value getLimit();
+
   /**
    *
    *
@@ -193,6 +200,7 @@ public interface FindNearestOrBuilder
    * @return The distanceResultProperty.
    */
   java.lang.String getDistanceResultProperty();
+
   /**
    *
    *
@@ -228,6 +236,7 @@ public interface FindNearestOrBuilder
    * @return Whether the distanceThreshold field is set.
    */
   boolean hasDistanceThreshold();
+
   /**
    *
    *
@@ -248,6 +257,7 @@ public interface FindNearestOrBuilder
    * @return The distanceThreshold.
    */
   com.google.protobuf.DoubleValue getDistanceThreshold();
+
   /**
    *
    *
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 766dfa10ef4d..86ae757ad1c0 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
@@ -34,6 +34,7 @@ public final class GqlQuery extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQuery)
     GqlQueryOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use GqlQuery.newBuilder() to construct.
   private GqlQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -80,6 +81,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object queryString_ = "";
+
   /**
    *
    *
@@ -104,6 +106,7 @@ public java.lang.String getQueryString() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -131,6 +134,7 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
 
   public static final int ALLOW_LITERALS_FIELD_NUMBER = 2;
   private boolean allowLiterals_ = false;
+
   /**
    *
    *
@@ -182,6 +186,7 @@ private static final class NamedBindingsDefaultEntryHolder {
   public int getNamedBindingsCount() {
     return internalGetNamedBindings().getMap().size();
   }
+
   /**
    *
    *
@@ -202,6 +207,7 @@ public boolean containsNamedBindings(java.lang.String key) {
     }
     return internalGetNamedBindings().getMap().containsKey(key);
   }
+
   /** Use {@link #getNamedBindingsMap()} instead. */
   @java.lang.Override
   @java.lang.Deprecated
@@ -209,6 +215,7 @@ public boolean containsNamedBindings(java.lang.String key) {
       getNamedBindings() {
     return getNamedBindingsMap();
   }
+
   /**
    *
    *
@@ -227,6 +234,7 @@ public boolean containsNamedBindings(java.lang.String key) {
       getNamedBindingsMap() {
     return internalGetNamedBindings().getMap();
   }
+
   /**
    *
    *
@@ -252,6 +260,7 @@ public boolean containsNamedBindings(java.lang.String key) {
         internalGetNamedBindings().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
+
   /**
    *
    *
@@ -282,6 +291,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
 
   @SuppressWarnings("serial")
   private java.util.List positionalBindings_;
+
   /**
    *
    *
@@ -299,6 +309,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
   public java.util.List getPositionalBindingsList() {
     return positionalBindings_;
   }
+
   /**
    *
    *
@@ -317,6 +328,7 @@ public java.util.List getPositionalBi
       getPositionalBindingsOrBuilderList() {
     return positionalBindings_;
   }
+
   /**
    *
    *
@@ -334,6 +346,7 @@ public java.util.List getPositionalBi
   public int getPositionalBindingsCount() {
     return positionalBindings_.size();
   }
+
   /**
    *
    *
@@ -351,6 +364,7 @@ public int getPositionalBindingsCount() {
   public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index) {
     return positionalBindings_.get(index);
   }
+
   /**
    *
    *
@@ -566,6 +580,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -865,6 +880,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object queryString_ = "";
+
     /**
      *
      *
@@ -888,6 +904,7 @@ public java.lang.String getQueryString() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -911,6 +928,7 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -933,6 +951,7 @@ public Builder setQueryString(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -951,6 +970,7 @@ public Builder clearQueryString() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -976,6 +996,7 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
     }
 
     private boolean allowLiterals_;
+
     /**
      *
      *
@@ -994,6 +1015,7 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
     public boolean getAllowLiterals() {
       return allowLiterals_;
     }
+
     /**
      *
      *
@@ -1016,6 +1038,7 @@ public Builder setAllowLiterals(boolean value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1057,7 +1080,8 @@ public com.google.datastore.v1.GqlQueryParameter build(
           defaultEntry() {
         return NamedBindingsDefaultEntryHolder.defaultEntry;
       }
-    };
+    }
+    ;
 
     private static final NamedBindingsConverter namedBindingsConverter =
         new NamedBindingsConverter();
@@ -1098,6 +1122,7 @@ public com.google.datastore.v1.GqlQueryParameter build(
     public int getNamedBindingsCount() {
       return internalGetNamedBindings().ensureBuilderMap().size();
     }
+
     /**
      *
      *
@@ -1118,6 +1143,7 @@ public boolean containsNamedBindings(java.lang.String key) {
       }
       return internalGetNamedBindings().ensureBuilderMap().containsKey(key);
     }
+
     /** Use {@link #getNamedBindingsMap()} instead. */
     @java.lang.Override
     @java.lang.Deprecated
@@ -1125,6 +1151,7 @@ public boolean containsNamedBindings(java.lang.String key) {
         getNamedBindings() {
       return getNamedBindingsMap();
     }
+
     /**
      *
      *
@@ -1143,6 +1170,7 @@ public boolean containsNamedBindings(java.lang.String key) {
         getNamedBindingsMap() {
       return internalGetNamedBindings().getImmutableMap();
     }
+
     /**
      *
      *
@@ -1168,6 +1196,7 @@ public boolean containsNamedBindings(java.lang.String key) {
           internalGetMutableNamedBindings().ensureBuilderMap();
       return map.containsKey(key) ? namedBindingsConverter.build(map.get(key)) : defaultValue;
     }
+
     /**
      *
      *
@@ -1199,6 +1228,7 @@ public Builder clearNamedBindings() {
       internalGetMutableNamedBindings().clear();
       return this;
     }
+
     /**
      *
      *
@@ -1219,6 +1249,7 @@ public Builder removeNamedBindings(java.lang.String key) {
       internalGetMutableNamedBindings().ensureBuilderMap().remove(key);
       return this;
     }
+
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map
@@ -1226,6 +1257,7 @@ public Builder removeNamedBindings(java.lang.String key) {
       bitField0_ |= 0x00000004;
       return internalGetMutableNamedBindings().ensureMessageMap();
     }
+
     /**
      *
      *
@@ -1251,6 +1283,7 @@ public Builder putNamedBindings(
       bitField0_ |= 0x00000004;
       return this;
     }
+
     /**
      *
      *
@@ -1276,6 +1309,7 @@ public Builder putAllNamedBindings(
       bitField0_ |= 0x00000004;
       return this;
     }
+
     /**
      *
      *
@@ -1342,6 +1376,7 @@ public java.util.List getPositionalBi
         return positionalBindingsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1362,6 +1397,7 @@ public int getPositionalBindingsCount() {
         return positionalBindingsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1382,6 +1418,7 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index
         return positionalBindingsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1409,6 +1446,7 @@ public Builder setPositionalBindings(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1433,6 +1471,7 @@ public Builder setPositionalBindings(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1459,6 +1498,7 @@ public Builder addPositionalBindings(com.google.datastore.v1.GqlQueryParameter v
       }
       return this;
     }
+
     /**
      *
      *
@@ -1486,6 +1526,7 @@ public Builder addPositionalBindings(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1510,6 +1551,7 @@ public Builder addPositionalBindings(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1534,6 +1576,7 @@ public Builder addPositionalBindings(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1558,6 +1601,7 @@ public Builder addAllPositionalBindings(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1581,6 +1625,7 @@ public Builder clearPositionalBindings() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1604,6 +1649,7 @@ public Builder removePositionalBindings(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1621,6 +1667,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBu
         int index) {
       return getPositionalBindingsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -1642,6 +1689,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
         return positionalBindingsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -1663,6 +1711,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
         return java.util.Collections.unmodifiableList(positionalBindings_);
       }
     }
+
     /**
      *
      *
@@ -1680,6 +1729,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
       return getPositionalBindingsFieldBuilder()
           .addBuilder(com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1698,6 +1748,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
       return getPositionalBindingsFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
     }
+
     /**
      *
      *
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 1ce49ae7ae99..36d73aa77128 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
@@ -37,6 +37,7 @@ public interface GqlQueryOrBuilder
    * @return The queryString.
    */
   java.lang.String getQueryString();
+
   /**
    *
    *
@@ -81,6 +82,7 @@ public interface GqlQueryOrBuilder
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
   int getNamedBindingsCount();
+
   /**
    *
    *
@@ -95,9 +97,11 @@ public interface GqlQueryOrBuilder
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
   boolean containsNamedBindings(java.lang.String key);
+
   /** Use {@link #getNamedBindingsMap()} instead. */
   @java.lang.Deprecated
   java.util.Map getNamedBindings();
+
   /**
    *
    *
@@ -112,6 +116,7 @@ public interface GqlQueryOrBuilder
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
   java.util.Map getNamedBindingsMap();
+
   /**
    *
    *
@@ -130,6 +135,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
       java.lang.String key,
       /* nullable */
       com.google.datastore.v1.GqlQueryParameter defaultValue);
+
   /**
    *
    *
@@ -159,6 +165,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
   java.util.List getPositionalBindingsList();
+
   /**
    *
    *
@@ -173,6 +180,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
   com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index);
+
   /**
    *
    *
@@ -187,6 +195,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
   int getPositionalBindingsCount();
+
   /**
    *
    *
@@ -202,6 +211,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    */
   java.util.List
       getPositionalBindingsOrBuilderList();
+
   /**
    *
    *
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 d57a38e8500d..eb6b3850e38f 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
@@ -33,6 +33,7 @@ public final class GqlQueryParameter extends com.google.protobuf.GeneratedMessag
     // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQueryParameter)
     GqlQueryParameterOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use GqlQueryParameter.newBuilder() to construct.
   private GqlQueryParameter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -78,6 +79,7 @@ public enum ParameterTypeCase
     private ParameterTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -111,6 +113,7 @@ public ParameterTypeCase getParameterTypeCase() {
   }
 
   public static final int VALUE_FIELD_NUMBER = 2;
+
   /**
    *
    *
@@ -126,6 +129,7 @@ public ParameterTypeCase getParameterTypeCase() {
   public boolean hasValue() {
     return parameterTypeCase_ == 2;
   }
+
   /**
    *
    *
@@ -144,6 +148,7 @@ public com.google.datastore.v1.Value getValue() {
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -162,6 +167,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
   }
 
   public static final int CURSOR_FIELD_NUMBER = 3;
+
   /**
    *
    *
@@ -178,6 +184,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
   public boolean hasCursor() {
     return parameterTypeCase_ == 3;
   }
+
   /**
    *
    *
@@ -387,6 +394,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -615,6 +623,7 @@ public Builder clearParameterType() {
             com.google.datastore.v1.Value.Builder,
             com.google.datastore.v1.ValueOrBuilder>
         valueBuilder_;
+
     /**
      *
      *
@@ -630,6 +639,7 @@ public Builder clearParameterType() {
     public boolean hasValue() {
       return parameterTypeCase_ == 2;
     }
+
     /**
      *
      *
@@ -655,6 +665,7 @@ public com.google.datastore.v1.Value getValue() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -677,6 +688,7 @@ public Builder setValue(com.google.datastore.v1.Value value) {
       parameterTypeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -696,6 +708,7 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
       parameterTypeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -728,6 +741,7 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       parameterTypeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -753,6 +767,7 @@ public Builder clearValue() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -765,6 +780,7 @@ public Builder clearValue() {
     public com.google.datastore.v1.Value.Builder getValueBuilder() {
       return getValueFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -785,6 +801,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -831,6 +848,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
     public boolean hasCursor() {
       return parameterTypeCase_ == 3;
     }
+
     /**
      *
      *
@@ -849,6 +867,7 @@ public com.google.protobuf.ByteString getCursor() {
       }
       return com.google.protobuf.ByteString.EMPTY;
     }
+
     /**
      *
      *
@@ -871,6 +890,7 @@ public Builder setCursor(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 5c3fc53dadf6..7c3e07894700 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
@@ -36,6 +36,7 @@ public interface GqlQueryParameterOrBuilder
    * @return Whether the value field is set.
    */
   boolean hasValue();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface GqlQueryParameterOrBuilder
    * @return The value.
    */
   com.google.datastore.v1.Value getValue();
+
   /**
    *
    *
@@ -72,6 +74,7 @@ public interface GqlQueryParameterOrBuilder
    * @return Whether the cursor field is set.
    */
   boolean hasCursor();
+
   /**
    *
    *
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 9cd165e426c9..28314fbb8ea4 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
@@ -36,6 +36,7 @@ public final class Key extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Key)
     KeyOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Key.newBuilder() to construct.
   private Key(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -89,6 +90,7 @@ public interface PathElementOrBuilder
      * @return The kind.
      */
     java.lang.String getKind();
+
     /**
      *
      *
@@ -125,6 +127,7 @@ public interface PathElementOrBuilder
      * @return Whether the id field is set.
      */
     boolean hasId();
+
     /**
      *
      *
@@ -161,6 +164,7 @@ public interface PathElementOrBuilder
      * @return Whether the name field is set.
      */
     boolean hasName();
+
     /**
      *
      *
@@ -181,6 +185,7 @@ public interface PathElementOrBuilder
      * @return The name.
      */
     java.lang.String getName();
+
     /**
      *
      *
@@ -204,6 +209,7 @@ public interface PathElementOrBuilder
 
     com.google.datastore.v1.Key.PathElement.IdTypeCase getIdTypeCase();
   }
+
   /**
    *
    *
@@ -221,6 +227,7 @@ public static final class PathElement extends com.google.protobuf.GeneratedMessa
       // @@protoc_insertion_point(message_implements:google.datastore.v1.Key.PathElement)
       PathElementOrBuilder {
     private static final long serialVersionUID = 0L;
+
     // Use PathElement.newBuilder() to construct.
     private PathElement(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
@@ -268,6 +275,7 @@ public enum IdTypeCase
       private IdTypeCase(int value) {
         this.value = value;
       }
+
       /**
        * @param value The number of the enum to look for.
        * @return The enum associated with the given number.
@@ -304,6 +312,7 @@ public IdTypeCase getIdTypeCase() {
 
     @SuppressWarnings("serial")
     private volatile java.lang.Object kind_ = "";
+
     /**
      *
      *
@@ -335,6 +344,7 @@ public java.lang.String getKind() {
         return s;
       }
     }
+
     /**
      *
      *
@@ -368,6 +378,7 @@ public com.google.protobuf.ByteString getKindBytes() {
     }
 
     public static final int ID_FIELD_NUMBER = 2;
+
     /**
      *
      *
@@ -386,6 +397,7 @@ public com.google.protobuf.ByteString getKindBytes() {
     public boolean hasId() {
       return idTypeCase_ == 2;
     }
+
     /**
      *
      *
@@ -409,6 +421,7 @@ public long getId() {
     }
 
     public static final int NAME_FIELD_NUMBER = 3;
+
     /**
      *
      *
@@ -431,6 +444,7 @@ public long getId() {
     public boolean hasName() {
       return idTypeCase_ == 3;
     }
+
     /**
      *
      *
@@ -466,6 +480,7 @@ public java.lang.String getName() {
         return s;
       }
     }
+
     /**
      *
      *
@@ -698,6 +713,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -940,6 +956,7 @@ public Builder clearIdType() {
       private int bitField0_;
 
       private java.lang.Object kind_ = "";
+
       /**
        *
        *
@@ -970,6 +987,7 @@ public java.lang.String getKind() {
           return (java.lang.String) ref;
         }
       }
+
       /**
        *
        *
@@ -1000,6 +1018,7 @@ public com.google.protobuf.ByteString getKindBytes() {
           return (com.google.protobuf.ByteString) ref;
         }
       }
+
       /**
        *
        *
@@ -1029,6 +1048,7 @@ public Builder setKind(java.lang.String value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1054,6 +1074,7 @@ public Builder clearKind() {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1102,6 +1123,7 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
       public boolean hasId() {
         return idTypeCase_ == 2;
       }
+
       /**
        *
        *
@@ -1122,6 +1144,7 @@ public long getId() {
         }
         return 0L;
       }
+
       /**
        *
        *
@@ -1144,6 +1167,7 @@ public Builder setId(long value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1190,6 +1214,7 @@ public Builder clearId() {
       public boolean hasName() {
         return idTypeCase_ == 3;
       }
+
       /**
        *
        *
@@ -1226,6 +1251,7 @@ public java.lang.String getName() {
           return (java.lang.String) ref;
         }
       }
+
       /**
        *
        *
@@ -1262,6 +1288,7 @@ public com.google.protobuf.ByteString getNameBytes() {
           return (com.google.protobuf.ByteString) ref;
         }
       }
+
       /**
        *
        *
@@ -1291,6 +1318,7 @@ public Builder setName(java.lang.String value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1318,6 +1346,7 @@ public Builder clearName() {
         }
         return this;
       }
+
       /**
        *
        *
@@ -1416,6 +1445,7 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
   private int bitField0_;
   public static final int PARTITION_ID_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PartitionId partitionId_;
+
   /**
    *
    *
@@ -1433,6 +1463,7 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
   public boolean hasPartitionId() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -1452,6 +1483,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
         ? com.google.datastore.v1.PartitionId.getDefaultInstance()
         : partitionId_;
   }
+
   /**
    *
    *
@@ -1474,6 +1506,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
 
   @SuppressWarnings("serial")
   private java.util.List path_;
+
   /**
    *
    *
@@ -1502,6 +1535,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
   public java.util.List getPathList() {
     return path_;
   }
+
   /**
    *
    *
@@ -1531,6 +1565,7 @@ public java.util.List getPathList() {
       getPathOrBuilderList() {
     return path_;
   }
+
   /**
    *
    *
@@ -1559,6 +1594,7 @@ public java.util.List getPathList() {
   public int getPathCount() {
     return path_.size();
   }
+
   /**
    *
    *
@@ -1587,6 +1623,7 @@ public int getPathCount() {
   public com.google.datastore.v1.Key.PathElement getPath(int index) {
     return path_.get(index);
   }
+
   /**
    *
    *
@@ -1789,6 +1826,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -2052,6 +2090,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.PartitionId.Builder,
             com.google.datastore.v1.PartitionIdOrBuilder>
         partitionIdBuilder_;
+
     /**
      *
      *
@@ -2068,6 +2107,7 @@ public Builder mergeFrom(
     public boolean hasPartitionId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -2090,6 +2130,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
         return partitionIdBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2114,6 +2155,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2135,6 +2177,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2164,6 +2207,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2185,6 +2229,7 @@ public Builder clearPartitionId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2201,6 +2246,7 @@ public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2221,6 +2267,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
             : partitionId_;
       }
     }
+
     /**
      *
      *
@@ -2296,6 +2343,7 @@ public java.util.List getPathList() {
         return pathBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -2327,6 +2375,7 @@ public int getPathCount() {
         return pathBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -2358,6 +2407,7 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
         return pathBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -2395,6 +2445,7 @@ public Builder setPath(int index, com.google.datastore.v1.Key.PathElement value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -2430,6 +2481,7 @@ public Builder setPath(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2467,6 +2519,7 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2504,6 +2557,7 @@ public Builder addPath(int index, com.google.datastore.v1.Key.PathElement value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -2538,6 +2592,7 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement.Builder builderFo
       }
       return this;
     }
+
     /**
      *
      *
@@ -2573,6 +2628,7 @@ public Builder addPath(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2608,6 +2664,7 @@ public Builder addAllPath(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2642,6 +2699,7 @@ public Builder clearPath() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2676,6 +2734,7 @@ public Builder removePath(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2703,6 +2762,7 @@ public Builder removePath(int index) {
     public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(int index) {
       return getPathFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -2734,6 +2794,7 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind
         return pathBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -2766,6 +2827,7 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind
         return java.util.Collections.unmodifiableList(path_);
       }
     }
+
     /**
      *
      *
@@ -2794,6 +2856,7 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() {
       return getPathFieldBuilder()
           .addBuilder(com.google.datastore.v1.Key.PathElement.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2822,6 +2885,7 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(int index)
       return getPathFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Key.PathElement.getDefaultInstance());
     }
+
     /**
      *
      *
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 dca0ac30092a..4c72915d8f84 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
@@ -38,6 +38,7 @@ public interface KeyOrBuilder
    * @return Whether the partitionId field is set.
    */
   boolean hasPartitionId();
+
   /**
    *
    *
@@ -52,6 +53,7 @@ public interface KeyOrBuilder
    * @return The partitionId.
    */
   com.google.datastore.v1.PartitionId getPartitionId();
+
   /**
    *
    *
@@ -90,6 +92,7 @@ public interface KeyOrBuilder
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
   java.util.List getPathList();
+
   /**
    *
    *
@@ -115,6 +118,7 @@ public interface KeyOrBuilder
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
   com.google.datastore.v1.Key.PathElement getPath(int index);
+
   /**
    *
    *
@@ -140,6 +144,7 @@ public interface KeyOrBuilder
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
   int getPathCount();
+
   /**
    *
    *
@@ -165,6 +170,7 @@ public interface KeyOrBuilder
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
   java.util.List getPathOrBuilderList();
+
   /**
    *
    *
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 2440248b27a0..9b3d26ef993e 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
@@ -33,6 +33,7 @@ public final class KindExpression extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.KindExpression)
     KindExpressionOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use KindExpression.newBuilder() to construct.
   private KindExpression(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object name_ = "";
+
   /**
    *
    *
@@ -90,6 +92,7 @@ public java.lang.String getName() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -272,6 +275,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -455,6 +459,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object name_ = "";
+
     /**
      *
      *
@@ -477,6 +482,7 @@ public java.lang.String getName() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -499,6 +505,7 @@ public com.google.protobuf.ByteString getNameBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -520,6 +527,7 @@ public Builder setName(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -537,6 +545,7 @@ public Builder clearName() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 75f85f5fa311..ad9b5f9b64c7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -36,6 +36,7 @@ public interface KindExpressionOrBuilder
    * @return The name.
    */
   java.lang.String getName();
+
   /**
    *
    *
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 c9debbee560f..68b94adaa11f 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
@@ -33,6 +33,7 @@ public final class LookupRequest extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupRequest)
     LookupRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use LookupRequest.newBuilder() to construct.
   private LookupRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -93,6 +95,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -176,6 +181,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
+
   /**
    *
    *
@@ -191,6 +197,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public boolean hasReadOptions() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -208,6 +215,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
         ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
         : readOptions_;
   }
+
   /**
    *
    *
@@ -228,6 +236,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
 
   @SuppressWarnings("serial")
   private java.util.List keys_;
+
   /**
    *
    *
@@ -242,6 +251,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
   public java.util.List getKeysList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -256,6 +266,7 @@ public java.util.List getKeysList() {
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -270,6 +281,7 @@ public java.util.List getKeysOrB
   public int getKeysCount() {
     return keys_.size();
   }
+
   /**
    *
    *
@@ -284,6 +296,7 @@ public int getKeysCount() {
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
+
   /**
    *
    *
@@ -301,6 +314,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
 
   public static final int PROPERTY_MASK_FIELD_NUMBER = 5;
   private com.google.datastore.v1.PropertyMask propertyMask_;
+
   /**
    *
    *
@@ -321,6 +335,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
   public boolean hasPropertyMask() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -343,6 +358,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() {
         ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
         : propertyMask_;
   }
+
   /**
    *
    *
@@ -569,6 +585,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -877,6 +894,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -899,6 +917,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -921,6 +940,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -942,6 +962,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -959,6 +980,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -983,6 +1005,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -1008,6 +1031,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1033,6 +1057,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1057,6 +1082,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1077,6 +1103,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1109,6 +1136,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
             com.google.datastore.v1.ReadOptions.Builder,
             com.google.datastore.v1.ReadOptionsOrBuilder>
         readOptionsBuilder_;
+
     /**
      *
      *
@@ -1123,6 +1151,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     public boolean hasReadOptions() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1143,6 +1172,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
         return readOptionsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1165,6 +1195,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1184,6 +1215,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1211,6 +1243,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1230,6 +1263,7 @@ public Builder clearReadOptions() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1244,6 +1278,7 @@ public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1262,6 +1297,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
             : readOptions_;
       }
     }
+
     /**
      *
      *
@@ -1320,6 +1356,7 @@ public java.util.List getKeysList() {
         return keysBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1337,6 +1374,7 @@ public int getKeysCount() {
         return keysBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1354,6 +1392,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
         return keysBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1377,6 +1416,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1397,6 +1437,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -1420,6 +1461,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1443,6 +1485,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1463,6 +1506,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1483,6 +1527,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -1503,6 +1548,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB
         return java.util.Collections.unmodifiableList(keys_);
       }
     }
+
     /**
      *
      *
@@ -1603,6 +1654,7 @@ public java.util.List getKeysOrB
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
       return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1617,6 +1669,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
       return getKeysFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1654,6 +1707,7 @@ public java.util.List getKeysBuilderList()
             com.google.datastore.v1.PropertyMask.Builder,
             com.google.datastore.v1.PropertyMaskOrBuilder>
         propertyMaskBuilder_;
+
     /**
      *
      *
@@ -1673,6 +1727,7 @@ public java.util.List getKeysBuilderList()
     public boolean hasPropertyMask() {
       return ((bitField0_ & 0x00000010) != 0);
     }
+
     /**
      *
      *
@@ -1698,6 +1753,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() {
         return propertyMaskBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1725,6 +1781,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1749,6 +1806,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1781,6 +1839,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1805,6 +1864,7 @@ public Builder clearPropertyMask() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1824,6 +1884,7 @@ public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() {
       onChanged();
       return getPropertyMaskFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1847,6 +1908,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
             : propertyMask_;
       }
     }
+
     /**
      *
      *
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 645d311f2de4..f102198151c0 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
@@ -36,6 +36,7 @@ public interface LookupRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface LookupRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public interface LookupRequestOrBuilder
    * @return Whether the readOptions field is set.
    */
   boolean hasReadOptions();
+
   /**
    *
    *
@@ -104,6 +107,7 @@ public interface LookupRequestOrBuilder
    * @return The readOptions.
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
+
   /**
    *
    *
@@ -126,6 +130,7 @@ public interface LookupRequestOrBuilder
    * 
    */
   java.util.List getKeysList();
+
   /**
    *
    *
@@ -137,6 +142,7 @@ public interface LookupRequestOrBuilder
    * 
    */
   com.google.datastore.v1.Key getKeys(int index);
+
   /**
    *
    *
@@ -148,6 +154,7 @@ public interface LookupRequestOrBuilder
    * 
    */
   int getKeysCount();
+
   /**
    *
    *
@@ -159,6 +166,7 @@ public interface LookupRequestOrBuilder
    * 
    */
   java.util.List getKeysOrBuilderList();
+
   /**
    *
    *
@@ -188,6 +196,7 @@ public interface LookupRequestOrBuilder
    * @return Whether the propertyMask field is set.
    */
   boolean hasPropertyMask();
+
   /**
    *
    *
@@ -205,6 +214,7 @@ public interface LookupRequestOrBuilder
    * @return The propertyMask.
    */
   com.google.datastore.v1.PropertyMask getPropertyMask();
+
   /**
    *
    *
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 211ecfd32103..1f02e007c56e 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
@@ -33,6 +33,7 @@ public final class LookupResponse extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupResponse)
     LookupResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use LookupResponse.newBuilder() to construct.
   private LookupResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -71,6 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List found_;
+
   /**
    *
    *
@@ -86,6 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getFoundList() {
     return found_;
   }
+
   /**
    *
    *
@@ -102,6 +105,7 @@ public java.util.List getFoundList() {
       getFoundOrBuilderList() {
     return found_;
   }
+
   /**
    *
    *
@@ -117,6 +121,7 @@ public java.util.List getFoundList() {
   public int getFoundCount() {
     return found_.size();
   }
+
   /**
    *
    *
@@ -132,6 +137,7 @@ public int getFoundCount() {
   public com.google.datastore.v1.EntityResult getFound(int index) {
     return found_.get(index);
   }
+
   /**
    *
    *
@@ -152,6 +158,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
 
   @SuppressWarnings("serial")
   private java.util.List missing_;
+
   /**
    *
    *
@@ -167,6 +174,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
   public java.util.List getMissingList() {
     return missing_;
   }
+
   /**
    *
    *
@@ -183,6 +191,7 @@ public java.util.List getMissingList() {
       getMissingOrBuilderList() {
     return missing_;
   }
+
   /**
    *
    *
@@ -198,6 +207,7 @@ public java.util.List getMissingList() {
   public int getMissingCount() {
     return missing_.size();
   }
+
   /**
    *
    *
@@ -213,6 +223,7 @@ public int getMissingCount() {
   public com.google.datastore.v1.EntityResult getMissing(int index) {
     return missing_.get(index);
   }
+
   /**
    *
    *
@@ -233,6 +244,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
 
   @SuppressWarnings("serial")
   private java.util.List deferred_;
+
   /**
    *
    *
@@ -248,6 +260,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
   public java.util.List getDeferredList() {
     return deferred_;
   }
+
   /**
    *
    *
@@ -263,6 +276,7 @@ public java.util.List getDeferredList() {
   public java.util.List getDeferredOrBuilderList() {
     return deferred_;
   }
+
   /**
    *
    *
@@ -278,6 +292,7 @@ public java.util.List getDeferre
   public int getDeferredCount() {
     return deferred_.size();
   }
+
   /**
    *
    *
@@ -293,6 +308,7 @@ public int getDeferredCount() {
   public com.google.datastore.v1.Key getDeferred(int index) {
     return deferred_.get(index);
   }
+
   /**
    *
    *
@@ -311,6 +327,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
 
   public static final int TRANSACTION_FIELD_NUMBER = 5;
   private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -335,6 +352,7 @@ public com.google.protobuf.ByteString getTransaction() {
 
   public static final int READ_TIME_FIELD_NUMBER = 7;
   private com.google.protobuf.Timestamp readTime_;
+
   /**
    *
    *
@@ -350,6 +368,7 @@ public com.google.protobuf.ByteString getTransaction() {
   public boolean hasReadTime() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -365,6 +384,7 @@ public boolean hasReadTime() {
   public com.google.protobuf.Timestamp getReadTime() {
     return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
   }
+
   /**
    *
    *
@@ -584,6 +604,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1001,6 +1022,7 @@ public java.util.List getFoundList() {
         return foundBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1019,6 +1041,7 @@ public int getFoundCount() {
         return foundBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1037,6 +1060,7 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
         return foundBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1061,6 +1085,7 @@ public Builder setFound(int index, com.google.datastore.v1.EntityResult value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1083,6 +1108,7 @@ public Builder setFound(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1107,6 +1133,7 @@ public Builder addFound(com.google.datastore.v1.EntityResult value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1131,6 +1158,7 @@ public Builder addFound(int index, com.google.datastore.v1.EntityResult value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1152,6 +1180,7 @@ public Builder addFound(com.google.datastore.v1.EntityResult.Builder builderForV
       }
       return this;
     }
+
     /**
      *
      *
@@ -1174,6 +1203,7 @@ public Builder addFound(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1196,6 +1226,7 @@ public Builder addAllFound(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1217,6 +1248,7 @@ public Builder clearFound() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1238,6 +1270,7 @@ public Builder removeFound(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1252,6 +1285,7 @@ public Builder removeFound(int index) {
     public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(int index) {
       return getFoundFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -1270,6 +1304,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
         return foundBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -1289,6 +1324,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
         return java.util.Collections.unmodifiableList(found_);
       }
     }
+
     /**
      *
      *
@@ -1304,6 +1340,7 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder() {
       return getFoundFieldBuilder()
           .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1319,6 +1356,7 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(int index) {
       return getFoundFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1385,6 +1423,7 @@ public java.util.List getMissingList() {
         return missingBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1403,6 +1442,7 @@ public int getMissingCount() {
         return missingBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1421,6 +1461,7 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
         return missingBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1445,6 +1486,7 @@ public Builder setMissing(int index, com.google.datastore.v1.EntityResult value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1467,6 +1509,7 @@ public Builder setMissing(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1491,6 +1534,7 @@ public Builder addMissing(com.google.datastore.v1.EntityResult value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1515,6 +1559,7 @@ public Builder addMissing(int index, com.google.datastore.v1.EntityResult value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1536,6 +1581,7 @@ public Builder addMissing(com.google.datastore.v1.EntityResult.Builder builderFo
       }
       return this;
     }
+
     /**
      *
      *
@@ -1558,6 +1604,7 @@ public Builder addMissing(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1580,6 +1627,7 @@ public Builder addAllMissing(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1601,6 +1649,7 @@ public Builder clearMissing() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1622,6 +1671,7 @@ public Builder removeMissing(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1636,6 +1686,7 @@ public Builder removeMissing(int index) {
     public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(int index) {
       return getMissingFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -1654,6 +1705,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
         return missingBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -1673,6 +1725,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
         return java.util.Collections.unmodifiableList(missing_);
       }
     }
+
     /**
      *
      *
@@ -1688,6 +1741,7 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder() {
       return getMissingFieldBuilder()
           .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1703,6 +1757,7 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(int index)
       return getMissingFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1769,6 +1824,7 @@ public java.util.List getDeferredList() {
         return deferredBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1787,6 +1843,7 @@ public int getDeferredCount() {
         return deferredBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1805,6 +1862,7 @@ public com.google.datastore.v1.Key getDeferred(int index) {
         return deferredBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1829,6 +1887,7 @@ public Builder setDeferred(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1850,6 +1909,7 @@ public Builder setDeferred(int index, com.google.datastore.v1.Key.Builder builde
       }
       return this;
     }
+
     /**
      *
      *
@@ -1874,6 +1934,7 @@ public Builder addDeferred(com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1898,6 +1959,7 @@ public Builder addDeferred(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1919,6 +1981,7 @@ public Builder addDeferred(com.google.datastore.v1.Key.Builder builderForValue)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1940,6 +2003,7 @@ public Builder addDeferred(int index, com.google.datastore.v1.Key.Builder builde
       }
       return this;
     }
+
     /**
      *
      *
@@ -1962,6 +2026,7 @@ public Builder addAllDeferred(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1983,6 +2048,7 @@ public Builder clearDeferred() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2004,6 +2070,7 @@ public Builder removeDeferred(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2018,6 +2085,7 @@ public Builder removeDeferred(int index) {
     public com.google.datastore.v1.Key.Builder getDeferredBuilder(int index) {
       return getDeferredFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -2036,6 +2104,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
         return deferredBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -2055,6 +2124,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
         return java.util.Collections.unmodifiableList(deferred_);
       }
     }
+
     /**
      *
      *
@@ -2069,6 +2139,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
     public com.google.datastore.v1.Key.Builder addDeferredBuilder() {
       return getDeferredFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2084,6 +2155,7 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder(int index) {
       return getDeferredFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2117,6 +2189,7 @@ public java.util.List getDeferredBuilderLis
     }
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -2138,6 +2211,7 @@ public java.util.List getDeferredBuilderLis
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
+
     /**
      *
      *
@@ -2165,6 +2239,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2195,6 +2270,7 @@ public Builder clearTransaction() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         readTimeBuilder_;
+
     /**
      *
      *
@@ -2209,6 +2285,7 @@ public Builder clearTransaction() {
     public boolean hasReadTime() {
       return ((bitField0_ & 0x00000010) != 0);
     }
+
     /**
      *
      *
@@ -2227,6 +2304,7 @@ public com.google.protobuf.Timestamp getReadTime() {
         return readTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2249,6 +2327,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2268,6 +2347,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2295,6 +2375,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2314,6 +2395,7 @@ public Builder clearReadTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2328,6 +2410,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
       onChanged();
       return getReadTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2344,6 +2427,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
         return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
       }
     }
+
     /**
      *
      *
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 540ffdd11f74..ae3bfc36d3a8 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
@@ -36,6 +36,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
   java.util.List getFoundList();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
   com.google.datastore.v1.EntityResult getFound(int index);
+
   /**
    *
    *
@@ -60,6 +62,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
   int getFoundCount();
+
   /**
    *
    *
@@ -72,6 +75,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
   java.util.List getFoundOrBuilderList();
+
   /**
    *
    *
@@ -97,6 +101,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
   java.util.List getMissingList();
+
   /**
    *
    *
@@ -109,6 +114,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
   com.google.datastore.v1.EntityResult getMissing(int index);
+
   /**
    *
    *
@@ -121,6 +127,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
   int getMissingCount();
+
   /**
    *
    *
@@ -133,6 +140,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
   java.util.List getMissingOrBuilderList();
+
   /**
    *
    *
@@ -158,6 +166,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.Key deferred = 3;
    */
   java.util.List getDeferredList();
+
   /**
    *
    *
@@ -170,6 +179,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.Key deferred = 3;
    */
   com.google.datastore.v1.Key getDeferred(int index);
+
   /**
    *
    *
@@ -182,6 +192,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.Key deferred = 3;
    */
   int getDeferredCount();
+
   /**
    *
    *
@@ -194,6 +205,7 @@ public interface LookupResponseOrBuilder
    * repeated .google.datastore.v1.Key deferred = 3;
    */
   java.util.List getDeferredOrBuilderList();
+
   /**
    *
    *
@@ -238,6 +250,7 @@ public interface LookupResponseOrBuilder
    * @return Whether the readTime field is set.
    */
   boolean hasReadTime();
+
   /**
    *
    *
@@ -250,6 +263,7 @@ public interface LookupResponseOrBuilder
    * @return The readTime.
    */
   com.google.protobuf.Timestamp getReadTime();
+
   /**
    *
    *
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 e9d1e85273be..be1d7e191404 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
@@ -33,6 +33,7 @@ public final class Mutation extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Mutation)
     MutationOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Mutation.newBuilder() to construct.
   private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -116,6 +117,7 @@ public enum ConflictResolutionStrategy implements com.google.protobuf.ProtocolMe
      * STRATEGY_UNSPECIFIED = 0;
      */
     public static final int STRATEGY_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -126,6 +128,7 @@ public enum ConflictResolutionStrategy implements com.google.protobuf.ProtocolMe
      * SERVER_VALUE = 1;
      */
     public static final int SERVER_VALUE_VALUE = 1;
+
     /**
      *
      *
@@ -243,6 +246,7 @@ public enum OperationCase
     private OperationCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -296,6 +300,7 @@ public enum ConflictDetectionStrategyCase
     private ConflictDetectionStrategyCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -329,6 +334,7 @@ public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
   }
 
   public static final int INSERT_FIELD_NUMBER = 4;
+
   /**
    *
    *
@@ -345,6 +351,7 @@ public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
   public boolean hasInsert() {
     return operationCase_ == 4;
   }
+
   /**
    *
    *
@@ -364,6 +371,7 @@ public com.google.datastore.v1.Entity getInsert() {
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -383,6 +391,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
   }
 
   public static final int UPDATE_FIELD_NUMBER = 5;
+
   /**
    *
    *
@@ -399,6 +408,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
   public boolean hasUpdate() {
     return operationCase_ == 5;
   }
+
   /**
    *
    *
@@ -418,6 +428,7 @@ public com.google.datastore.v1.Entity getUpdate() {
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -437,6 +448,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
   }
 
   public static final int UPSERT_FIELD_NUMBER = 6;
+
   /**
    *
    *
@@ -453,6 +465,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
   public boolean hasUpsert() {
     return operationCase_ == 6;
   }
+
   /**
    *
    *
@@ -472,6 +485,7 @@ public com.google.datastore.v1.Entity getUpsert() {
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -491,6 +505,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
   }
 
   public static final int DELETE_FIELD_NUMBER = 7;
+
   /**
    *
    *
@@ -507,6 +522,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
   public boolean hasDelete() {
     return operationCase_ == 7;
   }
+
   /**
    *
    *
@@ -526,6 +542,7 @@ public com.google.datastore.v1.Key getDelete() {
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -545,6 +562,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
   }
 
   public static final int BASE_VERSION_FIELD_NUMBER = 8;
+
   /**
    *
    *
@@ -562,6 +580,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
   public boolean hasBaseVersion() {
     return conflictDetectionStrategyCase_ == 8;
   }
+
   /**
    *
    *
@@ -584,6 +603,7 @@ public long getBaseVersion() {
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 11;
+
   /**
    *
    *
@@ -601,6 +621,7 @@ public long getBaseVersion() {
   public boolean hasUpdateTime() {
     return conflictDetectionStrategyCase_ == 11;
   }
+
   /**
    *
    *
@@ -621,6 +642,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
     }
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -642,6 +664,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
 
   public static final int CONFLICT_RESOLUTION_STRATEGY_FIELD_NUMBER = 10;
   private int conflictResolutionStrategy_ = 0;
+
   /**
    *
    *
@@ -661,6 +684,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   public int getConflictResolutionStrategyValue() {
     return conflictResolutionStrategy_;
   }
+
   /**
    *
    *
@@ -689,6 +713,7 @@ public int getConflictResolutionStrategyValue() {
 
   public static final int PROPERTY_MASK_FIELD_NUMBER = 9;
   private com.google.datastore.v1.PropertyMask propertyMask_;
+
   /**
    *
    *
@@ -711,6 +736,7 @@ public int getConflictResolutionStrategyValue() {
   public boolean hasPropertyMask() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -735,6 +761,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() {
         ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
         : propertyMask_;
   }
+
   /**
    *
    *
@@ -762,6 +789,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
 
   @SuppressWarnings("serial")
   private java.util.List propertyTransforms_;
+
   /**
    *
    *
@@ -781,6 +809,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
   public java.util.List getPropertyTransformsList() {
     return propertyTransforms_;
   }
+
   /**
    *
    *
@@ -801,6 +830,7 @@ public java.util.List getPropertyTran
       getPropertyTransformsOrBuilderList() {
     return propertyTransforms_;
   }
+
   /**
    *
    *
@@ -820,6 +850,7 @@ public java.util.List getPropertyTran
   public int getPropertyTransformsCount() {
     return propertyTransforms_.size();
   }
+
   /**
    *
    *
@@ -839,6 +870,7 @@ public int getPropertyTransformsCount() {
   public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index) {
     return propertyTransforms_.get(index);
   }
+
   /**
    *
    *
@@ -1157,6 +1189,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1580,6 +1613,7 @@ public Builder clearConflictDetectionStrategy() {
             com.google.datastore.v1.Entity.Builder,
             com.google.datastore.v1.EntityOrBuilder>
         insertBuilder_;
+
     /**
      *
      *
@@ -1596,6 +1630,7 @@ public Builder clearConflictDetectionStrategy() {
     public boolean hasInsert() {
       return operationCase_ == 4;
     }
+
     /**
      *
      *
@@ -1622,6 +1657,7 @@ public com.google.datastore.v1.Entity getInsert() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1645,6 +1681,7 @@ public Builder setInsert(com.google.datastore.v1.Entity value) {
       operationCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -1665,6 +1702,7 @@ public Builder setInsert(com.google.datastore.v1.Entity.Builder builderForValue)
       operationCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -1697,6 +1735,7 @@ public Builder mergeInsert(com.google.datastore.v1.Entity value) {
       operationCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -1723,6 +1762,7 @@ public Builder clearInsert() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1736,6 +1776,7 @@ public Builder clearInsert() {
     public com.google.datastore.v1.Entity.Builder getInsertBuilder() {
       return getInsertFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1757,6 +1798,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1794,6 +1836,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
             com.google.datastore.v1.Entity.Builder,
             com.google.datastore.v1.EntityOrBuilder>
         updateBuilder_;
+
     /**
      *
      *
@@ -1810,6 +1853,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
     public boolean hasUpdate() {
       return operationCase_ == 5;
     }
+
     /**
      *
      *
@@ -1836,6 +1880,7 @@ public com.google.datastore.v1.Entity getUpdate() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1859,6 +1904,7 @@ public Builder setUpdate(com.google.datastore.v1.Entity value) {
       operationCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -1879,6 +1925,7 @@ public Builder setUpdate(com.google.datastore.v1.Entity.Builder builderForValue)
       operationCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -1911,6 +1958,7 @@ public Builder mergeUpdate(com.google.datastore.v1.Entity value) {
       operationCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -1937,6 +1985,7 @@ public Builder clearUpdate() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1950,6 +1999,7 @@ public Builder clearUpdate() {
     public com.google.datastore.v1.Entity.Builder getUpdateBuilder() {
       return getUpdateFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1971,6 +2021,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2008,6 +2059,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
             com.google.datastore.v1.Entity.Builder,
             com.google.datastore.v1.EntityOrBuilder>
         upsertBuilder_;
+
     /**
      *
      *
@@ -2024,6 +2076,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
     public boolean hasUpsert() {
       return operationCase_ == 6;
     }
+
     /**
      *
      *
@@ -2050,6 +2103,7 @@ public com.google.datastore.v1.Entity getUpsert() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2073,6 +2127,7 @@ public Builder setUpsert(com.google.datastore.v1.Entity value) {
       operationCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2093,6 +2148,7 @@ public Builder setUpsert(com.google.datastore.v1.Entity.Builder builderForValue)
       operationCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2125,6 +2181,7 @@ public Builder mergeUpsert(com.google.datastore.v1.Entity value) {
       operationCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2151,6 +2208,7 @@ public Builder clearUpsert() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2164,6 +2222,7 @@ public Builder clearUpsert() {
     public com.google.datastore.v1.Entity.Builder getUpsertBuilder() {
       return getUpsertFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2185,6 +2244,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2222,6 +2282,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
             com.google.datastore.v1.Key.Builder,
             com.google.datastore.v1.KeyOrBuilder>
         deleteBuilder_;
+
     /**
      *
      *
@@ -2238,6 +2299,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
     public boolean hasDelete() {
       return operationCase_ == 7;
     }
+
     /**
      *
      *
@@ -2264,6 +2326,7 @@ public com.google.datastore.v1.Key getDelete() {
         return com.google.datastore.v1.Key.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2287,6 +2350,7 @@ public Builder setDelete(com.google.datastore.v1.Key value) {
       operationCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2307,6 +2371,7 @@ public Builder setDelete(com.google.datastore.v1.Key.Builder builderForValue) {
       operationCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2338,6 +2403,7 @@ public Builder mergeDelete(com.google.datastore.v1.Key value) {
       operationCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2364,6 +2430,7 @@ public Builder clearDelete() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2377,6 +2444,7 @@ public Builder clearDelete() {
     public com.google.datastore.v1.Key.Builder getDeleteBuilder() {
       return getDeleteFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2398,6 +2466,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
         return com.google.datastore.v1.Key.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2446,6 +2515,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
     public boolean hasBaseVersion() {
       return conflictDetectionStrategyCase_ == 8;
     }
+
     /**
      *
      *
@@ -2465,6 +2535,7 @@ public long getBaseVersion() {
       }
       return 0L;
     }
+
     /**
      *
      *
@@ -2486,6 +2557,7 @@ public Builder setBaseVersion(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2513,6 +2585,7 @@ public Builder clearBaseVersion() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         updateTimeBuilder_;
+
     /**
      *
      *
@@ -2530,6 +2603,7 @@ public Builder clearBaseVersion() {
     public boolean hasUpdateTime() {
       return conflictDetectionStrategyCase_ == 11;
     }
+
     /**
      *
      *
@@ -2557,6 +2631,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
         return com.google.protobuf.Timestamp.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2581,6 +2656,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
       conflictDetectionStrategyCase_ = 11;
       return this;
     }
+
     /**
      *
      *
@@ -2602,6 +2678,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
       conflictDetectionStrategyCase_ = 11;
       return this;
     }
+
     /**
      *
      *
@@ -2636,6 +2713,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       conflictDetectionStrategyCase_ = 11;
       return this;
     }
+
     /**
      *
      *
@@ -2663,6 +2741,7 @@ public Builder clearUpdateTime() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2677,6 +2756,7 @@ public Builder clearUpdateTime() {
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
       return getUpdateTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2699,6 +2779,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
         return com.google.protobuf.Timestamp.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2735,6 +2816,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     }
 
     private int conflictResolutionStrategy_ = 0;
+
     /**
      *
      *
@@ -2754,6 +2836,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     public int getConflictResolutionStrategyValue() {
       return conflictResolutionStrategy_;
     }
+
     /**
      *
      *
@@ -2776,6 +2859,7 @@ public Builder setConflictResolutionStrategyValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2801,6 +2885,7 @@ public Builder setConflictResolutionStrategyValue(int value) {
           ? com.google.datastore.v1.Mutation.ConflictResolutionStrategy.UNRECOGNIZED
           : result;
     }
+
     /**
      *
      *
@@ -2827,6 +2912,7 @@ public Builder setConflictResolutionStrategy(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2855,6 +2941,7 @@ public Builder clearConflictResolutionStrategy() {
             com.google.datastore.v1.PropertyMask.Builder,
             com.google.datastore.v1.PropertyMaskOrBuilder>
         propertyMaskBuilder_;
+
     /**
      *
      *
@@ -2876,6 +2963,7 @@ public Builder clearConflictResolutionStrategy() {
     public boolean hasPropertyMask() {
       return ((bitField0_ & 0x00000080) != 0);
     }
+
     /**
      *
      *
@@ -2903,6 +2991,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() {
         return propertyMaskBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2932,6 +3021,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2958,6 +3048,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2992,6 +3083,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3018,6 +3110,7 @@ public Builder clearPropertyMask() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3039,6 +3132,7 @@ public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() {
       onChanged();
       return getPropertyMaskFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -3064,6 +3158,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
             : propertyMask_;
       }
     }
+
     /**
      *
      *
@@ -3136,6 +3231,7 @@ public java.util.List getPropertyTran
         return propertyTransformsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -3158,6 +3254,7 @@ public int getPropertyTransformsCount() {
         return propertyTransformsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -3180,6 +3277,7 @@ public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index
         return propertyTransformsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -3209,6 +3307,7 @@ public Builder setPropertyTransforms(
       }
       return this;
     }
+
     /**
      *
      *
@@ -3235,6 +3334,7 @@ public Builder setPropertyTransforms(
       }
       return this;
     }
+
     /**
      *
      *
@@ -3263,6 +3363,7 @@ public Builder addPropertyTransforms(com.google.datastore.v1.PropertyTransform v
       }
       return this;
     }
+
     /**
      *
      *
@@ -3292,6 +3393,7 @@ public Builder addPropertyTransforms(
       }
       return this;
     }
+
     /**
      *
      *
@@ -3318,6 +3420,7 @@ public Builder addPropertyTransforms(
       }
       return this;
     }
+
     /**
      *
      *
@@ -3344,6 +3447,7 @@ public Builder addPropertyTransforms(
       }
       return this;
     }
+
     /**
      *
      *
@@ -3370,6 +3474,7 @@ public Builder addAllPropertyTransforms(
       }
       return this;
     }
+
     /**
      *
      *
@@ -3395,6 +3500,7 @@ public Builder clearPropertyTransforms() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3420,6 +3526,7 @@ public Builder removePropertyTransforms(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3439,6 +3546,7 @@ public com.google.datastore.v1.PropertyTransform.Builder getPropertyTransformsBu
         int index) {
       return getPropertyTransformsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -3462,6 +3570,7 @@ public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsO
         return propertyTransformsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -3485,6 +3594,7 @@ public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsO
         return java.util.Collections.unmodifiableList(propertyTransforms_);
       }
     }
+
     /**
      *
      *
@@ -3504,6 +3614,7 @@ public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBu
       return getPropertyTransformsFieldBuilder()
           .addBuilder(com.google.datastore.v1.PropertyTransform.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -3524,6 +3635,7 @@ public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBu
       return getPropertyTransformsFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.PropertyTransform.getDefaultInstance());
     }
+
     /**
      *
      *
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 f608c8c7187d..3b01c9ae5194 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
@@ -37,6 +37,7 @@ public interface MutationOrBuilder
    * @return Whether the insert field is set.
    */
   boolean hasInsert();
+
   /**
    *
    *
@@ -50,6 +51,7 @@ public interface MutationOrBuilder
    * @return The insert.
    */
   com.google.datastore.v1.Entity getInsert();
+
   /**
    *
    *
@@ -75,6 +77,7 @@ public interface MutationOrBuilder
    * @return Whether the update field is set.
    */
   boolean hasUpdate();
+
   /**
    *
    *
@@ -88,6 +91,7 @@ public interface MutationOrBuilder
    * @return The update.
    */
   com.google.datastore.v1.Entity getUpdate();
+
   /**
    *
    *
@@ -113,6 +117,7 @@ public interface MutationOrBuilder
    * @return Whether the upsert field is set.
    */
   boolean hasUpsert();
+
   /**
    *
    *
@@ -126,6 +131,7 @@ public interface MutationOrBuilder
    * @return The upsert.
    */
   com.google.datastore.v1.Entity getUpsert();
+
   /**
    *
    *
@@ -151,6 +157,7 @@ public interface MutationOrBuilder
    * @return Whether the delete field is set.
    */
   boolean hasDelete();
+
   /**
    *
    *
@@ -164,6 +171,7 @@ public interface MutationOrBuilder
    * @return The delete.
    */
   com.google.datastore.v1.Key getDelete();
+
   /**
    *
    *
@@ -190,6 +198,7 @@ public interface MutationOrBuilder
    * @return Whether the baseVersion field is set.
    */
   boolean hasBaseVersion();
+
   /**
    *
    *
@@ -219,6 +228,7 @@ public interface MutationOrBuilder
    * @return Whether the updateTime field is set.
    */
   boolean hasUpdateTime();
+
   /**
    *
    *
@@ -233,6 +243,7 @@ public interface MutationOrBuilder
    * @return The updateTime.
    */
   com.google.protobuf.Timestamp getUpdateTime();
+
   /**
    *
    *
@@ -262,6 +273,7 @@ public interface MutationOrBuilder
    * @return The enum numeric value on the wire for conflictResolutionStrategy.
    */
   int getConflictResolutionStrategyValue();
+
   /**
    *
    *
@@ -298,6 +310,7 @@ public interface MutationOrBuilder
    * @return Whether the propertyMask field is set.
    */
   boolean hasPropertyMask();
+
   /**
    *
    *
@@ -317,6 +330,7 @@ public interface MutationOrBuilder
    * @return The propertyMask.
    */
   com.google.datastore.v1.PropertyMask getPropertyMask();
+
   /**
    *
    *
@@ -351,6 +365,7 @@ public interface MutationOrBuilder
    * 
    */
   java.util.List getPropertyTransformsList();
+
   /**
    *
    *
@@ -367,6 +382,7 @@ public interface MutationOrBuilder
    * 
    */
   com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index);
+
   /**
    *
    *
@@ -383,6 +399,7 @@ public interface MutationOrBuilder
    * 
    */
   int getPropertyTransformsCount();
+
   /**
    *
    *
@@ -400,6 +417,7 @@ public interface MutationOrBuilder
    */
   java.util.List
       getPropertyTransformsOrBuilderList();
+
   /**
    *
    *
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 e2bd44311032..8f82a5c95f4b 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
@@ -33,6 +33,7 @@ public final class MutationResult extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.MutationResult)
     MutationResultOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use MutationResult.newBuilder() to construct.
   private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int KEY_FIELD_NUMBER = 3;
   private com.google.datastore.v1.Key key_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasKey() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -98,6 +101,7 @@ public boolean hasKey() {
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
+
   /**
    *
    *
@@ -115,6 +119,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
 
   public static final int VERSION_FIELD_NUMBER = 4;
   private long version_ = 0L;
+
   /**
    *
    *
@@ -137,6 +142,7 @@ public long getVersion() {
 
   public static final int CREATE_TIME_FIELD_NUMBER = 7;
   private com.google.protobuf.Timestamp createTime_;
+
   /**
    *
    *
@@ -152,6 +158,7 @@ public long getVersion() {
   public boolean hasCreateTime() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -167,6 +174,7 @@ public boolean hasCreateTime() {
   public com.google.protobuf.Timestamp getCreateTime() {
     return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
+
   /**
    *
    *
@@ -183,6 +191,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 6;
   private com.google.protobuf.Timestamp updateTime_;
+
   /**
    *
    *
@@ -201,6 +210,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
   public boolean hasUpdateTime() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -219,6 +229,7 @@ public boolean hasUpdateTime() {
   public com.google.protobuf.Timestamp getUpdateTime() {
     return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
+
   /**
    *
    *
@@ -238,6 +249,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
 
   public static final int CONFLICT_DETECTED_FIELD_NUMBER = 5;
   private boolean conflictDetected_ = false;
+
   /**
    *
    *
@@ -259,6 +271,7 @@ public boolean getConflictDetected() {
 
   @SuppressWarnings("serial")
   private java.util.List transformResults_;
+
   /**
    *
    *
@@ -274,6 +287,7 @@ public boolean getConflictDetected() {
   public java.util.List getTransformResultsList() {
     return transformResults_;
   }
+
   /**
    *
    *
@@ -290,6 +304,7 @@ public java.util.List getTransformResultsList() {
       getTransformResultsOrBuilderList() {
     return transformResults_;
   }
+
   /**
    *
    *
@@ -305,6 +320,7 @@ public java.util.List getTransformResultsList() {
   public int getTransformResultsCount() {
     return transformResults_.size();
   }
+
   /**
    *
    *
@@ -320,6 +336,7 @@ public int getTransformResultsCount() {
   public com.google.datastore.v1.Value getTransformResults(int index) {
     return transformResults_.get(index);
   }
+
   /**
    *
    *
@@ -556,6 +573,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -882,6 +900,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.Key.Builder,
             com.google.datastore.v1.KeyOrBuilder>
         keyBuilder_;
+
     /**
      *
      *
@@ -897,6 +916,7 @@ public Builder mergeFrom(
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -916,6 +936,7 @@ public com.google.datastore.v1.Key getKey() {
         return keyBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -939,6 +960,7 @@ public Builder setKey(com.google.datastore.v1.Key value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -959,6 +981,7 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -987,6 +1010,7 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1007,6 +1031,7 @@ public Builder clearKey() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1022,6 +1047,7 @@ public com.google.datastore.v1.Key.Builder getKeyBuilder() {
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1039,6 +1065,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
         return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
       }
     }
+
     /**
      *
      *
@@ -1066,6 +1093,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
     }
 
     private long version_;
+
     /**
      *
      *
@@ -1085,6 +1113,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
     public long getVersion() {
       return version_;
     }
+
     /**
      *
      *
@@ -1108,6 +1137,7 @@ public Builder setVersion(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1136,6 +1166,7 @@ public Builder clearVersion() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         createTimeBuilder_;
+
     /**
      *
      *
@@ -1150,6 +1181,7 @@ public Builder clearVersion() {
     public boolean hasCreateTime() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1170,6 +1202,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
         return createTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1192,6 +1225,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1211,6 +1245,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1238,6 +1273,7 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1257,6 +1293,7 @@ public Builder clearCreateTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1271,6 +1308,7 @@ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1289,6 +1327,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
             : createTime_;
       }
     }
+
     /**
      *
      *
@@ -1321,6 +1360,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         updateTimeBuilder_;
+
     /**
      *
      *
@@ -1338,6 +1378,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
     public boolean hasUpdateTime() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1361,6 +1402,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
         return updateTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1386,6 +1428,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1408,6 +1451,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1438,6 +1482,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1460,6 +1505,7 @@ public Builder clearUpdateTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1477,6 +1523,7 @@ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1498,6 +1545,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
             : updateTime_;
       }
     }
+
     /**
      *
      *
@@ -1528,6 +1576,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     }
 
     private boolean conflictDetected_;
+
     /**
      *
      *
@@ -1544,6 +1593,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     public boolean getConflictDetected() {
       return conflictDetected_;
     }
+
     /**
      *
      *
@@ -1564,6 +1614,7 @@ public Builder setConflictDetected(boolean value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1618,6 +1669,7 @@ public java.util.List getTransformResultsList() {
         return transformResultsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1636,6 +1688,7 @@ public int getTransformResultsCount() {
         return transformResultsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1654,6 +1707,7 @@ public com.google.datastore.v1.Value getTransformResults(int index) {
         return transformResultsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1678,6 +1732,7 @@ public Builder setTransformResults(int index, com.google.datastore.v1.Value valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1700,6 +1755,7 @@ public Builder setTransformResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1724,6 +1780,7 @@ public Builder addTransformResults(com.google.datastore.v1.Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1748,6 +1805,7 @@ public Builder addTransformResults(int index, com.google.datastore.v1.Value valu
       }
       return this;
     }
+
     /**
      *
      *
@@ -1769,6 +1827,7 @@ public Builder addTransformResults(com.google.datastore.v1.Value.Builder builder
       }
       return this;
     }
+
     /**
      *
      *
@@ -1791,6 +1850,7 @@ public Builder addTransformResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1813,6 +1873,7 @@ public Builder addAllTransformResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1834,6 +1895,7 @@ public Builder clearTransformResults() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1855,6 +1917,7 @@ public Builder removeTransformResults(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1869,6 +1932,7 @@ public Builder removeTransformResults(int index) {
     public com.google.datastore.v1.Value.Builder getTransformResultsBuilder(int index) {
       return getTransformResultsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -1887,6 +1951,7 @@ public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int i
         return transformResultsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -1906,6 +1971,7 @@ public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int i
         return java.util.Collections.unmodifiableList(transformResults_);
       }
     }
+
     /**
      *
      *
@@ -1921,6 +1987,7 @@ public com.google.datastore.v1.Value.Builder addTransformResultsBuilder() {
       return getTransformResultsFieldBuilder()
           .addBuilder(com.google.datastore.v1.Value.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1936,6 +2003,7 @@ public com.google.datastore.v1.Value.Builder addTransformResultsBuilder(int inde
       return getTransformResultsFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance());
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index c948ceffb265..5df6b9c3a145 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -37,6 +37,7 @@ public interface MutationResultOrBuilder
    * @return Whether the key field is set.
    */
   boolean hasKey();
+
   /**
    *
    *
@@ -50,6 +51,7 @@ public interface MutationResultOrBuilder
    * @return The key.
    */
   com.google.datastore.v1.Key getKey();
+
   /**
    *
    *
@@ -91,6 +93,7 @@ public interface MutationResultOrBuilder
    * @return Whether the createTime field is set.
    */
   boolean hasCreateTime();
+
   /**
    *
    *
@@ -103,6 +106,7 @@ public interface MutationResultOrBuilder
    * @return The createTime.
    */
   com.google.protobuf.Timestamp getCreateTime();
+
   /**
    *
    *
@@ -129,6 +133,7 @@ public interface MutationResultOrBuilder
    * @return Whether the updateTime field is set.
    */
   boolean hasUpdateTime();
+
   /**
    *
    *
@@ -144,6 +149,7 @@ public interface MutationResultOrBuilder
    * @return The updateTime.
    */
   com.google.protobuf.Timestamp getUpdateTime();
+
   /**
    *
    *
@@ -184,6 +190,7 @@ public interface MutationResultOrBuilder
    * repeated .google.datastore.v1.Value transform_results = 8;
    */
   java.util.List getTransformResultsList();
+
   /**
    *
    *
@@ -196,6 +203,7 @@ public interface MutationResultOrBuilder
    * repeated .google.datastore.v1.Value transform_results = 8;
    */
   com.google.datastore.v1.Value getTransformResults(int index);
+
   /**
    *
    *
@@ -208,6 +216,7 @@ public interface MutationResultOrBuilder
    * repeated .google.datastore.v1.Value transform_results = 8;
    */
   int getTransformResultsCount();
+
   /**
    *
    *
@@ -221,6 +230,7 @@ public interface MutationResultOrBuilder
    */
   java.util.List
       getTransformResultsOrBuilderList();
+
   /**
    *
    *
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 c5c48023008d..be1529aca397 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
@@ -52,6 +52,7 @@ public final class PartitionId extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PartitionId)
     PartitionIdOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use PartitionId.newBuilder() to construct.
   private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -88,6 +89,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -111,6 +113,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -139,6 +142,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -163,6 +167,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -192,6 +197,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object namespaceId_ = "";
+
   /**
    *
    *
@@ -215,6 +221,7 @@ public java.lang.String getNamespaceId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -414,6 +421,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -645,6 +653,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -667,6 +676,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -689,6 +699,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -710,6 +721,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -727,6 +739,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -751,6 +764,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -774,6 +788,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -797,6 +812,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -819,6 +835,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -837,6 +854,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -862,6 +880,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object namespaceId_ = "";
+
     /**
      *
      *
@@ -884,6 +903,7 @@ public java.lang.String getNamespaceId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -906,6 +926,7 @@ public com.google.protobuf.ByteString getNamespaceIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -927,6 +948,7 @@ public Builder setNamespaceId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -944,6 +966,7 @@ public Builder clearNamespaceId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 0fd99d809c53..17e4eb6597c4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -36,6 +36,7 @@ public interface PartitionIdOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -62,6 +63,7 @@ public interface PartitionIdOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -88,6 +90,7 @@ public interface PartitionIdOrBuilder
    * @return The namespaceId.
    */
   java.lang.String getNamespaceId();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
index 25c75ada895e..e378ba5665e0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
@@ -33,6 +33,7 @@ public final class PlanSummary extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PlanSummary)
     PlanSummaryOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use PlanSummary.newBuilder() to construct.
   private PlanSummary(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List indexesUsed_;
+
   /**
    *
    *
@@ -84,6 +86,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getIndexesUsedList() {
     return indexesUsed_;
   }
+
   /**
    *
    *
@@ -102,6 +105,7 @@ public java.util.List getIndexesUsedList() {
       getIndexesUsedOrBuilderList() {
     return indexesUsed_;
   }
+
   /**
    *
    *
@@ -119,6 +123,7 @@ public java.util.List getIndexesUsedList() {
   public int getIndexesUsedCount() {
     return indexesUsed_.size();
   }
+
   /**
    *
    *
@@ -136,6 +141,7 @@ public int getIndexesUsedCount() {
   public com.google.protobuf.Struct getIndexesUsed(int index) {
     return indexesUsed_.get(index);
   }
+
   /**
    *
    *
@@ -313,6 +319,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -574,6 +581,7 @@ public java.util.List getIndexesUsedList() {
         return indexesUsedBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -594,6 +602,7 @@ public int getIndexesUsedCount() {
         return indexesUsedBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -614,6 +623,7 @@ public com.google.protobuf.Struct getIndexesUsed(int index) {
         return indexesUsedBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -640,6 +650,7 @@ public Builder setIndexesUsed(int index, com.google.protobuf.Struct value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -663,6 +674,7 @@ public Builder setIndexesUsed(int index, com.google.protobuf.Struct.Builder buil
       }
       return this;
     }
+
     /**
      *
      *
@@ -689,6 +701,7 @@ public Builder addIndexesUsed(com.google.protobuf.Struct value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -715,6 +728,7 @@ public Builder addIndexesUsed(int index, com.google.protobuf.Struct value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -738,6 +752,7 @@ public Builder addIndexesUsed(com.google.protobuf.Struct.Builder builderForValue
       }
       return this;
     }
+
     /**
      *
      *
@@ -761,6 +776,7 @@ public Builder addIndexesUsed(int index, com.google.protobuf.Struct.Builder buil
       }
       return this;
     }
+
     /**
      *
      *
@@ -785,6 +801,7 @@ public Builder addAllIndexesUsed(
       }
       return this;
     }
+
     /**
      *
      *
@@ -808,6 +825,7 @@ public Builder clearIndexesUsed() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -831,6 +849,7 @@ public Builder removeIndexesUsed(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -847,6 +866,7 @@ public Builder removeIndexesUsed(int index) {
     public com.google.protobuf.Struct.Builder getIndexesUsedBuilder(int index) {
       return getIndexesUsedFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -867,6 +887,7 @@ public com.google.protobuf.StructOrBuilder getIndexesUsedOrBuilder(int index) {
         return indexesUsedBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -888,6 +909,7 @@ public com.google.protobuf.StructOrBuilder getIndexesUsedOrBuilder(int index) {
         return java.util.Collections.unmodifiableList(indexesUsed_);
       }
     }
+
     /**
      *
      *
@@ -905,6 +927,7 @@ public com.google.protobuf.Struct.Builder addIndexesUsedBuilder() {
       return getIndexesUsedFieldBuilder()
           .addBuilder(com.google.protobuf.Struct.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -922,6 +945,7 @@ public com.google.protobuf.Struct.Builder addIndexesUsedBuilder(int index) {
       return getIndexesUsedFieldBuilder()
           .addBuilder(index, com.google.protobuf.Struct.getDefaultInstance());
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
index ace5cbe50328..b132b1c667d4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
@@ -38,6 +38,7 @@ public interface PlanSummaryOrBuilder
    * repeated .google.protobuf.Struct indexes_used = 1;
    */
   java.util.List getIndexesUsedList();
+
   /**
    *
    *
@@ -52,6 +53,7 @@ public interface PlanSummaryOrBuilder
    * repeated .google.protobuf.Struct indexes_used = 1;
    */
   com.google.protobuf.Struct getIndexesUsed(int index);
+
   /**
    *
    *
@@ -66,6 +68,7 @@ public interface PlanSummaryOrBuilder
    * repeated .google.protobuf.Struct indexes_used = 1;
    */
   int getIndexesUsedCount();
+
   /**
    *
    *
@@ -80,6 +83,7 @@ public interface PlanSummaryOrBuilder
    * repeated .google.protobuf.Struct indexes_used = 1;
    */
   java.util.List getIndexesUsedOrBuilderList();
+
   /**
    *
    *
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 440ca2b2c231..e3a262b149a9 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
@@ -33,6 +33,7 @@ public final class Projection extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Projection)
     ProjectionOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Projection.newBuilder() to construct.
   private Projection(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
+
   /**
    *
    *
@@ -79,6 +81,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasProperty() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -96,6 +99,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
         ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
         : property_;
   }
+
   /**
    *
    *
@@ -274,6 +278,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -475,6 +480,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.PropertyReference.Builder,
             com.google.datastore.v1.PropertyReferenceOrBuilder>
         propertyBuilder_;
+
     /**
      *
      *
@@ -489,6 +495,7 @@ public Builder mergeFrom(
     public boolean hasProperty() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -509,6 +516,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
         return propertyBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -531,6 +539,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -550,6 +559,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -577,6 +587,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -596,6 +607,7 @@ public Builder clearProperty() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -610,6 +622,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -628,6 +641,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
             : property_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 179dddadc57c..0b4cb23d8fca 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -36,6 +36,7 @@ public interface ProjectionOrBuilder
    * @return Whether the property field is set.
    */
   boolean hasProperty();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface ProjectionOrBuilder
    * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
+
   /**
    *
    *
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 e549f15f9bf8..2b9946906b01 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
@@ -33,6 +33,7 @@ public final class PropertyFilter extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyFilter)
     PropertyFilterOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use PropertyFilter.newBuilder() to construct.
   private PropertyFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -224,6 +225,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * OPERATOR_UNSPECIFIED = 0;
      */
     public static final int OPERATOR_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -238,6 +240,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * LESS_THAN = 1;
      */
     public static final int LESS_THAN_VALUE = 1;
+
     /**
      *
      *
@@ -252,6 +255,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * LESS_THAN_OR_EQUAL = 2;
      */
     public static final int LESS_THAN_OR_EQUAL_VALUE = 2;
+
     /**
      *
      *
@@ -266,6 +270,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * GREATER_THAN = 3;
      */
     public static final int GREATER_THAN_VALUE = 3;
+
     /**
      *
      *
@@ -280,6 +285,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * GREATER_THAN_OR_EQUAL = 4;
      */
     public static final int GREATER_THAN_OR_EQUAL_VALUE = 4;
+
     /**
      *
      *
@@ -290,6 +296,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * EQUAL = 5;
      */
     public static final int EQUAL_VALUE = 5;
+
     /**
      *
      *
@@ -306,6 +313,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * IN = 6;
      */
     public static final int IN_VALUE = 6;
+
     /**
      *
      *
@@ -321,6 +329,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * NOT_EQUAL = 9;
      */
     public static final int NOT_EQUAL_VALUE = 9;
+
     /**
      *
      *
@@ -336,6 +345,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      * HAS_ANCESTOR = 11;
      */
     public static final int HAS_ANCESTOR_VALUE = 11;
+
     /**
      *
      *
@@ -453,6 +463,7 @@ private Operator(int value) {
   private int bitField0_;
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
+
   /**
    *
    *
@@ -468,6 +479,7 @@ private Operator(int value) {
   public boolean hasProperty() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -485,6 +497,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
         ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
         : property_;
   }
+
   /**
    *
    *
@@ -503,6 +516,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
 
   public static final int OP_FIELD_NUMBER = 2;
   private int op_ = 0;
+
   /**
    *
    *
@@ -518,6 +532,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   public int getOpValue() {
     return op_;
   }
+
   /**
    *
    *
@@ -538,6 +553,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() {
 
   public static final int VALUE_FIELD_NUMBER = 3;
   private com.google.datastore.v1.Value value_;
+
   /**
    *
    *
@@ -553,6 +569,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() {
   public boolean hasValue() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -568,6 +585,7 @@ public boolean hasValue() {
   public com.google.datastore.v1.Value getValue() {
     return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
   }
+
   /**
    *
    *
@@ -768,6 +786,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1002,6 +1021,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.PropertyReference.Builder,
             com.google.datastore.v1.PropertyReferenceOrBuilder>
         propertyBuilder_;
+
     /**
      *
      *
@@ -1016,6 +1036,7 @@ public Builder mergeFrom(
     public boolean hasProperty() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -1036,6 +1057,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
         return propertyBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1058,6 +1080,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1077,6 +1100,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1104,6 +1128,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1123,6 +1148,7 @@ public Builder clearProperty() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1137,6 +1163,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1155,6 +1182,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
             : property_;
       }
     }
+
     /**
      *
      *
@@ -1182,6 +1210,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
     }
 
     private int op_ = 0;
+
     /**
      *
      *
@@ -1197,6 +1226,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
     public int getOpValue() {
       return op_;
     }
+
     /**
      *
      *
@@ -1215,6 +1245,7 @@ public Builder setOpValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1232,6 +1263,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() {
           com.google.datastore.v1.PropertyFilter.Operator.forNumber(op_);
       return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -1253,6 +1285,7 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1277,6 +1310,7 @@ public Builder clearOp() {
             com.google.datastore.v1.Value.Builder,
             com.google.datastore.v1.ValueOrBuilder>
         valueBuilder_;
+
     /**
      *
      *
@@ -1291,6 +1325,7 @@ public Builder clearOp() {
     public boolean hasValue() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1309,6 +1344,7 @@ public com.google.datastore.v1.Value getValue() {
         return valueBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1331,6 +1367,7 @@ public Builder setValue(com.google.datastore.v1.Value value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1350,6 +1387,7 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1377,6 +1415,7 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1396,6 +1435,7 @@ public Builder clearValue() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1410,6 +1450,7 @@ public com.google.datastore.v1.Value.Builder getValueBuilder() {
       onChanged();
       return getValueFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1426,6 +1467,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
         return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index 1cd09dd3e706..b4efa5d93636 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -36,6 +36,7 @@ public interface PropertyFilterOrBuilder
    * @return Whether the property field is set.
    */
   boolean hasProperty();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface PropertyFilterOrBuilder
    * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface PropertyFilterOrBuilder
    * @return The enum numeric value on the wire for op.
    */
   int getOpValue();
+
   /**
    *
    *
@@ -96,6 +99,7 @@ public interface PropertyFilterOrBuilder
    * @return Whether the value field is set.
    */
   boolean hasValue();
+
   /**
    *
    *
@@ -108,6 +112,7 @@ public interface PropertyFilterOrBuilder
    * @return The value.
    */
   com.google.datastore.v1.Value getValue();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
index a60894f47528..d8fc11dec963 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
@@ -34,6 +34,7 @@ public final class PropertyMask extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyMask)
     PropertyMaskOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use PropertyMask.newBuilder() to construct.
   private PropertyMask(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   @SuppressWarnings("serial")
   private com.google.protobuf.LazyStringArrayList paths_ =
       com.google.protobuf.LazyStringArrayList.emptyList();
+
   /**
    *
    *
@@ -93,6 +95,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public com.google.protobuf.ProtocolStringList getPathsList() {
     return paths_;
   }
+
   /**
    *
    *
@@ -117,6 +120,7 @@ public com.google.protobuf.ProtocolStringList getPathsList() {
   public int getPathsCount() {
     return paths_.size();
   }
+
   /**
    *
    *
@@ -142,6 +146,7 @@ public int getPathsCount() {
   public java.lang.String getPaths(int index) {
     return paths_.get(index);
   }
+
   /**
    *
    *
@@ -332,6 +337,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -530,6 +536,7 @@ private void ensurePathsIsMutable() {
       }
       bitField0_ |= 0x00000001;
     }
+
     /**
      *
      *
@@ -555,6 +562,7 @@ public com.google.protobuf.ProtocolStringList getPathsList() {
       paths_.makeImmutable();
       return paths_;
     }
+
     /**
      *
      *
@@ -579,6 +587,7 @@ public com.google.protobuf.ProtocolStringList getPathsList() {
     public int getPathsCount() {
       return paths_.size();
     }
+
     /**
      *
      *
@@ -604,6 +613,7 @@ public int getPathsCount() {
     public java.lang.String getPaths(int index) {
       return paths_.get(index);
     }
+
     /**
      *
      *
@@ -629,6 +639,7 @@ public java.lang.String getPaths(int index) {
     public com.google.protobuf.ByteString getPathsBytes(int index) {
       return paths_.getByteString(index);
     }
+
     /**
      *
      *
@@ -662,6 +673,7 @@ public Builder setPaths(int index, java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -694,6 +706,7 @@ public Builder addPaths(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -723,6 +736,7 @@ public Builder addAllPaths(java.lang.Iterable values) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -751,6 +765,7 @@ public Builder clearPaths() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
index f34a77f67e0d..ebd49c682a15 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
@@ -46,6 +46,7 @@ public interface PropertyMaskOrBuilder
    * @return A list containing the paths.
    */
   java.util.List getPathsList();
+
   /**
    *
    *
@@ -68,6 +69,7 @@ public interface PropertyMaskOrBuilder
    * @return The count of paths.
    */
   int getPathsCount();
+
   /**
    *
    *
@@ -91,6 +93,7 @@ public interface PropertyMaskOrBuilder
    * @return The paths at the given index.
    */
   java.lang.String getPaths(int index);
+
   /**
    *
    *
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 7991da53c412..a4315a5392d3 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
@@ -33,6 +33,7 @@ public final class PropertyOrder extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyOrder)
     PropertyOrderOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use PropertyOrder.newBuilder() to construct.
   private PropertyOrder(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -116,6 +117,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      * DIRECTION_UNSPECIFIED = 0;
      */
     public static final int DIRECTION_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -126,6 +128,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      * ASCENDING = 1;
      */
     public static final int ASCENDING_VALUE = 1;
+
     /**
      *
      *
@@ -223,6 +226,7 @@ private Direction(int value) {
   private int bitField0_;
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
+
   /**
    *
    *
@@ -238,6 +242,7 @@ private Direction(int value) {
   public boolean hasProperty() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -255,6 +260,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
         ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
         : property_;
   }
+
   /**
    *
    *
@@ -273,6 +279,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
 
   public static final int DIRECTION_FIELD_NUMBER = 2;
   private int direction_ = 0;
+
   /**
    *
    *
@@ -288,6 +295,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   public int getDirectionValue() {
     return direction_;
   }
+
   /**
    *
    *
@@ -479,6 +487,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -694,6 +703,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.PropertyReference.Builder,
             com.google.datastore.v1.PropertyReferenceOrBuilder>
         propertyBuilder_;
+
     /**
      *
      *
@@ -708,6 +718,7 @@ public Builder mergeFrom(
     public boolean hasProperty() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -728,6 +739,7 @@ public com.google.datastore.v1.PropertyReference getProperty() {
         return propertyBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -750,6 +762,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -769,6 +782,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -796,6 +810,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -815,6 +830,7 @@ public Builder clearProperty() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -829,6 +845,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -847,6 +864,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
             : property_;
       }
     }
+
     /**
      *
      *
@@ -874,6 +892,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
     }
 
     private int direction_ = 0;
+
     /**
      *
      *
@@ -889,6 +908,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
     public int getDirectionValue() {
       return direction_;
     }
+
     /**
      *
      *
@@ -907,6 +927,7 @@ public Builder setDirectionValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -924,6 +945,7 @@ public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
           com.google.datastore.v1.PropertyOrder.Direction.forNumber(direction_);
       return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -945,6 +967,7 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index a190d59d3d11..e1f589f07a0f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -36,6 +36,7 @@ public interface PropertyOrderOrBuilder
    * @return Whether the property field is set.
    */
   boolean hasProperty();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface PropertyOrderOrBuilder
    * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface PropertyOrderOrBuilder
    * @return The enum numeric value on the wire for direction.
    */
   int getDirectionValue();
+
   /**
    *
    *
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 56ee78cec55f..c301b8518434 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
@@ -33,6 +33,7 @@ public final class PropertyReference extends com.google.protobuf.GeneratedMessag
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyReference)
     PropertyReferenceOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use PropertyReference.newBuilder() to construct.
   private PropertyReference(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object name_ = "";
+
   /**
    *
    *
@@ -96,6 +98,7 @@ public java.lang.String getName() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -285,6 +288,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -468,6 +472,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object name_ = "";
+
     /**
      *
      *
@@ -496,6 +501,7 @@ public java.lang.String getName() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -524,6 +530,7 @@ public com.google.protobuf.ByteString getNameBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -551,6 +558,7 @@ public Builder setName(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -574,6 +582,7 @@ public Builder clearName() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 6e93680def7c..0fb61d2e081d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -42,6 +42,7 @@ public interface PropertyReferenceOrBuilder
    * @return The name.
    */
   java.lang.String getName();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
index 516aa58ade66..51bf34d7cce4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
@@ -33,6 +33,7 @@ public final class PropertyTransform extends com.google.protobuf.GeneratedMessag
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyTransform)
     PropertyTransformOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use PropertyTransform.newBuilder() to construct.
   private PropertyTransform(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -108,6 +109,7 @@ public enum ServerValue implements com.google.protobuf.ProtocolMessageEnum {
      * SERVER_VALUE_UNSPECIFIED = 0;
      */
     public static final int SERVER_VALUE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -223,6 +225,7 @@ public enum TransformTypeCase
     private TransformTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -267,6 +270,7 @@ public TransformTypeCase getTransformTypeCase() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object property_ = "";
+
   /**
    *
    *
@@ -297,6 +301,7 @@ public java.lang.String getProperty() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -329,6 +334,7 @@ public com.google.protobuf.ByteString getPropertyBytes() {
   }
 
   public static final int SET_TO_SERVER_VALUE_FIELD_NUMBER = 2;
+
   /**
    *
    *
@@ -343,6 +349,7 @@ public com.google.protobuf.ByteString getPropertyBytes() {
   public boolean hasSetToServerValue() {
     return transformTypeCase_ == 2;
   }
+
   /**
    *
    *
@@ -360,6 +367,7 @@ public int getSetToServerValueValue() {
     }
     return 0;
   }
+
   /**
    *
    *
@@ -384,6 +392,7 @@ public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue
   }
 
   public static final int INCREMENT_FIELD_NUMBER = 3;
+
   /**
    *
    *
@@ -408,6 +417,7 @@ public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue
   public boolean hasIncrement() {
     return transformTypeCase_ == 3;
   }
+
   /**
    *
    *
@@ -435,6 +445,7 @@ public com.google.datastore.v1.Value getIncrement() {
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -462,6 +473,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() {
   }
 
   public static final int MAXIMUM_FIELD_NUMBER = 4;
+
   /**
    *
    *
@@ -489,6 +501,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() {
   public boolean hasMaximum() {
     return transformTypeCase_ == 4;
   }
+
   /**
    *
    *
@@ -519,6 +532,7 @@ public com.google.datastore.v1.Value getMaximum() {
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -549,6 +563,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() {
   }
 
   public static final int MINIMUM_FIELD_NUMBER = 5;
+
   /**
    *
    *
@@ -576,6 +591,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() {
   public boolean hasMinimum() {
     return transformTypeCase_ == 5;
   }
+
   /**
    *
    *
@@ -606,6 +622,7 @@ public com.google.datastore.v1.Value getMinimum() {
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -636,6 +653,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() {
   }
 
   public static final int APPEND_MISSING_ELEMENTS_FIELD_NUMBER = 6;
+
   /**
    *
    *
@@ -662,6 +680,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() {
   public boolean hasAppendMissingElements() {
     return transformTypeCase_ == 6;
   }
+
   /**
    *
    *
@@ -691,6 +710,7 @@ public com.google.datastore.v1.ArrayValue getAppendMissingElements() {
     }
     return com.google.datastore.v1.ArrayValue.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -720,6 +740,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui
   }
 
   public static final int REMOVE_ALL_FROM_ARRAY_FIELD_NUMBER = 7;
+
   /**
    *
    *
@@ -744,6 +765,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui
   public boolean hasRemoveAllFromArray() {
     return transformTypeCase_ == 7;
   }
+
   /**
    *
    *
@@ -771,6 +793,7 @@ public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() {
     }
     return com.google.datastore.v1.ArrayValue.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -1055,6 +1078,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1365,6 +1389,7 @@ public Builder clearTransformType() {
     private int bitField0_;
 
     private java.lang.Object property_ = "";
+
     /**
      *
      *
@@ -1394,6 +1419,7 @@ public java.lang.String getProperty() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1423,6 +1449,7 @@ public com.google.protobuf.ByteString getPropertyBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1451,6 +1478,7 @@ public Builder setProperty(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1475,6 +1503,7 @@ public Builder clearProperty() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1520,6 +1549,7 @@ public Builder setPropertyBytes(com.google.protobuf.ByteString value) {
     public boolean hasSetToServerValue() {
       return transformTypeCase_ == 2;
     }
+
     /**
      *
      *
@@ -1538,6 +1568,7 @@ public int getSetToServerValueValue() {
       }
       return 0;
     }
+
     /**
      *
      *
@@ -1556,6 +1587,7 @@ public Builder setSetToServerValueValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1579,6 +1611,7 @@ public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue
       }
       return com.google.datastore.v1.PropertyTransform.ServerValue.SERVER_VALUE_UNSPECIFIED;
     }
+
     /**
      *
      *
@@ -1601,6 +1634,7 @@ public Builder setSetToServerValue(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1626,6 +1660,7 @@ public Builder clearSetToServerValue() {
             com.google.datastore.v1.Value.Builder,
             com.google.datastore.v1.ValueOrBuilder>
         incrementBuilder_;
+
     /**
      *
      *
@@ -1650,6 +1685,7 @@ public Builder clearSetToServerValue() {
     public boolean hasIncrement() {
       return transformTypeCase_ == 3;
     }
+
     /**
      *
      *
@@ -1684,6 +1720,7 @@ public com.google.datastore.v1.Value getIncrement() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1715,6 +1752,7 @@ public Builder setIncrement(com.google.datastore.v1.Value value) {
       transformTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1743,6 +1781,7 @@ public Builder setIncrement(com.google.datastore.v1.Value.Builder builderForValu
       transformTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1784,6 +1823,7 @@ public Builder mergeIncrement(com.google.datastore.v1.Value value) {
       transformTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1818,6 +1858,7 @@ public Builder clearIncrement() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1839,6 +1880,7 @@ public Builder clearIncrement() {
     public com.google.datastore.v1.Value.Builder getIncrementBuilder() {
       return getIncrementFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1868,6 +1910,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1913,6 +1956,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() {
             com.google.datastore.v1.Value.Builder,
             com.google.datastore.v1.ValueOrBuilder>
         maximumBuilder_;
+
     /**
      *
      *
@@ -1940,6 +1984,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() {
     public boolean hasMaximum() {
       return transformTypeCase_ == 4;
     }
+
     /**
      *
      *
@@ -1977,6 +2022,7 @@ public com.google.datastore.v1.Value getMaximum() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2011,6 +2057,7 @@ public Builder setMaximum(com.google.datastore.v1.Value value) {
       transformTypeCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -2042,6 +2089,7 @@ public Builder setMaximum(com.google.datastore.v1.Value.Builder builderForValue)
       transformTypeCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -2086,6 +2134,7 @@ public Builder mergeMaximum(com.google.datastore.v1.Value value) {
       transformTypeCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -2123,6 +2172,7 @@ public Builder clearMaximum() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2147,6 +2197,7 @@ public Builder clearMaximum() {
     public com.google.datastore.v1.Value.Builder getMaximumBuilder() {
       return getMaximumFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2179,6 +2230,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2227,6 +2279,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() {
             com.google.datastore.v1.Value.Builder,
             com.google.datastore.v1.ValueOrBuilder>
         minimumBuilder_;
+
     /**
      *
      *
@@ -2254,6 +2307,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() {
     public boolean hasMinimum() {
       return transformTypeCase_ == 5;
     }
+
     /**
      *
      *
@@ -2291,6 +2345,7 @@ public com.google.datastore.v1.Value getMinimum() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2325,6 +2380,7 @@ public Builder setMinimum(com.google.datastore.v1.Value value) {
       transformTypeCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -2356,6 +2412,7 @@ public Builder setMinimum(com.google.datastore.v1.Value.Builder builderForValue)
       transformTypeCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -2400,6 +2457,7 @@ public Builder mergeMinimum(com.google.datastore.v1.Value value) {
       transformTypeCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -2437,6 +2495,7 @@ public Builder clearMinimum() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2461,6 +2520,7 @@ public Builder clearMinimum() {
     public com.google.datastore.v1.Value.Builder getMinimumBuilder() {
       return getMinimumFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2493,6 +2553,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() {
         return com.google.datastore.v1.Value.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2541,6 +2602,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() {
             com.google.datastore.v1.ArrayValue.Builder,
             com.google.datastore.v1.ArrayValueOrBuilder>
         appendMissingElementsBuilder_;
+
     /**
      *
      *
@@ -2567,6 +2629,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() {
     public boolean hasAppendMissingElements() {
       return transformTypeCase_ == 6;
     }
+
     /**
      *
      *
@@ -2603,6 +2666,7 @@ public com.google.datastore.v1.ArrayValue getAppendMissingElements() {
         return com.google.datastore.v1.ArrayValue.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2636,6 +2700,7 @@ public Builder setAppendMissingElements(com.google.datastore.v1.ArrayValue value
       transformTypeCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2667,6 +2732,7 @@ public Builder setAppendMissingElements(
       transformTypeCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2710,6 +2776,7 @@ public Builder mergeAppendMissingElements(com.google.datastore.v1.ArrayValue val
       transformTypeCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2746,6 +2813,7 @@ public Builder clearAppendMissingElements() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2769,6 +2837,7 @@ public Builder clearAppendMissingElements() {
     public com.google.datastore.v1.ArrayValue.Builder getAppendMissingElementsBuilder() {
       return getAppendMissingElementsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2800,6 +2869,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui
         return com.google.datastore.v1.ArrayValue.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2849,6 +2919,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui
             com.google.datastore.v1.ArrayValue.Builder,
             com.google.datastore.v1.ArrayValueOrBuilder>
         removeAllFromArrayBuilder_;
+
     /**
      *
      *
@@ -2873,6 +2944,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui
     public boolean hasRemoveAllFromArray() {
       return transformTypeCase_ == 7;
     }
+
     /**
      *
      *
@@ -2907,6 +2979,7 @@ public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() {
         return com.google.datastore.v1.ArrayValue.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2938,6 +3011,7 @@ public Builder setRemoveAllFromArray(com.google.datastore.v1.ArrayValue value) {
       transformTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2967,6 +3041,7 @@ public Builder setRemoveAllFromArray(
       transformTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -3008,6 +3083,7 @@ public Builder mergeRemoveAllFromArray(com.google.datastore.v1.ArrayValue value)
       transformTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -3042,6 +3118,7 @@ public Builder clearRemoveAllFromArray() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3063,6 +3140,7 @@ public Builder clearRemoveAllFromArray() {
     public com.google.datastore.v1.ArrayValue.Builder getRemoveAllFromArrayBuilder() {
       return getRemoveAllFromArrayFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -3092,6 +3170,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilde
         return com.google.datastore.v1.ArrayValue.getDefaultInstance();
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
index 169427dd6b0f..7371d380ad53 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
@@ -43,6 +43,7 @@ public interface PropertyTransformOrBuilder
    * @return The property.
    */
   java.lang.String getProperty();
+
   /**
    *
    *
@@ -75,6 +76,7 @@ public interface PropertyTransformOrBuilder
    * @return Whether the setToServerValue field is set.
    */
   boolean hasSetToServerValue();
+
   /**
    *
    *
@@ -87,6 +89,7 @@ public interface PropertyTransformOrBuilder
    * @return The enum numeric value on the wire for setToServerValue.
    */
   int getSetToServerValueValue();
+
   /**
    *
    *
@@ -121,6 +124,7 @@ public interface PropertyTransformOrBuilder
    * @return Whether the increment field is set.
    */
   boolean hasIncrement();
+
   /**
    *
    *
@@ -142,6 +146,7 @@ public interface PropertyTransformOrBuilder
    * @return The increment.
    */
   com.google.datastore.v1.Value getIncrement();
+
   /**
    *
    *
@@ -186,6 +191,7 @@ public interface PropertyTransformOrBuilder
    * @return Whether the maximum field is set.
    */
   boolean hasMaximum();
+
   /**
    *
    *
@@ -210,6 +216,7 @@ public interface PropertyTransformOrBuilder
    * @return The maximum.
    */
   com.google.datastore.v1.Value getMaximum();
+
   /**
    *
    *
@@ -257,6 +264,7 @@ public interface PropertyTransformOrBuilder
    * @return Whether the minimum field is set.
    */
   boolean hasMinimum();
+
   /**
    *
    *
@@ -281,6 +289,7 @@ public interface PropertyTransformOrBuilder
    * @return The minimum.
    */
   com.google.datastore.v1.Value getMinimum();
+
   /**
    *
    *
@@ -327,6 +336,7 @@ public interface PropertyTransformOrBuilder
    * @return Whether the appendMissingElements field is set.
    */
   boolean hasAppendMissingElements();
+
   /**
    *
    *
@@ -350,6 +360,7 @@ public interface PropertyTransformOrBuilder
    * @return The appendMissingElements.
    */
   com.google.datastore.v1.ArrayValue getAppendMissingElements();
+
   /**
    *
    *
@@ -393,6 +404,7 @@ public interface PropertyTransformOrBuilder
    * @return Whether the removeAllFromArray field is set.
    */
   boolean hasRemoveAllFromArray();
+
   /**
    *
    *
@@ -414,6 +426,7 @@ public interface PropertyTransformOrBuilder
    * @return The removeAllFromArray.
    */
   com.google.datastore.v1.ArrayValue getRemoveAllFromArray();
+
   /**
    *
    *
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 d210c1636407..1e8e6ef92593 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
@@ -42,6 +42,7 @@ public final class Query extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Query)
     QueryOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Query.newBuilder() to construct.
   private Query(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -80,6 +81,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private java.util.List projection_;
+
   /**
    *
    *
@@ -93,6 +95,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public java.util.List getProjectionList() {
     return projection_;
   }
+
   /**
    *
    *
@@ -107,6 +110,7 @@ public java.util.List getProjectionList() {
       getProjectionOrBuilderList() {
     return projection_;
   }
+
   /**
    *
    *
@@ -120,6 +124,7 @@ public java.util.List getProjectionList() {
   public int getProjectionCount() {
     return projection_.size();
   }
+
   /**
    *
    *
@@ -133,6 +138,7 @@ public int getProjectionCount() {
   public com.google.datastore.v1.Projection getProjection(int index) {
     return projection_.get(index);
   }
+
   /**
    *
    *
@@ -151,6 +157,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
 
   @SuppressWarnings("serial")
   private java.util.List kind_;
+
   /**
    *
    *
@@ -165,6 +172,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
   public java.util.List getKindList() {
     return kind_;
   }
+
   /**
    *
    *
@@ -180,6 +188,7 @@ public java.util.List getKindList() {
       getKindOrBuilderList() {
     return kind_;
   }
+
   /**
    *
    *
@@ -194,6 +203,7 @@ public java.util.List getKindList() {
   public int getKindCount() {
     return kind_.size();
   }
+
   /**
    *
    *
@@ -208,6 +218,7 @@ public int getKindCount() {
   public com.google.datastore.v1.KindExpression getKind(int index) {
     return kind_.get(index);
   }
+
   /**
    *
    *
@@ -225,6 +236,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
 
   public static final int FILTER_FIELD_NUMBER = 4;
   private com.google.datastore.v1.Filter filter_;
+
   /**
    *
    *
@@ -240,6 +252,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
   public boolean hasFilter() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -255,6 +268,7 @@ public boolean hasFilter() {
   public com.google.datastore.v1.Filter getFilter() {
     return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
   }
+
   /**
    *
    *
@@ -273,6 +287,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
 
   @SuppressWarnings("serial")
   private java.util.List order_;
+
   /**
    *
    *
@@ -286,6 +301,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
   public java.util.List getOrderList() {
     return order_;
   }
+
   /**
    *
    *
@@ -300,6 +316,7 @@ public java.util.List getOrderList() {
       getOrderOrBuilderList() {
     return order_;
   }
+
   /**
    *
    *
@@ -313,6 +330,7 @@ public java.util.List getOrderList() {
   public int getOrderCount() {
     return order_.size();
   }
+
   /**
    *
    *
@@ -326,6 +344,7 @@ public int getOrderCount() {
   public com.google.datastore.v1.PropertyOrder getOrder(int index) {
     return order_.get(index);
   }
+
   /**
    *
    *
@@ -344,6 +363,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
 
   @SuppressWarnings("serial")
   private java.util.List distinctOn_;
+
   /**
    *
    *
@@ -364,6 +384,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
   public java.util.List getDistinctOnList() {
     return distinctOn_;
   }
+
   /**
    *
    *
@@ -385,6 +406,7 @@ public java.util.List getDistinctOnLi
       getDistinctOnOrBuilderList() {
     return distinctOn_;
   }
+
   /**
    *
    *
@@ -405,6 +427,7 @@ public java.util.List getDistinctOnLi
   public int getDistinctOnCount() {
     return distinctOn_.size();
   }
+
   /**
    *
    *
@@ -425,6 +448,7 @@ public int getDistinctOnCount() {
   public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
     return distinctOn_.get(index);
   }
+
   /**
    *
    *
@@ -448,6 +472,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
 
   public static final int START_CURSOR_FIELD_NUMBER = 7;
   private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -469,6 +494,7 @@ public com.google.protobuf.ByteString getStartCursor() {
 
   public static final int END_CURSOR_FIELD_NUMBER = 8;
   private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -490,6 +516,7 @@ public com.google.protobuf.ByteString getEndCursor() {
 
   public static final int OFFSET_FIELD_NUMBER = 10;
   private int offset_ = 0;
+
   /**
    *
    *
@@ -509,6 +536,7 @@ public int getOffset() {
 
   public static final int LIMIT_FIELD_NUMBER = 12;
   private com.google.protobuf.Int32Value limit_;
+
   /**
    *
    *
@@ -527,6 +555,7 @@ public int getOffset() {
   public boolean hasLimit() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -545,6 +574,7 @@ public boolean hasLimit() {
   public com.google.protobuf.Int32Value getLimit() {
     return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
   }
+
   /**
    *
    *
@@ -564,6 +594,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
 
   public static final int FIND_NEAREST_FIELD_NUMBER = 13;
   private com.google.datastore.v1.FindNearest findNearest_;
+
   /**
    *
    *
@@ -585,6 +616,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
   public boolean hasFindNearest() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -608,6 +640,7 @@ public com.google.datastore.v1.FindNearest getFindNearest() {
         ? com.google.datastore.v1.FindNearest.getDefaultInstance()
         : findNearest_;
   }
+
   /**
    *
    *
@@ -891,6 +924,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1436,6 +1470,7 @@ public java.util.List getProjectionList() {
         return projectionBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1452,6 +1487,7 @@ public int getProjectionCount() {
         return projectionBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1468,6 +1504,7 @@ public com.google.datastore.v1.Projection getProjection(int index) {
         return projectionBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1490,6 +1527,7 @@ public Builder setProjection(int index, com.google.datastore.v1.Projection value
       }
       return this;
     }
+
     /**
      *
      *
@@ -1510,6 +1548,7 @@ public Builder setProjection(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1532,6 +1571,7 @@ public Builder addProjection(com.google.datastore.v1.Projection value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1554,6 +1594,7 @@ public Builder addProjection(int index, com.google.datastore.v1.Projection value
       }
       return this;
     }
+
     /**
      *
      *
@@ -1573,6 +1614,7 @@ public Builder addProjection(com.google.datastore.v1.Projection.Builder builderF
       }
       return this;
     }
+
     /**
      *
      *
@@ -1593,6 +1635,7 @@ public Builder addProjection(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1613,6 +1656,7 @@ public Builder addAllProjection(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1632,6 +1676,7 @@ public Builder clearProjection() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1651,6 +1696,7 @@ public Builder removeProjection(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1663,6 +1709,7 @@ public Builder removeProjection(int index) {
     public com.google.datastore.v1.Projection.Builder getProjectionBuilder(int index) {
       return getProjectionFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -1679,6 +1726,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
         return projectionBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -1696,6 +1744,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
         return java.util.Collections.unmodifiableList(projection_);
       }
     }
+
     /**
      *
      *
@@ -1709,6 +1758,7 @@ public com.google.datastore.v1.Projection.Builder addProjectionBuilder() {
       return getProjectionFieldBuilder()
           .addBuilder(com.google.datastore.v1.Projection.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1722,6 +1772,7 @@ public com.google.datastore.v1.Projection.Builder addProjectionBuilder(int index
       return getProjectionFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Projection.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1785,6 +1836,7 @@ public java.util.List getKindList() {
         return kindBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1802,6 +1854,7 @@ public int getKindCount() {
         return kindBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1819,6 +1872,7 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
         return kindBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1842,6 +1896,7 @@ public Builder setKind(int index, com.google.datastore.v1.KindExpression value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1863,6 +1918,7 @@ public Builder setKind(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1886,6 +1942,7 @@ public Builder addKind(com.google.datastore.v1.KindExpression value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1909,6 +1966,7 @@ public Builder addKind(int index, com.google.datastore.v1.KindExpression value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1929,6 +1987,7 @@ public Builder addKind(com.google.datastore.v1.KindExpression.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -1950,6 +2009,7 @@ public Builder addKind(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1971,6 +2031,7 @@ public Builder addAllKind(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1991,6 +2052,7 @@ public Builder clearKind() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2011,6 +2073,7 @@ public Builder removeKind(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2024,6 +2087,7 @@ public Builder removeKind(int index) {
     public com.google.datastore.v1.KindExpression.Builder getKindBuilder(int index) {
       return getKindFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -2041,6 +2105,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
         return kindBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -2059,6 +2124,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
         return java.util.Collections.unmodifiableList(kind_);
       }
     }
+
     /**
      *
      *
@@ -2073,6 +2139,7 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder() {
       return getKindFieldBuilder()
           .addBuilder(com.google.datastore.v1.KindExpression.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2087,6 +2154,7 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder(int index)
       return getKindFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.KindExpression.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2124,6 +2192,7 @@ public java.util.List getKindBui
             com.google.datastore.v1.Filter.Builder,
             com.google.datastore.v1.FilterOrBuilder>
         filterBuilder_;
+
     /**
      *
      *
@@ -2138,6 +2207,7 @@ public java.util.List getKindBui
     public boolean hasFilter() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -2156,6 +2226,7 @@ public com.google.datastore.v1.Filter getFilter() {
         return filterBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2178,6 +2249,7 @@ public Builder setFilter(com.google.datastore.v1.Filter value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2197,6 +2269,7 @@ public Builder setFilter(com.google.datastore.v1.Filter.Builder builderForValue)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2224,6 +2297,7 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2243,6 +2317,7 @@ public Builder clearFilter() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2257,6 +2332,7 @@ public com.google.datastore.v1.Filter.Builder getFilterBuilder() {
       onChanged();
       return getFilterFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2273,6 +2349,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
         return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
       }
     }
+
     /**
      *
      *
@@ -2331,6 +2408,7 @@ public java.util.List getOrderList() {
         return orderBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -2347,6 +2425,7 @@ public int getOrderCount() {
         return orderBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -2363,6 +2442,7 @@ public com.google.datastore.v1.PropertyOrder getOrder(int index) {
         return orderBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -2385,6 +2465,7 @@ public Builder setOrder(int index, com.google.datastore.v1.PropertyOrder value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -2405,6 +2486,7 @@ public Builder setOrder(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2427,6 +2509,7 @@ public Builder addOrder(com.google.datastore.v1.PropertyOrder value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2449,6 +2532,7 @@ public Builder addOrder(int index, com.google.datastore.v1.PropertyOrder value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -2468,6 +2552,7 @@ public Builder addOrder(com.google.datastore.v1.PropertyOrder.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -2488,6 +2573,7 @@ public Builder addOrder(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2508,6 +2594,7 @@ public Builder addAllOrder(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2527,6 +2614,7 @@ public Builder clearOrder() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2546,6 +2634,7 @@ public Builder removeOrder(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2558,6 +2647,7 @@ public Builder removeOrder(int index) {
     public com.google.datastore.v1.PropertyOrder.Builder getOrderBuilder(int index) {
       return getOrderFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -2574,6 +2664,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
         return orderBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -2591,6 +2682,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
         return java.util.Collections.unmodifiableList(order_);
       }
     }
+
     /**
      *
      *
@@ -2604,6 +2696,7 @@ public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder() {
       return getOrderFieldBuilder()
           .addBuilder(com.google.datastore.v1.PropertyOrder.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2617,6 +2710,7 @@ public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder(int index)
       return getOrderFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.PropertyOrder.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -2687,6 +2781,7 @@ public java.util.List getDistinctOnLi
         return distinctOnBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -2710,6 +2805,7 @@ public int getDistinctOnCount() {
         return distinctOnBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -2733,6 +2829,7 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
         return distinctOnBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -2762,6 +2859,7 @@ public Builder setDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
       }
       return this;
     }
+
     /**
      *
      *
@@ -2789,6 +2887,7 @@ public Builder setDistinctOn(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2818,6 +2917,7 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2847,6 +2947,7 @@ public Builder addDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
       }
       return this;
     }
+
     /**
      *
      *
@@ -2874,6 +2975,7 @@ public Builder addDistinctOn(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2901,6 +3003,7 @@ public Builder addDistinctOn(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2928,6 +3031,7 @@ public Builder addAllDistinctOn(
       }
       return this;
     }
+
     /**
      *
      *
@@ -2954,6 +3058,7 @@ public Builder clearDistinctOn() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2980,6 +3085,7 @@ public Builder removeDistinctOn(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2999,6 +3105,7 @@ public Builder removeDistinctOn(int index) {
     public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(int index) {
       return getDistinctOnFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -3022,6 +3129,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
         return distinctOnBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -3046,6 +3154,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
         return java.util.Collections.unmodifiableList(distinctOn_);
       }
     }
+
     /**
      *
      *
@@ -3066,6 +3175,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder()
       return getDistinctOnFieldBuilder()
           .addBuilder(com.google.datastore.v1.PropertyReference.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -3086,6 +3196,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
       return getDistinctOnFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.PropertyReference.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -3125,6 +3236,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
     }
 
     private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -3143,6 +3255,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
     public com.google.protobuf.ByteString getStartCursor() {
       return startCursor_;
     }
+
     /**
      *
      *
@@ -3167,6 +3280,7 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3189,6 +3303,7 @@ public Builder clearStartCursor() {
     }
 
     private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -3207,6 +3322,7 @@ public Builder clearStartCursor() {
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
+
     /**
      *
      *
@@ -3231,6 +3347,7 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3253,6 +3370,7 @@ public Builder clearEndCursor() {
     }
 
     private int offset_;
+
     /**
      *
      *
@@ -3269,6 +3387,7 @@ public Builder clearEndCursor() {
     public int getOffset() {
       return offset_;
     }
+
     /**
      *
      *
@@ -3289,6 +3408,7 @@ public Builder setOffset(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3314,6 +3434,7 @@ public Builder clearOffset() {
             com.google.protobuf.Int32Value.Builder,
             com.google.protobuf.Int32ValueOrBuilder>
         limitBuilder_;
+
     /**
      *
      *
@@ -3331,6 +3452,7 @@ public Builder clearOffset() {
     public boolean hasLimit() {
       return ((bitField0_ & 0x00000100) != 0);
     }
+
     /**
      *
      *
@@ -3352,6 +3474,7 @@ public com.google.protobuf.Int32Value getLimit() {
         return limitBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -3377,6 +3500,7 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3399,6 +3523,7 @@ public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue)
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3429,6 +3554,7 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3451,6 +3577,7 @@ public Builder clearLimit() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3468,6 +3595,7 @@ public com.google.protobuf.Int32Value.Builder getLimitBuilder() {
       onChanged();
       return getLimitFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -3487,6 +3615,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
         return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
       }
     }
+
     /**
      *
      *
@@ -3522,6 +3651,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
             com.google.datastore.v1.FindNearest.Builder,
             com.google.datastore.v1.FindNearestOrBuilder>
         findNearestBuilder_;
+
     /**
      *
      *
@@ -3542,6 +3672,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
     public boolean hasFindNearest() {
       return ((bitField0_ & 0x00000200) != 0);
     }
+
     /**
      *
      *
@@ -3568,6 +3699,7 @@ public com.google.datastore.v1.FindNearest getFindNearest() {
         return findNearestBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -3596,6 +3728,7 @@ public Builder setFindNearest(com.google.datastore.v1.FindNearest value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3621,6 +3754,7 @@ public Builder setFindNearest(com.google.datastore.v1.FindNearest.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3654,6 +3788,7 @@ public Builder mergeFindNearest(com.google.datastore.v1.FindNearest value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3679,6 +3814,7 @@ public Builder clearFindNearest() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3699,6 +3835,7 @@ public com.google.datastore.v1.FindNearest.Builder getFindNearestBuilder() {
       onChanged();
       return getFindNearestFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -3723,6 +3860,7 @@ public com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder() {
             : findNearest_;
       }
     }
+
     /**
      *
      *
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 4ae6b255dbbf..7629bf17ee02 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
@@ -34,6 +34,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.Projection projection = 2;
    */
   java.util.List getProjectionList();
+
   /**
    *
    *
@@ -44,6 +45,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.Projection projection = 2;
    */
   com.google.datastore.v1.Projection getProjection(int index);
+
   /**
    *
    *
@@ -54,6 +56,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.Projection projection = 2;
    */
   int getProjectionCount();
+
   /**
    *
    *
@@ -65,6 +68,7 @@ public interface QueryOrBuilder
    */
   java.util.List
       getProjectionOrBuilderList();
+
   /**
    *
    *
@@ -87,6 +91,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
   java.util.List getKindList();
+
   /**
    *
    *
@@ -98,6 +103,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
   com.google.datastore.v1.KindExpression getKind(int index);
+
   /**
    *
    *
@@ -109,6 +115,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
   int getKindCount();
+
   /**
    *
    *
@@ -120,6 +127,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
   java.util.List getKindOrBuilderList();
+
   /**
    *
    *
@@ -144,6 +152,7 @@ public interface QueryOrBuilder
    * @return Whether the filter field is set.
    */
   boolean hasFilter();
+
   /**
    *
    *
@@ -156,6 +165,7 @@ public interface QueryOrBuilder
    * @return The filter.
    */
   com.google.datastore.v1.Filter getFilter();
+
   /**
    *
    *
@@ -177,6 +187,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
   java.util.List getOrderList();
+
   /**
    *
    *
@@ -187,6 +198,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
   com.google.datastore.v1.PropertyOrder getOrder(int index);
+
   /**
    *
    *
@@ -197,6 +209,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
   int getOrderCount();
+
   /**
    *
    *
@@ -207,6 +220,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
   java.util.List getOrderOrBuilderList();
+
   /**
    *
    *
@@ -235,6 +249,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
   java.util.List getDistinctOnList();
+
   /**
    *
    *
@@ -252,6 +267,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
   com.google.datastore.v1.PropertyReference getDistinctOn(int index);
+
   /**
    *
    *
@@ -269,6 +285,7 @@ public interface QueryOrBuilder
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
   int getDistinctOnCount();
+
   /**
    *
    *
@@ -287,6 +304,7 @@ public interface QueryOrBuilder
    */
   java.util.List
       getDistinctOnOrBuilderList();
+
   /**
    *
    *
@@ -366,6 +384,7 @@ public interface QueryOrBuilder
    * @return Whether the limit field is set.
    */
   boolean hasLimit();
+
   /**
    *
    *
@@ -381,6 +400,7 @@ public interface QueryOrBuilder
    * @return The limit.
    */
   com.google.protobuf.Int32Value getLimit();
+
   /**
    *
    *
@@ -413,6 +433,7 @@ public interface QueryOrBuilder
    * @return Whether the findNearest field is set.
    */
   boolean hasFindNearest();
+
   /**
    *
    *
@@ -431,6 +452,7 @@ public interface QueryOrBuilder
    * @return The findNearest.
    */
   com.google.datastore.v1.FindNearest getFindNearest();
+
   /**
    *
    *
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 bdd8d76827cf..d63999bb5ee1 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
@@ -113,107 +113,145 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     java.lang.String[] descriptorData = {
-      "\n\037google/datastore/v1/query.proto\022\023googl"
-          + "e.datastore.v1\032\037google/api/field_behavio"
-          + "r.proto\032 google/datastore/v1/entity.prot"
-          + "o\032\037google/protobuf/timestamp.proto\032\036goog"
-          + "le/protobuf/wrappers.proto\"\221\002\n\014EntityRes"
-          + "ult\022+\n\006entity\030\001 \001(\0132\033.google.datastore.v"
-          + "1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013create_time"
-          + "\030\006 \001(\0132\032.google.protobuf.Timestamp\022/\n\013up"
-          + "date_time\030\005 \001(\0132\032.google.protobuf.Timest"
-          + "amp\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RES"
-          + "ULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJ"
-          + "ECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\257\003\n\005Query\0223\n\nproj"
-          + "ection\030\002 \003(\0132\037.google.datastore.v1.Proje"
-          + "ction\0221\n\004kind\030\003 \003(\0132#.google.datastore.v"
-          + "1.KindExpression\022+\n\006filter\030\004 \001(\0132\033.googl"
-          + "e.datastore.v1.Filter\0221\n\005order\030\005 \003(\0132\".g"
-          + "oogle.datastore.v1.PropertyOrder\022;\n\013dist"
-          + "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\022;\n\014f"
-          + "ind_nearest\030\r \001(\0132 .google.datastore.v1."
-          + "FindNearestB\003\340A\001\"\344\004\n\020AggregationQuery\0222\n"
-          + "\014nested_query\030\001 \001(\0132\032.google.datastore.v"
-          + "1.QueryH\000\022L\n\014aggregations\030\003 \003(\01321.google"
-          + ".datastore.v1.AggregationQuery.Aggregati"
-          + "onB\003\340A\001\032\277\003\n\013Aggregation\022H\n\005count\030\001 \001(\01327"
-          + ".google.datastore.v1.AggregationQuery.Ag"
-          + "gregation.CountH\000\022D\n\003sum\030\002 \001(\01325.google."
-          + "datastore.v1.AggregationQuery.Aggregatio"
-          + "n.SumH\000\022D\n\003avg\030\003 \001(\01325.google.datastore."
-          + "v1.AggregationQuery.Aggregation.AvgH\000\022\022\n"
-          + "\005alias\030\007 \001(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001("
-          + "\0132\033.google.protobuf.Int64ValueB\003\340A\001\032?\n\003S"
-          + "um\0228\n\010property\030\001 \001(\0132&.google.datastore."
-          + "v1.PropertyReference\032?\n\003Avg\0228\n\010property\030"
-          + "\001 \001(\0132&.google.datastore.v1.PropertyRefe"
-          + "renceB\n\n\010operatorB\014\n\nquery_type\"\036\n\016KindE"
-          + "xpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRefer"
-          + "ence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010prop"
-          + "erty\030\001 \001(\0132&.google.datastore.v1.Propert"
-          + "yReference\"\321\001\n\rPropertyOrder\0228\n\010property"
-          + "\030\001 \001(\0132&.google.datastore.v1.PropertyRef"
-          + "erence\022?\n\tdirection\030\002 \001(\0162,.google.datas"
-          + "tore.v1.PropertyOrder.Direction\"E\n\tDirec"
-          + "tion\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCEN"
-          + "DING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020com"
-          + "posite_filter\030\001 \001(\0132$.google.datastore.v"
-          + "1.CompositeFilterH\000\022>\n\017property_filter\030\002"
-          + " \001(\0132#.google.datastore.v1.PropertyFilte"
-          + "rH\000B\r\n\013filter_type\"\261\001\n\017CompositeFilter\0229"
-          + "\n\002op\030\001 \001(\0162-.google.datastore.v1.Composi"
-          + "teFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.goo"
-          + "gle.datastore.v1.Filter\"5\n\010Operator\022\030\n\024O"
-          + "PERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352"
-          + "\002\n\016PropertyFilter\0228\n\010property\030\001 \001(\0132&.go"
-          + "ogle.datastore.v1.PropertyReference\0228\n\002o"
-          + "p\030\002 \001(\0162,.google.datastore.v1.PropertyFi"
-          + "lter.Operator\022)\n\005value\030\003 \001(\0132\032.google.da"
-          + "tastore.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATO"
-          + "R_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_T"
-          + "HAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREA"
-          + "TER_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_I"
-          + "N\020\r\"\323\003\n\013FindNearest\022D\n\017vector_property\030\001"
-          + " \001(\0132&.google.datastore.v1.PropertyRefer"
-          + "enceB\003\340A\002\0225\n\014query_vector\030\002 \001(\0132\032.google"
-          + ".datastore.v1.ValueB\003\340A\002\022O\n\020distance_mea"
-          + "sure\030\003 \001(\01620.google.datastore.v1.FindNea"
-          + "rest.DistanceMeasureB\003\340A\002\022/\n\005limit\030\004 \001(\013"
-          + "2\033.google.protobuf.Int32ValueB\003\340A\002\022%\n\030di"
-          + "stance_result_property\030\005 \001(\tB\003\340A\001\022=\n\022dis"
-          + "tance_threshold\030\006 \001(\0132\034.google.protobuf."
-          + "DoubleValueB\003\340A\001\"_\n\017DistanceMeasure\022 \n\034D"
-          + "ISTANCE_MEASURE_UNSPECIFIED\020\000\022\r\n\tEUCLIDE"
-          + "AN\020\001\022\n\n\006COSINE\020\002\022\017\n\013DOT_PRODUCT\020\003\"\245\002\n\010Gq"
-          + "lQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_li"
-          + "terals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.g"
-          + "oogle.datastore.v1.GqlQuery.NamedBinding"
-          + "sEntry\022C\n\023positional_bindings\030\004 \003(\0132&.go"
-          + "ogle.datastore.v1.GqlQueryParameter\032\\\n\022N"
-          + "amedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030"
-          + "\002 \001(\0132&.google.datastore.v1.GqlQueryPara"
-          + "meter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030"
-          + "\002 \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006c"
-          + "ursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020Quer"
-          + "yResultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n"
-          + "\016skipped_cursor\030\003 \001(\014\022H\n\022entity_result_t"
-          + "ype\030\001 \001(\0162,.google.datastore.v1.EntityRe"
-          + "sult.ResultType\0229\n\016entity_results\030\002 \003(\0132"
-          + "!.google.datastore.v1.EntityResult\022\022\n\nen"
-          + "d_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.g"
-          + "oogle.datastore.v1.QueryResultBatch.More"
-          + "ResultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n"
-          + "\tread_time\030\010 \001(\0132\032.google.protobuf.Times"
-          + "tamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS"
-          + "_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n"
-          + "\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESU"
-          + "LTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B"
-          + "\273\001\n\027com.google.datastore.v1B\nQueryProtoP"
-          + "\001Z;cloud.google.com/go/datastore/apiv1/d"
+      "\n"
+          + "\037google/datastore/v1/query.proto\022\023googl"
+          + "e.datastore.v1\032\037google/api/field_behavior.proto\032"
+          + " google/datastore/v1/entity.prot"
+          + "o\032\037google/protobuf/timestamp.proto\032\036google/protobuf/wrappers.proto\"\221\002\n"
+          + "\014EntityResult\022+\n"
+          + "\006entity\030\001 \001(\0132\033.google.datastore.v1.Entity\022\017\n"
+          + "\007version\030\004 \001(\003\022/\n"
+          + "\013create_time\030\006 \001(\0132\032.google.protobuf.Timestamp\022/\n"
+          + "\013update_time\030\005 \001(\0132\032.google.protobuf.Timestamp\022\016\n"
+          + "\006cursor\030\003 \001(\014\"Q\n\n"
+          + "ResultType\022\033\n"
+          + "\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n"
+          + "\004FULL\020\001\022\016\n\n"
+          + "PROJECTION\020\002\022\014\n"
+          + "\010KEY_ONLY\020\003\"\257\003\n"
+          + "\005Query\0223\n\n"
+          + "projection\030\002 \003(\0132\037.google.datastore.v1.Projection\0221\n"
+          + "\004kind\030\003 \003(\0132#.google.datastore.v1.KindExpression\022+\n"
+          + "\006filter\030\004 \001(\0132\033.google.datastore.v1.Filter\0221\n"
+          + "\005order\030\005 \003(\0132\".google.datastore.v1.PropertyOrder\022;\n"
+          + "\013distinct_on\030\006 \003(\0132&.google.datastore.v1.PropertyReference\022\024\n"
+          + "\014start_cursor\030\007 \001(\014\022\022\n\n"
+          + "end_cursor\030\010 \001(\014\022\016\n"
+          + "\006offset\030\n"
+          + " \001(\005\022*\n"
+          + "\005limit\030\014 \001(\0132\033.google.protobuf.Int32Value\022;\n"
+          + "\014find_nearest\030\r"
+          + " \001(\0132 .google.datastore.v1.FindNearestB\003\340A\001\"\344\004\n"
+          + "\020AggregationQuery\0222\n"
+          + "\014nested_query\030\001 \001(\0132\032.google.datastore.v1.QueryH\000\022L\n"
+          + "\014aggregations\030\003 \003(\01321.google"
+          + ".datastore.v1.AggregationQuery.AggregationB\003\340A\001\032\277\003\n"
+          + "\013Aggregation\022H\n"
+          + "\005count\030\001 \001(\01327"
+          + ".google.datastore.v1.AggregationQuery.Aggregation.CountH\000\022D\n"
+          + "\003sum\030\002 \001(\01325.google."
+          + "datastore.v1.AggregationQuery.Aggregation.SumH\000\022D\n"
+          + "\003avg\030\003"
+          + " \001(\01325.google.datastore.v1.AggregationQuery.Aggregation.AvgH\000\022\022\n"
+          + "\005alias\030\007 \001(\tB\003\340A\001\0328\n"
+          + "\005Count\022/\n"
+          + "\005up_to\030\001 \001(\0132\033.google.protobuf.Int64ValueB\003\340A\001\032?\n"
+          + "\003Sum\0228\n"
+          + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\032?\n"
+          + "\003Avg\0228\n"
+          + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReferenceB\n\n"
+          + "\010operatorB\014\n\n"
+          + "query_type\"\036\n"
+          + "\016KindExpression\022\014\n"
+          + "\004name\030\001 \001(\t\"!\n"
+          + "\021PropertyReference\022\014\n"
+          + "\004name\030\002 \001(\t\"F\n\n"
+          + "Projection\0228\n"
+          + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\"\321\001\n\r"
+          + "PropertyOrder\0228\n"
+          + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\022?\n"
+          + "\tdirection\030\002 \001(\0162,.google.datastore.v1.PropertyOrder.Direction\"E\n"
+          + "\tDirection\022\031\n"
+          + "\025DIRECTION_UNSPECIFIED\020\000\022\r\n"
+          + "\tASCENDING\020\001\022\016\n\n"
+          + "DESCENDING\020\002\"\231\001\n"
+          + "\006Filter\022@\n"
+          + "\020composite_filter\030\001"
+          + " \001(\0132$.google.datastore.v1.CompositeFilterH\000\022>\n"
+          + "\017property_filter\030\002 \001(\0132#.google.datastore.v1.PropertyFilterH\000B\r\n"
+          + "\013filter_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.datastore.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"
+          + "\016PropertyFilter\0228\n"
+          + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\0228\n"
+          + "\002op\030\002 \001(\0162,.google.datastore.v1.PropertyFilter.Operator\022)\n"
+          + "\005value\030\003 \001(\0132\032.google.datastore.v1.Value\"\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_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"
+          + "\"\323\003\n"
+          + "\013FindNearest\022D\n"
+          + "\017vector_property\030\001"
+          + " \001(\0132&.google.datastore.v1.PropertyReferenceB\003\340A\002\0225\n"
+          + "\014query_vector\030\002 \001(\0132\032.google.datastore.v1.ValueB\003\340A\002\022O\n"
+          + "\020distance_measure\030\003"
+          + " \001(\01620.google.datastore.v1.FindNearest.DistanceMeasureB\003\340A\002\022/\n"
+          + "\005limit\030\004 \001(\0132\033.google.protobuf.Int32ValueB\003\340A\002\022%\n"
+          + "\030distance_result_property\030\005 \001(\tB\003\340A\001\022=\n"
+          + "\022distance_threshold\030\006"
+          + " \001(\0132\034.google.protobuf.DoubleValueB\003\340A\001\"_\n"
+          + "\017DistanceMeasure\022 \n"
+          + "\034DISTANCE_MEASURE_UNSPECIFIED\020\000\022\r\n"
+          + "\tEUCLIDEAN\020\001\022\n\n"
+          + "\006COSINE\020\002\022\017\n"
+          + "\013DOT_PRODUCT\020\003\"\245\002\n"
+          + "\010GqlQuery\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.g"
+          + "oogle.datastore.v1.GqlQuery.NamedBindingsEntry\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"
+          + "\005value\030\002 \001(\0132&.google.datastore.v1.GqlQueryParameter:\0028\001\"d\n"
+          + "\021GqlQueryParameter\022+\n"
+          + "\005value\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"
+          + "\020QueryResultBatch\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.EntityResult.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.g"
+          + "oogle.datastore.v1.QueryResultBatch.MoreResultsType\022\030\n"
+          + "\020snapshot_version\030\007 \001(\003\022-\n"
+          + "\tread_time\030\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n"
+          + "\017MoreResultsType\022!\n"
+          + "\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n"
+          + "\014NOT_FINISHED\020\001\022\034\n"
+          + "\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n"
+          + "\031MORE_RESULTS_AFTER_CURSOR\020\004\022\023\n"
+          + "\017NO_MORE_RESULTS\020\003B\273\001\n"
+          + "\027com.google.datastore.v1B\n"
+          + "QueryProtoP\001Z;cloud.google.com/go/datastore/apiv1/d"
           + "atastorepb;datastorepb\252\002\031Google.Cloud.Da"
           + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002"
           + "\034Google::Cloud::Datastore::V1b\006proto3"
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index a5f09b7c90ce..ecd44fa37886 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -33,6 +33,7 @@ public final class QueryResultBatch extends com.google.protobuf.GeneratedMessage
     // @@protoc_insertion_point(message_implements:google.datastore.v1.QueryResultBatch)
     QueryResultBatchOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use QueryResultBatch.newBuilder() to construct.
   private QueryResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -141,6 +142,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      * MORE_RESULTS_TYPE_UNSPECIFIED = 0;
      */
     public static final int MORE_RESULTS_TYPE_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -151,6 +153,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      * NOT_FINISHED = 1;
      */
     public static final int NOT_FINISHED_VALUE = 1;
+
     /**
      *
      *
@@ -161,6 +164,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      * MORE_RESULTS_AFTER_LIMIT = 2;
      */
     public static final int MORE_RESULTS_AFTER_LIMIT_VALUE = 2;
+
     /**
      *
      *
@@ -172,6 +176,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      * MORE_RESULTS_AFTER_CURSOR = 4;
      */
     public static final int MORE_RESULTS_AFTER_CURSOR_VALUE = 4;
+
     /**
      *
      *
@@ -275,6 +280,7 @@ private MoreResultsType(int value) {
   private int bitField0_;
   public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6;
   private int skippedResults_ = 0;
+
   /**
    *
    *
@@ -293,6 +299,7 @@ public int getSkippedResults() {
 
   public static final int SKIPPED_CURSOR_FIELD_NUMBER = 3;
   private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -312,6 +319,7 @@ public com.google.protobuf.ByteString getSkippedCursor() {
 
   public static final int ENTITY_RESULT_TYPE_FIELD_NUMBER = 1;
   private int entityResultType_ = 0;
+
   /**
    *
    *
@@ -327,6 +335,7 @@ public com.google.protobuf.ByteString getSkippedCursor() {
   public int getEntityResultTypeValue() {
     return entityResultType_;
   }
+
   /**
    *
    *
@@ -349,6 +358,7 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
 
   @SuppressWarnings("serial")
   private java.util.List entityResults_;
+
   /**
    *
    *
@@ -362,6 +372,7 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
   public java.util.List getEntityResultsList() {
     return entityResults_;
   }
+
   /**
    *
    *
@@ -376,6 +387,7 @@ public java.util.List getEntityResultsList
       getEntityResultsOrBuilderList() {
     return entityResults_;
   }
+
   /**
    *
    *
@@ -389,6 +401,7 @@ public java.util.List getEntityResultsList
   public int getEntityResultsCount() {
     return entityResults_.size();
   }
+
   /**
    *
    *
@@ -402,6 +415,7 @@ public int getEntityResultsCount() {
   public com.google.datastore.v1.EntityResult getEntityResults(int index) {
     return entityResults_.get(index);
   }
+
   /**
    *
    *
@@ -418,6 +432,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
 
   public static final int END_CURSOR_FIELD_NUMBER = 4;
   private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -436,6 +451,7 @@ public com.google.protobuf.ByteString getEndCursor() {
 
   public static final int MORE_RESULTS_FIELD_NUMBER = 5;
   private int moreResults_ = 0;
+
   /**
    *
    *
@@ -451,6 +467,7 @@ public com.google.protobuf.ByteString getEndCursor() {
   public int getMoreResultsValue() {
     return moreResults_;
   }
+
   /**
    *
    *
@@ -473,6 +490,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
 
   public static final int SNAPSHOT_VERSION_FIELD_NUMBER = 7;
   private long snapshotVersion_ = 0L;
+
   /**
    *
    *
@@ -499,6 +517,7 @@ public long getSnapshotVersion() {
 
   public static final int READ_TIME_FIELD_NUMBER = 8;
   private com.google.protobuf.Timestamp readTime_;
+
   /**
    *
    *
@@ -523,6 +542,7 @@ public long getSnapshotVersion() {
   public boolean hasReadTime() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -547,6 +567,7 @@ public boolean hasReadTime() {
   public com.google.protobuf.Timestamp getReadTime() {
     return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
   }
+
   /**
    *
    *
@@ -804,6 +825,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1140,6 +1162,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private int skippedResults_;
+
     /**
      *
      *
@@ -1155,6 +1178,7 @@ public Builder mergeFrom(
     public int getSkippedResults() {
       return skippedResults_;
     }
+
     /**
      *
      *
@@ -1174,6 +1198,7 @@ public Builder setSkippedResults(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1193,6 +1218,7 @@ public Builder clearSkippedResults() {
     }
 
     private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -1209,6 +1235,7 @@ public Builder clearSkippedResults() {
     public com.google.protobuf.ByteString getSkippedCursor() {
       return skippedCursor_;
     }
+
     /**
      *
      *
@@ -1231,6 +1258,7 @@ public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1251,6 +1279,7 @@ public Builder clearSkippedCursor() {
     }
 
     private int entityResultType_ = 0;
+
     /**
      *
      *
@@ -1266,6 +1295,7 @@ public Builder clearSkippedCursor() {
     public int getEntityResultTypeValue() {
       return entityResultType_;
     }
+
     /**
      *
      *
@@ -1284,6 +1314,7 @@ public Builder setEntityResultTypeValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1301,6 +1332,7 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
           com.google.datastore.v1.EntityResult.ResultType.forNumber(entityResultType_);
       return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
     }
+
     /**
      *
      *
@@ -1322,6 +1354,7 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1373,6 +1406,7 @@ public java.util.List getEntityResultsList
         return entityResultsBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -1389,6 +1423,7 @@ public int getEntityResultsCount() {
         return entityResultsBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -1405,6 +1440,7 @@ public com.google.datastore.v1.EntityResult getEntityResults(int index) {
         return entityResultsBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1427,6 +1463,7 @@ public Builder setEntityResults(int index, com.google.datastore.v1.EntityResult
       }
       return this;
     }
+
     /**
      *
      *
@@ -1447,6 +1484,7 @@ public Builder setEntityResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1469,6 +1507,7 @@ public Builder addEntityResults(com.google.datastore.v1.EntityResult value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1491,6 +1530,7 @@ public Builder addEntityResults(int index, com.google.datastore.v1.EntityResult
       }
       return this;
     }
+
     /**
      *
      *
@@ -1510,6 +1550,7 @@ public Builder addEntityResults(com.google.datastore.v1.EntityResult.Builder bui
       }
       return this;
     }
+
     /**
      *
      *
@@ -1530,6 +1571,7 @@ public Builder addEntityResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1550,6 +1592,7 @@ public Builder addAllEntityResults(
       }
       return this;
     }
+
     /**
      *
      *
@@ -1569,6 +1612,7 @@ public Builder clearEntityResults() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1588,6 +1632,7 @@ public Builder removeEntityResults(int index) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1600,6 +1645,7 @@ public Builder removeEntityResults(int index) {
     public com.google.datastore.v1.EntityResult.Builder getEntityResultsBuilder(int index) {
       return getEntityResultsFieldBuilder().getBuilder(index);
     }
+
     /**
      *
      *
@@ -1616,6 +1662,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
         return entityResultsBuilder_.getMessageOrBuilder(index);
       }
     }
+
     /**
      *
      *
@@ -1633,6 +1680,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
         return java.util.Collections.unmodifiableList(entityResults_);
       }
     }
+
     /**
      *
      *
@@ -1646,6 +1694,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder() {
       return getEntityResultsFieldBuilder()
           .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1659,6 +1708,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
       return getEntityResultsFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1694,6 +1744,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
     }
 
     private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -1709,6 +1760,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
+
     /**
      *
      *
@@ -1730,6 +1782,7 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1749,6 +1802,7 @@ public Builder clearEndCursor() {
     }
 
     private int moreResults_ = 0;
+
     /**
      *
      *
@@ -1764,6 +1818,7 @@ public Builder clearEndCursor() {
     public int getMoreResultsValue() {
       return moreResults_;
     }
+
     /**
      *
      *
@@ -1782,6 +1837,7 @@ public Builder setMoreResultsValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1801,6 +1857,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
           ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
           : result;
     }
+
     /**
      *
      *
@@ -1822,6 +1879,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1841,6 +1899,7 @@ public Builder clearMoreResults() {
     }
 
     private long snapshotVersion_;
+
     /**
      *
      *
@@ -1864,6 +1923,7 @@ public Builder clearMoreResults() {
     public long getSnapshotVersion() {
       return snapshotVersion_;
     }
+
     /**
      *
      *
@@ -1891,6 +1951,7 @@ public Builder setSnapshotVersion(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1923,6 +1984,7 @@ public Builder clearSnapshotVersion() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         readTimeBuilder_;
+
     /**
      *
      *
@@ -1946,6 +2008,7 @@ public Builder clearSnapshotVersion() {
     public boolean hasReadTime() {
       return ((bitField0_ & 0x00000080) != 0);
     }
+
     /**
      *
      *
@@ -1973,6 +2036,7 @@ public com.google.protobuf.Timestamp getReadTime() {
         return readTimeBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2004,6 +2068,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2032,6 +2097,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2068,6 +2134,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2096,6 +2163,7 @@ public Builder clearReadTime() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2119,6 +2187,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
       onChanged();
       return getReadTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2144,6 +2213,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
         return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
       }
     }
+
     /**
      *
      *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index 01f9c75a7156..99483d9d6328 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -63,6 +63,7 @@ public interface QueryResultBatchOrBuilder
    * @return The enum numeric value on the wire for entityResultType.
    */
   int getEntityResultTypeValue();
+
   /**
    *
    *
@@ -86,6 +87,7 @@ public interface QueryResultBatchOrBuilder
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
   java.util.List getEntityResultsList();
+
   /**
    *
    *
@@ -96,6 +98,7 @@ public interface QueryResultBatchOrBuilder
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
   com.google.datastore.v1.EntityResult getEntityResults(int index);
+
   /**
    *
    *
@@ -106,6 +109,7 @@ public interface QueryResultBatchOrBuilder
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
   int getEntityResultsCount();
+
   /**
    *
    *
@@ -117,6 +121,7 @@ public interface QueryResultBatchOrBuilder
    */
   java.util.List
       getEntityResultsOrBuilderList();
+
   /**
    *
    *
@@ -153,6 +158,7 @@ public interface QueryResultBatchOrBuilder
    * @return The enum numeric value on the wire for moreResults.
    */
   int getMoreResultsValue();
+
   /**
    *
    *
@@ -208,6 +214,7 @@ public interface QueryResultBatchOrBuilder
    * @return Whether the readTime field is set.
    */
   boolean hasReadTime();
+
   /**
    *
    *
@@ -229,6 +236,7 @@ public interface QueryResultBatchOrBuilder
    * @return The readTime.
    */
   com.google.protobuf.Timestamp getReadTime();
+
   /**
    *
    *
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index ed5ac6a48351..954270bf8ab6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -33,6 +33,7 @@ public final class ReadOptions extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReadOptions)
     ReadOptionsOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ReadOptions.newBuilder() to construct.
   private ReadOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -114,6 +115,7 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
      * READ_CONSISTENCY_UNSPECIFIED = 0;
      */
     public static final int READ_CONSISTENCY_UNSPECIFIED_VALUE = 0;
+
     /**
      *
      *
@@ -124,6 +126,7 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
      * STRONG = 1;
      */
     public static final int STRONG_VALUE = 1;
+
     /**
      *
      *
@@ -239,6 +242,7 @@ public enum ConsistencyTypeCase
     private ConsistencyTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -276,6 +280,7 @@ public ConsistencyTypeCase getConsistencyTypeCase() {
   }
 
   public static final int READ_CONSISTENCY_FIELD_NUMBER = 1;
+
   /**
    *
    *
@@ -290,6 +295,7 @@ public ConsistencyTypeCase getConsistencyTypeCase() {
   public boolean hasReadConsistency() {
     return consistencyTypeCase_ == 1;
   }
+
   /**
    *
    *
@@ -307,6 +313,7 @@ public int getReadConsistencyValue() {
     }
     return 0;
   }
+
   /**
    *
    *
@@ -331,6 +338,7 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
+
   /**
    *
    *
@@ -348,6 +356,7 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
   public boolean hasTransaction() {
     return consistencyTypeCase_ == 2;
   }
+
   /**
    *
    *
@@ -370,6 +379,7 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   public static final int NEW_TRANSACTION_FIELD_NUMBER = 3;
+
   /**
    *
    *
@@ -391,6 +401,7 @@ public com.google.protobuf.ByteString getTransaction() {
   public boolean hasNewTransaction() {
     return consistencyTypeCase_ == 3;
   }
+
   /**
    *
    *
@@ -415,6 +426,7 @@ public com.google.datastore.v1.TransactionOptions getNewTransaction() {
     }
     return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -439,6 +451,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu
   }
 
   public static final int READ_TIME_FIELD_NUMBER = 4;
+
   /**
    *
    *
@@ -459,6 +472,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu
   public boolean hasReadTime() {
     return consistencyTypeCase_ == 4;
   }
+
   /**
    *
    *
@@ -482,6 +496,7 @@ public com.google.protobuf.Timestamp getReadTime() {
     }
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -721,6 +736,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -987,6 +1003,7 @@ public Builder clearConsistencyType() {
     public boolean hasReadConsistency() {
       return consistencyTypeCase_ == 1;
     }
+
     /**
      *
      *
@@ -1005,6 +1022,7 @@ public int getReadConsistencyValue() {
       }
       return 0;
     }
+
     /**
      *
      *
@@ -1023,6 +1041,7 @@ public Builder setReadConsistencyValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1046,6 +1065,7 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
       }
       return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED;
     }
+
     /**
      *
      *
@@ -1067,6 +1087,7 @@ public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsis
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1103,6 +1124,7 @@ public Builder clearReadConsistency() {
     public boolean hasTransaction() {
       return consistencyTypeCase_ == 2;
     }
+
     /**
      *
      *
@@ -1122,6 +1144,7 @@ public com.google.protobuf.ByteString getTransaction() {
       }
       return com.google.protobuf.ByteString.EMPTY;
     }
+
     /**
      *
      *
@@ -1145,6 +1168,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1172,6 +1196,7 @@ public Builder clearTransaction() {
             com.google.datastore.v1.TransactionOptions.Builder,
             com.google.datastore.v1.TransactionOptionsOrBuilder>
         newTransactionBuilder_;
+
     /**
      *
      *
@@ -1193,6 +1218,7 @@ public Builder clearTransaction() {
     public boolean hasNewTransaction() {
       return consistencyTypeCase_ == 3;
     }
+
     /**
      *
      *
@@ -1224,6 +1250,7 @@ public com.google.datastore.v1.TransactionOptions getNewTransaction() {
         return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1252,6 +1279,7 @@ public Builder setNewTransaction(com.google.datastore.v1.TransactionOptions valu
       consistencyTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1278,6 +1306,7 @@ public Builder setNewTransaction(
       consistencyTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1317,6 +1346,7 @@ public Builder mergeNewTransaction(com.google.datastore.v1.TransactionOptions va
       consistencyTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1348,6 +1378,7 @@ public Builder clearNewTransaction() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1366,6 +1397,7 @@ public Builder clearNewTransaction() {
     public com.google.datastore.v1.TransactionOptions.Builder getNewTransactionBuilder() {
       return getNewTransactionFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1392,6 +1424,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu
         return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1436,6 +1469,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         readTimeBuilder_;
+
     /**
      *
      *
@@ -1456,6 +1490,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu
     public boolean hasReadTime() {
       return consistencyTypeCase_ == 4;
     }
+
     /**
      *
      *
@@ -1486,6 +1521,7 @@ public com.google.protobuf.Timestamp getReadTime() {
         return com.google.protobuf.Timestamp.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1513,6 +1549,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
       consistencyTypeCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -1537,6 +1574,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
       consistencyTypeCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -1574,6 +1612,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
       consistencyTypeCase_ = 4;
       return this;
     }
+
     /**
      *
      *
@@ -1604,6 +1643,7 @@ public Builder clearReadTime() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1621,6 +1661,7 @@ public Builder clearReadTime() {
     public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
       return getReadTimeFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1646,6 +1687,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
         return com.google.protobuf.Timestamp.getDefaultInstance();
       }
     }
+
     /**
      *
      *
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 4c0ac317b43c..7ba3d1fad240 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
@@ -36,6 +36,7 @@ public interface ReadOptionsOrBuilder
    * @return Whether the readConsistency field is set.
    */
   boolean hasReadConsistency();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface ReadOptionsOrBuilder
    * @return The enum numeric value on the wire for readConsistency.
    */
   int getReadConsistencyValue();
+
   /**
    *
    *
@@ -75,6 +77,7 @@ public interface ReadOptionsOrBuilder
    * @return Whether the transaction field is set.
    */
   boolean hasTransaction();
+
   /**
    *
    *
@@ -108,6 +111,7 @@ public interface ReadOptionsOrBuilder
    * @return Whether the newTransaction field is set.
    */
   boolean hasNewTransaction();
+
   /**
    *
    *
@@ -126,6 +130,7 @@ public interface ReadOptionsOrBuilder
    * @return The newTransaction.
    */
   com.google.datastore.v1.TransactionOptions getNewTransaction();
+
   /**
    *
    *
@@ -160,6 +165,7 @@ public interface ReadOptionsOrBuilder
    * @return Whether the readTime field is set.
    */
   boolean hasReadTime();
+
   /**
    *
    *
@@ -177,6 +183,7 @@ public interface ReadOptionsOrBuilder
    * @return The readTime.
    */
   com.google.protobuf.Timestamp getReadTime();
+
   /**
    *
    *
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 bec6a7ae944a..3a23ce121014 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
@@ -34,6 +34,7 @@ public final class ReserveIdsRequest extends com.google.protobuf.GeneratedMessag
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsRequest)
     ReserveIdsRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ReserveIdsRequest.newBuilder() to construct.
   private ReserveIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -93,6 +95,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -178,6 +183,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   @SuppressWarnings("serial")
   private java.util.List keys_;
+
   /**
    *
    *
@@ -193,6 +199,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public java.util.List getKeysList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -208,6 +215,7 @@ public java.util.List getKeysList() {
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
+
   /**
    *
    *
@@ -223,6 +231,7 @@ public java.util.List getKeysOrB
   public int getKeysCount() {
     return keys_.size();
   }
+
   /**
    *
    *
@@ -238,6 +247,7 @@ public int getKeysCount() {
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
+
   /**
    *
    *
@@ -433,6 +443,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -691,6 +702,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -713,6 +725,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -735,6 +748,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -756,6 +770,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -773,6 +788,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -797,6 +813,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -822,6 +839,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -847,6 +865,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -871,6 +890,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -891,6 +911,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -950,6 +971,7 @@ public java.util.List getKeysList() {
         return keysBuilder_.getMessageList();
       }
     }
+
     /**
      *
      *
@@ -968,6 +990,7 @@ public int getKeysCount() {
         return keysBuilder_.getCount();
       }
     }
+
     /**
      *
      *
@@ -986,6 +1009,7 @@ public com.google.datastore.v1.Key getKeys(int index) {
         return keysBuilder_.getMessage(index);
       }
     }
+
     /**
      *
      *
@@ -1010,6 +1034,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1031,6 +1056,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -1055,6 +1081,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1079,6 +1106,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1100,6 +1128,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1121,6 +1150,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       }
       return this;
     }
+
     /**
      *
      *
@@ -1142,6 +1172,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB
         return java.util.Collections.unmodifiableList(keys_);
       }
     }
+
     /**
      *
      *
@@ -1248,6 +1284,7 @@ public java.util.List getKeysOrB
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
       return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
@@ -1263,6 +1300,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
       return getKeysFieldBuilder()
           .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
     }
+
     /**
      *
      *
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 794b3102fd37..7b26ed5c044e 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
@@ -36,6 +36,7 @@ public interface ReserveIdsRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface ReserveIdsRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public interface ReserveIdsRequestOrBuilder
    * 
    */
   java.util.List getKeysList();
+
   /**
    *
    *
@@ -104,6 +107,7 @@ public interface ReserveIdsRequestOrBuilder
    * 
    */
   com.google.datastore.v1.Key getKeys(int index);
+
   /**
    *
    *
@@ -116,6 +120,7 @@ public interface ReserveIdsRequestOrBuilder
    * 
    */
   int getKeysCount();
+
   /**
    *
    *
@@ -128,6 +133,7 @@ public interface ReserveIdsRequestOrBuilder
    * 
    */
   java.util.List getKeysOrBuilderList();
+
   /**
    *
    *
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 5100f525e7e7..7d89c33f317d 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
@@ -34,6 +34,7 @@ public final class ReserveIdsResponse extends com.google.protobuf.GeneratedMessa
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsResponse)
     ReserveIdsResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use ReserveIdsResponse.newBuilder() to construct.
   private ReserveIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -212,6 +213,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
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 edae24a6c63d..df1b5a581ccf 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
@@ -33,6 +33,7 @@ public final class RollbackRequest extends com.google.protobuf.GeneratedMessageV
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackRequest)
     RollbackRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use RollbackRequest.newBuilder() to construct.
   private RollbackRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -92,6 +94,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -120,6 +123,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -146,6 +150,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -175,6 +180,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -368,6 +374,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -579,6 +586,7 @@ public Builder mergeFrom(
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -601,6 +609,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -623,6 +632,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -644,6 +654,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -661,6 +672,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -685,6 +697,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -710,6 +723,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -735,6 +749,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -759,6 +774,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -779,6 +795,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -806,6 +823,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -822,6 +840,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
+
     /**
      *
      *
@@ -844,6 +863,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 754a192103c2..8fc63434da97 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
@@ -36,6 +36,7 @@ public interface RollbackRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface RollbackRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
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 b7aae859631b..22c7c565f432 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
@@ -35,6 +35,7 @@ public final class RollbackResponse extends com.google.protobuf.GeneratedMessage
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackResponse)
     RollbackResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use RollbackResponse.newBuilder() to construct.
   private RollbackResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -212,6 +213,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
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 1d262da92105..5c4fd8a80dab 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
@@ -34,6 +34,7 @@ public final class RunAggregationQueryRequest extends com.google.protobuf.Genera
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryRequest)
     RunAggregationQueryRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use RunAggregationQueryRequest.newBuilder() to construct.
   private RunAggregationQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -83,6 +84,7 @@ public enum QueryTypeCase
     private QueryTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -119,6 +121,7 @@ public QueryTypeCase getQueryTypeCase() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -142,6 +145,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -170,6 +174,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -196,6 +201,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -225,6 +231,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   public static final int PARTITION_ID_FIELD_NUMBER = 2;
   private com.google.datastore.v1.PartitionId partitionId_;
+
   /**
    *
    *
@@ -243,6 +250,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public boolean hasPartitionId() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -263,6 +271,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
         ? com.google.datastore.v1.PartitionId.getDefaultInstance()
         : partitionId_;
   }
+
   /**
    *
    *
@@ -284,6 +293,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
 
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
+
   /**
    *
    *
@@ -299,6 +309,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
   public boolean hasReadOptions() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -316,6 +327,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
         ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
         : readOptions_;
   }
+
   /**
    *
    *
@@ -333,6 +345,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
   }
 
   public static final int AGGREGATION_QUERY_FIELD_NUMBER = 3;
+
   /**
    *
    *
@@ -348,6 +361,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
   public boolean hasAggregationQuery() {
     return queryTypeCase_ == 3;
   }
+
   /**
    *
    *
@@ -366,6 +380,7 @@ public com.google.datastore.v1.AggregationQuery getAggregationQuery() {
     }
     return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -384,6 +399,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu
   }
 
   public static final int GQL_QUERY_FIELD_NUMBER = 7;
+
   /**
    *
    *
@@ -399,6 +415,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu
   public boolean hasGqlQuery() {
     return queryTypeCase_ == 7;
   }
+
   /**
    *
    *
@@ -417,6 +434,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
     }
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -436,6 +454,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
 
   public static final int EXPLAIN_OPTIONS_FIELD_NUMBER = 11;
   private com.google.datastore.v1.ExplainOptions explainOptions_;
+
   /**
    *
    *
@@ -454,6 +473,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
   public boolean hasExplainOptions() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -474,6 +494,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() {
         ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
         : explainOptions_;
   }
+
   /**
    *
    *
@@ -742,6 +763,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1075,6 +1097,7 @@ public Builder clearQueryType() {
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -1097,6 +1120,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1119,6 +1143,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1140,6 +1165,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1157,6 +1183,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1181,6 +1208,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -1206,6 +1234,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1231,6 +1260,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1255,6 +1285,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1275,6 +1306,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1307,6 +1339,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
             com.google.datastore.v1.PartitionId.Builder,
             com.google.datastore.v1.PartitionIdOrBuilder>
         partitionIdBuilder_;
+
     /**
      *
      *
@@ -1324,6 +1357,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     public boolean hasPartitionId() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1347,6 +1381,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
         return partitionIdBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1372,6 +1407,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1394,6 +1430,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1424,6 +1461,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1446,6 +1484,7 @@ public Builder clearPartitionId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1463,6 +1502,7 @@ public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1484,6 +1524,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
             : partitionId_;
       }
     }
+
     /**
      *
      *
@@ -1519,6 +1560,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
             com.google.datastore.v1.ReadOptions.Builder,
             com.google.datastore.v1.ReadOptionsOrBuilder>
         readOptionsBuilder_;
+
     /**
      *
      *
@@ -1533,6 +1575,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
     public boolean hasReadOptions() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1553,6 +1596,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
         return readOptionsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1575,6 +1619,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1594,6 +1639,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1621,6 +1667,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1640,6 +1687,7 @@ public Builder clearReadOptions() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1654,6 +1702,7 @@ public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1672,6 +1721,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
             : readOptions_;
       }
     }
+
     /**
      *
      *
@@ -1703,6 +1753,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
             com.google.datastore.v1.AggregationQuery.Builder,
             com.google.datastore.v1.AggregationQueryOrBuilder>
         aggregationQueryBuilder_;
+
     /**
      *
      *
@@ -1718,6 +1769,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
     public boolean hasAggregationQuery() {
       return queryTypeCase_ == 3;
     }
+
     /**
      *
      *
@@ -1743,6 +1795,7 @@ public com.google.datastore.v1.AggregationQuery getAggregationQuery() {
         return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1765,6 +1818,7 @@ public Builder setAggregationQuery(com.google.datastore.v1.AggregationQuery valu
       queryTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1785,6 +1839,7 @@ public Builder setAggregationQuery(
       queryTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1817,6 +1872,7 @@ public Builder mergeAggregationQuery(com.google.datastore.v1.AggregationQuery va
       queryTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1842,6 +1898,7 @@ public Builder clearAggregationQuery() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1854,6 +1911,7 @@ public Builder clearAggregationQuery() {
     public com.google.datastore.v1.AggregationQuery.Builder getAggregationQueryBuilder() {
       return getAggregationQueryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1874,6 +1932,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu
         return com.google.datastore.v1.AggregationQuery.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1912,6 +1971,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu
             com.google.datastore.v1.GqlQuery.Builder,
             com.google.datastore.v1.GqlQueryOrBuilder>
         gqlQueryBuilder_;
+
     /**
      *
      *
@@ -1927,6 +1987,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu
     public boolean hasGqlQuery() {
       return queryTypeCase_ == 7;
     }
+
     /**
      *
      *
@@ -1952,6 +2013,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
         return com.google.datastore.v1.GqlQuery.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1974,6 +2036,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) {
       queryTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -1993,6 +2056,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa
       queryTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2025,6 +2089,7 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
       queryTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2050,6 +2115,7 @@ public Builder clearGqlQuery() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2062,6 +2128,7 @@ public Builder clearGqlQuery() {
     public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
       return getGqlQueryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2082,6 +2149,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
         return com.google.datastore.v1.GqlQuery.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2119,6 +2187,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
             com.google.datastore.v1.ExplainOptions.Builder,
             com.google.datastore.v1.ExplainOptionsOrBuilder>
         explainOptionsBuilder_;
+
     /**
      *
      *
@@ -2136,6 +2205,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     public boolean hasExplainOptions() {
       return ((bitField0_ & 0x00000040) != 0);
     }
+
     /**
      *
      *
@@ -2159,6 +2229,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() {
         return explainOptionsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2184,6 +2255,7 @@ public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2207,6 +2279,7 @@ public Builder setExplainOptions(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2237,6 +2310,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -2259,6 +2333,7 @@ public Builder clearExplainOptions() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2276,6 +2351,7 @@ public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder()
       onChanged();
       return getExplainOptionsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2297,6 +2373,7 @@ public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilde
             : explainOptions_;
       }
     }
+
     /**
      *
      *
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 7f12bcfe22b6..d29e500711fe 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
@@ -36,6 +36,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -95,6 +97,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return Whether the partitionId field is set.
    */
   boolean hasPartitionId();
+
   /**
    *
    *
@@ -110,6 +113,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return The partitionId.
    */
   com.google.datastore.v1.PartitionId getPartitionId();
+
   /**
    *
    *
@@ -136,6 +140,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return Whether the readOptions field is set.
    */
   boolean hasReadOptions();
+
   /**
    *
    *
@@ -148,6 +153,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return The readOptions.
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
+
   /**
    *
    *
@@ -171,6 +177,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return Whether the aggregationQuery field is set.
    */
   boolean hasAggregationQuery();
+
   /**
    *
    *
@@ -183,6 +190,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return The aggregationQuery.
    */
   com.google.datastore.v1.AggregationQuery getAggregationQuery();
+
   /**
    *
    *
@@ -206,6 +214,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return Whether the gqlQuery field is set.
    */
   boolean hasGqlQuery();
+
   /**
    *
    *
@@ -218,6 +227,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return The gqlQuery.
    */
   com.google.datastore.v1.GqlQuery getGqlQuery();
+
   /**
    *
    *
@@ -244,6 +254,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return Whether the explainOptions field is set.
    */
   boolean hasExplainOptions();
+
   /**
    *
    *
@@ -259,6 +270,7 @@ public interface RunAggregationQueryRequestOrBuilder
    * @return The explainOptions.
    */
   com.google.datastore.v1.ExplainOptions getExplainOptions();
+
   /**
    *
    *
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 54453de38171..21e58fece8d4 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
@@ -34,6 +34,7 @@ public final class RunAggregationQueryResponse extends com.google.protobuf.Gener
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryResponse)
     RunAggregationQueryResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use RunAggregationQueryResponse.newBuilder() to construct.
   private RunAggregationQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int BATCH_FIELD_NUMBER = 1;
   private com.google.datastore.v1.AggregationResultBatch batch_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasBatch() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -99,6 +102,7 @@ public com.google.datastore.v1.AggregationResultBatch getBatch() {
         ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()
         : batch_;
   }
+
   /**
    *
    *
@@ -117,6 +121,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
 
   public static final int QUERY_FIELD_NUMBER = 2;
   private com.google.datastore.v1.AggregationQuery query_;
+
   /**
    *
    *
@@ -132,6 +137,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
   public boolean hasQuery() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -147,6 +153,7 @@ public boolean hasQuery() {
   public com.google.datastore.v1.AggregationQuery getQuery() {
     return query_ == null ? com.google.datastore.v1.AggregationQuery.getDefaultInstance() : query_;
   }
+
   /**
    *
    *
@@ -163,6 +170,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
 
   public static final int TRANSACTION_FIELD_NUMBER = 5;
   private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -187,6 +195,7 @@ public com.google.protobuf.ByteString getTransaction() {
 
   public static final int EXPLAIN_METRICS_FIELD_NUMBER = 9;
   private com.google.datastore.v1.ExplainMetrics explainMetrics_;
+
   /**
    *
    *
@@ -204,6 +213,7 @@ public com.google.protobuf.ByteString getTransaction() {
   public boolean hasExplainMetrics() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -223,6 +233,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
         ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
         : explainMetrics_;
   }
+
   /**
    *
    *
@@ -442,6 +453,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -698,6 +710,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.AggregationResultBatch.Builder,
             com.google.datastore.v1.AggregationResultBatchOrBuilder>
         batchBuilder_;
+
     /**
      *
      *
@@ -712,6 +725,7 @@ public Builder mergeFrom(
     public boolean hasBatch() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -732,6 +746,7 @@ public com.google.datastore.v1.AggregationResultBatch getBatch() {
         return batchBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -754,6 +769,7 @@ public Builder setBatch(com.google.datastore.v1.AggregationResultBatch value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -774,6 +790,7 @@ public Builder setBatch(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -801,6 +818,7 @@ public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -820,6 +838,7 @@ public Builder clearBatch() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -834,6 +853,7 @@ public com.google.datastore.v1.AggregationResultBatch.Builder getBatchBuilder()
       onChanged();
       return getBatchFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -852,6 +872,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
             : batch_;
       }
     }
+
     /**
      *
      *
@@ -884,6 +905,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
             com.google.datastore.v1.AggregationQuery.Builder,
             com.google.datastore.v1.AggregationQueryOrBuilder>
         queryBuilder_;
+
     /**
      *
      *
@@ -898,6 +920,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
     public boolean hasQuery() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -918,6 +941,7 @@ public com.google.datastore.v1.AggregationQuery getQuery() {
         return queryBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -940,6 +964,7 @@ public Builder setQuery(com.google.datastore.v1.AggregationQuery value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -959,6 +984,7 @@ public Builder setQuery(com.google.datastore.v1.AggregationQuery.Builder builder
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -986,6 +1012,7 @@ public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1005,6 +1032,7 @@ public Builder clearQuery() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1019,6 +1047,7 @@ public com.google.datastore.v1.AggregationQuery.Builder getQueryBuilder() {
       onChanged();
       return getQueryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1037,6 +1066,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
             : query_;
       }
     }
+
     /**
      *
      *
@@ -1064,6 +1094,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
     }
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -1085,6 +1116,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
+
     /**
      *
      *
@@ -1112,6 +1144,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1142,6 +1175,7 @@ public Builder clearTransaction() {
             com.google.datastore.v1.ExplainMetrics.Builder,
             com.google.datastore.v1.ExplainMetricsOrBuilder>
         explainMetricsBuilder_;
+
     /**
      *
      *
@@ -1158,6 +1192,7 @@ public Builder clearTransaction() {
     public boolean hasExplainMetrics() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1180,6 +1215,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
         return explainMetricsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1204,6 +1240,7 @@ public Builder setExplainMetrics(com.google.datastore.v1.ExplainMetrics value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1226,6 +1263,7 @@ public Builder setExplainMetrics(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1255,6 +1293,7 @@ public Builder mergeExplainMetrics(com.google.datastore.v1.ExplainMetrics value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1276,6 +1315,7 @@ public Builder clearExplainMetrics() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1292,6 +1332,7 @@ public com.google.datastore.v1.ExplainMetrics.Builder getExplainMetricsBuilder()
       onChanged();
       return getExplainMetricsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1312,6 +1353,7 @@ public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilde
             : explainMetrics_;
       }
     }
+
     /**
      *
      *
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 a8845ed1a791..c404a126eb3b 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
@@ -36,6 +36,7 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return Whether the batch field is set.
    */
   boolean hasBatch();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return The batch.
    */
   com.google.datastore.v1.AggregationResultBatch getBatch();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return Whether the query field is set.
    */
   boolean hasQuery();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return The query.
    */
   com.google.datastore.v1.AggregationQuery getQuery();
+
   /**
    *
    *
@@ -127,6 +131,7 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return Whether the explainMetrics field is set.
    */
   boolean hasExplainMetrics();
+
   /**
    *
    *
@@ -141,6 +146,7 @@ public interface RunAggregationQueryResponseOrBuilder
    * @return The explainMetrics.
    */
   com.google.datastore.v1.ExplainMetrics getExplainMetrics();
+
   /**
    *
    *
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 0dc924f05d6d..39365a38ba1b 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
@@ -33,6 +33,7 @@ public final class RunQueryRequest extends com.google.protobuf.GeneratedMessageV
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryRequest)
     RunQueryRequestOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use RunQueryRequest.newBuilder() to construct.
   private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -82,6 +83,7 @@ public enum QueryTypeCase
     private QueryTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -118,6 +120,7 @@ public QueryTypeCase getQueryTypeCase() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object projectId_ = "";
+
   /**
    *
    *
@@ -141,6 +144,7 @@ public java.lang.String getProjectId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -169,6 +173,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
 
   @SuppressWarnings("serial")
   private volatile java.lang.Object databaseId_ = "";
+
   /**
    *
    *
@@ -195,6 +200,7 @@ public java.lang.String getDatabaseId() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -224,6 +230,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
 
   public static final int PARTITION_ID_FIELD_NUMBER = 2;
   private com.google.datastore.v1.PartitionId partitionId_;
+
   /**
    *
    *
@@ -242,6 +249,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public boolean hasPartitionId() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -262,6 +270,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
         ? com.google.datastore.v1.PartitionId.getDefaultInstance()
         : partitionId_;
   }
+
   /**
    *
    *
@@ -283,6 +292,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
 
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
+
   /**
    *
    *
@@ -298,6 +308,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
   public boolean hasReadOptions() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -315,6 +326,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
         ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
         : readOptions_;
   }
+
   /**
    *
    *
@@ -332,6 +344,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
   }
 
   public static final int QUERY_FIELD_NUMBER = 3;
+
   /**
    *
    *
@@ -347,6 +360,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
   public boolean hasQuery() {
     return queryTypeCase_ == 3;
   }
+
   /**
    *
    *
@@ -365,6 +379,7 @@ public com.google.datastore.v1.Query getQuery() {
     }
     return com.google.datastore.v1.Query.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -383,6 +398,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
   }
 
   public static final int GQL_QUERY_FIELD_NUMBER = 7;
+
   /**
    *
    *
@@ -398,6 +414,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
   public boolean hasGqlQuery() {
     return queryTypeCase_ == 7;
   }
+
   /**
    *
    *
@@ -416,6 +433,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
     }
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -435,6 +453,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
 
   public static final int PROPERTY_MASK_FIELD_NUMBER = 10;
   private com.google.datastore.v1.PropertyMask propertyMask_;
+
   /**
    *
    *
@@ -454,6 +473,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
   public boolean hasPropertyMask() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -475,6 +495,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() {
         ? com.google.datastore.v1.PropertyMask.getDefaultInstance()
         : propertyMask_;
   }
+
   /**
    *
    *
@@ -497,6 +518,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
 
   public static final int EXPLAIN_OPTIONS_FIELD_NUMBER = 12;
   private com.google.datastore.v1.ExplainOptions explainOptions_;
+
   /**
    *
    *
@@ -515,6 +537,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
   public boolean hasExplainOptions() {
     return ((bitField0_ & 0x00000008) != 0);
   }
+
   /**
    *
    *
@@ -535,6 +558,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() {
         ? com.google.datastore.v1.ExplainOptions.getDefaultInstance()
         : explainOptions_;
   }
+
   /**
    *
    *
@@ -816,6 +840,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1166,6 +1191,7 @@ public Builder clearQueryType() {
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
+
     /**
      *
      *
@@ -1188,6 +1214,7 @@ public java.lang.String getProjectId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1210,6 +1237,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1231,6 +1259,7 @@ public Builder setProjectId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1248,6 +1277,7 @@ public Builder clearProjectId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1272,6 +1302,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
     }
 
     private java.lang.Object databaseId_ = "";
+
     /**
      *
      *
@@ -1297,6 +1328,7 @@ public java.lang.String getDatabaseId() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -1322,6 +1354,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -1346,6 +1379,7 @@ public Builder setDatabaseId(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1366,6 +1400,7 @@ public Builder clearDatabaseId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1398,6 +1433,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
             com.google.datastore.v1.PartitionId.Builder,
             com.google.datastore.v1.PartitionIdOrBuilder>
         partitionIdBuilder_;
+
     /**
      *
      *
@@ -1415,6 +1451,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
     public boolean hasPartitionId() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      *
      *
@@ -1438,6 +1475,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() {
         return partitionIdBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1463,6 +1501,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1485,6 +1524,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1515,6 +1555,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1537,6 +1578,7 @@ public Builder clearPartitionId() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1554,6 +1596,7 @@ public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1575,6 +1618,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
             : partitionId_;
       }
     }
+
     /**
      *
      *
@@ -1610,6 +1654,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
             com.google.datastore.v1.ReadOptions.Builder,
             com.google.datastore.v1.ReadOptionsOrBuilder>
         readOptionsBuilder_;
+
     /**
      *
      *
@@ -1624,6 +1669,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
     public boolean hasReadOptions() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1644,6 +1690,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() {
         return readOptionsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1666,6 +1713,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1685,6 +1733,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1712,6 +1761,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1731,6 +1781,7 @@ public Builder clearReadOptions() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1745,6 +1796,7 @@ public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1763,6 +1815,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
             : readOptions_;
       }
     }
+
     /**
      *
      *
@@ -1794,6 +1847,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
             com.google.datastore.v1.Query.Builder,
             com.google.datastore.v1.QueryOrBuilder>
         queryBuilder_;
+
     /**
      *
      *
@@ -1809,6 +1863,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
     public boolean hasQuery() {
       return queryTypeCase_ == 3;
     }
+
     /**
      *
      *
@@ -1834,6 +1889,7 @@ public com.google.datastore.v1.Query getQuery() {
         return com.google.datastore.v1.Query.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1856,6 +1912,7 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
       queryTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1875,6 +1932,7 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
       queryTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1906,6 +1964,7 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       queryTypeCase_ = 3;
       return this;
     }
+
     /**
      *
      *
@@ -1931,6 +1990,7 @@ public Builder clearQuery() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1943,6 +2003,7 @@ public Builder clearQuery() {
     public com.google.datastore.v1.Query.Builder getQueryBuilder() {
       return getQueryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1963,6 +2024,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
         return com.google.datastore.v1.Query.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1999,6 +2061,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
             com.google.datastore.v1.GqlQuery.Builder,
             com.google.datastore.v1.GqlQueryOrBuilder>
         gqlQueryBuilder_;
+
     /**
      *
      *
@@ -2014,6 +2077,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
     public boolean hasGqlQuery() {
       return queryTypeCase_ == 7;
     }
+
     /**
      *
      *
@@ -2039,6 +2103,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
         return com.google.datastore.v1.GqlQuery.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2061,6 +2126,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) {
       queryTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2080,6 +2146,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa
       queryTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2112,6 +2179,7 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
       queryTypeCase_ = 7;
       return this;
     }
+
     /**
      *
      *
@@ -2137,6 +2205,7 @@ public Builder clearGqlQuery() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2149,6 +2218,7 @@ public Builder clearGqlQuery() {
     public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
       return getGqlQueryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2169,6 +2239,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
         return com.google.datastore.v1.GqlQuery.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2206,6 +2277,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
             com.google.datastore.v1.PropertyMask.Builder,
             com.google.datastore.v1.PropertyMaskOrBuilder>
         propertyMaskBuilder_;
+
     /**
      *
      *
@@ -2224,6 +2296,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     public boolean hasPropertyMask() {
       return ((bitField0_ & 0x00000040) != 0);
     }
+
     /**
      *
      *
@@ -2248,6 +2321,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() {
         return propertyMaskBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2274,6 +2348,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2297,6 +2372,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2328,6 +2404,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2351,6 +2428,7 @@ public Builder clearPropertyMask() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2369,6 +2447,7 @@ public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() {
       onChanged();
       return getPropertyMaskFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2391,6 +2470,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
             : propertyMask_;
       }
     }
+
     /**
      *
      *
@@ -2427,6 +2507,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
             com.google.datastore.v1.ExplainOptions.Builder,
             com.google.datastore.v1.ExplainOptionsOrBuilder>
         explainOptionsBuilder_;
+
     /**
      *
      *
@@ -2444,6 +2525,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder()
     public boolean hasExplainOptions() {
       return ((bitField0_ & 0x00000080) != 0);
     }
+
     /**
      *
      *
@@ -2467,6 +2549,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() {
         return explainOptionsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -2492,6 +2575,7 @@ public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2515,6 +2599,7 @@ public Builder setExplainOptions(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2545,6 +2630,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -2567,6 +2653,7 @@ public Builder clearExplainOptions() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2584,6 +2671,7 @@ public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder()
       onChanged();
       return getExplainOptionsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2605,6 +2693,7 @@ public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilde
             : explainOptions_;
       }
     }
+
     /**
      *
      *
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 7135a9e04b6e..f7f29842a628 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
@@ -36,6 +36,7 @@ public interface RunQueryRequestOrBuilder
    * @return The projectId.
    */
   java.lang.String getProjectId();
+
   /**
    *
    *
@@ -64,6 +65,7 @@ public interface RunQueryRequestOrBuilder
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
+
   /**
    *
    *
@@ -95,6 +97,7 @@ public interface RunQueryRequestOrBuilder
    * @return Whether the partitionId field is set.
    */
   boolean hasPartitionId();
+
   /**
    *
    *
@@ -110,6 +113,7 @@ public interface RunQueryRequestOrBuilder
    * @return The partitionId.
    */
   com.google.datastore.v1.PartitionId getPartitionId();
+
   /**
    *
    *
@@ -136,6 +140,7 @@ public interface RunQueryRequestOrBuilder
    * @return Whether the readOptions field is set.
    */
   boolean hasReadOptions();
+
   /**
    *
    *
@@ -148,6 +153,7 @@ public interface RunQueryRequestOrBuilder
    * @return The readOptions.
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
+
   /**
    *
    *
@@ -171,6 +177,7 @@ public interface RunQueryRequestOrBuilder
    * @return Whether the query field is set.
    */
   boolean hasQuery();
+
   /**
    *
    *
@@ -183,6 +190,7 @@ public interface RunQueryRequestOrBuilder
    * @return The query.
    */
   com.google.datastore.v1.Query getQuery();
+
   /**
    *
    *
@@ -206,6 +214,7 @@ public interface RunQueryRequestOrBuilder
    * @return Whether the gqlQuery field is set.
    */
   boolean hasGqlQuery();
+
   /**
    *
    *
@@ -218,6 +227,7 @@ public interface RunQueryRequestOrBuilder
    * @return The gqlQuery.
    */
   com.google.datastore.v1.GqlQuery getGqlQuery();
+
   /**
    *
    *
@@ -245,6 +255,7 @@ public interface RunQueryRequestOrBuilder
    * @return Whether the propertyMask field is set.
    */
   boolean hasPropertyMask();
+
   /**
    *
    *
@@ -261,6 +272,7 @@ public interface RunQueryRequestOrBuilder
    * @return The propertyMask.
    */
   com.google.datastore.v1.PropertyMask getPropertyMask();
+
   /**
    *
    *
@@ -291,6 +303,7 @@ public interface RunQueryRequestOrBuilder
    * @return Whether the explainOptions field is set.
    */
   boolean hasExplainOptions();
+
   /**
    *
    *
@@ -306,6 +319,7 @@ public interface RunQueryRequestOrBuilder
    * @return The explainOptions.
    */
   com.google.datastore.v1.ExplainOptions getExplainOptions();
+
   /**
    *
    *
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 814bd4257d8e..224e9b21d8dc 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
@@ -34,6 +34,7 @@ public final class RunQueryResponse extends com.google.protobuf.GeneratedMessage
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryResponse)
     RunQueryResponseOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use RunQueryResponse.newBuilder() to construct.
   private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   private int bitField0_;
   public static final int BATCH_FIELD_NUMBER = 1;
   private com.google.datastore.v1.QueryResultBatch batch_;
+
   /**
    *
    *
@@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public boolean hasBatch() {
     return ((bitField0_ & 0x00000001) != 0);
   }
+
   /**
    *
    *
@@ -97,6 +100,7 @@ public boolean hasBatch() {
   public com.google.datastore.v1.QueryResultBatch getBatch() {
     return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
   }
+
   /**
    *
    *
@@ -113,6 +117,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
 
   public static final int QUERY_FIELD_NUMBER = 2;
   private com.google.datastore.v1.Query query_;
+
   /**
    *
    *
@@ -128,6 +133,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
   public boolean hasQuery() {
     return ((bitField0_ & 0x00000002) != 0);
   }
+
   /**
    *
    *
@@ -143,6 +149,7 @@ public boolean hasQuery() {
   public com.google.datastore.v1.Query getQuery() {
     return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
   }
+
   /**
    *
    *
@@ -159,6 +166,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
 
   public static final int TRANSACTION_FIELD_NUMBER = 5;
   private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
   /**
    *
    *
@@ -183,6 +191,7 @@ public com.google.protobuf.ByteString getTransaction() {
 
   public static final int EXPLAIN_METRICS_FIELD_NUMBER = 9;
   private com.google.datastore.v1.ExplainMetrics explainMetrics_;
+
   /**
    *
    *
@@ -200,6 +209,7 @@ public com.google.protobuf.ByteString getTransaction() {
   public boolean hasExplainMetrics() {
     return ((bitField0_ & 0x00000004) != 0);
   }
+
   /**
    *
    *
@@ -219,6 +229,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
         ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance()
         : explainMetrics_;
   }
+
   /**
    *
    *
@@ -437,6 +448,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -692,6 +704,7 @@ public Builder mergeFrom(
             com.google.datastore.v1.QueryResultBatch.Builder,
             com.google.datastore.v1.QueryResultBatchOrBuilder>
         batchBuilder_;
+
     /**
      *
      *
@@ -706,6 +719,7 @@ public Builder mergeFrom(
     public boolean hasBatch() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -726,6 +740,7 @@ public com.google.datastore.v1.QueryResultBatch getBatch() {
         return batchBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -748,6 +763,7 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -767,6 +783,7 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch.Builder builder
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -794,6 +811,7 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -813,6 +831,7 @@ public Builder clearBatch() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -827,6 +846,7 @@ public com.google.datastore.v1.QueryResultBatch.Builder getBatchBuilder() {
       onChanged();
       return getBatchFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -845,6 +865,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
             : batch_;
       }
     }
+
     /**
      *
      *
@@ -877,6 +898,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
             com.google.datastore.v1.Query.Builder,
             com.google.datastore.v1.QueryOrBuilder>
         queryBuilder_;
+
     /**
      *
      *
@@ -891,6 +913,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
     public boolean hasQuery() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      *
      *
@@ -909,6 +932,7 @@ public com.google.datastore.v1.Query getQuery() {
         return queryBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -931,6 +955,7 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -950,6 +975,7 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -977,6 +1003,7 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       }
       return this;
     }
+
     /**
      *
      *
@@ -996,6 +1023,7 @@ public Builder clearQuery() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1010,6 +1038,7 @@ public com.google.datastore.v1.Query.Builder getQueryBuilder() {
       onChanged();
       return getQueryFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1026,6 +1055,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
         return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
       }
     }
+
     /**
      *
      *
@@ -1053,6 +1083,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
     }
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -1074,6 +1105,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
+
     /**
      *
      *
@@ -1101,6 +1133,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1131,6 +1164,7 @@ public Builder clearTransaction() {
             com.google.datastore.v1.ExplainMetrics.Builder,
             com.google.datastore.v1.ExplainMetricsOrBuilder>
         explainMetricsBuilder_;
+
     /**
      *
      *
@@ -1147,6 +1181,7 @@ public Builder clearTransaction() {
     public boolean hasExplainMetrics() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      *
      *
@@ -1169,6 +1204,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() {
         return explainMetricsBuilder_.getMessage();
       }
     }
+
     /**
      *
      *
@@ -1193,6 +1229,7 @@ public Builder setExplainMetrics(com.google.datastore.v1.ExplainMetrics value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1215,6 +1252,7 @@ public Builder setExplainMetrics(
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1244,6 +1282,7 @@ public Builder mergeExplainMetrics(com.google.datastore.v1.ExplainMetrics value)
       }
       return this;
     }
+
     /**
      *
      *
@@ -1265,6 +1304,7 @@ public Builder clearExplainMetrics() {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1281,6 +1321,7 @@ public com.google.datastore.v1.ExplainMetrics.Builder getExplainMetricsBuilder()
       onChanged();
       return getExplainMetricsFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1301,6 +1342,7 @@ public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilde
             : explainMetrics_;
       }
     }
+
     /**
      *
      *
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 c4ad0528c8d3..a3316b6ef8af 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
@@ -36,6 +36,7 @@ public interface RunQueryResponseOrBuilder
    * @return Whether the batch field is set.
    */
   boolean hasBatch();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface RunQueryResponseOrBuilder
    * @return The batch.
    */
   com.google.datastore.v1.QueryResultBatch getBatch();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface RunQueryResponseOrBuilder
    * @return Whether the query field is set.
    */
   boolean hasQuery();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface RunQueryResponseOrBuilder
    * @return The query.
    */
   com.google.datastore.v1.Query getQuery();
+
   /**
    *
    *
@@ -127,6 +131,7 @@ public interface RunQueryResponseOrBuilder
    * @return Whether the explainMetrics field is set.
    */
   boolean hasExplainMetrics();
+
   /**
    *
    *
@@ -141,6 +146,7 @@ public interface RunQueryResponseOrBuilder
    * @return The explainMetrics.
    */
   com.google.datastore.v1.ExplainMetrics getExplainMetrics();
+
   /**
    *
    *
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 3da61336948f..256238e25221 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
@@ -39,6 +39,7 @@ public final class TransactionOptions extends com.google.protobuf.GeneratedMessa
     // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions)
     TransactionOptionsOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use TransactionOptions.newBuilder() to construct.
   private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -85,6 +86,7 @@ public interface ReadWriteOrBuilder
      */
     com.google.protobuf.ByteString getPreviousTransaction();
   }
+
   /**
    *
    *
@@ -99,6 +101,7 @@ public static final class ReadWrite extends com.google.protobuf.GeneratedMessage
       // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadWrite)
       ReadWriteOrBuilder {
     private static final long serialVersionUID = 0L;
+
     // Use ReadWrite.newBuilder() to construct.
     private ReadWrite(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
@@ -132,6 +135,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     public static final int PREVIOUS_TRANSACTION_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString previousTransaction_ =
         com.google.protobuf.ByteString.EMPTY;
+
     /**
      *
      *
@@ -309,6 +313,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -495,6 +500,7 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString previousTransaction_ =
           com.google.protobuf.ByteString.EMPTY;
+
       /**
        *
        *
@@ -510,6 +516,7 @@ public Builder mergeFrom(
       public com.google.protobuf.ByteString getPreviousTransaction() {
         return previousTransaction_;
       }
+
       /**
        *
        *
@@ -531,6 +538,7 @@ public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -634,6 +642,7 @@ public interface ReadOnlyOrBuilder
      * @return Whether the readTime field is set.
      */
     boolean hasReadTime();
+
     /**
      *
      *
@@ -650,6 +659,7 @@ public interface ReadOnlyOrBuilder
      * @return The readTime.
      */
     com.google.protobuf.Timestamp getReadTime();
+
     /**
      *
      *
@@ -665,6 +675,7 @@ public interface ReadOnlyOrBuilder
      */
     com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder();
   }
+
   /**
    *
    *
@@ -679,6 +690,7 @@ public static final class ReadOnly extends com.google.protobuf.GeneratedMessageV
       // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadOnly)
       ReadOnlyOrBuilder {
     private static final long serialVersionUID = 0L;
+
     // Use ReadOnly.newBuilder() to construct.
     private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
@@ -710,6 +722,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     private int bitField0_;
     public static final int READ_TIME_FIELD_NUMBER = 1;
     private com.google.protobuf.Timestamp readTime_;
+
     /**
      *
      *
@@ -729,6 +742,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     public boolean hasReadTime() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      *
      *
@@ -748,6 +762,7 @@ public boolean hasReadTime() {
     public com.google.protobuf.Timestamp getReadTime() {
       return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
     }
+
     /**
      *
      *
@@ -932,6 +947,7 @@ protected Builder newBuilderForType(
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -1138,6 +1154,7 @@ public Builder mergeFrom(
               com.google.protobuf.Timestamp.Builder,
               com.google.protobuf.TimestampOrBuilder>
           readTimeBuilder_;
+
       /**
        *
        *
@@ -1156,6 +1173,7 @@ public Builder mergeFrom(
       public boolean hasReadTime() {
         return ((bitField0_ & 0x00000001) != 0);
       }
+
       /**
        *
        *
@@ -1178,6 +1196,7 @@ public com.google.protobuf.Timestamp getReadTime() {
           return readTimeBuilder_.getMessage();
         }
       }
+
       /**
        *
        *
@@ -1204,6 +1223,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1227,6 +1247,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1258,6 +1279,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
         }
         return this;
       }
+
       /**
        *
        *
@@ -1281,6 +1303,7 @@ public Builder clearReadTime() {
         onChanged();
         return this;
       }
+
       /**
        *
        *
@@ -1299,6 +1322,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
         onChanged();
         return getReadTimeFieldBuilder().getBuilder();
       }
+
       /**
        *
        *
@@ -1319,6 +1343,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
           return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_;
         }
       }
+
       /**
        *
        *
@@ -1430,6 +1455,7 @@ public enum ModeCase
     private ModeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -1463,6 +1489,7 @@ public ModeCase getModeCase() {
   }
 
   public static final int READ_WRITE_FIELD_NUMBER = 1;
+
   /**
    *
    *
@@ -1478,6 +1505,7 @@ public ModeCase getModeCase() {
   public boolean hasReadWrite() {
     return modeCase_ == 1;
   }
+
   /**
    *
    *
@@ -1496,6 +1524,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
     }
     return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -1514,6 +1543,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
   }
 
   public static final int READ_ONLY_FIELD_NUMBER = 2;
+
   /**
    *
    *
@@ -1529,6 +1559,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
   public boolean hasReadOnly() {
     return modeCase_ == 2;
   }
+
   /**
    *
    *
@@ -1547,6 +1578,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
     }
     return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -1753,6 +1785,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1993,6 +2026,7 @@ public Builder clearMode() {
             com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
             com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>
         readWriteBuilder_;
+
     /**
      *
      *
@@ -2008,6 +2042,7 @@ public Builder clearMode() {
     public boolean hasReadWrite() {
       return modeCase_ == 1;
     }
+
     /**
      *
      *
@@ -2033,6 +2068,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
         return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2055,6 +2091,7 @@ public Builder setReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite
       modeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -2075,6 +2112,7 @@ public Builder setReadWrite(
       modeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -2107,6 +2145,7 @@ public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWri
       modeCase_ = 1;
       return this;
     }
+
     /**
      *
      *
@@ -2132,6 +2171,7 @@ public Builder clearReadWrite() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2144,6 +2184,7 @@ public Builder clearReadWrite() {
     public com.google.datastore.v1.TransactionOptions.ReadWrite.Builder getReadWriteBuilder() {
       return getReadWriteFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2164,6 +2205,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
         return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2202,6 +2244,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
             com.google.datastore.v1.TransactionOptions.ReadOnly.Builder,
             com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>
         readOnlyBuilder_;
+
     /**
      *
      *
@@ -2217,6 +2260,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
     public boolean hasReadOnly() {
       return modeCase_ == 2;
     }
+
     /**
      *
      *
@@ -2242,6 +2286,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
         return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2264,6 +2309,7 @@ public Builder setReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly v
       modeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -2284,6 +2330,7 @@ public Builder setReadOnly(
       modeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -2316,6 +2363,7 @@ public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly
       modeCase_ = 2;
       return this;
     }
+
     /**
      *
      *
@@ -2341,6 +2389,7 @@ public Builder clearReadOnly() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2353,6 +2402,7 @@ public Builder clearReadOnly() {
     public com.google.datastore.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBuilder() {
       return getReadOnlyFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2373,6 +2423,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
         return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
     }
+
     /**
      *
      *
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 6d256b6150fe..2fbfe302b9b1 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
@@ -36,6 +36,7 @@ public interface TransactionOptionsOrBuilder
    * @return Whether the readWrite field is set.
    */
   boolean hasReadWrite();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface TransactionOptionsOrBuilder
    * @return The readWrite.
    */
   com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite();
+
   /**
    *
    *
@@ -71,6 +73,7 @@ public interface TransactionOptionsOrBuilder
    * @return Whether the readOnly field is set.
    */
   boolean hasReadOnly();
+
   /**
    *
    *
@@ -83,6 +86,7 @@ public interface TransactionOptionsOrBuilder
    * @return The readOnly.
    */
   com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly();
+
   /**
    *
    *
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 14ce0060716e..b917baaa3de2 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
@@ -34,6 +34,7 @@ public final class Value extends com.google.protobuf.GeneratedMessageV3
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Value)
     ValueOrBuilder {
   private static final long serialVersionUID = 0L;
+
   // Use Value.newBuilder() to construct.
   private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
@@ -86,6 +87,7 @@ public enum ValueTypeCase
     private ValueTypeCase(int value) {
       this.value = value;
     }
+
     /**
      * @param value The number of the enum to look for.
      * @return The enum associated with the given number.
@@ -137,6 +139,7 @@ public ValueTypeCase getValueTypeCase() {
   }
 
   public static final int NULL_VALUE_FIELD_NUMBER = 11;
+
   /**
    *
    *
@@ -151,6 +154,7 @@ public ValueTypeCase getValueTypeCase() {
   public boolean hasNullValue() {
     return valueTypeCase_ == 11;
   }
+
   /**
    *
    *
@@ -168,6 +172,7 @@ public int getNullValueValue() {
     }
     return 0;
   }
+
   /**
    *
    *
@@ -189,6 +194,7 @@ public com.google.protobuf.NullValue getNullValue() {
   }
 
   public static final int BOOLEAN_VALUE_FIELD_NUMBER = 1;
+
   /**
    *
    *
@@ -204,6 +210,7 @@ public com.google.protobuf.NullValue getNullValue() {
   public boolean hasBooleanValue() {
     return valueTypeCase_ == 1;
   }
+
   /**
    *
    *
@@ -224,6 +231,7 @@ public boolean getBooleanValue() {
   }
 
   public static final int INTEGER_VALUE_FIELD_NUMBER = 2;
+
   /**
    *
    *
@@ -239,6 +247,7 @@ public boolean getBooleanValue() {
   public boolean hasIntegerValue() {
     return valueTypeCase_ == 2;
   }
+
   /**
    *
    *
@@ -259,6 +268,7 @@ public long getIntegerValue() {
   }
 
   public static final int DOUBLE_VALUE_FIELD_NUMBER = 3;
+
   /**
    *
    *
@@ -274,6 +284,7 @@ public long getIntegerValue() {
   public boolean hasDoubleValue() {
     return valueTypeCase_ == 3;
   }
+
   /**
    *
    *
@@ -294,6 +305,7 @@ public double getDoubleValue() {
   }
 
   public static final int TIMESTAMP_VALUE_FIELD_NUMBER = 10;
+
   /**
    *
    *
@@ -311,6 +323,7 @@ public double getDoubleValue() {
   public boolean hasTimestampValue() {
     return valueTypeCase_ == 10;
   }
+
   /**
    *
    *
@@ -331,6 +344,7 @@ public com.google.protobuf.Timestamp getTimestampValue() {
     }
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -351,6 +365,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
   }
 
   public static final int KEY_VALUE_FIELD_NUMBER = 5;
+
   /**
    *
    *
@@ -366,6 +381,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
   public boolean hasKeyValue() {
     return valueTypeCase_ == 5;
   }
+
   /**
    *
    *
@@ -384,6 +400,7 @@ public com.google.datastore.v1.Key getKeyValue() {
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -402,6 +419,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
   }
 
   public static final int STRING_VALUE_FIELD_NUMBER = 17;
+
   /**
    *
    *
@@ -418,6 +436,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
   public boolean hasStringValue() {
     return valueTypeCase_ == 17;
   }
+
   /**
    *
    *
@@ -447,6 +466,7 @@ public java.lang.String getStringValue() {
       return s;
     }
   }
+
   /**
    *
    *
@@ -478,6 +498,7 @@ public com.google.protobuf.ByteString getStringValueBytes() {
   }
 
   public static final int BLOB_VALUE_FIELD_NUMBER = 18;
+
   /**
    *
    *
@@ -496,6 +517,7 @@ public com.google.protobuf.ByteString getStringValueBytes() {
   public boolean hasBlobValue() {
     return valueTypeCase_ == 18;
   }
+
   /**
    *
    *
@@ -519,6 +541,7 @@ public com.google.protobuf.ByteString getBlobValue() {
   }
 
   public static final int GEO_POINT_VALUE_FIELD_NUMBER = 8;
+
   /**
    *
    *
@@ -534,6 +557,7 @@ public com.google.protobuf.ByteString getBlobValue() {
   public boolean hasGeoPointValue() {
     return valueTypeCase_ == 8;
   }
+
   /**
    *
    *
@@ -552,6 +576,7 @@ public com.google.type.LatLng getGeoPointValue() {
     }
     return com.google.type.LatLng.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -570,6 +595,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
   }
 
   public static final int ENTITY_VALUE_FIELD_NUMBER = 6;
+
   /**
    *
    *
@@ -589,6 +615,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
   public boolean hasEntityValue() {
     return valueTypeCase_ == 6;
   }
+
   /**
    *
    *
@@ -611,6 +638,7 @@ public com.google.datastore.v1.Entity getEntityValue() {
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -633,6 +661,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
   }
 
   public static final int ARRAY_VALUE_FIELD_NUMBER = 9;
+
   /**
    *
    *
@@ -651,6 +680,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
   public boolean hasArrayValue() {
     return valueTypeCase_ == 9;
   }
+
   /**
    *
    *
@@ -672,6 +702,7 @@ public com.google.datastore.v1.ArrayValue getArrayValue() {
     }
     return com.google.datastore.v1.ArrayValue.getDefaultInstance();
   }
+
   /**
    *
    *
@@ -694,6 +725,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
 
   public static final int MEANING_FIELD_NUMBER = 14;
   private int meaning_ = 0;
+
   /**
    *
    *
@@ -712,6 +744,7 @@ public int getMeaning() {
 
   public static final int EXCLUDE_FROM_INDEXES_FIELD_NUMBER = 19;
   private boolean excludeFromIndexes_ = false;
+
   /**
    *
    *
@@ -1071,6 +1104,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
     Builder builder = new Builder(parent);
     return builder;
   }
+
   /**
    *
    *
@@ -1461,6 +1495,7 @@ public Builder clearValueType() {
     public boolean hasNullValue() {
       return valueTypeCase_ == 11;
     }
+
     /**
      *
      *
@@ -1479,6 +1514,7 @@ public int getNullValueValue() {
       }
       return 0;
     }
+
     /**
      *
      *
@@ -1497,6 +1533,7 @@ public Builder setNullValueValue(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1517,6 +1554,7 @@ public com.google.protobuf.NullValue getNullValue() {
       }
       return com.google.protobuf.NullValue.NULL_VALUE;
     }
+
     /**
      *
      *
@@ -1538,6 +1576,7 @@ public Builder setNullValue(com.google.protobuf.NullValue value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1572,6 +1611,7 @@ public Builder clearNullValue() {
     public boolean hasBooleanValue() {
       return valueTypeCase_ == 1;
     }
+
     /**
      *
      *
@@ -1589,6 +1629,7 @@ public boolean getBooleanValue() {
       }
       return false;
     }
+
     /**
      *
      *
@@ -1608,6 +1649,7 @@ public Builder setBooleanValue(boolean value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1642,6 +1684,7 @@ public Builder clearBooleanValue() {
     public boolean hasIntegerValue() {
       return valueTypeCase_ == 2;
     }
+
     /**
      *
      *
@@ -1659,6 +1702,7 @@ public long getIntegerValue() {
       }
       return 0L;
     }
+
     /**
      *
      *
@@ -1678,6 +1722,7 @@ public Builder setIntegerValue(long value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1712,6 +1757,7 @@ public Builder clearIntegerValue() {
     public boolean hasDoubleValue() {
       return valueTypeCase_ == 3;
     }
+
     /**
      *
      *
@@ -1729,6 +1775,7 @@ public double getDoubleValue() {
       }
       return 0D;
     }
+
     /**
      *
      *
@@ -1748,6 +1795,7 @@ public Builder setDoubleValue(double value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -1773,6 +1821,7 @@ public Builder clearDoubleValue() {
             com.google.protobuf.Timestamp.Builder,
             com.google.protobuf.TimestampOrBuilder>
         timestampValueBuilder_;
+
     /**
      *
      *
@@ -1790,6 +1839,7 @@ public Builder clearDoubleValue() {
     public boolean hasTimestampValue() {
       return valueTypeCase_ == 10;
     }
+
     /**
      *
      *
@@ -1817,6 +1867,7 @@ public com.google.protobuf.Timestamp getTimestampValue() {
         return com.google.protobuf.Timestamp.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1841,6 +1892,7 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp value) {
       valueTypeCase_ = 10;
       return this;
     }
+
     /**
      *
      *
@@ -1862,6 +1914,7 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp.Builder builderFo
       valueTypeCase_ = 10;
       return this;
     }
+
     /**
      *
      *
@@ -1895,6 +1948,7 @@ public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) {
       valueTypeCase_ = 10;
       return this;
     }
+
     /**
      *
      *
@@ -1922,6 +1976,7 @@ public Builder clearTimestampValue() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -1936,6 +1991,7 @@ public Builder clearTimestampValue() {
     public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() {
       return getTimestampValueFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -1958,6 +2014,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
         return com.google.protobuf.Timestamp.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -1996,6 +2053,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
             com.google.datastore.v1.Key.Builder,
             com.google.datastore.v1.KeyOrBuilder>
         keyValueBuilder_;
+
     /**
      *
      *
@@ -2011,6 +2069,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
     public boolean hasKeyValue() {
       return valueTypeCase_ == 5;
     }
+
     /**
      *
      *
@@ -2036,6 +2095,7 @@ public com.google.datastore.v1.Key getKeyValue() {
         return com.google.datastore.v1.Key.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2058,6 +2118,7 @@ public Builder setKeyValue(com.google.datastore.v1.Key value) {
       valueTypeCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -2077,6 +2138,7 @@ public Builder setKeyValue(com.google.datastore.v1.Key.Builder builderForValue)
       valueTypeCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -2107,6 +2169,7 @@ public Builder mergeKeyValue(com.google.datastore.v1.Key value) {
       valueTypeCase_ = 5;
       return this;
     }
+
     /**
      *
      *
@@ -2132,6 +2195,7 @@ public Builder clearKeyValue() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2144,6 +2208,7 @@ public Builder clearKeyValue() {
     public com.google.datastore.v1.Key.Builder getKeyValueBuilder() {
       return getKeyValueFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2164,6 +2229,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
         return com.google.datastore.v1.Key.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2212,6 +2278,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
     public boolean hasStringValue() {
       return valueTypeCase_ == 17;
     }
+
     /**
      *
      *
@@ -2242,6 +2309,7 @@ public java.lang.String getStringValue() {
         return (java.lang.String) ref;
       }
     }
+
     /**
      *
      *
@@ -2272,6 +2340,7 @@ public com.google.protobuf.ByteString getStringValueBytes() {
         return (com.google.protobuf.ByteString) ref;
       }
     }
+
     /**
      *
      *
@@ -2295,6 +2364,7 @@ public Builder setStringValue(java.lang.String value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2316,6 +2386,7 @@ public Builder clearStringValue() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2358,6 +2429,7 @@ public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
     public boolean hasBlobValue() {
       return valueTypeCase_ == 18;
     }
+
     /**
      *
      *
@@ -2378,6 +2450,7 @@ public com.google.protobuf.ByteString getBlobValue() {
       }
       return com.google.protobuf.ByteString.EMPTY;
     }
+
     /**
      *
      *
@@ -2402,6 +2475,7 @@ public Builder setBlobValue(com.google.protobuf.ByteString value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -2428,6 +2502,7 @@ public Builder clearBlobValue() {
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>
         geoPointValueBuilder_;
+
     /**
      *
      *
@@ -2443,6 +2518,7 @@ public Builder clearBlobValue() {
     public boolean hasGeoPointValue() {
       return valueTypeCase_ == 8;
     }
+
     /**
      *
      *
@@ -2468,6 +2544,7 @@ public com.google.type.LatLng getGeoPointValue() {
         return com.google.type.LatLng.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2490,6 +2567,7 @@ public Builder setGeoPointValue(com.google.type.LatLng value) {
       valueTypeCase_ = 8;
       return this;
     }
+
     /**
      *
      *
@@ -2509,6 +2587,7 @@ public Builder setGeoPointValue(com.google.type.LatLng.Builder builderForValue)
       valueTypeCase_ = 8;
       return this;
     }
+
     /**
      *
      *
@@ -2539,6 +2618,7 @@ public Builder mergeGeoPointValue(com.google.type.LatLng value) {
       valueTypeCase_ = 8;
       return this;
     }
+
     /**
      *
      *
@@ -2564,6 +2644,7 @@ public Builder clearGeoPointValue() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2576,6 +2657,7 @@ public Builder clearGeoPointValue() {
     public com.google.type.LatLng.Builder getGeoPointValueBuilder() {
       return getGeoPointValueFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2596,6 +2678,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
         return com.google.type.LatLng.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2630,6 +2713,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
             com.google.datastore.v1.Entity.Builder,
             com.google.datastore.v1.EntityOrBuilder>
         entityValueBuilder_;
+
     /**
      *
      *
@@ -2649,6 +2733,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
     public boolean hasEntityValue() {
       return valueTypeCase_ == 6;
     }
+
     /**
      *
      *
@@ -2678,6 +2763,7 @@ public com.google.datastore.v1.Entity getEntityValue() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2704,6 +2790,7 @@ public Builder setEntityValue(com.google.datastore.v1.Entity value) {
       valueTypeCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2727,6 +2814,7 @@ public Builder setEntityValue(com.google.datastore.v1.Entity.Builder builderForV
       valueTypeCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2762,6 +2850,7 @@ public Builder mergeEntityValue(com.google.datastore.v1.Entity value) {
       valueTypeCase_ = 6;
       return this;
     }
+
     /**
      *
      *
@@ -2791,6 +2880,7 @@ public Builder clearEntityValue() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -2807,6 +2897,7 @@ public Builder clearEntityValue() {
     public com.google.datastore.v1.Entity.Builder getEntityValueBuilder() {
       return getEntityValueFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -2831,6 +2922,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
         return com.google.datastore.v1.Entity.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2871,6 +2963,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
             com.google.datastore.v1.ArrayValue.Builder,
             com.google.datastore.v1.ArrayValueOrBuilder>
         arrayValueBuilder_;
+
     /**
      *
      *
@@ -2889,6 +2982,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
     public boolean hasArrayValue() {
       return valueTypeCase_ == 9;
     }
+
     /**
      *
      *
@@ -2917,6 +3011,7 @@ public com.google.datastore.v1.ArrayValue getArrayValue() {
         return com.google.datastore.v1.ArrayValue.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -2942,6 +3037,7 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue value) {
       valueTypeCase_ = 9;
       return this;
     }
+
     /**
      *
      *
@@ -2964,6 +3060,7 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue.Builder builderF
       valueTypeCase_ = 9;
       return this;
     }
+
     /**
      *
      *
@@ -2999,6 +3096,7 @@ public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) {
       valueTypeCase_ = 9;
       return this;
     }
+
     /**
      *
      *
@@ -3027,6 +3125,7 @@ public Builder clearArrayValue() {
       }
       return this;
     }
+
     /**
      *
      *
@@ -3042,6 +3141,7 @@ public Builder clearArrayValue() {
     public com.google.datastore.v1.ArrayValue.Builder getArrayValueBuilder() {
       return getArrayValueFieldBuilder().getBuilder();
     }
+
     /**
      *
      *
@@ -3065,6 +3165,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
         return com.google.datastore.v1.ArrayValue.getDefaultInstance();
       }
     }
+
     /**
      *
      *
@@ -3100,6 +3201,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
     }
 
     private int meaning_;
+
     /**
      *
      *
@@ -3115,6 +3217,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
     public int getMeaning() {
       return meaning_;
     }
+
     /**
      *
      *
@@ -3134,6 +3237,7 @@ public Builder setMeaning(int value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
@@ -3153,6 +3257,7 @@ public Builder clearMeaning() {
     }
 
     private boolean excludeFromIndexes_;
+
     /**
      *
      *
@@ -3169,6 +3274,7 @@ public Builder clearMeaning() {
     public boolean getExcludeFromIndexes() {
       return excludeFromIndexes_;
     }
+
     /**
      *
      *
@@ -3189,6 +3295,7 @@ public Builder setExcludeFromIndexes(boolean value) {
       onChanged();
       return this;
     }
+
     /**
      *
      *
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 96773b933cea..a133a19b6a0d 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
@@ -36,6 +36,7 @@ public interface ValueOrBuilder
    * @return Whether the nullValue field is set.
    */
   boolean hasNullValue();
+
   /**
    *
    *
@@ -48,6 +49,7 @@ public interface ValueOrBuilder
    * @return The enum numeric value on the wire for nullValue.
    */
   int getNullValueValue();
+
   /**
    *
    *
@@ -73,6 +75,7 @@ public interface ValueOrBuilder
    * @return Whether the booleanValue field is set.
    */
   boolean hasBooleanValue();
+
   /**
    *
    *
@@ -98,6 +101,7 @@ public interface ValueOrBuilder
    * @return Whether the integerValue field is set.
    */
   boolean hasIntegerValue();
+
   /**
    *
    *
@@ -123,6 +127,7 @@ public interface ValueOrBuilder
    * @return Whether the doubleValue field is set.
    */
   boolean hasDoubleValue();
+
   /**
    *
    *
@@ -150,6 +155,7 @@ public interface ValueOrBuilder
    * @return Whether the timestampValue field is set.
    */
   boolean hasTimestampValue();
+
   /**
    *
    *
@@ -164,6 +170,7 @@ public interface ValueOrBuilder
    * @return The timestampValue.
    */
   com.google.protobuf.Timestamp getTimestampValue();
+
   /**
    *
    *
@@ -189,6 +196,7 @@ public interface ValueOrBuilder
    * @return Whether the keyValue field is set.
    */
   boolean hasKeyValue();
+
   /**
    *
    *
@@ -201,6 +209,7 @@ public interface ValueOrBuilder
    * @return The keyValue.
    */
   com.google.datastore.v1.Key getKeyValue();
+
   /**
    *
    *
@@ -226,6 +235,7 @@ public interface ValueOrBuilder
    * @return Whether the stringValue field is set.
    */
   boolean hasStringValue();
+
   /**
    *
    *
@@ -240,6 +250,7 @@ public interface ValueOrBuilder
    * @return The stringValue.
    */
   java.lang.String getStringValue();
+
   /**
    *
    *
@@ -270,6 +281,7 @@ public interface ValueOrBuilder
    * @return Whether the blobValue field is set.
    */
   boolean hasBlobValue();
+
   /**
    *
    *
@@ -298,6 +310,7 @@ public interface ValueOrBuilder
    * @return Whether the geoPointValue field is set.
    */
   boolean hasGeoPointValue();
+
   /**
    *
    *
@@ -310,6 +323,7 @@ public interface ValueOrBuilder
    * @return The geoPointValue.
    */
   com.google.type.LatLng getGeoPointValue();
+
   /**
    *
    *
@@ -337,6 +351,7 @@ public interface ValueOrBuilder
    * @return Whether the entityValue field is set.
    */
   boolean hasEntityValue();
+
   /**
    *
    *
@@ -353,6 +368,7 @@ public interface ValueOrBuilder
    * @return The entityValue.
    */
   com.google.datastore.v1.Entity getEntityValue();
+
   /**
    *
    *
@@ -383,6 +399,7 @@ public interface ValueOrBuilder
    * @return Whether the arrayValue field is set.
    */
   boolean hasArrayValue();
+
   /**
    *
    *
@@ -398,6 +415,7 @@ public interface ValueOrBuilder
    * @return The arrayValue.
    */
   com.google.datastore.v1.ArrayValue getArrayValue();
+
   /**
    *
    *
diff --git a/renovate.json b/renovate.json
index 5862088529e6..42538270e04c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -63,7 +63,6 @@
         "^org.jacoco:",
         "^org.codehaus.mojo:",
         "^org.sonatype.plugins:",
-        "^com.coveo:",
         "^com.google.cloud:google-cloud-shared-config"
       ],
       "semanticCommitType": "build",
diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
index 135beddeddb0..7fbc5f8b9b1f 100644
--- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
+++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
@@ -42,6 +42,7 @@ public class TaskList {
 
   // Create a Key factory to construct keys associated with this project.
   private final KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task");
+
   // [END datastore_build_service]
 
   // [START datastore_add_entity]
@@ -65,6 +66,7 @@ Key addTask(String description) {
     datastore.put(task);
     return key;
   }
+
   // [END datastore_add_entity]
 
   // [START datastore_update_entity]
@@ -90,6 +92,7 @@ boolean markDone(long id) {
       }
     }
   }
+
   // [END datastore_update_entity]
 
   // [START datastore_retrieve_entities]
@@ -103,6 +106,7 @@ Iterator listTasks() {
         Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build();
     return datastore.run(query);
   }
+
   // [END datastore_retrieve_entities]
 
   // [START datastore_delete_entity]
@@ -115,6 +119,7 @@ Iterator listTasks() {
   void deleteTask(long id) {
     datastore.delete(keyFactory.newKey(id));
   }
+
   // [END datastore_delete_entity]
 
   /**
diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 33aa63ab4ec3..13701eb2d192 100644
--- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -844,6 +844,7 @@ void transferFunds(Key fromKey, Key toKey, long amount) {
       }
     }
   }
+
   // [END datastore_transactional_update]
 
   @Test

From 4d2026c330009becc201a95c42af365cc83b8ea5 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 25 Apr 2025 18:15:34 +0100
Subject: [PATCH 1605/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.46.2 (#1823)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 1ecabfe2736f..2bb8e4187841 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.2
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f02b30d9e249..54bb69d4a01a 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.45.1
+    3.46.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 9fedd55b460a..241792087a4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.45.1
+    3.46.2
   
 
   

From e1a8983859cdd6f13c8a0ce9ef1348158f074406 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 25 Apr 2025 17:43:28 -0400
Subject: [PATCH 1606/1784] chore(main): release 2.27.2 (#1827)

* chore(main): release 2.27.2

* chore: generate libraries at Fri Apr 25 17:16:31 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 11 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 788ff76c40ba..f6fc874f12bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.27.2](https://github.com/googleapis/java-datastore/compare/v2.27.1...v2.27.2) (2025-04-25)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.56.2 ([1210f32](https://github.com/googleapis/java-datastore/commit/1210f32662e7aafd2e170643bedbb851f40f3646))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 ([#1823](https://github.com/googleapis/java-datastore/issues/1823)) ([4d2026c](https://github.com/googleapis/java-datastore/commit/4d2026c330009becc201a95c42af365cc83b8ea5))
+
 ## [2.27.1](https://github.com/googleapis/java-datastore/compare/v2.27.0...v2.27.1) (2025-03-18)
 
 
diff --git a/README.md b/README.md
index 8027f49c137a..53bbd7cc7b7a 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.27.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.27.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.2"
 ```
 
 ## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4178bfa2562c..3ab169eff39f 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.27.2-SNAPSHOT
+  2.27.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2-SNAPSHOT
+    2.27.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 54bb69d4a01a..c7327ea50b06 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.27.2-SNAPSHOT
+  2.27.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.27.2-SNAPSHOT
+        2.27.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.2-SNAPSHOT
+        2.27.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.2-SNAPSHOT
+        0.118.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.27.2-SNAPSHOT
+        2.27.2
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index fb581a186ef7..2b8fe269a249 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.27.2-SNAPSHOT
+  2.27.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2-SNAPSHOT
+    2.27.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index a0cf3a469533..029888ca2fb1 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.27.2-SNAPSHOT
+  2.27.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2-SNAPSHOT
+    2.27.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 241792087a4f..47aa1a063347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.27.2-SNAPSHOT
+  2.27.2
   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.27.2-SNAPSHOT
+        2.27.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.2-SNAPSHOT
+        2.27.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.27.2-SNAPSHOT
+        2.27.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.2-SNAPSHOT
+        0.118.2
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.27.2-SNAPSHOT
+        2.27.2
         
           
             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 a8f1bb4647e8..7b69a95a29f3 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.27.2-SNAPSHOT
+  2.27.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2-SNAPSHOT
+    2.27.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1cc404ce65a6..2c5a8e3b8c4d 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.118.2-SNAPSHOT
+  0.118.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2-SNAPSHOT
+    2.27.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4273064f8cca..e9ff8fa53740 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.27.2-SNAPSHOT
+      2.27.2
     
     
 
diff --git a/versions.txt b/versions.txt
index f3fa9247965c..59e0c205eb2d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.27.1:2.27.2-SNAPSHOT
-google-cloud-datastore-bom:2.27.1:2.27.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.118.1:0.118.2-SNAPSHOT
-datastore-v1-proto-client:2.27.1:2.27.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT
+google-cloud-datastore:2.27.2:2.27.2
+google-cloud-datastore-bom:2.27.2:2.27.2
+proto-google-cloud-datastore-v1:0.118.2:0.118.2
+datastore-v1-proto-client:2.27.2:2.27.2
+proto-google-cloud-datastore-admin-v1:2.27.2:2.27.2
+grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.2

From 2b22096ae8f87ae7d308e5f8d16c43b56675193c Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 28 Apr 2025 12:37:53 -0400
Subject: [PATCH 1607/1784] chore: Update generation configuration at Sun Apr
 27 02:30:03 UTC 2025 (#1829)

* chore: Update generation configuration at Sat Apr 26 02:27:15 UTC 2025

* chore: Update generation configuration at Sun Apr 27 02:30:03 UTC 2025
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 5e7d6072a86c..ca5a13acf68b 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.56.2
-googleapis_commitish: 2e5f8ba097342c6ef4efeba5c07677b3d35571d4
+googleapis_commitish: 2eec62dc7ed836c8d9f73fb313afb8f48c361bef
 libraries_bom_version: 26.59.0
 libraries:
   - api_shortname: datastore

From 126cf093dd331e8c822284bce4bc3e9b1a53e08c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 28 Apr 2025 21:40:56 +0200
Subject: [PATCH 1608/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.27.1 (#1820)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 8f6d763feeb8..22cd4507bb9d 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.27.0
+      2.27.1
     
     
 

From c5a5593f21f33fe68f64a5210740f782bce60b3e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 28 Apr 2025 22:26:49 +0200
Subject: [PATCH 1609/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.27.2 (#1830)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.27.1` -> `2.27.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.27.1/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.27.1/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.27.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2272-2025-04-25)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.27.1...v2.27.2)

##### Bug Fixes

-   **deps:** Update the Java code generator (gapic-generator-java) to 2.56.2 ([1210f32](https://redirect.github.com/googleapis/java-datastore/commit/1210f32662e7aafd2e170643bedbb851f40f3646))

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 ([#​1823](https://redirect.github.com/googleapis/java-datastore/issues/1823)) ([4d2026c](https://redirect.github.com/googleapis/java-datastore/commit/4d2026c330009becc201a95c42af365cc83b8ea5))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 22cd4507bb9d..ca5f706896fe 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.27.1
+      2.27.2
     
     
 

From c71b786ac548aa6afcf9bd9d642a5842e09fbbad Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 29 Apr 2025 00:02:31 +0000
Subject: [PATCH 1610/1784] chore(main): release 2.27.3-SNAPSHOT (#1828)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 README.md                                     |  2 +-
 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 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 12 ++++++------
 10 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 53bbd7cc7b7a..d94fcb890f5b 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.27.0
+  2.27.2
 
 
 ```
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3ab169eff39f..8bac6a329d60 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.27.2
+  2.27.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2
+    2.27.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c7327ea50b06..76840bb8b8be 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.27.2
+  2.27.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.27.2
+        2.27.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.2
+        2.27.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.2
+        0.118.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.27.2
+        2.27.3-SNAPSHOT
       
         
   
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2b8fe269a249..397d98c1dca5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.27.2
+  2.27.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2
+    2.27.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 029888ca2fb1..907c878d2707 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.27.2
+  2.27.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2
+    2.27.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 47aa1a063347..8a73f450214a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.27.2
+  2.27.3-SNAPSHOT
   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.27.2
+        2.27.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.2
+        2.27.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.27.2
+        2.27.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.2
+        0.118.3-SNAPSHOT
       
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.27.2
+        2.27.3-SNAPSHOT
         
           
             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 7b69a95a29f3..6684f2fdd276 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.27.2
+  2.27.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2
+    2.27.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2c5a8e3b8c4d..290e29408db1 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.118.2
+  0.118.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.2
+    2.27.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e9ff8fa53740..d6ec5f36d77b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.27.2
+      2.27.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 59e0c205eb2d..c965ffe8b800 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.27.2:2.27.2
-google-cloud-datastore-bom:2.27.2:2.27.2
-proto-google-cloud-datastore-v1:0.118.2:0.118.2
-datastore-v1-proto-client:2.27.2:2.27.2
-proto-google-cloud-datastore-admin-v1:2.27.2:2.27.2
-grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.2
+google-cloud-datastore:2.27.2:2.27.3-SNAPSHOT
+google-cloud-datastore-bom:2.27.2:2.27.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.118.2:0.118.3-SNAPSHOT
+datastore-v1-proto-client:2.27.2:2.27.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT

From a296d43724c57aba6a69ebed249261e3d367d625 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Tue, 29 Apr 2025 12:54:26 -0700
Subject: [PATCH 1611/1784] feat: Java datastore gapic upgrade (#1824)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: enable experimental grpc support (#1419)

* chore: Importing auto-generated code from googleapis-gen (#1235)

* Script to setup generated code from googleapis-gen

* fixing script and gitignore

* adding generated code

* add maven config for new grpc module

* fixing script

* owlbot config to fetch grpc and gapic modules for V1

* fix lint

* Revert "add maven config for new grpc module"

This reverts commit 7769d8083a84f3ae9255c51c3ecb01fbfdd49320.

* Reapply "add maven config for new grpc module"

This reverts commit 759475d121afa772f66f549958e8b092cf3c5f0a.

* remove unused dependency

* fix library version

* fix library version

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* removing exclusion of grpc-google-cloud-datastore-v1 module from repo metadata

* 🦉 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 

* refactor: Swap usage of HttpDatastoreRpc with GrpcDatastoreRpc (#1240)

* Create basic structure of GrpcDatastoreRpc and using it in DatastoreOptions

* applying unary settings to all the unary methods

* Configuring header provider for GrpcDatastoreRpc

* fixing emulator tests to be able to run successfully with grpc now

* ignoring one more test which will be fixed in actionable error implementation

* Making HttpDatastoreRpc completely unused

* Making GrpcDatastoreRpc implement AutoCloseable

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* incorporating feedbacks

* pinging emulator after each test for debugging

* Revert "pinging emulator after each test for debugging"

This reverts commit 60ee45d27412aab8140fc7065010633cf59a0ae8.

* Reapply "pinging emulator after each test for debugging"

This reverts commit d42e3b995fe56ded8c5f080a262e8ea02c00c9d9.

* more debugging

* Constant ping to avoid flaky behaviour of /shutdown endpoint

* fixing test

* checking if emulator is running  before sending a shutdown command

* fix lint

* implement helper method for localhost

* fix header lint

* moving emulator health check to src/test

* fix lint

* adding no extra headers

* minor cleanup

* using mutlipleAttemptsRule in DatastoreTest

* Revert "adding no extra headers"

This reverts commit 9b43798422dc0627b1b2bc6dea8b9f4169682292.

* using classRule

---------

Co-authored-by: Owl Bot 

* feat!: Actionable Error (#1244)

* Create basic structure of GrpcDatastoreRpc and using it in DatastoreOptions

* applying unary settings to all the unary methods

* Configuring header provider for GrpcDatastoreRpc

* fixing emulator tests to be able to run successfully with grpc now

* ignoring one more test which will be fixed in actionable error implementation

* Making HttpDatastoreRpc completely unused

* Making GrpcDatastoreRpc implement AutoCloseable

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* incorporating feedbacks

* pinging emulator after each test for debugging

* Revert "pinging emulator after each test for debugging"

This reverts commit 60ee45d27412aab8140fc7065010633cf59a0ae8.

* Reapply "pinging emulator after each test for debugging"

This reverts commit d42e3b995fe56ded8c5f080a262e8ea02c00c9d9.

* more debugging

* Constant ping to avoid flaky behaviour of /shutdown endpoint

* fixing test

* checking if emulator is running  before sending a shutdown command

* fix lint

* implement helper method for localhost

* fix header lint

* moving emulator health check to src/test

* fix lint

* adding no extra headers

* minor cleanup

* Making DatastoreException extend BaseGrpcServiceException

* Creating DatastoreException through ApiException and exposing methods to extract out domain, reason and metadata

* Wrapping ApiException in DatastoreException before throwing it

* adding clirr configuration

* javadoc for getReason

* deleting unused file

* enabling tests which were ignore for actionable error implementation

* added clirr comments

* fix lint

---------

Co-authored-by: Owl Bot 

* feat!: Making Datastore implement Closeable (#1246)

* Making Datastore closeable and fixing integration test

* Closing datastore in datastore test

* fix lint

* fix clirr config

* test to verify if datastore client is getting closed after invoking close() method

* Using a consistent port and reinitializing Datastore instance in @BeforeClass method

* trying to fix connection reset problem

* upgrading datastore emulator to fix DatastoreTest

* 🦉 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 

* feat: enabling regapic by giving an option to user to use http (#1261)

* feat: enabling regapic by giving an option to user to use http

* enabling retry settings

* fix lint

* fix deps failure

* fix deps failure

* trying out ipv6 address resolution

* Revert "trying out ipv6 address resolution"

This reverts commit 1bf0e299b163df5ad7c510fdce6dc71d681801b5.

* upgrading emulator

* fix lint

* downgrading to 2.0.2 to maintain java 8 compatibility

* incorporating feedbacks

* test retry settings while configuring DatastoreRpc instance

* fix test

* fix header

* fix clirr check

* fix lint

* fix integration test

* fix lint

* incorporating feedback

* test: Creating multi db rule to run tests multiple times against different named databases. (#1270)

* integrating aggregation integration test with multidb rule

* integrating multidb rule with ITDatastoreTest

* addressing feedbacks

* feat: remove `@BetaApi` annotations from get/setDatabaseId methods (#1277)

Cherry pick of #1272

* feat!: mark interfaces as `@InternalExtensionOnly` (#1275)

* feat!: mark interfaces as `@InternalExtensionOnly`

* lint

* refactor: rename internal class QueryAndReadOptions to QueryConfig (#1245) (#1283)

(cherry picked from commit 41d43e852d07a9026ae5be2add860c1f6980c7d6)

* deps: remove dependency on datastore-v1-proto-client module in google-cloud-datastore (#1281)

* feat: use existing transport options API to set transport (#1276)

* feat: use existing transport options API to set transport

* lint

* remove stale test

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 

* deps: bump com.google.truth:truth from 1.1.5 to 1.4.0 (#1323)

Bumps [com.google.truth:truth](https://togithub.com/google/truth) from 1.1.5 to 1.4.0.

    
Release notes

    Sourced from com.google.truth:truth's releases.
    

    

    1.4.0
    

    In this release, our assertions on Java 8 types continue to move from the Truth8 class to the main Truth class. This change should not break compatibility for any supported JDK or Android version, even users who test under old versions of Android without API desugaring. Additionally, we will never break binary compatibility, though some users will have to make changes to their source code in order for it to compile against newer versions.
    

    This release is likely to lead to more build failures than 1.3.0 did. However, those failures should be straightforward to fix.
    

    Example build failure
    

    Foo.java:152: error: reference to assertThat is ambiguous
    assertThat(repo.findFileWithName("foo")).isNull();
    ^
  both method assertThat(@org.jspecify.nullness.Nullable Path) in Truth8 and method assertThat(@org.jspecify.nullness.Nullable Path) in Truth match

    

    Simplest upgrade strategy (if you can update all your code atomically in the same commit as the Truth upgrade)
    

    In the same commit:
    

      

    1. Upgrade Truth to 1.4.0.
      2. 

    2. Replace import static com.google.common.truth.Truth8.assertThat; with import static com.google.common.truth.Truth.assertThat;.

        

      • If you use Kotlin, replace import com.google.common.truth.Truth8.assertThat with import com.google.common.truth.Truth.assertThat.
        • 

      

      3. 

    3. Replace import com.google.common.truth.Truth8; with import com.google.common.truth.Truth;.

        

      • again, similarly for Kotlin if needed
        • 

      

      4. 

    4. Optionally replace remaining references to Truth8 with references to Truth.

        

      • For example, replace Truth8.assertThat(optional).isPresent() with Truth.assertThat(optional).isPresent().
        • 

      

      5. 

    

    If you're feeling lucky, you can try this one-liner for the code updates:
    

    git grep -l Truth8 | xargs perl -pi -e 's/import static com.google.common.truth.Truth8.assertThat;/import static com.google.common.truth.Truth.assertThat;/g; s/import com.google.common.truth.Truth8.assertThat/import com.google.common.truth.Truth.assertThat/g; s/import com.google.common.truth.Truth8/import com.google.common.truth.Truth/g; s/\bTruth8[.]/Truth./g;'

    

    In most cases, that can be further simplified to:
    

    git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'

    

    After that process, it is possible that you'll still see build errors from ambiguous usages of assertThat static imports. If so, you can find a workaround in the section about overload ambiguity in the release notes for 1.3.0. Alternatively, you can wait to upgrade until after a future Truth release, which will eliminate the ambiguity by changing the signatures of some Truth.assertThat overloads.
    

    Incremental upgrade strategy
    

    If you have a very large repo or you have other reasons to prefer to upgrade incrementally, you can use the approach that we used inside Google. Roughly, that approach was:
    

      

    1. Make the optional changes discussed in the release notes for 1.3.0.
      2. 

    2. For any remaining calls to Truth8.assertThat, change them to avoid static import.

        

      • That is, replace assertThat(optional).isPresent() with Truth8.assertThat(optional).isPresent().
        • 

      

      3. 

    3. Upgrade Truth to 1.4.0.
      4. 

    4. Optionally replace references to Truth8 with references to Truth (including restoring static imports if desired), as discussed in section about the simple upgrade strategy above.
      5. 

    


    

    ... (truncated)
    

    

    
Commits

      

    • 2e8e488 Set version number for truth-parent to 1.4.0.
      • 

    • 1f81827 Copy Truth8.assertThat overloads for Path and OptionalLong to the main ...
      • 

    • 9be8e77 Copy remaining Truth8.assertThat overloads to the main Truth class—except...
      • 

    • b02a658 Migrate most usages of Truth8.assertThat to equivalent usages of `Truth.ass...
      • 

    • 0999369 Automated Code Change
      • 

    • 7c65fc6 Make it possible to write expect.that(optionalInt).isPresent(), `assertWith...
      • 

    • 87b371d Bump styfle/cancel-workflow-action from 0.12.0 to 0.12.1
      • 

    • 93b4d93 Add @since tags for the first batch of Java-8-related APIs.
      • 

    • 78d27dd Remove stale suppressions.
      • 

    • 7be930d Bump actions/cache from 3.3.3 to 4.0.0
      • 

    • Additional commits viewable in compare view
      • 

    

    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.truth:truth&package-manager=maven&previous-version=1.1.5&new-version=1.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* deps: bump com.google.cloud:google-cloud-shared-config from 1.6.1 to 1.7.1 (#1324)

Bumps [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) from 1.6.1 to 1.7.1.

    
Release notes

    Sourced from com.google.cloud:google-cloud-shared-config's releases.
    

    

    v1.7.1
    

    1.7.1 (2023-12-07)
    

    Bug Fixes
    

      

    • Move release configs to native-image-shared-config (#725) (58ffb4e)
      • 

    

    v1.7.0
    

    1.7.0 (2023-12-04)
    

    Features
    

      

    • Separate native-image-shared-config into its own module (#712) (567fecb)
      • 

    

    

    

    
Changelog

    Sourced from com.google.cloud:google-cloud-shared-config's changelog.
    

    

    1.7.1 (2023-12-07)
    

    Bug Fixes
    

      

    • Move release configs to native-image-shared-config (#725) (58ffb4e)
      • 

    

    1.7.0 (2023-12-04)
    

    Features
    

      

    • Separate native-image-shared-config into its own module (#712) (567fecb)
      • 

    

    

    

    
Commits

      

    • f5f57c8 chore(main): release 1.7.1 (#727)
      • 

    • 9fcbe9e chore: update release-please.yml to include cloudbuild test yamls (#728)
      • 

    • c432bae chore(main): release 1.7.1-SNAPSHOT (#719)
      • 

    • 58ffb4e fix: move release configs to native-image-shared-config (#725)
      • 

    • 8d411bc ci: Update ci.yaml to introduce Java 21 unit testing (#1907) (#717)
      • 

    • 3382cee chore: add downstream check for native image tests in cloud build (#715)
      • 

    • b22a75a chore: update graalvm docker image for 1.7.0 release (#720)
      • 

    • 93824e5 chore(main): release 1.7.0 (#716)
      • 

    • 7435981 chore: remove docker validation check (#718)
      • 

    • 567fecb feat: separate native-image-shared-config into its own module (#712)
      • 

    • Additional commits viewable in compare view
      • 

    

    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.cloud:google-cloud-shared-config&package-manager=maven&previous-version=1.6.1&new-version=1.7.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* deps: bump com.google.cloud:google-cloud-shared-dependencies from 3.19.0 to 3.24.0 (#1325)

Bumps com.google.cloud:google-cloud-shared-dependencies from 3.19.0 to 3.24.0.


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.cloud:google-cloud-shared-dependencies&package-manager=maven&previous-version=3.19.0&new-version=3.24.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* deps: bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.1 (#1327)

Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://togithub.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1.

    
Release notes

    Sourced from org.apache.maven.plugins:maven-compiler-plugin's releases.
    

    

    3.12.1
    


    🐛 Bug Fixes
    


    📦 Dependency updates
    


    3.12.0
    


    🚀 New features and improvements
    


    🐛 Bug Fixes
    


    📦 Dependency updates
    


    👻 Maintenance
    


    

    

    
Commits

      

    • 736da68 [maven-release-plugin] prepare release maven-compiler-plugin-3.12.1
      • 

    • ef93f3d [MCOMPILER-568] Bump plexusCompilerVersion from 2.14.1 to 2.14.2 (#220)
      • 

    • eb7840c [MCOMPILER-567] - Fail to compile if the "generated-sources/annotations" does...
      • 

    • 2a7a73b [maven-release-plugin] prepare for next development iteration
      • 

    • c08b0fd [maven-release-plugin] prepare release maven-compiler-plugin-3.12.0
      • 

    • a1c5b13 [MCOMPILER-565] Allow project build by Maven 4
      • 

    • 4855773 Bump plexusCompilerVersion from 2.13.0 to 2.14.1
      • 

    • 1d05342 [MCOMPILER-562] Add property maven.compiler.outputDirectory to CompilerMojo (...
      • 

    • ea74978 [MCOMPILER-381] - Refactor incremental detection (#181)
      • 

    • fd37f09 [MCOMPILER-333] Cleanup generated source files (#214)
      • 

    • Additional commits viewable in compare view
      • 

    

    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.11.0&new-version=3.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* test(deps): upgrade errorprone to 2.24.0 (#1271) (#1329)

* test(deps): upgrade errorprone to 2.24.0 (#1271)

* deps: upgrade errorprone to 2.24.0

* 🦉 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 

* 🦉 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 

* deps: bump com.google.errorprone:error_prone_core from 2.23.0 to 2.24.1 (#1326)

Bumps [com.google.errorprone:error_prone_core](https://togithub.com/google/error-prone) from 2.23.0 to 2.24.1.

    
Release notes

    Sourced from com.google.errorprone:error_prone_core's releases.
    

    

    Error Prone 2.24.1
    

    Changes:
    


    Full Changelog: https://togithub.com/google/error-prone/compare/v2.24.0...v2.24.1
    

    Error Prone 2.24.0
    

    New checks:
    


    Full Changelog: https://togithub.com/google/error-prone/compare/v2.23.0...v2.24.0
    

    

    

    
Commits

      

    • ecf7e10 Release Error Prone 2.24.1
      • 

    • 2bd7859 Add an assertion to try to help debug https://togithub.com/google/error-prone/i...
      • 

    • 58a9e80 Update a few checks (and a class of tests, with AbstractToString) to handle #...
      • 

    • fd21bc9 Reflow a comment that didn't appreciate being formatted in unknown commit
      • 

    • 63cf192 Update CanIgnoreReturnValueSuggester summary.
      • 

    • 5fa727a Actually test that hasExtraParameterForEnclosingInstance works.
      • 

    • 21c190a Document that javadoc shouldn't appear between annotations and the documented...
      • 

    • d272dfa Automated rollback of commit 654d1dbf1e6dd652cd6e8ca003643ddf02266ec2.
      • 

    • 654d1db Handle Joiner.on(...) in AbstractToString.
      • 

    • da7be27 Descend into VariableTrees when looking for variables to check.
      • 

    • Additional commits viewable in compare view
      • 

    

    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_core&package-manager=maven&previous-version=2.23.0&new-version=2.24.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* feat: allow setting channel and credential providers in DatastoreOptions (#1299)

* feat: allow setting channel and credential providers in DatastoreOptions

* add additional validation and test

* mark new fields as transient

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* update test

* review feedback

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* review feedback

* 🦉 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 

* chore: Update CODEOWNERS (#1297) (#1331)

* chore: Update CODEOWNERS

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: Update .repo-metadata.json

* 🦉 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 

* chore: run owlbot (#1330)

* chore: run owlbot

* update owlbot lock

* deps: bump com.google.cloud:google-cloud-shared-dependencies from 3.24.0 to 3.25.0 (#1335)

Bumps com.google.cloud:google-cloud-shared-dependencies from 3.24.0 to 3.25.0.


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.cloud:google-cloud-shared-dependencies&package-manager=maven&previous-version=3.24.0&new-version=3.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* deps: bump com.google.truth:truth from 1.4.0 to 1.4.1 (#1341)

Bumps [com.google.truth:truth](https://togithub.com/google/truth) from 1.4.0 to 1.4.1.

    
Release notes

    Sourced from com.google.truth:truth's releases.
    

    

    1.4.1
    

    This release deprecates Truth8.
    

    All its methods have become available on the main Truth class. In most cases, you can migrate your whole project mechanically: git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'
    

    While we do not plan to delete Truth8, we recommend migrating off it, at least if you static import assertThat: If you do not migrate, such static imports will become ambiguous in Truth 1.4.2, breaking your build.
    

    

    

    
Commits

      

    • a920d7d Set version number for truth-parent to 1.4.1.
      • 

    • 3406074 Document more about how and why to migrate off Truth8.
      • 

    • 2be0061 Update docs to reflect that the Java 8 assertions have "moved" to the main `T...
      • 

    • See full diff in compare view
      • 

    

    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.truth:truth&package-manager=maven&previous-version=1.4.0&new-version=1.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* deps: bump com.google.errorprone:error_prone_core from 2.24.1 to 2.25.0 (#1340)

Bumps [com.google.errorprone:error_prone_core](https://togithub.com/google/error-prone) from 2.24.1 to 2.25.0.

    
Release notes

    Sourced from com.google.errorprone:error_prone_core's releases.
    

    

    Error Prone 2.25.0
    

    New checks:
    


    Closed issues: #4195, #4224, #4228, #4248, #4249, #4251
    

    Full Changelog: https://togithub.com/google/error-prone/compare/v2.24.1...v2.25.0
    

    

    

    
Commits


    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_core&package-manager=maven&previous-version=2.24.1&new-version=2.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* revert: "test: Creating multi db rule to run tests multiple times agai… (#1346)

* Revert "test: Creating multi db rule to run tests multiple times against different named databases. (#1270)"

This reverts commit 780c9f40f1ae04d0ec919d203bf256e3cff8fcc1.

* 🦉 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 

* deps: bump com.google.truth:truth from 1.4.1 to 1.4.2 (#1354)

Bumps [com.google.truth:truth](https://togithub.com/google/truth) from 1.4.1 to 1.4.2.

    
Release notes

    Sourced from com.google.truth:truth's releases.
    

    

    1.4.2
    

    This release is the final step of copying all our methods from Truth8 to Truth. If you have not already migrated your usages from Truth8 to Truth, you may see build errors:
    

    OptionalSubjectTest.java:39: error: reference to assertThat is ambiguous
    assertThat(Optional.of("foo")).isPresent();
    ^
  both method assertThat(@org.checkerframework.checker.nullness.qual.Nullable Optional<?>) in Truth8 and method assertThat(@org.checkerframework.checker.nullness.qual.Nullable Optional<?>) in Truth match

    

    In most cases, you can migrate your whole project mechanically: git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'. (You can make that change before upgrading to Truth 1.4.2 or as part of the same commit.)
    

    If you instead need to migrate your project incrementally (for example, because it is very large), you may want to upgrade your version of Truth incrementally, too, following our instructions for 1.3.0 and 1.4.0.
    

    For help
    

    Please feel welcome to open an issue to report problems or request help.
    

    Changelog
    

      

    • Removed temporary type parameters from Truth.assertThat(Stream) and Truth.assertThat(Optional). This can create build errors, which you can fix by replacing all your references to Truth8 with references to Truth. (45782bd0e)
      • 

    

    

    

    
Commits

      

    • 0ca7ef0 Set version number for truth-parent to 1.4.2.
      • 

    • e3b4354 Enable a few more Guava Primitives tests for J2KT
      • 

    • ae78f4a Bump actions/setup-java from 4.0.0 to 4.1.0
      • 

    • 996a844 Remove more copies of a workaround for an ancient Android bug.
      • 

    • a43223e Suppress TruthSelfEquals violations in Truth.
      • 

    • 559d636 Suppress NullableOptional, as we already do in, e.g., `Truth.assertThat(Opt...
      • 

    • 3efe353 Automated Code Change
      • 

    • 5efd53f Change assertThat(array) to allow arrays of non-nullable elements
      • 

    • bbd8d12 Bump com.google.errorprone:error_prone_annotations from 2.24.1 to 2.25.0
      • 

    • c243961 Remove @J2ktIncompatible from StringSubject#matches
      • 

    • Additional commits viewable in compare view
      • 

    

    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.truth:truth&package-manager=maven&previous-version=1.4.1&new-version=1.4.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* deps: bump com.google.cloud:google-cloud-shared-dependencies from 3.25.0 to 3.27.0 (#1353)

Bumps com.google.cloud:google-cloud-shared-dependencies from 3.25.0 to 3.27.0.


[![Dependabot compat…

* chore: update version numbers (#1425)

* fix: make removeScheme case insensitive (#1423)

* chore: sync with main, update version numbers (#1465)

* chore: update sync-repo-settings.yaml (#1417)

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).

* deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421)

* deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426)

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 626430774

Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9

* chore(main): release 2.19.2 (#1414)

:robot: I have created a release *beep* *boop*
---


## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.3-SNAPSHOT (#1432)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2)

##### Bug Fixes

-   **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
-   Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* chore: autogen updates (#1434)

* fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService`
fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService`
fix: An existing message `UpdateVehicleLocationRequest` is removed

PiperOrigin-RevId: 631557549

Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9

* 🦉 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 

* chore: update dependency versions in java templates (#1964) (#1435)

* chore: update dependency versions in java templates

* update other templates
Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0

* 🦉 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 

* build: update actions/setup-java action to v4 (#1391)

* deps: update actions/checkout action to v4 (#1390)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443)

* chore(main): release 2.19.3 (#1438)

:robot: I have created a release *beep* *boop*
---


## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)


### Dependencies

* Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.4-SNAPSHOT (#1444)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3)

##### Dependencies

-   Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448)

* deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2

* 🦉 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 

* build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453)

* chore: [java] allow passing libraries_bom_version from env (#1967) (#1451)

* feat: [java] allow passing libraries_bom_version from env

* reformat
Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449)

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2

* 🦉 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 

* fix: Migrate off TextPrinter's deprecated methods (#1452)

* fix: chore: Migrate off TextPrinter's deprecated methods

* 🦉 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 

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* fix: set the correct database id on the key parent when calling Key#getParent (#1457)

* fix: set database ID on parent key

* 🦉 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 

* chore(main): release 2.20.0 (#1454)

:robot: I have created a release *beep* *boop*
---


## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)


### Features

* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b))


### Bug Fixes

* Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92))
* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.20.1-SNAPSHOT (#1461)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* test: add integration test for incomplete key (#1460)

* test: add integration test for incomplete key

* 🦉 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 

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0

* 🦉 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 

* fix typo

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix versions

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Mend Renovate 
Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Owl Bot 
Co-authored-by: Lawrence Qiu 
Co-authored-by: Henry Johnson 

* feat: add some docs, use only setCredentials in DatastoreOptions (#1467)

* feat: add some docs, use only setCredentials in DatastoreOptions

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 

* test: Add GRPC DatastoreTest and parameterize DatastoreTest for both gRPC and HTTP transports (#1478)

* test: Parameterize DatastoreTest to run for both gRPC and HTTP transports

* test: Parameterize DatastoreTest to run for both gRPC and HTTP transports

* fix linting

* update copy right

* refactor: Pull latest changes from main to Gapic update (#1620)

* chore: update sync-repo-settings.yaml (#1417)

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).

* deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421)

* deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426)

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 626430774

Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9

* chore(main): release 2.19.2 (#1414)

:robot: I have created a release *beep* *boop*
---


## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.3-SNAPSHOT (#1432)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2)

##### Bug Fixes

-   **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
-   Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* chore: autogen updates (#1434)

* fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService`
fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService`
fix: An existing message `UpdateVehicleLocationRequest` is removed

PiperOrigin-RevId: 631557549

Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9

* 🦉 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 

* chore: update dependency versions in java templates (#1964) (#1435)

* chore: update dependency versions in java templates

* update other templates
Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0

* 🦉 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 

* build: update actions/setup-java action to v4 (#1391)

* deps: update actions/checkout action to v4 (#1390)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443)

* chore(main): release 2.19.3 (#1438)

:robot: I have created a release *beep* *boop*
---


## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)


### Dependencies

* Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.4-SNAPSHOT (#1444)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3)

##### Dependencies

-   Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448)

* deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2

* 🦉 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 

* build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453)

* chore: [java] allow passing libraries_bom_version from env (#1967) (#1451)

* feat: [java] allow passing libraries_bom_version from env

* reformat
Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449)

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2

* 🦉 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 

* fix: Migrate off TextPrinter's deprecated methods (#1452)

* fix: chore: Migrate off TextPrinter's deprecated methods

* 🦉 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 

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* fix: set the correct database id on the key parent when calling Key#getParent (#1457)

* fix: set database ID on parent key

* 🦉 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 

* chore(main): release 2.20.0 (#1454)

:robot: I have created a release *beep* *boop*
---


## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)


### Features

* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b))


### Bug Fixes

* Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92))
* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.20.1-SNAPSHOT (#1461)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* test: add integration test for incomplete key (#1460)

* test: add integration test for incomplete key

* 🦉 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 

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0

* 🦉 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 

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 (#1466)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0

* 🦉 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 

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471)

* deps: update dependency com.google.guava:guava-testlib to v33.2.1-jre (#1470)

* deps: update dependency com.google.errorprone:error_prone_core to v2.28.0 (#1469)

* build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459)

* chore(main): release 2.20.1 (#1476)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* Doc: Add gRPC datastore gapic upgrade user guide (#1489)

* chore: Add read me user guide

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Updating formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fixing formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* adjusting formatting

* 🦉 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 

* chore(main): release 2.20.2-SNAPSHOT (#1479)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0

* 🦉 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 

* chore(main): release 2.20.2 (#1503)

:robot: I have created a release *beep* *boop*
---


## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* feat: enable hermetic library generation (#1462)

* restore to older version

* update googleapis_committish

* fix googleapis_committish

* infer image tag from config yaml

* correct workflow name

* update config scripts and yamls

* remove old update_googleapis_committish workflow

* restore proto folder

* Revert "restore proto folder"

This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5.

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* sync config structure with that of google-cloud-java

* remove quotes from config yamls

* fix typo in update_generation_config.yaml

* correct

* quote codeowners_team in generation config

* update generator version

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Owl Bot 

* ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#1481)

Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3

Co-authored-by: Owl Bot 

* test(deps): update dependency com.google.truth:truth to v1.4.3 (#1501)

* chore: correct hermetic library generation script path (#1506)

* fix: correct hermetic library generation script path

* 🦉 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 

* chore: skip hermetic generation on fork PRs (#1510)

* chore: make the owlbot postprocessor check non-required (#1512)

* chore: make the owlbot postprocessor check non-required

* remove required check in other branches

* chore: disable the Owl Bot post-processor (#1511)

via deleting .OwlBot.lock.yaml (context)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 (#1485)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 
Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>

* chore(main): release 2.20.3-SNAPSHOT (#1504)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: setup 2.19.x lts branch (#1535)

* chore(main): release 2.21.0 (#1517)

:robot: I have created a release *beep* *boop*
---


## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)


### Features

* Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531)

* chore(main): release 2.21.1-SNAPSHOT (#1538)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1515)

* chore(main): release 2.21.1 (#1540)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(main): release 2.21.2-SNAPSHOT (#1541)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: secure hermetic_library_generation workflow (#1552)

* chore: secure hermetic_library_generation workflow

Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections.

* fix wording

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547)

* chore(main): release 2.21.2 (#1553)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore: remove datastore native image sample in favor of sample hosted in google-cloud-java (#1519)

* chore: remove unused image tag in .OwlBot-hermetic.yaml (#1559)

This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo.

Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline).

* chore(main): release 2.21.3-SNAPSHOT (#1554)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: Update generation configuration at Tue Sep 10 17:00:48 UTC 2024 (#1564)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.45.0 (#1544)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011))
-   update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f))

### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0))
-   update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561)

* deps: update dependency com.google.guava:guava-testlib to v33.3.0-jre (#1548)

* deps: update dependency com.google.errorprone:error_prone_core to v2.31.0 (#1523)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone (com.google.errorprone:error_prone_core)

### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0

This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`.

Changes:

-   Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe)
-   Improved support for latest JDK 24 EA builds
-   Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756))

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing.

Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0

### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes.
-   [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions.
-   [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches.

Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487)

Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0

### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus:

-   a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479))
-   restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2

### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus:

-   a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451))
-   a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1

### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0

New checks:

-   [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention)
-   [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized)
-   [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch)

Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467)

Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore: change if condition in workflow (#1567)

* chore: change if condition in workflow

* add head_ref

* add var

* chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 (#1568)

* chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024

* chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551)

* test(deps): update dependency com.google.truth:truth to v1.4.4 (#1520)

* deps: update dependency org.easymock:easymock to v5.4.0 (#1482)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1480)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore(main): release 2.21.3 (#1565)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1570)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.3 (#1572)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa))
-   Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632))
-   Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9))
-   Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime (#1575)

* chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 (#1573)

* chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024

* chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024

* chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024

* chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024

* chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024

* chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024

* chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024

* chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024

* chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024

* feat: Introducing Tracing with OpenTelemetry API #1537 (#1576)

* feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431)

* Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest
* Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable
* Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431

* feat: Adding Lookup RPC OpenTelemetry Tracing (#1437)

* feat: Adding Lookup RPC OpenTelemetry Tracing
- Removed OpenCensus Tracing
- Added E2E tests with Global and Local OTel SDK
- Moved OTel SDK setup to RemoteDatastoreHelper
- Fixed pom to depend on BOM for all shared dependencies

* feat: Adding Commit RPC Trace Instrumentation (#1440)

- Added end-to-end test for Datastore operationsput, add, update and delete.
- Updated E2E Test to use the namespace correctly for efficient clean-up of test data

* feat: RunQuery trace instrumentation (#1441)

* feat: RunQuery trace instrumentation

* feat: RunAggregationQuery instrumentation (#1447)

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: Add Transaction tracing
test: transactionalLookupTest

* test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn..

* Adding transaction span names

* TransactionLookupTest

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* Revert "feat: support for transactional operations"

This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3.

* feat: support for transactional operations (#1468)

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* feat: Allocateid tracing (#1488)

* feat: Adding tracing for AllocateIds RPC

* formatting

* 🦉 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 

* feat: Add tracing for ReserveIds operation (#1490)

- added end-to-end test

* fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495)

* fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the …

* Refactor: merge changes from main branch (#1660)

* chore: update sync-repo-settings.yaml (#1417)

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).

* deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421)

* deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426)

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 626430774

Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9

* chore(main): release 2.19.2 (#1414)

:robot: I have created a release *beep* *boop*
---


## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.3-SNAPSHOT (#1432)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2)

##### Bug Fixes

-   **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
-   Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* chore: autogen updates (#1434)

* fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService`
fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService`
fix: An existing message `UpdateVehicleLocationRequest` is removed

PiperOrigin-RevId: 631557549

Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9

* 🦉 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 

* chore: update dependency versions in java templates (#1964) (#1435)

* chore: update dependency versions in java templates

* update other templates
Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0

* 🦉 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 

* build: update actions/setup-java action to v4 (#1391)

* deps: update actions/checkout action to v4 (#1390)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443)

* chore(main): release 2.19.3 (#1438)

:robot: I have created a release *beep* *boop*
---


## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)


### Dependencies

* Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.4-SNAPSHOT (#1444)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3)

##### Dependencies

-   Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448)

* deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2

* 🦉 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 

* build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453)

* chore: [java] allow passing libraries_bom_version from env (#1967) (#1451)

* feat: [java] allow passing libraries_bom_version from env

* reformat
Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449)

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2

* 🦉 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 

* fix: Migrate off TextPrinter's deprecated methods (#1452)

* fix: chore: Migrate off TextPrinter's deprecated methods

* 🦉 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 

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* fix: set the correct database id on the key parent when calling Key#getParent (#1457)

* fix: set database ID on parent key

* 🦉 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 

* chore(main): release 2.20.0 (#1454)

:robot: I have created a release *beep* *boop*
---


## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)


### Features

* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b))


### Bug Fixes

* Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92))
* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.20.1-SNAPSHOT (#1461)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* test: add integration test for incomplete key (#1460)

* test: add integration test for incomplete key

* 🦉 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 

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0

* 🦉 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 

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 (#1466)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0

* 🦉 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 

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471)

* deps: update dependency com.google.guava:guava-testlib to v33.2.1-jre (#1470)

* deps: update dependency com.google.errorprone:error_prone_core to v2.28.0 (#1469)

* build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459)

* chore(main): release 2.20.1 (#1476)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* Doc: Add gRPC datastore gapic upgrade user guide (#1489)

* chore: Add read me user guide

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Updating formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fixing formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* adjusting formatting

* 🦉 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 

* chore(main): release 2.20.2-SNAPSHOT (#1479)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0

* 🦉 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 

* chore(main): release 2.20.2 (#1503)

:robot: I have created a release *beep* *boop*
---


## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* feat: enable hermetic library generation (#1462)

* restore to older version

* update googleapis_committish

* fix googleapis_committish

* infer image tag from config yaml

* correct workflow name

* update config scripts and yamls

* remove old update_googleapis_committish workflow

* restore proto folder

* Revert "restore proto folder"

This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5.

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* sync config structure with that of google-cloud-java

* remove quotes from config yamls

* fix typo in update_generation_config.yaml

* correct

* quote codeowners_team in generation config

* update generator version

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Owl Bot 

* ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#1481)

Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3

Co-authored-by: Owl Bot 

* test(deps): update dependency com.google.truth:truth to v1.4.3 (#1501)

* chore: correct hermetic library generation script path (#1506)

* fix: correct hermetic library generation script path

* 🦉 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 

* chore: skip hermetic generation on fork PRs (#1510)

* chore: make the owlbot postprocessor check non-required (#1512)

* chore: make the owlbot postprocessor check non-required

* remove required check in other branches

* chore: disable the Owl Bot post-processor (#1511)

via deleting .OwlBot.lock.yaml (context)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 (#1485)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 
Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>

* chore(main): release 2.20.3-SNAPSHOT (#1504)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: setup 2.19.x lts branch (#1535)

* chore(main): release 2.21.0 (#1517)

:robot: I have created a release *beep* *boop*
---


## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)


### Features

* Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531)

* chore(main): release 2.21.1-SNAPSHOT (#1538)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1515)

* chore(main): release 2.21.1 (#1540)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(main): release 2.21.2-SNAPSHOT (#1541)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: secure hermetic_library_generation workflow (#1552)

* chore: secure hermetic_library_generation workflow

Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections.

* fix wording

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547)

* chore(main): release 2.21.2 (#1553)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore: remove datastore native image sample in favor of sample hosted in google-cloud-java (#1519)

* chore: remove unused image tag in .OwlBot-hermetic.yaml (#1559)

This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo.

Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline).

* chore(main): release 2.21.3-SNAPSHOT (#1554)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: Update generation configuration at Tue Sep 10 17:00:48 UTC 2024 (#1564)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.45.0 (#1544)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011))
-   update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f))

### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0))
-   update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561)

* deps: update dependency com.google.guava:guava-testlib to v33.3.0-jre (#1548)

* deps: update dependency com.google.errorprone:error_prone_core to v2.31.0 (#1523)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone (com.google.errorprone:error_prone_core)

### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0

This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`.

Changes:

-   Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe)
-   Improved support for latest JDK 24 EA builds
-   Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756))

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing.

Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0

### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes.
-   [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions.
-   [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches.

Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487)

Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0

### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus:

-   a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479))
-   restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2

### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus:

-   a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451))
-   a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1

### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0

New checks:

-   [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention)
-   [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized)
-   [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch)

Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467)

Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore: change if condition in workflow (#1567)

* chore: change if condition in workflow

* add head_ref

* add var

* chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 (#1568)

* chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024

* chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551)

* test(deps): update dependency com.google.truth:truth to v1.4.4 (#1520)

* deps: update dependency org.easymock:easymock to v5.4.0 (#1482)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1480)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore(main): release 2.21.3 (#1565)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1570)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.3 (#1572)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa))
-   Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632))
-   Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9))
-   Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime (#1575)

* chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 (#1573)

* chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024

* chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024

* chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024

* chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024

* chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024

* chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024

* chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024

* chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024

* chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024

* feat: Introducing Tracing with OpenTelemetry API #1537 (#1576)

* feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431)

* Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest
* Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable
* Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431

* feat: Adding Lookup RPC OpenTelemetry Tracing (#1437)

* feat: Adding Lookup RPC OpenTelemetry Tracing
- Removed OpenCensus Tracing
- Added E2E tests with Global and Local OTel SDK
- Moved OTel SDK setup to RemoteDatastoreHelper
- Fixed pom to depend on BOM for all shared dependencies

* feat: Adding Commit RPC Trace Instrumentation (#1440)

- Added end-to-end test for Datastore operationsput, add, update and delete.
- Updated E2E Test to use the namespace correctly for efficient clean-up of test data

* feat: RunQuery trace instrumentation (#1441)

* feat: RunQuery trace instrumentation

* feat: RunAggregationQuery instrumentation (#1447)

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: Add Transaction tracing
test: transactionalLookupTest

* test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn..

* Adding transaction span names

* TransactionLookupTest

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* Revert "feat: support for transactional operations"

This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3.

* feat: support for transactional operations (#1468)

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* feat: Allocateid tracing (#1488)

* feat: Adding tracing for AllocateIds RPC

* formatting

* 🦉 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 

* feat: Add tracing for ReserveIds operation (#1490)

- added end-to-end test

* fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495)

* fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the parent instead …

* Refactor: refactor code changes from maincopy (#1676)

* chore: update sync-repo-settings.yaml (#1417)

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes # ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).

* deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421)

* deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426)

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 626430774

Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9

* chore(main): release 2.19.2 (#1414)

:robot: I have created a release *beep* *boop*
---


## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.3-SNAPSHOT (#1432)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2)

##### Bug Fixes

-   **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
-   Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
-   Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* chore: autogen updates (#1434)

* fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService`
fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService`
fix: An existing message `UpdateVehicleLocationRequest` is removed

PiperOrigin-RevId: 631557549

Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9

* 🦉 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 

* chore: update dependency versions in java templates (#1964) (#1435)

* chore: update dependency versions in java templates

* update other templates
Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0

* 🦉 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 

* build: update actions/setup-java action to v4 (#1391)

* deps: update actions/checkout action to v4 (#1390)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443)

* chore(main): release 2.19.3 (#1438)

:robot: I have created a release *beep* *boop*
---


## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)


### Dependencies

* Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.19.4-SNAPSHOT (#1444)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16)

[Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3)

##### Dependencies

-   Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
-   Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))


    

---

### 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, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore).


* test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448)

* deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2

* 🦉 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 

* build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453)

* chore: [java] allow passing libraries_bom_version from env (#1967) (#1451)

* feat: [java] allow passing libraries_bom_version from env

* reformat
Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449)

* test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2

* 🦉 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 

* fix: Migrate off TextPrinter's deprecated methods (#1452)

* fix: chore: Migrate off TextPrinter's deprecated methods

* 🦉 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 

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* fix: set the correct database id on the key parent when calling Key#getParent (#1457)

* fix: set database ID on parent key

* 🦉 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 

* chore(main): release 2.20.0 (#1454)

:robot: I have created a release *beep* *boop*
---


## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)


### Features

* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b))


### Bug Fixes

* Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92))
* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 2.20.1-SNAPSHOT (#1461)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* test: add integration test for incomplete key (#1460)

* test: add integration test for incomplete key

* 🦉 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 

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0

* 🦉 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 

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 (#1466)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0

* 🦉 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 

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471)

* deps: update dependency com.google.guava:guava-testlib to v33.2.1-jre (#1470)

* deps: update dependency com.google.errorprone:error_prone_core to v2.28.0 (#1469)

* build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459)

* chore(main): release 2.20.1 (#1476)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* Doc: Add gRPC datastore gapic upgrade user guide (#1489)

* chore: Add read me user guide

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Updating formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fixing formatting

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* adjusting formatting

* 🦉 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 

* chore(main): release 2.20.2-SNAPSHOT (#1479)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0

* 🦉 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 

* chore(main): release 2.20.2 (#1503)

:robot: I have created a release *beep* *boop*
---


## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* feat: enable hermetic library generation (#1462)

* restore to older version

* update googleapis_committish

* fix googleapis_committish

* infer image tag from config yaml

* correct workflow name

* update config scripts and yamls

* remove old update_googleapis_committish workflow

* restore proto folder

* Revert "restore proto folder"

This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5.

* feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455)

* feat: New PropertyMask field which allows partial commits, lookups, and query results

PiperOrigin-RevId: 635449160

Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9

* 🦉 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 

* sync config structure with that of google-cloud-java

* remove quotes from config yamls

* fix typo in update_generation_config.yaml

* correct

* quote codeowners_team in generation config

* update generator version

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Owl Bot 

* ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#1481)

Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3

Co-authored-by: Owl Bot 

* test(deps): update dependency com.google.truth:truth to v1.4.3 (#1501)

* chore: correct hermetic library generation script path (#1506)

* fix: correct hermetic library generation script path

* 🦉 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 

* chore: skip hermetic generation on fork PRs (#1510)

* chore: make the owlbot postprocessor check non-required (#1512)

* chore: make the owlbot postprocessor check non-required

* remove required check in other branches

* chore: disable the Owl Bot post-processor (#1511)

via deleting .OwlBot.lock.yaml (context)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 (#1485)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 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 
Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>

* chore(main): release 2.20.3-SNAPSHOT (#1504)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: setup 2.19.x lts branch (#1535)

* chore(main): release 2.21.0 (#1517)

:robot: I have created a release *beep* *boop*
---


## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)


### Features

* Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531)

* chore(main): release 2.21.1-SNAPSHOT (#1538)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1515)

* chore(main): release 2.21.1 (#1540)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(main): release 2.21.2-SNAPSHOT (#1541)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: secure hermetic_library_generation workflow (#1552)

* chore: secure hermetic_library_generation workflow

Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections.

* fix wording

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547)

* chore(main): release 2.21.2 (#1553)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore: remove datastore native image sample in favor of sample hosted in google-cloud-java (#1519)

* chore: remove unused image tag in .OwlBot-hermetic.yaml (#1559)

This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo.

Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline).

* chore(main): release 2.21.3-SNAPSHOT (#1554)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: Update generation configuration at Tue Sep 10 17:00:48 UTC 2024 (#1564)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.45.0 (#1544)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011))
-   update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f))

### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0))
-   update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561)

* deps: update dependency com.google.guava:guava-testlib to v33.3.0-jre (#1548)

* deps: update dependency com.google.errorprone:error_prone_core to v2.31.0 (#1523)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
google/error-prone (com.google.errorprone:error_prone_core)

### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0

This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`.

Changes:

-   Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe)
-   Improved support for latest JDK 24 EA builds
-   Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756))

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing.

Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0

### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0

New checks:

-   [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes.
-   [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions.
-   [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches.

Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487)

Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0

### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus:

-   a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479))
-   restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2

### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1

This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus:

-   a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451))
-   a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475))

Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1

### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0

New checks:

-   [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention)
-   [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized)
-   [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch)

Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467)

Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore: change if condition in workflow (#1567)

* chore: change if condition in workflow

* add head_ref

* add var

* chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 (#1568)

* chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024

* chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024

* build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551)

* test(deps): update dependency com.google.truth:truth to v1.4.4 (#1520)

* deps: update dependency org.easymock:easymock to v5.4.0 (#1482)

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1480)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore(main): release 2.21.3 (#1565)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1570)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff))

### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0)

##### Features

-   Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46))

### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a))
-   Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49))
-   Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.3 (#1572)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa))
-   Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632))
-   Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9))
-   Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).


* chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime (#1575)

* chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 (#1573)

* chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024

* chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024

* chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024

* chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024

* chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024

* chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024

* chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024

* chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024

* chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024

* feat: Introducing Tracing with OpenTelemetry API #1537 (#1576)

* feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431)

* Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest
* Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable
* Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431

* feat: Adding Lookup RPC OpenTelemetry Tracing (#1437)

* feat: Adding Lookup RPC OpenTelemetry Tracing
- Removed OpenCensus Tracing
- Added E2E tests with Global and Local OTel SDK
- Moved OTel SDK setup to RemoteDatastoreHelper
- Fixed pom to depend on BOM for all shared dependencies

* feat: Adding Commit RPC Trace Instrumentation (#1440)

- Added end-to-end test for Datastore operationsput, add, update and delete.
- Updated E2E Test to use the namespace correctly for efficient clean-up of test data

* feat: RunQuery trace instrumentation (#1441)

* feat: RunQuery trace instrumentation

* feat: RunAggregationQuery instrumentation (#1447)

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: RunQuery trace instrumentation

* Formatting

* Formatting

* Refactor: s/RUNQUERY/RUN_QUERY

* feat: RunAggregationQuery Trace Instrumentation

* Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java).

* Formatting

* Fixing @Test annotation missed after merge

* Formatting

* feat: Add Transaction tracing
test: transactionalLookupTest

* test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn..

* Adding transaction span names

* TransactionLookupTest

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* Revert "feat: support for transactional operations"

This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3.

* feat: support for transactional operations (#1468)

* feat: support for transactional operations
- tested using newTransaction() and runInTransaction()

* feat: Allocateid tracing (#1488)

* feat: Adding tracing for AllocateIds RPC

* formatting

* 🦉 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 

* feat: Add tracing for ReserveIds operation (#1490)

- added end-to-end test

* fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495)

* fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the parent ins…

* Refactor: refactor grpc query splitter logic (#1674)

* Init commit to migrate query splitter

* Add query splitter and datastore factory

* fix unused dependencies

* Fix formatting

* Fix copyright

* Add initial tests and utilities

* Fix dependencies for datastore parent version

* Add unit tests

* fix non-complying

* Fix non-complying errors

* Skip native tests

* feat: Improve upon the default gRPC Connection Pool size (#1706)

* feat: Improve upon the default gRPC Connection Pool size

* feat: Improve upon the default gRPC Connection Pool size

* fix formatting

* add comment

* Add test

* formatting

* Add constants for min, max and init channel count

* Fix ci testing environment with java 11

* Revert "Fix ci testing environment with java 11"

This reverts commit 00c0d2146c814d428d8ae06f75d4c93b6f826851.

* deps: bump org.easymock:easymock from 5.4.0 to 5.5.0 (#1749)

Bumps [org.easymock:easymock](https://togithub.com/easymock/easymock) from 5.4.0 to 5.5.0.

    
Release notes

    Sourced from org.easymock:easymock's releases.
    

    

    5.5.0
    

    OSGi and Java 24 support.
    

    Change log
    

      

    • Bump org.codehaus.mojo:versions-maven-plugin from 2.17.1 to 2.18.0 (#700)
      • 

    • Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.5 to 4.8.6.6 (#699)
      • 

    • easymock.org unresolvable  (#698)
      • 

    • Bump com.puppycrawl.tools:checkstyle from 10.20.0 to 10.20.1 (#696)
      • 

    • Bump net.bytebuddy:byte-buddy from 1.15.7 to 1.15.10 (#695)
      • 

    • Bump org.apache.maven.surefire:surefire-testng from 3.5.1 to 3.5.2 (#694)
      • 

    • Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#693)
      • 

    • Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.1 to 3.5.2 (#692)
      • 

    • Bump org.apache.maven.surefire:surefire-junit-platform from 3.5.1 to 3.5.2 (#691)
      • 

    • Bump com.puppycrawl.tools:checkstyle from 10.19.0 to 10.20.0 (#690)
      • 

    • Bump org.apache.maven.plugins:maven-pmd-plugin from 3.25.0 to 3.26.0 (#689)
      • 

    • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.12 (#688)
      • 

    • Bump com.puppycrawl.tools:checkstyle from 10.18.2 to 10.19.0 (#687)
      • 

    • Bump org.apache.maven.plugins:maven-dependency-plugin from 3.8.0 to 3.8.1 (#686)
      • 

    • Bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.5.0 to 3.6.0 (#685)
      • 

    • Bump actions/setup-java from 4.4.0 to 4.5.0 (#684)
      • 

    • Bump actions/checkout from 4.2.1 to 4.2.2 (#683)
      • 

    • Bump net.bytebuddy:byte-buddy from 1.15.5 to 1.15.7 (#682)
      • 

    • Bump org.codehaus.mojo:exec-maven-plugin from 3.4.1 to 3.5.0 (#681)
      • 

    • Bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.7.0 to 3.8.0 (#680)
      • 

    • Bump junit.jupiter.version from 5.11.2 to 5.11.3 (#679)
      • 

    • Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.4 to 4.8.6.5 (#678)
      • 

    • Bump net.bytebuddy:byte-buddy from 1.15.4 to 1.15.5 (#677)
      • 

    • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.11 (#676)
      • 

    • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.10 (#675)
      • 

    • Bump net.bytebuddy:byte-buddy from 1.15.2 to 1.15.4 (#674)
      • 

    • Support Java 24-ea (#673)
      • 

    • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.9 (#672)
      • 

    • Bump org.ow2.asm:asm from 9.7 to 9.7.1 (#671)
      • 

    • Bump actions/checkout from 4.2.0 to 4.2.1 (#669)
      • 

    • Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.0 to 3.5.1 (#668)
      • 

    • Bump org.apache.maven.surefire:surefire-testng from 3.5.0 to 3.5.1 (#667)
      • 

    • Bump org.apache.maven.surefire:surefire-junit-platform from 3.5.0 to 3.5.1 (#666)
      • 

    • Bump junit.jupiter.version from 5.11.1 to 5.11.2 (#665)
      • 

    • Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 (#664)
      • 

    • Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.6 to 3.2.7 (#663)
      • 

    • Bump com.puppycrawl.tools:checkstyle from 10.18.1 to 10.18.2 (#662)
      • 

    • Bump net.bytebuddy:byte-buddy from 1.15.2 to 1.15.3 (#661)
      • 

    • Bump actions/checkout from 4.1.7 to 4.2.0 (#660)
      • 

    • Bump net.bytebuddy:byte-buddy from 1.15.1 to 1.15.2 (#659)
      • 

    • Bump com.mycila:license-maven-plugin from 4.5 to 4.6 (#658)
      • 

    • Bump junit.jupiter.version from 5.11.0 to 5.11.1 (#657)
      • 

    • Bump actions/setup-java from 4.3.0 to 4.4.0 (#656)
      • 

    • Bump org.codehaus.mojo:jdepend-maven-plugin from 2.0 to 2.1 (#655)
      • 

    • Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.3 to 4.8.6.4 (#654)
      • 

    


    

    ... (truncated)
    

    

    
Commits

      

    • 028fd28 Move to version 5.5.0
      • 

    • e11364d Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.5 to 4.8.6.6
      • 

    • 006f454 Update tool versions
      • 

    • 4a61823 Fix OSGi issues occurring since ByteBuddy was added (close #626)
      • 

    • 1ce4c19 Tab to space
      • 

    • 430b6a7 Bump org.codehaus.mojo:versions-maven-plugin from 2.17.1 to 2.18.0
      • 

    • d655e9d Upgrade github pages
      • 

    • d4ad6b6 Bump com.puppycrawl.tools:checkstyle from 10.20.0 to 10.20.1
      • 

    • 2c3ba98 Bump net.bytebuddy:byte-buddy from 1.15.7 to 1.15.10
      • 

    • 964763e Bump org.apache.maven.surefire:surefire-testng from 3.5.1 to 3.5.2
      • 

    • Additional commits viewable in compare view
      • 

    

    

    


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.easymock:easymock&package-manager=maven&previous-version=5.4.0&new-version=5.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---


    
Dependabot commands and options

    

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)



    

* resolve conflicts in dependabot

* chore: generate libraries at Thu Apr 24 00:49:57 UTC 2025

* fix version

* fix version to 2.27.2-SNAPSHOT

* fix version to 2.27.2-SNAPSHOT

* chore: generate libraries at Tue Apr 29 16:59:41 UTC 2025

* update version to 2.27.3

---------

Co-authored-by: kolea2 <45548808+kolea2@users.noreply.github.com>
Co-authored-by: Prateek 
Co-authored-by: Owl Bot 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mend Renovate 
Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Lawrence Qiu 
Co-authored-by: Henry Johnson 
Co-authored-by: Diego Marquez 
Co-authored-by: Min Zhu 
Co-authored-by: Mridula <66699525+mpeddada1@users.noreply.github.com>
Co-authored-by: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Co-authored-by: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
Co-authored-by: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
Co-authored-by: Joe Wang 
---
 .github/.OwlBot-hermetic.yaml                 |    4 +
 .github/dependabot.yml                        |    3 +-
 .github/sync-repo-settings.yaml               |   16 -
 .gitignore                                    |    2 +-
 google-cloud-datastore-utils/pom.xml          |  111 +
 .../com/google/datastore/utils/Datastore.java |  136 +
 .../datastore/utils/DatastoreException.java   |   49 +
 .../datastore/utils/DatastoreFactory.java     |  127 +
 .../datastore/utils/DatastoreHelper.java      |  731 +++++
 .../datastore/utils/DatastoreOptions.java     |  204 ++
 .../google/datastore/utils/QuerySplitter.java |   56 +
 .../datastore/utils/QuerySplitterImpl.java    |  309 ++
 .../com/google/datastore/utils/RemoteRpc.java |  239 ++
 .../utils/testing/MockCredential.java         |   36 +
 .../utils/testing/MockDatastoreFactory.java   |  132 +
 .../datastore/utils/DatastoreClientTest.java  |  407 +++
 .../datastore/utils/DatastoreFactoryTest.java |   93 +
 .../datastore/utils/DatastoreHelperTest.java  |  317 +++
 .../datastore/utils/QuerySplitterTest.java    |  365 +++
 .../google/datastore/utils/RemoteRpcTest.java |  341 +++
 .../utils/it/ITDatastoreProtoClientTest.java  |   90 +
 .../clirr-ignored-differences.xml             |   59 +-
 google-cloud-datastore/pom.xml                |    8 +
 .../com/google/cloud/datastore/Batch.java     |    2 +
 .../com/google/cloud/datastore/Datastore.java |   30 +-
 .../cloud/datastore/DatastoreBatchWriter.java |    2 +
 .../cloud/datastore/DatastoreException.java   |   83 +-
 .../cloud/datastore/DatastoreFactory.java     |    2 +
 .../google/cloud/datastore/DatastoreImpl.java |   17 +
 .../cloud/datastore/DatastoreOptions.java     |  122 +-
 .../cloud/datastore/DatastoreReader.java      |   10 +-
 .../datastore/DatastoreReaderWriter.java      |    3 +
 .../cloud/datastore/DatastoreUtils.java       |   57 +
 .../cloud/datastore/DatastoreWriter.java      |    2 +
 .../GrpcToDatastoreCodeTranslation.java       |   93 +
 .../google/cloud/datastore/QueryResults.java  |    6 +-
 .../RetryAndTraceDatastoreRpcDecorator.java   |   10 +
 .../cloud/datastore/StructuredQuery.java      |    2 +
 .../google/cloud/datastore/Transaction.java   |    6 +-
 .../google/cloud/datastore/ValueBuilder.java  |    2 +
 .../aggregation/AggregationBuilder.java       |    3 +
 .../datastore/spi/DatastoreRpcFactory.java    |    2 +
 .../cloud/datastore/spi/v1/DatastoreRpc.java  |   27 +-
 .../datastore/spi/v1/GrpcDatastoreRpc.java    |  202 ++
 .../datastore/spi/v1/HttpDatastoreRpc.java    |   13 +
 .../cloud/datastore/spi/v1/RpcUtils.java      |   34 +
 .../testing/LocalDatastoreHelper.java         |   11 +-
 .../cloud/datastore/v1/DatastoreClient.java   | 1087 +++++++
 .../cloud/datastore/v1/DatastoreSettings.java |  304 ++
 .../cloud/datastore/v1/gapic_metadata.json    |   42 +
 .../cloud/datastore/v1/package-info.java      |   49 +
 .../datastore/v1/stub/DatastoreStub.java      |   84 +
 .../v1/stub/DatastoreStubSettings.java        |  535 ++++
 .../v1/stub/GrpcDatastoreCallableFactory.java |  113 +
 .../datastore/v1/stub/GrpcDatastoreStub.java  |  429 +++
 .../HttpJsonDatastoreCallableFactory.java     |  101 +
 .../v1/stub/HttpJsonDatastoreStub.java        |  676 +++++
 .../reflect-config.json                       | 2522 +++++++++++++++++
 ...reTest.java => AbstractDatastoreTest.java} |   28 +-
 .../datastore/DatastoreExceptionTest.java     |    2 +-
 .../cloud/datastore/DatastoreOptionsTest.java |  143 +-
 .../cloud/datastore/DatastoreTestGrpc.java    |   61 +
 .../cloud/datastore/DatastoreTestHttp.java    |   57 +
 .../cloud/datastore/DatastoreUtilsTest.java   |   43 +
 .../GrpcToDatastoreCodeTranslationTest.java   |   53 +
 ...Test.java => AbstractITDatastoreTest.java} |  156 +-
 .../datastore/it/ITDatastoreConceptsTest.java |   15 +-
 .../datastore/it/ITDatastoreTestGrpc.java     |   64 +
 .../datastore/it/ITDatastoreTestHttp.java     |   58 +
 .../datastore/it/MultipleAttemptsRule.java    |    2 +-
 .../cloud/datastore/it/StatementExecutor.java |    7 +-
 .../cloud/datastore/spi/v1/RpcUtilsTest.java  |   57 +
 .../testing/ITLocalDatastoreHelperTest.java   |   23 +-
 .../testing/RemoteDatastoreHelper.java        |   45 +-
 .../v1/DatastoreClientHttpJsonTest.java       |  549 ++++
 .../datastore/v1/DatastoreClientTest.java     |  528 ++++
 .../cloud/datastore/v1/MockDatastore.java     |   59 +
 .../cloud/datastore/v1/MockDatastoreImpl.java |  241 ++
 grpc-google-cloud-datastore-v1/pom.xml        |   72 +
 .../google/datastore/v1/DatastoreGrpc.java    | 1339 +++++++++
 pom.xml                                       |   12 +
 pull-gapic-grpc.sh                            |   42 +
 versions.txt                                  |    1 +
 83 files changed, 13945 insertions(+), 230 deletions(-)
 create mode 100644 google-cloud-datastore-utils/pom.xml
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java
 create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java
 create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java
 create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java
 create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java
 create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java
 create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java
 create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java
 create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java
 create mode 100644 google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json
 rename google-cloud-datastore/src/test/java/com/google/cloud/datastore/{DatastoreTest.java => AbstractDatastoreTest.java} (98%)
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java
 rename google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/{ITDatastoreTest.java => AbstractITDatastoreTest.java} (96%)
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java
 create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java
 create mode 100644 grpc-google-cloud-datastore-v1/pom.xml
 create mode 100644 grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
 create mode 100644 pull-gapic-grpc.sh

diff --git a/.github/.OwlBot-hermetic.yaml b/.github/.OwlBot-hermetic.yaml
index 02f0dd37bbac..ef1c310b33cc 100644
--- a/.github/.OwlBot-hermetic.yaml
+++ b/.github/.OwlBot-hermetic.yaml
@@ -22,8 +22,12 @@ deep-copy-regex:
   dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-$1/src"
 - source: "/google/datastore/admin/(v.*)/.*-java/proto-google-.*/src"
   dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-admin-$1/src"
+- source: "/google/datastore/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-$1/src"
 - source: "/google/datastore/admin/(v.*)/.*-java/grpc-google-.*/src"
   dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-admin-$1/src"
 # Admin & Data APIs share the same wrapper library.
+- source: "/google/datastore/(v.*)/.*-java/gapic-google-.*/src"
+  dest: "/owl-bot-staging/$1/google-cloud-datastore/src"
 - source: "/google/datastore/admin/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/$1/google-cloud-datastore/src"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ac8af89e1c7f..18cc9f259244 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,8 +17,7 @@ updates:
     # If a security vulnerability comes in, we will be notified about 
     # it via template in the synthtool repository.
     ignore:
-    - dependency-name: "*"
-
+      - dependency-name: "*"
 # rules for the `grpc-experimental` branch
   - package-ecosystem: maven
     directory: "/"
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 6fdb2fb2e49b..12d6c76d266d 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -157,22 +157,6 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
-  - pattern: grpc-experimental
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
   - pattern: 2.19.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
diff --git a/.gitignore b/.gitignore
index 6f5e4424d742..241f8441762f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ target/
 *.iml
 __pycache__/
 
-.flattened-pom.xml
\ No newline at end of file
+.flattened-pom.xml
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
new file mode 100644
index 000000000000..6cb32a8b18ad
--- /dev/null
+++ b/google-cloud-datastore-utils/pom.xml
@@ -0,0 +1,111 @@
+
+
+    4.0.0
+    com.google.cloud
+    google-cloud-datastore-utils
+    2.27.3-SNAPSHOT
+    jar
+    Google Cloud Datastore Utilities
+    https://github.com/googleapis/java-datastore
+    
+        Java datastore client utility library.
+    
+    
+        com.google.cloud
+        google-cloud-datastore-parent
+        2.27.3-SNAPSHOT
+    
+    
+        google-cloud-datastore-utils
+    
+    
+        
+            com.google.api-client
+            google-api-client
+        
+        
+            com.google.http-client
+            google-http-client-protobuf
+        
+        
+            com.google.http-client
+            google-http-client-gson
+        
+        
+            com.google.api.grpc
+            proto-google-cloud-datastore-v1
+        
+        
+            com.google.api
+            api-common
+        
+        
+            com.google.protobuf
+            protobuf-java
+        
+        
+            com.google.guava
+            guava
+        
+        
+            com.google.api.grpc
+            proto-google-common-protos
+        
+        
+            com.google.http-client
+            google-http-client
+        
+        
+            com.google.http-client
+            google-http-client-jackson2
+        
+        
+            com.google.oauth-client
+            google-oauth-client
+        
+        
+            com.google.code.findbugs
+            jsr305
+        
+        
+        
+            junit
+            junit
+            test
+        
+        
+            com.google.truth
+            truth
+            1.4.2
+            test
+            
+                
+                    org.checkerframework
+                    checker-qual
+                
+            
+        
+    
+
+    
+        
+            
+                org.apache.maven.plugins
+                maven-surefire-plugin
+                
+                    -Xmx2048m
+                
+            
+        
+    
+
+    
+        
+            native
+            
+                
+                true
+            
+        
+    
+
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java
new file mode 100644
index 000000000000..d66e9ce606b4
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2024 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.utils;
+
+import com.google.datastore.v1.*;
+import com.google.rpc.Code;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Provides access to Cloud Datastore.
+ *
+ * 
    This class is thread-safe.
+ */
+public class Datastore {
+
+  final RemoteRpc remoteRpc;
+
+  Datastore(RemoteRpc remoteRpc) {
+    this.remoteRpc = remoteRpc;
+  }
+
+  /** Reset the RPC count. */
+  public void resetRpcCount() {
+    remoteRpc.resetRpcCount();
+  }
+
+  /**
+   * Returns the number of RPC calls made since the client was created or {@link #resetRpcCount} was
+   * called.
+   */
+  public int getRpcCount() {
+    return remoteRpc.getRpcCount();
+  }
+
+  private com.google.datastore.utils.DatastoreException invalidResponseException(
+      String method, IOException exception) {
+    return RemoteRpc.makeException(
+        remoteRpc.getUrl(), method, Code.UNAVAILABLE, "Invalid response", exception);
+  }
+
+  public AllocateIdsResponse allocateIds(AllocateIdsRequest request)
+      throws com.google.datastore.utils.DatastoreException {
+    try (InputStream is =
+        remoteRpc.call("allocateIds", request, request.getProjectId(), request.getDatabaseId())) {
+      return AllocateIdsResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("allocateIds", exception);
+    }
+  }
+
+  public BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
+      throws com.google.datastore.utils.DatastoreException {
+    try (InputStream is =
+        remoteRpc.call(
+            "beginTransaction", request, request.getProjectId(), request.getDatabaseId())) {
+      return BeginTransactionResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("beginTransaction", exception);
+    }
+  }
+
+  public CommitResponse commit(CommitRequest request)
+      throws com.google.datastore.utils.DatastoreException {
+    try (InputStream is =
+        remoteRpc.call("commit", request, request.getProjectId(), request.getDatabaseId())) {
+      return CommitResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("commit", exception);
+    }
+  }
+
+  public LookupResponse lookup(LookupRequest request)
+      throws com.google.datastore.utils.DatastoreException {
+    try (InputStream is =
+        remoteRpc.call("lookup", request, request.getProjectId(), request.getDatabaseId())) {
+      return LookupResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("lookup", exception);
+    }
+  }
+
+  public ReserveIdsResponse reserveIds(ReserveIdsRequest request)
+      throws com.google.datastore.utils.DatastoreException {
+    try (InputStream is =
+        remoteRpc.call("reserveIds", request, request.getProjectId(), request.getDatabaseId())) {
+      return ReserveIdsResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("reserveIds", exception);
+    }
+  }
+
+  public RollbackResponse rollback(RollbackRequest request)
+      throws com.google.datastore.utils.DatastoreException {
+    try (InputStream is =
+        remoteRpc.call("rollback", request, request.getProjectId(), request.getDatabaseId())) {
+      return RollbackResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("rollback", exception);
+    }
+  }
+
+  public RunQueryResponse runQuery(RunQueryRequest request)
+      throws com.google.datastore.utils.DatastoreException {
+    try (InputStream is =
+        remoteRpc.call("runQuery", request, request.getProjectId(), request.getDatabaseId())) {
+      return RunQueryResponse.parseFrom(is);
+    } catch (IOException exception) {
+      throw invalidResponseException("runQuery", exception);
+    }
+  }
+
+  public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request)
+      throws DatastoreException {
+    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/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java
new file mode 100644
index 000000000000..67dbc1f9a11a
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 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.utils;
+
+import com.google.rpc.Code;
+
+/** Indicates an error in a {@link Datastore} call. */
+public class DatastoreException extends Exception {
+  private final String methodName;
+  private final Code code;
+
+  public DatastoreException(String methodName, Code code, String message, Throwable cause) {
+    super(message, cause);
+    this.methodName = methodName;
+    this.code = code;
+  }
+
+  /**
+   * @return the canonical error code
+   */
+  public Code getCode() {
+    return code;
+  }
+
+  /**
+   * @return the datastore method name
+   */
+  public String getMethodName() {
+    return methodName;
+  }
+
+  @Override
+  public String toString() {
+    return String.format("%s, code=%s", super.toString(), code);
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java
new file mode 100644
index 000000000000..2befe276ec02
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.logging.*;
+
+/** Client factory for {@link com.google.datastore.utils.Datastore}. */
+public class DatastoreFactory {
+
+  // Lazy load this because we might be running inside App Engine and this
+  // class isn't on the whitelist.
+  private static ConsoleHandler methodHandler;
+
+  /** API version. */
+  public static final String VERSION = "v1";
+
+  public static final String DEFAULT_HOST = "https://datastore.googleapis.com";
+
+  /** Singleton factory instance. */
+  private static final DatastoreFactory INSTANCE = new DatastoreFactory();
+
+  public static DatastoreFactory get() {
+    return INSTANCE;
+  }
+
+  /**
+   * Provides access to a datastore using the provided options. Logs into the application using the
+   * credentials available via these options.
+   *
+   * @throws IllegalArgumentException if the server or credentials weren't provided.
+   */
+  public com.google.datastore.utils.Datastore create(
+      com.google.datastore.utils.DatastoreOptions options) {
+    return new com.google.datastore.utils.Datastore(newRemoteRpc(options));
+  }
+
+  /** Constructs a Google APIs HTTP client with the associated credentials. */
+  public HttpRequestFactory makeClient(com.google.datastore.utils.DatastoreOptions options) {
+    Credential credential = options.getCredential();
+    HttpTransport transport = options.getTransport();
+    if (transport == null) {
+      transport = credential == null ? new NetHttpTransport() : credential.getTransport();
+      transport = transport == null ? new NetHttpTransport() : transport;
+    }
+    return transport.createRequestFactory(credential);
+  }
+
+  /** Starts logging datastore method calls to the console. (Useful within tests.) */
+  public static void logMethodCalls() {
+    Logger logger = Logger.getLogger(Datastore.class.getName());
+    logger.setLevel(Level.FINE);
+    if (!Arrays.asList(logger.getHandlers()).contains(getStreamHandler())) {
+      logger.addHandler(getStreamHandler());
+    }
+  }
+
+  /** Build a valid datastore URL. */
+  String buildProjectEndpoint(com.google.datastore.utils.DatastoreOptions options) {
+    if (options.getProjectEndpoint() != null) {
+      return options.getProjectEndpoint();
+    }
+    // DatastoreOptions ensures either project endpoint or project ID is set.
+    String projectId = checkNotNull(options.getProjectId());
+    if (options.getHost() != null) {
+      return validateUrl(
+          String.format("https://%s/%s/projects/%s", options.getHost(), VERSION, projectId));
+    } else if (options.getLocalHost() != null) {
+      return validateUrl(
+          String.format("http://%s/%s/projects/%s", options.getLocalHost(), VERSION, projectId));
+    }
+    return validateUrl(String.format("%s/%s/projects/%s", DEFAULT_HOST, VERSION, projectId));
+  }
+
+  protected com.google.datastore.utils.RemoteRpc newRemoteRpc(DatastoreOptions options) {
+    checkNotNull(options);
+    HttpRequestFactory client = makeClient(options);
+    return new com.google.datastore.utils.RemoteRpc(
+        client, options.getInitializer(), buildProjectEndpoint(options));
+  }
+
+  private static String validateUrl(String url) {
+    try {
+      return new URI(url).toString();
+    } catch (URISyntaxException e) {
+      throw new IllegalArgumentException(e);
+    }
+  }
+
+  // TODO: Support something other than console handler for when we're
+  // running in App Engine
+  private static synchronized StreamHandler getStreamHandler() {
+    if (methodHandler == null) {
+      methodHandler = new ConsoleHandler();
+      methodHandler.setFormatter(
+          new Formatter() {
+            @Override
+            public String format(LogRecord record) {
+              return record.getMessage() + "\n";
+            }
+          });
+      methodHandler.setLevel(Level.FINE);
+    }
+    return methodHandler;
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java
new file mode 100644
index 000000000000..a937dffad804
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java
@@ -0,0 +1,731 @@
+/*
+ * Copyright 2024 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.utils;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.gson.GsonFactory;
+import com.google.datastore.v1.ArrayValue;
+import com.google.datastore.v1.CompositeFilter;
+import com.google.datastore.v1.Entity;
+import com.google.datastore.v1.Filter;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.Key.PathElement;
+import com.google.datastore.v1.Key.PathElement.IdTypeCase;
+import com.google.datastore.v1.Mutation;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.PropertyFilter;
+import com.google.datastore.v1.PropertyOrder;
+import com.google.datastore.v1.PropertyReference;
+import com.google.datastore.v1.Value;
+import com.google.datastore.v1.Value.ValueTypeCase;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Timestamp;
+import com.google.protobuf.TimestampOrBuilder;
+import com.google.type.LatLng;
+import java.io.File;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.PrivateKey;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+
+/** Helper methods for {@link Datastore}. */
+// TODO: Accept OrBuilders when possible.
+public final class DatastoreHelper {
+  private static final Logger logger =
+      Logger.getLogger(com.google.datastore.utils.DatastoreHelper.class.getName());
+
+  private static final int MICROSECONDS_PER_SECOND = 1000 * 1000;
+  private static final int NANOSECONDS_PER_MICROSECOND = 1000;
+
+  /** The property used in the Datastore to give us a random distribution. * */
+  public static final String SCATTER_PROPERTY_NAME = "__scatter__";
+
+  /** The property used in the Datastore to get the key of the entity. * */
+  public static final String KEY_PROPERTY_NAME = "__key__";
+
+  /** Name of the environment variable used to set the project ID. */
+  public static final String PROJECT_ID_ENV_VAR = "DATASTORE_PROJECT_ID";
+
+  /** Name of the environment variable used to set the local host. */
+  public static final String LOCAL_HOST_ENV_VAR = "DATASTORE_EMULATOR_HOST";
+
+  /** Name of the environment variable used to set the service account. */
+  public static final String SERVICE_ACCOUNT_ENV_VAR = "DATASTORE_SERVICE_ACCOUNT";
+
+  /** Name of the environment variable used to set the private key file. */
+  public static final String PRIVATE_KEY_FILE_ENV_VAR = "DATASTORE_PRIVATE_KEY_FILE";
+
+  private static final String URL_OVERRIDE_ENV_VAR = "__DATASTORE_URL_OVERRIDE";
+
+  private static final AtomicReference projectIdFromComputeEngine = new AtomicReference<>();
+
+  /** Comparator for Keys */
+  private static final class KeyComparator implements Comparator {
+
+    static final com.google.datastore.utils.DatastoreHelper.KeyComparator INSTANCE =
+        new com.google.datastore.utils.DatastoreHelper.KeyComparator();
+
+    private int comparePathElement(PathElement thisElement, PathElement otherElement) {
+      int result = thisElement.getKind().compareTo(otherElement.getKind());
+      if (result != 0) {
+        return result;
+      }
+      if (thisElement.getIdTypeCase() == IdTypeCase.ID) {
+        if (otherElement.getIdTypeCase() != IdTypeCase.ID) {
+          return -1;
+        }
+        return Long.valueOf(thisElement.getId()).compareTo(otherElement.getId());
+      }
+      if (otherElement.getIdTypeCase() == IdTypeCase.ID) {
+        return 1;
+      }
+
+      return thisElement.getName().compareTo(otherElement.getName());
+    }
+
+    @Override
+    public int compare(Key thisKey, Key otherKey) {
+      if (!thisKey.getPartitionId().equals(otherKey.getPartitionId())) {
+        throw new IllegalArgumentException("Cannot compare keys with different partition ids.");
+      }
+
+      Iterator thisPath = thisKey.getPathList().iterator();
+      Iterator otherPath = otherKey.getPathList().iterator();
+      while (thisPath.hasNext()) {
+        if (!otherPath.hasNext()) {
+          return 1;
+        }
+        int result = comparePathElement(thisPath.next(), otherPath.next());
+        if (result != 0) {
+          return result;
+        }
+      }
+
+      return otherPath.hasNext() ? -1 : 0;
+    }
+  }
+
+  private DatastoreHelper() {}
+
+  private static HttpTransport newTransport() throws GeneralSecurityException, IOException {
+    return GoogleNetHttpTransport.newTrustedTransport();
+  }
+
+  static JsonFactory newJsonFactory() {
+    return new GsonFactory();
+  }
+
+  /**
+   * Constructs credentials for the given account and key.
+   *
+   * @param serviceAccountId service account ID (typically an e-mail address).
+   * @param privateKeyFile the file name from which to get the private key.
+   * @return valid credentials or {@code null}
+   */
+  public static Credential getServiceAccountCredential(
+      String serviceAccountId, String privateKeyFile) throws GeneralSecurityException, IOException {
+    return getServiceAccountCredential(serviceAccountId, privateKeyFile, DatastoreOptions.SCOPES);
+  }
+
+  /**
+   * Constructs credentials for the given account and key file.
+   *
+   * @param serviceAccountId service account ID (typically an e-mail address).
+   * @param privateKeyFile the file name from which to get the private key.
+   * @param serviceAccountScopes Collection of OAuth scopes to use with the the service account flow
+   *     or {@code null} if not.
+   * @return valid credentials or {@code null}
+   */
+  public static Credential getServiceAccountCredential(
+      String serviceAccountId, String privateKeyFile, Collection serviceAccountScopes)
+      throws GeneralSecurityException, IOException {
+    return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes)
+        .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile))
+        .build();
+  }
+
+  /**
+   * Constructs credentials for the given account and key.
+   *
+   * @param serviceAccountId service account ID (typically an e-mail address).
+   * @param privateKey the private key for the given account.
+   * @param serviceAccountScopes Collection of OAuth scopes to use with the the service account flow
+   *     or {@code null} if not.
+   * @return valid credentials or {@code null}
+   */
+  public static Credential getServiceAccountCredential(
+      String serviceAccountId, PrivateKey privateKey, Collection serviceAccountScopes)
+      throws GeneralSecurityException, IOException {
+    return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes)
+        .setServiceAccountPrivateKey(privateKey)
+        .build();
+  }
+
+  private static GoogleCredential.Builder getCredentialBuilderWithoutPrivateKey(
+      String serviceAccountId, Collection serviceAccountScopes)
+      throws GeneralSecurityException, IOException {
+    HttpTransport transport = newTransport();
+    JsonFactory jsonFactory = newJsonFactory();
+    return new GoogleCredential.Builder()
+        .setTransport(transport)
+        .setJsonFactory(jsonFactory)
+        .setServiceAccountId(serviceAccountId)
+        .setServiceAccountScopes(serviceAccountScopes);
+  }
+
+  /**
+   * Constructs a {@link Datastore} from environment variables and/or the Compute Engine metadata
+   * server.
+   *
+   * 
    The project ID is determined from, in order of preference:
+   *
+   * 
      
+   *   
    • DATASTORE_PROJECT_ID environment variable
+   *   
    • Compute Engine
+   * 
    
+   *
+   * 
    Credentials are taken from, in order of preference:
+   *
+   * 
      
+   *   
    1. No credentials (if the DATASTORE_EMULATOR_HOST environment variable is set)
+   *   
    2. Service Account specified by the DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE
+   *       environment variables
+   *   
    3. Google Application Default as described here.
+   * 
    
+   */
+  public static DatastoreOptions.Builder getOptionsFromEnv()
+      throws GeneralSecurityException, IOException {
+    DatastoreOptions.Builder options = new DatastoreOptions.Builder();
+    setProjectEndpointFromEnv(options);
+    options.credential(getCredentialFromEnv());
+    return options;
+  }
+
+  private static Credential getCredentialFromEnv() throws GeneralSecurityException, IOException {
+    if (System.getenv(LOCAL_HOST_ENV_VAR) != null) {
+      logger.log(
+          Level.INFO,
+          "{0} environment variable was set. Not using credentials.",
+          new Object[] {LOCAL_HOST_ENV_VAR});
+      return null;
+    }
+    String serviceAccount = System.getenv(SERVICE_ACCOUNT_ENV_VAR);
+    String privateKeyFile = System.getenv(PRIVATE_KEY_FILE_ENV_VAR);
+    if (serviceAccount != null && privateKeyFile != null) {
+      logger.log(
+          Level.INFO,
+          "{0} and {1} environment variables were set. " + "Using service account credential.",
+          new Object[] {SERVICE_ACCOUNT_ENV_VAR, PRIVATE_KEY_FILE_ENV_VAR});
+      return getServiceAccountCredential(serviceAccount, privateKeyFile);
+    }
+    return GoogleCredential.getApplicationDefault().createScoped(DatastoreOptions.SCOPES);
+  }
+
+  /**
+   * Determines the project id from the environment. Uses the following sources in order of
+   * preference:
+   *
+   * 
      
+   *   
    1. Value of the DATASTORE_PROJECT_ID environment variable
+   *   
    2. Compute Engine
+   * 
    
+   *
+   * @throws IllegalStateException if the project ID cannot be determined
+   */
+  private static String getProjectIdFromEnv() {
+    if (System.getenv(PROJECT_ID_ENV_VAR) != null) {
+      return System.getenv(PROJECT_ID_ENV_VAR);
+    }
+    String projectIdFromComputeEngine = getProjectIdFromComputeEngine();
+    if (projectIdFromComputeEngine != null) {
+      return projectIdFromComputeEngine;
+    }
+    throw new IllegalStateException(
+        String.format(
+            "Could not determine project ID."
+                + " If you are not running on Compute Engine, set the"
+                + " %s environment variable.",
+            PROJECT_ID_ENV_VAR));
+  }
+
+  /**
+   * Gets the project ID from the Compute Engine metadata server. Returns {@code null} if the
+   * project ID cannot be determined (because, for instance, the code is not running on Compute
+   * Engine).
+   */
+  @Nullable
+  public static String getProjectIdFromComputeEngine() {
+    String cachedProjectId = projectIdFromComputeEngine.get();
+    return cachedProjectId != null ? cachedProjectId : queryProjectIdFromComputeEngine();
+  }
+
+  @Nullable
+  private static String queryProjectIdFromComputeEngine() {
+    HttpTransport transport;
+
+    try {
+      transport = newTransport();
+    } catch (GeneralSecurityException | IOException e) {
+      logger.log(Level.WARNING, "Failed to create HttpTransport.", e);
+      return null;
+    }
+
+    try {
+      GenericUrl projectIdUrl =
+          new GenericUrl("http://metadata/computeMetadata/v1/project/project-id");
+      HttpRequest request = transport.createRequestFactory().buildGetRequest(projectIdUrl);
+      request.getHeaders().set("Metadata-Flavor", "Google");
+      String result = request.execute().parseAsString();
+      projectIdFromComputeEngine.set(result);
+      return result;
+    } catch (IOException e) {
+      logger.log(Level.INFO, "Could not determine project ID from Compute Engine.", e);
+      return null;
+    }
+  }
+
+  private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options) {
+    // DATASTORE_HOST is deprecated.
+    if (System.getenv("DATASTORE_HOST") != null) {
+      logger.warning(
+          String.format(
+              "Ignoring value of environment variable DATASTORE_HOST. "
+                  + "To point datastore to a host running locally, use "
+                  + "the environment variable %s.",
+              LOCAL_HOST_ENV_VAR));
+    }
+    String projectId = getProjectIdFromEnv();
+    if (System.getenv(URL_OVERRIDE_ENV_VAR) != null) {
+      options.projectEndpoint(
+          String.format("%s/projects/%s", System.getenv(URL_OVERRIDE_ENV_VAR), projectId));
+      return;
+    }
+    if (System.getenv(LOCAL_HOST_ENV_VAR) != null) {
+      options.projectId(projectId);
+      options.localHost(System.getenv(LOCAL_HOST_ENV_VAR));
+      return;
+    }
+    options.projectId(projectId);
+    return;
+  }
+
+  /**
+   * @see #getOptionsFromEnv()
+   */
+  public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException {
+    return DatastoreFactory.get().create(getOptionsFromEnv().build());
+  }
+
+  /**
+   * Gets a {@link com.google.datastore.utils.QuerySplitter}.
+   *
+   * 
    The returned {@link com.google.datastore.utils.QuerySplitter#getSplits} cannot accept a
+   * query that contains inequality filters, a sort filter, or a missing kind.
+   */
+  public static QuerySplitter getQuerySplitter() {
+    return com.google.datastore.utils.QuerySplitterImpl.INSTANCE;
+  }
+
+  public static Comparator getKeyComparator() {
+    return com.google.datastore.utils.DatastoreHelper.KeyComparator.INSTANCE;
+  }
+
+  /** Make a sort order for use in a query. */
+  public static PropertyOrder.Builder makeOrder(
+      String property, PropertyOrder.Direction direction) {
+    return PropertyOrder.newBuilder()
+        .setProperty(makePropertyReference(property))
+        .setDirection(direction);
+  }
+
+  /** Makes an ancestor filter. */
+  public static Filter.Builder makeAncestorFilter(Key ancestor) {
+    return makeFilter(
+        com.google.datastore.utils.DatastoreHelper.KEY_PROPERTY_NAME,
+        PropertyFilter.Operator.HAS_ANCESTOR,
+        makeValue(ancestor));
+  }
+
+  /** Make a filter on a property for use in a query. */
+  public static Filter.Builder makeFilter(
+      String property, PropertyFilter.Operator operator, Value value) {
+    return Filter.newBuilder()
+        .setPropertyFilter(
+            PropertyFilter.newBuilder()
+                .setProperty(makePropertyReference(property))
+                .setOp(operator)
+                .setValue(value));
+  }
+
+  /** Make a filter on a property for use in a query. */
+  public static Filter.Builder makeFilter(
+      String property, PropertyFilter.Operator operator, Value.Builder value) {
+    return makeFilter(property, operator, value.build());
+  }
+
+  /** Make a composite filter from the given sub-filters using AND to combine filters. */
+  public static Filter.Builder makeAndFilter(Filter... subfilters) {
+    return makeAndFilter(Arrays.asList(subfilters));
+  }
+
+  /** Make a composite filter from the given sub-filters using AND to combine filters. */
+  public static Filter.Builder makeAndFilter(Iterable subfilters) {
+    return Filter.newBuilder()
+        .setCompositeFilter(
+            CompositeFilter.newBuilder()
+                .addAllFilters(subfilters)
+                .setOp(CompositeFilter.Operator.AND));
+  }
+
+  /** Make a property reference for use in a query. */
+  public static PropertyReference.Builder makePropertyReference(String propertyName) {
+    return PropertyReference.newBuilder().setName(propertyName);
+  }
+
+  /** Make an array value containing the specified values. */
+  public static Value.Builder makeValue(Iterable values) {
+    return Value.newBuilder().setArrayValue(ArrayValue.newBuilder().addAllValues(values));
+  }
+
+  /** Make a list value containing the specified values. */
+  public static Value.Builder makeValue(Value value1, Value value2, Value... rest) {
+    ArrayValue.Builder arrayValue = ArrayValue.newBuilder();
+    arrayValue.addValues(value1);
+    arrayValue.addValues(value2);
+    arrayValue.addAllValues(Arrays.asList(rest));
+    return Value.newBuilder().setArrayValue(arrayValue);
+  }
+
+  /** Make an array value containing the specified values. */
+  public static Value.Builder makeValue(
+      Value.Builder value1, Value.Builder value2, Value.Builder... rest) {
+    ArrayValue.Builder arrayValue = ArrayValue.newBuilder();
+    arrayValue.addValues(value1);
+    arrayValue.addValues(value2);
+    for (Value.Builder builder : rest) {
+      arrayValue.addValues(builder);
+    }
+    return Value.newBuilder().setArrayValue(arrayValue);
+  }
+
+  /** Make a key value. */
+  public static Value.Builder makeValue(Key key) {
+    return Value.newBuilder().setKeyValue(key);
+  }
+
+  /** Make a key value. */
+  public static Value.Builder makeValue(Key.Builder key) {
+    return makeValue(key.build());
+  }
+
+  /** Make an integer value. */
+  public static Value.Builder makeValue(long key) {
+    return Value.newBuilder().setIntegerValue(key);
+  }
+
+  /** Make a floating point value. */
+  public static Value.Builder makeValue(double value) {
+    return Value.newBuilder().setDoubleValue(value);
+  }
+
+  /** Make a boolean value. */
+  public static Value.Builder makeValue(boolean value) {
+    return Value.newBuilder().setBooleanValue(value);
+  }
+
+  /** Make a string value. */
+  public static Value.Builder makeValue(String value) {
+    return Value.newBuilder().setStringValue(value);
+  }
+
+  /** Make an entity value. */
+  public static Value.Builder makeValue(Entity entity) {
+    return Value.newBuilder().setEntityValue(entity);
+  }
+
+  /** Make a entity value. */
+  public static Value.Builder makeValue(Entity.Builder entity) {
+    return makeValue(entity.build());
+  }
+
+  /** Make a ByteString value. */
+  public static Value.Builder makeValue(ByteString blob) {
+    return Value.newBuilder().setBlobValue(blob);
+  }
+
+  /** Make a timestamp value given a date. */
+  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;
+    if (microsecondsRemainder < 0) {
+      // Nanos must be positive even if microseconds is negative.
+      // Java modulus doesn't take care of this for us.
+      microsecondsRemainder += MICROSECONDS_PER_SECOND;
+      seconds -= 1;
+    }
+    return Timestamp.newBuilder()
+        .setSeconds(seconds)
+        .setNanos((int) microsecondsRemainder * NANOSECONDS_PER_MICROSECOND);
+  }
+
+  /**
+   * Make a key from the specified path of kind/id-or-name pairs and/or Keys.
+   *
+   * 
    The id-or-name values must be either String, Long, Integer or Short.
+   *
+   * 
    The last id-or-name value may be omitted, in which case an entity without an id is created
+   * (for use with automatic id allocation).
+   *
+   * 
    The PartitionIds of all Keys in the path must be equal. The returned Key.Builder will use
+   * this PartitionId.
+   */
+  public static Key.Builder makeKey(Object... elements) {
+    Key.Builder key = Key.newBuilder();
+    PartitionId partitionId = null;
+    for (int pathIndex = 0; pathIndex < elements.length; pathIndex += 2) {
+      PathElement.Builder pathElement = PathElement.newBuilder();
+      Object element = elements[pathIndex];
+      if (element instanceof Key) {
+        Key subKey = (Key) element;
+        if (partitionId == null) {
+          partitionId = subKey.getPartitionId();
+        } else if (!partitionId.equals(subKey.getPartitionId())) {
+          throw new IllegalArgumentException(
+              "Partition IDs did not match, found: "
+                  + partitionId
+                  + " and "
+                  + subKey.getPartitionId());
+        }
+        key.addAllPath(((Key) element).getPathList());
+        // We increment by 2, but since we got a Key argument we're only consuming 1 element in this
+        // iteration of the loop. Decrement the index so that when we jump by 2 we end up in the
+        // right spot.
+        pathIndex--;
+      } else {
+        String kind;
+        try {
+          kind = (String) element;
+        } catch (ClassCastException e) {
+          throw new IllegalArgumentException(
+              "Expected string or Key, got: " + element.getClass(), e);
+        }
+        pathElement.setKind(kind);
+        if (pathIndex + 1 < elements.length) {
+          Object value = elements[pathIndex + 1];
+          if (value instanceof String) {
+            pathElement.setName((String) value);
+          } else if (value instanceof Long) {
+            pathElement.setId((Long) value);
+          } else if (value instanceof Integer) {
+            pathElement.setId((Integer) value);
+          } else if (value instanceof Short) {
+            pathElement.setId((Short) value);
+          } else {
+            throw new IllegalArgumentException(
+                "Expected string or integer, got: " + value.getClass());
+          }
+        }
+        key.addPath(pathElement);
+      }
+    }
+    if (partitionId != null && !partitionId.equals(PartitionId.getDefaultInstance())) {
+      key.setPartitionId(partitionId);
+    }
+    return key;
+  }
+
+  /**
+   * @return the double contained in value
+   * @throws IllegalArgumentException if the value does not contain a double.
+   */
+  public static double getDouble(Value value) {
+    if (value.getValueTypeCase() != ValueTypeCase.DOUBLE_VALUE) {
+      throw new IllegalArgumentException("Value does not contain a double.");
+    }
+    return value.getDoubleValue();
+  }
+
+  /**
+   * @return the key contained in value
+   * @throws IllegalArgumentException if the value does not contain a key.
+   */
+  public static Key getKey(Value value) {
+    if (value.getValueTypeCase() != ValueTypeCase.KEY_VALUE) {
+      throw new IllegalArgumentException("Value does not contain a key.");
+    }
+    return value.getKeyValue();
+  }
+
+  /**
+   * @return the blob contained in value
+   * @throws IllegalArgumentException if the value does not contain a blob.
+   */
+  public static ByteString getByteString(Value value) {
+    if (value.getMeaning() == 18 && value.getValueTypeCase() == ValueTypeCase.STRING_VALUE) {
+      return value.getStringValueBytes();
+    } else if (value.getValueTypeCase() == ValueTypeCase.BLOB_VALUE) {
+      return value.getBlobValue();
+    }
+    throw new IllegalArgumentException("Value does not contain a blob.");
+  }
+
+  /**
+   * @return the entity contained in value
+   * @throws IllegalArgumentException if the value does not contain an entity.
+   */
+  public static Entity getEntity(Value value) {
+    if (value.getValueTypeCase() != ValueTypeCase.ENTITY_VALUE) {
+      throw new IllegalArgumentException("Value does not contain an Entity.");
+    }
+    return value.getEntityValue();
+  }
+
+  /**
+   * @return the string contained in value
+   * @throws IllegalArgumentException if the value does not contain a string.
+   */
+  public static String getString(Value value) {
+    if (value.getValueTypeCase() != ValueTypeCase.STRING_VALUE) {
+      throw new IllegalArgumentException("Value does not contain a string.");
+    }
+    return value.getStringValue();
+  }
+
+  /**
+   * @return the boolean contained in value
+   * @throws IllegalArgumentException if the value does not contain a boolean.
+   */
+  public static boolean getBoolean(Value value) {
+    if (value.getValueTypeCase() != ValueTypeCase.BOOLEAN_VALUE) {
+      throw new IllegalArgumentException("Value does not contain a boolean.");
+    }
+    return value.getBooleanValue();
+  }
+
+  /**
+   * @return the long contained in value
+   * @throws IllegalArgumentException if the value does not contain a long.
+   */
+  public static long getLong(Value value) {
+    if (value.getValueTypeCase() != ValueTypeCase.INTEGER_VALUE) {
+      throw new IllegalArgumentException("Value does not contain an integer.");
+    }
+    return value.getIntegerValue();
+  }
+
+  /**
+   * @return the timestamp in microseconds contained in value
+   * @throws IllegalArgumentException if the value does not contain a timestamp.
+   */
+  public static long getTimestamp(Value value) {
+    if (value.getMeaning() == 18 && value.getValueTypeCase() == ValueTypeCase.INTEGER_VALUE) {
+      return value.getIntegerValue();
+    } else if (value.getValueTypeCase() == ValueTypeCase.TIMESTAMP_VALUE) {
+      return toMicroseconds(value.getTimestampValue());
+    }
+    throw new IllegalArgumentException("Value does not contain a timestamp.");
+  }
+
+  private static long toMicroseconds(TimestampOrBuilder timestamp) {
+    // Nanosecond precision is lost.
+    return timestamp.getSeconds() * MICROSECONDS_PER_SECOND
+        + timestamp.getNanos() / NANOSECONDS_PER_MICROSECOND;
+  }
+
+  /**
+   * @return the array contained in value as a list.
+   * @throws IllegalArgumentException if the value does not contain an array.
+   */
+  public static List getList(Value value) {
+    if (value.getValueTypeCase() != ValueTypeCase.ARRAY_VALUE) {
+      throw new IllegalArgumentException("Value does not contain an array.");
+    }
+    return value.getArrayValue().getValuesList();
+  }
+
+  /**
+   * Convert a timestamp value into a {@link Date} clipping off the microseconds.
+   *
+   * @param value a timestamp value to convert
+   * @return the resulting {@link Date}
+   * @throws IllegalArgumentException if the value does not contain a timestamp.
+   */
+  public static Date toDate(Value value) {
+    return new Date(getTimestamp(value) / 1000);
+  }
+
+  /**
+   * @param entity the entity to insert
+   * @return a mutation that will insert an entity
+   */
+  public static Mutation.Builder makeInsert(Entity entity) {
+    return Mutation.newBuilder().setInsert(entity);
+  }
+
+  /**
+   * @param entity the entity to update
+   * @return a mutation that will update an entity
+   */
+  public static Mutation.Builder makeUpdate(Entity entity) {
+    return Mutation.newBuilder().setUpdate(entity);
+  }
+
+  /**
+   * @param entity the entity to upsert
+   * @return a mutation that will upsert an entity
+   */
+  public static Mutation.Builder makeUpsert(Entity entity) {
+    return Mutation.newBuilder().setUpsert(entity);
+  }
+
+  /**
+   * @param key the key of the entity to delete
+   * @return a mutation that will delete an entity
+   */
+  public static Mutation.Builder makeDelete(Key key) {
+    return Mutation.newBuilder().setDelete(key);
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java
new file mode 100644
index 000000000000..f6e91a41a5ae
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.http.HttpRequestInitializer;
+import com.google.api.client.http.HttpTransport;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * An immutable object containing settings for the datastore.
+ *
+ * 
    Example for connecting to a datastore:
+ *
+ * 
    + * DatastoreOptions options = new DatastoreOptions.Builder()
+ *     .projectId("my-project-id")
+ *     .credential(DatastoreHelper.getComputeEngineCredential())
+ *     .build();
+ * DatastoreFactory.get().create(options);
+ * 
    
+ *
+ * 
    The options should be passed to {@link DatastoreFactory#create}.
+ */
+public class DatastoreOptions {
+  private final String projectId;
+
+  private final String projectEndpoint;
+  private final String host;
+  private final String localHost;
+
+  private final HttpRequestInitializer initializer;
+
+  private final Credential credential;
+  private final HttpTransport transport;
+  public static final List SCOPES =
+      Arrays.asList("https://www.googleapis.com/auth/datastore");
+
+  DatastoreOptions(Builder b) {
+    checkArgument(
+        b.projectId != null || b.projectEndpoint != null,
+        "Either project ID or project endpoint must be provided.");
+    this.projectId = b.projectId;
+    this.projectEndpoint = b.projectEndpoint;
+    this.host = b.host;
+    this.localHost = b.localHost;
+    this.initializer = b.initializer;
+    this.credential = b.credential;
+    this.transport = b.transport;
+  }
+
+  /** Builder for {@link DatastoreOptions}. */
+  public static class Builder {
+    private static final String PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR =
+        "Cannot set both project endpoint and project ID.";
+    private static final String PROJECT_ENDPOINT_AND_HOST_ERROR =
+        "Can set at most one of project endpoint, host, and local host.";
+
+    private String projectId;
+
+    private String projectEndpoint;
+    private String host;
+    private String localHost;
+    private HttpRequestInitializer initializer;
+    private Credential credential;
+    private HttpTransport transport;
+
+    public Builder() {}
+
+    public Builder(DatastoreOptions options) {
+      this.projectId = options.projectId;
+      this.projectEndpoint = options.projectEndpoint;
+      this.host = options.host;
+      this.localHost = options.localHost;
+      this.initializer = options.initializer;
+      this.credential = options.credential;
+      this.transport = options.transport;
+    }
+
+    public DatastoreOptions build() {
+      return new DatastoreOptions(this);
+    }
+
+    /** Sets the project ID used to access Cloud Datastore. */
+    public Builder projectId(String projectId) {
+      checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR);
+      this.projectId = projectId;
+      return this;
+    }
+
+    /**
+     * Sets the host used to access Cloud Datastore. To connect to the Cloud Datastore Emulator, use
+     * {@link #localHost} instead.
+     */
+    public Builder host(String host) {
+      checkArgument(projectEndpoint == null && localHost == null, PROJECT_ENDPOINT_AND_HOST_ERROR);
+      if (includesScheme(host)) {
+        throw new IllegalArgumentException(
+            String.format("Host \"%s\" must not include scheme.", host));
+      }
+      this.host = host;
+      return this;
+    }
+
+    /**
+     * Configures the client to access Cloud Datastore on a local host (typically a Cloud Datastore
+     * Emulator instance). Call this method also configures the client not to attach credentials to
+     * requests.
+     */
+    public Builder localHost(String localHost) {
+      checkArgument(projectEndpoint == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR);
+      if (includesScheme(localHost)) {
+        throw new IllegalArgumentException(
+            String.format("Local host \"%s\" must not include scheme.", localHost));
+      }
+      this.localHost = localHost;
+      return this;
+    }
+
+    /**
+     * Sets the project endpoint used to access Cloud Datastore. Prefer using {@link #projectId}
+     * and/or {@link #host}/{@link #localHost} when possible.
+     *
+     * @deprecated Use {@link #projectId} and/or {@link #host}/{@link #localHost} instead.
+     */
+    @Deprecated
+    public Builder projectEndpoint(String projectEndpoint) {
+      checkArgument(projectId == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR);
+      checkArgument(localHost == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR);
+      if (!includesScheme(projectEndpoint)) {
+        throw new IllegalArgumentException(
+            String.format("Project endpoint \"%s\" must include scheme.", projectEndpoint));
+      }
+      this.projectEndpoint = projectEndpoint;
+      return this;
+    }
+
+    /** Sets the (optional) initializer to run on HTTP requests to Cloud Datastore. */
+    public Builder initializer(HttpRequestInitializer initializer) {
+      this.initializer = initializer;
+      return this;
+    }
+
+    /** Sets the Google APIs {@link Credential} used to access Cloud Datastore. */
+    public Builder credential(Credential credential) {
+      this.credential = credential;
+      return this;
+    }
+
+    /** Sets the transport used to access Cloud Datastore. */
+    public Builder transport(HttpTransport transport) {
+      this.transport = transport;
+      return this;
+    }
+
+    private static boolean includesScheme(String url) {
+      return url.startsWith("http://") || url.startsWith("https://");
+    }
+  }
+
+  public String getProjectId() {
+    return projectId;
+  }
+
+  public String getProjectEndpoint() {
+    return projectEndpoint;
+  }
+
+  public String getHost() {
+    return host;
+  }
+
+  public String getLocalHost() {
+    return localHost;
+  }
+
+  public HttpRequestInitializer getInitializer() {
+    return initializer;
+  }
+
+  public Credential getCredential() {
+    return credential;
+  }
+
+  public HttpTransport getTransport() {
+    return transport;
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java
new file mode 100644
index 000000000000..31d1fd7d542f
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2024 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.utils;
+
+import com.google.api.core.BetaApi;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.Query;
+import com.google.protobuf.Timestamp;
+import java.util.List;
+
+/** Provides the ability to split a query into multiple shards. */
+public interface QuerySplitter {
+
+  /**
+   * Returns a list of sharded {@link Query}s for the given query.
+   *
+   * 
    This will create up to the desired number of splits, however it may return less splits if
+   * the desired number of splits is unavailable. This will happen if the number of split points
+   * provided by the underlying Datastore is less than the desired number, which will occur if the
+   * number of results for the query is too small.
+   *
+   * @param query the query to split.
+   * @param partition the partition the query is running in.
+   * @param numSplits the desired number of splits.
+   * @param datastore the datastore to run on.
+   * @throws DatastoreException if there was a datastore error while generating query splits.
+   * @throws IllegalArgumentException if the given query or numSplits was invalid.
+   */
+  List getSplits(Query query, PartitionId partition, int numSplits, Datastore datastore)
+      throws DatastoreException;
+
+  /**
+   * Same as {@link #getSplits(Query, PartitionId, int, Datastore)} but the splits are based on
+   * {@code readTime}, and the returned sharded {@link Query}s should also be executed with {@code
+   * readTime}. Reading from a timestamp is currently a private preview feature in Datastore.
+   */
+  @BetaApi
+  default List getSplits(
+      Query query, PartitionId partition, int numSplits, Datastore datastore, Timestamp readTime)
+      throws DatastoreException {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java
new file mode 100644
index 000000000000..ac2a6557e515
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static com.google.datastore.utils.DatastoreHelper.makeAndFilter;
+
+import com.google.api.core.BetaApi;
+import com.google.datastore.v1.EntityResult;
+import com.google.datastore.v1.Filter;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.Projection;
+import com.google.datastore.v1.PropertyFilter;
+import com.google.datastore.v1.PropertyFilter.Operator;
+import com.google.datastore.v1.PropertyOrder.Direction;
+import com.google.datastore.v1.PropertyReference;
+import com.google.datastore.v1.Query;
+import com.google.datastore.v1.QueryResultBatch;
+import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
+import com.google.datastore.v1.ReadOptions;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.protobuf.Timestamp;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import javax.annotation.Nullable;
+
+/**
+ * Provides the ability to split a query into multiple shards using Cloud Datastore.
+ *
+ * 
    This implementation of the QuerySplitter uses the __scatter__ property to gather random split
+ * points for a query.
+ */
+final class QuerySplitterImpl implements QuerySplitter {
+
+  /** The number of keys to sample for each split. * */
+  private static final int KEYS_PER_SPLIT = 32;
+
+  private static final EnumSet UNSUPPORTED_OPERATORS =
+      EnumSet.of(
+          Operator.LESS_THAN,
+          Operator.LESS_THAN_OR_EQUAL,
+          Operator.GREATER_THAN,
+          Operator.GREATER_THAN_OR_EQUAL);
+
+  static final QuerySplitter INSTANCE = new QuerySplitterImpl();
+
+  private QuerySplitterImpl() {
+    // No initialization required.
+  }
+
+  @Override
+  public List getSplits(
+      Query query, PartitionId partition, int numSplits, Datastore datastore)
+      throws DatastoreException, IllegalArgumentException {
+    return getSplitsInternal(query, partition, numSplits, datastore, null);
+  }
+
+  @BetaApi
+  @Override
+  public List getSplits(
+      Query query, PartitionId partition, int numSplits, Datastore datastore, Timestamp readTime)
+      throws DatastoreException, IllegalArgumentException {
+    return getSplitsInternal(query, partition, numSplits, datastore, readTime);
+  }
+
+  private List getSplitsInternal(
+      Query query,
+      PartitionId partition,
+      int numSplits,
+      Datastore datastore,
+      @Nullable Timestamp readTime)
+      throws DatastoreException, IllegalArgumentException {
+    List splits = new ArrayList(numSplits);
+    if (numSplits == 1) {
+      splits.add(query);
+      return splits;
+    }
+    validateQuery(query);
+    validateSplitSize(numSplits);
+
+    List scatterKeys = getScatterKeys(numSplits, query, partition, datastore, readTime);
+    Key lastKey = null;
+    for (Key nextKey : getSplitKey(scatterKeys, numSplits)) {
+      splits.add(createSplit(lastKey, nextKey, query));
+      lastKey = nextKey;
+    }
+    splits.add(createSplit(lastKey, null, query));
+    return splits;
+  }
+
+  /**
+   * Verify that the given number of splits is not out of bounds.
+   *
+   * @param numSplits the number of splits.
+   * @throws IllegalArgumentException if the split size is invalid.
+   */
+  private void validateSplitSize(int numSplits) throws IllegalArgumentException {
+    if (numSplits < 1) {
+      throw new IllegalArgumentException("The number of splits must be greater than 0.");
+    }
+  }
+
+  /**
+   * Validates that we only have allowable filters.
+   *
+   * 
    Note that equality and ancestor filters are allowed, however they may result in inefficient
+   * sharding.
+   */
+  private void validateFilter(Filter filter) throws IllegalArgumentException {
+    switch (filter.getFilterTypeCase()) {
+      case COMPOSITE_FILTER:
+        for (Filter subFilter : filter.getCompositeFilter().getFiltersList()) {
+          validateFilter(subFilter);
+        }
+        break;
+      case PROPERTY_FILTER:
+        if (UNSUPPORTED_OPERATORS.contains(filter.getPropertyFilter().getOp())) {
+          throw new IllegalArgumentException("Query cannot have any inequality filters.");
+        }
+        break;
+      default:
+        throw new IllegalArgumentException(
+            "Unsupported filter type: " + filter.getFilterTypeCase());
+    }
+  }
+
+  /**
+   * Verifies that the given query can be properly scattered.
+   *
+   * @param query the query to verify
+   * @throws IllegalArgumentException if the query is invalid.
+   */
+  private void validateQuery(Query query) throws IllegalArgumentException {
+    if (query.getKindCount() != 1) {
+      throw new IllegalArgumentException("Query must have exactly one kind.");
+    }
+    if (query.getOrderCount() != 0) {
+      throw new IllegalArgumentException("Query cannot have any sort orders.");
+    }
+    if (query.hasFilter()) {
+      validateFilter(query.getFilter());
+    }
+  }
+
+  /**
+   * Create a new {@link Query} given the query and range.
+   *
+   * @param lastKey the previous key. If null then assumed to be the beginning.
+   * @param nextKey the next key. If null then assumed to be the end.
+   * @param query the desired query.
+   */
+  private Query createSplit(Key lastKey, Key nextKey, Query query) {
+    if (lastKey == null && nextKey == null) {
+      return query;
+    }
+    List keyFilters = new ArrayList();
+    if (query.hasFilter()) {
+      keyFilters.add(query.getFilter());
+    }
+    if (lastKey != null) {
+      Filter lowerBound =
+          DatastoreHelper.makeFilter(
+                  DatastoreHelper.KEY_PROPERTY_NAME,
+                  PropertyFilter.Operator.GREATER_THAN_OR_EQUAL,
+                  DatastoreHelper.makeValue(lastKey))
+              .build();
+      keyFilters.add(lowerBound);
+    }
+    if (nextKey != null) {
+      Filter upperBound =
+          DatastoreHelper.makeFilter(
+                  DatastoreHelper.KEY_PROPERTY_NAME,
+                  PropertyFilter.Operator.LESS_THAN,
+                  DatastoreHelper.makeValue(nextKey))
+              .build();
+      keyFilters.add(upperBound);
+    }
+    return Query.newBuilder(query).setFilter(makeAndFilter(keyFilters)).build();
+  }
+
+  /**
+   * Gets a list of split keys given a desired number of splits.
+   *
+   * 
    This list will contain multiple split keys for each split. Only a single split key will be
+   * chosen as the split point, however providing multiple keys allows for more uniform sharding.
+   *
+   * @param numSplits the number of desired splits.
+   * @param query the user query.
+   * @param partition the partition to run the query in.
+   * @param datastore the datastore containing the data.
+   * @param readTime read time at which to get the split keys from the datastore.
+   * @throws com.google.datastore.utils.DatastoreException if there was an error when executing the
+   *     datastore query.
+   */
+  private List getScatterKeys(
+      int numSplits,
+      Query query,
+      PartitionId partition,
+      Datastore datastore,
+      @Nullable Timestamp readTime)
+      throws DatastoreException {
+    Query.Builder scatterPointQuery = createScatterQuery(query, numSplits);
+
+    List keySplits = new ArrayList();
+
+    QueryResultBatch batch;
+    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());
+      }
+      batch = datastore.runQuery(scatterRequest.build()).getBatch();
+      for (EntityResult result : batch.getEntityResultsList()) {
+        keySplits.add(result.getEntity().getKey());
+      }
+      scatterPointQuery.setStartCursor(batch.getEndCursor());
+      scatterPointQuery
+          .getLimitBuilder()
+          .setValue(scatterPointQuery.getLimit().getValue() - batch.getEntityResultsCount());
+    } while (batch.getMoreResults() == MoreResultsType.NOT_FINISHED);
+    Collections.sort(keySplits, DatastoreHelper.getKeyComparator());
+    return keySplits;
+  }
+
+  /**
+   * Creates a scatter query from the given user query
+   *
+   * @param query the user's query.
+   * @param numSplits the number of splits to create.
+   */
+  private Query.Builder createScatterQuery(Query query, int numSplits) {
+    // TODO(pcostello): We can potentially support better splits with equality filters in our query
+    // if there exists a composite index on property, __scatter__, __key__. Until an API for
+    // metadata exists, this isn't possible. Note that ancestor and inequality queries fall into
+    // the same category.
+    Query.Builder scatterPointQuery = Query.newBuilder();
+    scatterPointQuery.addAllKind(query.getKindList());
+    scatterPointQuery.addOrder(
+        DatastoreHelper.makeOrder(DatastoreHelper.SCATTER_PROPERTY_NAME, Direction.ASCENDING));
+    // There is a split containing entities before and after each scatter entity:
+    // ||---*------*------*------*------*------*------*---||  = scatter entity
+    // If we represent each split as a region before a scatter entity, there is an extra region
+    // following the last scatter point. Thus, we do not need the scatter entities for the last
+    // region.
+    scatterPointQuery.getLimitBuilder().setValue((numSplits - 1) * KEYS_PER_SPLIT);
+    scatterPointQuery.addProjection(
+        Projection.newBuilder().setProperty(PropertyReference.newBuilder().setName("__key__")));
+    return scatterPointQuery;
+  }
+
+  /**
+   * Given a list of keys and a number of splits find the keys to split on.
+   *
+   * @param keys the list of keys.
+   * @param numSplits the number of splits.
+   */
+  private Iterable getSplitKey(List keys, int numSplits) {
+    // If the number of keys is less than the number of splits, we are limited in the number of
+    // splits we can make.
+    if (keys.size() < numSplits - 1) {
+      return keys;
+    }
+
+    // Calculate the number of keys per split. This should be KEYS_PER_SPLIT, but may
+    // be less if there are not KEYS_PER_SPLIT * (numSplits - 1) scatter entities.
+    //
+    // Consider the following dataset, where - represents an entity and * represents an entity
+    // that is returned as a scatter entity:
+    // ||---*-----*----*-----*-----*------*----*----||
+    // If we want 4 splits in this data, the optimal split would look like:
+    // ||---*-----*----*-----*-----*------*----*----||
+    //            |          |            |
+    // The scatter keys in the last region are not useful to us, so we never request them:
+    // ||---*-----*----*-----*-----*------*---------||
+    //            |          |            |
+    // With 6 scatter keys we want to set scatter points at indexes: 1, 3, 5.
+    //
+    // We keep this as a double so that any "fractional" keys per split get distributed throughout
+    // the splits and don't make the last split significantly larger than the rest.
+    double numKeysPerSplit = Math.max(1.0, ((double) keys.size()) / (numSplits - 1));
+
+    List keysList = new ArrayList(numSplits - 1);
+    // Grab the last sample for each split, otherwise the first split will be too small.
+    for (int i = 1; i < numSplits; i++) {
+      int splitIndex = (int) Math.round(i * numKeysPerSplit) - 1;
+      keysList.add(keys.get(splitIndex));
+    }
+
+    return keysList;
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java
new file mode 100644
index 000000000000..492936e15f2b
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2024 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.utils;
+
+import com.google.api.client.http.*;
+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;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.SocketTimeoutException;
+import java.nio.charset.Charset;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Logger;
+
+/**
+ * An RPC transport that sends protocol buffers over HTTP.
+ *
+ * 
    This class is thread-safe.
+ */
+class RemoteRpc {
+  private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName());
+
+  @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;
+  private final AtomicInteger rpcCount = new AtomicInteger(0);
+  // Not final - so it can be set/reset in Unittests
+  private static boolean enableE2EChecksum =
+      Boolean.parseBoolean(System.getenv("GOOGLE_CLOUD_DATASTORE_HTTP_ENABLE_E2E_CHECKSUM"));
+
+  RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) {
+    this.client = client;
+    this.initializer = initializer;
+    this.url = url;
+    try {
+      resolveURL("dummyRpc");
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Unable to construct RemoteRpc due to unsupported url: <" + url + ">", e);
+    }
+  }
+
+  /**
+   * Makes an RPC call using the client. Logs how long it took and any exceptions.
+   *
+   * 
    NOTE: The request could be an InputStream too, but the http client will need to find its
+   * length, which will require buffering it anyways.
+   *
+   * @throws com.google.datastore.utils.DatastoreException if the RPC fails.
+   */
+  public InputStream call(
+      String methodName, MessageLite request, String projectId, String databaseId)
+      throws com.google.datastore.utils.DatastoreException {
+    logger.fine("remote datastore call " + methodName);
+
+    long startTime = System.currentTimeMillis();
+    try {
+      HttpResponse httpResponse;
+      try {
+        rpcCount.incrementAndGet();
+        ProtoHttpContent payload = new ProtoHttpContent(request);
+        HttpRequest httpRequest = client.buildPostRequest(resolveURL(methodName), payload);
+        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);
+        // Datastore requests typically time out after 60s; set the read timeout to slightly longer
+        // than that by default (can be overridden via the HttpRequestInitializer).
+        httpRequest.setReadTimeout(65 * 1000);
+        if (initializer != null) {
+          initializer.initialize(httpRequest);
+        }
+        httpResponse = httpRequest.execute();
+        if (!httpResponse.isSuccessStatusCode()) {
+          try (InputStream content = httpResponse.getContent()) {
+            throw makeException(
+                url,
+                methodName,
+                content,
+                httpResponse.getContentType(),
+                httpResponse.getContentCharset(),
+                null,
+                httpResponse.getStatusCode());
+          }
+        }
+        InputStream inputStream = httpResponse.getContent();
+        return inputStream;
+      } catch (SocketTimeoutException e) {
+        throw makeException(url, methodName, Code.DEADLINE_EXCEEDED, "Deadline exceeded", e);
+      } catch (IOException e) {
+        throw makeException(url, methodName, Code.UNAVAILABLE, "I/O error", e);
+      }
+    } finally {
+      long elapsedTime = System.currentTimeMillis() - startTime;
+      logger.fine("remote datastore call " + methodName + " took " + elapsedTime + " ms");
+    }
+  }
+
+  @VisibleForTesting
+  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());
+  }
+
+  @VisibleForTesting
+  HttpRequestFactory getClient() {
+    return client;
+  }
+
+  @VisibleForTesting
+  static void setSystemEnvE2EChecksum(boolean enableE2EChecksum) {
+    RemoteRpc.enableE2EChecksum = enableE2EChecksum;
+  }
+
+  void resetRpcCount() {
+    rpcCount.set(0);
+  }
+
+  int getRpcCount() {
+    return rpcCount.get();
+  }
+
+  public String getUrl() {
+    return url;
+  }
+
+  GenericUrl resolveURL(String path) {
+    return new GenericUrl(url + ":" + path);
+  }
+
+  HttpRequestFactory getHttpRequestFactory() {
+    return client;
+  }
+
+  public static com.google.datastore.utils.DatastoreException makeException(
+      String url, String methodName, Code code, String message, Throwable cause) {
+    logger.fine("remote datastore call " + methodName + " against " + url + " failed: " + message);
+    return new com.google.datastore.utils.DatastoreException(methodName, code, message, cause);
+  }
+
+  static DatastoreException makeException(
+      String url,
+      String methodName,
+      InputStream content,
+      String contentType,
+      Charset contentCharset,
+      Throwable cause,
+      int httpStatusCode) {
+    if (!contentType.equals("application/x-protobuf")) {
+      String responseContent;
+      try {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IOUtils.copy(content, out, false);
+        responseContent = out.toString(contentCharset.name());
+      } catch (IOException e) {
+        responseContent = "";
+      }
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
+          String.format(
+              "Non-protobuf error: %s. HTTP status code was %d.", responseContent, httpStatusCode),
+          cause);
+    }
+
+    Status rpcStatus;
+    try {
+      rpcStatus = Status.parseFrom(content);
+    } catch (IOException e) {
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
+          String.format(
+              "Unable to parse Status protocol buffer: HTTP status code was %s.", httpStatusCode),
+          e);
+    }
+
+    Code code = Code.forNumber(rpcStatus.getCode());
+    if (code == null) {
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
+          String.format(
+              "Invalid error code: %d. Message: %s.", rpcStatus.getCode(), rpcStatus.getMessage()),
+          cause);
+    } else if (code == Code.OK) {
+      // We can end up here because there was no response body (and we successfully parsed an
+      // empty Status message). This may happen for 401s in particular due to special handling
+      // in low-level HTTP libraries.
+      if (httpStatusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {
+        return makeException(url, methodName, Code.UNAUTHENTICATED, "Unauthenticated.", cause);
+      }
+      return makeException(
+          url,
+          methodName,
+          Code.INTERNAL,
+          String.format(
+              "Unexpected OK error code with HTTP status code of %d. Message: %s.",
+              httpStatusCode, rpcStatus.getMessage()),
+          cause);
+    }
+
+    return makeException(url, methodName, code, rpcStatus.getMessage(), cause);
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java
new file mode 100644
index 000000000000..d5d16bb65881
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java
@@ -0,0 +1,36 @@
+/*
+ * 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.utils.testing;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.http.HttpRequest;
+import java.io.IOException;
+
+/** Fake credential used for testing purpose. */
+public class MockCredential extends Credential {
+  public MockCredential() {
+    super(
+        new AccessMethod() {
+          @Override
+          public void intercept(HttpRequest request, String accessToken) throws IOException {}
+
+          @Override
+          public String getAccessTokenFromRequest(HttpRequest request) {
+            return "MockAccessToken";
+          }
+        });
+  }
+}
diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java
new file mode 100644
index 000000000000..d4dd5caefd13
--- /dev/null
+++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java
@@ -0,0 +1,132 @@
+/*
+ * 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.utils.testing;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.http.*;
+import com.google.api.client.testing.http.MockHttpTransport;
+import com.google.api.client.testing.http.MockLowLevelHttpRequest;
+import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import com.google.api.client.testing.util.TestableByteArrayInputStream;
+import com.google.common.collect.Iterables;
+import com.google.datastore.utils.DatastoreFactory;
+import com.google.datastore.utils.DatastoreOptions;
+import com.google.protobuf.Message;
+import com.google.rpc.Code;
+import com.google.rpc.Status;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+/** Fake Datastore factory used for testing purposes when a true Datastore service is not needed. */
+public class MockDatastoreFactory extends DatastoreFactory {
+  private int nextStatus;
+  private Message nextResponse;
+  private Status nextError;
+  private IOException nextException;
+
+  private String lastPath;
+  private String lastMimeType;
+  private byte[] lastBody;
+  private List lastCookies;
+  private String lastApiFormatHeaderValue;
+
+  public void setNextResponse(Message response) {
+    nextStatus = HttpStatusCodes.STATUS_CODE_OK;
+    nextResponse = response;
+    nextError = null;
+    nextException = null;
+  }
+
+  public void setNextError(int status, Code code, String message) {
+    nextStatus = status;
+    nextResponse = null;
+    nextError = makeErrorContent(message, code);
+    nextException = null;
+  }
+
+  public void setNextException(IOException exception) {
+    nextStatus = 0;
+    nextResponse = null;
+    nextError = null;
+    nextException = exception;
+  }
+
+  @Override
+  public HttpRequestFactory makeClient(DatastoreOptions options) {
+    HttpTransport transport =
+        new MockHttpTransport() {
+          @Override
+          public LowLevelHttpRequest buildRequest(String method, String url) {
+            return new MockLowLevelHttpRequest(url) {
+              @Override
+              public LowLevelHttpResponse execute() throws IOException {
+                lastPath = new GenericUrl(getUrl()).getRawPath();
+                lastMimeType = getContentType();
+                lastCookies = getHeaderValues("Cookie");
+                lastApiFormatHeaderValue =
+                    Iterables.getOnlyElement(getHeaderValues("X-Goog-Api-Format-Version"));
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                getStreamingContent().writeTo(out);
+                lastBody = out.toByteArray();
+                if (nextException != null) {
+                  throw nextException;
+                }
+                MockLowLevelHttpResponse response =
+                    new MockLowLevelHttpResponse()
+                        .setStatusCode(nextStatus)
+                        .setContentType("application/x-protobuf");
+                if (nextError != null) {
+                  checkState(nextResponse == null);
+                  response.setContent(new TestableByteArrayInputStream(nextError.toByteArray()));
+                } else {
+                  response.setContent(new TestableByteArrayInputStream(nextResponse.toByteArray()));
+                }
+                return response;
+              }
+            };
+          }
+        };
+    Credential credential = options.getCredential();
+    return transport.createRequestFactory(credential);
+  }
+
+  public String getLastPath() {
+    return lastPath;
+  }
+
+  public String getLastMimeType() {
+    return lastMimeType;
+  }
+
+  public String getLastApiFormatHeaderValue() {
+    return lastApiFormatHeaderValue;
+  }
+
+  public byte[] getLastBody() {
+    return lastBody;
+  }
+
+  public List getLastCookies() {
+    return lastCookies;
+  }
+
+  private static Status makeErrorContent(String message, Code code) {
+    return Status.newBuilder().setCode(code.getNumber()).setMessage(message).build();
+  }
+}
diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java
new file mode 100644
index 000000000000..31b0f6440e86
--- /dev/null
+++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.fail;
+
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpRequestInitializer;
+import com.google.datastore.utils.testing.MockCredential;
+import com.google.datastore.utils.testing.MockDatastoreFactory;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.EntityResult;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.QueryResultBatch;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Message;
+import com.google.rpc.Code;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.SocketTimeoutException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link DatastoreFactory} and {@link Datastore}. */
+@RunWith(JUnit4.class)
+public class DatastoreClientTest {
+  private static final String PROJECT_ID = "project-id";
+
+  private DatastoreFactory factory = new MockDatastoreFactory();
+  private DatastoreOptions.Builder options =
+      new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(new MockCredential());
+
+  @Test
+  public void options_NoProjectIdOrProjectEndpoint() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> factory.create(new DatastoreOptions.Builder().build()));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Either project ID or project endpoint must be provided");
+    factory.create(options.build());
+  }
+
+  @Test
+  public void options_ProjectIdAndProjectEndpoint() throws Exception {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .projectId(PROJECT_ID)
+                    .projectEndpoint(
+                        "http://localhost:1234/datastore/v1beta42/projects/project-id"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Cannot set both project endpoint and project ID");
+  }
+
+  @Test
+  public void options_LocalHostAndProjectEndpoint() throws Exception {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .localHost("localhost:8080")
+                    .projectEndpoint(
+                        "http://localhost:1234/datastore/v1beta42/projects/project-id"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Can set at most one of project endpoint, host, and local host");
+  }
+
+  @Test
+  public void options_HostAndProjectEndpoint() throws Exception {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .host("foo-datastore.googleapis.com")
+                    .projectEndpoint(
+                        "http://localhost:1234/datastore/v1beta42/projects/project-id"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Can set at most one of project endpoint, host, and local host");
+  }
+
+  @Test
+  public void options_HostAndLocalHost() throws Exception {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new DatastoreOptions.Builder()
+                    .host("foo-datastore.googleapis.com")
+                    .localHost("localhost:8080"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Can set at most one of project endpoint, host, and local host");
+  }
+
+  @Test
+  public void options_InvalidLocalHost() throws Exception {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                factory.create(
+                    new DatastoreOptions.Builder()
+                        .projectId(PROJECT_ID)
+                        .localHost("!not a valid url!")
+                        .build()));
+    assertThat(exception).hasMessageThat().contains("Illegal character");
+  }
+
+  @Test
+  public void options_SchemeInLocalHost() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DatastoreOptions.Builder().localHost("http://localhost:8080"));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Local host \"http://localhost:8080\" must not include scheme");
+  }
+
+  @Test
+  public void options_InvalidHost() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                factory.create(
+                    new DatastoreOptions.Builder()
+                        .projectId(PROJECT_ID)
+                        .host("!not a valid url!")
+                        .build()));
+    assertThat(exception).hasMessageThat().contains("Illegal character");
+  }
+
+  @Test
+  public void options_SchemeInHost() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DatastoreOptions.Builder().host("http://foo-datastore.googleapis.com"));
+
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Host \"http://foo-datastore.googleapis.com\" must not include scheme.");
+  }
+
+  @Test
+  public void create_NullOptions() throws Exception {
+    assertThrows(NullPointerException.class, () -> factory.create(null));
+  }
+
+  @Test
+  public void create_Host() {
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectId(PROJECT_ID)
+                .host("foo-datastore.googleapis.com")
+                .build());
+    assertThat(datastore.remoteRpc.getUrl())
+        .isEqualTo("https://foo-datastore.googleapis.com/v1/projects/project-id");
+  }
+
+  @Test
+  public void create_LocalHost() {
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectId(PROJECT_ID)
+                .localHost("localhost:8080")
+                .build());
+    assertThat(datastore.remoteRpc.getUrl())
+        .isEqualTo("http://localhost:8080/v1/projects/project-id");
+  }
+
+  @Test
+  public void create_LocalHostIp() {
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectId(PROJECT_ID)
+                .localHost("127.0.0.1:8080")
+                .build());
+    assertThat(datastore.remoteRpc.getUrl())
+        .isEqualTo("http://127.0.0.1:8080/v1/projects/project-id");
+  }
+
+  @Test
+  public void create_DefaultHost() {
+    Datastore datastore =
+        factory.create(new DatastoreOptions.Builder().projectId(PROJECT_ID).build());
+    assertThat(datastore.remoteRpc.getUrl())
+        .isEqualTo("https://datastore.googleapis.com/v1/projects/project-id");
+  }
+
+  @Test
+  public void create_ProjectEndpoint() {
+    Datastore datastore =
+        factory.create(
+            new DatastoreOptions.Builder()
+                .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id")
+                .build());
+    assertThat(datastore.remoteRpc.getUrl())
+        .isEqualTo("http://prom-qa/datastore/v1beta42/projects/project-id");
+  }
+
+  @Test
+  public void create_ProjectEndpointNoScheme() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                factory.create(
+                    new DatastoreOptions.Builder()
+                        .projectEndpoint("localhost:1234/datastore/v1beta42/projects/project-id")
+                        .build()));
+    assertThat(exception)
+        .hasMessageThat()
+        .contains(
+            "Project endpoint \"localhost:1234/datastore/v1beta42/projects/project-id\" must"
+                + " include scheme.");
+  }
+
+  @Test
+  public void initializer() throws Exception {
+    options.initializer(
+        new HttpRequestInitializer() {
+          @Override
+          public void initialize(HttpRequest request) {
+            request.getHeaders().setCookie("magic");
+          }
+        });
+    Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+    AllocateIdsRequest request = AllocateIdsRequest.newBuilder().build();
+    AllocateIdsResponse response = AllocateIdsResponse.newBuilder().build();
+    mockClient.setNextResponse(response);
+    assertEquals(response, datastore.allocateIds(request));
+    assertEquals("magic", mockClient.getLastCookies().get(0));
+  }
+
+  @Test
+  public void allocateIds() throws Exception {
+    AllocateIdsRequest.Builder request = AllocateIdsRequest.newBuilder();
+    AllocateIdsResponse.Builder response = AllocateIdsResponse.newBuilder();
+    expectRpc("allocateIds", request.build(), response.build());
+  }
+
+  @Test
+  public void lookup() throws Exception {
+    LookupRequest.Builder request = LookupRequest.newBuilder();
+    LookupResponse.Builder response = LookupResponse.newBuilder();
+    expectRpc("lookup", request.build(), response.build());
+  }
+
+  @Test
+  public void beginTransaction() throws Exception {
+    BeginTransactionRequest.Builder request = BeginTransactionRequest.newBuilder();
+    BeginTransactionResponse.Builder response = BeginTransactionResponse.newBuilder();
+    response.setTransaction(ByteString.copyFromUtf8("project-id"));
+    expectRpc("beginTransaction", request.build(), response.build());
+  }
+
+  @Test
+  public void commit() throws Exception {
+    CommitRequest.Builder request = CommitRequest.newBuilder();
+    request.setTransaction(ByteString.copyFromUtf8("project-id"));
+    CommitResponse.Builder response = CommitResponse.newBuilder();
+    expectRpc("commit", request.build(), response.build());
+  }
+
+  @Test
+  public void reserveIds() throws Exception {
+    ReserveIdsRequest.Builder request = ReserveIdsRequest.newBuilder();
+    ReserveIdsResponse.Builder response = ReserveIdsResponse.newBuilder();
+    expectRpc("reserveIds", request.build(), response.build());
+  }
+
+  @Test
+  public void rollback() throws Exception {
+    RollbackRequest.Builder request = RollbackRequest.newBuilder();
+    request.setTransaction(ByteString.copyFromUtf8("project-id"));
+    RollbackResponse.Builder response = RollbackResponse.newBuilder();
+    expectRpc("rollback", request.build(), response.build());
+  }
+
+  @Test
+  public void runQuery() throws Exception {
+    RunQueryRequest.Builder request = RunQueryRequest.newBuilder();
+    request.getQueryBuilder();
+    RunQueryResponse.Builder response = RunQueryResponse.newBuilder();
+    response
+        .getBatchBuilder()
+        .setEntityResultType(EntityResult.ResultType.FULL)
+        .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED);
+    expectRpc("runQuery", request.build(), response.build());
+  }
+
+  @Test
+  public void runAggregationQuery() throws Exception {
+    RunAggregationQueryRequest.Builder request = RunAggregationQueryRequest.newBuilder();
+    RunAggregationQueryResponse.Builder response = RunAggregationQueryResponse.newBuilder();
+    expectRpc("runAggregationQuery", request.build(), response.build());
+  }
+
+  private void expectRpc(String methodName, Message request, Message response) throws Exception {
+    Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+    mockClient.setNextResponse(response);
+    @SuppressWarnings("rawtypes")
+    Class[] methodArgs = {request.getClass()};
+    Method call = Datastore.class.getMethod(methodName, methodArgs);
+    Object[] callArgs = {request};
+    assertEquals(response, call.invoke(datastore, callArgs));
+
+    assertEquals("/v1/projects/project-id:" + methodName, mockClient.getLastPath());
+    assertEquals("application/x-protobuf", mockClient.getLastMimeType());
+    assertEquals("2", mockClient.getLastApiFormatHeaderValue());
+    assertArrayEquals(request.toByteArray(), mockClient.getLastBody());
+    assertEquals(1, datastore.getRpcCount());
+
+    datastore.resetRpcCount();
+    assertEquals(0, datastore.getRpcCount());
+
+    mockClient.setNextError(400, Code.INVALID_ARGUMENT, "oops");
+    try {
+      call.invoke(datastore, callArgs);
+      fail();
+    } catch (InvocationTargetException targetException) {
+      DatastoreException exception = (DatastoreException) targetException.getCause();
+      assertEquals(Code.INVALID_ARGUMENT, exception.getCode());
+      assertEquals(methodName, exception.getMethodName());
+      assertEquals("oops", exception.getMessage());
+    }
+
+    SocketTimeoutException socketTimeoutException = new SocketTimeoutException("ste");
+    mockClient.setNextException(socketTimeoutException);
+    try {
+      call.invoke(datastore, callArgs);
+      fail();
+    } catch (InvocationTargetException targetException) {
+      DatastoreException exception = (DatastoreException) targetException.getCause();
+      assertEquals(Code.DEADLINE_EXCEEDED, exception.getCode());
+      assertEquals(methodName, exception.getMethodName());
+      assertEquals("Deadline exceeded", exception.getMessage());
+      assertSame(socketTimeoutException, exception.getCause());
+    }
+
+    IOException ioException = new IOException("ioe");
+    mockClient.setNextException(ioException);
+    try {
+      call.invoke(datastore, callArgs);
+      fail();
+    } catch (InvocationTargetException targetException) {
+      DatastoreException exception = (DatastoreException) targetException.getCause();
+      assertEquals(Code.UNAVAILABLE, exception.getCode());
+      assertEquals(methodName, exception.getMethodName());
+      assertEquals("I/O error", exception.getMessage());
+      assertSame(ioException, exception.getCause());
+    }
+
+    assertEquals(3, datastore.getRpcCount());
+  }
+}
diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java
new file mode 100644
index 000000000000..2a3d5a38fcb4
--- /dev/null
+++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Test for {@link DatastoreFactory}. */
+@RunWith(JUnit4.class)
+public class DatastoreFactoryTest {
+  private static final String PROJECT_ID = "project-id";
+
+  private DatastoreFactory factory = DatastoreFactory.get();
+
+  /**
+   * Without specifying a credential or transport, the factory will create a default transport on
+   * its own.
+   */
+  @Test
+  public void makeClient_Default() {
+    DatastoreOptions options = new DatastoreOptions.Builder().projectId(PROJECT_ID).build();
+    HttpRequestFactory f = factory.makeClient(options);
+    assertNotNull(f.getTransport());
+    assertTrue(f.getTransport() instanceof NetHttpTransport);
+  }
+
+  /**
+   * Specifying a credential, but not a transport, the factory will use the transport from the
+   * credential.
+   */
+  @Test
+  public void makeClient_WithCredential() {
+    NetHttpTransport transport = new NetHttpTransport();
+    GoogleCredential credential = new GoogleCredential.Builder().setTransport(transport).build();
+    DatastoreOptions options =
+        new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(credential).build();
+    HttpRequestFactory f = factory.makeClient(options);
+    assertEquals(transport, f.getTransport());
+  }
+
+  /** Specifying a transport, but not a credential, the factory will use the transport specified. */
+  @Test
+  public void makeClient_WithTransport() {
+    NetHttpTransport transport = new NetHttpTransport();
+    DatastoreOptions options =
+        new DatastoreOptions.Builder().projectId(PROJECT_ID).transport(transport).build();
+    HttpRequestFactory f = factory.makeClient(options);
+    assertEquals(transport, f.getTransport());
+  }
+
+  /**
+   * Specifying both credential and transport, the factory will use the transport specified and not
+   * the one in the credential.
+   */
+  @Test
+  public void makeClient_WithCredentialTransport() {
+    NetHttpTransport credTransport = new NetHttpTransport();
+    NetHttpTransport transport = new NetHttpTransport();
+    GoogleCredential credential =
+        new GoogleCredential.Builder().setTransport(credTransport).build();
+    DatastoreOptions options =
+        new DatastoreOptions.Builder()
+            .projectId(PROJECT_ID)
+            .credential(credential)
+            .transport(transport)
+            .build();
+    HttpRequestFactory f = factory.makeClient(options);
+    assertNotSame(credTransport, f.getTransport());
+    assertEquals(transport, f.getTransport());
+  }
+}
diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java
new file mode 100644
index 000000000000..2462024441a2
--- /dev/null
+++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static com.google.datastore.utils.DatastoreHelper.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.Value;
+import com.google.datastore.v1.Value.ValueTypeCase;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Timestamp;
+import java.util.Date;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link DatastoreHelper}. */
+@RunWith(JUnit4.class)
+public class DatastoreHelperTest {
+
+  private static final Key PARENT =
+      Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Parent").setId(23L)).build();
+  private static final Key GRANDPARENT =
+      Key.newBuilder()
+          .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L))
+          .build();
+  private static final Key CHILD =
+      Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Child").setId(26L)).build();
+
+  @Test
+  public void testMakeKey_BadTypeForKind() {
+    try {
+      DatastoreHelper.makeKey(new Object());
+      fail("Expected IllegalArgumentException");
+    } catch (IllegalArgumentException expected) {
+    }
+  }
+
+  @Test
+  public void testMakeKey_BadTypeForNameId() {
+    try {
+      DatastoreHelper.makeKey("kind", new Object());
+      fail("Expected IllegalArgumentException");
+    } catch (IllegalArgumentException expected) {
+    }
+  }
+
+  @Test
+  public void testMakeKey_Empty() {
+    assertEquals(Key.newBuilder().build(), DatastoreHelper.makeKey().build());
+  }
+
+  @Test
+  public void testMakeKey_Incomplete() {
+    assertEquals(
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo")).build(),
+        makeKey("Foo").build());
+  }
+
+  @Test
+  public void testMakeKey_IdInt() {
+    assertEquals(
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(),
+        makeKey("Foo", 1).build());
+  }
+
+  @Test
+  public void testMakeKey_IdLong() {
+    assertEquals(
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(),
+        makeKey("Foo", 1L).build());
+  }
+
+  @Test
+  public void testMakeKey_IdShort() {
+    assertEquals(
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(),
+        makeKey("Foo", (short) 1).build());
+  }
+
+  @Test
+  public void testMakeKey_Name() {
+    assertEquals(
+        Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi")).build(),
+        makeKey("Foo", "hi").build());
+  }
+
+  @Test
+  public void testMakeKey_KindNameKind() {
+    assertEquals(
+        Key.newBuilder()
+            .addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi"))
+            .addPath(Key.PathElement.newBuilder().setKind("Bar"))
+            .build(),
+        makeKey("Foo", "hi", "Bar").build());
+  }
+
+  @Test
+  public void testMakeKey_KeyKind() {
+    // 1 key at the beginning of the series
+    assertEquals(
+        Key.newBuilder()
+            .addPath(PARENT.getPath(0))
+            .addPath(Key.PathElement.newBuilder().setKind("Child"))
+            .build(),
+        makeKey(PARENT, "Child").build());
+  }
+
+  @Test
+  public void testMakeKey_KindIdKeyKind() {
+    // 1 key in the middle of the series
+    assertEquals(
+        Key.newBuilder()
+            .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L))
+            .addPath(PARENT.getPath(0))
+            .addPath(Key.PathElement.newBuilder().setKind("Child"))
+            .build(),
+        makeKey("Grandparent", 24L, PARENT, "Child").build());
+  }
+
+  @Test
+  public void testMakeKey_KindIdKey() {
+    // 1 key at the end of the series
+    assertEquals(
+        Key.newBuilder()
+            .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L))
+            .addPath(PARENT.getPath(0))
+            .build(),
+        makeKey("Grandparent", 24L, PARENT).build());
+  }
+
+  @Test
+  public void testMakeKey_KeyKindIdKey() {
+    // 1 key at the beginning and 1 key at the end of the series
+    assertEquals(
+        Key.newBuilder()
+            .addPath(GRANDPARENT.getPath(0))
+            .addPath(Key.PathElement.newBuilder().setKind("Parent").setId(23L))
+            .addPath(CHILD.getPath(0))
+            .build(),
+        makeKey(GRANDPARENT, "Parent", 23, CHILD).build());
+  }
+
+  @Test
+  public void testMakeKey_Key() {
+    // Just 1 key
+    assertEquals(Key.newBuilder().addPath(CHILD.getPath(0)).build(), makeKey(CHILD).build());
+  }
+
+  @Test
+  public void testMakeKey_KeyKey() {
+    // Just 2 keys
+    assertEquals(
+        Key.newBuilder().addPath(PARENT.getPath(0)).addPath(CHILD.getPath(0)).build(),
+        makeKey(PARENT, CHILD).build());
+  }
+
+  @Test
+  public void testMakeKey_KeyKeyKey() {
+    // Just 3 keys
+    assertEquals(
+        Key.newBuilder()
+            .addPath(GRANDPARENT.getPath(0))
+            .addPath(PARENT.getPath(0))
+            .addPath(CHILD.getPath(0))
+            .build(),
+        makeKey(GRANDPARENT, PARENT, CHILD).build());
+  }
+
+  @Test
+  public void testMakeKey_KeyMultiLevelKey() {
+    // 1 key with 2 elements
+    assertEquals(
+        Key.newBuilder()
+            .addPath(GRANDPARENT.getPath(0))
+            .addPath(PARENT.getPath(0))
+            .addPath(CHILD.getPath(0))
+            .build(),
+        makeKey(GRANDPARENT, makeKey(PARENT, CHILD).build()).build());
+  }
+
+  @Test
+  public void testMakeKey_MultiLevelKeyKey() {
+    // 1 key with 2 elements
+    assertEquals(
+        Key.newBuilder()
+            .addPath(GRANDPARENT.getPath(0))
+            .addPath(PARENT.getPath(0))
+            .addPath(CHILD.getPath(0))
+            .build(),
+        makeKey(makeKey(GRANDPARENT, PARENT).build(), CHILD).build());
+  }
+
+  @Test
+  public void testMakeKey_MultiLevelKey() {
+    // 1 key with 3 elements
+    assertEquals(
+        Key.newBuilder()
+            .addPath(GRANDPARENT.getPath(0))
+            .addPath(PARENT.getPath(0))
+            .addPath(CHILD.getPath(0))
+            .build(),
+        makeKey(makeKey(GRANDPARENT, PARENT, CHILD).build()).build());
+  }
+
+  @Test
+  public void testMakeKey_PartitionId() {
+    PartitionId partitionId = PartitionId.newBuilder().setNamespaceId("namespace-id").build();
+    Key parent = PARENT.toBuilder().setPartitionId(partitionId).build();
+    assertEquals(
+        Key.newBuilder()
+            .setPartitionId(partitionId)
+            .addPath(PARENT.getPath(0))
+            .addPath(Key.PathElement.newBuilder().setKind("Child"))
+            .build(),
+        makeKey(parent, "Child").build());
+  }
+
+  @Test
+  public void testMakeKey_NonMatchingPartitionId2() {
+    PartitionId partitionId1 = PartitionId.newBuilder().setNamespaceId("namespace-id").build();
+    PartitionId partitionId2 =
+        PartitionId.newBuilder().setNamespaceId("another-namespace-id").build();
+    try {
+      makeKey(
+          PARENT.toBuilder().setPartitionId(partitionId1).build(),
+          CHILD.toBuilder().setPartitionId(partitionId2).build());
+      fail("expected IllegalArgumentException");
+    } catch (IllegalArgumentException expected) {
+    }
+  }
+
+  @Test
+  public void testMakeTimestampValue() throws Exception {
+    // Test cases with nanos == 0.
+    assertConversion(-50_000, -50, 0);
+    assertConversion(-1_000, -1, 0);
+    assertConversion(0, 0, 0);
+    assertConversion(1_000, 1, 0);
+    assertConversion(2_000, 2, 0);
+    assertConversion(100_000, 100, 0);
+
+    // Test cases with nanos % 1_000_000 == 0 (no loss of precision).
+    assertConversion(2, 0, 2_000_000);
+    assertConversion(1_003, 1, 3_000_000);
+    assertConversion(2_005, 2, 5_000_000);
+
+    // Timestamp specification requires that nanos >= 0 even if the timestamp
+    // is before the epoch.
+    assertConversion(0, 0, 0);
+    assertConversion(-250, -1, 750_000_000); // 1/4 second before epoch
+    assertConversion(-500, -1, 500_000_000); // 1/2 second before epoch
+    assertConversion(-750, -1, 250_000_000); // 3/4 second before epoch
+
+    // If nanos % 1_000_000 != 0, precision is lost (via truncation) when
+    // converting to milliseconds.
+    assertTimestampToMilliseconds(3_100, 3, 100_000_999);
+    assertMillisecondsToTimestamp(3_100, 3, 100_000_000);
+    assertTimestampToMilliseconds(5_999, 5, 999_999_999);
+    assertMillisecondsToTimestamp(5_999, 5, 999_000_000);
+    assertTimestampToMilliseconds(7_100, 7, 100_000_001);
+    assertMillisecondsToTimestamp(7_100, 7, 100_000_000);
+  }
+
+  private void assertConversion(long millis, long seconds, int nanos) {
+    assertMillisecondsToTimestamp(millis, seconds, nanos);
+    assertTimestampToMilliseconds(millis, seconds, nanos);
+  }
+
+  private void assertMillisecondsToTimestamp(long millis, long seconds, long nanos) {
+    Value timestampValue = makeValue(new Date(millis)).build();
+    assertEquals(ValueTypeCase.TIMESTAMP_VALUE, timestampValue.getValueTypeCase());
+    assertEquals(seconds, timestampValue.getTimestampValue().getSeconds());
+    assertEquals(nanos, timestampValue.getTimestampValue().getNanos());
+  }
+
+  private void assertTimestampToMilliseconds(long millis, long seconds, int nanos) {
+    Value.Builder value =
+        Value.newBuilder()
+            .setTimestampValue(Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos));
+    assertEquals(millis, DatastoreHelper.toDate(value.build()).getTime());
+  }
+
+  @Test
+  public void testProjectionHandling() {
+    assertEquals(
+        ByteString.copyFromUtf8("hi"), getByteString(makeValue("hi").setMeaning(18).build()));
+    try {
+      getByteString(makeValue("hi").build());
+      fail("Expected IllegalArgumentException");
+    } catch (IllegalArgumentException expected) {
+    }
+
+    assertEquals(new Date(1), toDate(makeValue(1000).setMeaning(18).build()));
+    try {
+      toDate(makeValue(1000).build());
+      fail("Expected IllegalArgumentException");
+    } catch (IllegalArgumentException expected) {
+    }
+  }
+}
diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java
new file mode 100644
index 000000000000..cad9502ae1af
--- /dev/null
+++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.datastore.utils.DatastoreHelper.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThrows;
+
+import com.google.datastore.utils.testing.MockCredential;
+import com.google.datastore.utils.testing.MockDatastoreFactory;
+import com.google.datastore.v1.*;
+import com.google.datastore.v1.EntityResult.ResultType;
+import com.google.datastore.v1.PropertyFilter.Operator;
+import com.google.datastore.v1.PropertyOrder.Direction;
+import com.google.datastore.v1.QueryResultBatch.MoreResultsType;
+import com.google.protobuf.Int32Value;
+import com.google.protobuf.Timestamp;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link com.google.datastore.utils.QuerySplitterImpl}. */
+@RunWith(JUnit4.class)
+public class QuerySplitterTest {
+  private static final String PROJECT_ID = "project-id";
+  private static final PartitionId PARTITION =
+      PartitionId.newBuilder().setProjectId(PROJECT_ID).build();
+  private static final String KIND = "test-kind";
+
+  private DatastoreFactory factory = new MockDatastoreFactory();
+  private com.google.datastore.utils.DatastoreOptions.Builder options =
+      new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(new MockCredential());
+
+  private Filter propertyFilter = makeFilter("foo", Operator.EQUAL, makeValue("value")).build();
+
+  private Query query =
+      Query.newBuilder()
+          .addKind(KindExpression.newBuilder().setName(KIND).build())
+          .setFilter(propertyFilter)
+          .build();
+
+  private Query splitQuery =
+      Query.newBuilder()
+          .addKind(KindExpression.newBuilder().setName(KIND).build())
+          .addOrder(makeOrder("__scatter__", Direction.ASCENDING))
+          .addProjection(Projection.newBuilder().setProperty(makePropertyReference("__key__")))
+          .build();
+
+  private Key splitKey0 = makeKey(KIND, String.format("%05d", 1)).setPartitionId(PARTITION).build();
+  private Key splitKey1 =
+      makeKey(KIND, String.format("%05d", 101)).setPartitionId(PARTITION).build();
+  private Key splitKey2 =
+      makeKey(KIND, String.format("%05d", 201)).setPartitionId(PARTITION).build();
+  private Key splitKey3 =
+      makeKey(KIND, String.format("%05d", 301)).setPartitionId(PARTITION).build();
+
+  @Test
+  public void disallowsSortOrder() {
+    com.google.datastore.utils.Datastore datastore = factory.create(options.build());
+    Query queryWithOrder =
+        query.toBuilder().addOrder(makeOrder("bar", Direction.ASCENDING)).build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+                    queryWithOrder, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query cannot have any sort orders.");
+  }
+
+  @Test
+  public void disallowsMultipleKinds() {
+    com.google.datastore.utils.Datastore datastore = factory.create(options.build());
+    Query queryWithMultipleKinds =
+        query.toBuilder()
+            .addKind(KindExpression.newBuilder().setName("another-kind").build())
+            .build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+                    queryWithMultipleKinds, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query must have exactly one kind.");
+  }
+
+  @Test
+  public void disallowsKindlessQuery() {
+    com.google.datastore.utils.Datastore datastore = factory.create(options.build());
+    Query kindlessQuery = query.toBuilder().clearKind().build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+                    kindlessQuery, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query must have exactly one kind.");
+  }
+
+  @Test
+  public void disallowsInequalityFilter() {
+    com.google.datastore.utils.Datastore datastore = factory.create(options.build());
+    Query queryWithInequality =
+        query.toBuilder()
+            .setFilter(makeFilter("foo", Operator.GREATER_THAN, makeValue("value")))
+            .build();
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+                    queryWithInequality, PARTITION, 2, datastore));
+    assertThat(exception).hasMessageThat().contains("Query cannot have any inequality filters.");
+  }
+
+  @Test
+  public void splitsMustBePositive() {
+    com.google.datastore.utils.Datastore datastore = factory.create(options.build());
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+                    query, PARTITION, 0, datastore));
+    assertThat(exception).hasMessageThat().contains("The number of splits must be greater than 0.");
+  }
+
+  @Test
+  public void getSplits() throws Exception {
+    com.google.datastore.utils.Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+    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 splittedQueries =
+        com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+            query, PARTITION, 3, datastore);
+
+    assertThat(splittedQueries)
+        .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)
+            .setQuery(
+                splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build()))
+            .build();
+
+    assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+  }
+
+  @Test
+  public void getSplitsWithDatabaseId() throws Exception {
+    com.google.datastore.utils.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 =
+        com.google.datastore.utils.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();
+
+    assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+  }
+
+  @Test
+  public void notEnoughSplits() throws Exception {
+    com.google.datastore.utils.Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+    RunQueryResponse splitQueryResponse =
+        RunQueryResponse.newBuilder()
+            .setQuery(splitQuery)
+            .setBatch(
+                QueryResultBatch.newBuilder()
+                    .setEntityResultType(ResultType.KEY_ONLY)
+                    .setMoreResults(MoreResultsType.NO_MORE_RESULTS)
+                    .addEntityResults(makeKeyOnlyEntity(splitKey0))
+                    .build())
+            .build();
+
+    mockClient.setNextResponse(splitQueryResponse);
+
+    List splittedQueries =
+        com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+            query, PARTITION, 100, datastore);
+
+    assertThat(splittedQueries)
+        .containsExactly(
+            query.toBuilder()
+                .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey0))
+                .build(),
+            query.toBuilder()
+                .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey0, null))
+                .build());
+
+    RunQueryRequest expectedSplitQueryRequest =
+        RunQueryRequest.newBuilder()
+            .setPartitionId(PARTITION)
+            .setProjectId(PROJECT_ID)
+            .setQuery(
+                splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(99 * 32).build()))
+            .build();
+
+    assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+  }
+
+  @Test
+  public void getSplits_withReadTime() throws Exception {
+    Datastore datastore = factory.create(options.build());
+    MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+    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);
+
+    Timestamp readTime = Timestamp.newBuilder().setSeconds(1654651341L).build();
+
+    List splittedQueries =
+        com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits(
+            query, PARTITION, 3, datastore, readTime);
+
+    assertThat(splittedQueries)
+        .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)
+            .setQuery(
+                splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build()))
+            .setReadOptions(ReadOptions.newBuilder().setReadTime(readTime))
+            .build();
+
+    assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+  }
+
+  private static EntityResult makeKeyOnlyEntity(Key key) {
+    return EntityResult.newBuilder().setEntity(Entity.newBuilder().setKey(key).build()).build();
+  }
+
+  private static Filter makeFilterWithKeyRange(Filter originalFilter, Key startKey, Key endKey) {
+    Filter startKeyFilter =
+        startKey == null
+            ? null
+            : makeFilter("__key__", Operator.GREATER_THAN_OR_EQUAL, makeValue(startKey)).build();
+
+    Filter endKeyFilter =
+        endKey == null
+            ? null
+            : makeFilter("__key__", Operator.LESS_THAN, makeValue(endKey)).build();
+
+    if (startKeyFilter == null && endKeyFilter == null) {
+      throw new IllegalArgumentException();
+    }
+
+    if (startKeyFilter != null && endKeyFilter == null) {
+      return makeAndFilter(originalFilter, startKeyFilter).build();
+    }
+
+    if (startKeyFilter == null && endKeyFilter != null) {
+      return makeAndFilter(originalFilter, endKeyFilter).build();
+    }
+
+    return makeAndFilter(originalFilter, startKeyFilter, endKeyFilter).build();
+  }
+}
diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java
new file mode 100644
index 000000000000..ae4d7a23e3ef
--- /dev/null
+++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java
@@ -0,0 +1,341 @@
+/*
+ * Copyright 2024 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.utils;
+
+import static org.junit.Assert.*;
+
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.LowLevelHttpRequest;
+import com.google.api.client.http.LowLevelHttpResponse;
+import com.google.api.client.http.protobuf.ProtoHttpContent;
+import com.google.api.client.util.Charsets;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.MessageLite;
+import com.google.rpc.Code;
+import com.google.rpc.Status;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPOutputStream;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Test for {@link RemoteRpc}. */
+@RunWith(JUnit4.class)
+public class RemoteRpcTest {
+
+  private static final String METHOD_NAME = "methodName";
+
+  @Test
+  public void testException() {
+    Status statusProto =
+        Status.newBuilder()
+            .setCode(Code.UNAUTHENTICATED_VALUE)
+            .setMessage("The request does not have valid authentication credentials.")
+            .build();
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream(statusProto.toByteArray()),
+            "application/x-protobuf",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            401);
+    assertEquals(Code.UNAUTHENTICATED, exception.getCode());
+    assertEquals(
+        "The request does not have valid authentication credentials.", exception.getMessage());
+    assertEquals(METHOD_NAME, exception.getMethodName());
+  }
+
+  @Test
+  public void testInvalidProtoException() {
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream("".getBytes()),
+            "application/x-protobuf",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            401);
+    assertEquals(Code.INTERNAL, exception.getCode());
+    assertEquals(
+        "Unable to parse Status protocol buffer: HTTP status code was 401.",
+        exception.getMessage());
+    assertEquals(METHOD_NAME, exception.getMethodName());
+  }
+
+  @Test
+  public void testEmptyProtoException() {
+    Status statusProto = Status.newBuilder().build();
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream(statusProto.toByteArray()),
+            "application/x-protobuf",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            404);
+    assertEquals(Code.INTERNAL, exception.getCode());
+    assertEquals(
+        "Unexpected OK error code with HTTP status code of 404. Message: .",
+        exception.getMessage());
+    assertEquals(METHOD_NAME, exception.getMethodName());
+  }
+
+  @Test
+  public void testEmptyProtoExceptionUnauthenticated() {
+    Status statusProto = Status.newBuilder().build();
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream(statusProto.toByteArray()),
+            "application/x-protobuf",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            401);
+    assertEquals(Code.UNAUTHENTICATED, exception.getCode());
+    assertEquals("Unauthenticated.", exception.getMessage());
+    assertEquals(METHOD_NAME, exception.getMethodName());
+  }
+
+  @Test
+  public void testPlainTextException() {
+    DatastoreException exception =
+        RemoteRpc.makeException(
+            "url",
+            METHOD_NAME,
+            new ByteArrayInputStream("Text Error".getBytes()),
+            "text/plain",
+            Charsets.UTF_8,
+            new RuntimeException(),
+            401);
+    assertEquals(Code.INTERNAL, exception.getCode());
+    assertEquals(
+        "Non-protobuf error: Text Error. HTTP status code was 401.", exception.getMessage());
+    assertEquals(METHOD_NAME, exception.getMethodName());
+  }
+
+  @Test
+  public void testGzip() throws IOException, DatastoreException {
+    BeginTransactionResponse response = newBeginTransactionResponse();
+    InjectedTestValues injectedTestValues =
+        new InjectedTestValues(gzip(response), new byte[1], true);
+    RemoteRpc rpc = newRemoteRpc(injectedTestValues);
+
+    InputStream is =
+        rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance(), "", "");
+    BeginTransactionResponse parsedResponse = BeginTransactionResponse.parseFrom(is);
+    is.close();
+
+    assertEquals(response, parsedResponse);
+    // Check that the underlying stream is exhausted.
+    assertEquals(-1, injectedTestValues.inputStream.read());
+  }
+
+  @Test
+  public void testHttpHeaders_apiFormat() throws IOException {
+    String projectId = "project-id";
+    MessageLite request =
+        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, projectId, "");
+    assertNotNull(
+        httpRequest.getHeaders().getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_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"))
+        .build();
+  }
+
+  private static RemoteRpc newRemoteRpc(InjectedTestValues injectedTestValues) {
+    return new RemoteRpc(
+        new MyHttpTransport(injectedTestValues).createRequestFactory(),
+        null,
+        "https://www.example.com/v1/projects/p");
+  }
+
+  private byte[] gzip(BeginTransactionResponse response) throws IOException {
+    ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+    try (GZIPOutputStream gzipOut = new GZIPOutputStream(bytesOut)) {
+      response.writeTo(gzipOut);
+    }
+    return bytesOut.toByteArray();
+  }
+
+  private static class InjectedTestValues {
+    private final InputStream inputStream;
+    private final int contentLength;
+    private final boolean isGzip;
+
+    public InjectedTestValues(byte[] messageBytes, byte[] additionalBytes, boolean isGzip) {
+      byte[] allBytes = concat(messageBytes, additionalBytes);
+      this.inputStream = new ByteArrayInputStream(allBytes);
+      this.contentLength = allBytes.length;
+      this.isGzip = isGzip;
+    }
+
+    private static byte[] concat(byte[] a, byte[] b) {
+      byte[] c = new byte[a.length + b.length];
+      System.arraycopy(a, 0, c, 0, a.length);
+      System.arraycopy(b, 0, c, a.length, b.length);
+      return c;
+    }
+  }
+
+  /** {@link HttpTransport} that allows injection of the returned {@link LowLevelHttpRequest}. */
+  private static class MyHttpTransport extends HttpTransport {
+
+    private final InjectedTestValues injectedTestValues;
+
+    public MyHttpTransport(InjectedTestValues injectedTestValues) {
+      this.injectedTestValues = injectedTestValues;
+    }
+
+    @Override
+    protected LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+      return new MyLowLevelHttpRequest(injectedTestValues);
+    }
+  }
+
+  /**
+   * {@link LowLevelHttpRequest} that allows injection of the returned {@link LowLevelHttpResponse}.
+   */
+  private static class MyLowLevelHttpRequest extends LowLevelHttpRequest {
+
+    private final InjectedTestValues injectedTestValues;
+
+    public MyLowLevelHttpRequest(InjectedTestValues injectedTestValues) {
+      this.injectedTestValues = injectedTestValues;
+    }
+
+    @Override
+    public void addHeader(String name, String value) throws IOException {
+      // Do nothing.
+    }
+
+    @Override
+    public LowLevelHttpResponse execute() throws IOException {
+      return new MyLowLevelHttpResponse(injectedTestValues);
+    }
+  }
+
+  /** {@link LowLevelHttpResponse} that allows injected properties. */
+  private static class MyLowLevelHttpResponse extends LowLevelHttpResponse {
+
+    private final InjectedTestValues injectedTestValues;
+
+    public MyLowLevelHttpResponse(InjectedTestValues injectedTestValues) {
+      this.injectedTestValues = injectedTestValues;
+    }
+
+    @Override
+    public InputStream getContent() throws IOException {
+      return injectedTestValues.inputStream;
+    }
+
+    @Override
+    public String getContentEncoding() throws IOException {
+      return injectedTestValues.isGzip ? "gzip" : "";
+    }
+
+    @Override
+    public long getContentLength() throws IOException {
+      return injectedTestValues.contentLength;
+    }
+
+    @Override
+    public String getContentType() throws IOException {
+      return "application/x-protobuf";
+    }
+
+    @Override
+    public String getStatusLine() throws IOException {
+      return null;
+    }
+
+    @Override
+    public int getStatusCode() throws IOException {
+      return 200;
+    }
+
+    @Override
+    public String getReasonPhrase() throws IOException {
+      return null;
+    }
+
+    @Override
+    public int getHeaderCount() throws IOException {
+      return 0;
+    }
+
+    @Override
+    public String getHeaderName(int index) throws IOException {
+      return null;
+    }
+
+    @Override
+    public String getHeaderValue(int index) throws IOException {
+      return null;
+    }
+  }
+}
diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java
new file mode 100644
index 000000000000..d30c1cbdc598
--- /dev/null
+++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2024 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.utils.it;
+
+import static com.google.datastore.utils.DatastoreHelper.makeFilter;
+import static com.google.datastore.utils.DatastoreHelper.makeValue;
+
+import com.google.common.truth.Truth;
+import com.google.datastore.utils.Datastore;
+import com.google.datastore.utils.DatastoreException;
+import com.google.datastore.utils.DatastoreHelper;
+import com.google.datastore.v1.*;
+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/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
index 6275f05c63f4..d1e3a4ff4458 100644
--- a/google-cloud-datastore/clirr-ignored-differences.xml
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -1,7 +1,50 @@
 
 
 
-    
+    
+    
+        com/google/cloud/datastore/ReadOption$QueryAndReadOptions
+        *
+        8001
+    
+    
+        com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer
+        *QueryAndReadOptions*
+        *QueryConfig*
+        7005
+    
+    
+        
+        com/google/cloud/datastore/DatastoreException
+        5000
+        com/google/cloud/grpc/BaseGrpcServiceException
+    
+    
+        
+        com/google/cloud/datastore/DatastoreException
+        5001
+        com/google/cloud/http/BaseHttpServiceException
+    
+    
+        com/google/cloud/datastore/Datastore
+        void close()
+        7012
+    
+    
+        com/google/cloud/datastore/spi/v1/DatastoreRpc
+        void close()
+        7012
+    
+    
+        com/google/cloud/datastore/Datastore
+        boolean isClosed()
+        7012
+    
+    
+        com/google/cloud/datastore/spi/v1/DatastoreRpc
+        boolean isClosed()
+        7012
+    
     
         com/google/cloud/datastore/Datastore
         com.google.cloud.datastore.QueryResults run(com.google.cloud.datastore.Query, com.google.cloud.datastore.models.ExplainOptions, com.google.cloud.datastore.ReadOption[])
@@ -14,7 +57,7 @@
     
     
         com/google/cloud/datastore/DatastoreReader
-         com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.models.ExplainOptions)
+        com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.models.ExplainOptions)
         7012
     
     
@@ -28,18 +71,6 @@
         7012
     
 
-    
-    
-        com/google/cloud/datastore/ReadOption$QueryConfig
-        com.google.cloud.datastore.ReadOption$QueryConfig create(com.google.cloud.datastore.Query, java.util.List)
-        *com.google.datastore.v1.ExplainOptions*
-        7005
-    
-    
-        com/google/cloud/datastore/ReadOption$QueryConfig
-        com.google.cloud.datastore.ReadOption$QueryConfig create(com.google.cloud.datastore.Query)
-        7004
-    
     
         com/google/cloud/datastore/execution/AggregationQueryExecutor
         com.google.cloud.datastore.AggregationResults execute(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.ReadOption[])
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 397d98c1dca5..32c6caf15573 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -31,6 +31,10 @@
     
   
   
+    
+      com.google.api.grpc
+      grpc-google-cloud-datastore-v1
+    
     
       com.google.api.grpc
       grpc-google-cloud-datastore-admin-v1
@@ -39,6 +43,10 @@
       com.google.cloud
       google-cloud-core-http
     
+    
+      com.google.cloud
+      google-cloud-core-grpc
+    
     
       com.google.api.grpc
       proto-google-cloud-datastore-v1
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
index 882a4db2514a..bb162af33f59 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.InternalExtensionOnly;
 import java.util.List;
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -42,6 +43,7 @@
  * This class too should not be treated as a thread safe class. 
  */
 @NotThreadSafe
+@InternalExtensionOnly
 public interface Batch extends DatastoreBatchWriter {
 
   interface Response {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index 45cecbf2585b..0e769a109372 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -17,6 +17,7 @@
 package com.google.cloud.datastore;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.Service;
 import com.google.cloud.datastore.models.ExplainOptions;
 import com.google.datastore.v1.TransactionOptions;
@@ -24,7 +25,8 @@
 import java.util.List;
 
 /** An interface for Google Cloud Datastore. */
-public interface Datastore extends Service, DatastoreReaderWriter {
+@InternalExtensionOnly
+public interface Datastore extends Service, DatastoreReaderWriter, AutoCloseable {
 
   /**
    * Returns a new Datastore transaction.
@@ -488,10 +490,7 @@ interface TransactionCallable {
    * @throws DatastoreException upon failure
    */
   @BetaApi
-  default  QueryResults run(
-      Query query, ExplainOptions explainOptions, ReadOption... options) {
-    throw new UnsupportedOperationException("Not implemented.");
-  }
+   QueryResults run(Query query, ExplainOptions explainOptions, ReadOption... options);
 
   /**
    * Submits a {@link AggregationQuery} and returns {@link AggregationResults}. {@link ReadOption}s
@@ -536,9 +535,7 @@ default  QueryResults run(
    * @throws DatastoreException upon failure
    * @return {@link AggregationResults}
    */
-  default AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
-    throw new UnsupportedOperationException("Not implemented.");
-  }
+  AggregationResults runAggregation(AggregationQuery query, ReadOption... options);
 
   /**
    * Submits a {@link AggregationQuery} with specified {@link
@@ -564,8 +561,17 @@ default AggregationResults runAggregation(AggregationQuery query, ReadOption...
    * @return {@link AggregationResults}
    */
   @BetaApi
-  default AggregationResults runAggregation(
-      AggregationQuery query, ExplainOptions explainOptions, ReadOption... options) {
-    throw new UnsupportedOperationException("Not implemented.");
-  }
+  AggregationResults runAggregation(
+      AggregationQuery query, ExplainOptions explainOptions, ReadOption... options);
+
+  /**
+   * Closes the gRPC channels associated with this instance and frees up their resources. This
+   * method blocks until all channels are closed. Once this method is called, this Datastore client
+   * is no longer usable.
+   */
+  @Override
+  void close() throws Exception;
+
+  /** Returns true if this background resource has been shut down. */
+  boolean isClosed();
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
index db4bd3179628..28d2569b6a89 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.InternalExtensionOnly;
 import java.util.List;
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -31,6 +32,7 @@
  * This class too should not be treated as a thread safe class. 
  */
 @NotThreadSafe
+@InternalExtensionOnly
 public interface DatastoreBatchWriter extends DatastoreWriter {
 
   /**
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
index 512d0a3dc270..44bde2c107ff 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
@@ -16,10 +16,16 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.gax.grpc.GrpcStatusCode;
+import com.google.api.gax.rpc.ApiException;
+import com.google.api.gax.rpc.StatusCode;
 import com.google.cloud.BaseServiceException;
 import com.google.cloud.RetryHelper.RetryHelperException;
 import com.google.cloud.http.BaseHttpServiceException;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
+import io.grpc.StatusException;
+import io.grpc.StatusRuntimeException;
 import java.io.IOException;
 import java.util.Set;
 
@@ -31,7 +37,7 @@
  */
 public final class DatastoreException extends BaseHttpServiceException {
 
-  // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes"
+  // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes
   private static final Set RETRYABLE_ERRORS =
       ImmutableSet.of(
           new Error(10, "ABORTED", false),
@@ -43,6 +49,10 @@ public DatastoreException(int code, String message, String reason) {
     this(code, message, reason, true, null);
   }
 
+  public DatastoreException(int code, String message, Throwable cause) {
+    super(code, message, null, true, RETRYABLE_ERRORS, cause);
+  }
+
   public DatastoreException(int code, String message, String reason, Throwable cause) {
     super(code, message, reason, true, RETRYABLE_ERRORS, cause);
   }
@@ -64,7 +74,76 @@ public DatastoreException(IOException exception) {
    */
   static DatastoreException translateAndThrow(RetryHelperException ex) {
     BaseServiceException.translate(ex);
-    throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null, ex.getCause());
+    throw transformThrowable(ex);
+  }
+
+  static BaseServiceException transformThrowable(Throwable t) {
+    if (t instanceof BaseServiceException) {
+      return (BaseServiceException) t;
+    }
+    if (t.getCause() instanceof BaseServiceException) {
+      return (BaseServiceException) t.getCause();
+    }
+    if (t instanceof ApiException) {
+      return asDatastoreException((ApiException) t);
+    }
+    if (t.getCause() instanceof ApiException) {
+      return asDatastoreException((ApiException) t.getCause());
+    }
+    return getDatastoreException(t);
+  }
+
+  private static DatastoreException getDatastoreException(Throwable t) {
+    // unwrap a RetryHelperException if that is what is being translated
+    if (t instanceof RetryHelperException) {
+      return new DatastoreException(UNKNOWN_CODE, t.getMessage(), null, t.getCause());
+    }
+    return new DatastoreException(UNKNOWN_CODE, t.getMessage(), t);
+  }
+
+  static DatastoreException asDatastoreException(ApiException apiEx) {
+    int datastoreStatusCode = 0;
+    StatusCode statusCode = apiEx.getStatusCode();
+    if (statusCode instanceof GrpcStatusCode) {
+      GrpcStatusCode gsc = (GrpcStatusCode) statusCode;
+      datastoreStatusCode =
+          GrpcToDatastoreCodeTranslation.grpcCodeToDatastoreStatusCode(gsc.getTransportCode());
+    }
+
+    // If there is a gRPC exception in our cause, pull its error message up to be our
+    // message otherwise, create a generic error message with the status code.
+    String statusCodeName = statusCode.getCode().name();
+    String statusExceptionMessage = getStatusExceptionMessage(apiEx);
+
+    String message;
+    if (statusExceptionMessage != null) {
+      message = statusCodeName + ": " + statusExceptionMessage;
+    } else {
+      message = "Error: " + statusCodeName;
+    }
+
+    String reason = "";
+    if (Strings.isNullOrEmpty(apiEx.getReason())) {
+      if (apiEx.getStatusCode() != null) {
+        reason = apiEx.getStatusCode().getCode().name();
+      }
+    }
+    // It'd be better to use ExceptionData and BaseServiceException#(ExceptionData) but,
+    // BaseHttpServiceException does not pass that through so we're stuck using this for now.
+    // TODO: When we can break the coupling to BaseHttpServiceException replace this
+    return new DatastoreException(datastoreStatusCode, message, reason, apiEx);
+  }
+
+  private static String getStatusExceptionMessage(Exception apiEx) {
+    if (apiEx.getMessage() != null) {
+      return apiEx.getMessage();
+    } else {
+      Throwable cause = apiEx.getCause();
+      if (cause instanceof StatusRuntimeException || cause instanceof StatusException) {
+        return cause.getMessage();
+      }
+      return null;
+    }
   }
 
   /**
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
index 1b443066d94a..54274e7bb972 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
@@ -16,7 +16,9 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.ServiceFactory;
 
 /** An interface for Datastore factories. */
+@InternalExtensionOnly
 public interface DatastoreFactory extends ServiceFactory {}
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 42bc1a093802..c64474fa8296 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
@@ -73,10 +73,13 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 final class DatastoreImpl extends BaseService implements Datastore {
 
+  Logger logger = Logger.getLogger(Datastore.class.getName());
   private final DatastoreRpc datastoreRpc;
   private final RetrySettings retrySettings;
   private static final ExceptionHandler TRANSACTION_EXCEPTION_HANDLER =
@@ -180,6 +183,20 @@ public T call() throws DatastoreException {
     }
   }
 
+  @Override
+  public void close() throws Exception {
+    try {
+      datastoreRpc.close();
+    } catch (Exception e) {
+      logger.log(Level.WARNING, "Failed to close channels", e);
+    }
+  }
+
+  @Override
+  public boolean isClosed() {
+    return datastoreRpc.isClosed();
+  }
+
   static class ReadWriteTransactionCallable implements Callable {
     private final Datastore datastore;
     private final TransactionCallable callable;
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 cef40eedd4c1..1ea79298c9f7 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
@@ -19,16 +19,23 @@
 import static com.google.cloud.datastore.Validator.validateNamespace;
 
 import com.google.api.core.BetaApi;
+import com.google.api.gax.grpc.ChannelPoolSettings;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.cloud.ServiceDefaults;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.ServiceRpc;
 import com.google.cloud.TransportOptions;
 import com.google.cloud.datastore.spi.DatastoreRpcFactory;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.cloud.datastore.spi.v1.GrpcDatastoreRpc;
 import com.google.cloud.datastore.spi.v1.HttpDatastoreRpc;
+import com.google.cloud.datastore.v1.DatastoreSettings;
+import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.cloud.http.HttpTransportOptions;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.Set;
@@ -42,6 +49,13 @@ public class DatastoreOptions extends ServiceOptions SCOPES = ImmutableSet.of(DATASTORE_SCOPE);
   private static final String DEFAULT_DATABASE_ID = "";
+  public static final String PROJECT_ID_ENV_VAR = "DATASTORE_PROJECT_ID";
+  public static final String LOCAL_HOST_ENV_VAR = "DATASTORE_EMULATOR_HOST";
+  public static final int INIT_CHANNEL_COUNT = 1;
+  public static final int MIN_CHANNEL_COUNT = 1;
+  public static final int MAX_CHANNEL_COUNT = 4;
+
+  private transient TransportChannelProvider channelProvider = null;
 
   private final String namespace;
   private final String databaseId;
@@ -65,7 +79,15 @@ public static class DefaultDatastoreRpcFactory implements DatastoreRpcFactory {
 
     @Override
     public ServiceRpc create(DatastoreOptions options) {
-      return new HttpDatastoreRpc(options);
+      try {
+        if (options.getTransportOptions() instanceof GrpcTransportOptions) {
+          return new GrpcDatastoreRpc(options);
+        } else {
+          return new HttpDatastoreRpc(options);
+        }
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
     }
   }
 
@@ -84,6 +106,9 @@ public static class Builder extends ServiceOptions.BuilderThis is only compatible with clients using a gRPC transport (see {@code
+     * DatastoreOptions#setTransportOptions(GrpcTransportOptions)} for more details).
+     *
+     * 
    This functionality is experimental and subject to change.
+     *
+     * @param channelProvider A InstantiatingGrpcChannelProvider object that defines the transport
+     *     provider for this client.
+     */
+    @BetaApi
+    public Builder setChannelProvider(TransportChannelProvider channelProvider) {
+      this.channelProvider = validateChannelProvider(channelProvider);
+      return this;
+    }
+
     @Override
     public DatastoreOptions build() {
+      if (this.host == null && this.transportOptions instanceof GrpcTransportOptions) {
+        this.setHost(DatastoreSettings.getDefaultEndpoint());
+      }
       return new DatastoreOptions(this);
     }
 
@@ -135,6 +197,15 @@ public Builder setOpenTelemetryOptions(
     }
   }
 
+  private static TransportChannelProvider validateChannelProvider(
+      TransportChannelProvider channelProvider) {
+    if (channelProvider != null && !(channelProvider instanceof InstantiatingGrpcChannelProvider)) {
+      throw new IllegalArgumentException(
+          "Only GRPC channels are allowed for " + API_SHORT_NAME + ".");
+    }
+    return channelProvider;
+  }
+
   private DatastoreOptions(Builder builder) {
     super(DatastoreFactory.class, DatastoreRpcFactory.class, builder, new DatastoreDefaults());
 
@@ -146,27 +217,46 @@ private DatastoreOptions(Builder builder) {
 
     namespace = MoreObjects.firstNonNull(builder.namespace, defaultNamespace());
     databaseId = MoreObjects.firstNonNull(builder.databaseId, DEFAULT_DATABASE_ID);
+
+    if (getTransportOptions() instanceof HttpTransportOptions && builder.channelProvider != null) {
+      throw new IllegalArgumentException(
+          "Only gRPC transport allows setting of channel provider or credentials provider");
+    } else if (getTransportOptions() instanceof GrpcTransportOptions) {
+      // For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1
+      // and maxChannelCount = 4
+      this.channelProvider =
+          builder.channelProvider != null
+              ? builder.channelProvider
+              : GrpcTransportOptions.setUpChannelProvider(
+                  DatastoreSettings.defaultGrpcTransportProviderBuilder()
+                      .setChannelPoolSettings(
+                          ChannelPoolSettings.builder()
+                              .setInitialChannelCount(INIT_CHANNEL_COUNT)
+                              .setMinChannelCount(MIN_CHANNEL_COUNT)
+                              .setMaxChannelCount(MAX_CHANNEL_COUNT)
+                              .build()),
+                  this);
+    }
+  }
+
+  public TransportChannelProvider getTransportChannelProvider() {
+    return channelProvider;
   }
 
   @Override
   protected String getDefaultHost() {
-    String host =
-        System.getProperty(
-            com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR,
-            System.getenv(com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR));
+    String host = System.getProperty(LOCAL_HOST_ENV_VAR, System.getenv(LOCAL_HOST_ENV_VAR));
     return host != null ? host : com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST;
   }
 
   @Override
   protected String getDefaultProject() {
-    String projectId =
-        System.getProperty(
-            com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR,
-            System.getenv(com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR));
+    String projectId = System.getProperty(PROJECT_ID_ENV_VAR, System.getenv(PROJECT_ID_ENV_VAR));
     return projectId != null ? projectId : super.getDefaultProject();
   }
 
   private static class DatastoreDefaults implements ServiceDefaults {
+    private final TransportOptions TRANSPORT_OPTIONS = getDefaultTransportOptionsBuilder().build();
 
     @Override
     public DatastoreFactory getDefaultServiceFactory() {
@@ -180,7 +270,11 @@ public DatastoreRpcFactory getDefaultRpcFactory() {
 
     @Override
     public TransportOptions getDefaultTransportOptions() {
-      return getDefaultHttpTransportOptions();
+      return TRANSPORT_OPTIONS;
+    }
+
+    public static HttpTransportOptions.Builder getDefaultTransportOptionsBuilder() {
+      return HttpTransportOptions.newBuilder();
     }
   }
 
@@ -188,6 +282,10 @@ public static HttpTransportOptions getDefaultHttpTransportOptions() {
     return HttpTransportOptions.newBuilder().build();
   }
 
+  public static GrpcTransportOptions getDefaultGrpcTransportOptions() {
+    return GrpcTransportOptions.newBuilder().build();
+  }
+
   /** Returns the default namespace to be used by the datastore service. */
   public String getNamespace() {
     return namespace;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
index 8aef7f5c0360..c3137a9a7ce6 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
@@ -17,11 +17,13 @@
 package com.google.cloud.datastore;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.datastore.models.ExplainOptions;
 import java.util.Iterator;
 import java.util.List;
 
 /** An interface to represent Google Cloud Datastore read operations. */
+@InternalExtensionOnly
 public interface DatastoreReader {
 
   /**
@@ -61,9 +63,7 @@ public interface DatastoreReader {
    *
    * @throws DatastoreException upon failure
    */
-  default AggregationResults runAggregation(AggregationQuery query) {
-    throw new UnsupportedOperationException("Not implemented.");
-  }
+  AggregationResults runAggregation(AggregationQuery query);
 
   /**
    * Submits a {@link AggregationQuery} with a specified {@link
@@ -72,7 +72,5 @@ default AggregationResults runAggregation(AggregationQuery query) {
    * @throws DatastoreException upon failure
    */
   @BetaApi
-  default AggregationResults runAggregation(AggregationQuery query, ExplainOptions explainOptions) {
-    throw new UnsupportedOperationException("Not implemented.");
-  }
+  AggregationResults runAggregation(AggregationQuery query, ExplainOptions explainOptions);
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
index a51a5aa77a9a..bc8700c70917 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
@@ -16,5 +16,8 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.InternalExtensionOnly;
+
 /** An interface that combines both Google Cloud Datastore read and write operations. */
+@InternalExtensionOnly
 public interface DatastoreReaderWriter extends DatastoreReader, DatastoreWriter {}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java
new file mode 100644
index 000000000000..e991fd51d02b
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2023 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.cloud.datastore;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.NoCredentials;
+import com.google.common.base.Strings;
+import java.net.InetAddress;
+import java.net.URL;
+
+@InternalApi
+public class DatastoreUtils {
+
+  public static boolean isEmulator(DatastoreOptions datastoreOptions) {
+    return isLocalHost(datastoreOptions.getHost())
+        || NoCredentials.getInstance().equals(datastoreOptions.getCredentials());
+  }
+
+  public static boolean isLocalHost(String host) {
+    if (Strings.isNullOrEmpty(host)) {
+      return false;
+    }
+    try {
+      String normalizedHost = "http://" + removeScheme(host);
+      InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost());
+      return hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static String removeScheme(String url) {
+    if (url != null) {
+      url = url.toLowerCase();
+      if (url.startsWith("https://")) {
+        return url.substring("https://".length());
+      } else if (url.startsWith("http://")) {
+        return url.substring("http://".length());
+      }
+    }
+    return url;
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
index 6c1d6fdbc9f8..b414995e6923 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
@@ -16,9 +16,11 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.InternalExtensionOnly;
 import java.util.List;
 
 /** An interface to represent Google Cloud Datastore write operations. */
+@InternalExtensionOnly
 public interface DatastoreWriter {
 
   /**
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java
new file mode 100644
index 000000000000..1d63fb19a22e
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2024 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.cloud.datastore;
+
+import com.google.api.gax.grpc.GrpcStatusCode;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.rpc.Code;
+import io.grpc.Status;
+import java.util.Map;
+import java.util.function.Function;
+
+final class GrpcToDatastoreCodeTranslation {
+  /** Mappings between gRPC status codes and their corresponding code numbers. */
+  private static final ImmutableList STATUS_CODE_MAPPINGS =
+      ImmutableList.of(
+          StatusCodeMapping.of(Code.OK.getNumber(), Status.Code.OK),
+          StatusCodeMapping.of(Code.DATA_LOSS.getNumber(), Status.Code.DATA_LOSS),
+          StatusCodeMapping.of(Code.INVALID_ARGUMENT.getNumber(), Status.Code.INVALID_ARGUMENT),
+          StatusCodeMapping.of(Code.OUT_OF_RANGE.getNumber(), Status.Code.OUT_OF_RANGE),
+          StatusCodeMapping.of(Code.UNAUTHENTICATED.getNumber(), Status.Code.UNAUTHENTICATED),
+          StatusCodeMapping.of(Code.PERMISSION_DENIED.getNumber(), Status.Code.PERMISSION_DENIED),
+          StatusCodeMapping.of(Code.NOT_FOUND.getNumber(), Status.Code.NOT_FOUND),
+          StatusCodeMapping.of(Code.ALREADY_EXISTS.getNumber(), Status.Code.ALREADY_EXISTS),
+          StatusCodeMapping.of(
+              Code.FAILED_PRECONDITION.getNumber(), Status.Code.FAILED_PRECONDITION),
+          StatusCodeMapping.of(Code.RESOURCE_EXHAUSTED.getNumber(), Status.Code.RESOURCE_EXHAUSTED),
+          StatusCodeMapping.of(Code.INTERNAL.getNumber(), Status.Code.INTERNAL),
+          StatusCodeMapping.of(Code.UNIMPLEMENTED.getNumber(), Status.Code.UNIMPLEMENTED),
+          StatusCodeMapping.of(Code.UNAVAILABLE.getNumber(), Status.Code.UNAVAILABLE),
+          StatusCodeMapping.of(Code.DEADLINE_EXCEEDED.getNumber(), Status.Code.DEADLINE_EXCEEDED),
+          StatusCodeMapping.of(Code.ABORTED.getNumber(), Status.Code.ABORTED),
+          StatusCodeMapping.of(Code.CANCELLED.getNumber(), Status.Code.CANCELLED),
+          StatusCodeMapping.of(Code.UNKNOWN.getNumber(), Status.Code.UNKNOWN));
+
+  /** Index our {@link StatusCodeMapping} for constant time lookup by {@link Status.Code} */
+  private static final Map GRPC_CODE_INDEX =
+      STATUS_CODE_MAPPINGS.stream()
+          .collect(
+              ImmutableMap.toImmutableMap(StatusCodeMapping::getGrpcCode, Function.identity()));
+
+  static int grpcCodeToDatastoreStatusCode(Status.Code code) {
+    StatusCodeMapping found = GRPC_CODE_INDEX.get(code);
+    // theoretically it's possible for gRPC to add a new code we haven't mapped here, if this
+    // happens fall through to our default of 0
+    if (found != null) {
+      return found.getDatastoreCode();
+    } else {
+      return 0;
+    }
+  }
+
+  /**
+   * Simple tuple class to bind together our corresponding http status code and {@link Status.Code}
+   * while providing easy access to the correct {@link GrpcStatusCode} where necessary.
+   */
+  private static final class StatusCodeMapping {
+
+    private final int datastoreCode;
+
+    private final Status.Code grpcCode;
+
+    private StatusCodeMapping(int datastoreCode, Status.Code grpcCode) {
+      this.datastoreCode = datastoreCode;
+      this.grpcCode = grpcCode;
+    }
+
+    public int getDatastoreCode() {
+      return datastoreCode;
+    }
+
+    public Status.Code getGrpcCode() {
+      return grpcCode;
+    }
+
+    static StatusCodeMapping of(int datastoreCode, Status.Code grpcCode) {
+      return new StatusCodeMapping(datastoreCode, grpcCode);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
index 50433a6a95ea..ca5b240adc2c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
@@ -17,6 +17,7 @@
 package com.google.cloud.datastore;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.datastore.models.ExplainMetrics;
 import com.google.datastore.v1.QueryResultBatch;
 import java.util.Iterator;
@@ -31,6 +32,7 @@
  *
  * @param  the type of the results value.
  */
+@InternalExtensionOnly
 public interface QueryResults extends Iterator {
 
   /** Returns the actual class of the result's values. */
@@ -75,7 +77,5 @@ public interface QueryResults extends Iterator {
   QueryResultBatch.MoreResultsType getMoreResults();
 
   @BetaApi
-  default Optional getExplainMetrics() {
-    throw new UnsupportedOperationException("Not implemented.");
-  }
+  Optional getExplainMetrics();
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
index e1ea6e8ddad0..630ddd225ce2 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
@@ -113,6 +113,16 @@ public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryReques
     return invokeRpc(() -> datastoreRpc.runAggregationQuery(request), spanName);
   }
 
+  @Override
+  public void close() throws Exception {
+    datastoreRpc.close();
+  }
+
+  @Override
+  public boolean isClosed() {
+    return datastoreRpc.isClosed();
+  }
+
   public  O invokeRpc(Callable block, String startSpan) {
     com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(startSpan);
     try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 30cd05759fb7..5bde80ed60a7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -27,6 +27,7 @@
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.InternalApi;
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.StringEnumType;
 import com.google.cloud.StringEnumValue;
 import com.google.cloud.Timestamp;
@@ -700,6 +701,7 @@ public String toString() {
    *
    * @param  the type of result the query returns.
    */
+  @InternalExtensionOnly
   public interface Builder {
 
     /** Sets the namespace for the query. */
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
index 7b6a67a2d8b4..697e7a6ffa66 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
@@ -17,6 +17,7 @@
 package com.google.cloud.datastore;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.datastore.models.ExplainOptions;
 import com.google.protobuf.ByteString;
 import java.util.Iterator;
@@ -63,6 +64,7 @@
  *     This class too should not be treated as a thread safe class. 
  */
 @NotThreadSafe
+@InternalExtensionOnly
 public interface Transaction extends DatastoreBatchWriter, DatastoreReaderWriter {
 
   interface Response {
@@ -179,9 +181,7 @@ interface Response {
    QueryResults run(Query query);
 
   @BetaApi
-  default  QueryResults run(Query query, ExplainOptions explainOptions) {
-    throw new UnsupportedOperationException("Not implemented.");
-  }
+   QueryResults run(Query query, ExplainOptions explainOptions);
 
   /**
    * Datastore add operation. This method will also allocate id for any entity with an incomplete
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
index 3c60ef409353..315728147497 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.GcpLaunchStage;
 
 /**
@@ -25,6 +26,7 @@
  * @param 
     the value type.
  * @param  the value type's associated builder.
  */
+@InternalExtensionOnly
 public interface ValueBuilder, B extends ValueBuilder> {
 
   ValueType getValueType();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
index ce23edcf0a54..632f44393684 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
@@ -16,6 +16,8 @@
 
 package com.google.cloud.datastore.aggregation;
 
+import com.google.api.core.InternalExtensionOnly;
+
 /**
  * An interface to represent the builders which build and customize {@link Aggregation} for {@link
  * com.google.cloud.datastore.AggregationQuery}.
@@ -23,6 +25,7 @@
  * 
    Used by {@link
  * com.google.cloud.datastore.AggregationQuery.Builder#addAggregation(AggregationBuilder)}.
  */
+@InternalExtensionOnly
 public interface AggregationBuilder {
   A build();
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
index 0b7f9094b7f3..acb85a61db85 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore.spi;
 
+import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.spi.ServiceRpcFactory;
 
@@ -23,4 +24,5 @@
  * An interface for Datastore RPC factory. Implementation will be loaded via {@link
  * java.util.ServiceLoader}.
  */
+@InternalExtensionOnly
 public interface DatastoreRpcFactory extends ServiceRpcFactory {}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
index 33b8e11eacef..f13e3873b356 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
@@ -16,8 +16,11 @@
 
 package com.google.cloud.datastore.spi.v1;
 
+import com.google.api.core.InternalExtensionOnly;
+import com.google.api.gax.rpc.HeaderProvider;
 import com.google.cloud.ServiceRpc;
 import com.google.cloud.datastore.DatastoreException;
+import com.google.cloud.datastore.v1.DatastoreSettings;
 import com.google.datastore.v1.AllocateIdsRequest;
 import com.google.datastore.v1.AllocateIdsResponse;
 import com.google.datastore.v1.BeginTransactionRequest;
@@ -36,7 +39,8 @@
 import com.google.datastore.v1.RunQueryResponse;
 
 /** Provides access to the remote Datastore service. */
-public interface DatastoreRpc extends ServiceRpc {
+@InternalExtensionOnly
+public interface DatastoreRpc extends ServiceRpc, AutoCloseable {
 
   /**
    * Sends an allocate IDs request.
@@ -93,7 +97,24 @@ BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
    *
    * @throws DatastoreException upon failure
    */
-  default RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) {
-    throw new UnsupportedOperationException("Not implemented.");
+  RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request);
+
+  @Override
+  void close() throws Exception;
+
+  /** Returns true if this background resource has been shut down. */
+  boolean isClosed();
+
+  // This class is needed solely to get access to protected method setInternalHeaderProvider()
+  class DatastoreSettingsBuilder extends DatastoreSettings.Builder {
+    DatastoreSettingsBuilder(DatastoreSettings settings) {
+      super(settings);
+    }
+
+    @Override
+    protected DatastoreSettings.Builder setInternalHeaderProvider(
+        HeaderProvider internalHeaderProvider) {
+      return super.setInternalHeaderProvider(internalHeaderProvider);
+    }
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
new file mode 100644
index 000000000000..ea9043bb9d7a
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2023 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.cloud.datastore.spi.v1;
+
+import static com.google.cloud.datastore.DatastoreUtils.isEmulator;
+import static com.google.cloud.datastore.DatastoreUtils.removeScheme;
+import static com.google.cloud.datastore.spi.v1.RpcUtils.retrySettingSetter;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import com.google.api.core.InternalApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.GaxProperties;
+import com.google.api.gax.grpc.ChannelPoolSettings;
+import com.google.api.gax.grpc.GrpcCallContext;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.HeaderProvider;
+import com.google.api.gax.rpc.NoHeaderProvider;
+import com.google.api.gax.rpc.TransportChannel;
+import com.google.cloud.ServiceOptions;
+import com.google.cloud.datastore.DatastoreException;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.v1.DatastoreSettings;
+import com.google.cloud.datastore.v1.stub.DatastoreStubSettings;
+import com.google.cloud.datastore.v1.stub.GrpcDatastoreStub;
+import com.google.cloud.grpc.GrpcTransportOptions;
+import com.google.common.base.Strings;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import io.grpc.CallOptions;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import java.io.IOException;
+import java.util.Collections;
+
+@InternalApi
+public class GrpcDatastoreRpc implements DatastoreRpc {
+
+  private final GrpcDatastoreStub datastoreStub;
+  private final ClientContext clientContext;
+  private boolean closed;
+
+  public GrpcDatastoreRpc(DatastoreOptions datastoreOptions) throws IOException {
+    try {
+      clientContext =
+          isEmulator(datastoreOptions)
+              ? getClientContextForEmulator(datastoreOptions)
+              : getClientContext(datastoreOptions);
+
+      /* For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 and maxChannelCount = 4 */
+      DatastoreStubSettings datastoreStubSettings =
+          DatastoreStubSettings.newBuilder(clientContext)
+              .applyToAllUnaryMethods(retrySettingSetter(datastoreOptions))
+              .setTransportChannelProvider(
+                  DatastoreSettings.defaultGrpcTransportProviderBuilder()
+                      .setChannelPoolSettings(
+                          ChannelPoolSettings.builder()
+                              .setInitialChannelCount(DatastoreOptions.INIT_CHANNEL_COUNT)
+                              .setMinChannelCount(DatastoreOptions.MIN_CHANNEL_COUNT)
+                              .setMaxChannelCount(DatastoreOptions.MAX_CHANNEL_COUNT)
+                              .build())
+                      .build())
+              .build();
+      datastoreStub = GrpcDatastoreStub.create(datastoreStubSettings);
+    } catch (IOException e) {
+      throw new IOException(e);
+    }
+  }
+
+  @Override
+  public void close() throws Exception {
+    if (!closed) {
+      datastoreStub.close();
+      for (BackgroundResource resource : clientContext.getBackgroundResources()) {
+        resource.close();
+      }
+      closed = true;
+    }
+    for (BackgroundResource resource : clientContext.getBackgroundResources()) {
+      resource.awaitTermination(1, SECONDS);
+    }
+  }
+
+  @Override
+  public AllocateIdsResponse allocateIds(AllocateIdsRequest request) {
+    return datastoreStub.allocateIdsCallable().call(request);
+  }
+
+  @Override
+  public BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
+      throws DatastoreException {
+    return datastoreStub.beginTransactionCallable().call(request);
+  }
+
+  @Override
+  public CommitResponse commit(CommitRequest request) {
+    return datastoreStub.commitCallable().call(request);
+  }
+
+  @Override
+  public LookupResponse lookup(LookupRequest request) {
+    return datastoreStub.lookupCallable().call(request);
+  }
+
+  @Override
+  public ReserveIdsResponse reserveIds(ReserveIdsRequest request) {
+    return datastoreStub.reserveIdsCallable().call(request);
+  }
+
+  @Override
+  public RollbackResponse rollback(RollbackRequest request) {
+    return datastoreStub.rollbackCallable().call(request);
+  }
+
+  @Override
+  public RunQueryResponse runQuery(RunQueryRequest request) {
+    return datastoreStub.runQueryCallable().call(request);
+  }
+
+  @Override
+  public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) {
+    return datastoreStub.runAggregationQueryCallable().call(request);
+  }
+
+  @Override
+  public boolean isClosed() {
+    return closed && datastoreStub.isShutdown();
+  }
+
+  private ClientContext getClientContextForEmulator(DatastoreOptions datastoreOptions)
+      throws IOException {
+    ManagedChannel managedChannel =
+        ManagedChannelBuilder.forTarget(removeScheme(datastoreOptions.getHost()))
+            .usePlaintext()
+            .build();
+    TransportChannel transportChannel = GrpcTransportChannel.create(managedChannel);
+    return ClientContext.newBuilder()
+        .setCredentials(null)
+        .setTransportChannel(transportChannel)
+        .setDefaultCallContext(GrpcCallContext.of(managedChannel, CallOptions.DEFAULT))
+        .setBackgroundResources(Collections.singletonList(transportChannel))
+        .build();
+  }
+
+  private ClientContext getClientContext(DatastoreOptions datastoreOptions) throws IOException {
+    HeaderProvider internalHeaderProvider =
+        DatastoreSettings.defaultApiClientHeaderProviderBuilder()
+            .setClientLibToken(
+                ServiceOptions.getGoogApiClientLibName(),
+                GaxProperties.getLibraryVersion(datastoreOptions.getClass()))
+            .setResourceToken(getResourceToken(datastoreOptions))
+            .build();
+
+    DatastoreSettingsBuilder settingsBuilder =
+        new DatastoreSettingsBuilder(DatastoreSettings.newBuilder().build());
+    settingsBuilder.setCredentialsProvider(
+        GrpcTransportOptions.setUpCredentialsProvider(datastoreOptions));
+    settingsBuilder.setTransportChannelProvider(datastoreOptions.getTransportChannelProvider());
+    settingsBuilder.setInternalHeaderProvider(internalHeaderProvider);
+    settingsBuilder.setHeaderProvider(
+        datastoreOptions.getMergedHeaderProvider(new NoHeaderProvider()));
+    return ClientContext.create(settingsBuilder.build());
+  }
+
+  private String getResourceToken(DatastoreOptions datastoreOptions) {
+    StringBuilder builder = new StringBuilder("project_id=");
+    builder.append(datastoreOptions.getProjectId());
+    if (!Strings.isNullOrEmpty(datastoreOptions.getDatabaseId())) {
+      builder.append("&database_id=");
+      builder.append(datastoreOptions.getDatabaseId());
+    }
+    return builder.toString();
+  }
+}
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 d927a2d7f5a0..ac39ad5ba929 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
@@ -19,6 +19,7 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
+import com.google.api.core.InternalApi;
 import com.google.cloud.datastore.DatastoreException;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.http.CensusHttpModule;
@@ -44,6 +45,7 @@
 import java.net.InetAddress;
 import java.net.URL;
 
+@InternalApi
 public class HttpDatastoreRpc implements DatastoreRpc {
 
   private final com.google.datastore.v1.client.Datastore client;
@@ -58,6 +60,7 @@ public HttpDatastoreRpc(DatastoreOptions options) {
             .initializer(getHttpRequestInitializer(options, httpTransportOptions))
             .transport(transport);
     String normalizedHost = options.getHost() != null ? options.getHost().toLowerCase() : "";
+
     if (isLocalHost(normalizedHost)) {
       clientBuilder = clientBuilder.localHost(removeScheme(normalizedHost));
     } else if (!removeScheme(com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST)
@@ -210,4 +213,14 @@ public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryReques
       throw translate(ex);
     }
   }
+
+  @Override
+  public void close() throws Exception {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
+  @Override
+  public boolean isClosed() {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java
new file mode 100644
index 000000000000..dee8d692027b
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2023 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.cloud.datastore.spi.v1;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.InternalApi;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.datastore.DatastoreOptions;
+
+@InternalApi
+public class RpcUtils {
+  @InternalApi
+  static ApiFunction, Void> retrySettingSetter(
+      DatastoreOptions datastoreOptions) {
+    return builder -> {
+      builder.setRetrySettings(datastoreOptions.getRetrySettings());
+      return null;
+    };
+  }
+}
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 20321f8127dd..9f5555d0f8be 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.cloud.testing.BaseEmulatorHelper;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
@@ -241,6 +242,14 @@ public DatastoreOptions getOptions(String namespace) {
     return optionsBuilder.setNamespace(namespace).build();
   }
 
+  /**
+   * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
+   * localhost. The transportOptions is set to {@code grpcTransportOptions}.
+   */
+  public DatastoreOptions getGrpcTransportOptions(GrpcTransportOptions grpcTransportOptions) {
+    return optionsBuilder.setTransportOptions(grpcTransportOptions).build();
+  }
+
   public DatastoreOptions.Builder setNamespace(String namespace) {
     return optionsBuilder.setNamespace(namespace);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java
new file mode 100644
index 000000000000..e8bea055f101
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java
@@ -0,0 +1,1087 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1;
+
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.datastore.v1.stub.DatastoreStub;
+import com.google.cloud.datastore.v1.stub.DatastoreStubSettings;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.Mutation;
+import com.google.datastore.v1.ReadOptions;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.protobuf.ByteString;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Service Description: Each RPC normalizes the partition IDs of the keys in its input entities, and
+ * always returns entities with keys with normalized partition IDs. This applies to all keys and
+ * entities, including those in values, except keys with both an empty path and an empty or unset
+ * partition ID. Normalization of input keys sets the project ID (if not already set) to the project
+ * ID from the request.
+ *
+ * 
    This class provides the ability to make remote calls to the backing service through method
+ * calls that map to API methods. Sample code to get started:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+ *   String projectId = "projectId-894832108";
+ *   ReadOptions readOptions = ReadOptions.newBuilder().build();
+ *   List keys = new ArrayList<>();
+ *   LookupResponse response = datastoreClient.lookup(projectId, readOptions, keys);
+ * }
+ * }
    
+ *
+ * 
    Note: close() needs to be called on the DatastoreClient object to clean up resources such as
+ * threads. In the example above, try-with-resources is used, which automatically calls close().
+ *
+ * 
    MethodsMethods
    MethodDescriptionMethod Variants
    ExportEntities
     ExportEntities
     Exports a copy of all or a subset of entities from Google Cloud Datastore to another storage system, such as Google Cloud Storage. Recent updates to entities may not be reflected in the export. The export occurs in the background and its progress can be monitored and managed via the Operation resource that is created. The output of an export may only be used once the associated operation is done. If an export operation is cancelled before completion it may leave partial data behind in Google Cloud Storage.
    		
  *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
  *      
      
- *           
    • exportEntitiesAsync(ExportEntitiesRequest request)
+ *           
    •  exportEntitiesAsync(ExportEntitiesRequest request)
  *      
    
  *      
    Methods that return long-running operations have "Async" method variants that return `OperationFuture`, which is used to track polling of the service.
    
  *      
      
- *           
    • exportEntitiesAsync(String projectId, Map<String, String> labels, EntityFilter entityFilter, String outputUrlPrefix)
+ *           
    •  exportEntitiesAsync(String projectId, Map<String, String> labels, EntityFilter entityFilter, String outputUrlPrefix)
  *      
    
  *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
  *      
      
- *           
    • exportEntitiesOperationCallable()
- *           
    • exportEntitiesCallable()
+ *           
    •  exportEntitiesOperationCallable()
+ *           
    •  exportEntitiesCallable()
  *      
    
  *       
    ImportEntities
     ImportEntities
     Imports entities into Google Cloud Datastore. Existing entities with the same key are overwritten. The import occurs in the background and its progress can be monitored and managed via the Operation resource that is created. If an ImportEntities operation is cancelled, it is possible that a subset of the data has already been imported to Cloud Datastore.
    		
  *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
  *      
      
- *           
    • importEntitiesAsync(ImportEntitiesRequest request)
+ *           
    •  importEntitiesAsync(ImportEntitiesRequest request)
  *      
    
  *      
    Methods that return long-running operations have "Async" method variants that return `OperationFuture`, which is used to track polling of the service.
    
  *      
      
- *           
    • importEntitiesAsync(String projectId, Map<String, String> labels, String inputUrl, EntityFilter entityFilter)
+ *           
    •  importEntitiesAsync(String projectId, Map<String, String> labels, String inputUrl, EntityFilter entityFilter)
  *      
    
  *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
  *      
      
- *           
    • importEntitiesOperationCallable()
- *           
    • importEntitiesCallable()
+ *           
    •  importEntitiesOperationCallable()
+ *           
    •  importEntitiesCallable()
  *      
    
  *       
    CreateIndex
     CreateIndex
     Creates the specified index. A newly created index's initial state is `CREATING`. On completion of the returned [google.longrunning.Operation][google.longrunning.Operation], the state will be `READY`. If the index already exists, the call will return an `ALREADY_EXISTS` status.
  * 
      During index creation, the process could result in an error, in which case the index will move to the `ERROR` state. The process can be recovered by fixing the data that caused the error, removing the index with [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then re-creating the index with [create] [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
  * 
      Indexes with a single property cannot be created.
    		
  *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
  *      
      
- *           
    • createIndexAsync(CreateIndexRequest request)
+ *           
    •  createIndexAsync(CreateIndexRequest request)
  *      
    
  *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
  *      
      
- *           
    • createIndexOperationCallable()
- *           
    • createIndexCallable()
+ *           
    •  createIndexOperationCallable()
+ *           
    •  createIndexCallable()
  *      
    
  *       
    DeleteIndex
     DeleteIndex
     Deletes an existing index. An index can only be deleted if it is in a `READY` or `ERROR` state. On successful execution of the request, the index will be in a `DELETING` [state][google.datastore.admin.v1.Index.State]. And on completion of the returned [google.longrunning.Operation][google.longrunning.Operation], the index will be removed.
  * 
      During index deletion, the process could result in an error, in which case the index will move to the `ERROR` state. The process can be recovered by fixing the data that caused the error, followed by calling [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
    		
  *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
  *      
      
- *           
    • deleteIndexAsync(DeleteIndexRequest request)
+ *           
    •  deleteIndexAsync(DeleteIndexRequest request)
  *      
    
  *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
  *      
      
- *           
    • deleteIndexOperationCallable()
- *           
    • deleteIndexCallable()
+ *           
    •  deleteIndexOperationCallable()
+ *           
    •  deleteIndexCallable()
  *      
    
  *       
    GetIndex
     GetIndex
     Gets an index.
    		
  *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
  *      
      
- *           
    • getIndex(GetIndexRequest request)
+ *           
    •  getIndex(GetIndexRequest request)
  *      
    
  *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
  *      
      
- *           
    • getIndexCallable()
+ *           
    •  getIndexCallable()
  *      
    
  *       
    ListIndexes
     ListIndexes
     Lists the indexes that match the specified filters.  Datastore uses an eventually consistent query to fetch the list of indexes and may occasionally return stale results.
    		
  *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
  *      
      
- *           
    • listIndexes(ListIndexesRequest request)
+ *           
    •  listIndexes(ListIndexesRequest request)
  *      
    
  *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
  *      
      
- *           
    • listIndexesPagedCallable()
- *           
    • listIndexesCallable()
+ *           
    •  listIndexesPagedCallable()
+ *           
    •  listIndexesCallable()
  *      
    
  *       
    
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *    
+ *      
+ *      
+ *      
+ *    
+ *  
    Methods
    MethodDescriptionMethod Variants
     Lookup
     Looks up entities by key.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  lookup(LookupRequest request)
+ *      
    
+ *      
    "Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.
    
+ *      
      
+ *           
    •  lookup(String projectId, ReadOptions readOptions, List<Key> keys)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  lookupCallable()
+ *      
    
+ *       
     RunQuery
     Queries for entities.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  runQuery(RunQueryRequest request)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  runQueryCallable()
+ *      
    
+ *       
     RunAggregationQuery
     Runs an aggregation query.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  runAggregationQuery(RunAggregationQueryRequest request)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  runAggregationQueryCallable()
+ *      
    
+ *       
     BeginTransaction
     Begins a new transaction.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  beginTransaction(BeginTransactionRequest request)
+ *      
    
+ *      
    "Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.
    
+ *      
      
+ *           
    •  beginTransaction(String projectId)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  beginTransactionCallable()
+ *      
    
+ *       
     Commit
     Commits a transaction, optionally creating, deleting or modifying some entities.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  commit(CommitRequest request)
+ *      
    
+ *      
    "Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.
    
+ *      
      
+ *           
    •  commit(String projectId, CommitRequest.Mode mode, List<Mutation> mutations)
+ *           
    •  commit(String projectId, CommitRequest.Mode mode, ByteString transaction, List<Mutation> mutations)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  commitCallable()
+ *      
    
+ *       
     Rollback
     Rolls back a transaction.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  rollback(RollbackRequest request)
+ *      
    
+ *      
    "Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.
    
+ *      
      
+ *           
    •  rollback(String projectId, ByteString transaction)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  rollbackCallable()
+ *      
    
+ *       
     AllocateIds
     Allocates IDs for the given keys, which is useful for referencing an entity before it is inserted.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  allocateIds(AllocateIdsRequest request)
+ *      
    
+ *      
    "Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.
    
+ *      
      
+ *           
    •  allocateIds(String projectId, List<Key> keys)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  allocateIdsCallable()
+ *      
    
+ *       
     ReserveIds
     Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore.
    		
+ *      
    Request object method variants only take one parameter, a request object, which must be constructed before the call.
    
+ *      
      
+ *           
    •  reserveIds(ReserveIdsRequest request)
+ *      
    
+ *      
    "Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.
    
+ *      
      
+ *           
    •  reserveIds(String projectId, List<Key> keys)
+ *      
    
+ *      
    Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.
    
+ *      
      
+ *           
    •  reserveIdsCallable()
+ *      
    
+ *       
    
+ *
+ * 
    See the individual methods for example code.
+ *
+ * 
    Many parameters require resource names to be formatted in a particular way. To assist with
+ * these names, this class includes a format method for each type of name, and additionally a parse
+ * method to extract the individual identifiers contained within names that are returned.
+ *
+ * 
    This class can be customized by passing in a custom instance of DatastoreSettings to create().
+ * For example:
+ *
+ * 
    To customize credentials:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * DatastoreSettings datastoreSettings =
+ *     DatastoreSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .build();
+ * DatastoreClient datastoreClient = DatastoreClient.create(datastoreSettings);
+ * }
    
+ *
+ * 
    To customize the endpoint:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * DatastoreSettings datastoreSettings =
+ *     DatastoreSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * DatastoreClient datastoreClient = DatastoreClient.create(datastoreSettings);
+ * }
    
+ *
+ * 
    To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
+ * the wire:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * DatastoreSettings datastoreSettings = DatastoreSettings.newHttpJsonBuilder().build();
+ * DatastoreClient datastoreClient = DatastoreClient.create(datastoreSettings);
+ * }
    
+ *
+ * 
    Please refer to the GitHub repository's samples for more quickstart code snippets.
+ */
+@Generated("by gapic-generator-java")
+public class DatastoreClient implements BackgroundResource {
+  private final DatastoreSettings settings;
+  private final DatastoreStub stub;
+
+  /** Constructs an instance of DatastoreClient with default settings. */
+  public static final DatastoreClient create() throws IOException {
+    return create(DatastoreSettings.newBuilder().build());
+  }
+
+  /**
+   * Constructs an instance of DatastoreClient, using the given settings. The channels are created
+   * based on the settings passed in, or defaults for any settings that are not set.
+   */
+  public static final DatastoreClient create(DatastoreSettings settings) throws IOException {
+    return new DatastoreClient(settings);
+  }
+
+  /**
+   * Constructs an instance of DatastoreClient, using the given stub for making calls. This is for
+   * advanced usage - prefer using create(DatastoreSettings).
+   */
+  public static final DatastoreClient create(DatastoreStub stub) {
+    return new DatastoreClient(stub);
+  }
+
+  /**
+   * Constructs an instance of DatastoreClient, using the given settings. This is protected so that
+   * it is easy to make a subclass, but otherwise, the static factory methods should be preferred.
+   */
+  protected DatastoreClient(DatastoreSettings settings) throws IOException {
+    this.settings = settings;
+    this.stub = ((DatastoreStubSettings) settings.getStubSettings()).createStub();
+  }
+
+  protected DatastoreClient(DatastoreStub stub) {
+    this.settings = null;
+    this.stub = stub;
+  }
+
+  public final DatastoreSettings getSettings() {
+    return settings;
+  }
+
+  public DatastoreStub getStub() {
+    return stub;
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Looks up entities by key.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   ReadOptions readOptions = ReadOptions.newBuilder().build();
+   *   List keys = new ArrayList<>();
+   *   LookupResponse response = datastoreClient.lookup(projectId, readOptions, keys);
+   * }
+   * }
    
+   *
+   * @param projectId Required. The ID of the project against which to make the request.
+   * @param readOptions The options for this lookup request.
+   * @param keys Required. Keys of entities to look up.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final LookupResponse lookup(String projectId, ReadOptions readOptions, List keys) {
+    LookupRequest request =
+        LookupRequest.newBuilder()
+            .setProjectId(projectId)
+            .setReadOptions(readOptions)
+            .addAllKeys(keys)
+            .build();
+    return lookup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Looks up entities by key.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   LookupRequest request =
+   *       LookupRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .addAllKeys(new ArrayList())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .build();
+   *   LookupResponse response = datastoreClient.lookup(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final LookupResponse lookup(LookupRequest request) {
+    return lookupCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Looks up entities by key.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   LookupRequest request =
+   *       LookupRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .addAllKeys(new ArrayList())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .build();
+   *   ApiFuture future = datastoreClient.lookupCallable().futureCall(request);
+   *   // Do something.
+   *   LookupResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable lookupCallable() {
+    return stub.lookupCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Queries for entities.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunQueryRequest request =
+   *       RunQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   RunQueryResponse response = datastoreClient.runQuery(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final RunQueryResponse runQuery(RunQueryRequest request) {
+    return runQueryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Queries for entities.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunQueryRequest request =
+   *       RunQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   ApiFuture future = datastoreClient.runQueryCallable().futureCall(request);
+   *   // Do something.
+   *   RunQueryResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable runQueryCallable() {
+    return stub.runQueryCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Runs an aggregation query.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunAggregationQueryRequest request =
+   *       RunAggregationQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   RunAggregationQueryResponse response = datastoreClient.runAggregationQuery(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) {
+    return runAggregationQueryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Runs an aggregation query.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunAggregationQueryRequest request =
+   *       RunAggregationQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.runAggregationQueryCallable().futureCall(request);
+   *   // Do something.
+   *   RunAggregationQueryResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable
+      runAggregationQueryCallable() {
+    return stub.runAggregationQueryCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Begins a new transaction.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   BeginTransactionResponse response = datastoreClient.beginTransaction(projectId);
+   * }
+   * }
    
+   *
+   * @param projectId Required. The ID of the project against which to make the request.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final BeginTransactionResponse beginTransaction(String projectId) {
+    BeginTransactionRequest request =
+        BeginTransactionRequest.newBuilder().setProjectId(projectId).build();
+    return beginTransaction(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Begins a new transaction.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   BeginTransactionRequest request =
+   *       BeginTransactionRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransactionOptions(TransactionOptions.newBuilder().build())
+   *           .build();
+   *   BeginTransactionResponse response = datastoreClient.beginTransaction(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final BeginTransactionResponse beginTransaction(BeginTransactionRequest request) {
+    return beginTransactionCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Begins a new transaction.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   BeginTransactionRequest request =
+   *       BeginTransactionRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransactionOptions(TransactionOptions.newBuilder().build())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.beginTransactionCallable().futureCall(request);
+   *   // Do something.
+   *   BeginTransactionResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable
+      beginTransactionCallable() {
+    return stub.beginTransactionCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Commits a transaction, optionally creating, deleting or modifying some entities.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+   *   List mutations = new ArrayList<>();
+   *   CommitResponse response = datastoreClient.commit(projectId, mode, mutations);
+   * }
+   * }
    
+   *
+   * @param projectId Required. The ID of the project against which to make the request.
+   * @param mode The type of commit to perform. Defaults to `TRANSACTIONAL`.
+   * @param mutations 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.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final CommitResponse commit(
+      String projectId, CommitRequest.Mode mode, List mutations) {
+    CommitRequest request =
+        CommitRequest.newBuilder()
+            .setProjectId(projectId)
+            .setMode(mode)
+            .addAllMutations(mutations)
+            .build();
+    return commit(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Commits a transaction, optionally creating, deleting or modifying some entities.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+   *   ByteString transaction = ByteString.EMPTY;
+   *   List mutations = new ArrayList<>();
+   *   CommitResponse response = datastoreClient.commit(projectId, mode, transaction, mutations);
+   * }
+   * }
    
+   *
+   * @param projectId Required. The ID of the project against which to make the request.
+   * @param mode The type of commit to perform. Defaults to `TRANSACTIONAL`.
+   * @param transaction The identifier of the transaction associated with the commit. A transaction
+   *     identifier is returned by a call to
+   *     [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * @param mutations 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.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final CommitResponse commit(
+      String projectId, CommitRequest.Mode mode, ByteString transaction, List mutations) {
+    CommitRequest request =
+        CommitRequest.newBuilder()
+            .setProjectId(projectId)
+            .setMode(mode)
+            .setTransaction(transaction)
+            .addAllMutations(mutations)
+            .build();
+    return commit(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Commits a transaction, optionally creating, deleting or modifying some entities.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   CommitRequest request =
+   *       CommitRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllMutations(new ArrayList())
+   *           .build();
+   *   CommitResponse response = datastoreClient.commit(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final CommitResponse commit(CommitRequest request) {
+    return commitCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Commits a transaction, optionally creating, deleting or modifying some entities.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   CommitRequest request =
+   *       CommitRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllMutations(new ArrayList())
+   *           .build();
+   *   ApiFuture future = datastoreClient.commitCallable().futureCall(request);
+   *   // Do something.
+   *   CommitResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable commitCallable() {
+    return stub.commitCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Rolls back a transaction.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   ByteString transaction = ByteString.EMPTY;
+   *   RollbackResponse response = datastoreClient.rollback(projectId, transaction);
+   * }
+   * }
    
+   *
+   * @param projectId Required. The ID of the project against which to make the request.
+   * @param transaction Required. The transaction identifier, returned by a call to
+   *     [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final RollbackResponse rollback(String projectId, ByteString transaction) {
+    RollbackRequest request =
+        RollbackRequest.newBuilder().setProjectId(projectId).setTransaction(transaction).build();
+    return rollback(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Rolls back a transaction.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RollbackRequest request =
+   *       RollbackRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransaction(ByteString.EMPTY)
+   *           .build();
+   *   RollbackResponse response = datastoreClient.rollback(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final RollbackResponse rollback(RollbackRequest request) {
+    return rollbackCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Rolls back a transaction.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RollbackRequest request =
+   *       RollbackRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransaction(ByteString.EMPTY)
+   *           .build();
+   *   ApiFuture future = datastoreClient.rollbackCallable().futureCall(request);
+   *   // Do something.
+   *   RollbackResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable rollbackCallable() {
+    return stub.rollbackCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Allocates IDs for the given keys, which is useful for referencing an entity before it is
+   * inserted.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   List keys = new ArrayList<>();
+   *   AllocateIdsResponse response = datastoreClient.allocateIds(projectId, keys);
+   * }
+   * }
    
+   *
+   * @param projectId Required. The ID of the project against which to make the request.
+   * @param keys Required. A list of keys with incomplete key paths for which to allocate IDs. No
+   *     key may be reserved/read-only.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final AllocateIdsResponse allocateIds(String projectId, List keys) {
+    AllocateIdsRequest request =
+        AllocateIdsRequest.newBuilder().setProjectId(projectId).addAllKeys(keys).build();
+    return allocateIds(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Allocates IDs for the given keys, which is useful for referencing an entity before it is
+   * inserted.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   AllocateIdsRequest request =
+   *       AllocateIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   AllocateIdsResponse response = datastoreClient.allocateIds(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final AllocateIdsResponse allocateIds(AllocateIdsRequest request) {
+    return allocateIdsCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Allocates IDs for the given keys, which is useful for referencing an entity before it is
+   * inserted.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   AllocateIdsRequest request =
+   *       AllocateIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.allocateIdsCallable().futureCall(request);
+   *   // Do something.
+   *   AllocateIdsResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable allocateIdsCallable() {
+    return stub.allocateIdsCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   List keys = new ArrayList<>();
+   *   ReserveIdsResponse response = datastoreClient.reserveIds(projectId, keys);
+   * }
+   * }
    
+   *
+   * @param projectId Required. The ID of the project against which to make the request.
+   * @param keys Required. A list of keys with complete key paths whose numeric IDs should not be
+   *     auto-allocated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ReserveIdsResponse reserveIds(String projectId, List keys) {
+    ReserveIdsRequest request =
+        ReserveIdsRequest.newBuilder().setProjectId(projectId).addAllKeys(keys).build();
+    return reserveIds(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   ReserveIdsRequest request =
+   *       ReserveIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   ReserveIdsResponse response = datastoreClient.reserveIds(request);
+   * }
+   * }
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ReserveIdsResponse reserveIds(ReserveIdsRequest request) {
+    return reserveIdsCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore.
+   *
+   * 
    Sample code:
+   *
+   * 
    {@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   ReserveIdsRequest request =
+   *       ReserveIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.reserveIdsCallable().futureCall(request);
+   *   // Do something.
+   *   ReserveIdsResponse response = future.get();
+   * }
+   * }
    
+   */
+  public final UnaryCallable reserveIdsCallable() {
+    return stub.reserveIdsCallable();
+  }
+
+  @Override
+  public final void close() {
+    stub.close();
+  }
+
+  @Override
+  public void shutdown() {
+    stub.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return stub.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return stub.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    stub.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return stub.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java
new file mode 100644
index 000000000000..74054341e9b9
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java
@@ -0,0 +1,304 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.datastore.v1.stub.DatastoreStubSettings;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Settings class to configure an instance of {@link DatastoreClient}.
+ *
+ * 
    The default instance has everything set to sensible defaults:
+ *
+ * 
      
+ *   
    • The default service address (datastore.googleapis.com) and default port (443) are used.
+ *   
    • Credentials are acquired automatically through Application Default Credentials.
+ *   
    • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 
    
+ *
+ * 
    The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object.
+ *
+ * 
    For example, to set the
+ * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings)
+ * of lookup:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * DatastoreSettings.Builder datastoreSettingsBuilder = DatastoreSettings.newBuilder();
+ * datastoreSettingsBuilder
+ *     .lookupSettings()
+ *     .setRetrySettings(
+ *         datastoreSettingsBuilder
+ *             .lookupSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
+ *             .build());
+ * DatastoreSettings datastoreSettings = datastoreSettingsBuilder.build();
+ * }
    
+ *
+ * Please refer to the [Client Side Retry
+ * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
+ * additional support in setting retries.
+ */
+@Generated("by gapic-generator-java")
+public class DatastoreSettings extends ClientSettings {
+
+  /** Returns the object with the settings used for calls to lookup. */
+  public UnaryCallSettings lookupSettings() {
+    return ((DatastoreStubSettings) getStubSettings()).lookupSettings();
+  }
+
+  /** Returns the object with the settings used for calls to runQuery. */
+  public UnaryCallSettings runQuerySettings() {
+    return ((DatastoreStubSettings) getStubSettings()).runQuerySettings();
+  }
+
+  /** Returns the object with the settings used for calls to runAggregationQuery. */
+  public UnaryCallSettings
+      runAggregationQuerySettings() {
+    return ((DatastoreStubSettings) getStubSettings()).runAggregationQuerySettings();
+  }
+
+  /** Returns the object with the settings used for calls to beginTransaction. */
+  public UnaryCallSettings
+      beginTransactionSettings() {
+    return ((DatastoreStubSettings) getStubSettings()).beginTransactionSettings();
+  }
+
+  /** Returns the object with the settings used for calls to commit. */
+  public UnaryCallSettings commitSettings() {
+    return ((DatastoreStubSettings) getStubSettings()).commitSettings();
+  }
+
+  /** Returns the object with the settings used for calls to rollback. */
+  public UnaryCallSettings rollbackSettings() {
+    return ((DatastoreStubSettings) getStubSettings()).rollbackSettings();
+  }
+
+  /** Returns the object with the settings used for calls to allocateIds. */
+  public UnaryCallSettings allocateIdsSettings() {
+    return ((DatastoreStubSettings) getStubSettings()).allocateIdsSettings();
+  }
+
+  /** Returns the object with the settings used for calls to reserveIds. */
+  public UnaryCallSettings reserveIdsSettings() {
+    return ((DatastoreStubSettings) getStubSettings()).reserveIdsSettings();
+  }
+
+  public static final DatastoreSettings create(DatastoreStubSettings stub) throws IOException {
+    return new DatastoreSettings.Builder(stub.toBuilder()).build();
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return DatastoreStubSettings.defaultExecutorProviderBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return DatastoreStubSettings.getDefaultEndpoint();
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DatastoreStubSettings.getDefaultServiceScopes();
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return DatastoreStubSettings.defaultCredentialsProviderBuilder();
+  }
+
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return DatastoreStubSettings.defaultGrpcTransportProviderBuilder();
+  }
+
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return DatastoreStubSettings.defaultHttpJsonTransportProviderBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return DatastoreStubSettings.defaultTransportChannelProvider();
+  }
+
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return DatastoreStubSettings.defaultApiClientHeaderProviderBuilder();
+  }
+
+  /** Returns a new gRPC builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new REST builder for this class. */
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected DatastoreSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+  }
+
+  /** Builder for DatastoreSettings. */
+  public static class Builder extends ClientSettings.Builder {
+
+    protected Builder() throws IOException {
+      this(((ClientContext) null));
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(DatastoreStubSettings.newBuilder(clientContext));
+    }
+
+    protected Builder(DatastoreSettings settings) {
+      super(settings.getStubSettings().toBuilder());
+    }
+
+    protected Builder(DatastoreStubSettings.Builder stubSettings) {
+      super(stubSettings);
+    }
+
+    private static Builder createDefault() {
+      return new Builder(DatastoreStubSettings.newBuilder());
+    }
+
+    private static Builder createHttpJsonDefault() {
+      return new Builder(DatastoreStubSettings.newHttpJsonBuilder());
+    }
+
+    public DatastoreStubSettings.Builder getStubSettingsBuilder() {
+      return ((DatastoreStubSettings.Builder) getStubSettings());
+    }
+
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
    Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) {
+      super.applyToAllUnaryMethods(
+          getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
+      return this;
+    }
+
+    /** Returns the builder for the settings used for calls to lookup. */
+    public UnaryCallSettings.Builder lookupSettings() {
+      return getStubSettingsBuilder().lookupSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to runQuery. */
+    public UnaryCallSettings.Builder runQuerySettings() {
+      return getStubSettingsBuilder().runQuerySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to runAggregationQuery. */
+    public UnaryCallSettings.Builder
+        runAggregationQuerySettings() {
+      return getStubSettingsBuilder().runAggregationQuerySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to beginTransaction. */
+    public UnaryCallSettings.Builder
+        beginTransactionSettings() {
+      return getStubSettingsBuilder().beginTransactionSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to commit. */
+    public UnaryCallSettings.Builder commitSettings() {
+      return getStubSettingsBuilder().commitSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to rollback. */
+    public UnaryCallSettings.Builder rollbackSettings() {
+      return getStubSettingsBuilder().rollbackSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to allocateIds. */
+    public UnaryCallSettings.Builder
+        allocateIdsSettings() {
+      return getStubSettingsBuilder().allocateIdsSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to reserveIds. */
+    public UnaryCallSettings.Builder reserveIdsSettings() {
+      return getStubSettingsBuilder().reserveIdsSettings();
+    }
+
+    @Override
+    public DatastoreSettings build() throws IOException {
+      return new DatastoreSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json
new file mode 100644
index 000000000000..02196d36eac3
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json
@@ -0,0 +1,42 @@
+{
+  "schema": "1.0",
+  "comment": "This file maps proto services/RPCs to the corresponding library clients/methods",
+  "language": "java",
+  "protoPackage": "google.datastore.v1",
+  "libraryPackage": "com.google.cloud.datastore.v1",
+  "services": {
+    "Datastore": {
+      "clients": {
+        "grpc": {
+          "libraryClient": "DatastoreClient",
+          "rpcs": {
+            "AllocateIds": {
+              "methods": ["allocateIds", "allocateIds", "allocateIdsCallable"]
+            },
+            "BeginTransaction": {
+              "methods": ["beginTransaction", "beginTransaction", "beginTransactionCallable"]
+            },
+            "Commit": {
+              "methods": ["commit", "commit", "commit", "commitCallable"]
+            },
+            "Lookup": {
+              "methods": ["lookup", "lookup", "lookupCallable"]
+            },
+            "ReserveIds": {
+              "methods": ["reserveIds", "reserveIds", "reserveIdsCallable"]
+            },
+            "Rollback": {
+              "methods": ["rollback", "rollback", "rollbackCallable"]
+            },
+            "RunAggregationQuery": {
+              "methods": ["runAggregationQuery", "runAggregationQueryCallable"]
+            },
+            "RunQuery": {
+              "methods": ["runQuery", "runQueryCallable"]
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java
new file mode 100644
index 000000000000..0484a7c04407
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.
+ */
+
+/**
+ * A client to Cloud Datastore API
+ *
+ * 
    The interfaces provided are listed below, along with usage samples.
+ *
+ * 
    ======================= DatastoreClient =======================
+ *
+ * 
    Service Description: Each RPC normalizes the partition IDs of the keys in its input entities,
+ * and always returns entities with keys with normalized partition IDs. This applies to all keys and
+ * entities, including those in values, except keys with both an empty path and an empty or unset
+ * partition ID. Normalization of input keys sets the project ID (if not already set) to the project
+ * ID from the request.
+ *
+ * 
    Sample for DatastoreClient:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * try (DatastoreClient datastoreClient = DatastoreClient.create()) {
+ *   String projectId = "projectId-894832108";
+ *   ReadOptions readOptions = ReadOptions.newBuilder().build();
+ *   List keys = new ArrayList<>();
+ *   LookupResponse response = datastoreClient.lookup(projectId, readOptions, keys);
+ * }
+ * }
    
+ */
+@Generated("by gapic-generator-java")
+package com.google.cloud.datastore.v1;
+
+import javax.annotation.Generated;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java
new file mode 100644
index 000000000000..231289f18ebd
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1.stub;
+
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Base stub class for the Datastore service API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator-java")
+public abstract class DatastoreStub implements BackgroundResource {
+
+  public UnaryCallable lookupCallable() {
+    throw new UnsupportedOperationException("Not implemented: lookupCallable()");
+  }
+
+  public UnaryCallable runQueryCallable() {
+    throw new UnsupportedOperationException("Not implemented: runQueryCallable()");
+  }
+
+  public UnaryCallable
+      runAggregationQueryCallable() {
+    throw new UnsupportedOperationException("Not implemented: runAggregationQueryCallable()");
+  }
+
+  public UnaryCallable
+      beginTransactionCallable() {
+    throw new UnsupportedOperationException("Not implemented: beginTransactionCallable()");
+  }
+
+  public UnaryCallable commitCallable() {
+    throw new UnsupportedOperationException("Not implemented: commitCallable()");
+  }
+
+  public UnaryCallable rollbackCallable() {
+    throw new UnsupportedOperationException("Not implemented: rollbackCallable()");
+  }
+
+  public UnaryCallable allocateIdsCallable() {
+    throw new UnsupportedOperationException("Not implemented: allocateIdsCallable()");
+  }
+
+  public UnaryCallable reserveIdsCallable() {
+    throw new UnsupportedOperationException("Not implemented: reserveIdsCallable()");
+  }
+
+  @Override
+  public abstract void close();
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java
new file mode 100644
index 000000000000..a4554339d2c5
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java
@@ -0,0 +1,535 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1.stub;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
+import com.google.api.gax.core.GaxProperties;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.GaxHttpJsonProperties;
+import com.google.api.gax.httpjson.HttpJsonTransportChannel;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.StubSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * Settings class to configure an instance of {@link DatastoreStub}.
+ *
+ * 
    The default instance has everything set to sensible defaults:
+ *
+ * 
      
+ *   
    • The default service address (datastore.googleapis.com) and default port (443) are used.
+ *   
    • Credentials are acquired automatically through Application Default Credentials.
+ *   
    • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 
    
+ *
+ * 
    The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object.
+ *
+ * 
    For example, to set the
+ * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings)
+ * of lookup:
+ *
+ * 
    {@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+ * DatastoreStubSettings.Builder datastoreSettingsBuilder = DatastoreStubSettings.newBuilder();
+ * datastoreSettingsBuilder
+ *     .lookupSettings()
+ *     .setRetrySettings(
+ *         datastoreSettingsBuilder
+ *             .lookupSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
+ *             .build());
+ * DatastoreStubSettings datastoreSettings = datastoreSettingsBuilder.build();
+ * }
    
+ *
+ * Please refer to the [Client Side Retry
+ * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
+ * additional support in setting retries.
+ */
+@Generated("by gapic-generator-java")
+public class DatastoreStubSettings extends StubSettings {
+  /** The default scopes of the service. */
+  private static final ImmutableList DEFAULT_SERVICE_SCOPES =
+      ImmutableList.builder()
+          .add("https://www.googleapis.com/auth/cloud-platform")
+          .add("https://www.googleapis.com/auth/datastore")
+          .build();
+
+  private final UnaryCallSettings lookupSettings;
+  private final UnaryCallSettings runQuerySettings;
+  private final UnaryCallSettings
+      runAggregationQuerySettings;
+  private final UnaryCallSettings
+      beginTransactionSettings;
+  private final UnaryCallSettings commitSettings;
+  private final UnaryCallSettings rollbackSettings;
+  private final UnaryCallSettings allocateIdsSettings;
+  private final UnaryCallSettings reserveIdsSettings;
+
+  /** Returns the object with the settings used for calls to lookup. */
+  public UnaryCallSettings lookupSettings() {
+    return lookupSettings;
+  }
+
+  /** Returns the object with the settings used for calls to runQuery. */
+  public UnaryCallSettings runQuerySettings() {
+    return runQuerySettings;
+  }
+
+  /** Returns the object with the settings used for calls to runAggregationQuery. */
+  public UnaryCallSettings
+      runAggregationQuerySettings() {
+    return runAggregationQuerySettings;
+  }
+
+  /** Returns the object with the settings used for calls to beginTransaction. */
+  public UnaryCallSettings
+      beginTransactionSettings() {
+    return beginTransactionSettings;
+  }
+
+  /** Returns the object with the settings used for calls to commit. */
+  public UnaryCallSettings commitSettings() {
+    return commitSettings;
+  }
+
+  /** Returns the object with the settings used for calls to rollback. */
+  public UnaryCallSettings rollbackSettings() {
+    return rollbackSettings;
+  }
+
+  /** Returns the object with the settings used for calls to allocateIds. */
+  public UnaryCallSettings allocateIdsSettings() {
+    return allocateIdsSettings;
+  }
+
+  /** Returns the object with the settings used for calls to reserveIds. */
+  public UnaryCallSettings reserveIdsSettings() {
+    return reserveIdsSettings;
+  }
+
+  public DatastoreStub createStub() throws IOException {
+    if (getTransportChannelProvider()
+        .getTransportName()
+        .equals(GrpcTransportChannel.getGrpcTransportName())) {
+      return GrpcDatastoreStub.create(this);
+    }
+    if (getTransportChannelProvider()
+        .getTransportName()
+        .equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
+      return HttpJsonDatastoreStub.create(this);
+    }
+    throw new UnsupportedOperationException(
+        String.format(
+            "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
+  }
+
+  /** Returns the default service name. */
+  @Override
+  public String getServiceName() {
+    return "datastore";
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return InstantiatingExecutorProvider.newBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
+  public static String getDefaultEndpoint() {
+    return "datastore.googleapis.com:443";
+  }
+
+  /** Returns the default mTLS service endpoint. */
+  public static String getDefaultMtlsEndpoint() {
+    return "datastore.mtls.googleapis.com:443";
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DEFAULT_SERVICE_SCOPES;
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
+  }
+
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
+  }
+
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return InstantiatingHttpJsonChannelProvider.newBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return defaultGrpcTransportProviderBuilder().build();
+  }
+
+  public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
+    return ApiClientHeaderProvider.newBuilder()
+        .setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(DatastoreStubSettings.class))
+        .setTransportToken(
+            GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
+  }
+
+  public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
+    return ApiClientHeaderProvider.newBuilder()
+        .setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(DatastoreStubSettings.class))
+        .setTransportToken(
+            GaxHttpJsonProperties.getHttpJsonTokenName(),
+            GaxHttpJsonProperties.getHttpJsonVersion());
+  }
+
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return DatastoreStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
+  }
+
+  /** Returns a new gRPC builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new REST builder for this class. */
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected DatastoreStubSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+
+    lookupSettings = settingsBuilder.lookupSettings().build();
+    runQuerySettings = settingsBuilder.runQuerySettings().build();
+    runAggregationQuerySettings = settingsBuilder.runAggregationQuerySettings().build();
+    beginTransactionSettings = settingsBuilder.beginTransactionSettings().build();
+    commitSettings = settingsBuilder.commitSettings().build();
+    rollbackSettings = settingsBuilder.rollbackSettings().build();
+    allocateIdsSettings = settingsBuilder.allocateIdsSettings().build();
+    reserveIdsSettings = settingsBuilder.reserveIdsSettings().build();
+  }
+
+  /** Builder for DatastoreStubSettings. */
+  public static class Builder extends StubSettings.Builder {
+    private final ImmutableList> unaryMethodSettingsBuilders;
+    private final UnaryCallSettings.Builder lookupSettings;
+    private final UnaryCallSettings.Builder runQuerySettings;
+    private final UnaryCallSettings.Builder
+        runAggregationQuerySettings;
+    private final UnaryCallSettings.Builder
+        beginTransactionSettings;
+    private final UnaryCallSettings.Builder commitSettings;
+    private final UnaryCallSettings.Builder rollbackSettings;
+    private final UnaryCallSettings.Builder
+        allocateIdsSettings;
+    private final UnaryCallSettings.Builder
+        reserveIdsSettings;
+    private static final ImmutableMap>
+        RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder> definitions =
+          ImmutableMap.builder();
+      definitions.put(
+          "retry_policy_0_codes",
+          ImmutableSet.copyOf(
+              Lists.newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList()));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder definitions = ImmutableMap.builder();
+      RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelayDuration(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelayDuration(Duration.ofMillis(60000L))
+              .setInitialRpcTimeoutDuration(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeoutDuration(Duration.ofMillis(60000L))
+              .setTotalTimeoutDuration(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_0_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeoutDuration(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeoutDuration(Duration.ofMillis(60000L))
+              .setTotalTimeoutDuration(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("no_retry_1_params", settings);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    protected Builder() {
+      this(((ClientContext) null));
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(clientContext);
+
+      lookupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      runQuerySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      runAggregationQuerySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      beginTransactionSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      commitSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      rollbackSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      allocateIdsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      reserveIdsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              lookupSettings,
+              runQuerySettings,
+              runAggregationQuerySettings,
+              beginTransactionSettings,
+              commitSettings,
+              rollbackSettings,
+              allocateIdsSettings,
+              reserveIdsSettings);
+      initDefaults(this);
+    }
+
+    protected Builder(DatastoreStubSettings settings) {
+      super(settings);
+
+      lookupSettings = settings.lookupSettings.toBuilder();
+      runQuerySettings = settings.runQuerySettings.toBuilder();
+      runAggregationQuerySettings = settings.runAggregationQuerySettings.toBuilder();
+      beginTransactionSettings = settings.beginTransactionSettings.toBuilder();
+      commitSettings = settings.commitSettings.toBuilder();
+      rollbackSettings = settings.rollbackSettings.toBuilder();
+      allocateIdsSettings = settings.allocateIdsSettings.toBuilder();
+      reserveIdsSettings = settings.reserveIdsSettings.toBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              lookupSettings,
+              runQuerySettings,
+              runAggregationQuerySettings,
+              beginTransactionSettings,
+              commitSettings,
+              rollbackSettings,
+              allocateIdsSettings,
+              reserveIdsSettings);
+    }
+
+    private static Builder createDefault() {
+      Builder builder = new Builder(((ClientContext) null));
+
+      builder.setTransportChannelProvider(defaultTransportChannelProvider());
+      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+      builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
+      builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+      builder.setSwitchToMtlsEndpointAllowed(true);
+
+      return initDefaults(builder);
+    }
+
+    private static Builder createHttpJsonDefault() {
+      Builder builder = new Builder(((ClientContext) null));
+
+      builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
+      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+      builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
+      builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+      builder.setSwitchToMtlsEndpointAllowed(true);
+
+      return initDefaults(builder);
+    }
+
+    private static Builder initDefaults(Builder builder) {
+      builder
+          .lookupSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+
+      builder
+          .runQuerySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+
+      builder
+          .runAggregationQuerySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+
+      builder
+          .beginTransactionSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .commitSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .rollbackSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .allocateIdsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .reserveIdsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+
+      return builder;
+    }
+
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
    Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) {
+      super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
+      return this;
+    }
+
+    public ImmutableList> unaryMethodSettingsBuilders() {
+      return unaryMethodSettingsBuilders;
+    }
+
+    /** Returns the builder for the settings used for calls to lookup. */
+    public UnaryCallSettings.Builder lookupSettings() {
+      return lookupSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to runQuery. */
+    public UnaryCallSettings.Builder runQuerySettings() {
+      return runQuerySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to runAggregationQuery. */
+    public UnaryCallSettings.Builder
+        runAggregationQuerySettings() {
+      return runAggregationQuerySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to beginTransaction. */
+    public UnaryCallSettings.Builder
+        beginTransactionSettings() {
+      return beginTransactionSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to commit. */
+    public UnaryCallSettings.Builder commitSettings() {
+      return commitSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to rollback. */
+    public UnaryCallSettings.Builder rollbackSettings() {
+      return rollbackSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to allocateIds. */
+    public UnaryCallSettings.Builder
+        allocateIdsSettings() {
+      return allocateIdsSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to reserveIds. */
+    public UnaryCallSettings.Builder reserveIdsSettings() {
+      return reserveIdsSettings;
+    }
+
+    @Override
+    public DatastoreStubSettings build() throws IOException {
+      return new DatastoreStubSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java
new file mode 100644
index 000000000000..ffe225259dc3
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1.stub;
+
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcCallableFactory;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.BatchingCallSettings;
+import com.google.api.gax.rpc.BidiStreamingCallable;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientStreamingCallable;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.api.gax.rpc.StreamingCallSettings;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.OperationsStub;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * gRPC callable factory implementation for the Datastore service API.
+ *
+ * 
    This class is for advanced usage.
+ */
+@Generated("by gapic-generator-java")
+public class GrpcDatastoreCallableFactory implements GrpcStubCallableFactory {
+
+  @Override
+  public  UnaryCallable createUnaryCallable(
+      GrpcCallSettings grpcCallSettings,
+      UnaryCallSettings callSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createUnaryCallable(grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      UnaryCallable createPagedCallable(
+          GrpcCallSettings grpcCallSettings,
+          PagedCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createPagedCallable(grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public  UnaryCallable createBatchingCallable(
+      GrpcCallSettings grpcCallSettings,
+      BatchingCallSettings callSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createBatchingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      OperationCallable createOperationCallable(
+          GrpcCallSettings grpcCallSettings,
+          OperationCallSettings callSettings,
+          ClientContext clientContext,
+          OperationsStub operationsStub) {
+    return GrpcCallableFactory.createOperationCallable(
+        grpcCallSettings, callSettings, clientContext, operationsStub);
+  }
+
+  @Override
+  public 
+      BidiStreamingCallable createBidiStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createBidiStreamingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ServerStreamingCallable createServerStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          ServerStreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createServerStreamingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ClientStreamingCallable createClientStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createClientStreamingCallable(
+        grpcCallSettings, callSettings, clientContext);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
new file mode 100644
index 000000000000..48741381607a
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
@@ -0,0 +1,429 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1.stub;
+
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.BackgroundResourceAggregation;
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.RequestParamsBuilder;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.longrunning.stub.GrpcOperationsStub;
+import io.grpc.MethodDescriptor;
+import io.grpc.protobuf.ProtoUtils;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * gRPC stub implementation for the Datastore service API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator-java")
+public class GrpcDatastoreStub extends DatastoreStub {
+  private static final MethodDescriptor lookupMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.datastore.v1.Datastore/Lookup")
+          .setRequestMarshaller(ProtoUtils.marshaller(LookupRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(LookupResponse.getDefaultInstance()))
+          .build();
+
+  private static final MethodDescriptor
+      runQueryMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.v1.Datastore/RunQuery")
+              .setRequestMarshaller(ProtoUtils.marshaller(RunQueryRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(RunQueryResponse.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor
+      runAggregationQueryMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.v1.Datastore/RunAggregationQuery")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(RunAggregationQueryRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(RunAggregationQueryResponse.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor
+      beginTransactionMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.v1.Datastore/BeginTransaction")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(BeginTransactionRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(BeginTransactionResponse.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor commitMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.datastore.v1.Datastore/Commit")
+          .setRequestMarshaller(ProtoUtils.marshaller(CommitRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(CommitResponse.getDefaultInstance()))
+          .build();
+
+  private static final MethodDescriptor
+      rollbackMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.v1.Datastore/Rollback")
+              .setRequestMarshaller(ProtoUtils.marshaller(RollbackRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(RollbackResponse.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor
+      allocateIdsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.v1.Datastore/AllocateIds")
+              .setRequestMarshaller(ProtoUtils.marshaller(AllocateIdsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(AllocateIdsResponse.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor
+      reserveIdsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.datastore.v1.Datastore/ReserveIds")
+              .setRequestMarshaller(ProtoUtils.marshaller(ReserveIdsRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(ReserveIdsResponse.getDefaultInstance()))
+              .build();
+
+  private final UnaryCallable lookupCallable;
+  private final UnaryCallable runQueryCallable;
+  private final UnaryCallable
+      runAggregationQueryCallable;
+  private final UnaryCallable
+      beginTransactionCallable;
+  private final UnaryCallable commitCallable;
+  private final UnaryCallable rollbackCallable;
+  private final UnaryCallable allocateIdsCallable;
+  private final UnaryCallable reserveIdsCallable;
+
+  private final BackgroundResource backgroundResources;
+  private final GrpcOperationsStub operationsStub;
+  private final GrpcStubCallableFactory callableFactory;
+
+  private static final PathTemplate LOOKUP_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}");
+  private static final PathTemplate LOOKUP_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate RUN_QUERY_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate RUN_QUERY_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate BEGIN_TRANSACTION_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate BEGIN_TRANSACTION_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate COMMIT_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}");
+  private static final PathTemplate COMMIT_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate ROLLBACK_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate ROLLBACK_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate ALLOCATE_IDS_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate ALLOCATE_IDS_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate RESERVE_IDS_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate RESERVE_IDS_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+
+  public static final GrpcDatastoreStub create(DatastoreStubSettings settings) throws IOException {
+    return new GrpcDatastoreStub(settings, ClientContext.create(settings));
+  }
+
+  public static final GrpcDatastoreStub create(ClientContext clientContext) throws IOException {
+    return new GrpcDatastoreStub(DatastoreStubSettings.newBuilder().build(), clientContext);
+  }
+
+  public static final GrpcDatastoreStub create(
+      ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException {
+    return new GrpcDatastoreStub(
+        DatastoreStubSettings.newBuilder().build(), clientContext, callableFactory);
+  }
+
+  /**
+   * Constructs an instance of GrpcDatastoreStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcDatastoreStub(DatastoreStubSettings settings, ClientContext clientContext)
+      throws IOException {
+    this(settings, clientContext, new GrpcDatastoreCallableFactory());
+  }
+
+  /**
+   * Constructs an instance of GrpcDatastoreStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcDatastoreStub(
+      DatastoreStubSettings settings,
+      ClientContext clientContext,
+      GrpcStubCallableFactory callableFactory)
+      throws IOException {
+    this.callableFactory = callableFactory;
+    this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
+
+    GrpcCallSettings lookupTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(lookupMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", LOOKUP_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", LOOKUP_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    GrpcCallSettings runQueryTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(runQueryMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", RUN_QUERY_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", RUN_QUERY_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    GrpcCallSettings
+        runAggregationQueryTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(runAggregationQueryMethodDescriptor)
+                .setParamsExtractor(
+                    request -> {
+                      RequestParamsBuilder builder = RequestParamsBuilder.create();
+                      builder.add(
+                          request.getProjectId(),
+                          "project_id",
+                          RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE);
+                      builder.add(
+                          request.getDatabaseId(),
+                          "database_id",
+                          RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE);
+                      return builder.build();
+                    })
+                .build();
+    GrpcCallSettings
+        beginTransactionTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(beginTransactionMethodDescriptor)
+                .setParamsExtractor(
+                    request -> {
+                      RequestParamsBuilder builder = RequestParamsBuilder.create();
+                      builder.add(
+                          request.getProjectId(), "project_id", BEGIN_TRANSACTION_0_PATH_TEMPLATE);
+                      builder.add(
+                          request.getDatabaseId(),
+                          "database_id",
+                          BEGIN_TRANSACTION_1_PATH_TEMPLATE);
+                      return builder.build();
+                    })
+                .build();
+    GrpcCallSettings commitTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(commitMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", COMMIT_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", COMMIT_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    GrpcCallSettings rollbackTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(rollbackMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", ROLLBACK_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", ROLLBACK_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    GrpcCallSettings allocateIdsTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(allocateIdsMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", ALLOCATE_IDS_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", ALLOCATE_IDS_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    GrpcCallSettings reserveIdsTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(reserveIdsMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", RESERVE_IDS_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", RESERVE_IDS_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+
+    this.lookupCallable =
+        callableFactory.createUnaryCallable(
+            lookupTransportSettings, settings.lookupSettings(), clientContext);
+    this.runQueryCallable =
+        callableFactory.createUnaryCallable(
+            runQueryTransportSettings, settings.runQuerySettings(), clientContext);
+    this.runAggregationQueryCallable =
+        callableFactory.createUnaryCallable(
+            runAggregationQueryTransportSettings,
+            settings.runAggregationQuerySettings(),
+            clientContext);
+    this.beginTransactionCallable =
+        callableFactory.createUnaryCallable(
+            beginTransactionTransportSettings, settings.beginTransactionSettings(), clientContext);
+    this.commitCallable =
+        callableFactory.createUnaryCallable(
+            commitTransportSettings, settings.commitSettings(), clientContext);
+    this.rollbackCallable =
+        callableFactory.createUnaryCallable(
+            rollbackTransportSettings, settings.rollbackSettings(), clientContext);
+    this.allocateIdsCallable =
+        callableFactory.createUnaryCallable(
+            allocateIdsTransportSettings, settings.allocateIdsSettings(), clientContext);
+    this.reserveIdsCallable =
+        callableFactory.createUnaryCallable(
+            reserveIdsTransportSettings, settings.reserveIdsSettings(), clientContext);
+
+    this.backgroundResources =
+        new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+  }
+
+  public GrpcOperationsStub getOperationsStub() {
+    return operationsStub;
+  }
+
+  @Override
+  public UnaryCallable lookupCallable() {
+    return lookupCallable;
+  }
+
+  @Override
+  public UnaryCallable runQueryCallable() {
+    return runQueryCallable;
+  }
+
+  @Override
+  public UnaryCallable
+      runAggregationQueryCallable() {
+    return runAggregationQueryCallable;
+  }
+
+  @Override
+  public UnaryCallable
+      beginTransactionCallable() {
+    return beginTransactionCallable;
+  }
+
+  @Override
+  public UnaryCallable commitCallable() {
+    return commitCallable;
+  }
+
+  @Override
+  public UnaryCallable rollbackCallable() {
+    return rollbackCallable;
+  }
+
+  @Override
+  public UnaryCallable allocateIdsCallable() {
+    return allocateIdsCallable;
+  }
+
+  @Override
+  public UnaryCallable reserveIdsCallable() {
+    return reserveIdsCallable;
+  }
+
+  @Override
+  public final void close() {
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundResources.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return backgroundResources.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return backgroundResources.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    backgroundResources.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return backgroundResources.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java
new file mode 100644
index 000000000000..b12560ab1db3
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1.stub;
+
+import com.google.api.gax.httpjson.HttpJsonCallSettings;
+import com.google.api.gax.httpjson.HttpJsonCallableFactory;
+import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
+import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
+import com.google.api.gax.httpjson.longrunning.stub.OperationsStub;
+import com.google.api.gax.rpc.BatchingCallSettings;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.longrunning.Operation;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * REST callable factory implementation for the Datastore service API.
+ *
+ * 
    This class is for advanced usage.
+ */
+@Generated("by gapic-generator-java")
+public class HttpJsonDatastoreCallableFactory
+    implements HttpJsonStubCallableFactory {
+
+  @Override
+  public  UnaryCallable createUnaryCallable(
+      HttpJsonCallSettings httpJsonCallSettings,
+      UnaryCallSettings callSettings,
+      ClientContext clientContext) {
+    return HttpJsonCallableFactory.createUnaryCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      UnaryCallable createPagedCallable(
+          HttpJsonCallSettings httpJsonCallSettings,
+          PagedCallSettings callSettings,
+          ClientContext clientContext) {
+    return HttpJsonCallableFactory.createPagedCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public  UnaryCallable createBatchingCallable(
+      HttpJsonCallSettings httpJsonCallSettings,
+      BatchingCallSettings callSettings,
+      ClientContext clientContext) {
+    return HttpJsonCallableFactory.createBatchingCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      OperationCallable createOperationCallable(
+          HttpJsonCallSettings httpJsonCallSettings,
+          OperationCallSettings callSettings,
+          ClientContext clientContext,
+          OperationsStub operationsStub) {
+    UnaryCallable innerCallable =
+        HttpJsonCallableFactory.createBaseUnaryCallable(
+            httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext);
+    HttpJsonOperationSnapshotCallable initialCallable =
+        new HttpJsonOperationSnapshotCallable(
+            innerCallable,
+            httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory());
+    return HttpJsonCallableFactory.createOperationCallable(
+        callSettings, clientContext, operationsStub.longRunningClient(), initialCallable);
+  }
+
+  @Override
+  public 
+      ServerStreamingCallable createServerStreamingCallable(
+          HttpJsonCallSettings httpJsonCallSettings,
+          ServerStreamingCallSettings callSettings,
+          ClientContext clientContext) {
+    return HttpJsonCallableFactory.createServerStreamingCallable(
+        httpJsonCallSettings, callSettings, clientContext);
+  }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java
new file mode 100644
index 000000000000..4d77fcac29ac
--- /dev/null
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java
@@ -0,0 +1,676 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1.stub;
+
+import com.google.api.core.InternalApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.BackgroundResourceAggregation;
+import com.google.api.gax.httpjson.ApiMethodDescriptor;
+import com.google.api.gax.httpjson.HttpJsonCallSettings;
+import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
+import com.google.api.gax.httpjson.ProtoMessageRequestFormatter;
+import com.google.api.gax.httpjson.ProtoMessageResponseParser;
+import com.google.api.gax.httpjson.ProtoRestSerializer;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.RequestParamsBuilder;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.protobuf.TypeRegistry;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * REST stub implementation for the Datastore service API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator-java")
+public class HttpJsonDatastoreStub extends DatastoreStub {
+  private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
+
+  private static final ApiMethodDescriptor lookupMethodDescriptor =
+      ApiMethodDescriptor.newBuilder()
+          .setFullMethodName("google.datastore.v1.Datastore/Lookup")
+          .setHttpMethod("POST")
+          .setType(ApiMethodDescriptor.MethodType.UNARY)
+          .setRequestFormatter(
+              ProtoMessageRequestFormatter.newBuilder()
+                  .setPath(
+                      "/v1/projects/{projectId}:lookup",
+                      request -> {
+                        Map fields = new HashMap<>();
+                        ProtoRestSerializer serializer =
+                            ProtoRestSerializer.create();
+                        serializer.putPathParam(fields, "projectId", request.getProjectId());
+                        return fields;
+                      })
+                  .setQueryParamsExtractor(
+                      request -> {
+                        Map> fields = new HashMap<>();
+                        ProtoRestSerializer serializer =
+                            ProtoRestSerializer.create();
+                        serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                        return fields;
+                      })
+                  .setRequestBodyExtractor(
+                      request ->
+                          ProtoRestSerializer.create()
+                              .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                  .build())
+          .setResponseParser(
+              ProtoMessageResponseParser.newBuilder()
+                  .setDefaultInstance(LookupResponse.getDefaultInstance())
+                  .setDefaultTypeRegistry(typeRegistry)
+                  .build())
+          .build();
+
+  private static final ApiMethodDescriptor
+      runQueryMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.v1.Datastore/RunQuery")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:runQuery",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(RunQueryResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
+  private static final ApiMethodDescriptor
+      runAggregationQueryMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.v1.Datastore/RunAggregationQuery")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:runAggregationQuery",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(RunAggregationQueryResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
+  private static final ApiMethodDescriptor
+      beginTransactionMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.v1.Datastore/BeginTransaction")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:beginTransaction",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(BeginTransactionResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
+  private static final ApiMethodDescriptor commitMethodDescriptor =
+      ApiMethodDescriptor.newBuilder()
+          .setFullMethodName("google.datastore.v1.Datastore/Commit")
+          .setHttpMethod("POST")
+          .setType(ApiMethodDescriptor.MethodType.UNARY)
+          .setRequestFormatter(
+              ProtoMessageRequestFormatter.newBuilder()
+                  .setPath(
+                      "/v1/projects/{projectId}:commit",
+                      request -> {
+                        Map fields = new HashMap<>();
+                        ProtoRestSerializer serializer =
+                            ProtoRestSerializer.create();
+                        serializer.putPathParam(fields, "projectId", request.getProjectId());
+                        return fields;
+                      })
+                  .setQueryParamsExtractor(
+                      request -> {
+                        Map> fields = new HashMap<>();
+                        ProtoRestSerializer serializer =
+                            ProtoRestSerializer.create();
+                        serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                        return fields;
+                      })
+                  .setRequestBodyExtractor(
+                      request ->
+                          ProtoRestSerializer.create()
+                              .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                  .build())
+          .setResponseParser(
+              ProtoMessageResponseParser.newBuilder()
+                  .setDefaultInstance(CommitResponse.getDefaultInstance())
+                  .setDefaultTypeRegistry(typeRegistry)
+                  .build())
+          .build();
+
+  private static final ApiMethodDescriptor
+      rollbackMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.v1.Datastore/Rollback")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:rollback",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(RollbackResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
+  private static final ApiMethodDescriptor
+      allocateIdsMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.v1.Datastore/AllocateIds")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:allocateIds",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(AllocateIdsResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
+  private static final ApiMethodDescriptor
+      reserveIdsMethodDescriptor =
+          ApiMethodDescriptor.newBuilder()
+              .setFullMethodName("google.datastore.v1.Datastore/ReserveIds")
+              .setHttpMethod("POST")
+              .setType(ApiMethodDescriptor.MethodType.UNARY)
+              .setRequestFormatter(
+                  ProtoMessageRequestFormatter.newBuilder()
+                      .setPath(
+                          "/v1/projects/{projectId}:reserveIds",
+                          request -> {
+                            Map fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putPathParam(fields, "projectId", request.getProjectId());
+                            return fields;
+                          })
+                      .setQueryParamsExtractor(
+                          request -> {
+                            Map> fields = new HashMap<>();
+                            ProtoRestSerializer serializer =
+                                ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
+                            return fields;
+                          })
+                      .setRequestBodyExtractor(
+                          request ->
+                              ProtoRestSerializer.create()
+                                  .toBody("*", request.toBuilder().clearProjectId().build(), true))
+                      .build())
+              .setResponseParser(
+                  ProtoMessageResponseParser.newBuilder()
+                      .setDefaultInstance(ReserveIdsResponse.getDefaultInstance())
+                      .setDefaultTypeRegistry(typeRegistry)
+                      .build())
+              .build();
+
+  private final UnaryCallable lookupCallable;
+  private final UnaryCallable runQueryCallable;
+  private final UnaryCallable
+      runAggregationQueryCallable;
+  private final UnaryCallable
+      beginTransactionCallable;
+  private final UnaryCallable commitCallable;
+  private final UnaryCallable rollbackCallable;
+  private final UnaryCallable allocateIdsCallable;
+  private final UnaryCallable reserveIdsCallable;
+
+  private final BackgroundResource backgroundResources;
+  private final HttpJsonStubCallableFactory callableFactory;
+
+  private static final PathTemplate LOOKUP_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}");
+  private static final PathTemplate LOOKUP_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate RUN_QUERY_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate RUN_QUERY_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate BEGIN_TRANSACTION_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate BEGIN_TRANSACTION_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate COMMIT_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}");
+  private static final PathTemplate COMMIT_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate ROLLBACK_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate ROLLBACK_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate ALLOCATE_IDS_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate ALLOCATE_IDS_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+  private static final PathTemplate RESERVE_IDS_0_PATH_TEMPLATE =
+      PathTemplate.create("{project_id=**}");
+  private static final PathTemplate RESERVE_IDS_1_PATH_TEMPLATE =
+      PathTemplate.create("{database_id=**}");
+
+  public static final HttpJsonDatastoreStub create(DatastoreStubSettings settings)
+      throws IOException {
+    return new HttpJsonDatastoreStub(settings, ClientContext.create(settings));
+  }
+
+  public static final HttpJsonDatastoreStub create(ClientContext clientContext) throws IOException {
+    return new HttpJsonDatastoreStub(
+        DatastoreStubSettings.newHttpJsonBuilder().build(), clientContext);
+  }
+
+  public static final HttpJsonDatastoreStub create(
+      ClientContext clientContext, HttpJsonStubCallableFactory callableFactory) throws IOException {
+    return new HttpJsonDatastoreStub(
+        DatastoreStubSettings.newHttpJsonBuilder().build(), clientContext, callableFactory);
+  }
+
+  /**
+   * Constructs an instance of HttpJsonDatastoreStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected HttpJsonDatastoreStub(DatastoreStubSettings settings, ClientContext clientContext)
+      throws IOException {
+    this(settings, clientContext, new HttpJsonDatastoreCallableFactory());
+  }
+
+  /**
+   * Constructs an instance of HttpJsonDatastoreStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected HttpJsonDatastoreStub(
+      DatastoreStubSettings settings,
+      ClientContext clientContext,
+      HttpJsonStubCallableFactory callableFactory)
+      throws IOException {
+    this.callableFactory = callableFactory;
+
+    HttpJsonCallSettings lookupTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(lookupMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", LOOKUP_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", LOOKUP_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    HttpJsonCallSettings runQueryTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(runQueryMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", RUN_QUERY_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", RUN_QUERY_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    HttpJsonCallSettings
+        runAggregationQueryTransportSettings =
+            HttpJsonCallSettings
+                .newBuilder()
+                .setMethodDescriptor(runAggregationQueryMethodDescriptor)
+                .setTypeRegistry(typeRegistry)
+                .setParamsExtractor(
+                    request -> {
+                      RequestParamsBuilder builder = RequestParamsBuilder.create();
+                      builder.add(
+                          request.getProjectId(),
+                          "project_id",
+                          RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE);
+                      builder.add(
+                          request.getDatabaseId(),
+                          "database_id",
+                          RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE);
+                      return builder.build();
+                    })
+                .build();
+    HttpJsonCallSettings
+        beginTransactionTransportSettings =
+            HttpJsonCallSettings.newBuilder()
+                .setMethodDescriptor(beginTransactionMethodDescriptor)
+                .setTypeRegistry(typeRegistry)
+                .setParamsExtractor(
+                    request -> {
+                      RequestParamsBuilder builder = RequestParamsBuilder.create();
+                      builder.add(
+                          request.getProjectId(), "project_id", BEGIN_TRANSACTION_0_PATH_TEMPLATE);
+                      builder.add(
+                          request.getDatabaseId(),
+                          "database_id",
+                          BEGIN_TRANSACTION_1_PATH_TEMPLATE);
+                      return builder.build();
+                    })
+                .build();
+    HttpJsonCallSettings commitTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(commitMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", COMMIT_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", COMMIT_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    HttpJsonCallSettings rollbackTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(rollbackMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", ROLLBACK_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", ROLLBACK_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    HttpJsonCallSettings allocateIdsTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(allocateIdsMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", ALLOCATE_IDS_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", ALLOCATE_IDS_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+    HttpJsonCallSettings reserveIdsTransportSettings =
+        HttpJsonCallSettings.newBuilder()
+            .setMethodDescriptor(reserveIdsMethodDescriptor)
+            .setTypeRegistry(typeRegistry)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add(request.getProjectId(), "project_id", RESERVE_IDS_0_PATH_TEMPLATE);
+                  builder.add(request.getDatabaseId(), "database_id", RESERVE_IDS_1_PATH_TEMPLATE);
+                  return builder.build();
+                })
+            .build();
+
+    this.lookupCallable =
+        callableFactory.createUnaryCallable(
+            lookupTransportSettings, settings.lookupSettings(), clientContext);
+    this.runQueryCallable =
+        callableFactory.createUnaryCallable(
+            runQueryTransportSettings, settings.runQuerySettings(), clientContext);
+    this.runAggregationQueryCallable =
+        callableFactory.createUnaryCallable(
+            runAggregationQueryTransportSettings,
+            settings.runAggregationQuerySettings(),
+            clientContext);
+    this.beginTransactionCallable =
+        callableFactory.createUnaryCallable(
+            beginTransactionTransportSettings, settings.beginTransactionSettings(), clientContext);
+    this.commitCallable =
+        callableFactory.createUnaryCallable(
+            commitTransportSettings, settings.commitSettings(), clientContext);
+    this.rollbackCallable =
+        callableFactory.createUnaryCallable(
+            rollbackTransportSettings, settings.rollbackSettings(), clientContext);
+    this.allocateIdsCallable =
+        callableFactory.createUnaryCallable(
+            allocateIdsTransportSettings, settings.allocateIdsSettings(), clientContext);
+    this.reserveIdsCallable =
+        callableFactory.createUnaryCallable(
+            reserveIdsTransportSettings, settings.reserveIdsSettings(), clientContext);
+
+    this.backgroundResources =
+        new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+  }
+
+  @InternalApi
+  public static List getMethodDescriptors() {
+    List methodDescriptors = new ArrayList<>();
+    methodDescriptors.add(lookupMethodDescriptor);
+    methodDescriptors.add(runQueryMethodDescriptor);
+    methodDescriptors.add(runAggregationQueryMethodDescriptor);
+    methodDescriptors.add(beginTransactionMethodDescriptor);
+    methodDescriptors.add(commitMethodDescriptor);
+    methodDescriptors.add(rollbackMethodDescriptor);
+    methodDescriptors.add(allocateIdsMethodDescriptor);
+    methodDescriptors.add(reserveIdsMethodDescriptor);
+    return methodDescriptors;
+  }
+
+  @Override
+  public UnaryCallable lookupCallable() {
+    return lookupCallable;
+  }
+
+  @Override
+  public UnaryCallable runQueryCallable() {
+    return runQueryCallable;
+  }
+
+  @Override
+  public UnaryCallable
+      runAggregationQueryCallable() {
+    return runAggregationQueryCallable;
+  }
+
+  @Override
+  public UnaryCallable
+      beginTransactionCallable() {
+    return beginTransactionCallable;
+  }
+
+  @Override
+  public UnaryCallable commitCallable() {
+    return commitCallable;
+  }
+
+  @Override
+  public UnaryCallable rollbackCallable() {
+    return rollbackCallable;
+  }
+
+  @Override
+  public UnaryCallable allocateIdsCallable() {
+    return allocateIdsCallable;
+  }
+
+  @Override
+  public UnaryCallable reserveIdsCallable() {
+    return reserveIdsCallable;
+  }
+
+  @Override
+  public final void close() {
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundResources.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return backgroundResources.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return backgroundResources.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    backgroundResources.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return backgroundResources.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json
new file mode 100644
index 000000000000..475f7690cfcb
--- /dev/null
+++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json
@@ -0,0 +1,2522 @@
+[
+  {
+    "name": "com.google.api.ClientLibraryDestination",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ClientLibraryOrganization",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ClientLibrarySettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ClientLibrarySettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CommonLanguageSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CommonLanguageSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CppSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CppSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CustomHttpPattern",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.CustomHttpPattern$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.DotnetSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.DotnetSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.FieldBehavior",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.GoSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.GoSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Http",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Http$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.HttpRule",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.HttpRule$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.JavaSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.JavaSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.LaunchStage",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings$LongRunning",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.MethodSettings$LongRunning$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.NodeSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.NodeSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PhpSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PhpSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Publishing",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.Publishing$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings$ExperimentalFeatures",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings$ExperimentalFeatures$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor$History",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceDescriptor$Style",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceReference",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.ResourceReference$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RoutingParameter",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RoutingParameter$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RoutingRule",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RoutingRule$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RubySettings",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.RubySettings$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.SelectiveGapicGeneration",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.SelectiveGapicGeneration$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Avg",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Avg$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Count",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Count$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Sum",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Sum$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationQuery$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationResult",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationResult$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationResultBatch",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AggregationResultBatch$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AllocateIdsRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AllocateIdsRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AllocateIdsResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.AllocateIdsResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ArrayValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ArrayValue$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.BeginTransactionRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.BeginTransactionRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.BeginTransactionResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.BeginTransactionResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CommitRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CommitRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CommitRequest$Mode",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CommitResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CommitResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CompositeFilter",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CompositeFilter$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.CompositeFilter$Operator",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Entity",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Entity$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.EntityResult",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.EntityResult$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.EntityResult$ResultType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ExecutionStats",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ExecutionStats$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ExplainMetrics",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ExplainMetrics$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ExplainOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ExplainOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Filter",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Filter$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.FindNearest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.FindNearest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.FindNearest$DistanceMeasure",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.GqlQuery",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.GqlQuery$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.GqlQueryParameter",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.GqlQueryParameter$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Key",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Key$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Key$PathElement",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Key$PathElement$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.KindExpression",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.KindExpression$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.LookupRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.LookupRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.LookupResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.LookupResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Mutation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Mutation$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Mutation$ConflictResolutionStrategy",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.MutationResult",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.MutationResult$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PartitionId",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PartitionId$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PlanSummary",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PlanSummary$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Projection",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Projection$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyFilter",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyFilter$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyFilter$Operator",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyMask",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyMask$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyOrder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyOrder$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyOrder$Direction",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyReference",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyReference$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyTransform",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyTransform$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.PropertyTransform$ServerValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Query",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Query$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.QueryResultBatch",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.QueryResultBatch$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.QueryResultBatch$MoreResultsType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ReadOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ReadOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ReadOptions$ReadConsistency",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ReserveIdsRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ReserveIdsRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ReserveIdsResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.ReserveIdsResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RollbackRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RollbackRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RollbackResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RollbackResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunAggregationQueryRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunAggregationQueryRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunAggregationQueryResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunAggregationQueryResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunQueryRequest",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunQueryRequest$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunQueryResponse",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.RunQueryResponse$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.TransactionOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.TransactionOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.TransactionOptions$ReadOnly",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.TransactionOptions$ReadOnly$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.TransactionOptions$ReadWrite",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.TransactionOptions$ReadWrite$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Value",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.datastore.v1.Value$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.BoolValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.BoolValue$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.BytesValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.BytesValue$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$Edition",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$VerificationState",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$CType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionRetention",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionTargetType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileDescriptorSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation$Semantic",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MessageOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MessageOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$MethodOptions$IdempotencyLevel",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$OneofOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceDescriptorProto",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceOptions",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$ServiceOptions$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DoubleValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DoubleValue$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Duration",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Duration$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.FloatValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.FloatValue$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Int32Value",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Int32Value$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Int64Value",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Int64Value$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.ListValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.ListValue$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.NullValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.StringValue",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.StringValue$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Struct",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Struct$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Timestamp",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Timestamp$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.UInt32Value",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.UInt32Value$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.UInt64Value",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.UInt64Value$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Value",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.Value$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.type.LatLng",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.type.LatLng$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  }
+]
\ No newline at end of file
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/AbstractDatastoreTest.java
similarity index 98%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java
index ca84ab35ad04..9d4ecac57a00 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/AbstractDatastoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,8 +67,6 @@
 import com.google.datastore.v1.RunQueryResponse;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.protobuf.ByteString;
-import java.io.IOException;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -78,23 +76,20 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 import org.easymock.EasyMock;
-import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class DatastoreTest {
+public abstract class AbstractDatastoreTest {
 
-  private static LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0);
-  private static final DatastoreOptions options = helper.getOptions();
-  private static final Datastore datastore = options.getService();
+  private static final LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0, 9090);
+  protected static DatastoreOptions options = helper.getOptions();
+  protected static Datastore datastore;
   private static final String PROJECT_ID = options.getProjectId();
   private static final String KIND1 = "kind1";
   private static final String KIND2 = "kind2";
@@ -167,9 +162,9 @@ public class DatastoreTest {
   private DatastoreRpcFactory rpcFactoryMock;
   private DatastoreRpc rpcMock;
 
-  @BeforeClass
-  public static void beforeClass() throws IOException, InterruptedException {
-    helper.start();
+  public AbstractDatastoreTest(DatastoreOptions options, Datastore datastore) {
+    this.options = options;
+    this.datastore = datastore;
   }
 
   @Before
@@ -190,11 +185,6 @@ public void setUp() {
     datastore.add(ENTITY1, ENTITY2);
   }
 
-  @AfterClass
-  public static void afterClass() throws IOException, InterruptedException, TimeoutException {
-    helper.stopDuration(Duration.ofMinutes(1));
-  }
-
   @Test
   public void testGetOptions() {
     assertSame(options, datastore.getOptions());
@@ -649,6 +639,7 @@ private List buildResponsesForQueryPagination() {
     List responses = new ArrayList<>();
     RecordQuery query = Query.newKeyQueryBuilder().build();
     RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
+    requestPb.setProjectId(PROJECT_ID);
     query.populatePb(requestPb);
     QueryResultBatch queryResultBatchPb =
         RunQueryResponse.newBuilder()
@@ -758,6 +749,7 @@ private List buildResponsesForQueryPaginationWithLimit() {
     List responses = new ArrayList<>();
     RecordQuery query = Query.newEntityQueryBuilder().build();
     RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
+    requestPb.setProjectId(PROJECT_ID);
     query.populatePb(requestPb);
     QueryResultBatch queryResultBatchPb =
         RunQueryResponse.newBuilder()
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
index 12b99c966309..8c52b55191df 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
@@ -97,7 +97,7 @@ public void testTranslateAndThrow() {
     cause = new IllegalArgumentException("message");
     exceptionMock = createMock(RetryHelper.RetryHelperException.class);
     expect(exceptionMock.getMessage()).andReturn("message").times(1);
-    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    expect(exceptionMock.getCause()).andReturn(cause).times(4);
     replay(exceptionMock);
     try {
       DatastoreException.translateAndThrow(exceptionMock);
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 85703f739e1a..c6a26d05d032 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,21 @@
 
 package com.google.cloud.datastore;
 
+import static com.google.common.truth.Truth.assertThat;
 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;
 
-import com.google.cloud.TransportOptions;
+import com.google.api.gax.grpc.ChannelPoolSettings;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.cloud.NoCredentials;
 import com.google.cloud.datastore.spi.DatastoreRpcFactory;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
+import com.google.cloud.datastore.v1.DatastoreSettings;
+import com.google.cloud.grpc.GrpcTransportOptions;
+import com.google.cloud.http.HttpTransportOptions;
+import com.google.datastore.v1.client.DatastoreFactory;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
@@ -48,7 +54,9 @@ public void setUp() {
             .setServiceRpcFactory(datastoreRpcFactory)
             .setProjectId(PROJECT_ID)
             .setDatabaseId(DATABASE_ID)
+            .setCredentials(NoCredentials.getInstance())
             .setHost("http://localhost:" + PORT);
+
     EasyMock.expect(datastoreRpcFactory.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(datastoreRpc)
         .anyTimes();
@@ -95,12 +103,130 @@ public void testDatastore() {
     assertSame(datastoreRpc, options.build().getRpc());
   }
 
+  @Test
+  public void testGrpcDefaultChannelConfigurations() {
+    DatastoreOptions datastoreOptions =
+        DatastoreOptions.newBuilder()
+            .setServiceRpcFactory(datastoreRpcFactory)
+            .setProjectId(PROJECT_ID)
+            .setDatabaseId(DATABASE_ID)
+            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setCredentials(NoCredentials.getInstance())
+            .setHost("http://localhost:" + PORT)
+            .build();
+    ChannelPoolSettings channelPoolSettings =
+        ((InstantiatingGrpcChannelProvider) datastoreOptions.getTransportChannelProvider())
+            .getChannelPoolSettings();
+    assertEquals(channelPoolSettings.getInitialChannelCount(), DatastoreOptions.INIT_CHANNEL_COUNT);
+    assertEquals(channelPoolSettings.getMinChannelCount(), DatastoreOptions.MIN_CHANNEL_COUNT);
+    assertEquals(channelPoolSettings.getMaxChannelCount(), DatastoreOptions.MAX_CHANNEL_COUNT);
+  }
+
+  @Test
+  public void testCustomChannelAndCredentials() {
+    InstantiatingGrpcChannelProvider channelProvider =
+        DatastoreSettings.defaultGrpcTransportProviderBuilder()
+            .setChannelPoolSettings(
+                ChannelPoolSettings.builder()
+                    .setInitialChannelCount(10)
+                    .setMaxChannelCount(20)
+                    .build())
+            .build();
+    DatastoreOptions datastoreOptions =
+        DatastoreOptions.newBuilder()
+            .setServiceRpcFactory(datastoreRpcFactory)
+            .setProjectId(PROJECT_ID)
+            .setDatabaseId(DATABASE_ID)
+            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setChannelProvider(channelProvider)
+            .setCredentials(NoCredentials.getInstance())
+            .setHost("http://localhost:" + PORT)
+            .build();
+    assertEquals(datastoreOptions.getTransportChannelProvider(), channelProvider);
+  }
+
+  @Test
+  public void testInvalidConfigForHttp() {
+    DatastoreOptions.Builder options =
+        DatastoreOptions.newBuilder()
+            .setServiceRpcFactory(datastoreRpcFactory)
+            .setProjectId(PROJECT_ID)
+            .setDatabaseId(DATABASE_ID)
+            .setTransportOptions(HttpTransportOptions.newBuilder().build())
+            .setChannelProvider(
+                DatastoreSettings.defaultGrpcTransportProviderBuilder()
+                    .setChannelPoolSettings(
+                        ChannelPoolSettings.builder()
+                            .setInitialChannelCount(10)
+                            .setMaxChannelCount(20)
+                            .build())
+                    .build())
+            .setCredentials(NoCredentials.getInstance())
+            .setHost("http://localhost:" + PORT);
+    Assert.assertThrows(IllegalArgumentException.class, options::build);
+  }
+
+  @Test
+  public void testTransport() {
+    // default http transport
+    assertThat(options.build().getTransportOptions()).isInstanceOf(HttpTransportOptions.class);
+
+    // custom grpc transport
+    DatastoreOptions grpcTransportOptions =
+        DatastoreOptions.newBuilder()
+            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setProjectId(PROJECT_ID)
+            .setCredentials(NoCredentials.getInstance())
+            .build();
+    assertThat(grpcTransportOptions.getTransportOptions()).isInstanceOf(GrpcTransportOptions.class);
+    assertThat(grpcTransportOptions.getTransportChannelProvider())
+        .isInstanceOf(InstantiatingGrpcChannelProvider.class);
+  }
+
+  @Test
+  public void testHostWithGrpcAndHttp() {
+    DatastoreOptions grpcTransportOptions =
+        DatastoreOptions.newBuilder()
+            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setProjectId(PROJECT_ID)
+            .setCredentials(NoCredentials.getInstance())
+            .build();
+    assertThat(grpcTransportOptions.getHost()).isEqualTo(DatastoreSettings.getDefaultEndpoint());
+    assertThat(grpcTransportOptions.getHost()).isEqualTo("datastore.googleapis.com:443");
+
+    String customHost = "http://localhost:" + PORT;
+    DatastoreOptions grpcTransportOptionsCustomHost =
+        DatastoreOptions.newBuilder()
+            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setHost(customHost)
+            .setProjectId(PROJECT_ID)
+            .setCredentials(NoCredentials.getInstance())
+            .build();
+    assertThat(grpcTransportOptionsCustomHost.getHost()).isEqualTo(customHost);
+
+    DatastoreOptions httpTransportOptions =
+        DatastoreOptions.newBuilder()
+            .setProjectId(PROJECT_ID)
+            .setCredentials(NoCredentials.getInstance())
+            .build();
+    assertThat(httpTransportOptions.getHost()).isEqualTo(DatastoreFactory.DEFAULT_HOST);
+
+    DatastoreOptions httpTransportOptionsCustomHost =
+        DatastoreOptions.newBuilder()
+            .setHost(customHost)
+            .setProjectId(PROJECT_ID)
+            .setCredentials(NoCredentials.getInstance())
+            .build();
+    assertThat(httpTransportOptionsCustomHost.getHost()).isEqualTo(customHost);
+  }
+
   @Test
   public void testToBuilder() {
     DatastoreOptions original = options.setNamespace("ns1").build();
     DatastoreOptions copy = original.toBuilder().build();
     assertEquals(original.getProjectId(), copy.getProjectId());
     assertEquals(original.getNamespace(), copy.getNamespace());
+    assertEquals(original.getDatabaseId(), copy.getDatabaseId());
     assertEquals(original.getHost(), copy.getHost());
     assertEquals(original.getRetrySettings(), copy.getRetrySettings());
     assertEquals(original.getCredentials(), copy.getCredentials());
@@ -111,15 +237,4 @@ public void testToBuilder() {
     assertNotEquals(original, newOptions);
     assertNotEquals(original.hashCode(), newOptions.hashCode());
   }
-
-  @Test
-  public void testInvalidTransport() {
-    try {
-      DatastoreOptions.newBuilder()
-          .setTransportOptions(EasyMock.createMock(TransportOptions.class));
-      Assert.fail();
-    } catch (IllegalArgumentException ex) {
-      assertNotNull(ex.getMessage());
-    }
-  }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java
new file mode 100644
index 000000000000..cb242f2af84a
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024 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.cloud.datastore;
+
+import com.google.cloud.datastore.testing.LocalDatastoreHelper;
+import com.google.cloud.grpc.GrpcTransportOptions;
+import com.google.common.truth.Truth;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Arrays;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class DatastoreTestGrpc extends AbstractDatastoreTest {
+
+  private static final LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0, 9090);
+
+  private static DatastoreOptions options =
+      helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build());
+  private static Datastore datastore = options.getService();
+
+  public DatastoreTestGrpc(DatastoreOptions options, Datastore datastore) {
+    super(options, datastore);
+  }
+
+  @Parameterized.Parameters(name = "data options: {0}")
+  public static Iterable data() {
+    return Arrays.asList(new Object[][] {{options, datastore}});
+  }
+
+  @BeforeClass
+  public static void beforeClass() throws IOException, InterruptedException {
+    helper.start();
+    options = helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build());
+    datastore = options.getService();
+  }
+
+  @AfterClass
+  public static void afterClass() throws Exception {
+    datastore.close();
+    Truth.assertThat(datastore.isClosed()).isTrue();
+    helper.stopDuration(Duration.ofMinutes(1));
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java
new file mode 100644
index 000000000000..a73cae8e4e5d
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015 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.cloud.datastore;
+
+import com.google.cloud.datastore.testing.LocalDatastoreHelper;
+import com.google.cloud.grpc.GrpcTransportOptions;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Arrays;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class DatastoreTestHttp extends AbstractDatastoreTest {
+
+  private static final LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0, 9090);
+
+  private static DatastoreOptions options = helper.getOptions();
+  private static Datastore datastore = options.getService();
+
+  public DatastoreTestHttp(DatastoreOptions options, Datastore datastore) {
+    super(options, datastore);
+  }
+
+  @Parameterized.Parameters(name = "data options: {0}")
+  public static Iterable data() {
+    return Arrays.asList(new Object[][] {{options, datastore}});
+  }
+
+  @BeforeClass
+  public static void beforeClass() throws IOException, InterruptedException {
+    helper.start();
+    options = helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build());
+    datastore = options.getService();
+  }
+
+  @AfterClass
+  public static void afterClass() throws Exception {
+    helper.stopDuration(Duration.ofMinutes(1));
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java
new file mode 100644
index 000000000000..74d7e9d288f4
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 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.cloud.datastore;
+
+import static com.google.cloud.datastore.DatastoreUtils.isLocalHost;
+import static com.google.cloud.datastore.DatastoreUtils.removeScheme;
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+
+public class DatastoreUtilsTest {
+
+  @Test
+  public void testIsLocalHost() {
+    assertThat(isLocalHost(null)).isFalse();
+    assertThat(isLocalHost("")).isFalse();
+    assertThat(isLocalHost("http://localhost:9090")).isTrue();
+    assertThat(isLocalHost("https://localhost:9090")).isTrue();
+    assertThat(isLocalHost("10.10.10.10:9090")).isFalse();
+  }
+
+  @Test
+  public void testRemoveScheme() {
+    assertThat(removeScheme("http://localhost:9090")).isEqualTo("localhost:9090");
+    assertThat(removeScheme("https://localhost:9090")).isEqualTo("localhost:9090");
+    assertThat(removeScheme("https://localhost:9090")).isEqualTo("localhost:9090");
+    assertThat(removeScheme("Https://localhost:9090")).isEqualTo("localhost:9090");
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java
new file mode 100644
index 000000000000..3f297989fb3c
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024 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.cloud.datastore;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import io.grpc.Status.Code;
+import java.util.EnumMap;
+import org.junit.Test;
+
+public class GrpcToDatastoreCodeTranslationTest {
+  @Test
+  public void grpcCodeToDatastoreCode_expectedMapping() {
+    EnumMap expected = new EnumMap<>(Code.class);
+    expected.put(Code.OK, com.google.rpc.Code.OK.getNumber());
+    expected.put(Code.INVALID_ARGUMENT, com.google.rpc.Code.INVALID_ARGUMENT.getNumber());
+    expected.put(Code.OUT_OF_RANGE, com.google.rpc.Code.OUT_OF_RANGE.getNumber());
+    expected.put(Code.UNAUTHENTICATED, com.google.rpc.Code.UNAUTHENTICATED.getNumber());
+    expected.put(Code.PERMISSION_DENIED, com.google.rpc.Code.PERMISSION_DENIED.getNumber());
+    expected.put(Code.NOT_FOUND, com.google.rpc.Code.NOT_FOUND.getNumber());
+    expected.put(Code.FAILED_PRECONDITION, com.google.rpc.Code.FAILED_PRECONDITION.getNumber());
+    expected.put(Code.ALREADY_EXISTS, com.google.rpc.Code.ALREADY_EXISTS.getNumber());
+    expected.put(Code.RESOURCE_EXHAUSTED, com.google.rpc.Code.RESOURCE_EXHAUSTED.getNumber());
+    expected.put(Code.INTERNAL, com.google.rpc.Code.INTERNAL.getNumber());
+    expected.put(Code.UNIMPLEMENTED, com.google.rpc.Code.UNIMPLEMENTED.getNumber());
+    expected.put(Code.UNAVAILABLE, com.google.rpc.Code.UNAVAILABLE.getNumber());
+    expected.put(Code.ABORTED, com.google.rpc.Code.ABORTED.getNumber());
+    expected.put(Code.CANCELLED, com.google.rpc.Code.CANCELLED.getNumber());
+    expected.put(Code.UNKNOWN, com.google.rpc.Code.UNKNOWN.getNumber());
+    expected.put(Code.DEADLINE_EXCEEDED, com.google.rpc.Code.DEADLINE_EXCEEDED.getNumber());
+    expected.put(Code.DATA_LOSS, com.google.rpc.Code.DATA_LOSS.getNumber());
+
+    EnumMap actual = new EnumMap<>(Code.class);
+    for (Code c : Code.values()) {
+      actual.put(c, GrpcToDatastoreCodeTranslation.grpcCodeToDatastoreStatusCode(c));
+    }
+
+    assertThat(actual).isEqualTo(expected);
+  }
+}
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/AbstractITDatastoreTest.java
similarity index 96%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java
index bf0c20dcef5f..53a858cae91a 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/AbstractITDatastoreTest.java
@@ -16,6 +16,11 @@
 
 package com.google.cloud.datastore.it;
 
+import static com.google.api.gax.rpc.StatusCode.Code.ALREADY_EXISTS;
+import static com.google.api.gax.rpc.StatusCode.Code.DEADLINE_EXCEEDED;
+import static com.google.api.gax.rpc.StatusCode.Code.FAILED_PRECONDITION;
+import static com.google.api.gax.rpc.StatusCode.Code.INVALID_ARGUMENT;
+import static com.google.api.gax.rpc.StatusCode.Code.NOT_FOUND;
 import static com.google.cloud.datastore.aggregation.Aggregation.avg;
 import static com.google.cloud.datastore.aggregation.Aggregation.count;
 import static com.google.cloud.datastore.aggregation.Aggregation.sum;
@@ -27,8 +32,8 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import com.google.cloud.Timestamp;
 import com.google.cloud.Tuple;
@@ -74,7 +79,6 @@
 import com.google.cloud.datastore.models.ExplainMetrics;
 import com.google.cloud.datastore.models.ExplainOptions;
 import com.google.cloud.datastore.models.PlanSummary;
-import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
@@ -83,7 +87,6 @@
 import com.google.datastore.v1.TransactionOptions.ReadOnly;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -97,7 +100,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -106,19 +108,11 @@
 import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
-public class ITDatastoreTest {
+public abstract class AbstractITDatastoreTest {
+  protected static final String CUSTOM_DB_ID = "test-db";
 
-  private static final RemoteDatastoreHelper HELPER = RemoteDatastoreHelper.create();
-  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;
+  protected DatastoreOptions options;
+  protected Datastore datastore;
 
   private static String PROJECT_ID;
   private static String NAMESPACE;
@@ -161,12 +155,21 @@ public class ITDatastoreTest {
 
   @Rule public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3);
 
-  @AfterClass
-  public static void afterClass() {
-    HELPER.deleteNamespace();
+  @Before
+  public void setUp() {
+    datastore.put(ENTITY1, ENTITY2);
   }
 
-  public ITDatastoreTest(
+  @After
+  public void tearDown() {
+    EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build();
+    QueryResults allEntities = datastore.run(allEntitiesQuery);
+    Key[] keysToDelete =
+        ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new);
+    datastore.delete(keysToDelete);
+  }
+
+  public AbstractITDatastoreTest(
       DatastoreOptions options,
       Datastore datastore,
       // databaseType is unused as a variable, but used as a parameterized label when running tests
@@ -272,26 +275,6 @@ public ITDatastoreTest(
             .build();
   }
 
-  @Before
-  public void setUp() {
-    datastore.put(ENTITY1, ENTITY2);
-  }
-
-  @After
-  public void tearDown() {
-    EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build();
-    QueryResults allEntities = datastore.run(allEntitiesQuery);
-    Key[] keysToDelete =
-        ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new);
-    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
@@ -496,19 +479,11 @@ public void testNewTransactionCommit() {
     assertEquals(ENTITY3, list.get(2));
     assertEquals(3, list.size());
 
-    try {
-      transaction.commit();
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
-    }
+    DatastoreException expected = assertThrows(DatastoreException.class, transaction::commit);
+    assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0);
 
-    try {
-      transaction.rollback();
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
-    }
+    DatastoreException expected2 = assertThrows(DatastoreException.class, transaction::rollback);
+    assertDatastoreException(expected2, FAILED_PRECONDITION.name(), 0);
   }
 
   @Test
@@ -699,12 +674,8 @@ public void testNewTransactionRollback() {
     transaction.rollback();
     transaction.rollback(); // should be safe to repeat rollback calls
 
-    try {
-      transaction.commit();
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
-    }
+    DatastoreException expected = assertThrows(DatastoreException.class, transaction::commit);
+    assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0);
 
     List list = datastore.fetch(KEY1, KEY2, KEY3);
     assertEquals(ENTITY1, list.get(0));
@@ -751,12 +722,8 @@ public void testNewBatch() {
     assertEquals(PARTIAL_ENTITY3.getNames(), datastore.get(generatedKeys.get(0)).getNames());
     assertEquals(PARTIAL_ENTITY3.getKey(), IncompleteKey.newBuilder(generatedKeys.get(0)).build());
 
-    try {
-      batch.submit();
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
-    }
+    DatastoreException expected = assertThrows(DatastoreException.class, batch::submit);
+    assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0);
 
     batch = datastore.newBatch();
     batch.delete(entity4.getKey(), entity5.getKey(), entity6.getKey());
@@ -1857,12 +1824,11 @@ public void testGetArrayNoDeferredResults() {
     assertEquals(EMPTY_LIST_VALUE, entity3.getValue("emptyList"));
     assertEquals(8, entity3.getNames().size());
     assertFalse(entity3.contains("bla"));
-    try {
-      entity3.getString("str");
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException(expected, "FAILED_PRECONDITION", 0);
-    }
+
+    DatastoreException expected =
+        assertThrows(DatastoreException.class, () -> entity3.getString("str"));
+    assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0);
+
     assertFalse(result.hasNext());
     datastore.delete(ENTITY3.getKey());
   }
@@ -1874,12 +1840,9 @@ public void testAddEntity() {
     assertNull(keys.get(1));
     assertEquals(2, keys.size());
 
-    try {
-      datastore.add(ENTITY1);
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException(expected, "ALREADY_EXISTS", 6);
-    }
+    DatastoreException expected =
+        assertThrows(DatastoreException.class, () -> datastore.add(ENTITY1));
+    assertDatastoreException(expected, ALREADY_EXISTS.name(), 6);
 
     List entities = datastore.add(ENTITY3, PARTIAL_ENTITY1, PARTIAL_ENTITY2);
     assertEquals(ENTITY3, datastore.get(ENTITY3.getKey()));
@@ -1902,12 +1865,10 @@ public void testUpdate() {
     assertNull(keys.get(1));
     assertEquals(2, keys.size());
 
-    try {
-      datastore.update(ENTITY3);
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException(expected, "NOT_FOUND", 5);
-    }
+    DatastoreException expected =
+        assertThrows(DatastoreException.class, () -> datastore.update(ENTITY3));
+    assertDatastoreException(expected, NOT_FOUND.name(), 5);
+
     datastore.add(ENTITY3);
     assertEquals(ENTITY3, datastore.get(ENTITY3.getKey()));
     Entity entity3 = Entity.newBuilder(ENTITY3).clear().set("bla", new NullValue()).build();
@@ -1917,6 +1878,12 @@ public void testUpdate() {
     datastore.delete(ENTITY3.getKey());
   }
 
+  private void assertDatastoreException(
+      DatastoreException expected, String reason, int datastoreStatusCode) {
+    Truth.assertThat(expected.getReason()).isEqualTo(reason);
+    Truth.assertThat(expected.getCode()).isEqualTo(datastoreStatusCode);
+  }
+
   @Test
   public void testPut() {
     Entity updatedEntity = Entity.newBuilder(ENTITY1).set("new_property", 42L).build();
@@ -1993,12 +1960,9 @@ public Integer run(DatastoreReaderWriter transaction) {
           }
         };
 
-    try {
-      datastore.runInTransaction(callable2);
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException((DatastoreException) expected.getCause(), "DEADLINE_EXCEEDED", 4);
-    }
+    DatastoreException expected =
+        assertThrows(DatastoreException.class, () -> datastore.runInTransaction(callable2));
+    assertDatastoreException((DatastoreException) expected.getCause(), DEADLINE_EXCEEDED.name(), 4);
   }
 
   @Test
@@ -2047,12 +2011,10 @@ public Integer run(DatastoreReaderWriter transaction) {
             .setReadOnly(TransactionOptions.ReadOnly.getDefaultInstance())
             .build();
 
-    try {
-      datastore.runInTransaction(callable2, readOnlyOptions);
-      fail("Expecting a failure");
-    } catch (DatastoreException expected) {
-      assertDatastoreException((DatastoreException) expected.getCause(), "INVALID_ARGUMENT", 3);
-    }
+    DatastoreException expected =
+        assertThrows(
+            DatastoreException.class, () -> datastore.runInTransaction(callable2, readOnlyOptions));
+    assertDatastoreException((DatastoreException) expected.getCause(), INVALID_ARGUMENT.name(), 3);
   }
 
   @Test
@@ -2167,10 +2129,4 @@ public void testQueryWithReadTime() throws InterruptedException {
       datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
     }
   }
-
-  private void assertDatastoreException(
-      DatastoreException expected, String reason, int statusCode) {
-    assertEquals(reason, expected.getReason());
-    assertEquals(statusCode, expected.getCode());
-  }
 }
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
index 7700657786af..1d6b2f8382d4 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
@@ -68,6 +68,7 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /*
@@ -77,7 +78,7 @@ public class ITDatastoreConceptsTest {
   private static final RemoteDatastoreHelper HELPER = RemoteDatastoreHelper.create();
   private static final DatastoreOptions OPTIONS = HELPER.getOptions();
   private static final FullEntity TEST_FULL_ENTITY = FullEntity.newBuilder().build();
-  private Datastore datastore;
+  private static Datastore datastore;
   private KeyFactory keyFactory;
   private Key taskKey;
   private Entity testEntity;
@@ -87,13 +88,15 @@ public class ITDatastoreConceptsTest {
 
   private static final String TASK_CONCEPTS = "TaskConcepts";
 
-  /**
-   * Initializes Datastore and cleans out any residual values. Also initializes global variables
-   * used for testing.
-   */
+  /** Initializes Datastore for testing. */
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    datastore = OPTIONS.getService();
+  }
+
+  /** Cleans out any residual values. Also initializes global variables used for testing. */
   @Before
   public void setUp() {
-    datastore = OPTIONS.getService();
     StructuredQuery query = Query.newKeyQueryBuilder().build();
     QueryResults result = datastore.run(query);
     datastore.delete(Iterators.toArray(result, Key.class));
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java
new file mode 100644
index 000000000000..7bb809997db4
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 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.cloud.datastore.it;
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
+import com.google.cloud.grpc.GrpcTransportOptions;
+import com.google.common.truth.Truth;
+import java.util.Arrays;
+import org.junit.AfterClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class ITDatastoreTestGrpc extends AbstractITDatastoreTest {
+  // setup for default db, grpc transport
+  protected static final RemoteDatastoreHelper HELPER_DEFAULT_GRPC =
+      RemoteDatastoreHelper.create(GrpcTransportOptions.newBuilder().build());
+  private static final DatastoreOptions OPTIONS_DEFAULT_GRPC = HELPER_DEFAULT_GRPC.getOptions();
+  private static final Datastore DATASTORE_DEFAULT_GRPC = OPTIONS_DEFAULT_GRPC.getService();
+
+  // setup for custom db, grpc transport
+  private static final RemoteDatastoreHelper HELPER_CUSTOM_DB_GRPC =
+      RemoteDatastoreHelper.create(CUSTOM_DB_ID, GrpcTransportOptions.newBuilder().build());
+  private static final DatastoreOptions OPTIONS_CUSTOM_DB_GRPC = HELPER_CUSTOM_DB_GRPC.getOptions();
+  private static final Datastore DATASTORE_CUSTOM_DB_GRPC = OPTIONS_CUSTOM_DB_GRPC.getService();
+
+  public ITDatastoreTestGrpc(DatastoreOptions options, Datastore datastore, String databaseType) {
+    super(options, datastore, databaseType);
+  }
+
+  @Parameterized.Parameters(name = "database: {2}")
+  public static Iterable data() {
+    return Arrays.asList(
+        new Object[][] {
+          {OPTIONS_DEFAULT_GRPC, DATASTORE_DEFAULT_GRPC, "default"},
+          {OPTIONS_CUSTOM_DB_GRPC, DATASTORE_CUSTOM_DB_GRPC, CUSTOM_DB_ID},
+        });
+  }
+
+  @AfterClass
+  public static void afterClass() throws Exception {
+    HELPER_DEFAULT_GRPC.deleteNamespace();
+    HELPER_CUSTOM_DB_GRPC.deleteNamespace();
+    DATASTORE_DEFAULT_GRPC.close();
+    DATASTORE_CUSTOM_DB_GRPC.close();
+    Truth.assertThat(DATASTORE_DEFAULT_GRPC.isClosed()).isTrue();
+    Truth.assertThat(DATASTORE_CUSTOM_DB_GRPC.isClosed()).isTrue();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java
new file mode 100644
index 000000000000..3546bfcaf625
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2024 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.cloud.datastore.it;
+
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
+import java.util.Arrays;
+import org.junit.AfterClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class ITDatastoreTestHttp extends AbstractITDatastoreTest {
+  // setup for default db, http transport
+  private static final RemoteDatastoreHelper HELPER_DEFAULT_HTTP = RemoteDatastoreHelper.create();
+
+  private static final DatastoreOptions OPTIONS_DEFAULT_HTTP = HELPER_DEFAULT_HTTP.getOptions();
+  private static final Datastore DATASTORE_DEFAULT_HTTP = OPTIONS_DEFAULT_HTTP.getService();
+
+  // setup for custom db, http transport
+  private static final RemoteDatastoreHelper HELPER_CUSTOM_DB_HTTP =
+      RemoteDatastoreHelper.create(CUSTOM_DB_ID);
+  private static final DatastoreOptions OPTIONS_CUSTOM_DB_HTTP = HELPER_CUSTOM_DB_HTTP.getOptions();
+  private static final Datastore DATASTORE_CUSTOM_DB_HTTP = OPTIONS_CUSTOM_DB_HTTP.getService();
+
+  public ITDatastoreTestHttp(DatastoreOptions options, Datastore datastore, String databaseType) {
+    super(options, datastore, databaseType);
+  }
+
+  @Parameterized.Parameters(name = "database: {2}")
+  public static Iterable data() {
+    return Arrays.asList(
+        new Object[][] {
+          {OPTIONS_DEFAULT_HTTP, DATASTORE_DEFAULT_HTTP, "default"},
+          {OPTIONS_CUSTOM_DB_HTTP, DATASTORE_CUSTOM_DB_HTTP, CUSTOM_DB_ID},
+        });
+  }
+
+  @AfterClass
+  public static void afterClass() throws Exception {
+    HELPER_DEFAULT_HTTP.deleteNamespace();
+    HELPER_CUSTOM_DB_HTTP.deleteNamespace();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
index 8472f3131343..ce9a226a6901 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
@@ -37,7 +37,7 @@ public final class MultipleAttemptsRule implements TestRule {
     this(attemptCount, 1000L);
   }
 
-  MultipleAttemptsRule(int attemptCount, long initialBackoffMillis) {
+  public MultipleAttemptsRule(int attemptCount, long initialBackoffMillis) {
     checkState(attemptCount > 0, "attemptCount must be > 0");
     checkState(initialBackoffMillis > 0, "initialBackoffMillis must be > 0");
     this.initialBackoffMillis = initialBackoffMillis;
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
index c8ded3d89b2c..f2209be9cbb0 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
@@ -80,9 +80,10 @@ private boolean transactionConflict(Exception exception) {
     }
     return exception instanceof ExecutionException
         && exception.getCause().getClass() == DatastoreException.class
-        && exception
-            .getMessage()
-            .contains("contention"); // exception raise coz of optimistic concurrency
+        && (exception.getMessage().contains("contention")
+            || exception
+                .getMessage()
+                .contains("Conflict")); // exception raise coz of optimistic concurrency
   }
 
   interface Statement {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java
new file mode 100644
index 000000000000..f813482577f1
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2023 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.cloud.datastore.spi.v1;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.datastore.DatastoreOptions;
+import java.time.Duration;
+import org.junit.Test;
+
+public class RpcUtilsTest {
+
+  @Test
+  public void testRetrySettingSetter() {
+    UnaryCallSettings.Builder builder =
+        UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+    // datastoreOptions with default retry settings
+    DatastoreOptions datastoreOptions =
+        DatastoreOptions.newBuilder().setProjectId("project-id").build();
+    RpcUtils.retrySettingSetter(datastoreOptions).apply(builder);
+    assertThat(builder.getRetrySettings()).isEqualTo(datastoreOptions.getRetrySettings());
+
+    // datastoreOptions with custom retry settings
+    RetrySettings customRetrySettings =
+        RetrySettings.newBuilder()
+            .setTotalTimeoutDuration(Duration.ofMinutes(2))
+            .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+            .setMaxRpcTimeoutDuration(Duration.ofSeconds(10))
+            .setRetryDelayMultiplier(1.5)
+            .setMaxAttempts(5)
+            .build();
+    DatastoreOptions datastoreOptionsWithCustomRetrySettings =
+        DatastoreOptions.newBuilder()
+            .setProjectId("project-id")
+            .setRetrySettings(customRetrySettings)
+            .build();
+    RpcUtils.retrySettingSetter(datastoreOptionsWithCustomRetrySettings).apply(builder);
+    assertThat(builder.getRetrySettings()).isEqualTo(customRetrySettings);
+  }
+}
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 d5be6b9e627a..3b07254d72e8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore.testing;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -23,12 +24,15 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreException;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Key;
+import com.google.cloud.grpc.GrpcTransportOptions;
+import com.google.cloud.http.HttpTransportOptions;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -172,6 +176,23 @@ public void testOptions() {
     assertEquals(NAMESPACE, options.getNamespace());
   }
 
+  @Test
+  public void testDefaultHttpTransportOptions() {
+    LocalDatastoreHelper helper = LocalDatastoreHelper.create();
+    DatastoreOptions options = helper.getOptions();
+    assertThat(options.getTransportOptions()).isInstanceOf(HttpTransportOptions.class);
+  }
+
+  @Test
+  public void testSetGrpcTransportOptions() {
+    LocalDatastoreHelper helper = LocalDatastoreHelper.create();
+    DatastoreOptions options =
+        helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build());
+    assertThat(options.getTransportOptions()).isInstanceOf(GrpcTransportOptions.class);
+    assertThat(options.getTransportChannelProvider())
+        .isInstanceOf(InstantiatingGrpcChannelProvider.class);
+  }
+
   @Test
   public void testStartStopReset() throws IOException, InterruptedException, TimeoutException {
     try {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
index cc30ace71b63..412af667a7cb 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
@@ -18,6 +18,7 @@
 
 import com.google.api.core.InternalApi;
 import com.google.api.gax.retrying.RetrySettings;
+import com.google.cloud.TransportOptions;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreOpenTelemetryOptions;
 import com.google.cloud.datastore.DatastoreOptions;
@@ -25,6 +26,7 @@
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.StructuredQuery;
+import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.cloud.http.HttpTransportOptions;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import java.time.Duration;
@@ -77,21 +79,46 @@ public void deleteNamespace() {
 
   /** Creates a {@code RemoteStorageHelper} object. */
   public static RemoteDatastoreHelper create() {
-    return create("");
+    return create(
+        "", DatastoreOptions.getDefaultHttpTransportOptions(), /* openTelemetrySdk= */ null);
+  }
+
+  public static RemoteDatastoreHelper create(String databaseId) {
+    return create(
+        databaseId,
+        DatastoreOptions.getDefaultHttpTransportOptions(),
+        /* openTelemetrySdk= */ null);
+  }
+
+  public static RemoteDatastoreHelper create(TransportOptions transportOptions) {
+    return create("", transportOptions, /* openTelemetrySdk= */ null);
   }
 
-  /** Creates a {@code RemoteStorageHelper} object. */
   public static RemoteDatastoreHelper create(
       String databaseId, @Nullable OpenTelemetrySdk openTelemetrySdk) {
-    HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions();
-    transportOptions =
-        transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000).build();
+    return create(databaseId, DatastoreOptions.getDefaultHttpTransportOptions(), openTelemetrySdk);
+  }
+
+  public static RemoteDatastoreHelper create(String databaseId, TransportOptions transportOptions) {
+    return create(databaseId, transportOptions, /* openTelemetrySdk= */ null);
+  }
+
+  /** Creates a {@code RemoteStorageHelper} object. */
+  public static RemoteDatastoreHelper create(
+      String databaseId,
+      TransportOptions transportOptions,
+      @Nullable OpenTelemetrySdk openTelemetrySdk) {
     DatastoreOptions.Builder datastoreOptionBuilder =
         DatastoreOptions.newBuilder()
             .setDatabaseId(databaseId)
             .setNamespace(UUID.randomUUID().toString())
-            .setRetrySettings(retrySettings())
-            .setTransportOptions(transportOptions);
+            .setRetrySettings(retrySettings());
+    if (transportOptions instanceof GrpcTransportOptions) {
+      datastoreOptionBuilder =
+          datastoreOptionBuilder.setTransportOptions((GrpcTransportOptions) transportOptions);
+    } else {
+      datastoreOptionBuilder = datastoreOptionBuilder.setTransportOptions(transportOptions);
+    }
 
     if (openTelemetrySdk != null) {
       datastoreOptionBuilder.setOpenTelemetryOptions(
@@ -103,10 +130,6 @@ public static RemoteDatastoreHelper create(
     return new RemoteDatastoreHelper(datastoreOptionBuilder.build());
   }
 
-  public static RemoteDatastoreHelper create(String databaseId) {
-    return create(databaseId, /* openTelemetrySdk= */ null);
-  }
-
   private static RetrySettings retrySettings() {
     return RetrySettings.newBuilder()
         .setMaxAttempts(10)
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java
new file mode 100644
index 000000000000..293c904b99d0
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java
@@ -0,0 +1,549 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.httpjson.GaxHttpJsonProperties;
+import com.google.api.gax.httpjson.testing.MockHttpService;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ApiException;
+import com.google.api.gax.rpc.ApiExceptionFactory;
+import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.testing.FakeStatusCode;
+import com.google.cloud.datastore.v1.stub.HttpJsonDatastoreStub;
+import com.google.datastore.v1.AggregationQuery;
+import com.google.datastore.v1.AggregationResultBatch;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.EntityResult;
+import com.google.datastore.v1.ExplainMetrics;
+import com.google.datastore.v1.ExplainOptions;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.Mutation;
+import com.google.datastore.v1.MutationResult;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.PropertyMask;
+import com.google.datastore.v1.Query;
+import com.google.datastore.v1.QueryResultBatch;
+import com.google.datastore.v1.ReadOptions;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Timestamp;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Generated;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@Generated("by gapic-generator-java")
+public class DatastoreClientHttpJsonTest {
+  private static MockHttpService mockService;
+  private static DatastoreClient client;
+
+  @BeforeClass
+  public static void startStaticServer() throws IOException {
+    mockService =
+        new MockHttpService(
+            HttpJsonDatastoreStub.getMethodDescriptors(), DatastoreSettings.getDefaultEndpoint());
+    DatastoreSettings settings =
+        DatastoreSettings.newHttpJsonBuilder()
+            .setTransportChannelProvider(
+                DatastoreSettings.defaultHttpJsonTransportProviderBuilder()
+                    .setHttpTransport(mockService)
+                    .build())
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .build();
+    client = DatastoreClient.create(settings);
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    client.close();
+  }
+
+  @Before
+  public void setUp() {}
+
+  @After
+  public void tearDown() throws Exception {
+    mockService.reset();
+  }
+
+  @Test
+  public void lookupTest() throws Exception {
+    LookupResponse expectedResponse =
+        LookupResponse.newBuilder()
+            .addAllFound(new ArrayList())
+            .addAllMissing(new ArrayList())
+            .addAllDeferred(new ArrayList())
+            .setTransaction(ByteString.EMPTY)
+            .setReadTime(Timestamp.newBuilder().build())
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    String projectId = "projectId-1530";
+    ReadOptions readOptions = ReadOptions.newBuilder().build();
+    List keys = new ArrayList<>();
+
+    LookupResponse actualResponse = client.lookup(projectId, readOptions, keys);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void lookupExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      ReadOptions readOptions = ReadOptions.newBuilder().build();
+      List keys = new ArrayList<>();
+      client.lookup(projectId, readOptions, keys);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void runQueryTest() throws Exception {
+    RunQueryResponse expectedResponse =
+        RunQueryResponse.newBuilder()
+            .setBatch(QueryResultBatch.newBuilder().build())
+            .setQuery(Query.newBuilder().build())
+            .setTransaction(ByteString.EMPTY)
+            .setExplainMetrics(ExplainMetrics.newBuilder().build())
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    RunQueryRequest request =
+        RunQueryRequest.newBuilder()
+            .setProjectId("projectId-1530")
+            .setDatabaseId("databaseId1688905718")
+            .setPartitionId(PartitionId.newBuilder().build())
+            .setReadOptions(ReadOptions.newBuilder().build())
+            .setPropertyMask(PropertyMask.newBuilder().build())
+            .setExplainOptions(ExplainOptions.newBuilder().build())
+            .build();
+
+    RunQueryResponse actualResponse = client.runQuery(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void runQueryExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      RunQueryRequest request =
+          RunQueryRequest.newBuilder()
+              .setProjectId("projectId-1530")
+              .setDatabaseId("databaseId1688905718")
+              .setPartitionId(PartitionId.newBuilder().build())
+              .setReadOptions(ReadOptions.newBuilder().build())
+              .setPropertyMask(PropertyMask.newBuilder().build())
+              .setExplainOptions(ExplainOptions.newBuilder().build())
+              .build();
+      client.runQuery(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void runAggregationQueryTest() throws Exception {
+    RunAggregationQueryResponse expectedResponse =
+        RunAggregationQueryResponse.newBuilder()
+            .setBatch(AggregationResultBatch.newBuilder().build())
+            .setQuery(AggregationQuery.newBuilder().build())
+            .setTransaction(ByteString.EMPTY)
+            .setExplainMetrics(ExplainMetrics.newBuilder().build())
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    RunAggregationQueryRequest request =
+        RunAggregationQueryRequest.newBuilder()
+            .setProjectId("projectId-1530")
+            .setDatabaseId("databaseId1688905718")
+            .setPartitionId(PartitionId.newBuilder().build())
+            .setReadOptions(ReadOptions.newBuilder().build())
+            .setExplainOptions(ExplainOptions.newBuilder().build())
+            .build();
+
+    RunAggregationQueryResponse actualResponse = client.runAggregationQuery(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void runAggregationQueryExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      RunAggregationQueryRequest request =
+          RunAggregationQueryRequest.newBuilder()
+              .setProjectId("projectId-1530")
+              .setDatabaseId("databaseId1688905718")
+              .setPartitionId(PartitionId.newBuilder().build())
+              .setReadOptions(ReadOptions.newBuilder().build())
+              .setExplainOptions(ExplainOptions.newBuilder().build())
+              .build();
+      client.runAggregationQuery(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void beginTransactionTest() throws Exception {
+    BeginTransactionResponse expectedResponse =
+        BeginTransactionResponse.newBuilder().setTransaction(ByteString.EMPTY).build();
+    mockService.addResponse(expectedResponse);
+
+    String projectId = "projectId-1530";
+
+    BeginTransactionResponse actualResponse = client.beginTransaction(projectId);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void beginTransactionExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      client.beginTransaction(projectId);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void commitTest() throws Exception {
+    CommitResponse expectedResponse =
+        CommitResponse.newBuilder()
+            .addAllMutationResults(new ArrayList())
+            .setIndexUpdates(-1425228195)
+            .setCommitTime(Timestamp.newBuilder().build())
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    String projectId = "projectId-1530";
+    CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+    List mutations = new ArrayList<>();
+
+    CommitResponse actualResponse = client.commit(projectId, mode, mutations);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void commitExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+      List mutations = new ArrayList<>();
+      client.commit(projectId, mode, mutations);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void commitTest2() throws Exception {
+    CommitResponse expectedResponse =
+        CommitResponse.newBuilder()
+            .addAllMutationResults(new ArrayList())
+            .setIndexUpdates(-1425228195)
+            .setCommitTime(Timestamp.newBuilder().build())
+            .build();
+    mockService.addResponse(expectedResponse);
+
+    String projectId = "projectId-1530";
+    CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+    ByteString transaction = ByteString.EMPTY;
+    List mutations = new ArrayList<>();
+
+    CommitResponse actualResponse = client.commit(projectId, mode, transaction, mutations);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void commitExceptionTest2() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+      ByteString transaction = ByteString.EMPTY;
+      List mutations = new ArrayList<>();
+      client.commit(projectId, mode, transaction, mutations);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void rollbackTest() throws Exception {
+    RollbackResponse expectedResponse = RollbackResponse.newBuilder().build();
+    mockService.addResponse(expectedResponse);
+
+    String projectId = "projectId-1530";
+    ByteString transaction = ByteString.EMPTY;
+
+    RollbackResponse actualResponse = client.rollback(projectId, transaction);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void rollbackExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      ByteString transaction = ByteString.EMPTY;
+      client.rollback(projectId, transaction);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void allocateIdsTest() throws Exception {
+    AllocateIdsResponse expectedResponse =
+        AllocateIdsResponse.newBuilder().addAllKeys(new ArrayList()).build();
+    mockService.addResponse(expectedResponse);
+
+    String projectId = "projectId-1530";
+    List keys = new ArrayList<>();
+
+    AllocateIdsResponse actualResponse = client.allocateIds(projectId, keys);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void allocateIdsExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      List keys = new ArrayList<>();
+      client.allocateIds(projectId, keys);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void reserveIdsTest() throws Exception {
+    ReserveIdsResponse expectedResponse = ReserveIdsResponse.newBuilder().build();
+    mockService.addResponse(expectedResponse);
+
+    String projectId = "projectId-1530";
+    List keys = new ArrayList<>();
+
+    ReserveIdsResponse actualResponse = client.reserveIds(projectId, keys);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockService.getRequestPaths();
+    Assert.assertEquals(1, actualRequests.size());
+
+    String apiClientHeaderKey =
+        mockService
+            .getRequestHeaders()
+            .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey())
+            .iterator()
+            .next();
+    Assert.assertTrue(
+        GaxHttpJsonProperties.getDefaultApiClientHeaderPattern()
+            .matcher(apiClientHeaderKey)
+            .matches());
+  }
+
+  @Test
+  public void reserveIdsExceptionTest() throws Exception {
+    ApiException exception =
+        ApiExceptionFactory.createException(
+            new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false);
+    mockService.addException(exception);
+
+    try {
+      String projectId = "projectId-1530";
+      List keys = new ArrayList<>();
+      client.reserveIds(projectId, keys);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java
new file mode 100644
index 000000000000..909330b51a17
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java
@@ -0,0 +1,528 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.testing.LocalChannelProvider;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.api.gax.grpc.testing.MockServiceHelper;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.datastore.v1.AggregationQuery;
+import com.google.datastore.v1.AggregationResultBatch;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.EntityResult;
+import com.google.datastore.v1.ExplainMetrics;
+import com.google.datastore.v1.ExplainOptions;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.Mutation;
+import com.google.datastore.v1.MutationResult;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.PropertyMask;
+import com.google.datastore.v1.Query;
+import com.google.datastore.v1.QueryResultBatch;
+import com.google.datastore.v1.ReadOptions;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Timestamp;
+import io.grpc.StatusRuntimeException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import javax.annotation.Generated;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@Generated("by gapic-generator-java")
+public class DatastoreClientTest {
+  private static MockDatastore mockDatastore;
+  private static MockServiceHelper mockServiceHelper;
+  private LocalChannelProvider channelProvider;
+  private DatastoreClient client;
+
+  @BeforeClass
+  public static void startStaticServer() {
+    mockDatastore = new MockDatastore();
+    mockServiceHelper =
+        new MockServiceHelper(
+            UUID.randomUUID().toString(), Arrays.asList(mockDatastore));
+    mockServiceHelper.start();
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    mockServiceHelper.stop();
+  }
+
+  @Before
+  public void setUp() throws IOException {
+    mockServiceHelper.reset();
+    channelProvider = mockServiceHelper.createChannelProvider();
+    DatastoreSettings settings =
+        DatastoreSettings.newBuilder()
+            .setTransportChannelProvider(channelProvider)
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .build();
+    client = DatastoreClient.create(settings);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    client.close();
+  }
+
+  @Test
+  public void lookupTest() throws Exception {
+    LookupResponse expectedResponse =
+        LookupResponse.newBuilder()
+            .addAllFound(new ArrayList())
+            .addAllMissing(new ArrayList())
+            .addAllDeferred(new ArrayList())
+            .setTransaction(ByteString.EMPTY)
+            .setReadTime(Timestamp.newBuilder().build())
+            .build();
+    mockDatastore.addResponse(expectedResponse);
+
+    String projectId = "projectId-894832108";
+    ReadOptions readOptions = ReadOptions.newBuilder().build();
+    List keys = new ArrayList<>();
+
+    LookupResponse actualResponse = client.lookup(projectId, readOptions, keys);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    LookupRequest actualRequest = ((LookupRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(readOptions, actualRequest.getReadOptions());
+    Assert.assertEquals(keys, actualRequest.getKeysList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void lookupExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      ReadOptions readOptions = ReadOptions.newBuilder().build();
+      List keys = new ArrayList<>();
+      client.lookup(projectId, readOptions, keys);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void runQueryTest() throws Exception {
+    RunQueryResponse expectedResponse =
+        RunQueryResponse.newBuilder()
+            .setBatch(QueryResultBatch.newBuilder().build())
+            .setQuery(Query.newBuilder().build())
+            .setTransaction(ByteString.EMPTY)
+            .setExplainMetrics(ExplainMetrics.newBuilder().build())
+            .build();
+    mockDatastore.addResponse(expectedResponse);
+
+    RunQueryRequest request =
+        RunQueryRequest.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setDatabaseId("databaseId1688905718")
+            .setPartitionId(PartitionId.newBuilder().build())
+            .setReadOptions(ReadOptions.newBuilder().build())
+            .setPropertyMask(PropertyMask.newBuilder().build())
+            .setExplainOptions(ExplainOptions.newBuilder().build())
+            .build();
+
+    RunQueryResponse actualResponse = client.runQuery(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    RunQueryRequest actualRequest = ((RunQueryRequest) actualRequests.get(0));
+
+    Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId());
+    Assert.assertEquals(request.getDatabaseId(), actualRequest.getDatabaseId());
+    Assert.assertEquals(request.getPartitionId(), actualRequest.getPartitionId());
+    Assert.assertEquals(request.getReadOptions(), actualRequest.getReadOptions());
+    Assert.assertEquals(request.getQuery(), actualRequest.getQuery());
+    Assert.assertEquals(request.getGqlQuery(), actualRequest.getGqlQuery());
+    Assert.assertEquals(request.getPropertyMask(), actualRequest.getPropertyMask());
+    Assert.assertEquals(request.getExplainOptions(), actualRequest.getExplainOptions());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void runQueryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      RunQueryRequest request =
+          RunQueryRequest.newBuilder()
+              .setProjectId("projectId-894832108")
+              .setDatabaseId("databaseId1688905718")
+              .setPartitionId(PartitionId.newBuilder().build())
+              .setReadOptions(ReadOptions.newBuilder().build())
+              .setPropertyMask(PropertyMask.newBuilder().build())
+              .setExplainOptions(ExplainOptions.newBuilder().build())
+              .build();
+      client.runQuery(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void runAggregationQueryTest() throws Exception {
+    RunAggregationQueryResponse expectedResponse =
+        RunAggregationQueryResponse.newBuilder()
+            .setBatch(AggregationResultBatch.newBuilder().build())
+            .setQuery(AggregationQuery.newBuilder().build())
+            .setTransaction(ByteString.EMPTY)
+            .setExplainMetrics(ExplainMetrics.newBuilder().build())
+            .build();
+    mockDatastore.addResponse(expectedResponse);
+
+    RunAggregationQueryRequest request =
+        RunAggregationQueryRequest.newBuilder()
+            .setProjectId("projectId-894832108")
+            .setDatabaseId("databaseId1688905718")
+            .setPartitionId(PartitionId.newBuilder().build())
+            .setReadOptions(ReadOptions.newBuilder().build())
+            .setExplainOptions(ExplainOptions.newBuilder().build())
+            .build();
+
+    RunAggregationQueryResponse actualResponse = client.runAggregationQuery(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    RunAggregationQueryRequest actualRequest = ((RunAggregationQueryRequest) actualRequests.get(0));
+
+    Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId());
+    Assert.assertEquals(request.getDatabaseId(), actualRequest.getDatabaseId());
+    Assert.assertEquals(request.getPartitionId(), actualRequest.getPartitionId());
+    Assert.assertEquals(request.getReadOptions(), actualRequest.getReadOptions());
+    Assert.assertEquals(request.getAggregationQuery(), actualRequest.getAggregationQuery());
+    Assert.assertEquals(request.getGqlQuery(), actualRequest.getGqlQuery());
+    Assert.assertEquals(request.getExplainOptions(), actualRequest.getExplainOptions());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void runAggregationQueryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      RunAggregationQueryRequest request =
+          RunAggregationQueryRequest.newBuilder()
+              .setProjectId("projectId-894832108")
+              .setDatabaseId("databaseId1688905718")
+              .setPartitionId(PartitionId.newBuilder().build())
+              .setReadOptions(ReadOptions.newBuilder().build())
+              .setExplainOptions(ExplainOptions.newBuilder().build())
+              .build();
+      client.runAggregationQuery(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void beginTransactionTest() throws Exception {
+    BeginTransactionResponse expectedResponse =
+        BeginTransactionResponse.newBuilder().setTransaction(ByteString.EMPTY).build();
+    mockDatastore.addResponse(expectedResponse);
+
+    String projectId = "projectId-894832108";
+
+    BeginTransactionResponse actualResponse = client.beginTransaction(projectId);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    BeginTransactionRequest actualRequest = ((BeginTransactionRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void beginTransactionExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      client.beginTransaction(projectId);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void commitTest() throws Exception {
+    CommitResponse expectedResponse =
+        CommitResponse.newBuilder()
+            .addAllMutationResults(new ArrayList())
+            .setIndexUpdates(-1425228195)
+            .setCommitTime(Timestamp.newBuilder().build())
+            .build();
+    mockDatastore.addResponse(expectedResponse);
+
+    String projectId = "projectId-894832108";
+    CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+    List mutations = new ArrayList<>();
+
+    CommitResponse actualResponse = client.commit(projectId, mode, mutations);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CommitRequest actualRequest = ((CommitRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(mode, actualRequest.getMode());
+    Assert.assertEquals(mutations, actualRequest.getMutationsList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void commitExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+      List mutations = new ArrayList<>();
+      client.commit(projectId, mode, mutations);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void commitTest2() throws Exception {
+    CommitResponse expectedResponse =
+        CommitResponse.newBuilder()
+            .addAllMutationResults(new ArrayList())
+            .setIndexUpdates(-1425228195)
+            .setCommitTime(Timestamp.newBuilder().build())
+            .build();
+    mockDatastore.addResponse(expectedResponse);
+
+    String projectId = "projectId-894832108";
+    CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+    ByteString transaction = ByteString.EMPTY;
+    List mutations = new ArrayList<>();
+
+    CommitResponse actualResponse = client.commit(projectId, mode, transaction, mutations);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CommitRequest actualRequest = ((CommitRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(mode, actualRequest.getMode());
+    Assert.assertEquals(transaction, actualRequest.getTransaction());
+    Assert.assertEquals(mutations, actualRequest.getMutationsList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void commitExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+      ByteString transaction = ByteString.EMPTY;
+      List mutations = new ArrayList<>();
+      client.commit(projectId, mode, transaction, mutations);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void rollbackTest() throws Exception {
+    RollbackResponse expectedResponse = RollbackResponse.newBuilder().build();
+    mockDatastore.addResponse(expectedResponse);
+
+    String projectId = "projectId-894832108";
+    ByteString transaction = ByteString.EMPTY;
+
+    RollbackResponse actualResponse = client.rollback(projectId, transaction);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    RollbackRequest actualRequest = ((RollbackRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(transaction, actualRequest.getTransaction());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void rollbackExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      ByteString transaction = ByteString.EMPTY;
+      client.rollback(projectId, transaction);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void allocateIdsTest() throws Exception {
+    AllocateIdsResponse expectedResponse =
+        AllocateIdsResponse.newBuilder().addAllKeys(new ArrayList()).build();
+    mockDatastore.addResponse(expectedResponse);
+
+    String projectId = "projectId-894832108";
+    List keys = new ArrayList<>();
+
+    AllocateIdsResponse actualResponse = client.allocateIds(projectId, keys);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    AllocateIdsRequest actualRequest = ((AllocateIdsRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(keys, actualRequest.getKeysList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void allocateIdsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      List keys = new ArrayList<>();
+      client.allocateIds(projectId, keys);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void reserveIdsTest() throws Exception {
+    ReserveIdsResponse expectedResponse = ReserveIdsResponse.newBuilder().build();
+    mockDatastore.addResponse(expectedResponse);
+
+    String projectId = "projectId-894832108";
+    List keys = new ArrayList<>();
+
+    ReserveIdsResponse actualResponse = client.reserveIds(projectId, keys);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDatastore.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ReserveIdsRequest actualRequest = ((ReserveIdsRequest) actualRequests.get(0));
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(keys, actualRequest.getKeysList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void reserveIdsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockDatastore.addException(exception);
+
+    try {
+      String projectId = "projectId-894832108";
+      List keys = new ArrayList<>();
+      client.reserveIds(projectId, keys);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java
new file mode 100644
index 000000000000..e64c68018b06
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.protobuf.AbstractMessage;
+import io.grpc.ServerServiceDefinition;
+import java.util.List;
+import javax.annotation.Generated;
+
+@BetaApi
+@Generated("by gapic-generator-java")
+public class MockDatastore implements MockGrpcService {
+  private final MockDatastoreImpl serviceImpl;
+
+  public MockDatastore() {
+    serviceImpl = new MockDatastoreImpl();
+  }
+
+  @Override
+  public List getRequests() {
+    return serviceImpl.getRequests();
+  }
+
+  @Override
+  public void addResponse(AbstractMessage response) {
+    serviceImpl.addResponse(response);
+  }
+
+  @Override
+  public void addException(Exception exception) {
+    serviceImpl.addException(exception);
+  }
+
+  @Override
+  public ServerServiceDefinition getServiceDefinition() {
+    return serviceImpl.bindService();
+  }
+
+  @Override
+  public void reset() {
+    serviceImpl.reset();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java
new file mode 100644
index 000000000000..e37eac6c0963
--- /dev/null
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright 2025 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
+ *
+ *      https://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.cloud.datastore.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.datastore.v1.AllocateIdsRequest;
+import com.google.datastore.v1.AllocateIdsResponse;
+import com.google.datastore.v1.BeginTransactionRequest;
+import com.google.datastore.v1.BeginTransactionResponse;
+import com.google.datastore.v1.CommitRequest;
+import com.google.datastore.v1.CommitResponse;
+import com.google.datastore.v1.DatastoreGrpc.DatastoreImplBase;
+import com.google.datastore.v1.LookupRequest;
+import com.google.datastore.v1.LookupResponse;
+import com.google.datastore.v1.ReserveIdsRequest;
+import com.google.datastore.v1.ReserveIdsResponse;
+import com.google.datastore.v1.RollbackRequest;
+import com.google.datastore.v1.RollbackResponse;
+import com.google.datastore.v1.RunAggregationQueryRequest;
+import com.google.datastore.v1.RunAggregationQueryResponse;
+import com.google.datastore.v1.RunQueryRequest;
+import com.google.datastore.v1.RunQueryResponse;
+import com.google.protobuf.AbstractMessage;
+import io.grpc.stub.StreamObserver;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import javax.annotation.Generated;
+
+@BetaApi
+@Generated("by gapic-generator-java")
+public class MockDatastoreImpl extends DatastoreImplBase {
+  private List requests;
+  private Queue responses;
+
+  public MockDatastoreImpl() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  public List getRequests() {
+    return requests;
+  }
+
+  public void addResponse(AbstractMessage response) {
+    responses.add(response);
+  }
+
+  public void setResponses(List responses) {
+    this.responses = new LinkedList(responses);
+  }
+
+  public void addException(Exception exception) {
+    responses.add(exception);
+  }
+
+  public void reset() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  @Override
+  public void lookup(LookupRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof LookupResponse) {
+      requests.add(request);
+      responseObserver.onNext(((LookupResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method Lookup, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  LookupResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void runQuery(RunQueryRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof RunQueryResponse) {
+      requests.add(request);
+      responseObserver.onNext(((RunQueryResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method RunQuery, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  RunQueryResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void runAggregationQuery(
+      RunAggregationQueryRequest request,
+      StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof RunAggregationQueryResponse) {
+      requests.add(request);
+      responseObserver.onNext(((RunAggregationQueryResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method RunAggregationQuery, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  RunAggregationQueryResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void beginTransaction(
+      BeginTransactionRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof BeginTransactionResponse) {
+      requests.add(request);
+      responseObserver.onNext(((BeginTransactionResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method BeginTransaction, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  BeginTransactionResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void commit(CommitRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof CommitResponse) {
+      requests.add(request);
+      responseObserver.onNext(((CommitResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method Commit, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  CommitResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void rollback(RollbackRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof RollbackResponse) {
+      requests.add(request);
+      responseObserver.onNext(((RollbackResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method Rollback, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  RollbackResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void allocateIds(
+      AllocateIdsRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof AllocateIdsResponse) {
+      requests.add(request);
+      responseObserver.onNext(((AllocateIdsResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method AllocateIds, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  AllocateIdsResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
+  @Override
+  public void reserveIds(
+      ReserveIdsRequest request, StreamObserver responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof ReserveIdsResponse) {
+      requests.add(request);
+      responseObserver.onNext(((ReserveIdsResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method ReserveIds, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  ReserveIdsResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+}
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
new file mode 100644
index 000000000000..8a4396f4f22a
--- /dev/null
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -0,0 +1,72 @@
+
+  4.0.0
+  com.google.api.grpc
+  grpc-google-cloud-datastore-v1
+  2.27.3-SNAPSHOT
+  grpc-google-cloud-datastore-v1
+  GRPC library for google-cloud-datastore
+  
+    com.google.cloud
+    google-cloud-datastore-parent
+    2.27.3-SNAPSHOT
+  
+  
+    
+      io.grpc
+      grpc-api
+    
+    
+      io.grpc
+      grpc-stub
+    
+    
+      io.grpc
+      grpc-protobuf
+    
+    
+      com.google.protobuf
+      protobuf-java
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-datastore-v1
+    
+    
+      com.google.guava
+      guava
+    
+  
+
+  
+    
+      java9
+      
+        [9,)
+      
+      
+        
+          javax.annotation
+          javax.annotation-api
+        
+      
+    
+  
+
+  
+    
+      
+          org.codehaus.mojo
+          flatten-maven-plugin
+        
+      
+        org.codehaus.mojo
+        clirr-maven-plugin
+        
+          true 
+        
+      
+    
+  
+
\ No newline at end of file
diff --git a/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
new file mode 100644
index 000000000000..8feee8ad9d58
--- /dev/null
+++ b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
@@ -0,0 +1,1339 @@
+/*
+ * Copyright 2025 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
+ *
+ *     https://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;
+
+import static io.grpc.MethodDescriptor.generateFullMethodName;
+
+/**
+ *
+ *
+ * 
    + * Each RPC normalizes the partition IDs of the keys in its input entities,
+ * and always returns entities with keys with normalized partition IDs.
+ * This applies to all keys and entities, including those in values, except keys
+ * with both an empty path and an empty or unset partition ID. Normalization of
+ * input keys sets the project ID (if not already set) to the project ID from
+ * the request.
+ * 
    
+ */
+@javax.annotation.Generated(
+    value = "by gRPC proto compiler",
+    comments = "Source: google/datastore/v1/datastore.proto")
+@io.grpc.stub.annotations.GrpcGenerated
+public final class DatastoreGrpc {
+
+  private DatastoreGrpc() {}
+
+  public static final java.lang.String SERVICE_NAME = "google.datastore.v1.Datastore";
+
+  // Static method descriptors that strictly reflect the proto.
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse>
+      getLookupMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "Lookup",
+      requestType = com.google.datastore.v1.LookupRequest.class,
+      responseType = com.google.datastore.v1.LookupResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse>
+      getLookupMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse>
+        getLookupMethod;
+    if ((getLookupMethod = DatastoreGrpc.getLookupMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getLookupMethod = DatastoreGrpc.getLookupMethod) == null) {
+          DatastoreGrpc.getLookupMethod =
+              getLookupMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Lookup"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.LookupRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.LookupResponse.getDefaultInstance()))
+                      .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("Lookup"))
+                      .build();
+        }
+      }
+    }
+    return getLookupMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.RunQueryRequest, com.google.datastore.v1.RunQueryResponse>
+      getRunQueryMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "RunQuery",
+      requestType = com.google.datastore.v1.RunQueryRequest.class,
+      responseType = com.google.datastore.v1.RunQueryResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.RunQueryRequest, com.google.datastore.v1.RunQueryResponse>
+      getRunQueryMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.RunQueryRequest, com.google.datastore.v1.RunQueryResponse>
+        getRunQueryMethod;
+    if ((getRunQueryMethod = DatastoreGrpc.getRunQueryMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getRunQueryMethod = DatastoreGrpc.getRunQueryMethod) == null) {
+          DatastoreGrpc.getRunQueryMethod =
+              getRunQueryMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "RunQuery"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.RunQueryRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.RunQueryResponse.getDefaultInstance()))
+                      .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("RunQuery"))
+                      .build();
+        }
+      }
+    }
+    return getRunQueryMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.RunAggregationQueryRequest,
+          com.google.datastore.v1.RunAggregationQueryResponse>
+      getRunAggregationQueryMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "RunAggregationQuery",
+      requestType = com.google.datastore.v1.RunAggregationQueryRequest.class,
+      responseType = com.google.datastore.v1.RunAggregationQueryResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.RunAggregationQueryRequest,
+          com.google.datastore.v1.RunAggregationQueryResponse>
+      getRunAggregationQueryMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.RunAggregationQueryRequest,
+            com.google.datastore.v1.RunAggregationQueryResponse>
+        getRunAggregationQueryMethod;
+    if ((getRunAggregationQueryMethod = DatastoreGrpc.getRunAggregationQueryMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getRunAggregationQueryMethod = DatastoreGrpc.getRunAggregationQueryMethod) == null) {
+          DatastoreGrpc.getRunAggregationQueryMethod =
+              getRunAggregationQueryMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(
+                          generateFullMethodName(SERVICE_NAME, "RunAggregationQuery"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.RunAggregationQueryRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.RunAggregationQueryResponse
+                                  .getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new DatastoreMethodDescriptorSupplier("RunAggregationQuery"))
+                      .build();
+        }
+      }
+    }
+    return getRunAggregationQueryMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.BeginTransactionRequest,
+          com.google.datastore.v1.BeginTransactionResponse>
+      getBeginTransactionMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "BeginTransaction",
+      requestType = com.google.datastore.v1.BeginTransactionRequest.class,
+      responseType = com.google.datastore.v1.BeginTransactionResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.BeginTransactionRequest,
+          com.google.datastore.v1.BeginTransactionResponse>
+      getBeginTransactionMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.BeginTransactionRequest,
+            com.google.datastore.v1.BeginTransactionResponse>
+        getBeginTransactionMethod;
+    if ((getBeginTransactionMethod = DatastoreGrpc.getBeginTransactionMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getBeginTransactionMethod = DatastoreGrpc.getBeginTransactionMethod) == null) {
+          DatastoreGrpc.getBeginTransactionMethod =
+              getBeginTransactionMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "BeginTransaction"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.BeginTransactionResponse
+                                  .getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new DatastoreMethodDescriptorSupplier("BeginTransaction"))
+                      .build();
+        }
+      }
+    }
+    return getBeginTransactionMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse>
+      getCommitMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "Commit",
+      requestType = com.google.datastore.v1.CommitRequest.class,
+      responseType = com.google.datastore.v1.CommitResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse>
+      getCommitMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse>
+        getCommitMethod;
+    if ((getCommitMethod = DatastoreGrpc.getCommitMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getCommitMethod = DatastoreGrpc.getCommitMethod) == null) {
+          DatastoreGrpc.getCommitMethod =
+              getCommitMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Commit"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.CommitRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.CommitResponse.getDefaultInstance()))
+                      .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("Commit"))
+                      .build();
+        }
+      }
+    }
+    return getCommitMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.RollbackRequest, com.google.datastore.v1.RollbackResponse>
+      getRollbackMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "Rollback",
+      requestType = com.google.datastore.v1.RollbackRequest.class,
+      responseType = com.google.datastore.v1.RollbackResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.RollbackRequest, com.google.datastore.v1.RollbackResponse>
+      getRollbackMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.RollbackRequest, com.google.datastore.v1.RollbackResponse>
+        getRollbackMethod;
+    if ((getRollbackMethod = DatastoreGrpc.getRollbackMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getRollbackMethod = DatastoreGrpc.getRollbackMethod) == null) {
+          DatastoreGrpc.getRollbackMethod =
+              getRollbackMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Rollback"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.RollbackRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.RollbackResponse.getDefaultInstance()))
+                      .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("Rollback"))
+                      .build();
+        }
+      }
+    }
+    return getRollbackMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.AllocateIdsRequest, com.google.datastore.v1.AllocateIdsResponse>
+      getAllocateIdsMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "AllocateIds",
+      requestType = com.google.datastore.v1.AllocateIdsRequest.class,
+      responseType = com.google.datastore.v1.AllocateIdsResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.AllocateIdsRequest, com.google.datastore.v1.AllocateIdsResponse>
+      getAllocateIdsMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.AllocateIdsRequest, com.google.datastore.v1.AllocateIdsResponse>
+        getAllocateIdsMethod;
+    if ((getAllocateIdsMethod = DatastoreGrpc.getAllocateIdsMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getAllocateIdsMethod = DatastoreGrpc.getAllocateIdsMethod) == null) {
+          DatastoreGrpc.getAllocateIdsMethod =
+              getAllocateIdsMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "AllocateIds"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance()))
+                      .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("AllocateIds"))
+                      .build();
+        }
+      }
+    }
+    return getAllocateIdsMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.datastore.v1.ReserveIdsRequest, com.google.datastore.v1.ReserveIdsResponse>
+      getReserveIdsMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "ReserveIds",
+      requestType = com.google.datastore.v1.ReserveIdsRequest.class,
+      responseType = com.google.datastore.v1.ReserveIdsResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.datastore.v1.ReserveIdsRequest, com.google.datastore.v1.ReserveIdsResponse>
+      getReserveIdsMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.datastore.v1.ReserveIdsRequest, com.google.datastore.v1.ReserveIdsResponse>
+        getReserveIdsMethod;
+    if ((getReserveIdsMethod = DatastoreGrpc.getReserveIdsMethod) == null) {
+      synchronized (DatastoreGrpc.class) {
+        if ((getReserveIdsMethod = DatastoreGrpc.getReserveIdsMethod) == null) {
+          DatastoreGrpc.getReserveIdsMethod =
+              getReserveIdsMethod =
+                  io.grpc.MethodDescriptor
+                      .
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ReserveIds"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance()))
+                      .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("ReserveIds"))
+                      .build();
+        }
+      }
+    }
+    return getReserveIdsMethod;
+  }
+
+  /** Creates a new async stub that supports all call types for the service */
+  public static DatastoreStub newStub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreStub(channel, callOptions);
+          }
+        };
+    return DatastoreStub.newStub(factory, channel);
+  }
+
+  /** Creates a new blocking-style stub that supports all types of calls on the service */
+  public static DatastoreBlockingV2Stub newBlockingV2Stub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreBlockingV2Stub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreBlockingV2Stub(channel, callOptions);
+          }
+        };
+    return DatastoreBlockingV2Stub.newStub(factory, channel);
+  }
+
+  /**
+   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
+   */
+  public static DatastoreBlockingStub newBlockingStub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreBlockingStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreBlockingStub(channel, callOptions);
+          }
+        };
+    return DatastoreBlockingStub.newStub(factory, channel);
+  }
+
+  /** Creates a new ListenableFuture-style stub that supports unary calls on the service */
+  public static DatastoreFutureStub newFutureStub(io.grpc.Channel channel) {
+    io.grpc.stub.AbstractStub.StubFactory factory =
+        new io.grpc.stub.AbstractStub.StubFactory() {
+          @java.lang.Override
+          public DatastoreFutureStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new DatastoreFutureStub(channel, callOptions);
+          }
+        };
+    return DatastoreFutureStub.newStub(factory, channel);
+  }
+
+  /**
+   *
+   *
+   * 
    +   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   * 
    
+   */
+  public interface AsyncService {
+
+    /**
+     *
+     *
+     * 
    +     * Looks up entities by key.
+     * 
    
+     */
+    default void lookup(
+        com.google.datastore.v1.LookupRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getLookupMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Queries for entities.
+     * 
    
+     */
+    default void runQuery(
+        com.google.datastore.v1.RunQueryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRunQueryMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Runs an aggregation query.
+     * 
    
+     */
+    default void runAggregationQuery(
+        com.google.datastore.v1.RunAggregationQueryRequest request,
+        io.grpc.stub.StreamObserver
+            responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getRunAggregationQueryMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Begins a new transaction.
+     * 
    
+     */
+    default void beginTransaction(
+        com.google.datastore.v1.BeginTransactionRequest request,
+        io.grpc.stub.StreamObserver
+            responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getBeginTransactionMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     * 
    
+     */
+    default void commit(
+        com.google.datastore.v1.CommitRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCommitMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Rolls back a transaction.
+     * 
    
+     */
+    default void rollback(
+        com.google.datastore.v1.RollbackRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRollbackMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     * 
    
+     */
+    default void allocateIds(
+        com.google.datastore.v1.AllocateIdsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getAllocateIdsMethod(), responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     * 
    
+     */
+    default void reserveIds(
+        com.google.datastore.v1.ReserveIdsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getReserveIdsMethod(), responseObserver);
+    }
+  }
+
+  /**
+   * Base class for the server implementation of the service Datastore.
+   *
+   * 
    +   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   * 
    
+   */
+  public abstract static class DatastoreImplBase implements io.grpc.BindableService, AsyncService {
+
+    @java.lang.Override
+    public final io.grpc.ServerServiceDefinition bindService() {
+      return DatastoreGrpc.bindService(this);
+    }
+  }
+
+  /**
+   * A stub to allow clients to do asynchronous rpc calls to service Datastore.
+   *
+   * 
    +   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   * 
    
+   */
+  public static final class DatastoreStub extends io.grpc.stub.AbstractAsyncStub {
+    private DatastoreStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreStub build(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreStub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Looks up entities by key.
+     * 
    
+     */
+    public void lookup(
+        com.google.datastore.v1.LookupRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getLookupMethod(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Queries for entities.
+     * 
    
+     */
+    public void runQuery(
+        com.google.datastore.v1.RunQueryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getRunQueryMethod(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Runs an aggregation query.
+     * 
    
+     */
+    public void runAggregationQuery(
+        com.google.datastore.v1.RunAggregationQueryRequest request,
+        io.grpc.stub.StreamObserver
+            responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getRunAggregationQueryMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Begins a new transaction.
+     * 
    
+     */
+    public void beginTransaction(
+        com.google.datastore.v1.BeginTransactionRequest request,
+        io.grpc.stub.StreamObserver
+            responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getBeginTransactionMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     * 
    
+     */
+    public void commit(
+        com.google.datastore.v1.CommitRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getCommitMethod(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Rolls back a transaction.
+     * 
    
+     */
+    public void rollback(
+        com.google.datastore.v1.RollbackRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getRollbackMethod(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     * 
    
+     */
+    public void allocateIds(
+        com.google.datastore.v1.AllocateIdsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getAllocateIdsMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     * 
    
+     */
+    public void reserveIds(
+        com.google.datastore.v1.ReserveIdsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getReserveIdsMethod(), getCallOptions()), request, responseObserver);
+    }
+  }
+
+  /**
+   * A stub to allow clients to do synchronous rpc calls to service Datastore.
+   *
+   * 
    +   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   * 
    
+   */
+  public static final class DatastoreBlockingV2Stub
+      extends io.grpc.stub.AbstractBlockingStub {
+    private DatastoreBlockingV2Stub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreBlockingV2Stub build(
+        io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreBlockingV2Stub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Looks up entities by key.
+     * 
    
+     */
+    public com.google.datastore.v1.LookupResponse lookup(
+        com.google.datastore.v1.LookupRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getLookupMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Queries for entities.
+     * 
    
+     */
+    public com.google.datastore.v1.RunQueryResponse runQuery(
+        com.google.datastore.v1.RunQueryRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getRunQueryMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Runs an aggregation query.
+     * 
    
+     */
+    public com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery(
+        com.google.datastore.v1.RunAggregationQueryRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getRunAggregationQueryMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Begins a new transaction.
+     * 
    
+     */
+    public com.google.datastore.v1.BeginTransactionResponse beginTransaction(
+        com.google.datastore.v1.BeginTransactionRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getBeginTransactionMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     * 
    
+     */
+    public com.google.datastore.v1.CommitResponse commit(
+        com.google.datastore.v1.CommitRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCommitMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Rolls back a transaction.
+     * 
    
+     */
+    public com.google.datastore.v1.RollbackResponse rollback(
+        com.google.datastore.v1.RollbackRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getRollbackMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     * 
    
+     */
+    public com.google.datastore.v1.AllocateIdsResponse allocateIds(
+        com.google.datastore.v1.AllocateIdsRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getAllocateIdsMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     * 
    
+     */
+    public com.google.datastore.v1.ReserveIdsResponse reserveIds(
+        com.google.datastore.v1.ReserveIdsRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getReserveIdsMethod(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   * A stub to allow clients to do limited synchronous rpc calls to service Datastore.
+   *
+   * 
    +   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   * 
    
+   */
+  public static final class DatastoreBlockingStub
+      extends io.grpc.stub.AbstractBlockingStub {
+    private DatastoreBlockingStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreBlockingStub build(
+        io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreBlockingStub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Looks up entities by key.
+     * 
    
+     */
+    public com.google.datastore.v1.LookupResponse lookup(
+        com.google.datastore.v1.LookupRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getLookupMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Queries for entities.
+     * 
    
+     */
+    public com.google.datastore.v1.RunQueryResponse runQuery(
+        com.google.datastore.v1.RunQueryRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getRunQueryMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Runs an aggregation query.
+     * 
    
+     */
+    public com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery(
+        com.google.datastore.v1.RunAggregationQueryRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getRunAggregationQueryMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Begins a new transaction.
+     * 
    
+     */
+    public com.google.datastore.v1.BeginTransactionResponse beginTransaction(
+        com.google.datastore.v1.BeginTransactionRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getBeginTransactionMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     * 
    
+     */
+    public com.google.datastore.v1.CommitResponse commit(
+        com.google.datastore.v1.CommitRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCommitMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Rolls back a transaction.
+     * 
    
+     */
+    public com.google.datastore.v1.RollbackResponse rollback(
+        com.google.datastore.v1.RollbackRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getRollbackMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     * 
    
+     */
+    public com.google.datastore.v1.AllocateIdsResponse allocateIds(
+        com.google.datastore.v1.AllocateIdsRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getAllocateIdsMethod(), getCallOptions(), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     * 
    
+     */
+    public com.google.datastore.v1.ReserveIdsResponse reserveIds(
+        com.google.datastore.v1.ReserveIdsRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getReserveIdsMethod(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service Datastore.
+   *
+   * 
    +   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   * 
    
+   */
+  public static final class DatastoreFutureStub
+      extends io.grpc.stub.AbstractFutureStub {
+    private DatastoreFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DatastoreFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+      return new DatastoreFutureStub(channel, callOptions);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Looks up entities by key.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.LookupResponse>
+        lookup(com.google.datastore.v1.LookupRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getLookupMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Queries for entities.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.RunQueryResponse>
+        runQuery(com.google.datastore.v1.RunQueryRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getRunQueryMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Runs an aggregation query.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.RunAggregationQueryResponse>
+        runAggregationQuery(com.google.datastore.v1.RunAggregationQueryRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getRunAggregationQueryMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Begins a new transaction.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.BeginTransactionResponse>
+        beginTransaction(com.google.datastore.v1.BeginTransactionRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getBeginTransactionMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.CommitResponse>
+        commit(com.google.datastore.v1.CommitRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getCommitMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Rolls back a transaction.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.RollbackResponse>
+        rollback(com.google.datastore.v1.RollbackRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getRollbackMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.AllocateIdsResponse>
+        allocateIds(com.google.datastore.v1.AllocateIdsRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getAllocateIdsMethod(), getCallOptions()), request);
+    }
+
+    /**
+     *
+     *
+     * 
    +     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.datastore.v1.ReserveIdsResponse>
+        reserveIds(com.google.datastore.v1.ReserveIdsRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getReserveIdsMethod(), getCallOptions()), request);
+    }
+  }
+
+  private static final int METHODID_LOOKUP = 0;
+  private static final int METHODID_RUN_QUERY = 1;
+  private static final int METHODID_RUN_AGGREGATION_QUERY = 2;
+  private static final int METHODID_BEGIN_TRANSACTION = 3;
+  private static final int METHODID_COMMIT = 4;
+  private static final int METHODID_ROLLBACK = 5;
+  private static final int METHODID_ALLOCATE_IDS = 6;
+  private static final int METHODID_RESERVE_IDS = 7;
+
+  private static final class MethodHandlers
+      implements io.grpc.stub.ServerCalls.UnaryMethod,
+          io.grpc.stub.ServerCalls.ServerStreamingMethod,
+          io.grpc.stub.ServerCalls.ClientStreamingMethod,
+          io.grpc.stub.ServerCalls.BidiStreamingMethod {
+    private final AsyncService serviceImpl;
+    private final int methodId;
+
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
+      this.serviceImpl = serviceImpl;
+      this.methodId = methodId;
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        case METHODID_LOOKUP:
+          serviceImpl.lookup(
+              (com.google.datastore.v1.LookupRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        case METHODID_RUN_QUERY:
+          serviceImpl.runQuery(
+              (com.google.datastore.v1.RunQueryRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        case METHODID_RUN_AGGREGATION_QUERY:
+          serviceImpl.runAggregationQuery(
+              (com.google.datastore.v1.RunAggregationQueryRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        case METHODID_BEGIN_TRANSACTION:
+          serviceImpl.beginTransaction(
+              (com.google.datastore.v1.BeginTransactionRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        case METHODID_COMMIT:
+          serviceImpl.commit(
+              (com.google.datastore.v1.CommitRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        case METHODID_ROLLBACK:
+          serviceImpl.rollback(
+              (com.google.datastore.v1.RollbackRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        case METHODID_ALLOCATE_IDS:
+          serviceImpl.allocateIds(
+              (com.google.datastore.v1.AllocateIdsRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        case METHODID_RESERVE_IDS:
+          serviceImpl.reserveIds(
+              (com.google.datastore.v1.ReserveIdsRequest) request,
+              (io.grpc.stub.StreamObserver)
+                  responseObserver);
+          break;
+        default:
+          throw new AssertionError();
+      }
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public io.grpc.stub.StreamObserver invoke(
+        io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        default:
+          throw new AssertionError();
+      }
+    }
+  }
+
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
+    return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+        .addMethod(
+            getLookupMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse>(
+                    service, METHODID_LOOKUP)))
+        .addMethod(
+            getRunQueryMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.RunQueryRequest,
+                    com.google.datastore.v1.RunQueryResponse>(service, METHODID_RUN_QUERY)))
+        .addMethod(
+            getRunAggregationQueryMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.RunAggregationQueryRequest,
+                    com.google.datastore.v1.RunAggregationQueryResponse>(
+                    service, METHODID_RUN_AGGREGATION_QUERY)))
+        .addMethod(
+            getBeginTransactionMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.BeginTransactionRequest,
+                    com.google.datastore.v1.BeginTransactionResponse>(
+                    service, METHODID_BEGIN_TRANSACTION)))
+        .addMethod(
+            getCommitMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse>(
+                    service, METHODID_COMMIT)))
+        .addMethod(
+            getRollbackMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.RollbackRequest,
+                    com.google.datastore.v1.RollbackResponse>(service, METHODID_ROLLBACK)))
+        .addMethod(
+            getAllocateIdsMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.AllocateIdsRequest,
+                    com.google.datastore.v1.AllocateIdsResponse>(service, METHODID_ALLOCATE_IDS)))
+        .addMethod(
+            getReserveIdsMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.datastore.v1.ReserveIdsRequest,
+                    com.google.datastore.v1.ReserveIdsResponse>(service, METHODID_RESERVE_IDS)))
+        .build();
+  }
+
+  private abstract static class DatastoreBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoFileDescriptorSupplier,
+          io.grpc.protobuf.ProtoServiceDescriptorSupplier {
+    DatastoreBaseDescriptorSupplier() {}
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.getDescriptor();
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
+      return getFileDescriptor().findServiceByName("Datastore");
+    }
+  }
+
+  private static final class DatastoreFileDescriptorSupplier
+      extends DatastoreBaseDescriptorSupplier {
+    DatastoreFileDescriptorSupplier() {}
+  }
+
+  private static final class DatastoreMethodDescriptorSupplier
+      extends DatastoreBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
+    private final java.lang.String methodName;
+
+    DatastoreMethodDescriptorSupplier(java.lang.String methodName) {
+      this.methodName = methodName;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
+      return getServiceDescriptor().findMethodByName(methodName);
+    }
+  }
+
+  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
+
+  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
+    io.grpc.ServiceDescriptor result = serviceDescriptor;
+    if (result == null) {
+      synchronized (DatastoreGrpc.class) {
+        result = serviceDescriptor;
+        if (result == null) {
+          serviceDescriptor =
+              result =
+                  io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
+                      .setSchemaDescriptor(new DatastoreFileDescriptorSupplier())
+                      .addMethod(getLookupMethod())
+                      .addMethod(getRunQueryMethod())
+                      .addMethod(getRunAggregationQueryMethod())
+                      .addMethod(getBeginTransactionMethod())
+                      .addMethod(getCommitMethod())
+                      .addMethod(getRollbackMethod())
+                      .addMethod(getAllocateIdsMethod())
+                      .addMethod(getReserveIdsMethod())
+                      .build();
+        }
+      }
+    }
+    return result;
+  }
+}
diff --git a/pom.xml b/pom.xml
index 8a73f450214a..e3192a0c2f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,16 @@
         proto-google-cloud-datastore-v1
         0.118.3-SNAPSHOT
       
+      
+        com.google.api.grpc
+        grpc-google-cloud-datastore-v1
+        2.27.3-SNAPSHOT
+      
+      
+        com.google.cloud
+        google-cloud-datastore-utils
+        2.27.3-SNAPSHOT
+      
       
         com.google.cloud.datastore
         datastore-v1-proto-client
@@ -269,8 +279,10 @@
     grpc-google-cloud-datastore-admin-v1
     proto-google-cloud-datastore-v1
     proto-google-cloud-datastore-admin-v1
+    grpc-google-cloud-datastore-v1
     datastore-v1-proto-client
     google-cloud-datastore-bom
+    google-cloud-datastore-utils
   
 
   
diff --git a/pull-gapic-grpc.sh b/pull-gapic-grpc.sh
new file mode 100644
index 000000000000..327d7676c7d2
--- /dev/null
+++ b/pull-gapic-grpc.sh
@@ -0,0 +1,42 @@
+#
+# Copyright 2023 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
+#
+#     https://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.
+#
+
+GENERATED_CODE_DIR=$(pwd)/../googleapis-gen
+DATASTORE_DIR=$(pwd)
+
+echo $GENERATED_CODE_DIR
+if [ -d "$GENERATED_CODE_DIR" ]; then
+  echo "Pulling latest changes in ${GENERATED_CODE_DIR}"
+  pushd $GENERATED_CODE_DIR || exit
+  git pull
+  popd || exit
+else
+  echo "Cloning googleapis-gen"
+  git clone --depth 1 git@github.com:googleapis/googleapis-gen.git $GENERATED_CODE_DIR
+fi
+
+#Copying the required directories
+mkdir -p "$DATASTORE_DIR/grpc-google-cloud-datastore-v1"
+cp -r "$GENERATED_CODE_DIR/google/datastore/v1/google-cloud-datastore-v1-java/grpc-google-cloud-datastore-v1-java/." \
+"$DATASTORE_DIR/grpc-google-cloud-datastore-v1/."
+cp -r "$GENERATED_CODE_DIR/google/datastore/v1/google-cloud-datastore-v1-java/gapic-google-cloud-datastore-v1-java/." \
+"$DATASTORE_DIR/google-cloud-datastore/."
+
+#Cleaning up unwanted files
+rm grpc-google-cloud-datastore-v1/build.gradle
+rm google-cloud-datastore/build.gradle
+
+echo "Success"
diff --git a/versions.txt b/versions.txt
index c965ffe8b800..5431b08fde1f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -7,3 +7,4 @@ proto-google-cloud-datastore-v1:0.118.2:0.118.3-SNAPSHOT
 datastore-v1-proto-client:2.27.2:2.27.3-SNAPSHOT
 proto-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT
 grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.27.2:2.27.3-SNAPSHOT

From 42188b990719ca3f45633fdeda5714cec54e8faf Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 29 Apr 2025 15:54:53 -0400
Subject: [PATCH 1612/1784] chore: Update generation configuration at Tue Apr
 29 02:28:51 UTC 2025 (#1831)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index ca5a13acf68b..c7f6ff1880a9 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.56.2
-googleapis_commitish: 2eec62dc7ed836c8d9f73fb313afb8f48c361bef
+googleapis_commitish: ce291b3bc967923f89e0e54ed33d18802672b171
 libraries_bom_version: 26.59.0
 libraries:
   - api_shortname: datastore

From be0236970e2f5d1db46a934f7cc1fbdfd9dfaff9 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Tue, 29 Apr 2025 13:45:57 -0700
Subject: [PATCH 1613/1784] doc: modify installation instructions for gapic
 public preview (#1833)

* doc: modify installation instructions for gapic public preview

* chore: generate libraries at Tue Apr 29 20:05:06 UTC 2025

---------

Co-authored-by: cloud-java-bot 
---
 .readme-partials.yaml | 29 ++---------------------------
 README.md             | 29 ++---------------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/.readme-partials.yaml b/.readme-partials.yaml
index 3e8d3a46559a..a6afbfd20dd5 100644
--- a/.readme-partials.yaml
+++ b/.readme-partials.yaml
@@ -108,35 +108,10 @@ custom_content: |
   
   gRPC Java Datastore Client User Guide
   -------
-  In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
+  The [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
   
   #### Installation Instructions
-  The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below.
-
-  1. Download the datastore private preview package with dependencies:
-    ```
-    curl -o   https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar
-    ```
-  2. Run the following commands to install JDK locally:
-    ```
-    mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc
-    ```
-  3. Edit your pom.xml to add above package to `` section:
-    ```xml
-    
-    com.google.cloud
-    google-cloud-datastore
-    2.20.0-grpc-experimental-1-SNAPSHOT
-    
-    ```
-  
-  And if you have not yet, add below to `` section:
-    ```xml
-    
-    local-repo
-    file://${user.home}/.m2/repository
-    
-    ```
+  To use this feature, please upgrade your Java-datastore SDK to version v2.28.0 or a newer release. You can find the latest versions [here](https://github.com/googleapis/java-datastore/releases).
   
   #### How to Use
   To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation.
diff --git a/README.md b/README.md
index d94fcb890f5b..9fcbdbba3e85 100644
--- a/README.md
+++ b/README.md
@@ -206,35 +206,10 @@ display on your webpage.
 
 gRPC Java Datastore Client User Guide
 -------
-In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
+The [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
 
 #### Installation Instructions
-The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below.
-
-1. Download the datastore private preview package with dependencies:
-  ```
-  curl -o   https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar
-  ```
-2. Run the following commands to install JDK locally:
-  ```
-  mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc
-  ```
-3. Edit your pom.xml to add above package to `` section:
-  ```xml
-  
-  com.google.cloud
-  google-cloud-datastore
-  2.20.0-grpc-experimental-1-SNAPSHOT
-  
-  ```
-
-And if you have not yet, add below to `` section:
-  ```xml
-  
-  local-repo
-  file://${user.home}/.m2/repository
-  
-  ```
+To use this feature, please upgrade your Java-datastore SDK to version v2.28.0 or a newer release. You can find the latest versions [here](https://github.com/googleapis/java-datastore/releases).
 
 #### How to Use
 To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation.

From 6beb15236b7b276b69686f7d20bc7d935c8acbd6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Apr 2025 06:46:45 -0700
Subject: [PATCH 1614/1784] chore(main): release 2.28.0 (#1832)

* chore(main): release 2.28.0

* chore: generate libraries at Tue Apr 29 19:55:20 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6fc874f12bc..520736da2338 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.28.0](https://github.com/googleapis/java-datastore/compare/v2.27.2...v2.28.0) (2025-04-29)
+
+
+### Features
+
+* Java datastore gapic upgrade ([#1824](https://github.com/googleapis/java-datastore/issues/1824)) ([a296d43](https://github.com/googleapis/java-datastore/commit/a296d43724c57aba6a69ebed249261e3d367d625))
+
 ## [2.27.2](https://github.com/googleapis/java-datastore/compare/v2.27.1...v2.27.2) (2025-04-25)
 
 
diff --git a/README.md b/README.md
index 9fcbdbba3e85..dcda545d579b 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.27.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.28.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.0"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8bac6a329d60..a03e00cb9a0a 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.27.3-SNAPSHOT
+  2.28.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.3-SNAPSHOT
+    2.28.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 76840bb8b8be..5cbd6833d511 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.27.3-SNAPSHOT
+  2.28.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.27.3-SNAPSHOT
+        2.28.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.3-SNAPSHOT
+        2.28.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.3-SNAPSHOT
+        0.119.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.27.3-SNAPSHOT
+        2.28.0
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 6cb32a8b18ad..8a5f90af1553 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.27.3-SNAPSHOT
+    2.28.0
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.27.3-SNAPSHOT
+        2.28.0
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 32c6caf15573..bd4451798f99 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.27.3-SNAPSHOT
+  2.28.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.3-SNAPSHOT
+    2.28.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 907c878d2707..9061da736263 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.27.3-SNAPSHOT
+  2.28.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.3-SNAPSHOT
+    2.28.0
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 8a4396f4f22a..68f2130fb05e 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.27.3-SNAPSHOT
+  2.28.0
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.3-SNAPSHOT
+    2.28.0
   
   
     
diff --git a/pom.xml b/pom.xml
index e3192a0c2f3c..924f8de588cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.27.3-SNAPSHOT
+  2.28.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.27.3-SNAPSHOT
+        2.28.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.27.3-SNAPSHOT
+        2.28.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.27.3-SNAPSHOT
+        2.28.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.118.3-SNAPSHOT
+        0.119.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.27.3-SNAPSHOT
+        2.28.0
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.27.3-SNAPSHOT
+        2.28.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 6684f2fdd276..78f760cda623 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.27.3-SNAPSHOT
+  2.28.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.3-SNAPSHOT
+    2.28.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 290e29408db1..23c4117c4aa2 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.118.3-SNAPSHOT
+  0.119.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.27.3-SNAPSHOT
+    2.28.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d6ec5f36d77b..4f57a670958f 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.27.3-SNAPSHOT
+      2.28.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 5431b08fde1f..82005f39ada0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.27.2:2.27.3-SNAPSHOT
-google-cloud-datastore-bom:2.27.2:2.27.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.118.2:0.118.3-SNAPSHOT
-datastore-v1-proto-client:2.27.2:2.27.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.27.2:2.27.3-SNAPSHOT
+google-cloud-datastore:2.28.0:2.28.0
+google-cloud-datastore-bom:2.28.0:2.28.0
+proto-google-cloud-datastore-v1:0.119.0:0.119.0
+datastore-v1-proto-client:2.28.0:2.28.0
+proto-google-cloud-datastore-admin-v1:2.28.0:2.28.0
+grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.0
+grpc-google-cloud-datastore-v1:2.28.0:2.28.0

From 6a38446fc333c587a1e640e350fd072df4df318c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 12:01:45 -0700
Subject: [PATCH 1615/1784] chore(main): release 2.28.1-SNAPSHOT (#1837)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a03e00cb9a0a..2cb36d489184 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.28.0
+  2.28.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.0
+    2.28.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5cbd6833d511..da8bc293c634 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.28.0
+  2.28.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.28.0
+        2.28.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.0
+        2.28.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.0
+        0.119.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.28.0
+        2.28.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 8a5f90af1553..e67ac5b9856d 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.28.0
+    2.28.1-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.28.0
+        2.28.1-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index bd4451798f99..f6efd5640cc5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.28.0
+  2.28.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.0
+    2.28.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 9061da736263..81b1299a7cb4 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.28.0
+  2.28.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.0
+    2.28.1-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 68f2130fb05e..20c709c0179c 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.28.0
+  2.28.1-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.0
+    2.28.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 924f8de588cf..0ca3d9d51142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.28.0
+  2.28.1-SNAPSHOT
   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.28.0
+        2.28.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.0
+        2.28.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.28.0
+        2.28.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.0
+        0.119.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.28.0
+        2.28.1-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.28.0
+        2.28.1-SNAPSHOT
         
           
             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 78f760cda623..779ca5877897 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.28.0
+  2.28.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.0
+    2.28.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 23c4117c4aa2..619c1cfff558 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.119.0
+  0.119.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.0
+    2.28.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4f57a670958f..b8f37263e4e0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.28.0
+      2.28.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 82005f39ada0..c56217f8db13 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.28.0:2.28.0
-google-cloud-datastore-bom:2.28.0:2.28.0
-proto-google-cloud-datastore-v1:0.119.0:0.119.0
-datastore-v1-proto-client:2.28.0:2.28.0
-proto-google-cloud-datastore-admin-v1:2.28.0:2.28.0
-grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.0
-grpc-google-cloud-datastore-v1:2.28.0:2.28.0
+google-cloud-datastore:2.28.0:2.28.1-SNAPSHOT
+google-cloud-datastore-bom:2.28.0:2.28.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.119.0:0.119.1-SNAPSHOT
+datastore-v1-proto-client:2.28.0:2.28.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.28.0:2.28.1-SNAPSHOT

From ac393e61e517d30b534be3e99070c210081c4f0b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 6 May 2025 17:00:02 +0200
Subject: [PATCH 1616/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.47.0 (#1841)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-a.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg            | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 2bb8e4187841..c39a53f54a55 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.2
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.47.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index d0c295213338..24e5053a5b7e 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 962c305ff7fb..ae35f6cb21f9 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 87b5dff65a31..660f1ee7eaec 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index da8bc293c634..7fff645a7da1 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.46.2
+    3.47.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 0ca3d9d51142..f0dabca02da5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.46.2
+    3.47.0
   
 
   

From 0745906bbdd8819ac2ccaafa301c8f4b4fd20be4 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 6 May 2025 18:11:19 +0200
Subject: [PATCH 1617/1784] deps: update googleapis/sdk-platform-java action to
 v2.57.0 (#1842)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 6b856abdef3f..f0b1369c88b8 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.57.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From f9a143216cc2a0c9d7343290c8c076809c509b85 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 12:57:23 -0400
Subject: [PATCH 1618/1784] chore(main): release 2.28.1 (#1843)

* chore(main): release 2.28.1

* chore: generate libraries at Tue May  6 16:12:06 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 .kokoro/presubmit/graalvm-native-a.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-b.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-c.cfg        |  2 +-
 CHANGELOG.md                                  |  8 ++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 16 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 24e5053a5b7e..d0c295213338 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index ae35f6cb21f9..962c305ff7fb 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 660f1ee7eaec..87b5dff65a31 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 520736da2338..eb97ef26429f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.28.1](https://github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1) (2025-05-06)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 ([#1841](https://github.com/googleapis/java-datastore/issues/1841)) ([ac393e6](https://github.com/googleapis/java-datastore/commit/ac393e61e517d30b534be3e99070c210081c4f0b))
+* Update googleapis/sdk-platform-java action to v2.57.0 ([#1842](https://github.com/googleapis/java-datastore/issues/1842)) ([0745906](https://github.com/googleapis/java-datastore/commit/0745906bbdd8819ac2ccaafa301c8f4b4fd20be4))
+
 ## [2.28.0](https://github.com/googleapis/java-datastore/compare/v2.27.2...v2.28.0) (2025-04-29)
 
 
diff --git a/README.md b/README.md
index dcda545d579b..1c9fdac68803 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.28.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.28.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.1"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 2cb36d489184..19157daa0049 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.28.1-SNAPSHOT
+  2.28.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1-SNAPSHOT
+    2.28.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7fff645a7da1..b5f085a78844 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.28.1-SNAPSHOT
+  2.28.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.28.1-SNAPSHOT
+        2.28.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.1-SNAPSHOT
+        2.28.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.1-SNAPSHOT
+        0.119.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.28.1-SNAPSHOT
+        2.28.1
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index e67ac5b9856d..a81437be483a 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.28.1-SNAPSHOT
+    2.28.1
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.28.1-SNAPSHOT
+        2.28.1
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f6efd5640cc5..9732d8da41f1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.28.1-SNAPSHOT
+  2.28.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1-SNAPSHOT
+    2.28.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 81b1299a7cb4..33928580ff9d 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.28.1-SNAPSHOT
+  2.28.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1-SNAPSHOT
+    2.28.1
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 20c709c0179c..c00d8f2adc5f 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.28.1-SNAPSHOT
+  2.28.1
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1-SNAPSHOT
+    2.28.1
   
   
     
diff --git a/pom.xml b/pom.xml
index f0dabca02da5..b4cef3dc8274 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.28.1-SNAPSHOT
+  2.28.1
   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.28.1-SNAPSHOT
+        2.28.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.1-SNAPSHOT
+        2.28.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.28.1-SNAPSHOT
+        2.28.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.1-SNAPSHOT
+        0.119.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.28.1-SNAPSHOT
+        2.28.1
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.28.1-SNAPSHOT
+        2.28.1
         
           
             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 779ca5877897..86895276be95 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.28.1-SNAPSHOT
+  2.28.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1-SNAPSHOT
+    2.28.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 619c1cfff558..10aef002c686 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.119.1-SNAPSHOT
+  0.119.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1-SNAPSHOT
+    2.28.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b8f37263e4e0..ab17ca59fcfe 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.28.1-SNAPSHOT
+      2.28.1
     
     
 
diff --git a/versions.txt b/versions.txt
index c56217f8db13..2bbdc428d845 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.28.0:2.28.1-SNAPSHOT
-google-cloud-datastore-bom:2.28.0:2.28.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.119.0:0.119.1-SNAPSHOT
-datastore-v1-proto-client:2.28.0:2.28.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.28.0:2.28.1-SNAPSHOT
+google-cloud-datastore:2.28.1:2.28.1
+google-cloud-datastore-bom:2.28.1:2.28.1
+proto-google-cloud-datastore-v1:0.119.1:0.119.1
+datastore-v1-proto-client:2.28.1:2.28.1
+proto-google-cloud-datastore-admin-v1:2.28.1:2.28.1
+grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.1
+grpc-google-cloud-datastore-v1:2.28.1:2.28.1

From 52741c7bf5263064089042bf4b1764657cd2d1b6 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 13:39:20 -0400
Subject: [PATCH 1619/1784] chore(main): release 2.28.2-SNAPSHOT (#1845)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 19157daa0049..32e5dc65c83d 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.28.1
+  2.28.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1
+    2.28.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b5f085a78844..6842d693ee29 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.28.1
+  2.28.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.28.1
+        2.28.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.1
+        2.28.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.1
+        0.119.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.28.1
+        2.28.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index a81437be483a..0360a44a6bde 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.28.1
+    2.28.2-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.28.1
+        2.28.2-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9732d8da41f1..ecb5895ae130 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.28.1
+  2.28.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1
+    2.28.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 33928580ff9d..98b13c80d7a0 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.28.1
+  2.28.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1
+    2.28.2-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index c00d8f2adc5f..98832894eb46 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.28.1
+  2.28.2-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1
+    2.28.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index b4cef3dc8274..ab5e5724940e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.28.1
+  2.28.2-SNAPSHOT
   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.28.1
+        2.28.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.1
+        2.28.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.28.1
+        2.28.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.1
+        0.119.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.28.1
+        2.28.2-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.28.1
+        2.28.2-SNAPSHOT
         
           
             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 86895276be95..eeee39bc69b1 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.28.1
+  2.28.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1
+    2.28.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 10aef002c686..f896ecd1f483 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.119.1
+  0.119.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.1
+    2.28.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ab17ca59fcfe..3a513d18ce4e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.28.1
+      2.28.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 2bbdc428d845..cd6778817419 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.28.1:2.28.1
-google-cloud-datastore-bom:2.28.1:2.28.1
-proto-google-cloud-datastore-v1:0.119.1:0.119.1
-datastore-v1-proto-client:2.28.1:2.28.1
-proto-google-cloud-datastore-admin-v1:2.28.1:2.28.1
-grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.1
-grpc-google-cloud-datastore-v1:2.28.1:2.28.1
+google-cloud-datastore:2.28.1:2.28.2-SNAPSHOT
+google-cloud-datastore-bom:2.28.1:2.28.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.119.1:0.119.2-SNAPSHOT
+datastore-v1-proto-client:2.28.1:2.28.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.28.1:2.28.2-SNAPSHOT

From b8fc73de6974181bc54a5716e08815f804eb8006 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 8 May 2025 00:30:25 +0200
Subject: [PATCH 1620/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore-utils to v2.28.1 (#1839)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore-utils](https://redirect.github.com/googleapis/java-datastore) | `2.27.3-SNAPSHOT` -> `2.28.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore-utils/2.27.3-SNAPSHOT/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore-utils/2.27.3-SNAPSHOT/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore-utils)

### [`v2.28.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2281-2025-05-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 ([#​1841](https://redirect.github.com/googleapis/java-datastore/issues/1841)) ([ac393e6](https://redirect.github.com/googleapis/java-datastore/commit/ac393e61e517d30b534be3e99070c210081c4f0b))
-   Update googleapis/sdk-platform-java action to v2.57.0 ([#​1842](https://redirect.github.com/googleapis/java-datastore/issues/1842)) ([0745906](https://redirect.github.com/googleapis/java-datastore/commit/0745906bbdd8819ac2ccaafa301c8f4b4fd20be4))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ab5e5724940e..0d80b0fe4196 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
       
         com.google.cloud
         google-cloud-datastore-utils
-        2.27.3-SNAPSHOT
+        2.28.1
       
       
         com.google.cloud.datastore

From 0808d9a51f9fcaea622c75d4fc6915afa782dfad Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 8 May 2025 00:30:30 +0200
Subject: [PATCH 1621/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.28.1 (#1838)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.27.2` -> `2.28.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.27.2/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.27.2/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.28.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2281-2025-05-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 ([#​1841](https://redirect.github.com/googleapis/java-datastore/issues/1841)) ([ac393e6](https://redirect.github.com/googleapis/java-datastore/commit/ac393e61e517d30b534be3e99070c210081c4f0b))
-   Update googleapis/sdk-platform-java action to v2.57.0 ([#​1842](https://redirect.github.com/googleapis/java-datastore/issues/1842)) ([0745906](https://redirect.github.com/googleapis/java-datastore/commit/0745906bbdd8819ac2ccaafa301c8f4b4fd20be4))

### [`v2.28.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2280-2025-04-29)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.27.2...v2.28.0)

##### Features

-   Java datastore gapic upgrade ([#​1824](https://redirect.github.com/googleapis/java-datastore/issues/1824)) ([a296d43](https://redirect.github.com/googleapis/java-datastore/commit/a296d43724c57aba6a69ebed249261e3d367d625))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index ca5f706896fe..1cf6cb5f9d68 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.27.2
+      2.28.1
     
     
 

From 012d5138f3c0e5a87d18f0c63c7ea2c7ce6783fe Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 15 May 2025 20:50:23 +0200
Subject: [PATCH 1622/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.60.0 (#1848)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.59.0` -> `26.60.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.59.0/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.59.0/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.60.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26600-2025-05-09)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.47.0 ([#​7016](https://redirect.github.com/googleapis/java-cloud-bom/issues/7016)) ([a40d300](https://redirect.github.com/googleapis/java-cloud-bom/commit/a40d300eb07af6b74db39fe7d8a3e990d0195a36))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.55.0 ([#​7015](https://redirect.github.com/googleapis/java-cloud-bom/issues/7015)) ([405c67b](https://redirect.github.com/googleapis/java-cloud-bom/commit/405c67bfcb79cd25aec30476ebcd9a5432348f82))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.56.0 ([#​7026](https://redirect.github.com/googleapis/java-cloud-bom/issues/7026)) ([f5732ad](https://redirect.github.com/googleapis/java-cloud-bom/commit/f5732ad9fbb63a5f432def426d13d8b8d18ee43b))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.50.0 ([#​7020](https://redirect.github.com/googleapis/java-cloud-bom/issues/7020)) ([52686db](https://redirect.github.com/googleapis/java-cloud-bom/commit/52686dbf1b4d590fda47a3477b3bba3e41834b9e))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.14.0 ([#​7025](https://redirect.github.com/googleapis/java-cloud-bom/issues/7025)) ([ce8f873](https://redirect.github.com/googleapis/java-cloud-bom/commit/ce8f8735cb57d1ac8c0a3c5b42149f0a14d546ec))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.58.1 ([#​7000](https://redirect.github.com/googleapis/java-cloud-bom/issues/7000)) ([4946872](https://redirect.github.com/googleapis/java-cloud-bom/commit/49468728c8b3d272590e1d5a1a7356ab9a0b5063))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.58.2 ([#​7030](https://redirect.github.com/googleapis/java-cloud-bom/issues/7030)) ([7b5548f](https://redirect.github.com/googleapis/java-cloud-bom/commit/7b5548fffacc57b2976a5ec2616e9b5fcfd4a9a7))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.28.1 ([#​7027](https://redirect.github.com/googleapis/java-cloud-bom/issues/7027)) ([663f640](https://redirect.github.com/googleapis/java-cloud-bom/commit/663f64047ff82842744f4507860ee45489620da1))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.2 ([#​6999](https://redirect.github.com/googleapis/java-cloud-bom/issues/6999)) ([3a39dcf](https://redirect.github.com/googleapis/java-cloud-bom/commit/3a39dcf7c7939444429fedbbcfaec354df243809))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.3 ([#​7031](https://redirect.github.com/googleapis/java-cloud-bom/issues/7031)) ([abed6bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/abed6bdcd0d394f1293d27d732f9743ff76627a5))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.22.3 ([#​7021](https://redirect.github.com/googleapis/java-cloud-bom/issues/7021)) ([115edeb](https://redirect.github.com/googleapis/java-cloud-bom/commit/115edebd8b06ca1c5bac209f5dc5db526c0c1c54))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.132.7-alpha ([#​7022](https://redirect.github.com/googleapis/java-cloud-bom/issues/7022)) ([a4bd532](https://redirect.github.com/googleapis/java-cloud-bom/commit/a4bd53204b722627f1c16be01f395cf030db0d90))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.35 ([#​7023](https://redirect.github.com/googleapis/java-cloud-bom/issues/7023)) ([cf8f804](https://redirect.github.com/googleapis/java-cloud-bom/commit/cf8f8046f9b4ad8fe2adc49dbc1a77c1a85f7d4b))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.139.3 ([#​7028](https://redirect.github.com/googleapis/java-cloud-bom/issues/7028)) ([9999747](https://redirect.github.com/googleapis/java-cloud-bom/commit/999974779448eb5de8775bd6e3a1ec89c288cbc3))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.7 ([#​7024](https://redirect.github.com/googleapis/java-cloud-bom/issues/7024)) ([b67d320](https://redirect.github.com/googleapis/java-cloud-bom/commit/b67d320b8054bb03be2abc11d260af4361c09116))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.92.0 ([#​7010](https://redirect.github.com/googleapis/java-cloud-bom/issues/7010)) ([e69a50d](https://redirect.github.com/googleapis/java-cloud-bom/commit/e69a50d32347e4d836273b678513f0249602b525))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.93.0 ([#​7033](https://redirect.github.com/googleapis/java-cloud-bom/issues/7033)) ([195fdeb](https://redirect.github.com/googleapis/java-cloud-bom/commit/195fdeb6baff72d12b6a4c62edb4006944371b3e))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.0 ([#​7017](https://redirect.github.com/googleapis/java-cloud-bom/issues/7017)) ([2601c4b](https://redirect.github.com/googleapis/java-cloud-bom/commit/2601c4b736e623117c6af7d0569aea0b6abf816a))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.1 ([#​7034](https://redirect.github.com/googleapis/java-cloud-bom/issues/7034)) ([efad584](https://redirect.github.com/googleapis/java-cloud-bom/commit/efad584a7e9bd83f08c8808bad25a02d06dc2d96))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.52.2 ([#​7029](https://redirect.github.com/googleapis/java-cloud-bom/issues/7029)) ([0c3d542](https://redirect.github.com/googleapis/java-cloud-bom/commit/0c3d54270254f274b21b09715d651e6bcbff35ee))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 88e93a110712..f913a5e02f5d 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.59.0
+        26.60.0
         pom
         import
       

From 7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 15 May 2025 22:03:17 +0200
Subject: [PATCH 1623/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.48.0 (#1847)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-a.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg            | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index c39a53f54a55..dac51eeaf5f9 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.47.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.48.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index d0c295213338..d72ed3f0e3b0 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 962c305ff7fb..f2e296b84759 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 87b5dff65a31..68512fbff55c 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6842d693ee29..8fb5dc56ae5d 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.47.0
+    3.48.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 0d80b0fe4196..64588d7a2e87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.47.0
+    3.48.0
   
 
   

From eef820d017f5e00245924d551abe172a2a39e29f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 16 May 2025 19:12:17 +0200
Subject: [PATCH 1624/1784] deps: update googleapis/sdk-platform-java action to
 v2.58.0 (#1853)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index f0b1369c88b8..336ac2c8cab6 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.57.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.58.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From 055effd30d3c940d4660e98ddde5d0ee726873ff Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 19 May 2025 14:02:25 +0000
Subject: [PATCH 1625/1784] chore(main): release 2.28.2 (#1854)

:robot: I have created a release *beep* *boop*
---


## [2.28.2](https://togithub.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) (2025-05-16)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#1847](https://togithub.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://togithub.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b))
* Update googleapis/sdk-platform-java action to v2.58.0 ([#1853](https://togithub.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://togithub.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 .kokoro/presubmit/graalvm-native-a.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-b.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-c.cfg        |  2 +-
 CHANGELOG.md                                  |  8 ++++++++
 README.md                                     | 10 +++++-----
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 16 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index d72ed3f0e3b0..d0c295213338 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index f2e296b84759..962c305ff7fb 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 68512fbff55c..87b5dff65a31 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb97ef26429f..24ecd6b7f4df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.28.2](https://github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) (2025-05-16)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#1847](https://github.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://github.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b))
+* Update googleapis/sdk-platform-java action to v2.58.0 ([#1853](https://github.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://github.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f))
+
 ## [2.28.1](https://github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1) (2025-05-06)
 
 
diff --git a/README.md b/README.md
index 1c9fdac68803..f20c24eaa5d1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.59.0
+      26.60.0
       pom
       import
     
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.27.2
+  2.28.1
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.28.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.28.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.2"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 32e5dc65c83d..7adb1d6ad54e 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.28.2-SNAPSHOT
+  2.28.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2-SNAPSHOT
+    2.28.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8fb5dc56ae5d..230ce6be9281 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.28.2-SNAPSHOT
+  2.28.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.28.2-SNAPSHOT
+        2.28.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.2-SNAPSHOT
+        2.28.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.2-SNAPSHOT
+        0.119.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.28.2-SNAPSHOT
+        2.28.2
       
         
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 0360a44a6bde..7f6f32554563 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.28.2-SNAPSHOT
+    2.28.2
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.28.2-SNAPSHOT
+        2.28.2
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ecb5895ae130..09e41478930d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.28.2-SNAPSHOT
+  2.28.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2-SNAPSHOT
+    2.28.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 98b13c80d7a0..9eeb87b2b339 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.28.2-SNAPSHOT
+  2.28.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2-SNAPSHOT
+    2.28.2
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 98832894eb46..9581cd434628 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.28.2-SNAPSHOT
+  2.28.2
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2-SNAPSHOT
+    2.28.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 64588d7a2e87..d89aae8504d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.28.2-SNAPSHOT
+  2.28.2
   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.28.2-SNAPSHOT
+        2.28.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.2-SNAPSHOT
+        2.28.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.28.2-SNAPSHOT
+        2.28.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.2-SNAPSHOT
+        0.119.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.28.2-SNAPSHOT
+        2.28.2
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.28.2-SNAPSHOT
+        2.28.2
         
           
             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 eeee39bc69b1..9ffbeaf9ee87 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.28.2-SNAPSHOT
+  2.28.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2-SNAPSHOT
+    2.28.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f896ecd1f483..b3006f3ee294 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.119.2-SNAPSHOT
+  0.119.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2-SNAPSHOT
+    2.28.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3a513d18ce4e..e3eac4010f73 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.28.2-SNAPSHOT
+      2.28.2
     
     
 
diff --git a/versions.txt b/versions.txt
index cd6778817419..d8c67509f8ca 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.28.1:2.28.2-SNAPSHOT
-google-cloud-datastore-bom:2.28.1:2.28.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.119.1:0.119.2-SNAPSHOT
-datastore-v1-proto-client:2.28.1:2.28.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.28.1:2.28.2-SNAPSHOT
+google-cloud-datastore:2.28.2:2.28.2
+google-cloud-datastore-bom:2.28.2:2.28.2
+proto-google-cloud-datastore-v1:0.119.2:0.119.2
+datastore-v1-proto-client:2.28.2:2.28.2
+proto-google-cloud-datastore-admin-v1:2.28.2:2.28.2
+grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.2
+grpc-google-cloud-datastore-v1:2.28.2:2.28.2

From b9c2c3ff775f7123d701ccacff9bd2ea3718243b Mon Sep 17 00:00:00 2001
From: Stanislav R 
Date: Thu, 29 May 2025 21:25:59 +0300
Subject: [PATCH 1626/1784] feat: add getNumber to AggregationResult
 (https://github.com/googleapis/java-datastore/issues/1851) (#1861)

---
 .../cloud/datastore/AggregationResult.java    | 20 +++++++++++++++++++
 .../datastore/AggregationResultTest.java      | 18 +++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
index a5071d8d84a1..1fdfa5bdae27 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
@@ -84,6 +84,26 @@ public Double getDouble(String alias) {
     }
   }
 
+  /**
+   * Returns a result value for the given alias.
+   *
+   * @param alias A custom alias provided in the query or an autogenerated alias in the form of
+   *     'property_\d'
+   * @return An aggregation result value as a {@link Number} for the given alias.
+   */
+  public Number getNumber(String alias) {
+    Value value = properties.get(alias);
+    switch (value.getType()) {
+      case LONG:
+        return (Long) value.get();
+      case DOUBLE:
+        return (Double) value.get();
+      default:
+        throw new RuntimeException(
+            String.format("Unsupported type %s received for alias '%s'.", value.getType(), alias));
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
index 592bfb36863d..84341f9d4e26 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
@@ -77,5 +77,23 @@ public void shouldThrowRuntimeExceptionOnUnknownTypes() {
     RuntimeException e2 =
         assertThrows(RuntimeException.class, () -> aggregationResult.getDouble("qty_avg"));
     assertThat(e2.getMessage()).isEqualTo("Unsupported type BOOLEAN received for alias 'qty_avg'.");
+
+    RuntimeException e3 =
+        assertThrows(RuntimeException.class, () -> aggregationResult.getNumber("qty_avg"));
+    assertThat(e3.getMessage()).isEqualTo("Unsupported type BOOLEAN received for alias 'qty_avg'.");
+  }
+
+  @Test
+  public void shouldGetDoubleAggregatedResultValueAsNumber() {
+    AggregationResult aggregationResult =
+        new AggregationResult(ImmutableMap.of("qty_avg", DoubleValue.of(45.9322)));
+    assertThat(aggregationResult.getNumber("qty_avg")).isEqualTo(45.9322);
+  }
+
+  @Test
+  public void shouldGetLongAggregatedResultValueAsNumber() {
+    AggregationResult aggregationResult =
+        new AggregationResult(ImmutableMap.of("count", LongValue.of(50)));
+    assertThat(aggregationResult.getNumber("count")).isEqualTo(50);
   }
 }

From 10971752310d8b1794c8e77041b582707142b328 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Thu, 5 Jun 2025 14:28:26 -0700
Subject: [PATCH 1627/1784] fix: remove 500 char path name limit (#1865)

Remove path name 500 character limit validation as this is impacting some customers for key retrievals.
---
 .../src/main/java/com/google/cloud/datastore/PathElement.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
index fb72f4f06bf2..d9d61342d570 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
@@ -128,7 +128,6 @@ static PathElement of(String kind) {
 
   public static PathElement of(String kind, String name) {
     checkArgument(!Strings.isNullOrEmpty(name), "name must not be empty or null");
-    checkArgument(name.length() <= 500, "name must not exceed 500 characters");
     return new PathElement(kind, name, null);
   }
 

From 47e6b2aea2d754d1a8d1926a65ef78862980e105 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 6 Jun 2025 00:38:24 +0000
Subject: [PATCH 1628/1784] chore(main): release 2.28.3-SNAPSHOT (#1859)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7adb1d6ad54e..67d261aa74d0 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.28.2
+  2.28.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2
+    2.28.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 230ce6be9281..c4cc681e18dc 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.28.2
+  2.28.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.28.2
+        2.28.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.2
+        2.28.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.2
+        0.119.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.28.2
+        2.28.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 7f6f32554563..6ed140c619ba 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.28.2
+    2.28.3-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.28.2
+        2.28.3-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 09e41478930d..6f1baf8f8c74 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.28.2
+  2.28.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2
+    2.28.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 9eeb87b2b339..7b99e6fe1192 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.28.2
+  2.28.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2
+    2.28.3-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 9581cd434628..518ff7266ae3 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.28.2
+  2.28.3-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2
+    2.28.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index d89aae8504d7..36eea16ae6b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.28.2
+  2.28.3-SNAPSHOT
   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.28.2
+        2.28.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.2
+        2.28.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.28.2
+        2.28.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.2
+        0.119.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.28.2
+        2.28.3-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.28.2
+        2.28.3-SNAPSHOT
         
           
             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 9ffbeaf9ee87..67a538349f98 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.28.2
+  2.28.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2
+    2.28.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index b3006f3ee294..0f16a6dff0e5 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.119.2
+  0.119.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.2
+    2.28.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e3eac4010f73..5b182860a913 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.28.2
+      2.28.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index d8c67509f8ca..028562d3265e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.28.2:2.28.2
-google-cloud-datastore-bom:2.28.2:2.28.2
-proto-google-cloud-datastore-v1:0.119.2:0.119.2
-datastore-v1-proto-client:2.28.2:2.28.2
-proto-google-cloud-datastore-admin-v1:2.28.2:2.28.2
-grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.2
-grpc-google-cloud-datastore-v1:2.28.2:2.28.2
+google-cloud-datastore:2.28.2:2.28.3-SNAPSHOT
+google-cloud-datastore-bom:2.28.2:2.28.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.119.2:0.119.3-SNAPSHOT
+datastore-v1-proto-client:2.28.2:2.28.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.28.2:2.28.3-SNAPSHOT

From acc1513ad90e8da6743e618322bae075bac4ac46 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 6 Jun 2025 03:37:51 +0200
Subject: [PATCH 1629/1784] deps: update dependency org.easymock:easymock to
 v5.6.0 (#1858)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 36eea16ae6b6..12926cce8267 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,7 @@
       
         org.easymock
         easymock
-        5.5.0
+        5.6.0
         test
       
     

From 50ddc6684cb2eb50b684a1a105359602450714d7 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 6 Jun 2025 06:22:25 +0000
Subject: [PATCH 1630/1784] chore(main): release 2.29.0 (#1866)

:robot: I have created a release *beep* *boop*
---


## [2.29.0](https://togithub.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) (2025-06-06)


### Features

* Add getNumber to AggregationResult (https://togithub.com/googleapis/java-datastore/issues/1851) ([#1861](https://togithub.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://togithub.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b))


### Bug Fixes

* Remove 500 char path name limit ([#1865](https://togithub.com/googleapis/java-datastore/issues/1865)) ([1097175](https://togithub.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328))


### Dependencies

* Update dependency org.easymock:easymock to v5.6.0 ([#1858](https://togithub.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://togithub.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 17 +++++++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24ecd6b7f4df..87fb18df3e72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [2.29.0](https://github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) (2025-06-06)
+
+
+### Features
+
+* Add getNumber to AggregationResult (https://github.com/googleapis/java-datastore/issues/1851) ([#1861](https://github.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://github.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b))
+
+
+### Bug Fixes
+
+* Remove 500 char path name limit ([#1865](https://github.com/googleapis/java-datastore/issues/1865)) ([1097175](https://github.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328))
+
+
+### Dependencies
+
+* Update dependency org.easymock:easymock to v5.6.0 ([#1858](https://github.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://github.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46))
+
 ## [2.28.2](https://github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) (2025-05-16)
 
 
diff --git a/README.md b/README.md
index f20c24eaa5d1..48eb23728bee 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.28.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.29.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.0"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 67d261aa74d0..209294c71284 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.28.3-SNAPSHOT
+  2.29.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.3-SNAPSHOT
+    2.29.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c4cc681e18dc..8059f7fa0fa9 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.28.3-SNAPSHOT
+  2.29.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.28.3-SNAPSHOT
+        2.29.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.3-SNAPSHOT
+        2.29.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.3-SNAPSHOT
+        0.120.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.28.3-SNAPSHOT
+        2.29.0
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 6ed140c619ba..3d3b9e8d55a8 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.28.3-SNAPSHOT
+    2.29.0
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.28.3-SNAPSHOT
+        2.29.0
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 6f1baf8f8c74..8c24af2eb81f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.28.3-SNAPSHOT
+  2.29.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.3-SNAPSHOT
+    2.29.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 7b99e6fe1192..cfc9826e8d73 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.28.3-SNAPSHOT
+  2.29.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.3-SNAPSHOT
+    2.29.0
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 518ff7266ae3..a05352cc83c8 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.28.3-SNAPSHOT
+  2.29.0
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.3-SNAPSHOT
+    2.29.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 12926cce8267..c72faeced342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.28.3-SNAPSHOT
+  2.29.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.28.3-SNAPSHOT
+        2.29.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.28.3-SNAPSHOT
+        2.29.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.28.3-SNAPSHOT
+        2.29.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.119.3-SNAPSHOT
+        0.120.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.28.3-SNAPSHOT
+        2.29.0
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.28.3-SNAPSHOT
+        2.29.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 67a538349f98..2101884620d4 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.28.3-SNAPSHOT
+  2.29.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.3-SNAPSHOT
+    2.29.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0f16a6dff0e5..d4ff5e3b3c08 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.119.3-SNAPSHOT
+  0.120.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.28.3-SNAPSHOT
+    2.29.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5b182860a913..ab291cac33e9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.28.3-SNAPSHOT
+      2.29.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 028562d3265e..f6e73f023569 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.28.2:2.28.3-SNAPSHOT
-google-cloud-datastore-bom:2.28.2:2.28.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.119.2:0.119.3-SNAPSHOT
-datastore-v1-proto-client:2.28.2:2.28.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.28.2:2.28.3-SNAPSHOT
+google-cloud-datastore:2.29.0:2.29.0
+google-cloud-datastore-bom:2.29.0:2.29.0
+proto-google-cloud-datastore-v1:0.120.0:0.120.0
+datastore-v1-proto-client:2.29.0:2.29.0
+proto-google-cloud-datastore-admin-v1:2.29.0:2.29.0
+grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.0
+grpc-google-cloud-datastore-v1:2.29.0:2.29.0

From 0eff0284bf78152341e1692ffc57930f62ec01dc Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Sat, 7 Jun 2025 04:23:30 +0200
Subject: [PATCH 1631/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.49.0 (#1860)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-a.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg            | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg            | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index dac51eeaf5f9..c543c9eb3824 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.48.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.49.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index d0c295213338..5cc939cf9090 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 962c305ff7fb..fd00159184a1 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 87b5dff65a31..424494b02e02 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8059f7fa0fa9..ba0fafd470c4 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.48.0
+    3.49.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index c72faeced342..7d542563c72f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.48.0
+    3.49.0
   
 
   

From 9b0db92ee123c52974bd61a48d51e482e2f33422 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Sat, 7 Jun 2025 22:10:25 +0000
Subject: [PATCH 1632/1784] chore(main): release 2.29.1-SNAPSHOT (#1868)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 .kokoro/presubmit/graalvm-native-a.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-b.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-c.cfg        |  2 +-
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 14 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 5cc939cf9090..d0c295213338 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index fd00159184a1..962c305ff7fb 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 424494b02e02..87b5dff65a31 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 209294c71284..3d66f6ae05d2 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.29.0
+  2.29.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.0
+    2.29.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ba0fafd470c4..5746da4bfca3 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.29.0
+  2.29.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.29.0
+        2.29.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.0
+        2.29.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.0
+        0.120.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.29.0
+        2.29.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 3d3b9e8d55a8..5d178082a244 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.29.0
+    2.29.1-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.29.0
+        2.29.1-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8c24af2eb81f..3c23890d35a3 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.29.0
+  2.29.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.0
+    2.29.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index cfc9826e8d73..95ba5940e6d8 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.29.0
+  2.29.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.0
+    2.29.1-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index a05352cc83c8..a07c55ebe28a 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.29.0
+  2.29.1-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.0
+    2.29.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 7d542563c72f..4e51e78eb44a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.29.0
+  2.29.1-SNAPSHOT
   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.29.0
+        2.29.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.0
+        2.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.29.0
+        2.29.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.0
+        0.120.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.29.0
+        2.29.1-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.29.0
+        2.29.1-SNAPSHOT
         
           
             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 2101884620d4..5b5dfe8d1598 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.29.0
+  2.29.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.0
+    2.29.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index d4ff5e3b3c08..cd1410bc1fe8 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.120.0
+  0.120.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.0
+    2.29.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ab291cac33e9..a3160aeb40bc 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.29.0
+      2.29.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index f6e73f023569..7c6bd5f88b10 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.29.0:2.29.0
-google-cloud-datastore-bom:2.29.0:2.29.0
-proto-google-cloud-datastore-v1:0.120.0:0.120.0
-datastore-v1-proto-client:2.29.0:2.29.0
-proto-google-cloud-datastore-admin-v1:2.29.0:2.29.0
-grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.0
-grpc-google-cloud-datastore-v1:2.29.0:2.29.0
+google-cloud-datastore:2.29.0:2.29.1-SNAPSHOT
+google-cloud-datastore-bom:2.29.0:2.29.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.120.0:0.120.1-SNAPSHOT
+datastore-v1-proto-client:2.29.0:2.29.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.29.0:2.29.1-SNAPSHOT

From 5f31da8352f2fdc54ff5004ad2e127f6d7fa5d13 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Sun, 8 Jun 2025 17:38:23 +0000
Subject: [PATCH 1633/1784] chore(main): release 2.29.1 (#1870)

:robot: I have created a release *beep* *boop*
---


## [2.29.1](https://togithub.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) (2025-06-07)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#1860](https://togithub.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://togithub.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87fb18df3e72..fae65118f12c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.29.1](https://github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) (2025-06-07)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#1860](https://github.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://github.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc))
+
 ## [2.29.0](https://github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) (2025-06-06)
 
 
diff --git a/README.md b/README.md
index 48eb23728bee..c72333a14b05 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.29.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.29.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.1"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3d66f6ae05d2..29486cfc0316 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.29.1-SNAPSHOT
+  2.29.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1-SNAPSHOT
+    2.29.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5746da4bfca3..2624fbf2ba9f 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.29.1-SNAPSHOT
+  2.29.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.29.1-SNAPSHOT
+        2.29.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.1-SNAPSHOT
+        2.29.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.1-SNAPSHOT
+        0.120.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.29.1-SNAPSHOT
+        2.29.1
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 5d178082a244..06e3c55b7ab7 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.29.1-SNAPSHOT
+    2.29.1
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.29.1-SNAPSHOT
+        2.29.1
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3c23890d35a3..479655438ff7 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.29.1-SNAPSHOT
+  2.29.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1-SNAPSHOT
+    2.29.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 95ba5940e6d8..6ad5a8c36cac 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.29.1-SNAPSHOT
+  2.29.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1-SNAPSHOT
+    2.29.1
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index a07c55ebe28a..4b62739dfc2d 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.29.1-SNAPSHOT
+  2.29.1
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1-SNAPSHOT
+    2.29.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 4e51e78eb44a..860e9c06126c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.29.1-SNAPSHOT
+  2.29.1
   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.29.1-SNAPSHOT
+        2.29.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.1-SNAPSHOT
+        2.29.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.29.1-SNAPSHOT
+        2.29.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.1-SNAPSHOT
+        0.120.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.29.1-SNAPSHOT
+        2.29.1
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.29.1-SNAPSHOT
+        2.29.1
         
           
             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 5b5dfe8d1598..5284820b8977 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.29.1-SNAPSHOT
+  2.29.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1-SNAPSHOT
+    2.29.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cd1410bc1fe8..a5ed4e394ffe 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.120.1-SNAPSHOT
+  0.120.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1-SNAPSHOT
+    2.29.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index a3160aeb40bc..46983615615d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.29.1-SNAPSHOT
+      2.29.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 7c6bd5f88b10..3686297762b7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.29.0:2.29.1-SNAPSHOT
-google-cloud-datastore-bom:2.29.0:2.29.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.120.0:0.120.1-SNAPSHOT
-datastore-v1-proto-client:2.29.0:2.29.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.29.0:2.29.1-SNAPSHOT
+google-cloud-datastore:2.29.1:2.29.1
+google-cloud-datastore-bom:2.29.1:2.29.1
+proto-google-cloud-datastore-v1:0.120.1:0.120.1
+datastore-v1-proto-client:2.29.1:2.29.1
+proto-google-cloud-datastore-admin-v1:2.29.1:2.29.1
+grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.1
+grpc-google-cloud-datastore-v1:2.29.1:2.29.1

From 910a6c20cb23f441ede5cd75972c65adbb8752e8 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 10 Jun 2025 16:34:16 -0400
Subject: [PATCH 1634/1784] chore: Update generation configuration at Tue Jun
 10 02:31:38 UTC 2025 (#1872)

* chore: Update generation configuration at Mon Jun  9 15:20:58 UTC 2025

* chore: generate libraries at Mon Jun  9 15:21:29 UTC 2025

* chore: Update generation configuration at Tue Jun 10 02:31:38 UTC 2025
---
 .github/workflows/hermetic_library_generation.yaml  |  2 +-
 .kokoro/presubmit/graalvm-native-a.cfg              |  2 +-
 .kokoro/presubmit/graalvm-native-b.cfg              |  2 +-
 .kokoro/presubmit/graalvm-native-c.cfg              |  2 +-
 README.md                                           |  2 +-
 generation_config.yaml                              |  6 +++---
 .../google/datastore/admin/v1/CommonMetadata.java   |  2 +-
 .../datastore/admin/v1/CommonMetadataOrBuilder.java |  2 +-
 .../datastore/admin/v1/CreateIndexRequest.java      |  2 +-
 .../admin/v1/CreateIndexRequestOrBuilder.java       |  2 +-
 .../datastore/admin/v1/DatastoreAdminProto.java     |  2 +-
 .../v1/DatastoreFirestoreMigrationMetadata.java     |  2 +-
 ...atastoreFirestoreMigrationMetadataOrBuilder.java |  2 +-
 .../datastore/admin/v1/DeleteIndexRequest.java      |  2 +-
 .../admin/v1/DeleteIndexRequestOrBuilder.java       |  2 +-
 .../com/google/datastore/admin/v1/EntityFilter.java |  2 +-
 .../datastore/admin/v1/EntityFilterOrBuilder.java   |  2 +-
 .../datastore/admin/v1/ExportEntitiesMetadata.java  |  2 +-
 .../admin/v1/ExportEntitiesMetadataOrBuilder.java   |  2 +-
 .../datastore/admin/v1/ExportEntitiesRequest.java   |  2 +-
 .../admin/v1/ExportEntitiesRequestOrBuilder.java    |  2 +-
 .../datastore/admin/v1/ExportEntitiesResponse.java  |  2 +-
 .../admin/v1/ExportEntitiesResponseOrBuilder.java   |  2 +-
 .../google/datastore/admin/v1/GetIndexRequest.java  |  2 +-
 .../admin/v1/GetIndexRequestOrBuilder.java          |  2 +-
 .../datastore/admin/v1/ImportEntitiesMetadata.java  |  2 +-
 .../admin/v1/ImportEntitiesMetadataOrBuilder.java   |  2 +-
 .../datastore/admin/v1/ImportEntitiesRequest.java   |  2 +-
 .../admin/v1/ImportEntitiesRequestOrBuilder.java    |  2 +-
 .../java/com/google/datastore/admin/v1/Index.java   |  2 +-
 .../datastore/admin/v1/IndexOperationMetadata.java  |  2 +-
 .../admin/v1/IndexOperationMetadataOrBuilder.java   |  2 +-
 .../google/datastore/admin/v1/IndexOrBuilder.java   |  2 +-
 .../com/google/datastore/admin/v1/IndexProto.java   |  2 +-
 .../datastore/admin/v1/ListIndexesRequest.java      |  2 +-
 .../admin/v1/ListIndexesRequestOrBuilder.java       |  2 +-
 .../datastore/admin/v1/ListIndexesResponse.java     |  2 +-
 .../admin/v1/ListIndexesResponseOrBuilder.java      |  2 +-
 .../datastore/admin/v1/MigrationProgressEvent.java  |  2 +-
 .../admin/v1/MigrationProgressEventOrBuilder.java   |  2 +-
 .../google/datastore/admin/v1/MigrationProto.java   |  2 +-
 .../google/datastore/admin/v1/MigrationState.java   |  2 +-
 .../datastore/admin/v1/MigrationStateEvent.java     |  2 +-
 .../admin/v1/MigrationStateEventOrBuilder.java      |  2 +-
 .../google/datastore/admin/v1/MigrationStep.java    |  2 +-
 .../google/datastore/admin/v1/OperationType.java    |  2 +-
 .../com/google/datastore/admin/v1/Progress.java     |  2 +-
 .../datastore/admin/v1/ProgressOrBuilder.java       |  2 +-
 .../com/google/datastore/v1/AggregationQuery.java   |  2 +-
 .../datastore/v1/AggregationQueryOrBuilder.java     |  2 +-
 .../com/google/datastore/v1/AggregationResult.java  |  2 +-
 .../google/datastore/v1/AggregationResultBatch.java |  2 +-
 .../v1/AggregationResultBatchOrBuilder.java         |  2 +-
 .../datastore/v1/AggregationResultOrBuilder.java    |  2 +-
 .../google/datastore/v1/AggregationResultProto.java |  2 +-
 .../com/google/datastore/v1/AllocateIdsRequest.java |  2 +-
 .../datastore/v1/AllocateIdsRequestOrBuilder.java   |  2 +-
 .../google/datastore/v1/AllocateIdsResponse.java    |  2 +-
 .../datastore/v1/AllocateIdsResponseOrBuilder.java  |  2 +-
 .../java/com/google/datastore/v1/ArrayValue.java    |  2 +-
 .../google/datastore/v1/ArrayValueOrBuilder.java    |  2 +-
 .../datastore/v1/BeginTransactionRequest.java       |  2 +-
 .../v1/BeginTransactionRequestOrBuilder.java        |  2 +-
 .../datastore/v1/BeginTransactionResponse.java      |  2 +-
 .../v1/BeginTransactionResponseOrBuilder.java       |  2 +-
 .../java/com/google/datastore/v1/CommitRequest.java |  2 +-
 .../google/datastore/v1/CommitRequestOrBuilder.java |  2 +-
 .../com/google/datastore/v1/CommitResponse.java     |  2 +-
 .../datastore/v1/CommitResponseOrBuilder.java       |  2 +-
 .../com/google/datastore/v1/CompositeFilter.java    |  2 +-
 .../datastore/v1/CompositeFilterOrBuilder.java      |  2 +-
 .../com/google/datastore/v1/DatastoreProto.java     |  2 +-
 .../main/java/com/google/datastore/v1/Entity.java   |  2 +-
 .../com/google/datastore/v1/EntityOrBuilder.java    |  2 +-
 .../java/com/google/datastore/v1/EntityProto.java   |  2 +-
 .../java/com/google/datastore/v1/EntityResult.java  |  2 +-
 .../google/datastore/v1/EntityResultOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/ExecutionStats.java     |  2 +-
 .../datastore/v1/ExecutionStatsOrBuilder.java       |  2 +-
 .../com/google/datastore/v1/ExplainMetrics.java     |  2 +-
 .../datastore/v1/ExplainMetricsOrBuilder.java       |  2 +-
 .../com/google/datastore/v1/ExplainOptions.java     |  2 +-
 .../datastore/v1/ExplainOptionsOrBuilder.java       |  2 +-
 .../main/java/com/google/datastore/v1/Filter.java   |  2 +-
 .../com/google/datastore/v1/FilterOrBuilder.java    |  2 +-
 .../java/com/google/datastore/v1/FindNearest.java   |  2 +-
 .../google/datastore/v1/FindNearestOrBuilder.java   |  2 +-
 .../main/java/com/google/datastore/v1/GqlQuery.java |  2 +-
 .../com/google/datastore/v1/GqlQueryOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/GqlQueryParameter.java  |  2 +-
 .../datastore/v1/GqlQueryParameterOrBuilder.java    |  2 +-
 .../src/main/java/com/google/datastore/v1/Key.java  |  2 +-
 .../java/com/google/datastore/v1/KeyOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/KindExpression.java     |  2 +-
 .../datastore/v1/KindExpressionOrBuilder.java       |  2 +-
 .../java/com/google/datastore/v1/LookupRequest.java |  2 +-
 .../google/datastore/v1/LookupRequestOrBuilder.java |  2 +-
 .../com/google/datastore/v1/LookupResponse.java     |  2 +-
 .../datastore/v1/LookupResponseOrBuilder.java       |  2 +-
 .../main/java/com/google/datastore/v1/Mutation.java |  2 +-
 .../com/google/datastore/v1/MutationOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/MutationResult.java     |  2 +-
 .../datastore/v1/MutationResultOrBuilder.java       |  2 +-
 .../java/com/google/datastore/v1/PartitionId.java   |  2 +-
 .../google/datastore/v1/PartitionIdOrBuilder.java   |  2 +-
 .../java/com/google/datastore/v1/PlanSummary.java   |  2 +-
 .../google/datastore/v1/PlanSummaryOrBuilder.java   |  2 +-
 .../java/com/google/datastore/v1/Projection.java    |  2 +-
 .../google/datastore/v1/ProjectionOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/PropertyFilter.java     |  2 +-
 .../datastore/v1/PropertyFilterOrBuilder.java       |  2 +-
 .../java/com/google/datastore/v1/PropertyMask.java  |  2 +-
 .../google/datastore/v1/PropertyMaskOrBuilder.java  |  2 +-
 .../java/com/google/datastore/v1/PropertyOrder.java |  2 +-
 .../google/datastore/v1/PropertyOrderOrBuilder.java |  2 +-
 .../com/google/datastore/v1/PropertyReference.java  |  2 +-
 .../datastore/v1/PropertyReferenceOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/PropertyTransform.java  |  2 +-
 .../datastore/v1/PropertyTransformOrBuilder.java    |  2 +-
 .../main/java/com/google/datastore/v1/Query.java    |  2 +-
 .../com/google/datastore/v1/QueryOrBuilder.java     |  2 +-
 .../com/google/datastore/v1/QueryProfileProto.java  |  2 +-
 .../java/com/google/datastore/v1/QueryProto.java    |  2 +-
 .../com/google/datastore/v1/QueryResultBatch.java   |  2 +-
 .../datastore/v1/QueryResultBatchOrBuilder.java     |  2 +-
 .../java/com/google/datastore/v1/ReadOptions.java   |  2 +-
 .../google/datastore/v1/ReadOptionsOrBuilder.java   |  2 +-
 .../com/google/datastore/v1/ReserveIdsRequest.java  |  2 +-
 .../datastore/v1/ReserveIdsRequestOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/ReserveIdsResponse.java |  2 +-
 .../datastore/v1/ReserveIdsResponseOrBuilder.java   |  2 +-
 .../com/google/datastore/v1/RollbackRequest.java    |  2 +-
 .../datastore/v1/RollbackRequestOrBuilder.java      |  2 +-
 .../com/google/datastore/v1/RollbackResponse.java   |  2 +-
 .../datastore/v1/RollbackResponseOrBuilder.java     |  2 +-
 .../datastore/v1/RunAggregationQueryRequest.java    |  2 +-
 .../v1/RunAggregationQueryRequestOrBuilder.java     |  2 +-
 .../datastore/v1/RunAggregationQueryResponse.java   |  2 +-
 .../v1/RunAggregationQueryResponseOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/RunQueryRequest.java    |  2 +-
 .../datastore/v1/RunQueryRequestOrBuilder.java      |  2 +-
 .../com/google/datastore/v1/RunQueryResponse.java   |  2 +-
 .../datastore/v1/RunQueryResponseOrBuilder.java     |  2 +-
 .../com/google/datastore/v1/TransactionOptions.java |  2 +-
 .../datastore/v1/TransactionOptionsOrBuilder.java   |  2 +-
 .../main/java/com/google/datastore/v1/Value.java    |  2 +-
 .../com/google/datastore/v1/ValueOrBuilder.java     |  2 +-
 renovate.json                                       | 13 +------------
 148 files changed, 150 insertions(+), 161 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 336ac2c8cab6..c01f3faec3af 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.58.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index d0c295213338..5cc939cf9090 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 962c305ff7fb..fd00159184a1 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 87b5dff65a31..424494b02e02 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index c72333a14b05..a75655f2bbd8 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.59.0')
+implementation platform('com.google.cloud:libraries-bom:26.61.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index c7f6ff1880a9..28b18604f2b3 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.56.2
-googleapis_commitish: ce291b3bc967923f89e0e54ed33d18802672b171
-libraries_bom_version: 26.59.0
+gapic_generator_version: 2.59.0
+googleapis_commitish: ad56690468e8f6ea87207d054bd6ad6adceaf0d3
+libraries_bom_version: 26.61.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index d7c5167a191b..d73ecd26c959 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index 29e4383cb71a..c27c9174ddfa 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface CommonMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index bff6b84a3d5b..87af20988028 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index a3de2d745f86..c60c9be079b3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface CreateIndexRequestOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index cf104bfb7151..6bf22f9d325a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public final class DatastoreAdminProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index fe3a7cf43e92..c87056546b49 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index dd1e0884d4ff..93572d5355a4 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface DatastoreFirestoreMigrationMetadataOrBuilder
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 e2e7ae6de729..708a59ff9619 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index 860bbcc27860..9639e757062d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface DeleteIndexRequestOrBuilder
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 35db5e1f2a13..623478375447 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
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 381e1e38d6ee..502b42d35845 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface EntityFilterOrBuilder
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 946dd9d6b3a8..6963c8fd11a4 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index d6e626eea8b8..409b713aeacd 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesMetadataOrBuilder
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 ae104717730d..5186fbb1a1a7 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
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 0b9dae2e69a8..73549d372cf4 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesRequestOrBuilder
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 8916b5572c9e..bff44706c3e5 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index 9d515855d61e..ed131756b10b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesResponseOrBuilder
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 4d7406fd1d51..7ce114e140af 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index 2b49cfd613a2..040281319202 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface GetIndexRequestOrBuilder
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 da2ab3e7309d..97e2c91e0376 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index f814d500ea03..bae1dcadddf9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesMetadataOrBuilder
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 66d1fdb0b36b..b7c648983a67 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
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 6bde8cc3cc2f..c4707c6faf2d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesRequestOrBuilder
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 0f2721672d4f..5f21b5938485 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
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 c66aa37d4652..90e653e5a528 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index ba34cbf02c63..ba20a55a5c7e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface IndexOperationMetadataOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index a786ec0c3462..74411b8b4808 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface IndexOrBuilder
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 e66e42843aef..fe4ac6f69e41 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public final class IndexProto {
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 ca32a0fa376c..2c444f6b5c6d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index 1c4c70c350e5..bf5439d9f173 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesRequestOrBuilder
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 3aae0bc18497..8b08cbfcc616 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index c89b116ed938..f44ec108bead 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesResponseOrBuilder
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 7833fb2a22a7..dcc9cf35ad88 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
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 c23e32fbb0ce..1ef40bfb5f4f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface MigrationProgressEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 4da124461fb2..450cebdc4a3c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public final class MigrationProto {
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index 5434e3eaeb6f..09102a46740b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
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 1e06a1c49612..c01f43fcbf22 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 758d5fe00894..45e1efc8b92d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface MigrationStateEventOrBuilder
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index 44f3c4c5e11b..8fc3a261430b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index db31a688df07..149901038a91 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
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 48580643e17a..04912dba48c8 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index 0d22c5b2cf6a..0383444f1daa 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.admin.v1;
 
 public interface ProgressOrBuilder
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 700120cebb7f..6e382ea8590f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 1bced478b834..99f400d2c5d6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface AggregationQueryOrBuilder
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 a8af25d7469a..5d2c3f62bbff 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 2db8614e58a7..b40e381951bf 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 0c8ebc3fda2d..1995aae15049 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface AggregationResultBatchOrBuilder
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 94e573e78893..609de95b1e0e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface AggregationResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index 8c172f409a58..0274db53ce76 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/aggregation_result.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public final class AggregationResultProto {
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 b3bd50bd51e0..5fad3328c10a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 13d3009e7c09..bd87ecd134b0 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface AllocateIdsRequestOrBuilder
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 b7e67dcc0e17..730bda037a0d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 6dbcd866d00b..e442c3c2728e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface AllocateIdsResponseOrBuilder
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 0d73c1fa7180..67de9d652e18 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index c6d447186b9c..0e631b6e27e2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ArrayValueOrBuilder
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 6fdef6176df3..90c32dc3436e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 9441e577d6d7..1ffdcf1769f4 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface BeginTransactionRequestOrBuilder
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 839dab467ac2..4c73112a77df 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index 408896255824..3f0ad182a5e5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface BeginTransactionResponseOrBuilder
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 3189b3fa6f06..d3af7bbbddc1 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 2602a23f5399..64333f04f464 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface CommitRequestOrBuilder
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 51aadd20bdd8..690d9243e373 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 734dab60a098..24205c882145 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface CommitResponseOrBuilder
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 48ce71656821..010b4ff2cfb6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 da11961a0fa9..7ef29d5f92fe 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface CompositeFilterOrBuilder
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 b7fd2e6b5ed4..97b3ba628053 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public final class DatastoreProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 7a16929fa4e3..67d9354bb29a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 455c0fe51b66..61ea8e8ee5bd 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface EntityOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index fdccb22406dd..17c1c1a303e6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public final class EntityProto {
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 1d5997ea56fe..100c9fad41bc 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 85d9d4ce18bb..6a02b4c0843b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface EntityResultOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
index d42944e056c9..f6f0ae83d9a2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
index ffbf156bfcb5..6289a7e9fb85 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ExecutionStatsOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
index 7a4f5361d8d4..abea37234d6a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
index b9463b3e0f1b..cc1c6625fab6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ExplainMetricsOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
index 5d374909fc46..720f3e85b8d2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
index f6c779c1965f..67d6a51561ac 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ExplainOptionsOrBuilder
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 7454f23b653b..8211ea1f2f04 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 1136f49a386e..9ef339fa912b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface FilterOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
index fd233c99bfec..08adba2464e2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
index 4e21ec5c31dc..631975f606bf 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface FindNearestOrBuilder
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 86ae757ad1c0..831a282f5dca 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 36d73aa77128..a2d5bf0b3411 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface GqlQueryOrBuilder
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 eb6b3850e38f..5349f046a02e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 7c3e07894700..bd2cbfc518bf 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface GqlQueryParameterOrBuilder
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 28314fbb8ea4..45c5cd73c8ef 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 4c72915d8f84..612744003a0b 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface KeyOrBuilder
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 9b3d26ef993e..d3cc4b102fea 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index ad9b5f9b64c7..0545ef4f8dbe 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface KindExpressionOrBuilder
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 68b94adaa11f..b791a5c0f82c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 f102198151c0..a39628e443d3 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface LookupRequestOrBuilder
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 1f02e007c56e..2e80515e021a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 ae3bfc36d3a8..892905cf7229 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface LookupResponseOrBuilder
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 be1d7e191404..b65d0ca8b45e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 3b01c9ae5194..8b433c5ade4d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface MutationOrBuilder
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 8f82a5c95f4b..71922947d32d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 5df6b9c3a145..4f01efbb6aea 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface MutationResultOrBuilder
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 be1529aca397..bd8bb8696b43 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 17e4eb6597c4..c35dfd03fd47 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface PartitionIdOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
index e378ba5665e0..40b1b94448ad 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
index b132b1c667d4..7299584a1053 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface PlanSummaryOrBuilder
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 e3a262b149a9..796d5225bcce 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 0b4cb23d8fca..4799bba1aadb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ProjectionOrBuilder
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 2b9946906b01..8fea5e2163eb 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index b4efa5d93636..02a9da7274ce 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface PropertyFilterOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
index d8fc11dec963..9f6e0e5406a6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
index ebd49c682a15..d4038d59fd98 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface PropertyMaskOrBuilder
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 a4315a5392d3..381e21973c88 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index e1f589f07a0f..01b8e22f373a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface PropertyOrderOrBuilder
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 c301b8518434..184e3aa5901d 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 0fb61d2e081d..503a1dd2441b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface PropertyReferenceOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
index 51bf34d7cce4..243f3173917a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
index 7371d380ad53..c9a74555af4f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface PropertyTransformOrBuilder
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 1e8e6ef92593..990f78cb926c 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 7629bf17ee02..d581848b263e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface QueryOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
index 9bfe380f795c..4a6980072b39 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query_profile.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public final class QueryProfileProto {
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 d63999bb5ee1..875844726cb3 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public final class QueryProto {
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index ecd44fa37886..f3634d09d860 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index 99483d9d6328..d4d2db887876 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/query.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface QueryResultBatchOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 954270bf8ab6..578c3c132c72 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 7ba3d1fad240..97460f1de2eb 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ReadOptionsOrBuilder
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 3a23ce121014..4326bd29853f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 7b26ed5c044e..d53ae5cbb576 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ReserveIdsRequestOrBuilder
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 7d89c33f317d..962388f7ad09 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 182dfdc188b3..7002f2b45c4a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ReserveIdsResponseOrBuilder
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 df1b5a581ccf..e48e884439b6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 8fc63434da97..6c4f2234ac91 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface RollbackRequestOrBuilder
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 22c7c565f432..afdb9f900182 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index 69e9ae346dda..b8c871f53e76 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface RollbackResponseOrBuilder
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 5c4fd8a80dab..bdae4252dcfd 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 d29e500711fe..6cf4dc5b1c5e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryRequestOrBuilder
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 21e58fece8d4..d23698c1e844 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 c404a126eb3b..0c10bc35444f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface RunAggregationQueryResponseOrBuilder
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 39365a38ba1b..9ef7a6e0f172 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 f7f29842a628..3a7bd8996817 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface RunQueryRequestOrBuilder
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 224e9b21d8dc..f8c571c1ba7a 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 a3316b6ef8af..0d389b65e44e 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface RunQueryResponseOrBuilder
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 256238e25221..82d8db4c6fa6 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 2fbfe302b9b1..c75d40723e2f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/datastore.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface TransactionOptionsOrBuilder
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 b917baaa3de2..20ddd8bb560f 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 /**
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 a133a19b6a0d..53035cd7cdf9 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
@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/v1/entity.proto
 
-// Protobuf Java Version: 3.25.5
+// Protobuf Java Version: 3.25.8
 package com.google.datastore.v1;
 
 public interface ValueOrBuilder
diff --git a/renovate.json b/renovate.json
index 42538270e04c..82d917e7146e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -20,17 +20,6 @@
     ".github/workflows/samples.yaml"
   ],
   "customManagers": [
-    {
-      "customType": "regex",
-      "fileMatch": [
-        "^.kokoro/presubmit/graalvm-native.*.cfg$"
-      ],
-      "matchStrings": [
-        "value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""
-      ],
-      "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
-      "datasourceTemplate": "maven"
-    },
     {
       "customType": "regex",
       "fileMatch": [
@@ -104,4 +93,4 @@
   ],
   "semanticCommits": true,
   "dependencyDashboard": true
-}
\ No newline at end of file
+}

From 34faa62587cf85021721758d41028ff6164a6016 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 10 Jun 2025 22:50:27 +0200
Subject: [PATCH 1635/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.29.1 (#1869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.28.1` -> `2.29.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore)

### [`v2.29.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2291-2025-06-07)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#​1860](https://redirect.github.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://redirect.github.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc))

### [`v2.29.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2290-2025-06-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0)

##### Features

-   Add getNumber to AggregationResult ([https://togithub.com/googleapis/java-datastore/issues/1851](https://redirect.github.com/googleapis/java-datastore/issues/1851)) ([#​1861](https://redirect.github.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://redirect.github.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b))

##### Bug Fixes

-   Remove 500 char path name limit ([#​1865](https://redirect.github.com/googleapis/java-datastore/issues/1865)) ([1097175](https://redirect.github.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328))

##### Dependencies

-   Update dependency org.easymock:easymock to v5.6.0 ([#​1858](https://redirect.github.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://redirect.github.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46))

### [`v2.28.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2282-2025-05-16)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#​1847](https://redirect.github.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://redirect.github.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b))
-   Update googleapis/sdk-platform-java action to v2.58.0 ([#​1853](https://redirect.github.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://redirect.github.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1cf6cb5f9d68..8d4e863cc28e 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.28.1
+      2.29.1
     
     
 

From 3bc1a958c7bcd3319759ecf01d8030577bb01806 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 11 Jun 2025 14:28:34 -0400
Subject: [PATCH 1636/1784] chore: Update generation configuration at Wed Jun
 11 02:31:02 UTC 2025 (#1874)

* chore: Update generation configuration at Wed Jun 11 02:31:02 UTC 2025

* chore: generate libraries at Wed Jun 11 02:31:28 UTC 2025
---
 README.md              | 2 +-
 generation_config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a75655f2bbd8..9db871f06b2c 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.28.1
+  2.29.1
 
 
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 28b18604f2b3..76cd11606211 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.59.0
-googleapis_commitish: ad56690468e8f6ea87207d054bd6ad6adceaf0d3
+googleapis_commitish: 111b7383752255d1849a8d3b7259ed735acc4f97
 libraries_bom_version: 26.61.0
 libraries:
   - api_shortname: datastore

From 7f9c22999a516155c7151d8253f85f7c808d6a20 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 11 Jun 2025 20:44:30 +0200
Subject: [PATCH 1637/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore-utils to v2.29.1 (#1873)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-datastore-utils](https://redirect.github.com/googleapis/java-datastore) | `2.28.1` -> `2.29.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore-utils/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore-utils/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-datastore (com.google.cloud:google-cloud-datastore-utils)

### [`v2.29.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2291-2025-06-07)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#​1860](https://redirect.github.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://redirect.github.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc))

### [`v2.29.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2290-2025-06-06)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0)

##### Features

-   Add getNumber to AggregationResult ([https://togithub.com/googleapis/java-datastore/issues/1851](https://redirect.github.com/googleapis/java-datastore/issues/1851)) ([#​1861](https://redirect.github.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://redirect.github.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b))

##### Bug Fixes

-   Remove 500 char path name limit ([#​1865](https://redirect.github.com/googleapis/java-datastore/issues/1865)) ([1097175](https://redirect.github.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328))

##### Dependencies

-   Update dependency org.easymock:easymock to v5.6.0 ([#​1858](https://redirect.github.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://redirect.github.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46))

### [`v2.28.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2282-2025-05-16)

[Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2)

##### Dependencies

-   Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#​1847](https://redirect.github.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://redirect.github.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b))
-   Update googleapis/sdk-platform-java action to v2.58.0 ([#​1853](https://redirect.github.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://redirect.github.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 860e9c06126c..33778aa3f39e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
       
         com.google.cloud
         google-cloud-datastore-utils
-        2.28.1
+        2.29.1
       
       
         com.google.cloud.datastore

From fe7f8a0aeaf62d5d7abf405cd6d14e7153011616 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Thu, 12 Jun 2025 13:18:20 -0400
Subject: [PATCH 1638/1784] build: disable errorprone for JDK 24+ (#1876)

The current errorprone version is not compatible with JDK 24 onwards.
While we dont have a long term solution, we will disable the check for JDK 24.
---
 pom.xml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 33778aa3f39e..30283fcb9a22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,10 +232,31 @@
   
 
   
+    
+      
+      no-errorprone-jdk-24-onwards
+      
+        [24,)
+      
+      
+        
+          
+            maven-compiler-plugin
+            
+              true
+              
+                
+                -XDcompilePolicy=simple
+              
+            
+          
+        
+      
+    
     
       java9
       
-        [9,)
+        [9,24)
       
       
         

From 3b37a5e0dbafc39b6de9492d0e2e1012f5ccf347 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 12 Jun 2025 18:55:30 -0400
Subject: [PATCH 1639/1784] chore: Update generation configuration at Thu Jun
 12 02:30:37 UTC 2025 (#1877)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 76cd11606211..02af02d4ae61 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.59.0
-googleapis_commitish: 111b7383752255d1849a8d3b7259ed735acc4f97
+googleapis_commitish: 4cdc2aa1af11046c38ee1a4b1f6f4b20f0d49e2b
 libraries_bom_version: 26.61.0
 libraries:
   - api_shortname: datastore

From b08416d885fb857280559973e5f182789a717481 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 13 Jun 2025 02:04:27 +0200
Subject: [PATCH 1640/1784] chore(deps): update dependency
 com.google.cloud:libraries-bom to v26.62.0 (#1875)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.60.0` -> `26.62.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.60.0/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.60.0/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes


    
googleapis/java-cloud-bom (com.google.cloud:libraries-bom)

### [`v26.62.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26620-2025-06-10)

[Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.61.0...v26.62.0)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.49.0 ([#​7057](https://redirect.github.com/googleapis/java-cloud-bom/issues/7057)) ([640aca3](https://redirect.github.com/googleapis/java-cloud-bom/commit/640aca31c2045c7424b54729a857ea193fa53ffd))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.58.0 ([#​7068](https://redirect.github.com/googleapis/java-cloud-bom/issues/7068)) ([7902ff0](https://redirect.github.com/googleapis/java-cloud-bom/commit/7902ff0c88c9f671027bad439690178dc2b0bdf6))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.51.0 ([#​7073](https://redirect.github.com/googleapis/java-cloud-bom/issues/7073)) ([dce1f2a](https://redirect.github.com/googleapis/java-cloud-bom/commit/dce1f2aa8528292440c548bdf2097942db4fc071))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.15.0 ([#​7063](https://redirect.github.com/googleapis/java-cloud-bom/issues/7063)) ([395d4fb](https://redirect.github.com/googleapis/java-cloud-bom/commit/395d4fb39b01eafa1a72e435a2f566b647d65c9e))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.60.0 ([#​7069](https://redirect.github.com/googleapis/java-cloud-bom/issues/7069)) ([d691ec7](https://redirect.github.com/googleapis/java-cloud-bom/commit/d691ec72815eb4f12501387bd8a342cc37ffe174))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.29.1 ([#​7074](https://redirect.github.com/googleapis/java-cloud-bom/issues/7074)) ([479df4c](https://redirect.github.com/googleapis/java-cloud-bom/commit/479df4c9c3700091229433f891022fd90b70f838))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.6 ([#​7056](https://redirect.github.com/googleapis/java-cloud-bom/issues/7056)) ([95ec51c](https://redirect.github.com/googleapis/java-cloud-bom/commit/95ec51cf7940c3235b9e2512a28b1dae9a3ea570))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.22.5 ([#​7066](https://redirect.github.com/googleapis/java-cloud-bom/issues/7066)) ([d5ece55](https://redirect.github.com/googleapis/java-cloud-bom/commit/d5ece55fbaa467cda42067c5eff56faf6e7ff2b8))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.132.9-alpha ([#​7070](https://redirect.github.com/googleapis/java-cloud-bom/issues/7070)) ([ee56a61](https://redirect.github.com/googleapis/java-cloud-bom/commit/ee56a61f48f5187b4447aebd8649e88fcd26fd33))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.37 ([#​7062](https://redirect.github.com/googleapis/java-cloud-bom/issues/7062)) ([b37ec3b](https://redirect.github.com/googleapis/java-cloud-bom/commit/b37ec3b59e18db9582caa3d99d6358391459f651))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.140.1 ([#​7060](https://redirect.github.com/googleapis/java-cloud-bom/issues/7060)) ([3977d26](https://redirect.github.com/googleapis/java-cloud-bom/commit/3977d2613d21d4b61a1a40651bee0922d29b8e61))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.9 ([#​7067](https://redirect.github.com/googleapis/java-cloud-bom/issues/7067)) ([20a2c66](https://redirect.github.com/googleapis/java-cloud-bom/commit/20a2c66f643a1d370394296765746ec0b162eb8e))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.95.1 ([#​7075](https://redirect.github.com/googleapis/java-cloud-bom/issues/7075)) ([046443d](https://redirect.github.com/googleapis/java-cloud-bom/commit/046443d7359bb6a13c1b9b783621c69e92c19acd))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.4 ([#​7076](https://redirect.github.com/googleapis/java-cloud-bom/issues/7076)) ([cff29a9](https://redirect.github.com/googleapis/java-cloud-bom/commit/cff29a9da734e94cb712338ec29ccf1e80448a9c))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.53.0 ([#​7061](https://redirect.github.com/googleapis/java-cloud-bom/issues/7061)) ([37f11e3](https://redirect.github.com/googleapis/java-cloud-bom/commit/37f11e30c9eec2ad4c74e2b37d315c4b60ed7044))
-   Upgrade Protobuf-Java to v3.25.8 ([#​7058](https://redirect.github.com/googleapis/java-cloud-bom/issues/7058)) ([bd71298](https://redirect.github.com/googleapis/java-cloud-bom/commit/bd71298ffb1e5f362584494384d01a95d7ed9756))

### [`v26.61.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26610-2025-05-22)

##### Dependencies

-   update dependency com.google.cloud:first-party-dependencies to v3.48.0 ([#​7038](https://redirect.github.com/googleapis/java-cloud-bom/issues/7038)) ([604b292](https://redirect.github.com/googleapis/java-cloud-bom/commit/604b2925ba5f063305abed187e9493382e73f0e2))
-   update dependency com.google.cloud:gapic-libraries-bom to v1.57.0 ([#​7040](https://redirect.github.com/googleapis/java-cloud-bom/issues/7040)) ([39c2ffd](https://redirect.github.com/googleapis/java-cloud-bom/commit/39c2ffd5867f908b5d9e5b046ae8eac3931a1d34))
-   update dependency com.google.cloud:google-cloud-bigquery to v2.50.1 ([#​7044](https://redirect.github.com/googleapis/java-cloud-bom/issues/7044)) ([59185a6](https://redirect.github.com/googleapis/java-cloud-bom/commit/59185a6ac8385403bb40b9d8d45d7d34a093ad6c))
-   update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.14.1 ([#​7041](https://redirect.github.com/googleapis/java-cloud-bom/issues/7041)) ([da9e434](https://redirect.github.com/googleapis/java-cloud-bom/commit/da9e4348730b96b2d9730e1dfa79da0eece269c0))
-   update dependency com.google.cloud:google-cloud-bigtable-bom to v2.59.0 ([#​7043](https://redirect.github.com/googleapis/java-cloud-bom/issues/7043)) ([2b92099](https://redirect.github.com/googleapis/java-cloud-bom/commit/2b9209944c0c698722b6de9a46cbd296c993a774))
-   update dependency com.google.cloud:google-cloud-datastore-bom to v2.28.2 ([#​7045](https://redirect.github.com/googleapis/java-cloud-bom/issues/7045)) ([d7d9253](https://redirect.github.com/googleapis/java-cloud-bom/commit/d7d925386b9ea8c20c36b887a5e146afbc8769bc))
-   update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.4 ([#​7039](https://redirect.github.com/googleapis/java-cloud-bom/issues/7039)) ([16f206a](https://redirect.github.com/googleapis/java-cloud-bom/commit/16f206a1a59c0d72ac5778f44c45e40d69131084))
-   update dependency com.google.cloud:google-cloud-logging-bom to v3.22.4 ([#​7046](https://redirect.github.com/googleapis/java-cloud-bom/issues/7046)) ([86097e4](https://redirect.github.com/googleapis/java-cloud-bom/commit/86097e41e435cea50d351b13094411e0e3cfbdc4))
-   update dependency com.google.cloud:google-cloud-logging-logback to v0.132.8-alpha ([#​7050](https://redirect.github.com/googleapis/java-cloud-bom/issues/7050)) ([b138835](https://redirect.github.com/googleapis/java-cloud-bom/commit/b1388357ae7febc552a8fe84ba82b7eb40de9f97))
-   update dependency com.google.cloud:google-cloud-nio to v0.127.36 ([#​7047](https://redirect.github.com/googleapis/java-cloud-bom/issues/7047)) ([84fe21c](https://redirect.github.com/googleapis/java-cloud-bom/commit/84fe21c0906a8d65c955567dc38f8c6c73de48a4))
-   update dependency com.google.cloud:google-cloud-pubsub-bom to v1.139.4 ([#​7042](https://redirect.github.com/googleapis/java-cloud-bom/issues/7042)) ([8b7b466](https://redirect.github.com/googleapis/java-cloud-bom/commit/8b7b466ad7f850cd3b3766696a64d56506fda611))
-   update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.8 ([#​7048](https://redirect.github.com/googleapis/java-cloud-bom/issues/7048)) ([61fa514](https://redirect.github.com/googleapis/java-cloud-bom/commit/61fa5147f66a412ccaa2285d347b7545f69305df))
-   update dependency com.google.cloud:google-cloud-spanner-bom to v6.94.0 ([#​7051](https://redirect.github.com/googleapis/java-cloud-bom/issues/7051)) ([9327276](https://redirect.github.com/googleapis/java-cloud-bom/commit/9327276b9b08769309c04d67c18d00c1c62e8f11))
-   update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.2 ([#​7052](https://redirect.github.com/googleapis/java-cloud-bom/issues/7052)) ([fa7eff7](https://redirect.github.com/googleapis/java-cloud-bom/commit/fa7eff723b87cdc7c4299948912c6d099bc2a453))
-   update dependency com.google.cloud:google-cloud-storage-bom to v2.52.3 ([#​7049](https://redirect.github.com/googleapis/java-cloud-bom/issues/7049)) ([0336c8d](https://redirect.github.com/googleapis/java-cloud-bom/commit/0336c8d07f0b04e93300445cd0fd0c0a11878358))


    

---

### 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, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore).

---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f913a5e02f5d..8ed08dea5f3b 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        26.60.0
+        26.62.0
         pom
         import
       

From 09c7df97c16aa661ac87e93e34de2fd01d6c1628 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 13 Jun 2025 15:38:40 -0400
Subject: [PATCH 1641/1784] chore: Update generation configuration at Fri Jun
 13 02:30:58 UTC 2025 (#1878)

* chore: Update generation configuration at Fri Jun 13 02:30:58 UTC 2025

* chore: generate libraries at Fri Jun 13 02:31:28 UTC 2025
---
 README.md              | 2 +-
 generation_config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9db871f06b2c..0310487e3e13 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     
       com.google.cloud
       libraries-bom
-      26.60.0
+      26.62.0
       pom
       import
     
diff --git a/generation_config.yaml b/generation_config.yaml
index 02af02d4ae61..b4aa948f4ded 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.59.0
-googleapis_commitish: 4cdc2aa1af11046c38ee1a4b1f6f4b20f0d49e2b
+googleapis_commitish: 3a45aa38968f4fe537cd3837c0e95af8c189b11b
 libraries_bom_version: 26.61.0
 libraries:
   - api_shortname: datastore

From b64a35c1e46f757abe5e917f3890c194ea6d97c1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 13 Jun 2025 19:58:25 +0000
Subject: [PATCH 1642/1784] chore(main): release 2.29.2-SNAPSHOT (#1871)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 29486cfc0316..0461a6c5388e 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.29.1
+  2.29.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1
+    2.29.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2624fbf2ba9f..346e7793b322 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.29.1
+  2.29.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.29.1
+        2.29.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.1
+        2.29.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.1
+        0.120.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.29.1
+        2.29.2-SNAPSHOT
       
         
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 06e3c55b7ab7..2acaa0ee1974 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.29.1
+    2.29.2-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.29.1
+        2.29.2-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 479655438ff7..839f58eaa55b 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.29.1
+  2.29.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1
+    2.29.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 6ad5a8c36cac..72b5a271adcc 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.29.1
+  2.29.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1
+    2.29.2-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 4b62739dfc2d..8017b239cf84 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.29.1
+  2.29.2-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1
+    2.29.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 30283fcb9a22..8b6092e35858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.29.1
+  2.29.2-SNAPSHOT
   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.29.1
+        2.29.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.1
+        2.29.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.29.1
+        2.29.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.1
+        0.120.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.29.1
+        2.29.2-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.29.1
+        2.29.2-SNAPSHOT
         
           
             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 5284820b8977..fa7a362def79 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.29.1
+  2.29.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1
+    2.29.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a5ed4e394ffe..e8f00a694064 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.120.1
+  0.120.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.1
+    2.29.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 46983615615d..92f9e163b52a 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.29.1
+      2.29.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 3686297762b7..09de55edd8c8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.29.1:2.29.1
-google-cloud-datastore-bom:2.29.1:2.29.1
-proto-google-cloud-datastore-v1:0.120.1:0.120.1
-datastore-v1-proto-client:2.29.1:2.29.1
-proto-google-cloud-datastore-admin-v1:2.29.1:2.29.1
-grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.1
-grpc-google-cloud-datastore-v1:2.29.1:2.29.1
+google-cloud-datastore:2.29.1:2.29.2-SNAPSHOT
+google-cloud-datastore-bom:2.29.1:2.29.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.120.1:0.120.2-SNAPSHOT
+datastore-v1-proto-client:2.29.1:2.29.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.29.1:2.29.2-SNAPSHOT

From 4b15ffdff8fcb901df7033938013a4efe53642f7 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Sat, 14 Jun 2025 16:48:22 +0000
Subject: [PATCH 1643/1784] chore(main): release 2.29.2 (#1879)

:robot: I have created a release *beep* *boop*
---


## [2.29.2](https://togithub.com/googleapis/java-datastore/compare/v2.29.1...v2.29.2) (2025-06-13)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.59.0 ([910a6c2](https://togithub.com/googleapis/java-datastore/commit/910a6c20cb23f441ede5cd75972c65adbb8752e8))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fae65118f12c..b4a858926271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.29.2](https://github.com/googleapis/java-datastore/compare/v2.29.1...v2.29.2) (2025-06-13)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.59.0 ([910a6c2](https://github.com/googleapis/java-datastore/commit/910a6c20cb23f441ede5cd75972c65adbb8752e8))
+
 ## [2.29.1](https://github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) (2025-06-07)
 
 
diff --git a/README.md b/README.md
index 0310487e3e13..ff607f27c752 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.29.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.29.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.2"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 0461a6c5388e..50210ebe9e1e 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.29.2-SNAPSHOT
+  2.29.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2-SNAPSHOT
+    2.29.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 346e7793b322..edc225e4f2a8 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.29.2-SNAPSHOT
+  2.29.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.29.2-SNAPSHOT
+        2.29.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.2-SNAPSHOT
+        2.29.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.2-SNAPSHOT
+        0.120.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.29.2-SNAPSHOT
+        2.29.2
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 2acaa0ee1974..90af8cfe1947 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.29.2-SNAPSHOT
+    2.29.2
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.29.2-SNAPSHOT
+        2.29.2
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 839f58eaa55b..19e045ccb790 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.29.2-SNAPSHOT
+  2.29.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2-SNAPSHOT
+    2.29.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 72b5a271adcc..1e218b925ca1 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.29.2-SNAPSHOT
+  2.29.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2-SNAPSHOT
+    2.29.2
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 8017b239cf84..b29600f42222 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.29.2-SNAPSHOT
+  2.29.2
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2-SNAPSHOT
+    2.29.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 8b6092e35858..bef877d0ade1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.29.2-SNAPSHOT
+  2.29.2
   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.29.2-SNAPSHOT
+        2.29.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.2-SNAPSHOT
+        2.29.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.29.2-SNAPSHOT
+        2.29.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.2-SNAPSHOT
+        0.120.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.29.2-SNAPSHOT
+        2.29.2
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.29.2-SNAPSHOT
+        2.29.2
         
           
             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 fa7a362def79..4cf802aa34f2 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.29.2-SNAPSHOT
+  2.29.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2-SNAPSHOT
+    2.29.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e8f00a694064..88f6f688372a 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.120.2-SNAPSHOT
+  0.120.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2-SNAPSHOT
+    2.29.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 92f9e163b52a..9a3a5dffb411 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.29.2-SNAPSHOT
+      2.29.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 09de55edd8c8..d36d84d7b16d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.29.1:2.29.2-SNAPSHOT
-google-cloud-datastore-bom:2.29.1:2.29.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.120.1:0.120.2-SNAPSHOT
-datastore-v1-proto-client:2.29.1:2.29.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.29.1:2.29.2-SNAPSHOT
+google-cloud-datastore:2.29.2:2.29.2
+google-cloud-datastore-bom:2.29.2:2.29.2
+proto-google-cloud-datastore-v1:0.120.2:0.120.2
+datastore-v1-proto-client:2.29.2:2.29.2
+proto-google-cloud-datastore-admin-v1:2.29.2:2.29.2
+grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.2
+grpc-google-cloud-datastore-v1:2.29.2:2.29.2

From 5c6eaa50623ded4df16da6bf45682c8d4e89c087 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 17 Jun 2025 12:23:16 -0400
Subject: [PATCH 1644/1784] chore: Update generation configuration at Tue Jun
 17 02:31:31 UTC 2025 (#1881)

* chore: Update generation configuration at Sat Jun 14 02:29:59 UTC 2025

* chore: Update generation configuration at Tue Jun 17 02:31:31 UTC 2025
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index b4aa948f4ded..ebb31077b558 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.59.0
-googleapis_commitish: 3a45aa38968f4fe537cd3837c0e95af8c189b11b
+googleapis_commitish: b6b04bf5bdb12d6b223e318ec63aa2ed22cfc0f7
 libraries_bom_version: 26.61.0
 libraries:
   - api_shortname: datastore

From 8df2620b8ad3fd9df1a1b831e469b5ba15f69f8c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 17 Jun 2025 18:43:41 +0200
Subject: [PATCH 1645/1784] build(deps): update dependency
 org.codehaus.mojo:build-helper-maven-plugin to v3.6.1 (#1867)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 8d4e863cc28e..ee4fdd2ffff9 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -53,7 +53,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.6.0
+        3.6.1
         
           
             add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 9a3a5dffb411..f771baf74baf 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -52,7 +52,7 @@
       
         org.codehaus.mojo
         build-helper-maven-plugin
-        3.6.0
+        3.6.1
         
           
             add-snippets-source

From 4fb992943152bb4533e0bbd80e373de61f5ec864 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Tue, 17 Jun 2025 20:50:32 +0200
Subject: [PATCH 1646/1784] deps: update googleapis/sdk-platform-java action to
 v2.59.1 (#1880)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index c01f3faec3af..fa6e2ff75b7c 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From 599f364493465164e7b242e8edb1acaf5c78ebaf Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 20 Jun 2025 15:51:33 -0400
Subject: [PATCH 1647/1784] chore(main): release 2.29.3-SNAPSHOT (#1882)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 50210ebe9e1e..d5347e795f6a 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.29.2
+  2.29.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2
+    2.29.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index edc225e4f2a8..7f954626c582 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.29.2
+  2.29.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.29.2
+        2.29.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.2
+        2.29.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.2
+        0.120.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.29.2
+        2.29.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 90af8cfe1947..95c42e0e6132 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.29.2
+    2.29.3-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.29.2
+        2.29.3-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 19e045ccb790..ad7519423af0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.29.2
+  2.29.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2
+    2.29.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 1e218b925ca1..c6e0e90f13b7 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.29.2
+  2.29.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2
+    2.29.3-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index b29600f42222..291507cf3e9f 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.29.2
+  2.29.3-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2
+    2.29.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index bef877d0ade1..d274626d2b74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.29.2
+  2.29.3-SNAPSHOT
   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.29.2
+        2.29.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.2
+        2.29.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.29.2
+        2.29.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.2
+        0.120.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.29.2
+        2.29.3-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.29.2
+        2.29.3-SNAPSHOT
         
           
             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 4cf802aa34f2..802cde576602 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.29.2
+  2.29.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2
+    2.29.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 88f6f688372a..e5368c00aebc 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.120.2
+  0.120.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.2
+    2.29.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f771baf74baf..f96f6fc2fdf3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.29.2
+      2.29.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index d36d84d7b16d..cf2f14cd5a36 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.29.2:2.29.2
-google-cloud-datastore-bom:2.29.2:2.29.2
-proto-google-cloud-datastore-v1:0.120.2:0.120.2
-datastore-v1-proto-client:2.29.2:2.29.2
-proto-google-cloud-datastore-admin-v1:2.29.2:2.29.2
-grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.2
-grpc-google-cloud-datastore-v1:2.29.2:2.29.2
+google-cloud-datastore:2.29.2:2.29.3-SNAPSHOT
+google-cloud-datastore-bom:2.29.2:2.29.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.120.2:0.120.3-SNAPSHOT
+datastore-v1-proto-client:2.29.2:2.29.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.29.2:2.29.3-SNAPSHOT

From a9d6155449ee7e159dbbbc4c3b61b804b20da290 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki 
Date: Fri, 20 Jun 2025 16:39:25 -0400
Subject: [PATCH 1648/1784] chore: declare the name element (#1891)

The pom.xml doesn't have the name element.
---
 datastore-v1-proto-client/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d5347e795f6a..6a573df0e6da 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -28,6 +28,7 @@
   
 
   jar
+  datastore-v1-proto-client
   
     Low level client for accessing Google Cloud Datastore v1.
   

From 97004c85d73541ccfc26e0f4212e3a447d3e4ba6 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Fri, 20 Jun 2025 15:25:56 -0700
Subject: [PATCH 1649/1784] feat: enable grpc configurator for client-side
 tracing (#1886)

* "feat: enable grpc configurator for client-side tracing"

* chore: generate libraries at Tue Jun 17 22:31:00 UTC 2025

* fix unit tests for max channel number

* Remove max channel count configurations to fall back to gax-grpc max channel count

* fix clirr difference error

---------

Co-authored-by: cloud-java-bot 
---
 google-cloud-datastore/pom.xml                |  4 ++
 .../cloud/datastore/DatastoreOptions.java     | 44 ++++++++++++++-----
 .../datastore/spi/v1/GrpcDatastoreRpc.java    |  3 +-
 .../datastore/telemetry/EnabledTraceUtil.java | 24 +++++++++-
 .../cloud/datastore/DatastoreOptionsTest.java |  3 +-
 .../telemetry/EnabledTraceUtilTest.java       | 32 +++++++++++++-
 6 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ad7519423af0..ea1dc0e677e0 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -147,6 +147,10 @@
       opentelemetry-context
       ${opentelemetry.version}
     
+    
+      io.opentelemetry.instrumentation
+      opentelemetry-grpc-1.6
+    
     
 
     
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 1ea79298c9f7..242ce3b01776 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.ApiFunction;
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.ChannelPoolSettings;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -35,6 +36,7 @@
 import com.google.cloud.http.HttpTransportOptions;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
+import io.grpc.ManagedChannelBuilder;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Objects;
@@ -222,20 +224,37 @@ private DatastoreOptions(Builder builder) {
       throw new IllegalArgumentException(
           "Only gRPC transport allows setting of channel provider or credentials provider");
     } else if (getTransportOptions() instanceof GrpcTransportOptions) {
-      // For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1
-      // and maxChannelCount = 4
-      this.channelProvider =
-          builder.channelProvider != null
-              ? builder.channelProvider
-              : GrpcTransportOptions.setUpChannelProvider(
+      if (builder.channelProvider == null) {
+        /*
+         The default gRPC connection pool is configured with a minimum of 1 channel.
+         The maximum channel count automatically defaults to 200 (Defined in gax-grpc).
+        */
+        ChannelPoolSettings datastoreChannelPoolSettings =
+            ChannelPoolSettings.builder()
+                .setInitialChannelCount(INIT_CHANNEL_COUNT)
+                .setMinChannelCount(MIN_CHANNEL_COUNT)
+                .build();
+
+        ApiFunction channelConfigurator =
+            this.traceUtil.getChannelConfigurator();
+        if (channelConfigurator == null) {
+          this.channelProvider =
+              GrpcTransportOptions.setUpChannelProvider(
                   DatastoreSettings.defaultGrpcTransportProviderBuilder()
-                      .setChannelPoolSettings(
-                          ChannelPoolSettings.builder()
-                              .setInitialChannelCount(INIT_CHANNEL_COUNT)
-                              .setMinChannelCount(MIN_CHANNEL_COUNT)
-                              .setMaxChannelCount(MAX_CHANNEL_COUNT)
-                              .build()),
+                      .setChannelPoolSettings(datastoreChannelPoolSettings),
                   this);
+        } else {
+          // Intercept the grpc channel calls to add telemetry info.
+          this.channelProvider =
+              GrpcTransportOptions.setUpChannelProvider(
+                  DatastoreSettings.defaultGrpcTransportProviderBuilder()
+                      .setChannelPoolSettings(datastoreChannelPoolSettings)
+                      .setChannelConfigurator(channelConfigurator),
+                  this);
+        }
+      } else {
+        this.channelProvider = builder.channelProvider;
+      }
     }
   }
 
@@ -256,6 +275,7 @@ protected String getDefaultProject() {
   }
 
   private static class DatastoreDefaults implements ServiceDefaults {
+
     private final TransportOptions TRANSPORT_OPTIONS = getDefaultTransportOptionsBuilder().build();
 
     @Override
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
index ea9043bb9d7a..f9e3a34f3edc 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
@@ -75,7 +75,7 @@ public GrpcDatastoreRpc(DatastoreOptions datastoreOptions) throws IOException {
               ? getClientContextForEmulator(datastoreOptions)
               : getClientContext(datastoreOptions);
 
-      /* For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 and maxChannelCount = 4 */
+      /* For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 */
       DatastoreStubSettings datastoreStubSettings =
           DatastoreStubSettings.newBuilder(clientContext)
               .applyToAllUnaryMethods(retrySettingSetter(datastoreOptions))
@@ -85,7 +85,6 @@ public GrpcDatastoreRpc(DatastoreOptions datastoreOptions) throws IOException {
                           ChannelPoolSettings.builder()
                               .setInitialChannelCount(DatastoreOptions.INIT_CHANNEL_COUNT)
                               .setMinChannelCount(DatastoreOptions.MIN_CHANNEL_COUNT)
-                              .setMaxChannelCount(DatastoreOptions.MAX_CHANNEL_COUNT)
                               .build())
                       .build())
               .build();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
index 40fc7308e3ca..711e94020548 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
@@ -35,6 +35,8 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.instrumentation.grpc.v1_6.GrpcTelemetry;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -66,14 +68,30 @@ public OpenTelemetry getOpenTelemetry() {
     return openTelemetry;
   }
 
+  // The gRPC channel configurator that intercepts gRPC calls for tracing purposes.
+  public class OpenTelemetryGrpcChannelConfigurator
+      implements ApiFunction {
+
+    @Override
+    public ManagedChannelBuilder apply(ManagedChannelBuilder managedChannelBuilder) {
+      GrpcTelemetry grpcTelemetry = GrpcTelemetry.create(getOpenTelemetry());
+      return managedChannelBuilder.intercept(grpcTelemetry.newClientInterceptor());
+    }
+  }
+
   @Override
   @Nullable
   public ApiFunction getChannelConfigurator() {
-    // TODO(jimit) Update this to return a gRPC Channel Configurator after gRPC upgrade.
-    return null;
+    // Note: using `==` rather than `.equals` since OpenTelemetry has only 1 static instance of
+    // `TracerProvider.noop`.
+    if (openTelemetry.getTracerProvider() == TracerProvider.noop()) {
+      return null;
+    }
+    return new OpenTelemetryGrpcChannelConfigurator();
   }
 
   static class Span implements TraceUtil.Span {
+
     private final io.opentelemetry.api.trace.Span span;
     private final String spanName;
 
@@ -198,6 +216,7 @@ public Scope makeCurrent() {
   }
 
   static class Scope implements TraceUtil.Scope {
+
     private final io.opentelemetry.context.Scope scope;
 
     Scope(io.opentelemetry.context.Scope scope) {
@@ -211,6 +230,7 @@ public void close() {
   }
 
   static class Context implements TraceUtil.Context {
+
     private final io.opentelemetry.context.Context context;
 
     Context(io.opentelemetry.context.Context context) {
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 c6a26d05d032..0c25c3b6c58e 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
@@ -41,6 +41,7 @@ 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 static final int DEFAULT_MAX_CHANNEL_COUNT = 200;
   private DatastoreRpcFactory datastoreRpcFactory;
   private DatastoreRpc datastoreRpc;
   private DatastoreOptions.Builder options;
@@ -119,7 +120,7 @@ public void testGrpcDefaultChannelConfigurations() {
             .getChannelPoolSettings();
     assertEquals(channelPoolSettings.getInitialChannelCount(), DatastoreOptions.INIT_CHANNEL_COUNT);
     assertEquals(channelPoolSettings.getMinChannelCount(), DatastoreOptions.MIN_CHANNEL_COUNT);
-    assertEquals(channelPoolSettings.getMaxChannelCount(), DatastoreOptions.MAX_CHANNEL_COUNT);
+    assertEquals(channelPoolSettings.getMaxChannelCount(), DEFAULT_MAX_CHANNEL_COUNT);
   }
 
   @Test
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
index 50d7b6820418..f076c0966947 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
@@ -66,12 +66,12 @@ public void usesOpenTelemetryFromOptions() {
   @Test
   public void usesGlobalOpenTelemetryIfOpenTelemetryInstanceNotProvided() {
     OpenTelemetrySdk ignored = OpenTelemetrySdk.builder().buildAndRegisterGlobal();
-    DatastoreOptions firestoreOptions =
+    DatastoreOptions datastoreOptions =
         getBaseOptions()
             .setOpenTelemetryOptions(
                 DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build())
             .build();
-    EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions);
+    EnabledTraceUtil traceUtil = new EnabledTraceUtil(datastoreOptions);
     assertThat(traceUtil.getOpenTelemetry()).isEqualTo(GlobalOpenTelemetry.get());
   }
 
@@ -80,6 +80,34 @@ public void enabledTraceUtilProvidesChannelConfigurator() {
     assertThat(newEnabledTraceUtil().getChannelConfigurator()).isNull();
   }
 
+  @Test
+  public void openTelemetryInstanceRegistersGrpcChannelConfigurator() {
+    OpenTelemetrySdk myOpenTelemetrySdk = OpenTelemetrySdk.builder().build();
+    DatastoreOptions firestoreOptions =
+        getBaseOptions()
+            .setOpenTelemetryOptions(
+                DatastoreOpenTelemetryOptions.newBuilder()
+                    .setTracingEnabled(true)
+                    .setOpenTelemetry(myOpenTelemetrySdk)
+                    .build())
+            .build();
+    EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions);
+    assertThat(traceUtil.getChannelConfigurator()).isNotNull();
+  }
+
+  @Test
+  public void globalOpenTelemetryRegistersGrpcChannelConfigurator() {
+
+    OpenTelemetrySdk.builder().buildAndRegisterGlobal();
+    DatastoreOptions datastoreOptions =
+        getBaseOptions()
+            .setOpenTelemetryOptions(
+                DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build())
+            .build();
+    EnabledTraceUtil traceUtil = new EnabledTraceUtil(datastoreOptions);
+    assertThat(traceUtil.getChannelConfigurator()).isNotNull();
+  }
+
   @Test
   public void usesEnabledContext() {
     assertThat(newEnabledTraceUtil().getCurrentContext() instanceof EnabledTraceUtil.Context)

From f1c255a9e09e5c51055334c5b6c870698d07b44e Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 25 Jun 2025 12:41:22 -0400
Subject: [PATCH 1650/1784] chore: Update generation configuration at Wed Jun
 25 02:32:25 UTC 2025 (#1887)

* chore: Update generation configuration at Wed Jun 18 02:30:54 UTC 2025

* chore: Update generation configuration at Thu Jun 19 02:31:16 UTC 2025

* chore: Update generation configuration at Fri Jun 20 02:30:59 UTC 2025

* chore: Update generation configuration at Sat Jun 21 02:30:26 UTC 2025

* chore: Update generation configuration at Wed Jun 25 02:32:25 UTC 2025
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 generation_config.yaml                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index fa6e2ff75b7c..c01f3faec3af 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/generation_config.yaml b/generation_config.yaml
index ebb31077b558..8ad8001754f7 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.59.0
-googleapis_commitish: b6b04bf5bdb12d6b223e318ec63aa2ed22cfc0f7
+googleapis_commitish: 8a883235bc76e941ef745a5b5465878dadc9c440
 libraries_bom_version: 26.61.0
 libraries:
   - api_shortname: datastore

From bf2a33c32a04b978a19fd6dfbe845769c921fa4f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 25 Jun 2025 21:30:17 +0200
Subject: [PATCH 1651/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.60.0 (#1799)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ea1dc0e677e0..d634e44ce3dc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.53.0
+        1.60.0
         pom
         import
       

From 5a82c115ba1998fd72af207da135fff5efc27f1e Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 25 Jun 2025 21:31:20 +0200
Subject: [PATCH 1652/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.29.2 (#1883)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index ee4fdd2ffff9..0f7983be3871 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.29.1
+      2.29.2
     
     
 

From 56028d0bae0241ec9c0092b34adc746f569f545f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 25 Jun 2025 21:47:02 +0200
Subject: [PATCH 1653/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore-utils to v2.29.2 (#1885)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d274626d2b74..9ed049b2c28a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
       
         com.google.cloud
         google-cloud-datastore-utils
-        2.29.1
+        2.29.2
       
       
         com.google.cloud.datastore

From a8d99cde26c38376b596f44379f4d069b25339b2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 26 Jun 2025 21:22:55 +0200
Subject: [PATCH 1654/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.50.0 (#1897)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index c543c9eb3824..3b858f5510f5 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.49.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 7f954626c582..0cd0a10d3967 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.49.0
+    3.50.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 9ed049b2c28a..0bb5ebfdc52c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.49.0
+    3.50.0
   
 
   

From 0921f869ff4a19e7c0fe918aea0896922e9a18af Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 26 Jun 2025 21:32:08 +0200
Subject: [PATCH 1655/1784] deps: update googleapis/sdk-platform-java action to
 v2.60.0 (#1898)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index c01f3faec3af..7838b82ee38c 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.60.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From 77d505076c3babef28b2c17a66093640ab5b3c79 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:13:13 -0700
Subject: [PATCH 1656/1784] chore(main): release 2.30.0 (#1890)

* chore(main): release 2.30.0

* chore: generate libraries at Thu Jun 26 19:32:52 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 15 +++++++++++++++
 README.md                                     |  8 ++++----
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4a858926271..0378423c8526 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.30.0](https://github.com/googleapis/java-datastore/compare/v2.29.2...v2.30.0) (2025-06-26)
+
+
+### Features
+
+* Enable grpc configurator for client-side tracing ([#1886](https://github.com/googleapis/java-datastore/issues/1886)) ([97004c8](https://github.com/googleapis/java-datastore/commit/97004c85d73541ccfc26e0f4212e3a447d3e4ba6))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.60.0 ([#1799](https://github.com/googleapis/java-datastore/issues/1799)) ([bf2a33c](https://github.com/googleapis/java-datastore/commit/bf2a33c32a04b978a19fd6dfbe845769c921fa4f))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.0 ([#1897](https://github.com/googleapis/java-datastore/issues/1897)) ([a8d99cd](https://github.com/googleapis/java-datastore/commit/a8d99cde26c38376b596f44379f4d069b25339b2))
+* Update googleapis/sdk-platform-java action to v2.59.1 ([#1880](https://github.com/googleapis/java-datastore/issues/1880)) ([4fb9929](https://github.com/googleapis/java-datastore/commit/4fb992943152bb4533e0bbd80e373de61f5ec864))
+* Update googleapis/sdk-platform-java action to v2.60.0 ([#1898](https://github.com/googleapis/java-datastore/issues/1898)) ([0921f86](https://github.com/googleapis/java-datastore/commit/0921f869ff4a19e7c0fe918aea0896922e9a18af))
+
 ## [2.29.2](https://github.com/googleapis/java-datastore/compare/v2.29.1...v2.29.2) (2025-06-13)
 
 
diff --git a/README.md b/README.md
index ff607f27c752..95d252d9d5d0 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.29.1
+  2.29.2
 
 
 ```
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.29.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.30.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.30.0"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.30.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 6a573df0e6da..bbeba8b2b113 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.29.3-SNAPSHOT
+  2.30.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.3-SNAPSHOT
+    2.30.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0cd0a10d3967..c2f577695df8 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.29.3-SNAPSHOT
+  2.30.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.29.3-SNAPSHOT
+        2.30.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.3-SNAPSHOT
+        2.30.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.3-SNAPSHOT
+        0.121.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.29.3-SNAPSHOT
+        2.30.0
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 95c42e0e6132..5af334b5a9de 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.29.3-SNAPSHOT
+    2.30.0
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.29.3-SNAPSHOT
+        2.30.0
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d634e44ce3dc..14cd3c1e71cc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.29.3-SNAPSHOT
+  2.30.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.3-SNAPSHOT
+    2.30.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 c6e0e90f13b7..630e5ac7a675 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.29.3-SNAPSHOT
+  2.30.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.3-SNAPSHOT
+    2.30.0
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 291507cf3e9f..6415f2deba16 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.29.3-SNAPSHOT
+  2.30.0
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.3-SNAPSHOT
+    2.30.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 0bb5ebfdc52c..df3804fd362a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.29.3-SNAPSHOT
+  2.30.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.29.3-SNAPSHOT
+        2.30.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.29.3-SNAPSHOT
+        2.30.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.29.3-SNAPSHOT
+        2.30.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.120.3-SNAPSHOT
+        0.121.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.29.3-SNAPSHOT
+        2.30.0
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.29.3-SNAPSHOT
+        2.30.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 802cde576602..411b59801dd1 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.29.3-SNAPSHOT
+  2.30.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.3-SNAPSHOT
+    2.30.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index e5368c00aebc..055ec6d34d3c 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.120.3-SNAPSHOT
+  0.121.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.29.3-SNAPSHOT
+    2.30.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f96f6fc2fdf3..e607354c74b6 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.29.3-SNAPSHOT
+      2.30.0
     
     
 
diff --git a/versions.txt b/versions.txt
index cf2f14cd5a36..6659b1fc38ee 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.29.2:2.29.3-SNAPSHOT
-google-cloud-datastore-bom:2.29.2:2.29.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.120.2:0.120.3-SNAPSHOT
-datastore-v1-proto-client:2.29.2:2.29.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.29.2:2.29.3-SNAPSHOT
+google-cloud-datastore:2.30.0:2.30.0
+google-cloud-datastore-bom:2.30.0:2.30.0
+proto-google-cloud-datastore-v1:0.121.0:0.121.0
+datastore-v1-proto-client:2.30.0:2.30.0
+proto-google-cloud-datastore-admin-v1:2.30.0:2.30.0
+grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.0
+grpc-google-cloud-datastore-v1:2.30.0:2.30.0

From c8f4c0e6ee5c40e83749062a1bba49023d297aad Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 9 Jul 2025 01:37:58 +0200
Subject: [PATCH 1657/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore-utils to v2.30.0 (#1904)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index df3804fd362a..3dab86c1cc63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
       
         com.google.cloud
         google-cloud-datastore-utils
-        2.29.2
+        2.30.0
       
       
         com.google.cloud.datastore

From beeb125efc842776facfa67742bdf8b6c167e9f2 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 9 Jul 2025 01:48:35 +0200
Subject: [PATCH 1658/1784] deps: update dependency
 com.google.cloud:gapic-libraries-bom to v1.61.0 (#1901)

---
 google-cloud-datastore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 14cd3c1e71cc..ee2685c7ae9d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -24,7 +24,7 @@
         
         com.google.cloud
         gapic-libraries-bom
-        1.60.0
+        1.61.0
         pom
         import
       

From 9045160a757b2ffd54c1a3a5e0d0504653546f6d Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 9 Jul 2025 01:48:46 +0200
Subject: [PATCH 1659/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.30.0 (#1903)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 0f7983be3871..58a0953fa0b8 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.29.2
+      2.30.0
     
     
 

From a74c46bfbac8eaf5c97fe653b740e26e7c79f4da Mon Sep 17 00:00:00 2001
From: Jin Seop Kim 
Date: Thu, 10 Jul 2025 11:40:37 -0700
Subject: [PATCH 1660/1784] feat: next release from main branch is 2.31.0
 (#1912)

* feat: next release from main branch is 2.31.0

* chore: generate libraries at Wed Jul  9 21:11:47 UTC 2025

---------

Co-authored-by: cloud-java-bot 
---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 39 ++++++++++++++++++++++++---------
 README.md                       |  2 +-
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 3fd939966c92..28d9ff930ba6 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -38,3 +38,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.26.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.30.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 12d6c76d266d..7545f34d8095 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -116,16 +116,16 @@ branchProtectionRules:
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: false
     requiredStatusCheckContexts:
-        - dependencies (17)
-        - lint
-        - clirr
-        - units (8)
-        - units (11)
-        - 'Kokoro - Test: Integration'
-        - cla/google
-        - 'Kokoro - Test: Java GraalVM Native Image'
-        - 'Kokoro - Test: Java 17 GraalVM Native Image'
-        - javadoc
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
   - pattern: 2.15.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
@@ -191,6 +191,25 @@ branchProtectionRules:
       - javadoc
       - library_generation
       - unmanaged_dependency_check
+  - pattern: 2.30.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image A'
+      - 'Kokoro - Test: Java GraalVM Native Image B'
+      - 'Kokoro - Test: Java GraalVM Native Image C'
+      - javadoc
+      - library_generation
+      - unmanaged_dependency_check
 permissionRules:
   - team: yoshi-admins
     permission: admin
diff --git a/README.md b/README.md
index 95d252d9d5d0..bbe1e863ddc0 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.29.2
+  2.30.0
 
 
 ```

From b10e0f0748decf06574fc0eb7ddba33ee5ece1a7 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 14 Jul 2025 19:03:46 +0200
Subject: [PATCH 1661/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.50.1 (#1908)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 3b858f5510f5..156af5f336ba 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c2f577695df8..69737f60a32c 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.50.0
+    3.50.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 3dab86c1cc63..a6e5ff3e277d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.50.0
+    3.50.1
   
 
   

From 29d7fe88b670e7230eaaffd0250f32671dee56da Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 18:00:38 +0000
Subject: [PATCH 1662/1784] chore(main): release 2.30.1-SNAPSHOT (#1902)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index bbeba8b2b113..29e5d1e76eef 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.30.0
+  2.30.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.0
+    2.30.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 69737f60a32c..a897f63bb385 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.30.0
+  2.30.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.30.0
+        2.30.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.30.0
+        2.30.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.121.0
+        0.121.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.30.0
+        2.30.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 5af334b5a9de..335cbf611ce9 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.30.0
+    2.30.1-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.30.0
+        2.30.1-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ee2685c7ae9d..630302e4aa63 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.30.0
+  2.30.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.0
+    2.30.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 630e5ac7a675..21b387720a5e 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.30.0
+  2.30.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.0
+    2.30.1-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 6415f2deba16..4669023fc434 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.30.0
+  2.30.1-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.0
+    2.30.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index a6e5ff3e277d..b2141dfbddad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.30.0
+  2.30.1-SNAPSHOT
   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.30.0
+        2.30.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.30.0
+        2.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.30.0
+        2.30.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.121.0
+        0.121.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.30.0
+        2.30.1-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.30.0
+        2.30.1-SNAPSHOT
         
           
             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 411b59801dd1..0f98c0c6d4a7 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.30.0
+  2.30.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.0
+    2.30.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 055ec6d34d3c..af7cb6667628 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.121.0
+  0.121.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.0
+    2.30.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e607354c74b6..1ae718ba1031 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.30.0
+      2.30.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 6659b1fc38ee..2678a0bef55e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.30.0:2.30.0
-google-cloud-datastore-bom:2.30.0:2.30.0
-proto-google-cloud-datastore-v1:0.121.0:0.121.0
-datastore-v1-proto-client:2.30.0:2.30.0
-proto-google-cloud-datastore-admin-v1:2.30.0:2.30.0
-grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.0
-grpc-google-cloud-datastore-v1:2.30.0:2.30.0
+google-cloud-datastore:2.30.0:2.30.1-SNAPSHOT
+google-cloud-datastore-bom:2.30.0:2.30.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.121.0:0.121.1-SNAPSHOT
+datastore-v1-proto-client:2.30.0:2.30.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.30.0:2.30.1-SNAPSHOT

From 0fd4981f91c008b60977754c0bd067365e27c362 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 01:36:23 +0000
Subject: [PATCH 1663/1784] chore(main): release 2.31.0 (#1916)

:robot: I have created a release *beep* *boop*
---


## [2.31.0](https://togithub.com/googleapis/java-datastore/compare/v2.30.0...v2.31.0) (2025-07-14)


### Features

* Next release from main branch is 2.31.0 ([#1912](https://togithub.com/googleapis/java-datastore/issues/1912)) ([a74c46b](https://togithub.com/googleapis/java-datastore/commit/a74c46bfbac8eaf5c97fe653b740e26e7c79f4da))


### Dependencies

* Update dependency com.google.cloud:gapic-libraries-bom to v1.61.0 ([#1901](https://togithub.com/googleapis/java-datastore/issues/1901)) ([beeb125](https://togithub.com/googleapis/java-datastore/commit/beeb125efc842776facfa67742bdf8b6c167e9f2))
* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.1 ([#1908](https://togithub.com/googleapis/java-datastore/issues/1908)) ([b10e0f0](https://togithub.com/googleapis/java-datastore/commit/b10e0f0748decf06574fc0eb7ddba33ee5ece1a7))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 13 +++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0378423c8526..708cd5fb987b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.31.0](https://github.com/googleapis/java-datastore/compare/v2.30.0...v2.31.0) (2025-07-14)
+
+
+### Features
+
+* Next release from main branch is 2.31.0 ([#1912](https://github.com/googleapis/java-datastore/issues/1912)) ([a74c46b](https://github.com/googleapis/java-datastore/commit/a74c46bfbac8eaf5c97fe653b740e26e7c79f4da))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:gapic-libraries-bom to v1.61.0 ([#1901](https://github.com/googleapis/java-datastore/issues/1901)) ([beeb125](https://github.com/googleapis/java-datastore/commit/beeb125efc842776facfa67742bdf8b6c167e9f2))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.1 ([#1908](https://github.com/googleapis/java-datastore/issues/1908)) ([b10e0f0](https://github.com/googleapis/java-datastore/commit/b10e0f0748decf06574fc0eb7ddba33ee5ece1a7))
+
 ## [2.30.0](https://github.com/googleapis/java-datastore/compare/v2.29.2...v2.30.0) (2025-06-26)
 
 
diff --git a/README.md b/README.md
index bbe1e863ddc0..f737c2cfe51a 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.30.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.31.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.0"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.30.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 29e5d1e76eef..940a5f672491 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.30.1-SNAPSHOT
+  2.31.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.1-SNAPSHOT
+    2.31.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a897f63bb385..474f3bac626c 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.30.1-SNAPSHOT
+  2.31.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.30.1-SNAPSHOT
+        2.31.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.30.1-SNAPSHOT
+        2.31.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.121.1-SNAPSHOT
+        0.122.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.30.1-SNAPSHOT
+        2.31.0
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 335cbf611ce9..f9d026e4e263 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.30.1-SNAPSHOT
+    2.31.0
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.30.1-SNAPSHOT
+        2.31.0
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 630302e4aa63..13ab983259dc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.30.1-SNAPSHOT
+  2.31.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.1-SNAPSHOT
+    2.31.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 21b387720a5e..0c281d430554 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.30.1-SNAPSHOT
+  2.31.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.1-SNAPSHOT
+    2.31.0
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 4669023fc434..c45ee0bb5738 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.30.1-SNAPSHOT
+  2.31.0
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.1-SNAPSHOT
+    2.31.0
   
   
     
diff --git a/pom.xml b/pom.xml
index b2141dfbddad..e57149915408 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.30.1-SNAPSHOT
+  2.31.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.30.1-SNAPSHOT
+        2.31.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.30.1-SNAPSHOT
+        2.31.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.30.1-SNAPSHOT
+        2.31.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.121.1-SNAPSHOT
+        0.122.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.30.1-SNAPSHOT
+        2.31.0
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.30.1-SNAPSHOT
+        2.31.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 0f98c0c6d4a7..7cee2b35fca7 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.30.1-SNAPSHOT
+  2.31.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.1-SNAPSHOT
+    2.31.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index af7cb6667628..0e9379faf6ef 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.121.1-SNAPSHOT
+  0.122.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.30.1-SNAPSHOT
+    2.31.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1ae718ba1031..df8e9435e74c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.30.1-SNAPSHOT
+      2.31.0
     
     
 
diff --git a/versions.txt b/versions.txt
index 2678a0bef55e..5c015f9154ad 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.30.0:2.30.1-SNAPSHOT
-google-cloud-datastore-bom:2.30.0:2.30.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.121.0:0.121.1-SNAPSHOT
-datastore-v1-proto-client:2.30.0:2.30.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.30.0:2.30.1-SNAPSHOT
+google-cloud-datastore:2.31.0:2.31.0
+google-cloud-datastore-bom:2.31.0:2.31.0
+proto-google-cloud-datastore-v1:0.122.0:0.122.0
+datastore-v1-proto-client:2.31.0:2.31.0
+proto-google-cloud-datastore-admin-v1:2.31.0:2.31.0
+grpc-google-cloud-datastore-admin-v1:2.31.0:2.31.0
+grpc-google-cloud-datastore-v1:2.31.0:2.31.0

From 481e26deee9a426ebd7523b6469f98b0ecf69ac9 Mon Sep 17 00:00:00 2001
From: Jin Seop Kim 
Date: Fri, 18 Jul 2025 13:02:35 -0700
Subject: [PATCH 1664/1784] chore: create LTS branch 2.29.x (#1922)

---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 28d9ff930ba6..8f934f1ba5a3 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -42,3 +42,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.30.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.29.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 7545f34d8095..a62e8b083b47 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -210,6 +210,25 @@ branchProtectionRules:
       - javadoc
       - library_generation
       - unmanaged_dependency_check
+  - pattern: 2.29.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image A'
+      - 'Kokoro - Test: Java GraalVM Native Image B'
+      - 'Kokoro - Test: Java GraalVM Native Image C'
+      - javadoc
+      - library_generation
+      - unmanaged_dependency_check
 permissionRules:
   - team: yoshi-admins
     permission: admin

From 0c5f47c73fda5f3a70de3cc83d1e1fb3a6f5d91a Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Mon, 28 Jul 2025 12:08:21 -0400
Subject: [PATCH 1665/1784] chore: manual update of update_generation_config.sh
 (#1925)

Unfortunately, https://github.com/googleapis/sdk-platform-java/pull/3853 cannot be automatically propagated.

This PR manually updates this script with the latest.
---
 .github/scripts/update_generation_config.sh     | 10 ++++++----
 .github/workflows/update_generation_config.yaml |  7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh
index fff56bf5ddf3..a0b95de6c0df 100644
--- a/.github/scripts/update_generation_config.sh
+++ b/.github/scripts/update_generation_config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 # This script should be run at the root of the repository.
 # This script is used to update googleapis_commitish, gapic_generator_version,
 # and libraries_bom_version in generation configuration at the time of running
@@ -15,8 +15,10 @@ set -e
 function get_latest_released_version() {
     local group_id=$1
     local artifact_id=$2
-    json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
-    latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
+    group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
+    url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
+    xml_content=$(curl -s --fail "${url}")
+    latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
     if [[ -z "${latest}" ]]; then
         echo "The latest version of ${group_id}:${artifact_id} is empty."
         echo "The returned json from maven.org is invalid: ${json_content}"
@@ -172,4 +174,4 @@ if [ -z "${pr_num}" ]; then
 else
   git push
   gh pr edit "${pr_num}" --title "${title}" --body "${title}"
-fi
+fi
\ No newline at end of file
diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml
index cd2d5fd5a8e4..7b14069ced81 100644
--- a/.github/workflows/update_generation_config.yaml
+++ b/.github/workflows/update_generation_config.yaml
@@ -18,7 +18,6 @@ on:
   schedule:
   - cron: '0 2 * * *'
   workflow_dispatch:
-
 jobs:
   update-generation-config:
     runs-on: ubuntu-24.04
@@ -30,6 +29,9 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+    - name: Install Dependencies
+      shell: bash
+      run: sudo apt-get update && sudo apt-get install -y libxml2-utils
     - name: Update params in generation config to latest
       shell: bash
       run: |
@@ -40,5 +42,4 @@ jobs:
           --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
\ No newline at end of file

From 1ecdf377b2a6ccb2ffd231744726807b0493df79 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 28 Jul 2025 18:26:51 +0200
Subject: [PATCH 1666/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.50.2 (#1926)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 156af5f336ba..703e62bd76e9 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.2
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 474f3bac626c..92065bda93fd 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.50.1
+    3.50.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index e57149915408..50905c97dd83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.50.1
+    3.50.2
   
 
   

From 876e46bcf6a426934f65ae1f910f8a0a02f7f3e8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 28 Jul 2025 18:27:03 +0200
Subject: [PATCH 1667/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.31.0 (#1927)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 58a0953fa0b8..7fcf9a499107 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.30.0
+      2.31.0
     
     
 

From 20fc6b3b95cac0e8a221e36480bfc74c51a8e54c Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 28 Jul 2025 18:27:28 +0200
Subject: [PATCH 1668/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore-utils to v2.31.0 (#1928)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 50905c97dd83..96636d6b4d6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
       
         com.google.cloud
         google-cloud-datastore-utils
-        2.30.0
+        2.31.0
       
       
         com.google.cloud.datastore

From 06372cd63a7ce35747d90c62cc1d57be0a6ffb37 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 28 Jul 2025 12:28:32 -0400
Subject: [PATCH 1669/1784] chore: Update generation configuration at Mon Jul
 28 16:10:07 UTC 2025 (#1899)

* chore: Update generation configuration at Thu Jun 26 02:31:44 UTC 2025

* chore: generate libraries at Thu Jun 26 02:32:12 UTC 2025

* chore: Update generation configuration at Fri Jun 27 02:32:03 UTC 2025

* chore: Update generation configuration at Sat Jun 28 02:30:19 UTC 2025

* chore: Update generation configuration at Sun Jun 29 02:39:25 UTC 2025

* chore: Update generation configuration at Tue Jul  1 02:40:34 UTC 2025

* chore: Update generation configuration at Wed Jul  2 02:31:49 UTC 2025

* chore: Update generation configuration at Thu Jul  3 02:32:36 UTC 2025

* chore: Update generation configuration at Fri Jul  4 02:31:28 UTC 2025

* chore: Update generation configuration at Tue Jul  8 02:32:49 UTC 2025

* chore: Update generation configuration at Wed Jul  9 02:33:40 UTC 2025

* chore: generate libraries at Wed Jul  9 02:34:11 UTC 2025

* chore: Update generation configuration at Thu Jul 10 02:33:59 UTC 2025

* chore: Update generation configuration at Fri Jul 11 02:36:06 UTC 2025

* chore: Update generation configuration at Sat Jul 12 02:35:31 UTC 2025

* chore: Update generation configuration at Tue Jul 15 02:38:30 UTC 2025

* chore: Update generation configuration at Wed Jul 16 02:36:20 UTC 2025

* chore: Update generation configuration at Thu Jul 17 02:36:50 UTC 2025

* chore: Update generation configuration at Sat Jul 19 02:33:15 UTC 2025

* chore: Update generation configuration at Tue Jul 22 02:37:19 UTC 2025

* chore: Update generation configuration at Wed Jul 23 02:38:20 UTC 2025

* chore: Update generation configuration at Thu Jul 24 02:37:49 UTC 2025

* chore: Update generation configuration at Thu Jul 24 19:16:27 UTC 2025

* chore: Update generation configuration at Fri Jul 25 02:37:36 UTC 2025

* chore: Update generation configuration at Sat Jul 26 02:34:21 UTC 2025

* chore: Update generation configuration at Mon Jul 28 16:10:07 UTC 2025

* chore: generate libraries at Mon Jul 28 16:10:41 UTC 2025
---
 .github/scripts/update_generation_config.sh        | 4 ++--
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 .github/workflows/update_generation_config.yaml    | 4 +++-
 .kokoro/presubmit/graalvm-native-a.cfg             | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg             | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg             | 2 +-
 README.md                                          | 2 +-
 generation_config.yaml                             | 6 +++---
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh
index a0b95de6c0df..3b890a76b24e 100644
--- a/.github/scripts/update_generation_config.sh
+++ b/.github/scripts/update_generation_config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -ex
+set -e
 # This script should be run at the root of the repository.
 # This script is used to update googleapis_commitish, gapic_generator_version,
 # and libraries_bom_version in generation configuration at the time of running
@@ -174,4 +174,4 @@ if [ -z "${pr_num}" ]; then
 else
   git push
   gh pr edit "${pr_num}" --title "${title}" --body "${title}"
-fi
\ No newline at end of file
+fi
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 7838b82ee38c..5912d6f06913 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.60.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.60.2
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml
index 7b14069ced81..a7e14bb483c3 100644
--- a/.github/workflows/update_generation_config.yaml
+++ b/.github/workflows/update_generation_config.yaml
@@ -18,6 +18,7 @@ on:
   schedule:
   - cron: '0 2 * * *'
   workflow_dispatch:
+
 jobs:
   update-generation-config:
     runs-on: ubuntu-24.04
@@ -42,4 +43,5 @@ jobs:
           --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
\ No newline at end of file
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 5cc939cf9090..96b4fed86fbc 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index fd00159184a1..76f048331494 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 424494b02e02..277aa2338dd3 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index f737c2cfe51a..bfa8e9b49d42 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.61.0')
+implementation platform('com.google.cloud:libraries-bom:26.64.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 8ad8001754f7..6ff88720abcc 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.59.0
-googleapis_commitish: 8a883235bc76e941ef745a5b5465878dadc9c440
-libraries_bom_version: 26.61.0
+gapic_generator_version: 2.60.2
+googleapis_commitish: 6588689155df35bb46974c477505990f0034f569
+libraries_bom_version: 26.64.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 3826b79eecbf51fb421ae232482096c848ac2903 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 16:54:22 +0000
Subject: [PATCH 1670/1784] chore(main): release 2.31.1-SNAPSHOT (#1920)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 README.md                                     |  2 +-
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index bfa8e9b49d42..3a10f60d935b 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.30.0
+  2.31.0
 
 
 ```
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 940a5f672491..431dca0a5776 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.31.0
+  2.31.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.0
+    2.31.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 92065bda93fd..5879b9f17817 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.31.0
+  2.31.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.0
+        2.31.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.0
+        2.31.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.0
+        0.122.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.0
+        2.31.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index f9d026e4e263..1fa5b7bceb31 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.0
+    2.31.1-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.0
+        2.31.1-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 13ab983259dc..f2d8ed0ed2c5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.0
+  2.31.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.0
+    2.31.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 0c281d430554..60fe1d51af19 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.31.0
+  2.31.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.0
+    2.31.1-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index c45ee0bb5738..504a8156efbe 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.0
+  2.31.1-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.0
+    2.31.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 96636d6b4d6c..0d26751390e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.0
+  2.31.1-SNAPSHOT
   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.31.0
+        2.31.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.0
+        2.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.0
+        2.31.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.0
+        0.122.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.0
+        2.31.1-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.0
+        2.31.1-SNAPSHOT
         
           
             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 7cee2b35fca7..75b0695d4c63 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.31.0
+  2.31.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.0
+    2.31.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0e9379faf6ef..9fa4d2c12ce0 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.122.0
+  0.122.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.0
+    2.31.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index df8e9435e74c..abe600e9f6c0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.0
+      2.31.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 5c015f9154ad..095e8646be9e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.0:2.31.0
-google-cloud-datastore-bom:2.31.0:2.31.0
-proto-google-cloud-datastore-v1:0.122.0:0.122.0
-datastore-v1-proto-client:2.31.0:2.31.0
-proto-google-cloud-datastore-admin-v1:2.31.0:2.31.0
-grpc-google-cloud-datastore-admin-v1:2.31.0:2.31.0
-grpc-google-cloud-datastore-v1:2.31.0:2.31.0
+google-cloud-datastore:2.31.0:2.31.1-SNAPSHOT
+google-cloud-datastore-bom:2.31.0:2.31.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.122.0:0.122.1-SNAPSHOT
+datastore-v1-proto-client:2.31.0:2.31.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.31.0:2.31.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.31.0:2.31.1-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.31.0:2.31.1-SNAPSHOT

From d478b185343eb649cd2ffa09c2c66763ce475772 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 09:24:40 -0700
Subject: [PATCH 1671/1784] chore(main): release 2.31.1 (#1929)

* chore(main): release 2.31.1

* chore: generate libraries at Mon Jul 28 16:55:08 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 708cd5fb987b..1d3936161ea0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.31.1](https://github.com/googleapis/java-datastore/compare/v2.31.0...v2.31.1) (2025-07-28)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.60.2 ([06372cd](https://github.com/googleapis/java-datastore/commit/06372cd63a7ce35747d90c62cc1d57be0a6ffb37))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.2 ([#1926](https://github.com/googleapis/java-datastore/issues/1926)) ([1ecdf37](https://github.com/googleapis/java-datastore/commit/1ecdf377b2a6ccb2ffd231744726807b0493df79))
+
 ## [2.31.0](https://github.com/googleapis/java-datastore/compare/v2.30.0...v2.31.0) (2025-07-14)
 
 
diff --git a/README.md b/README.md
index 3a10f60d935b..fbdcae1e025a 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.31.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.31.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.1"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 431dca0a5776..a884007f2e4b 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.31.1-SNAPSHOT
+  2.31.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1-SNAPSHOT
+    2.31.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5879b9f17817..da39431ac76a 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.31.1-SNAPSHOT
+  2.31.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.1-SNAPSHOT
+        2.31.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.1-SNAPSHOT
+        2.31.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.1-SNAPSHOT
+        0.122.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.1-SNAPSHOT
+        2.31.1
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 1fa5b7bceb31..ffff1421edb8 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.1-SNAPSHOT
+    2.31.1
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.1-SNAPSHOT
+        2.31.1
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f2d8ed0ed2c5..790f83c36164 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.1-SNAPSHOT
+  2.31.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1-SNAPSHOT
+    2.31.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 60fe1d51af19..a5c9af88eea7 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.31.1-SNAPSHOT
+  2.31.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1-SNAPSHOT
+    2.31.1
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 504a8156efbe..fa9fa5d356a8 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.1-SNAPSHOT
+  2.31.1
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1-SNAPSHOT
+    2.31.1
   
   
     
diff --git a/pom.xml b/pom.xml
index 0d26751390e9..e0cd7aa7bf23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.1-SNAPSHOT
+  2.31.1
   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.31.1-SNAPSHOT
+        2.31.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.1-SNAPSHOT
+        2.31.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.1-SNAPSHOT
+        2.31.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.1-SNAPSHOT
+        0.122.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.1-SNAPSHOT
+        2.31.1
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.1-SNAPSHOT
+        2.31.1
         
           
             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 75b0695d4c63..1765128defca 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.31.1-SNAPSHOT
+  2.31.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1-SNAPSHOT
+    2.31.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9fa4d2c12ce0..78f9f8fddc7c 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.122.1-SNAPSHOT
+  0.122.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1-SNAPSHOT
+    2.31.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index abe600e9f6c0..44de6d73d6db 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.1-SNAPSHOT
+      2.31.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 095e8646be9e..50ead5b4fadb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.0:2.31.1-SNAPSHOT
-google-cloud-datastore-bom:2.31.0:2.31.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.122.0:0.122.1-SNAPSHOT
-datastore-v1-proto-client:2.31.0:2.31.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.31.0:2.31.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.31.0:2.31.1-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.31.0:2.31.1-SNAPSHOT
+google-cloud-datastore:2.31.1:2.31.1
+google-cloud-datastore-bom:2.31.1:2.31.1
+proto-google-cloud-datastore-v1:0.122.1:0.122.1
+datastore-v1-proto-client:2.31.1:2.31.1
+proto-google-cloud-datastore-admin-v1:2.31.1:2.31.1
+grpc-google-cloud-datastore-admin-v1:2.31.1:2.31.1
+grpc-google-cloud-datastore-v1:2.31.1:2.31.1

From 290e8bffdf1b973eea4d13ee84aaa6afdbb93b6a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:02:14 -0700
Subject: [PATCH 1672/1784] chore(main): release 2.31.2-SNAPSHOT (#1931)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a884007f2e4b..5ed25f1d99be 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.31.1
+  2.31.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1
+    2.31.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index da39431ac76a..5126e201080f 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.31.1
+  2.31.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.1
+        2.31.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.1
+        2.31.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.1
+        0.122.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.1
+        2.31.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index ffff1421edb8..2e818d46110b 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.1
+    2.31.2-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.1
+        2.31.2-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 790f83c36164..3864a672b9dd 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.1
+  2.31.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1
+    2.31.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index a5c9af88eea7..63566c6111e3 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.31.1
+  2.31.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1
+    2.31.2-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index fa9fa5d356a8..2e42cb98bb64 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.1
+  2.31.2-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1
+    2.31.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index e0cd7aa7bf23..dd36b02d234e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.1
+  2.31.2-SNAPSHOT
   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.31.1
+        2.31.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.1
+        2.31.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.1
+        2.31.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.1
+        0.122.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.1
+        2.31.2-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.1
+        2.31.2-SNAPSHOT
         
           
             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 1765128defca..e14a87033e1b 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.31.1
+  2.31.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1
+    2.31.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 78f9f8fddc7c..1da104841944 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.122.1
+  0.122.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.1
+    2.31.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 44de6d73d6db..ad220505582c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.1
+      2.31.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 50ead5b4fadb..7f92864acfe6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.1:2.31.1
-google-cloud-datastore-bom:2.31.1:2.31.1
-proto-google-cloud-datastore-v1:0.122.1:0.122.1
-datastore-v1-proto-client:2.31.1:2.31.1
-proto-google-cloud-datastore-admin-v1:2.31.1:2.31.1
-grpc-google-cloud-datastore-admin-v1:2.31.1:2.31.1
-grpc-google-cloud-datastore-v1:2.31.1:2.31.1
+google-cloud-datastore:2.31.1:2.31.2-SNAPSHOT
+google-cloud-datastore-bom:2.31.1:2.31.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.122.1:0.122.2-SNAPSHOT
+datastore-v1-proto-client:2.31.1:2.31.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.31.1:2.31.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.31.1:2.31.2-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.31.1:2.31.2-SNAPSHOT

From c7bd68de82ec06f06c41cd12e87cc96a337dcd02 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 7 Aug 2025 00:38:30 -0400
Subject: [PATCH 1673/1784] chore: Update generation configuration at Thu Aug 
 7 02:41:40 UTC 2025 (#1930)

* chore: Update generation configuration at Tue Jul 29 02:45:31 UTC 2025

* chore: Update generation configuration at Wed Jul 30 02:41:17 UTC 2025

* chore: Update generation configuration at Thu Jul 31 02:39:41 UTC 2025

* chore: Update generation configuration at Fri Aug  1 02:48:04 UTC 2025

* chore: Update generation configuration at Sat Aug  2 02:36:47 UTC 2025

* chore: generate libraries at Sat Aug  2 02:37:18 UTC 2025

* chore: Update generation configuration at Tue Aug  5 02:42:22 UTC 2025

* chore: generate libraries at Tue Aug  5 02:42:50 UTC 2025

* chore: Update generation configuration at Wed Aug  6 02:41:00 UTC 2025

* chore: Update generation configuration at Thu Aug  7 02:41:40 UTC 2025

---------

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 .github/scripts/update_generation_config.sh        | 2 +-
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-a.cfg             | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg             | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg             | 2 +-
 README.md                                          | 2 +-
 generation_config.yaml                             | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh
index 3b890a76b24e..92efcf881914 100644
--- a/.github/scripts/update_generation_config.sh
+++ b/.github/scripts/update_generation_config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 # This script should be run at the root of the repository.
 # This script is used to update googleapis_commitish, gapic_generator_version,
 # and libraries_bom_version in generation configuration at the time of running
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 5912d6f06913..5a97a438023b 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.60.2
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.61.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 96b4fed86fbc..783727ef0104 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 76f048331494..83c7afee079c 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 277aa2338dd3..3a9bbf8c3ab9 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index fbdcae1e025a..0c717a8edf3e 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.64.0')
+implementation platform('com.google.cloud:libraries-bom:26.65.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 6ff88720abcc..1172382880ca 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.60.2
-googleapis_commitish: 6588689155df35bb46974c477505990f0034f569
-libraries_bom_version: 26.64.0
+gapic_generator_version: 2.61.0
+googleapis_commitish: b0316578aaf7434e3c5bb93badd252f67aacf8d5
+libraries_bom_version: 26.65.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From a25433f805f957dc0beebaeef466aa20f14f8ccc Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 8 Aug 2025 19:54:27 +0200
Subject: [PATCH 1674/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.51.0 (#1936)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 703e62bd76e9..bb91570d7484 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.2
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.51.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 5126e201080f..997276d4c66a 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.50.2
+    3.51.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index dd36b02d234e..a5d021d027b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.50.2
+    3.51.0
   
 
   

From 9056a73aa19ffc24205ea4a135fb087de346598c Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 8 Aug 2025 14:10:25 -0400
Subject: [PATCH 1675/1784] chore: Update generation configuration at Fri Aug 
 8 02:42:00 UTC 2025 (#1935)

chore: Update generation configuration at Fri Aug  8 02:42:00 UTC 2025
---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 1172382880ca..d69fd3870509 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.61.0
-googleapis_commitish: b0316578aaf7434e3c5bb93badd252f67aacf8d5
+googleapis_commitish: c5334a83d6966439a2273a4ef64e6779ffba97a1
 libraries_bom_version: 26.65.0
 libraries:
   - api_shortname: datastore

From 53f36928104243f12f1a9ec9a825bc14d96425f4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 15:32:29 +0000
Subject: [PATCH 1676/1784] chore(main): release 2.31.2 (#1934)

:robot: I have created a release *beep* *boop*
---


## [2.31.2](https://togithub.com/googleapis/java-datastore/compare/v2.31.1...v2.31.2) (2025-08-08)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.61.0 ([c7bd68d](https://togithub.com/googleapis/java-datastore/commit/c7bd68de82ec06f06c41cd12e87cc96a337dcd02))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.51.0 ([#1936](https://togithub.com/googleapis/java-datastore/issues/1936)) ([a25433f](https://togithub.com/googleapis/java-datastore/commit/a25433f805f957dc0beebaeef466aa20f14f8ccc))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d3936161ea0..66f1b6e46d08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.31.2](https://github.com/googleapis/java-datastore/compare/v2.31.1...v2.31.2) (2025-08-08)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.61.0 ([c7bd68d](https://github.com/googleapis/java-datastore/commit/c7bd68de82ec06f06c41cd12e87cc96a337dcd02))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.51.0 ([#1936](https://github.com/googleapis/java-datastore/issues/1936)) ([a25433f](https://github.com/googleapis/java-datastore/commit/a25433f805f957dc0beebaeef466aa20f14f8ccc))
+
 ## [2.31.1](https://github.com/googleapis/java-datastore/compare/v2.31.0...v2.31.1) (2025-07-28)
 
 
diff --git a/README.md b/README.md
index 0c717a8edf3e..36985394f1d5 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.31.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.31.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.2"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 5ed25f1d99be..435f1f903b27 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.31.2-SNAPSHOT
+  2.31.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2-SNAPSHOT
+    2.31.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 997276d4c66a..d59cc5969621 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.31.2-SNAPSHOT
+  2.31.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.2-SNAPSHOT
+        2.31.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.2-SNAPSHOT
+        2.31.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.2-SNAPSHOT
+        0.122.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.2-SNAPSHOT
+        2.31.2
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 2e818d46110b..dc97e7e8ae22 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.2-SNAPSHOT
+    2.31.2
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.2-SNAPSHOT
+        2.31.2
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 3864a672b9dd..ba76ca5444f9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.2-SNAPSHOT
+  2.31.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2-SNAPSHOT
+    2.31.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 63566c6111e3..8fb58c6ca9df 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.31.2-SNAPSHOT
+  2.31.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2-SNAPSHOT
+    2.31.2
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 2e42cb98bb64..3ed25e90557a 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.2-SNAPSHOT
+  2.31.2
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2-SNAPSHOT
+    2.31.2
   
   
     
diff --git a/pom.xml b/pom.xml
index a5d021d027b8..60ad55f16311 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.2-SNAPSHOT
+  2.31.2
   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.31.2-SNAPSHOT
+        2.31.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.2-SNAPSHOT
+        2.31.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.2-SNAPSHOT
+        2.31.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.2-SNAPSHOT
+        0.122.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.2-SNAPSHOT
+        2.31.2
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.2-SNAPSHOT
+        2.31.2
         
           
             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 e14a87033e1b..fa4246a87a79 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.31.2-SNAPSHOT
+  2.31.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2-SNAPSHOT
+    2.31.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1da104841944..8052e6a71a0f 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.122.2-SNAPSHOT
+  0.122.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2-SNAPSHOT
+    2.31.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ad220505582c..1adec068dac3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.2-SNAPSHOT
+      2.31.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 7f92864acfe6..38d1854337b1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.1:2.31.2-SNAPSHOT
-google-cloud-datastore-bom:2.31.1:2.31.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.122.1:0.122.2-SNAPSHOT
-datastore-v1-proto-client:2.31.1:2.31.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.31.1:2.31.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.31.1:2.31.2-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.31.1:2.31.2-SNAPSHOT
+google-cloud-datastore:2.31.2:2.31.2
+google-cloud-datastore-bom:2.31.2:2.31.2
+proto-google-cloud-datastore-v1:0.122.2:0.122.2
+datastore-v1-proto-client:2.31.2:2.31.2
+proto-google-cloud-datastore-admin-v1:2.31.2:2.31.2
+grpc-google-cloud-datastore-admin-v1:2.31.2:2.31.2
+grpc-google-cloud-datastore-v1:2.31.2:2.31.2

From 2b7fed8bd87eee92b81d1e6494f5f3dd0c374d80 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 19 Aug 2025 16:38:48 -0400
Subject: [PATCH 1677/1784] chore: Update generation configuration at Sat Aug
 16 02:30:30 UTC 2025 (#1937)

* chore: Update generation configuration at Sat Aug  9 02:31:56 UTC 2025

* chore: Update generation configuration at Sun Aug 10 02:43:05 UTC 2025

* chore: Update generation configuration at Mon Aug 11 02:41:17 UTC 2025

* chore: Update generation configuration at Tue Aug 12 02:32:03 UTC 2025

* chore: Update generation configuration at Wed Aug 13 02:32:41 UTC 2025

* chore: Update generation configuration at Thu Aug 14 02:34:29 UTC 2025

* chore: Update generation configuration at Fri Aug 15 02:34:47 UTC 2025

* chore: Update generation configuration at Sat Aug 16 02:30:30 UTC 2025

* chore: generate libraries at Sat Aug 16 02:31:01 UTC 2025
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 36985394f1d5..6a921784d4fa 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.65.0')
+implementation platform('com.google.cloud:libraries-bom:26.66.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index d69fd3870509..afe14e179a27 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.61.0
-googleapis_commitish: c5334a83d6966439a2273a4ef64e6779ffba97a1
-libraries_bom_version: 26.65.0
+googleapis_commitish: d869249c5d3da60af39dc7968140468ef7d1fdd6
+libraries_bom_version: 26.66.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From df8bb6905e877f8076a253b5297601b842ffd9cd Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 20 Aug 2025 00:32:50 +0200
Subject: [PATCH 1678/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore to v2.31.2 (#1932)

---
 samples/install-without-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 7fcf9a499107..29d115bec2e3 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.31.0
+      2.31.2
     
     
 

From 30a6e2856ee87568f14bbe94fe5918a4ecea4612 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 20 Aug 2025 17:38:37 +0200
Subject: [PATCH 1679/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.52.0 (#1944)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index bb91570d7484..f65bbad954a6 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.51.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d59cc5969621..bf068b09ed3a 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.51.0
+    3.52.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 60ad55f16311..b40ac0c53c46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.51.0
+    3.52.0
   
 
   

From bc548dcff867773a787596a80fa0f6e27ab727a8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:38:22 +0000
Subject: [PATCH 1680/1784] chore(main): release 2.31.3-SNAPSHOT (#1938)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 README.md                                     |  2 +-
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 6a921784d4fa..dd44356c952b 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 
   com.google.cloud
   google-cloud-datastore
-  2.31.0
+  2.31.2
 
 
 ```
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 435f1f903b27..bc4869411dc1 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.31.2
+  2.31.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2
+    2.31.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index bf068b09ed3a..3d49fb07d8ee 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.31.2
+  2.31.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.2
+        2.31.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.2
+        2.31.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.2
+        0.122.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.2
+        2.31.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index dc97e7e8ae22..3be6f81a01c9 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.2
+    2.31.3-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.2
+        2.31.3-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ba76ca5444f9..d126a94edf35 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.2
+  2.31.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2
+    2.31.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 8fb58c6ca9df..956422022527 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.31.2
+  2.31.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2
+    2.31.3-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 3ed25e90557a..1c0b3604fe51 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.2
+  2.31.3-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2
+    2.31.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index b40ac0c53c46..e5be3069fb83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.2
+  2.31.3-SNAPSHOT
   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.31.2
+        2.31.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.2
+        2.31.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.2
+        2.31.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.2
+        0.122.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.2
+        2.31.3-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.2
+        2.31.3-SNAPSHOT
         
           
             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 fa4246a87a79..aea924ce509b 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.31.2
+  2.31.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2
+    2.31.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 8052e6a71a0f..7b62e559c436 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.122.2
+  0.122.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.2
+    2.31.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1adec068dac3..d9f46702289d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.2
+      2.31.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 38d1854337b1..9460a4072195 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.2:2.31.2
-google-cloud-datastore-bom:2.31.2:2.31.2
-proto-google-cloud-datastore-v1:0.122.2:0.122.2
-datastore-v1-proto-client:2.31.2:2.31.2
-proto-google-cloud-datastore-admin-v1:2.31.2:2.31.2
-grpc-google-cloud-datastore-admin-v1:2.31.2:2.31.2
-grpc-google-cloud-datastore-v1:2.31.2:2.31.2
+google-cloud-datastore:2.31.2:2.31.3-SNAPSHOT
+google-cloud-datastore-bom:2.31.2:2.31.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.122.2:0.122.3-SNAPSHOT
+datastore-v1-proto-client:2.31.2:2.31.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.31.2:2.31.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.31.2:2.31.3-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.31.2:2.31.3-SNAPSHOT

From 4eeeb4fd297bebfb9c5b698a1adcbc0255677273 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 13:17:28 -0400
Subject: [PATCH 1681/1784] chore(main): release 2.31.3 (#1945)

* chore(main): release 2.31.3

* chore: generate libraries at Wed Aug 20 16:39:15 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66f1b6e46d08..883ec4ba20ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.31.3](https://github.com/googleapis/java-datastore/compare/v2.31.2...v2.31.3) (2025-08-20)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.52.0 ([#1944](https://github.com/googleapis/java-datastore/issues/1944)) ([30a6e28](https://github.com/googleapis/java-datastore/commit/30a6e2856ee87568f14bbe94fe5918a4ecea4612))
+
 ## [2.31.2](https://github.com/googleapis/java-datastore/compare/v2.31.1...v2.31.2) (2025-08-08)
 
 
diff --git a/README.md b/README.md
index dd44356c952b..8bc95c0d120c 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.31.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.31.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.3"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index bc4869411dc1..4b2f3c9ace62 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.31.3-SNAPSHOT
+  2.31.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3-SNAPSHOT
+    2.31.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3d49fb07d8ee..38c230af0626 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.31.3-SNAPSHOT
+  2.31.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.3-SNAPSHOT
+        2.31.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.3-SNAPSHOT
+        2.31.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.3-SNAPSHOT
+        0.122.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.3-SNAPSHOT
+        2.31.3
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 3be6f81a01c9..d14f14cb07b5 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.3-SNAPSHOT
+    2.31.3
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.3-SNAPSHOT
+        2.31.3
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d126a94edf35..8710885d1aab 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.3-SNAPSHOT
+  2.31.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3-SNAPSHOT
+    2.31.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 956422022527..ea86874c0a99 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.31.3-SNAPSHOT
+  2.31.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3-SNAPSHOT
+    2.31.3
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 1c0b3604fe51..b0f8102b54d2 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.3-SNAPSHOT
+  2.31.3
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3-SNAPSHOT
+    2.31.3
   
   
     
diff --git a/pom.xml b/pom.xml
index e5be3069fb83..07947b7e6541 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.3-SNAPSHOT
+  2.31.3
   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.31.3-SNAPSHOT
+        2.31.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.3-SNAPSHOT
+        2.31.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.3-SNAPSHOT
+        2.31.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.3-SNAPSHOT
+        0.122.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.3-SNAPSHOT
+        2.31.3
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.3-SNAPSHOT
+        2.31.3
         
           
             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 aea924ce509b..d291ed1da3eb 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.31.3-SNAPSHOT
+  2.31.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3-SNAPSHOT
+    2.31.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 7b62e559c436..5c000f391112 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.122.3-SNAPSHOT
+  0.122.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3-SNAPSHOT
+    2.31.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d9f46702289d..5826c3af7386 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.3-SNAPSHOT
+      2.31.3
     
     
 
diff --git a/versions.txt b/versions.txt
index 9460a4072195..56c383652da9 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.2:2.31.3-SNAPSHOT
-google-cloud-datastore-bom:2.31.2:2.31.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.122.2:0.122.3-SNAPSHOT
-datastore-v1-proto-client:2.31.2:2.31.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.31.2:2.31.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.31.2:2.31.3-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.31.2:2.31.3-SNAPSHOT
+google-cloud-datastore:2.31.3:2.31.3
+google-cloud-datastore-bom:2.31.3:2.31.3
+proto-google-cloud-datastore-v1:0.122.3:0.122.3
+datastore-v1-proto-client:2.31.3:2.31.3
+proto-google-cloud-datastore-admin-v1:2.31.3:2.31.3
+grpc-google-cloud-datastore-admin-v1:2.31.3:2.31.3
+grpc-google-cloud-datastore-v1:2.31.3:2.31.3

From 90f552624627b3ca6fde4b4241b66893019174dd Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:04:06 -0400
Subject: [PATCH 1682/1784] chore: Update generation configuration at Wed Aug
 20 02:29:16 UTC 2025 (#1942)

* chore: Update generation configuration at Wed Aug 20 02:29:16 UTC 2025

* chore: generate libraries at Wed Aug 20 02:29:49 UTC 2025
---
 .github/workflows/hermetic_library_generation.yaml        | 2 +-
 .kokoro/presubmit/graalvm-native-a.cfg                    | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg                    | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg                    | 2 +-
 generation_config.yaml                                    | 4 ++--
 .../datastore/admin/v1/stub/GrpcDatastoreAdminStub.java   | 6 ++++++
 .../google/cloud/datastore/v1/stub/GrpcDatastoreStub.java | 8 ++++++++
 7 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 5a97a438023b..02d55be1f066 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.61.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.62.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 783727ef0104..5816d6107330 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 83c7afee079c..7986fd67310e 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 3a9bbf8c3ab9..acecfce1bfb7 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/generation_config.yaml b/generation_config.yaml
index afe14e179a27..2b812b2c5866 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.61.0
-googleapis_commitish: d869249c5d3da60af39dc7968140468ef7d1fdd6
+gapic_generator_version: 2.62.0
+googleapis_commitish: 3b2a2ae91db23a9c879b2b725d6a5de6bd64a800
 libraries_bom_version: 26.66.0
 libraries:
   - api_shortname: datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
index 1f6e840e014b..2e5f450acf06 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
@@ -63,6 +63,7 @@ public class GrpcDatastoreAdminStub extends DatastoreAdminStub {
               .setRequestMarshaller(
                   ProtoUtils.marshaller(ExportEntitiesRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private static final MethodDescriptor
@@ -73,6 +74,7 @@ public class GrpcDatastoreAdminStub extends DatastoreAdminStub {
               .setRequestMarshaller(
                   ProtoUtils.marshaller(ImportEntitiesRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private static final MethodDescriptor createIndexMethodDescriptor =
@@ -81,6 +83,7 @@ public class GrpcDatastoreAdminStub extends DatastoreAdminStub {
           .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/CreateIndex")
           .setRequestMarshaller(ProtoUtils.marshaller(CreateIndexRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+          .setSampledToLocalTracing(true)
           .build();
 
   private static final MethodDescriptor deleteIndexMethodDescriptor =
@@ -89,6 +92,7 @@ public class GrpcDatastoreAdminStub extends DatastoreAdminStub {
           .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/DeleteIndex")
           .setRequestMarshaller(ProtoUtils.marshaller(DeleteIndexRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+          .setSampledToLocalTracing(true)
           .build();
 
   private static final MethodDescriptor getIndexMethodDescriptor =
@@ -97,6 +101,7 @@ public class GrpcDatastoreAdminStub extends DatastoreAdminStub {
           .setFullMethodName("google.datastore.admin.v1.DatastoreAdmin/GetIndex")
           .setRequestMarshaller(ProtoUtils.marshaller(GetIndexRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Index.getDefaultInstance()))
+          .setSampledToLocalTracing(true)
           .build();
 
   private static final MethodDescriptor
@@ -107,6 +112,7 @@ public class GrpcDatastoreAdminStub extends DatastoreAdminStub {
               .setRequestMarshaller(ProtoUtils.marshaller(ListIndexesRequest.getDefaultInstance()))
               .setResponseMarshaller(
                   ProtoUtils.marshaller(ListIndexesResponse.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private final UnaryCallable exportEntitiesCallable;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
index 48741381607a..d98484faae04 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
@@ -61,6 +61,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
           .setFullMethodName("google.datastore.v1.Datastore/Lookup")
           .setRequestMarshaller(ProtoUtils.marshaller(LookupRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(LookupResponse.getDefaultInstance()))
+          .setSampledToLocalTracing(true)
           .build();
 
   private static final MethodDescriptor
@@ -70,6 +71,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
               .setFullMethodName("google.datastore.v1.Datastore/RunQuery")
               .setRequestMarshaller(ProtoUtils.marshaller(RunQueryRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(RunQueryResponse.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private static final MethodDescriptor
@@ -81,6 +83,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
                   ProtoUtils.marshaller(RunAggregationQueryRequest.getDefaultInstance()))
               .setResponseMarshaller(
                   ProtoUtils.marshaller(RunAggregationQueryResponse.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private static final MethodDescriptor
@@ -92,6 +95,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
                   ProtoUtils.marshaller(BeginTransactionRequest.getDefaultInstance()))
               .setResponseMarshaller(
                   ProtoUtils.marshaller(BeginTransactionResponse.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private static final MethodDescriptor commitMethodDescriptor =
@@ -100,6 +104,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
           .setFullMethodName("google.datastore.v1.Datastore/Commit")
           .setRequestMarshaller(ProtoUtils.marshaller(CommitRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(CommitResponse.getDefaultInstance()))
+          .setSampledToLocalTracing(true)
           .build();
 
   private static final MethodDescriptor
@@ -109,6 +114,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
               .setFullMethodName("google.datastore.v1.Datastore/Rollback")
               .setRequestMarshaller(ProtoUtils.marshaller(RollbackRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(RollbackResponse.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private static final MethodDescriptor
@@ -119,6 +125,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
               .setRequestMarshaller(ProtoUtils.marshaller(AllocateIdsRequest.getDefaultInstance()))
               .setResponseMarshaller(
                   ProtoUtils.marshaller(AllocateIdsResponse.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private static final MethodDescriptor
@@ -128,6 +135,7 @@ public class GrpcDatastoreStub extends DatastoreStub {
               .setFullMethodName("google.datastore.v1.Datastore/ReserveIds")
               .setRequestMarshaller(ProtoUtils.marshaller(ReserveIdsRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(ReserveIdsResponse.getDefaultInstance()))
+              .setSampledToLocalTracing(true)
               .build();
 
   private final UnaryCallable lookupCallable;

From 3121949096868360dd296844ce0129b3b0e3e08a Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:43:44 -0400
Subject: [PATCH 1683/1784] chore: Update generation configuration at Thu Aug
 21 02:30:12 UTC 2025 (#1948)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 2b812b2c5866..0a65fae14fdf 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.62.0
-googleapis_commitish: 3b2a2ae91db23a9c879b2b725d6a5de6bd64a800
+googleapis_commitish: 677d8cb377ca9b60ee4552bfcd607cc01b15a46e
 libraries_bom_version: 26.66.0
 libraries:
   - api_shortname: datastore

From f261a2a2a3f6680ec95fed30f77ca8e4489c0e9b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 21 Aug 2025 14:58:42 -0700
Subject: [PATCH 1684/1784] chore(main): release 2.31.4-SNAPSHOT (#1946)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 4b2f3c9ace62..dc4fed4b2d18 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.31.3
+  2.31.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3
+    2.31.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 38c230af0626..e8c734f26832 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.31.3
+  2.31.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.3
+        2.31.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.3
+        2.31.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.3
+        0.122.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.3
+        2.31.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index d14f14cb07b5..04939967781c 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.3
+    2.31.4-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.3
+        2.31.4-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 8710885d1aab..2f1b0dfffeb9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.3
+  2.31.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3
+    2.31.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index ea86874c0a99..614131b35deb 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.31.3
+  2.31.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3
+    2.31.4-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index b0f8102b54d2..0ec9368390d5 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.3
+  2.31.4-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3
+    2.31.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 07947b7e6541..6810ab1adaaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.3
+  2.31.4-SNAPSHOT
   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.31.3
+        2.31.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.3
+        2.31.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.3
+        2.31.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.3
+        0.122.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.3
+        2.31.4-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.3
+        2.31.4-SNAPSHOT
         
           
             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 d291ed1da3eb..f77e4d1d17a8 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.31.3
+  2.31.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3
+    2.31.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 5c000f391112..1c636cefdeff 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.122.3
+  0.122.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.3
+    2.31.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5826c3af7386..1ada2b7b4353 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.3
+      2.31.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 56c383652da9..a415cdbf417b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.3:2.31.3
-google-cloud-datastore-bom:2.31.3:2.31.3
-proto-google-cloud-datastore-v1:0.122.3:0.122.3
-datastore-v1-proto-client:2.31.3:2.31.3
-proto-google-cloud-datastore-admin-v1:2.31.3:2.31.3
-grpc-google-cloud-datastore-admin-v1:2.31.3:2.31.3
-grpc-google-cloud-datastore-v1:2.31.3:2.31.3
+google-cloud-datastore:2.31.3:2.31.4-SNAPSHOT
+google-cloud-datastore-bom:2.31.3:2.31.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.122.3:0.122.4-SNAPSHOT
+datastore-v1-proto-client:2.31.3:2.31.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.31.3:2.31.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.31.3:2.31.4-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.31.3:2.31.4-SNAPSHOT

From f7cf8ac3a295812ddc0a8bd4b1ba478d02665236 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 21 Aug 2025 23:59:03 +0200
Subject: [PATCH 1685/1784] chore(deps): update dependency
 com.google.cloud:google-cloud-datastore-utils to v2.31.2 (#1941)

Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6810ab1adaaf..e6580d61857a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
       
         com.google.cloud
         google-cloud-datastore-utils
-        2.31.0
+        2.31.2
       
       
         com.google.cloud.datastore

From 00516b9ea554c447b12b593dee122ec401b80cd4 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 22 Aug 2025 12:21:29 -0400
Subject: [PATCH 1686/1784] chore: Update generation configuration at Fri Aug
 22 02:30:11 UTC 2025 (#1951)

---
 generation_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generation_config.yaml b/generation_config.yaml
index 0a65fae14fdf..cfad63c0e9c5 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,5 +1,5 @@
 gapic_generator_version: 2.62.0
-googleapis_commitish: 677d8cb377ca9b60ee4552bfcd607cc01b15a46e
+googleapis_commitish: 7c4d9e72e01e7edfc55b5aefa8a86643a5a9799b
 libraries_bom_version: 26.66.0
 libraries:
   - api_shortname: datastore

From 21aee1500ddd23d6df3722ecde16f156538bd1cb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 22 Aug 2025 21:52:24 +0000
Subject: [PATCH 1687/1784] chore(main): release 2.31.4 (#1949)

:robot: I have created a release *beep* *boop*
---


## [2.31.4](https://togithub.com/googleapis/java-datastore/compare/v2.31.3...v2.31.4) (2025-08-22)


### Bug Fixes

* **deps:** Update the Java code generator (gapic-generator-java) to 2.62.0 ([90f5526](https://togithub.com/googleapis/java-datastore/commit/90f552624627b3ca6fde4b4241b66893019174dd))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 883ec4ba20ab..974e7a1bdabd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.31.4](https://github.com/googleapis/java-datastore/compare/v2.31.3...v2.31.4) (2025-08-22)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.62.0 ([90f5526](https://github.com/googleapis/java-datastore/commit/90f552624627b3ca6fde4b4241b66893019174dd))
+
 ## [2.31.3](https://github.com/googleapis/java-datastore/compare/v2.31.2...v2.31.3) (2025-08-20)
 
 
diff --git a/README.md b/README.md
index 8bc95c0d120c..0dea67818ac8 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.31.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.31.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.4"
 ```
 
 ## Authentication
@@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.4
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index dc4fed4b2d18..842a2e4d56cb 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.31.4-SNAPSHOT
+  2.31.4
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4-SNAPSHOT
+    2.31.4
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index e8c734f26832..ecd7f04736bd 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.31.4-SNAPSHOT
+  2.31.4
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.4-SNAPSHOT
+        2.31.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.4-SNAPSHOT
+        2.31.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.4-SNAPSHOT
+        0.122.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.4-SNAPSHOT
+        2.31.4
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 04939967781c..edcc7e21714d 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.4-SNAPSHOT
+    2.31.4
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.4-SNAPSHOT
+        2.31.4
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 2f1b0dfffeb9..5b151d18bbc6 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.4-SNAPSHOT
+  2.31.4
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4-SNAPSHOT
+    2.31.4
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 614131b35deb..97655560f6a1 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.31.4-SNAPSHOT
+  2.31.4
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4-SNAPSHOT
+    2.31.4
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 0ec9368390d5..49ef533f221d 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.4-SNAPSHOT
+  2.31.4
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4-SNAPSHOT
+    2.31.4
   
   
     
diff --git a/pom.xml b/pom.xml
index e6580d61857a..991c349f4ada 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.4-SNAPSHOT
+  2.31.4
   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.31.4-SNAPSHOT
+        2.31.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.4-SNAPSHOT
+        2.31.4
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.4-SNAPSHOT
+        2.31.4
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.4-SNAPSHOT
+        0.122.4
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.4-SNAPSHOT
+        2.31.4
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.4-SNAPSHOT
+        2.31.4
         
           
             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 f77e4d1d17a8..d81596d70f91 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.31.4-SNAPSHOT
+  2.31.4
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4-SNAPSHOT
+    2.31.4
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1c636cefdeff..1f00ced9c659 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.122.4-SNAPSHOT
+  0.122.4
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4-SNAPSHOT
+    2.31.4
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 1ada2b7b4353..efb6603de755 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.4-SNAPSHOT
+      2.31.4
     
     
 
diff --git a/versions.txt b/versions.txt
index a415cdbf417b..4c91c312f7fa 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.3:2.31.4-SNAPSHOT
-google-cloud-datastore-bom:2.31.3:2.31.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.122.3:0.122.4-SNAPSHOT
-datastore-v1-proto-client:2.31.3:2.31.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.31.3:2.31.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.31.3:2.31.4-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.31.3:2.31.4-SNAPSHOT
+google-cloud-datastore:2.31.4:2.31.4
+google-cloud-datastore-bom:2.31.4:2.31.4
+proto-google-cloud-datastore-v1:0.122.4:0.122.4
+datastore-v1-proto-client:2.31.4:2.31.4
+proto-google-cloud-datastore-admin-v1:2.31.4:2.31.4
+grpc-google-cloud-datastore-admin-v1:2.31.4:2.31.4
+grpc-google-cloud-datastore-v1:2.31.4:2.31.4

From 57981db8fb73f35bf72a9c1c5d53bd06dedf0ebc Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:20:34 -0700
Subject: [PATCH 1688/1784] feat: Add sample code for connection pooling
 (#1947)

* feat: Add sample code for connection pooling

* Fix header

* chore: generate libraries at Wed Aug 20 23:03:06 UTC 2025

---------

Co-authored-by: cloud-java-bot 
---
 README.md                                     |  1 +
 .../datastore/ConfigureConnectionPool.java    | 61 +++++++++++++++++++
 .../datastore/ConfigureConnectionPoolIT.java  | 39 ++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java
 create mode 100644 samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java

diff --git a/README.md b/README.md
index 0dea67818ac8..3e5af25c05d0 100644
--- a/README.md
+++ b/README.md
@@ -363,6 +363,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre
 
 | Sample                      | Source Code                       | Try it |
 | --------------------------- | --------------------------------- | ------ |
+| Configure Connection Pool | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java) |
 | Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
 | Avg Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) |
 | Avg Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) |
diff --git a/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java b/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java
new file mode 100644
index 000000000000..a9459e8041ef
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 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.example.datastore;
+
+// [START datastore_configure_connection_pool]
+
+import com.google.api.gax.grpc.ChannelPoolSettings;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.v1.DatastoreSettings;
+import com.google.cloud.grpc.GrpcTransportOptions;
+
+public class ConfigureConnectionPool {
+
+  public static void main(String... args) throws Exception {
+    InstantiatingGrpcChannelProvider channelProvider =
+        DatastoreSettings.defaultGrpcTransportProviderBuilder()
+            .setChannelPoolSettings(
+                ChannelPoolSettings.builder()
+                    .setInitialChannelCount(10)
+                    .setMinChannelCount(5)
+                    .setMaxChannelCount(200)
+                    .build())
+            .build();
+
+    DatastoreOptions datastoreOptions =
+        DatastoreOptions.newBuilder()
+            .setProjectId("my-project")
+            .setChannelProvider(channelProvider)
+            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .build();
+
+    ChannelPoolSettings channelPoolSettings =
+        ((InstantiatingGrpcChannelProvider) datastoreOptions.getTransportChannelProvider())
+            .getChannelPoolSettings();
+
+    System.out.printf(
+        String.format(
+            "Connected with pool with InitialChannelCount: %d, MinChannelCount: %d,"
+                + " MaxChannelCount: %d",
+            channelPoolSettings.getInitialChannelCount(),
+            channelPoolSettings.getMinChannelCount(),
+            channelPoolSettings.getMaxChannelCount()));
+  }
+}
+
+// [END datastore_configure_connection_pool]
diff --git a/samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java b/samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java
new file mode 100644
index 000000000000..40b22c89d42a
--- /dev/null
+++ b/samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 Google Inc.
+ *
+ * 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.example.datastore;
+
+import com.rule.SystemsOutRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for ConfigureConnectionPool sample. */
+@RunWith(JUnit4.class)
+@SuppressWarnings("checkstyle:abbreviationaswordinname")
+public class ConfigureConnectionPoolIT {
+
+  @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule();
+
+  @Test
+  public void testConfigureConnectionPool() throws Exception {
+    ConfigureConnectionPool.main();
+    systemsOutRule.assertContains(
+        "Connected with pool with InitialChannelCount: 10, MinChannelCount: 5, MaxChannelCount:"
+            + " 200");
+  }
+}

From 283cfeb6fd8ace82dd551c276740735da1ad9765 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Fri, 5 Sep 2025 15:31:06 -0400
Subject: [PATCH 1689/1784] chore: Update generation configuration at Fri Sep 
 5 02:27:13 UTC 2025 (#1953)

* chore: Update generation configuration at Sat Aug 23 02:27:57 UTC 2025

* chore: Update generation configuration at Tue Aug 26 02:30:07 UTC 2025

* chore: Update generation configuration at Wed Aug 27 02:27:42 UTC 2025

* chore: Update generation configuration at Thu Aug 28 02:27:45 UTC 2025

* chore: Update generation configuration at Fri Aug 29 02:27:49 UTC 2025

* chore: generate libraries at Fri Aug 29 02:28:22 UTC 2025

* chore: Update generation configuration at Sat Aug 30 02:25:07 UTC 2025

* chore: Update generation configuration at Wed Sep  3 02:24:24 UTC 2025

* chore: Update generation configuration at Thu Sep  4 02:24:43 UTC 2025

* chore: Update generation configuration at Fri Sep  5 02:27:13 UTC 2025
---
 README.md              | 2 +-
 generation_config.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3e5af25c05d0..6ee862f5c403 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.66.0')
+implementation platform('com.google.cloud:libraries-bom:26.67.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index cfad63c0e9c5..a216b9efa76a 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
 gapic_generator_version: 2.62.0
-googleapis_commitish: 7c4d9e72e01e7edfc55b5aefa8a86643a5a9799b
-libraries_bom_version: 26.66.0
+googleapis_commitish: a6fb279349101a2e53aaad4c9f02c57871812153
+libraries_bom_version: 26.67.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 5d1c2626da9fe7ceb7ee14b8261e2e70957b9d3c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 12 Sep 2025 10:23:29 -0700
Subject: [PATCH 1690/1784] chore(main): release 2.31.5-SNAPSHOT (#1952)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 842a2e4d56cb..86a17e81c223 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.31.4
+  2.31.5-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4
+    2.31.5-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ecd7f04736bd..a37525797ab9 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.31.4
+  2.31.5-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.4
+        2.31.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.4
+        2.31.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.4
+        0.122.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.4
+        2.31.5-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index edcc7e21714d..8c05dc87650b 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.4
+    2.31.5-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.4
+        2.31.5-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 5b151d18bbc6..85742d3ebbea 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.4
+  2.31.5-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4
+    2.31.5-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 97655560f6a1..c19f98dd2753 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.31.4
+  2.31.5-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4
+    2.31.5-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 49ef533f221d..2e753d643b95 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.4
+  2.31.5-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4
+    2.31.5-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 991c349f4ada..d8a49c75d998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.4
+  2.31.5-SNAPSHOT
   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.31.4
+        2.31.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.4
+        2.31.5-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.4
+        2.31.5-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.4
+        0.122.5-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.4
+        2.31.5-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.4
+        2.31.5-SNAPSHOT
         
           
             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 d81596d70f91..0b08bb9b6ec0 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.31.4
+  2.31.5-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4
+    2.31.5-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1f00ced9c659..76fb0dde9df9 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.122.4
+  0.122.5-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.4
+    2.31.5-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index efb6603de755..09e7c3150a8e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.4
+      2.31.5-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 4c91c312f7fa..db6a12b01463 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.4:2.31.4
-google-cloud-datastore-bom:2.31.4:2.31.4
-proto-google-cloud-datastore-v1:0.122.4:0.122.4
-datastore-v1-proto-client:2.31.4:2.31.4
-proto-google-cloud-datastore-admin-v1:2.31.4:2.31.4
-grpc-google-cloud-datastore-admin-v1:2.31.4:2.31.4
-grpc-google-cloud-datastore-v1:2.31.4:2.31.4
+google-cloud-datastore:2.31.4:2.31.5-SNAPSHOT
+google-cloud-datastore-bom:2.31.4:2.31.5-SNAPSHOT
+proto-google-cloud-datastore-v1:0.122.4:0.122.5-SNAPSHOT
+datastore-v1-proto-client:2.31.4:2.31.5-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.31.4:2.31.5-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.31.4:2.31.5-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.31.4:2.31.5-SNAPSHOT

From 833a34a7e5ab1194d2ac8ebf097d7c300d7e8d37 Mon Sep 17 00:00:00 2001
From: Blake Li 
Date: Fri, 12 Sep 2025 15:29:49 -0400
Subject: [PATCH 1691/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.52.1 (#1963)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.52.1

* Update pom.xml

* Update unmanaged_dependency_check.yaml
---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index f65bbad954a6..4b7a65657ed2 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a37525797ab9..6fa89e45c200 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.0
+    3.52.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index d8a49c75d998..1a7b130c9ad7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.0
+    3.52.1
   
 
   

From a16b2498589ac1050881b0d6d6e720316305c91e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 12 Sep 2025 16:15:42 -0400
Subject: [PATCH 1692/1784] chore(main): release 2.32.0 (#1962)

* chore(main): release 2.32.0

* chore: generate libraries at Fri Sep 12 19:30:42 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974e7a1bdabd..5310c3abf96c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.32.0](https://github.com/googleapis/java-datastore/compare/v2.31.4...v2.32.0) (2025-09-12)
+
+
+### Features
+
+* Add sample code for connection pooling ([#1947](https://github.com/googleapis/java-datastore/issues/1947)) ([57981db](https://github.com/googleapis/java-datastore/commit/57981db8fb73f35bf72a9c1c5d53bd06dedf0ebc))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.52.1 ([#1963](https://github.com/googleapis/java-datastore/issues/1963)) ([833a34a](https://github.com/googleapis/java-datastore/commit/833a34a7e5ab1194d2ac8ebf097d7c300d7e8d37))
+
 ## [2.31.4](https://github.com/googleapis/java-datastore/compare/v2.31.3...v2.31.4) (2025-08-22)
 
 
diff --git a/README.md b/README.md
index 6ee862f5c403..087df5f5fff9 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.31.4'
+implementation 'com.google.cloud:google-cloud-datastore:2.32.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.0"
 ```
 
 ## Authentication
@@ -493,7 +493,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.4
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 86a17e81c223..7ef18667452b 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.31.5-SNAPSHOT
+  2.32.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.5-SNAPSHOT
+    2.32.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6fa89e45c200..ffde0fe89d58 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.31.5-SNAPSHOT
+  2.32.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.31.5-SNAPSHOT
+        2.32.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.5-SNAPSHOT
+        2.32.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.5-SNAPSHOT
+        0.123.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.31.5-SNAPSHOT
+        2.32.0
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 8c05dc87650b..826f18f0e75d 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.31.5-SNAPSHOT
+    2.32.0
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.31.5-SNAPSHOT
+        2.32.0
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 85742d3ebbea..ddedc9ec8f0f 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.31.5-SNAPSHOT
+  2.32.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.5-SNAPSHOT
+    2.32.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 c19f98dd2753..649dfd748d48 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.31.5-SNAPSHOT
+  2.32.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.5-SNAPSHOT
+    2.32.0
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 2e753d643b95..c9be75ff687c 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.31.5-SNAPSHOT
+  2.32.0
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.5-SNAPSHOT
+    2.32.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 1a7b130c9ad7..617e919fe7c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.31.5-SNAPSHOT
+  2.32.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.31.5-SNAPSHOT
+        2.32.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.31.5-SNAPSHOT
+        2.32.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.31.5-SNAPSHOT
+        2.32.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.122.5-SNAPSHOT
+        0.123.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.31.5-SNAPSHOT
+        2.32.0
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.31.5-SNAPSHOT
+        2.32.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 0b08bb9b6ec0..9fe1e378c6e1 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.31.5-SNAPSHOT
+  2.32.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.5-SNAPSHOT
+    2.32.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 76fb0dde9df9..9687745d2b3b 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.122.5-SNAPSHOT
+  0.123.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.31.5-SNAPSHOT
+    2.32.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 09e7c3150a8e..fcbb5ee37ce5 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.31.5-SNAPSHOT
+      2.32.0
     
     
 
diff --git a/versions.txt b/versions.txt
index db6a12b01463..b27cd80811a3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.31.4:2.31.5-SNAPSHOT
-google-cloud-datastore-bom:2.31.4:2.31.5-SNAPSHOT
-proto-google-cloud-datastore-v1:0.122.4:0.122.5-SNAPSHOT
-datastore-v1-proto-client:2.31.4:2.31.5-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.31.4:2.31.5-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.31.4:2.31.5-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.31.4:2.31.5-SNAPSHOT
+google-cloud-datastore:2.32.0:2.32.0
+google-cloud-datastore-bom:2.32.0:2.32.0
+proto-google-cloud-datastore-v1:0.123.0:0.123.0
+datastore-v1-proto-client:2.32.0:2.32.0
+proto-google-cloud-datastore-admin-v1:2.32.0:2.32.0
+grpc-google-cloud-datastore-admin-v1:2.32.0:2.32.0
+grpc-google-cloud-datastore-v1:2.32.0:2.32.0

From d02c2b1e1d1ad2578a5b979099785713a22910a8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 12 Sep 2025 20:34:26 +0000
Subject: [PATCH 1693/1784] chore(main): release 2.32.1-SNAPSHOT (#1964)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 7ef18667452b..60b280c46a74 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.32.0
+  2.32.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.0
+    2.32.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index ffde0fe89d58..8cc637a0816b 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.32.0
+  2.32.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.0
+        2.32.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.0
+        2.32.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.0
+        0.123.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.0
+        2.32.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 826f18f0e75d..382d3d7a6515 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.0
+    2.32.1-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.0
+        2.32.1-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index ddedc9ec8f0f..d0ede71e5c50 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.0
+  2.32.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.0
+    2.32.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 649dfd748d48..94e87e3cde46 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.32.0
+  2.32.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.0
+    2.32.1-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index c9be75ff687c..11e148a26c4b 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.0
+  2.32.1-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.0
+    2.32.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 617e919fe7c5..9817d5f6544a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.0
+  2.32.1-SNAPSHOT
   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.32.0
+        2.32.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.0
+        2.32.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.0
+        2.32.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.0
+        0.123.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.0
+        2.32.1-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.0
+        2.32.1-SNAPSHOT
         
           
             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 9fe1e378c6e1..d2833eff4fa1 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.32.0
+  2.32.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.0
+    2.32.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 9687745d2b3b..f75d7262add4 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.123.0
+  0.123.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.0
+    2.32.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index fcbb5ee37ce5..777c2a8be80e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.0
+      2.32.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index b27cd80811a3..841d258b23ff 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.0:2.32.0
-google-cloud-datastore-bom:2.32.0:2.32.0
-proto-google-cloud-datastore-v1:0.123.0:0.123.0
-datastore-v1-proto-client:2.32.0:2.32.0
-proto-google-cloud-datastore-admin-v1:2.32.0:2.32.0
-grpc-google-cloud-datastore-admin-v1:2.32.0:2.32.0
-grpc-google-cloud-datastore-v1:2.32.0:2.32.0
+google-cloud-datastore:2.32.0:2.32.1-SNAPSHOT
+google-cloud-datastore-bom:2.32.0:2.32.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.123.0:0.123.1-SNAPSHOT
+datastore-v1-proto-client:2.32.0:2.32.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.32.0:2.32.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.32.0:2.32.1-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.32.0:2.32.1-SNAPSHOT

From 22434714d50d9da1c6034bf9dbec745a62abc731 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Fri, 26 Sep 2025 20:08:30 +0100
Subject: [PATCH 1694/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.52.2 (#1969)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 4b7a65657ed2..d3ebc84e1381 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.2
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 8cc637a0816b..2ed99d16c18a 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.1
+    3.52.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 9817d5f6544a..bd80de6cce9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.1
+    3.52.2
   
 
   

From 6e99826a0440bb3552aaf2c4e8b8ffa44ef76f53 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 29 Sep 2025 13:56:26 -0400
Subject: [PATCH 1695/1784] chore(main): release 2.32.1 (#1970)

* chore(main): release 2.32.1

* chore: generate libraries at Fri Sep 26 19:09:27 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5310c3abf96c..1d00ba2bc6bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.32.1](https://github.com/googleapis/java-datastore/compare/v2.32.0...v2.32.1) (2025-09-26)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.52.2 ([#1969](https://github.com/googleapis/java-datastore/issues/1969)) ([2243471](https://github.com/googleapis/java-datastore/commit/22434714d50d9da1c6034bf9dbec745a62abc731))
+
 ## [2.32.0](https://github.com/googleapis/java-datastore/compare/v2.31.4...v2.32.0) (2025-09-12)
 
 
diff --git a/README.md b/README.md
index 087df5f5fff9..f69972984511 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.32.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.32.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.1"
 ```
 
 ## Authentication
@@ -493,7 +493,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 60b280c46a74..c414f481d063 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.32.1-SNAPSHOT
+  2.32.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1-SNAPSHOT
+    2.32.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 2ed99d16c18a..de065aefb770 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.32.1-SNAPSHOT
+  2.32.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.1-SNAPSHOT
+        2.32.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.1-SNAPSHOT
+        2.32.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.1-SNAPSHOT
+        0.123.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.1-SNAPSHOT
+        2.32.1
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 382d3d7a6515..da1786d51e2b 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.1-SNAPSHOT
+    2.32.1
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.1-SNAPSHOT
+        2.32.1
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d0ede71e5c50..d9555d21cbb2 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.1-SNAPSHOT
+  2.32.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1-SNAPSHOT
+    2.32.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 94e87e3cde46..f94d11778b77 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.32.1-SNAPSHOT
+  2.32.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1-SNAPSHOT
+    2.32.1
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 11e148a26c4b..bf159e843f17 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.1-SNAPSHOT
+  2.32.1
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1-SNAPSHOT
+    2.32.1
   
   
     
diff --git a/pom.xml b/pom.xml
index bd80de6cce9e..804337201f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.1-SNAPSHOT
+  2.32.1
   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.32.1-SNAPSHOT
+        2.32.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.1-SNAPSHOT
+        2.32.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.1-SNAPSHOT
+        2.32.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.1-SNAPSHOT
+        0.123.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.1-SNAPSHOT
+        2.32.1
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.1-SNAPSHOT
+        2.32.1
         
           
             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 d2833eff4fa1..068d2a0f9042 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.32.1-SNAPSHOT
+  2.32.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1-SNAPSHOT
+    2.32.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f75d7262add4..47866196841d 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.123.1-SNAPSHOT
+  0.123.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1-SNAPSHOT
+    2.32.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 777c2a8be80e..6c8f17057873 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.1-SNAPSHOT
+      2.32.1
     
     
 
diff --git a/versions.txt b/versions.txt
index 841d258b23ff..73079c9646aa 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.0:2.32.1-SNAPSHOT
-google-cloud-datastore-bom:2.32.0:2.32.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.123.0:0.123.1-SNAPSHOT
-datastore-v1-proto-client:2.32.0:2.32.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.32.0:2.32.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.32.0:2.32.1-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.32.0:2.32.1-SNAPSHOT
+google-cloud-datastore:2.32.1:2.32.1
+google-cloud-datastore-bom:2.32.1:2.32.1
+proto-google-cloud-datastore-v1:0.123.1:0.123.1
+datastore-v1-proto-client:2.32.1:2.32.1
+proto-google-cloud-datastore-admin-v1:2.32.1:2.32.1
+grpc-google-cloud-datastore-admin-v1:2.32.1:2.32.1
+grpc-google-cloud-datastore-v1:2.32.1:2.32.1

From 141ec943cd6e619a64a48e14053119aeb5238817 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Sat, 4 Oct 2025 02:37:57 +0100
Subject: [PATCH 1696/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.52.3 (#1973)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index d3ebc84e1381..fb94c1a62cea 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.2
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.3
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index de065aefb770..99703bcdb3f2 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.2
+    3.52.3
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 804337201f82..6b81ce5baffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.2
+    3.52.3
   
 
   

From 4e52aec210e9e7edf7beddcb5efceec84e3abe8c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 22:05:23 -0400
Subject: [PATCH 1697/1784] chore(main): release 2.32.2-SNAPSHOT (#1971)

Merge pull request #1971 from googleapis/java-datastore
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index c414f481d063..9c401d0ef551 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.32.1
+  2.32.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1
+    2.32.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 99703bcdb3f2..3dbdc67f390d 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.32.1
+  2.32.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.1
+        2.32.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.1
+        2.32.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.1
+        0.123.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.1
+        2.32.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index da1786d51e2b..14ee33f53abf 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.1
+    2.32.2-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.1
+        2.32.2-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index d9555d21cbb2..445fb0a808c1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.1
+  2.32.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1
+    2.32.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f94d11778b77..12663d4404d4 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.32.1
+  2.32.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1
+    2.32.2-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index bf159e843f17..5c63608f0413 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.1
+  2.32.2-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1
+    2.32.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 6b81ce5baffa..dde7af7f6bd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.1
+  2.32.2-SNAPSHOT
   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.32.1
+        2.32.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.1
+        2.32.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.1
+        2.32.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.1
+        0.123.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.1
+        2.32.2-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.1
+        2.32.2-SNAPSHOT
         
           
             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 068d2a0f9042..a0173c65af50 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.32.1
+  2.32.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1
+    2.32.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 47866196841d..f5f923e05e23 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.123.1
+  0.123.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.1
+    2.32.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 6c8f17057873..7b78825be242 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.1
+      2.32.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 73079c9646aa..ae3c1f0de98b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.1:2.32.1
-google-cloud-datastore-bom:2.32.1:2.32.1
-proto-google-cloud-datastore-v1:0.123.1:0.123.1
-datastore-v1-proto-client:2.32.1:2.32.1
-proto-google-cloud-datastore-admin-v1:2.32.1:2.32.1
-grpc-google-cloud-datastore-admin-v1:2.32.1:2.32.1
-grpc-google-cloud-datastore-v1:2.32.1:2.32.1
+google-cloud-datastore:2.32.1:2.32.2-SNAPSHOT
+google-cloud-datastore-bom:2.32.1:2.32.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.123.1:0.123.2-SNAPSHOT
+datastore-v1-proto-client:2.32.1:2.32.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.32.1:2.32.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.32.1:2.32.2-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.32.1:2.32.2-SNAPSHOT

From a74c7532595d3f527ae153daa9fdce5a8cb5e12e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 22:33:15 -0400
Subject: [PATCH 1698/1784] chore(main): release 2.32.2 (#1974)

* chore(main): release 2.32.2

* chore: generate libraries at Sat Oct  4 02:06:14 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  |  7 +++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d00ba2bc6bc..94d5c807c609 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.32.2](https://github.com/googleapis/java-datastore/compare/v2.32.1...v2.32.2) (2025-10-04)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.52.3 ([#1973](https://github.com/googleapis/java-datastore/issues/1973)) ([141ec94](https://github.com/googleapis/java-datastore/commit/141ec943cd6e619a64a48e14053119aeb5238817))
+
 ## [2.32.1](https://github.com/googleapis/java-datastore/compare/v2.32.0...v2.32.1) (2025-09-26)
 
 
diff --git a/README.md b/README.md
index f69972984511..87e8a2242959 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.32.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.32.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.2"
 ```
 
 ## Authentication
@@ -493,7 +493,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 9c401d0ef551..3bf53a81a0b1 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.32.2-SNAPSHOT
+  2.32.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2-SNAPSHOT
+    2.32.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3dbdc67f390d..580518944266 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.32.2-SNAPSHOT
+  2.32.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.2-SNAPSHOT
+        2.32.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.2-SNAPSHOT
+        2.32.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.2-SNAPSHOT
+        0.123.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.2-SNAPSHOT
+        2.32.2
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 14ee33f53abf..1f7db2b1efaa 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.2-SNAPSHOT
+    2.32.2
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.2-SNAPSHOT
+        2.32.2
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 445fb0a808c1..cc0cff5fc9cf 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.2-SNAPSHOT
+  2.32.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2-SNAPSHOT
+    2.32.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 12663d4404d4..7baeb736e133 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.32.2-SNAPSHOT
+  2.32.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2-SNAPSHOT
+    2.32.2
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 5c63608f0413..c656b0f13fc7 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.2-SNAPSHOT
+  2.32.2
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2-SNAPSHOT
+    2.32.2
   
   
     
diff --git a/pom.xml b/pom.xml
index dde7af7f6bd3..c0eacdca4de9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.2-SNAPSHOT
+  2.32.2
   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.32.2-SNAPSHOT
+        2.32.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.2-SNAPSHOT
+        2.32.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.2-SNAPSHOT
+        2.32.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.2-SNAPSHOT
+        0.123.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.2-SNAPSHOT
+        2.32.2
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.2-SNAPSHOT
+        2.32.2
         
           
             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 a0173c65af50..40d4d3b0c753 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.32.2-SNAPSHOT
+  2.32.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2-SNAPSHOT
+    2.32.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f5f923e05e23..483b0f6966e8 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.123.2-SNAPSHOT
+  0.123.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2-SNAPSHOT
+    2.32.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7b78825be242..78ea99ecd7aa 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.2-SNAPSHOT
+      2.32.2
     
     
 
diff --git a/versions.txt b/versions.txt
index ae3c1f0de98b..02ceafdb4a96 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.1:2.32.2-SNAPSHOT
-google-cloud-datastore-bom:2.32.1:2.32.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.123.1:0.123.2-SNAPSHOT
-datastore-v1-proto-client:2.32.1:2.32.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.32.1:2.32.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.32.1:2.32.2-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.32.1:2.32.2-SNAPSHOT
+google-cloud-datastore:2.32.2:2.32.2
+google-cloud-datastore-bom:2.32.2:2.32.2
+proto-google-cloud-datastore-v1:0.123.2:0.123.2
+datastore-v1-proto-client:2.32.2:2.32.2
+proto-google-cloud-datastore-admin-v1:2.32.2:2.32.2
+grpc-google-cloud-datastore-admin-v1:2.32.2:2.32.2
+grpc-google-cloud-datastore-v1:2.32.2:2.32.2

From c57e76e7465bdf7857e7dc725984dccf60bbb3e2 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:14:25 -0400
Subject: [PATCH 1699/1784] chore: add JDK 25 to the CI (#1976)

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2192f032d2d3..442c25800cc8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21]
+        java: [11, 17, 21, 25]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4

From 1520b7c4ac51139c1c8809a4ead990d558f6c705 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Mon, 20 Oct 2025 18:33:04 +0100
Subject: [PATCH 1700/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.53.0 (#1980)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index fb94c1a62cea..aa7dbb945ca8 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.3
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.53.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 580518944266..0e927b97e7ef 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.3
+    3.53.0
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index c0eacdca4de9..811d6b1149b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.52.3
+    3.53.0
   
 
   

From b9b95cb0b08ec393f714f885e511443c1e044a0e Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Mon, 20 Oct 2025 14:14:46 -0400
Subject: [PATCH 1701/1784] chore: Update generation configuration at Sun Oct
 19 02:31:07 UTC 2025 (#1957)

Co-authored-by: Lawrence Qiu 
---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 .kokoro/presubmit/graalvm-native-a.cfg             | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg             | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg             | 2 +-
 README.md                                          | 2 +-
 generation_config.yaml                             | 6 +++---
 renovate.json                                      | 4 +++-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 02d55be1f066..a1d9c6a9f2a0 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.62.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.63.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 5816d6107330..55c5543e2605 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 7986fd67310e..5c981b984828 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index acecfce1bfb7..f2032499dff9 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index 87e8a2242959..f577619ae295 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.67.0')
+implementation platform('com.google.cloud:libraries-bom:26.70.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index a216b9efa76a..d19af969a7aa 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.62.0
-googleapis_commitish: a6fb279349101a2e53aaad4c9f02c57871812153
-libraries_bom_version: 26.67.0
+gapic_generator_version: 2.63.0
+googleapis_commitish: c288189b43c016dd3cf1ec73ce3cadee8b732f07
+libraries_bom_version: 26.70.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore
diff --git a/renovate.json b/renovate.json
index 82d917e7146e..abd5ab3ab2b5 100644
--- a/renovate.json
+++ b/renovate.json
@@ -92,5 +92,7 @@
     }
   ],
   "semanticCommits": true,
-  "dependencyDashboard": true
+  "dependencyDashboard": true,
+  "prConcurrentLimit": 0,
+  "prHourlyLimit": 0
 }

From 23054108012d4f312dc54a00157906185d3de411 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 15:01:43 -0400
Subject: [PATCH 1702/1784] chore(main): release 2.32.3-SNAPSHOT (#1975)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 3bf53a81a0b1..ebbf0bbc38c5 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.32.2
+  2.32.3-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2
+    2.32.3-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0e927b97e7ef..b81837f1d58d 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.32.2
+  2.32.3-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.2
+        2.32.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.2
+        2.32.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.2
+        0.123.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.2
+        2.32.3-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 1f7db2b1efaa..5722d4e93f71 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.2
+    2.32.3-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.2
+        2.32.3-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index cc0cff5fc9cf..268f3ad02fb3 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.2
+  2.32.3-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2
+    2.32.3-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 7baeb736e133..f3e33cd0f49d 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.32.2
+  2.32.3-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2
+    2.32.3-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index c656b0f13fc7..002877b19fb2 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.2
+  2.32.3-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2
+    2.32.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 811d6b1149b8..80f92fffb833 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.2
+  2.32.3-SNAPSHOT
   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.32.2
+        2.32.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.2
+        2.32.3-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.2
+        2.32.3-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.2
+        0.123.3-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.2
+        2.32.3-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.2
+        2.32.3-SNAPSHOT
         
           
             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 40d4d3b0c753..95fc5f74a1b3 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.32.2
+  2.32.3-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2
+    2.32.3-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 483b0f6966e8..a4332270ba20 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.123.2
+  0.123.3-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.2
+    2.32.3-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 78ea99ecd7aa..0dcb904d3aa9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.2
+      2.32.3-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 02ceafdb4a96..409a28743e73 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.2:2.32.2
-google-cloud-datastore-bom:2.32.2:2.32.2
-proto-google-cloud-datastore-v1:0.123.2:0.123.2
-datastore-v1-proto-client:2.32.2:2.32.2
-proto-google-cloud-datastore-admin-v1:2.32.2:2.32.2
-grpc-google-cloud-datastore-admin-v1:2.32.2:2.32.2
-grpc-google-cloud-datastore-v1:2.32.2:2.32.2
+google-cloud-datastore:2.32.2:2.32.3-SNAPSHOT
+google-cloud-datastore-bom:2.32.2:2.32.3-SNAPSHOT
+proto-google-cloud-datastore-v1:0.123.2:0.123.3-SNAPSHOT
+datastore-v1-proto-client:2.32.2:2.32.3-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.32.2:2.32.3-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.32.2:2.32.3-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.32.2:2.32.3-SNAPSHOT

From 40c51205c60b8e7af98546438a71ed1ae2d366d3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 15:28:35 -0400
Subject: [PATCH 1703/1784] chore(main): release 2.32.3 (#1986)

* chore(main): release 2.32.3

* chore: generate libraries at Mon Oct 20 19:02:49 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 12 ++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94d5c807c609..dfe5ac11f4d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.32.3](https://github.com/googleapis/java-datastore/compare/v2.32.2...v2.32.3) (2025-10-20)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.63.0 ([b9b95cb](https://github.com/googleapis/java-datastore/commit/b9b95cb0b08ec393f714f885e511443c1e044a0e))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.53.0 ([#1980](https://github.com/googleapis/java-datastore/issues/1980)) ([1520b7c](https://github.com/googleapis/java-datastore/commit/1520b7c4ac51139c1c8809a4ead990d558f6c705))
+
 ## [2.32.2](https://github.com/googleapis/java-datastore/compare/v2.32.1...v2.32.2) (2025-10-04)
 
 
diff --git a/README.md b/README.md
index f577619ae295..e6e309f7e21a 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.32.2'
+implementation 'com.google.cloud:google-cloud-datastore:2.32.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.3"
 ```
 
 ## Authentication
@@ -493,7 +493,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ebbf0bbc38c5..83f214daea3a 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.32.3-SNAPSHOT
+  2.32.3
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3-SNAPSHOT
+    2.32.3
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b81837f1d58d..6ad1c323680a 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.32.3-SNAPSHOT
+  2.32.3
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.3-SNAPSHOT
+        2.32.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.3-SNAPSHOT
+        2.32.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.3-SNAPSHOT
+        0.123.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.3-SNAPSHOT
+        2.32.3
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 5722d4e93f71..24f6132e40b6 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.3-SNAPSHOT
+    2.32.3
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.3-SNAPSHOT
+        2.32.3
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 268f3ad02fb3..e3536d98b52a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.3-SNAPSHOT
+  2.32.3
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3-SNAPSHOT
+    2.32.3
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f3e33cd0f49d..16a76bd71480 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.32.3-SNAPSHOT
+  2.32.3
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3-SNAPSHOT
+    2.32.3
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 002877b19fb2..7811f79aa718 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.3-SNAPSHOT
+  2.32.3
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3-SNAPSHOT
+    2.32.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 80f92fffb833..6118f67ed9bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.3-SNAPSHOT
+  2.32.3
   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.32.3-SNAPSHOT
+        2.32.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.3-SNAPSHOT
+        2.32.3
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.3-SNAPSHOT
+        2.32.3
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.3-SNAPSHOT
+        0.123.3
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.3-SNAPSHOT
+        2.32.3
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.3-SNAPSHOT
+        2.32.3
         
           
             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 95fc5f74a1b3..9d4be0e2a70e 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.32.3-SNAPSHOT
+  2.32.3
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3-SNAPSHOT
+    2.32.3
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index a4332270ba20..2510fa66d37a 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.123.3-SNAPSHOT
+  0.123.3
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3-SNAPSHOT
+    2.32.3
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0dcb904d3aa9..ed5df809e3b9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.3-SNAPSHOT
+      2.32.3
     
     
 
diff --git a/versions.txt b/versions.txt
index 409a28743e73..c0deffe38942 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.2:2.32.3-SNAPSHOT
-google-cloud-datastore-bom:2.32.2:2.32.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.123.2:0.123.3-SNAPSHOT
-datastore-v1-proto-client:2.32.2:2.32.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.32.2:2.32.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.32.2:2.32.3-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.32.2:2.32.3-SNAPSHOT
+google-cloud-datastore:2.32.3:2.32.3
+google-cloud-datastore-bom:2.32.3:2.32.3
+proto-google-cloud-datastore-v1:0.123.3:0.123.3
+datastore-v1-proto-client:2.32.3:2.32.3
+proto-google-cloud-datastore-admin-v1:2.32.3:2.32.3
+grpc-google-cloud-datastore-admin-v1:2.32.3:2.32.3
+grpc-google-cloud-datastore-v1:2.32.3:2.32.3

From 767a558d7cd8b4ba791fe5d304757e660f7935ff Mon Sep 17 00:00:00 2001
From: Jin Seop Kim 
Date: Mon, 27 Oct 2025 11:01:42 -0400
Subject: [PATCH 1704/1784] feat: enable flag for report generation (#1991)

* feat: enable flag for report generation

* chore: remove clirr-maven-plugin override
---
 grpc-google-cloud-datastore-v1/pom.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 7811f79aa718..8096c57b3f63 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -60,13 +60,6 @@
           org.codehaus.mojo
           flatten-maven-plugin
         
-      
-        org.codehaus.mojo
-        clirr-maven-plugin
-        
-          true 
-        
-      
     
   
-
\ No newline at end of file
+

From 5f6c500d3fb092d87669550ff882782b10199a03 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Thu, 6 Nov 2025 15:13:38 -0500
Subject: [PATCH 1705/1784] deps: Manage Opentelemetry version from Shared-Deps
 (#1995)

* deps: update opentelemetry.version to 1.52.0

* chore: do not manage custom opentelemetry version
---
 google-cloud-datastore/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e3536d98b52a..35f698a1b97c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -16,7 +16,6 @@
   
   
     google-cloud-datastore
-    1.42.1
   
   
     
@@ -140,12 +139,10 @@
     
       io.opentelemetry
       opentelemetry-api
-      ${opentelemetry.version}
     
     
       io.opentelemetry
       opentelemetry-context
-      ${opentelemetry.version}
     
     
       io.opentelemetry.instrumentation
@@ -211,25 +208,21 @@
     
       io.opentelemetry
       opentelemetry-sdk
-      ${opentelemetry.version}
       test
     
     
       io.opentelemetry
       opentelemetry-sdk-common
-      ${opentelemetry.version}
       test
     
     
       io.opentelemetry
       opentelemetry-sdk-testing
-      ${opentelemetry.version}
       test
     
     
       io.opentelemetry
       opentelemetry-sdk-trace
-      ${opentelemetry.version}
       test
     
     

From 11265fdee02b429803d2d2c7d1e7f5a735e11757 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 13 Nov 2025 17:23:17 +0000
Subject: [PATCH 1706/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.54.1 (#1994)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index aa7dbb945ca8..512becedbcaa 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.53.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 6ad1c323680a..533e60a7bbf7 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.53.0
+    3.54.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 6118f67ed9bc..bbf7f15ed597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.53.0
+    3.54.1
   
 
   

From beb284c5d3ce97252db750deb2bf915332770a0e Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Thu, 13 Nov 2025 14:23:39 -0500
Subject: [PATCH 1707/1784] chore: grant write access to yoshi-java (#1996)

* chore: grant write access to yoshi-java

* chore: update CODEOWNERS to reflect new team ownership
---
 .github/CODEOWNERS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 95d4bc11b7a4..0f5636920d0d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,14 +5,14 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
 # The @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
+*                       @googleapis/cloud-java-team-teamsync @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
+**/*.java                @googleapis/cloud-java-team-teamsync @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
 
 
 # The java-samples-reviewers team is the default owner for samples changes
-samples/**/*.java       @googleapis/java-samples-reviewers
+samples/**/*.java        @googleapis/cloud-java-team-teamsync @googleapis/java-samples-reviewers
 
 # Generated snippets should not be owned by samples reviewers
-samples/snippets/generated/       @googleapis/yoshi-java
+samples/snippets/generated/        @googleapis/cloud-java-team-teamsync

From 216e771f9181f03f4add7e35bf11c5f64f80b6a7 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 13 Nov 2025 14:23:55 -0500
Subject: [PATCH 1708/1784] chore: Update generation configuration at Thu Nov
 13 02:30:31 UTC 2025 (#1988)

* chore: Update generation configuration at Tue Oct 21 02:28:45 UTC 2025

* chore: Update generation configuration at Wed Oct 22 02:31:15 UTC 2025

* chore: Update generation configuration at Thu Oct 23 02:29:19 UTC 2025

* chore: Update generation configuration at Fri Oct 24 02:26:58 UTC 2025

* chore: Update generation configuration at Sat Oct 25 02:29:34 UTC 2025

* chore: Update generation configuration at Tue Oct 28 02:28:27 UTC 2025

* chore: generate libraries at Tue Oct 28 02:29:03 UTC 2025

* chore: Update generation configuration at Wed Oct 29 02:32:03 UTC 2025

* chore: Update generation configuration at Thu Oct 30 02:30:16 UTC 2025

* chore: Update generation configuration at Fri Oct 31 02:31:28 UTC 2025

* chore: Update generation configuration at Sat Nov  1 02:30:05 UTC 2025

* chore: Update generation configuration at Tue Nov  4 02:29:37 UTC 2025

* chore: Update generation configuration at Wed Nov  5 02:30:08 UTC 2025

* chore: generate libraries at Wed Nov  5 02:30:40 UTC 2025

* chore: Update generation configuration at Thu Nov  6 02:31:22 UTC 2025

* chore: Update generation configuration at Fri Nov  7 02:33:54 UTC 2025

* chore: Update generation configuration at Sat Nov  8 02:27:23 UTC 2025

* chore: generate libraries at Sat Nov  8 02:27:56 UTC 2025

* chore: Update generation configuration at Tue Nov 11 02:30:31 UTC 2025

* chore: Update generation configuration at Wed Nov 12 02:30:56 UTC 2025

* chore: Update generation configuration at Thu Nov 13 02:30:31 UTC 2025

---------

Co-authored-by: Diego Marquez 
---
 .../hermetic_library_generation.yaml          |  2 +-
 .kokoro/presubmit/graalvm-native-a.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-b.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-c.cfg        |  2 +-
 README.md                                     |  2 +-
 generation_config.yaml                        |  6 ++--
 .../admin/v1/DatastoreAdminGrpc.java          | 29 ++++++++-------
 .../google/datastore/v1/DatastoreGrpc.java    | 35 +++++++++----------
 8 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index a1d9c6a9f2a0..31a38fbb06be 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.63.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.64.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 55c5543e2605..b772eac66cd8 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 5c981b984828..baf136cf8233 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index f2032499dff9..2fb2fc87c418 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index e6e309f7e21a..4dd9612b935f 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.70.0')
+implementation platform('com.google.cloud:libraries-bom:26.71.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index d19af969a7aa..21e9734f62dc 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.63.0
-googleapis_commitish: c288189b43c016dd3cf1ec73ce3cadee8b732f07
-libraries_bom_version: 26.70.0
+gapic_generator_version: 2.64.1
+googleapis_commitish: 5342712986262b93211b136eb4bd6fb79b3764af
+libraries_bom_version: 26.71.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index f331aba0e7ac..865f9b090b73 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -60,9 +60,6 @@
  * service google.longrunning.Operations.
  * 
  */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: google/datastore/admin/v1/datastore_admin.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class DatastoreAdminGrpc {
 
@@ -853,8 +850,9 @@ protected DatastoreAdminBlockingV2Stub build(
      * 
      */
     public com.google.longrunning.Operation exportEntities(
-        com.google.datastore.admin.v1.ExportEntitiesRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.admin.v1.ExportEntitiesRequest request)
+        throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getExportEntitiesMethod(), getCallOptions(), request);
     }
 
@@ -870,8 +868,9 @@ public com.google.longrunning.Operation exportEntities(
      * 
      */
     public com.google.longrunning.Operation importEntities(
-        com.google.datastore.admin.v1.ImportEntitiesRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.admin.v1.ImportEntitiesRequest request)
+        throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getImportEntitiesMethod(), getCallOptions(), request);
     }
 
@@ -894,8 +893,8 @@ public com.google.longrunning.Operation importEntities(
      * 
      */
     public com.google.longrunning.Operation createIndex(
-        com.google.datastore.admin.v1.CreateIndexRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.admin.v1.CreateIndexRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getCreateIndexMethod(), getCallOptions(), request);
     }
 
@@ -916,8 +915,8 @@ public com.google.longrunning.Operation createIndex(
      * 
      */
     public com.google.longrunning.Operation deleteIndex(
-        com.google.datastore.admin.v1.DeleteIndexRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.admin.v1.DeleteIndexRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getDeleteIndexMethod(), getCallOptions(), request);
     }
 
@@ -929,8 +928,8 @@ public com.google.longrunning.Operation deleteIndex(
      * 
      */
     public com.google.datastore.admin.v1.Index getIndex(
-        com.google.datastore.admin.v1.GetIndexRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.admin.v1.GetIndexRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getGetIndexMethod(), getCallOptions(), request);
     }
 
@@ -944,8 +943,8 @@ public com.google.datastore.admin.v1.Index getIndex(
      * 
      */
     public com.google.datastore.admin.v1.ListIndexesResponse listIndexes(
-        com.google.datastore.admin.v1.ListIndexesRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.admin.v1.ListIndexesRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getListIndexesMethod(), getCallOptions(), request);
     }
   }
diff --git a/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
index 8feee8ad9d58..860482c55af7 100644
--- a/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
+++ b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
@@ -29,9 +29,6 @@
  * the request.
  * 
  */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: google/datastore/v1/datastore.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class DatastoreGrpc {
 
@@ -758,8 +755,8 @@ protected DatastoreBlockingV2Stub build(
      * 
      */
     public com.google.datastore.v1.LookupResponse lookup(
-        com.google.datastore.v1.LookupRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.LookupRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getLookupMethod(), getCallOptions(), request);
     }
 
@@ -771,8 +768,8 @@ public com.google.datastore.v1.LookupResponse lookup(
      * 
      */
     public com.google.datastore.v1.RunQueryResponse runQuery(
-        com.google.datastore.v1.RunQueryRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.RunQueryRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getRunQueryMethod(), getCallOptions(), request);
     }
 
@@ -784,8 +781,8 @@ public com.google.datastore.v1.RunQueryResponse runQuery(
      * 
      */
     public com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery(
-        com.google.datastore.v1.RunAggregationQueryRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.RunAggregationQueryRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getRunAggregationQueryMethod(), getCallOptions(), request);
     }
 
@@ -797,8 +794,8 @@ public com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery(
      * 
      */
     public com.google.datastore.v1.BeginTransactionResponse beginTransaction(
-        com.google.datastore.v1.BeginTransactionRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.BeginTransactionRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getBeginTransactionMethod(), getCallOptions(), request);
     }
 
@@ -811,8 +808,8 @@ public com.google.datastore.v1.BeginTransactionResponse beginTransaction(
      * 
      */
     public com.google.datastore.v1.CommitResponse commit(
-        com.google.datastore.v1.CommitRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.CommitRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getCommitMethod(), getCallOptions(), request);
     }
 
@@ -824,8 +821,8 @@ public com.google.datastore.v1.CommitResponse commit(
      * 
      */
     public com.google.datastore.v1.RollbackResponse rollback(
-        com.google.datastore.v1.RollbackRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.RollbackRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getRollbackMethod(), getCallOptions(), request);
     }
 
@@ -838,8 +835,8 @@ public com.google.datastore.v1.RollbackResponse rollback(
      * 
      */
     public com.google.datastore.v1.AllocateIdsResponse allocateIds(
-        com.google.datastore.v1.AllocateIdsRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.AllocateIdsRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getAllocateIdsMethod(), getCallOptions(), request);
     }
 
@@ -852,8 +849,8 @@ public com.google.datastore.v1.AllocateIdsResponse allocateIds(
      * 
      */
     public com.google.datastore.v1.ReserveIdsResponse reserveIds(
-        com.google.datastore.v1.ReserveIdsRequest request) {
-      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+        com.google.datastore.v1.ReserveIdsRequest request) throws io.grpc.StatusException {
+      return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
           getChannel(), getReserveIdsMethod(), getCallOptions(), request);
     }
   }

From 8642b8babe0cfa26db975b1cb20880fd5507da19 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 13 Nov 2025 14:51:13 -0500
Subject: [PATCH 1709/1784] chore(main): release 2.32.4-SNAPSHOT (#1987)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 83f214daea3a..a38d82249d36 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.32.3
+  2.32.4-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3
+    2.32.4-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 533e60a7bbf7..85f1f95901cc 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.32.3
+  2.32.4-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.3
+        2.32.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.3
+        2.32.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.3
+        0.123.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.3
+        2.32.4-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 24f6132e40b6..9037c1b97d09 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.3
+    2.32.4-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.3
+        2.32.4-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 35f698a1b97c..4b78dda4579d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.3
+  2.32.4-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3
+    2.32.4-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 16a76bd71480..8ca755b8c80f 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.32.3
+  2.32.4-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3
+    2.32.4-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 8096c57b3f63..35ae1917c1c5 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.3
+  2.32.4-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3
+    2.32.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index bbf7f15ed597..5d85a7a3c92f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.3
+  2.32.4-SNAPSHOT
   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.32.3
+        2.32.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.3
+        2.32.4-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.3
+        2.32.4-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.3
+        0.123.4-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.3
+        2.32.4-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.3
+        2.32.4-SNAPSHOT
         
           
             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 9d4be0e2a70e..67959112dbfa 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.32.3
+  2.32.4-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3
+    2.32.4-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2510fa66d37a..2f4fd2999898 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.123.3
+  0.123.4-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.3
+    2.32.4-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ed5df809e3b9..59be9b4dcbf5 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.3
+      2.32.4-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index c0deffe38942..a322d6108d2b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.3:2.32.3
-google-cloud-datastore-bom:2.32.3:2.32.3
-proto-google-cloud-datastore-v1:0.123.3:0.123.3
-datastore-v1-proto-client:2.32.3:2.32.3
-proto-google-cloud-datastore-admin-v1:2.32.3:2.32.3
-grpc-google-cloud-datastore-admin-v1:2.32.3:2.32.3
-grpc-google-cloud-datastore-v1:2.32.3:2.32.3
+google-cloud-datastore:2.32.3:2.32.4-SNAPSHOT
+google-cloud-datastore-bom:2.32.3:2.32.4-SNAPSHOT
+proto-google-cloud-datastore-v1:0.123.3:0.123.4-SNAPSHOT
+datastore-v1-proto-client:2.32.3:2.32.4-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.32.3:2.32.4-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.32.3:2.32.4-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.32.3:2.32.4-SNAPSHOT

From c2cfbe0268f0c1d52f97bcc605820279c40cdf2f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 13 Nov 2025 15:51:40 -0500
Subject: [PATCH 1710/1784] chore(main): release 2.33.0 (#1997)

* chore(main): release 2.33.0

* chore: generate libraries at Thu Nov 13 19:52:09 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 18 ++++++++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfe5ac11f4d9..7fe8b5d8b6b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.33.0](https://github.com/googleapis/java-datastore/compare/v2.32.3...v2.33.0) (2025-11-13)
+
+
+### Features
+
+* Enable flag for report generation ([#1991](https://github.com/googleapis/java-datastore/issues/1991)) ([767a558](https://github.com/googleapis/java-datastore/commit/767a558d7cd8b4ba791fe5d304757e660f7935ff))
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.64.1 ([216e771](https://github.com/googleapis/java-datastore/commit/216e771f9181f03f4add7e35bf11c5f64f80b6a7))
+
+
+### Dependencies
+
+* Manage Opentelemetry version from Shared-Deps ([#1995](https://github.com/googleapis/java-datastore/issues/1995)) ([5f6c500](https://github.com/googleapis/java-datastore/commit/5f6c500d3fb092d87669550ff882782b10199a03))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.54.1 ([#1994](https://github.com/googleapis/java-datastore/issues/1994)) ([11265fd](https://github.com/googleapis/java-datastore/commit/11265fdee02b429803d2d2c7d1e7f5a735e11757))
+
 ## [2.32.3](https://github.com/googleapis/java-datastore/compare/v2.32.2...v2.32.3) (2025-10-20)
 
 
diff --git a/README.md b/README.md
index 4dd9612b935f..c7438bedcb15 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.32.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.33.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.32.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.33.0"
 ```
 
 ## Authentication
@@ -493,7 +493,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.32.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.33.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index a38d82249d36..d6960c166545 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.32.4-SNAPSHOT
+  2.33.0
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.4-SNAPSHOT
+    2.33.0
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 85f1f95901cc..d4266387c562 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.32.4-SNAPSHOT
+  2.33.0
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.32.4-SNAPSHOT
+        2.33.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.4-SNAPSHOT
+        2.33.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.4-SNAPSHOT
+        0.124.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.32.4-SNAPSHOT
+        2.33.0
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 9037c1b97d09..06b0602cf207 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.32.4-SNAPSHOT
+    2.33.0
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.32.4-SNAPSHOT
+        2.33.0
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 4b78dda4579d..21e2630e114a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.32.4-SNAPSHOT
+  2.33.0
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.4-SNAPSHOT
+    2.33.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 8ca755b8c80f..8befef91f3a8 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.32.4-SNAPSHOT
+  2.33.0
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.4-SNAPSHOT
+    2.33.0
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 35ae1917c1c5..627e2c6ce03a 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.32.4-SNAPSHOT
+  2.33.0
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.4-SNAPSHOT
+    2.33.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 5d85a7a3c92f..b52ecb8b6da1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.32.4-SNAPSHOT
+  2.33.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.32.4-SNAPSHOT
+        2.33.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.32.4-SNAPSHOT
+        2.33.0
       
       
         com.google.cloud
         google-cloud-datastore
-        2.32.4-SNAPSHOT
+        2.33.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.123.4-SNAPSHOT
+        0.124.0
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.32.4-SNAPSHOT
+        2.33.0
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.32.4-SNAPSHOT
+        2.33.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 67959112dbfa..4e3b5173f2bd 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.32.4-SNAPSHOT
+  2.33.0
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.4-SNAPSHOT
+    2.33.0
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 2f4fd2999898..dc91b78fecf9 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.123.4-SNAPSHOT
+  0.124.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.32.4-SNAPSHOT
+    2.33.0
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 59be9b4dcbf5..70fd2aaac7ed 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.32.4-SNAPSHOT
+      2.33.0
     
     
 
diff --git a/versions.txt b/versions.txt
index a322d6108d2b..14c7893e8ba1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.32.3:2.32.4-SNAPSHOT
-google-cloud-datastore-bom:2.32.3:2.32.4-SNAPSHOT
-proto-google-cloud-datastore-v1:0.123.3:0.123.4-SNAPSHOT
-datastore-v1-proto-client:2.32.3:2.32.4-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.32.3:2.32.4-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.32.3:2.32.4-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.32.3:2.32.4-SNAPSHOT
+google-cloud-datastore:2.33.0:2.33.0
+google-cloud-datastore-bom:2.33.0:2.33.0
+proto-google-cloud-datastore-v1:0.124.0:0.124.0
+datastore-v1-proto-client:2.33.0:2.33.0
+proto-google-cloud-datastore-admin-v1:2.33.0:2.33.0
+grpc-google-cloud-datastore-admin-v1:2.33.0:2.33.0
+grpc-google-cloud-datastore-v1:2.33.0:2.33.0

From 4a4b546d24bfad52952beddc2f8ee6e7bd81705c Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Thu, 4 Dec 2025 15:50:15 -0500
Subject: [PATCH 1711/1784] chore: add release-please config for protobuf-4.x
 (#2002)

* chore: add release-please config for protobuf-4.x

* Change release type from java-backport to java-yoshi
---
 .github/release-please.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 8f934f1ba5a3..9f3efbba082a 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -46,3 +46,8 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.29.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-yoshi
+    branch: protobuf-4.x-rc
+    manifest: true

From c2062e77f0ae50981ff381bd82151720f31aa83a Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 11 Dec 2025 22:02:32 +0000
Subject: [PATCH 1712/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.54.2 (#2011)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 512becedbcaa..f908da812113 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.2
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index d4266387c562..a745f3bee36e 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.54.1
+    3.54.2
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index b52ecb8b6da1..749e61444a6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.54.1
+    3.54.2
   
 
   

From 3ad31689197a97d3496ae10fa3338d15d9df022f Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Thu, 11 Dec 2025 22:02:48 +0000
Subject: [PATCH 1713/1784] deps: update googleapis/sdk-platform-java action to
 v2.64.2 (#2012)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 31a38fbb06be..8c3df5194ac4 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.64.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.64.2
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From b5f1285bb783c004464b0f7e8b1fcea567ea22d5 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 11 Dec 2025 17:03:19 -0500
Subject: [PATCH 1714/1784] chore: Update generation configuration at Thu Dec
 11 02:33:14 UTC 2025 (#1999)

* chore: Update generation configuration at Fri Nov 14 02:30:15 UTC 2025

* chore: Update generation configuration at Sat Nov 15 02:28:09 UTC 2025

* chore: Update generation configuration at Mon Nov 17 02:30:05 UTC 2025

* chore: Update generation configuration at Tue Nov 18 02:29:50 UTC 2025

* chore: Update generation configuration at Wed Nov 19 02:29:25 UTC 2025

* chore: generate libraries at Wed Nov 19 02:29:59 UTC 2025

* chore: Update generation configuration at Thu Nov 20 02:29:22 UTC 2025

* chore: Update generation configuration at Fri Nov 21 02:29:09 UTC 2025

* chore: Update generation configuration at Wed Nov 26 02:30:42 UTC 2025

* chore: Update generation configuration at Thu Nov 27 02:29:34 UTC 2025

* chore: Update generation configuration at Fri Nov 28 02:29:20 UTC 2025

* chore: Update generation configuration at Tue Dec  2 02:31:02 UTC 2025

* chore: Update generation configuration at Wed Dec  3 02:31:00 UTC 2025

* chore: Update generation configuration at Thu Dec  4 02:30:58 UTC 2025

* chore: Update generation configuration at Fri Dec  5 02:31:18 UTC 2025

* chore: Update generation configuration at Sat Dec  6 02:29:05 UTC 2025

* chore: Update generation configuration at Tue Dec  9 02:31:22 UTC 2025

* chore: Update generation configuration at Wed Dec 10 02:31:33 UTC 2025

* chore: Update generation configuration at Thu Dec 11 02:33:14 UTC 2025

* chore: generate libraries at Thu Dec 11 02:33:48 UTC 2025
---
 .kokoro/presubmit/graalvm-native-a.cfg | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg | 2 +-
 README.md                              | 2 +-
 generation_config.yaml                 | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index b772eac66cd8..406018c48a5f 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index baf136cf8233..60c82d4bf4fc 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 2fb2fc87c418..60982adf5a35 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index c7438bedcb15..0ae0f852b839 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.71.0')
+implementation platform('com.google.cloud:libraries-bom:26.72.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 21e9734f62dc..24b12bc7ad94 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.64.1
-googleapis_commitish: 5342712986262b93211b136eb4bd6fb79b3764af
-libraries_bom_version: 26.71.0
+gapic_generator_version: 2.64.2
+googleapis_commitish: b32495a713a68dd0dff90cf0b24021debfca048a
+libraries_bom_version: 26.72.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From d0638ecc8bd0a3e8b939f1abd194c531b5eedb91 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 22:20:22 +0000
Subject: [PATCH 1715/1784] chore(main): release 2.33.1-SNAPSHOT (#1998)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index d6960c166545..ad21a8df9371 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.33.0
+  2.33.1-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.0
+    2.33.1-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index a745f3bee36e..b9d1c4e090bd 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.33.0
+  2.33.1-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.33.0
+        2.33.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.0
+        2.33.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.0
+        0.124.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.33.0
+        2.33.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 06b0602cf207..9305b7b7971d 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.33.0
+    2.33.1-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.33.0
+        2.33.1-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 21e2630e114a..b9bee6d053bc 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.33.0
+  2.33.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.0
+    2.33.1-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 8befef91f3a8..80155df4fae3 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.33.0
+  2.33.1-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.0
+    2.33.1-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 627e2c6ce03a..2a5bb90c61c0 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.33.0
+  2.33.1-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.0
+    2.33.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 749e61444a6c..fd53bfb7040c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.33.0
+  2.33.1-SNAPSHOT
   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.33.0
+        2.33.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.0
+        2.33.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.33.0
+        2.33.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.0
+        0.124.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.33.0
+        2.33.1-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.33.0
+        2.33.1-SNAPSHOT
         
           
             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 4e3b5173f2bd..b36e2b543c73 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.33.0
+  2.33.1-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.0
+    2.33.1-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index dc91b78fecf9..207b04211aec 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.124.0
+  0.124.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.0
+    2.33.1-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 70fd2aaac7ed..d75a58642241 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.33.0
+      2.33.1-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 14c7893e8ba1..b82a4b021ae4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.33.0:2.33.0
-google-cloud-datastore-bom:2.33.0:2.33.0
-proto-google-cloud-datastore-v1:0.124.0:0.124.0
-datastore-v1-proto-client:2.33.0:2.33.0
-proto-google-cloud-datastore-admin-v1:2.33.0:2.33.0
-grpc-google-cloud-datastore-admin-v1:2.33.0:2.33.0
-grpc-google-cloud-datastore-v1:2.33.0:2.33.0
+google-cloud-datastore:2.33.0:2.33.1-SNAPSHOT
+google-cloud-datastore-bom:2.33.0:2.33.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.124.0:0.124.1-SNAPSHOT
+datastore-v1-proto-client:2.33.0:2.33.1-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.33.0:2.33.1-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.33.0:2.33.1-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.33.0:2.33.1-SNAPSHOT

From f08c51a186b45a33a3ee83f9bb90e44e5d669045 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 20:51:26 -0500
Subject: [PATCH 1716/1784] chore(main): release 2.33.1 (#2013)

* chore(main): release 2.33.1

* chore: generate libraries at Thu Dec 11 22:21:16 UTC 2025

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 13 +++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fe8b5d8b6b8..155fb4ce16e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.33.1](https://github.com/googleapis/java-datastore/compare/v2.33.0...v2.33.1) (2025-12-11)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.64.2 ([b5f1285](https://github.com/googleapis/java-datastore/commit/b5f1285bb783c004464b0f7e8b1fcea567ea22d5))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.54.2 ([#2011](https://github.com/googleapis/java-datastore/issues/2011)) ([c2062e7](https://github.com/googleapis/java-datastore/commit/c2062e77f0ae50981ff381bd82151720f31aa83a))
+* Update googleapis/sdk-platform-java action to v2.64.2 ([#2012](https://github.com/googleapis/java-datastore/issues/2012)) ([3ad3168](https://github.com/googleapis/java-datastore/commit/3ad31689197a97d3496ae10fa3338d15d9df022f))
+
 ## [2.33.0](https://github.com/googleapis/java-datastore/compare/v2.32.3...v2.33.0) (2025-11-13)
 
 
diff --git a/README.md b/README.md
index 0ae0f852b839..33ded17da09b 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.33.0'
+implementation 'com.google.cloud:google-cloud-datastore:2.33.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.33.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.33.1"
 ```
 
 ## Authentication
@@ -493,7 +493,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.33.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.33.1
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index ad21a8df9371..54fe09a35198 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.33.1-SNAPSHOT
+  2.33.1
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1-SNAPSHOT
+    2.33.1
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b9d1c4e090bd..f2851b744970 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.33.1-SNAPSHOT
+  2.33.1
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.33.1-SNAPSHOT
+        2.33.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.1-SNAPSHOT
+        2.33.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.1-SNAPSHOT
+        0.124.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.33.1-SNAPSHOT
+        2.33.1
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 9305b7b7971d..7c54b472d69f 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.33.1-SNAPSHOT
+    2.33.1
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.33.1-SNAPSHOT
+        2.33.1
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b9bee6d053bc..0a2265246e90 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.33.1-SNAPSHOT
+  2.33.1
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1-SNAPSHOT
+    2.33.1
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 80155df4fae3..f6f927eccb6b 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.33.1-SNAPSHOT
+  2.33.1
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1-SNAPSHOT
+    2.33.1
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index 2a5bb90c61c0..b82267716017 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.33.1-SNAPSHOT
+  2.33.1
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1-SNAPSHOT
+    2.33.1
   
   
     
diff --git a/pom.xml b/pom.xml
index fd53bfb7040c..4a8c0a343d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.33.1-SNAPSHOT
+  2.33.1
   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.33.1-SNAPSHOT
+        2.33.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.1-SNAPSHOT
+        2.33.1
       
       
         com.google.cloud
         google-cloud-datastore
-        2.33.1-SNAPSHOT
+        2.33.1
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.1-SNAPSHOT
+        0.124.1
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.33.1-SNAPSHOT
+        2.33.1
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.33.1-SNAPSHOT
+        2.33.1
         
           
             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 b36e2b543c73..5cc106d2eaf8 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.33.1-SNAPSHOT
+  2.33.1
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1-SNAPSHOT
+    2.33.1
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 207b04211aec..0182b2f05272 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.124.1-SNAPSHOT
+  0.124.1
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1-SNAPSHOT
+    2.33.1
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d75a58642241..f8348a32ffe6 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.33.1-SNAPSHOT
+      2.33.1
     
     
 
diff --git a/versions.txt b/versions.txt
index b82a4b021ae4..36d4a892d99d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.33.0:2.33.1-SNAPSHOT
-google-cloud-datastore-bom:2.33.0:2.33.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.124.0:0.124.1-SNAPSHOT
-datastore-v1-proto-client:2.33.0:2.33.1-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.33.0:2.33.1-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.33.0:2.33.1-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.33.0:2.33.1-SNAPSHOT
+google-cloud-datastore:2.33.1:2.33.1
+google-cloud-datastore-bom:2.33.1:2.33.1
+proto-google-cloud-datastore-v1:0.124.1:0.124.1
+datastore-v1-proto-client:2.33.1:2.33.1
+proto-google-cloud-datastore-admin-v1:2.33.1:2.33.1
+grpc-google-cloud-datastore-admin-v1:2.33.1:2.33.1
+grpc-google-cloud-datastore-v1:2.33.1:2.33.1

From 83fb5cffaa091766eb0827921f2549d3e6d98363 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 12 Dec 2025 02:14:29 +0000
Subject: [PATCH 1717/1784] chore(main): release 2.33.2-SNAPSHOT (#2014)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 54fe09a35198..8739f8d5f924 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.33.1
+  2.33.2-SNAPSHOT
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1
+    2.33.2-SNAPSHOT
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index f2851b744970..34b6dd4368f3 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.33.1
+  2.33.2-SNAPSHOT
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.33.1
+        2.33.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.1
+        2.33.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.1
+        0.124.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.33.1
+        2.33.2-SNAPSHOT
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 7c54b472d69f..9cdc13d788e9 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.33.1
+    2.33.2-SNAPSHOT
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.33.1
+        2.33.2-SNAPSHOT
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 0a2265246e90..408046f92317 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.33.1
+  2.33.2-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1
+    2.33.2-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index f6f927eccb6b..b7594dec6be4 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.33.1
+  2.33.2-SNAPSHOT
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1
+    2.33.2-SNAPSHOT
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index b82267716017..faaad2fc0299 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.33.1
+  2.33.2-SNAPSHOT
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1
+    2.33.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 4a8c0a343d2b..18895d66c743 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.33.1
+  2.33.2-SNAPSHOT
   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.33.1
+        2.33.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.1
+        2.33.2-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        2.33.1
+        2.33.2-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.1
+        0.124.2-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.33.1
+        2.33.2-SNAPSHOT
       
       
         com.google.cloud
@@ -189,7 +189,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.33.1
+        2.33.2-SNAPSHOT
         
           
             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 5cc106d2eaf8..12c48a4f6825 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.33.1
+  2.33.2-SNAPSHOT
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1
+    2.33.2-SNAPSHOT
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 0182b2f05272..3e547c45139c 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.124.1
+  0.124.2-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.1
+    2.33.2-SNAPSHOT
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f8348a32ffe6..bb807f056d88 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.33.1
+      2.33.2-SNAPSHOT
     
     
 
diff --git a/versions.txt b/versions.txt
index 36d4a892d99d..75ebd5906d76 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.33.1:2.33.1
-google-cloud-datastore-bom:2.33.1:2.33.1
-proto-google-cloud-datastore-v1:0.124.1:0.124.1
-datastore-v1-proto-client:2.33.1:2.33.1
-proto-google-cloud-datastore-admin-v1:2.33.1:2.33.1
-grpc-google-cloud-datastore-admin-v1:2.33.1:2.33.1
-grpc-google-cloud-datastore-v1:2.33.1:2.33.1
+google-cloud-datastore:2.33.1:2.33.2-SNAPSHOT
+google-cloud-datastore-bom:2.33.1:2.33.2-SNAPSHOT
+proto-google-cloud-datastore-v1:0.124.1:0.124.2-SNAPSHOT
+datastore-v1-proto-client:2.33.1:2.33.2-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.33.1:2.33.2-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.33.1:2.33.2-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.33.1:2.33.2-SNAPSHOT

From 3be810672d6d3b7fc5b7ce182329f1930d3a340e Mon Sep 17 00:00:00 2001
From: Lawrence Qiu 
Date: Thu, 18 Dec 2025 16:27:46 -0500
Subject: [PATCH 1718/1784] chore: Run errorprone for JDK 17+ only (#2023)

* chore: Run errorprone for JDK 17+

* chore: Enable error prone for Java 17+

* chore: Set the error prone core version as a property

* chore: Add error prone configs in handwritten modules

* chore: generate libraries at Thu Dec 18 19:31:48 UTC 2025

---------

Co-authored-by: cloud-java-bot 
---
 datastore-v1-proto-client/pom.xml    | 42 +++++++++++++++++
 google-cloud-datastore-utils/pom.xml | 42 +++++++++++++++++
 google-cloud-datastore/pom.xml       | 42 +++++++++++++++++
 pom.xml                              | 69 ++--------------------------
 4 files changed, 130 insertions(+), 65 deletions(-)

diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 8739f8d5f924..cadbbea61ded 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -130,6 +130,48 @@
         true
       
     
+    
+      java17
+      
+        [17,)
+      
+      
+        
+          
+            org.apache.maven.plugins
+            maven-compiler-plugin
+            
+              UTF-8
+              true
+              
+                -XDcompilePolicy=simple
+                --should-stop=ifError=FLOW
+                -Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*
+
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+                -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+                -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+              
+              
+              
+                
+                  com.google.errorprone
+                  error_prone_core
+                  ${error-prone.version}
+                
+              
+            
+          
+        
+      
+    
   
 
 
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 9cdc13d788e9..74f717c84d08 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -107,5 +107,47 @@
                 true
             
         
+        
+            java17
+            
+                [17,)
+            
+            
+                
+                    
+                        org.apache.maven.plugins
+                        maven-compiler-plugin
+                        
+                            UTF-8
+                            true
+                            
+                                -XDcompilePolicy=simple
+                                --should-stop=ifError=FLOW
+                                -Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*
+
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+                                -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+                                -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+                                -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+                            
+                            
+                            
+                                
+                                    com.google.errorprone
+                                    error_prone_core
+                                    ${error-prone.version}
+                                
+                            
+                        
+                    
+                
+            
+        
     
 
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 408046f92317..30867c3e3cd1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -271,5 +271,47 @@
         com.google.cloud.datastore.it.ITDatastoreConceptsTest
       
     
+    
+      java17
+      
+        [17,)
+      
+      
+        
+          
+            org.apache.maven.plugins
+            maven-compiler-plugin
+            
+              UTF-8
+              true
+              
+                -XDcompilePolicy=simple
+                --should-stop=ifError=FLOW
+                -Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*
+
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+                -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+                -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+                -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+              
+              
+              
+                
+                  com.google.errorprone
+                  error_prone_core
+                  ${error-prone.version}
+                
+              
+            
+          
+        
+      
+    
   
 
diff --git a/pom.xml b/pom.xml
index 18895d66c743..462070dc8235 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,10 @@
     github
     google-cloud-datastore-parent
     https://googleapis.dev/java/google-api-grpc/latest
-    2.31.0
+
+
+
+    2.42.0
   
 
   
@@ -231,70 +234,6 @@
     
   
 
-  
-    
-      
-      no-errorprone-jdk-24-onwards
-      
-        [24,)
-      
-      
-        
-          
-            maven-compiler-plugin
-            
-              true
-              
-                
-                -XDcompilePolicy=simple
-              
-            
-          
-        
-      
-    
-    
-      java9
-      
-        [9,24)
-      
-      
-        
-          
-            org.apache.maven.plugins
-            maven-compiler-plugin
-            3.14.0
-            
-              UTF-8
-              true
-              
-                -XDcompilePolicy=simple
-                -Xplugin:ErrorProne
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
-                -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-                -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
-                -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
-              
-              
-                
-                  com.google.errorprone
-                  error_prone_core
-                  ${error-prone.version}
-                
-              
-            
-          
-        
-      
-    
-  
-
   
     google-cloud-datastore
     grpc-google-cloud-datastore-admin-v1

From 786a2ea9bb2465696be179be3df760b8bb775fa6 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Tue, 13 Jan 2026 15:59:47 -0500
Subject: [PATCH 1719/1784] chore: cleanup release-please config (#2005)

* chore: cleanup release-please config

- Remove redundant options already declared at the top level.\n- Remove bumpMinorPreMajor for repositories after the first major release.

* chore: format release-please.yml
---
 .github/release-please.yml | 72 ++++++++++++--------------------------
 1 file changed, 23 insertions(+), 49 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 9f3efbba082a..53b9a3553667 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -2,52 +2,26 @@ bumpMinorPreMajor: true
 handleGHRelease: true
 releaseType: java-yoshi
 branches:
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-lts
-    branch: 1.106.5-sp
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-yoshi
-    branch: java7
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.1.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.2.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.12.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.15.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.17.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.19.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.26.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.30.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.29.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-yoshi
-    branch: protobuf-4.x-rc
-    manifest: true
+    - branch: 1.106.5-sp
+      releaseType: java-lts
+    - branch: java7
+    - branch: 2.1.x
+      releaseType: java-backport
+    - branch: 2.2.x
+      releaseType: java-backport
+    - branch: 2.12.x
+      releaseType: java-backport
+    - branch: 2.15.x
+      releaseType: java-backport
+    - branch: 2.17.x
+      releaseType: java-backport
+    - branch: 2.19.x
+      releaseType: java-backport
+    - branch: 2.26.x
+      releaseType: java-backport
+    - branch: 2.30.x
+      releaseType: java-backport
+    - branch: 2.29.x
+      releaseType: java-backport
+    - branch: protobuf-4.x-rc
+      manifest: true

From 4d7dd5a7e054bd552e5c5a81c8634dcaab4630f0 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:22:23 -0500
Subject: [PATCH 1720/1784] chore: Update generation configuration at Tue Jan
 13 21:59:16 UTC 2026 (#2015)

* chore: Update generation configuration at Fri Dec 12 02:32:40 UTC 2025

* chore: Update generation configuration at Sat Dec 13 02:30:22 UTC 2025

* chore: generate libraries at Sat Dec 13 02:30:51 UTC 2025

* chore: Update generation configuration at Mon Dec 15 02:35:52 UTC 2025

* chore: Update generation configuration at Tue Dec 16 02:33:05 UTC 2025

* chore: Update generation configuration at Wed Dec 17 02:31:09 UTC 2025

* chore: generate libraries at Wed Dec 17 02:31:38 UTC 2025

* chore: Update generation configuration at Thu Dec 18 02:31:20 UTC 2025

* chore: Update generation configuration at Fri Dec 19 02:32:33 UTC 2025

* chore: Update generation configuration at Sat Dec 20 02:30:15 UTC 2025

* chore: generate libraries at Sat Dec 20 02:30:47 UTC 2025

* chore: Update generation configuration at Wed Dec 24 02:32:17 UTC 2025

* chore: Update generation configuration at Thu Dec 25 02:34:09 UTC 2025

* chore: Update generation configuration at Tue Dec 30 02:34:32 UTC 2025

* chore: Update generation configuration at Wed Dec 31 02:34:34 UTC 2025

* chore: Update generation configuration at Tue Jan  6 02:36:10 UTC 2026

* chore: generate libraries at Tue Jan  6 02:36:41 UTC 2026

* chore: Update generation configuration at Wed Jan  7 02:35:49 UTC 2026

* chore: Update generation configuration at Thu Jan  8 02:35:40 UTC 2026

* chore: Update generation configuration at Fri Jan  9 02:36:14 UTC 2026

* chore: Update generation configuration at Sat Jan 10 02:32:36 UTC 2026

* chore: Update generation configuration at Tue Jan 13 02:35:07 UTC 2026

* chore: generate libraries at Tue Jan 13 02:35:35 UTC 2026

* chore: Update generation configuration at Tue Jan 13 21:59:16 UTC 2026

* chore: generate libraries at Tue Jan 13 21:59:42 UTC 2026
---
 .github/scripts/update_generation_config.sh   | 12 ++++++++++-
 .../hermetic_library_generation.yaml          |  2 +-
 .kokoro/presubmit/graalvm-native-a.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-b.cfg        |  2 +-
 .kokoro/presubmit/graalvm-native-c.cfg        |  2 +-
 README.md                                     | 21 +------------------
 generation_config.yaml                        |  6 +++---
 .../admin/v1/DatastoreAdminClient.java        |  2 +-
 .../admin/v1/DatastoreAdminSettings.java      |  6 +++---
 .../datastore/admin/v1/package-info.java      |  2 +-
 .../admin/v1/stub/DatastoreAdminStub.java     |  2 +-
 .../v1/stub/DatastoreAdminStubSettings.java   |  6 +++---
 .../GrpcDatastoreAdminCallableFactory.java    |  2 +-
 .../admin/v1/stub/GrpcDatastoreAdminStub.java |  2 +-
 ...HttpJsonDatastoreAdminCallableFactory.java |  2 +-
 .../v1/stub/HttpJsonDatastoreAdminStub.java   |  2 +-
 .../cloud/datastore/v1/DatastoreClient.java   |  2 +-
 .../cloud/datastore/v1/DatastoreSettings.java |  6 +++---
 .../cloud/datastore/v1/package-info.java      |  2 +-
 .../datastore/v1/stub/DatastoreStub.java      |  2 +-
 .../v1/stub/DatastoreStubSettings.java        |  6 +++---
 .../v1/stub/GrpcDatastoreCallableFactory.java |  2 +-
 .../datastore/v1/stub/GrpcDatastoreStub.java  |  2 +-
 .../HttpJsonDatastoreCallableFactory.java     |  2 +-
 .../v1/stub/HttpJsonDatastoreStub.java        |  2 +-
 .../v1/DatastoreAdminClientHttpJsonTest.java  |  2 +-
 .../admin/v1/DatastoreAdminClientTest.java    |  2 +-
 .../admin/v1/MockDatastoreAdmin.java          |  2 +-
 .../admin/v1/MockDatastoreAdminImpl.java      |  2 +-
 .../v1/DatastoreClientHttpJsonTest.java       |  2 +-
 .../datastore/v1/DatastoreClientTest.java     |  2 +-
 .../cloud/datastore/v1/MockDatastore.java     |  2 +-
 .../cloud/datastore/v1/MockDatastoreImpl.java |  2 +-
 .../admin/v1/DatastoreAdminGrpc.java          |  2 +-
 .../google/datastore/v1/DatastoreGrpc.java    |  2 +-
 .../datastore/admin/v1/CommonMetadata.java    |  2 +-
 .../admin/v1/CommonMetadataOrBuilder.java     |  2 +-
 .../admin/v1/CreateIndexRequest.java          |  2 +-
 .../admin/v1/CreateIndexRequestOrBuilder.java |  2 +-
 .../admin/v1/DatastoreAdminProto.java         |  2 +-
 .../DatastoreFirestoreMigrationMetadata.java  |  2 +-
 ...reFirestoreMigrationMetadataOrBuilder.java |  2 +-
 .../admin/v1/DeleteIndexRequest.java          |  2 +-
 .../admin/v1/DeleteIndexRequestOrBuilder.java |  2 +-
 .../datastore/admin/v1/EntityFilter.java      |  2 +-
 .../admin/v1/EntityFilterOrBuilder.java       |  2 +-
 .../admin/v1/ExportEntitiesMetadata.java      |  2 +-
 .../v1/ExportEntitiesMetadataOrBuilder.java   |  2 +-
 .../admin/v1/ExportEntitiesRequest.java       |  2 +-
 .../v1/ExportEntitiesRequestOrBuilder.java    |  2 +-
 .../admin/v1/ExportEntitiesResponse.java      |  2 +-
 .../v1/ExportEntitiesResponseOrBuilder.java   |  2 +-
 .../datastore/admin/v1/GetIndexRequest.java   |  2 +-
 .../admin/v1/GetIndexRequestOrBuilder.java    |  2 +-
 .../admin/v1/ImportEntitiesMetadata.java      |  2 +-
 .../v1/ImportEntitiesMetadataOrBuilder.java   |  2 +-
 .../admin/v1/ImportEntitiesRequest.java       |  2 +-
 .../v1/ImportEntitiesRequestOrBuilder.java    |  2 +-
 .../com/google/datastore/admin/v1/Index.java  |  2 +-
 .../admin/v1/IndexOperationMetadata.java      |  2 +-
 .../v1/IndexOperationMetadataOrBuilder.java   |  2 +-
 .../datastore/admin/v1/IndexOrBuilder.java    |  2 +-
 .../google/datastore/admin/v1/IndexProto.java |  2 +-
 .../admin/v1/ListIndexesRequest.java          |  2 +-
 .../admin/v1/ListIndexesRequestOrBuilder.java |  2 +-
 .../admin/v1/ListIndexesResponse.java         |  2 +-
 .../v1/ListIndexesResponseOrBuilder.java      |  2 +-
 .../admin/v1/MigrationProgressEvent.java      |  2 +-
 .../v1/MigrationProgressEventOrBuilder.java   |  2 +-
 .../datastore/admin/v1/MigrationProto.java    |  2 +-
 .../datastore/admin/v1/MigrationState.java    |  2 +-
 .../admin/v1/MigrationStateEvent.java         |  2 +-
 .../v1/MigrationStateEventOrBuilder.java      |  2 +-
 .../datastore/admin/v1/MigrationStep.java     |  2 +-
 .../datastore/admin/v1/OperationType.java     |  2 +-
 .../google/datastore/admin/v1/Progress.java   |  2 +-
 .../datastore/admin/v1/ProgressOrBuilder.java |  2 +-
 .../google/datastore/v1/AggregationQuery.java |  2 +-
 .../v1/AggregationQueryOrBuilder.java         |  2 +-
 .../datastore/v1/AggregationResult.java       |  2 +-
 .../datastore/v1/AggregationResultBatch.java  |  2 +-
 .../v1/AggregationResultBatchOrBuilder.java   |  2 +-
 .../v1/AggregationResultOrBuilder.java        |  2 +-
 .../datastore/v1/AggregationResultProto.java  |  2 +-
 .../datastore/v1/AllocateIdsRequest.java      |  2 +-
 .../v1/AllocateIdsRequestOrBuilder.java       |  2 +-
 .../datastore/v1/AllocateIdsResponse.java     |  2 +-
 .../v1/AllocateIdsResponseOrBuilder.java      |  2 +-
 .../com/google/datastore/v1/ArrayValue.java   |  2 +-
 .../datastore/v1/ArrayValueOrBuilder.java     |  2 +-
 .../datastore/v1/BeginTransactionRequest.java |  2 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |  2 +-
 .../v1/BeginTransactionResponse.java          |  2 +-
 .../v1/BeginTransactionResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/CommitRequest.java    |  2 +-
 .../datastore/v1/CommitRequestOrBuilder.java  |  2 +-
 .../google/datastore/v1/CommitResponse.java   |  2 +-
 .../datastore/v1/CommitResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/CompositeFilter.java  |  2 +-
 .../v1/CompositeFilterOrBuilder.java          |  2 +-
 .../google/datastore/v1/DatastoreProto.java   |  2 +-
 .../java/com/google/datastore/v1/Entity.java  |  2 +-
 .../google/datastore/v1/EntityOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/EntityProto.java  |  2 +-
 .../com/google/datastore/v1/EntityResult.java |  2 +-
 .../datastore/v1/EntityResultOrBuilder.java   |  2 +-
 .../google/datastore/v1/ExecutionStats.java   |  2 +-
 .../datastore/v1/ExecutionStatsOrBuilder.java |  2 +-
 .../google/datastore/v1/ExplainMetrics.java   |  2 +-
 .../datastore/v1/ExplainMetricsOrBuilder.java |  2 +-
 .../google/datastore/v1/ExplainOptions.java   |  2 +-
 .../datastore/v1/ExplainOptionsOrBuilder.java |  2 +-
 .../java/com/google/datastore/v1/Filter.java  |  2 +-
 .../google/datastore/v1/FilterOrBuilder.java  |  2 +-
 .../com/google/datastore/v1/FindNearest.java  |  2 +-
 .../datastore/v1/FindNearestOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/GqlQuery.java     |  2 +-
 .../datastore/v1/GqlQueryOrBuilder.java       |  2 +-
 .../datastore/v1/GqlQueryParameter.java       |  2 +-
 .../v1/GqlQueryParameterOrBuilder.java        |  2 +-
 .../java/com/google/datastore/v1/Key.java     |  2 +-
 .../com/google/datastore/v1/KeyOrBuilder.java |  2 +-
 .../google/datastore/v1/KindExpression.java   |  2 +-
 .../datastore/v1/KindExpressionOrBuilder.java |  2 +-
 .../google/datastore/v1/LookupRequest.java    |  2 +-
 .../datastore/v1/LookupRequestOrBuilder.java  |  2 +-
 .../google/datastore/v1/LookupResponse.java   |  2 +-
 .../datastore/v1/LookupResponseOrBuilder.java |  2 +-
 .../com/google/datastore/v1/Mutation.java     |  2 +-
 .../datastore/v1/MutationOrBuilder.java       |  2 +-
 .../google/datastore/v1/MutationResult.java   |  2 +-
 .../datastore/v1/MutationResultOrBuilder.java |  2 +-
 .../com/google/datastore/v1/PartitionId.java  |  2 +-
 .../datastore/v1/PartitionIdOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/PlanSummary.java  |  2 +-
 .../datastore/v1/PlanSummaryOrBuilder.java    |  2 +-
 .../com/google/datastore/v1/Projection.java   |  2 +-
 .../datastore/v1/ProjectionOrBuilder.java     |  2 +-
 .../google/datastore/v1/PropertyFilter.java   |  2 +-
 .../datastore/v1/PropertyFilterOrBuilder.java |  2 +-
 .../com/google/datastore/v1/PropertyMask.java |  2 +-
 .../datastore/v1/PropertyMaskOrBuilder.java   |  2 +-
 .../google/datastore/v1/PropertyOrder.java    |  2 +-
 .../datastore/v1/PropertyOrderOrBuilder.java  |  2 +-
 .../datastore/v1/PropertyReference.java       |  2 +-
 .../v1/PropertyReferenceOrBuilder.java        |  2 +-
 .../datastore/v1/PropertyTransform.java       |  2 +-
 .../v1/PropertyTransformOrBuilder.java        |  2 +-
 .../java/com/google/datastore/v1/Query.java   |  2 +-
 .../google/datastore/v1/QueryOrBuilder.java   |  2 +-
 .../datastore/v1/QueryProfileProto.java       |  2 +-
 .../com/google/datastore/v1/QueryProto.java   |  2 +-
 .../google/datastore/v1/QueryResultBatch.java |  2 +-
 .../v1/QueryResultBatchOrBuilder.java         |  2 +-
 .../com/google/datastore/v1/ReadOptions.java  |  2 +-
 .../datastore/v1/ReadOptionsOrBuilder.java    |  2 +-
 .../datastore/v1/ReserveIdsRequest.java       |  2 +-
 .../v1/ReserveIdsRequestOrBuilder.java        |  2 +-
 .../datastore/v1/ReserveIdsResponse.java      |  2 +-
 .../v1/ReserveIdsResponseOrBuilder.java       |  2 +-
 .../google/datastore/v1/RollbackRequest.java  |  2 +-
 .../v1/RollbackRequestOrBuilder.java          |  2 +-
 .../google/datastore/v1/RollbackResponse.java |  2 +-
 .../v1/RollbackResponseOrBuilder.java         |  2 +-
 .../v1/RunAggregationQueryRequest.java        |  2 +-
 .../RunAggregationQueryRequestOrBuilder.java  |  2 +-
 .../v1/RunAggregationQueryResponse.java       |  2 +-
 .../RunAggregationQueryResponseOrBuilder.java |  2 +-
 .../google/datastore/v1/RunQueryRequest.java  |  2 +-
 .../v1/RunQueryRequestOrBuilder.java          |  2 +-
 .../google/datastore/v1/RunQueryResponse.java |  2 +-
 .../v1/RunQueryResponseOrBuilder.java         |  2 +-
 .../datastore/v1/TransactionOptions.java      |  2 +-
 .../v1/TransactionOptionsOrBuilder.java       |  2 +-
 .../java/com/google/datastore/v1/Value.java   |  2 +-
 .../google/datastore/v1/ValueOrBuilder.java   |  2 +-
 176 files changed, 196 insertions(+), 205 deletions(-)

diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh
index 92efcf881914..74d0e6cc4105 100644
--- a/.github/scripts/update_generation_config.sh
+++ b/.github/scripts/update_generation_config.sh
@@ -18,7 +18,17 @@ function get_latest_released_version() {
     group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
     url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
     xml_content=$(curl -s --fail "${url}")
-    latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
+    
+    # 1. Extract all version tags
+    # 2. Strip the XML tags to leave just the version numbers
+    # 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
+    # 4. Sort by version (V) and take the last one (tail -n 1)
+    latest=$(echo "${xml_content}" \
+      | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \
+      | sed -E 's/<[^>]+>//g' \
+      | sort -V \
+      | tail -n 1)
+    
     if [[ -z "${latest}" ]]; then
         echo "The latest version of ${group_id}:${artifact_id} is empty."
         echo "The returned json from maven.org is invalid: ${json_content}"
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 8c3df5194ac4..1a975347bee7 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.64.2
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 406018c48a5f..4e7644997676 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 60c82d4bf4fc..c373ff14abc9 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 60982adf5a35..f707020ce505 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index 33ded17da09b..77b5b10ce05d 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.72.0')
+implementation platform('com.google.cloud:libraries-bom:26.74.0-rc2')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
@@ -468,29 +468,10 @@ information.
 
 Apache 2.0 - See [LICENSE][license] for more information.
 
-## CI Status
-
-Java Version | Status
------------- | ------
-Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
-Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
-Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
-Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
-
 Java is a registered trademark of Oracle and/or its affiliates.
 
 [product-docs]: https://cloud.google.com/datastore
 [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
-[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.svg
-[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.html
-[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.svg
-[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.html
-[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-osx.svg
-[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-osx.html
-[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.svg
-[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.html
-[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.svg
-[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
 [maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.33.1
diff --git a/generation_config.yaml b/generation_config.yaml
index 24b12bc7ad94..7941754c953b 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.64.2
-googleapis_commitish: b32495a713a68dd0dff90cf0b24021debfca048a
-libraries_bom_version: 26.72.0
+gapic_generator_version: 2.65.0
+googleapis_commitish: e006e1c8b69c0594e6f872316a3543b3b37ad81b
+libraries_bom_version: 26.74.0-rc2
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
index 9ef7f1edf90d..a0530e22fa49 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
index 35f993cc8ee3..e3912dd53bc7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,8 +97,8 @@
  * }
  *
  * Please refer to the [Client Side Retry
- * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
- * additional support in setting retries.
+ * Guide](https://docs.cloud.google.com/java/docs/client-retries) for additional support in setting
+ * retries.
  *
  * 
    To configure the RetrySettings of a Long Running Operation method, create an
  * OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
index 73f593170298..9e41866814a6 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
index e5a17cc7d166..87e0db23e0fd 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
index 77314c4bc4c4..7564c3ad3cfe 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,8 +118,8 @@
  * }
  *
  * Please refer to the [Client Side Retry
- * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
- * additional support in setting retries.
+ * Guide](https://docs.cloud.google.com/java/docs/client-retries) for additional support in setting
+ * retries.
  *
  * 
    To configure the RetrySettings of a Long Running Operation method, create an
  * OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
index fa1147044143..47629c9a7206 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
index 2e5f450acf06..4d72d06cb4b3 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
index e56561c69564..bb9ec0e59723 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
index 7c1a53ea39f3..5fe4db69959b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java
index e8bea055f101..dfbb17d18878 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java
index 74054341e9b9..74da075c1669 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,8 +94,8 @@
  * }
  *
  * Please refer to the [Client Side Retry
- * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
- * additional support in setting retries.
+ * Guide](https://docs.cloud.google.com/java/docs/client-retries) for additional support in setting
+ * retries.
  */
 @Generated("by gapic-generator-java")
 public class DatastoreSettings extends ClientSettings {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java
index 0484a7c04407..a5a708ed4e79 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java
index 231289f18ebd..5dad98ef9579 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java
index a4554339d2c5..9d7d11a7d7c8 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,8 +106,8 @@
  * }
  *
  * Please refer to the [Client Side Retry
- * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
- * additional support in setting retries.
+ * Guide](https://docs.cloud.google.com/java/docs/client-retries) for additional support in setting
+ * retries.
  */
 @Generated("by gapic-generator-java")
 public class DatastoreStubSettings extends StubSettings {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java
index ffe225259dc3..d0423c6e6f94 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
index d98484faae04..9efdf1e6c4c9 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java
index b12560ab1db3..fbb23e70b585 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java
index 4d77fcac29ac..d0c7e3591863 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
index 60e786eb98f7..61105dee8a7a 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
index e279f543ef1f..a4c32d7c7a5b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
index ab02d565b7f0..0e0d17e4f5c0 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
index 7ac63a381ff7..d9be1ba4d056 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java
index 293c904b99d0..97cead185516 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java
index 909330b51a17..d70d277762b4 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java
index e64c68018b06..35c889815abd 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java
index e37eac6c0963..e65bd2168e78 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
index 865f9b090b73..8f2552416002 100644
--- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
+++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
index 860482c55af7..7fda0f92028c 100644
--- a/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
+++ b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
index d73ecd26c959..0d6df98015af 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
index c27c9174ddfa..59a484b0c75d 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
index 87af20988028..07885be65c65 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
index c60c9be079b3..0dc20129c49c 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 6bf22f9d325a..f9a63cb86526 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
index c87056546b49..7f6e0c89383f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
index 93572d5355a4..000588d7ddc4 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 708a59ff9619..34c33485cc13 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
index 9639e757062d..a1a166d85fa0 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 623478375447..d9ae8b386f1e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 502b42d35845..75e35d5bb07b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6963c8fd11a4..abf0cbe50552 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
index 409b713aeacd..086062f909a6 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5186fbb1a1a7..f5ea6a2f32f4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 73549d372cf4..3ffa58cc1dc3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 bff44706c3e5..a042fe1d4b62 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
index ed131756b10b..1566b7337cf3 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 7ce114e140af..26f1baeee3b3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
index 040281319202..ff233bdd6a33 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 97e2c91e0376..d7b1d6fe4217 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
index bae1dcadddf9..82598a6e85aa 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b7c648983a67..fe762d870ea7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c4707c6faf2d..e6468c5f3927 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5f21b5938485..58f4885b37c4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 90e653e5a528..5760532b9eba 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
index ba20a55a5c7e..c82cb2ef091e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
index 74411b8b4808..fb22e407c2cb 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 fe4ac6f69e41..505a01a0e9af 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 2c444f6b5c6d..0fe980b5ef11 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
index bf5439d9f173..b771745fd58b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8b08cbfcc616..2599f3792dfa 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
index f44ec108bead..75cc023adc9e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 dcc9cf35ad88..e0a527e0f8a3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1ef40bfb5f4f..b9bef59e8118 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 450cebdc4a3c..468872235aa5 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
index 09102a46740b..e710319806e8 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c01f43fcbf22..3a2992566f24 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
index 45e1efc8b92d..149b7b43c8d2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
index 8fc3a261430b..9f9e47d9d1dc 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
index 149901038a91..14a178bdb705 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 04912dba48c8..226d3fdd3165 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
index 0383444f1daa..9952e72f6090 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6e382ea8590f..1abd2b308e1c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 99f400d2c5d6..6d09610d2536 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5d2c3f62bbff..5050ba9df5e5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b40e381951bf..dcdff0999200 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1995aae15049..7eeb07a7a0e0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 609de95b1e0e..8e11000cc547 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
index 0274db53ce76..0b48050e9a93 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5fad3328c10a..3bceb8c32a75 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 bd87ecd134b0..1665521ad527 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 730bda037a0d..792bd26f6d9b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index e442c3c2728e..0a15ec9ca235 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 67de9d652e18..bc9cae3cfbc3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index 0e631b6e27e2..5c64d8281765 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 90c32dc3436e..dffdd9d44e12 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 1ffdcf1769f4..e1513d8cd5a9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4c73112a77df..c69be99ceaf3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index 3f0ad182a5e5..74b0190f99c6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d3af7bbbddc1..dc2995770eda 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 64333f04f464..ec719960e930 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 690d9243e373..ccc3121406dd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 24205c882145..062e2a36efd6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 010b4ff2cfb6..40a7539c4052 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 7ef29d5f92fe..4394f2ef75db 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 97b3ba628053..bca4d71553a9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 67d9354bb29a..b539dc621918 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 61ea8e8ee5bd..b6d546e2fa3f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 17c1c1a303e6..adcd56c78745 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 100c9fad41bc..22432f8ff3fb 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6a02b4c0843b..de6af24cbafc 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
index f6f0ae83d9a2..1cd6d50b1ae7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
index 6289a7e9fb85..4c4d256b37d4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
index abea37234d6a..41ece50d4421 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
index cc1c6625fab6..c49c3827c1a0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
index 720f3e85b8d2..17239c1c7caf 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
index 67d6a51561ac..6f32190d5b39 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8211ea1f2f04..c0a7db151704 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9ef339fa912b..acd6a9ef16a9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
index 08adba2464e2..99b606853c0c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
index 631975f606bf..f4c8408ba14d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 831a282f5dca..4da9e332fb5c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a2d5bf0b3411..8ab95e172501 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 5349f046a02e..69a6fab1f7e6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 bd2cbfc518bf..896cd02f4bd2 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 45c5cd73c8ef..152ae407948f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 612744003a0b..c22132f7971e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d3cc4b102fea..c0e5c0a083bc 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index 0545ef4f8dbe..665248cbc11d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b791a5c0f82c..4f7a85bbad2c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 a39628e443d3..5ade8e4aab06 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 2e80515e021a..e3e2dbf56ace 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 892905cf7229..929916c68eee 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 b65d0ca8b45e..0242260b90c4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8b433c5ade4d..8e5c1a1c7d98 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 71922947d32d..f3c63d99cb2e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 4f01efbb6aea..eee55b02d7be 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 bd8bb8696b43..f321eade7cc7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index c35dfd03fd47..1dbb6bc7dbc8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
index 40b1b94448ad..b3399cbd1d98 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
index 7299584a1053..2692e5f4cff2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 796d5225bcce..dca4ae0ff49f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index 4799bba1aadb..c3a7ccdd6b43 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 8fea5e2163eb..18ec7756c16a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index 02a9da7274ce..ecfb5f3e0de7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
index 9f6e0e5406a6..a5ae3b9e1997 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
index d4038d59fd98..3c237c5e60b8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 381e21973c88..141dacb7cc30 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index 01b8e22f373a..ba2235830275 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 184e3aa5901d..8f95f901ce42 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 503a1dd2441b..9dc18e7dc8ff 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
index 243f3173917a..32df3f0ae294 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
index c9a74555af4f..ae005e6ad68c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 990f78cb926c..f85c1d84f567 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d581848b263e..226e261ed721 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
index 4a6980072b39..2fa5ac143dfe 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 875844726cb3..67392d6cb840 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index f3634d09d860..b188c5c04500 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index d4d2db887876..c6981a114300 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 578c3c132c72..78a93952b61c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 97460f1de2eb..f2de0cd09537 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 4326bd29853f..f4962f595be9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d53ae5cbb576..3568efbd8e1a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 962388f7ad09..9a915ffe949d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 7002f2b45c4a..ff223f82cd99 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 e48e884439b6..a7ec66800898 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6c4f2234ac91..343feed3f722 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 afdb9f900182..6bcf2e82e533 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index b8c871f53e76..9809ceb070a0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 bdae4252dcfd..dbabd22b8301 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 6cf4dc5b1c5e..9994dc734c12 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 d23698c1e844..f0bfa2cc4717 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0c10bc35444f..877b9f58d3d1 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 9ef7a6e0f172..df93c2817823 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 3a7bd8996817..e76e33170636 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 f8c571c1ba7a..967b0ab56d33 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 0d389b65e44e..6cbe1650a296 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 82d8db4c6fa6..7b14b00e0b30 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 c75d40723e2f..61a7fe682d95 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 20ddd8bb560f..4e7a02a242af 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
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 53035cd7cdf9..87693966d6fb 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 6442e1060e80b8476ba4635e1d7cf77f58f8f9eb Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 14 Jan 2026 22:21:02 +0000
Subject: [PATCH 1721/1784] deps: update dependency
 com.google.cloud:sdk-platform-java-config to v3.55.1 (#2027)

---
 .github/workflows/unmanaged_dependency_check.yaml | 2 +-
 google-cloud-datastore-bom/pom.xml                | 2 +-
 pom.xml                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index f908da812113..f265cd541aaa 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.2
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 34b6dd4368f3..3d707afa4980 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.54.2
+    3.55.1
   
 
   Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 462070dc8235..2eace59b60ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   
     com.google.cloud
     sdk-platform-java-config
-    3.54.2
+    3.55.1
   
 
   

From de3236d23abdafe9836310b097b1ff17642f16d8 Mon Sep 17 00:00:00 2001
From: Mend Renovate 
Date: Wed, 14 Jan 2026 22:21:29 +0000
Subject: [PATCH 1722/1784] deps: update googleapis/sdk-platform-java action to
 v2.65.1 (#2029)

---
 .github/workflows/hermetic_library_generation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 1a975347bee7..1716ff0b495d 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

From 5d9bfd206ba9adc5ab9a9b16f5614ab7014cae92 Mon Sep 17 00:00:00 2001
From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
Date: Thu, 15 Jan 2026 10:36:44 -0500
Subject: [PATCH 1723/1784] chore: Update generation configuration at Thu Jan
 15 02:36:12 UTC 2026 (#2030)

* chore: Update generation configuration at Wed Jan 14 02:40:25 UTC 2026

* chore: generate libraries at Wed Jan 14 02:40:55 UTC 2026

* chore: Update generation configuration at Thu Jan 15 02:36:12 UTC 2026

---------

Co-authored-by: Diego Marquez 
---
 .kokoro/presubmit/graalvm-native-a.cfg | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg | 2 +-
 README.md                              | 2 +-
 generation_config.yaml                 | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 4e7644997676..623fedf2040a 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index c373ff14abc9..bee69fa91d3e 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index f707020ce505..b742f6ec44c7 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/README.md b/README.md
index 77b5b10ce05d..9a7bf6bf056c 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.74.0-rc2')
+implementation platform('com.google.cloud:libraries-bom:26.73.0')
 
 implementation 'com.google.cloud:google-cloud-datastore'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
index 7941754c953b..16e68051a135 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.65.0
-googleapis_commitish: e006e1c8b69c0594e6f872316a3543b3b37ad81b
-libraries_bom_version: 26.74.0-rc2
+gapic_generator_version: 2.65.1
+googleapis_commitish: 415914bd49d41beaae8a9adb348ee2587c93aa70
+libraries_bom_version: 26.73.0
 libraries:
   - api_shortname: datastore
     name_pretty: Cloud Datastore

From 285e0ec5369ed57d708d7da9484be9ad73d28217 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 11:38:31 -0500
Subject: [PATCH 1724/1784] chore(main): release 2.33.2 (#2028)

* chore(main): release 2.33.2

* chore: generate libraries at Thu Jan 15 15:37:45 UTC 2026

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: cloud-java-bot 
---
 CHANGELOG.md                                  | 14 ++++++++++++++
 README.md                                     |  6 +++---
 datastore-v1-proto-client/pom.xml             |  4 ++--
 google-cloud-datastore-bom/pom.xml            | 10 +++++-----
 google-cloud-datastore-utils/pom.xml          |  4 ++--
 google-cloud-datastore/pom.xml                |  4 ++--
 grpc-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 grpc-google-cloud-datastore-v1/pom.xml        |  4 ++--
 pom.xml                                       | 14 +++++++-------
 proto-google-cloud-datastore-admin-v1/pom.xml |  4 ++--
 proto-google-cloud-datastore-v1/pom.xml       |  4 ++--
 samples/snapshot/pom.xml                      |  2 +-
 versions.txt                                  | 14 +++++++-------
 13 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 155fb4ce16e1..73068ed171cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.33.2](https://github.com/googleapis/java-datastore/compare/v2.33.1...v2.33.2) (2026-01-15)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.65.0 ([4d7dd5a](https://github.com/googleapis/java-datastore/commit/4d7dd5a7e054bd552e5c5a81c8634dcaab4630f0))
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.65.1 ([5d9bfd2](https://github.com/googleapis/java-datastore/commit/5d9bfd206ba9adc5ab9a9b16f5614ab7014cae92))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.55.1 ([#2027](https://github.com/googleapis/java-datastore/issues/2027)) ([6442e10](https://github.com/googleapis/java-datastore/commit/6442e1060e80b8476ba4635e1d7cf77f58f8f9eb))
+* Update googleapis/sdk-platform-java action to v2.65.1 ([#2029](https://github.com/googleapis/java-datastore/issues/2029)) ([de3236d](https://github.com/googleapis/java-datastore/commit/de3236d23abdafe9836310b097b1ff17642f16d8))
+
 ## [2.33.1](https://github.com/googleapis/java-datastore/compare/v2.33.0...v2.33.1) (2025-12-11)
 
 
diff --git a/README.md b/README.md
index 9a7bf6bf056c..d682969de64b 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.33.1'
+implementation 'com.google.cloud:google-cloud-datastore:2.33.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.33.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.33.2"
 ```
 
 ## Authentication
@@ -474,7 +474,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.33.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.33.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index cadbbea61ded..51144a08a434 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.33.2-SNAPSHOT
+  2.33.2
 
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.2-SNAPSHOT
+    2.33.2
   
 
   jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 3d707afa4980..291d5e03af75 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.33.2-SNAPSHOT
+  2.33.2
   pom
   
     com.google.cloud
@@ -52,22 +52,22 @@
       
         com.google.cloud
         google-cloud-datastore
-        2.33.2-SNAPSHOT
+        2.33.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.2-SNAPSHOT
+        2.33.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.2-SNAPSHOT
+        0.124.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.33.2-SNAPSHOT
+        2.33.2
       
     
   
diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml
index 74f717c84d08..3d5e26875790 100644
--- a/google-cloud-datastore-utils/pom.xml
+++ b/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-datastore-utils
-    2.33.2-SNAPSHOT
+    2.33.2
     jar
     Google Cloud Datastore Utilities
     https://github.com/googleapis/java-datastore
@@ -13,7 +13,7 @@
     
         com.google.cloud
         google-cloud-datastore-parent
-        2.33.2-SNAPSHOT
+        2.33.2
     
     
         google-cloud-datastore-utils
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 30867c3e3cd1..fe82b404848d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  2.33.2-SNAPSHOT
+  2.33.2
   jar
   Google Cloud Datastore
   https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.2-SNAPSHOT
+    2.33.2
   
   
     google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index b7594dec6be4..da9cf6beeb52 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.33.2-SNAPSHOT
+  2.33.2
   grpc-google-cloud-datastore-admin-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.2-SNAPSHOT
+    2.33.2
   
   
     
diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml
index faaad2fc0299..985fa662c700 100644
--- a/grpc-google-cloud-datastore-v1/pom.xml
+++ b/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-datastore-v1
-  2.33.2-SNAPSHOT
+  2.33.2
   grpc-google-cloud-datastore-v1
   GRPC library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.2-SNAPSHOT
+    2.33.2
   
   
     
diff --git a/pom.xml b/pom.xml
index 2eace59b60ca..1903cc15fdc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-datastore-parent
   pom
-  2.33.2-SNAPSHOT
+  2.33.2
   Google Cloud Datastore Parent
   https://github.com/googleapis/java-datastore
   
@@ -162,27 +162,27 @@
       
         com.google.api.grpc
         proto-google-cloud-datastore-admin-v1
-        2.33.2-SNAPSHOT
+        2.33.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-admin-v1
-        2.33.2-SNAPSHOT
+        2.33.2
       
       
         com.google.cloud
         google-cloud-datastore
-        2.33.2-SNAPSHOT
+        2.33.2
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.124.2-SNAPSHOT
+        0.124.2
       
       
         com.google.api.grpc
         grpc-google-cloud-datastore-v1
-        2.33.2-SNAPSHOT
+        2.33.2
       
       
         com.google.cloud
@@ -192,7 +192,7 @@
       
         com.google.cloud.datastore
         datastore-v1-proto-client
-        2.33.2-SNAPSHOT
+        2.33.2
         
           
             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 12c48a4f6825..b1146db027e2 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.33.2-SNAPSHOT
+  2.33.2
   proto-google-cloud-datastore-admin-v1
   Proto library for google-cloud-datastore
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.2-SNAPSHOT
+    2.33.2
   
   
     
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 3e547c45139c..38fd3a72f0fe 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.124.2-SNAPSHOT
+  0.124.2
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.cloud
     google-cloud-datastore-parent
-    2.33.2-SNAPSHOT
+    2.33.2
   
   
     
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index bb807f056d88..54b876b0496b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-datastore
-      2.33.2-SNAPSHOT
+      2.33.2
     
     
 
diff --git a/versions.txt b/versions.txt
index 75ebd5906d76..5eedb470be03 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-datastore:2.33.1:2.33.2-SNAPSHOT
-google-cloud-datastore-bom:2.33.1:2.33.2-SNAPSHOT
-proto-google-cloud-datastore-v1:0.124.1:0.124.2-SNAPSHOT
-datastore-v1-proto-client:2.33.1:2.33.2-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.33.1:2.33.2-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.33.1:2.33.2-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.33.1:2.33.2-SNAPSHOT
+google-cloud-datastore:2.33.2:2.33.2
+google-cloud-datastore-bom:2.33.2:2.33.2
+proto-google-cloud-datastore-v1:0.124.2:0.124.2
+datastore-v1-proto-client:2.33.2:2.33.2
+proto-google-cloud-datastore-admin-v1:2.33.2:2.33.2
+grpc-google-cloud-datastore-admin-v1:2.33.2:2.33.2
+grpc-google-cloud-datastore-v1:2.33.2:2.33.2

From 02ad0d8dd18f9d30ef14f86a5edfa3ce9b7c6a67 Mon Sep 17 00:00:00 2001
From: Diego Marquez 
Date: Thu, 22 Jan 2026 19:56:35 -0500
Subject: [PATCH 1725/1784] chore: update workflow github token (#2034)

* chore: update workflow github token

* chore: generate libraries at Thu Jan 22 20:25:14 UTC 2026

---------

Co-authored-by: cloud-java-bot 
---
 .github/workflows/hermetic_library_generation.yaml | 4 ++--
 .github/workflows/update_generation_config.yaml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 1716ff0b495d..58f0df638e71 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -36,10 +36,10 @@ jobs:
       if: env.SHOULD_RUN == 'true'
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
         head_ref: ${{ github.head_ref }}
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml
index a7e14bb483c3..8de9d67eae71 100644
--- a/.github/workflows/update_generation_config.yaml
+++ b/.github/workflows/update_generation_config.yaml
@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - name: Install Dependencies
       shell: bash
       run: sudo apt-get update && sudo apt-get install -y libxml2-utils
@@ -43,5 +43,5 @@ jobs:
           --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
 

From 6a76569734fad261c6890c9ebe2a77d37cfb33ee Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Mon, 22 Dec 2025 15:52:48 -0500
Subject: [PATCH 1726/1784] chore: add monorepo migration script

---
 monorepo-migration/migrate.sh | 119 ++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 monorepo-migration/migrate.sh

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
new file mode 100644
index 000000000000..856ca724417e
--- /dev/null
+++ b/monorepo-migration/migrate.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Exit on error
+set -e
+
+# Configuration
+MONOREPO_URL="https://github.com/googleapis/google-cloud-java"
+SOURCE_REPO_URL="https://github.com/googleapis/java-logging"
+
+# Derive names from URLs to avoid duplication
+SOURCE_REPO_NAME="${SOURCE_REPO_URL##*/}"
+MONOREPO_NAME="${MONOREPO_URL##*/}"
+
+# Use a temporary working directory sibling to the current monorepo
+WORKING_DIR="../../../migration-work"
+SOURCE_DIR="$WORKING_DIR/$SOURCE_REPO_NAME-source"
+TARGET_DIR="$WORKING_DIR/$MONOREPO_NAME-target"
+
+echo "Starting migration using git read-tree with isolated clones..."
+
+# 0. Create working directory
+mkdir -p "$WORKING_DIR"
+
+# 1. Clone the source repository
+if [ ! -d "$SOURCE_DIR" ]; then
+    echo "Cloning source repo: $SOURCE_REPO_URL into $SOURCE_DIR"
+    git clone "$SOURCE_REPO_URL" "$SOURCE_DIR"
+else
+    echo "Source directory $SOURCE_DIR already exists. Ensuring it is clean and up-to-date..."
+    cd "$SOURCE_DIR"
+    git fetch origin
+    git checkout -f main
+    git reset --hard origin/main
+    git clean -fd
+    cd - > /dev/null
+fi
+
+# 2. Clone the target monorepo (the "isolated clone")
+if [ ! -d "$TARGET_DIR" ]; then
+    echo "Cloning target monorepo: $MONOREPO_URL into $TARGET_DIR"
+    git clone "$MONOREPO_URL" "$TARGET_DIR"
+else
+    echo "Target directory $TARGET_DIR already exists. Ensuring it is clean and up-to-date..."
+    cd "$TARGET_DIR"
+    git fetch origin
+    git checkout -f main
+    git reset --hard origin/main
+    git clean -fd
+    cd - > /dev/null
+fi
+
+cd "$TARGET_DIR"
+
+# Ensure we are on a clean main branch in the target clone
+echo "Ensuring clean state in target monorepo..."
+git fetch origin
+git reset --hard HEAD
+git clean -fd
+git checkout -f main
+git reset --hard origin/main
+
+# 2.5 Create a new feature branch for the migration
+BRANCH_NAME="feat/migrate-$SOURCE_REPO_NAME"
+echo "Creating feature branch: $BRANCH_NAME"
+if git branch | grep -q "$BRANCH_NAME"; then
+    git branch -D "$BRANCH_NAME"
+fi
+git checkout -b "$BRANCH_NAME"
+
+# 3. Add the source repo as a remote
+echo "Adding remote for $SOURCE_REPO_NAME: $SOURCE_DIR"
+if git remote | grep -q "^$SOURCE_REPO_NAME$"; then
+    git remote remove "$SOURCE_REPO_NAME"
+fi
+git remote add "$SOURCE_REPO_NAME" "../$SOURCE_REPO_NAME-source"
+
+# 4. Fetch the source repo
+echo "Fetching $SOURCE_REPO_NAME..."
+git fetch "$SOURCE_REPO_NAME"
+
+# 5. Merge the histories using 'ours' strategy to keep monorepo content
+echo "Merging histories (strategy: ours)..."
+git merge --allow-unrelated-histories --no-ff "$SOURCE_REPO_NAME/main" -s ours --no-commit -m "feat($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
+
+# 6. Read the tree from the source repo into the desired subdirectory
+echo "Reading tree into prefix $SOURCE_REPO_NAME/..."
+if [ -d "$SOURCE_REPO_NAME" ]; then
+    rm -rf "$SOURCE_REPO_NAME"
+fi
+git read-tree --prefix="$SOURCE_REPO_NAME/" -u "$SOURCE_REPO_NAME/main"
+
+# 7. Commit the changes
+echo "Committing migration..."
+git commit -n --no-gpg-sign -m "feat($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
+
+# 8. Update the root pom.xml to include the new module
+echo "Updating root pom.xml..."
+if [ -f "pom.xml" ]; then
+    # Check if module already exists
+    if grep -q "$SOURCE_REPO_NAME" pom.xml; then
+        echo "Module $SOURCE_REPO_NAME already exists in pom.xml"
+    else
+        # Insert the module before the closing  tag
+        sed -i '' "/<\/modules>/i\\
+\\    $SOURCE_REPO_NAME
+" pom.xml
+        echo "Added $SOURCE_REPO_NAME to pom.xml"
+    fi
+else
+    echo "Warning: root pom.xml not found"
+fi
+
+# 9. Cleanup
+echo "Cleaning up temporary source clone..."
+rm -rf "$SOURCE_DIR"
+
+echo "Migration complete!"
+echo "The migrated codebase is available in: $TARGET_DIR"
+echo "You are on the $BRANCH_NAME branch in that clone."

From a334f916bcd81f08bb0ce8ae12131157dbbf5780 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Mon, 22 Dec 2025 15:59:08 -0500
Subject: [PATCH 1727/1784] chore: fix path

---
 monorepo-migration/migrate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 monorepo-migration/migrate.sh

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
old mode 100644
new mode 100755
index 856ca724417e..4eba1c3908c1
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -12,7 +12,7 @@ SOURCE_REPO_NAME="${SOURCE_REPO_URL##*/}"
 MONOREPO_NAME="${MONOREPO_URL##*/}"
 
 # Use a temporary working directory sibling to the current monorepo
-WORKING_DIR="../../../migration-work"
+WORKING_DIR="../../migration-work"
 SOURCE_DIR="$WORKING_DIR/$SOURCE_REPO_NAME-source"
 TARGET_DIR="$WORKING_DIR/$MONOREPO_NAME-target"
 

From 01c4873d7dca2cf66f3bae0a71ff099ed40672aa Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Mon, 22 Dec 2025 16:11:25 -0500
Subject: [PATCH 1728/1784] chore: refine migration script for atomic commits
 and isolation

---
 monorepo-migration/migrate.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 4eba1c3908c1..21c1f134d899 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -60,9 +60,9 @@ git checkout -f main
 git reset --hard origin/main
 
 # 2.5 Create a new feature branch for the migration
-BRANCH_NAME="feat/migrate-$SOURCE_REPO_NAME"
+BRANCH_NAME="migrate-$SOURCE_REPO_NAME"
 echo "Creating feature branch: $BRANCH_NAME"
-if git branch | grep -q "$BRANCH_NAME"; then
+if git rev-parse --verify "$BRANCH_NAME" >/dev/null 2>&1; then
     git branch -D "$BRANCH_NAME"
 fi
 git checkout -b "$BRANCH_NAME"
@@ -80,7 +80,7 @@ git fetch "$SOURCE_REPO_NAME"
 
 # 5. Merge the histories using 'ours' strategy to keep monorepo content
 echo "Merging histories (strategy: ours)..."
-git merge --allow-unrelated-histories --no-ff "$SOURCE_REPO_NAME/main" -s ours --no-commit -m "feat($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
+git merge --allow-unrelated-histories --no-ff "$SOURCE_REPO_NAME/main" -s ours --no-commit -m "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
 
 # 6. Read the tree from the source repo into the desired subdirectory
 echo "Reading tree into prefix $SOURCE_REPO_NAME/..."
@@ -89,9 +89,9 @@ if [ -d "$SOURCE_REPO_NAME" ]; then
 fi
 git read-tree --prefix="$SOURCE_REPO_NAME/" -u "$SOURCE_REPO_NAME/main"
 
-# 7. Commit the changes
+# 7. Commit the migration
 echo "Committing migration..."
-git commit -n --no-gpg-sign -m "feat($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
+git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
 
 # 8. Update the root pom.xml to include the new module
 echo "Updating root pom.xml..."
@@ -105,6 +105,8 @@ if [ -f "pom.xml" ]; then
 \\    $SOURCE_REPO_NAME
 " pom.xml
         echo "Added $SOURCE_REPO_NAME to pom.xml"
+        git add pom.xml
+        git commit -n --no-gpg-sign -m "chore: add $SOURCE_REPO_NAME module to root pom.xml"
     fi
 else
     echo "Warning: root pom.xml not found"

From 58d624c3ff41cbca7f5f574ce8c5e634862e5dbf Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 11:10:52 -0500
Subject: [PATCH 1729/1784] chore: remove pom.xml update logic from migration
 script

---
 monorepo-migration/migrate.sh | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 21c1f134d899..c9f279d52871 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -93,26 +93,7 @@ git read-tree --prefix="$SOURCE_REPO_NAME/" -u "$SOURCE_REPO_NAME/main"
 echo "Committing migration..."
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
 
-# 8. Update the root pom.xml to include the new module
-echo "Updating root pom.xml..."
-if [ -f "pom.xml" ]; then
-    # Check if module already exists
-    if grep -q "$SOURCE_REPO_NAME" pom.xml; then
-        echo "Module $SOURCE_REPO_NAME already exists in pom.xml"
-    else
-        # Insert the module before the closing  tag
-        sed -i '' "/<\/modules>/i\\
-\\    $SOURCE_REPO_NAME
-" pom.xml
-        echo "Added $SOURCE_REPO_NAME to pom.xml"
-        git add pom.xml
-        git commit -n --no-gpg-sign -m "chore: add $SOURCE_REPO_NAME module to root pom.xml"
-    fi
-else
-    echo "Warning: root pom.xml not found"
-fi
-
-# 9. Cleanup
+# 8. Cleanup
 echo "Cleaning up temporary source clone..."
 rm -rf "$SOURCE_DIR"
 

From 28ef2e69b3ae138bb6790c9d01f29c5d948ae7ff Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 11:45:16 -0500
Subject: [PATCH 1730/1784] chore: implement GitHub Actions workflow migration
 using paths-filter

---
 monorepo-migration/migrate.sh | 81 +++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index c9f279d52871..49e32164e312 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -93,6 +93,87 @@ git read-tree --prefix="$SOURCE_REPO_NAME/" -u "$SOURCE_REPO_NAME/main"
 echo "Committing migration..."
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
 
+# 7.5 Migrate GitHub Actions workflows
+echo "Checking for GitHub Actions workflows..."
+if [ -d "$SOURCE_REPO_NAME/.github/workflows" ]; then
+    echo "Migrating workflows to root .github/workflows/..."
+    mkdir -p .github/workflows
+    
+    # Create a temporary python script for robust YAML transformation
+    cat << 'EOF' > transform_workflow.py
+import sys
+import re
+
+def transform(content, lib_name):
+    lines = content.splitlines()
+    new_lines = []
+    inserted_defaults = False
+    
+    filter_job = f"""  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      library: ${{{{ steps.filter.outputs.library }}}}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          library:
+            - '{lib_name}/**'"""
+
+    in_jobs = False
+    for line in lines:
+        if line.startswith('jobs:'):
+            if not inserted_defaults:
+                new_lines.append("defaults:")
+                new_lines.append("  run:")
+                new_lines.append(f"    working-directory: {lib_name}")
+                inserted_defaults = True
+            new_lines.append(line)
+            new_lines.append(filter_job)
+            in_jobs = True
+            continue
+            
+        if in_jobs and line.startswith('  ') and not line.startswith('    ') and line.strip() and not line.strip().startswith('#'):
+            job_match = re.match(r'^  ([\w-]+):', line)
+            if job_match:
+                job_name = job_match.group(1)
+                if job_name != 'filter':
+                    new_lines.append(line)
+                    new_lines.append("    needs: filter")
+                    new_lines.append(f"    if: ${{{{ needs.filter.outputs.library == 'true' }}}}")
+                    continue
+        
+        new_lines.append(line)
+    return "\n".join(new_lines)
+
+if __name__ == "__main__":
+    lib = sys.argv[1]
+    print(transform(sys.stdin.read(), lib))
+EOF
+
+    for workflow in "$SOURCE_REPO_NAME/.github/workflows/"*; do
+        if [ -f "$workflow" ]; then
+            filename=$(basename "$workflow")
+            new_filename="${SOURCE_REPO_NAME}-${filename}"
+            target_path=".github/workflows/$new_filename"
+            
+            echo "Migrating and adapting $filename to $target_path"
+            python3 transform_workflow.py "$SOURCE_REPO_NAME" < "$workflow" > "$target_path"
+        fi
+    done
+    
+    rm transform_workflow.py
+    
+    # Cleanup empty .github directory if it exists
+    rm -rf "$SOURCE_REPO_NAME/.github"
+    
+    echo "Committing workflow migration..."
+    git add .github/workflows
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate and adapt GitHub Actions workflows"
+fi
+
 # 8. Cleanup
 echo "Cleaning up temporary source clone..."
 rm -rf "$SOURCE_DIR"

From 547682fbb5cb000ac0f98788b1343dbdbe032292 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 12:21:22 -0500
Subject: [PATCH 1731/1784] chore: skip redundant workflows and update
 generation_config.yaml

---
 monorepo-migration/migrate.sh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 49e32164e312..d3c1273a09f9 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -156,6 +156,13 @@ EOF
     for workflow in "$SOURCE_REPO_NAME/.github/workflows/"*; do
         if [ -f "$workflow" ]; then
             filename=$(basename "$workflow")
+            
+            # Skip redundant workflows as requested by user
+            if [ "$filename" == "hermetic_library_generation.yaml" ] || [ "$filename" == "update_generation_config.yaml" ]; then
+                echo "Skipping redundant workflow: $filename"
+                continue
+            fi
+            
             new_filename="${SOURCE_REPO_NAME}-${filename}"
             target_path=".github/workflows/$new_filename"
             
@@ -174,6 +181,27 @@ EOF
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate and adapt GitHub Actions workflows"
 fi
 
+# 7.6 Update generation_config.yaml
+echo "Updating generation_config.yaml..."
+SOURCE_CONFIG="$SOURCE_REPO_NAME/generation_config.yaml"
+if [ -f "$SOURCE_CONFIG" ]; then
+    # Extract the library entry (starts with - api_shortname)
+    # This assumes the source config only has one library or we want the first one
+    ENTRY=$(awk '/^  - api_shortname:/{flag=1; print $0; next} /^  - / && flag{flag=0} flag' "$SOURCE_CONFIG")
+    
+    # Simple cleanup: remove repo and repo_short if they exist
+    # Adjust indentation to match monorepo (0 spaces for -)
+    CLEAN_ENTRY=$(echo "$ENTRY" | sed '/repo:/d' | sed '/repo_short:/d' | sed 's/^  //')
+    
+    # Append to target generation_config.yaml
+    echo "" >> generation_config.yaml
+    echo "$CLEAN_ENTRY" >> generation_config.yaml
+    
+    echo "Committing generation_config.yaml update..."
+    git add generation_config.yaml
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add library to generation_config.yaml"
+fi
+
 # 8. Cleanup
 echo "Cleaning up temporary source clone..."
 rm -rf "$SOURCE_DIR"

From 5a392d288f7763c841712c99ce9c1928570b87fd Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 13:34:18 -0500
Subject: [PATCH 1732/1784] chore: expand workflow skip list to include
 samples, release, and more

---
 monorepo-migration/migrate.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index d3c1273a09f9..f575e43a633a 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -156,12 +156,16 @@ EOF
     for workflow in "$SOURCE_REPO_NAME/.github/workflows/"*; do
         if [ -f "$workflow" ]; then
             filename=$(basename "$workflow")
-            
+
             # Skip redundant workflows as requested by user
-            if [ "$filename" == "hermetic_library_generation.yaml" ] || [ "$filename" == "update_generation_config.yaml" ]; then
-                echo "Skipping redundant workflow: $filename"
-                continue
-            fi
+            case "$filename" in
+                "hermetic_library_generation.yaml" | "update_generation_config.yaml" | \
+                "approve-readme.yaml" | "auto-release.yaml" | "renovate_config_check.yaml" | \
+                "samples.yaml" | "unmanaged_dependency_check.yaml")
+                    echo "Skipping redundant workflow: $filename"
+                    continue
+                    ;;
+            esac
             
             new_filename="${SOURCE_REPO_NAME}-${filename}"
             target_path=".github/workflows/$new_filename"

From 2a82e1bcfc0c746ee4ff507abdd1c15a2933b203 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 13:51:21 -0500
Subject: [PATCH 1733/1784] chore: make workflow transformation logic a
 permanent script and rename workflows

---
 monorepo-migration/migrate.sh            | 62 ++----------------------
 monorepo-migration/transform_workflow.py | 62 ++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 57 deletions(-)
 create mode 100644 monorepo-migration/transform_workflow.py

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index f575e43a633a..e7781460dd20 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -16,6 +16,10 @@ WORKING_DIR="../../migration-work"
 SOURCE_DIR="$WORKING_DIR/$SOURCE_REPO_NAME-source"
 TARGET_DIR="$WORKING_DIR/$MONOREPO_NAME-target"
 
+# Get absolute path to the transformation script before any cd
+TRANSFORM_SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+TRANSFORM_SCRIPT="$TRANSFORM_SCRIPT_DIR/transform_workflow.py"
+
 echo "Starting migration using git read-tree with isolated clones..."
 
 # 0. Create working directory
@@ -99,60 +103,6 @@ if [ -d "$SOURCE_REPO_NAME/.github/workflows" ]; then
     echo "Migrating workflows to root .github/workflows/..."
     mkdir -p .github/workflows
     
-    # Create a temporary python script for robust YAML transformation
-    cat << 'EOF' > transform_workflow.py
-import sys
-import re
-
-def transform(content, lib_name):
-    lines = content.splitlines()
-    new_lines = []
-    inserted_defaults = False
-    
-    filter_job = f"""  filter:
-    runs-on: ubuntu-latest
-    outputs:
-      library: ${{{{ steps.filter.outputs.library }}}}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: dorny/paths-filter@v3
-      id: filter
-      with:
-        filters: |
-          library:
-            - '{lib_name}/**'"""
-
-    in_jobs = False
-    for line in lines:
-        if line.startswith('jobs:'):
-            if not inserted_defaults:
-                new_lines.append("defaults:")
-                new_lines.append("  run:")
-                new_lines.append(f"    working-directory: {lib_name}")
-                inserted_defaults = True
-            new_lines.append(line)
-            new_lines.append(filter_job)
-            in_jobs = True
-            continue
-            
-        if in_jobs and line.startswith('  ') and not line.startswith('    ') and line.strip() and not line.strip().startswith('#'):
-            job_match = re.match(r'^  ([\w-]+):', line)
-            if job_match:
-                job_name = job_match.group(1)
-                if job_name != 'filter':
-                    new_lines.append(line)
-                    new_lines.append("    needs: filter")
-                    new_lines.append(f"    if: ${{{{ needs.filter.outputs.library == 'true' }}}}")
-                    continue
-        
-        new_lines.append(line)
-    return "\n".join(new_lines)
-
-if __name__ == "__main__":
-    lib = sys.argv[1]
-    print(transform(sys.stdin.read(), lib))
-EOF
-
     for workflow in "$SOURCE_REPO_NAME/.github/workflows/"*; do
         if [ -f "$workflow" ]; then
             filename=$(basename "$workflow")
@@ -171,12 +121,10 @@ EOF
             target_path=".github/workflows/$new_filename"
             
             echo "Migrating and adapting $filename to $target_path"
-            python3 transform_workflow.py "$SOURCE_REPO_NAME" < "$workflow" > "$target_path"
+            python3 "$TRANSFORM_SCRIPT" "$SOURCE_REPO_NAME" < "$workflow" > "$target_path"
         fi
     done
     
-    rm transform_workflow.py
-    
     # Cleanup empty .github directory if it exists
     rm -rf "$SOURCE_REPO_NAME/.github"
     
diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
new file mode 100644
index 000000000000..b40dd9f4ebd7
--- /dev/null
+++ b/monorepo-migration/transform_workflow.py
@@ -0,0 +1,62 @@
+import sys
+import re
+
+def transform(content, lib_name):
+    lines = content.splitlines()
+    new_lines = []
+    inserted_defaults = False
+    
+    filter_job = f"""  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      library: ${{{{ steps.filter.outputs.library }}}}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          library:
+            - '{lib_name}/**'"""
+
+    in_jobs = False
+    for line in lines:
+        if line.startswith('name:') and not in_jobs:
+            name_match = re.match(r'^name:\s*(.*)', line)
+            if name_match:
+                orig_name = name_match.group(1).strip()
+                # Remove quotes if they exist
+                orig_name = orig_name.strip("\"'")
+                new_lines.append(f"name: {lib_name} {orig_name}")
+                continue
+
+        if line.startswith('jobs:'):
+            if not inserted_defaults:
+                new_lines.append("defaults:")
+                new_lines.append("  run:")
+                new_lines.append(f"    working-directory: {lib_name}")
+                inserted_defaults = True
+            new_lines.append(line)
+            new_lines.append(filter_job)
+            in_jobs = True
+            continue
+            
+        if in_jobs and line.startswith('  ') and not line.startswith('    ') and line.strip() and not line.strip().startswith('#'):
+            job_match = re.match(r'^  ([\w-]+):', line)
+            if job_match:
+                job_name = job_match.group(1)
+                if job_name != 'filter':
+                    new_lines.append(line)
+                    new_lines.append("    needs: filter")
+                    new_lines.append(f"    if: ${{{{ needs.filter.outputs.library == 'true' }}}}")
+                    continue
+        
+        new_lines.append(line)
+    return "\n".join(new_lines)
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        print("Usage: python3 transform_workflow.py ")
+        sys.exit(1)
+    lib = sys.argv[1]
+    print(transform(sys.stdin.read(), lib))

From 9d1a84d6955a553535e8137500296a5bac2ed29c Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 14:07:54 -0500
Subject: [PATCH 1734/1784] chore: refine versions.txt consolidation to only
 append data lines

---
 monorepo-migration/migrate.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index e7781460dd20..0168563adea8 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -154,6 +154,21 @@ if [ -f "$SOURCE_CONFIG" ]; then
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add library to generation_config.yaml"
 fi
 
+# 7.7 Consolidate versions.txt
+echo "Consolidating versions.txt..."
+SOURCE_VERSIONS="$SOURCE_REPO_NAME/versions.txt"
+if [ -f "$SOURCE_VERSIONS" ]; then
+    # Append data lines only to root versions.txt (exclude comments/headers)
+    grep "^[a-zA-Z0-9]" "$SOURCE_VERSIONS" >> versions.txt
+    
+    # Remove the migrated subdirectory's versions.txt
+    rm "$SOURCE_VERSIONS"
+    
+    echo "Committing versions.txt update..."
+    git add versions.txt "$SOURCE_VERSIONS"
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): consolidate versions.txt into root"
+fi
+
 # 8. Cleanup
 echo "Cleaning up temporary source clone..."
 rm -rf "$SOURCE_DIR"

From de5c2ac5c2b6902b9102ebdd29abc72fe86011ca Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 14:27:55 -0500
Subject: [PATCH 1735/1784] chore: remove clirr job from workflow
 transformation

---
 monorepo-migration/transform_workflow.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
index b40dd9f4ebd7..0e6b1c6927cb 100644
--- a/monorepo-migration/transform_workflow.py
+++ b/monorepo-migration/transform_workflow.py
@@ -20,6 +20,7 @@ def transform(content, lib_name):
             - '{lib_name}/**'"""
 
     in_jobs = False
+    skip_current_job = False
     for line in lines:
         if line.startswith('name:') and not in_jobs:
             name_match = re.match(r'^name:\s*(.*)', line)
@@ -45,13 +46,20 @@ def transform(content, lib_name):
             job_match = re.match(r'^  ([\w-]+):', line)
             if job_match:
                 job_name = job_match.group(1)
+                if job_name == 'clirr':
+                    skip_current_job = True
+                    continue
+                else:
+                    skip_current_job = False
+                
                 if job_name != 'filter':
                     new_lines.append(line)
                     new_lines.append("    needs: filter")
                     new_lines.append(f"    if: ${{{{ needs.filter.outputs.library == 'true' }}}}")
                     continue
         
-        new_lines.append(line)
+        if not skip_current_job:
+            new_lines.append(line)
     return "\n".join(new_lines)
 
 if __name__ == "__main__":

From 117fa7260563d78b02c60887cb5b013e3fc73534 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 14:35:41 -0500
Subject: [PATCH 1736/1784] chore: add copyright header fix to migration script

---
 monorepo-migration/migrate.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 0168563adea8..f80382ac5bc2 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -169,6 +169,14 @@ if [ -f "$SOURCE_VERSIONS" ]; then
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): consolidate versions.txt into root"
 fi
 
+# 7.8 Fix copyright headers in Java files
+echo "Fixing copyright headers in Java files..."
+find "$SOURCE_REPO_NAME" -name "*.java" -exec python3 -c "import sys, re; p = sys.argv[1]; c = open(p).read(); new_c = re.sub(r'Copyright \d{4} Google (Inc\.|LLC)', 'Copyright 2025 Google LLC', c); open(p, 'w').write(new_c)" {} \;
+
+echo "Committing copyright header fixes..."
+git add "$SOURCE_REPO_NAME"
+git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright headers to 2025 Google LLC"
+
 # 8. Cleanup
 echo "Cleaning up temporary source clone..."
 rm -rf "$SOURCE_DIR"

From ba35c2d0ed4691557328655c4143fa731514b2f6 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin 
Date: Tue, 23 Dec 2025 23:19:47 -0500
Subject: [PATCH 1737/1784] impl: automate reporting removal, build
 verification, and dynamic parent versioning

---
 monorepo-migration/migrate.sh       |  14 ++++
 monorepo-migration/modernize_pom.py | 102 ++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 monorepo-migration/modernize_pom.py

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index f80382ac5bc2..18f5e8d03dc8 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -19,6 +19,7 @@ TARGET_DIR="$WORKING_DIR/$MONOREPO_NAME-target"
 # Get absolute path to the transformation script before any cd
 TRANSFORM_SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 TRANSFORM_SCRIPT="$TRANSFORM_SCRIPT_DIR/transform_workflow.py"
+MODERNIZE_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/modernize_pom.py"
 
 echo "Starting migration using git read-tree with isolated clones..."
 
@@ -177,6 +178,19 @@ echo "Committing copyright header fixes..."
 git add "$SOURCE_REPO_NAME"
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright headers to 2025 Google LLC"
 
+# 7.9 Modernize root pom.xml
+echo "Modernizing root pom.xml..."
+PARENT_VERSION=$(grep -m 1 ".*{x-version-update:google-cloud-java:current}" google-cloud-jar-parent/pom.xml | sed -E 's/.*(.*)<\/version>.*/\1/')
+python3 "$MODERNIZE_POM_SCRIPT" "$SOURCE_REPO_NAME/pom.xml" "$PARENT_VERSION"
+
+echo "Committing root pom.xml modernization..."
+git add "$SOURCE_REPO_NAME/pom.xml"
+git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): modernize root pom.xml"
+
+# 7.10 Verify compilation
+echo "Verifying compilation..."
+(cd "$SOURCE_REPO_NAME" && mvn compile -DskipTests -T 1C)
+
 # 8. Cleanup
 echo "Cleaning up temporary source clone..."
 rm -rf "$SOURCE_DIR"
diff --git a/monorepo-migration/modernize_pom.py b/monorepo-migration/modernize_pom.py
new file mode 100644
index 000000000000..983f2828261c
--- /dev/null
+++ b/monorepo-migration/modernize_pom.py
@@ -0,0 +1,102 @@
+import sys
+import re
+
+def modernize_pom(file_path, parent_version):
+    with open(file_path, 'r') as f:
+        lines = f.readlines()
+
+    new_lines = []
+    in_parent = False
+    in_dep_mgmt = False
+    in_dependencies = False
+    in_dependency = False
+    in_reporting = False
+    current_dependency_lines = []
+    has_x_version_update = False
+
+    for line in lines:
+        # Parent section modernization
+        if '' in line and not in_parent:
+            in_parent = True
+            indent = line[:line.find('<')]
+            new_lines.append(f"{indent}\n")
+            new_lines.append(f"{indent}  com.google.cloud\n")
+            new_lines.append(f"{indent}  google-cloud-jar-parent\n")
+            new_lines.append(f"{indent}  {parent_version}\n")
+            new_lines.append(f"{indent}  ../google-cloud-jar-parent/pom.xml\n")
+            continue
+        if '' in line and in_parent:
+            in_parent = False
+            new_lines.append(line)
+            continue
+        if in_parent:
+            continue # skip original parent content
+
+        # Dependency Management pruning
+        if '' in line:
+            in_dep_mgmt = True
+            new_lines.append(line)
+            continue
+        if '' in line:
+            in_dep_mgmt = False
+            new_lines.append(line)
+            continue
+        
+        if in_dep_mgmt:
+            if '' in line:
+                in_dependencies = True
+                new_lines.append(line)
+                continue
+            if '' in line:
+                in_dependencies = False
+                new_lines.append(line)
+                continue
+            
+            if in_dependencies:
+                if '' in line:
+                    in_dependency = True
+                    current_dependency_lines = [line]
+                    has_x_version_update = False
+                    continue
+                if '' in line:
+                    in_dependency = False
+                    current_dependency_lines.append(line)
+                    if has_x_version_update:
+                        new_lines.extend(current_dependency_lines)
+                    continue
+                
+                if in_dependency:
+                    current_dependency_lines.append(line)
+                    if '{x-version-update:' in line:
+                        has_x_version_update = True
+                    continue
+                
+                # Prune comments and extra whitespace in depMgmt for a cleaner result
+                if not line.strip():
+                    new_lines.append(line)
+                continue
+
+        # Reporting section removal
+        if '' in line:
+            in_reporting = True
+            continue
+        if '' in line:
+            in_reporting = False
+            continue
+        if in_reporting:
+            continue
+
+        new_lines.append(line)
+
+    with open(file_path, 'w') as f:
+        # Clean up double empty lines potentially introduced by pruning
+        content = "".join(new_lines)
+        content = re.sub(r'\n\s*\n\s*\n', '\n\n', content)
+        f.write(content)
+
+if __name__ == "__main__":
+    if len(sys.argv) > 2:
+        modernize_pom(sys.argv[1], sys.argv[2])
+    else:
+        print("Usage: python3 modernize_pom.py  ")
+        sys.exit(1)

From fe58cf08a7af8e9074f4879bf7aecd092d42e0c0 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Mon, 5 Jan 2026 21:14:13 +0000
Subject: [PATCH 1738/1784] feat: add CLI binary checks to migrate.sh

---
 monorepo-migration/migrate.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 18f5e8d03dc8..b60f32e76dc0 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -3,6 +3,19 @@
 # Exit on error
 set -e
 
+# Function to check if a command exists
+check_command() {
+    if ! command -v "$1" >/dev/null 2>&1; then
+        echo "Error: $1 is not installed or not in PATH." >&2
+        exit 1
+    fi
+}
+
+# Check for necessary CLI binaries
+check_command git
+check_command python3
+check_command mvn
+
 # Configuration
 MONOREPO_URL="https://github.com/googleapis/google-cloud-java"
 SOURCE_REPO_URL="https://github.com/googleapis/java-logging"

From 071619234ceebca0efcf8024ab0dd3c40affd3c4 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Tue, 6 Jan 2026 17:12:41 +0000
Subject: [PATCH 1739/1784] chore: allow setting SOURCE_REPO_URL via
 environment variable in migrate.sh

---
 monorepo-migration/migrate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index b60f32e76dc0..0a234982330f 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -18,7 +18,7 @@ check_command mvn
 
 # Configuration
 MONOREPO_URL="https://github.com/googleapis/google-cloud-java"
-SOURCE_REPO_URL="https://github.com/googleapis/java-logging"
+SOURCE_REPO_URL="${SOURCE_REPO_URL:-https://github.com/googleapis/java-logging}"
 
 # Derive names from URLs to avoid duplication
 SOURCE_REPO_NAME="${SOURCE_REPO_URL##*/}"

From 44667979315aa5c25e9caab9436e062082ac3d9b Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Tue, 6 Jan 2026 17:28:51 +0000
Subject: [PATCH 1740/1784] feat: add guard for checking if the repository is
 already migrated

---
 monorepo-migration/migrate.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 0a234982330f..a1639851a0de 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -77,6 +77,14 @@ git clean -fd
 git checkout -f main
 git reset --hard origin/main
 
+# Check if the repository is already migrated
+if [ -d "$SOURCE_REPO_NAME" ]; then
+    echo "Error: Directory $SOURCE_REPO_NAME already exists in the monorepo." >&2
+    echo "This repository seems to have already been migrated." >&2
+    exit 1
+fi
+
+
 # 2.5 Create a new feature branch for the migration
 BRANCH_NAME="migrate-$SOURCE_REPO_NAME"
 echo "Creating feature branch: $BRANCH_NAME"
@@ -102,9 +110,6 @@ git merge --allow-unrelated-histories --no-ff "$SOURCE_REPO_NAME/main" -s ours -
 
 # 6. Read the tree from the source repo into the desired subdirectory
 echo "Reading tree into prefix $SOURCE_REPO_NAME/..."
-if [ -d "$SOURCE_REPO_NAME" ]; then
-    rm -rf "$SOURCE_REPO_NAME"
-fi
 git read-tree --prefix="$SOURCE_REPO_NAME/" -u "$SOURCE_REPO_NAME/main"
 
 # 7. Commit the migration

From 2b5c55fbf52b56379db8f065ddcd41d0f9b14d48 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Tue, 6 Jan 2026 18:47:43 +0000
Subject: [PATCH 1741/1784] feat: add environment variable for specifying
 codeowner team to migrate

---
 monorepo-migration/migrate.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index a1639851a0de..a387a9e840ad 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -19,6 +19,7 @@ check_command mvn
 # Configuration
 MONOREPO_URL="https://github.com/googleapis/google-cloud-java"
 SOURCE_REPO_URL="${SOURCE_REPO_URL:-https://github.com/googleapis/java-logging}"
+CODEOWNER="${CODEOWNER:-}"
 
 # Derive names from URLs to avoid duplication
 SOURCE_REPO_NAME="${SOURCE_REPO_URL##*/}"
@@ -116,6 +117,17 @@ git read-tree --prefix="$SOURCE_REPO_NAME/" -u "$SOURCE_REPO_NAME/main"
 echo "Committing migration..."
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
 
+# 7.1 Update CODEOWNERS
+if [ -n "$CODEOWNER" ]; then
+    echo "Updating .github/CODEOWNERS..."
+    mkdir -p .github
+    echo "/$SOURCE_REPO_NAME/ $CODEOWNER @googleapis/cloud-java-team-teamsync" >> .github/CODEOWNERS
+
+    echo "Committing CODEOWNERS update..."
+    git add .github/CODEOWNERS
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add code owners for $SOURCE_REPO_NAME"
+fi
+
 # 7.5 Migrate GitHub Actions workflows
 echo "Checking for GitHub Actions workflows..."
 if [ -d "$SOURCE_REPO_NAME/.github/workflows" ]; then

From 5d0edb68c496bea4a783ce2890bd196dbb889c0b Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 7 Jan 2026 17:28:58 +0000
Subject: [PATCH 1742/1784] feat: insert new module in root pom.xml

---
 monorepo-migration/migrate.sh | 41 +++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index a387a9e840ad..4035465674b0 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -77,6 +77,7 @@ git reset --hard HEAD
 git clean -fd
 git checkout -f main
 git reset --hard origin/main
+git clean -fdx
 
 # Check if the repository is already migrated
 if [ -d "$SOURCE_REPO_NAME" ]; then
@@ -128,6 +129,46 @@ if [ -n "$CODEOWNER" ]; then
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add code owners for $SOURCE_REPO_NAME"
 fi
 
+# 7.2 Update root pom.xml modules
+echo "Updating root pom.xml modules..."
+python3 -c "
+import sys
+pom_path = sys.argv[1]
+module_name = sys.argv[2]
+new_module = f'    {module_name}\n'
+with open(pom_path, 'r') as f:
+    content = f.read()
+start_tag = ''
+end_tag = ''
+start_idx = content.find(start_tag)
+end_idx = content.find(end_tag)
+if start_idx != -1 and end_idx != -1:
+    modules_section = content[start_idx + len(start_tag):end_idx]
+    lines = [l for l in modules_section.splitlines(keepends=True) if l.strip()]
+
+    java_indices = [i for i, l in enumerate(lines) if 'java-' in l]
+    if java_indices:
+        start_java = java_indices[0]
+        end_java = java_indices[-1] + 1
+        java_lines = lines[start_java:end_java]
+        if not any(f'{module_name}' in l for l in java_lines):
+            java_lines.append(new_module)
+            java_lines.sort()
+            lines = lines[:start_java] + java_lines + lines[end_java:]
+    else:
+        if not any(f'{module_name}' in l for l in lines):
+            lines.append(new_module)
+
+    new_content = content[:start_idx + len(start_tag)] + '\n' + ''.join(lines) + '  ' + content[end_idx:]
+    with open(pom_path, 'w') as f:
+        f.write(new_content)
+" "pom.xml" "$SOURCE_REPO_NAME"
+
+echo "Committing root pom.xml modules update..."
+git add pom.xml
+git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add module to root pom.xml"
+
+
 # 7.5 Migrate GitHub Actions workflows
 echo "Checking for GitHub Actions workflows..."
 if [ -d "$SOURCE_REPO_NAME/.github/workflows" ]; then

From 76997bf5c5d6436e81bdb2105114cf8614f6b13b Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 7 Jan 2026 19:11:12 +0000
Subject: [PATCH 1743/1784] chore: exclude common files from source root in
 migration script

---
 monorepo-migration/migrate.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 4035465674b0..2d619ced0153 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -114,6 +114,15 @@ git merge --allow-unrelated-histories --no-ff "$SOURCE_REPO_NAME/main" -s ours -
 echo "Reading tree into prefix $SOURCE_REPO_NAME/..."
 git read-tree --prefix="$SOURCE_REPO_NAME/" -u "$SOURCE_REPO_NAME/main"
 
+# 6.5 Remove common files from the root of the migrated library
+echo "Removing common files from the root of $SOURCE_REPO_NAME/..."
+rm -f "$SOURCE_REPO_NAME/.gitignore"
+rm -f "$SOURCE_REPO_NAME/renovate.json"
+rm -f "$SOURCE_REPO_NAME/LICENSE"
+rm -f "$SOURCE_REPO_NAME/java.header"
+rm -f "$SOURCE_REPO_NAME/license-checks.xml"
+find "$SOURCE_REPO_NAME" -maxdepth 1 -name "*.md" ! -name "CHANGELOG.md" ! -name "README.md" -delete
+
 # 7. Commit the migration
 echo "Committing migration..."
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"

From 257de3d641919f841f1bcbef36545d600c050fed Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 18:02:18 +0000
Subject: [PATCH 1744/1784] refactor: extract inline python to a .py file

---
 monorepo-migration/migrate.sh         | 34 ++-------------------
 monorepo-migration/update_root_pom.py | 43 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 monorepo-migration/update_root_pom.py

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 2d619ced0153..ddd694bcdc30 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -34,6 +34,7 @@ TARGET_DIR="$WORKING_DIR/$MONOREPO_NAME-target"
 TRANSFORM_SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 TRANSFORM_SCRIPT="$TRANSFORM_SCRIPT_DIR/transform_workflow.py"
 MODERNIZE_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/modernize_pom.py"
+UPDATE_ROOT_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_root_pom.py"
 
 echo "Starting migration using git read-tree with isolated clones..."
 
@@ -140,38 +141,7 @@ fi
 
 # 7.2 Update root pom.xml modules
 echo "Updating root pom.xml modules..."
-python3 -c "
-import sys
-pom_path = sys.argv[1]
-module_name = sys.argv[2]
-new_module = f'    {module_name}\n'
-with open(pom_path, 'r') as f:
-    content = f.read()
-start_tag = ''
-end_tag = ''
-start_idx = content.find(start_tag)
-end_idx = content.find(end_tag)
-if start_idx != -1 and end_idx != -1:
-    modules_section = content[start_idx + len(start_tag):end_idx]
-    lines = [l for l in modules_section.splitlines(keepends=True) if l.strip()]
-
-    java_indices = [i for i, l in enumerate(lines) if 'java-' in l]
-    if java_indices:
-        start_java = java_indices[0]
-        end_java = java_indices[-1] + 1
-        java_lines = lines[start_java:end_java]
-        if not any(f'{module_name}' in l for l in java_lines):
-            java_lines.append(new_module)
-            java_lines.sort()
-            lines = lines[:start_java] + java_lines + lines[end_java:]
-    else:
-        if not any(f'{module_name}' in l for l in lines):
-            lines.append(new_module)
-
-    new_content = content[:start_idx + len(start_tag)] + '\n' + ''.join(lines) + '  ' + content[end_idx:]
-    with open(pom_path, 'w') as f:
-        f.write(new_content)
-" "pom.xml" "$SOURCE_REPO_NAME"
+python3 "$UPDATE_ROOT_POM_SCRIPT" "pom.xml" "$SOURCE_REPO_NAME"
 
 echo "Committing root pom.xml modules update..."
 git add pom.xml
diff --git a/monorepo-migration/update_root_pom.py b/monorepo-migration/update_root_pom.py
new file mode 100644
index 000000000000..82822dd7734d
--- /dev/null
+++ b/monorepo-migration/update_root_pom.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+import sys
+
+def update_root_pom(pom_path, module_name):
+    new_module = f'    {module_name}\n'
+    with open(pom_path, 'r') as f:
+        content = f.read()
+
+    start_tag = ''
+    end_tag = ''
+    start_idx = content.find(start_tag)
+    end_idx = content.find(end_tag)
+
+    if start_idx == -1 or end_idx == -1:
+        print(f"Error: {start_tag} or {end_tag} not found in {pom_path}")
+        sys.exit(1)
+
+    modules_section = content[start_idx + len(start_tag):end_idx]
+    lines = [l for l in modules_section.splitlines(keepends=True) if l.strip()]
+
+    java_indices = [i for i, l in enumerate(lines) if 'java-' in l]
+    if java_indices:
+        start_java = java_indices[0]
+        end_java = java_indices[-1] + 1
+        java_lines = lines[start_java:end_java]
+        if not any(f'{module_name}' in l for l in java_lines):
+            java_lines.append(new_module)
+            java_lines.sort()
+            lines = lines[:start_java] + java_lines + lines[end_java:]
+    else:
+        if not any(f'{module_name}' in l for l in lines):
+            lines.append(new_module)
+
+    new_content = content[:start_idx + len(start_tag)] + '\n' + ''.join(lines) + '  ' + content[end_idx:]
+    with open(pom_path, 'w') as f:
+        f.write(new_content)
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print("Usage: update_root_pom.py  ")
+        sys.exit(1)
+    update_root_pom(sys.argv[1], sys.argv[2])

From 621bd151e7220f9340a30816bb1f496b1fcadc5b Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 18:07:55 +0000
Subject: [PATCH 1745/1784] chore: add license headers

---
 monorepo-migration/migrate.sh            | 14 ++++++++++++++
 monorepo-migration/modernize_pom.py      | 14 ++++++++++++++
 monorepo-migration/transform_workflow.py | 14 ++++++++++++++
 monorepo-migration/update_root_pom.py    | 13 +++++++++++++
 4 files changed, 55 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index ddd694bcdc30..c51434a562af 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2026 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.
+
 
 # Exit on error
 set -e
diff --git a/monorepo-migration/modernize_pom.py b/monorepo-migration/modernize_pom.py
index 983f2828261c..145f08aa3b63 100644
--- a/monorepo-migration/modernize_pom.py
+++ b/monorepo-migration/modernize_pom.py
@@ -1,3 +1,17 @@
+# Copyright 2026 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.
+
 import sys
 import re
 
diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
index 0e6b1c6927cb..3a719bb9710e 100644
--- a/monorepo-migration/transform_workflow.py
+++ b/monorepo-migration/transform_workflow.py
@@ -1,3 +1,17 @@
+# Copyright 2026 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.
+
 import sys
 import re
 
diff --git a/monorepo-migration/update_root_pom.py b/monorepo-migration/update_root_pom.py
index 82822dd7734d..fec12930dee3 100644
--- a/monorepo-migration/update_root_pom.py
+++ b/monorepo-migration/update_root_pom.py
@@ -1,4 +1,17 @@
 #!/usr/bin/env python3
+# Copyright 2026 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.
 
 import sys
 

From 7fd59a7ffa4d8ff785661824c5e76ac35fa9fbb9 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 18:08:40 +0000
Subject: [PATCH 1746/1784] fix: use 2026 when fixing copyright headers

---
 monorepo-migration/migrate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index c51434a562af..f6f20384d2ff 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -236,11 +236,11 @@ fi
 
 # 7.8 Fix copyright headers in Java files
 echo "Fixing copyright headers in Java files..."
-find "$SOURCE_REPO_NAME" -name "*.java" -exec python3 -c "import sys, re; p = sys.argv[1]; c = open(p).read(); new_c = re.sub(r'Copyright \d{4} Google (Inc\.|LLC)', 'Copyright 2025 Google LLC', c); open(p, 'w').write(new_c)" {} \;
+find "$SOURCE_REPO_NAME" -name "*.java" -exec python3 -c "import sys, re; p = sys.argv[1]; c = open(p).read(); new_c = re.sub(r'Copyright \d{4} Google (Inc\.|LLC)', 'Copyright 2026 Google LLC', c); open(p, 'w').write(new_c)" {} \;
 
 echo "Committing copyright header fixes..."
 git add "$SOURCE_REPO_NAME"
-git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright headers to 2025 Google LLC"
+git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright headers to 2026 Google LLC"
 
 # 7.9 Modernize root pom.xml
 echo "Modernizing root pom.xml..."

From b92406ccf76523a6b5a3a179d343bcb6d2752366 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 19:27:57 +0000
Subject: [PATCH 1747/1784] refactor: extract fix copyright inline python into
 .py file

---
 monorepo-migration/fix_copyright_headers.py | 53 +++++++++++++++++++++
 monorepo-migration/migrate.sh               |  3 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 monorepo-migration/fix_copyright_headers.py

diff --git a/monorepo-migration/fix_copyright_headers.py b/monorepo-migration/fix_copyright_headers.py
new file mode 100644
index 000000000000..cd813851d383
--- /dev/null
+++ b/monorepo-migration/fix_copyright_headers.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# Copyright 2026 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.
+
+import os
+import re
+import sys
+
+def fix_copyright(path):
+    if os.path.isfile(path):
+        if path.endswith(".java"):
+            _fix_file(path)
+    elif os.path.isdir(path):
+        for root, _, files in os.walk(path):
+            for file in files:
+                if file.endswith(".java"):
+                    _fix_file(os.path.join(root, file))
+
+def _fix_file(file_path):
+    with open(file_path, 'r') as f:
+        content = f.read()
+    
+    # Replace "Copyright [Year] Google LLC" or "Copyright [Year] Google Inc."
+    # with "Copyright 2026 Google LLC"
+    new_content = re.sub(
+        r'Copyright \d{4} Google (Inc\.|LLC)',
+        'Copyright 2026 Google LLC',
+        content
+    )
+    
+    if new_content != content:
+        with open(file_path, 'w') as f:
+            f.write(new_content)
+        print(f"Updated copyright in {file_path}")
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        print("Usage: fix_copyright_headers.py  ...")
+        sys.exit(1)
+    
+    for arg in sys.argv[1:]:
+        fix_copyright(arg)
diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index f6f20384d2ff..996d6575571d 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -49,6 +49,7 @@ TRANSFORM_SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 TRANSFORM_SCRIPT="$TRANSFORM_SCRIPT_DIR/transform_workflow.py"
 MODERNIZE_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/modernize_pom.py"
 UPDATE_ROOT_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_root_pom.py"
+FIX_COPYRIGHT_SCRIPT="$TRANSFORM_SCRIPT_DIR/fix_copyright_headers.py"
 
 echo "Starting migration using git read-tree with isolated clones..."
 
@@ -236,7 +237,7 @@ fi
 
 # 7.8 Fix copyright headers in Java files
 echo "Fixing copyright headers in Java files..."
-find "$SOURCE_REPO_NAME" -name "*.java" -exec python3 -c "import sys, re; p = sys.argv[1]; c = open(p).read(); new_c = re.sub(r'Copyright \d{4} Google (Inc\.|LLC)', 'Copyright 2026 Google LLC', c); open(p, 'w').write(new_c)" {} \;
+python3 "$FIX_COPYRIGHT_SCRIPT" "$SOURCE_REPO_NAME"
 
 echo "Committing copyright header fixes..."
 git add "$SOURCE_REPO_NAME"

From f9e0ce5950629b7dd655da6630c942dcdc224ee2 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 20:25:14 +0000
Subject: [PATCH 1748/1784] feat: update urls in the migrated pom.xml

---
 monorepo-migration/migrate.sh       |  2 +-
 monorepo-migration/modernize_pom.py | 34 ++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 996d6575571d..e9d59f4480fc 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -246,7 +246,7 @@ git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright heade
 # 7.9 Modernize root pom.xml
 echo "Modernizing root pom.xml..."
 PARENT_VERSION=$(grep -m 1 ".*{x-version-update:google-cloud-java:current}" google-cloud-jar-parent/pom.xml | sed -E 's/.*(.*)<\/version>.*/\1/')
-python3 "$MODERNIZE_POM_SCRIPT" "$SOURCE_REPO_NAME/pom.xml" "$PARENT_VERSION"
+python3 "$MODERNIZE_POM_SCRIPT" "$SOURCE_REPO_NAME/pom.xml" "$PARENT_VERSION" "$SOURCE_REPO_NAME"
 
 echo "Committing root pom.xml modernization..."
 git add "$SOURCE_REPO_NAME/pom.xml"
diff --git a/monorepo-migration/modernize_pom.py b/monorepo-migration/modernize_pom.py
index 145f08aa3b63..62879d77a79a 100644
--- a/monorepo-migration/modernize_pom.py
+++ b/monorepo-migration/modernize_pom.py
@@ -15,7 +15,7 @@
 import sys
 import re
 
-def modernize_pom(file_path, parent_version):
+def modernize_pom(file_path, parent_version, source_repo_name=None):
     with open(file_path, 'r') as f:
         lines = f.readlines()
 
@@ -29,6 +29,33 @@ def modernize_pom(file_path, parent_version):
     has_x_version_update = False
 
     for line in lines:
+        # URL Modernization
+        if any(tag in line for tag in ['', '', '']):
+            if 'github.com' in line and 'googleapis/' in line:
+                if source_repo_name:
+                    repo_pattern = re.escape(source_repo_name)
+                else:
+                    repo_pattern = r'[a-zA-Z0-9-]+'
+                
+                # Replace HTTPS URLs
+                line = re.sub(
+                    r'https://github\.com/googleapis/' + repo_pattern,
+                    'https://github.com/googleapis/google-cloud-java',
+                    line
+                )
+                # Replace Git SSH URLs
+                line = re.sub(
+                    r'git@github\.com:googleapis/' + repo_pattern + r'(\.git)?',
+                    'git@github.com:googleapis/google-cloud-java.git',
+                    line
+                )
+                # Handle scm:git: prefix if it has https
+                line = re.sub(
+                    r'scm:git:https://github\.com/googleapis/' + repo_pattern,
+                    'scm:git:https://github.com/googleapis/google-cloud-java.git',
+                    line
+                )
+
         # Parent section modernization
         if '' in line and not in_parent:
             in_parent = True
@@ -110,7 +137,8 @@ def modernize_pom(file_path, parent_version):
 
 if __name__ == "__main__":
     if len(sys.argv) > 2:
-        modernize_pom(sys.argv[1], sys.argv[2])
+        source_repo = sys.argv[3] if len(sys.argv) > 3 else None
+        modernize_pom(sys.argv[1], sys.argv[2], source_repo)
     else:
-        print("Usage: python3 modernize_pom.py  ")
+        print("Usage: python3 modernize_pom.py   [source_repo_name]")
         sys.exit(1)

From 81dae140d6a1bce63a7412de856403307f707786 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 21:49:17 +0000
Subject: [PATCH 1749/1784] fix: preserve explicilty declared versions in
 pom.xml

---
 monorepo-migration/modernize_pom.py | 33 +++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/monorepo-migration/modernize_pom.py b/monorepo-migration/modernize_pom.py
index 62879d77a79a..407a2d8c75cc 100644
--- a/monorepo-migration/modernize_pom.py
+++ b/monorepo-migration/modernize_pom.py
@@ -26,7 +26,9 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
     in_dependency = False
     in_reporting = False
     current_dependency_lines = []
-    has_x_version_update = False
+    should_preserve = False
+    current_group_id = None
+    has_version = False
 
     for line in lines:
         # URL Modernization
@@ -36,7 +38,7 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
                     repo_pattern = re.escape(source_repo_name)
                 else:
                     repo_pattern = r'[a-zA-Z0-9-]+'
-                
+
                 # Replace HTTPS URLs
                 line = re.sub(
                     r'https://github\.com/googleapis/' + repo_pattern,
@@ -82,7 +84,7 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
             in_dep_mgmt = False
             new_lines.append(line)
             continue
-        
+
         if in_dep_mgmt:
             if '' in line:
                 in_dependencies = True
@@ -92,26 +94,39 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
                 in_dependencies = False
                 new_lines.append(line)
                 continue
-            
+
             if in_dependencies:
                 if '' in line:
                     in_dependency = True
                     current_dependency_lines = [line]
-                    has_x_version_update = False
+                    should_preserve = False
+                    current_group_id = None
+                    has_version = False
                     continue
                 if '' in line:
                     in_dependency = False
                     current_dependency_lines.append(line)
-                    if has_x_version_update:
+
+                    # Preservation logic:
+                    # 1. Has x-version-update comment
+                    # 2. Is NOT com.google group AND has a version tag
+                    is_external = current_group_id and not current_group_id.startswith('com.google')
+                    if should_preserve or (is_external and has_version):
                         new_lines.extend(current_dependency_lines)
                     continue
-                
+
                 if in_dependency:
                     current_dependency_lines.append(line)
                     if '{x-version-update:' in line:
-                        has_x_version_update = True
+                        should_preserve = True
+                    if '' in line:
+                        match = re.search(r'(.*?)', line)
+                        if match:
+                            current_group_id = match.group(1).strip()
+                    if '' in line:
+                        has_version = True
                     continue
-                
+
                 # Prune comments and extra whitespace in depMgmt for a cleaner result
                 if not line.strip():
                     new_lines.append(line)

From 0ae9c9f0a884c41d3c7d7e2749c68b85a12950fd Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 22:04:50 +0000
Subject: [PATCH 1750/1784] fix: also preserve explicit google-cloud-x
 dependency versions

---
 monorepo-migration/modernize_pom.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/monorepo-migration/modernize_pom.py b/monorepo-migration/modernize_pom.py
index 407a2d8c75cc..bdf7f57a6027 100644
--- a/monorepo-migration/modernize_pom.py
+++ b/monorepo-migration/modernize_pom.py
@@ -101,6 +101,7 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
                     current_dependency_lines = [line]
                     should_preserve = False
                     current_group_id = None
+                    current_artifact_id = None
                     has_version = False
                     continue
                 if '' in line:
@@ -110,8 +111,11 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
                     # Preservation logic:
                     # 1. Has x-version-update comment
                     # 2. Is NOT com.google group AND has a version tag
+                    # 3. Is com.google.cloud group AND artifactId starts with google-cloud- AND has a version tag
                     is_external = current_group_id and not current_group_id.startswith('com.google')
-                    if should_preserve or (is_external and has_version):
+                    is_google_cloud_lib = current_group_id == 'com.google.cloud' and current_artifact_id and current_artifact_id.startswith('google-cloud-')
+                    
+                    if should_preserve or (is_external and has_version) or (is_google_cloud_lib and has_version):
                         new_lines.extend(current_dependency_lines)
                     continue
 
@@ -123,6 +127,10 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
                         match = re.search(r'(.*?)', line)
                         if match:
                             current_group_id = match.group(1).strip()
+                    if '' in line:
+                        match = re.search(r'(.*?)', line)
+                        if match:
+                            current_artifact_id = match.group(1).strip()
                     if '' in line:
                         has_version = True
                     continue

From 0fabe7a8195af98f0e6fceab07b8e497ee89b675 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 23:22:28 +0000
Subject: [PATCH 1751/1784] feat: prompt for CODEOWNERS value

---
 monorepo-migration/migrate.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index e9d59f4480fc..589b35b19126 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -34,6 +34,9 @@ check_command mvn
 MONOREPO_URL="https://github.com/googleapis/google-cloud-java"
 SOURCE_REPO_URL="${SOURCE_REPO_URL:-https://github.com/googleapis/java-logging}"
 CODEOWNER="${CODEOWNER:-}"
+if [ -z "$CODEOWNER" ]; then
+    read -p "Enter CODEOWNER (e.g., @chingor13): " CODEOWNER
+fi
 
 # Derive names from URLs to avoid duplication
 SOURCE_REPO_NAME="${SOURCE_REPO_URL##*/}"

From 09dba8b54bead414ac77bea7b13286c4b3b769ee Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 8 Jan 2026 23:26:18 +0000
Subject: [PATCH 1752/1784] feat: prompt for SOURCE_REPO_URL value

---
 monorepo-migration/migrate.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 589b35b19126..54bddeecf44c 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -32,7 +32,10 @@ check_command mvn
 
 # Configuration
 MONOREPO_URL="https://github.com/googleapis/google-cloud-java"
-SOURCE_REPO_URL="${SOURCE_REPO_URL:-https://github.com/googleapis/java-logging}"
+if [ -z "$SOURCE_REPO_URL" ]; then
+    read -p "Enter SOURCE_REPO_URL [https://github.com/googleapis/java-logging]: " input_url
+    SOURCE_REPO_URL="${input_url:-https://github.com/googleapis/java-logging}"
+fi
 CODEOWNER="${CODEOWNER:-}"
 if [ -z "$CODEOWNER" ]; then
     read -p "Enter CODEOWNER (e.g., @chingor13): " CODEOWNER

From 35f40a5e72a3cfef261f7d4220fdd9a8e8445792 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Mon, 12 Jan 2026 22:07:53 +0000
Subject: [PATCH 1753/1784] feat: merge generator config yaml

---
 monorepo-migration/migrate.sh                 |  13 +--
 .../update_generation_config.py               | 107 ++++++++++++++++++
 2 files changed, 109 insertions(+), 11 deletions(-)
 create mode 100644 monorepo-migration/update_generation_config.py

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 54bddeecf44c..4e425e4a596c 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -56,6 +56,7 @@ TRANSFORM_SCRIPT="$TRANSFORM_SCRIPT_DIR/transform_workflow.py"
 MODERNIZE_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/modernize_pom.py"
 UPDATE_ROOT_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_root_pom.py"
 FIX_COPYRIGHT_SCRIPT="$TRANSFORM_SCRIPT_DIR/fix_copyright_headers.py"
+UPDATE_GENERATION_CONFIG_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_generation_config.py"
 
 echo "Starting migration using git read-tree with isolated clones..."
 
@@ -209,17 +210,7 @@ fi
 echo "Updating generation_config.yaml..."
 SOURCE_CONFIG="$SOURCE_REPO_NAME/generation_config.yaml"
 if [ -f "$SOURCE_CONFIG" ]; then
-    # Extract the library entry (starts with - api_shortname)
-    # This assumes the source config only has one library or we want the first one
-    ENTRY=$(awk '/^  - api_shortname:/{flag=1; print $0; next} /^  - / && flag{flag=0} flag' "$SOURCE_CONFIG")
-    
-    # Simple cleanup: remove repo and repo_short if they exist
-    # Adjust indentation to match monorepo (0 spaces for -)
-    CLEAN_ENTRY=$(echo "$ENTRY" | sed '/repo:/d' | sed '/repo_short:/d' | sed 's/^  //')
-    
-    # Append to target generation_config.yaml
-    echo "" >> generation_config.yaml
-    echo "$CLEAN_ENTRY" >> generation_config.yaml
+    python3 "$UPDATE_GENERATION_CONFIG_SCRIPT" "generation_config.yaml" "$SOURCE_CONFIG"
     
     echo "Committing generation_config.yaml update..."
     git add generation_config.yaml
diff --git a/monorepo-migration/update_generation_config.py b/monorepo-migration/update_generation_config.py
new file mode 100644
index 000000000000..1ba7e6fc8c3e
--- /dev/null
+++ b/monorepo-migration/update_generation_config.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+# Copyright 2026 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.
+
+import sys
+import yaml
+import re
+
+def get_library_id(lib):
+    """
+    Returns a unique identifier for a library.
+    Prefer 'library_name', then 'api_shortname'.
+    """
+    if 'library_name' in lib:
+        return f"java-{lib['library_name']}"
+    if 'api_shortname' in lib:
+        return f"java-{lib['api_shortname']}"
+    return "unknown"
+
+def merge_libraries(target_libs, source_libs):
+    """
+    Merges source_libs into target_libs.
+    Libraries are matched by get_library_id.
+    GAPICs are merged and deduplicated by proto_path.
+    The final list is sorted by library_id.
+    """
+    # Map from library_id to library dict
+    target_map = {get_library_id(lib): lib for lib in target_libs}
+
+    for s_lib in source_libs:
+        lib_id = get_library_id(s_lib)
+        
+        # Clean up source library (remove repo fields)
+        s_lib_cleaned = {k: v for k, v in s_lib.items() if k not in ('repo', 'repo_short')}
+        
+        if lib_id in target_map:
+            t_lib = target_map[lib_id]
+            # Merge GAPICs
+            t_gapics_list = t_lib.get('GAPICs', [])
+            s_gapics_list = s_lib_cleaned.get('GAPICs', [])
+            
+            # Map by proto_path for deduplication
+            proto_map = {g['proto_path']: g for g in t_gapics_list}
+            for g in s_gapics_list:
+                proto_map[g['proto_path']] = g
+            
+            # Sort GAPICs by proto_path
+            sorted_protos = sorted(proto_map.keys())
+            t_lib['GAPICs'] = [proto_map[p] for p in sorted_protos]
+            
+            # Update other fields from source
+            for k, v in s_lib_cleaned.items():
+                if k != 'GAPICs':
+                    t_lib[k] = v
+        else:
+            target_map[lib_id] = s_lib_cleaned
+
+    # Return sorted list of libraries
+    sorted_ids = sorted(target_map.keys())
+    return [target_map[lib_id] for lib_id in sorted_ids]
+
+def update_config(target_path, source_path):
+    with open(target_path, 'r') as f:
+        target_content = f.read()
+    
+    with open(source_path, 'r') as f:
+        source_data = yaml.safe_load(f) or {}
+
+    # Load target data
+    target_data = yaml.safe_load(target_content) or {}
+    
+    target_libs = target_data.get('libraries', [])
+    source_libs = source_data.get('libraries', [])
+    
+    merged_libs = merge_libraries(target_libs, source_libs)
+    target_data['libraries'] = merged_libs
+
+    # Write back
+    with open(target_path, 'w') as f:
+        # Check if there was a license header in the original file
+        header_match = re.search(r'^(#.*?\n\n)', target_content, re.DOTALL)
+        if header_match:
+            f.write(header_match.group(1))
+        
+        # Use yaml.dump to write the data.
+        # sort_keys=False to preserve order of fields within libraries if possible (YAML 1.2+ usually does, but pyyaml depends)
+        yaml.dump(target_data, f, sort_keys=False, default_flow_style=False, indent=2)
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print("Usage: python3 update_generation_config.py  ")
+        sys.exit(1)
+    
+    target_path = sys.argv[1]
+    source_path = sys.argv[2]
+    update_config(target_path, source_path)

From e4a396ed3d0f592fee891425a67913042162dbb5 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 14 Jan 2026 22:26:50 +0000
Subject: [PATCH 1754/1784] chore: read root CODEOWNER entry from source

---
 monorepo-migration/migrate.sh | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 4e425e4a596c..682b9839b126 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -37,9 +37,6 @@ if [ -z "$SOURCE_REPO_URL" ]; then
     SOURCE_REPO_URL="${input_url:-https://github.com/googleapis/java-logging}"
 fi
 CODEOWNER="${CODEOWNER:-}"
-if [ -z "$CODEOWNER" ]; then
-    read -p "Enter CODEOWNER (e.g., @chingor13): " CODEOWNER
-fi
 
 # Derive names from URLs to avoid duplication
 SOURCE_REPO_NAME="${SOURCE_REPO_URL##*/}"
@@ -77,6 +74,35 @@ else
     cd - > /dev/null
 fi
 
+# 1.5 Extract CODEOWNERS from source repository as default
+if [ -z "$CODEOWNER" ]; then
+    echo "Attempting to find default CODEOWNER from source repository..."
+    CODEOWNERS_FILE=""
+    if [ -f "$SOURCE_DIR/.github/CODEOWNERS" ]; then
+        CODEOWNERS_FILE="$SOURCE_DIR/.github/CODEOWNERS"
+    elif [ -f "$SOURCE_DIR/CODEOWNERS" ]; then
+        CODEOWNERS_FILE="$SOURCE_DIR/CODEOWNERS"
+    fi
+
+    DEFAULT_CODEOWNER=""
+    if [ -n "$CODEOWNERS_FILE" ]; then
+        # Extract the line(s) starting with * (global owners)
+        # Use grep to find the line, then sed to remove the '*' and standard team handle
+        EXTRACTED_OWNERS=$(grep "^\*" "$CODEOWNERS_FILE" | sed 's/^\*[[:space:]]*//' | sed 's/@googleapis\/cloud-java-team-teamsync//g' | xargs)
+        if [ -n "$EXTRACTED_OWNERS" ]; then
+            DEFAULT_CODEOWNER="$EXTRACTED_OWNERS"
+            echo "Found default CODEOWNER: $DEFAULT_CODEOWNER"
+        fi
+    fi
+
+    if [ -n "$DEFAULT_CODEOWNER" ]; then
+        read -p "Enter CODEOWNER [$DEFAULT_CODEOWNER]: " input_owner
+        CODEOWNER="${input_owner:-$DEFAULT_CODEOWNER}"
+    else
+        read -p "Enter CODEOWNER (e.g., @chingor13): " CODEOWNER
+    fi
+fi
+
 # 2. Clone the target monorepo (the "isolated clone")
 if [ ! -d "$TARGET_DIR" ]; then
     echo "Cloning target monorepo: $MONOREPO_URL into $TARGET_DIR"

From 8287f15f55bb324e0e42832528c68d0ff6e2c06f Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 14 Jan 2026 23:51:38 +0000
Subject: [PATCH 1755/1784] migrate .OwlBot-hermetic.yaml

---
 monorepo-migration/migrate.sh                | 24 +++++-
 monorepo-migration/update_owlbot_hermetic.py | 77 ++++++++++++++++++++
 2 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 monorepo-migration/update_owlbot_hermetic.py

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 682b9839b126..3c81fc860542 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -54,6 +54,7 @@ MODERNIZE_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/modernize_pom.py"
 UPDATE_ROOT_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_root_pom.py"
 FIX_COPYRIGHT_SCRIPT="$TRANSFORM_SCRIPT_DIR/fix_copyright_headers.py"
 UPDATE_GENERATION_CONFIG_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_generation_config.py"
+UPDATE_OWLBOT_HERMETIC_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_owlbot_hermetic.py"
 
 echo "Starting migration using git read-tree with isolated clones..."
 
@@ -258,7 +259,24 @@ if [ -f "$SOURCE_VERSIONS" ]; then
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): consolidate versions.txt into root"
 fi
 
-# 7.8 Fix copyright headers in Java files
+# 7.8 Migrate .OwlBot-hermetic.yaml
+echo "Migrating .OwlBot-hermetic.yaml..."
+if [ -f "$SOURCE_DIR/.github/.OwlBot-hermetic.yaml" ]; then
+    SOURCE_OWLBOT="$SOURCE_DIR/.github/.OwlBot-hermetic.yaml"
+else
+    SOURCE_OWLBOT=""
+fi
+
+if [ -n "$SOURCE_OWLBOT" ]; then
+    TARGET_OWLBOT="$SOURCE_REPO_NAME/.OwlBot-hermetic.yaml"
+    python3 "$UPDATE_OWLBOT_HERMETIC_SCRIPT" "$TARGET_OWLBOT" "$SOURCE_OWLBOT" "$SOURCE_REPO_NAME"
+    
+    echo "Committing .OwlBot-hermetic.yaml migration..."
+    git add "$TARGET_OWLBOT"
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate .OwlBot-hermetic.yaml"
+fi
+
+# 7.9 Fix copyright headers in Java files
 echo "Fixing copyright headers in Java files..."
 python3 "$FIX_COPYRIGHT_SCRIPT" "$SOURCE_REPO_NAME"
 
@@ -266,7 +284,7 @@ echo "Committing copyright header fixes..."
 git add "$SOURCE_REPO_NAME"
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright headers to 2026 Google LLC"
 
-# 7.9 Modernize root pom.xml
+# 7.10 Modernize root pom.xml
 echo "Modernizing root pom.xml..."
 PARENT_VERSION=$(grep -m 1 ".*{x-version-update:google-cloud-java:current}" google-cloud-jar-parent/pom.xml | sed -E 's/.*(.*)<\/version>.*/\1/')
 python3 "$MODERNIZE_POM_SCRIPT" "$SOURCE_REPO_NAME/pom.xml" "$PARENT_VERSION" "$SOURCE_REPO_NAME"
@@ -275,7 +293,7 @@ echo "Committing root pom.xml modernization..."
 git add "$SOURCE_REPO_NAME/pom.xml"
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): modernize root pom.xml"
 
-# 7.10 Verify compilation
+# 7.11 Verify compilation
 echo "Verifying compilation..."
 (cd "$SOURCE_REPO_NAME" && mvn compile -DskipTests -T 1C)
 
diff --git a/monorepo-migration/update_owlbot_hermetic.py b/monorepo-migration/update_owlbot_hermetic.py
new file mode 100644
index 000000000000..7f9f803822f5
--- /dev/null
+++ b/monorepo-migration/update_owlbot_hermetic.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+# Copyright 2026 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.
+
+import sys
+import yaml
+import re
+
+def update_config(target_path, source_path, prefix):
+    """
+    Reads source_path, prepends prefix to paths in deep-remove-regex and deep-preserve-regex,
+    and writes to target_path.
+    """
+    with open(source_path, 'r') as f:
+        source_content = f.read()
+
+    # Load source data
+    source_data = yaml.safe_load(source_content) or {}
+
+    # Define fields to update
+    fields_to_update = ['deep-remove-regex', 'deep-preserve-regex']
+
+    for field in fields_to_update:
+        if field in source_data:
+            updated_list = []
+            for item in source_data[field]:
+                # If item is a string, prepend prefix
+                # Regex might need handling if it starts with ^
+                # But usually these are just paths.
+                # Assuming simple concatenation for now as per requirement.
+                # "When referencing paths in the deep-remove-regex and deep-preserve-regex, the new directory name should be prefixed"
+                
+                # If the regex starts with ^, insert the prefix after it.
+                if item.startswith('^'):
+                    updated_list.append(f"^{prefix}/{item[1:]}")
+                else:
+                    updated_list.append(f"/{prefix}{item}")
+            source_data[field] = updated_list
+
+    if 'deep-copy-regex' in source_data:
+        for item in source_data['deep-copy-regex']:
+            if 'dest' in item and item['dest'].startswith('/owl-bot-staging/'):
+                item['dest'] = item['dest'].replace('/owl-bot-staging/', f'/owl-bot-staging/{prefix}/', 1)
+
+    # Write to target_path
+    with open(target_path, 'w') as f:
+        # Check if there was a license header in the original file
+        # Match a block of lines starting with # at the beginning of the file
+        header_match = re.search(r'^((?:#[^\n]*\n)+)', source_content)
+        if header_match:
+            f.write(header_match.group(1))
+            f.write("\n") # Add a newline after the header
+        
+        # Use yaml.dump to write the data.
+        yaml.dump(source_data, f, sort_keys=False, default_flow_style=False, indent=2)
+
+if __name__ == "__main__":
+    if len(sys.argv) != 4:
+        print("Usage: python3 update_owlbot_hermetic.py   ")
+        sys.exit(1)
+    
+    target_path = sys.argv[1]
+    source_path = sys.argv[2]
+    prefix = sys.argv[3]
+    
+    update_config(target_path, source_path, prefix)

From 431b565621c669d187c56129e81ea24aea430295 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 15 Jan 2026 18:07:30 +0000
Subject: [PATCH 1756/1784] migrate existing owlbot.py file and replace the
 template excludes

---
 monorepo-migration/migrate.sh       |  25 +++++
 monorepo-migration/update_owlbot.py | 159 ++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)
 create mode 100644 monorepo-migration/update_owlbot.py

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 3c81fc860542..63a8b1914a1c 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -55,6 +55,7 @@ UPDATE_ROOT_POM_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_root_pom.py"
 FIX_COPYRIGHT_SCRIPT="$TRANSFORM_SCRIPT_DIR/fix_copyright_headers.py"
 UPDATE_GENERATION_CONFIG_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_generation_config.py"
 UPDATE_OWLBOT_HERMETIC_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_owlbot_hermetic.py"
+TRANSFORM_OWLBOT_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_owlbot.py"
 
 echo "Starting migration using git read-tree with isolated clones..."
 
@@ -276,6 +277,30 @@ if [ -n "$SOURCE_OWLBOT" ]; then
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate .OwlBot-hermetic.yaml"
 fi
 
+
+# 7.8b Migrate owlbot.py
+echo "Migrating owlbot.py..."
+if [ -f "$SOURCE_DIR/owlbot.py" ]; then
+    TARGET_OWLBOT="$SOURCE_REPO_NAME/owlbot.py"
+    
+    # Check for a template owlbot.py to source common excludes from
+    TEMPLATE_OWLBOT=""
+    if [ -f "java-workstations/owlbot.py" ]; then
+        TEMPLATE_OWLBOT="java-workstations/owlbot.py"
+        echo "Using $TEMPLATE_OWLBOT as template for excludes."
+    fi
+
+    if [ -n "$TEMPLATE_OWLBOT" ]; then
+        python3 "$TRANSFORM_OWLBOT_SCRIPT" "$TARGET_OWLBOT" "$SOURCE_DIR/owlbot.py" "$TEMPLATE_OWLBOT"
+    else
+        python3 "$TRANSFORM_OWLBOT_SCRIPT" "$TARGET_OWLBOT" "$SOURCE_DIR/owlbot.py"
+    fi
+
+    echo "Committing owlbot.py migration..."
+    git add "$TARGET_OWLBOT"
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate owlbot.py"
+fi
+
 # 7.9 Fix copyright headers in Java files
 echo "Fixing copyright headers in Java files..."
 python3 "$FIX_COPYRIGHT_SCRIPT" "$SOURCE_REPO_NAME"
diff --git a/monorepo-migration/update_owlbot.py b/monorepo-migration/update_owlbot.py
new file mode 100644
index 000000000000..ec40992ca412
--- /dev/null
+++ b/monorepo-migration/update_owlbot.py
@@ -0,0 +1,159 @@
+# Copyright 2026 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.
+
+import ast
+import sys
+import os
+
+def extract_info(source_code):
+    """Extracts excludes and replacement calls from the source owlbot.py."""
+    excludes = []
+    replacements = []
+    
+    try:
+        tree = ast.parse(source_code)
+    except SyntaxError:
+        return excludes, replacements
+
+    for node in ast.walk(tree):
+        # Look for s.replace(...) calls
+        if isinstance(node, ast.Call):
+            if isinstance(node.func, ast.Attribute) and node.func.attr == 'replace':
+                # We found a replace call. We want to reconstruct the source code for this call.
+                # However, ast.unparse is only available in Python 3.9+.
+                # If we are on an older python, we might need a workaround or just grab the line range.
+                # Since we likely have 3.9+, let's try ast.unparse if available, otherwise strict extraction.
+                if sys.version_info >= (3, 9):
+                    replacements.append(ast.unparse(node))
+                else:
+                    # Fallback for older python: just comment it needs manual migration or try simple extraction
+                    # For now assume 3.9+ which is standard in this environment
+                    pass
+        
+        # Look for java.common_templates or common.java_library calls to find excludes
+        if isinstance(node, ast.Call):
+            is_common_templates = False
+            if isinstance(node.func, ast.Attribute):
+                 if node.func.attr == 'common_templates':
+                     is_common_templates = True
+                 elif node.func.attr == 'java_library': # older name
+                     is_common_templates = True
+            
+            if is_common_templates:
+                for keyword in node.keywords:
+                    if keyword.arg == 'excludes':
+                        if isinstance(keyword.value, ast.List):
+                            for elt in keyword.value.elts:
+                                if isinstance(elt, ast.Constant): # Python 3.8+
+                                    excludes.append(elt.value)
+                                elif isinstance(elt, ast.Str): # Python < 3.8
+                                    excludes.append(elt.s)
+                        break
+    return excludes, replacements
+
+
+def generate_target_content(excludes, replacements, standard_excludes=None):
+    # Default excludes for monorepo if no template is provided
+    if standard_excludes is None:
+        standard_excludes = {
+            ".github/*",
+            ".kokoro/*",
+            "samples/*",
+            "CODE_OF_CONDUCT.md",
+            "CONTRIBUTING.md",
+            "LICENSE",
+            "SECURITY.md",
+            "java.header",
+            "license-checks.xml",
+            "renovate.json",
+            ".gitignore"
+        }
+    
+    # Merge excludes
+    # User requested to ignore source excludes and strictly use standard excludes
+    final_excludes = sorted(list(set(standard_excludes)))
+    
+    # Format replacements with indentation
+    formatted_replacements = ""
+    for rep in replacements:
+        formatted_replacements += "    " + rep + "\n"
+        
+    excludes_str = ",\n        ".join([f'"{e}"' for e in final_excludes])
+
+    content = f"""# Copyright 2026 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
+#
+#     https://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.
+
+import synthtool as s
+from synthtool.languages import java
+
+for library in s.get_staging_dirs():
+    # put any special-case replacements here
+    s.move(library)
+{formatted_replacements}
+s.remove_staging_dirs()
+java.common_templates(monorepo=True, excludes=[
+        {excludes_str}
+])
+"""
+    return content
+
+def main():
+    if len(sys.argv) < 3:
+        print("Usage: update_owlbot.py   [template_file]")
+        sys.exit(1)
+
+    target_file = sys.argv[1]
+    source_file = sys.argv[2]
+    template_file = sys.argv[3] if len(sys.argv) > 3 else None
+
+    if not os.path.exists(source_file):
+        print(f"Source file {source_file} not found.")
+        sys.exit(1)
+
+    with open(source_file, 'r') as f:
+        source_code = f.read()
+
+    excludes, replacements = extract_info(source_code)
+    
+    standard_excludes = None
+    if template_file:
+        if os.path.exists(template_file):
+            with open(template_file, 'r') as f:
+                template_code = f.read()
+            template_excludes, _ = extract_info(template_code)
+            standard_excludes = template_excludes
+        else:
+            print(f"Template file {template_file} not found. using default excludes.")
+
+    target_content = generate_target_content(excludes, replacements, standard_excludes)
+    
+    os.makedirs(os.path.dirname(target_file), exist_ok=True)
+    with open(target_file, 'w') as f:
+        f.write(target_content)
+    
+    print(f"Generated {target_file}")
+
+if __name__ == "__main__":
+    main()

From 5213a3089df7232ba9d422bbd7eaf3e7ab75a3e3 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 15 Jan 2026 18:17:26 +0000
Subject: [PATCH 1757/1784] skip .kokoro folder

---
 monorepo-migration/migrate.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 63a8b1914a1c..b1837594c054 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -171,6 +171,7 @@ rm -f "$SOURCE_REPO_NAME/.gitignore"
 rm -f "$SOURCE_REPO_NAME/renovate.json"
 rm -f "$SOURCE_REPO_NAME/LICENSE"
 rm -f "$SOURCE_REPO_NAME/java.header"
+rm -rf "$SOURCE_REPO_NAME/.kokoro"
 rm -f "$SOURCE_REPO_NAME/license-checks.xml"
 find "$SOURCE_REPO_NAME" -maxdepth 1 -name "*.md" ! -name "CHANGELOG.md" ! -name "README.md" -delete
 

From 8f7b7a827df581b597afbb33df3e7dd81bf6934a Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 15 Jan 2026 18:27:43 +0000
Subject: [PATCH 1758/1784] remove more unnecessary files

---
 monorepo-migration/migrate.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index b1837594c054..7b519761bece 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -172,6 +172,8 @@ rm -f "$SOURCE_REPO_NAME/renovate.json"
 rm -f "$SOURCE_REPO_NAME/LICENSE"
 rm -f "$SOURCE_REPO_NAME/java.header"
 rm -rf "$SOURCE_REPO_NAME/.kokoro"
+rm -f "$SOURCE_REPO_NAME/codecov.yaml"
+rm -f "$SOURCE_REPO_NAME/synth.metadata"
 rm -f "$SOURCE_REPO_NAME/license-checks.xml"
 find "$SOURCE_REPO_NAME" -maxdepth 1 -name "*.md" ! -name "CHANGELOG.md" ! -name "README.md" -delete
 

From cd132d7ae663caa6bbd76702ad8d4540c4ffdb2f Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 15 Jan 2026 20:32:04 +0000
Subject: [PATCH 1759/1784] remove only kokoro configs and clean up generation
 config

---
 monorepo-migration/migrate.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 7b519761bece..95e6f58656b3 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -171,7 +171,7 @@ rm -f "$SOURCE_REPO_NAME/.gitignore"
 rm -f "$SOURCE_REPO_NAME/renovate.json"
 rm -f "$SOURCE_REPO_NAME/LICENSE"
 rm -f "$SOURCE_REPO_NAME/java.header"
-rm -rf "$SOURCE_REPO_NAME/.kokoro"
+rm -rf "$SOURCE_REPO_NAME/.kokoro/continuous"  "$SOURCE_REPO_NAME/.kokoro/nightly"  "$SOURCE_REPO_NAME/.kokoro/presubmit"
 rm -f "$SOURCE_REPO_NAME/codecov.yaml"
 rm -f "$SOURCE_REPO_NAME/synth.metadata"
 rm -f "$SOURCE_REPO_NAME/license-checks.xml"
@@ -243,8 +243,11 @@ SOURCE_CONFIG="$SOURCE_REPO_NAME/generation_config.yaml"
 if [ -f "$SOURCE_CONFIG" ]; then
     python3 "$UPDATE_GENERATION_CONFIG_SCRIPT" "generation_config.yaml" "$SOURCE_CONFIG"
     
+    # Remove the source generation_config.yaml as it is now merged
+    rm "$SOURCE_CONFIG"
+
     echo "Committing generation_config.yaml update..."
-    git add generation_config.yaml
+    git add generation_config.yaml "$SOURCE_CONFIG"
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add library to generation_config.yaml"
 fi
 

From 65ec0fda5307d1dd6a4c60ab80dcd32a95d38cbc Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 15 Jan 2026 21:22:22 +0000
Subject: [PATCH 1760/1784] disable java17 profile for split repo's java8 test

---
 monorepo-migration/transform_workflow.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
index 3a719bb9710e..a333b1491fcf 100644
--- a/monorepo-migration/transform_workflow.py
+++ b/monorepo-migration/transform_workflow.py
@@ -73,6 +73,8 @@ def transform(content, lib_name):
                     continue
         
         if not skip_current_job:
+            if 'run: echo "SUREFIRE_JVM_OPT=' in line and '!java17' not in line:
+                line = line.replace('" >> $GITHUB_ENV', ' -P !java17" >> $GITHUB_ENV')
             new_lines.append(line)
     return "\n".join(new_lines)
 

From c606a1c1c4b639ddecffdbb087259bef259bfa5a Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 16 Jan 2026 01:12:24 +0000
Subject: [PATCH 1761/1784] add git config for longpaths on windows build

---
 monorepo-migration/transform_workflow.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
index a333b1491fcf..741a54f80fbb 100644
--- a/monorepo-migration/transform_workflow.py
+++ b/monorepo-migration/transform_workflow.py
@@ -35,6 +35,8 @@ def transform(content, lib_name):
 
     in_jobs = False
     skip_current_job = False
+    current_job_is_windows = False
+    
     for line in lines:
         if line.startswith('name:') and not in_jobs:
             name_match = re.match(r'^name:\s*(.*)', line)
@@ -60,6 +62,7 @@ def transform(content, lib_name):
             job_match = re.match(r'^  ([\w-]+):', line)
             if job_match:
                 job_name = job_match.group(1)
+                current_job_is_windows = False # Reset for new job
                 if job_name == 'clirr':
                     skip_current_job = True
                     continue
@@ -73,6 +76,15 @@ def transform(content, lib_name):
                     continue
         
         if not skip_current_job:
+            if 'runs-on:' in line and 'windows' in line:
+                current_job_is_windows = True
+            
+            if line.strip() == 'steps:' and current_job_is_windows:
+                new_lines.append(line)
+                new_lines.append("    - name: Support longpaths")
+                new_lines.append("      run: git config --system core.longpaths true")
+                continue
+
             if 'run: echo "SUREFIRE_JVM_OPT=' in line and '!java17' not in line:
                 line = line.replace('" >> $GITHUB_ENV', ' -P !java17" >> $GITHUB_ENV')
             new_lines.append(line)

From ce70a56a246e57f051720924e4150b13f51ec3d6 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 16 Jan 2026 21:16:38 +0000
Subject: [PATCH 1762/1784] fix working directory for longpaths

---
 monorepo-migration/transform_workflow.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
index 741a54f80fbb..f4175cf61c34 100644
--- a/monorepo-migration/transform_workflow.py
+++ b/monorepo-migration/transform_workflow.py
@@ -83,6 +83,7 @@ def transform(content, lib_name):
                 new_lines.append(line)
                 new_lines.append("    - name: Support longpaths")
                 new_lines.append("      run: git config --system core.longpaths true")
+                new_lines.append("      working-directory: .")
                 continue
 
             if 'run: echo "SUREFIRE_JVM_OPT=' in line and '!java17' not in line:

From 41aea784ae249e396a67b80695d3dde95e5e05cf Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 16 Jan 2026 21:17:02 +0000
Subject: [PATCH 1763/1784] allow running root ci scripts in BUILD_SUBDIR

---
 .kokoro/build.sh                                | 15 ++++++++++++++-
 .kokoro/dependencies.sh                         | 12 ++++++++++++
 generation/check_non_release_please_versions.sh |  4 ++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index e604c8768b86..675fd276cbcd 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -33,10 +33,17 @@ if [ -f "${KOKORO_GFILE_DIR}/secret_manager/java-bigqueryconnection-samples-secr
   source "${KOKORO_GFILE_DIR}/secret_manager/java-bigqueryconnection-samples-secrets"
 fi
 
+if [[ -n "${BUILD_SUBDIR}" ]]
+then
+  echo "Running in subdir: ${BUILD_SUBDIR}"
+  pushd "${BUILD_SUBDIR}"
+fi
+
 RETURN_CODE=0
 
 case ${JOB_TYPE} in
   test)
+    echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
     retry_with_backoff 3 10 \
       mvn test \
         -B -ntp \
@@ -48,7 +55,7 @@ case ${JOB_TYPE} in
         -Dflatten.skip=true \
         -Danimal.sniffer.skip=true \
         -Dmaven.wagon.http.retryHandler.count=5 \
-        -T 1C
+        -T 1C ${SUREFIRE_JVM_OPT}
     RETURN_CODE=$?
     echo "Finished running unit tests"
     ;;
@@ -125,6 +132,12 @@ case ${JOB_TYPE} in
 
 esac
 
+if [[ -n "${BUILD_SUBDIR}" ]]
+then
+  echo "restoring directory"
+  popd
+fi
+
 if [ "${REPORT_COVERAGE}" == "true" ]; then
   bash ${KOKORO_GFILE_DIR}/codecov.sh
 fi
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index bd8960246f66..1ea066f5bf77 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -49,6 +49,12 @@ function determineMavenOpts() {
 
 export MAVEN_OPTS=$(determineMavenOpts)
 
+if [[ -n "${BUILD_SUBDIR}" ]]
+then
+  echo "Running in subdir: ${BUILD_SUBDIR}"
+  pushd "${BUILD_SUBDIR}"
+fi
+
 # this should run maven enforcer
 retry_with_backoff 3 10 \
   mvn install -B -V -ntp \
@@ -57,3 +63,9 @@ retry_with_backoff 3 10 \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
+
+if [[ -n "${BUILD_SUBDIR}" ]]
+then
+  echo "Leaving subdir: ${BUILD_SUBDIR}"
+  popd
+fi
diff --git a/generation/check_non_release_please_versions.sh b/generation/check_non_release_please_versions.sh
index bb7e2f0e88e0..0a0e32c22874 100755
--- a/generation/check_non_release_please_versions.sh
+++ b/generation/check_non_release_please_versions.sh
@@ -19,6 +19,10 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
     echo "Skipping version check for java-samples directory"
     continue
   fi
+  if [[ "${pomFile}" =~ .*/samples/.* ]]; then
+    echo "Skipping version check for samples directory"
+    continue
+  fi
 
   if grep -n '.*' "$pomFile" | grep -v 'x-version-update'; then
     echo "Found version declaration(s) without x-version-update in: $pomFile"

From 5af6bee9ed6023fe9d3207fbc01c4cdec765dc45 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 16 Jan 2026 21:27:31 +0000
Subject: [PATCH 1764/1784] modernize the bom pom.xml

---
 monorepo-migration/migrate.sh       | 15 ++++++++++++++-
 monorepo-migration/modernize_pom.py | 14 +++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 95e6f58656b3..b07b2aba5284 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -315,7 +315,7 @@ echo "Committing copyright header fixes..."
 git add "$SOURCE_REPO_NAME"
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright headers to 2026 Google LLC"
 
-# 7.10 Modernize root pom.xml
+# 7.11 Modernize root pom.xml
 echo "Modernizing root pom.xml..."
 PARENT_VERSION=$(grep -m 1 ".*{x-version-update:google-cloud-java:current}" google-cloud-jar-parent/pom.xml | sed -E 's/.*(.*)<\/version>.*/\1/')
 python3 "$MODERNIZE_POM_SCRIPT" "$SOURCE_REPO_NAME/pom.xml" "$PARENT_VERSION" "$SOURCE_REPO_NAME"
@@ -324,6 +324,19 @@ echo "Committing root pom.xml modernization..."
 git add "$SOURCE_REPO_NAME/pom.xml"
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): modernize root pom.xml"
 
+# 7.12 Modernize BOM pom.xml
+echo "Modernizing BOM pom.xml..."
+# Find potential BOM POMs (usually in a subdirectory ending with -bom)
+find "$SOURCE_REPO_NAME" -name "pom.xml" | grep "\-bom/pom.xml" | while read -r bom_pom; do
+    echo "Modernizing BOM: $bom_pom"
+    # BOMs should inherit from google-cloud-pom-parent
+    python3 "$MODERNIZE_POM_SCRIPT" "$bom_pom" "$PARENT_VERSION" "$SOURCE_REPO_NAME" "google-cloud-pom-parent" "../../google-cloud-pom-parent/pom.xml"
+    
+    echo "Committing BOM pom.xml modernization for $bom_pom..."
+    git add "$bom_pom"
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): modernize BOM pom.xml"
+done
+
 # 7.11 Verify compilation
 echo "Verifying compilation..."
 (cd "$SOURCE_REPO_NAME" && mvn compile -DskipTests -T 1C)
diff --git a/monorepo-migration/modernize_pom.py b/monorepo-migration/modernize_pom.py
index bdf7f57a6027..ea0c023a9b57 100644
--- a/monorepo-migration/modernize_pom.py
+++ b/monorepo-migration/modernize_pom.py
@@ -15,7 +15,8 @@
 import sys
 import re
 
-def modernize_pom(file_path, parent_version, source_repo_name=None):
+
+def modernize_pom(file_path, parent_version, source_repo_name=None, parent_artifactId='google-cloud-jar-parent', relative_path='../google-cloud-jar-parent/pom.xml'):
     with open(file_path, 'r') as f:
         lines = f.readlines()
 
@@ -64,9 +65,9 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
             indent = line[:line.find('<')]
             new_lines.append(f"{indent}\n")
             new_lines.append(f"{indent}  com.google.cloud\n")
-            new_lines.append(f"{indent}  google-cloud-jar-parent\n")
+            new_lines.append(f"{indent}  {parent_artifactId}\n")
             new_lines.append(f"{indent}  {parent_version}\n")
-            new_lines.append(f"{indent}  ../google-cloud-jar-parent/pom.xml\n")
+            new_lines.append(f"{indent}  {relative_path}\n")
             continue
         if '' in line and in_parent:
             in_parent = False
@@ -161,7 +162,10 @@ def modernize_pom(file_path, parent_version, source_repo_name=None):
 if __name__ == "__main__":
     if len(sys.argv) > 2:
         source_repo = sys.argv[3] if len(sys.argv) > 3 else None
-        modernize_pom(sys.argv[1], sys.argv[2], source_repo)
+        parent_artifactId = sys.argv[4] if len(sys.argv) > 4 else 'google-cloud-jar-parent'
+        relative_path = sys.argv[5] if len(sys.argv) > 5 else '../google-cloud-jar-parent/pom.xml'
+        modernize_pom(sys.argv[1], sys.argv[2], source_repo, parent_artifactId, relative_path)
     else:
-        print("Usage: python3 modernize_pom.py   [source_repo_name]")
+        print("Usage: python3 modernize_pom.py   [source_repo_name] [parent_artifactId] [relative_path]")
         sys.exit(1)
+

From bfb1fc9263e2dc96cb0ff3bbf3d5ba881ddf2a00 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 21 Jan 2026 21:16:19 +0000
Subject: [PATCH 1765/1784] allow specifying target branch

---
 monorepo-migration/migrate.sh       |  16 +-
 monorepo-migration/update_owlbot.py | 237 ++++++++++++++++++----------
 2 files changed, 164 insertions(+), 89 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index b07b2aba5284..4b5d749cd5a5 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -62,6 +62,8 @@ echo "Starting migration using git read-tree with isolated clones..."
 # 0. Create working directory
 mkdir -p "$WORKING_DIR"
 
+MIGRATION_HEAD_BRANCH="add-migration-script"
+
 # 1. Clone the source repository
 if [ ! -d "$SOURCE_DIR" ]; then
     echo "Cloning source repo: $SOURCE_REPO_URL into $SOURCE_DIR"
@@ -70,7 +72,7 @@ else
     echo "Source directory $SOURCE_DIR already exists. Ensuring it is clean and up-to-date..."
     cd "$SOURCE_DIR"
     git fetch origin
-    git checkout -f main
+    git checkout -f "main"
     git reset --hard origin/main
     git clean -fd
     cd - > /dev/null
@@ -109,12 +111,14 @@ fi
 if [ ! -d "$TARGET_DIR" ]; then
     echo "Cloning target monorepo: $MONOREPO_URL into $TARGET_DIR"
     git clone "$MONOREPO_URL" "$TARGET_DIR"
+    git checkout -f "${MIGRATION_HEAD_BRANCH}"
+    git reset --hard origin/${MIGRATION_HEAD_BRANCH}
 else
     echo "Target directory $TARGET_DIR already exists. Ensuring it is clean and up-to-date..."
     cd "$TARGET_DIR"
     git fetch origin
-    git checkout -f main
-    git reset --hard origin/main
+    git checkout -f "${MIGRATION_HEAD_BRANCH}"
+    git reset --hard origin/${MIGRATION_HEAD_BRANCH}
     git clean -fd
     cd - > /dev/null
 fi
@@ -126,8 +130,8 @@ echo "Ensuring clean state in target monorepo..."
 git fetch origin
 git reset --hard HEAD
 git clean -fd
-git checkout -f main
-git reset --hard origin/main
+git checkout -f "${MIGRATION_HEAD_BRANCH}"
+git reset --hard origin/${MIGRATION_HEAD_BRANCH}
 git clean -fdx
 
 # Check if the repository is already migrated
@@ -327,7 +331,7 @@ git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): modernize root pom.xml
 # 7.12 Modernize BOM pom.xml
 echo "Modernizing BOM pom.xml..."
 # Find potential BOM POMs (usually in a subdirectory ending with -bom)
-find "$SOURCE_REPO_NAME" -name "pom.xml" | grep "\-bom/pom.xml" | while read -r bom_pom; do
+find "$SOURCE_REPO_NAME" -name "pom.xml" | grep "\-bom/pom.xml" | grep -v "samples" | while read -r bom_pom; do
     echo "Modernizing BOM: $bom_pom"
     # BOMs should inherit from google-cloud-pom-parent
     python3 "$MODERNIZE_POM_SCRIPT" "$bom_pom" "$PARENT_VERSION" "$SOURCE_REPO_NAME" "google-cloud-pom-parent" "../../google-cloud-pom-parent/pom.xml"
diff --git a/monorepo-migration/update_owlbot.py b/monorepo-migration/update_owlbot.py
index ec40992ca412..a89ff5182d3f 100644
--- a/monorepo-migration/update_owlbot.py
+++ b/monorepo-migration/update_owlbot.py
@@ -16,55 +16,122 @@
 import sys
 import os
 
+def is_call_to(node, name_parts):
+    """
+    Checks if an AST node is a call to a specific function.
+    name_parts: list of strings, e.g. ['s', 'move'] for s.move()
+                or ['java', 'common_templates']
+    """
+    if not isinstance(node, ast.Call):
+        return False
+    
+    func = node.func
+    # Handle attribute access (e.g. s.move)
+    if isinstance(func, ast.Attribute):
+        if len(name_parts) == 2:
+            # Check object and attr
+            obj = func.value
+            if isinstance(obj, ast.Name) and obj.id == name_parts[0] and func.attr == name_parts[1]:
+                return True
+        elif len(name_parts) == 1:
+            if func.attr == name_parts[0]:
+                return True
+    # Handle direct name (e.g. if imported directly, though less common for these)
+    elif isinstance(func, ast.Name):
+        if len(name_parts) == 1 and func.id == name_parts[0]:
+            return True
+        
+    return False
+
+def extract_excludes_from_call(call_node):
+    excludes = []
+    for keyword in call_node.keywords:
+        if keyword.arg == 'excludes':
+            if isinstance(keyword.value, ast.List):
+                for elt in keyword.value.elts:
+                    if isinstance(elt, ast.Constant): # Python 3.8+
+                        excludes.append(elt.value)
+                    elif isinstance(elt, ast.Str): # Python < 3.8
+                        excludes.append(elt.s)
+            break
+    return excludes
+
 def extract_info(source_code):
-    """Extracts excludes and replacement calls from the source owlbot.py."""
     excludes = []
-    replacements = []
-    
+    loop_body_lines = []
+    top_level_lines = []
+
     try:
         tree = ast.parse(source_code)
     except SyntaxError:
-        return excludes, replacements
-
-    for node in ast.walk(tree):
-        # Look for s.replace(...) calls
-        if isinstance(node, ast.Call):
-            if isinstance(node.func, ast.Attribute) and node.func.attr == 'replace':
-                # We found a replace call. We want to reconstruct the source code for this call.
-                # However, ast.unparse is only available in Python 3.9+.
-                # If we are on an older python, we might need a workaround or just grab the line range.
-                # Since we likely have 3.9+, let's try ast.unparse if available, otherwise strict extraction.
-                if sys.version_info >= (3, 9):
-                    replacements.append(ast.unparse(node))
-                else:
-                    # Fallback for older python: just comment it needs manual migration or try simple extraction
-                    # For now assume 3.9+ which is standard in this environment
-                    pass
-        
-        # Look for java.common_templates or common.java_library calls to find excludes
-        if isinstance(node, ast.Call):
-            is_common_templates = False
-            if isinstance(node.func, ast.Attribute):
-                 if node.func.attr == 'common_templates':
-                     is_common_templates = True
-                 elif node.func.attr == 'java_library': # older name
-                     is_common_templates = True
+        return excludes, top_level_lines, loop_body_lines
+
+    for node in tree.body:
+        # Some nodes are wrapped in Expr, e.g. s.remove_staging_dirs()
+        inner_node = node
+        if isinstance(node, ast.Expr):
+            inner_node = node.value
+
+        # Ignore standard imports (we will inject them)
+        if isinstance(node, (ast.Import, ast.ImportFrom)):
+            # We assume we only care about synthtool/java imports which we regenerate.
+            # If there are other imports, we should probably preserve them.
+            # Heuristic: if it mentions 'synthtool', ignore it.
+            if isinstance(node, ast.Import):
+                if any('synthtool' in alias.name for alias in node.names):
+                    continue
+            if isinstance(node, ast.ImportFrom):
+                if node.module and 'synthtool' in node.module:
+                    continue
+            # Preserve other imports
+            if sys.version_info >= (3, 9):
+                top_level_lines.append(ast.unparse(node))
+            continue
+
+        # Check for java.common_templates (top level)
+        if is_call_to(inner_node, ['java', 'common_templates']) or is_call_to(inner_node, ['common', 'java_library']):
+            excludes.extend(extract_excludes_from_call(inner_node))
+            continue
+
+        # Check for s.remove_staging_dirs()
+        if is_call_to(inner_node, ['s', 'remove_staging_dirs']):
+            continue
+
+        # Check for the main loop: for library in s.get_staging_dirs():
+        if isinstance(node, ast.For):
+            is_staging_loop = False
+            if isinstance(node.iter, ast.Call):
+                # Check for s.get_staging_dirs()
+                if is_call_to(node.iter, ['s', 'get_staging_dirs']):
+                    is_staging_loop = True
             
-            if is_common_templates:
-                for keyword in node.keywords:
-                    if keyword.arg == 'excludes':
-                        if isinstance(keyword.value, ast.List):
-                            for elt in keyword.value.elts:
-                                if isinstance(elt, ast.Constant): # Python 3.8+
-                                    excludes.append(elt.value)
-                                elif isinstance(elt, ast.Str): # Python < 3.8
-                                    excludes.append(elt.s)
-                        break
-    return excludes, replacements
-
-
-def generate_target_content(excludes, replacements, standard_excludes=None):
-    # Default excludes for monorepo if no template is provided
+            if is_staging_loop:
+                # Extract body
+                for child in node.body:
+                    child_inner = child
+                    if isinstance(child, ast.Expr):
+                        child_inner = child.value
+                        
+                    # Ignore s.move(library)
+                    if is_call_to(child_inner, ['s', 'move']):
+                        continue
+                    # Check for nested common_templates (rare but possible)
+                    if is_call_to(child_inner, ['java', 'common_templates']) or is_call_to(child_inner, ['common', 'java_library']):
+                        excludes.extend(extract_excludes_from_call(child_inner))
+                        continue
+                    
+                    if sys.version_info >= (3, 9):
+                        loop_body_lines.append(ast.unparse(child))
+                continue
+            # else fall through to preserve other loops
+
+        # Preserve everything else (constants, functions, other logic)
+        if sys.version_info >= (3, 9):
+            top_level_lines.append(ast.unparse(node))
+
+    return excludes, top_level_lines, loop_body_lines
+
+def generate_target_content(excludes, top_level_lines, loop_body_lines, standard_excludes=None):
     if standard_excludes is None:
         standard_excludes = {
             ".github/*",
@@ -80,44 +147,47 @@ def generate_target_content(excludes, replacements, standard_excludes=None):
             ".gitignore"
         }
     
-    # Merge excludes
-    # User requested to ignore source excludes and strictly use standard excludes
     final_excludes = sorted(list(set(standard_excludes)))
-    
-    # Format replacements with indentation
-    formatted_replacements = ""
-    for rep in replacements:
-        formatted_replacements += "    " + rep + "\n"
-        
-    excludes_str = ",\n        ".join([f'"{e}"' for e in final_excludes])
-
-    content = f"""# Copyright 2026 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
-#
-#     https://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.
+    excludes_str = ",\n    ".join([f'"{e}"' for e in final_excludes])
 
-import synthtool as s
-from synthtool.languages import java
+    # Reconstruct content
+    lines = []
+    lines.append("# Copyright 2026 Google LLC")
+    lines.append("#")
+    lines.append("# Licensed under the Apache License, Version 2.0 (the \"License\");")
+    lines.append("# you may not use this file except in compliance with the License.")
+    lines.append("# You may obtain a copy of the License at")
+    lines.append("#")
+    lines.append("#     https://www.apache.org/licenses/LICENSE-2.0")
+    lines.append("#")
+    lines.append("# Unless required by applicable law or agreed to in writing, software")
+    lines.append("# distributed under the License is distributed on an \"AS IS\" BASIS,")
+    lines.append("# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.")
+    lines.append("# See the License for the specific language governing permissions and")
+    lines.append("# limitations under the License.")
+    lines.append("")
+    lines.append("import synthtool as s")
+    lines.append("from synthtool.languages import java")
+    lines.append("")
+    
+    if top_level_lines:
+        lines.extend(top_level_lines)
+        lines.append("")
 
-for library in s.get_staging_dirs():
-    # put any special-case replacements here
-    s.move(library)
-{formatted_replacements}
-s.remove_staging_dirs()
-java.common_templates(monorepo=True, excludes=[
-        {excludes_str}
-])
-"""
-    return content
+    lines.append("for library in s.get_staging_dirs():")
+    lines.append("    # put any special-case replacements here")
+    lines.append("    s.move(library)")
+    for l in loop_body_lines:
+        # Indent loop body
+        for sl in l.split('\n'):
+             lines.append("    " + sl)
+    
+    lines.append("s.remove_staging_dirs()")
+    lines.append(f"java.common_templates(monorepo=True, excludes=[")
+    lines.append(f"    {excludes_str}")
+    lines.append("])")
+    
+    return "\n".join(lines) + "\n"
 
 def main():
     if len(sys.argv) < 3:
@@ -135,21 +205,22 @@ def main():
     with open(source_file, 'r') as f:
         source_code = f.read()
 
-    excludes, replacements = extract_info(source_code)
+    excludes, top_level_lines, loop_body_lines = extract_info(source_code)
     
     standard_excludes = None
     if template_file:
         if os.path.exists(template_file):
             with open(template_file, 'r') as f:
                 template_code = f.read()
-            template_excludes, _ = extract_info(template_code)
+            template_excludes, _, _ = extract_info(template_code)
             standard_excludes = template_excludes
         else:
-            print(f"Template file {template_file} not found. using default excludes.")
+            print(f"Template file {template_file} not found using default excludes.")
 
-    target_content = generate_target_content(excludes, replacements, standard_excludes)
+    target_content = generate_target_content(excludes, top_level_lines, loop_body_lines, standard_excludes)
     
-    os.makedirs(os.path.dirname(target_file), exist_ok=True)
+    if os.path.dirname(target_file):
+        os.makedirs(os.path.dirname(target_file), exist_ok=True)
     with open(target_file, 'w') as f:
         f.write(target_content)
     

From b5db9ddf698445382753c535e1e946fe89e70891 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 21 Jan 2026 21:45:37 +0000
Subject: [PATCH 1766/1784] fix s.move

---
 monorepo-migration/update_owlbot.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/monorepo-migration/update_owlbot.py b/monorepo-migration/update_owlbot.py
index a89ff5182d3f..be063ff685d7 100644
--- a/monorepo-migration/update_owlbot.py
+++ b/monorepo-migration/update_owlbot.py
@@ -111,10 +111,7 @@ def extract_info(source_code):
                     child_inner = child
                     if isinstance(child, ast.Expr):
                         child_inner = child.value
-                        
-                    # Ignore s.move(library)
-                    if is_call_to(child_inner, ['s', 'move']):
-                        continue
+
                     # Check for nested common_templates (rare but possible)
                     if is_call_to(child_inner, ['java', 'common_templates']) or is_call_to(child_inner, ['common', 'java_library']):
                         excludes.extend(extract_excludes_from_call(child_inner))
@@ -176,7 +173,6 @@ def generate_target_content(excludes, top_level_lines, loop_body_lines, standard
 
     lines.append("for library in s.get_staging_dirs():")
     lines.append("    # put any special-case replacements here")
-    lines.append("    s.move(library)")
     for l in loop_body_lines:
         # Indent loop body
         for sl in l.split('\n'):

From 1e7d833224d801a9da98255c05255e399bbeb3eb Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 21 Jan 2026 21:45:44 +0000
Subject: [PATCH 1767/1784] use BUILD_SUBDIR env variable

---
 monorepo-migration/transform_workflow.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
index f4175cf61c34..55b069950ad8 100644
--- a/monorepo-migration/transform_workflow.py
+++ b/monorepo-migration/transform_workflow.py
@@ -49,9 +49,8 @@ def transform(content, lib_name):
 
         if line.startswith('jobs:'):
             if not inserted_defaults:
-                new_lines.append("defaults:")
-                new_lines.append("  run:")
-                new_lines.append(f"    working-directory: {lib_name}")
+                new_lines.append("env:")
+                new_lines.append(f"  BUILD_SUBDIR: {lib_name}")
                 inserted_defaults = True
             new_lines.append(line)
             new_lines.append(filter_job)

From b92293800242d7147f721ecf2a5477728f29ef3c Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 21 Jan 2026 21:55:04 +0000
Subject: [PATCH 1768/1784] skip kokoro files

---
 monorepo-migration/migrate.sh       | 16 +++-------------
 monorepo-migration/update_owlbot.py |  1 -
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index 4b5d749cd5a5..bad39922663f 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -175,7 +175,8 @@ rm -f "$SOURCE_REPO_NAME/.gitignore"
 rm -f "$SOURCE_REPO_NAME/renovate.json"
 rm -f "$SOURCE_REPO_NAME/LICENSE"
 rm -f "$SOURCE_REPO_NAME/java.header"
-rm -rf "$SOURCE_REPO_NAME/.kokoro/continuous"  "$SOURCE_REPO_NAME/.kokoro/nightly"  "$SOURCE_REPO_NAME/.kokoro/presubmit"
+rm -rf "$SOURCE_REPO_NAME/.kokoro"
+# rm -rf "$SOURCE_REPO_NAME/.kokoro/continuous"  "$SOURCE_REPO_NAME/.kokoro/nightly"  "$SOURCE_REPO_NAME/.kokoro/presubmit"
 rm -f "$SOURCE_REPO_NAME/codecov.yaml"
 rm -f "$SOURCE_REPO_NAME/synth.metadata"
 rm -f "$SOURCE_REPO_NAME/license-checks.xml"
@@ -293,18 +294,7 @@ echo "Migrating owlbot.py..."
 if [ -f "$SOURCE_DIR/owlbot.py" ]; then
     TARGET_OWLBOT="$SOURCE_REPO_NAME/owlbot.py"
     
-    # Check for a template owlbot.py to source common excludes from
-    TEMPLATE_OWLBOT=""
-    if [ -f "java-workstations/owlbot.py" ]; then
-        TEMPLATE_OWLBOT="java-workstations/owlbot.py"
-        echo "Using $TEMPLATE_OWLBOT as template for excludes."
-    fi
-
-    if [ -n "$TEMPLATE_OWLBOT" ]; then
-        python3 "$TRANSFORM_OWLBOT_SCRIPT" "$TARGET_OWLBOT" "$SOURCE_DIR/owlbot.py" "$TEMPLATE_OWLBOT"
-    else
-        python3 "$TRANSFORM_OWLBOT_SCRIPT" "$TARGET_OWLBOT" "$SOURCE_DIR/owlbot.py"
-    fi
+    python3 "$TRANSFORM_OWLBOT_SCRIPT" "$TARGET_OWLBOT" "$SOURCE_DIR/owlbot.py"
 
     echo "Committing owlbot.py migration..."
     git add "$TARGET_OWLBOT"
diff --git a/monorepo-migration/update_owlbot.py b/monorepo-migration/update_owlbot.py
index be063ff685d7..2b3d866d40f4 100644
--- a/monorepo-migration/update_owlbot.py
+++ b/monorepo-migration/update_owlbot.py
@@ -132,7 +132,6 @@ def generate_target_content(excludes, top_level_lines, loop_body_lines, standard
     if standard_excludes is None:
         standard_excludes = {
             ".github/*",
-            ".kokoro/*",
             "samples/*",
             "CODE_OF_CONDUCT.md",
             "CONTRIBUTING.md",

From 1222239ed441a7f7136a9a5c4f0cee1b155ee136 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Wed, 21 Jan 2026 21:57:36 +0000
Subject: [PATCH 1769/1784] fix windows build file

---
 monorepo-migration/transform_workflow.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/monorepo-migration/transform_workflow.py b/monorepo-migration/transform_workflow.py
index 55b069950ad8..fba791634ebe 100644
--- a/monorepo-migration/transform_workflow.py
+++ b/monorepo-migration/transform_workflow.py
@@ -82,11 +82,13 @@ def transform(content, lib_name):
                 new_lines.append(line)
                 new_lines.append("    - name: Support longpaths")
                 new_lines.append("      run: git config --system core.longpaths true")
-                new_lines.append("      working-directory: .")
                 continue
 
             if 'run: echo "SUREFIRE_JVM_OPT=' in line and '!java17' not in line:
                 line = line.replace('" >> $GITHUB_ENV', ' -P !java17" >> $GITHUB_ENV')
+            if 'build.bat' in line:
+                line = line.replace('build.bat', 'build.sh')
+
             new_lines.append(line)
     return "\n".join(new_lines)
 

From 776336b1d7ed50eec3850403233d4ed96f4409fe Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Thu, 22 Jan 2026 20:23:01 +0000
Subject: [PATCH 1770/1784] optionally squash commits

---
 monorepo-migration/migrate.sh | 42 ++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index bad39922663f..ad45d6eb59a6 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -57,6 +57,9 @@ UPDATE_GENERATION_CONFIG_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_generation_config.
 UPDATE_OWLBOT_HERMETIC_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_owlbot_hermetic.py"
 TRANSFORM_OWLBOT_SCRIPT="$TRANSFORM_SCRIPT_DIR/update_owlbot.py"
 
+# Track number of commits made by this script
+COMMIT_COUNT=0
+
 echo "Starting migration using git read-tree with isolated clones..."
 
 # 0. Create working directory
@@ -185,6 +188,7 @@ find "$SOURCE_REPO_NAME" -maxdepth 1 -name "*.md" ! -name "CHANGELOG.md" ! -name
 # 7. Commit the migration
 echo "Committing migration..."
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
+COMMIT_COUNT=$((COMMIT_COUNT + 1))
 
 # 7.1 Update CODEOWNERS
 if [ -n "$CODEOWNER" ]; then
@@ -195,6 +199,7 @@ if [ -n "$CODEOWNER" ]; then
     echo "Committing CODEOWNERS update..."
     git add .github/CODEOWNERS
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add code owners for $SOURCE_REPO_NAME"
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 
 # 7.2 Update root pom.xml modules
@@ -204,7 +209,7 @@ python3 "$UPDATE_ROOT_POM_SCRIPT" "pom.xml" "$SOURCE_REPO_NAME"
 echo "Committing root pom.xml modules update..."
 git add pom.xml
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add module to root pom.xml"
-
+COMMIT_COUNT=$((COMMIT_COUNT + 1))
 
 # 7.5 Migrate GitHub Actions workflows
 echo "Checking for GitHub Actions workflows..."
@@ -240,6 +245,7 @@ if [ -d "$SOURCE_REPO_NAME/.github/workflows" ]; then
     echo "Committing workflow migration..."
     git add .github/workflows
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate and adapt GitHub Actions workflows"
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 
 # 7.6 Update generation_config.yaml
@@ -254,6 +260,7 @@ if [ -f "$SOURCE_CONFIG" ]; then
     echo "Committing generation_config.yaml update..."
     git add generation_config.yaml "$SOURCE_CONFIG"
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): add library to generation_config.yaml"
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 
 # 7.7 Consolidate versions.txt
@@ -269,6 +276,7 @@ if [ -f "$SOURCE_VERSIONS" ]; then
     echo "Committing versions.txt update..."
     git add versions.txt "$SOURCE_VERSIONS"
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): consolidate versions.txt into root"
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 
 # 7.8 Migrate .OwlBot-hermetic.yaml
@@ -286,6 +294,7 @@ if [ -n "$SOURCE_OWLBOT" ]; then
     echo "Committing .OwlBot-hermetic.yaml migration..."
     git add "$TARGET_OWLBOT"
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate .OwlBot-hermetic.yaml"
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 
 
@@ -299,6 +308,7 @@ if [ -f "$SOURCE_DIR/owlbot.py" ]; then
     echo "Committing owlbot.py migration..."
     git add "$TARGET_OWLBOT"
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate owlbot.py"
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 
 # 7.9 Fix copyright headers in Java files
@@ -308,6 +318,7 @@ python3 "$FIX_COPYRIGHT_SCRIPT" "$SOURCE_REPO_NAME"
 echo "Committing copyright header fixes..."
 git add "$SOURCE_REPO_NAME"
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): update copyright headers to 2026 Google LLC"
+COMMIT_COUNT=$((COMMIT_COUNT + 1))
 
 # 7.11 Modernize root pom.xml
 echo "Modernizing root pom.xml..."
@@ -317,11 +328,13 @@ python3 "$MODERNIZE_POM_SCRIPT" "$SOURCE_REPO_NAME/pom.xml" "$PARENT_VERSION" "$
 echo "Committing root pom.xml modernization..."
 git add "$SOURCE_REPO_NAME/pom.xml"
 git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): modernize root pom.xml"
+COMMIT_COUNT=$((COMMIT_COUNT + 1))
 
 # 7.12 Modernize BOM pom.xml
 echo "Modernizing BOM pom.xml..."
 # Find potential BOM POMs (usually in a subdirectory ending with -bom)
-find "$SOURCE_REPO_NAME" -name "pom.xml" | grep "\-bom/pom.xml" | grep -v "samples" | while read -r bom_pom; do
+# Use process substitution or just a loop over the output of find to avoid subshell issues with counters
+while read -r bom_pom; do
     echo "Modernizing BOM: $bom_pom"
     # BOMs should inherit from google-cloud-pom-parent
     python3 "$MODERNIZE_POM_SCRIPT" "$bom_pom" "$PARENT_VERSION" "$SOURCE_REPO_NAME" "google-cloud-pom-parent" "../../google-cloud-pom-parent/pom.xml"
@@ -329,12 +342,35 @@ find "$SOURCE_REPO_NAME" -name "pom.xml" | grep "\-bom/pom.xml" | grep -v "sampl
     echo "Committing BOM pom.xml modernization for $bom_pom..."
     git add "$bom_pom"
     git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): modernize BOM pom.xml"
-done
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
+done < <(find "$SOURCE_REPO_NAME" -name "pom.xml" | grep "\-bom/pom.xml" | grep -v "samples")
 
 # 7.11 Verify compilation
 echo "Verifying compilation..."
 (cd "$SOURCE_REPO_NAME" && mvn compile -DskipTests -T 1C)
 
+# 7.13 Squash commits
+if [ "${SQUASH_COMMITS:-false}" = "true" ]; then
+    echo "Squashing $COMMIT_COUNT commits..."
+    if [ "$COMMIT_COUNT" -gt 1 ]; then
+        # Reset soft to the first commit of the migration
+        # We want to keep the very first commit message, or maybe a combined one?
+        # The requirement is "squash all the commits it's made into a single migration commit"
+        # The first commit we made was "chore($SOURCE_REPO_NAME): migrate $SOURCE_REPO_NAME into monorepo"
+        
+        # We can do this by soft resetting back COMMIT_COUNT-1 commits
+        # This leaves the first commit as HEAD, but with changes from subsequent commits staged.
+        # NO. Soft reset back N commits.
+        # If we made 3 commits: C1, C2, C3. HEAD is C3.
+        # reset --soft HEAD~2 results in HEAD at C1, with changes from C2 and C3 staged.
+        # then commit --amend adds those staged changes to C1.
+        
+        git reset --soft "HEAD~$((COMMIT_COUNT - 1))"
+        git commit --amend --no-edit --no-gpg-sign
+        echo "Squashed everything into one commit."
+    fi
+fi
+
 # 8. Cleanup
 echo "Cleaning up temporary source clone..."
 rm -rf "$SOURCE_DIR"

From b05691a1e6a9dfd1b01cf63be30c66720920b525 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:22:08 +0000
Subject: [PATCH 1771/1784] fix CODEOWNERS detection

---
 monorepo-migration/migrate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monorepo-migration/migrate.sh b/monorepo-migration/migrate.sh
index ad45d6eb59a6..390f8eef2d47 100755
--- a/monorepo-migration/migrate.sh
+++ b/monorepo-migration/migrate.sh
@@ -95,7 +95,7 @@ if [ -z "$CODEOWNER" ]; then
     if [ -n "$CODEOWNERS_FILE" ]; then
         # Extract the line(s) starting with * (global owners)
         # Use grep to find the line, then sed to remove the '*' and standard team handle
-        EXTRACTED_OWNERS=$(grep "^\*" "$CODEOWNERS_FILE" | sed 's/^\*[[:space:]]*//' | sed 's/@googleapis\/cloud-java-team-teamsync//g' | xargs)
+        EXTRACTED_OWNERS=$(grep "^\* " "$CODEOWNERS_FILE" | sed 's/^\*[[:space:]]*//' | sed 's/@googleapis\/cloud-java-team-teamsync//g' | xargs)
         if [ -n "$EXTRACTED_OWNERS" ]; then
             DEFAULT_CODEOWNER="$EXTRACTED_OWNERS"
             echo "Found default CODEOWNER: $DEFAULT_CODEOWNER"

From 62423ad49ec7d6c2d8e32deb4c722a79b310820e Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:22:15 +0000
Subject: [PATCH 1772/1784] fix owlbot template excludes

---
 monorepo-migration/update_owlbot.py | 45 ++++++++++-------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/monorepo-migration/update_owlbot.py b/monorepo-migration/update_owlbot.py
index 2b3d866d40f4..5b02501e7625 100644
--- a/monorepo-migration/update_owlbot.py
+++ b/monorepo-migration/update_owlbot.py
@@ -128,23 +128,21 @@ def extract_info(source_code):
 
     return excludes, top_level_lines, loop_body_lines
 
-def generate_target_content(excludes, top_level_lines, loop_body_lines, standard_excludes=None):
-    if standard_excludes is None:
-        standard_excludes = {
-            ".github/*",
-            "samples/*",
-            "CODE_OF_CONDUCT.md",
-            "CONTRIBUTING.md",
-            "LICENSE",
-            "SECURITY.md",
-            "java.header",
-            "license-checks.xml",
-            "renovate.json",
-            ".gitignore"
-        }
-    
-    final_excludes = sorted(list(set(standard_excludes)))
-    excludes_str = ",\n    ".join([f'"{e}"' for e in final_excludes])
+def generate_target_content(excludes, top_level_lines, loop_body_lines):
+    standard_excludes = [
+        ".github/*",
+        ".kokoro/*",
+        "samples/*",
+        "CODE_OF_CONDUCT.md",
+        "CONTRIBUTING.md",
+        "LICENSE",
+        "SECURITY.md",
+        "java.header",
+        "license-checks.xml",
+        "renovate.json",
+        ".gitignore",
+    ]
+    excludes_str = ",\n    ".join([f'"{e}"' for e in standard_excludes])
 
     # Reconstruct content
     lines = []
@@ -201,18 +199,7 @@ def main():
         source_code = f.read()
 
     excludes, top_level_lines, loop_body_lines = extract_info(source_code)
-    
-    standard_excludes = None
-    if template_file:
-        if os.path.exists(template_file):
-            with open(template_file, 'r') as f:
-                template_code = f.read()
-            template_excludes, _, _ = extract_info(template_code)
-            standard_excludes = template_excludes
-        else:
-            print(f"Template file {template_file} not found using default excludes.")
-
-    target_content = generate_target_content(excludes, top_level_lines, loop_body_lines, standard_excludes)
+    target_content = generate_target_content(excludes, top_level_lines, loop_body_lines)
     
     if os.path.dirname(target_file):
         os.makedirs(os.path.dirname(target_file), exist_ok=True)

From fa5b942d8e1011ff997cecf55c2155753f357d31 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:26 +0000
Subject: [PATCH 1773/1784] chore(java-datastore): add code owners for
 java-datastore

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index eb74930dec50..43a5bb05803e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,3 +7,4 @@
 
 # java-vertexai has maintainers
 /java-vertexai/   @googleapis/vertex-java-sdk @googleapis/cloud-java-team-teamsync
+/java-datastore/ @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners @googleapis/cloud-java-team-teamsync

From 38a3cf54f78da78fd50a23f26e5a13f7095e9cff Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:27 +0000
Subject: [PATCH 1774/1784] chore(java-datastore): add module to root pom.xml

---
 pom.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 96bd03560242..a90ef93fa0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
     java-admanager
     java-advisorynotifications
     java-aiplatform
-    java-alloydb
     java-alloydb-connectors
+    java-alloydb
     java-analytics-admin
     java-analytics-data
     java-analyticshub
@@ -83,14 +83,15 @@
     java-datalineage
     java-datamanager
     java-dataplex
-    java-dataproc
     java-dataproc-metastore
+    java-dataproc
+    java-datastore
     java-datastream
     java-deploy
     java-developerconnect
     java-devicestreaming
-    java-dialogflow
     java-dialogflow-cx
+    java-dialogflow
     java-discoveryengine
     java-distributedcloudedge
     java-dlp
@@ -102,8 +103,8 @@
     java-enterpriseknowledgegraph
     java-errorreporting
     java-essential-contacts
-    java-eventarc
     java-eventarc-publishing
+    java-eventarc
     java-filestore
     java-financialservices
     java-functions
@@ -117,8 +118,8 @@
     java-grafeas
     java-gsuite-addons
     java-hypercomputecluster
-    java-iam
     java-iam-admin
+    java-iam
     java-iamcredentials
     java-iap
     java-ids
@@ -138,8 +139,8 @@
     java-managedkafka
     java-maps-addressvalidation
     java-maps-area-insights
-    java-maps-fleetengine
     java-maps-fleetengine-delivery
+    java-maps-fleetengine
     java-maps-mapsplatformdatasets
     java-maps-places
     java-maps-routeoptimization
@@ -151,9 +152,9 @@
     java-memcache
     java-migrationcenter
     java-modelarmor
-    java-monitoring
     java-monitoring-dashboards
     java-monitoring-metricsscope
+    java-monitoring
     java-netapp
     java-network-management
     java-network-security
@@ -180,8 +181,8 @@
     java-recaptchaenterprise
     java-recommendations-ai
     java-recommender
-    java-redis
     java-redis-cluster
+    java-redis
     java-resourcemanager
     java-retail
     java-run
@@ -191,8 +192,8 @@
     java-secretmanager
     java-securesourcemanager
     java-security-private-ca
-    java-securitycenter
     java-securitycenter-settings
+    java-securitycenter
     java-securitycentermanagement
     java-securityposture
     java-service-control

From 305996d1fe326b61f4d8ba4d4aa6480c3005114c Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:28 +0000
Subject: [PATCH 1775/1784] chore(java-datastore): migrate and adapt GitHub
 Actions workflows

---
 .github/workflows/java-datastore-ci.yaml | 147 +++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 .github/workflows/java-datastore-ci.yaml

diff --git a/.github/workflows/java-datastore-ci.yaml b/.github/workflows/java-datastore-ci.yaml
new file mode 100644
index 000000000000..0b080099fabd
--- /dev/null
+++ b/.github/workflows/java-datastore-ci.yaml
@@ -0,0 +1,147 @@
+# 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.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+name: java-datastore ci
+env:
+  BUILD_SUBDIR: java-datastore
+jobs:
+  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      library: ${{ steps.filter.outputs.library }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          library:
+            - 'java-datastore/**'
+  units:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [11, 17, 21, 25]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test
+  units-java8:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    # Building using Java 17 and run the tests with Java 8 runtime
+    name: "units (8)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 8
+          distribution: temurin
+      - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
+        # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
+        # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
+        run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java -P !java17" >> $GITHUB_ENV
+        shell: bash
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: test
+  windows:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    # Building using Java 11 and run the tests with Java 8 runtime
+    runs-on: windows-latest
+    steps:
+    - name: Support longpaths
+      run: git config --system core.longpaths true
+    - name: Support longpaths
+      run: git config --system core.longpaths true
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 8
+        distribution: temurin
+    - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
+      run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}\bin\java -P !java17" >> $GITHUB_ENV
+      shell: bash
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 11
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test
+  dependencies:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [17]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/dependencies.sh
+  javadoc:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 17
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: javadoc
+  lint:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 17
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: lint

From ef6daae78b51ad3b2635b9f5e36fa3eb25d837ea Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:30 +0000
Subject: [PATCH 1776/1784] chore(java-datastore): add library to
 generation_config.yaml

---
 generation_config.yaml                | 453 +++++++-------------------
 java-datastore/generation_config.yaml |  25 --
 2 files changed, 114 insertions(+), 364 deletions(-)
 delete mode 100644 java-datastore/generation_config.yaml

diff --git a/generation_config.yaml b/generation_config.yaml
index 76a9c95606a8..5fc94c0c14de 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,10 +1,6 @@
 gapic_generator_version: 2.65.1
 googleapis_commitish: 415914bd49d41beaae8a9adb348ee2587c93aa70
 libraries_bom_version: 26.73.0
-
-# the libraries are ordered with respect to library name, which is
-# java-{library.library_name} or java-{library.api-shortname} when
-# library.library_name is not defined.
 libraries:
 - api_shortname: accessapproval
   name_pretty: Access Approval
@@ -14,7 +10,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/accessapproval/v1
-
 - api_shortname: accesscontextmanager
   name_pretty: Identity Access Context Manager
   product_documentation: n/a
@@ -24,7 +19,6 @@ libraries:
   GAPICs:
   - proto_path: google/identity/accesscontextmanager/v1
   - proto_path: google/identity/accesscontextmanager/type
-
 - api_shortname: admanager
   name_pretty: Google Ad Manager API
   product_documentation: https://developers.google.com/ad-manager/api/beta
@@ -40,7 +34,6 @@ libraries:
   GAPICs:
   - proto_path: google/ads/admanager/v1
   requires_billing: true
-
 - api_shortname: advisorynotifications
   name_pretty: Advisory Notifications API
   product_documentation: https://cloud.google.com/advisory-notifications/
@@ -48,7 +41,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/advisorynotifications/v1
-
 - api_shortname: aiplatform
   name_pretty: Vertex AI
   product_documentation: https://cloud.google.com/vertex-ai/docs
@@ -61,7 +53,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/aiplatform/v1
   - proto_path: google/cloud/aiplatform/v1beta1
-
 - api_shortname: alloydb
   name_pretty: AlloyDB
   product_documentation: https://cloud.google.com/alloydb/
@@ -73,7 +64,6 @@ libraries:
   - proto_path: google/cloud/alloydb/v1
   - proto_path: google/cloud/alloydb/v1alpha
   - proto_path: google/cloud/alloydb/v1beta
-
 - api_shortname: alloydb
   name_pretty: AlloyDB connectors
   product_documentation: https://cloud.google.com/alloydb/docs
@@ -88,7 +78,6 @@ libraries:
   - proto_path: google/cloud/alloydb/connectors/v1
   - proto_path: google/cloud/alloydb/connectors/v1alpha
   - proto_path: google/cloud/alloydb/connectors/v1beta
-
 - api_shortname: analyticsadmin
   name_pretty: Analytics Admin
   product_documentation: https://developers.google.com/analytics
@@ -100,7 +89,6 @@ libraries:
   GAPICs:
   - proto_path: google/analytics/admin/v1alpha
   - proto_path: google/analytics/admin/v1beta
-
 - api_shortname: analyticsdata
   name_pretty: Analytics Data
   product_documentation: https://developers.google.com/analytics/trusted-testing/analytics-data
@@ -114,7 +102,6 @@ libraries:
   GAPICs:
   - proto_path: google/analytics/data/v1alpha
   - proto_path: google/analytics/data/v1beta
-
 - api_shortname: analyticshub
   name_pretty: Analytics Hub API
   product_documentation: https://cloud.google.com/bigquery/TBD
@@ -122,7 +109,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/bigquery/analyticshub/v1
-
 - api_shortname: apigateway
   name_pretty: API Gateway
   product_documentation: https://cloud.google.com/api-gateway/docs
@@ -137,7 +123,6 @@ libraries:
   rest_documentation: https://cloud.google.com/api-gateway/docs/reference/rest
   GAPICs:
   - proto_path: google/cloud/apigateway/v1
-
 - api_shortname: apigeeconnect
   name_pretty: Apigee Connect
   product_documentation: https://cloud.google.com/apigee/docs/hybrid/v1.3/apigee-connect/
@@ -148,7 +133,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/apigeeconnect/v1
-
 - api_shortname: apigee-registry
   name_pretty: Registry API
   product_documentation: https://cloud.google.com/apigee/docs/api-hub/get-started-registry-api
@@ -157,7 +141,6 @@ libraries:
   api_id: apigeeregistry.googleapis.com
   GAPICs:
   - proto_path: google/cloud/apigeeregistry/v1
-
 - api_shortname: apihub
   name_pretty: API hub API
   product_documentation: https://cloud.google.com/apigee/docs/apihub/what-is-api-hub
@@ -183,7 +166,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/api/apikeys/v2
-
 - api_shortname: appengine
   name_pretty: App Engine Admin API
   product_documentation: https://cloud.google.com/appengine/docs/admin-api/
@@ -193,7 +175,6 @@ libraries:
   codeowner_team: '@googleapis/aap-dpes'
   GAPICs:
   - proto_path: google/appengine/v1
-
 - api_shortname: apphub
   name_pretty: App Hub API
   product_documentation: https://cloud.google.com/app-hub/docs/overview
@@ -202,7 +183,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/app-hub/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/apphub/v1
-
 - api_shortname: area120tables
   name_pretty: Area 120 Tables
   product_documentation: https://area120.google.com/
@@ -212,7 +192,6 @@ libraries:
   distribution_name: com.google.area120:google-area120-tables
   GAPICs:
   - proto_path: google/area120/tables/v1alpha1
-
 - api_shortname: artifactregistry
   name_pretty: Artifact Registry
   product_documentation: https://cloud.google.com/artifact-registry
@@ -229,7 +208,6 @@ libraries:
   GAPICs:
   - proto_path: google/devtools/artifactregistry/v1
   - proto_path: google/devtools/artifactregistry/v1beta2
-
 - api_shortname: cloudasset
   name_pretty: Cloud Asset Inventory
   product_documentation: https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview
@@ -247,7 +225,6 @@ libraries:
   - proto_path: google/cloud/asset/v1p2beta1
   - proto_path: google/cloud/asset/v1p5beta1
   - proto_path: google/cloud/asset/v1p7beta1
-
 - api_shortname: assuredworkloads
   name_pretty: Assured Workloads for Government
   product_documentation: https://cloud.google.com/assured-workloads/
@@ -260,7 +237,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/assuredworkloads/v1
   - proto_path: google/cloud/assuredworkloads/v1beta1
-
 - api_shortname: automl
   name_pretty: Cloud Auto ML
   product_documentation: https://cloud.google.com/automl/docs/
@@ -276,14 +252,12 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/automl/v1
   - proto_path: google/cloud/automl/v1beta1
-
 - api_shortname: backupdr
   name_pretty: Backup and DR Service API
   product_documentation: https://cloud.google.com/backup-disaster-recovery/docs/concepts/backup-dr
   api_description: 'Backup and DR Service is a powerful, centralized, cloud-first
     backup and disaster recovery solution for cloud-based and hybrid workloads. '
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-backupdr/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-backupdr/latest/overview
   release_level: stable
   distribution_name: com.google.cloud:google-cloud-backupdr
   api_id: backupdr.googleapis.com
@@ -303,7 +277,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/bare-metal/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/baremetalsolution/v2
-
 - api_shortname: batch
   name_pretty: Cloud Batch
   product_documentation: https://cloud.google.com/
@@ -311,7 +284,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/batch/v1
   - proto_path: google/cloud/batch/v1alpha
-
 - api_shortname: beyondcorp-appconnections
   name_pretty: BeyondCorp AppConnections
   product_documentation: https://cloud.google.com/beyondcorp-enterprise/
@@ -322,7 +294,6 @@ libraries:
     need for a traditional VPN.
   GAPICs:
   - proto_path: google/cloud/beyondcorp/appconnections/v1
-
 - api_shortname: beyondcorp-appconnectors
   name_pretty: BeyondCorp AppConnectors
   product_documentation: cloud.google.com/beyondcorp-enterprise/
@@ -330,7 +301,6 @@ libraries:
     AppConnectors.
   GAPICs:
   - proto_path: google/cloud/beyondcorp/appconnectors/v1
-
 - api_shortname: beyondcorp-appgateways
   name_pretty: BeyondCorp AppGateways
   product_documentation: https://cloud.google.com/beyondcorp-enterprise/
@@ -339,7 +309,6 @@ libraries:
   api_id: beyondcorp.googleapis.com
   GAPICs:
   - proto_path: google/cloud/beyondcorp/appgateways/v1
-
 - api_shortname: beyondcorp-clientconnectorservices
   name_pretty: BeyondCorp ClientConnectorServices
   product_documentation: https://cloud.google.com/beyondcorp-enterprise/
@@ -348,7 +317,6 @@ libraries:
   api_id: beyondcorp.googleapis.com
   GAPICs:
   - proto_path: google/cloud/beyondcorp/clientconnectorservices/v1
-
 - api_shortname: beyondcorp-clientgateways
   name_pretty: BeyondCorp ClientGateways
   product_documentation: https://cloud.google.com/beyondcorp-enterprise/
@@ -357,7 +325,6 @@ libraries:
   api_id: beyondcorp.googleapis.com
   GAPICs:
   - proto_path: google/cloud/beyondcorp/clientgateways/v1
-
 - api_shortname: biglake
   name_pretty: BigLake
   product_documentation: https://cloud.google.com/biglake
@@ -368,7 +335,6 @@ libraries:
   - proto_path: google/cloud/bigquery/biglake/v1
   - proto_path: google/cloud/biglake/v1
   - proto_path: google/cloud/bigquery/biglake/v1alpha1
-
 - api_shortname: analyticshub
   name_pretty: Analytics Hub
   product_documentation: https://cloud.google.com/analytics-hub
@@ -378,18 +344,15 @@ libraries:
   library_name: bigquery-data-exchange
   GAPICs:
   - proto_path: google/cloud/bigquery/dataexchange/v1beta1
-
 - api_shortname: bigqueryconnection
   name_pretty: Cloud BigQuery Connection
   product_documentation: https://cloud.google.com/bigquery/docs/reference/bigqueryconnection/rest
   api_description: allows users to manage BigQuery connections to external data sources.
   release_level: stable
-  client_documentation: 
-    https://cloud.google.com/bigquery/docs/reference/reservations/rpc/google.cloud.bigquery.reservation.v1beta1
+  client_documentation: https://cloud.google.com/bigquery/docs/reference/reservations/rpc/google.cloud.bigquery.reservation.v1beta1
   GAPICs:
   - proto_path: google/cloud/bigquery/connection/v1
   - proto_path: google/cloud/bigquery/connection/v1beta1
-
 - api_shortname: bigquerydatapolicy
   name_pretty: BigQuery DataPolicy API
   product_documentation: https://cloud.google.com/bigquery/docs/reference/datapolicy/
@@ -399,7 +362,6 @@ libraries:
   - proto_path: google/cloud/bigquery/datapolicies/v1beta1
   - proto_path: google/cloud/bigquery/datapolicies/v2beta1
   - proto_path: google/cloud/bigquery/datapolicies/v2
-
 - api_shortname: bigquerydatatransfer
   name_pretty: BigQuery Data Transfer Service
   product_documentation: https://cloud.google.com/bigquery/transfer/
@@ -409,7 +371,6 @@ libraries:
   issue_tracker: https://issuetracker.google.com/savedsearches/559654
   GAPICs:
   - proto_path: google/cloud/bigquery/datatransfer/v1
-
 - api_shortname: bigquerymigration
   name_pretty: BigQuery Migration
   product_documentation: https://cloud.google.com/bigquery/docs
@@ -418,7 +379,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/bigquery/migration/v2
   - proto_path: google/cloud/bigquery/migration/v2alpha
-
 - api_shortname: bigqueryreservation
   name_pretty: Cloud BigQuery Reservation
   product_documentation: https://cloud.google.com/bigquery/docs/reference/reservations/rpc
@@ -426,7 +386,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/bigquery/reservation/v1
-
 - api_shortname: cloudbilling
   name_pretty: Cloud Billing
   product_documentation: https://cloud.google.com/billing/docs
@@ -439,7 +398,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/billing/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/billing/v1
-
 - api_shortname: billingbudgets
   name_pretty: Cloud Billing Budgets
   product_documentation: https://cloud.google.com/billing/docs/how-to/budgets
@@ -449,7 +407,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/billing/budgets/v1
   - proto_path: google/cloud/billing/budgets/v1beta1
-
 - api_shortname: binaryauthorization
   name_pretty: Binary Authorization
   product_documentation: https://cloud.google.com/binary-authorization/docs
@@ -465,13 +422,11 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/binaryauthorization/v1
   - proto_path: google/cloud/binaryauthorization/v1beta1
-
 - api_shortname: capacityplanner
   name_pretty: Capacity Planner API
   product_documentation: https://cloud.google.com/capacity-planner/docs
   api_description: Provides programmatic access to Capacity Planner features.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-capacityplanner/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-capacityplanner/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-capacityplanner
   api_id: capacityplanner.googleapis.com
@@ -490,7 +445,6 @@ libraries:
   api_id: certificatemanager.googleapis.com
   GAPICs:
   - proto_path: google/cloud/certificatemanager/v1
-
 - api_shortname: cloudchannel
   name_pretty: Channel Services
   product_documentation: https://cloud.google.com/channel/docs
@@ -504,7 +458,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/channel/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/channel/v1
-
 - api_shortname: chat
   name_pretty: Google Chat API
   product_documentation: https://developers.google.com/chat/concepts
@@ -514,15 +467,13 @@ libraries:
   rest_documentation: https://developers.google.com/chat/api/reference/rest
   GAPICs:
   - proto_path: google/chat/v1
-
 - api_shortname: chronicle
   name_pretty: Chronicle API
   product_documentation: https://cloud.google.com/chronicle/docs/secops/secops-overview
   api_description: The Google Cloud Security Operations API, popularly known as the
     Chronicle API, serves endpoints that enable security analysts to analyze and mitigate
     a security threat throughout its lifecycle
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-chronicle/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-chronicle/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-chronicle
   api_id: chronicle.googleapis.com
@@ -538,8 +489,7 @@ libraries:
   api_description: Cloud API Registry lets you discover, govern, use, and monitor
     Model Context Protocol (MCP) servers and tools provided by Google, or by your
     organization through Apigee API hub.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-cloudapiregistry/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-cloudapiregistry/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-cloudapiregistry
   api_id: cloudapiregistry.googleapis.com
@@ -562,7 +512,6 @@ libraries:
   GAPICs:
   - proto_path: google/devtools/cloudbuild/v1
   - proto_path: google/devtools/cloudbuild/v2
-
 - api_shortname: cloudcommerceconsumerprocurement
   name_pretty: Cloud Commerce Consumer Procurement
   product_documentation: https://cloud.google.com/marketplace/
@@ -573,7 +522,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/commerce/consumer/procurement/v1
   - proto_path: google/cloud/commerce/consumer/procurement/v1alpha1
-
 - api_shortname: cloudcontrolspartner
   name_pretty: Cloud Controls Partner API
   product_documentation: https://cloud.google.com/sovereign-controls-by-partners/docs/sovereign-partners
@@ -583,27 +531,23 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/cloudcontrolspartner/v1
   - proto_path: google/cloud/cloudcontrolspartner/v1beta
-
 - api_shortname: cloudquotas
   name_pretty: Cloud Quotas API
   product_documentation: https://cloud.google.com/cloudquotas/docs/
-  api_description: "Cloud Quotas API provides GCP service consumers with management
-    and\n    observability for resource usage, quotas, and restrictions of the services\n\
+  api_description: "Cloud Quotas API provides GCP service consumers with management\
+    \ and\n    observability for resource usage, quotas, and restrictions of the services\n\
     \    they consume."
   release_level: stable
   GAPICs:
   - proto_path: google/api/cloudquotas/v1
   - proto_path: google/api/cloudquotas/v1beta
-
 - api_shortname: cloudsecuritycompliance
   name_pretty: Cloud Security Compliance API
-  product_documentation: 
-    https://cloud.google.com/security-command-center/docs/compliance-manager-overview
+  product_documentation: https://cloud.google.com/security-command-center/docs/compliance-manager-overview
   api_description: Compliance Manager uses software-defined controls that let you
     assess support for multiple compliance programs and security requirements within
     a Google Cloud organization
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-cloudsecuritycompliance/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-cloudsecuritycompliance/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-cloudsecuritycompliance
   api_id: cloudsecuritycompliance.googleapis.com
@@ -621,21 +565,19 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/support/v2
   - proto_path: google/cloud/support/v2beta
-
 - api_shortname: compute
   name_pretty: Compute Engine
   product_documentation: https://cloud.google.com/compute/
-  api_description: "delivers virtual machines running in Google's innovative data
-    centers and worldwide fiber network. Compute Engine's tooling and workflow support
+  api_description: 'delivers virtual machines running in Google''s innovative data
+    centers and worldwide fiber network. Compute Engine''s tooling and workflow support
     enable scaling from single instances to global, load-balanced cloud computing.
-    Compute Engine's VMs boot quickly, come with persistent disk storage, deliver
-    consistent performance and are available in many configurations. "
+    Compute Engine''s VMs boot quickly, come with persistent disk storage, deliver
+    consistent performance and are available in many configurations. '
   release_level: stable
   excluded_poms: grpc-google-cloud-compute-v1
   excluded_dependencies: grpc-google-cloud-compute-v1
   GAPICs:
   - proto_path: google/cloud/compute/v1
-
 - api_shortname: confidentialcomputing
   name_pretty: Confidential Computing API
   product_documentation: https://cloud.google.com/confidential-computing/
@@ -644,15 +586,12 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/confidentialcomputing/v1
   - proto_path: google/cloud/confidentialcomputing/v1alpha1
-
 - api_shortname: configdelivery
   name_pretty: Config Delivery API
-  product_documentation: 
-    https://cloud.google.com/kubernetes-engine/enterprise/config-sync/docs/concepts/fleet-packages
+  product_documentation: https://cloud.google.com/kubernetes-engine/enterprise/config-sync/docs/concepts/fleet-packages
   api_description: ConfigDelivery service manages the deployment of kubernetes configuration
     to a fleet of kubernetes clusters.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-configdelivery/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-configdelivery/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-configdelivery
   api_id: configdelivery.googleapis.com
@@ -660,19 +599,16 @@ libraries:
   group_id: com.google.cloud
   cloud_api: true
   requires_billing: true
-  rest_documentation: 
-    https://cloud.google.com/kubernetes-engine/enterprise/config-sync/docs/reference/rest
+  rest_documentation: https://cloud.google.com/kubernetes-engine/enterprise/config-sync/docs/reference/rest
   GAPICs:
   - proto_path: google/cloud/configdelivery/v1beta
   - proto_path: google/cloud/configdelivery/v1
 - api_shortname: connectgateway
   name_pretty: Connect Gateway API
-  product_documentation: 
-    https://cloud.google.com/kubernetes-engine/enterprise/multicluster-management/gateway
+  product_documentation: https://cloud.google.com/kubernetes-engine/enterprise/multicluster-management/gateway
   api_description: The Connect Gateway service allows connectivity from external parties
     to     connected Kubernetes clusters.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-connectgateway/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-connectgateway/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-connectgateway
   api_id: connectgateway.googleapis.com
@@ -692,7 +628,6 @@ libraries:
   codeowner_team: '@googleapis/api-contact-center-insights'
   GAPICs:
   - proto_path: google/cloud/contactcenterinsights/v1
-
 - api_shortname: container
   name_pretty: Kubernetes Engine
   product_documentation: https://cloud.google.com/kubernetes-engine/
@@ -708,7 +643,6 @@ libraries:
   GAPICs:
   - proto_path: google/container/v1
   - proto_path: google/container/v1beta1
-
 - api_shortname: containeranalysis
   name_pretty: Cloud Container Analysis
   product_documentation: https://cloud.google.com/container-registry/docs/container-analysis
@@ -724,7 +658,6 @@ libraries:
   GAPICs:
   - proto_path: google/devtools/containeranalysis/v1
   - proto_path: google/devtools/containeranalysis/v1beta1
-
 - api_shortname: contentwarehouse
   name_pretty: Document AI Warehouse
   product_documentation: https://cloud.google.com/document-warehouse/docs/overview
@@ -733,7 +666,6 @@ libraries:
     metadata.
   GAPICs:
   - proto_path: google/cloud/contentwarehouse/v1
-
 - api_shortname: datafusion
   name_pretty: Cloud Data Fusion
   product_documentation: https://cloud.google.com/data-fusion/docs
@@ -745,19 +677,17 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/datafusion/v1
   - proto_path: google/cloud/datafusion/v1beta1
-
 - api_shortname: databasecenter
   name_pretty: Database Center API
   product_documentation: https://cloud.google.com/database-center/docs/overview
-  api_description: Database Center provides an organization-wide, cross-product fleet
-    health platform to eliminate the overhead, complexity, and risk associated with
-    aggregating and summarizing health signals through custom dashboards. Through
-    Database Center’s fleet health dashboard and API, database platform teams that
-    are responsible for reliability, compliance, security, cost, and administration
-    of database fleets will now have a single pane of glass that pinpoints issues
-    relevant to each team.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-databasecenter/latest/overview
+  api_description: "Database Center provides an organization-wide, cross-product fleet\
+    \ health platform to eliminate the overhead, complexity, and risk associated with\
+    \ aggregating and summarizing health signals through custom dashboards. Through\
+    \ Database Center\u2019s fleet health dashboard and API, database platform teams\
+    \ that are responsible for reliability, compliance, security, cost, and administration\
+    \ of database fleets will now have a single pane of glass that pinpoints issues\
+    \ relevant to each team."
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-databasecenter/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-databasecenter
   api_id: databasecenter.googleapis.com
@@ -777,7 +707,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/datacatalog/v1
   - proto_path: google/cloud/datacatalog/v1beta1
-
 - api_shortname: dataflow
   name_pretty: Dataflow
   product_documentation: https://cloud.google.com/dataflow/docs
@@ -787,7 +716,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/dataflow/docs/reference/rpc
   GAPICs:
   - proto_path: google/dataflow/v1beta3
-
 - api_shortname: dataform
   name_pretty: Cloud Dataform
   product_documentation: https://cloud.google.com/dataform/docs
@@ -795,7 +723,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/dataform/v1beta1
   - proto_path: google/cloud/dataform/v1
-
 - api_shortname: datalabeling
   name_pretty: Data Labeling
   product_documentation: https://cloud.google.com/ai-platform/data-labeling/docs/
@@ -807,7 +734,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/ai-platform/data-labeling/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/datalabeling/v1beta1
-
 - api_shortname: datalineage
   name_pretty: Data Lineage
   product_documentation: https://cloud.google.com/data-catalog/docs/data-lineage/
@@ -815,7 +741,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/datacatalog/lineage/v1
-
 - api_shortname: datamanager
   name_pretty: Data Manager API
   product_documentation: https://developers.google.com/data-manager
@@ -845,7 +770,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/dataplex/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/dataplex/v1
-
 - api_shortname: dataproc
   name_pretty: Dataproc
   product_documentation: https://cloud.google.com/dataproc
@@ -858,7 +782,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/dataproc/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/dataproc/v1
-
 - api_shortname: metastore
   name_pretty: Dataproc Metastore
   product_documentation: https://cloud.google.com/dataproc-metastore/docs
@@ -874,7 +797,29 @@ libraries:
   - proto_path: google/cloud/metastore/v1
   - proto_path: google/cloud/metastore/v1alpha
   - proto_path: google/cloud/metastore/v1beta
-
+- api_shortname: datastore
+  name_pretty: Cloud Datastore
+  product_documentation: https://cloud.google.com/datastore
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
+  issue_tracker: https://issuetracker.google.com/savedsearches/559768
+  release_level: stable
+  language: java
+  distribution_name: com.google.cloud:google-cloud-datastore
+  codeowner_team: '@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk
+    @googleapis/api-firestore-partners'
+  api_id: datastore.googleapis.com
+  library_type: GAPIC_COMBO
+  api_description: is a fully managed, schemaless database for\nstoring non-relational
+    data. Cloud Datastore automatically scales with\nyour users and supports ACID
+    transactions, high availability of reads and\nwrites, strong consistency for reads
+    and ancestor queries, and eventual\nconsistency for all other queries.
+  excluded_dependencies: grpc-google-cloud-datastore-v1
+  extra_versioned_modules: datastore-v1-proto-client
+  excluded_poms: grpc-google-cloud-datastore-v1
+  recommended_package: com.google.cloud.datastore
+  GAPICs:
+  - proto_path: google/datastore/v1
+  - proto_path: google/datastore/admin/v1
 - api_shortname: datastream
   name_pretty: Datastream
   product_documentation: https://cloud.google.com/datastream/docs
@@ -886,7 +831,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/datastream/v1
   - proto_path: google/cloud/datastream/v1alpha1
-
 - api_shortname: clouddeploy
   name_pretty: Google Cloud Deploy
   product_documentation: https://cloud.google.com/deploy/docs
@@ -897,13 +841,11 @@ libraries:
   codeowner_team: '@googleapis/aap-dpes'
   GAPICs:
   - proto_path: google/cloud/deploy/v1
-
 - api_shortname: developerconnect
   name_pretty: Developer Connect API
   product_documentation: https://cloud.google.com/developer-connect/docs/overview
   api_description: Connect third-party source code management to Google
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-developerconnect/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-developerconnect/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-developerconnect
   api_id: developerconnect.googleapis.com
@@ -917,8 +859,7 @@ libraries:
   name_pretty: Device Streaming API
   product_documentation: https://cloud.google.com/device-streaming/docs
   api_description: The Cloud API for device streaming usage.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-devicestreaming/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-devicestreaming/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-devicestreaming
   api_id: devicestreaming.googleapis.com
@@ -943,7 +884,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/dialogflow/v2
   - proto_path: google/cloud/dialogflow/v2beta1
-
 - api_shortname: dialogflow-cx
   name_pretty: Dialogflow CX
   product_documentation: https://cloud.google.com/dialogflow/cx/docs
@@ -955,7 +895,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/dialogflow/cx/v3
   - proto_path: google/cloud/dialogflow/cx/v3beta1
-
 - api_shortname: discoveryengine
   name_pretty: Discovery Engine API
   product_documentation: https://cloud.google.com/discovery-engine/media/docs
@@ -966,7 +905,6 @@ libraries:
   - proto_path: google/cloud/discoveryengine/v1
   - proto_path: google/cloud/discoveryengine/v1alpha
   - proto_path: google/cloud/discoveryengine/v1beta
-
 - api_shortname: distributedcloudedge
   name_pretty: Google Distributed Cloud Edge
   product_documentation: https://cloud.google.com/distributed-cloud/edge/latest/
@@ -978,7 +916,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/edgecontainer/v1
-
 - api_shortname: dlp
   name_pretty: Cloud Data Loss Prevention
   product_documentation: https://cloud.google.com/dlp/docs/
@@ -991,7 +928,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/dlp/docs/reference/rpc
   GAPICs:
   - proto_path: google/privacy/dlp/v2
-
 - api_shortname: datamigration
   name_pretty: Database Migration Service
   product_documentation: https://cloud.google.com/database-migration/docs
@@ -1004,7 +940,6 @@ libraries:
   rest_documentation: https://cloud.google.com/database-migration/docs/reference/rest
   GAPICs:
   - proto_path: google/cloud/clouddms/v1
-
 - api_shortname: documentai
   name_pretty: Document AI
   product_documentation: https://cloud.google.com/compute/docs/documentai/
@@ -1016,7 +951,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/documentai/v1
   - proto_path: google/cloud/documentai/v1beta3
-
 - api_shortname: domains
   name_pretty: Cloud Domains
   product_documentation: https://cloud.google.com/domains
@@ -1026,7 +960,6 @@ libraries:
   - proto_path: google/cloud/domains/v1
   - proto_path: google/cloud/domains/v1alpha2
   - proto_path: google/cloud/domains/v1beta1
-
 - api_shortname: edgenetwork
   name_pretty: Distributed Cloud Edge Network API
   product_documentation: https://cloud.google.com/distributed-cloud/edge/latest/docs/overview
@@ -1034,7 +967,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/edgenetwork/v1
-
 - api_shortname: enterpriseknowledgegraph
   name_pretty: Enterprise Knowledge Graph
   product_documentation: https://cloud.google.com/enterprise-knowledge-graph/docs/overview
@@ -1043,7 +975,6 @@ libraries:
     an efficient and useful way.
   GAPICs:
   - proto_path: google/cloud/enterpriseknowledgegraph/v1
-
 - api_shortname: clouderrorreporting
   name_pretty: Error Reporting
   product_documentation: https://cloud.google.com/error-reporting
@@ -1058,7 +989,6 @@ libraries:
   requires_billing: false
   GAPICs:
   - proto_path: google/devtools/clouderrorreporting/v1beta1
-
 - api_shortname: essentialcontacts
   name_pretty: Essential Contacts API
   product_documentation: https://cloud.google.com/resource-manager/docs/managing-notification-contacts/
@@ -1068,7 +998,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/essentialcontacts/v1
-
 - api_shortname: eventarc
   name_pretty: Eventarc
   product_documentation: https://cloud.google.com/eventarc/docs
@@ -1082,7 +1011,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/eventarc/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/eventarc/v1
-
 - api_shortname: eventarcpublishing
   name_pretty: Eventarc Publishing
   product_documentation: https://cloud.google.com/eventarc/docs
@@ -1094,7 +1022,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/eventarc/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/eventarc/publishing/v1
-
 - api_shortname: file
   name_pretty: Cloud Filestore API
   product_documentation: https://cloud.google.com/filestore/docs
@@ -1107,16 +1034,13 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/filestore/v1
   - proto_path: google/cloud/filestore/v1beta1
-
 - api_shortname: financialservices
   name_pretty: Financial Services API
-  product_documentation: 
-    https://cloud.google.com/financial-services/anti-money-laundering/docs/concepts/overview
+  product_documentation: https://cloud.google.com/financial-services/anti-money-laundering/docs/concepts/overview
   api_description: Google Cloud's Anti Money Laundering AI (AML AI) product is an
     API that scores AML risk. Use it to identify more risk, more defensibly, with
     fewer false positives and reduced time per review.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-financialservices/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-financialservices/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-financialservices
   api_id: financialservices.googleapis.com
@@ -1141,15 +1065,13 @@ libraries:
   - proto_path: google/cloud/functions/v2
   - proto_path: google/cloud/functions/v2alpha
   - proto_path: google/cloud/functions/v2beta
-
 - api_shortname: gdchardwaremanagement
   name_pretty: GDC Hardware Management API
   product_documentation: https://cloud.google.com/distributed-cloud/edge/latest/docs
   api_description: Google Distributed Cloud connected allows you to run Kubernetes
     clusters on dedicated hardware provided and maintained by Google that is separate
     from the Google Cloud data center.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-gdchardwaremanagement/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-gdchardwaremanagement/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-gdchardwaremanagement
   api_id: gdchardwaremanagement.googleapis.com
@@ -1159,16 +1081,14 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/gdchardwaremanagement/v1alpha
   requires_billing: true
-  rpc_documentation: 
-    https://cloud.google.com/distributed-cloud/edge/latest/docs/reference/hardware/rpc
+  rpc_documentation: https://cloud.google.com/distributed-cloud/edge/latest/docs/reference/hardware/rpc
 - api_shortname: geminidataanalytics
   name_pretty: Data Analytics API with Gemini
   product_documentation: https://cloud.google.com/gemini/docs/conversational-analytics-api/overview
   api_description: Use Conversational Analytics API to build an artificial intelligence
     (AI)-powered chat interface, or data agent, that answers questions about structured
     data using natural language.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-geminidataanalytics/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-geminidataanalytics/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-geminidataanalytics
   api_id: geminidataanalytics.googleapis.com
@@ -1187,7 +1107,6 @@ libraries:
   library_name: gke-backup
   GAPICs:
   - proto_path: google/cloud/gkebackup/v1
-
 - api_shortname: connectgateway
   name_pretty: Connect Gateway API
   product_documentation: https://cloud.google.com/anthos/multicluster-management/gateway/
@@ -1199,7 +1118,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/gkeconnect/gateway/v1beta1
-
 - api_shortname: gke-multi-cloud
   name_pretty: Anthos Multicloud
   product_documentation: https://cloud.google.com/anthos/clusters/docs/multi-cloud
@@ -1208,7 +1126,6 @@ libraries:
   api_id: gkemulticloud.googleapis.com
   GAPICs:
   - proto_path: google/cloud/gkemulticloud/v1
-
 - api_shortname: gkehub
   name_pretty: GKE Hub API
   product_documentation: https://cloud.google.com/anthos/gke/docs/
@@ -1225,16 +1142,13 @@ libraries:
   - proto_path: google/cloud/gkehub/v1beta1
   - proto_path: google/cloud/gkehub/policycontroller/v1beta
   - proto_path: google/cloud/gkehub/servicemesh/v1beta
-
 - api_shortname: gkerecommender
   name_pretty: GKE Recommender API
-  product_documentation: 
-    https://cloud.google.com/kubernetes-engine/docs/how-to/machine-learning/inference-quickstart
+  product_documentation: https://cloud.google.com/kubernetes-engine/docs/how-to/machine-learning/inference-quickstart
   api_description: lets you analyze the performance and cost-efficiency of your inference
     workloads, and make data-driven decisions about resource allocation and model
     deployment strategies.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-gkerecommender/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-gkerecommender/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-gkerecommender
   api_id: gkerecommender.googleapis.com
@@ -1255,7 +1169,6 @@ libraries:
   library_name: grafeas
   GAPICs:
   - proto_path: grafeas/v1
-
 - api_shortname: gsuiteaddons
   name_pretty: Google Workspace Add-ons API
   product_documentation: https://developers.google.com/workspace/add-ons/overview
@@ -1271,14 +1184,11 @@ libraries:
   - proto_path: google/apps/script/type/gmail
   - proto_path: google/apps/script/type/sheets
   - proto_path: google/apps/script/type/slides
-
 - api_shortname: hypercomputecluster
   name_pretty: Cluster Director API
-  product_documentation: 
-    https://cloud.google.com/blog/products/compute/managed-slurm-and-other-cluster-director-enhancements
+  product_documentation: https://cloud.google.com/blog/products/compute/managed-slurm-and-other-cluster-director-enhancements
   api_description: simplifies cluster management across compute, network, and storage
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-hypercomputecluster/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-hypercomputecluster/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-hypercomputecluster
   api_id: hypercomputecluster.googleapis.com
@@ -1304,7 +1214,6 @@ libraries:
   - proto_path: google/iam/v2beta
   - proto_path: google/iam/v3
   - proto_path: google/iam/v3beta
-
 - api_shortname: iam-admin
   name_pretty: IAM Admin API
   product_documentation: https://cloud.google.com/iam/docs/apis
@@ -1314,7 +1223,6 @@ libraries:
   api_id: iam.googleapis.com
   GAPICs:
   - proto_path: google/iam/admin/v1
-
 - api_shortname: iamcredentials
   name_pretty: IAM Service Account Credentials API
   product_documentation: https://cloud.google.com/iam/credentials/reference/rest/
@@ -1325,7 +1233,6 @@ libraries:
   issue_tracker: https://issuetracker.google.com/issues/new?component=187161&template=0
   GAPICs:
   - proto_path: google/iam/credentials/v1
-
 - api_shortname: iap
   name_pretty: Cloud Identity-Aware Proxy API
   product_documentation: https://cloud.google.com/iap
@@ -1348,7 +1255,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/ids/v1
-
 - api_shortname: infra-manager
   name_pretty: Infrastructure Manager API
   product_documentation: https://cloud.google.com/infrastructure-manager/docs/overview
@@ -1357,7 +1263,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/config/v1
-
 - api_shortname: cloudiot
   name_pretty: Cloud Internet of Things (IoT) Core
   product_documentation: https://cloud.google.com/iot
@@ -1374,8 +1279,7 @@ libraries:
   name_pretty: Merchant Issue Resolution API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programatically manage your Merchant Issues
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-issue-resolution/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-issue-resolution/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-issue-resolution
   api_id: merchantapi.googleapis.com
@@ -1387,13 +1291,11 @@ libraries:
   - proto_path: google/shopping/merchant/issueresolution/v1beta
   library_name: java-shopping-merchant-issue-resolution
   requires_billing: true
-
 - api_shortname: merchantapi
   name_pretty: Merchant Order Tracking API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center Accounts
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-order-tracking/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-order-tracking/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-order-tracking
   api_id: merchantapi.googleapis.com
@@ -1405,7 +1307,6 @@ libraries:
   - proto_path: google/shopping/merchant/ordertracking/v1beta
   library_name: java-shopping-merchant-order-tracking
   requires_billing: true
-
 - api_shortname: cloudkms
   name_pretty: Cloud Key Management Service
   product_documentation: https://cloud.google.com/kms
@@ -1421,7 +1322,6 @@ libraries:
   issue_tracker: https://issuetracker.google.com/savedsearches/5264932
   GAPICs:
   - proto_path: google/cloud/kms/v1
-
 - api_shortname: kmsinventory
   name_pretty: KMS Inventory API
   product_documentation: https://cloud.google.com/kms/docs/
@@ -1430,7 +1330,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/kms/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/kms/inventory/v1
-
 - api_shortname: language
   name_pretty: Natural Language
   product_documentation: https://cloud.google.com/natural-language/docs/
@@ -1446,14 +1345,12 @@ libraries:
   - proto_path: google/cloud/language/v1
   - proto_path: google/cloud/language/v1beta2
   - proto_path: google/cloud/language/v2
-
 - api_shortname: licensemanager
   name_pretty: License Manager API
   product_documentation: https://cloud.google.com/compute/docs/instances/windows/ms-licensing
   api_description: License Manager is a tool to manage and track third-party licenses
     on Google Cloud.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-licensemanager/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-licensemanager/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-licensemanager
   api_id: licensemanager.googleapis.com
@@ -1473,15 +1370,13 @@ libraries:
   rpc_documentation: https://cloud.google.com/life-sciences/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/lifesciences/v2beta
-
 - api_shortname: locationfinder
   name_pretty: Cloud Location Finder API
   product_documentation: https://cloud.google.com/location-finder/docs/overview
   api_description: Cloud Location Finder is a public API that offers a repository
     of all Google Cloud and Google Distributed Cloud locations, as well as cloud locations
     for other cloud providers.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-locationfinder/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-locationfinder/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-locationfinder
   api_id: locationfinder.googleapis.com
@@ -1512,8 +1407,7 @@ libraries:
   product_documentation: https://cloud.google.com/unified-maintenance/docs/overview
   api_description: The Maintenance API provides a centralized view of planned disruptive
     maintenance events across supported Google Cloud products.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-maintenance/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-maintenance/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-maintenance
   api_id: maintenance.googleapis.com
@@ -1538,13 +1432,11 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/managedidentities/v1
   - proto_path: google/cloud/managedidentities/v1beta1
-
 - api_shortname: managedkafka
   name_pretty: Managed Service for Apache Kafka
   product_documentation: https://cloud.google.com/managed-kafka
   api_description: Manage Apache Kafka clusters and resources.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-managedkafka/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-managedkafka/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-managedkafka
   api_id: managedkafka.googleapis.com
@@ -1566,13 +1458,11 @@ libraries:
   distribution_name: com.google.maps:google-maps-addressvalidation
   GAPICs:
   - proto_path: google/maps/addressvalidation/v1
-
 - api_shortname: maps-area-insights
   name_pretty: Places Insights API
   product_documentation: https://developers.google.com/maps/documentation/places-insights
   api_description: Places Insights API.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-maps-area-insights/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-maps-area-insights/latest/overview
   release_level: preview
   distribution_name: com.google.maps:google-maps-area-insights
   api_id: maps-area-insights.googleapis.com
@@ -1584,14 +1474,12 @@ libraries:
   requires_billing: true
 - api_shortname: maps-fleetengine
   name_pretty: Local Rides and Deliveries API
-  product_documentation: 
-    https://developers.google.com/maps/documentation/transportation-logistics/mobility
+  product_documentation: https://developers.google.com/maps/documentation/transportation-logistics/mobility
   api_description: Enables Fleet Engine for access to the On Demand Rides and Deliveries
     and Last Mile Fleet Solution APIs.  Customer's use of Google Maps Content in the
     Cloud Logging Services is subject to the Google Maps Platform Terms of Service
     located at https://cloud.google.com/maps-platform/terms.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-maps-fleetengine/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-maps-fleetengine/latest/overview
   release_level: preview
   distribution_name: com.google.maps:google-maps-fleetengine
   api_id: maps-fleetengine.googleapis.com
@@ -1603,14 +1491,12 @@ libraries:
   requires_billing: true
 - api_shortname: maps-fleetengine-delivery
   name_pretty: Last Mile Fleet Solution Delivery API
-  product_documentation: 
-    https://developers.google.com/maps/documentation/transportation-logistics/mobility
+  product_documentation: https://developers.google.com/maps/documentation/transportation-logistics/mobility
   api_description: Enables Fleet Engine for access to the On Demand Rides and Deliveries
     and Last Mile Fleet Solution APIs.  Customer's use of Google Maps Content in the
     Cloud Logging Services is subject to the Google Maps Platform Terms of Service
     located at https://cloud.google.com/maps-platform/terms.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-maps-fleetengine-delivery/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-maps-fleetengine-delivery/latest/overview
   release_level: preview
   distribution_name: com.google.maps:google-maps-fleetengine-delivery
   api_id: maps-fleetengine-delivery.googleapis.com
@@ -1623,15 +1509,14 @@ libraries:
 - api_shortname: maps-mapsplatformdatasets
   name_pretty: Maps Platform Datasets API
   product_documentation: https://developers.google.com/maps/documentation
-  api_description: "The Maps Platform Datasets API enables developers to ingest geospatially-tied
-    datasets\n    that they can use to enrich their experience of Maps Platform solutions
-    (e.g. styling, routing)."
+  api_description: "The Maps Platform Datasets API enables developers to ingest geospatially-tied\
+    \ datasets\n    that they can use to enrich their experience of Maps Platform\
+    \ solutions (e.g. styling, routing)."
   api_id: mapsplatformdatasets.googleapis.com
   distribution_name: com.google.maps:google-maps-mapsplatformdatasets
   cloud_api: false
   GAPICs:
   - proto_path: google/maps/mapsplatformdatasets/v1
-
 - api_shortname: maps-places
   name_pretty: Places API (New)
   product_documentation: https://developers.google.com/maps/documentation/places/web-service/
@@ -1642,15 +1527,13 @@ libraries:
   cloud_api: false
   GAPICs:
   - proto_path: google/maps/places/v1
-
 - api_shortname: routeoptimization
   name_pretty: Route Optimization API
   product_documentation: https://developers.google.com/maps/documentation/route-optimization
   api_description: The Route Optimization API assigns tasks and routes to a vehicle
     fleet, optimizing against the objectives and constraints that you supply for your
     transportation goals.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-maps-routeoptimization/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-maps-routeoptimization/latest/overview
   release_level: preview
   distribution_name: com.google.maps:google-maps-routeoptimization
   api_id: routeoptimization.googleapis.com
@@ -1661,10 +1544,8 @@ libraries:
   - proto_path: google/maps/routeoptimization/v1
   library_name: maps-routeoptimization
   requires_billing: true
-  rest_documentation: 
-    https://developers.google.com/maps/documentation/route-optimization/reference/rest/
-  rpc_documentation: 
-    https://developers.google.com/maps/documentation/route-optimization/reference/rpc
+  rest_documentation: https://developers.google.com/maps/documentation/route-optimization/reference/rest/
+  rpc_documentation: https://developers.google.com/maps/documentation/route-optimization/reference/rpc
 - api_shortname: maps-routing
   name_pretty: Routes API
   product_documentation: https://developers.google.com/maps/documentation/routes
@@ -1678,7 +1559,6 @@ libraries:
   cloud_api: false
   GAPICs:
   - proto_path: google/maps/routing/v2
-
 - api_shortname: maps-solar
   name_pretty: Solar API
   product_documentation: https://developers.google.com/maps/documentation/solar/overview
@@ -1722,7 +1602,6 @@ libraries:
   requires_billing: false
   GAPICs:
   - proto_path: google/cloud/mediatranslation/v1beta1
-
 - api_shortname: meet
   name_pretty: Google Meet API
   product_documentation: https://developers.google.com/meet/api/guides/overview
@@ -1731,7 +1610,6 @@ libraries:
   GAPICs:
   - proto_path: google/apps/meet/v2
   - proto_path: google/apps/meet/v2beta
-
 - api_shortname: memcache
   name_pretty: Cloud Memcache
   product_documentation: https://cloud.google.com/memorystore/
@@ -1741,7 +1619,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/memcache/v1
   - proto_path: google/cloud/memcache/v1beta2
-
 - api_shortname: migrationcenter
   name_pretty: Migration Center API
   product_documentation: https://cloud.google.com/migration-center/docs/migration-center-overview
@@ -1750,15 +1627,13 @@ libraries:
     cloud environments to Google Cloud
   GAPICs:
   - proto_path: google/cloud/migrationcenter/v1
-
 - api_shortname: modelarmor
   name_pretty: Model Armor API
   product_documentation: https://cloud.google.com/security-command-center/docs/model-armor-overview
   api_description: Model Armor helps you protect against risks like prompt injection,
     harmful content, and data leakage in generative AI applications by letting you
     define policies that filter user prompts and model responses.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-modelarmor/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-modelarmor/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-modelarmor
   api_id: modelarmor.googleapis.com
@@ -1782,7 +1657,6 @@ libraries:
   issue_tracker: https://issuetracker.google.com/savedsearches/559785
   GAPICs:
   - proto_path: google/monitoring/v3
-
 - api_shortname: monitoring-dashboards
   name_pretty: Monitoring Dashboards
   product_documentation: https://cloud.google.com/monitoring/charts/dashboards
@@ -1795,18 +1669,15 @@ libraries:
   api_id: monitoring.googleapis.com
   GAPICs:
   - proto_path: google/monitoring/dashboard/v1
-
 - api_shortname: monitoring-metricsscope
   name_pretty: Monitoring Metrics Scopes
-  product_documentation: 
-    https://cloud.google.com/monitoring/api/ref_v3/rest/v1/locations.global.metricsScopes
+  product_documentation: https://cloud.google.com/monitoring/api/ref_v3/rest/v1/locations.global.metricsScopes
   api_description: The metrics scope defines the set of Google Cloud projects whose
     metrics the current Google Cloud project can access.
   api_id: monitoring.googleapis.com
   distribution_name: com.google.cloud:google-cloud-monitoring-metricsscope
   GAPICs:
   - proto_path: google/monitoring/metricsscope/v1
-
 - api_shortname: netapp
   name_pretty: NetApp API
   product_documentation: https://cloud.google.com/netapp/volumes/docs/discover/overview
@@ -1815,11 +1686,9 @@ libraries:
     scalable performance with global availability.
   GAPICs:
   - proto_path: google/cloud/netapp/v1
-
 - api_shortname: networkmanagement
   name_pretty: Network Management API
-  product_documentation: 
-    https://cloud.google.com/network-intelligence-center/docs/connectivity-tests/reference/networkmanagement/rest/
+  product_documentation: https://cloud.google.com/network-intelligence-center/docs/connectivity-tests/reference/networkmanagement/rest/
   api_description: provides a collection of network performance monitoring and diagnostic
     capabilities.
   library_name: network-management
@@ -1827,7 +1696,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/networkmanagement/v1
   - proto_path: google/cloud/networkmanagement/v1beta1
-
 - api_shortname: networksecurity
   name_pretty: Network Security API
   product_documentation: https://cloud.google.com/traffic-director/docs/reference/network-security/rest
@@ -1837,7 +1705,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/networksecurity/v1
   - proto_path: google/cloud/networksecurity/v1beta1
-
 - api_shortname: networkconnectivity
   name_pretty: Network Connectivity Center
   product_documentation: https://cloud.google.com/network-connectivity/docs
@@ -1848,7 +1715,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/networkconnectivity/v1
   - proto_path: google/cloud/networkconnectivity/v1alpha1
-
 - api_shortname: networkservices
   name_pretty: Network Services API
   product_documentation: https://cloud.google.com/products/networking
@@ -1856,8 +1722,7 @@ libraries:
     on top of planet-scale infrastructure that leverages automation, advanced AI,
     and programmability, enabling enterprises to connect, scale, secure, modernize
     and optimize their infrastructure.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-networkservices/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-networkservices/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-networkservices
   api_id: networkservices.googleapis.com
@@ -1880,7 +1745,6 @@ libraries:
   - proto_path: google/cloud/notebooks/v1
   - proto_path: google/cloud/notebooks/v1beta1
   - proto_path: google/cloud/notebooks/v2
-
 - api_shortname: cloudoptimization
   name_pretty: Cloud Fleet Routing
   product_documentation: https://cloud.google.com/optimization/docs
@@ -1893,14 +1757,12 @@ libraries:
   rpc_documentation: https://cloud.google.com/optimization/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/optimization/v1
-
 - api_shortname: oracledatabase
   name_pretty: Oracle Database@Google Cloud API
   product_documentation: https://cloud.google.com/oracle/database/docs
   api_description: The Oracle Database@Google Cloud API provides a set of APIs to
     manage   Oracle database services, such as Exadata and Autonomous Databases.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-oracledatabase/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-oracledatabase/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-oracledatabase
   api_id: oracledatabase.googleapis.com
@@ -1925,18 +1787,15 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/orchestration/airflow/service/v1
   - proto_path: google/cloud/orchestration/airflow/service/v1beta1
-
 - api_shortname: orgpolicy
   name_pretty: Cloud Organization Policy
   product_documentation: n/a
   api_description: n/a
   release_level: stable
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/proto-google-cloud-orgpolicy-v1/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/proto-google-cloud-orgpolicy-v1/latest/overview
   GAPICs:
   - proto_path: google/cloud/orgpolicy/v1
   - proto_path: google/cloud/orgpolicy/v2
-
 - api_shortname: osconfig
   name_pretty: OS Config API
   product_documentation: https://cloud.google.com/compute/docs/os-patch-management
@@ -1950,7 +1809,6 @@ libraries:
   - proto_path: google/cloud/osconfig/v1
   - proto_path: google/cloud/osconfig/v1alpha
   - proto_path: google/cloud/osconfig/v1beta
-
 - api_shortname: oslogin
   name_pretty: Cloud OS Login
   product_documentation: https://cloud.google.com/compute/docs/oslogin/
@@ -1961,14 +1819,12 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/oslogin/v1
   - proto_path: google/cloud/oslogin/v1beta
-
 - api_shortname: parallelstore
   name_pretty: Parallelstore API
   product_documentation: https://cloud/parallelstore?hl=en
   api_description: 'Parallelstore is based on Intel DAOS and delivers up to 6.3x greater
     read throughput performance compared to competitive Lustre scratch offerings. '
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-parallelstore/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-parallelstore/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-parallelstore
   api_id: parallelstore.googleapis.com
@@ -1986,8 +1842,7 @@ libraries:
     to store,     access and manage the lifecycle of your workload parameters. Parameter     Manager
     aims to make management of sensitive application parameters     effortless for
     customers without diminishing focus on security.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-parametermanager/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-parametermanager/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-parametermanager
   api_id: parametermanager.googleapis.com
@@ -2009,7 +1864,6 @@ libraries:
   requires_billing: false
   GAPICs:
   - proto_path: google/cloud/phishingprotection/v1beta1
-
 - api_shortname: policytroubleshooter
   name_pretty: IAM Policy Troubleshooter API
   product_documentation: https://cloud.google.com/iam/docs/troubleshooting-access
@@ -2025,7 +1879,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/policytroubleshooter/v1
   - proto_path: google/cloud/policytroubleshooter/iam/v3
-
 - api_shortname: policysimulator
   name_pretty: Policy Simulator API
   product_documentation: https://cloud.google.com/policysimulator/docs/overview
@@ -2033,7 +1886,6 @@ libraries:
     and viewing a Replay.
   GAPICs:
   - proto_path: google/cloud/policysimulator/v1
-
 - api_shortname: cloudprivatecatalog
   name_pretty: Private Catalog
   product_documentation: https://cloud.google.com/private-catalog/docs
@@ -2044,11 +1896,9 @@ libraries:
   api_id: privatecatalog.googleapis.com
   GAPICs:
   - proto_path: google/cloud/privatecatalog/v1beta1
-
 - api_shortname: privilegedaccessmanager
   name_pretty: Privileged Access Manager API
-  product_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-privilegedaccessmanager/latest/overview
+  product_documentation: https://cloud.google.com/java/docs/reference/google-cloud-privilegedaccessmanager/latest/overview
   api_description: Privileged Access Manager (PAM) helps you on your journey towards
     least privilege and helps mitigate risks tied to privileged access misuse orabuse.
     PAM allows you to shift from always-on standing privileges towards on-demand access
@@ -2061,8 +1911,7 @@ libraries:
     access for developers for critical deployment or maintenance, temporary access
     for operators for data ingestion and audits, JIT access to service accounts for
     automated tasks, and more.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-privilegedaccessmanager/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-privilegedaccessmanager/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-privilegedaccessmanager
   api_id: privilegedaccessmanager.googleapis.com
@@ -2086,7 +1935,6 @@ libraries:
   api_id: cloudprofiler.googleapis.com
   GAPICs:
   - proto_path: google/devtools/cloudprofiler/v2
-
 - api_shortname: publicca
   name_pretty: Public Certificate Authority API
   product_documentation: https://cloud.google.com/certificate-manager/docs/public-ca
@@ -2098,14 +1946,12 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/security/publicca/v1beta1
   - proto_path: google/cloud/security/publicca/v1
-
 - api_shortname: rapidmigrationassessment
   name_pretty: Rapid Migration Assessment API
   product_documentation: https://cloud.google.com/migration-center/docs
   api_description: Rapid Migration Assessment API
   GAPICs:
   - proto_path: google/cloud/rapidmigrationassessment/v1
-
 - api_shortname: recaptchaenterprise
   name_pretty: reCAPTCHA Enterprise
   product_documentation: https://cloud.google.com/recaptcha-enterprise/docs/
@@ -2118,7 +1964,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/recaptchaenterprise/v1
   - proto_path: google/cloud/recaptchaenterprise/v1beta1
-
 - api_shortname: recommendationengine
   name_pretty: Recommendations AI
   product_documentation: https://cloud.google.com/recommendations-ai/
@@ -2126,7 +1971,6 @@ libraries:
   library_name: recommendations-ai
   GAPICs:
   - proto_path: google/cloud/recommendationengine/v1beta1
-
 - api_shortname: recommender
   name_pretty: Recommender
   product_documentation: https://cloud.google.com/recommendations/
@@ -2136,7 +1980,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/recommender/v1
   - proto_path: google/cloud/recommender/v1beta1
-
 - api_shortname: redis
   name_pretty: Cloud Redis
   product_documentation: https://cloud.google.com/memorystore/docs/redis/
@@ -2149,7 +1992,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/redis/v1
   - proto_path: google/cloud/redis/v1beta1
-
 - api_shortname: redis-cluster
   name_pretty: Google Cloud Memorystore for Redis API
   product_documentation: https://cloud.google.com/memorystore/docs/cluster
@@ -2157,7 +1999,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/redis/cluster/v1
   - proto_path: google/cloud/redis/cluster/v1beta1
-
 - api_shortname: cloudresourcemanager
   name_pretty: Resource Manager API
   product_documentation: https://cloud.google.com/resource-manager
@@ -2169,7 +2010,6 @@ libraries:
   issue_tracker: https://issuetracker.google.com/savedsearches/559757
   GAPICs:
   - proto_path: google/cloud/resourcemanager/v3
-
 - api_shortname: retail
   name_pretty: Cloud Retail
   product_documentation: https://cloud.google.com/solutions/retail
@@ -2179,7 +2019,6 @@ libraries:
   - proto_path: google/cloud/retail/v2
   - proto_path: google/cloud/retail/v2alpha
   - proto_path: google/cloud/retail/v2beta
-
 - api_shortname: run
   name_pretty: Cloud Run
   product_documentation: https://cloud.google.com/run/docs
@@ -2189,13 +2028,11 @@ libraries:
   rpc_documentation: https://cloud.google.com/run/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/run/v2
-
 - api_shortname: saasservicemgmt
   name_pretty: SaaS Runtime API
   product_documentation: https://cloud.google.com/saas-runtime/docs/overview
   api_description: "Model, deploy, and operate your SaaS at scale.\t"
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-saasservicemgmt/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-saasservicemgmt/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-saasservicemgmt
   api_id: saasservicemgmt.googleapis.com
@@ -2223,7 +2060,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/scheduler/v1
   - proto_path: google/cloud/scheduler/v1beta1
-
 - api_shortname: secretmanager
   name_pretty: Secret Management
   product_documentation: https://cloud.google.com/solutions/secrets-management/
@@ -2234,18 +2070,15 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/secretmanager/v1
   - proto_path: google/cloud/secretmanager/v1beta2
-  # v1beta1's version is in a different proto path from the rest
   - proto_path: google/cloud/secrets/v1beta1
-
 - api_shortname: securesourcemanager
   name_pretty: Secure Source Manager API
   product_documentation: https://cloud.google.com/secure-source-manager/docs/overview
-  api_description: "Regionally deployed, single-tenant managed source code repository
-    hosted on\n    Google Cloud."
+  api_description: "Regionally deployed, single-tenant managed source code repository\
+    \ hosted on\n    Google Cloud."
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/securesourcemanager/v1
-
 - api_shortname: privateca
   name_pretty: Certificate Authority Service
   product_documentation: https://cloud.google.com/certificate-authority-service/docs
@@ -2259,8 +2092,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/security/privateca/v1
   - proto_path: google/cloud/security/privateca/v1beta1
-
-# duplicated api_shortname
 - api_shortname: securitycenter
   name_pretty: Security Command Center
   product_documentation: https://cloud.google.com/security-command-center
@@ -2280,7 +2111,6 @@ libraries:
   - proto_path: google/cloud/securitycenter/v1beta1
   - proto_path: google/cloud/securitycenter/v1p1beta1
   - proto_path: google/cloud/securitycenter/v2
-
 - api_shortname: securitycenter
   name_pretty: Security Command Center Settings API
   product_documentation: https://cloud.google.com/security-command-center/
@@ -2293,7 +2123,6 @@ libraries:
   rest_documentation: https://cloud.google.com/security-command-center/docs/reference/rest
   GAPICs:
   - proto_path: google/cloud/securitycenter/settings/v1beta1
-
 - api_shortname: securitycentermanagement
   name_pretty: Security Center Management API
   product_documentation: https://cloud.google.com/securitycentermanagement/docs/overview
@@ -2301,7 +2130,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/securitycentermanagement/v1
-
 - api_shortname: securityposture
   name_pretty: Security Posture API
   product_documentation: https://cloud.google.com/security-command-center/docs/security-posture-overview
@@ -2312,7 +2140,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/securityposture/v1
-
 - api_shortname: servicecontrol
   name_pretty: Service Control API
   product_documentation: https://cloud.google.com/service-infrastructure/docs/overview/
@@ -2324,7 +2151,6 @@ libraries:
   GAPICs:
   - proto_path: google/api/servicecontrol/v1
   - proto_path: google/api/servicecontrol/v2
-
 - api_shortname: servicemanagement
   name_pretty: Service Management API
   product_documentation: https://cloud.google.com/service-infrastructure/docs/overview/
@@ -2338,7 +2164,6 @@ libraries:
   api_id: servicemanagement.googleapis.com
   GAPICs:
   - proto_path: google/api/servicemanagement/v1
-
 - api_shortname: serviceusage
   name_pretty: Service Usage
   product_documentation: https://cloud.google.com/service-usage/docs/overview
@@ -2349,7 +2174,6 @@ libraries:
   GAPICs:
   - proto_path: google/api/serviceusage/v1
   - proto_path: google/api/serviceusage/v1beta1
-
 - api_shortname: servicedirectory
   name_pretty: Service Directory
   product_documentation: https://cloud.google.com/service-directory/
@@ -2361,7 +2185,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/servicedirectory/v1
   - proto_path: google/cloud/servicedirectory/v1beta1
-
 - api_shortname: servicehealth
   name_pretty: Service Health API
   product_documentation: https://cloud.google.com/service-health/docs/overview
@@ -2370,7 +2193,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/service-health/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/servicehealth/v1
-
 - api_shortname: cloudshell
   name_pretty: Cloud Shell
   product_documentation: https://cloud.google.com/shell/docs
@@ -2384,7 +2206,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/shell/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/shell/v1
-
 - api_shortname: css
   name_pretty: CSS API
   product_documentation: https://developers.google.com/comparison-shopping-services/api
@@ -2395,14 +2216,11 @@ libraries:
   distribution_name: com.google.shopping:google-shopping-css
   GAPICs:
   - proto_path: google/shopping/css/v1
-
-  # duplicated api_shortname
 - api_shortname: merchantapi
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-accounts/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-accounts/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-accounts
   api_id: merchantapi.googleapis.com
@@ -2418,8 +2236,7 @@ libraries:
   name_pretty: Merchant Conversions API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-conversions/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-conversions/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-conversions
   api_id: shopping-merchant-conversions.googleapis.com
@@ -2430,13 +2247,11 @@ libraries:
   - proto_path: google/shopping/merchant/conversions/v1
   - proto_path: google/shopping/merchant/conversions/v1beta
   requires_billing: true
-
 - api_shortname: merchantapi
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-datasources/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-datasources/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-datasources
   api_id: merchantapi.googleapis.com
@@ -2463,8 +2278,7 @@ libraries:
   name_pretty: Merchant LFP API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-lfp/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-lfp/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-lfp
   api_id: shopping-merchant-lfp.googleapis.com
@@ -2475,13 +2289,11 @@ libraries:
   - proto_path: google/shopping/merchant/lfp/v1
   - proto_path: google/shopping/merchant/lfp/v1beta
   requires_billing: true
-
 - api_shortname: shopping-merchant-notifications
   name_pretty: Merchant Notifications API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-notifications/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-notifications/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-notifications
   api_id: shopping-merchant-notifications.googleapis.com
@@ -2496,8 +2308,7 @@ libraries:
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your products.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-productstudio/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-productstudio/latest/overview
   release_level: preview
   distribution_name: com.google.shopping:google-shopping-merchant-productstudio
   api_id: merchantapi.googleapis.com
@@ -2512,8 +2323,7 @@ libraries:
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-products/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-products/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-products
   api_id: merchantapi.googleapis.com
@@ -2528,8 +2338,7 @@ libraries:
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-promotions/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-promotions/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-promotions
   api_id: merchantapi.googleapis.com
@@ -2545,8 +2354,7 @@ libraries:
   name_pretty: Merchant Quota API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-quota/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-quota/latest/overview
   release_level: stable
   distribution_name: com.google.shopping:google-shopping-merchant-quota
   api_id: shopping-merchant-quota.googleapis.com
@@ -2557,7 +2365,6 @@ libraries:
   - proto_path: google/shopping/merchant/quota/v1
   - proto_path: google/shopping/merchant/quota/v1beta
   requires_billing: true
-
 - api_shortname: merchantapi
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
@@ -2570,13 +2377,11 @@ libraries:
   - proto_path: google/shopping/merchant/reports/v1
   - proto_path: google/shopping/merchant/reports/v1beta
   - proto_path: google/shopping/merchant/reports/v1alpha
-
 - api_shortname: merchantapi
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
   api_description: Programmatically manage your Merchant Center Accounts.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-shopping-merchant-reviews/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-shopping-merchant-reviews/latest/overview
   release_level: preview
   distribution_name: com.google.shopping:google-shopping-merchant-reviews
   library_type: GAPIC_AUTO
@@ -2586,16 +2391,13 @@ libraries:
   - proto_path: google/shopping/merchant/reviews/v1beta
   requires_billing: true
   library_name: shopping-merchant-reviews
-
 - api_shortname: spanneradapter
   name_pretty: Cloud Spanner Adapter API
-  product_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-spanneradapter/latest/overview
+  product_documentation: https://cloud.google.com/java/docs/reference/google-cloud-spanneradapter/latest/overview
   api_description: The Cloud Spanner Adapter service allows native drivers of supported     database
     dialects to interact directly with Cloud Spanner by wrapping the underlying     wire
     protocol used by the driver in a gRPC stream.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-spanneradapter/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-spanneradapter/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-spanneradapter
   api_id: spanneradapter.googleapis.com
@@ -2620,7 +2422,6 @@ libraries:
   - proto_path: google/cloud/speech/v1
   - proto_path: google/cloud/speech/v1p1beta1
   - proto_path: google/cloud/speech/v2
-
 - api_shortname: storagetransfer
   name_pretty: Storage Transfer Service
   product_documentation: https://cloud.google.com/storage-transfer-service
@@ -2630,15 +2431,13 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/storagetransfer/v1
-
 - api_shortname: storagebatchoperations
   name_pretty: Storage Batch Operations API
   product_documentation: https://cloud.google.com/storage/docs/batch-operations/overview
   api_description: Storage batch operations is a Cloud Storage management feature
     that performs operations on billions of Cloud Storage objects in a serverless
     manner.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-storagebatchoperations/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-storagebatchoperations/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-storagebatchoperations
   api_id: storagebatchoperations.googleapis.com
@@ -2654,7 +2453,6 @@ libraries:
   api_description: Provides insights capability on Google Cloud Storage
   GAPICs:
   - proto_path: google/cloud/storageinsights/v1
-
 - api_shortname: jobs
   name_pretty: Talent Solution
   product_documentation: https://cloud.google.com/solutions/talent-solution/
@@ -2670,7 +2468,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/talent/v4
   - proto_path: google/cloud/talent/v4beta1
-
 - api_shortname: cloudtasks
   name_pretty: Cloud Tasks
   product_documentation: https://cloud.google.com/tasks/docs/
@@ -2688,7 +2485,6 @@ libraries:
   - proto_path: google/cloud/tasks/v2
   - proto_path: google/cloud/tasks/v2beta2
   - proto_path: google/cloud/tasks/v2beta3
-
 - api_shortname: telcoautomation
   name_pretty: Telco Automation API
   product_documentation: https://cloud.google.com/telecom-network-automation
@@ -2698,7 +2494,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/telcoautomation/v1
   - proto_path: google/cloud/telcoautomation/v1alpha1
-
 - api_shortname: texttospeech
   name_pretty: Cloud Text-to-Speech
   product_documentation: https://cloud.google.com/text-to-speech
@@ -2713,7 +2508,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/texttospeech/v1
   - proto_path: google/cloud/texttospeech/v1beta1
-
 - api_shortname: tpu
   name_pretty: Cloud TPU
   product_documentation: https://cloud.google.com/tpu/docs
@@ -2725,7 +2519,6 @@ libraries:
   - proto_path: google/cloud/tpu/v1
   - proto_path: google/cloud/tpu/v2
   - proto_path: google/cloud/tpu/v2alpha1
-
 - api_shortname: cloudtrace
   name_pretty: Stackdriver Trace
   product_documentation: https://cloud.google.com/trace/docs/
@@ -2739,7 +2532,6 @@ libraries:
   GAPICs:
   - proto_path: google/devtools/cloudtrace/v1
   - proto_path: google/devtools/cloudtrace/v2
-
 - api_shortname: translate
   name_pretty: Cloud Translation
   product_documentation: https://cloud.google.com/translate/docs/
@@ -2754,14 +2546,12 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/translate/v3
   - proto_path: google/cloud/translate/v3beta1
-
 - api_shortname: memorystore
   name_pretty: Memorystore API
   product_documentation: https://cloud.google.com/memorystore/docs/valkey
   api_description: Memorystore for Valkey is a fully managed Valkey Cluster service
     for Google Cloud.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-memorystore/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-memorystore/latest/overview
   release_level: stable
   api_id: memorystore.googleapis.com
   library_type: GAPIC_AUTO
@@ -2784,8 +2574,7 @@ libraries:
     with associated metadata, automatically generate embeddings from your data, and
     perform fast approximate nearest neighbor (ANN) searches to find semantically
     similar items at scale.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-vectorsearch/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-vectorsearch/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-vectorsearch
   api_id: vectorsearch.googleapis.com
@@ -2811,7 +2600,6 @@ libraries:
   - proto_path: google/cloud/videointelligence/v1p1beta1
   - proto_path: google/cloud/videointelligence/v1p2beta1
   - proto_path: google/cloud/videointelligence/v1p3beta1
-
 - api_shortname: livestream
   name_pretty: Live Stream API
   product_documentation: https://cloud.google.com/livestream/
@@ -2822,7 +2610,6 @@ libraries:
   distribution_name: com.google.cloud:google-cloud-live-stream
   GAPICs:
   - proto_path: google/cloud/video/livestream/v1
-
 - api_shortname: videostitcher
   name_pretty: Video Stitcher API
   product_documentation: https://cloud.google.com/video-stitcher/
@@ -2832,7 +2619,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/video/stitcher/v1
-
 - api_shortname: transcoder
   name_pretty: Video Transcoder
   product_documentation: https://cloud.google.com/transcoder/docs
@@ -2846,7 +2632,6 @@ libraries:
   rpc_documentation: https://cloud.google.com/transcoder/docs/reference/rpc
   GAPICs:
   - proto_path: google/cloud/video/transcoder/v1
-
 - api_shortname: vision
   name_pretty: Cloud Vision
   product_documentation: https://cloud.google.com/vision/docs/
@@ -2863,14 +2648,12 @@ libraries:
   - proto_path: google/cloud/vision/v1p2beta1
   - proto_path: google/cloud/vision/v1p3beta1
   - proto_path: google/cloud/vision/v1p4beta1
-
 - api_shortname: visionai
   name_pretty: Vision AI API
   product_documentation: https://cloud.google.com/vision-ai/docs
   api_description: Vertex AI Vision is an AI-powered platform to ingest, analyze and
     store video data.
-  client_documentation: 
-    https://cloud.google.com/java/docs/reference/google-cloud-visionai/latest/overview
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-visionai/latest/overview
   release_level: preview
   distribution_name: com.google.cloud:google-cloud-visionai
   api_id: visionai.googleapis.com
@@ -2890,7 +2673,6 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/vmmigration/v1
-
 - api_shortname: vmwareengine
   name_pretty: Google Cloud VMware Engine
   product_documentation: https://cloud.google.com/vmware-engine/
@@ -2899,7 +2681,6 @@ libraries:
   rest_documentation: https://cloud.google.com/vmware-engine/docs/reference/rest
   GAPICs:
   - proto_path: google/cloud/vmwareengine/v1
-
 - api_shortname: vpcaccess
   name_pretty: Serverless VPC Access
   product_documentation: https://cloud.google.com/vpc/docs/serverless-vpc-access
@@ -2910,18 +2691,17 @@ libraries:
   release_level: stable
   GAPICs:
   - proto_path: google/cloud/vpcaccess/v1
-
 - api_shortname: webrisk
   name_pretty: Web Risk
   product_documentation: https://cloud.google.com/web-risk/docs/
-  api_description: is a Google Cloud service that lets client applications check URLs
-    against Google's constantly updated lists of unsafe web resources. Unsafe web
-    resources include social engineering sites—such as phishing and deceptive sites—and
-    sites that host malware or unwanted software. With the Web Risk API, you can quickly
-    identify known bad sites, warn users before they click infected links, and prevent
-    users from posting links to known infected pages from your site. The Web Risk
-    API includes data on more than a million unsafe URLs and stays up to date by examining
-    billions of URLs each day.
+  api_description: "is a Google Cloud service that lets client applications check\
+    \ URLs against Google's constantly updated lists of unsafe web resources. Unsafe\
+    \ web resources include social engineering sites\u2014such as phishing and deceptive\
+    \ sites\u2014and sites that host malware or unwanted software. With the Web Risk\
+    \ API, you can quickly identify known bad sites, warn users before they click\
+    \ infected links, and prevent users from posting links to known infected pages\
+    \ from your site. The Web Risk API includes data on more than a million unsafe\
+    \ URLs and stays up to date by examining billions of URLs each day."
   release_level: stable
   requires_billing: false
   issue_tracker: ''
@@ -2930,7 +2710,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/webrisk/v1
   - proto_path: google/cloud/webrisk/v1beta1
-
 - api_shortname: websecurityscanner
   name_pretty: Cloud Security Scanner
   product_documentation: https://cloud.google.com/security-scanner/docs/
@@ -2945,7 +2724,6 @@ libraries:
   - proto_path: google/cloud/websecurityscanner/v1
   - proto_path: google/cloud/websecurityscanner/v1alpha
   - proto_path: google/cloud/websecurityscanner/v1beta
-
 - api_shortname: workflowexecutions
   name_pretty: Cloud Workflow Executions
   product_documentation: https://cloud.google.com/workflows
@@ -2958,7 +2736,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/workflows/executions/v1
   - proto_path: google/cloud/workflows/executions/v1beta
-
 - api_shortname: workflows
   name_pretty: Cloud Workflows
   product_documentation: https://cloud.google.com/workflows
@@ -2970,7 +2747,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/workflows/v1
   - proto_path: google/cloud/workflows/v1beta
-
 - api_shortname: workspaceevents
   name_pretty: Google Workspace Events API
   product_documentation: https://developers.google.com/workspace/events
@@ -2980,7 +2756,6 @@ libraries:
   GAPICs:
   - proto_path: google/apps/events/subscriptions/v1
   - proto_path: google/apps/events/subscriptions/v1beta
-
 - api_shortname: workstations
   name_pretty: Cloud Workstations
   product_documentation: https://cloud.google.com/workstations
diff --git a/java-datastore/generation_config.yaml b/java-datastore/generation_config.yaml
deleted file mode 100644
index 16e68051a135..000000000000
--- a/java-datastore/generation_config.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-gapic_generator_version: 2.65.1
-googleapis_commitish: 415914bd49d41beaae8a9adb348ee2587c93aa70
-libraries_bom_version: 26.73.0
-libraries:
-  - api_shortname: datastore
-    name_pretty: Cloud Datastore
-    product_documentation: https://cloud.google.com/datastore
-    client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
-    issue_tracker: https://issuetracker.google.com/savedsearches/559768
-    release_level: stable
-    language: java
-    repo: googleapis/java-datastore
-    repo_short: java-datastore
-    distribution_name: com.google.cloud:google-cloud-datastore
-    codeowner_team: '@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners'
-    api_id: datastore.googleapis.com
-    library_type: GAPIC_COMBO
-    api_description: is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.
-    excluded_dependencies: grpc-google-cloud-datastore-v1
-    extra_versioned_modules: datastore-v1-proto-client
-    excluded_poms: grpc-google-cloud-datastore-v1
-    recommended_package: com.google.cloud.datastore
-    GAPICs:
-      - proto_path: google/datastore/v1
-      - proto_path: google/datastore/admin/v1

From 097dc1ba0770f8564cec8cc320d0d77061a4f2fd Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:31 +0000
Subject: [PATCH 1777/1784] chore(java-datastore): consolidate versions.txt
 into root

---
 java-datastore/versions.txt | 10 ----------
 versions.txt                |  7 +++++++
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 java-datastore/versions.txt

diff --git a/java-datastore/versions.txt b/java-datastore/versions.txt
deleted file mode 100644
index 5eedb470be03..000000000000
--- a/java-datastore/versions.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Format:
-# module:released-version:current-version
-
-google-cloud-datastore:2.33.2:2.33.2
-google-cloud-datastore-bom:2.33.2:2.33.2
-proto-google-cloud-datastore-v1:0.124.2:0.124.2
-datastore-v1-proto-client:2.33.2:2.33.2
-proto-google-cloud-datastore-admin-v1:2.33.2:2.33.2
-grpc-google-cloud-datastore-admin-v1:2.33.2:2.33.2
-grpc-google-cloud-datastore-v1:2.33.2:2.33.2
diff --git a/versions.txt b/versions.txt
index b402889bf022..988fbb4fce6c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -937,3 +937,10 @@ grpc-google-cloud-gkerecommender-v1:0.2.0:0.3.0-SNAPSHOT
 google-cloud-cloudapiregistry:0.1.0:0.2.0-SNAPSHOT
 proto-google-cloud-cloudapiregistry-v1beta:0.1.0:0.2.0-SNAPSHOT
 grpc-google-cloud-cloudapiregistry-v1beta:0.1.0:0.2.0-SNAPSHOT
+google-cloud-datastore:2.33.2:2.33.2
+google-cloud-datastore-bom:2.33.2:2.33.2
+proto-google-cloud-datastore-v1:0.124.2:0.124.2
+datastore-v1-proto-client:2.33.2:2.33.2
+proto-google-cloud-datastore-admin-v1:2.33.2:2.33.2
+grpc-google-cloud-datastore-admin-v1:2.33.2:2.33.2
+grpc-google-cloud-datastore-v1:2.33.2:2.33.2

From 0d9ed22e85a9993abe2c46d9c6d29610bf6a8598 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:32 +0000
Subject: [PATCH 1778/1784] chore(java-datastore): migrate
 .OwlBot-hermetic.yaml

---
 java-datastore/.OwlBot-hermetic.yaml | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 java-datastore/.OwlBot-hermetic.yaml

diff --git a/java-datastore/.OwlBot-hermetic.yaml b/java-datastore/.OwlBot-hermetic.yaml
new file mode 100644
index 000000000000..c53f7529e9bf
--- /dev/null
+++ b/java-datastore/.OwlBot-hermetic.yaml
@@ -0,0 +1,31 @@
+# Copyright 2021 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.
+
+deep-remove-regex:
+- /java-datastore/proto-google-.*/src
+deep-preserve-regex:
+- /java-datastore/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java
+deep-copy-regex:
+- source: /google/datastore/(v.*)/.*-java/proto-google-.*/src
+  dest: /owl-bot-staging/java-datastore/$1/proto-google-cloud-datastore-$1/src
+- source: /google/datastore/admin/(v.*)/.*-java/proto-google-.*/src
+  dest: /owl-bot-staging/java-datastore/$1/proto-google-cloud-datastore-admin-$1/src
+- source: /google/datastore/(v.*)/.*-java/grpc-google-.*/src
+  dest: /owl-bot-staging/java-datastore/$1/grpc-google-cloud-datastore-$1/src
+- source: /google/datastore/admin/(v.*)/.*-java/grpc-google-.*/src
+  dest: /owl-bot-staging/java-datastore/$1/grpc-google-cloud-datastore-admin-$1/src
+- source: /google/datastore/(v.*)/.*-java/gapic-google-.*/src
+  dest: /owl-bot-staging/java-datastore/$1/google-cloud-datastore/src
+- source: /google/datastore/admin/(v.*)/.*-java/gapic-google-.*/src
+  dest: /owl-bot-staging/java-datastore/$1/google-cloud-datastore/src

From 407a7d50aa5e1ce408d18deff581ffebf3320152 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:33 +0000
Subject: [PATCH 1779/1784] chore(java-datastore): migrate owlbot.py

---
 java-datastore/owlbot.py | 53 +++++++++++++---------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/java-datastore/owlbot.py b/java-datastore/owlbot.py
index a858b736689f..0d229f0729bb 100644
--- a/java-datastore/owlbot.py
+++ b/java-datastore/owlbot.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,46 +14,27 @@
 
 import synthtool as s
 from synthtool.languages import java
-protobuf_header = "// Generated by the protocol buffer compiler.  DO NOT EDIT!"
-# License header
-license_header = """/*
- * Copyright 2019 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
- *
- *     https://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.
- */
-"""
+
+protobuf_header = '// Generated by the protocol buffer compiler.  DO NOT EDIT!'
+license_header = '/*\n * Copyright 2019 Google LLC\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n'
 service = 'datastore'
 version = 'v1'
 
 for library in s.get_staging_dirs():
     # put any special-case replacements here
-    s.replace(
-        f'owl-bot-staging/v1/proto-google-cloud-{service}-{version}-java/src/**/*.java',
-        protobuf_header,
-        f'{license_header}{protobuf_header}'
-    )
+    s.replace(f'owl-bot-staging/v1/proto-google-cloud-{service}-{version}-java/src/**/*.java', protobuf_header, f'{license_header}{protobuf_header}')
     s.move(library)
-
 s.remove_staging_dirs()
-java.common_templates(excludes=[
-    '.kokoro/build.sh',
-    '.kokoro/presubmit/integration.cfg',
-    '.kokoro/presubmit/graalvm-native.cfg',
-    '.kokoro/presubmit/graalvm-native-17.cfg',
-    '.kokoro/nightly/integration.cfg',
-    '.kokoro/nightly/java11-integration.cfg',
-    '.kokoro/requirements.in',
-    '.kokoro/requirements.txt',
-    '.github/dependabot.yml',
-    '.github/workflows/ci.yaml'
+java.common_templates(monorepo=True, excludes=[
+    ".github/*",
+    ".kokoro/*",
+    "samples/*",
+    "CODE_OF_CONDUCT.md",
+    "CONTRIBUTING.md",
+    "LICENSE",
+    "SECURITY.md",
+    "java.header",
+    "license-checks.xml",
+    "renovate.json",
+    ".gitignore"
 ])

From 8787e8ada113943105ec24d13b448481b3325e6f Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:34 +0000
Subject: [PATCH 1780/1784] chore(java-datastore): update copyright headers to
 2026 Google LLC

---
 java-datastore/.github/.OwlBot-hermetic.yaml  |  33 ---
 java-datastore/.github/CODEOWNERS             |  18 --
 .../.github/ISSUE_TEMPLATE/bug_report.md      |  51 ----
 .../.github/ISSUE_TEMPLATE/feature_request.md |  21 --
 .../.github/ISSUE_TEMPLATE/support_request.md |   7 -
 .../.github/PULL_REQUEST_TEMPLATE.md          |  10 -
 java-datastore/.github/auto-label.yaml        |  15 --
 java-datastore/.github/blunderbuss.yml        |   7 -
 java-datastore/.github/dependabot.yml         |  30 ---
 java-datastore/.github/flakybot.yaml          |   1 -
 .../.github/generated-files-bot.yml           |  13 -
 .../readme/synth.metadata/synth.metadata      |  18 --
 java-datastore/.github/release-please.yml     |  27 --
 java-datastore/.github/release-trigger.yml    |   2 -
 .../scripts/update_generation_config.sh       | 187 --------------
 java-datastore/.github/snippet-bot.yml        |   0
 .../.github/sync-repo-settings.yaml           | 238 ------------------
 .../.github/trusted-contribution.yml          |   9 -
 .../.github/workflows/approve-readme.yaml     |  69 -----
 java-datastore/.github/workflows/ci.yaml      | 131 ----------
 .../hermetic_library_generation.yaml          |  45 ----
 .../workflows/renovate_config_check.yaml      |  25 --
 java-datastore/.github/workflows/samples.yaml |  30 ---
 .../workflows/unmanaged_dependency_check.yaml |  19 --
 .../workflows/update_generation_config.yaml   |  47 ----
 java-datastore/.gitignore                     |   6 -
 java-datastore/.kokoro/build.bat              |  18 --
 java-datastore/.kokoro/build.sh               | 147 -----------
 java-datastore/.kokoro/coerce_logs.sh         |  37 ---
 java-datastore/.kokoro/common.cfg             |  13 -
 java-datastore/.kokoro/common.sh              |  60 -----
 java-datastore/.kokoro/continuous/common.cfg  |  25 --
 java-datastore/.kokoro/continuous/java8.cfg   |  12 -
 .../.kokoro/continuous/propose_release.sh     |  29 ---
 java-datastore/.kokoro/dependencies.sh        |  59 -----
 java-datastore/.kokoro/nightly/common.cfg     |  25 --
 .../.kokoro/nightly/integration.cfg           |  42 ----
 .../.kokoro/nightly/java11-integration.cfg    |  42 ----
 java-datastore/.kokoro/nightly/java11.cfg     |   7 -
 java-datastore/.kokoro/nightly/java7.cfg      |   7 -
 java-datastore/.kokoro/nightly/java8-osx.cfg  |   3 -
 java-datastore/.kokoro/nightly/java8-win.cfg  |   3 -
 java-datastore/.kokoro/nightly/java8.cfg      |  12 -
 java-datastore/.kokoro/nightly/samples.cfg    |  38 ---
 java-datastore/.kokoro/populate-secrets.sh    |  43 ----
 java-datastore/.kokoro/presubmit/clirr.cfg    |  13 -
 java-datastore/.kokoro/presubmit/common.cfg   |  34 ---
 .../.kokoro/presubmit/dependencies.cfg        |  12 -
 .../.kokoro/presubmit/graalvm-native-a.cfg    |  38 ---
 .../.kokoro/presubmit/graalvm-native-b.cfg    |  38 ---
 .../.kokoro/presubmit/graalvm-native-c.cfg    |  38 ---
 .../.kokoro/presubmit/integration.cfg         |  38 ---
 java-datastore/.kokoro/presubmit/java11.cfg   |   7 -
 java-datastore/.kokoro/presubmit/java7.cfg    |   7 -
 .../.kokoro/presubmit/java8-osx.cfg           |   3 -
 .../.kokoro/presubmit/java8-win.cfg           |   3 -
 java-datastore/.kokoro/presubmit/java8.cfg    |  12 -
 .../.kokoro/presubmit/linkage-monitor.cfg     |  12 -
 java-datastore/.kokoro/presubmit/lint.cfg     |  13 -
 java-datastore/.kokoro/presubmit/samples.cfg  |  33 ---
 java-datastore/.kokoro/readme.sh              |  45 ----
 java-datastore/.kokoro/trampoline.sh          |  26 --
 java-datastore/CODE_OF_CONDUCT.md             |  94 -------
 java-datastore/CONTRIBUTING.md                |  92 -------
 java-datastore/LICENSE                        | 201 ---------------
 java-datastore/SECURITY.md                    |   7 -
 java-datastore/codecov.yaml                   |   4 -
 .../client/ChecksumEnforcingInputStream.java  |   2 +-
 .../google/datastore/v1/client/Datastore.java |   2 +-
 .../v1/client/DatastoreEmulator.java          |   2 +-
 .../v1/client/DatastoreEmulatorException.java |   2 +-
 .../v1/client/DatastoreEmulatorFactory.java   |   2 +-
 .../v1/client/DatastoreEmulatorOptions.java   |   2 +-
 .../v1/client/DatastoreException.java         |   2 +-
 .../datastore/v1/client/DatastoreFactory.java |   2 +-
 .../datastore/v1/client/DatastoreHelper.java  |   2 +-
 .../datastore/v1/client/DatastoreOptions.java |   2 +-
 .../v1/client/EndToEndChecksumHandler.java    |   2 +-
 .../datastore/v1/client/QuerySplitter.java    |   2 +-
 .../v1/client/QuerySplitterImpl.java          |   2 +-
 .../google/datastore/v1/client/RemoteRpc.java |   2 +-
 .../v1/client/testing/MockCredential.java     |   2 +-
 .../client/testing/MockDatastoreFactory.java  |   2 +-
 .../ChecksumEnforcingInputStreamTest.java     |   2 +-
 .../v1/client/DatastoreClientTest.java        |   2 +-
 .../v1/client/DatastoreEmulatorTest.java      |   2 +-
 .../v1/client/DatastoreFactoryTest.java       |   2 +-
 .../v1/client/DatastoreHelperTest.java        |   2 +-
 .../client/EndToEndChecksumHandlerTest.java   |   2 +-
 .../v1/client/QuerySplitterTest.java          |   2 +-
 .../datastore/v1/client/RemoteRpcTest.java    |   2 +-
 .../client/it/ITDatastoreProtoClientTest.java |   2 +-
 .../com/google/datastore/utils/Datastore.java |   2 +-
 .../datastore/utils/DatastoreException.java   |   2 +-
 .../datastore/utils/DatastoreFactory.java     |   2 +-
 .../datastore/utils/DatastoreHelper.java      |   2 +-
 .../datastore/utils/DatastoreOptions.java     |   2 +-
 .../google/datastore/utils/QuerySplitter.java |   2 +-
 .../datastore/utils/QuerySplitterImpl.java    |   2 +-
 .../com/google/datastore/utils/RemoteRpc.java |   2 +-
 .../utils/testing/MockCredential.java         |   2 +-
 .../utils/testing/MockDatastoreFactory.java   |   2 +-
 .../datastore/utils/DatastoreClientTest.java  |   2 +-
 .../datastore/utils/DatastoreFactoryTest.java |   2 +-
 .../datastore/utils/DatastoreHelperTest.java  |   2 +-
 .../datastore/utils/QuerySplitterTest.java    |   2 +-
 .../google/datastore/utils/RemoteRpcTest.java |   2 +-
 .../utils/it/ITDatastoreProtoClientTest.java  |   2 +-
 .../cloud/datastore/AggregationQuery.java     |   2 +-
 .../cloud/datastore/AggregationResult.java    |   2 +-
 .../cloud/datastore/AggregationResults.java   |   2 +-
 .../datastore/BaseDatastoreBatchWriter.java   |   2 +-
 .../google/cloud/datastore/BaseEntity.java    |   2 +-
 .../com/google/cloud/datastore/BaseKey.java   |   2 +-
 .../com/google/cloud/datastore/Batch.java     |   2 +-
 .../com/google/cloud/datastore/BatchImpl.java |   2 +-
 .../java/com/google/cloud/datastore/Blob.java |   2 +-
 .../com/google/cloud/datastore/BlobValue.java |   2 +-
 .../google/cloud/datastore/BooleanValue.java  |   2 +-
 .../com/google/cloud/datastore/Cursor.java    |   2 +-
 .../com/google/cloud/datastore/Datastore.java |   2 +-
 .../cloud/datastore/DatastoreBatchWriter.java |   2 +-
 .../cloud/datastore/DatastoreException.java   |   2 +-
 .../cloud/datastore/DatastoreFactory.java     |   2 +-
 .../cloud/datastore/DatastoreHelper.java      |   2 +-
 .../google/cloud/datastore/DatastoreImpl.java |   2 +-
 .../DatastoreOpenTelemetryOptions.java        |   2 +-
 .../cloud/datastore/DatastoreOptions.java     |   2 +-
 .../cloud/datastore/DatastoreReader.java      |   2 +-
 .../datastore/DatastoreReaderWriter.java      |   2 +-
 .../cloud/datastore/DatastoreUtils.java       |   2 +-
 .../cloud/datastore/DatastoreWriter.java      |   2 +-
 .../google/cloud/datastore/DoubleValue.java   |   2 +-
 .../com/google/cloud/datastore/Entity.java    |   2 +-
 .../google/cloud/datastore/EntityQuery.java   |   2 +-
 .../google/cloud/datastore/EntityValue.java   |   2 +-
 .../google/cloud/datastore/FullEntity.java    |   2 +-
 .../com/google/cloud/datastore/GqlQuery.java  |   2 +-
 .../datastore/GqlQueryProtoPreparer.java      |   2 +-
 .../GrpcToDatastoreCodeTranslation.java       |   2 +-
 .../google/cloud/datastore/IncompleteKey.java |   2 +-
 .../java/com/google/cloud/datastore/Key.java  |   2 +-
 .../google/cloud/datastore/KeyFactory.java    |   2 +-
 .../com/google/cloud/datastore/KeyQuery.java  |   2 +-
 .../com/google/cloud/datastore/KeyValue.java  |   2 +-
 .../com/google/cloud/datastore/LatLng.java    |   2 +-
 .../google/cloud/datastore/LatLngValue.java   |   2 +-
 .../com/google/cloud/datastore/ListValue.java |   2 +-
 .../com/google/cloud/datastore/LongValue.java |   2 +-
 .../com/google/cloud/datastore/NullValue.java |   2 +-
 .../google/cloud/datastore/PathElement.java   |   2 +-
 .../cloud/datastore/ProjectionEntity.java     |   2 +-
 .../datastore/ProjectionEntityQuery.java      |   2 +-
 .../com/google/cloud/datastore/Query.java     |   2 +-
 .../google/cloud/datastore/QueryResults.java  |   2 +-
 .../cloud/datastore/QueryResultsImpl.java     |   2 +-
 .../com/google/cloud/datastore/RawValue.java  |   2 +-
 .../google/cloud/datastore/ReadOption.java    |   2 +-
 .../datastore/ReadOptionProtoPreparer.java    |   2 +-
 .../google/cloud/datastore/RecordQuery.java   |   2 +-
 .../RetryAndTraceDatastoreRpcDecorator.java   |   2 +-
 .../google/cloud/datastore/StringValue.java   |   2 +-
 .../cloud/datastore/StructuredQuery.java      |   2 +-
 .../StructuredQueryProtoPreparer.java         |   2 +-
 .../cloud/datastore/TimestampValue.java       |   2 +-
 .../google/cloud/datastore/Transaction.java   |   2 +-
 .../TransactionExceptionHandler.java          |   2 +-
 .../cloud/datastore/TransactionImpl.java      |   2 +-
 .../TransactionOperationExceptionHandler.java |   2 +-
 .../com/google/cloud/datastore/Validator.java |   2 +-
 .../com/google/cloud/datastore/Value.java     |   2 +-
 .../google/cloud/datastore/ValueBuilder.java  |   2 +-
 .../cloud/datastore/ValueMarshaller.java      |   2 +-
 .../com/google/cloud/datastore/ValueType.java |   2 +-
 .../datastore/aggregation/Aggregation.java    |   2 +-
 .../aggregation/AggregationBuilder.java       |   2 +-
 .../datastore/aggregation/AvgAggregation.java |   2 +-
 .../aggregation/CountAggregation.java         |   2 +-
 .../datastore/aggregation/SumAggregation.java |   2 +-
 .../execution/AggregationQueryExecutor.java   |   2 +-
 .../datastore/execution/QueryExecutor.java    |   2 +-
 .../AggregationQueryRequestProtoPreparer.java |   2 +-
 .../execution/request/ProtoPreparer.java      |   2 +-
 .../AggregationQueryResponseTransformer.java  |   2 +-
 .../response/ResponseTransformer.java         |   2 +-
 .../datastore/models/ExecutionStats.java      |   2 +-
 .../datastore/models/ExplainMetrics.java      |   2 +-
 .../datastore/models/ExplainOptions.java      |   2 +-
 .../cloud/datastore/models/PlanSummary.java   |   2 +-
 .../google/cloud/datastore/package-info.java  |   2 +-
 .../datastore/spi/DatastoreRpcFactory.java    |   2 +-
 .../cloud/datastore/spi/v1/DatastoreRpc.java  |   2 +-
 .../datastore/spi/v1/GrpcDatastoreRpc.java    |   2 +-
 .../datastore/spi/v1/HttpDatastoreRpc.java    |   2 +-
 .../cloud/datastore/spi/v1/RpcUtils.java      |   2 +-
 .../telemetry/DisabledTraceUtil.java          |   2 +-
 .../datastore/telemetry/EnabledTraceUtil.java |   2 +-
 .../cloud/datastore/telemetry/TraceUtil.java  |   2 +-
 .../testing/LocalDatastoreHelper.java         |   2 +-
 .../cloud/datastore/testing/package-info.java |   2 +-
 .../datastore/AbstractDatastoreTest.java      |   2 +-
 .../cloud/datastore/AggregationQueryTest.java |   2 +-
 .../datastore/AggregationResultTest.java      |   2 +-
 .../BaseDatastoreBatchWriterTest.java         |   2 +-
 .../cloud/datastore/BaseEntityTest.java       |   2 +-
 .../google/cloud/datastore/BaseKeyTest.java   |   2 +-
 .../com/google/cloud/datastore/BlobTest.java  |   2 +-
 .../google/cloud/datastore/BlobValueTest.java |   2 +-
 .../cloud/datastore/BooleanValueTest.java     |   2 +-
 .../google/cloud/datastore/CursorTest.java    |   2 +-
 .../datastore/DatastoreExceptionTest.java     |   2 +-
 .../cloud/datastore/DatastoreHelperTest.java  |   2 +-
 .../cloud/datastore/DatastoreOptionsTest.java |   2 +-
 .../cloud/datastore/DatastoreTestGrpc.java    |   2 +-
 .../cloud/datastore/DatastoreTestHttp.java    |   2 +-
 .../cloud/datastore/DatastoreUtilsTest.java   |   2 +-
 .../cloud/datastore/DoubleValueTest.java      |   2 +-
 .../google/cloud/datastore/EntityTest.java    |   2 +-
 .../cloud/datastore/EntityValueTest.java      |   2 +-
 .../cloud/datastore/FullEntityTest.java       |   2 +-
 .../datastore/GqlQueryProtoPreparerTest.java  |   2 +-
 .../GrpcToDatastoreCodeTranslationTest.java   |   2 +-
 .../cloud/datastore/IncompleteKeyTest.java    |   2 +-
 .../cloud/datastore/KeyFactoryTest.java       |   2 +-
 .../com/google/cloud/datastore/KeyTest.java   |   2 +-
 .../google/cloud/datastore/KeyValueTest.java  |   2 +-
 .../google/cloud/datastore/LatLngTest.java    |   2 +-
 .../cloud/datastore/LatLngValueTest.java      |   2 +-
 .../google/cloud/datastore/ListValueTest.java |   2 +-
 .../google/cloud/datastore/LongValueTest.java |   2 +-
 .../google/cloud/datastore/NullValueTest.java |   2 +-
 .../cloud/datastore/PathElementTest.java      |   2 +-
 .../cloud/datastore/ProjectionEntityTest.java |   2 +-
 .../google/cloud/datastore/ProtoTestData.java |   2 +-
 .../google/cloud/datastore/RawValueTest.java  |   2 +-
 .../ReadOptionProtoPreparerTest.java          |   2 +-
 .../cloud/datastore/SerializationTest.java    |   2 +-
 .../cloud/datastore/StringValueTest.java      |   2 +-
 .../StructuredQueryProtoPreparerTest.java     |   2 +-
 .../cloud/datastore/StructuredQueryTest.java  |   2 +-
 .../com/google/cloud/datastore/TestUtils.java |   2 +-
 .../cloud/datastore/TimestampValueTest.java   |   2 +-
 .../TransactionExceptionHandlerTest.java      |   2 +-
 .../com/google/cloud/datastore/ValueTest.java |   2 +-
 .../aggregation/AvgAggregationTest.java       |   2 +-
 .../aggregation/CountAggregationTest.java     |   2 +-
 .../aggregation/SumAggregationTest.java       |   2 +-
 .../AggregationQueryExecutorTest.java         |   2 +-
 ...regationQueryRequestProtoPreparerTest.java |   2 +-
 ...gregationQueryResponseTransformerTest.java |   2 +-
 .../datastore/it/AbstractITDatastoreTest.java |   2 +-
 .../datastore/it/ITDatastoreConceptsTest.java |   2 +-
 .../datastore/it/ITDatastoreTestGrpc.java     |   2 +-
 .../datastore/it/ITDatastoreTestHttp.java     |   2 +-
 .../cloud/datastore/it/ITE2ETracingTest.java  |   2 +-
 .../cloud/datastore/it/ITTracingTest.java     |   2 +-
 .../datastore/it/MultipleAttemptsRule.java    |   2 +-
 .../it/MultipleAttemptsRuleTest.java          |   2 +-
 .../cloud/datastore/it/StatementExecutor.java |   2 +-
 .../datastore/models/ExecutionStatsTest.java  |   2 +-
 .../datastore/models/ExplainOptionsTest.java  |   2 +-
 .../datastore/models/PlanSummaryTest.java     |   2 +-
 .../cloud/datastore/spi/v1/RpcUtilsTest.java  |   2 +-
 .../telemetry/DisabledTraceUtilTest.java      |   2 +-
 .../telemetry/EnabledTraceUtilTest.java       |   2 +-
 .../datastore/telemetry/TraceUtilTest.java    |   2 +-
 .../testing/ITLocalDatastoreHelperTest.java   |   2 +-
 .../testing/RemoteDatastoreHelper.java        |   2 +-
 java-datastore/java.header                    |  15 --
 java-datastore/license-checks.xml             |  10 -
 java-datastore/renovate.json                  |  98 --------
 .../datastore/ConfigureConnectionPool.java    |   2 +-
 .../example/datastore/QuickstartSample.java   |   2 +-
 .../aggregation/AvgAggregationOnKind.java     |   2 +-
 .../aggregation/AvgAggregationWithLimit.java  |   2 +-
 .../AvgAggregationWithOrderBy.java            |   2 +-
 .../AvgAggregationWithPropertyFilter.java     |   2 +-
 .../CountAggregationInTransaction.java        |   2 +-
 .../aggregation/CountAggregationOnKind.java   |   2 +-
 .../CountAggregationWithGqlQuery.java         |   2 +-
 .../CountAggregationWithLimit.java            |   2 +-
 .../CountAggregationWithOrderBy.java          |   2 +-
 .../CountAggregationWithPropertyFilter.java   |   2 +-
 .../CountAggregationWithStaleRead.java        |   2 +-
 .../MultipleAggregationsInGqlQuery.java       |   2 +-
 ...MultipleAggregationsInStructuredQuery.java |   2 +-
 .../aggregation/SumAggregationOnKind.java     |   2 +-
 .../aggregation/SumAggregationWithLimit.java  |   2 +-
 .../SumAggregationWithOrderBy.java            |   2 +-
 .../SumAggregationWithPropertyFilter.java     |   2 +-
 .../filters/IndexingConsiderationQuery.java   |   2 +-
 .../datastore/filters/OrFilterQuery.java      |   2 +-
 .../datastore/filters/OrderFieldsQuery.java   |   2 +-
 .../queryprofile/QueryProfileExplain.java     |   2 +-
 .../QueryProfileExplainAggregation.java       |   2 +-
 .../QueryProfileExplainAnalyze.java           |   2 +-
 ...QueryProfileExplainAnalyzeAggregation.java |   2 +-
 .../google/datastore/snippets/TaskList.java   |   2 +-
 .../datastore/ConfigureConnectionPoolIT.java  |   2 +-
 .../example/datastore/QuickstartSampleIT.java |   2 +-
 .../AggregationQuerySampleTestIT.java         |   2 +-
 .../filters/MultiIneqQuerySampleIT.java       |   2 +-
 .../filters/OrFilterQuerySampleIT.java        |   2 +-
 .../queryprofile/QueryProfileSampleIT.java    |   2 +-
 .../datastore/snippets/ConceptsTest.java      |   2 +-
 .../test/java/com/rule/SystemsOutRule.java    |   2 +-
 java-datastore/synth.metadata                 | 191 --------------
 307 files changed, 236 insertions(+), 3001 deletions(-)
 delete mode 100644 java-datastore/.github/.OwlBot-hermetic.yaml
 delete mode 100644 java-datastore/.github/CODEOWNERS
 delete mode 100644 java-datastore/.github/ISSUE_TEMPLATE/bug_report.md
 delete mode 100644 java-datastore/.github/ISSUE_TEMPLATE/feature_request.md
 delete mode 100644 java-datastore/.github/ISSUE_TEMPLATE/support_request.md
 delete mode 100644 java-datastore/.github/PULL_REQUEST_TEMPLATE.md
 delete mode 100644 java-datastore/.github/auto-label.yaml
 delete mode 100644 java-datastore/.github/blunderbuss.yml
 delete mode 100644 java-datastore/.github/dependabot.yml
 delete mode 100644 java-datastore/.github/flakybot.yaml
 delete mode 100644 java-datastore/.github/generated-files-bot.yml
 delete mode 100644 java-datastore/.github/readme/synth.metadata/synth.metadata
 delete mode 100644 java-datastore/.github/release-please.yml
 delete mode 100644 java-datastore/.github/release-trigger.yml
 delete mode 100644 java-datastore/.github/scripts/update_generation_config.sh
 delete mode 100644 java-datastore/.github/snippet-bot.yml
 delete mode 100644 java-datastore/.github/sync-repo-settings.yaml
 delete mode 100644 java-datastore/.github/trusted-contribution.yml
 delete mode 100644 java-datastore/.github/workflows/approve-readme.yaml
 delete mode 100644 java-datastore/.github/workflows/ci.yaml
 delete mode 100644 java-datastore/.github/workflows/hermetic_library_generation.yaml
 delete mode 100644 java-datastore/.github/workflows/renovate_config_check.yaml
 delete mode 100644 java-datastore/.github/workflows/samples.yaml
 delete mode 100644 java-datastore/.github/workflows/unmanaged_dependency_check.yaml
 delete mode 100644 java-datastore/.github/workflows/update_generation_config.yaml
 delete mode 100644 java-datastore/.gitignore
 delete mode 100644 java-datastore/.kokoro/build.bat
 delete mode 100755 java-datastore/.kokoro/build.sh
 delete mode 100755 java-datastore/.kokoro/coerce_logs.sh
 delete mode 100644 java-datastore/.kokoro/common.cfg
 delete mode 100644 java-datastore/.kokoro/common.sh
 delete mode 100644 java-datastore/.kokoro/continuous/common.cfg
 delete mode 100644 java-datastore/.kokoro/continuous/java8.cfg
 delete mode 100755 java-datastore/.kokoro/continuous/propose_release.sh
 delete mode 100755 java-datastore/.kokoro/dependencies.sh
 delete mode 100644 java-datastore/.kokoro/nightly/common.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/integration.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/java11-integration.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/java11.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/java7.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/java8-osx.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/java8-win.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/java8.cfg
 delete mode 100644 java-datastore/.kokoro/nightly/samples.cfg
 delete mode 100755 java-datastore/.kokoro/populate-secrets.sh
 delete mode 100644 java-datastore/.kokoro/presubmit/clirr.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/common.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/dependencies.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/graalvm-native-a.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/graalvm-native-b.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/graalvm-native-c.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/integration.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/java11.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/java7.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/java8-osx.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/java8-win.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/java8.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/linkage-monitor.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/lint.cfg
 delete mode 100644 java-datastore/.kokoro/presubmit/samples.cfg
 delete mode 100755 java-datastore/.kokoro/readme.sh
 delete mode 100644 java-datastore/.kokoro/trampoline.sh
 delete mode 100644 java-datastore/CODE_OF_CONDUCT.md
 delete mode 100644 java-datastore/CONTRIBUTING.md
 delete mode 100644 java-datastore/LICENSE
 delete mode 100644 java-datastore/SECURITY.md
 delete mode 100644 java-datastore/codecov.yaml
 delete mode 100644 java-datastore/java.header
 delete mode 100644 java-datastore/license-checks.xml
 delete mode 100644 java-datastore/renovate.json
 delete mode 100644 java-datastore/synth.metadata

diff --git a/java-datastore/.github/.OwlBot-hermetic.yaml b/java-datastore/.github/.OwlBot-hermetic.yaml
deleted file mode 100644
index ef1c310b33cc..000000000000
--- a/java-datastore/.github/.OwlBot-hermetic.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-deep-remove-regex:
-- "/proto-google-.*/src"
-
-deep-preserve-regex:
-- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
-
-deep-copy-regex:
-- source: "/google/datastore/(v.*)/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-$1/src"
-- source: "/google/datastore/admin/(v.*)/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-admin-$1/src"
-- source: "/google/datastore/(v.*)/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-$1/src"
-- source: "/google/datastore/admin/(v.*)/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-admin-$1/src"
-# Admin & Data APIs share the same wrapper library.
-- source: "/google/datastore/(v.*)/.*-java/gapic-google-.*/src"
-  dest: "/owl-bot-staging/$1/google-cloud-datastore/src"
-- source: "/google/datastore/admin/(v.*)/.*-java/gapic-google-.*/src"
-  dest: "/owl-bot-staging/$1/google-cloud-datastore/src"
diff --git a/java-datastore/.github/CODEOWNERS b/java-datastore/.github/CODEOWNERS
deleted file mode 100644
index 0f5636920d0d..000000000000
--- a/java-datastore/.github/CODEOWNERS
+++ /dev/null
@@ -1,18 +0,0 @@
-# Code owners file.
-# This file controls who is tagged for review for any given pull request.
-
-# For syntax help see:
-# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
-
-# The @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners is the default owner for changes in this repo
-*                       @googleapis/cloud-java-team-teamsync @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
-
-# for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java                @googleapis/cloud-java-team-teamsync @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
-
-
-# The java-samples-reviewers team is the default owner for samples changes
-samples/**/*.java        @googleapis/cloud-java-team-teamsync @googleapis/java-samples-reviewers
-
-# Generated snippets should not be owned by samples reviewers
-samples/snippets/generated/        @googleapis/cloud-java-team-teamsync
diff --git a/java-datastore/.github/ISSUE_TEMPLATE/bug_report.md b/java-datastore/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 630ca5ddb300..000000000000
--- a/java-datastore/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-Thanks for stopping by to let us know something could be better!
-
-**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
-
-Please run down the following list and make sure you've tried the usual "quick fixes":
-
-  - Search the issues already opened: https://github.com/googleapis/java-datastore/issues
-  - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform
-
-If you are still having issues, please include as much information as possible:
-
-#### Environment details
-
-1. Specify the API at the beginning of the title. For example, "BigQuery: ...").
-   General, Core, and Other are also allowed as types
-2. OS type and version:
-3. Java version:
-4.  version(s):
-
-#### Steps to reproduce
-
-  1. ?
-  2. ?
-
-#### Code example
-
-```java
-// example
-```
-
-#### Stack trace
-```
-Any relevant stacktrace here.
-```
-
-#### External references such as API reference guides
-
-- ?
-
-#### Any additional information below
-
-
-Following these steps guarantees the quickest resolution possible.
-
-Thanks!
diff --git a/java-datastore/.github/ISSUE_TEMPLATE/feature_request.md b/java-datastore/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 754e30c68a00..000000000000
--- a/java-datastore/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this library
-
----
-
-Thanks for stopping by to let us know something could be better!
-
-**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
-
-**Is your feature request related to a problem? Please describe.**
-What the problem is. Example: I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-What you want to happen.
-
-**Describe alternatives you've considered**
-Any alternative solutions or features you've considered.
-
-**Additional context**
-Any other context or screenshots about the feature request.
diff --git a/java-datastore/.github/ISSUE_TEMPLATE/support_request.md b/java-datastore/.github/ISSUE_TEMPLATE/support_request.md
deleted file mode 100644
index 995869032125..000000000000
--- a/java-datastore/.github/ISSUE_TEMPLATE/support_request.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Support request
-about: If you have a support contract with Google, please create an issue in the Google Cloud Support console.
-
----
-
-**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
diff --git a/java-datastore/.github/PULL_REQUEST_TEMPLATE.md b/java-datastore/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index a2a811faba59..000000000000
--- a/java-datastore/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
-- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-datastore/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
-- [ ] Ensure the tests and linter pass
-- [ ] Code coverage does not decrease (if any source code was changed)
-- [ ] Appropriate docs were updated (if necessary)
-
-Fixes # ☕️
-
-If you write sample code, please follow the [samples format](
-https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
diff --git a/java-datastore/.github/auto-label.yaml b/java-datastore/.github/auto-label.yaml
deleted file mode 100644
index 4caef688b745..000000000000
--- a/java-datastore/.github/auto-label.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021 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.
-requestsize:
-  enabled: true
diff --git a/java-datastore/.github/blunderbuss.yml b/java-datastore/.github/blunderbuss.yml
deleted file mode 100644
index 2176b0543214..000000000000
--- a/java-datastore/.github/blunderbuss.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
-assign_prs_by:
-- labels:
-  - samples
-  to:
-  - googleapis/java-samples-reviewers
\ No newline at end of file
diff --git a/java-datastore/.github/dependabot.yml b/java-datastore/.github/dependabot.yml
deleted file mode 100644
index 18cc9f259244..000000000000
--- a/java-datastore/.github/dependabot.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    # Disable version updates for Maven dependencies
-    # we use renovate-bot as well as shared-dependencies BOM to update maven dependencies.
-    ignore:
-      - dependency-name: "*"
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    # Disable version updates for pip dependencies
-    # If a security vulnerability comes in, we will be notified about 
-    # it via template in the synthtool repository.
-    ignore:
-      - dependency-name: "*"
-# rules for the `grpc-experimental` branch
-  - package-ecosystem: maven
-    directory: "/"
-    schedule:
-      interval: daily
-    commit-message:
-      # Prefix all commit messages with "deps: "
-      prefix: "deps"
-    open-pull-requests-limit: 10
-    target-branch: "grpc-experimental"
diff --git a/java-datastore/.github/flakybot.yaml b/java-datastore/.github/flakybot.yaml
deleted file mode 100644
index cb83375f9893..000000000000
--- a/java-datastore/.github/flakybot.yaml
+++ /dev/null
@@ -1 +0,0 @@
-issuePriority: p2
diff --git a/java-datastore/.github/generated-files-bot.yml b/java-datastore/.github/generated-files-bot.yml
deleted file mode 100644
index e58cdcbad65a..000000000000
--- a/java-datastore/.github/generated-files-bot.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-externalManifests:
-- type: json
-  file: 'synth.metadata'
-  jsonpath: '$.generatedFiles[*]'
-- type: json
-  file: '.github/readme/synth.metadata/synth.metadata'
-  jsonpath: '$.generatedFiles[*]'
-ignoreAuthors:
-- 'cloud-java-bot'
-- 'renovate-bot'
-- 'yoshi-automation'
-- 'release-please[bot]'
-- 'gcf-owl-bot[bot]'
diff --git a/java-datastore/.github/readme/synth.metadata/synth.metadata b/java-datastore/.github/readme/synth.metadata/synth.metadata
deleted file mode 100644
index 250e22d86232..000000000000
--- a/java-datastore/.github/readme/synth.metadata/synth.metadata
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "sources": [
-    {
-      "git": {
-        "name": ".",
-        "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "b1932d97b8263c2bcfdf31179bb5705988d8d516"
-      }
-    },
-    {
-      "git": {
-        "name": "synthtool",
-        "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/java-datastore/.github/release-please.yml b/java-datastore/.github/release-please.yml
deleted file mode 100644
index 53b9a3553667..000000000000
--- a/java-datastore/.github/release-please.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-bumpMinorPreMajor: true
-handleGHRelease: true
-releaseType: java-yoshi
-branches:
-    - branch: 1.106.5-sp
-      releaseType: java-lts
-    - branch: java7
-    - branch: 2.1.x
-      releaseType: java-backport
-    - branch: 2.2.x
-      releaseType: java-backport
-    - branch: 2.12.x
-      releaseType: java-backport
-    - branch: 2.15.x
-      releaseType: java-backport
-    - branch: 2.17.x
-      releaseType: java-backport
-    - branch: 2.19.x
-      releaseType: java-backport
-    - branch: 2.26.x
-      releaseType: java-backport
-    - branch: 2.30.x
-      releaseType: java-backport
-    - branch: 2.29.x
-      releaseType: java-backport
-    - branch: protobuf-4.x-rc
-      manifest: true
diff --git a/java-datastore/.github/release-trigger.yml b/java-datastore/.github/release-trigger.yml
deleted file mode 100644
index 4d7c5dc5794c..000000000000
--- a/java-datastore/.github/release-trigger.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-enabled: true
-multiScmName: java-datastore
diff --git a/java-datastore/.github/scripts/update_generation_config.sh b/java-datastore/.github/scripts/update_generation_config.sh
deleted file mode 100644
index 74d0e6cc4105..000000000000
--- a/java-datastore/.github/scripts/update_generation_config.sh
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/bin/bash
-set -ex
-# This script should be run at the root of the repository.
-# This script is used to update googleapis_commitish, gapic_generator_version,
-# and libraries_bom_version in generation configuration at the time of running
-# and create a pull request.
-
-# The following commands need to be installed before running the script:
-# 1. git
-# 2. gh
-# 3. jq
-
-# Utility functions
-# Get the latest released version of a Maven artifact.
-function get_latest_released_version() {
-    local group_id=$1
-    local artifact_id=$2
-    group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
-    url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
-    xml_content=$(curl -s --fail "${url}")
-    
-    # 1. Extract all version tags
-    # 2. Strip the XML tags to leave just the version numbers
-    # 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
-    # 4. Sort by version (V) and take the last one (tail -n 1)
-    latest=$(echo "${xml_content}" \
-      | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \
-      | sed -E 's/<[^>]+>//g' \
-      | sort -V \
-      | tail -n 1)
-    
-    if [[ -z "${latest}" ]]; then
-        echo "The latest version of ${group_id}:${artifact_id} is empty."
-        echo "The returned json from maven.org is invalid: ${json_content}"
-        exit 1
-    else
-        echo "${latest}"
-    fi
-}
-
-# Update a key to a new value in the generation config.
-function update_config() {
-    local key_word=$1
-    local new_value=$2
-    local file=$3
-    echo "Update ${key_word} to ${new_value} in ${file}"
-    sed -i -e "s/^${key_word}.*$/${key_word}: ${new_value}/" "${file}"
-}
-
-# Update an action to a new version in GitHub action.
-function update_action() {
-    local key_word=$1
-    local new_value=$2
-    local file=$3
-    echo "Update ${key_word} to ${new_value} in ${file}"
-    # use a different delimiter because the key_word contains "/".
-    sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}"
-}
-
-# The parameters of this script is:
-# 1. base_branch, the base branch of the result pull request.
-# 2. repo, organization/repo-name, e.g., googleapis/google-cloud-java
-# 3. [optional] generation_config, the path to the generation configuration,
-# the default value is generation_config.yaml in the repository root.
-# 4. [optional] workflow, the library generation workflow file,
-# the default value is .github/workflows/hermetic_library_generation.yaml.
-while [[ $# -gt 0 ]]; do
-key="$1"
-case "${key}" in
-  --base_branch)
-    base_branch="$2"
-    shift
-    ;;
-  --repo)
-    repo="$2"
-    shift
-    ;;
-  --generation_config)
-    generation_config="$2"
-    shift
-    ;;
-  --workflow)
-    workflow="$2"
-    shift
-    ;;
-  *)
-    echo "Invalid option: [$1]"
-    exit 1
-    ;;
-esac
-shift
-done
-
-if [ -z "${base_branch}" ]; then
-  echo "missing required argument --base_branch"
-  exit 1
-fi
-
-if [ -z "${repo}" ]; then
-  echo "missing required argument --repo"
-  exit 1
-fi
-
-if [ -z "${generation_config}" ]; then
-  generation_config="generation_config.yaml"
-  echo "Use default generation config: ${generation_config}"
-fi
-
-if [ -z "${workflow}" ]; then
-    workflow=".github/workflows/hermetic_library_generation.yaml"
-    echo "Use default library generation workflow file: ${workflow}"
-fi
-
-current_branch="generate-libraries-${base_branch}"
-title="chore: Update generation configuration at $(date)"
-
-git checkout "${base_branch}"
-# Try to find a open pull request associated with the branch
-pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
-# Create a branch if there's no open pull request associated with the
-# branch; otherwise checkout the pull request.
-if [ -z "${pr_num}" ]; then
-  git checkout -b "${current_branch}"
-  # Push the current branch to remote so that we can
-  # compare the commits later.
-  git push -u origin "${current_branch}"
-else
-  gh pr checkout "${pr_num}"
-fi
-
-# Only allow fast-forward merging; exit with non-zero result if there's merging
-# conflict.
-git merge -m "chore: merge ${base_branch} into ${current_branch}" "${base_branch}"
-
-mkdir tmp-googleapis
-# Use partial clone because only commit history is needed.
-git clone --filter=blob:none https://github.com/googleapis/googleapis.git tmp-googleapis
-pushd tmp-googleapis
-git pull
-latest_commit=$(git rev-parse HEAD)
-popd
-rm -rf tmp-googleapis
-update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
-
-# Update gapic-generator-java version to the latest
-latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
-update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
-
-# Update composite action version to latest gapic-generator-java version
-update_action "googleapis/sdk-platform-java/.github/scripts" \
-  "${latest_version}" \
-  "${workflow}"
-
-# Update libraries-bom version to the latest
-latest_version=$(get_latest_released_version "com.google.cloud" "libraries-bom")
-update_config "libraries_bom_version" "${latest_version}" "${generation_config}"
-
-git add "${generation_config}" "${workflow}"
-changed_files=$(git diff --cached --name-only)
-if [[ "${changed_files}" == "" ]]; then
-    echo "The latest generation config is not changed."
-    echo "Skip committing to the pull request."
-else
-    git commit -m "${title}"
-fi
-
-# There are potentially at most two commits: merge commit and change commit.
-# We want to exit the script if no commit happens (otherwise this will be an
-# infinite loop).
-# `git cherry` is a way to find whether the local branch has commits that are
-# not in the remote branch.
-# If we find any such commit, push them to remote branch.
-unpushed_commit=$(git cherry -v "origin/${current_branch}" | wc -l)
-if [[ "${unpushed_commit}" -eq 0 ]]; then
-    echo "No unpushed commits, exit"
-    exit 0
-fi
-
-if [ -z "${pr_num}" ]; then
-  git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${repo}.git"
-  git fetch -q remote_repo
-  git push -f remote_repo "${current_branch}"
-  gh pr create --title "${title}" --head "${current_branch}" --body "${title}" --base "${base_branch}"
-else
-  git push
-  gh pr edit "${pr_num}" --title "${title}" --body "${title}"
-fi
diff --git a/java-datastore/.github/snippet-bot.yml b/java-datastore/.github/snippet-bot.yml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/java-datastore/.github/sync-repo-settings.yaml b/java-datastore/.github/sync-repo-settings.yaml
deleted file mode 100644
index a62e8b083b47..000000000000
--- a/java-datastore/.github/sync-repo-settings.yaml
+++ /dev/null
@@ -1,238 +0,0 @@
-rebaseMergeAllowed: false
-squashMergeAllowed: true
-mergeCommitAllowed: false
-branchProtectionRules:
-  - pattern: main
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image A'
-      - 'Kokoro - Test: Java GraalVM Native Image B'
-      - 'Kokoro - Test: Java GraalVM Native Image C'
-      - javadoc
-      - library_generation
-      - unmanaged_dependency_check
-  - pattern: 1.106.5-sp
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-  - pattern: java7
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
-      - lint
-      - clirr
-      - units (7)
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-  - pattern: 2.1.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-  - pattern: 2.2.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-  - pattern: 2.12.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-  - pattern: multi-db
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (8)
-      - dependencies (11)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-  - pattern: grpc-experimental
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
-  - pattern: 2.15.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-  - pattern: 2.17.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
-  - pattern: 2.19.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
-  - pattern: 2.26.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
-      - library_generation
-      - unmanaged_dependency_check
-  - pattern: 2.30.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image A'
-      - 'Kokoro - Test: Java GraalVM Native Image B'
-      - 'Kokoro - Test: Java GraalVM Native Image C'
-      - javadoc
-      - library_generation
-      - unmanaged_dependency_check
-  - pattern: 2.29.x
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - 'Kokoro - Test: Java GraalVM Native Image A'
-      - 'Kokoro - Test: Java GraalVM Native Image B'
-      - 'Kokoro - Test: Java GraalVM Native Image C'
-      - javadoc
-      - library_generation
-      - unmanaged_dependency_check
-permissionRules:
-  - team: yoshi-admins
-    permission: admin
-  - team: yoshi-java-admins
-    permission: admin
-  - team: yoshi-java
-    permission: push
diff --git a/java-datastore/.github/trusted-contribution.yml b/java-datastore/.github/trusted-contribution.yml
deleted file mode 100644
index 88d3ac9bf1a7..000000000000
--- a/java-datastore/.github/trusted-contribution.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-trustedContributors:
-- renovate-bot
-- gcf-owl-bot[bot]
-
-annotations:
-- type: comment
-  text: "/gcbrun"
-- type: label
-  text: "kokoro:force-run"
diff --git a/java-datastore/.github/workflows/approve-readme.yaml b/java-datastore/.github/workflows/approve-readme.yaml
deleted file mode 100644
index 59f00b8eb6e6..000000000000
--- a/java-datastore/.github/workflows/approve-readme.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.
-# Github action job to test core java library features on
-# downstream client libraries before they are released.
-on:
-  pull_request:
-name: auto-merge-readme
-jobs:
-  approve:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
-    steps:
-      - uses: actions/github-script@v7
-        with:
-          github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
-          script: |
-            // only approve PRs from yoshi-automation
-            if (context.payload.pull_request.user.login !== "yoshi-automation") {
-              return;
-            }
-
-            // only approve PRs like "chore: release "
-            if (!context.payload.pull_request.title === "chore: regenerate README") {
-              return;
-            }
-
-            // only approve PRs with README.md and synth.metadata changes
-            const files = new Set(
-              (
-                await github.paginate(
-                  github.pulls.listFiles.endpoint({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    pull_number: context.payload.pull_request.number,
-                  })
-                )
-              ).map(file => file.filename)
-            );
-            if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) {
-              return;
-            }
-
-            // approve README regeneration PR
-            await github.pulls.createReview({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: 'Rubber stamped PR!',
-              pull_number: context.payload.pull_request.number,
-              event: 'APPROVE'
-            });
-
-            // attach automerge label
-            await github.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number,
-              labels: ['automerge']
-            });
diff --git a/java-datastore/.github/workflows/ci.yaml b/java-datastore/.github/workflows/ci.yaml
deleted file mode 100644
index 442c25800cc8..000000000000
--- a/java-datastore/.github/workflows/ci.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.
-# Github action job to test core java library features on
-# downstream client libraries before they are released.
-on:
-  push:
-    branches:
-    - main
-  pull_request:
-name: ci
-jobs:
-  units:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java: [11, 17, 21, 25]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
-  units-java8:
-    # Building using Java 17 and run the tests with Java 8 runtime
-    name: "units (8)"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          java-version: 8
-          distribution: temurin
-      - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
-        # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
-        # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
-        run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
-        shell: bash
-      - uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: temurin
-      - run: .kokoro/build.sh
-        env:
-          JOB_TYPE: test
-  windows:
-    # Building using Java 11 and run the tests with Java 8 runtime
-    runs-on: windows-latest
-    steps:
-    - name: Support longpaths
-      run: git config --system core.longpaths true
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        java-version: 8
-        distribution: temurin
-    - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
-      run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}\bin\java" >> $GITHUB_ENV
-      shell: bash
-    - uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 11
-    - run: java -version
-    - run: .kokoro/build.bat
-      env:
-        JOB_TYPE: test
-  dependencies:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [17]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/dependencies.sh
-  javadoc:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 17
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: javadoc
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 17
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: lint
-  clirr:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 8
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: clirr
diff --git a/java-datastore/.github/workflows/hermetic_library_generation.yaml b/java-datastore/.github/workflows/hermetic_library_generation.yaml
deleted file mode 100644
index 58f0df638e71..000000000000
--- a/java-datastore/.github/workflows/hermetic_library_generation.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2024 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.
-# GitHub action job to test core java library features on
-# downstream client libraries before they are released.
-name: Hermetic library generation upon generation config change through pull requests
-on:
-  pull_request:
-
-env:
-  REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
-  GITHUB_REPOSITORY: ${{ github.repository }}
-jobs:
-  library_generation:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Determine whether the pull request comes from a fork
-      run: |
-        if [[ "${GITHUB_REPOSITORY}" != "${REPO_FULL_NAME}" ]]; then
-          echo "This PR comes from a fork. Skip library generation."
-          echo "SHOULD_RUN=false" >> $GITHUB_ENV
-        else
-          echo "SHOULD_RUN=true" >> $GITHUB_ENV
-        fi
-    - uses: actions/checkout@v4
-      if: env.SHOULD_RUN == 'true'
-      with:
-        fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
-      if: env.SHOULD_RUN == 'true'
-      with:
-        base_ref: ${{ github.base_ref }}
-        head_ref: ${{ github.head_ref }}
-        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
diff --git a/java-datastore/.github/workflows/renovate_config_check.yaml b/java-datastore/.github/workflows/renovate_config_check.yaml
deleted file mode 100644
index 47b9e87c98bb..000000000000
--- a/java-datastore/.github/workflows/renovate_config_check.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Renovate Bot Config Validation
-
-on:
-  pull_request:
-    paths:
-      - 'renovate.json'
-
-jobs:
-  renovate_bot_config_validation:
-    runs-on: ubuntu-24.04
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '22'
-
-    - name: Install Renovate and Config Validator
-      run: |
-        npm install -g npm@latest
-        npm install --global renovate
-        renovate-config-validator
diff --git a/java-datastore/.github/workflows/samples.yaml b/java-datastore/.github/workflows/samples.yaml
deleted file mode 100644
index 186fd8bcfc51..000000000000
--- a/java-datastore/.github/workflows/samples.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.
-# Github action job to test core java library features on
-# downstream client libraries before they are released.
-on:
-  pull_request:
-name: samples
-jobs:
-  checkstyle:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-      - name: Run checkstyle
-        run: mvn -P lint --quiet --batch-mode checkstyle:check
-        working-directory: samples/snippets
diff --git a/java-datastore/.github/workflows/unmanaged_dependency_check.yaml b/java-datastore/.github/workflows/unmanaged_dependency_check.yaml
deleted file mode 100644
index f265cd541aaa..000000000000
--- a/java-datastore/.github/workflows/unmanaged_dependency_check.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-on:
-  pull_request:
-name: Unmanaged dependency check
-jobs:
-  unmanaged_dependency_check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 11
-    - name: Install modules
-      shell: bash
-      run: .kokoro/build.sh
-    - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
-      with:
-        bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/java-datastore/.github/workflows/update_generation_config.yaml b/java-datastore/.github/workflows/update_generation_config.yaml
deleted file mode 100644
index 8de9d67eae71..000000000000
--- a/java-datastore/.github/workflows/update_generation_config.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2024 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.
-# GitHub action job to test core java library features on
-# downstream client libraries before they are released.
-name: Update generation configuration
-on:
-  schedule:
-  - cron: '0 2 * * *'
-  workflow_dispatch:
-
-jobs:
-  update-generation-config:
-    runs-on: ubuntu-24.04
-    env:
-      # the branch into which the pull request is merged
-      base_branch: main
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
-    - name: Install Dependencies
-      shell: bash
-      run: sudo apt-get update && sudo apt-get install -y libxml2-utils
-    - name: Update params in generation config to latest
-      shell: bash
-      run: |
-        set -x
-        [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
-        [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
-        bash .github/scripts/update_generation_config.sh \
-          --base_branch "${base_branch}" \
-          --repo ${{ github.repository }}
-      env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
-
diff --git a/java-datastore/.gitignore b/java-datastore/.gitignore
deleted file mode 100644
index 241f8441762f..000000000000
--- a/java-datastore/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target/
-.idea/
-*.iml
-__pycache__/
-
-.flattened-pom.xml
diff --git a/java-datastore/.kokoro/build.bat b/java-datastore/.kokoro/build.bat
deleted file mode 100644
index 067cf4a4c489..000000000000
--- a/java-datastore/.kokoro/build.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-:: 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.
-:: Github action job to test core java library features on
-:: downstream client libraries before they are released.
-:: See documentation in type-shell-output.bat
-
-"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
diff --git a/java-datastore/.kokoro/build.sh b/java-datastore/.kokoro/build.sh
deleted file mode 100755
index f77424b4ffea..000000000000
--- a/java-datastore/.kokoro/build.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-# Copyright 2025 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
-#
-#     https://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.
-
-set -eo pipefail
-
-## Get the directory of the build script
-scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-## cd to the parent directory, i.e. the root of the git repo
-cd ${scriptDir}/..
-
-# include common functions
-source ${scriptDir}/common.sh
-
-# Print out Maven & Java version
-mvn -version
-echo ${JOB_TYPE}
-
-# attempt to install 3 times with exponential backoff (starting with 10 seconds)
-retry_with_backoff 3 10 \
-  mvn install -B -V -ntp \
-    -DskipTests=true \
-    -Dclirr.skip=true \
-    -Denforcer.skip=true \
-    -Dmaven.javadoc.skip=true \
-    -Dgcloud.download.skip=true \
-    -T 1C
-
-# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
-if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
-    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
-fi
-
-
-RETURN_CODE=0
-set +e
-
-case ${JOB_TYPE} in
-test)
-    echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
-    mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
-    RETURN_CODE=$?
-    ;;
-lint)
-    mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
-    RETURN_CODE=$?
-    ;;
-javadoc)
-    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
-    RETURN_CODE=$?
-    ;;
-integration)
-    # Kokoro integration tests use both JDK 11 and JDK 8. Integration
-    # tests require JDK 11 export as JAVA env variable to run cloud datastore
-    # emulator (https://cloud.google.com/sdk/docs/release-notes#39300_2022-07-12).
-    # For Java 8 environment, we will still run the tests using Java 8 with
-    # SUREFIRE_JVM_OPT for Maven surefire plugin:
-    # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
-    if [[ -n "${JAVA11_HOME}"  &&  -n "${JAVA8_HOME}" ]]
-    then
-      export JAVA=${JAVA11_HOME}/bin/java
-      export SUREFIRE_JVM_OPT=-Djvm=${JAVA8_HOME}/bin/java
-    fi
-
-    mvn -B ${INTEGRATION_TEST_ARGS} \
-      -ntp \
-      -Penable-integration-tests \
-      -DtrimStackTrace=false \
-      -Dclirr.skip=true \
-      -Denforcer.skip=true \
-      -Dcheckstyle.skip=true \
-      -DskipUnitTests=true \
-      -Dfmt.skip=true \
-      -fae \
-      verify
-    RETURN_CODE=$?
-    ;;
-graalvm)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
-    RETURN_CODE=$?
-    ;;
-samples)
-    SAMPLES_DIR=samples
-    # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
-    if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]]
-    then
-      SAMPLES_DIR=samples/snapshot
-    fi
-
-    if [[ -f ${SAMPLES_DIR}/pom.xml ]]
-    then
-        for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
-          [[ -f "$FILE" ]] || continue
-          source "$FILE"
-        done
-
-        pushd ${SAMPLES_DIR}
-        mvn -B \
-          -ntp \
-          -DtrimStackTrace=false \
-          -Dclirr.skip=true \
-          -Denforcer.skip=true \
-		  -Dfmt.skip=true \
-          -fae \
-          verify
-        RETURN_CODE=$?
-        popd
-    else
-        echo "no sample pom.xml found - skipping sample tests"
-    fi
-    ;;
-clirr)
-    mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
-    RETURN_CODE=$?
-    ;;
-*)
-    ;;
-esac
-
-if [ "${REPORT_COVERAGE}" == "true" ]
-then
-  bash ${KOKORO_GFILE_DIR}/codecov.sh
-fi
-
-# fix output location of logs
-bash .kokoro/coerce_logs.sh
-
-if [[ "${ENABLE_FLAKYBOT}" == "true" ]]
-then
-    chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
-    ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-datastore
-fi
-
-echo "exiting with ${RETURN_CODE}"
-exit ${RETURN_CODE}
diff --git a/java-datastore/.kokoro/coerce_logs.sh b/java-datastore/.kokoro/coerce_logs.sh
deleted file mode 100755
index 46edbf7f2fcd..000000000000
--- a/java-datastore/.kokoro/coerce_logs.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# Copyright 2019 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.
-
-# This script finds and moves sponge logs so that they can be found by placer
-# and are not flagged as flaky by sponge.
-
-set -eo pipefail
-
-## Get the directory of the build script
-scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-## cd to the parent directory, i.e. the root of the git repo
-cd ${scriptDir}/..
-
-job=$(basename ${KOKORO_JOB_NAME})
-
-echo "coercing sponge logs..."
-for xml in `find . -name *-sponge_log.xml`
-do
-  class=$(basename ${xml} | cut -d- -f2)
-  dir=$(dirname ${xml})/${job}/${class}
-  text=$(dirname ${xml})/${class}-sponge_log.txt
-  mkdir -p ${dir}
-  mv ${xml} ${dir}/sponge_log.xml
-  mv ${text} ${dir}/sponge_log.txt
-done
diff --git a/java-datastore/.kokoro/common.cfg b/java-datastore/.kokoro/common.cfg
deleted file mode 100644
index 6be8cb555662..000000000000
--- a/java-datastore/.kokoro/common.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# All builds use the trampoline script to run in docker.
-build_file: "java-datastore/.kokoro/trampoline.sh"
-
-# Tell the trampoline which build file to use.
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/build.sh"
-}
diff --git a/java-datastore/.kokoro/common.sh b/java-datastore/.kokoro/common.sh
deleted file mode 100644
index aeb3568bbaa0..000000000000
--- a/java-datastore/.kokoro/common.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# Copyright 2020 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.
-
-function retry_with_backoff {
-    attempts_left=$1
-    sleep_seconds=$2
-    shift 2
-    command=$@
-
-
-    # store current flag state
-    flags=$-
-    
-    # allow a failures to continue
-    set +e
-    ${command}
-    exit_code=$?
-
-    # restore "e" flag
-    if [[ ${flags} =~ e ]]
-    then set -e
-    else set +e
-    fi
-
-    if [[ $exit_code == 0 ]]
-    then
-        return 0
-    fi
-
-    # failure
-    if [[ ${attempts_left} > 0 ]]
-    then
-        echo "failure (${exit_code}), sleeping ${sleep_seconds}..."
-        sleep ${sleep_seconds}
-        new_attempts=$((${attempts_left} - 1))
-        new_sleep=$((${sleep_seconds} * 2))
-        retry_with_backoff ${new_attempts} ${new_sleep} ${command}
-    fi
-
-    return $exit_code
-}
-
-## Helper functions
-function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
-function msg() { println "$*" >&2; }
-function println() { printf '%s\n' "$(now) $*"; }
-
-## Helper comment to trigger updated repo dependency release
\ No newline at end of file
diff --git a/java-datastore/.kokoro/continuous/common.cfg b/java-datastore/.kokoro/continuous/common.cfg
deleted file mode 100644
index 937eb5bf2738..000000000000
--- a/java-datastore/.kokoro/continuous/common.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-    regex: "**/*sponge_log.txt"
-  }
-}
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# Use the trampoline script to run in docker.
-build_file: "java-datastore/.kokoro/trampoline.sh"
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/build.sh"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "test"
-}
diff --git a/java-datastore/.kokoro/continuous/java8.cfg b/java-datastore/.kokoro/continuous/java8.cfg
deleted file mode 100644
index 495cc7bacd63..000000000000
--- a/java-datastore/.kokoro/continuous/java8.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "REPORT_COVERAGE"
-  value: "true"
-}
diff --git a/java-datastore/.kokoro/continuous/propose_release.sh b/java-datastore/.kokoro/continuous/propose_release.sh
deleted file mode 100755
index c1c2c4ae41b8..000000000000
--- a/java-datastore/.kokoro/continuous/propose_release.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 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
-#
-#     https://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.
-
-set -eo pipefail
-
-export NPM_CONFIG_PREFIX=/home/node/.npm-global
-
-if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
-  # Groom the release PR as new commits are merged.
-  npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
-    --repo-url=googleapis/java-datastore \
-    --package-name="datastore" \
-    --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
-    --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
-    --release-type=java-yoshi
-fi
diff --git a/java-datastore/.kokoro/dependencies.sh b/java-datastore/.kokoro/dependencies.sh
deleted file mode 100755
index bd8960246f66..000000000000
--- a/java-datastore/.kokoro/dependencies.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-# Copyright 2019 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.
-
-set -eo pipefail
-shopt -s nullglob
-
-## Get the directory of the build script
-scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-## cd to the parent directory, i.e. the root of the git repo
-cd ${scriptDir}/..
-
-# include common functions
-source ${scriptDir}/common.sh
-
-# Print out Java
-java -version
-echo $JOB_TYPE
-
-function determineMavenOpts() {
-  local javaVersion=$(
-    # filter down to the version line, then pull out the version between quotes,
-    # then trim the version number down to its minimal number (removing any
-    # update or suffix number).
-    java -version 2>&1 | grep "version" \
-      | sed -E 's/^.*"(.*?)".*$/\1/g' \
-      | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
-  )
-
-  if [[ $javaVersion == 17* ]]
-    then
-      # MaxPermSize is no longer supported as of jdk 17
-      echo -n "-Xmx1024m"
-  else
-      echo -n "-Xmx1024m -XX:MaxPermSize=128m"
-  fi
-}
-
-export MAVEN_OPTS=$(determineMavenOpts)
-
-# this should run maven enforcer
-retry_with_backoff 3 10 \
-  mvn install -B -V -ntp \
-    -DskipTests=true \
-    -Dmaven.javadoc.skip=true \
-    -Dclirr.skip=true
-
-mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/java-datastore/.kokoro/nightly/common.cfg b/java-datastore/.kokoro/nightly/common.cfg
deleted file mode 100644
index 937eb5bf2738..000000000000
--- a/java-datastore/.kokoro/nightly/common.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-    regex: "**/*sponge_log.txt"
-  }
-}
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# Use the trampoline script to run in docker.
-build_file: "java-datastore/.kokoro/trampoline.sh"
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/build.sh"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "test"
-}
diff --git a/java-datastore/.kokoro/nightly/integration.cfg b/java-datastore/.kokoro/nightly/integration.cfg
deleted file mode 100644
index 418983013dbe..000000000000
--- a/java-datastore/.kokoro/nightly/integration.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "integration"
-}
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "java-docs-samples-testing"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "java-docs-samples-testing"
-}
-
-env_vars: {
-  key: "DATASTORE_PROJECT_ID"
-  value: "java-docs-samples-testing"
-}
-
-env_vars: {
-  key: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
diff --git a/java-datastore/.kokoro/nightly/java11-integration.cfg b/java-datastore/.kokoro/nightly/java11-integration.cfg
deleted file mode 100644
index 5929bb204e3b..000000000000
--- a/java-datastore/.kokoro/nightly/java11-integration.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/java11014"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "integration"
-}
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "DATASTORE_PROJECT_ID"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
diff --git a/java-datastore/.kokoro/nightly/java11.cfg b/java-datastore/.kokoro/nightly/java11.cfg
deleted file mode 100644
index 709f2b4c73db..000000000000
--- a/java-datastore/.kokoro/nightly/java11.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
-}
diff --git a/java-datastore/.kokoro/nightly/java7.cfg b/java-datastore/.kokoro/nightly/java7.cfg
deleted file mode 100644
index cb24f44eea3b..000000000000
--- a/java-datastore/.kokoro/nightly/java7.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
-}
diff --git a/java-datastore/.kokoro/nightly/java8-osx.cfg b/java-datastore/.kokoro/nightly/java8-osx.cfg
deleted file mode 100644
index 3ba7de0b1e16..000000000000
--- a/java-datastore/.kokoro/nightly/java8-osx.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "java-datastore/.kokoro/build.sh"
diff --git a/java-datastore/.kokoro/nightly/java8-win.cfg b/java-datastore/.kokoro/nightly/java8-win.cfg
deleted file mode 100644
index 85494f810009..000000000000
--- a/java-datastore/.kokoro/nightly/java8-win.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "java-datastore/.kokoro/build.bat"
diff --git a/java-datastore/.kokoro/nightly/java8.cfg b/java-datastore/.kokoro/nightly/java8.cfg
deleted file mode 100644
index 495cc7bacd63..000000000000
--- a/java-datastore/.kokoro/nightly/java8.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "REPORT_COVERAGE"
-  value: "true"
-}
diff --git a/java-datastore/.kokoro/nightly/samples.cfg b/java-datastore/.kokoro/nightly/samples.cfg
deleted file mode 100644
index 9761fd8648cb..000000000000
--- a/java-datastore/.kokoro/nightly/samples.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "samples"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "java-docs-samples-testing"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "java-docs-samples-testing"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-docs-samples-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-docs-samples-service-account"
-}
-
-env_vars: {
-  key: "ENABLE_FLAKYBOT"
-  value: "true"
-}
diff --git a/java-datastore/.kokoro/populate-secrets.sh b/java-datastore/.kokoro/populate-secrets.sh
deleted file mode 100755
index f52514257ef0..000000000000
--- a/java-datastore/.kokoro/populate-secrets.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# Copyright 2020 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.
-
-set -eo pipefail
-
-function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;}
-function msg { println "$*" >&2 ;}
-function println { printf '%s\n' "$(now) $*" ;}
-
-
-# Populates requested secrets set in SECRET_MANAGER_KEYS from service account:
-# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com
-SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
-msg "Creating folder on disk for secrets: ${SECRET_LOCATION}"
-mkdir -p ${SECRET_LOCATION}
-for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
-do
-  msg "Retrieving secret ${key}"
-  docker run --entrypoint=gcloud \
-    --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
-    gcr.io/google.com/cloudsdktool/cloud-sdk \
-    secrets versions access latest \
-    --project cloud-devrel-kokoro-resources \
-    --secret ${key} > \
-    "${SECRET_LOCATION}/${key}"
-  if [[ $? == 0 ]]; then
-    msg "Secret written to ${SECRET_LOCATION}/${key}"
-  else
-    msg "Error retrieving secret ${key}"
-  fi
-done
diff --git a/java-datastore/.kokoro/presubmit/clirr.cfg b/java-datastore/.kokoro/presubmit/clirr.cfg
deleted file mode 100644
index ec572442e2e7..000000000000
--- a/java-datastore/.kokoro/presubmit/clirr.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "clirr"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/presubmit/common.cfg b/java-datastore/.kokoro/presubmit/common.cfg
deleted file mode 100644
index 9cd0764c3c93..000000000000
--- a/java-datastore/.kokoro/presubmit/common.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-    regex: "**/*sponge_log.txt"
-  }
-}
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# Use the trampoline script to run in docker.
-build_file: "java-datastore/.kokoro/trampoline.sh"
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/build.sh"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "test"
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "dpebot_codecov_token"
-    }
-  }
-}
diff --git a/java-datastore/.kokoro/presubmit/dependencies.cfg b/java-datastore/.kokoro/presubmit/dependencies.cfg
deleted file mode 100644
index 8908efe02d46..000000000000
--- a/java-datastore/.kokoro/presubmit/dependencies.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/dependencies.sh"
-}
diff --git a/java-datastore/.kokoro/presubmit/graalvm-native-a.cfg b/java-datastore/.kokoro/presubmit/graalvm-native-a.cfg
deleted file mode 100644
index 623fedf2040a..000000000000
--- a/java-datastore/.kokoro/presubmit/graalvm-native-a.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.1" # {x-version-update:google-cloud-shared-dependencies:current}
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "graalvm"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
-
-env_vars: {
-  key: "IT_SERVICE_ACCOUNT_EMAIL"
-  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/presubmit/graalvm-native-b.cfg b/java-datastore/.kokoro/presubmit/graalvm-native-b.cfg
deleted file mode 100644
index bee69fa91d3e..000000000000
--- a/java-datastore/.kokoro/presubmit/graalvm-native-b.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.1" # {x-version-update:google-cloud-shared-dependencies:current}
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "graalvm"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
-
-env_vars: {
-  key: "IT_SERVICE_ACCOUNT_EMAIL"
-  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/presubmit/graalvm-native-c.cfg b/java-datastore/.kokoro/presubmit/graalvm-native-c.cfg
deleted file mode 100644
index b742f6ec44c7..000000000000
--- a/java-datastore/.kokoro/presubmit/graalvm-native-c.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.1" # {x-version-update:google-cloud-shared-dependencies:current}
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "graalvm"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
-
-env_vars: {
-  key: "IT_SERVICE_ACCOUNT_EMAIL"
-  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/presubmit/integration.cfg b/java-datastore/.kokoro/presubmit/integration.cfg
deleted file mode 100644
index 71431d938ab3..000000000000
--- a/java-datastore/.kokoro/presubmit/integration.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "integration"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  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"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/presubmit/java11.cfg b/java-datastore/.kokoro/presubmit/java11.cfg
deleted file mode 100644
index 709f2b4c73db..000000000000
--- a/java-datastore/.kokoro/presubmit/java11.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
-}
diff --git a/java-datastore/.kokoro/presubmit/java7.cfg b/java-datastore/.kokoro/presubmit/java7.cfg
deleted file mode 100644
index cb24f44eea3b..000000000000
--- a/java-datastore/.kokoro/presubmit/java7.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
-}
diff --git a/java-datastore/.kokoro/presubmit/java8-osx.cfg b/java-datastore/.kokoro/presubmit/java8-osx.cfg
deleted file mode 100644
index 3ba7de0b1e16..000000000000
--- a/java-datastore/.kokoro/presubmit/java8-osx.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "java-datastore/.kokoro/build.sh"
diff --git a/java-datastore/.kokoro/presubmit/java8-win.cfg b/java-datastore/.kokoro/presubmit/java8-win.cfg
deleted file mode 100644
index 85494f810009..000000000000
--- a/java-datastore/.kokoro/presubmit/java8-win.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "java-datastore/.kokoro/build.bat"
diff --git a/java-datastore/.kokoro/presubmit/java8.cfg b/java-datastore/.kokoro/presubmit/java8.cfg
deleted file mode 100644
index 495cc7bacd63..000000000000
--- a/java-datastore/.kokoro/presubmit/java8.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "REPORT_COVERAGE"
-  value: "true"
-}
diff --git a/java-datastore/.kokoro/presubmit/linkage-monitor.cfg b/java-datastore/.kokoro/presubmit/linkage-monitor.cfg
deleted file mode 100644
index 505dbd1a9548..000000000000
--- a/java-datastore/.kokoro/presubmit/linkage-monitor.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "TRAMPOLINE_BUILD_FILE"
-  value: "github/java-datastore/.kokoro/linkage-monitor.sh"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/presubmit/lint.cfg b/java-datastore/.kokoro/presubmit/lint.cfg
deleted file mode 100644
index 6d323c8ae768..000000000000
--- a/java-datastore/.kokoro/presubmit/lint.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "lint"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/presubmit/samples.cfg b/java-datastore/.kokoro/presubmit/samples.cfg
deleted file mode 100644
index 01e0960047b8..000000000000
--- a/java-datastore/.kokoro/presubmit/samples.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "samples"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "java-docs-samples-testing"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "java-docs-samples-testing"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-docs-samples-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-docs-samples-service-account"
-}
\ No newline at end of file
diff --git a/java-datastore/.kokoro/readme.sh b/java-datastore/.kokoro/readme.sh
deleted file mode 100755
index 982fd48ee4c4..000000000000
--- a/java-datastore/.kokoro/readme.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# Copyright 2020 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.
-
-set -eo pipefail
-
-cd ${KOKORO_ARTIFACTS_DIR}/github/java-datastore
-
-# Disable buffering, so that the logs stream through.
-export PYTHONUNBUFFERED=1
-
-# Kokoro exposes this as a file, but the scripts expect just a plain variable.
-export GITHUB_TOKEN=$(cat ${KOKORO_KEYSTORE_DIR}/73713_yoshi-automation-github-key)
-
-# Setup git credentials
-echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials
-git config --global credential.helper 'store --file ~/.git-credentials'
-
-python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool
-
-set +e
-python3.6 -m autosynth.synth \
-    --repository=googleapis/java-datastore \
-    --synth-file-name=.github/readme/synth.py \
-    --metadata-path=.github/readme/synth.metadata \
-    --pr-title="chore: regenerate README" \
-    --branch-suffix="readme"
-
-# autosynth returns 28 to signal there are no changes
-RETURN_CODE=$?
-if [[ ${RETURN_CODE} -ne 0 && ${RETURN_CODE} -ne 28 ]]
-then
-    exit ${RETURN_CODE}
-fi
diff --git a/java-datastore/.kokoro/trampoline.sh b/java-datastore/.kokoro/trampoline.sh
deleted file mode 100644
index 8b69b793c9ec..000000000000
--- a/java-datastore/.kokoro/trampoline.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# Copyright 2018 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.
-set -eo pipefail
-# Always run the cleanup script, regardless of the success of bouncing into
-# the container.
-function cleanup() {
-    chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
-    ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
-    echo "cleanup";
-}
-trap cleanup EXIT
-
-$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
-python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
diff --git a/java-datastore/CODE_OF_CONDUCT.md b/java-datastore/CODE_OF_CONDUCT.md
deleted file mode 100644
index 2add2547a812..000000000000
--- a/java-datastore/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,94 +0,0 @@
-
-# Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of
-experience, education, socio-economic status, nationality, personal appearance,
-race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-*   Using welcoming and inclusive language
-*   Being respectful of differing viewpoints and experiences
-*   Gracefully accepting constructive criticism
-*   Focusing on what is best for the community
-*   Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-*   The use of sexualized language or imagery and unwelcome sexual attention or
-    advances
-*   Trolling, insulting/derogatory comments, and personal or political attacks
-*   Public or private harassment
-*   Publishing others' private information, such as a physical or electronic
-    address, without explicit permission
-*   Other conduct which could reasonably be considered inappropriate in a
-    professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, or to ban temporarily or permanently any
-contributor for other behaviors that they deem inappropriate, threatening,
-offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-This Code of Conduct also applies outside the project spaces when the Project
-Steward has a reasonable belief that an individual's behavior may have a
-negative impact on the project or its community.
-
-## Conflict Resolution
-
-We do not believe that all conflict is bad; healthy debate and disagreement
-often yield positive results. However, it is never okay to be disrespectful or
-to engage in behavior that violates the project’s code of conduct.
-
-If you see someone violating the code of conduct, you are encouraged to address
-the behavior directly with those involved. Many issues can be resolved quickly
-and easily, and this gives people more control over the outcome of their
-dispute. If you are unable to resolve the matter for any reason, or if the
-behavior is threatening or harassing, report it. We are dedicated to providing
-an environment where participants feel welcome and safe.
-
-Reports should be directed to *googleapis-stewards@google.com*, the
-Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to
-receive and address reported violations of the code of conduct. They will then
-work with a committee consisting of representatives from the Open Source
-Programs Office and the Google Open Source Strategy team. If for any reason you
-are uncomfortable reaching out to the Project Steward, please email
-opensource@google.com.
-
-We will investigate every complaint, but you may not receive a direct response.
-We will use our discretion in determining when and how to follow up on reported
-incidents, which may range from not taking action to permanent expulsion from
-the project and project-sponsored spaces. We will notify the accused of the
-report and provide them an opportunity to discuss it before any action is taken.
-The identity of the reporter will be omitted from the details of the report
-supplied to the accused. In potentially harmful situations, such as ongoing
-harassment or threats to anyone's safety, we may take action without notice.
-
-## Attribution
-
-This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
-available at
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
\ No newline at end of file
diff --git a/java-datastore/CONTRIBUTING.md b/java-datastore/CONTRIBUTING.md
deleted file mode 100644
index ff092b68e3fc..000000000000
--- a/java-datastore/CONTRIBUTING.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# How to Contribute
-
-We'd love to accept your patches and contributions to this project. There are
-just a few small guidelines you need to follow.
-
-## Contributor License Agreement
-
-Contributions to this project must be accompanied by a Contributor License
-Agreement. You (or your employer) retain the copyright to your contribution;
-this simply gives us permission to use and redistribute your contributions as
-part of the project. Head over to  to see
-your current agreements on file or to sign a new one.
-
-You generally only need to submit a CLA once, so if you've already submitted one
-(even if it was for a different project), you probably don't need to do it
-again.
-
-## Code reviews
-
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose. Consult
-[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
-
-## Community Guidelines
-
-This project follows
-[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
-
-## Building the project
-
-To build, package, and run all unit tests run the command
-
-```
-mvn clean verify
-```
-
-### Running Integration tests
-
-To include integration tests when building the project, you need access to
-a GCP Project with a valid service account. 
-
-For instructions on how to generate a service account and corresponding
-credentials JSON see: [Creating a Service Account][1].
-
-Then run the following to build, package, run all unit tests and run all
-integration tests.
-
-```bash
-export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
-mvn -Penable-integration-tests clean verify
-```
-
-## Code Samples
-
-All code samples must be in compliance with the [java sample formatting guide][3].
-Code Samples must be bundled in separate Maven modules.
-
-The samples must be separate from the primary project for a few reasons:
-1. Primary projects have a minimum Java version of Java 8 whereas samples can have
-   Java version of Java 11. Due to this we need the ability to
-   selectively exclude samples from a build run.
-2. Many code samples depend on external GCP services and need
-   credentials to access the service.
-3. Code samples are not released as Maven artifacts and must be excluded from 
-   release builds.
-   
-### Building
-
-```bash
-mvn clean verify
-```
-
-Some samples require access to GCP services and require a service account:
-
-```bash
-export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
-mvn clean verify
-```
-
-### Code Formatting
-
-Code in this repo is formatted with
-[google-java-format](https://github.com/google/google-java-format).
-To run formatting on your project, you can run:
-```
-mvn com.spotify.fmt:fmt-maven-plugin:format
-```
-
-[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account
-[2]: https://maven.apache.org/settings.html#Active_Profiles
-[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md
\ No newline at end of file
diff --git a/java-datastore/LICENSE b/java-datastore/LICENSE
deleted file mode 100644
index 261eeb9e9f8b..000000000000
--- a/java-datastore/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/java-datastore/SECURITY.md b/java-datastore/SECURITY.md
deleted file mode 100644
index 8b58ae9c01ae..000000000000
--- a/java-datastore/SECURITY.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Security Policy
-
-To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
-
-The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
-
-We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.
diff --git a/java-datastore/codecov.yaml b/java-datastore/codecov.yaml
deleted file mode 100644
index 5724ea9478d7..000000000000
--- a/java-datastore/codecov.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-codecov:
-  ci:
-    - source.cloud.google.com
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
index e8cc4163a9fe..fc525bd4f28e 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/ChecksumEnforcingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java
index 6b886aef0fa3..4a980baa344e 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
index dcca102a1679..e4720c2e8eb4 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java
index 69c0bc9e0fe4..fb84ea1fe015 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java
index 7a5de0a5e317..901edcdaabb8 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java
index ee73d56f4f90..04b90cc23e5c 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulatorOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
index b283603fbfe2..08a085a48a68 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
index f5e56d2cc388..c7e7ceff87a5 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java
index 2396730616ce..de364a307c36 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
index 9a7045809de8..780a3c940184 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
index 339fe4878d78..507625a47cc7 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
index 97268d38de76..e704f4c932ad 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java
index 8952111ec592..3eac40fa111c 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java
index b0b47c5056b9..75fc84d62e28 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java
index 7579f58b3bea..7831d2a03f6d 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java
index 6942a5d79a2b..bbe8468258a9 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/testing/MockDatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
index dbe0e766ae10..74ab41de0d5f 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/ChecksumEnforcingInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
index 16a6303bb2d7..b2fe1ee90afa 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java
index f195e61c475a..d03cfa867fab 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreEmulatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
index 02bb44a52c58..bc28342c092f 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
index 20325a4f0598..d9f5979c317d 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
index 1fdc1906a1de..09176678e18a 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/EndToEndChecksumHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java
index 0802a62aa80d..027029a768af 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java
index 28e3f20b8a45..4fad87d26a85 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java
index 3e6cf025e7f3..c6df61ce762d 100644
--- a/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java
+++ b/java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java
index d66e9ce606b4..92e2e0a6d00f 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java
index 67dbc1f9a11a..20913b5e12e5 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java
index 2befe276ec02..cdd1698d5c28 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java
index a937dffad804..0001cfb09dff 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java
index f6e91a41a5ae..2c8d5e48004a 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java
index 31d1fd7d542f..beb20a05babd 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java
index ac2a6557e515..f139b7c1fc8c 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java
index 492936e15f2b..4d92ef6bce1b 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java
index d5d16bb65881..0f2f165e08db 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java
index d4dd5caefd13..13a4539c600b 100644
--- a/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java
+++ b/java-datastore/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java
index 31b0f6440e86..c46bb1b2203e 100644
--- a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java
+++ b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java
index 2a3d5a38fcb4..51446f981a9f 100644
--- a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java
+++ b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java
index 2462024441a2..db0949800f2d 100644
--- a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java
+++ b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java
index cad9502ae1af..d173576ae6a2 100644
--- a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java
+++ b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java
index ae4d7a23e3ef..09e750d0712a 100644
--- a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java
+++ b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java
index d30c1cbdc598..ae983cb9557e 100644
--- a/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java
+++ b/java-datastore/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
index f657d4aaeae7..d54b40f1283b 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
index 1fdfa5bdae27..aa9f1ad8bdc1 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
index 8e40ab8b765c..8d722ea86794 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java
index 83e4c49d8a09..a513d806bcb2 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
index 608dc7187610..5bc9229e52ac 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
index 5547979d9f6c..3658c3f71172 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
index bb162af33f59..9cd2ef10bcc3 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
index f1647cac7cf7..605d8b18e57e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
index edcbc92154e8..e2127c3a1de7 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java
index e9fb2591ff6e..05c61667ec6e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java
index 69ee1dff963d..09f23e9bbcfe 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java
index 959eddef38e3..f67e1c264da0 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
index 0e769a109372..fd1174fe874b 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
index 28d2569b6a89..38ff7b6d04ae 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
index 44bde2c107ff..0b46b4b07790 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
index 54274e7bb972..b29786f95c43 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
index 33e90a66e802..bc7e399f2500 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
index c64474fa8296..22f20d68c3b2 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java
index ac266562e0ba..847e36c83d19 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
index 242ce3b01776..942f3d08aa54 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
index c3137a9a7ce6..e1121073ebbd 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
index bc8700c70917..287e040294e9 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java
index e991fd51d02b..bac611ed4b25 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
index b414995e6923..97a75470eb5a 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
index b746e848cf3d..230b29d176ce 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
index 9d3a0c84510e..5cc3096f7927 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
index d20ee07415c9..1a39074868f6 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
index 757ffdd10c01..2ebb5cffc2a3 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
index ee342073afab..0fbe1e644964 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index de86a24a5fb5..969216eafba4 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java
index 5269740f7e2a..2b362e913151 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQueryProtoPreparer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java
index 1d63fb19a22e..1b6f85651e23 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
index 71e31b94d0fe..c795bf623311 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
index 14fe264bba07..a15ed89ce565 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
index 628a32353655..f9ba5706a3a1 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
index 46974acde899..591dfd47240b 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
index 64c411f4193a..5a30bd9204d6 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
index 9b969dd81821..3b5f476e4b2e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
index f655f5857823..2500bd2aac2c 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
index f4402b1156bd..2c9e8ee32460 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
index 3c633537bd21..11911a11a907 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
index eaa9094443aa..2e5c18404889 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
index d9d61342d570..80fc70085857 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
index 0b44eb37ea50..bb8d4889b869 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
index 092d9fd5d835..b2f626160322 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
index 883051972d93..b078015b6b89 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
index ca5b240adc2c..efd03c67ba1f 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
index ad51129891b5..138bc3d3c9d5 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
index a0c33776b1bc..d74e4794639b 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index f7d6d82c76a2..0d3fd6c77aec 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java
index 15713b02fe0f..d6b667c83a6c 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOptionProtoPreparer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java
index 9dc9664578da..f54213ab7587 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RecordQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
index 630ddd225ce2..b8a179783733 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
index 3bc423f250c5..d457d6f735fa 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 5bde80ed60a7..f1e8479cde57 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java
index fda6f8f4acb5..42c0b757e51b 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQueryProtoPreparer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
index 12f3eadcc073..46386dd601f8 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
index 697e7a6ffa66..3d783e53a528 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
index e39f15947c49..a291dfd4f48c 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
index e730db81f3e8..a5bd1f419281 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java
index 0556555d00c7..0d73738e79a4 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionOperationExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
index f1c19d155166..881fb09e752a 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
index 4bd0a5133163..40cb52d5947e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
index 315728147497..2c5f0cabcb93 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java
index ae1371973063..ecfab4bf127e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
index 13e3c7af6ace..66ce37d1c218 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
index 4baf9e9dcdab..a347cdf3db72 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
index 632f44393684..39e0dd22fa5b 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java
index 31bd28ffa812..0e2f60d84987 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AvgAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
index af2f23788291..e4bd1464681a 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java
index 2e1dcd3d55e3..36c6f83563d8 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/SumAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
index bedcf34e4da1..698e6095d3ea 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
index 60c75e0f8f53..c6fe1b64ad6e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/QueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
index a89ebb11a18c..9d8120314ec8 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java
index 2701699651c2..946c9072457a 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/ProtoPreparer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
index 71f7453cb884..cc04a49e3b96 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java
index b17da3f79992..d1f498d8d5b6 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/response/ResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
index 6738d84e3941..d8faaa611d18 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java
index 75fd94d6178d..a4a889ca33fa 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java
index f339a8510e26..065d79c67fa4 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExplainOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java
index ea9e87bd9247..620b7c3f164d 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/PlanSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
index 735b8c35ace1..f95d41fad8dc 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
index acb85a61db85..ca837030975e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
index f13e3873b356..4f1090bd4be1 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
index f9e3a34f3edc..ce79ac346bc8 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
index ac39ad5ba929..493064526d7c 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java
index dee8d692027b..5649a42120f9 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
index ebb6305159b6..259048e8e059 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
index 711e94020548..5d0fb8c7c927 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
index fd616a733c49..7fcd935775b1 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
index 9f5555d0f8be..e2ec33f68615 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
index 86a13fefff69..5a1ddef2f7e8 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java
index 9d4ecac57a00..96bb1365e86b 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
index fd037808c9e5..830c5832994e 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
index 84341f9d4e26..8728cfab0b02 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
index 6c8d7c057b0b..b5e2fe2e96ce 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
index 1b5380ab9bcf..7f5836e0e984 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
index 08b65bdc7544..332017945096 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
index 391f6f7654d8..5c6b1dedf7ab 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
index 7bad94293c34..3cb193ffbd51 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
index 579c1774878f..bf85f74b21c0 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
index 4a3c3542d8ad..26d634323f1a 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
index 8c52b55191df..b83809536cee 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
index 010a892ae3b5..2d72339be6d5 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
index 0c25c3b6c58e..fd9b71f93be1 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java
index cb242f2af84a..4d0f4fb5a0ca 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java
index a73cae8e4e5d..346b722cd496 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java
index 74d7e9d288f4..3a4f7b80ccd8 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
index 257d5e829612..b686106f7a46 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
index 64517de66c79..588b27520db1 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
index 7a060ed804be..b582937ca611 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
index 5bad1e30d964..cd1c9ad4c328 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java
index 0d2e0ede7c6d..06088cde6db6 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GqlQueryProtoPreparerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java
index 3f297989fb3c..327a0436ae30 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
index 75549e5ea112..3d9ec96e7e98 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
index 37017c28e84e..6afbf8ec1c9f 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
index cb3d13fdbf15..3f2fbe0e0b2b 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
index e589f7d314f4..a35a15262b77 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
index 9363fc15a12e..7c4c0a6e6dae 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
index 6ae6b5c2caac..04874dc0c7db 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
index 44ea74a648df..ecbb6f34b9c8 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
index 9f355fd024af..92b3dd9e2abb 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
index 3bd5002196bb..1978dd5ad5e6 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
index efeb8efa773b..8832013d23c2 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
index 14a73564462f..1172b1106ad5 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
index 8e2ba890ab60..6b44d7a08dd5 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProtoTestData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
index 8d10a9f9f71d..249ef74ec76c 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
index b16fdf100746..bd7f7ee437e1 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ReadOptionProtoPreparerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
index 1b8186a5482c..52baa7d80bf2 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
index 88aa841d36a2..d97c5ef9ae57 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java
index 60937fc28cda..52ec9226baa5 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryProtoPreparerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
index c593375868d3..adfb6b8784aa 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java
index 3a3fcfaea721..c90d6ce22a9d 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
index 10dbaf8c782d..ce5b9f0ac44f 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
index d531456e0651..e08ede692e7d 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
index 8d53dc736e82..72e193a7dc55 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java
index ac785c8b3adb..f00652137fc7 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/AvgAggregationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java
index a8b3bc945c50..9fbe94a860db 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/CountAggregationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java
index e4f637af05c0..53f550bdeb74 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/aggregation/SumAggregationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
index 46752ba898f9..2ab8b790aa4a 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/AggregationQueryExecutorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
index 4aec8f7bba43..8a6cc16e3b9b 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
index 9263543dbb4e..156a46a73c7f 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/response/AggregationQueryResponseTransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java
index 53a858cae91a..6fe624e562dc 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
index 1d6b2f8382d4..097c0c90d326 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java
index 7bb809997db4..5002c5973e71 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java
index 3546bfcaf625..f343dabc2ce6 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
index d0631f51acd9..a61bb54358c1 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
index aefb51352be2..a09c8998a629 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
index ce9a226a6901..5d55d26facaa 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java
index bb6a3c2f5593..8fc7350bec23 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRuleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
index f2209be9cbb0..3d8392017a27 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
index a0e778cee74b..aca4d12adcf8 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java
index f8fb86abfc17..e4f7a3f48f09 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExplainOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java
index fe8c0f0d6467..aaa0804eb97f 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/PlanSummaryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java
index f813482577f1..901876a34e51 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java
index c80ef9353fd5..c867ad583ec2 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
index f076c0966947..101ddf610bc7 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java
index f1cce800689e..788bdd72f689 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
index 3b07254d72e8..c7ba16a29ef1 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
index 412af667a7cb..1fc06d429954 100644
--- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
+++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/java.header b/java-datastore/java.header
deleted file mode 100644
index d0970ba7d375..000000000000
--- a/java-datastore/java.header
+++ /dev/null
@@ -1,15 +0,0 @@
-^/\*$
-^ \* Copyright \d\d\d\d,? Google (Inc\.|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$
-^ \*$
-^ \*[ ]+https?://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\.$
-^ \*/$
diff --git a/java-datastore/license-checks.xml b/java-datastore/license-checks.xml
deleted file mode 100644
index 6597fced808e..000000000000
--- a/java-datastore/license-checks.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-  
-    
-    
-  
-
diff --git a/java-datastore/renovate.json b/java-datastore/renovate.json
deleted file mode 100644
index abd5ab3ab2b5..000000000000
--- a/java-datastore/renovate.json
+++ /dev/null
@@ -1,98 +0,0 @@
-
-{
-
-  "extends": [
-    ":separateMajorReleases",
-    ":combinePatchMinorReleases",
-    ":ignoreUnstable",
-    ":prImmediately",
-    ":updateNotScheduled",
-    ":automergeDisabled",
-    ":ignoreModulesAndTests",
-    ":maintainLockFilesDisabled",
-    ":autodetectPinVersions"
-  ],
-  "ignorePaths": [
-    ".kokoro/requirements.txt",
-    ".github/workflows/approve-readme.yaml",
-    ".github/workflows/ci.yaml",
-    ".github/workflows/renovate_config_check.yaml",
-    ".github/workflows/samples.yaml"
-  ],
-  "customManagers": [
-    {
-      "customType": "regex",
-      "fileMatch": [
-        "^.github/workflows/unmanaged_dependency_check.yaml$"
-      ],
-      "matchStrings": [
-        "uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"
-      ],
-      "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
-      "datasourceTemplate": "maven"
-    }
-  ],
-  "packageRules": [
-    {
-      "packagePatterns": [
-        "^com.google.guava:"
-      ],
-      "versionScheme": "docker"
-    },
-    {
-      "packagePatterns": [
-        "*"
-      ],
-      "semanticCommitType": "deps",
-      "semanticCommitScope": null
-    },
-    {
-      "packagePatterns": [
-        "^org.apache.maven",
-        "^org.jacoco:",
-        "^org.codehaus.mojo:",
-        "^org.sonatype.plugins:",
-        "^com.google.cloud:google-cloud-shared-config"
-      ],
-      "semanticCommitType": "build",
-      "semanticCommitScope": "deps"
-    },
-    {
-      "packagePatterns": [
-        "^com.google.cloud:google-cloud-datastore",
-        "^com.google.cloud:libraries-bom",
-        "^com.google.cloud.samples:shared-configuration"
-      ],
-      "semanticCommitType": "chore",
-      "semanticCommitScope": "deps"
-    },
-    {
-      "packagePatterns": [
-        "^junit:junit",
-        "^com.google.truth:truth",
-        "^org.mockito:mockito-core",
-        "^org.objenesis:objenesis",
-        "^com.google.cloud:google-cloud-conformance-tests",
-        "^org.graalvm.buildtools:junit-platform-native"
-      ],
-      "semanticCommitType": "test",
-      "semanticCommitScope": "deps"
-    },
-    {
-      "packagePatterns": [
-        "^com.google.cloud:google-cloud-"
-      ],
-      "ignoreUnstable": false
-    },
-    {
-      "packagePatterns": [
-        "^com.fasterxml.jackson.core"
-      ],
-      "groupName": "jackson dependencies"
-    }
-  ],
-  "semanticCommits": true,
-  "dependencyDashboard": true,
-  "prConcurrentLimit": 0,
-  "prHourlyLimit": 0
-}
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java
index a9459e8041ef..7809501cc997 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java
index 437ceb3a0858..0f88c1c147db 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java
index 367837da620c..312c12509b8d 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java
index a96ab9317d7a..fab0a87134c3 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java
index 68875b23fccd..f7573df094fe 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
index 4fe2dd5326d1..a2addf1dfd65 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java
index ca62e2cabba0..d2b28172ba91 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java
index b2673653a50d..c73151917f9c 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java
index fd2bf8cc4d68..e890cee4ec89 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java
index a6a1a4c554a7..4948972769ca 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java
index 247bbdefe3a4..b7710ac8ffdb 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java
index ecc53b496850..9f66d1dbb554 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java
index e46670b986b6..2e0bebacfb88 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java
index 40d152598032..2129d38360de 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java
index 1fc0e9edad26..39c164e6fcba 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java
index 48ca2974d6bc..d5795adf6fd7 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java
index 6b94ade92370..37c43f2e2c0c 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java
index 151bdd1c7e28..e07d3d2f3305 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java
index 39ba310ea3ad..8150618c6065 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
index 90a94014c5f0..2ccd8e058805 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
index 1fa1d40de4f8..b36db4e78a2a 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
index 24fc7901c7e8..8e847ed9341b 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java
index 8954589c5d0c..a8fda0bcbc4f 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java
index 8176cdc6bb88..3610853a5a37 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java
index 7a1b34a623c8..b7ce1a213f6f 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java
index 5bbc8ccca656..c17660953899 100644
--- a/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java
+++ b/java-datastore/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/java-datastore/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
index 7fbc5f8b9b1f..1e054537bf17 100644
--- a/java-datastore/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
+++ b/java-datastore/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java b/java-datastore/samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java
index 40b22c89d42a..84fe60e77eca 100644
--- a/java-datastore/samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java
+++ b/java-datastore/samples/snippets/src/test/java/com/example/datastore/ConfigureConnectionPoolIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google Inc.
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/java-datastore/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
index 09823479f83c..ba36a8e7209d 100644
--- a/java-datastore/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
+++ b/java-datastore/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/example/datastore/aggregation/AggregationQuerySampleTestIT.java b/java-datastore/samples/snippets/src/test/java/com/example/datastore/aggregation/AggregationQuerySampleTestIT.java
index 65a5ef3f3150..e31688501f3a 100644
--- a/java-datastore/samples/snippets/src/test/java/com/example/datastore/aggregation/AggregationQuerySampleTestIT.java
+++ b/java-datastore/samples/snippets/src/test/java/com/example/datastore/aggregation/AggregationQuerySampleTestIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java b/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
index 8e3fa4c10554..2c700a115658 100644
--- a/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
+++ b/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/OrFilterQuerySampleIT.java b/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/OrFilterQuerySampleIT.java
index a1b84cdfdad0..55731878aa05 100644
--- a/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/OrFilterQuerySampleIT.java
+++ b/java-datastore/samples/snippets/src/test/java/com/example/datastore/filters/OrFilterQuerySampleIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java b/java-datastore/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
index 6003b4a0f397..f0377a507623 100644
--- a/java-datastore/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
+++ b/java-datastore/samples/snippets/src/test/java/com/example/datastore/queryprofile/QueryProfileSampleIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/java-datastore/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 13701eb2d192..1efd6cfaeb55 100644
--- a/java-datastore/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/java-datastore/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/samples/snippets/src/test/java/com/rule/SystemsOutRule.java b/java-datastore/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
index 829fd8a53f70..d7f09140f636 100644
--- a/java-datastore/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
+++ b/java-datastore/samples/snippets/src/test/java/com/rule/SystemsOutRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/java-datastore/synth.metadata b/java-datastore/synth.metadata
deleted file mode 100644
index b2f526b6c686..000000000000
--- a/java-datastore/synth.metadata
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-  "sources": [
-    {
-      "git": {
-        "name": ".",
-        "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "1810bae27175ea5db1fa8ea78a36fc717461f496"
-      }
-    },
-    {
-      "git": {
-        "name": "googleapis",
-        "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "10380880f030101709b3ebe1eb1dd121fa8b4116",
-        "internalRef": "420859180"
-      }
-    },
-    {
-      "git": {
-        "name": "synthtool",
-        "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "010e6b0541130bef2cfe453380a31bea959278c5"
-      }
-    }
-  ],
-  "destinations": [
-    {
-      "client": {
-        "source": "googleapis",
-        "apiName": "datastore",
-        "apiVersion": "v1",
-        "language": "java",
-        "generator": "bazel"
-      }
-    }
-  ],
-  "generatedFiles": [
-    ".github/CODEOWNERS",
-    ".github/ISSUE_TEMPLATE/bug_report.md",
-    ".github/ISSUE_TEMPLATE/feature_request.md",
-    ".github/ISSUE_TEMPLATE/support_request.md",
-    ".github/PULL_REQUEST_TEMPLATE.md",
-    ".github/blunderbuss.yml",
-    ".github/generated-files-bot.yml",
-    ".github/release-please.yml",
-    ".github/release-trigger.yml",
-    ".github/snippet-bot.yml",
-    ".github/sync-repo-settings.yaml",
-    ".github/trusted-contribution.yml",
-    ".github/workflows/approve-readme.yaml",
-    ".github/workflows/auto-release.yaml",
-    ".github/workflows/ci.yaml",
-    ".github/workflows/samples.yaml",
-    ".kokoro/build.bat",
-    ".kokoro/build.sh",
-    ".kokoro/coerce_logs.sh",
-    ".kokoro/common.cfg",
-    ".kokoro/common.sh",
-    ".kokoro/continuous/common.cfg",
-    ".kokoro/continuous/java8.cfg",
-    ".kokoro/dependencies.sh",
-    ".kokoro/nightly/common.cfg",
-    ".kokoro/nightly/integration.cfg",
-    ".kokoro/nightly/java11-integration.cfg",
-    ".kokoro/nightly/java11.cfg",
-    ".kokoro/nightly/java7.cfg",
-    ".kokoro/nightly/java8-osx.cfg",
-    ".kokoro/nightly/java8-win.cfg",
-    ".kokoro/nightly/java8.cfg",
-    ".kokoro/nightly/samples.cfg",
-    ".kokoro/populate-secrets.sh",
-    ".kokoro/presubmit/clirr.cfg",
-    ".kokoro/presubmit/common.cfg",
-    ".kokoro/presubmit/dependencies.cfg",
-    ".kokoro/presubmit/graalvm-native.cfg",
-    ".kokoro/presubmit/integration.cfg",
-    ".kokoro/presubmit/java11.cfg",
-    ".kokoro/presubmit/java7.cfg",
-    ".kokoro/presubmit/java8-osx.cfg",
-    ".kokoro/presubmit/java8-win.cfg",
-    ".kokoro/presubmit/java8.cfg",
-    ".kokoro/presubmit/linkage-monitor.cfg",
-    ".kokoro/presubmit/lint.cfg",
-    ".kokoro/presubmit/samples.cfg",
-    ".kokoro/readme.sh",
-    ".kokoro/release/bump_snapshot.cfg",
-    ".kokoro/release/common.cfg",
-    ".kokoro/release/common.sh",
-    ".kokoro/release/drop.cfg",
-    ".kokoro/release/drop.sh",
-    ".kokoro/release/promote.cfg",
-    ".kokoro/release/promote.sh",
-    ".kokoro/release/publish_javadoc.cfg",
-    ".kokoro/release/publish_javadoc.sh",
-    ".kokoro/release/publish_javadoc11.cfg",
-    ".kokoro/release/publish_javadoc11.sh",
-    ".kokoro/release/snapshot.cfg",
-    ".kokoro/release/snapshot.sh",
-    ".kokoro/release/stage.cfg",
-    ".kokoro/release/stage.sh",
-    ".kokoro/trampoline.sh",
-    "CODE_OF_CONDUCT.md",
-    "CONTRIBUTING.md",
-    "LICENSE",
-    "SECURITY.md",
-    "codecov.yaml",
-    "java.header",
-    "license-checks.xml",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java",
-    "proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java",
-    "proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto",
-    "proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto",
-    "proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto",
-    "renovate.json",
-    "samples/install-without-bom/pom.xml",
-    "samples/pom.xml",
-    "samples/snapshot/pom.xml",
-    "samples/snippets/pom.xml"
-  ]
-}
\ No newline at end of file

From 897ab8b140d763586fa4eaafab05196bfe240508 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:36 +0000
Subject: [PATCH 1781/1784] chore(java-datastore): modernize root pom.xml

---
 java-datastore/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/java-datastore/pom.xml b/java-datastore/pom.xml
index 1903cc15fdc2..adf2cf23a763 100644
--- a/java-datastore/pom.xml
+++ b/java-datastore/pom.xml
@@ -6,15 +6,16 @@
   pom
   2.33.2
   Google Cloud Datastore Parent
-  https://github.com/googleapis/java-datastore
+  https://github.com/googleapis/google-cloud-java
   
     Java idiomatic client for Google Cloud Platform services.
   
 
   
     com.google.cloud
-    sdk-platform-java-config
-    3.55.1
+    google-cloud-jar-parent
+    1.77.0-SNAPSHOT
+    ../google-cloud-jar-parent/pom.xml
   
 
   
@@ -120,13 +121,13 @@
     Google LLC
   
   
-    scm:git:git@github.com:googleapis/java-datastore.git
-    scm:git:git@github.com:googleapis/java-datastore.git
-    https://github.com/googleapis/java-datastore
+    scm:git:git@github.com:googleapis/google-cloud-java.git
+    scm:git:git@github.com:googleapis/google-cloud-java.git
+    https://github.com/googleapis/google-cloud-java
     HEAD
   
   
-    https://github.com/googleapis/java-datastore/issues
+    https://github.com/googleapis/google-cloud-java/issues
     GitHub Issues
   
   
@@ -200,7 +201,6 @@
           
         
       
-      
       
         junit
         junit

From 67a203130766c06d0ee8ade5f8be205da778f781 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:27:37 +0000
Subject: [PATCH 1782/1784] chore(java-datastore): modernize BOM pom.xml

---
 java-datastore/google-cloud-datastore-bom/pom.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/java-datastore/google-cloud-datastore-bom/pom.xml b/java-datastore/google-cloud-datastore-bom/pom.xml
index 291d5e03af75..be45f940c304 100644
--- a/java-datastore/google-cloud-datastore-bom/pom.xml
+++ b/java-datastore/google-cloud-datastore-bom/pom.xml
@@ -7,12 +7,13 @@
   pom
   
     com.google.cloud
-    sdk-platform-java-config
-    3.55.1
+    google-cloud-pom-parent
+    1.77.0-SNAPSHOT
+    ../../google-cloud-pom-parent/pom.xml
   
 
   Google Cloud datastore BOM
-  https://github.com/googleapis/java-datastore
+  https://github.com/googleapis/google-cloud-java
   
     BOM for Google Cloud datastore
   
@@ -34,9 +35,9 @@
   
 
   
-    scm:git:https://github.com/googleapis/java-datastore.git
-    scm:git:git@github.com:googleapis/java-datastore.git
-    https://github.com/googleapis/java-datastore
+    scm:git:https://github.com/googleapis/google-cloud-java.git
+    scm:git:git@github.com:googleapis/google-cloud-java.git
+    https://github.com/googleapis/google-cloud-java
   
 
   

From b1001ff4117384488a368c625cfec8d1c94a0a46 Mon Sep 17 00:00:00 2001
From: chingor13 
Date: Fri, 23 Jan 2026 20:52:04 +0000
Subject: [PATCH 1783/1784] try updated token

---
 .github/workflows/hermetic_library_generation.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 1716ff0b495d..58f0df638e71 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -36,10 +36,10 @@ jobs:
       if: env.SHOULD_RUN == 'true'
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
         head_ref: ${{ github.head_ref }}
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}

From eb161073760afd590634143d221fefb0543b71ec Mon Sep 17 00:00:00 2001
From: cloud-java-bot 
Date: Fri, 23 Jan 2026 20:56:30 +0000
Subject: [PATCH 1784/1784] chore: generate libraries at Fri Jan 23 20:54:35
 UTC 2026

---
 gapic-libraries-bom/pom.xml        |  7 ++++
 java-datastore/.repo-metadata.json |  2 +-
 java-datastore/README.md           | 62 +++++++++++++++---------------
 pom.xml                            | 18 ++++-----
 4 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/gapic-libraries-bom/pom.xml b/gapic-libraries-bom/pom.xml
index e7b3efd5a591..0eaac79fc531 100644
--- a/gapic-libraries-bom/pom.xml
+++ b/gapic-libraries-bom/pom.xml
@@ -497,6 +497,13 @@
         pom
         import
       
+      
+        com.google.cloud
+        google-cloud-datastore-bom
+        2.33.2
+        pom
+        import
+      
       
         com.google.cloud
         google-cloud-datastream-bom
diff --git a/java-datastore/.repo-metadata.json b/java-datastore/.repo-metadata.json
index 6ae8c95c023b..f15aa1b07777 100644
--- a/java-datastore/.repo-metadata.json
+++ b/java-datastore/.repo-metadata.json
@@ -7,7 +7,7 @@
   "release_level": "stable",
   "transport": "both",
   "language": "java",
-  "repo": "googleapis/java-datastore",
+  "repo": "googleapis/google-cloud-java",
   "repo_short": "java-datastore",
   "distribution_name": "com.google.cloud:google-cloud-datastore",
   "api_id": "datastore.googleapis.com",
diff --git a/java-datastore/README.md b/java-datastore/README.md
index d682969de64b..be8b583d1b5d 100644
--- a/java-datastore/README.md
+++ b/java-datastore/README.md
@@ -359,37 +359,37 @@ Example Applications
 
 ## Samples
 
-Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tree/main/samples) directory.
+Samples are in the [`samples/`](https://github.com/googleapis/google-cloud-java/tree/main/samples) directory.
 
 | Sample                      | Source Code                       | Try it |
 | --------------------------- | --------------------------------- | ------ |
-| Configure Connection Pool | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java) |
-| Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
-| Avg Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) |
-| Avg Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) |
-| Avg Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java) |
-| Avg Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java) |
-| Count Aggregation In Transaction | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) |
-| Count Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) |
-| Count Aggregation With Gql Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) |
-| Count Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java) |
-| Count Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) |
-| Count Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) |
-| Count Aggregation With Stale Read | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) |
-| Multiple Aggregations In Gql Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java) |
-| Multiple Aggregations In Structured Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java) |
-| Sum Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java) |
-| Sum Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) |
-| Sum Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) |
-| Sum Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) |
-| Indexing Consideration Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) |
-| Create a union between two filters | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) |
-| Order Fields Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) |
-| Query Profile Explain | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) |
-| Query Profile Explain Aggregation | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) |
-| Query Profile Explain Analyze | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) |
-| Query Profile Explain Analyze Aggregation | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java) |
-| Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
+| Configure Connection Pool | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/ConfigureConnectionPool.java) |
+| Quickstart Sample | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) |
+| Avg Aggregation On Kind | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) |
+| Avg Aggregation With Limit | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) |
+| Avg Aggregation With Order By | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithOrderBy.java) |
+| Avg Aggregation With Property Filter | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithPropertyFilter.java) |
+| Count Aggregation In Transaction | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationInTransaction.java) |
+| Count Aggregation On Kind | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationOnKind.java) |
+| Count Aggregation With Gql Query | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithGqlQuery.java) |
+| Count Aggregation With Limit | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithLimit.java) |
+| Count Aggregation With Order By | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithOrderBy.java) |
+| Count Aggregation With Property Filter | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithPropertyFilter.java) |
+| Count Aggregation With Stale Read | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/CountAggregationWithStaleRead.java) |
+| Multiple Aggregations In Gql Query | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInGqlQuery.java) |
+| Multiple Aggregations In Structured Query | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/MultipleAggregationsInStructuredQuery.java) |
+| Sum Aggregation On Kind | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationOnKind.java) |
+| Sum Aggregation With Limit | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) |
+| Sum Aggregation With Order By | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) |
+| Sum Aggregation With Property Filter | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) |
+| Indexing Consideration Query | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) |
+| Create a union between two filters | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) |
+| Order Fields Query | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) |
+| Query Profile Explain | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) |
+| Query Profile Explain Aggregation | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) |
+| Query Profile Explain Analyze | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) |
+| Query Profile Explain Analyze Aggregation | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyzeAggregation.java) |
+| Task List | [source code](https://github.com/googleapis/google-cloud-java/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-java&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) |
 
 
 
@@ -483,9 +483,9 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-cli]: https://cloud.google.com/cli
 [troubleshooting]: https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md
-[contributing]: https://github.com/googleapis/java-datastore/blob/main/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-datastore/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[license]: https://github.com/googleapis/java-datastore/blob/main/LICENSE
+[contributing]: https://github.com/googleapis/google-cloud-java/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/google-cloud-java/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE
 [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
 [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com
 [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
diff --git a/pom.xml b/pom.xml
index a90ef93fa0bf..803fdf50b764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
     java-admanager
     java-advisorynotifications
     java-aiplatform
-    java-alloydb-connectors
     java-alloydb
+    java-alloydb-connectors
     java-analytics-admin
     java-analytics-data
     java-analyticshub
@@ -83,15 +83,15 @@
     java-datalineage
     java-datamanager
     java-dataplex
-    java-dataproc-metastore
     java-dataproc
+    java-dataproc-metastore
     java-datastore
     java-datastream
     java-deploy
     java-developerconnect
     java-devicestreaming
-    java-dialogflow-cx
     java-dialogflow
+    java-dialogflow-cx
     java-discoveryengine
     java-distributedcloudedge
     java-dlp
@@ -103,8 +103,8 @@
     java-enterpriseknowledgegraph
     java-errorreporting
     java-essential-contacts
-    java-eventarc-publishing
     java-eventarc
+    java-eventarc-publishing
     java-filestore
     java-financialservices
     java-functions
@@ -118,8 +118,8 @@
     java-grafeas
     java-gsuite-addons
     java-hypercomputecluster
-    java-iam-admin
     java-iam
+    java-iam-admin
     java-iamcredentials
     java-iap
     java-ids
@@ -139,8 +139,8 @@
     java-managedkafka
     java-maps-addressvalidation
     java-maps-area-insights
-    java-maps-fleetengine-delivery
     java-maps-fleetengine
+    java-maps-fleetengine-delivery
     java-maps-mapsplatformdatasets
     java-maps-places
     java-maps-routeoptimization
@@ -152,9 +152,9 @@
     java-memcache
     java-migrationcenter
     java-modelarmor
+    java-monitoring
     java-monitoring-dashboards
     java-monitoring-metricsscope
-    java-monitoring
     java-netapp
     java-network-management
     java-network-security
@@ -181,8 +181,8 @@
     java-recaptchaenterprise
     java-recommendations-ai
     java-recommender
-    java-redis-cluster
     java-redis
+    java-redis-cluster
     java-resourcemanager
     java-retail
     java-run
@@ -192,8 +192,8 @@
     java-secretmanager
     java-securesourcemanager
     java-security-private-ca
-    java-securitycenter-settings
     java-securitycenter
+    java-securitycenter-settings
     java-securitycentermanagement
     java-securityposture
     java-service-control